Skip to content

Commit 58dff3e

Browse files
feilongjiangRealFYang
authored andcommitted
8278832: riscv: Inconsistency of Java frame offset definition in jdk.hotspot.agent
Reviewed-by: yadongwang, yzhu, fyang
1 parent 3a9a1eb commit 58dff3e

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/riscv64/RISCV64Frame.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@ public class RISCV64Frame extends Frame {
4747
}
4848

4949
// Java frames
50-
private static final int LINK_OFFSET = 0;
51-
private static final int RETURN_ADDR_OFFSET = 1;
52-
private static final int SENDER_SP_OFFSET = 2;
50+
private static final int LINK_OFFSET = -2;
51+
private static final int RETURN_ADDR_OFFSET = -1;
52+
private static final int SENDER_SP_OFFSET = 0;
5353

5454
// Interpreter frames
55-
private static final int INTERPRETER_FRAME_SENDER_SP_OFFSET = -1;
55+
private static final int INTERPRETER_FRAME_SENDER_SP_OFFSET = -3;
5656
private static final int INTERPRETER_FRAME_LAST_SP_OFFSET = INTERPRETER_FRAME_SENDER_SP_OFFSET - 1;
5757
private static final int INTERPRETER_FRAME_METHOD_OFFSET = INTERPRETER_FRAME_LAST_SP_OFFSET - 1;
5858
private static int INTERPRETER_FRAME_MDX_OFFSET; // Non-core builds only
@@ -66,7 +66,7 @@ public class RISCV64Frame extends Frame {
6666
private static int INTERPRETER_FRAME_MONITOR_BLOCK_BOTTOM_OFFSET;
6767

6868
// Entry frames
69-
private static int ENTRY_FRAME_CALL_WRAPPER_OFFSET = -8;
69+
private static int ENTRY_FRAME_CALL_WRAPPER_OFFSET = -10;
7070

7171
// Native frames
7272
private static final int NATIVE_FRAME_INITIAL_PARAM_OFFSET = 2;

0 commit comments

Comments
 (0)