update and adapt the code

Author: cq674350529

qiling/const.py

@@ -65,8 +65,6 @@ class QL_INTERCEPT(IntEnum):
 
 QL_OS_BAREMETAL   = (QL_OS.MCU,)
 QL_OS_INTERPRETER = (QL_OS.EVM,)
-QL_OS_ALL         = QL_OS_POSIX + QL_OS_NONPID + (QL_OS.WINDOWS,)
-QL_OS_BARE_RTOS   = (QL_OS.BARE,)
 
 QL_HOOK_BLOCK = 0b0001
 QL_CALL_BLOCK = 0b0010
@@ -92,7 +90,7 @@ def __reverse_enum(e: Type[Enum]) -> Mapping[str, Any]:
     QL_OS.DOS     : "DOS",
     QL_OS.EVM     : "EVM",
     QL_OS.MCU     : "MCU",
-    QL_OS.BARE    : "BLOB"
+    QL_OS.BARE    : "BARE"
 }
 
 arch_os_map = {

qiling/core.py

@@ -19,7 +19,7 @@
     from .hw.hw import QlHwManager
     from .loader.loader import QlLoader
 
-from .const import QL_ARCH_ENDIAN, QL_ENDIAN, QL_VERBOSE, QL_OS_INTERPRETER, QL_OS_BAREMETAL, QL_OS_ALL, QL_OS_BARE_RTOS
+from .const import QL_ARCH_ENDIAN, QL_ENDIAN, QL_VERBOSE, QL_OS_INTERPRETER, QL_OS_BAREMETAL
 from .exception import QlErrorFileNotFound, QlErrorArch, QlErrorOsType
 from .utils import *
 from .core_struct import QlCoreStructs
@@ -194,24 +194,19 @@ def __init__(
         ##############
         # Components #
         ##############
-        if self.gpos or self.baremetal or self.blob:
+        if not self.interpreter:
             self._mem = component_setup("os", "memory", self)
             self._reg = component_setup("arch", "register", self)
-
-            if self.baremetal:   
-                self._hw  = component_setup("hw", "hw", self)
+              
 
         self._arch = arch_setup(self.archtype, self)
 
         # Once we finish setting up arch layer, we can init QlCoreHooks.
-        self.uc = self.arch.init_uc
-        QlCoreHooks.__init__(self, self.uc)
+        if not self.interpreter:
+            self.uc = self.arch.init_uc
+            QlCoreHooks.__init__(self, self.uc)
 
-        # Setup Outpt
-        if self.gpos or self.baremetal:
             self.arch.utils.setup_output()
-
-        if self.gpos:
             self._os = os_setup(self.archtype, self.ostype, self)
 
             if stdin is not None:
@@ -225,10 +220,7 @@ def __init__(
 
         # Run the loader
         self.loader.run()
-
-        if self.gpos:
-            # Add extra guard options when configured to do so
-            self._init_stop_guard()    
+        self._init_stop_guard()    
 
     #####################
     # Qiling Components #
@@ -481,24 +473,6 @@ def baremetal(self) -> bool:
         """
         return self.ostype in QL_OS_BAREMETAL
 
-    @property
-    def gpos(self) -> bool:
-        """ General purpose OS
-            - Windows, Linux, MacOS and etc
-
-            Type: bool
-        """
-        return self.ostype in QL_OS_ALL
-
-    @property
-    def blob(self) -> bool:
-        """  Static linked bare binary type
-            - U-Boot, VxWorks, eCos
-
-            Type: bool
-        """
-        return self.ostype in QL_OS_BARE_RTOS
-
     @property
     def platform_os(self):
         """ Specify current platform os where Qiling runs on.

qiling/debugger/gdb/gdb.py

@@ -54,7 +54,7 @@ def __init__(self, ql: Qiling, ip: str = '127.0.01', port: int = 9999):
         if self.ql.baremetal:
             load_address = self.ql.loader.load_address
             exit_point = load_address + os.path.getsize(ql.path)
-        elif self.ql.code and ql.gpos:
+        elif self.ql.code:
             load_address = self.ql.os.entry_point
             exit_point = load_address + len(ql.code)
         else:

qiling/loader/bare.py

@@ -0,0 +1,28 @@
+#!/usr/bin/env python3
+#
+# Cross Platform and Multi Architecture Advanced Binary Emulation Framework
+#
+
+from qiling import Qiling
+from qiling.loader.loader import QlLoader
+from qiling.os.memory import QlMemoryHeap
+
+class QlLoaderBARE(QlLoader):
+    def __init__(self, ql: Qiling):
+        super().__init__(ql)
+
+        self.load_address = 0
+
+    def run(self):
+        self.load_address = self.ql.os.entry_point      # for consistency
+
+        self.ql.mem.map(self.ql.os.entry_point, self.ql.os.code_ram_size, info="[code]")
+        self.ql.mem.write(self.ql.os.entry_point, self.ql.code)
+
+        heap_address = self.ql.os.entry_point + self.ql.os.code_ram_size
+        heap_size = int(self.ql.os.profile.get("CODE", "heap_size"), 16)
+        self.ql.os.heap = QlMemoryHeap(self.ql, heap_address, heap_address + heap_size)
+
+        self.ql.reg.arch_sp = heap_address - 0x1000
+
+        return

qiling/loader/blob.py

@@ -10,10 +10,10 @@
 
 from qiling.const import *
 from qiling.core import Qiling
+from qiling.utils import component_setup
 
 from .loader import QlLoader
 
-
 class IhexParser:
     def __init__(self, path):
         self.pc   = None
@@ -60,7 +60,7 @@ def parse_line(self, line):
 class QlLoaderMCU(QlLoader):
     def __init__(self, ql:Qiling):
         super(QlLoaderMCU, self).__init__(ql)   
-        
+        self.ql._hw  = component_setup("hw", "hw", self.ql)
         self.load_address = 0        
         self.path = self.argv[0]
         self.filetype = self.guess_filetype()

qiling/loader/mcu.py

@@ -0,0 +1,43 @@
+#!/usr/bin/env python3
+#
+# Cross Platform and Multi Architecture Advanced Binary Emulation Framework
+#
+
+from qiling import Qiling
+from qiling.cc import QlCC, intel, arm, mips
+from qiling.const import QL_ARCH
+from qiling.os.fcall import QlFunctionCall
+from qiling.os.os import QlOs
+
+class QlOsBare(QlOs):
+    """ QlOsBare for bare barines.
+
+    For bare binary such as u-boot, it's ready to be mapped and executed directly,
+    where there is(may be) no concept of os? Currently, some functionalities such as
+    resolve_fcall_params(), heap or add_fs_mapper() are based on os. To keep the
+    consistence of api usage, QlOsBare is introduced and placed at its loader temporarily.
+    """
+    def __init__(self, ql: Qiling):
+        super(QlOsBare, self).__init__(ql)
+
+        self.ql = ql
+
+        cc: QlCC = {
+            QL_ARCH.X86   : intel.cdecl,
+            QL_ARCH.X8664 : intel.amd64,
+            QL_ARCH.ARM   : arm.aarch32,
+            QL_ARCH.ARM64 : arm.aarch64,
+            QL_ARCH.MIPS  : mips.mipso32
+        }[ql.archtype](ql)
+
+        self.fcall = QlFunctionCall(ql, cc)
+
+    def run(self):
+        if self.ql.entry_point:
+            self.entry_point = self.ql.entry_point
+
+        self.exit_point = self.ql.loader.load_address + len(self.ql.code)
+        if self.ql.exit_point:
+            self.exit_point = self.ql.exit_point
+
+        self.ql.emu_start(self.entry_point, self.exit_point, self.ql.timeout, self.ql.count)

qiling/os/bare/bare.py

@@ -0,0 +1,5 @@
+#!/usr/bin/env python3
+# 
+# Cross Platform and Multi Architecture Advanced Binary Emulation Framework
+#
+

qiling/os/mcu/const.py

@@ -0,0 +1,15 @@
+#!/usr/bin/env python3
+# 
+# Cross Platform and Multi Architecture Advanced Binary Emulation Framework
+#
+
+from unicorn import UcError
+
+from qiling.os.os import QlOs
+
+class QlOsMcu(QlOs):
+    def __init__(self, ql):
+        super(QlOsMcu, self).__init__(ql)
+
+    def run(self):
+        pass

qiling/os/mcu/mcu.py

@@ -35,7 +35,7 @@ def __init__(self, ql: Qiling, resolvers: Mapping[Any, Resolver] = {}):
         self.child_processes = False
         self.thread_management = None
         self.profile = self.ql.profile
-        self.path = QlPathManager(ql, self.ql.profile.get("MISC", "current_path"))
+        self.path = None if self.ql.baremetal else QlPathManager(ql, self.ql.profile.get("MISC", "current_path"))
         self.exit_code = 0
 
         self.user_defined_api = {