Fix for Windows

Author: YaSuenag

src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgCDebugger.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -69,11 +69,11 @@ public LoadObject loadObjectContainingPC(Address pc) throws DebuggerException {
   public CFrame topFrameForThread(ThreadProxy thread) throws DebuggerException {
     if (dbg.getCPU().equals("amd64")) {
       AMD64ThreadContext context = (AMD64ThreadContext) thread.getContext();
-      Address rbp = context.getRegisterAsAddress(AMD64ThreadContext.RBP);
-      if (rbp == null) return null;
+      Address rsp = context.getRegisterAsAddress(AMD64ThreadContext.RSP);
+      if (rsp == null) return null;
       Address pc  = context.getRegisterAsAddress(AMD64ThreadContext.RIP);
       if (pc == null) return null;
-      return new WindowsAMD64CFrame(dbg, rbp, pc);
+      return new WindowsAMD64CFrame(dbg, rsp, pc);
     } else {
       // unsupported CPU!
       return null;

src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgDebugger.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -90,4 +90,10 @@ public long         readCInteger(long address, long numBytes, boolean isUnsigned
   //   public ThreadProxy getThreadForIdentifierAddress(Address addr);
 
   public int getAddressSize();
+
+  public Address getFrameBase(Address sp, Address pc);
+
+  public static record SenderRegs(Address nextSP, Address nextPC) {};
+
+  public SenderRegs getSenderRegs(Address sp, Address pc);
 }

src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgDebuggerLocal.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -229,6 +229,16 @@ public synchronized ClosestSymbol lookup(long address) {
     return lookupByAddress0(address);
   }
 
+  public synchronized Address getFrameBase(Address sp, Address pc) {
+    long rawAddr = getFrameBase0(sp.asLongValue(), pc.asLongValue());
+    return newAddress(rawAddr);
+  }
+
+  public synchronized SenderRegs getSenderRegs(Address sp, Address pc) {
+    long[] rawSenderRegs = getSenderRegs0(sp.asLongValue(), pc.asLongValue());
+    return rawSenderRegs == null ? null : new SenderRegs(newAddress(rawSenderRegs[0]), newAddress(rawSenderRegs[1]));
+  }
+
   /** From the Debugger interface */
   public MachineDescription getMachineDescription() {
     return machDesc;
@@ -646,6 +656,8 @@ private native byte[] readBytesFromProcess0(long address, long numBytes)
   private native String consoleExecuteCommand0(String cmd);
   private native long lookupByName0(String objName, String symName);
   private native ClosestSymbol lookupByAddress0(long address);
+  private native long getFrameBase0(long sp, long pc);
+  private native long[] getSenderRegs0(long sp, long pc);
 
   // helper called lookupByAddress0
   private ClosestSymbol createClosestSymbol(String symbol, long diff) {

src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windows/amd64/WindowsAMD64CFrame.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,49 +31,39 @@
 import sun.jvm.hotspot.debugger.windbg.*;
 
 public class WindowsAMD64CFrame extends BasicCFrame {
-  private Address rbp;
+  private Address rsp;
   private Address pc;
 
   private static final int ADDRESS_SIZE = 8;
 
   /** Constructor for topmost frame */
-  public WindowsAMD64CFrame(WindbgDebugger dbg, Address rbp, Address pc) {
+  public WindowsAMD64CFrame(WindbgDebugger dbg, Address rsp, Address pc) {
     super(dbg.getCDebugger());
-    this.rbp = rbp;
+    this.rsp = rsp;
     this.pc  = pc;
     this.dbg = dbg;
   }
 
   public CFrame sender(ThreadProxy thread) {
-    AMD64ThreadContext context = (AMD64ThreadContext) thread.getContext();
-    Address rsp = context.getRegisterAsAddress(AMD64ThreadContext.RSP);
-
-    if ( (rbp == null) || rbp.lessThan(rsp) ) {
+    WindbgDebugger.SenderRegs senderRegs = dbg.getSenderRegs(rsp, pc);
+    if (senderRegs == null) {
       return null;
     }
-
-    // Check alignment of rbp
-    if ( dbg.getAddressValue(rbp) % ADDRESS_SIZE != 0) {
-        return null;
-    }
-
-    Address nextRBP = rbp.getAddressAt( 0 * ADDRESS_SIZE);
-    if (nextRBP == null || nextRBP.lessThanOrEqual(rbp)) {
+    if (senderRegs.nextSP() == null || senderRegs.nextSP().lessThanOrEqual(rsp)) {
       return null;
     }
-    Address nextPC  = rbp.getAddressAt( 1 * ADDRESS_SIZE);
-    if (nextPC == null) {
+    if (senderRegs.nextPC() == null) {
       return null;
     }
-    return new WindowsAMD64CFrame(dbg, nextRBP, nextPC);
+    return new WindowsAMD64CFrame(dbg, senderRegs.nextSP(), senderRegs.nextPC());
   }
 
   public Address pc() {
     return pc;
   }
 
   public Address localVariableBase() {
-    return rbp;
+    return dbg.getFrameBase(rsp, pc);
   }
 
   private WindbgDebugger dbg;

src/jdk.hotspot.agent/windows/native/libsaproc/sawindbg.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -862,3 +862,50 @@ JNIEXPORT jobject JNICALL Java_sun_jvm_hotspot_debugger_windbg_WindbgDebuggerLoc
   CHECK_EXCEPTION_(0);
   return res;
 }
+
+/*
+ * Class:     sun_jvm_hotspot_debugger_windbg_WindbgDebuggerLocal
+ * Method:    getFrameBase0
+ * Signature: (JJ)J
+ */
+JNIEXPORT jlong JNICALL Java_sun_jvm_hotspot_debugger_windbg_WindbgDebuggerLocal_getFrameBase0
+    (JNIEnv *env, jobject obj, jlong sp, jlong pc) {
+  IDebugControl* ptrIDebugControl = (IDebugControl*)env->GetLongField(obj, ptrIDebugControl_ID);
+  CHECK_EXCEPTION_(0);
+
+  DEBUG_STACK_FRAME frames;
+  ULONG filled;
+  HRESULT result = ptrIDebugControl->GetStackTrace(0, sp, pc, &frames, 1, &filled);
+
+  return (result != S_OK || filled != 1) ? 0 : frames.FrameOffset;
+}
+
+/*
+ * Class:     sun_jvm_hotspot_debugger_windbg_WindbgDebuggerLocal
+ * Method:    getSenderRegs0
+ * Signature: (JJ)[J
+ */
+JNIEXPORT jlongArray JNICALL Java_sun_jvm_hotspot_debugger_windbg_WindbgDebuggerLocal_getSenderRegs0
+    (JNIEnv *env, jobject obj, jlong sp, jlong pc) {
+  IDebugControl* ptrIDebugControl = (IDebugControl*)env->GetLongField(obj, ptrIDebugControl_ID);
+  CHECK_EXCEPTION_(nullptr);
+
+  DEBUG_STACK_FRAME frames[2];
+  ULONG filled;
+  HRESULT dbg_result = ptrIDebugControl->GetStackTrace(0, sp, pc, frames, 2, &filled);
+  if (dbg_result != S_OK || filled != 2) {
+    return nullptr;
+  }
+
+  jlongArray result = env->NewLongArray(2);
+  CHECK_EXCEPTION_(nullptr);
+  if (result == nullptr) {
+    return nullptr;
+  }
+
+  jlong regs[] = { static_cast<jlong>(frames[1].StackOffset), static_cast<jlong>(frames[1].InstructionOffset) };
+  env->SetLongArrayRegion(result, 0, 2, regs);
+  CHECK_EXCEPTION_(nullptr);
+
+  return result;
+}