Merge branch 'dev' of https://github.com/cla7aye15I4nd/qiling into dev

Author: cla7aye15I4nd

.gitignore

@@ -36,4 +36,5 @@ test.file
 core
 *.perf
 tests/output.txt
+tests/testtest_*
 

Dockerfile

@@ -3,6 +3,7 @@ FROM python:3.8-slim AS builder
 LABEL maintainer="Kevin Foo <[email protected]>"
 
 ENV DEBIAN_FRONTEND=noninteractive
+ENV AM_I_IN_A_DOCKER_CONTAINER Yes
 
 RUN apt-get update \
   && apt-get -y upgrade \

qiling/const.py

@@ -51,17 +51,14 @@ class QL_INTERCEPT(IntEnum):
 
 QL_DEBUGGER_ALL = (QL_DEBUGGER.IDAPRO, QL_DEBUGGER.GDB, QL_DEBUGGER.QDB)
 
-QL_ARCH_MCU32  = (QL_ARCH.CORTEX_M,)
-QL_ARCH_MCU    = QL_ARCH_MCU32
-
 QL_ARCH_ENDIAN = (QL_ARCH.MIPS, QL_ARCH.ARM)
 QL_ARCH_1BIT   = (QL_ARCH.EVM,)
 QL_ARCH_16BIT  = (QL_ARCH.A8086,)
-QL_ARCH_32BIT  = (QL_ARCH.ARM, QL_ARCH.ARM_THUMB, QL_ARCH.MIPS, QL_ARCH.X86) + QL_ARCH_MCU32
+QL_ARCH_32BIT  = (QL_ARCH.ARM, QL_ARCH.ARM_THUMB, QL_ARCH.MIPS, QL_ARCH.X86, QL_ARCH.CORTEX_M)
 QL_ARCH_64BIT  = (QL_ARCH.ARM64, QL_ARCH.X8664)
 
 QL_OS_NONPID        = (QL_OS.DOS, QL_OS.UEFI)
-QL_ARCH_HARDWARE    = QL_ARCH_MCU
+QL_ARCH_HARDWARE    = (QL_ARCH.CORTEX_M,)
 QL_ARCH_NONEOS      = (QL_ARCH.EVM,)
 QL_OS_POSIX         = (QL_OS.LINUX, QL_OS.FREEBSD, QL_OS.MACOS, QL_OS.QNX)
 QL_OS_ALL           = QL_OS_POSIX + QL_OS_NONPID + (QL_OS.WINDOWS,)

qiling/core.py

@@ -609,7 +609,7 @@ def filter(self, ft):
     def uc(self) -> Uc:
         """ Raw uc instance.
 
-            Type: Uc
+            Type: Ucgit
         """
         return self._uc
 
@@ -864,7 +864,7 @@ def stop(self):
             self.arch.stop()
 
         else:
-            self.uc.emu_stop()        
+            self.uc.emu_stop()    
 
     # start emulation
     def emu_start(self, begin, end, timeout=0, count=0):

qiling/core_struct.py

@@ -30,7 +30,7 @@ def __init__(self, endian: QL_ENDIAN, bit: int):
 		self._fmt32s = f'{modifier}i'
 		self._fmt64  = f'{modifier}Q'
 		self._fmt64s = f'{modifier}q'
