drv/acia: latest bells and whistles

drv/acia.fs

@@ -29,7 +29,7 @@ ACIA_MEM: Address in memory that can be used variables shared
 
 : ACIA$
     H@ DUP DUP ACIA( ! ACIAR> !
-    1 + ACIAW> ! ( write index starts one position later )
+    1+ ACIAW> ! ( write index starts one position later )
     ACIABUFSZ ALLOT
     H@ ACIA) !
 ( setup ACIA
@@ -49,7 +49,7 @@ ACIA_MEM: Address in memory that can be used variables shared
 
 : KEY
     ( inc then fetch )
-    ACIAR> @ 1 + DUP ACIA) @ = IF
+    ACIAR> @ 1+ DUP ACIA) @ = IF
         DROP ACIA( @
     THEN
 

drv/acia.z80

@@ -20,17 +20,17 @@ ACIA_MEM
 	( Read our character from ACIA into our BUFIDX )
     ACIA_CTL INAn,
     0x01 ANDn,   ( is ACIA rcv buf full? )
-    JRZ, L2 FWR ( end, no, wrong interrupt cause. )
-
+    IFNZ,
+        ( correct interrupt cause )
         ( +2 == ACIAW> )
-    ACIA_MEM 2 + LDHL(nn),
+        ACIA_MEM 2+ LDHL(nn),
         ( is it == to ACIAR>? )
         ( +0 == ACIAR> )
         DE ACIA_MEM LDdd(nn),
         ( carry cleared from ANDn above )
         DE SBCHLss,
-    JRZ, L3 FWR ( end, buffer full )
-
+        IFNZ, ( buffer full? )
+            ( no, continue )
             DE ADDHLss, ( restore ACIAW> )
             ( buffer not full, let's write )
             ACIA_IO INAn,
@@ -39,18 +39,19 @@ ACIA_MEM
             ( advance W> )
             HL INCss,
             ( +2 == ACIAW> )
-    ACIA_MEM 2 + LD(nn)HL,
+            ACIA_MEM 2+ LD(nn)HL,
             ( +6 == ACIA) )
             DE ACIA_MEM 6 + LDdd(nn),
             DE SUBHLss,
-    JRNZ, L4 FWR ( skip )
-    ( end of buffer reached )
+            IFZ, ( end of buffer reached? )
+                ( yes )
                 ( +4 == ACIA( )
                 ACIA_MEM 4 + LDHL(nn),
                 ( +2 == ACIAW> )
-    ACIA_MEM 2 + LD(nn)HL,
-L4 FSET ( skip )
-L3 FSET L2 FSET ( end )
+                ACIA_MEM 2+ LD(nn)HL,
+            THEN,
+        THEN,
+    THEN,
 
     DE POPqq,
     HL POPqq,