diff options
| author | David Crawshaw <david.crawshaw@zentus.com> | 2014-06-30 19:10:41 -0400 |
|---|---|---|
| committer | David Crawshaw <david.crawshaw@zentus.com> | 2014-06-30 19:10:41 -0400 |
| commit | 54951023cb0a1743f7f3cb233ff424593bf1a131 (patch) | |
| tree | c923b6b2d823f08671bb8477dcb1757fda604b61 /src/pkg/runtime | |
| parent | ce5bbfdde4ac3e2b8b1437e3ff12c69daec938a7 (diff) | |
| download | go-54951023cb0a1743f7f3cb233ff424593bf1a131.tar.xz | |
runtime: update arm comments now register m is gone
LGTM=minux
R=golang-codereviews, minux
CC=golang-codereviews
https://golang.org/cl/109220046
Diffstat (limited to 'src/pkg/runtime')
| -rw-r--r-- | src/pkg/runtime/asm_arm.s | 10 | ||||
| -rw-r--r-- | src/pkg/runtime/cgo/gcc_arm.S | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/pkg/runtime/asm_arm.s b/src/pkg/runtime/asm_arm.s index 7564e96b1e..4f029c850a 100644 --- a/src/pkg/runtime/asm_arm.s +++ b/src/pkg/runtime/asm_arm.s @@ -125,7 +125,7 @@ TEXT runtime·gogo(SB), NOSPLIT, $-4-4 MOVW gobuf_g(R1), g MOVW 0(g), R2 // make sure g != nil MOVB runtime·iscgo(SB), R2 - CMP $0, R2 // if in Cgo, we have to save g and m + CMP $0, R2 // if in Cgo, we have to save g BL.NE runtime·save_g(SB) // this call will clobber R0 MOVW gobuf_sp(R1), SP // restore SP MOVW gobuf_lr(R1), LR @@ -688,10 +688,10 @@ _eqnext: MOVB R7, v+16(FP) RET -// We have to resort to TLS variable to save g(R10) and -// m(R9). One reason is that external code might trigger +// We have to resort to TLS variable to save g(R10). +// One reason is that external code might trigger // SIGSEGV, and our runtime.sigtramp don't even know we -// are in external code, and will continue to use R10/R9, +// are in external code, and will continue to use R10, // this might as well result in another SIGSEGV. // Note: all three functions will clobber R0, and the last // two can be called from 5c ABI code. @@ -724,7 +724,7 @@ TEXT runtime·load_g(SB),NOSPLIT,$0 MOVW 0(R0), g RET -// void setg_gcc(M*, G*); set m and g called from gcc. +// void setg_gcc(G*); set g called from gcc. TEXT setg_gcc<>(SB),NOSPLIT,$0 MOVW R0, g B runtime·save_g(SB) diff --git a/src/pkg/runtime/cgo/gcc_arm.S b/src/pkg/runtime/cgo/gcc_arm.S index 336f8ca62c..2e4b3528ba 100644 --- a/src/pkg/runtime/cgo/gcc_arm.S +++ b/src/pkg/runtime/cgo/gcc_arm.S @@ -31,7 +31,7 @@ EXT(crosscall_arm1): mov r4, r0 mov r5, r1 mov r0, r2 - blx r5 // setmg(g) + blx r5 // setg(g) blx r4 // fn() pop {r4, r5, r6, r7, r8, r9, r10, r11, ip, pc} |