Diff for /gforth/libcc.fs between versions 1.11 and 1.18

version 1.11, 2007/04/25 17:59:36 version 1.18, 2007/06/01 18:40:20
Line 82 Line 82
 \ first-time word, then to the run-time word; the run-time word calls  \ first-time word, then to the run-time word; the run-time word calls
 \ the c function.  \ the c function.
   
   
   require struct.fs
   
       \ counted-string
       
 \ c-function-ft word body:  \ c-function-ft word body:
 \  cell xt of c-function-rt word  struct
 \  cell xt of c-function deferred word       cell% field cff-cfr \ xt of c-function-rt word
 \  char return type index      cell% field cff-deferred \ xt of c-function deferred word
 \  char parameter count n      cell% field cff-lha \ address of the lib-handle for the lib that
 \  char*n parameters (type indices)                          \ contains the wrapper function of the word
 \  counted string: c-name      char% field cff-rtype  \ return type
       char% field cff-np     \ number of parameters
       1 0   field cff-ptypes \ #npar parameter types
       \  counted string: c-name
   end-struct cff%
   
   variable c-source-file-id \ contains the source file id of the current batch
   0 c-source-file-id !
   variable lib-handle-addr \ points to the library handle of the current batch.
                            \ the library handle is 0 if the current
                            \ batch is not yet compiled.
   2variable lib-filename \ filename without extension
   
 : .nb ( n -- )  : .nb ( n -- )
     0 .r ;      0 .r ;
Line 110 Line 126
     c c-addr1 c!      c c-addr1 c!
     c-addr1 u1 1 /string ;      c-addr1 u1 1 /string ;
   
 \ linked list stuff (should go elsewhere)  : s+ { addr1 u1 addr2 u2 -- addr u }
       u1 u2 + allocate throw { addr }
       addr1 addr u1 move
       addr2 addr u1 + u2 move
       addr u1 u2 +
   ;
   
 hex  : append { addr1 u1 addr2 u2 -- addr u }
       addr1 u1 u2 + dup { u } resize throw { addr }
       addr2 addr u1 + u2 move
       addr u ;
   
 require struct.fs  \ linked list stuff (should go elsewhere)
   
 struct  struct
     cell% field list-next      cell% field list-next
Line 150  end-struct c-prefix% Line 174  end-struct c-prefix%
 variable c-prefix-lines 0 c-prefix-lines !  variable c-prefix-lines 0 c-prefix-lines !
 variable c-prefix-lines-end c-prefix-lines c-prefix-lines-end !  variable c-prefix-lines-end c-prefix-lines c-prefix-lines-end !
   
 : save-c-prefix-line ( c-addr u -- )  
     align here 0 , c-prefix-lines-end list-append ( c-addr u )  
     longstring, ;  
   
 : \c ( "rest-of-line" -- )  
     -1 parse save-c-prefix-line ;  
   
 : print-c-prefix-line ( node -- )  : print-c-prefix-line ( node -- )
     dup c-prefix-chars swap c-prefix-count @ type cr ;      dup c-prefix-chars swap c-prefix-count @ type cr ;
   
 : print-c-prefix-lines ( -- )  : print-c-prefix-lines ( -- )
     c-prefix-lines @ ['] print-c-prefix-line list-map ;      c-prefix-lines @ ['] print-c-prefix-line list-map ;
   
 \c #include "engine/libcc.h"  : save-c-prefix-line ( c-addr u -- )
       c-source-file-id @ ?dup-if
           >r 2dup r> write-line throw
       then
       align here 0 , c-prefix-lines-end list-append ( c-addr u )
       longstring, ;
   
 print-c-prefix-lines  : \c ( "rest-of-line" -- ) \ gforth backslash-c
       \G One line of C declarations for the C interface
       -1 parse save-c-prefix-line ;
   
   \c #include "engine/libcc.h"
   
 \ Types (for parsing)  \ Types (for parsing)
   
Line 327  create gen-wrapped-types Line 353  create gen-wrapped-types
 : gen-wrapper-function ( addr -- )  : gen-wrapper-function ( addr -- )
     \ addr points to the return type index of a c-function descriptor      \ addr points to the return type index of a c-function descriptor
     dup { descriptor }      dup { descriptor }
     c@+ { ret } count 2dup { d: pars } chars + count { d: c-name }      count { ret } count 2dup { d: pars } chars + count { d: c-name }
     ." void " descriptor wrapper-function-name 2dup type drop free throw      ." void " descriptor wrapper-function-name 2dup type drop free throw
     .\" (void)\n"      .\" (void)\n"
     .\" {\n  Cell MAYBE_UNUSED *sp = gforth_SP;\n  Float MAYBE_UNUSED *fp = gforth_FP;\n  "      .\" {\n  Cell MAYBE_UNUSED *sp = gforth_SP;\n  Float MAYBE_UNUSED *fp = gforth_FP;\n  "
