diff options
Diffstat (limited to 'src/pkg/runtime/freebsd/386')
-rw-r--r-- | src/pkg/runtime/freebsd/386/defs.h | 1 | ||||
-rw-r--r-- | src/pkg/runtime/freebsd/386/rt0.s | 2 | ||||
-rw-r--r-- | src/pkg/runtime/freebsd/386/signal.c | 104 | ||||
-rw-r--r-- | src/pkg/runtime/freebsd/386/sys.s | 70 |
4 files changed, 96 insertions, 81 deletions
diff --git a/src/pkg/runtime/freebsd/386/defs.h b/src/pkg/runtime/freebsd/386/defs.h index 76c55721f..128be9cc9 100644 --- a/src/pkg/runtime/freebsd/386/defs.h +++ b/src/pkg/runtime/freebsd/386/defs.h @@ -10,6 +10,7 @@ enum { PROT_EXEC = 0x4, MAP_ANON = 0x1000, MAP_PRIVATE = 0x2, + MAP_FIXED = 0x10, SA_SIGINFO = 0x40, SA_RESTART = 0x2, SA_ONSTACK = 0x1, diff --git a/src/pkg/runtime/freebsd/386/rt0.s b/src/pkg/runtime/freebsd/386/rt0.s index 67c5f912c..3ca981b3a 100644 --- a/src/pkg/runtime/freebsd/386/rt0.s +++ b/src/pkg/runtime/freebsd/386/rt0.s @@ -4,6 +4,6 @@ // Darwin and Linux use the same linkage to main -TEXT _rt0_386_freebsd(SB),7,$0 +TEXT _rt0_386_freebsd(SB),7,$0 JMP _rt0_386(SB) diff --git a/src/pkg/runtime/freebsd/386/signal.c b/src/pkg/runtime/freebsd/386/signal.c index 4fc6d9e12..52b820df1 100644 --- a/src/pkg/runtime/freebsd/386/signal.c +++ b/src/pkg/runtime/freebsd/386/signal.c @@ -7,7 +7,7 @@ #include "signals.h" #include "os.h" -extern void sigtramp(void); +extern void runtime·sigtramp(void); typedef struct sigaction { union { @@ -19,33 +19,33 @@ typedef struct sigaction { } Sigaction; void -dumpregs(Mcontext *r) +runtime·dumpregs(Mcontext *r) { - printf("eax %x\n", r->mc_eax); - printf("ebx %x\n", r->mc_ebx); - printf("ecx %x\n", r->mc_ecx); - printf("edx %x\n", r->mc_edx); - printf("edi %x\n", r->mc_edi); - printf("esi %x\n", r->mc_esi); - printf("ebp %x\n", r->mc_ebp); - printf("esp %x\n", r->mc_esp); - printf("eip %x\n", r->mc_eip); - printf("eflags %x\n", r->mc_eflags); - printf("cs %x\n", r->mc_cs); - printf("fs %x\n", r->mc_fs); - printf("gs %x\n", r->mc_gs); + runtime·printf("eax %x\n", r->mc_eax); + runtime·printf("ebx %x\n", r->mc_ebx); + runtime·printf("ecx %x\n", r->mc_ecx); + runtime·printf("edx %x\n", r->mc_edx); + runtime·printf("edi %x\n", r->mc_edi); + runtime·printf("esi %x\n", r->mc_esi); + runtime·printf("ebp %x\n", r->mc_ebp); + runtime·printf("esp %x\n", r->mc_esp); + runtime·printf("eip %x\n", r->mc_eip); + runtime·printf("eflags %x\n", r->mc_eflags); + runtime·printf("cs %x\n", r->mc_cs); + runtime·printf("fs %x\n", r->mc_fs); + runtime·printf("gs %x\n", r->mc_gs); } 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; Mcontext *r; @@ -55,7 +55,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 @@ -64,91 +64,91 @@ sighandler(int32 sig, Siginfo* info, void* context) gp->sigcode0 = info->si_code; gp->sigcode1 = (uintptr)info->si_addr; - // Only push sigpanic if r->mc_eip != 0. + // Only push runtime·sigpanic if r->mc_eip != 0. // If r->mc_eip == 0, probably panicked because of a // call to a nil func. Not pushing that onto sp will - // make the trace look like a call to sigpanic instead. - // (Otherwise the trace will end at sigpanic and we + // make the trace look like a call to runtime·sigpanic instead. + // (Otherwise the trace will end at runtime·sigpanic and we // won't get to see who faulted.) if(r->mc_eip != 0) { sp = (uintptr*)r->mc_esp; *--sp = r->mc_eip; r->mc_esp = (uintptr)sp; } - r->mc_eip = (uintptr)sigpanic; + r->mc_eip = (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->mc_eip); - printf("\n"); + runtime·printf("PC=%X\n", r->mc_eip); + runtime·printf("\n"); - if(gotraceback()){ - traceback((void*)r->mc_eip, (void*)r->mc_esp, 0, m->curg); - tracebackothers(m->curg); - dumpregs(r); + if(runtime·gotraceback()){ + runtime·traceback((void*)r->mc_eip, (void*)r->mc_esp, 0, m->curg); + runtime·tracebackothers(m->curg); + runtime·dumpregs(r); } - breakpoint(); - exit(2); + runtime·breakpoint(); + runtime·exit(2); } void -sigignore(void) +runtime·sigignore(void) { } void -signalstack(byte *p, int32 n) +runtime·signalstack(byte *p, int32 n) { Sigaltstack st; st.ss_sp = (int8*)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.sa_mask = ~0x0ull; 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.__sigaction_u.__sa_sigaction = (void*) sigtramp; + if(runtime·sigtab[i].flags & (SigCatch | SigQueue)) + sa.__sigaction_u.__sa_sigaction = (void*) runtime·sigtramp; else - sa.__sigaction_u.__sa_sigaction = (void*) sigignore; + sa.__sigaction_u.__sa_sigaction = (void*) runtime·sigignore; - if(sigtab[i].flags & SigRestart) + if(runtime·sigtab[i].flags & SigRestart) sa.sa_flags |= SA_RESTART; else sa.sa_flags &= ~SA_RESTART; - sigaction(i, &sa, nil); + runtime·sigaction(i, &sa, nil); } } } diff --git a/src/pkg/runtime/freebsd/386/sys.s b/src/pkg/runtime/freebsd/386/sys.s index a0860db81..7110e6924 100644 --- a/src/pkg/runtime/freebsd/386/sys.s +++ b/src/pkg/runtime/freebsd/386/sys.s @@ -8,17 +8,17 @@ #include "386/asm.h" -TEXT sys_umtx_op(SB),7,$-4 +TEXT runtime·sys_umtx_op(SB),7,$-4 MOVL $454, AX INT $0x80 RET -TEXT thr_new(SB),7,$-4 +TEXT runtime·thr_new(SB),7,$-4 MOVL $455, AX INT $0x80 RET -TEXT thr_start(SB),7,$0 +TEXT runtime·thr_start(SB),7,$0 MOVL mm+0(FP), AX MOVL m_g0(AX), BX LEAL m_tls(AX), BP @@ -28,7 +28,7 @@ TEXT thr_start(SB),7,$0 PUSHL $32 PUSHL BP PUSHL DI - CALL setldt(SB) + CALL runtime·setldt(SB) POPL AX POPL AX POPL AX @@ -37,43 +37,57 @@ TEXT thr_start(SB),7,$0 MOVL BX, g(CX) MOVL AX, m(CX) - CALL stackcheck(SB) // smashes AX - CALL mstart(SB) + CALL runtime·stackcheck(SB) // smashes AX + CALL runtime·mstart(SB) MOVL 0, AX // crash (not reached) // Exit the entire program (like C exit) -TEXT exit(SB),7,$-4 +TEXT runtime·exit(SB),7,$-4 MOVL $1, AX INT $0x80 - CALL notok(SB) + CALL runtime·notok(SB) RET -TEXT exit1(SB),7,$-4 +TEXT runtime·exit1(SB),7,$-4 MOVL $431, AX INT $0x80 JAE 2(PC) - CALL notok(SB) + CALL runtime·notok(SB) RET -TEXT write(SB),7,$-4 +TEXT runtime·write(SB),7,$-4 MOVL $4, AX INT $0x80 - JAE 2(PC) - CALL notok(SB) RET -TEXT notok(SB),7,$0 +TEXT runtime·notok(SB),7,$0 MOVL $0xf1, 0xf1 RET -TEXT ·mmap(SB),7,$-4 +TEXT runtime·mmap(SB),7,$32 + LEAL arg0+0(FP), SI + LEAL 4(SP), DI + CLD + MOVSL + MOVSL + MOVSL + MOVSL + MOVSL + MOVSL + MOVL $0, AX // top 64 bits of file offset + STOSL MOVL $477, AX INT $0x80 + RET + +TEXT runtime·munmap(SB),7,$-4 + MOVL $73, AX + INT $0x80 JAE 2(PC) - CALL notok(SB) + CALL runtime·notok(SB) RET -TEXT gettime(SB), 7, $32 +TEXT runtime·gettime(SB), 7, $32 MOVL $116, AX LEAL 12(SP), BX MOVL BX, 4(SP) @@ -90,14 +104,14 @@ TEXT gettime(SB), 7, $32 MOVL BX, (DI) RET -TEXT sigaction(SB),7,$-4 +TEXT runtime·sigaction(SB),7,$-4 MOVL $416, AX INT $0x80 JAE 2(PC) - CALL notok(SB) + CALL runtime·notok(SB) RET -TEXT sigtramp(SB),7,$40 +TEXT runtime·sigtramp(SB),7,$40 // g = m->gsignal get_tls(DX) MOVL m(DX), BP @@ -111,7 +125,7 @@ TEXT sigtramp(SB),7,$40 MOVL AX, 0(SP) MOVL BX, 4(SP) MOVL CX, 8(SP) - CALL sighandler(SB) + CALL runtime·sighandler(SB) // g = m->curg get_tls(DX) @@ -125,14 +139,14 @@ TEXT sigtramp(SB),7,$40 MOVL AX, 4(SP) MOVL $417, AX // sigreturn(ucontext) INT $0x80 - CALL notok(SB) + CALL runtime·notok(SB) RET -TEXT sigaltstack(SB),7,$0 +TEXT runtime·sigaltstack(SB),7,$0 MOVL $53, AX INT $0x80 JAE 2(PC) - CALL notok(SB) + CALL runtime·notok(SB) RET /* @@ -152,7 +166,7 @@ int i386_set_ldt(int, const union ldt_entry *, int); */ // setldt(int entry, int address, int limit) -TEXT setldt(SB),7,$32 +TEXT runtime·setldt(SB),7,$32 MOVL address+4(FP), BX // aka base // see comment in linux/386/sys.s; freebsd is similar ADDL $0x8, BX @@ -177,7 +191,7 @@ TEXT setldt(SB),7,$32 MOVL $0xffffffff, 0(SP) // auto-allocate entry and return in AX MOVL AX, 4(SP) MOVL $1, 8(SP) - CALL i386_set_ldt(SB) + CALL runtime·i386_set_ldt(SB) // compute segment selector - (entry*8+7) SHLL $3, AX @@ -185,7 +199,7 @@ TEXT setldt(SB),7,$32 MOVW AX, GS RET -TEXT i386_set_ldt(SB),7,$16 +TEXT runtime·i386_set_ldt(SB),7,$16 LEAL args+0(FP), AX // 0(FP) == 4(SP) before SP got moved MOVL $0, 0(SP) // syscall gap MOVL $1, 4(SP) @@ -197,4 +211,4 @@ TEXT i386_set_ldt(SB),7,$16 INT $3 RET -GLOBL tlsoffset(SB),$4 +GLOBL runtime·tlsoffset(SB),$4 |