anton/riscemu
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[ElfLoader] better formatting for jump and load/store instructions

Browse Source
This commit is contained in:
Anton Lydike 2021-06-05 15:29:40 +02:00
parent 37910018b9
commit c1110b9ce3
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
riscemu/priv/ElfLoader.py
View File

@ -1,5 +1,5 @@
from dataclasses import dataclass
from typing import List, Dict, Union
from typing import List, Dict, Tuple
from elftools.elf.elffile import ELFFile
from elftools.elf.sections import Section, SymbolTableSection
@ -108,10 +108,12 @@ class ElfInstruction:
def get_reg(self, num: int) -> str:
return RISCV_REGS[self.args[num]]
def __repr__(self):
if self.name in ('sw', 'sh', 'sb', 'lb', 'lh', 'lb', 'lbu', 'lhu'):
def __repr__(self) -> str:
if self.name == 'jal' and self.args[0] == 0:
return "j {}".format(self.args[1])
elif self.name in ('lw', 'lh', 'lb', 'lbu', 'lhu', 'sw', 'sh', 'sb'):
args = "{}, {}({})".format(
self.args[1], self.args[2], self.args[0]
RISCV_REGS[self.args[0]], self.args[2], RISCV_REGS[self.args[1]]
)
else:
args = ", ".join(map(str, self.args))