diff options
| author | Russ Cox <rsc@golang.org> | 2010-07-17 16:54:03 -0700 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2010-07-17 16:54:03 -0700 |
| commit | 2d6ae385e1c097a061fdc6de9e771d7ad9dbcc0e (patch) | |
| tree | afe29059cf64c087aada3ea31b9d84eac27edbc3 /src/pkg/runtime/linux | |
| parent | bc2ee6b8c641010a576aa991c84120e0b991f2c3 (diff) | |
| download | go-2d6ae385e1c097a061fdc6de9e771d7ad9dbcc0e.tar.xz | |
linux/386: use Xen-friendly ELF TLS instruction sequence
Fixes #465.
R=iant
CC=golang-dev
https://golang.org/cl/1665051
Diffstat (limited to 'src/pkg/runtime/linux')
| -rw-r--r-- | src/pkg/runtime/linux/386/sys.s | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/pkg/runtime/linux/386/sys.s b/src/pkg/runtime/linux/386/sys.s index 57ffc4aa4f..35c3780cef 100644 --- a/src/pkg/runtime/linux/386/sys.s +++ b/src/pkg/runtime/linux/386/sys.s @@ -161,12 +161,12 @@ TEXT clone(SB),7,$0 // In child on new stack. Reload registers (paranoia). MOVL 0(SP), BX // m MOVL 4(SP), DX // g - MOVL 8(SP), CX // fn + MOVL 8(SP), SI // fn MOVL AX, m_procid(BX) // save tid as m->procid // set up ldt 7+id to point at m->tls. - // m->tls is at m+40. newosproc left the id in tls[0]. + // newosproc left the id in tls[0]. LEAL m_tls(BX), BP MOVL 0(BP), DI ADDL $7, DI // m0 is LDT#7. count up. @@ -186,7 +186,7 @@ TEXT clone(SB),7,$0 MOVL DX, g(AX) MOVL BX, m(AX) - CALL stackcheck(SB) // smashes AX + CALL stackcheck(SB) // smashes AX, CX MOVL 0(DX), DX // paranoia; check they are not nil MOVL 0(BX), BX @@ -195,7 +195,7 @@ TEXT clone(SB),7,$0 CALL emptyfunc(SB) POPAL - CALL CX // fn() + CALL SI // fn() CALL exit1(SB) MOVL $0x1234, 0x1005 RET @@ -247,8 +247,11 @@ TEXT setldt(SB),7,$32 * To accommodate that rewrite, we translate * the address here and bump the limit to 0xffffffff (no limit) * so that -8(GS) maps to 0(address). + * Also, the final 0(GS) (current 8(CX)) has to point + * to itself, to mimic ELF. */ ADDL $0x8, CX // address + MOVL CX, 0(CX) // set up user_desc LEAL 16(SP), AX // struct user_desc |