diff options
Diffstat (limited to 'src/pkg/runtime/linux/arm')
| -rw-r--r-- | src/pkg/runtime/linux/arm/signal.c | 9 | ||||
| -rw-r--r-- | src/pkg/runtime/linux/arm/sys.s | 31 |
2 files changed, 35 insertions, 5 deletions
diff --git a/src/pkg/runtime/linux/arm/signal.c b/src/pkg/runtime/linux/arm/signal.c index 481bd13c6..843c40b68 100644 --- a/src/pkg/runtime/linux/arm/signal.c +++ b/src/pkg/runtime/linux/arm/signal.c @@ -50,16 +50,15 @@ 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; - 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 @@ -99,8 +98,8 @@ runtime·sighandler(int32 sig, Siginfo *info, void *context) runtime·printf("\n"); if(runtime·gotraceback()){ - runtime·traceback((void*)r->arm_pc, (void*)r->arm_sp, (void*)r->arm_lr, m->curg); - runtime·tracebackothers(m->curg); + runtime·traceback((void*)r->arm_pc, (void*)r->arm_sp, (void*)r->arm_lr, gp); + runtime·tracebackothers(gp); runtime·printf("\n"); runtime·dumpregs(r); } diff --git a/src/pkg/runtime/linux/arm/sys.s b/src/pkg/runtime/linux/arm/sys.s index b25cf81aa..9daf9c2e4 100644 --- a/src/pkg/runtime/linux/arm/sys.s +++ b/src/pkg/runtime/linux/arm/sys.s @@ -197,11 +197,24 @@ TEXT runtime·sigignore(SB),7,$0 RET TEXT runtime·sigtramp(SB),7,$24 + // save g + MOVW g, R3 + MOVW g, 20(R13) + + // g = m->gsignal MOVW m_gsignal(m), g + + // copy arguments for call to sighandler MOVW R0, 4(R13) MOVW R1, 8(R13) MOVW R2, 12(R13) + MOVW R3, 16(R13) + BL runtime·sighandler(SB) + + // restore g + MOVW 20(R13), g + RET TEXT runtime·rt_sigaction(SB),7,$0 @@ -217,3 +230,21 @@ TEXT runtime·sigreturn(SB),7,$0 MOVW $SYS_rt_sigreturn, R7 SWI $0 RET + +// Use kernel version instead of native armcas in ../../arm.s. +// See ../../../sync/atomic/asm_linux_arm.s for details. +TEXT cas<>(SB),7,$0 + MOVW $0xffff0fc0, PC + +TEXT runtime·cas(SB),7,$0 + MOVW valptr+0(FP), R2 + MOVW old+4(FP), R0 + MOVW new+8(FP), R1 + BL cas<>(SB) + MOVW $0, R0 + MOVW.CS $1, R0 + RET + +TEXT runtime·casp(SB),7,$0 + B runtime·cas(SB) + |