Line 340  create gen-wrapped-types Line 366  create gen-wrapped-types
     endif      endif
     .\" }\n" ;      .\" }\n" ;
   
 variable c-source-file-id  : tempdir ( -- c-addr u )
 0 c-source-file-id !      s" TMPDIR" getenv dup 0= if
           2drop s" /tmp"
       then ;
   
   : gen-filename ( x -- c-addr u )
       \ generates a filename without extension for lib-handle-addr X
       0 <<# ['] #s $10 base-execute #> 
       tempdir s" /gforth-c-" s+ 2swap append #>> ;
   
   : init-c-source-file ( -- )
       c-source-file-id @ 0= if
           here 0 , dup lib-handle-addr ! gen-filename 2dup lib-filename 2!
           s" .c" s+ 2dup w/o create-file throw dup c-source-file-id !
           ['] print-c-prefix-lines swap outfile-execute
           drop free throw
       endif ;
   
 : c-source-file ( -- file-id )  : c-source-file ( -- file-id )
     c-source-file-id @ ?dup-if      c-source-file-id @ assert( dup ) ;
         exit  
     endif  
     s" xxx.c" w/o create-file throw dup c-source-file-id !  
     ['] print-c-prefix-lines over outfile-execute ;  
   
 : compile-wrapper-function ( -- )  : compile-wrapper-function ( -- )
     c-source-file-id @ assert( dup )      c-source-file close-file throw
     close-file throw 0 c-source-file-id !      0 c-source-file-id !
     s" gcc -fPIC -shared -Wl,-soname,xxx.so.1 -Wl,-export_dynamic -o xxx.so.1 -O xxx.c" system      s" gcc -I. -fPIC -shared -Wl,-soname," lib-filename 2@ s+
     $? abort" compiler generated error" ;      s" .so.1 -Wl,-export_dynamic -o " append lib-filename 2@ append
       s" .so.1 -O " append lib-filename 2@ append s" .c" append ( c-addr u )
       2dup system drop free throw
       $? abort" compiler generated error" \ !! call dlerror
       lib-filename 2@ s" .so.1" s+
       2dup open-lib dup 0= abort" open-lib failed" \ !! call dlerror
       ( lib-handle ) lib-handle-addr @ !
       2dup delete-file throw drop free throw
       lib-filename 2@ s" .c" s+ 2dup delete-file throw drop free throw
       lib-filename 2@ drop free throw 0 0 lib-filename 2! ;
 \    s" ar rcs xxx.a xxx.o" system  \    s" ar rcs xxx.a xxx.o" system
 \    $? abort" ar generated error" ;  \    $? abort" ar generated error" ;
   
 : link-wrapper-function ( addr -- sym )  : link-wrapper-function { cff -- sym }
     wrapper-function-name { d: wrapper-name }      cff cff-rtype wrapper-function-name { d: wrapper-name }
     s" /home/anton/gforth/xxx.so.1" open-lib ( lib-handle )      wrapper-name cff cff-lha @ @ assert( dup ) lib-sym dup 0= -&32 and throw
     wrapper-name rot lib-sym dup 0= -&32 and throw  
     wrapper-name drop free throw ;      wrapper-name drop free throw ;
   
 : c-function-ft ( xt-defer xt-cfr "c-name" "{libcc-type}" "--" "libcc-type" -- )  : c-function-ft ( xt-defr xt-cfr "c-name" "{libcc-type}" "--" "libcc-type" -- )
     \ build time/first time action for c-function      \ build time/first time action for c-function
     noname create 2,      init-c-source-file
       noname create 2, lib-handle-addr @ ,
     parse-name { d: c-name }      parse-name { d: c-name }
     here parse-function-types c-name string,      here parse-function-types c-name string,
     ['] gen-wrapper-function c-source-file outfile-execute      ['] gen-wrapper-function c-source-file outfile-execute
   does> ( ... -- ... )    does> ( ... -- ... )
     dup 2@ { xt-defer xt-cfr }      dup 2@ { xt-defer xt-cfr }
     compile-wrapper-function      dup cff-lha @ @ 0= if
     2 cells + link-wrapper-function xt-cfr >body !          compile-wrapper-function
       endif
       link-wrapper-function xt-cfr >body !
     xt-cfr xt-defer defer!      xt-cfr xt-defer defer!
     xt-cfr execute ;      xt-cfr execute ;
   
Line 384  variable c-source-file-id Line 432  variable c-source-file-id
   does> ( ... -- ... )    does> ( ... -- ... )
     @ call-c ;      @ call-c ;
   
 : c-function ( "forth-name" "c-name" "{libcc-type}" "--" "libcc-type" -- )  : c-function ( "forth-name" "c-name" "@{type@}" "--" "type" -- ) \ gforth
       \G Define a Forth word @i{forth-name}.  @i{Forth-name} has the
       \G specified stack effect and calls the C function @code{c-name}.
     defer lastxt dup c-function-rt lastxt c-function-ft      defer lastxt dup c-function-rt lastxt c-function-ft
     lastxt swap defer! ;      lastxt swap defer! ;
   
 s" Library not found" exception constant err-nolib  
   
 : library ( "name" "file" -- ) \ gforth  
 \G Dynamically links the library specified by @i{file}.  Defines a  
 \G word @i{name} ( -- lib ) that starts the declaration of a  
 \G function from that library.  
     create parse-name open-lib dup 0= err-nolib and throw ,  
   does> ( -- lib )  
     @ ;  
   
 \ test  
   
 \ test all parameter and return types  
   
 \ cr .( #include "engine/libcc.h")  
 \ cr .( #include <unistd.h>)  
 \ cr ." typedef void (* func)(int);  
 \ cr ." int test1(int,char*,long,double,void (*)(int));"  
 \ cr ." Cell *test2(void);"  
 \ cr ." int test3(void);"  
 \ cr ." float test4(void);"  
 \ cr ." func test5(void);"  
 \ cr ." void test6(void);"  
 \ cr  
   
 \ c-function dlseek lseek n d n -- d  
 \ c-function n test1 n a d r func -- n  
 \ c-function a test2 -- a  
 \ c-function d test3 -- d  
 \ c-function r test4 -- r  
 \ c-function func test5 -- func  
 \ c-function void test6 -- void  
   
 \c #include <string.h>  
 \c #include <stdlib.h>  
   
 cr here hex.  
   
 c-function strlen strlen a -- n  
 c-function labs labs n -- n  
   
 cr s\" fooo\0" 2dup dump drop .s strlen cr .s drop cr   
 \ -5 labs .s drop cr  

Removed from v.1.11  
changed lines
  Added in v.1.18


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