Add support for WATCOMC

Add size checks for C to Forth string conversion

diff --git a/csrc/pf_cglue.c b/csrc/pf_cglue.c
index 2e6f52d..0ec1e70 100644 (file)
--- a/csrc/pf_cglue.c
+++ b/csrc/pf_cglue.c
@@ -85,7 +85,7 @@ Err CreateGlueToC( const char *CName, ucell_t Index, cell_t ReturnMode, int32_t
        ucell_t Packed;\r
        char FName[40];\r
        \r
        ucell_t Packed;\r
        char FName[40];\r
        \r

-       CStringToForth( FName, CName );\r
+       CStringToForth( FName, CName, sizeof(FName) );\r

        Packed = (Index & 0xFFFF) | 0 | (NumParams << 24) |\r
                (ReturnMode << 31);\r
        DBUG(("Packed = 0x%8x\n", Packed));\r
        Packed = (Index & 0xFFFF) | 0 | (NumParams << 24) |\r
                (ReturnMode << 31);\r
        DBUG(("Packed = 0x%8x\n", Packed));\r

diff --git a/csrc/pf_core.c b/csrc/pf_core.c
index f7bf38f..235c0a2 100644 (file)
--- a/csrc/pf_core.c
+++ b/csrc/pf_core.c
@@ -572,3 +572,13 @@ error1:
 \r
        return -1;\r
 }\r
 \r
        return -1;\r
 }\r

+\r
+\r
+#ifdef PF_UNIT_TEST\r
+cell_t pfUnitTest( void )\r
+{\r
+       cell_t numErrors = 0;\r
+       numErrors += pfUnitTestText();\r
+       return numErrors;\r
+}\r
+#endif\r

diff --git a/csrc/pf_core.h b/csrc/pf_core.h
index 630d1a2..1279e8b 100644 (file)
--- a/csrc/pf_core.h
+++ b/csrc/pf_core.h
@@ -27,7 +27,8 @@ void   pfInitGlobals( void );
 \r
 void   pfDebugMessage( const char *CString );\r
 void   pfDebugPrintDecimalNumber( int n );\r
 \r
 void   pfDebugMessage( const char *CString );\r
 void   pfDebugPrintDecimalNumber( int n );\r

-\r
+       \r
+cell_t pfUnitTestText( void );\r

 \r
 #ifdef __cplusplus\r
 }   \r
 \r
 #ifdef __cplusplus\r
 }   \r

diff --git a/csrc/pf_inner.c b/csrc/pf_inner.c
index fe60d15..dad9265 100644 (file)
--- a/csrc/pf_inner.c
+++ b/csrc/pf_inner.c
@@ -26,6 +26,8 @@
 **\r
 ***************************************************************/\r
 \r
 **\r
 ***************************************************************/\r
 \r

+#include <sys/types.h>\r
+\r

 #include "pf_all.h"\r
 \r
 #ifdef WIN32\r
 #include "pf_all.h"\r
 \r
 #ifdef WIN32\r


@@ -1544,7 +1546,7 @@ DBUG(("XX ah,m,l = 0x%8x,%8x,%8x - qh,l = 0x%8x,%8x\n", ah,am,al, qh,ql ));
                                CodeSize = TOS;\r
                                NameSize = M_POP;\r
                                EntryPoint = M_POP;\r
                                CodeSize = TOS;\r
                                NameSize = M_POP;\r
                                EntryPoint = M_POP;\r

-                               ForthStringToC( gScratch, (char *) M_POP );\r
+                               ForthStringToC( gScratch, (char *) M_POP, sizeof(gScratch) );\r

                                TOS =  ffSaveForth( gScratch, EntryPoint, NameSize, CodeSize );\r
                        }\r
                        endcase;\r
                                TOS =  ffSaveForth( gScratch, EntryPoint, NameSize, CodeSize );\r
                        }\r
                        endcase;\r

