--- gforth/prim	2005/11/27 22:47:18	1.179
+++ gforth/prim	2006/01/05 01:37:31	1.185
@@ -1,6 +1,6 @@
 \ Gforth primitives
 
-\ Copyright (C) 1995,1996,1997,1998,2000,2003,2004 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -1229,7 +1229,7 @@ useraddr	( #u -- a_addr )	new
 a_addr = (Cell *)(up+u);
 
 up!	( a_addr -- )	gforth	up_store
-UP=up=(char *)a_addr;
+gforth_UP=up=(char *)a_addr;
 :
  up ! ;
 Variable UP
@@ -1788,11 +1788,11 @@ access the stack itself. The stack point
 variables @code{SP} and @code{FP}.""
 /* This is a first attempt at support for calls to C. This may change in
    the future */
-FP=fp;
-SP=sp;
+gforth_FP=fp;
+gforth_SP=sp;
 ((void (*)())w)();
-sp=SP;
-fp=FP;
+sp=gforth_SP;
+fp=gforth_FP;
 
 \+
 \+file
@@ -2440,9 +2440,27 @@ u3 = 0;
 #endif
 
 wcall	( ... u -- ... )	gforth
-FP=fp;
-sp=(Cell*)(SYSCALL(Cell*(*)(Cell *, void *))u)(sp, &FP);
-fp=FP;
+gforth_FP=fp;
+sp=(Cell*)(SYSCALL(Cell*(*)(Cell *, void *))u)(sp, &gforth_FP);
+fp=gforth_FP;
+
+w@ ( a_addr -- u )	gforth wfetch
+u = *(UWyde*)(a_addr);
+
+sw@ ( a_addr -- u )	gforth swfetch
+u = *(Wyde*)(a_addr);
+
+w! ( u a_addr -- )	gforth wstore
+*(Wyde*)(a_addr) = u;
+
+l@ ( a_addr -- u )	gforth lfetch
+u = *(UTetrabyte*)(a_addr);
+
+sl@ ( a_addr -- u )	gforth slfetch
+u = *(Tetrabyte*)(a_addr);
+
+l! ( u a_addr -- )	gforth lstore
+*(Tetrabyte*)(a_addr) = u;
 
 \+FFCALL
 
@@ -2547,7 +2565,7 @@ REST_REGS
 c_addr = prv;
 
 alloc-callback	( a_ip -- c_addr )	gforth	alloc_callback
-c_addr = (char *)alloc_callback(engine_callback, (Xt *)a_ip);
+c_addr = (char *)alloc_callback(gforth_callback, (Xt *)a_ip);
 
 va-start-void	( -- )	gforth	va_start_void
 va_start_void(clist);
@@ -2639,16 +2657,12 @@ ffi-prep-cif ( a_atypes n a_rtype a_cif
 w = ffi_prep_cif(a_cif, FFI_DEFAULT_ABI, n, a_rtype, a_atypes);
 
 ffi-call ( a_avalues a_rvalue a_ip a_cif -- )	gforth ffi_call
+SAVE_REGS
 ffi_call(a_cif, a_ip, a_rvalue, a_avalues);
+REST_REGS
 
 ffi-prep-closure ( a_ip a_cif a_closure -- w )	gforth ffi_prep_closure
-w = ffi_prep_closure(a_closure, a_cif, ffi_callback, a_ip);
-
-ffi-i@ ( a_addr -- n )	gforth ffi_ifetch
-n = *(int*)(a_addr);
-
-ffi-i! ( n a_addr -- )	gforth ffi_istore
-*(int*)(a_addr) = n;
+w = ffi_prep_closure(a_closure, a_cif, gforth_callback, a_ip);
 
 ffi-2@ ( a_addr -- d )	gforth ffi_2fetch
 #ifdef BUGGY_LONG_LONG