minor core.py cleanup

Author: xwings

qiling/core.py

@@ -125,29 +125,24 @@ def __init__(
                 self._ostype = ostype_convert(self._ostype.lower())
 
             if self._code == None:
-                self._code = "qiling"
+                self._code = "qilingcode"
             if self._argv is None:
                 self._argv = ["qilingcode"]
             if self._rootfs is None:
                 self._rootfs = "."
 
         self._interpreter = True if self._archtype in (QL_ARCH_INTERPRETER) else False
         self._baremetal = True if self._archtype in (QL_ARCH_BAREMETAL) else False
+        self._path = (str(self._argv[0]))
+        self._targetname = ntpath.basename(self._argv[0])
 
         # file check
-        if self._code is None:
+        if (self._path and self._rootfs) and self._code == None:
             if not os.path.exists(str(self._argv[0])):
                 raise QlErrorFileNotFound("Target binary not found: %s" %(self._argv[0]))
             if not os.path.exists(self._rootfs):
                 raise QlErrorFileNotFound("Target rootfs not found")
 
-        self._path = (str(self._argv[0]))
-        self._targetname = ntpath.basename(self._argv[0])
-
-        ##########
-        # Loader #
-        ##########
-        if self._code is None:
             guessed_archtype, guessed_ostype, guessed_archendian = ql_guess_emu_env(self._path)
             if self._ostype is None:
                 self._ostype = guessed_ostype
@@ -162,6 +157,10 @@ def __init__(
             if not ql_is_valid_arch(self._archtype):
                 raise QlErrorArch("Invalid Arch %s" % self._archtype)
 
+        ##########
+        # Loader #
+        ##########
+
         self._loader = loader_setup(self._ostype, self)
 
         #####################
@@ -736,33 +735,25 @@ def run(self, begin=None, end=None, timeout=0, count=0, code = None):
         if self._debugger != False and self._debugger != None:
             self._debugger = debugger_setup(self._debugger, self)
 
-        if not self.interpreter:
-            if not self.baremetal:
-                self.write_exit_trap()
-                # patch binary
-                self.__enable_bin_patch()
-
-                # emulate the binary
-                self.os.run()
-
         if self.interpreter:
-            if code == None:
-                return self.arch.run(self._code)
-            else:
-                return self.arch.run(code) 
-        
-        if self.baremetal:
+            return self.arch.run(code)
+        elif self.baremetal:
             self.__enable_bin_patch()
             if self.count <= 0:
                 self.count = -1
-            self.arch.run(count=self.count, end=self.exit_point)
-        
+            self.arch.run(count=self.count, end=self.exit_point)        
+        else:
+            self.write_exit_trap()
+            # patch binary
+            self.__enable_bin_patch()
+            # emulate the binary
+            self.os.run()
+
         # run debugger
         if self._debugger != False and self._debugger != None:
             self._debugger.run()
 
 
-
     # patch code to memory address
     def patch(self, addr, code, file_name=b''):
         if file_name == b'':

qiling/debugger/gdb/gdb.py

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