Merge branch 'qilingframework:dev' into dev

Author: cla7aye15I4nd

ChangeLog

@@ -2,16 +2,20 @@ This file details the changelog of Qiling Framework.
 
 ------------------------------------
 [Version 1.4.1]: Nov Xth, 2021
+
 - Clean and tidy up core utils module (WIP)
 - Clean and tidy up path module
 - Other small adjustments so support the above changes
 - Rearranged the code to be more Pythonic and more readable
 - Removed unused members and methods
 - Added typing annotations
+- Added ql.platform_os and ql.platform_arch
+- update ql.os.posix.const_mapping with more os/arch match
 
 
 ------------------------------------
 [Version 1.4.0]: Oct 20th, 2021
+
 - Added MCU Engine
 - Bug fix for qdb
 - Bug fix for debugger

qiling/core.py

@@ -34,7 +34,6 @@ def __init__(
             rootfs=None,
             env=None,
             code=None,
-            shellcoder=None,
             ostype=None,
             archtype=None,
             bigendian=False,
@@ -67,9 +66,9 @@ def __init__(
         self._rootfs = rootfs
         self._env = env if env else {}
         self._code = code
-        self._shellcoder = shellcoder
         self._ostype = ostype
         self._archtype = archtype
+        self._noneos = None,
         self._archendian = None
         self._archbit = None
         self._pointersize = None
@@ -82,7 +81,8 @@ def __init__(
         self._log_override = log_override
         self._log_plain = log_plain
         self._filter = filter
-        self._platform = ostype_convert(platform.system().lower())
+        self._platform_os = ostype_convert(platform.system().lower())
+        self._platform_arch = arch_convert(platform.machine().lower())
         self._internal_exception = None
         self._uc = None
         self._stop_options = QlStopOptions(stackpointer=stop_on_stackpointer, exit_trap=stop_on_exit_trap)
@@ -114,10 +114,6 @@ def __init__(
         # Shellcode? #
         ##############
 
-        # for Legacy
-        if self._shellcoder:
-            self._code = self._shellcoder
-
         if self._code or (self._archtype and type(self._archtype) == str):
             if (self._archtype and type(self._archtype) == str):
                 self._archtype= arch_convert(self._archtype.lower())
@@ -476,20 +472,36 @@ def targetname(self) -> str:
         return self._targetname
 
     @property
-    def platform(self):
-        """ Specify current platform where Qiling runs on.
+    def platform_os(self):
+        """ Specify current platform os where Qiling runs on.
+
+            Type: int
+            Values: All possible values from platform.system()
+        """
+        return self._platform_os
+
+    @platform_os.setter
+    def platform_os(self, value):
+        if type(value) is str:
+            self._platform_os = ostype_convert(value.lower())
+        else:
+            self._platform_os = value
+
+    @property
+    def platform_arch(self):
+        """ Specify current platform arch where Qiling runs on.
 
             Type: int
             Values: All possible values from platform.system()
         """
-        return self._platform
+        return self._platform_arch
 
-    @platform.setter
-    def platform(self, value):
+    @platform_arch.setter
+    def platform_arch(self, value):
         if type(value) is str:
-            self._platform = ostype_convert(value.lower())
+            self._platform_arch = arch_convert(value.lower())
         else:
-            self._platform = value
+            self._platform_arch = value
 
     @property
     def internal_exception(self) -> Exception:

qiling/os/linux/const.py

@@ -107,7 +107,7 @@ def convert_for_native_os(rootfs: Union[str, Path], cwd: str, path: str) -> Path
 
     def convert_path(self, rootfs: Union[str, Path], cwd: str, path: str) -> Path:
         emulated_os = self.ql.ostype
-        hosting_os = self.ql.platform
+        hosting_os = self.ql.platform_os
 
         # emulated os and hosting platform are of the same type
         if  (emulated_os == hosting_os) or (emulated_os in QL_OS_POSIX and hosting_os in QL_OS_POSIX):