diff --git a/csrc/pf_io.h b/csrc/pf_io.h
index 2a4af4b..beb3495 100644 (file)
--- a/csrc/pf_io.h
+++ b/csrc/pf_io.h
@@ -118,7 +118,7 @@ void ioTerm( void );
                #define sdFlushFile     fflush\r
                #define sdReadFile      fread\r
                #define sdWriteFile     fwrite\r
                #define sdFlushFile     fflush\r
                #define sdReadFile      fread\r
                #define sdWriteFile     fwrite\r

-               #if WIN32\r
+               #if defined(WIN32) || defined(__NT__)\r

                        /* TODO To support 64-bit file offset we probably need fseeki64(). */\r
                        #define sdSeekFile      fseek\r
                        #define sdTellFile      ftell\r
                        /* TODO To support 64-bit file offset we probably need fseeki64(). */\r
                        #define sdSeekFile      fseek\r
                        #define sdTellFile      ftell\r

diff --git a/csrc/pf_main.c b/csrc/pf_main.c
index 71defbc..a973553 100644 (file)
--- a/csrc/pf_main.c
+++ b/csrc/pf_main.c
@@ -129,6 +129,14 @@ int main( int argc, char **argv )
        DicName = NULL;\r
 #endif\r
 \r
        DicName = NULL;\r
 #endif\r
 \r

+#ifdef PF_UNIT_TEST\r
+       if( (Result = pfUnitTest()) != 0 )\r
+       {\r
+               ERR(("pForth stopping on unit test failure.\n"));\r
+               goto on_error;\r
+       }\r
+#endif\r
+       \r

        Result = pfDoForth( DicName, SourceName, IfInit);\r
 \r
 on_error:\r
        Result = pfDoForth( DicName, SourceName, IfInit);\r
 \r
 on_error:\r

diff --git a/csrc/pf_text.c b/csrc/pf_text.c
index 9530546..6d36e2c 100644 (file)
--- a/csrc/pf_text.c
+++ b/csrc/pf_text.c
@@ -135,11 +135,16 @@ void pfReportThrow( ThrowCode code )
 ** Copy a Forth String to a 'C' string.\r
 */\r
 \r
 ** Copy a Forth String to a 'C' string.\r
 */\r
 \r

-char *ForthStringToC( char *dst, const char *FString )\r
+char *ForthStringToC( char *dst, const char *FString, cell_t dstSize )\r

 {\r
        cell_t Len;\r
 \r
        Len = (cell_t) *FString;\r
 {\r
        cell_t Len;\r
 \r
        Len = (cell_t) *FString;\r

+       /* Make sure the text + NUL can fit. */\r
+       if( Len >= dstSize )\r
+       {\r
+               Len = dstSize - 1;\r
+       }\r

        pfCopyMemory( dst, FString+1, Len );\r
        dst[Len] = '\0';\r
 \r
        pfCopyMemory( dst, FString+1, Len );\r
        dst[Len] = '\0';\r
 \r


@@ -149,17 +154,20 @@ char *ForthStringToC( char *dst, const char *FString )
 /**************************************************************\r
 ** Copy a NUL terminated string to a Forth counted string.\r
 */\r
 /**************************************************************\r
 ** Copy a NUL terminated string to a Forth counted string.\r
 */\r

-char *CStringToForth( char *dst, const char *CString )\r
+char *CStringToForth( char *dst, const char *CString, cell_t dstSize )\r

 {\r
 {\r

-       char *s;\r

        cell_t i;\r
 \r
        cell_t i;\r
 \r

-       s = dst+1;\r
-       for( i=0; *CString; i++ )\r
+       /* Make sure the SIZE+text can fit. */\r
+       for( i=1; i<dstSize; i++ )\r

        {\r
        {\r

-               *s++ = *CString++;\r
+               if( *CString == 0 )\r
+               {\r
+                       break;\r
+               }\r
+               dst[i] = *CString++;\r

        }\r
        }\r

-       *dst = (char ) i;\r
+       *dst = (char ) i-1;\r

        return dst;\r
 }\r
 \r
        return dst;\r
 }\r
 \r


@@ -335,3 +343,65 @@ void TypeName( const char *Name )
 }\r
 \r
 \r
 }\r
 \r
 \r

