qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-19 00:54:42 -07:00
Code Releases Activity

runtime: fix arm5 softfloat build

Browse Source 
runtime._sfloat2 now returns the lr value on the stack, not R0.

Credit to Russ Cox for the fix.

LGTM=rsc
R=rsc
CC=golang-codereviews
https://golang.org/cl/133120045
This commit is contained in:
Dave Cheney 2014-08-28 12:41:32 +10:00
parent 45c819b2da
commit 433d643732
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/pkg/runtime/vlop_arm.s
View File

@ -47,12 +47,12 @@ TEXT _mulv(SB), NOSPLIT, $0
// trampoline for _sfloat2. passes LR as arg0 and // trampoline for _sfloat2. passes LR as arg0 and
// saves registers R0-R13 and CPSR on the stack. R0-R12 and CPSR flags can // saves registers R0-R13 and CPSR on the stack. R0-R12 and CPSR flags can
// be changed by _sfloat2. // be changed by _sfloat2.
TEXT _sfloat(SB), NOSPLIT, $64-0 // 4 arg + 14*4 saved regs + cpsr TEXT _sfloat(SB), NOSPLIT, $68-0 // 4 arg + 14*4 saved regs + cpsr + return value
MOVW R14, 4(R13) MOVW R14, 4(R13)
MOVW R0, 8(R13) MOVW R0, 8(R13)
MOVW $12(R13), R0 MOVW $12(R13), R0
MOVM.IA.W [R1-R12], (R0) MOVM.IA.W [R1-R12], (R0)
MOVW $68(R13), R1 // correct for frame size MOVW $72(R13), R1 // correct for frame size
MOVW R1, 60(R13) MOVW R1, 60(R13)
WORD $0xe10f1000 // mrs r1, cpsr WORD $0xe10f1000 // mrs r1, cpsr
MOVW R1, 64(R13) MOVW R1, 64(R13)
@ -78,6 +78,7 @@ TEXT _sfloat(SB), NOSPLIT, $64-0 // 4 arg + 14*4 saved regs + cpsr
MOVW $1, R1 MOVW $1, R1
MOVW R1, m_softfloat(R8) MOVW R1, m_softfloat(R8)
BL runtime·_sfloat2(SB) BL runtime·_sfloat2(SB)
MOVW 68(R13), R0
MOVW g_m(g), R8 MOVW g_m(g), R8
MOVW m_locks(R8), R1 MOVW m_locks(R8), R1
SUB $1, R1 SUB $1, R1