OpenJDK / bsd-port / jdk9 / hotspot
changeset 8756:9b286bec511b
Merge
| author | dsamersoff |
|---|---|
| date | Wed, 22 Jul 2015 18:01:11 +0000 |
| parents | 9bf59a3a88a1 c9f1ede09782 |
| children | c2134cfa02fd |
| files | |
| diffstat | 2 files changed, 17 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/agent/src/share/classes/sun/jvm/hotspot/debugger/aarch64/AARCH64ThreadContext.java Wed Jul 22 18:16:55 2015 +0200 +++ b/agent/src/share/classes/sun/jvm/hotspot/debugger/aarch64/AARCH64ThreadContext.java Wed Jul 22 18:01:11 2015 +0000 @@ -37,6 +37,21 @@ public abstract class AARCH64ThreadContext implements ThreadContext { // Taken from /usr/include/asm/sigcontext.h on Linux/AARCH64. + // /* + // * Signal context structure - contains all info to do with the state + // * before the signal handler was invoked. + // */ + // struct sigcontext { + // __u64 fault_address; + // /* AArch64 registers */ + // __u64 regs[31]; + // __u64 sp; + // __u64 pc; + // __u64 pstate; + // /* 4K reserved for FP/SIMD state and future expansion */ + // __u8 __reserved[4096] __attribute__((__aligned__(16))); + // }; + // NOTE: the indices for the various registers must be maintained as // listed across various operating systems. However, only a small // subset of the registers' values are guaranteed to be present (and @@ -78,8 +93,9 @@ public static final int LR = 30; public static final int SP = 31; public static final int PC = 32; + public static final int PSTATE = 33; - public static final int NPRGREG = 33; + public static final int NPRGREG = 34; private long[] data;
--- a/test/serviceability/sa/TestStackTrace.java Wed Jul 22 18:16:55 2015 +0200 +++ b/test/serviceability/sa/TestStackTrace.java Wed Jul 22 18:01:11 2015 +0000 @@ -34,7 +34,6 @@ * @test * @library /../../test/lib/share/classes * @library /testlibrary - * @ignore 8129971 * @build jdk.test.lib.* * @build jdk.test.lib.apps.* * @run main TestStackTrace