Diff for /gforth/libffi.fs between versions 1.19 and 1.30

version 1.19, 2008/04/22 14:50:59 version 1.30, 2008/09/18 02:42:24
Line 1 Line 1
 \ libffi.fs     shared library support package          14aug05py  \ libffi.fs     shared library support package          14aug05py
   
 \ Copyright (C) 1995,1996,1997,1998,2000,2003,2005,2006,2007 Free Software Foundation, Inc.  \ Copyright (C) 1995,1996,1997,1998,2000,2003,2005,2006,2007,2008 Free Software Foundation, Inc.
   
 \ This file is part of Gforth.  \ This file is part of Gforth.
   
Line 21 Line 21
 \ note that the API functions have their arguments reversed and other  \ note that the API functions have their arguments reversed and other
 \ deviations.  \ deviations.
   
 require libcc.fs  c-library libffi
   s" ffi" add-lib
   
 s" libffi" open-lib 0= [if]  \ The ffi.h of XCode needs the following line, and it should not hurt elsewhere
     .( cannot open libffi ) cr abort  \c #define MACOSX
 [then]  include-ffi.h-string save-c-prefix-line \ #include <ffi.h>
   \c #include <stdio.h>
 \c #include <ffi.h>  
 \c static Cell *gforth_RP;  
 \c static char *gforth_LP;  
 \c static void **gforth_clist;  \c static void **gforth_clist;
 \c static void *gforth_ritem;  \c static void *gforth_ritem;
   \c #ifndef HAS_BACKLINK
   \c static void **saved_gforth_pointers;
   \c #endif
 \c typedef void *Label;  \c typedef void *Label;
 \c typedef Label *Xt;  \c typedef Label *Xt;
 \c static void gforth_callback_ffi(ffi_cif * cif, void * resp, void ** args, void * ip)  \c static void gforth_callback_ffi(ffi_cif * cif, void * resp, void ** args, void * ip)
 \c {  \c {
 \c   Cell *rp1 = gforth_RP;  \c #ifndef HAS_BACKLINK
 \c   Cell *sp = gforth_SP;  \c   void **gforth_pointers = saved_gforth_pointers;
 \c   Float *fp = gforth_FP;  \c #endif
 \c   char *lp = gforth_LP;  \c   {
 \c   void ** clist = gforth_clist;  \c     Cell *rp1 = gforth_RP;
 \c   void * ritem = gforth_ritem;  \c     Cell *sp = gforth_SP;
   \c     Float *fp = gforth_FP;
   \c     unsigned char *lp = gforth_LP;
   \c     void ** clist = gforth_clist;
   \c     void * ritem = gforth_ritem;
   \c
   \c     gforth_clist = args;
   \c     gforth_ritem = resp;
   \c
   \c     gforth_engine((Xt *)ip, sp, rp1, fp, lp, gforth_UP);
 \c   \c 
 \c   gforth_clist = args;  \c     /* restore global variables */
 \c   gforth_ritem = resp;  \c     gforth_RP = rp1;
 \c   \c     gforth_SP = sp;
 \c   gforth_engine((Xt *)ip, sp, rp1, fp, lp);  \c     gforth_FP = fp;
 \c   \c     gforth_LP = lp;
 \c   /* restore global variables */  \c     gforth_clist = clist;
 \c   gforth_RP = rp1;  \c     gforth_ritem = ritem;
 \c   gforth_SP = sp;  \c   }
 \c   gforth_FP = fp;  
 \c   gforth_LP = lp;  
 \c   gforth_clist = clist;  
 \c   gforth_ritem = ritem;  
 \c }  \c }
   
 \c static void* ffi_types[] =  \c static void* ffi_types[] =
