diff options
Diffstat (limited to 'src/pkg/runtime/linux/arm')
-rw-r--r-- | src/pkg/runtime/linux/arm/defs.h | 27 | ||||
-rw-r--r-- | src/pkg/runtime/linux/arm/rt0.s | 2 | ||||
-rw-r--r-- | src/pkg/runtime/linux/arm/signal.c | 118 | ||||
-rw-r--r-- | src/pkg/runtime/linux/arm/sys.s | 47 |
4 files changed, 99 insertions, 95 deletions
diff --git a/src/pkg/runtime/linux/arm/defs.h b/src/pkg/runtime/linux/arm/defs.h index b13985171..ff43d689a 100644 --- a/src/pkg/runtime/linux/arm/defs.h +++ b/src/pkg/runtime/linux/arm/defs.h @@ -10,6 +10,7 @@ enum { PROT_EXEC = 0x4, MAP_ANON = 0x20, MAP_PRIVATE = 0x2, + MAP_FIXED = 0x10, SA_RESTART = 0x10000000, SA_ONSTACK = 0x8000000, SA_RESTORER = 0x4000000, @@ -44,19 +45,19 @@ enum { SIGIO = 0x1d, SIGPWR = 0x1e, SIGSYS = 0x1f, - FPE_INTDIV = 0x30001, - FPE_INTOVF = 0x30002, - FPE_FLTDIV = 0x30003, - FPE_FLTOVF = 0x30004, - FPE_FLTUND = 0x30005, - FPE_FLTRES = 0x30006, - FPE_FLTINV = 0x30007, - FPE_FLTSUB = 0x30008, - BUS_ADRALN = 0x30001, - BUS_ADRERR = 0x30002, - BUS_OBJERR = 0x30003, - SEGV_MAPERR = 0x30001, - SEGV_ACCERR = 0x30002, + FPE_INTDIV = 0x1, + FPE_INTOVF = 0x2, + FPE_FLTDIV = 0x3, + FPE_FLTOVF = 0x4, + FPE_FLTUND = 0x5, + FPE_FLTRES = 0x6, + FPE_FLTINV = 0x7, + FPE_FLTSUB = 0x8, + BUS_ADRALN = 0x1, + BUS_ADRERR = 0x2, + BUS_OBJERR = 0x3, + SEGV_MAPERR = 0x1, + SEGV_ACCERR = 0x2, }; // Types diff --git a/src/pkg/runtime/linux/arm/rt0.s b/src/pkg/runtime/linux/arm/rt0.s index 024547ddd..8838b4891 100644 --- a/src/pkg/runtime/linux/arm/rt0.s +++ b/src/pkg/runtime/linux/arm/rt0.s @@ -2,5 +2,5 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -TEXT _rt0_arm_linux(SB),7,$0 +TEXT _rt0_arm_linux(SB),7,$0 B _rt0_arm(SB) diff --git a/src/pkg/runtime/linux/arm/signal.c b/src/pkg/runtime/linux/arm/signal.c index a9dccae4a..c65aff913 100644 --- a/src/pkg/runtime/linux/arm/signal.c +++ b/src/pkg/runtime/linux/arm/signal.c @@ -8,49 +8,49 @@ #include "os.h" void -dumpregs(Sigcontext *r) +runtime·dumpregs(Sigcontext *r) { - printf("trap %x\n", r->trap_no); - printf("error %x\n", r->error_code); - printf("oldmask %x\n", r->oldmask); - printf("r0 %x\n", r->arm_r0); - printf("r1 %x\n", r->arm_r1); - printf("r2 %x\n", r->arm_r2); - printf("r3 %x\n", r->arm_r3); - printf("r4 %x\n", r->arm_r4); - printf("r5 %x\n", r->arm_r5); - printf("r6 %x\n", r->arm_r6); - printf("r7 %x\n", r->arm_r7); - printf("r8 %x\n", r->arm_r8); - printf("r9 %x\n", r->arm_r9); - printf("r10 %x\n", r->arm_r10); - printf("fp %x\n", r->arm_fp); - printf("ip %x\n", r->arm_ip); - printf("sp %x\n", r->arm_sp); - printf("lr %x\n", r->arm_lr); - printf("pc %x\n", r->arm_pc); - printf("cpsr %x\n", r->arm_cpsr); - printf("fault %x\n", r->fault_address); + runtime·printf("trap %x\n", r->trap_no); + runtime·printf("error %x\n", r->error_code); + runtime·printf("oldmask %x\n", r->oldmask); + runtime·printf("r0 %x\n", r->arm_r0); + runtime·printf("r1 %x\n", r->arm_r1); + runtime·printf("r2 %x\n", r->arm_r2); + runtime·printf("r3 %x\n", r->arm_r3); + runtime·printf("r4 %x\n", r->arm_r4); + runtime·printf("r5 %x\n", r->arm_r5); + runtime·printf("r6 %x\n", r->arm_r6); + runtime·printf("r7 %x\n", r->arm_r7); + runtime·printf("r8 %x\n", r->arm_r8); + runtime·printf("r9 %x\n", r->arm_r9); + runtime·printf("r10 %x\n", r->arm_r10); + runtime·printf("fp %x\n", r->arm_fp); + runtime·printf("ip %x\n", r->arm_ip); + runtime·printf("sp %x\n", r->arm_sp); + runtime·printf("lr %x\n", r->arm_lr); + runtime·printf("pc %x\n", r->arm_pc); + runtime·printf("cpsr %x\n", r->arm_cpsr); + runtime·printf("fault %x\n", r->fault_address); } /* * This assembler routine takes the args from registers, puts them on the stack, * and calls sighandler(). */ -extern void sigtramp(void); -extern void sigignore(void); // just returns -extern void sigreturn(void); // calls sigreturn +extern void runtime·sigtramp(void); +extern void runtime·sigignore(void); // just returns +extern void runtime·sigreturn(void); // calls runtime·sigreturn String -signame(int32 sig) +runtime·signame(int32 sig) { if(sig < 0 || sig >= NSIG) - return emptystring; - return gostringnocopy((byte*)sigtab[sig].name); + return runtime·emptystring; + return runtime·gostringnocopy((byte*)runtime·sigtab[sig].name); } void -sighandler(int32 sig, Siginfo *info, void *context) +runtime·sighandler(int32 sig, Siginfo *info, void *context) { Ucontext *uc; Sigcontext *r; @@ -59,7 +59,7 @@ sighandler(int32 sig, Siginfo *info, void *context) uc = context; r = &uc->uc_mcontext; - if((gp = m->curg) != nil && (sigtab[sig].flags & SigPanic)) { + if((gp = m->curg) != 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 @@ -75,75 +75,75 @@ sighandler(int32 sig, Siginfo *info, void *context) // old link register is more useful in the stack trace. if(r->arm_pc != 0) r->arm_lr = r->arm_pc; - r->arm_pc = (uintptr)sigpanic; + r->arm_pc = (uintptr)runtime·sigpanic; return; } - if(sigtab[sig].flags & SigQueue) { - if(sigsend(sig) || (sigtab[sig].flags & SigIgnore)) + if(runtime·sigtab[sig].flags & SigQueue) { + if(runtime·sigsend(sig) || (runtime·sigtab[sig].flags & SigIgnore)) return; - exit(2); // SIGINT, SIGTERM, etc + runtime·exit(2); // SIGINT, SIGTERM, etc } - if(panicking) // traceback already printed - exit(2); - panicking = 1; + if(runtime·panicking) // traceback already printed + runtime·exit(2); + runtime·panicking = 1; if(sig < 0 || sig >= NSIG) - printf("Signal %d\n", sig); + runtime·printf("Signal %d\n", sig); else - printf("%s\n", sigtab[sig].name); + runtime·printf("%s\n", runtime·sigtab[sig].name); - printf("PC=%x\n", r->arm_pc); - printf("\n"); + runtime·printf("PC=%x\n", r->arm_pc); + runtime·printf("\n"); - if(gotraceback()){ - traceback((void*)r->arm_pc, (void*)r->arm_sp, (void*)r->arm_lr, m->curg); - tracebackothers(m->curg); - printf("\n"); - dumpregs(r); + if(runtime·gotraceback()){ + runtime·traceback((void*)r->arm_pc, (void*)r->arm_sp, (void*)r->arm_lr, m->curg); + runtime·tracebackothers(m->curg); + runtime·printf("\n"); + runtime·dumpregs(r); } // breakpoint(); - exit(2); + runtime·exit(2); } void -signalstack(byte *p, int32 n) +runtime·signalstack(byte *p, int32 n) { Sigaltstack st; st.ss_sp = p; st.ss_size = n; st.ss_flags = 0; - sigaltstack(&st, nil); + runtime·sigaltstack(&st, nil); } void -initsig(int32 queue) +runtime·initsig(int32 queue) { static Sigaction sa; - siginit(); + runtime·siginit(); int32 i; sa.sa_flags = SA_ONSTACK | SA_SIGINFO | SA_RESTORER; sa.sa_mask.sig[0] = 0xFFFFFFFF; sa.sa_mask.sig[1] = 0xFFFFFFFF; - sa.sa_restorer = (void*)sigreturn; + sa.sa_restorer = (void*)runtime·sigreturn; for(i = 0; i<NSIG; i++) { - if(sigtab[i].flags) { - if((sigtab[i].flags & SigQueue) != queue) + if(runtime·sigtab[i].flags) { + if((runtime·sigtab[i].flags & SigQueue) != queue) continue; - if(sigtab[i].flags & (SigCatch | SigQueue)) - sa.sa_handler = (void*)sigtramp; + if(runtime·sigtab[i].flags & (SigCatch | SigQueue)) + sa.sa_handler = (void*)runtime·sigtramp; else - sa.sa_handler = (void*)sigignore; - if(sigtab[i].flags & SigRestart) + sa.sa_handler = (void*)runtime·sigignore; + if(runtime·sigtab[i].flags & SigRestart) sa.sa_flags |= SA_RESTART; else sa.sa_flags &= ~SA_RESTART; - rt_sigaction(i, &sa, nil, 8); + runtime·rt_sigaction(i, &sa, nil, 8); } } } diff --git a/src/pkg/runtime/linux/arm/sys.s b/src/pkg/runtime/linux/arm/sys.s index f30aed001..b25cf81aa 100644 --- a/src/pkg/runtime/linux/arm/sys.s +++ b/src/pkg/runtime/linux/arm/sys.s @@ -25,11 +25,12 @@ #define SYS_gettid (SYS_BASE + 224) #define SYS_futex (SYS_BASE + 240) #define SYS_exit_group (SYS_BASE + 248) +#define SYS_munmap (SYS_BASE + 91) #define ARM_BASE (SYS_BASE + 0x0f0000) #define SYS_ARM_cacheflush (ARM_BASE + 2) -TEXT write(SB),7,$0 +TEXT runtime·write(SB),7,$0 MOVW 0(FP), R0 MOVW 4(FP), R1 MOVW 8(FP), R2 @@ -37,7 +38,7 @@ TEXT write(SB),7,$0 SWI $0 RET -TEXT exit(SB),7,$-4 +TEXT runtime·exit(SB),7,$-4 MOVW 0(FP), R0 MOVW $SYS_exit_group, R7 SWI $0 @@ -45,7 +46,7 @@ TEXT exit(SB),7,$-4 MOVW $1002, R1 MOVW R0, (R1) // fail hard -TEXT exit1(SB),7,$-4 +TEXT runtime·exit1(SB),7,$-4 MOVW 0(FP), R0 MOVW $SYS_exit, R7 SWI $0 @@ -53,7 +54,7 @@ TEXT exit1(SB),7,$-4 MOVW $1003, R1 MOVW R0, (R1) // fail hard -TEXT ·mmap(SB),7,$0 +TEXT runtime·mmap(SB),7,$0 MOVW 0(FP), R0 MOVW 4(FP), R1 MOVW 8(FP), R2 @@ -64,7 +65,14 @@ TEXT ·mmap(SB),7,$0 SWI $0 RET -TEXT gettime(SB),7,$32 +TEXT runtime·munmap(SB),7,$0 + MOVW 0(FP), R0 + MOVW 4(FP), R1 + MOVW $SYS_munmap, R7 + SWI $0 + RET + +TEXT runtime·gettime(SB),7,$32 /* dummy version - return 0,0 */ MOVW $0, R1 MOVW 0(FP), R0 @@ -93,7 +101,7 @@ TEXT gettime(SB),7,$32 // int32 futex(int32 *uaddr, int32 op, int32 val, // struct timespec *timeout, int32 *uaddr2, int32 val2); -TEXT futex(SB),7,$0 +TEXT runtime·futex(SB),7,$0 MOVW 4(SP), R0 MOVW 8(SP), R1 MOVW 12(SP), R2 @@ -106,7 +114,7 @@ TEXT futex(SB),7,$0 // int32 clone(int32 flags, void *stack, M *m, G *g, void (*fn)(void)); -TEXT clone(SB),7,$0 +TEXT runtime·clone(SB),7,$0 MOVW flags+0(FP), R0 MOVW stack+4(FP), R1 MOVW $0, R2 // parent tid ptr @@ -139,7 +147,7 @@ TEXT clone(SB),7,$0 MOVW $1234, R1 CMP R0, R1 BEQ 2(PC) - B abort(SB) + BL runtime·abort(SB) MOVW 0(R13), m MOVW 4(R13), g @@ -148,7 +156,7 @@ TEXT clone(SB),7,$0 MOVW 0(m), R0 MOVW 0(g), R0 - BL emptyfunc(SB) // fault if stack check is wrong + BL runtime·emptyfunc(SB) // fault if stack check is wrong // Initialize m->procid to Linux tid MOVW $SYS_gettid, R7 @@ -162,7 +170,7 @@ TEXT clone(SB),7,$0 MOVW $0, R0 MOVW R0, 4(R13) - BL exit1(SB) + BL runtime·exit1(SB) // It shouldn't return MOVW $1234, R0 @@ -170,7 +178,7 @@ TEXT clone(SB),7,$0 MOVW R0, (R1) -TEXT cacheflush(SB),7,$0 +TEXT runtime·cacheflush(SB),7,$0 MOVW 0(FP), R0 MOVW 4(FP), R1 MOVW $0, R2 @@ -178,30 +186,25 @@ TEXT cacheflush(SB),7,$0 SWI $0 RET -TEXT sigaltstack(SB),7,$0 +TEXT runtime·sigaltstack(SB),7,$0 MOVW 0(FP), R0 MOVW 4(FP), R1 MOVW $SYS_sigaltstack, R7 SWI $0 RET -TEXT sigignore(SB),7,$0 - RET - -TEXT sigreturn(SB),7,$0 - MOVW R0, R0 - B abort(SB) +TEXT runtime·sigignore(SB),7,$0 RET -TEXT sigtramp(SB),7,$24 +TEXT runtime·sigtramp(SB),7,$24 MOVW m_gsignal(m), g MOVW R0, 4(R13) MOVW R1, 8(R13) MOVW R2, 12(R13) - BL sighandler(SB) + BL runtime·sighandler(SB) RET -TEXT rt_sigaction(SB),7,$0 +TEXT runtime·rt_sigaction(SB),7,$0 MOVW 0(FP), R0 MOVW 4(FP), R1 MOVW 8(FP), R2 @@ -210,7 +213,7 @@ TEXT rt_sigaction(SB),7,$0 SWI $0 RET -TEXT sigreturn(SB),7,$0 +TEXT runtime·sigreturn(SB),7,$0 MOVW $SYS_rt_sigreturn, R7 SWI $0 RET |