From 5516f4fac6203511f12489d6646c0e8439e17a56 Mon Sep 17 00:00:00 2001 From: Luke Kenneth Casson Leighton Date: Sat, 1 Oct 2022 14:43:24 +0100 Subject: [PATCH] simplify ISACaller execute_one --- src/openpower/decoder/isa/caller.py | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/src/openpower/decoder/isa/caller.py b/src/openpower/decoder/isa/caller.py index 2f9d8aa0..a17365a1 100644 --- a/src/openpower/decoder/isa/caller.py +++ b/src/openpower/decoder/isa/caller.py @@ -1432,18 +1432,14 @@ class ISACaller(ISACallerHelper, ISAFPHelpers, StepLoop): """execute one instruction """ # get the disassembly code for this instruction - if self.is_svp64_mode: - if not self.disassembly: - code = yield from self.get_assembly_name() - else: - code = self.disassembly[self._pc+4] - log(" svp64 sim-execute", hex(self._pc), code) + if not self.disassembly: + code = yield from self.get_assembly_name() else: - if not self.disassembly: - code = yield from self.get_assembly_name() - else: - code = self.disassembly[self._pc] - log("sim-execute", hex(self._pc), code) + offs, dbg = 0, "" + if self.is_svp64_mode: + offs, dbg = 4, "svp64 " + code = self.disassembly[self._pc+offs] + log(" %s sim-execute" % dbg, hex(self._pc), code) opname = code.split(' ')[0] try: yield from self.call(opname) # execute the instruction -- 2.30.2