Opportunistic adjustments to mem.read_ptr

Author: elicn

qiling/os/memory.py

@@ -288,6 +288,7 @@ def read(self, addr: int, size: int) -> bytearray:
 
     def read_ptr(self, addr: int, size: int=None) -> int:
         """Read an integer value from a memory address.
+        Bytes read will be unpacked using emulated architecture properties.
 
         Args:
             addr: memory address to read
@@ -306,10 +307,10 @@ def read_ptr(self, addr: int, size: int=None) -> int:
             8 : self.ql.unpack64
         }.get(size)
 
-        if __unpack:
-            return __unpack(self.read(addr, size))
+        if __unpack is None:
+            raise QlErrorStructConversion(f"Unsupported pointer size: {size}")
 
-        raise QlErrorStructConversion(f"Unsupported pointer size: {size}")
+        return __unpack(self.read(addr, size))
 
     def write(self, addr: int, data: bytes) -> None:
         """Write bytes to a memory.

qiling/os/qnx/syscall.py

@@ -107,7 +107,7 @@ def ql_syscall_sys_cpupage_get(ql:Qiling, index, *args, **kw):
         return ql.os.cpupage_addr
     # CPUPAGE_PLS
     elif index == 1:
-        return ql.unpack32(ql.mem.read(ql.os.cpupage_addr + 4, 4))
+        return ql.mem.read_ptr(ql.os.cpupage_addr + 4, 4)
     # CPUPAGE_SYSPAGE
     elif index == 2:
         return ql.os.syspage_addr

qiling/os/uefi/utils.py

@@ -67,7 +67,7 @@ def ptr_read8(ql: Qiling, addr: int) -> int:
 	"""Read BYTE data from a pointer
 	"""
 
-	return ql.unpack8(ql.mem.read(addr, 1))
+	return ql.mem.read_ptr(addr, 1)
 
 def ptr_write8(ql: Qiling, addr: int, val: int) -> None:
 	"""Write BYTE data to a pointer
@@ -79,7 +79,7 @@ def ptr_read16(ql: Qiling, addr: int) -> int:
 	"""Read WORD data from a pointer
 	"""
 
-	return ql.unpack16(ql.mem.read(addr, 2))
+	return ql.mem.read_ptr(addr, 2)
 
 def ptr_write16(ql: Qiling, addr: int, val: int) -> None:
 	"""Write WORD data to a pointer
@@ -91,7 +91,7 @@ def ptr_read32(ql: Qiling, addr: int) -> int:
 	"""Read DWORD data from a pointer
 	"""
 
-	return ql.unpack32(ql.mem.read(addr, 4))
+	return ql.mem.read_ptr(addr, 4)
 
 def ptr_write32(ql: Qiling, addr: int, val: int) -> None:
 	"""Write DWORD data to a pointer
@@ -103,7 +103,7 @@ def ptr_read64(ql: Qiling, addr: int) -> int:
 	"""Read QWORD data from a pointer
 	"""
 
-	return ql.unpack64(ql.mem.read(addr, 8))
+	return ql.mem.read_ptr(addr, 8)
 
 def ptr_write64(ql: Qiling, addr: int, val: int) -> None:
 	"""Write QWORD data to a pointer