xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

ape: fix _main stack setup for arm (_privates and _errnoloc was inside argv)

Browse source
This commit is contained in:
cinap_lenrek 2013-06-08 23:53:28 +02:00
parent 4e81aab690
commit b38d197995
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sys/src/ape/lib/ap/arm/main9.s
View file

@ -15,14 +15,18 @@ TEXT _main(SB), 1, $(16+NPRIVATES*4)
/* _tos = arg */
MOVW R(arg), _tos(SB)
MOVW $errno+12(SP), R1
MOVW $errno-68(SP), R1
MOVW R1, _errnoloc(SB)
MOVW $private+16(SP), R1
MOVW $private-64(SP), R1
MOVW R1, _privates(SB)
MOVW $NPRIVATES, R1
MOVW R1, _nprivates(SB)
BL _envsetup(SB)
/* main(argc, argv, environ); */
MOVW environ(SB), R(arg)
MOVW R(arg), 12(R(sp))
MOVW $inargv+0(FP), R(arg)
MOVW R(arg), 8(R(sp))
MOVW inargc-4(FP), R(arg)

8
sys/src/ape/lib/ap/arm/main9p.s
View file

@ -15,9 +15,9 @@ TEXT _mainp(SB), 1, $(16+NPRIVATES*4)
/* _tos = arg */
MOVW R(arg), _tos(SB)
MOVW $errno+12(SP), R1
MOVW $errno-68(SP), R1
MOVW R1, _errnoloc(SB)
MOVW $private+16(SP), R1
MOVW $private-64(SP), R1
MOVW R1, _privates(SB)
MOVW $NPRIVATES, R1
MOVW R1, _nprivates(SB)
@ -33,12 +33,12 @@ TEXT _mainp(SB), 1, $(16+NPRIVATES*4)
BL _envsetup(SB)
/* main(argc, argv, environ); */
MOVW environ(SB), R(arg)
MOVW R(arg), 12(R(sp))
MOVW $inargv+0(FP), R(arg)
MOVW R(arg), 8(R(sp))
MOVW inargc-4(FP), R(arg)
MOVW R(arg), 4(R(sp))
MOVW environ(SB), R(arg)
MOVW R(arg), 8(R(sp))
BL main(SB)
loop:
MOVW R(arg), 4(R(sp))