isa/caller.py: refactor trace file format

diff --git a/src/openpower/decoder/isa/caller.py b/src/openpower/decoder/isa/caller.py
index d80db2fd3bbc022314f8b658cf398198588e6fae..42e4a2b95272bfbca7d661c89aaef8571437f0f1 100644 (file)
--- a/src/openpower/decoder/isa/caller.py
+++ b/src/openpower/decoder/isa/caller.py
@@ -1732,7 +1732,6 @@ class ISACaller(ISACallerHelper, ISAFPHelpers, StepLoop):
                 offs, dbg = 4, "svp64 "
             code = self.disassembly[self._pc+offs]
             log("    %s sim-execute" % dbg, hex(self._pc), code)
-            self.insnlog.append(code)
         opname = code.split(' ')[0]
         try:
             yield from self.call(opname)         # execute the instruction
@@ -1765,7 +1764,9 @@ class ISACaller(ISACallerHelper, ISAFPHelpers, StepLoop):
             raise e                          # ... re-raise
 
         # append the log file
-        self.tracefile.write(" ".join(self.insnlog)+"\n")
+        self.insnlog.append("#")
+        self.insnlog.append(code)
+        self.tracefile.write(" ".join(self.insnlog) + "\n")
 
         log("gprs after code", code)
         self.gpr.dump()