duplicate logic to be abe to use logging functions

0vercl0k · May 25, 2024 · bd38fb5 · bd38fb5
1 parent c3c1c82
commit bd38fb5
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 31 deletions.
diff --git a/src/wtf/kvm_backend.cc b/src/wtf/kvm_backend.cc
@@ -2158,8 +2158,10 @@ bool KvmBackend_t::EnableSingleStep(CpuState_t &CpuState) {
       return false;
     }
 
-    if (!SetBreakpoint(*Handler,
-                       [](Backend_t *Backend) { Backend->TrapFlag(true); })) {
+    if (!SetBreakpoint(*Handler, [](Backend_t *Backend) {
+          KvmDebugPrint("Hit IDT breakpoint, turning on TF\n");
+          Backend->TrapFlag(true);
+        })) {
       fmt::print("Failed to set breakpoint on IDT[{}]", Idx);
       return false;
     }

diff --git a/src/wtf/utils.cc b/src/wtf/utils.cc
@@ -513,22 +513,3 @@ ReadIDTEntryHandler(const Backend_t &Backend, const CpuState_t &CpuState,
 
   return Entry.Handler();
 }
-
-[[nodiscard]] bool BreakOnIDTEntries(Backend_t &Backend,
-                                     const CpuState_t &CpuState) {
-  for (size_t Idx = 0; Idx < 256; Idx++) {
-    const auto Handler = ReadIDTEntryHandler(Backend, CpuState, Idx);
-    if (!Handler) {
-      fmt::print("ReadIDTEntryHandler failed\n");
-      return false;
-    }
-
-    if (!Backend.SetBreakpoint(
-            *Handler, [](Backend_t *Backend) { Backend->TrapFlag(true); })) {
-      fmt::print("Failed to set breakpoint on IDT[{}]\n", Idx);
-      return false;
-    }
-  }
-
-  return true;
-}
diff --git a/src/wtf/utils.h b/src/wtf/utils.h
@@ -268,10 +268,3 @@ SaveFile(const fs::path &Path, const uint8_t *Buffer, const size_t BufferSize);
 [[nodiscard]] std::optional<Gva_t>
 ReadIDTEntryHandler(const Backend_t &Backend, const CpuState_t &CpuState,
                     const size_t Vector);
-
-//
-// Set a breakpoint on every IDT handlers that turn on TF.
-//
-
-[[nodiscard]] bool BreakOnIDTEntries(Backend_t &Backend,
-                                     const CpuState_t &CpuState);
diff --git a/src/wtf/whv_backend.cc b/src/wtf/whv_backend.cc
@@ -1430,9 +1430,20 @@ bool WhvBackend_t::EnableSingleStep(CpuState_t &CpuState) {
   // interrupts/exceptions.
   //
 
-  if (!BreakOnIDTEntries(*this, CpuState)) {
-    fmt::print("Failed to BreakOnIDTEntries\n");
-    return false;
+  for (size_t Idx = 0; Idx < 256; Idx++) {
+    const auto Handler = ReadIDTEntryHandler(*this, CpuState, Idx);
+    if (!Handler) {
+      fmt::print("ReadIDTEntryHandler failed\n");
+      return false;
+    }
+
+    if (!SetBreakpoint(*Handler, [](Backend_t *Backend) {
+          WhvDebugPrint("Hit IDT breakpoint, turning on TF\n");
+          Backend->TrapFlag(true);
+        })) {
+      fmt::print("Failed to set breakpoint on IDT[{}]", Idx);
+      return false;
+    }
   }
 
   return true;