diff --git a/blk/243 b/blk/243 index 6f1a1ce..9306a8d 100644 --- a/blk/243 +++ b/blk/243 @@ -3,10 +3,9 @@ : BJP, BIN( @ + JPnn, ; : BJPcc, BIN( @ + JPccnn, ; +VARIABLE lblchkPS +: chkPS, lblchkPS @ CALLnn, ; ( chkPS, B305 ) : JPNEXT, 26 BJP, ; ( 26 == next ) - -: chkPS, L4 @ CALLnn, ; ( chkPS, B305 ) - : CODE ( same as CREATE, but with native word ) (entry) 0 C, ( 0 == native ) ; : ;CODE JPNEXT, ; diff --git a/blk/282 b/blk/282 index adc13e8..77ff6a2 100644 --- a/blk/282 +++ b/blk/282 @@ -1,3 +1,4 @@ +VARIABLE lblofl VARIABLE lblpushRS VARIABLE lblexec 1 53 LOADR+ @@ -9,8 +10,3 @@ - - - - - diff --git a/blk/297 b/blk/297 index 0c9ec79..2cb35db 100644 --- a/blk/297 +++ b/blk/297 @@ -1,4 +1,4 @@ -L4 BSET PC ORG @ 0x12 + ! ( pushRS ) +lblpushRS BSET PC ORG @ 0x12 + ! ( pushRS ) IX INCss, IX INCss, 0 IX+ L LDIXYr, diff --git a/blk/298 b/blk/298 index 8c4493d..480bce6 100644 --- a/blk/298 +++ b/blk/298 @@ -1,5 +1,5 @@ 6 A, '(' A, 'u' A, 'f' A, 'l' A, 'w' A, ')' A, -L2 BSET ( abortUnderflow ) +lblofl BSET ( abortUnderflow ) HL PC 7 - LDddnn, DE RAMSTART 0x02 + LDdd(nn), ( RAM+02 == CURRENT ) 0x03 BCALL, ( find ) diff --git a/blk/300 b/blk/300 index 04cef3b..b3715cc 100644 --- a/blk/300 +++ b/blk/300 @@ -5,11 +5,11 @@ PC ORG @ 0x1b + ! ( next ) ( Before we continue: are stacks within bounds? ) ( PS ) HL PS_ADDR LDddnn, SP SUBHLss, - JRC, L2 BWR ( abortUnderflow-B298 ) + JRC, lblofl BWR ( abortUnderflow-B298 ) ( RS ) IX PUSHqq, HL POPqq, DE RS_ADDR LDddnn, DE SUBHLss, - JRC, L2 BWR ( IX < RS_ADDR? abortUnderflow-B298 ) + JRC, lblofl BWR ( IX < RS_ADDR? abortUnderflow-B298 ) E 0 IY+ LDrIXY, D 1 IY+ LDrIXY, IY INCss, IY INCss, diff --git a/blk/301 b/blk/301 index 7a6b45c..530932b 100644 --- a/blk/301 +++ b/blk/301 @@ -1,4 +1,4 @@ -L3 BSET PC ORG @ 0x34 + ! ( execute. DE -> wordref ) +lblexec BSET PC ORG @ 0x34 + ! ( execute. DE -> wordref ) ( We don't apply BIN( reliably on stable ABI stuff, we might need to adjust addr. Ugly, but well... ) BIN( @ [IF] diff --git a/blk/303 b/blk/303 index 6aecef4..205d3d0 100644 --- a/blk/303 +++ b/blk/303 @@ -3,13 +3,13 @@ 2. Set new IP to the second atom of the list 3. Execute the first atom of the list. ) IY PUSHqq, HL POPqq, ( <-- IP ) - L4 @ ( pushRS ) CALLnn, + lblpushRS @ ( pushRS ) CALLnn, EXDEHL, ( HL points to PFA ) ( While we inc, dereference into DE for execute call later. ) LDDE(HL), HL INCss, HL PUSHqq, IY POPqq, ( --> IP ) - JR, L3 BWR ( execute-B301 ) + JR, lblexec BWR ( execute-B301 ) diff --git a/blk/305 b/blk/305 index 8779003..506c636 100644 --- a/blk/305 +++ b/blk/305 @@ -1,4 +1,4 @@ -L4 BSET ( chkPS ) +lblchkPS BSET ( chkPS ) ( Note that you only need to call this in words that push back to PSP. If they don't, calling chkPS is redundant with check in next ) @@ -9,7 +9,7 @@ L4 BSET ( chkPS ) SP SUBHLss, EXX, CNC RETcc, ( PS_ADDR >= SP? good ) - JR, L2 BWR ( abortUnderflow-B298 ) + JR, lblofl BWR ( abortUnderflow-B298 ) diff --git a/blk/306 b/blk/306 index 360be1c..a8ea472 100644 --- a/blk/306 +++ b/blk/306 @@ -5,7 +5,7 @@ CODE EXECUTE DE POPqq, chkPS, - JR, L3 BWR ( execute-B301 ) + JR, lblexec BWR ( execute-B301 ) ( a b c -- b c a ) CODE ROT diff --git a/blk/310 b/blk/310 index d169433..0860d0d 100644 --- a/blk/310 +++ b/blk/310 @@ -10,7 +10,7 @@ CODE PICK EXDEHL, HL PS_ADDR LDddnn, DE SUBHLss, - CC L2 @ JPccnn, ( abortUnderflow-B298 ) + CC lblofl @ JPccnn, ( abortUnderflow-B298 ) BC PUSHqq, ;CODE