V25 with 64-bit support

[pforth] / fth / system.fth

diff --git a/fth/system.fth b/fth/system.fth
index 01b779d..0223ab0 100644 (file)
--- a/fth/system.fth
+++ b/fth/system.fth
@@ -17,8 +17,8 @@
 : \ ( <line> -- , comment out rest of line )\r
         EOL word drop\r
 ; immediate\r
 : \ ( <line> -- , comment out rest of line )\r
         EOL word drop\r
 ; immediate\r

-
-\ 1 echo !  \ Uncomment this line to echo Forth code while compiling.
+\r
+\ 1 echo !  \ Uncomment this line to echo Forth code while compiling.\r

 \r
 \ *********************************************************************\r
 \ This is another style of comment that is common in Forth.\r
 \r
 \ *********************************************************************\r
 \ This is another style of comment that is common in Forth.\r


@@ -48,13 +48,9 @@
         0 swap !\r
 ;\r
 \r
         0 swap !\r
 ;\r
 \r

-\ size of data items\r
-\ FIXME - move these into 'C' code for portability ????\r
-: CELL ( -- size_of_stack_item ) 4 ;\r
-\r

 : CELL+ ( n -- n+cell )  cell + ;\r
 : CELL- ( n -- n+cell )  cell - ;\r
 : CELL+ ( n -- n+cell )  cell + ;\r
 : CELL- ( n -- n+cell )  cell - ;\r

-: CELLS ( n -- n*cell )  2 lshift ;\r
+: CELL* ( n -- n*cell )  cells ;

 \r
 : CHAR+ ( n -- n+size_of_char ) 1+ ;\r
 : CHARS ( n -- n*size_of_char , don't do anything)  ; immediate\r
 \r
 : CHAR+ ( n -- n+size_of_char ) 1+ ;\r
 : CHARS ( n -- n*size_of_char , don't do anything)  ; immediate\r


@@ -174,7 +170,7 @@
 ;\r
 \r
 : N>LINK  ( nfa -- lfa )\r
 ;\r
 \r
 : N>LINK  ( nfa -- lfa )\r

-        8 -\r
+        2 CELLS -\r

 ;\r
 \r
 : >BODY   ( xt -- pfa )\r
 ;\r
 \r
 : >BODY   ( xt -- pfa )\r


@@ -358,7 +354,8 @@
 ;\r
 \r
 : D2*  ( d -- d*2 )\r
 ;\r
 \r
 : D2*  ( d -- d*2 )\r

-        2* over 31 rshift or  swap\r
+        2* over 
+        cell 8 * 1- rshift or  swap\r

         2* swap\r
 ;\r
 \r
         2* swap\r
 ;\r
 \r


@@ -825,6 +822,6 @@ FREEZE    \ prevent forgetting below this point
 \r
 .( Dictionary compiled, save in "pforth.dic".) cr\r
 c" pforth.dic" save-forth\r
 \r
 .( Dictionary compiled, save in "pforth.dic".) cr\r
 c" pforth.dic" save-forth\r

-
+\r

 \ Save the dictionary in "pfdicdat.h" file so pForth can be compiled for standalone mode.\r
 SDAD\r
 \ Save the dictionary in "pfdicdat.h" file so pForth can be compiled for standalone mode.\r
 SDAD\r