V25 with 64-bit support

[pforth] / csrc / pfinnrfp.h

diff --git a/csrc/pfinnrfp.h b/csrc/pfinnrfp.h
index d0bd4ab..0428b25 100644 (file)
--- a/csrc/pfinnrfp.h
+++ b/csrc/pfinnrfp.h
@@ -41,7 +41,7 @@
                {\r
                        fpTemp = ((PF_FLOAT) TOS); /* dhi */\r
                        fpTemp *= FP_DHI1;\r
                {\r
                        fpTemp = ((PF_FLOAT) TOS); /* dhi */\r
                        fpTemp *= FP_DHI1;\r

-                       fpScratch = ( (PF_FLOAT) ((uint32)Scratch) );  /* Convert TOS and push on FP stack. */\r
+                       fpScratch = ( (PF_FLOAT) ((ucell_t)Scratch) );  /* Convert TOS and push on FP stack. */\r

                        FP_TOS = fpTemp + fpScratch;\r
                }       \r
                M_DROP;\r
                        FP_TOS = fpTemp + fpScratch;\r
                }       \r
                M_DROP;\r


@@ -102,8 +102,8 @@
        case ID_FP_F_TO_D: /* ( -- dlo dhi) ( F: r -- ) */\r
                /* printf("f2d = %g\n", FP_TOS); */\r
                {\r
        case ID_FP_F_TO_D: /* ( -- dlo dhi) ( F: r -- ) */\r
                /* printf("f2d = %g\n", FP_TOS); */\r
                {\r

-                       uint32 dlo;\r
-                       int32 dhi;\r
+                       ucell_t dlo;\r
+                       cell_t dhi;\r

                        int ifNeg;\r
        /* Convert absolute value, then negate D if negative. */\r
                        PUSH_TOS;   /* Save old TOS */\r
                        int ifNeg;\r
        /* Convert absolute value, then negate D if negative. */\r
                        PUSH_TOS;   /* Save old TOS */\r


@@ -116,12 +116,12 @@
                        }\r
                        fpScratch = fpTemp / FP_DHI1;\r
                /* printf("f2d - fpScratch = %g\n", fpScratch); */\r
                        }\r
                        fpScratch = fpTemp / FP_DHI1;\r
                /* printf("f2d - fpScratch = %g\n", fpScratch); */\r

-                       dhi = (int32) fpScratch;  /* dhi */\r
+                       dhi = (cell_t) fpScratch;  /* dhi */\r

                        fpScratch = ((PF_FLOAT) dhi) * FP_DHI1;\r
                /* printf("f2d - , dhi = 0x%x, fpScratch = %g\n", dhi, fpScratch); */\r
                \r
                        fpTemp = fpTemp - fpScratch; /* Remainder */\r
                        fpScratch = ((PF_FLOAT) dhi) * FP_DHI1;\r
                /* printf("f2d - , dhi = 0x%x, fpScratch = %g\n", dhi, fpScratch); */\r
                \r
                        fpTemp = fpTemp - fpScratch; /* Remainder */\r

-                       dlo = (uint32) fpTemp;\r
+                       dlo = (ucell_t) fpTemp;\r

                /* printf("f2d - , dlo = 0x%x, fpTemp = %g\n", dlo, fpTemp); */\r
                        if( ifNeg )\r
                        {\r
                /* printf("f2d - , dlo = 0x%x, fpTemp = %g\n", dlo, fpTemp); */\r
                        if( ifNeg )\r
                        {\r


@@ -284,7 +284,7 @@
                        PF_FLOAT *fptr;\r
                        fptr = (PF_FLOAT *)InsPtr;\r
                        FP_TOS = READ_FLOAT_DIC( fptr++ );\r
                        PF_FLOAT *fptr;\r
                        fptr = (PF_FLOAT *)InsPtr;\r
                        FP_TOS = READ_FLOAT_DIC( fptr++ );\r

-                       InsPtr = (cell *) fptr;\r
+                       InsPtr = (cell_t *) fptr;\r

                }\r
 #endif\r
                endcase;\r
                }\r
 #endif\r
                endcase;\r