From 24c0e27b1bb9d46aa6e4c9fbe8a414fe90c48f8c Mon Sep 17 00:00:00 2001 From: Kartik Agaram Date: Sat, 9 Mar 2019 21:31:32 -0800 Subject: 4999 Fix CI. pack.subx was passing in emulation but not natively. Commit 4954 on Feb 10 was a real dud. First I find I forgot to reclaim space for locals (commit 4996). Now I find I haven't been tracking registers properly either. --- subx/072slice.subx | 4 +++- subx/apps/crenshaw2-1 | Bin 17760 -> 17762 bytes subx/apps/crenshaw2-1b | Bin 18319 -> 18321 bytes subx/apps/factorial | Bin 16678 -> 16680 bytes subx/apps/handle | Bin 17453 -> 17455 bytes subx/apps/hex | Bin 20739 -> 20741 bytes subx/apps/pack | Bin 21169 -> 21171 bytes 7 files changed, 3 insertions(+), 1 deletion(-) diff --git a/subx/072slice.subx b/subx/072slice.subx index a47ef493..d9576d89 100644 --- a/subx/072slice.subx +++ b/subx/072slice.subx @@ -800,12 +800,13 @@ test-write-slice: # - construct a 'maximal slice' and pass it to write-slice # - flush the buffered-file and pass the stream directly to its fd (disabling buffering) # we'll go with the first way for now -write-stream-buffered: # f : (address buffered-file), s : (address stream) +write-stream-buffered: # f : (address buffered-file), s : (address stream) -> # . prolog 55/push-EBP 89/copy 3/mod/direct 5/rm32/EBP . . . 4/r32/ESP . . # copy ESP to EBP # . save registers 50/push-EAX + 51/push-ECX 56/push-ESI # ESI = s 8b/copy 1/mod/*+disp8 5/rm32/EBP . . . 6/r32/ESI 0xc/disp8 . # copy *(EBP+12) to ESI @@ -832,6 +833,7 @@ $write-stream-buffered:end: 81 0/subop/add 3/mod/direct 4/rm32/ESP . . . . . 8/imm32 # add to ESP # . restore registers 5e/pop-to-ESI + 59/pop-to-ECX 58/pop-to-EAX # . epilog 89/copy 3/mod/direct 4/rm32/ESP . . . 5/r32/EBP . . # copy EBP to ESP diff --git a/subx/apps/crenshaw2-1 b/subx/apps/crenshaw2-1 index 0a3d59ee..919ebb8a 100755 Binary files a/subx/apps/crenshaw2-1 and b/subx/apps/crenshaw2-1 differ diff --git a/subx/apps/crenshaw2-1b b/subx/apps/crenshaw2-1b index 931bff4c..b9867201 100755 Binary files a/subx/apps/crenshaw2-1b and b/subx/apps/crenshaw2-1b differ diff --git a/subx/apps/factorial b/subx/apps/factorial index 9bef95a7..39ce244a 100755 Binary files a/subx/apps/factorial and b/subx/apps/factorial differ diff --git a/subx/apps/handle b/subx/apps/handle index 84b1bcf1..724d1f02 100755 Binary files a/subx/apps/handle and b/subx/apps/handle differ diff --git a/subx/apps/hex b/subx/apps/hex index 3b183506..abbdfb23 100755 Binary files a/subx/apps/hex and b/subx/apps/hex differ diff --git a/subx/apps/pack b/subx/apps/pack index 69af4226..e3e7ea66 100755 Binary files a/subx/apps/pack and b/subx/apps/pack differ -- cgit 1.4.1-2-gfad0