From a87743b92d1044ffa7a19ba905a23318506d452e Mon Sep 17 00:00:00 2001 From: mariusmonton Date: Mon, 11 Feb 2019 15:54:13 +0100 Subject: [PATCH] minor changes --- src/Registers.cpp | 8 +++----- src/Simulator.cpp | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/Registers.cpp b/src/Registers.cpp index db89c70..53c7521 100644 --- a/src/Registers.cpp +++ b/src/Registers.cpp @@ -7,14 +7,11 @@ Registers::Registers() { perf = Performance::getInstance(); initCSR(); - //register_bank[sp] = 1024-1; // SP points to end of memory - //register_bank[sp] = 0x70000000; - //register_bank[sp] = (0x10000000 / 4) - 1; //cout << "Memory size: 0x" << hex << Memory::SIZE << endl; //cout << "SP address: 0x" << hex << (0x10000000 / 4) - 1 << endl; - //register_bank[sp] = Memory::SIZE-4; + register_bank[sp] = Memory::SIZE-4; // default stack at the end of the memory register_PC = 0x80000000; // default _start address } @@ -119,7 +116,7 @@ uint32_t Registers::getCSR(int csr) { void Registers::setCSR(int csr, uint32_t value) { - /* @note rv32mi-p-ma_fetch tests doesn't allow MISA to writable, + /* @FIXME: rv32mi-p-ma_fetch tests doesn't allow MISA to writable, * but Volume II: Privileged Architectura v1.10 says MISRA is writable (?) */ if (csr != CSR_MISA) { @@ -130,5 +127,6 @@ void Registers::setCSR(int csr, uint32_t value) { void Registers::initCSR() { CSR[CSR_MISA] = MISA_MXL | MISA_M_EXTENSION | MISA_C_EXTENSION | MISA_A_EXTENSION | MISA_I_BASE; + CSR[CSR_MSTATUS] = MISA_MXL ; } diff --git a/src/Simulator.cpp b/src/Simulator.cpp index bd5dc9d..d598a52 100644 --- a/src/Simulator.cpp +++ b/src/Simulator.cpp @@ -47,7 +47,7 @@ SC_MODULE(Simulator) SC_CTOR(Simulator) { log = Log::getInstance(); - log->setLogLevel(Log::ERROR); + log->setLogLevel(Log::INFO); MainMemory = new Memory("Main_Memory", filename); start_PC = MainMemory->getPCfromHEX();