diff options
| author | cinap_lenrek <cinap_lenrek@felloff.net> | 2015-03-25 13:56:04 +0100 |
|---|---|---|
| committer | cinap_lenrek <cinap_lenrek@felloff.net> | 2015-03-25 13:56:04 +0100 |
| commit | 1cff9ab4e8412d5c6b6a3cbca720fbc4bcccecd9 (patch) | |
| tree | e458021ef7f3e20ff316776279a026698a3904e9 | |
| parent | a7925e3ecb2b58c19e52c7ea36f041aab1407398 (diff) | |
| download | plan9front-1cff9ab4e8412d5c6b6a3cbca720fbc4bcccecd9.tar.xz | |
ape: fix main9 for mips
| -rw-r--r-- | sys/src/ape/lib/ap/mips/main9.s | 18 | ||||
| -rw-r--r-- | sys/src/ape/lib/ap/mips/main9p.s | 15 |
2 files changed, 12 insertions, 21 deletions
diff --git a/sys/src/ape/lib/ap/mips/main9.s b/sys/src/ape/lib/ap/mips/main9.s index ef36522de..12125fdb2 100644 --- a/sys/src/ape/lib/ap/mips/main9.s +++ b/sys/src/ape/lib/ap/mips/main9.s @@ -10,26 +10,24 @@ TEXT _main(SB), 1, $(16+NPRIVATES*4) /* _tos = arg */ MOVW R1, _tos(SB) -/* - MOVW $0,FCR31 - NOR R0,R0 - MOVD $0.5, F26 - SUBD F26, F26, F24 - ADDD F26, F26, F28 - ADDD F28, F28, F30 -*/ - MOVW $12(SP), R1 + + MOVW $p-68(SP), R1 MOVW R1, _errnoloc(SB) - MOVW $16(SP), R1 + ADDU $4, R1 MOVW R1, _privates(SB) MOVW $NPRIVATES, R1 MOVW R1, _nprivates(SB) JAL _envsetup(SB) + + /* main(argc, argv, environ); */ MOVW inargc-4(FP), R1 MOVW $inargv+0(FP), R2 + MOVW environ(SB), R3 MOVW R1, 4(R29) MOVW R2, 8(R29) + MOVW R3, 12(R29) + JAL main(SB) loop: MOVW R1, 4(R29) diff --git a/sys/src/ape/lib/ap/mips/main9p.s b/sys/src/ape/lib/ap/mips/main9p.s index 195fba08b..1339b3267 100644 --- a/sys/src/ape/lib/ap/mips/main9p.s +++ b/sys/src/ape/lib/ap/mips/main9p.s @@ -10,19 +10,12 @@ TEXT _mainp(SB), 1, $(16+NPRIVATES*4) /* _tos = arg */ MOVW R1, _tos(SB) -/* - MOVW $0,FCR31 - NOR R0,R0 - MOVD $0.5, F26 - SUBD F26, F26, F24 - ADDD F26, F26, F28 - ADDD F28, F28, F30 -*/ - MOVW $12(SP), R1 + + MOVW $p-68(SP), R1 MOVW R1, _errnoloc(SB) - MOVW $16(SP), R1 + ADDU $4, R1 MOVW R1, _privates(SB) - MOVW $NPRIVATES, R1 + MOVW $(NPRIVATES-1), R1 MOVW R1, _nprivates(SB) /* _profmain(); */ |