Line 77  c-function ffi-size ffi_size n -- n Line 83  c-function ffi-size ffi_size n -- n
 \c                        (ffi_type *)rtype, (ffi_type **)atypes)  \c                        (ffi_type *)rtype, (ffi_type **)atypes)
 c-function ffi-prep-cif ffi_prep_cif1 a n a a -- n  c-function ffi-prep-cif ffi_prep_cif1 a n a a -- n
   
   \c #ifdef HAS_BACKLINK
   \c #define ffi_call1(a_avalues, a_rvalue ,a_ip ,a_cif) \
   \c             ffi_call((ffi_cif *)a_cif, (void(*)())a_ip, \
   \c                      (void *)a_rvalue, (void **)a_avalues)
   \c #else
 \c #define ffi_call1(a_avalues, a_rvalue ,a_ip ,a_cif) \  \c #define ffi_call1(a_avalues, a_rvalue ,a_ip ,a_cif) \
   \c             (saved_gforth_pointers = gforth_pointers), \
 \c             ffi_call((ffi_cif *)a_cif, (void(*)())a_ip, \  \c             ffi_call((ffi_cif *)a_cif, (void(*)())a_ip, \
 \c                      (void *)a_rvalue, (void **)a_avalues)  \c                      (void *)a_rvalue, (void **)a_avalues)
   \c #endif
 c-function ffi-call ffi_call1 a a a a -- void  c-function ffi-call ffi_call1 a a a a -- void
   
 \c #define ffi_prep_closure1(a_ip, a_cif, a_closure) \  \c #define ffi_prep_closure1(a_ip, a_cif, a_closure) \
 \c              ffi_prep_closure((ffi_closure *)a_closure, (ffi_cif *)a_cif, gforth_callback_ffi, (void *)a_ip)  \c              ffi_prep_closure((ffi_closure *)a_closure, (ffi_cif *)a_cif, gforth_callback_ffi, (void *)a_ip)
 c-function ffi-prep-closure a a a -- n  c-function ffi-prep-closure ffi_prep_closure1 a a a -- n
   
 \ !! use ud?  \ !! use ud?
 \c #define ffi_2fetch(a_addr) (*(long long *)a_addr)  \c #define ffi_2fetch(a_addr) (*(long long *)a_addr)
Line 143  c-function ffi-ret-float1 ffi_ret_float1 Line 156  c-function ffi-ret-float1 ffi_ret_float1
 \c #define ffi_ret_double1(r) (*(double *)(gforth_ritem) = r)  \c #define ffi_ret_double1(r) (*(double *)(gforth_ritem) = r)
 c-function ffi-ret-double1 ffi_ret_double1 r -- void  c-function ffi-ret-double1 ffi_ret_double1 r -- void
 : ffi-ret-double ( r -- ) ffi-ret-double1 ffi-ret-void ;  : ffi-ret-double ( r -- ) ffi-ret-double1 ffi-ret-void ;
   end-c-library
   
 \ common stuff, same as fflib.fs  \ common stuff, same as fflib.fs
   
Line 336  also c-decl definitions Line 350  also c-decl definitions
 ' >dl+ ' >dl-   6 argtype dlong  ' >dl+ ' >dl-   6 argtype dlong
 ' >sf+ ' >sf-   9 argtype sf  ' >sf+ ' >sf-   9 argtype sf
 ' >df+ ' >df- &10 argtype df  ' >df+ ' >df- &10 argtype df
   : ints 0 ?DO int LOOP ;
   
 ' noop   0 rettype (void)  ' noop   0 rettype (void)
 ' is>x   6 rettype (int)  ' is>x   6 rettype (int)
Line 423  also cb-decl definitions Line 438  also cb-decl definitions
 ' ffi-arg-longlong   8 argtype' llong  ' ffi-arg-longlong   8 argtype' llong
 ' ffi-arg-dlong      6 argtype' dlong  ' ffi-arg-dlong      6 argtype' dlong
 ' ffi-arg-ptr      &12 argtype' ptr  ' ffi-arg-ptr      &12 argtype' ptr
   : ints ( n -- ) 0 ?DO postpone int LOOP ; immediate
   
 ' ffi-ret-void       0 rettype' (void)  ' ffi-ret-void       0 rettype' (void)
 ' ffi-ret-int        6 rettype' (int)  ' ffi-ret-int        6 rettype' (int)

Removed from v.1.19  
changed lines
  Added in v.1.30


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>