-
+		
 		handlers = {
 			64 : (self.pack64, self.pack64s, self.unpack64, self.unpack64s),
 			32 : (self.pack32, self.pack32s, self.unpack32, self.unpack32s),

qiling/hw/timer/stm32f4xx_rtc.py

@@ -5,11 +5,9 @@
 
 import time
 import ctypes
-from datetime import datetime
 
 from qiling.hw.peripheral import QlPeripheral
 from qiling.hw.const.stm32f4xx_rtc import RTC_TR, RTC_ISR
-from qiling.hw.utils.bcd import bcd2byte, byte2bcd
 
 
 class STM32F4xxRtc(QlPeripheral):
@@ -123,26 +121,6 @@ def write(self, offset: int, size: int, value: int):
         data = (value).to_bytes(size, 'little')
         ctypes.memmove(ctypes.addressof(self.rtc) + offset, data, size)    
 
-    def set_time(self, hour=0, minute=0, second=0, time_format=0):        
-        hour   = (byte2bcd(hour) << 16) & (RTC_TR.HT | RTC_TR.HU)
-        minute = (byte2bcd(minute) << 8) & (RTC_TR.MNT | RTC_TR.MNU)
-        second = byte2bcd(second) & (RTC_TR.ST | RTC_TR.SU)
-        time_format = (time_format << 16) & RTC_TR.PM
-
-        self.rtc.TR = hour | minute | second | time_format
-
-    def get_time(self, value):
-        hour   = (value & (RTC_TR.HT | RTC_TR.HU)) >> 16
-        minute = (value & (RTC_TR.MNT | RTC_TR.MNU)) >> 8
-        second = value & (RTC_TR.ST | RTC_TR.SU)
-        time_format = (value & RTC_TR.PM) >> 16
-
-        return hour, minute, second, time_format
-        
-    def increase(self):
-        self.calendar += 1
-        self.set_time(self.calendar.tm_hour, self.calendar.tm_min, self.calendar.tm_sec)
-
     def step(self):
         if self.rtc.ISR & RTC_ISR.INIT:
             self.rtc.ISR |= RTC_ISR.INITF

qiling/os/posix/syscall/unistd.py

@@ -687,6 +687,13 @@ def _type_mapping(ent):
             d_type = _type_mapping(result)
             d_reclen = n + n + 2 + len(d_name) + 1
 
+            # TODO: Dirty fix for X8664 MACOS 11.6 APFS
+            # For some reason MACOS return int value is 64bit
+            try:
+                packed_d_ino = (ql.pack(d_ino), n)
+            except: 
+                packed_d_ino = (ql.pack64(d_ino), n)
+
             if is_64:
                 fields = (
                     (ql.pack(d_ino), n),
@@ -697,7 +704,7 @@ def _type_mapping(ent):
                 )
             else:
                 fields = (
-                    (ql.pack(d_ino), n),
+                    packed_d_ino,
                     (ql.pack(d_off), n),
                     (ql.pack16(d_reclen), 2),
                     (d_name, len(d_name)),

tests/test_elf_multithread.py

@@ -34,6 +34,7 @@ def test_elf_linux_execve_x8664(self):
         del QL_TEST
         del ql
 
+
     def test_elf_linux_cloexec_x8664(self):
         with open('../examples/rootfs/x8664_linux/testfile', 'wb') as f:
             f.write(b'0123456789')
@@ -149,9 +150,6 @@ def check_write(ql, write_fd, write_buf, write_count, *args, **kw):
 
 
     def test_tcp_elf_linux_x86(self):
-        if platform.system() == "Darwin" and platform.machine() == "arm64":
-            return
-
         def check_write(ql, write_fd, write_buf, write_count, *args, **kw):
             try:
                 buf = ql.mem.read(write_buf, write_count)
@@ -170,9 +168,6 @@ def check_write(ql, write_fd, write_buf, write_count, *args, **kw):
 
 
     def test_tcp_elf_linux_x8664(self):
-        if platform.system() == "Darwin" and platform.machine() == "arm64":
-            return
-
         def check_write(ql, write_fd, write_buf, write_count, *args, **kw):
             try:
                 buf = ql.mem.read(write_buf, write_count)
@@ -242,9 +237,6 @@ def test_tcp_elf_linux_mips32el(self):
 
 
     def test_udp_elf_linux_x86(self):
-        if platform.system() == "Darwin" and platform.machine() == "arm64":
-            return
-
         def check_write(ql, write_fd, write_buf, write_count, *args, **kw):
             try:
                 buf = ql.mem.read(write_buf, write_count)
@@ -264,9 +256,6 @@ def check_write(ql, write_fd, write_buf, write_count, *args, **kw):
 
 
     def test_udp_elf_linux_x8664(self):
-        if platform.system() == "Darwin" and platform.machine() == "arm64":
-            return
-
         def check_write(ql, write_fd, write_buf, write_count, *args, **kw):
             try:
                 buf = ql.mem.read(write_buf, write_count)

tests/test_evm.py

@@ -1,11 +1,13 @@
 #!/usr/bin/env python3
 
-import platform, sys, unittest
+import os, platform, sys, unittest
 
 sys.path.append("..")
 from qiling import Qiling
 
-if sys.version_info.major == 3 and sys.version_info.minor == 9:
+SECRET_KEY = os.environ.get('AM_I_IN_A_DOCKER_CONTAINER', False)
+
+if SECRET_KEY:
     sys.exit(0)
 
 if platform.system() == "Darwin" and platform.machine() == "arm64":