From 7b3a4b92e0fb39fc5032f3690bbcd109ec017a10 Mon Sep 17 00:00:00 2001 From: Asahi Lina Date: Sun, 24 Sep 2023 00:59:00 +0900 Subject: [PATCH] m1n1.hw.isp: Print more stuff Signed-off-by: Asahi Lina --- proxyclient/m1n1/hw/isp.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/proxyclient/m1n1/hw/isp.py b/proxyclient/m1n1/hw/isp.py index 4d8d0fda..1d314d5f 100644 --- a/proxyclient/m1n1/hw/isp.py +++ b/proxyclient/m1n1/hw/isp.py @@ -88,14 +88,15 @@ class ISPIOCommand(ISPCommand): super().__init__(channel, message, direction) self.iova = self.value if self.iova != 0: - contents = self.read_iova(self.iova, 0x8) - self.contents = int.from_bytes(contents, byteorder="little") + contents = self.read_iova(self.iova, self.arg0) + self.contents = contents else: self.contents = None def dump(self): if self.iova != 0: - self.log(f"[IO Addr: {hex(self.iova)}, Size: {hex(self.arg0)}, U1: {hex(self.arg1)} -> Opcode: {hex(self.contents >> 32)}]") + self.log(f"[IO Addr: {hex(self.iova)}, Size: {hex(self.arg0)}, U1: {hex(self.arg1)}]") + chexdump(self.contents, print_fn=self.log) class ISPT2HBufferCommand(ISPCommand): """ Represents a command in BUF_T2H channel """ @@ -108,7 +109,7 @@ class ISPT2HBufferCommand(ISPCommand): def dump(self): super().dump() if self.iova != 0: - chexdump(self.contents) + chexdump(self.contents, print_fn=self.log) class ISPH2TBufferCommand(ISPCommand): """ Represents a command in BUF_H2T channel """ @@ -122,7 +123,7 @@ class ISPH2TBufferCommand(ISPCommand): def dump(self): super().dump() if self.iova != 0: - chexdump(self.contents) + chexdump(self.contents, print_fn=self.log) class ISPT2HIOCommand(ISPCommand): """ Represents a command in IO_T2H channel """ @@ -136,7 +137,7 @@ class ISPT2HIOCommand(ISPCommand): def dump(self): super().dump() if self.iova != 0: - chexdump(self.contents) + chexdump(self.contents, print_fn=self.log) class ISPSharedMallocCommand(ISPCommand): """ Represents a command in SHAREDMALLOC channel