Add patch from Aleksej for 64 bit cells on 32 bit system.

[pforth] / csrc / pf_guts.h

diff --git a/csrc/pf_guts.h b/csrc/pf_guts.h
index 806ff84..425f226 100644 (file)
--- a/csrc/pf_guts.h
+++ b/csrc/pf_guts.h
@@ -422,26 +422,22 @@ typedef struct pfDictionary_s
        ucell_t  dic_Flags;\r
 /* Headers contain pointers to names and dictionary. */\r
 \r
        ucell_t  dic_Flags;\r
 /* Headers contain pointers to names and dictionary. */\r
 \r

-       uint8_t *dic_HeaderBaseUnaligned;\r
+       ucell_t dic_HeaderBaseUnaligned;\r

 \r
 \r

-       uint8_t *dic_HeaderBase;\r
-       union\r
-       {\r
-               cell_t  *Cell;\r
-               uint8_t *Byte;\r
-       } dic_HeaderPtr;\r
-       uint8_t *dic_HeaderLimit;\r
+       ucell_t dic_HeaderBase;\r
+       ucell_t dic_HeaderPtr;\r
+       ucell_t dic_HeaderLimit;\r

 /* Code segment contains tokenized code and data. */\r
 \r
 /* Code segment contains tokenized code and data. */\r
 \r

-       uint8_t *dic_CodeBaseUnaligned;\r
+       ucell_t dic_CodeBaseUnaligned;\r

 \r
 \r

-       uint8_t *dic_CodeBase;\r
+       ucell_t dic_CodeBase;\r

        union\r
        {\r
                cell_t  *Cell;\r
                uint8_t *Byte;\r
        } dic_CodePtr;\r
        union\r
        {\r
                cell_t  *Cell;\r
                uint8_t *Byte;\r
        } dic_CodePtr;\r

-       uint8_t *dic_CodeLimit;\r
+       ucell_t dic_CodeLimit;\r

 } pfDictionary_t;\r
 \r
 /* Save state of include when nesting files. */\r
 } pfDictionary_t;\r
 \r
 /* Save state of include when nesting files. */\r


@@ -487,7 +483,7 @@ extern ExecToken     gAcceptP_XT;         /* XT of ACCEPT */
 extern cell_t         gDepthAtColon;\r
 \r
 /* Global variables. */\r
 extern cell_t         gDepthAtColon;\r
 \r
 /* Global variables. */\r

-extern char         *gVarContext;    /* Points to last name field. */\r
+extern cell_t        gVarContext;    /* Points to last name field. */\r

 extern cell_t        gVarState;      /* 1 if compiling. */\r
 extern cell_t        gVarBase;       /* Numeric Base. */\r
 extern cell_t        gVarEcho;       /* Echo input from file. */\r
 extern cell_t        gVarState;      /* 1 if compiling. */\r
 extern cell_t        gVarBase;       /* Numeric Base. */\r
 extern cell_t        gVarEcho;       /* Echo input from file. */\r