diff options
| author | Russ Cox <rsc@golang.org> | 2010-01-25 18:52:55 -0800 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2010-01-25 18:52:55 -0800 |
| commit | ab9fc72814710229b0118e302bbceae3e9260926 (patch) | |
| tree | e8137325f4384b3cd062ab7f2700db20c32efb4c /src/pkg/runtime/linux | |
| parent | 3ed83878d067bfb4eaa5ba5390bcde974382000f (diff) | |
| download | golang-ab9fc72814710229b0118e302bbceae3e9260926.tar.gz | |
in C and asm, replace pkg·name with ·name
(eliminate assumption of package global name space,
make code easier to move between packages).
R=r
CC=golang-dev
http://codereview.appspot.com/194072
Diffstat (limited to 'src/pkg/runtime/linux')
| -rw-r--r-- | src/pkg/runtime/linux/386/sys.s | 2 | ||||
| -rw-r--r-- | src/pkg/runtime/linux/amd64/sys.s | 10 | ||||
| -rw-r--r-- | src/pkg/runtime/linux/arm/sys.s | 2 | ||||
| -rw-r--r-- | src/pkg/runtime/linux/thread.c | 10 |
4 files changed, 12 insertions, 12 deletions
diff --git a/src/pkg/runtime/linux/386/sys.s b/src/pkg/runtime/linux/386/sys.s index 49b829a6a..7f644cbf3 100644 --- a/src/pkg/runtime/linux/386/sys.s +++ b/src/pkg/runtime/linux/386/sys.s @@ -60,7 +60,7 @@ TEXT sigreturn(SB),7,$0 INT $3 // not reached RET -TEXT runtime·mmap(SB),7,$0 +TEXT ·mmap(SB),7,$0 MOVL $192, AX // mmap2 MOVL 4(SP), BX MOVL 8(SP), CX diff --git a/src/pkg/runtime/linux/amd64/sys.s b/src/pkg/runtime/linux/amd64/sys.s index 6565d86de..8e0905ee1 100644 --- a/src/pkg/runtime/linux/amd64/sys.s +++ b/src/pkg/runtime/linux/amd64/sys.s @@ -36,7 +36,7 @@ TEXT write(SB),7,$0-24 SYSCALL RET -TEXT runtime·write(SB),7,$0-24 +TEXT ·write(SB),7,$0-24 MOVL 8(SP), DI MOVQ 16(SP), SI MOVL 24(SP), DX @@ -69,7 +69,7 @@ TEXT sigreturn(SB),7,$0 SYSCALL INT $3 // not reached -TEXT runtime·mmap(SB),7,$0-32 +TEXT ·mmap(SB),7,$0-32 MOVQ 8(SP), DI MOVQ $0, SI MOVL 16(SP), SI @@ -91,7 +91,7 @@ TEXT notok(SB),7,$0 MOVQ BP, (BP) RET -TEXT runtime·memclr(SB),7,$0-16 +TEXT ·memclr(SB),7,$0-16 MOVQ 8(SP), DI // arg 1 addr MOVL 16(SP), CX // arg 2 count (cannot be zero) ADDL $7, CX @@ -102,12 +102,12 @@ TEXT runtime·memclr(SB),7,$0-16 STOSQ RET -TEXT runtime·getcallerpc+0(SB),7,$0 +TEXT ·getcallerpc+0(SB),7,$0 MOVQ x+0(FP),AX // addr of first arg MOVQ -8(AX),AX // get calling pc RET -TEXT runtime·setcallerpc+0(SB),7,$0 +TEXT ·setcallerpc+0(SB),7,$0 MOVQ x+0(FP),AX // addr of first arg MOVQ x+8(FP), BX MOVQ BX, -8(AX) // set calling pc diff --git a/src/pkg/runtime/linux/arm/sys.s b/src/pkg/runtime/linux/arm/sys.s index f11646d5b..218bdd8f0 100644 --- a/src/pkg/runtime/linux/arm/sys.s +++ b/src/pkg/runtime/linux/arm/sys.s @@ -49,7 +49,7 @@ TEXT exit1(SB),7,$-4 MOVW $1003, R1 MOVW R0, (R1) // fail hard -TEXT runtime·mmap(SB),7,$0 +TEXT ·mmap(SB),7,$0 MOVW 0(FP), R0 MOVW 4(FP), R1 MOVW 8(FP), R2 diff --git a/src/pkg/runtime/linux/thread.c b/src/pkg/runtime/linux/thread.c index 425e6695b..1d857a67c 100644 --- a/src/pkg/runtime/linux/thread.c +++ b/src/pkg/runtime/linux/thread.c @@ -49,11 +49,11 @@ futexsleep(uint32 *addr, uint32 val) return; prints("futexsleep addr="); - runtime·printpointer(addr); + ·printpointer(addr); prints(" val="); - runtime·printint(val); + ·printint(val); prints(" returned "); - runtime·printint(ret); + ·printint(ret); prints("\n"); *(int32*)0x1005 = 0x1005; } @@ -74,9 +74,9 @@ futexwakeup(uint32 *addr) // safe to loop and call futex again. prints("futexwakeup addr="); - runtime·printpointer(addr); + ·printpointer(addr); prints(" returned "); - runtime·printint(ret); + ·printint(ret); prints("\n"); *(int32*)0x1006 = 0x1006; } |