Fixing breakpoints.

2015-09-21 21:10:57 -07:00
parent 5d033f9cb3
commit 4c8634bc31
7 changed files with 42 additions and 32 deletions
--- a/src/xenia/cpu/stack_walker_win.cc
+++ b/src/xenia/cpu/stack_walker_win.cc
@@ -239,11 +239,8 @@ class Win32StackWalker : public StackWalker {
          // displacement in x64 from the JIT'ed code start to the PC.
          if (function->is_guest()) {
            auto guest_function = static_cast<GuestFunction*>(function);
-            uint32_t host_displacement =
-                uint32_t(frame.host_pc) -
-                uint32_t(uint64_t(guest_function->machine_code()));
-            auto entry = guest_function->LookupCodeOffset(host_displacement);
-            frame.guest_pc = entry->source_offset;
+            frame.guest_pc =
+                guest_function->MapMachineCodeToGuestAddress(frame.host_pc);
          }
        } else {
          frame.guest_symbol.function = nullptr;