V25 with 64-bit support

[pforth] / csrc / pf_words.c

diff --git a/csrc/pf_words.c b/csrc/pf_words.c
index 6b01fd8..97760b9 100644 (file)
--- a/csrc/pf_words.c
+++ b/csrc/pf_words.c
@@ -26,7 +26,7 @@
 ** Print number in current base to output stream.\r
 ** This version does not handle double precision.\r
 */\r
 ** Print number in current base to output stream.\r
 ** This version does not handle double precision.\r
 */\r

-void ffDot( int32 n )\r
+void ffDot( cell_t n )\r

 {\r
        MSG( ConvertNumberToText( n, gVarBase, TRUE, 1 ) );\r
        EMIT(' ');\r
 {\r
        MSG( ConvertNumberToText( n, gVarBase, TRUE, 1 ) );\r
        EMIT(' ');\r


@@ -36,7 +36,7 @@ void ffDot( int32 n )
 ** Print number in current base to output stream.\r
 ** This version does not handle double precision.\r
 */\r
 ** Print number in current base to output stream.\r
 ** This version does not handle double precision.\r
 */\r

-void ffDotHex( int32 n )\r
+void ffDotHex( cell_t n )\r

 {\r
        MSG( ConvertNumberToText( n, 16, FALSE, 1 ) );\r
        EMIT(' ');\r
 {\r
        MSG( ConvertNumberToText( n, 16, FALSE, 1 ) );\r
        EMIT(' ');\r


@@ -45,8 +45,8 @@ void ffDotHex( int32 n )
 /* ( ... --- ... , print stack ) */\r
 void ffDotS( void )\r
 {\r
 /* ( ... --- ... , print stack ) */\r
 void ffDotS( void )\r
 {\r

-       cell *sp;\r
-       int32 i, Depth;\r
+       cell_t *sp;\r
+       cell_t i, Depth;\r

 \r
        MSG("Stack<");\r
        MSG( ConvertNumberToText( gVarBase, 10, TRUE, 1 ) ); /* Print base in decimal. */\r
 \r
        MSG("Stack<");\r
        MSG( ConvertNumberToText( gVarBase, 10, TRUE, 1 ) ); /* Print base in decimal. */\r


@@ -72,7 +72,7 @@ void ffDotS( void )
 }\r
 \r
 /* ( addr cnt char -- addr' cnt' , skip leading characters ) */\r
 }\r
 \r
 /* ( addr cnt char -- addr' cnt' , skip leading characters ) */\r

-cell ffSkip( char *AddrIn, cell Cnt, char c, char **AddrOut )\r
+cell_t ffSkip( char *AddrIn, cell_t Cnt, char c, char **AddrOut )\r

 {\r
        char *s;\r
        \r
 {\r
        char *s;\r
        \r


@@ -102,7 +102,7 @@ DBUGX(("ffSkip: %c=0x%x, %d\n", *s, Cnt ));
 }\r
 \r
 /* ( addr cnt char -- addr' cnt' , scan for char ) */\r
 }\r
 \r
 /* ( addr cnt char -- addr' cnt' , scan for char ) */\r

-cell ffScan( char *AddrIn, cell Cnt, char c, char **AddrOut )\r
+cell_t ffScan( char *AddrIn, cell_t Cnt, char c, char **AddrOut )\r

 {\r
        char *s;\r
        \r
 {\r
        char *s;\r
        \r


@@ -139,7 +139,7 @@ DBUGX(("ffScan: %c, %d\n", *s, Cnt ));
 ***************************************************************/\r
 \r
 /* Convert a single digit to the corresponding hex number. */\r
 ***************************************************************/\r
 \r
 /* Convert a single digit to the corresponding hex number. */\r

-static cell HexDigitToNumber( char c )\r
+static cell_t HexDigitToNumber( char c )\r

 {      \r
        if( (c >= '0') && (c <= '9') )\r
        {\r
 {      \r
        if( (c >= '0') && (c <= '9') )\r
        {\r


@@ -156,9 +156,9 @@ static cell HexDigitToNumber( char c )
 }\r
 \r
 /* Convert a string to the corresponding number using BASE. */\r
 }\r
 \r
 /* Convert a string to the corresponding number using BASE. */\r

-cell ffNumberQ( const char *FWord, cell *Num )\r
+cell_t ffNumberQ( const char *FWord, cell_t *Num )\r

 {\r
 {\r

-       int32 Len, i, Accum=0, n, Sign=1;\r
+       cell_t Len, i, Accum=0, n, Sign=1;\r

        const char *s;\r
        \r
 /* get count */\r
        const char *s;\r
        \r
 /* get count */\r


@@ -195,8 +195,8 @@ cell ffNumberQ( const char *FWord, cell *Num )
 char * ffWord( char c )\r
 {\r
        char *s1,*s2,*s3;\r
 char * ffWord( char c )\r
 {\r
        char *s1,*s2,*s3;\r

-       int32 n1, n2, n3;\r
-       int32 i, nc;\r
+       cell_t n1, n2, n3;\r
+       cell_t i, nc;\r

 \r
        s1 = gCurrentTask->td_SourcePtr + gCurrentTask->td_IN;\r
        n1 = gCurrentTask->td_SourceNum - gCurrentTask->td_IN;\r
 \r
        s1 = gCurrentTask->td_SourcePtr + gCurrentTask->td_IN;\r
        n1 = gCurrentTask->td_SourceNum - gCurrentTask->td_IN;\r