Apply the peripheral read/write debug decorator

Author: cla7aye15I4nd

qiling/hw/char/stm32f4xx_usart.py

@@ -59,9 +59,8 @@ def __init__(self, ql, label, intn=None):
         self.recv_buf = bytearray()
         self.send_buf = bytearray()
 
+    @QlPeripheral.read_debug
     def read(self, offset: int, size: int) -> int:
-        self.ql.log.debug(f'[{self.label.upper()}] [R] {self.find_field(offset, size):10s}')
-
         buf = ctypes.create_string_buffer(size)
         ctypes.memmove(buf, ctypes.addressof(self.usart) + offset, size)
         retval = int.from_bytes(buf.raw, byteorder='little')
@@ -71,9 +70,8 @@ def read(self, offset: int, size: int) -> int:
 
         return retval
 
-    def write(self, offset: int, size: int, value: int):
-        self.ql.log.debug(f'[{self.label.upper()}] [W] {self.find_field(offset, size):10s} = {hex(value)}')
-
+    @QlPeripheral.write_debug
+    def write(self, offset: int, size: int, value: int):        
         if offset == self.struct.SR.offset:
             self.usart.SR &= value | USART_SR.CTS | USART_SR.LBD | USART_SR.TC | USART_SR.RXNE
 
@@ -94,8 +92,7 @@ def transfer(self):
             data = self.usart.DR
 
             self.usart.SR |= USART_SR.TXE            
-            self.send_buf.append(data)            
-            self.ql.log.debug(f'[{self.label}] Send {repr(chr(data))}')
+            self.send_buf.append(data)
 
         if not (self.usart.SR & USART_SR.RXNE): 
             # TXE bit must had been cleared

qiling/hw/gpio/stm32f4xx_gpio.py

@@ -64,6 +64,7 @@ def __init__(self, ql, label,
             PUPDR   = pupdr_reset,
         )        
 
+    @QlPeripheral.read_debug
     def read(self, offset: int, size: int) -> int:
         if offset == self.struct.BSRR.offset:
             return 0x00
@@ -72,6 +73,7 @@ def read(self, offset: int, size: int) -> int:
         ctypes.memmove(buf, ctypes.addressof(self.gpio) + offset, size)
         return int.from_bytes(buf.raw, byteorder='little')
 
+    @QlPeripheral.write_debug
     def write(self, offset: int, size: int, value: int):
         if offset == self.struct.IDR.offset:
             return

qiling/hw/i2c/stm32f4xx_i2c.py

@@ -62,13 +62,13 @@ def reset(self):
 			TRISE = 0x0002
 		)
 
-	def read(self, offset: int, size: int) -> int:
-		self.ql.log.debug(f'[{self.label.upper()}] [R] {self.find_field(offset, size):10s}')
-
+	@QlPeripheral.read_debug
+	def read(self, offset: int, size: int) -> int:		
 		buf = ctypes.create_string_buffer(size)
 		ctypes.memmove(buf, ctypes.addressof(self.i2c) + offset, size)
 		return int.from_bytes(buf.raw, byteorder='little')
 
+	@QlPeripheral.write_debug
 	def write(self, offset: int, size: int, value: int):
 		self.ql.log.debug(f'[{self.label.upper()}] [W] {self.find_field(offset, size):10s} = {hex(value)}')
 

qiling/hw/intc/cm4_nvic.py

@@ -113,11 +113,13 @@ def step(self):
             self.clear_pending(IRQn)
             self.ql.arch.handle_interupt(IRQn)            
 
+    @QlPeripheral.read_debug
     def read(self, offset: int, size: int) -> int:
         buf = ctypes.create_string_buffer(size)
         ctypes.memmove(buf, ctypes.addressof(self.nvic) + offset, size)
         return int.from_bytes(buf.raw, byteorder='little')
 
+    @QlPeripheral.write_debug
     def write(self, offset: int, size: int, value: int):
         def write_byte(ofs, byte):
             for var, func in self.triggers:

qiling/hw/misc/cm4_scb.py

@@ -117,11 +117,13 @@ def get_pending(self, IRQn):
     def get_priority(self, IRQn):
         return self.scb.SHP[(IRQn & 0xf) - 4]
 
