blk/328

@@ -1,16 +1,14 @@
 CODE S=
-    DE POPqq, HL POPqq, chkPS,
-    HL DECss, DE DECss,
-    LDA(DE),
-    (HL) CPr,
-    IFZ, ( same size? )
-        B A LDrr, ( loop A times )
+    DE  POPqq,
+    HL  POPqq,
+    chkPS,
     BEGIN,
-            HL INCss, DE INCss,
         LDA(DE),
         (HL) CPr,
         JRNZ, BREAK, ( not equal? break early. NZ is set. )
-        DJNZ, AGAIN,
-    THEN,
+        A ORr,   ( if our char is null, stop )
+        HL INCss,
+        DE INCss,
+    JRNZ, AGAIN,
     PUSHZ,
 ;CODE

blk/367

@@ -1,10 +0,0 @@
-: IMMEDIATE
-    CURRENT @ 1-
-    DUP C@ 128 OR SWAP C! ;
-: IMMED? 1- C@ 0x80 AND ;
-: +! TUCK @ + SWAP ! ;
-: -^ SWAP - ;
-: / /MOD NIP ;
-: MOD /MOD DROP ;
-: ALLOT HERE +! ;
-: LEAVE R> R> DROP I 1- >R >R ;

blk/368

@@ -0,0 +1,12 @@
+: +! TUCK @ + SWAP ! ;
+: [entry] ( w -- )
+    H@ SWAP
+    BEGIN C@+ ( w+1 c ) ?DUP IF C, 0 ELSE 1 THEN UNTIL DROP
+    H@ SWAP - ( sz )
+    ( write prev value )
+    H@ CURRENT @ - ,
+    C, ( write size )
+    H@ CURRENT !
+;
+
+: (entry) WORD [entry] ;

blk/369

@@ -1,12 +1,11 @@
-: '? WORD FIND ;
-: '
-    '? (?br) [ 4 , ] EXIT
-    LIT< (wnf) FIND DROP EXECUTE
-;
-: ROLL
-    ?DUP NOT IF EXIT THEN
-    1+ DUP PICK          ( n val )
-    SWAP 2 * (roll)      ( val )
-    NIP ;
-: 2OVER 3 PICK 3 PICK ;
-: 2SWAP 3 ROLL 3 ROLL ;
+: IMMEDIATE
+    CURRENT @ 1-
+    DUP C@ 128 OR SWAP C! ;
+: IMMED? 1- C@ 0x80 AND ;
+: -^ SWAP - ;
+: / /MOD NIP ;
+: MOD /MOD DROP ;
+: ALLOT HERE +! ;
+: CREATE (entry) 11 ( 11 == cellWord ) C, ;
+: VARIABLE CREATE 2 ALLOT ;
+: LEAVE R> R> DROP I 1- >R >R ;

blk/370

@@ -1,14 +1,12 @@
-: MOVE ( a1 a2 u -- )
-    ( u ) 0 DO ( a1 a2 )
-        SWAP C@+ ( a2 a1+1 x )
-        ROT C!+ ( a1+1 a2+1 )
-    LOOP 2DROP ;
-: MOVE- ( a1 a2 u -- )
-    TUCK + 1- ( a1 u a2+u-1 )
-    ROT 2 PICK + 1- ( u a2+u-1 a1+u-1 )
-    ROT ( u ) 0 DO ( a2 a1 )
-        C@- ( a2 a1-1 x )
-        ROT C!- ( a1-1 a2-1 ) SWAP ( a2 a1 )
-    LOOP 2DROP ;
-: MOVE, ( a u -- ) H@ OVER ALLOT SWAP MOVE ;
-: PREV 3 - DUP @ - ;
+: '? WORD FIND ;
+: '
+    '? (?br) [ 4 , ] EXIT
+    LIT< (wnf) FIND DROP EXECUTE
+;
+: ROLL
+    ?DUP NOT IF EXIT THEN
+    1+ DUP PICK          ( n val )
+    SWAP 2 * (roll)      ( val )
+    NIP ;
+: 2OVER 3 PICK 3 PICK ;
+: 2SWAP 3 ROLL 3 ROLL ;

blk/371

@@ -1,10 +1,14 @@
-: [entry] ( w -- )
-    1- C@+ ( w+1 len ) TUCK MOVE, ( len )
-    ( write prev value )
-    H@ CURRENT @ - ,
-    C, ( write size )
-    H@ CURRENT !
-;
-: (entry) WORD [entry] ;
-: CREATE (entry) 11 ( 11 == cellWord ) C, ;
-: VARIABLE CREATE 2 ALLOT ;
+: MOVE ( a1 a2 u -- )
+    ( u ) 0 DO ( a1 a2 )
+        SWAP C@+ ( a2 a1+1 x )
+        ROT C!+ ( a1+1 a2+1 )
+    LOOP 2DROP ;
+: MOVE- ( a1 a2 u -- )
+    TUCK + 1- ( a1 u a2+u-1 )
+    ROT 2 PICK + 1- ( u a2+u-1 a1+u-1 )
+    ROT ( u ) 0 DO ( a2 a1 )
+        C@- ( a2 a1-1 x )
+        ROT C!- ( a1-1 a2-1 ) SWAP ( a2 a1 )
+    LOOP 2DROP ;
+: MOVE, ( a u -- ) H@ OVER ALLOT SWAP MOVE ;
+: PREV 3 - DUP @ - ;

emul/stage.c

@@ -42,8 +42,7 @@ static uint8_t iord_stdio()
 
 static void iowr_stdio(uint8_t val)
 {
-    // uncomment when you need to debug staging
-    // putc(val, stderr);
+    // we don't output stdout in stage0
 }
 
 static void iowr_here(uint8_t val)