forth: remove JTBL

We refer to stable offset as direct numbers instead of offset to JTBL.
Simpler that way.

forth/core.fs

@@ -2,7 +2,7 @@
 : -^ SWAP - ;
 : [ INTERPRET 1 FLAGS ! ; IMMEDIATE
 : ] R> DROP ;
-: LIT JTBL 26 + , ;
+: LIT 34 , ;
 : LITS LIT SCPY ;
 : LIT< WORD LITS ; IMMEDIATE
 : _err LIT< word-not-found (print) ABORT ;
@@ -22,6 +22,7 @@
   "_": words starting with "_" are meant to be "private",
   that is, only used by their immediate surrondings.
 
+  LIT: 34 == LIT
   COMPILE: Tough one. Get addr of caller word (example above
   (br)) and then call LITN on it. )
 
@@ -49,7 +50,7 @@
 
 : CREATE
     (entry)            ( empty header with name )
-    [ JTBL 3 + LITN ]  ( push cellWord addr )
+    11                 ( 11 == cellWord )
     ,                  ( write it )
 ;
 : VARIABLE CREATE 2 ALLOT ;
@@ -86,10 +87,10 @@
 
 : (sysv)
     (entry)
-    ( JTBL+0 == sysvarWord )
+    ( 8 == sysvarWord )
-    [ JTBL LITN ] ,
+    8 ,
-    ( JTBL+42 == SYSVNXT )
+    ( 50 == SYSVNXT )
-    [ JTBL 42 + @ LITN ] DUP    ( a a )
+    [ 50 @ LITN ] DUP    ( a a )
     ( Get new sysv addr )
     @ ,                         ( a )
     ( increase current sysv counter )

forth/forth.asm

@@ -103,10 +103,11 @@
 ; *** Stable ABI ***
 ; Those jumps below are supposed to stay at these offsets, always. If they
 ; change bootstrap binaries have to be adjusted because they rely on them.
+; Those entries are referenced directly by their offset in Forth code with a
+; comment indicating what that number refers to.
 ; We're at 0 here
 	jp	forthMain
 .fill 0x08-$
-JUMPTBL:
 	jp	sysvarWord
 	jp	cellWord
 	jp	compiledWord
@@ -116,9 +117,7 @@ JUMPTBL:
 	jp	next
 	jp	chkPS
 ; 24
-NUMBER:
 	.dw	numberWord
-LIT:
 	.dw	litWord
 	.dw	INITIAL_SP
 	.dw	WORDBUF

forth/icore.fs

@@ -55,26 +55,24 @@
     ,           ( write! )
 ; IMMEDIATE
 
-: JTBL 0x08 ;
-
 : FLAGS
-    ( JTBL+44 == FLAGS )
+    ( 52 == FLAGS )
-    [ JTBL 44 + @ LITN ]
+    [ 52 @ LITN ]
 ;
 
 : (parse*)
-    ( JTBL+46 == PARSEPTR )
+    ( 54 == PARSEPTR )
-    [ JTBL 46 + @ LITN ]
+    [ 54 @ LITN ]
 ;
 
 : HERE
-    ( JTBL+48 == HERE )
+    ( 56 == HERE )
-    [ JTBL 48 + @ LITN ]
+    [ 56 @ LITN ]
 ;
 
 : CURRENT
-    ( JTBL+50 == CURRENT )
+    ( 58 == CURRENT )
-    [ JTBL 50 + @ LITN ]
+    [ 58 @ LITN ]
 ;
 
 : QUIT
@@ -107,8 +105,8 @@
 ;
 
 : C<
-    ( JTBL+40 == CINPTR )
+    ( 48 == CINPTR )
-    [ JTBL 40 + @ LITN ] _c @ EXECUTE
+    [ 48 @ LITN ] _c @ EXECUTE
 ;
 
 : C,
@@ -130,8 +128,8 @@
 ( Read word from C<, copy to WORDBUF, null-terminate, and
   return, make HL point to WORDBUF. )
 : WORD