+    @QlPeripheral.read_debug
     def read(self, offset: int, size: int) -> int:
         buf = ctypes.create_string_buffer(size)
         ctypes.memmove(buf, ctypes.addressof(self.scb) + offset, size)
         return int.from_bytes(buf.raw, byteorder='little')
 
+    @QlPeripheral.write_debug
     def write(self, offset: int, size: int, value: int):
         if offset == self.struct.ICSR.offset:
             if (value >> 28) & 1:

qiling/hw/misc/stm32f4xx_rcc.py

@@ -79,16 +79,14 @@ def __init__(self, ql, label, intn=None):
 
 		self.intn = intn
 
-	def read(self, offset: int, size: int) -> int:
-		self.ql.log.debug(f'[{self.label.upper()}] [R] {self.find_field(offset, size):10s}')
-		
+	@QlPeripheral.read_debug
+	def read(self, offset: int, size: int) -> int:		
 		buf = ctypes.create_string_buffer(size)
 		ctypes.memmove(buf, ctypes.addressof(self.rcc) + offset, size)
 		return int.from_bytes(buf.raw, byteorder='little')
 
+	@QlPeripheral.write_debug
 	def write(self, offset: int, size: int, value: int):
-		self.ql.log.debug(f'[{self.label.upper()}] [W] {self.find_field(offset, size):10s} = {hex(value)}')
-
 		if offset == self.struct.CR.offset:
 			value = (self.rcc.CR & RCC_CR.RO_MASK) | (value & RCC_CR.RW_MASK)
 		elif offset == self.struct.CFGR.offset:

qiling/hw/spi/stm32f4xx_spi.py

@@ -64,9 +64,8 @@ def __init__(self, ql, label, intn=None):
 
         self.intn = intn
 
+    @QlPeripheral.read_debug
     def read(self, offset: int, size: int) -> int:
-        self.ql.log.debug(f'[{self.label.upper()}] [R] {self.find_field(offset, size):10s}')
-
         if self.in_field(self.struct.DR, offset, size):
             self.spi.SR &= ~SPI_SR.RXNE
 
@@ -76,9 +75,8 @@ def read(self, offset: int, size: int) -> int:
 
         return data
 
+    @QlPeripheral.write_debug
     def write(self, offset: int, size: int, value: int):
-        self.ql.log.debug(f'[{self.label.upper()}] [W] {self.find_field(offset, size):10s} = {hex(value)}')
-
         if offset in [self.struct.SR.offset, self.struct.RXCRCR.offset, self.struct.TXCRCR.offset]:
             return
 

qiling/hw/timer/cm4_systick.py

@@ -44,19 +44,17 @@ def step(self):
         else:
             self.systick.VAL -= self.ratio
 
-    def read(self, offset: int, size: int) -> int:       
-        self.ql.log.debug(f'[{self.label.upper()}] [R] {self.find_field(offset, size):10s}')
-
+    @QlPeripheral.read_debug
+    def read(self, offset: int, size: int) -> int:
         buf = ctypes.create_string_buffer(size)
         ctypes.memmove(buf, ctypes.addressof(self.systick) + offset, size)
 
         if offset == self.struct.CTRL.offset:
             self.systick.CTRL &= ~SYSTICK_CTRL.COUNTFLAG        
         return int.from_bytes(buf.raw, byteorder='little')
 
+    @QlPeripheral.write_debug
     def write(self, offset: int, size: int, value: int):
-        self.ql.log.debug(f'[{self.label.upper()}] [W] {self.find_field(offset, size):10s} = {hex(value)}')
-        
         # ignore the reserved bit
         if offset == self.struct.CTRL.offset:
             value &= SYSTICK_CTRL.MASK

qiling/hw/timer/stm32f4xx_rtc.py

@@ -91,11 +91,13 @@ def __init__(self, ql, label, wkup_intn=None, alarm_intn=None):
         self.wkup_intn = wkup_intn
         self.alarm_intn = alarm_intn
 
+    @QlPeripheral.read_debug
     def read(self, offset: int, size: int) -> int:
         buf = ctypes.create_string_buffer(size)
         ctypes.memmove(buf, ctypes.addressof(self.rtc) + offset, size)
         return int.from_bytes(buf.raw, byteorder='little')
 
+    @QlPeripheral.write_debug
     def write(self, offset: int, size: int, value: int):
         data = (value).to_bytes(size, 'little')
         ctypes.memmove(ctypes.addressof(self.rtc) + offset, data, size)