+\r
+#ifdef PF_UNIT_TEST\r
+/* Unit test for string conversion routines. */\r
+#define ASSERT_PAD_IS( index, value, msg ) \\r
+       if( pad[index] != ((char)(value)) ) \\r
+       { \\r
+               ERR(( "ERROR text test failed: " msg "\n")); \\r
+               numErrors += 1; \\r
+       } \\r
+\r
+cell_t pfUnitTestText( void )\r
+{\r
+       cell_t numErrors = 0;\r
+       char pad[16];\r
+       char fpad[8];\r
+\r
+       /* test CStringToForth */\r
+       pfSetMemory(pad,0xA5,sizeof(pad));\r
+       CStringToForth( pad, "frog", 6 );\r
+       ASSERT_PAD_IS( 0, 4, "CS len 6" );\r
+       ASSERT_PAD_IS( 4, 'g', "CS end 6" );\r
+       ASSERT_PAD_IS( 5, 0xA5, "CS past 6" );\r
+       \r
+       pfSetMemory(pad,0xA5,sizeof(pad));\r
+       CStringToForth( pad, "frog", 5 );\r
+       ASSERT_PAD_IS( 0, 4, "CS len 5" );\r
+       ASSERT_PAD_IS( 4, 'g', "CS end 5" );\r
+       ASSERT_PAD_IS( 5, 0xA5, "CS past 5" );\r
+       \r
+       pfSetMemory(pad,0xA5,sizeof(pad));\r
+       CStringxxxxxToForth( pad, "frog", 4 );\r
+       ASSERT_PAD_IS( 0, 3, "CS len 4" );\r
+       ASSERT_PAD_IS( 3, 'o', "CS end 4" );\r
+       ASSERT_PAD_IS( 4, 0xA5, "CS past 4" );\r
+       \r
+       /* Make a Forth string for testing ForthStringToC. */\r
+       CStringToForth( fpad, "frog", sizeof(fpad) );\r
+       \r
+       pfSetMemory(pad,0xA5,sizeof(pad));\r
+       ForthStringToC( pad, fpad, 6 );\r
+       ASSERT_PAD_IS( 0, 'f', "FS len 6" );\r
+       ASSERT_PAD_IS( 3, 'g', "FS end 6" );\r
+       ASSERT_PAD_IS( 4, 0, "FS nul 6" );\r
+       ASSERT_PAD_IS( 5, 0xA5, "FS past 6" );\r
+       \r
+       pfSetMemory(pad,0xA5,sizeof(pad));\r
+       ForthStringToC( pad, fpad, 5 );\r
+       ASSERT_PAD_IS( 0, 'f', "FS len 5" );\r
+       ASSERT_PAD_IS( 3, 'g', "FS end 5" );\r
+       ASSERT_PAD_IS( 4, 0, "FS nul 5" );\r
+       ASSERT_PAD_IS( 5, 0xA5, "FS past 5" );\r
+       \r
+       pfSetMemory(pad,0xA5,sizeof(pad));\r
+       ForthStringToC( pad, fpad, 4 );\r
+       ASSERT_PAD_IS( 0, 'f', "FS len 4" );\r
+       ASSERT_PAD_IS( 2, 'o', "FS end 4" );\r
+       ASSERT_PAD_IS( 3, 0, "FS nul 4" );\r
+       ASSERT_PAD_IS( 4, 0xA5, "FS past 4" );\r
+       \r
+       return numErrors;\r
+}\r
+#endif\r

