Diff for /gforth/libcc.fs between versions 1.9 and 1.13

version 1.9, 2007/02/23 22:33:21 version 1.13, 2007/05/28 09:43:34
Line 76 Line 76
   
 \ data structures  \ data structures
   
 \ c-function word body:  \ For every c-function, we have three words: two anonymous words
 \  cell function pointer  \ created by c-function-ft (first time) and c-function-rt (run-time),
 \  char return type index  \ and a named deferred word.  The deferred word first points to the
 \  char parameter count n  \ first-time word, then to the run-time word; the run-time word calls
 \  char*n parameters (type indices)  \ the c function.
 \  counted string: c-name  
   
   require struct.fs
   
       \ counted-string
       
   \ c-function-ft word body:
   struct
       cell% field cff-cfr \ xt of c-function-rt word
       cell% field cff-deferred \ xt of c-function deferred word
       cell% field cff-lha \ address of the lib-handle for the lib that
                           \ contains the wrapper function of the word
       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%
   
   
 : .nb ( n -- )  : .nb ( n -- )
     0 .r ;      0 .r ;
Line 89 Line 106
 : const+ ( n1 "name" -- n2 )  : const+ ( n1 "name" -- n2 )
     dup constant 1+ ;      dup constant 1+ ;
   
   : front-string { c-addr1 u1 c-addr2 u2 -- c-addr3 u3 }
       \ insert string c-addr2 u2 in buffer c-addr1 u1; c-addr3 u3 is the
       \ remainder of the buffer.
       assert( u1 u2 u>= )
       c-addr2 c-addr1 u2 move
       c-addr1 u1 u2 /string ;
   
   : front-char { c-addr1 u1 c -- c-addr3 u2 }
       \ insert c in buffer c-addr1 u1; c-addr3 u3 is the remainder of
       \ the buffer.
       assert( u1 0 u> )
       c c-addr1 c!
       c-addr1 u1 1 /string ;
   
 \ linked list stuff (should go elsewhere)  \ linked list stuff (should go elsewhere)
   
 hex  hex
   
 require struct.fs  
   
 struct  struct
     cell% field list-next      cell% field list-next
     1 0   field list-payload      1 0   field list-payload
Line 144  variable c-prefix-lines-end c-prefix-lin Line 173  variable c-prefix-lines-end c-prefix-lin
   
 \c #include "engine/libcc.h"  \c #include "engine/libcc.h"
   
 print-c-prefix-lines  
   
 \ Types (for parsing)  \ Types (for parsing)
   
 wordlist constant libcc-types  wordlist constant libcc-types
Line 288  create gen-wrapped-types Line 315  create gen-wrapped-types
 : gen-wrapped-stmt ( pars c-name fp-change1 sp-change1 ret -- fp-change sp-change )  : gen-wrapped-stmt ( pars c-name fp-change1 sp-change1 ret -- fp-change sp-change )
     cells gen-wrapped-types + @ execute ;      cells gen-wrapped-types + @ execute ;
   
 : gen-wrapper-function ( addr -- )  : wrapper-function-name ( addr -- c-addr u )
     \ addr points to the return type index of a c-function descriptor      \ addr points to the return type index of a c-function descriptor
     c@+ { ret } count 2dup { d: pars } chars + count { d: c-name }      count { r-type } count { d: pars }
     print-c-prefix-lines      pars + count { d: c-name }
     ." void gforth_c_" c-name type ." _"      s" gforth_c_" { d: prefix }
       prefix nip c-name nip + pars nip + 3 + { u }
       u allocate throw { c-addr }
       c-addr u
       prefix front-string c-name front-string '_ front-char
     pars bounds u+do      pars bounds u+do
         i c@ type-letter emit          i c@ type-letter front-char
     loop      loop
     ." _" ret type-letter emit .\" (void)\n"      '_ front-char r-type type-letter front-char assert( dup 0= )
       2drop c-addr u ;
   
   : gen-wrapper-function ( addr -- )
       \ addr points to the return type index of a c-function descriptor
       dup { descriptor }
       count { ret } count 2dup { d: pars } chars + count { d: c-name }
       ." void " descriptor wrapper-function-name 2dup type drop free throw
       .\" (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  "
     pars c-name 2over count-stacks ret gen-wrapped-stmt .\" ;\n"      pars c-name 2over count-stacks ret gen-wrapped-stmt .\" ;\n"
     ?dup-if      ?dup-if
Line 307  create gen-wrapped-types Line 346  create gen-wrapped-types
     endif      endif
     .\" }\n" ;      .\" }\n" ;
   
   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.
   
   : init-c-source-file ( -- )
       c-source-file-id @ 0= if
           s" xxx.c" w/o create-file throw dup c-source-file-id !
           ['] print-c-prefix-lines swap outfile-execute
           here 0 , lib-handle-addr !
       endif ;
   
   : c-source-file ( -- file-id )
       c-source-file-id @ assert( dup ) ;
   
 : compile-wrapper-function ( -- )  : compile-wrapper-function ( -- )
       c-source-file close-file throw
       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 -fPIC -shared -Wl,-soname,xxx.so.1 -Wl,-export_dynamic -o xxx.so.1 -O xxx.c" system
     $? abort" compiler generated error" ;      $? abort" compiler generated error"
       s" /home/anton/gforth/xxx.so.1" open-lib dup 0= abort" open-lib failed"
       ( lib-handle ) lib-handle-addr @ ! ;
 \    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 ( -- sym )  : link-wrapper-function { cff -- sym }
     s" /home/anton/gforth/xxx.so.1" open-lib ( lib-handle )      cff cff-rtype wrapper-function-name { d: wrapper-name }
     s" gforth_c_strlen_a_n" rot lib-sym dup 0= -&32 and throw ;      wrapper-name cff cff-lha @ @ assert( dup ) lib-sym dup 0= -&32 and 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,
     s" xxx.c" w/o create-file throw >r ( R:file-id )      ['] gen-wrapper-function c-source-file outfile-execute
     ['] gen-wrapper-function r@ outfile-execute  
     r> close-file throw  
   does> ( ... -- ... )    does> ( ... -- ... )
     2@ { xt-defer xt-cfr }      dup 2@ { xt-defer xt-cfr }
     compile-wrapper-function      dup cff-lha @ @ 0= if
           compile-wrapper-function
       endif
     link-wrapper-function xt-cfr >body !      link-wrapper-function xt-cfr >body !
     xt-cfr xt-defer defer!      xt-cfr xt-defer defer!
     xt-cfr execute ;      xt-cfr execute ;
Line 353  s" Library not found" exception constant Line 413  s" Library not found" exception constant
     create parse-name open-lib dup 0= err-nolib and throw ,      create parse-name open-lib dup 0= err-nolib and throw ,
   does> ( -- lib )    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-function strlen strlen a -- n  
   
 cr s\" fooo\0" 2dup dump drop .s strlen cr .s cr  

Removed from v.1.9  
changed lines
  Added in v.1.13


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