--- gforth/prim	2009/12/31 15:32:35	1.245
+++ gforth/prim	2011/12/31 15:29:25	1.264
@@ -1,6 +1,6 @@
 \ Gforth primitives
 
-\ Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006,2007,2008,2009 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006,2007,2008,2009,2010,2011 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -229,9 +229,28 @@ fprintf(stderr, "dodoes to %x, push %x\n
 SET_IP(DOES_CODE1(CFA));
 #endif /* !defined(NO_IP) */
 
-(does-handler) ( -- )	gforth-internal	paren_does_handler
-""just a slot to have an encoding for the DOESJUMP, 
-which is no longer used anyway (!! eliminate this)""
+(doabicode) ( ... -- ...)	gforth-internal	paren_doabicode
+""run-time routine for @code{ABI-code} definitions""
+abifunc *f = (abifunc *)PFA(CFA);
+Float *fp_mem = fp;
+sp = (*f)(sp, &fp_mem);
+fp = fp_mem;
+#ifdef NO_IP
+INST_TAIL;
+goto *next_code;
+#endif /* defined(NO_IP) */
+
+(do;abicode) ( ... -- ... ) gforth-internal paren_do_semicolon_abi_code
+""run-time routine for @code{;abi-code}-defined words""
+Float *fp_mem = fp;
+Address body = (Address)PFA(CFA);
+semiabifunc *f = (semiabifunc *)DOES_CODE1(CFA);
+sp = (*f)(sp, &fp_mem, body);
+fp = fp_mem;
+#ifdef NO_IP
+INST_TAIL;
+goto *next_code;
+#endif /* defined(NO_IP) */
 
 \F [endif]
 
@@ -593,6 +612,24 @@ SET_IP((Xt *)a_target);
      cell+
  THEN  >r ;
 
+(try1)	( ... a_oldhandler a_recovery -- R:a_recovery R:a_sp R:f_fp R:c_lp R:a_oldhandler a_newhandler ) gforth paren_try1
+a_sp = sp-1;
+f_fp = fp;
+c_lp = lp;
+a_newhandler = rp-5;
+
+(throw1) ( ... wball a_handler -- ... wball ) gforth paren_throw1
+rp = a_handler;
+lp = (Address)rp[1];
+fp = (Float *)rp[2];
+sp = (Cell *)rp[3];
+#ifndef NO_IP
+ip=IP;
+#endif
+SUPER_END;
+VM_JUMP(EXEC1(*(Xt *)rp[4]));
+  
+
 \+
 
 \ don't make any assumptions where the return stack is!!
@@ -1066,6 +1103,22 @@ lshift	( u1 n -- u2 )		core	l_shift
 :
     0 ?DO 2* LOOP ;
 
+umax	( u1 u2 -- u )	core
+if (u1<u2)
+  u = u2;
+else
+  u = u1;
+:
+ 2dup u< IF swap THEN drop ;
+
+umin	( u1 u2 -- u )	core
+if (u1<u2)
+  u = u1;
+else
+  u = u2;
+:
+ 2dup u> IF swap THEN drop ;
+
 \g compare
 
 \ comparisons(prefix, args, prefix, arg1, arg2, wordsets...)
@@ -1767,6 +1820,8 @@ if (a_addr1==NULL)
 else
   a_addr2 = (Cell *)realloc(a_addr1, u);
 wior = IOR(a_addr2==NULL);	/* !! Define a return code */
+if (a_addr2==NULL)
+  a_addr2 = a_addr1;
 
 strerror	( n -- c_addr u )	gforth
 c_addr = (Char *)strerror(n);
@@ -1994,6 +2049,19 @@ duser = timeval2us(&time1);
 dsystem = DZERO;
 #endif
 
+ntime	( -- dtime )	gforth
+""Report the current time in nanoseconds since some epoch.""
+struct timespec time1;
+#ifdef HAVE_CLOCK_GETTIME
+clock_gettime(CLOCK_REALTIME,&time1);
+#else
+struct timeval time2;
+gettimeofday(&time2,NULL);
+time1.tv_sec = time2.tv_sec;
+time1.tv_nsec = time2.tv_usec*1000;
+#endif
+dtime = timespec2ns(&time1);
+
 \+
 
 \+floating
@@ -2473,6 +2541,105 @@ c_addr = "libltdl is not configured";
 u = strlen(c_addr);
 #endif
 
+be-w! ( w c_addr -- )	gforth w_store_be
+""Store the bottom 16 bits of @i{w} at @i{c_addr} in big endian format.""
+c_addr[0] = w >> 8;
+c_addr[1] = w;
+
+be-l! ( w c_addr -- )	gforth l_store_be
+""Store the bottom 32 bits of @i{w} at @i{c_addr} in big endian format.""
+c_addr[0] = w >> 24;
+c_addr[1] = w >> 16;
+c_addr[2] = w >> 8;
+c_addr[3] = w;
+
+le-w! ( w c_addr -- )	gforth w_store_le
+""Store the bottom 16 bits of @i{w} at @i{c_addr} in big endian format.""
+c_addr[1] = w >> 8;
+c_addr[0] = w;
+
+le-l! ( w c_addr -- )	gforth l_store_le
+""Store the bottom 32 bits of @i{w} at @i{c_addr} in big endian format.""
+c_addr[3] = w >> 24;
+c_addr[2] = w >> 16;
+c_addr[1] = w >> 8;
+c_addr[0] = w;
+
+be-uw@ ( c_addr -- u )	gforth w_fetch_be
+""@i{u} is the zero-extended 16-bit big endian value stored at @i{c_addr}.""
+u = (c_addr[0] << 8) | (c_addr[1]);
+
+be-ul@ ( c_addr -- u )	gforth l_fetch_be
+""@i{u} is the zero-extended 32-bit big endian value stored at @i{c_addr}.""
+u = (c_addr[0] << 24) | (c_addr[1] << 16) | (c_addr[2] << 8) | (c_addr[3]);
+
+le-uw@ ( c_addr -- u )	gforth w_fetch_le
+""@i{u} is the zero-extended 16-bit little endian value stored at @i{c_addr}.""
+u = (c_addr[1] << 8) | (c_addr[0]);
+
+le-ul@ ( c_addr -- u )	gforth l_fetch_le
+""@i{u} is the zero-extended 32-bit little endian value stored at @i{c_addr}.""
+u = (c_addr[3] << 24) | (c_addr[2] << 16) | (c_addr[1] << 8) | (c_addr[0]);
+
+\+64bit
+
+x! ( w c_addr -- )	gforth x_store
+""Store the bottom 64 bits of @i{w} at 64-bit-aligned @i{c_addr}.""
+*(UOctabyte *)c_addr = w;
+
+ux@ ( c_addr -- u )	gforth u_x_fetch
+""@i{u} is the zero-extended 64-bit value stored at 64-bit-aligned @i{c_addr}.""
+u = *(UOctabyte *)c_addr;
+
+sx@ ( c_addr -- n )	gforth s_x_fetch
+""@i{u} is the sign-extended 64-bit value stored at 64-bit-aligned @i{c_addr}.""
+n = *(Octabyte *)c_addr;
+
+be-x! ( w c_addr -- )	gforth b_e_x_store
+""Store the bottom 64 bits of @i{w} at @i{c_addr} in big endian format.""
+c_addr[0] = w >> 56;
+c_addr[1] = w >> 48;
+c_addr[2] = w >> 40;
+c_addr[3] = w >> 32;
+c_addr[4] = w >> 24;
+c_addr[5] = w >> 16;
+c_addr[6] = w >> 8;
+c_addr[7] = w;
+
+le-x! ( w c_addr -- )	gforth l_e_x_store
+""Store the bottom 64 bits of @i{w} at @i{c_addr} in big endian format.""
+c_addr[7] = w >> 56;
+c_addr[6] = w >> 48;
+c_addr[5] = w >> 40;
+c_addr[4] = w >> 32;
+c_addr[3] = w >> 24;
+c_addr[2] = w >> 16;
+c_addr[1] = w >> 8;
+c_addr[0] = w;
+
+be-ux@ ( c_addr -- u )	gforth b_e_u_x_fetch
+""@i{u} is the zero-extended 64-bit big endian value stored at @i{c_addr}.""
+u = (((Cell)(c_addr[0]) << 56) |
+     ((Cell)(c_addr[1]) << 48) |
+     ((Cell)(c_addr[2]) << 40) |
+     ((Cell)(c_addr[3]) << 32) |
+     ((Cell)(c_addr[4]) << 24) |
+     ((Cell)(c_addr[5]) << 16) |
+     ((Cell)(c_addr[6]) << 8) |
+     ((Cell)(c_addr[7])));
+
+le-ux@ ( c_addr -- u )	gforth l_e_u_x_fetch
+""@i{u} is the zero-extended 64-bit little endian value stored at @i{c_addr}.""
+u = (((Cell)(c_addr[7]) << 56) |
+     ((Cell)(c_addr[6]) << 48) |
+     ((Cell)(c_addr[5]) << 40) |
+     ((Cell)(c_addr[4]) << 32) |
+     ((Cell)(c_addr[3]) << 24) |
+     ((Cell)(c_addr[2]) << 16) |
+     ((Cell)(c_addr[1]) << 8) |
+     ((Cell)(c_addr[0])));
+
+\+
 \+
 \g peephole
 
@@ -2520,6 +2687,36 @@ a_addr = groups;
 
 \+
 
+\g primitive_centric
+
+\ primitives for primitive-centric code
+\ another one is does-exec
+
+abi-call	( #a_callee ... -- ... ) gforth-internal abi_call
+/* primitive for compiled ABI-CODE words */
+abifunc *f = (abifunc *)a_callee;
+Float *fp_mem = fp;
+sp = (*f)(sp, &fp_mem);
+fp = fp_mem;
+
+;abi-code-exec ( #a_cfa ... -- ... ) gforth-internal semi_abi_code_exec
+/* primitive for performing ;ABI-CODE words */
+Float *fp_mem = fp;
+semiabifunc *f = (semiabifunc *)DOES_CODE1(a_cfa);
+Address body = (Address)PFA(a_cfa);
+sp = (*f)(sp, &fp_mem, body);
+fp = fp_mem;
+
+lit-execute	( #a_addr -- )	new	lit_execute
+/* for ;code and code words; a static superinstruction would be more general, 
+   but VM_JUMP is currently not supported there */
+#ifndef NO_IP
+ip=IP;
+#endif
+SUPER_END;
+VM_JUMP(EXEC1((Xt)a_addr));
+
+
 \g static_super
 
 ifdef(`STACK_CACHE_FILE',