diff --git a/csrc/pf_text.h b/csrc/pf_text.h
index 7cbe97d..29e0218 100644 (file)
--- a/csrc/pf_text.h
+++ b/csrc/pf_text.h
@@ -51,8 +51,8 @@ extern "C" {
 void pfReportError( const char *FunctionName, Err ErrCode );\r
 void pfReportThrow( ThrowCode code );\r
 \r
 void pfReportError( const char *FunctionName, Err ErrCode );\r
 void pfReportThrow( ThrowCode code );\r
 \r

-char  *ForthStringToC( char *dst, const char *FString );\r
-char  *CStringToForth( char *dst, const char *CString );\r
+char  *ForthStringToC( char *dst, const char *FString, cell_t dstSize );\r
+char  *CStringToForth( char *dst, const char *CString, cell_t dstSize  );\r

 \r
 cell_t ffCompare( const char *s1, cell_t len1, const char *s2, int32_t len2 );\r
 cell_t ffCompareText( const char *s1, const char *s2, cell_t len );\r
 \r
 cell_t ffCompare( const char *s1, cell_t len1, const char *s2, int32_t len2 );\r
 cell_t ffCompareText( const char *s1, const char *s2, cell_t len );\r


@@ -61,7 +61,9 @@ cell_t ffCompareTextCaseN( const char *s1, const char *s2, cell_t len );
 void  DumpMemory( void *addr, cell_t cnt);\r
 char *ConvertNumberToText( cell_t Num, cell_t Base, int32_t IfSigned, int32_t MinChars );\r
 void  TypeName( const char *Name );\r
 void  DumpMemory( void *addr, cell_t cnt);\r
 char *ConvertNumberToText( cell_t Num, cell_t Base, int32_t IfSigned, int32_t MinChars );\r
 void  TypeName( const char *Name );\r

-\r
+       \r
+cell_t pfUnitTestText( void );\r
+       \r

 #ifdef __cplusplus\r
 }   \r
 #endif\r
 #ifdef __cplusplus\r
 }   \r
 #endif\r

diff --git a/csrc/pfcompil.c b/csrc/pfcompil.c
index feb85db..bc4c585 100644 (file)
--- a/csrc/pfcompil.c
+++ b/csrc/pfcompil.c
@@ -97,7 +97,7 @@ void CreateDicEntry( ExecToken XT, const ForthStringPtr FName, ucell_t Flags )
 void CreateDicEntryC( ExecToken XT, const char *CName, ucell_t Flags )\r
 {\r
        ForthString FName[40];\r
 void CreateDicEntryC( ExecToken XT, const char *CName, ucell_t Flags )\r
 {\r
        ForthString FName[40];\r

-       CStringToForth( FName, CName );\r
+       CStringToForth( FName, CName, sizeof(FName) );\r

        CreateDicEntry( XT, FName, Flags );\r
 }\r
 \r
        CreateDicEntry( XT, FName, Flags );\r
 }\r
 \r


@@ -513,7 +513,7 @@ DBUG(("ffFind: %8s at 0x%x\n", WordName+1, NFA)); /* WARNING, not NUL terminated
 cell_t ffFindC( const char *WordName, ExecToken *pXT )\r
 {\r
 DBUG(("ffFindC: %s\n", WordName ));\r
 cell_t ffFindC( const char *WordName, ExecToken *pXT )\r
 {\r
 DBUG(("ffFindC: %s\n", WordName ));\r

-       CStringToForth( gScratch, WordName );\r
+       CStringToForth( gScratch, WordName, sizeof(gScratch) );\r

        return ffFind( gScratch, pXT );\r
 }\r
 \r
        return ffFind( gScratch, pXT );\r
 }\r
 \r


@@ -643,7 +643,7 @@ void ffStringDefer( const ForthStringPtr FName, ExecToken DefaultXT )
 static void CreateDeferredC( ExecToken DefaultXT, const char *CName )\r
 {\r
        char FName[40];\r
 static void CreateDeferredC( ExecToken DefaultXT, const char *CName )\r
 {\r
        char FName[40];\r

-       CStringToForth( FName, CName );\r
+       CStringToForth( FName, CName, sizeof(FName) );\r

        ffStringDefer( FName, DefaultXT );\r
 }\r
 #endif\r
        ffStringDefer( FName, DefaultXT );\r
 }\r
 #endif\r

diff --git a/csrc/win32/pf_io_win32.c b/csrc/win32/pf_io_win32.c
index 24bfa8e..6fd93e3 100644 (file)
--- a/csrc/win32/pf_io_win32.c
+++ b/csrc/win32/pf_io_win32.c
@@ -23,16 +23,24 @@
 #include <conio.h>\r
 \r
 /* Use console mode I/O so that KEY and ?TERMINAL will work. */\r
 #include <conio.h>\r
 \r
 /* Use console mode I/O so that KEY and ?TERMINAL will work. */\r

