Refactor get_printable_location.

Author: Sarah Mount

.coveragerc

@@ -32,7 +32,7 @@ exclude_lines =
 
     # Don't complain about code that only executes when translated.
     .*we_are_translated.*
-    def get_location
+    def get_printable_location
     _RevelationByteMemory
 
     # Don't complain about every single status bit.

revelation/sim.py

@@ -25,6 +25,12 @@ def new_memory(logger):
     return Memory(block_size=2**20, logger=logger)
 
 
+def get_printable_location(pc, core, coreid, opcode):
+    hex_pc = pad_hex(pc)
+    mnemonic, _ = decode(opcode)
+    return 'Core ID: 0x%x PC: %s Instruction: %s' % (coreid, hex_pc, mnemonic)
+
+
 class Revelation(Sim):
 
     def __init__(self):
@@ -35,17 +41,12 @@ def __init__(self):
         self.arch_name = self.arch_name_human.lower()
         self.jit_enabled = True
         if self.jit_enabled:
-            self.jitdriver = JitDriver(greens = ['pc', 'core', 'coreid', 'opcode'],
-                                       reds = ['tick_counter',
-                                               'halted_cores',
-                                               'idle_cores',
-                                               'old_pcs',
-                                               'memory',
-                                               'sim',
-                                               'state',
-                                               'start_time'],
-                                       virtualizables = ['state'],
-                                       get_printable_location=self.get_location)
+            self.jitdriver = JitDriver(
+                greens = ['pc', 'core', 'coreid', 'opcode'],
+                reds = ['tick_counter', 'halted_cores', 'idle_cores',
+                        'old_pcs', 'memory', 'sim', 'state', 'start_time'],
+                virtualizables = ['state'],
+                get_printable_location=get_printable_location)
         self.default_trace_limit = 400000
         self.max_insts = 0
         self.logger = None
@@ -73,11 +74,6 @@ def __init__(self):
             9 : 0x24, # Software-generate user interrupt.
         }
 
-    @staticmethod
-    def get_location(pc, core, coreid, opcode):
-        mnemonic, _ = decode(opcode)
-        return 'Core ID: %x PC: %x Instruction: %s' % (coreid, pc, mnemonic)
-
     @elidable
     def next_core(self, core):
         return (core + 1) % (self.rows * self.cols)