revise command do_start

Author: ucgJhe

qiling/debugger/qdb/qdb.py

@@ -33,9 +33,22 @@ def __init__(self: QlQdb, ql: Qiling, init_hook: str = "", rr: bool = False) ->
 
         super().__init__()
 
+        self.dbg_hook(init_hook)
+
+    def dbg_hook(self: QlQdb, init_hook: str):
+
+        # self.ql.loader.entry_point  # ld.so
+        # self.ql.loader.elf_entry    # .text of binary
+
+        if init_hook:
+            init_hook = parse_int(init_hook)
+
+            self.set_breakpoint(init_hook, is_temp=True)
+
         self.cur_addr = self.ql.loader.entry_point
+        self._init_state = self.ql.save()
 
-        self.do_start()
+        self.do_context()
         self.interactive()
 
     @property
@@ -72,6 +85,7 @@ def _bp_handler(self: QlQdb, *args) -> None:
                 print(f"{color.CYAN}[+] hit breakpoint at 0x{self.cur_addr:08x}{color.END}")
                 bp.hitted = True
 
+            self.ql.stop()
             self.do_context()
 
     def _save(self: QlQdb, *args) -> None:
@@ -147,7 +161,7 @@ def emptyline(self: QlQdb, *args) -> None:
 
     def do_run(self: QlQdb, *args) -> None:
         """
-        launching qiling instance
+        launch qiling instance
         """
 
         self._run()
@@ -173,7 +187,7 @@ def do_backward(self: QlQdb, *args) -> None:
             self._restore()
             self.do_context()
 
-    def do_step(self: QlQdb, *args) -> Optional[bool, None]:
+    def do_step(self: QlQdb, *args) -> Optional[bool]:
         """
         execute one instruction at a time
         """
@@ -202,7 +216,7 @@ def do_step(self: QlQdb, *args) -> Optional[bool, None]:
 
     def set_breakpoint(self: QlQdb, address: int, is_temp: bool = False) -> None:
         """
-        internal function for placing breakpoints
+        internal function for placing breakpoint
         """
 
         bp = TempBreakpoint(address) if is_temp else Breakpoint(address)
@@ -221,14 +235,10 @@ def del_breakpoint(self: QlQdb, bp: Union[Breakpoint, TempBreakpoint]) -> None:
 
     def do_start(self: QlQdb, address: str = "", *args) -> None:
         """
-        move current context to ql.loader.entry_point
+        restore qiling instance context to initial state
         """
 
-        self.cur_addr = self.ql.loader.entry_point  # ld.so
-        # self.cur_addr = self.ql.loader.elf_entry    # .text of binary
-
-        # need a proper method for this
-        # self.ql.restore(self._init_state)
+        self.ql.restore(self._init_state)
 
         self.do_context()