commit 6cc549a08e7809ae3d2a04210346598720e5d76e
parent a726e8c5c4676473be99e617fc9638f7d678d9c3
Author: Alexander Burger <abu@software-lab.de>
Date: Tue, 11 Jun 2013 11:10:19 +0200
dto.
Diffstat:
3 files changed, 39 insertions(+), 43 deletions(-)
diff --git a/lib/map b/lib/map
@@ -1,5 +1,5 @@
-! (2884 . "@src64/flow.l")
-$ (2986 . "@src64/flow.l")
+! (2880 . "@src64/flow.l")
+$ (2982 . "@src64/flow.l")
% (2572 . "@src64/big.l")
& (2807 . "@src64/big.l")
* (2389 . "@src64/big.l")
@@ -46,7 +46,7 @@ bool (1724 . "@src64/flow.l")
box (828 . "@src64/flow.l")
box? (1131 . "@src64/sym.l")
by (1669 . "@src64/apply.l")
-bye (3434 . "@src64/flow.l")
+bye (3430 . "@src64/flow.l")
bytes (2973 . "@src64/subr.l")
caaaar (271 . "@src64/subr.l")
caaadr (288 . "@src64/subr.l")
@@ -62,7 +62,7 @@ caddar (409 . "@src64/subr.l")
cadddr (435 . "@src64/subr.l")
caddr (156 . "@src64/subr.l")
cadr (45 . "@src64/subr.l")
-call (3086 . "@src64/flow.l")
+call (3082 . "@src64/flow.l")
car (5 . "@src64/subr.l")
case (1965 . "@src64/flow.l")
catch (2467 . "@src64/flow.l")
@@ -115,7 +115,7 @@ diff (2590 . "@src64/subr.l")
dir (3154 . "@src64/main.l")
dm (545 . "@src64/flow.l")
do (2141 . "@src64/flow.l")
-e (2947 . "@src64/flow.l")
+e (2943 . "@src64/flow.l")
echo (4434 . "@src64/io.l")
env (609 . "@src64/main.l")
eof (3549 . "@src64/io.l")
@@ -141,7 +141,7 @@ flip (1700 . "@src64/subr.l")
flush (5143 . "@src64/io.l")
fold (3521 . "@src64/sym.l")
for (2230 . "@src64/flow.l")
-fork (3260 . "@src64/flow.l")
+fork (3256 . "@src64/flow.l")
format (2089 . "@src64/big.l")
free (1960 . "@src64/db.l")
from (3568 . "@src64/io.l")
@@ -169,12 +169,12 @@ inc (2256 . "@src64/big.l")
index (2638 . "@src64/subr.l")
info (3056 . "@src64/main.l")
intern (1007 . "@src64/sym.l")
-ipid (3205 . "@src64/flow.l")
+ipid (3201 . "@src64/flow.l")
isa (967 . "@src64/flow.l")
job (1429 . "@src64/flow.l")
journal (971 . "@src64/db.l")
key (3401 . "@src64/io.l")
-kill (3237 . "@src64/flow.l")
+kill (3233 . "@src64/flow.l")
last (2045 . "@src64/subr.l")
le0 (2693 . "@src64/big.l")
length (2742 . "@src64/subr.l")
@@ -239,7 +239,7 @@ on (1717 . "@src64/sym.l")
onOff (1747 . "@src64/sym.l")
one (1780 . "@src64/sym.l")
open (4360 . "@src64/io.l")
-opid (3221 . "@src64/flow.l")
+opid (3217 . "@src64/flow.l")
opt (3345 . "@src64/main.l")
or (1640 . "@src64/flow.l")
out (4236 . "@src64/io.l")
@@ -324,7 +324,7 @@ tail (1912 . "@src64/subr.l")
tell (3285 . "@src64/io.l")
text (1407 . "@src64/sym.l")
throw (2493 . "@src64/flow.l")
-tick (3173 . "@src64/flow.l")
+tick (3169 . "@src64/flow.l")
till (3635 . "@src64/io.l")
time (2861 . "@src64/main.l")
touch (1181 . "@src64/sym.l")
diff --git a/src64/flow.l b/src64/flow.l
@@ -2846,25 +2846,21 @@
jmp resumeCoroutine # Resume
(code 'cutLocalCX 0)
- cmp C (X) # Any locals?
- if ne # Yes
- do
- ld X (X) # Frame pointer
- cmp C (X) # More locals?
- until eq # No
- ld (X) 0 # Cut off
- end
+ do
+ cmp C (X) # More locals?
+ while ne # Yes
+ ld X (X) # Next frame pointer
+ loop
+ ld (X) 0 # Cut off
ret
(code 'joinLocalCX 0)
- cmp C (X) # Any locals?
- if ne # Yes
- do
- ld X (X) # Frame pointer
- null (X) # More locals?
- until z # No
- ld (X) C # Join
- end
+ do
+ null (X) # More locals?
+ while nz # Yes
+ ld X (X) # Next frame pointer
+ loop
+ ld (X) C # Join
ret
(code 'closeCoFilesC 0)
diff --git a/src64/tags b/src64/tags
@@ -1110,23 +1110,23 @@ sys/x86-64.linux.defs.l,1959
resumeCoroutine2576,60042
doYield2729,65274
cutLocalCX2848,68623
-joinLocalCX2859,68829
-closeCoFilesC2870,69031
-doBreak2884,69294
-brkLoadE_E2892,69446
-doE2947,71046
-doTrace2986,71812
-traceCY3058,73727
-doCall3086,74215
-doTick3173,76407
-doIpid3205,77404
-doOpid3221,77692
-doKill3237,77987
-doFork3260,78422
-forkLispX_FE3273,78643
-doBye3434,83203
-byeE3446,83375
-finishE3458,83686
+joinLocalCX2857,68777
+closeCoFilesC2866,68928
+doBreak2880,69191
+brkLoadE_E2888,69343
+doE2943,70943
+doTrace2982,71709
+traceCY3054,73624
+doCall3082,74112
+doTick3169,76304
+doIpid3201,77301
+doOpid3217,77589
+doKill3233,77884
+doFork3256,78319
+forkLispX_FE3269,78540
+doBye3430,83100
+byeE3442,83272
+finishE3454,83583
./subr.l,2147
doCar5,71