diff options
| author | Ondřej Surý <ondrej@sury.org> | 2011-04-20 15:44:41 +0200 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2011-04-20 15:44:41 +0200 |
| commit | 50104cc32a498f7517a51c8dc93106c51c7a54b4 (patch) | |
| tree | 47af80be259cc7c45d0eaec7d42e61fa38c8e4fb /src/pkg/runtime/linux/386 | |
| parent | c072558b90f1bbedc2022b0f30c8b1ac4712538e (diff) | |
| download | golang-upstream/2011.03.07.1.tar.gz | |
Imported Upstream version 2011.03.07.1upstream/2011.03.07.1
Diffstat (limited to 'src/pkg/runtime/linux/386')
| -rw-r--r-- | src/pkg/runtime/linux/386/signal.c | 10 | ||||
| -rw-r--r-- | src/pkg/runtime/linux/386/sys.s | 7 |
2 files changed, 8 insertions, 9 deletions
diff --git a/src/pkg/runtime/linux/386/signal.c b/src/pkg/runtime/linux/386/signal.c index 9651a6f28..bd918c7ea 100644 --- a/src/pkg/runtime/linux/386/signal.c +++ b/src/pkg/runtime/linux/386/signal.c @@ -42,17 +42,16 @@ runtime·signame(int32 sig) } void -runtime·sighandler(int32 sig, Siginfo* info, void* context) +runtime·sighandler(int32 sig, Siginfo *info, void *context, G *gp) { Ucontext *uc; Sigcontext *r; uintptr *sp; - G *gp; uc = context; r = &uc->uc_mcontext; - if((gp = m->curg) != nil && (runtime·sigtab[sig].flags & SigPanic)) { + if(gp != nil && (runtime·sigtab[sig].flags & SigPanic)) { // Make it look like a call to the signal func. // Have to pass arguments out of band since // augmenting the stack frame would break @@ -96,12 +95,11 @@ runtime·sighandler(int32 sig, Siginfo* info, void* context) runtime·printf("\n"); if(runtime·gotraceback()){ - runtime·traceback((void*)r->eip, (void*)r->esp, 0, m->curg); - runtime·tracebackothers(m->curg); + runtime·traceback((void*)r->eip, (void*)r->esp, 0, gp); + runtime·tracebackothers(gp); runtime·dumpregs(r); } - runtime·breakpoint(); runtime·exit(2); } diff --git a/src/pkg/runtime/linux/386/sys.s b/src/pkg/runtime/linux/386/sys.s index a1505b0b0..a684371be 100644 --- a/src/pkg/runtime/linux/386/sys.s +++ b/src/pkg/runtime/linux/386/sys.s @@ -56,12 +56,12 @@ TEXT runtime·rt_sigaction(SB),7,$0 INT $0x80 RET -TEXT runtime·sigtramp(SB),7,$40 +TEXT runtime·sigtramp(SB),7,$44 get_tls(CX) // save g - MOVL g(CX), BX - MOVL BX, 20(SP) + MOVL g(CX), DI + MOVL DI, 20(SP) // g = m->gsignal MOVL m(CX), BX @@ -75,6 +75,7 @@ TEXT runtime·sigtramp(SB),7,$40 MOVL BX, 4(SP) MOVL context+8(FP), BX MOVL BX, 8(SP) + MOVL DI, 12(SP) CALL runtime·sighandler(SB) |