m1n1.trace.isp: Hexdump to HV log

Signed-off-by: Asahi Lina <[email protected]>

Author: hoshinolina

proxyclient/m1n1/trace/isp.py

@@ -48,17 +48,17 @@ def dump(self):
 class ISPIOCommand(ISPCommand):
     def __init__(self, chan, msg, direction):
         super().__init__(chan, msg, direction)
-        self.contents = self.read_iova(self.iova, self.arg1)
+        self.contents = self.read_iova(self.iova, max(self.arg1, 8))
 
     def dump(self):
         if self.iova:
             opcode = struct.unpack("<Q", self.contents[:0x8])[0] >> 32
             self.log(f"[IO iova: {hex(self.iova)}, insize: {hex(self.arg1)}, outsize: {hex(self.arg2)} -> opcode: {hex(opcode)} {opcode2name(opcode)}]")
             self.log("IO struct: ")
             try:
-                chexdump32(self.contents)
+                chexdump32(self.contents, print_fn=self.log)
             except struct.error:
-                print(chexdump(self.contents))
+                chexdump(self.contents, print_fn=self.log)
 
 class ISPT2HBufferCommand(ISPCommand):
     def __init__(self, chan, msg, direction):
@@ -70,7 +70,7 @@ def dump(self):
         super().dump()
         if self.contents:
             self.log("BUF_T2H struct:")
-            chexdump32(self.contents)
+            chexdump32(self.contents, print_fn=self.log)
 
 class ISPH2TBufferCommand(ISPCommand):
     def __init__(self, chan, msg, direction):
@@ -82,7 +82,7 @@ def dump(self):
         super().dump()
         if self.contents:
             self.log("BUF_H2T struct:")
-            chexdump32(self.contents)
+            chexdump32(self.contents, print_fn=self.log)
 
 class ISPT2HIOCommand(ISPCommand):
     def __init__(self, chan, msg, direction):
@@ -225,7 +225,7 @@ def w_ISP_GPIO_0(self, val):
         if (val.value >= 0xe00000) and (val.value <= 0x1100000): # dunno
             self.log("ISP bootargs at 0x%x:" % val.value)
             bootargs = self.dart.ioread(0, val.value, 0x200) # justt in case
-            chexdump32(bootargs)
+            chexdump32(bootargs, print_fn=self.log)
             x = ISPIPCBootArgs.parse(bootargs[:ISPIPCBootArgs.sizeof()])
             self.log(x)
 

proxyclient/m1n1/utils.py

@@ -189,17 +189,17 @@ def ehexdump(s, st=0, abbreviate=True, indent="", print_fn=print):
             last = val
             skip = False
 
-def chexdump32(s, st=0, abbreviate=True):
+def chexdump32(s, st=0, abbreviate=True, print_fn=print):
     last = None
     skip = False
     for i in range(0,len(s),32):
         val = s[i:i+32]
         if val == last and abbreviate:
             if not skip:
-                print("%08x  *" % (i + st))
+                print_fn("%08x  *" % (i + st))
                 skip = True
         else:
-            print("%08x  %s" % (
+            print_fn("%08x  %s" % (
                 i + st,
                 hexdump32(val, ' ')))
             last = val