From: Ian Jiang <ianjiang.ict@gmail.com>
Date: Fri, 14 Aug 2020 02:13:41 +0000 (+0800)
Subject: arch-riscv: Fix disassembling of all register instructions
X-Git-Tag: v20.1.0.0~298
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=96f482fd6cc01f9181360daac0ae80e2dee40401;p=gem5.git

arch-riscv: Fix disassembling of all register instructions

How many Rs to output in disassembling register instructions? It does
not depend on wheather the register index is zero, but on the count
of source registers.

This patch fixes the problem.

Change-Id: I9a770722003bc6f4a259589a7471a506494d4c86
Signed-off-by: Ian Jiang <ianjiang.ict@gmail.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/32694
Reviewed-by: Jason Lowe-Power <power.jg@gmail.com>
Maintainer: Jason Lowe-Power <power.jg@gmail.com>
Tested-by: kokoro <noreply+kokoro@google.com>
---

diff --git a/src/arch/riscv/insts/standard.cc b/src/arch/riscv/insts/standard.cc
index e6c2b67ae..9a9aa9da4 100644
--- a/src/arch/riscv/insts/standard.cc
+++ b/src/arch/riscv/insts/standard.cc
@@ -48,9 +48,9 @@ RegOp::generateDisassembly(Addr pc, const Loader::SymbolTable *symtab) const
     stringstream ss;
     ss << mnemonic << ' ' << registerName(_destRegIdx[0]) << ", " <<
         registerName(_srcRegIdx[0]);
-    if (_srcRegIdx[1].index() != 0)
+    if (_numSrcRegs >= 2)
         ss << ", " << registerName(_srcRegIdx[1]);
-    if (_srcRegIdx[2].index() != 0)
+    if (_numSrcRegs >= 3)
         ss << ", " << registerName(_srcRegIdx[2]);
     return ss.str();
 }