From cc5a14e1cd6bd2ac9ef7e5569342838f3be4c201 Mon Sep 17 00:00:00 2001 From: hsufit Date: Fri, 20 Aug 2021 16:19:26 +0800 Subject: [PATCH 1/2] Add missing colon for BASIC instruction log Better for analysis the RISC-V code stream --- src/BASE_ISA.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/BASE_ISA.cpp b/src/BASE_ISA.cpp index 527157a..d429c2f 100644 --- a/src/BASE_ISA.cpp +++ b/src/BASE_ISA.cpp @@ -91,7 +91,7 @@ bool BASE_ISA::Exec_LUI() const { regs->setValue(rd, static_cast(imm)); if (log->getLogLevel() >= Log::INFO) { - log->SC_log(Log::INFO) << "LUI x" << std::dec << rd << " <- 0x" << std::hex + log->SC_log(Log::INFO) << "LUI: x" << std::dec << rd << " <- 0x" << std::hex << imm << "\n"; } @@ -110,7 +110,7 @@ bool BASE_ISA::Exec_AUIPC() const { regs->setValue(rd, new_pc); if (log->getLogLevel() >= Log::INFO) { - log->SC_log(Log::INFO) << "AUIPC x" << std::dec << rd << " <- 0x" + log->SC_log(Log::INFO) << "AUIPC: x" << std::dec << rd << " <- 0x" << std::hex << imm << " + PC (0x" << new_pc << ")" << "\n"; } @@ -179,7 +179,7 @@ bool BASE_ISA::Exec_BEQ() const { } if (log->getLogLevel() >= Log::INFO) { - log->SC_log(Log::INFO) << "BEQ x" << std::dec << rs1 << "(0x" << std::hex + log->SC_log(Log::INFO) << "BEQ: x" << std::dec << rs1 << "(0x" << std::hex << regs->getValue(rs1) << ") == x" << std::dec << rs2 << "(0x" << std::hex << regs->getValue(rs2) << ")? -> PC (0x" << std::hex << new_pc << ")" << std::dec << "\n"; @@ -232,7 +232,7 @@ bool BASE_ISA::Exec_BLT() const { } if (log->getLogLevel() >= Log::INFO) { - log->SC_log(Log::INFO) << "BLT x" << std::dec << rs1 << "(0x" << std::hex + log->SC_log(Log::INFO) << "BLT: x" << std::dec << rs1 << "(0x" << std::hex << (int32_t) regs->getValue(rs1) << ") < x" << std::dec << rs2 << "(0x" << std::hex << (int32_t) regs->getValue(rs2) << ")? -> PC (0x" << std::hex << new_pc << ")" << std::dec @@ -257,7 +257,7 @@ bool BASE_ISA::Exec_BGE() const { } if (log->getLogLevel() >= Log::INFO) { - log->SC_log(Log::INFO) << "BGE x" << std::dec << rs1 << "(0x" << std::hex + log->SC_log(Log::INFO) << "BGE: x" << std::dec << rs1 << "(0x" << std::hex << (int32_t) regs->getValue(rs1) << ") > x" << std::dec << rs2 << "(0x" << std::hex << (int32_t) regs->getValue(rs2) << ")? -> PC (0x" << std::hex << new_pc << ")" << std::dec @@ -283,7 +283,7 @@ bool BASE_ISA::Exec_BLTU() const { } if (log->getLogLevel() >= Log::INFO) { - log->SC_log(Log::INFO) << "BLTU x" << std::dec << rs1 << "(0x" << std::hex + log->SC_log(Log::INFO) << "BLTU: x" << std::dec << rs1 << "(0x" << std::hex << regs->getValue(rs1) << ") < x" << std::dec << rs2 << "(0x" << std::hex << regs->getValue(rs2) << ")? -> PC (0x" << std::hex << new_pc << ")" << std::dec << "\n"; @@ -307,7 +307,7 @@ bool BASE_ISA::Exec_BGEU() const { } if (log->getLogLevel() >= Log::INFO) { - log->SC_log(Log::INFO) << "BGEU x" << std::dec << rs1 << "(0x" << std::hex + log->SC_log(Log::INFO) << "BGEU: x" << std::dec << rs1 << "(0x" << std::hex << regs->getValue(rs1) << ") > x" << std::dec << rs2 << "(0x" << std::hex << regs->getValue(rs2) << ")? -> PC (0x" << std::hex << new_pc << ")" << std::dec << "\n"; From 293b7926f6af83b73ba745b3f226c06257810d7c Mon Sep 17 00:00:00 2001 From: hsufit Date: Fri, 20 Aug 2021 16:23:19 +0800 Subject: [PATCH 2/2] Add missing colon for C_extension instruction log Better for analysis the RISC-V code stream --- src/C_extension.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/C_extension.cpp b/src/C_extension.cpp index abc3664..a363a96 100644 --- a/src/C_extension.cpp +++ b/src/C_extension.cpp @@ -280,7 +280,7 @@ bool C_extension::Exec_C_ADDI16SP() { rd = get_rd(); imm = get_imm_LUI(); regs->setValue(rd, imm); - log->SC_log(Log::INFO) << std::dec << "C.LUI x" << rd << " <- 0x" + log->SC_log(Log::INFO) << std::dec << "C.LUI: x" << rd << " <- 0x" << std::hex << imm << "\n"; }