Fixed errors due to renaming to AddressSpace
MODIFY
src/processorregistry.h
src/processorregistry.h
@@ -129,9 +129,12 @@ private:
desc.isa = vsrtl::core::RV5S_NO_FW::ISA();
desc.name = "5-Stage Processor w/o forwarding unit";
desc.description = "A 5-Stage in-order processor with hazard detection/elimination but no forwarding unit.";
- desc.layouts = {
- {"Standard", ":/layouts/RISC-V/rv5s_no_fw/rv5s_no_fw_standard_layout.json", {0.08, 0.3, 0.53, 0.75, 0.88}},
- {"Extended", ":/layouts/RISC-V/rv5s_no_fw/rv5s_no_fw_extended_layout.json", {0.08, 0.28, 0.53, 0.78, 0.9}}};
+ desc.layouts = {{"Standard",
+ ":/layouts/RISC-V/rv5s_no_fw/rv5s_no_fw_standard_layout.json",
+ {QPointF{0.08, 0}, QPointF{0.3, 0}, QPointF{0.53, 0}, QPointF{0.75, 0}, QPointF{0.88, 0}}},
+ {"Extended",
+ ":/layouts/RISC-V/rv5s_no_fw/rv5s_no_fw_extended_layout.json",
+ {QPointF{0.08, 0}, QPointF{0.28, 0}, QPointF{0.53, 0}, QPointF{0.78, 0}, QPointF{0.9, 0}}}};
desc.defaultRegisterVals = {{2, 0x7ffffff0}, {3, 0x10000000}};
m_descriptions[desc.id] = desc;

MODIFY
src/processors/RISC-V/rv5s_no_fw/rv5s_no_fw.h
src/processors/RISC-V/rv5s_no_fw/rv5s_no_fw.h
@@ -280,7 +280,7 @@ public:
SUBCOMPONENT(mem_stalled_or, TYPE(Or<1, 2>));
// Address spaces
- ADDRESSSPACE(m_memory);
+ ADDRESSSPACEMM(m_memory);
ADDRESSSPACE(m_regMem);
SUBCOMPONENT(ecallChecker, EcallChecker);
@@ -388,8 +388,8 @@ public:
propagateDesign();
}
void setPCInitialValue(uint32_t address) override { pc_reg->setInitValue(address); }
- AddressSpace& getMemory() override { return *m_memory; }
- unsigned int getRegister(RegisterFileType rfid, unsigned i) const override { return registerFile->getRegister(i); }
+ AddressSpaceMM& getMemory() override { return *m_memory; }
+ unsigned int getRegister(RegisterFileType, unsigned i) const override { return registerFile->getRegister(i); }
AddressSpace& getArchRegisters() override { return *m_regMem; }
void finalize(const FinalizeReason& fr) override {
if (fr.exitSyscall && !ecallChecker->isSysCallExiting()) {
@@ -399,6 +399,7 @@ public:
}
ecallChecker->setSysCallExiting(ecallChecker->isSysCallExiting() || fr.exitSyscall);
}
+ const std::vector<unsigned> breakpointTriggeringStages() const override { return {IF}; };
const Component* getDataMemory() const override { return data_mem; }
const Component* getInstrMemory() const override { return instr_mem; }
@@ -414,7 +415,7 @@ public:
return allStagesInvalid;
}
- void setRegister(RegisterFileType rfid, unsigned i, uint32_t v) override {
+ void setRegister(RegisterFileType, unsigned i, uint32_t v) override {
setSynchronousValue(registerFile->_wr_mem, i, v);
}

Fixed errors due to renaming to AddressSpace