: C@ @ ;
: C, , ;
-: DEPTH PSP@ PSP0 @ - ;
+: DEPTH PSP@ PSP0 - ;
: '\n' 10 ;
: BL 32 ;
: LITERAL IMMEDIATE ['] LIT , , ;
-: ' BL WORD FIND >CFA ;
+: ' BL WORD FIND DROP ;
: CHAR BL WORD 1+ @ ;
: [CHAR] IMMEDIATE
: [COMPILE] IMMEDIATE
BL WORD \ get the next word
- FIND \ find it in the dictionary
- >CFA \ get its codeword
+ FIND DROP \ find it in the dictionary
, \ and compile that
;
: IF IMMEDIATE
['] 0BRANCH , \ compile 0BRANCH
- HERE @ \ save location of the offset on the stack
+ HERE \ save location of the offset on the stack
0 , \ compile a dummy offset
;
: THEN IMMEDIATE
DUP
- HERE @ SWAP - \ calculate the offset from the address saved on the stack
+ HERE SWAP - \ calculate the offset from the address saved on the stack
SWAP ! \ store the offset in the back-filled location
;
: ELSE IMMEDIATE
['] BRANCH , \ definite branch to just over the false-part
- HERE @ \ save location of the offset on the stack
+ HERE \ save location of the offset on the stack
0 , \ compile a dummy offset
SWAP \ now back-fill the original (IF) offset
DUP \ same as for THEN word above
- HERE @ SWAP -
+ HERE SWAP -
SWAP !
;
: BEGIN IMMEDIATE
- HERE @ \ save location on the stack
+ HERE \ save location on the stack
;
: UNTIL IMMEDIATE
['] 0BRANCH , \ compile 0BRANCH
- HERE @ - \ calculate the offset from the address saved on the stack
+ HERE - \ calculate the offset from the address saved on the stack
, \ compile the offset here
;
: AGAIN IMMEDIATE
['] BRANCH , \ compile BRANCH
- HERE @ - \ calculate the offset back
+ HERE - \ calculate the offset back
, \ compile the offset here
;
: WHILE IMMEDIATE
['] 0BRANCH , \ compile 0BRANCH
- HERE @ \ save location of the offset2 on the stack
+ HERE \ save location of the offset2 on the stack
0 , \ compile a dummy offset2
;
: REPEAT IMMEDIATE
['] BRANCH , \ compile BRANCH
SWAP \ get the original offset (from BEGIN)
- HERE @ - , \ and compile it after BRANCH
+ HERE - , \ and compile it after BRANCH
DUP
- HERE @ SWAP - \ calculate the offset2
+ HERE SWAP - \ calculate the offset2
SWAP ! \ and back-fill it in the original location
;
: DO IMMEDIATE
['] LIT , -1 , [COMPILE] IF
['] >R , ['] >R ,
- ['] LIT , HERE @ 0 , ['] >R ,
- HERE @
+ ['] LIT , HERE 0 , ['] >R ,
+ HERE
;
: ?DO IMMEDIATE
['] 2DUP , ['] - , [COMPILE] IF
['] >R , ['] >R ,
- ['] LIT , HERE @ 0 , ['] >R ,
- HERE @
+ ['] LIT , HERE 0 , ['] >R ,
+ HERE
;
: I RSP@ 3 - @ ;
: ?LEAVE IMMEDIATE
['] 0BRANCH , 13 ,
['] R> , ['] RDROP , ['] RDROP ,
- ['] LIT , HERE @ 7 + , ['] DUP , ['] -ROT , ['] - , ['] SWAP , ['] ! ,
+ ['] LIT , HERE 7 + , ['] DUP , ['] -ROT , ['] - , ['] SWAP , ['] ! ,
['] BRANCH ,
0 ,
;
: +LOOP IMMEDIATE
- trace
-
['] DUP , \ Store copy of increment
['] R> , ['] SWAP , ['] R> , ['] SWAP , ['] R> , ['] SWAP , ['] + , ['] 2DUP , ['] - ,
['] SWAP , ['] >R , ['] SWAP , ['] >R , ['] SWAP , ['] >R ,
- trace
-
\ Condition differently depending on sign of increment
['] SWAP , ['] 0>= , [COMPILE] IF
['] 0<= ,
['] 0> ,
[COMPILE] THEN
- trace
-
\ Branch back to begining of loop kernel
- ['] 0BRANCH , HERE @ - ,
+ ['] 0BRANCH , HERE - ,
\ Clean up
['] RDROP , ['] RDROP , ['] RDROP ,
- trace
-
\ Record address of loop end for any LEAVEs to use
- HERE @ SWAP !
+ HERE SWAP !
[COMPILE] ELSE
['] 2DROP , \ Clean up if loop was entirely skipped (?DO)
REPEAT
;
-xx
\ COMMENTS ----------------------------------------------------------------------
: .S ( -- )
[CHAR] < EMIT DEPTH U. [CHAR] > EMIT SPACE
- PSP0 @ 1+
+ PSP0 1+
BEGIN
DUP PSP@ 2 - <=
WHILE
( C, appends a byte to the current compiled word. )
: C,
- HERE @ C!
- 1 HERE +!
+ HERE C!
+ 1 H +!
;
: S" IMMEDIATE ( -- addr len )
STATE @ IF ( compiling? )
['] LITSTRING , ( compile LITSTRING )
- HERE @ ( save the address of the length word on the stack )
+ HERE ( save the address of the length word on the stack )
0 , ( dummy length - we don't know what it is yet )
- KEY DROP
+
BEGIN
- KEY ( get next character of the string )
+ >IN @ #TIB @ >= IF \ End of TIB?
+ QUERY \ Get next line
+ THEN
+
+ TIB >IN @ + @ 1 >IN +! \ Get char from TIB
+
DUP [CHAR] " <>
WHILE
C, ( copy character )
REPEAT
DROP ( drop the double quote character at the end )
DUP ( get the saved address of the length word )
- HERE @ SWAP - ( calculate the length )
+ HERE SWAP - ( calculate the length )
1- ( subtract 1 (because we measured from the start of the length word) )
SWAP ! ( and back-fill the length location )
ELSE ( immediate mode )
- HERE @ ( get the start address of the temporary space )
- KEY DROP
+ HERE ( get the start address of the temporary space )
+
BEGIN
- KEY
+ >IN @ #TIB @ >= IF \ End of TIB?
+ QUERY \ Get next line
+ THEN
+
+ TIB >IN @ + @ 1 >IN +! \ Get char from TIB
+
DUP [CHAR] " <>
WHILE
OVER C! ( save next character )
1+ ( increment address )
REPEAT
DROP ( drop the final " character )
- HERE @ - ( calculate the length )
- HERE @ ( push the start address )
+ HERE - ( calculate the length )
+ HERE ( push the start address )
SWAP ( addr len )
THEN
;
;
: .(
- KEY DROP
BEGIN
- KEY
+ >IN @ #TIB @ >= IF \ End of TIB?
+ QUERY \ Get next line
+ THEN
+
+ TIB >IN @ + @ 1 >IN +! \ Get char from TIB
+
DUP [CHAR] ) = IF
DROP ( drop the double quote character )
EXIT ( return from this function )
( CONSTANTS AND VARIABLES ------------------------------------------------------ )
: CONSTANT
- BL WORD HEADER ( make dictionary entry (the name follows CONSTANT) )
- DOCOL , ( append DOCOL (the codeword field of this word) )
- ['] LIT , ( append the codeword LIT )
- , ( append the value on the top of the stack )
- ['] EXIT , ( append the codeword EXIT )
+ CREATE ,
+DOES> @
;
: ALLOT ( n -- )
- HERE +! ( adds n to HERE, after this the old value of HERE is still on the stack )
+ H +! ( adds n to H, after this the old value of H is still on the stack )
;
: VARIABLE
1 CELLS ALLOT ( allocate 1 cell of memory, push the pointer to this memory )
;
-
: VALUE ( n -- )
- BL WORD HEADER ( make the dictionary entry (the name follows VALUE) )
- DOCOL , ( append DOCOL )
- ['] LIT , ( append the codeword LIT )
- , ( append the initial value )
- ['] EXIT , ( append the codeword EXIT )
+ CREATE ,
+DOES> @
;
: TO IMMEDIATE ( n -- )
BL WORD ( get the name of the value )
- FIND ( look it up in the dictionary )
- >PFA ( get a pointer to the first data field (the 'LIT') )
- 1+ ( increment to point at the value )
+ FIND DROP ( look it up in the dictionary )
+ >BODY ( get a pointer to the first data field (the 'LIT') )
STATE @ IF ( compiling? )
['] LIT , ( compile LIT )
, ( compile the address of the value )
( x +TO VAL adds x to VAL )
: +TO IMMEDIATE
BL WORD ( get the name of the value )
- FIND ( look it up in the dictionary )
- >PFA ( get a pointer to the first data field (the 'LIT') )
- 1+ ( increment to point at the value )
+ FIND DROP ( look it up in the dictionary )
+ >BODY ( get a pointer to the first data field (the 'LIT') )
STATE @ IF ( compiling? )
['] LIT , ( compile LIT )
, ( compile the address of the value )
( PRINTING THE DICTIONARY ------------------------------------------------------ )
-: ID.
- 1+ ( skip over the link pointer )
+: .NAME
DUP @ ( get the flags/length byte )
F_LENMASK AND ( mask out the flags - just want the length )
;
: WORDS
+ CR
LATEST @ ( start at LATEST dictionary entry )
BEGIN
?DUP ( while link pointer is not null )
WHILE
DUP ?HIDDEN NOT IF ( ignore hidden words )
- DUP ID. ( but if not hidden, print the word )
+ DUP 1+ .NAME ( but if not hidden, print the word )
SPACE
THEN
@ ( dereference the link pointer - go to previous word )
CR
;
-
-( FORGET ---------------------------------------------------------------------- )
-
-: FORGET
- BL WORD FIND ( find the word, gets the dictionary entry address )
- DUP @ LATEST ! ( set LATEST to point to the previous word )
- HERE ! ( and store HERE with the dictionary address )
-;
-
( DUMP ------------------------------------------------------------------------ )
\ TODO!
( DECOMPILER ------------------------------------------------------------------ )
-: CFA>
- LATEST @ ( start at LATEST dictionary entry )
+: >NAME
BEGIN
- ?DUP ( while link pointer is not null )
- WHILE
- 2DUP SWAP ( cfa curr curr cfa )
- < IF ( current dictionary entry < cfa? )
- NIP ( leave curr dictionary entry on the stack )
- EXIT
- THEN
- @ ( follow link pointer back )
- REPEAT
- DROP ( restore stack )
- 0 ( sorry, nothing found )
+ 1- DUP @
+ NFA_MARK AND
+ NFA_MARK = UNTIL
;
+: >LFA >NAME 1- ;
+
: SEE
- BL WORD 2DUP FIND ( find the dictionary entry to decompile )
+ BL WORD FIND ( find the dictionary entry to decompile )
- ?DUP 0= IF
- ." Word '" TYPE ." ' not found in dictionary."
+ CR
+
+ 0= IF
+ ." Word '" COUNT TYPE ." ' not found in dictionary."
EXIT
THEN
- -ROT 2DROP
+ >LFA
( Now we search again, looking for the next word in the dictionary. This gives us
the length of the word that we will be decompiling. (Well, mostly it does). )
- HERE @ ( address of the end of the last compiled word )
+ HERE ( address of the end of the last compiled word )
LATEST @ ( word last curr )
BEGIN
2 PICK ( word last curr word )
DUP >CFA @ CASE
DOCOL OF
\ Colon definition
- [CHAR] : EMIT SPACE DUP ID. SPACE
+ [CHAR] : EMIT SPACE DUP 1+ .NAME SPACE
DUP ?IMMEDIATE IF ." IMMEDIATE " THEN CR
ENDOF
DOVAR OF
\ Variable definition
- ." Variable " DUP ID. CR
+ ." Variable " DUP 1+ .NAME CR
2DROP EXIT
ENDOF
DOCON OF
\ Constant definition
- ." Constant " DUP ID. CR
+ ." Constant " DUP 1+ .NAME CR
2DROP EXIT
ENDOF
DROP 2DROP EXIT
ENDCASE
- ( begin the definition with : NAME [IMMEDIATE] )
- ( [CHAR] : EMIT SPACE DUP ID. SPACE
- DUP ?IMMEDIATE IF ." IMMEDIATE " THEN CR 4 )
-
4 SPACES
- >PFA ( get the data address, ie. points after DOCOL | end-of-word start-of-data )
+ >CFA >BODY ( get the data address, ie. points after DOCOL | end-of-word start-of-data )
( now we start decompiling until we hit the end of the word )
BEGIN ( end start )
['] ['] OF ( is it ['] ? )
." ['] "
1+ DUP @ ( get the next codeword )
- CFA> ( and force it to be printed as a dictionary entry )
- ID. SPACE
+ >NAME ( and force it to be printed as a dictionary entry )
+ .NAME SPACE
ENDOF
['] EXIT OF ( is it EXIT? )
( We expect the last word to be EXIT, and if it is then we don't print it
ENDOF
( default case: )
DUP ( in the default case we always need to DUP before using )
- CFA> ( look up the codeword to get the dictionary entry )
- ID. SPACE ( and print it )
+ >NAME ( look up the codeword to get the dictionary entry )
+ .NAME SPACE ( and print it )
ENDCASE
1+ ( end start+1 )
;
+( FORGET and HIDE ------------------------------------------------------------ )
+
+: FORGET
+ BL WORD FIND >LFA ( find the word, gets the dictionary entry address )
+ DUP @ LATEST ! ( set LATEST to point to the previous word )
+ H ! ( and store H with the dictionary address )
+;
+
+: HIDE
+ BL WORD FIND DROP >NAME
+ DUP @ F_HIDDEN OR SWAP !
+;
+
( MEMORY ------------------------------------------------------------------ )
: UNUSED ( -- cells )
- MEMSIZE HERE @ - ;
+ MEMSIZE HERE - ;
The Lambda Lab / projects / forth.jl.git / blobdiff