--- gforth/libffi.fs	2005/12/11 19:31:48	1.7
+++ gforth/libffi.fs	2006/12/31 13:39:13	1.13
@@ -1,6 +1,6 @@
 \ libffi.fs	shared library support package 		14aug05py
 
-\ Copyright (C) 1995,1996,1997,1998,2000,2003,2005 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1996,1997,1998,2000,2003,2005,2006 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -104,9 +104,10 @@ Create argptr maxargs 0 [DO]  argbuf [I]
 \ "forward" when revarg is on
 
 \ : >c+  ( char buf -- buf' )  tuck   c!    cell+ cell+ ;
-: >i+  ( n buf -- buf' )     tuck    !    cell+ cell+ ;
+: >i+  ( n buf -- buf' )     tuck   l!    cell+ cell+ ;
 : >p+  ( addr buf -- buf' )  tuck    !    cell+ cell+ ;
 : >d+  ( d buf -- buf' )     dup >r ffi-2! r> cell+ cell+ ;
+: >dl+ ( d buf -- buf' )     nip dup >r  ! r> cell+ cell+ ;
 : >sf+ ( r buf -- buf' )     dup   sf!    cell+ cell+ ;
 : >df+ ( r buf -- buf' )     dup   df!    cell+ cell+ ;
 
@@ -115,6 +116,7 @@ Create argptr maxargs 0 [DO]  argbuf [I]
 : >i-  ( n buf -- buf' )     2 cells - tuck   l! ;
 : >p-  ( addr buf -- buf' )  2 cells - tuck    ! ;
 : >d-  ( d buf -- buf' )     2 cells - dup >r ffi-2! r> ;
+: >dl- ( d buf -- buf' )     2 cells - nip dup >r ! r> ;
 : >sf- ( r buf -- buf' )     2 cells - dup   sf! ;
 : >df- ( r buf -- buf' )     2 cells - dup   df! ;
 
@@ -123,6 +125,7 @@ Create argptr maxargs 0 [DO]  argbuf [I]
 : i>x   ( -- n )  retbuf l@ ;
 : is>x   ( -- n )  retbuf sl@ ;
 : p>x   ( -- addr ) retbuf @ ;
+: dl>x   ( -- d ) retbuf @ s>d ;
 : d>x   ( -- d )  retbuf ffi-2@ ;
 : sf>x  ( -- r )  retbuf sf@ ;
 : df>x  ( -- r )  retbuf df@ ;
@@ -148,6 +151,10 @@ Variable args args off
     revarg @ IF  drop 0  ELSE  2* cells  THEN  argbuf +
     postpone Literal ;
 
+Variable ind-call  ind-call off
+: fptr  ind-call on  Create  here thisproc !
+    0 , 0 , 0 , 0 also c-decl  DOES>  cell+ dup cell+ cell+ >r ! ;
+
 : ffi-call, ( -- lit-cif )
     postpone drop postpone argptr postpone retbuf
     thisproc @ cell+ postpone literal postpone @
@@ -187,23 +194,30 @@ Variable args args off
 
 : rettype ( endxt n "name" -- )
     Create 2,
-  DOES>  2@ args @ decl, symbol, previous revarg off args off ;
+  DOES>  2@ args @ decl, ind-call @ 0= IF  symbol,  THEN
+    previous revarg off args off ind-call off ;
+
+6 1 cells 4 > 2* - Constant _long
 
 also c-decl definitions
 
 : <rev>  revarg on ;
 
 ' >i+  ' >i-    6 argtype int
+' >p+  ' >p-    _long argtype long
 ' >p+  ' >p-  &12 argtype ptr
 ' >d+  ' >d-    8 argtype llong
+' >dl+ ' >dl-   6 argtype dlong
 ' >sf+ ' >sf-   9 argtype sf
 ' >df+ ' >df- &10 argtype df
 
 ' noop   0 rettype (void)
 ' is>x   6 rettype (int)
-' i>x    6 rettype (uint)
+' i>x    5 rettype (uint)
+' p>x    _long rettype (long)
 ' p>x  &12 rettype (ptr)
 ' d>x    8 rettype (llong)
+' dl>x   6 rettype (dlong)
 ' sf>x   9 rettype (sf)
 ' df>x &10 rettype (fp)
 
@@ -238,18 +252,17 @@ Variable callbacks
 
 Variable rtype
 
-: alloc-callback ( -- addr )
-    rtype @ create-cif
-    cif@ 1- tuck + c@ ffi-type here dup >r 1 ffi-size allot
-    ffi-prep-closure throw r> ;
+: alloc-callback ( ip -- addr )
+    rtype @ make-cif here 1 ffi-size allot
+    dup >r ffi-prep-closure throw r> ;
 
 : callback ( -- )
     Create  0 ] postpone >r also cb-decl cifreset
   DOES>
-    Create here >r 0 , callbacks @ A, r@ callbacks !
+    0 Value  -1 cells allot
+    here >r 0 , callbacks @ A, r@ callbacks !
     swap postpone Literal postpone call , postpone EXIT
-    r> dup cell+ cell+ alloc-callback swap !
-  DOES> @ ;
+    r@ cell+ cell+ alloc-callback r> ! ;
 
 : callback; ( 0 arg1 .. argn -- )
     BEGIN  over  WHILE  compile,  REPEAT
@@ -277,7 +290,9 @@ also cb-decl definitions
 ' ffi-arg-int        6 argtype' int
 ' ffi-arg-float      9 argtype' sf
 ' ffi-arg-double   &10 argtype' df
+' ffi-arg-long       _long argtype' long
 ' ffi-arg-longlong   8 argtype' llong
+' ffi-arg-dlong      6 argtype' dlong
 ' ffi-arg-ptr      &12 argtype' ptr
 
 ' ffi-ret-void       0 rettype' (void)
@@ -285,6 +300,8 @@ also cb-decl definitions
 ' ffi-ret-float      9 rettype' (sf)
 ' ffi-ret-double   &10 rettype' (fp)
 ' ffi-ret-longlong   8 rettype' (llong)
+' ffi-ret-long       _long rettype' (long)
+' ffi-ret-dlong      _long rettype' (dlong)
 ' ffi-ret-ptr      &12 rettype' (ptr)
 
 previous definitions