Merge branch 'master' into build64
authorPhil Burk <philburk@mobileer.com>
Sun, 19 May 2019 21:55:10 +0000 (14:55 -0700)
committerGitHub <noreply@github.com>
Sun, 19 May 2019 21:55:10 +0000 (14:55 -0700)
1  2 
csrc/pf_guts.h
csrc/pf_inner.c
csrc/pf_save.c
fth/c_struct.fth
fth/member.fth
fth/misc2.fth
fth/system.fth

diff --cc csrc/pf_guts.h
Simple merge
diff --cc csrc/pf_inner.c
@@@ -199,8 -193,26 +193,26 @@@ static void TraceNames( ExecToken Token
  /* Use local copy of CODE_BASE for speed. */
  #define LOCAL_CODEREL_TO_ABS( a ) ((cell_t *) (((cell_t) a) + CodeBase))
  
 -static const char *pfSelectFileModeCreate(cell_t fam );
 -static const char *pfSelectFileModeOpen(cell_t fam );
+ /* 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( cell_t fam );
 +static const char *pfSelectFileModeOpen( cell_t fam );
  
  /**************************************************************/
  static const char *pfSelectFileModeCreate( cell_t fam )
diff --cc csrc/pf_save.c
Simple merge
Simple merge
diff --cc fth/member.fth
Simple merge
diff --cc fth/misc2.fth
Simple merge
diff --cc fth/system.fth
Simple merge