-    ( JTBL+30 == WORDBUF )
+    ( 38 == WORDBUF )
-    [ JTBL 30 + @ LITN ]        ( a )
+    [ 38 @ LITN ]        ( a )
     _c TOWORD                   ( a c )
     BEGIN
         ( We take advantage of the fact that char MSB is
@@ -144,7 +142,7 @@
     ( a this point, PS is: a WS )
     ( null-termination is already written )
     _c 2DROP
-    [ JTBL 30 + @ LITN ]
+    [ 38 @ LITN ]
 ;
 
 : (entry)
@@ -179,8 +177,8 @@
 : BOOT
     LIT< (parse) (find) _c DROP _c (parse*) _c !
     LIT< (c<) (find) NOT IF LIT< KEY (find) _c DROP THEN
-    ( JTBL+40 == CINPTR )
+    ( 48 == CINPTR )
-    [ JTBL 40 + @ LITN ] _c !
+    [ 48 @ LITN ] _c !
     LIT< (c<$) (find) IF EXECUTE ELSE _c DROP THEN
     _c INTERPRET
 ;
@@ -188,9 +186,8 @@
 ( LITN has to be defined after the last immediate usage of
   it to avoid bootstrapping issues )
 : LITN
-    ( JTBL+24 == NUMBER )
+    ( 32 == NUMBER )
-    _c JTBL 24 _c + ,
+    32 , ,
-    ,
 ;
 
 ( : and ; have to be defined last because it can't be
@@ -200,8 +197,8 @@
 : X
     _c (entry)
     ( We cannot use LITN as IMMEDIATE because of bootstrapping
-      issues. JTBL+24 == NUMBER JTBL+6 == compiledWord )
+      issues. 32 == NUMBER 14 == compiledWord )
-    [ JTBL 24 + , JTBL 6 + , ] ,
+    [ 32 , 14 , ] ,
     BEGIN
     _c WORD
     (find)

forth/z80a.fs

@@ -241,19 +241,19 @@
     SPLITB A, A,
 ;
 
-( JTBL+18 == next )
+( 26 == next )
-: JPNEXT, [ JTBL 18 + LITN ] JPnn, ;
+: JPNEXT, 26 JPnn, ;
 
 : CODE
     ( same as CREATE, but with native word )
     (entry)
-    ( JTBL+15 == next )
+    ( 23 == nativeWord )
-    [ JTBL 15 + LITN ] ,
+    23 ,
 ;
 
 : ;CODE JPNEXT, ;
 
 
 ( Routines )
-( JTBL+21 == next )
+( 29 == chkPS )
-: chkPS, [ JTBL 21 + LITN ] CALLnn, ;
+: chkPS, 29 CALLnn, ;

forth/z80c.fs

@@ -283,13 +283,13 @@ CODE J
 CODE >R
     HL POPqq,
     chkPS,
-    ( JTBL+9 == pushRS )
+    ( 17 == pushRS )
-    JTBL 9 + CALLnn,
+    17 CALLnn,
 ;CODE
 
 CODE R>
-    ( JTBL+12 == popRS )
+    ( 20 == popRS )
-    JTBL 12 + CALLnn,
+    20 CALLnn,
     HL PUSHqq,
 ;CODE
 
@@ -316,23 +316,23 @@ CODE BYE
 ;CODE
 
 CODE (resSP)
-    ( INITIAL_SP == JTBL+28 )
+    ( INITIAL_SP == 36 )
-    SP JTBL 28 + @ LDdd(nn),
+    SP 36 @ LDdd(nn),
 ;CODE
 
 CODE (resRS)
-    ( RS_ADDR == JTBL+38 )
+    ( RS_ADDR == 46 )
-    IX JTBL 38 + @ LDddnn,
+    IX 46 @ LDddnn,
 ;CODE
 
 CODE SCMP
     DE  POPqq,
     HL  POPqq,
     chkPS,
-    ( JTBL+35 == strcmp )
+    ( 43 == strcmp )
-    JTBL 35 + CALLnn,
+    43 CALLnn,
-    ( JTBL+32 == flagsToBC )
+    ( 40 == flagsToBC )
-    JTBL 32 + CALLnn,
+    40 CALLnn,
     BC PUSHqq,
 ;CODE
 
@@ -342,8 +342,8 @@ CODE CMP
     chkPS,
     A ORr,      ( clear carry )
     DE SBCHLss,
-    ( JTBL+32 == flagsToBC )
+    ( 40 == flagsToBC )
-    JTBL 32 + CALLnn,
+    40 CALLnn,
     BC PUSHqq,
 ;CODE