From f3959be843e640ea5c108576a171026b54878614 Mon Sep 17 00:00:00 2001
From: Anton Lydike <me@antonlydike.de>
Date: Sun, 23 May 2021 10:44:27 +0200
Subject: [PATCH] [decoder] now returning instruction number as third return
 value

---
 riscemu/decoder/__main__.py |  3 +--
 riscemu/decoder/decoder.py  | 18 +++++++++---------
 riscemu/priv/ElfLoader.py   |  1 +
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/riscemu/decoder/__main__.py b/riscemu/decoder/__main__.py
index 98fcd49..e109c97 100644
--- a/riscemu/decoder/__main__.py
+++ b/riscemu/decoder/__main__.py
@@ -5,8 +5,7 @@ if __name__ == '__main__':
 
     from .decoder import *
     from .formats import *
-    from instruction_table import *
-    from regs import *
+    from .instruction_table import *
 
     sess_vars = globals()
     sess_vars.update(locals())
diff --git a/riscemu/decoder/decoder.py b/riscemu/decoder/decoder.py
index d34dded..b218ccd 100644
--- a/riscemu/decoder/decoder.py
+++ b/riscemu/decoder/decoder.py
@@ -8,13 +8,13 @@ def print_ins(ins: int):
         f"0b{ins >> 25 :07b}_{(ins >> 20) & 0b11111:05b}_{(ins >> 15) & 0b11111:03b}_{(ins >> 12) & 0b111:03b}_{(ins >> 7) & 0b11111:05b}_{ins & 0b1111111:07b}");
 
 
-STATIC_INSN = {
-    0x00000013: ("nop", []),
-    0x00008067: ("ret", []),
-    0xfe010113: ("addi", ["sp", "sp", -32]),
-    0x02010113: ("addi", ["sp", "sp", 32]),
-    0x00100073: ("ebreak", []),
-    0x00000073: ("ecall", [])
+STATIC_INSN: Dict[int, Tuple[str, List[Union[str, int]], int]] = {
+    0x00000013: ("nop", [], 0x00000013),
+    0x00008067: ("ret", [], 0x00008067),
+    0xfe010113: ("addi", ["sp", "sp", -32], 0xfe010113),
+    0x02010113: ("addi", ["sp", "sp", 32], 0x02010113),
+    0x00100073: ("ebreak", [], 0x00100073),
+    0x00000073: ("ecall", [], 0x00000073),
 }
 
 
@@ -68,7 +68,7 @@ def name_from_insn(ins: int):
     raise RuntimeError(f"Invalid instruction: {ins:x}")
 
 
-def decode(ins: bytearray) -> Tuple[str, List[Union[str, int]]]:
+def decode(ins: bytearray) -> Tuple[str, List[Union[str, int]], int]:
     insn = int_from_ins(ins)
 
     if insn & 3 != 3:
@@ -83,4 +83,4 @@ def decode(ins: bytearray) -> Tuple[str, List[Union[str, int]]]:
         print_ins(insn)
         raise RuntimeError("No instruction decoder found for instruction")
 
-    return name_from_insn(insn), INSTRUCTION_ARGS_DECODER[opcode](insn)
+    return name_from_insn(insn), INSTRUCTION_ARGS_DECODER[opcode](insn), insn
diff --git a/riscemu/priv/ElfLoader.py b/riscemu/priv/ElfLoader.py
index 549114e..90ca06e 100644
--- a/riscemu/priv/ElfLoader.py
+++ b/riscemu/priv/ElfLoader.py
@@ -92,6 +92,7 @@ class InvalidElfException(RiscemuBaseException):
 class ElfInstruction:
     name: str
     args: List[Union[int, str]]
+    encoded: int
 
     def get_imm(self, num: int):
         return self.args[-1]