diff options
Diffstat (limited to 'src/pkg/runtime/tiny/386')
-rw-r--r-- | src/pkg/runtime/tiny/386/rt0.s | 8 | ||||
-rw-r--r-- | src/pkg/runtime/tiny/386/signal.c | 8 | ||||
-rw-r--r-- | src/pkg/runtime/tiny/386/sys.s | 18 |
3 files changed, 17 insertions, 17 deletions
diff --git a/src/pkg/runtime/tiny/386/rt0.s b/src/pkg/runtime/tiny/386/rt0.s index ff7aae7ac..524ac7664 100644 --- a/src/pkg/runtime/tiny/386/rt0.s +++ b/src/pkg/runtime/tiny/386/rt0.s @@ -11,18 +11,18 @@ TEXT _rt0_386_tiny(SB), 7, $0 MOVL AX, SP // Set up memory hardware. - CALL msetup(SB) + CALL runtime·msetup(SB) // _rt0_386 expects to find argc, argv, envv on stack. // Set up argv=["kernel"] and envv=[]. SUBL $64, SP MOVL $1, 0(SP) - MOVL $kernel(SB), 4(SP) + MOVL $runtime·kernel(SB), 4(SP) MOVL $0, 8(SP) MOVL $0, 12(SP) JMP _rt0_386(SB) -DATA kernel+0(SB)/7, $"kernel\z" -GLOBL kernel(SB), $7 +DATA runtime·kernel(SB)/7, $"kernel\z" +GLOBL runtime·kernel(SB), $7 diff --git a/src/pkg/runtime/tiny/386/signal.c b/src/pkg/runtime/tiny/386/signal.c index de06ba8db..88e634e9d 100644 --- a/src/pkg/runtime/tiny/386/signal.c +++ b/src/pkg/runtime/tiny/386/signal.c @@ -4,16 +4,16 @@ #include "runtime.h" -extern void ·write(int32 fd, void *v, int32 len, int32 cap); // slice, spelled out +extern void runtime·write(int32 fd, void *v, int32 len, int32 cap); // slice, spelled out int32 -write(int32 fd, void *v, int32 len) +runtime·write(int32 fd, void *v, int32 len) { - ·write(fd, v, len, len); + runtime·write(fd, v, len, len); return len; } void -gettime(int64*, int32*) +runtime·gettime(int64*, int32*) { } diff --git a/src/pkg/runtime/tiny/386/sys.s b/src/pkg/runtime/tiny/386/sys.s index c51a5ec3e..851171476 100644 --- a/src/pkg/runtime/tiny/386/sys.s +++ b/src/pkg/runtime/tiny/386/sys.s @@ -17,8 +17,8 @@ // Called to set up memory hardware. // Already running in 32-bit mode thanks to boot block, // but we need to install our new GDT that we can modify. -TEXT msetup(SB), 7, $0 - MOVL gdtptr(SB), GDTR +TEXT runtime·msetup(SB), 7, $0 + MOVL runtime·gdtptr(SB), GDTR MOVL $(1*8+0), AX MOVW AX, DS MOVW AX, ES @@ -29,14 +29,14 @@ TEXT msetup(SB), 7, $0 // long jmp to cs:mret BYTE $0xEA - LONG $mret(SB) + LONG $runtime·mret(SB) WORD $(2*8+0) -TEXT mret(SB), 7, $0 +TEXT runtime·mret(SB), 7, $0 RET // GDT memory -TEXT gdt(SB), 7, $0 +TEXT runtime·gdt(SB), 7, $0 // null segment LONG $0 LONG $0 @@ -54,14 +54,14 @@ TEXT gdt(SB), 7, $0 LONG $0 // GDT pseudo-descriptor -TEXT gdtptr(SB), 7, $0 +TEXT runtime·gdtptr(SB), 7, $0 WORD $(4*8) - LONG $gdt(SB) + LONG $runtime·gdt(SB) // Called to establish the per-thread segment. // Write to gdt[3] and reload the gdt register. // 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 MOVL limit+8(FP), CX @@ -83,7 +83,7 @@ TEXT setldt(SB),7,$32 MOVB CX, 6(AX) MOVB $0xF2, 5(AX) // r/w data descriptor, dpl=3, present - MOVL gdtptr(SB), GDTR + MOVL runtime·gdtptr(SB), GDTR // Compute segment selector - (entry*8+0) MOVL $(3*8+0), AX |