X-Git-Url: http://git.subgeniuskitty.com/pforth/.git/blobdiff_plain/49a54f16c613407ada65dee32493f4878d199aa1..0b1e24898c41afa1f07854c295881b23aa2faea6:/csrc/pf_inner.c

diff --git a/csrc/pf_inner.c b/csrc/pf_inner.c
index d616c22..2e5aac6 100644
--- a/csrc/pf_inner.c
+++ b/csrc/pf_inner.c
@@ -26,7 +26,11 @@
 **
 ***************************************************************/
 
+#ifndef AMIGA
 #include <sys/types.h>
+#else
+typedef long off_t;
+#endif
 
 #include "pf_all.h"
 
@@ -195,6 +199,24 @@ static void TraceNames( ExecToken Token, cell_t Level )
 /* Use local copy of CODE_BASE for speed. */
 #define LOCAL_CODEREL_TO_ABS( a ) ((cell_t *) (((cell_t) a) + CodeBase))
 
+/* Truncate the unsigned double cell integer LO/HI to an uint64_t. */
+static uint64_t UdToUint64( ucell_t Lo, ucell_t Hi )
+{
+    return (( 2 * sizeof(ucell_t) == sizeof(uint64_t) )
+	    ? (((uint64_t)Lo) | (((uint64_t)Hi) >> (sizeof(ucell_t) * 8)))
+	    : Lo );
+}
+
+/* Return TRUE if the unsigned double cell integer LO/HI is not greater
+ * then the greatest uint64_t.
+ */
+static int UdIsUint64( ucell_t Lo, ucell_t Hi )
+{
+    return (( 2 * sizeof(ucell_t) == sizeof(uint64_t) )
+	    ? TRUE
+	    : Hi == 0 );
+}
+
 static const char *pfSelectFileModeCreate( int fam );
 static const char *pfSelectFileModeOpen( int fam );
 
@@ -1087,6 +1109,32 @@ DBUG(("XX ah,m,l = 0x%8x,%8x,%8x - qh,l = 0x%8x,%8x\n", ah,am,al, qh,ql ));
             TOS = TOS | PF_FAM_BINARY_FLAG;
             endcase;
 
+	case ID_FILE_FLUSH: /* ( fileid -- ior ) */
+	    {
+		FileStream *Stream = (FileStream *) TOS;
+		TOS = (sdFlushFile( Stream ) == 0) ? 0 : THROW_FLUSH_FILE;
+	    }
+	    endcase;
+
+	case ID_FILE_RENAME: /* ( oldName newName -- ior ) */
+	    {
+		char *New = (char *) TOS;
+		char *Old = (char *) M_POP;
+		TOS = sdRenameFile( Old, New );
+	    }
+	    endcase;
+
+	case ID_FILE_RESIZE: /* ( ud fileid -- ior ) */
+	    {
+		FileStream *File = (FileStream *) TOS;
+		ucell_t SizeHi = (ucell_t) M_POP;
+		ucell_t SizeLo = (ucell_t) M_POP;
+		TOS = ( UdIsUint64( SizeLo, SizeHi )
+			? sdResizeFile( File, UdToUint64( SizeLo, SizeHi ))
+			: THROW_RESIZE_FILE );
+	    }
+	    endcase;
+
         case ID_FILL: /* ( caddr num charval -- ) */
             {
                 register char *DstPtr;
@@ -1387,15 +1435,18 @@ DBUG(("XX ah,m,l = 0x%8x,%8x,%8x - qh,l = 0x%8x,%8x\n", ah,am,al, qh,ql ));
 
         case ID_PLUSLOOP_P: /* ( delta -- ) ( R: index limit -- | index limit ) */
             {
-                ucell_t OldIndex, NewIndex, Limit;
-
-                Limit = M_R_POP;
-                OldIndex = M_R_POP;
-                NewIndex = OldIndex + TOS; /* add TOS to index, not 1 */
-/* Do indices cross boundary between LIMIT-1 and LIMIT ? */
-                if( ( (OldIndex - Limit) & ((Limit-1) - NewIndex) & 0x80000000 ) ||
-                    ( (NewIndex - Limit) & ((Limit-1) - OldIndex) & 0x80000000 ) )
-                {
+		cell_t Limit = M_R_POP;
+		cell_t OldIndex = M_R_POP;
+		cell_t Delta = TOS; /* add TOS to index, not 1 */
+		cell_t NewIndex = OldIndex + Delta;
+		cell_t OldDiff = OldIndex - Limit;
+
+		/* This exploits this idea (lifted from Gforth):
+		   (x^y)<0 is equivalent to (x<0) != (y<0) */
+                if( ((OldDiff ^ (OldDiff + Delta)) /* is the limit crossed? */
+		     & (OldDiff ^ Delta))          /* is it a wrap-around? */
+		    < 0 )
+		{
                     InsPtr++;   /* skip branch offset, exit loop */
                 }
                 else
@@ -1552,16 +1603,6 @@ DBUG(("XX ah,m,l = 0x%8x,%8x,%8x - qh,l = 0x%8x,%8x\n", ah,am,al, qh,ql ));
             endcase;
 #endif
 
-/* Source     Stack
-** EVALUATE    >IN  SourceID=(-1)  1111
-** keyboard    >IN  SourceID=(0)   2222
-** file        >IN  lineNumber filePos  SourceID=(fileID)
-*/
-        case ID_SAVE_INPUT:  /* FIXME - finish */
-            {
-            }
-            endcase;
-
         case ID_SP_FETCH:    /* ( -- sp , address of top of stack, sorta ) */
             PUSH_TOS;
             TOS = (cell_t)STKPTR;
@@ -1643,6 +1684,16 @@ DBUG(("XX ah,m,l = 0x%8x,%8x,%8x - qh,l = 0x%8x,%8x\n", ah,am,al, qh,ql ));
             else M_DROP;
             endcase;
 
+	case ID_SOURCE_LINE_NUMBER_FETCH: /* ( -- linenr ) */
+	    PUSH_TOS;
+	    TOS = gCurrentTask->td_LineNumber;
+	    endcase;
+
+	case ID_SOURCE_LINE_NUMBER_STORE: /* ( linenr -- ) */
+	    gCurrentTask->td_LineNumber = TOS;
+	    TOS = M_POP;
+	    endcase;
+
         case ID_SWAP:
             Scratch = TOS;
             TOS = *STKPTR;