* libgo patch committed: Handle arm64 GNU/Linux signal register values
@ 2020-02-28 20:24 Ian Lance Taylor
0 siblings, 0 replies; only message in thread
From: Ian Lance Taylor @ 2020-02-28 20:24 UTC (permalink / raw)
To: gcc-patches, gofrontend-dev
[-- Attachment #1: Type: text/plain, Size: 284 bytes --]
This libgo patch by eric fang sets sigpc and implement dumpregs for
arm64 GNU/Linux. Without this change, the cmd/vet tool test will fail
randomly, as discussed at https://golang.org/issue/20931.
Bootstrapped and ran Go testsuite on x86_64-pc-linux-gnu. Committed
to mainline.
Ian
[-- Attachment #2: patch.txt --]
[-- Type: text/plain, Size: 4214 bytes --]
d13e079f4b6e1ac76984d8734e6879f1e3a4e9e7
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index a62c8292e0a..6b4c21fabf5 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-5fc21bb0d91d916940c21e6d4a3e10ad3f45343d
+7a62a49e62c090118fa003d9265c5f5e2090c4f9
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.
diff --git a/libgo/runtime/go-signal.c b/libgo/runtime/go-signal.c
index 081604e1849..a07fdeafeb4 100644
--- a/libgo/runtime/go-signal.c
+++ b/libgo/runtime/go-signal.c
@@ -205,28 +205,18 @@ getSiginfo(siginfo_t *info, void *context __attribute__((unused)))
// Use unportable code to pull it from context, and if that fails
// try a stack backtrace across the signal handler.
-#ifdef __x86_64__
- #ifdef __linux__
+#if defined(__x86_64__) && defined(__linux__)
ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.gregs[REG_RIP];
- #endif
-#endif
-#ifdef __i386__
- #ifdef __linux__
+#elif defined(__i386__) && defined(__linux__)
ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.gregs[REG_EIP];
- #endif
-#endif
-#ifdef __alpha__
- #ifdef __linux__
+#elif defined(__alpha__) && defined(__linux__)
ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.sc_pc;
- #endif
-#endif
-#ifdef __PPC__
- #ifdef __linux__
+#elif defined(__PPC__) && defined(__linux__)
ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.regs->nip;
- #endif
- #ifdef _AIX
+#elif defined(__PPC__) && defined(_AIX)
ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.jmp_context.iar;
- #endif
+#elif defined(__aarch64__) && defined(__linux__)
+ ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.pc;
#endif
if (ret.sigpc == 0) {
@@ -250,8 +240,7 @@ void dumpregs(siginfo_t *, void *)
void
dumpregs(siginfo_t *info __attribute__((unused)), void *context __attribute__((unused)))
{
-#ifdef __x86_64__
- #ifdef __linux__
+#if defined(__x86_64__) && defined(__linux__)
{
mcontext_t *m = &((ucontext_t*)(context))->uc_mcontext;
@@ -277,11 +266,7 @@ dumpregs(siginfo_t *info __attribute__((unused)), void *context __attribute__((u
runtime_printf("fs %X\n", (m->gregs[REG_CSGSFS] >> 16) & 0xffff);
runtime_printf("gs %X\n", (m->gregs[REG_CSGSFS] >> 32) & 0xffff);
}
- #endif
-#endif
-
-#ifdef __i386__
- #ifdef __linux__
+#elif defined(__i386__) && defined(__linux__)
{
mcontext_t *m = &((ucontext_t*)(context))->uc_mcontext;
@@ -299,11 +284,7 @@ dumpregs(siginfo_t *info __attribute__((unused)), void *context __attribute__((u
runtime_printf("fs %x\n", m->gregs[REG_FS]);
runtime_printf("gs %x\n", m->gregs[REG_GS]);
}
- #endif
-#endif
-
-#ifdef __alpha__
- #ifdef __linux__
+#elif defined(__alpha__) && defined(__linux__)
{
mcontext_t *m = &((ucontext_t*)(context))->uc_mcontext;
@@ -340,11 +321,7 @@ dumpregs(siginfo_t *info __attribute__((unused)), void *context __attribute__((u
runtime_printf("sp %X\n", m->sc_regs[30]);
runtime_printf("pc %X\n", m->sc_pc);
}
- #endif
-#endif
-
-#if defined(__PPC__) && defined(__LITTLE_ENDIAN__)
- #ifdef __linux__
+#elif defined(__PPC__) && defined(__LITTLE_ENDIAN__) && defined(__linux__)
{
mcontext_t *m = &((ucontext_t*)(context))->uc_mcontext;
int i;
@@ -358,11 +335,7 @@ dumpregs(siginfo_t *info __attribute__((unused)), void *context __attribute__((u
runtime_printf("ctr %X\n", m->regs->ctr);
runtime_printf("xer %X\n", m->regs->xer);
}
- #endif
-#endif
-
-#ifdef __PPC__
- #ifdef _AIX
+#elif defined(__PPC__) && defined(_AIX)
{
mcontext_t *m = &((ucontext_t*)(context))->uc_mcontext;
int i;
@@ -376,6 +349,16 @@ dumpregs(siginfo_t *info __attribute__((unused)), void *context __attribute__((u
runtime_printf("ctr %p\n", m->jmp_context.ctr);
runtime_printf("xer %x\n", m->jmp_context.xer);
}
- #endif
+#elif defined(__aarch64__) && defined(__linux__)
+ {
+ mcontext_t *m = &((ucontext_t*)(context))->uc_mcontext;
+ int i;
+
+ for (i = 0; i < 31; i++)
+ runtime_printf("x%d %X\n", i, m->regs[i]);
+ runtime_printf("sp %X\n", m->sp);
+ runtime_printf("pc %X\n", m->pc);
+ runtime_printf("pstate %X\n", m->pstate);
+ }
#endif
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2020-02-28 20:24 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-28 20:24 libgo patch committed: Handle arm64 GNU/Linux signal register values Ian Lance Taylor
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).