-#if WIN32\r
+#if defined(WIN32) || defined(__NT__)\r

 int  sdTerminalOut( char c )\r
 {\r
 int  sdTerminalOut( char c )\r
 {\r

+#if defined(__WATCOMC__)\r
+       return putch((char)(c));\r
+#else\r

        return _putch((char)(c));\r
        return _putch((char)(c));\r

+#endif\r

 }\r
 \r
 /* Needed cuz _getch() does not echo. */\r
 int  sdTerminalEcho( char c )\r
 {\r
 }\r
 \r
 /* Needed cuz _getch() does not echo. */\r
 int  sdTerminalEcho( char c )\r
 {\r

+#if defined(__WATCOMC__)\r
+       return putch((char)(c));\r
+#else\r

        return _putch((char)(c));\r
        return _putch((char)(c));\r

+#endif\r

 }\r
 \r
 int  sdTerminalIn( void )\r
 }\r
 \r
 int  sdTerminalIn( void )\r

diff --git a/csrc/win32_console/pf_io_win32_console.c b/csrc/win32_console/pf_io_win32_console.c
index 8efd7d8..d36a04c 100644 (file)
--- a/csrc/win32_console/pf_io_win32_console.c
+++ b/csrc/win32_console/pf_io_win32_console.c
@@ -20,7 +20,7 @@
 \r
 #include "../pf_all.h"\r
 \r
 \r
 #include "../pf_all.h"\r
 \r

-#if WIN32\r
+#if defined(WIN32) || defined(__NT__)\r

 \r
 #include <windows.h>\r
 \r
 \r
 #include <windows.h>\r
 \r

diff --git a/releases.txt b/releases.txt
index 571a512..82be64c 100644 (file)
--- a/releases.txt
+++ b/releases.txt
@@ -10,8 +10,12 @@ V27
       http://code.google.com/p/pforth/issues/detail?id=4&can=1\r
     - Fixed scrambled HISTORY on 64-bit systems. Was using CELL+ but really needed 4 +.\r
     - Fixed floating point input. Now accepts "1E" as 1.0. Was Issue #2.\r
       http://code.google.com/p/pforth/issues/detail?id=4&can=1\r
     - Fixed scrambled HISTORY on 64-bit systems. Was using CELL+ but really needed 4 +.\r
     - Fixed floating point input. Now accepts "1E" as 1.0. Was Issue #2.\r

-    - Fixed lots of warning and made code compatible with C89 and ANSI with -pedantic.\r
+    - Fixed lots of warning and made code compatible with C89 and ANSI. Uses -pedantic.\r

     - Use fseek and ftell on WIN32 instead of fseeko and ftello.\r
     - Use fseek and ftell on WIN32 instead of fseeko and ftello.\r

+    - Makefile is now more standard. Builds in same dir as Makefile. Uses CFLAGS etc.\r
+    - Add support for console IO with _WATCOMC_\r
+    - Internal CStringToForth and ForthStringToC now take a destination size for safety.\r
+    - Run units tests for CStringToForth and ForthStringToC if PF_UNIT_TESTS is defined.\r

 \r
 V26  5/20/2010\r
     - 64-bit support for M* UM/MOD etc by Aleksej Saushev. Thanks Aleksej!\r
 \r
 V26  5/20/2010\r
     - 64-bit support for M* UM/MOD etc by Aleksej Saushev. Thanks Aleksej!\r