Diff for /gforth/libcc.fs between versions 1.4 and 1.5

version 1.4, 2006/12/27 18:52:17 version 1.5, 2006/12/28 20:53:04
Line 67 Line 67
 : const+ ( n1 "name" -- n2 )  : const+ ( n1 "name" -- n2 )
     dup constant 1+ ;      dup constant 1+ ;
   
   \ dlerror
   
   \ require lib.fs
   
   \ library libc libc.so.6
   \ libc sleep int (int) sleep
   \ libc dlerror (ptr) dlerror
   
 wordlist constant libcc-types  wordlist constant libcc-types
   
 get-current libcc-types set-current  get-current libcc-types set-current
Line 75  get-current libcc-types set-current Line 83  get-current libcc-types set-current
 -1  -1
 const+ -- \ end of arguments  const+ -- \ end of arguments
 const+ n \ integer cell  const+ n \ integer cell
 const+ p \ pointer cell  const+ a \ address cell
 const+ d \ double  const+ d \ double
 const+ r \ float  const+ r \ float
 const+ func \ C function pointer  const+ func \ C function pointer
Line 96  set-current Line 104  set-current
     parse-libcc-type dup 0< -32 and throw swap c! ;      parse-libcc-type dup 0< -32 and throw swap c! ;
   
 : type-letter ( n -- c )  : type-letter ( n -- c )
     chars s" npdrfv" drop + c@ ;      chars s" nadrfv" drop + c@ ;
   
 \ count-stacks  \ count-stacks
   
 : count-stacks-n ( fp-change1 sp-change1 -- fp-change2 sp-change2 )  : count-stacks-n ( fp-change1 sp-change1 -- fp-change2 sp-change2 )
     1+ ;      1+ ;
   
 : count-stacks-p ( fp-change1 sp-change1 -- fp-change2 sp-change2 )  : count-stacks-a ( fp-change1 sp-change1 -- fp-change2 sp-change2 )
     1+ ;      1+ ;
   
 : count-stacks-d ( fp-change1 sp-change1 -- fp-change2 sp-change2 )  : count-stacks-d ( fp-change1 sp-change1 -- fp-change2 sp-change2 )
Line 120  set-current Line 128  set-current
   
 create count-stacks-types  create count-stacks-types
 ' count-stacks-n ,  ' count-stacks-n ,
 ' count-stacks-p ,  ' count-stacks-a ,
 ' count-stacks-d ,  ' count-stacks-d ,
 ' count-stacks-r ,  ' count-stacks-r ,
 ' count-stacks-func ,  ' count-stacks-func ,
Line 135  create count-stacks-types Line 143  create count-stacks-types
 \ gen-pars  \ gen-pars
   
 : gen-par-n ( fp-depth1 sp-depth1 -- fp-depth2 sp-depth2 )  : gen-par-n ( fp-depth1 sp-depth1 -- fp-depth2 sp-depth2 )
     1- dup ." sp[" .nb ." ]" ;      ." sp[" 1- dup .nb ." ]" ;
   
 : gen-par-p ( fp-depth1 sp-depth1 -- fp-depth2 sp-depth2 )  : gen-par-a ( fp-depth1 sp-depth1 -- fp-depth2 sp-depth2 )
     ." (void *)(" gen-par-n ." )" ;      ." (void *)(" gen-par-n ." )" ;
   
 : gen-par-d ( fp-depth1 sp-depth1 -- fp-depth2 sp-depth2 )  : gen-par-d ( fp-depth1 sp-depth1 -- fp-depth2 sp-depth2 )
Line 147  create count-stacks-types Line 155  create count-stacks-types
     swap 1- tuck ." fp[" .nb ." ]" ;      swap 1- tuck ." fp[" .nb ." ]" ;
   
 : gen-par-func ( fp-depth1 sp-depth1 -- fp-depth2 sp-depth2 )  : gen-par-func ( fp-depth1 sp-depth1 -- fp-depth2 sp-depth2 )
     gen-par-p ;      gen-par-a ;
   
 : gen-par-void ( fp-depth1 sp-depth1 -- fp-depth2 sp-depth2 )  : gen-par-void ( fp-depth1 sp-depth1 -- fp-depth2 sp-depth2 )
     -32 throw ;      -32 throw ;
   
 create gen-par-types  create gen-par-types
 ' gen-par-n ,  ' gen-par-n ,
 ' gen-par-p ,  ' gen-par-a ,
 ' gen-par-d ,  ' gen-par-d ,
 ' gen-par-r ,  ' gen-par-r ,
 ' gen-par-func ,  ' gen-par-func ,
Line 181  create gen-par-types Line 189  create gen-par-types
     2dup 2>r gen-wrapped-call 2r> ;      2dup 2>r gen-wrapped-call 2r> ;
   
 : gen-wrapped-n ( pars c-name fp-change1 sp-change1 -- fp-change sp-change )  : gen-wrapped-n ( pars c-name fp-change1 sp-change1 -- fp-change sp-change )
     1- dup ." sp[" .nb ." ]=" gen-wrapped-void ;      2dup gen-par-n 2>r ." =" gen-wrapped-call 2r> ;
   
 : gen-wrapped-p ( pars c-name fp-change1 sp-change1 -- fp-change sp-change )  : gen-wrapped-a ( pars c-name fp-change1 sp-change1 -- fp-change sp-change )
     1- dup ." sp[" .nb ." ]=(Cell)" gen-wrapped-void ;      2dup gen-par-n 2>r ." =(Cell)" gen-wrapped-call 2r> ;
   
 : gen-wrapped-d ( pars c-name fp-change1 sp-change1 -- fp-change sp-change )  : gen-wrapped-d ( pars c-name fp-change1 sp-change1 -- fp-change sp-change )
     ." gforth_ll2d(" gen-wrapped-void      ." gforth_ll2d(" gen-wrapped-void
     ." ,sp[" 1- dup .nb ." ],sp[" 1- dup .nb ." ])" ;      ." ," gen-par-n ." ," gen-par-n ." )" ;
   
 : gen-wrapped-r ( pars c-name fp-change1 sp-change1 -- fp-change sp-change )  : gen-wrapped-r ( pars c-name fp-change1 sp-change1 -- fp-change sp-change )
     swap 1- tuck ." fp[" .nb ." ]=" gen-wrapped-void ;      2dup gen-par-r 2>r ." =" gen-wrapped-void 2r> ;
   
 : gen-wrapped-func ( pars c-name fp-change1 sp-change1 -- fp-change sp-change )  : gen-wrapped-func ( pars c-name fp-change1 sp-change1 -- fp-change sp-change )
     gen-wrapped-p ;      gen-wrapped-a ;
   
 create gen-wrapped-types  create gen-wrapped-types
 ' gen-wrapped-n ,  ' gen-wrapped-n ,
 ' gen-wrapped-p ,  ' gen-wrapped-a ,
 ' gen-wrapped-d ,  ' gen-wrapped-d ,
 ' gen-wrapped-r ,  ' gen-wrapped-r ,
 ' gen-wrapped-func ,  ' gen-wrapped-func ,
Line 210  create gen-wrapped-types Line 218  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
     c@+ { ret } count 2dup { d: pars } chars + count { d: c-name }      c@+ { ret } count 2dup { d: pars } chars + count { d: c-name }
       .\" #include \"engine/libcc.h\"\n"
     ." void gforth_c_" c-name type ." _"      ." void gforth_c_" c-name type ." _"
     pars 0 +do      pars bounds u+do
         i chars over + c@ type-letter emit          i c@ type-letter emit
     loop      loop
     ." _" ret type-letter emit .\" (void)\n"      ." _" ret type-letter emit .\" (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 225  create gen-wrapped-types Line 234  create gen-wrapped-types
     endif      endif
     .\" }\n" ;      .\" }\n" ;
   
   : compile-wrapper-function ( -- )
       s" gcc -fPIC -shared -Wl,-soname,xxx.so.1 -Wl,-export_dynamic -o xxx.so.1 -O xxx.c" system
       $? abort" compiler generated error" ;
   \    s" ar rcs xxx.a xxx.o" system
   \    $? abort" ar generated error" ;
   
   : link-wrapper-function ( -- )
       s" /home/anton/gforth/xxx.so.1" open-lib ( lib-handle )
       s" gforth_c_strlen_a_n" rot lib-sym dup 0= -32 and throw ;
   
 : c-function ( "forth-name" "c-name" "{libcc-type}" "--" "libcc-type" -- )  : c-function ( "forth-name" "c-name" "{libcc-type}" "--" "libcc-type" -- )
     create here >r 0 , \ place for the wrapper function pointer      create here >r 0 , \ place for the wrapper function pointer
     parse-name { d: c-name }      parse-name { d: c-name }
     parse-function-types c-name string,      parse-function-types c-name string,
     r> cell+ gen-wrapper-function      r@ cell+
 \    compile-wrapper-function      s" xxx.c" w/o create-file throw ( file-id )
 \    link-wrapper-function      dup >r >outfile gen-wrapper-function outfile<
 \    r> !      r> close-file throw
       compile-wrapper-function
       link-wrapper-function
       r> !
   does> ( ... -- ... )    does> ( ... -- ... )
     @ call-c ;      @ call-c ;
   
Line 252  s" Library not found" exception constant Line 274  s" Library not found" exception constant
   
 \ test  \ test
   
 cr .( #include "engine/libcc.h")  \ test all parameter and return types
 cr .( #include <unistd.h>)  
 cr ." typedef void (* func)(int);  \ cr .( #include "engine/libcc.h")
 cr ." int test1(int,char*,long,double,void (*)(int));"  \ cr .( #include <unistd.h>)
 cr ." Cell *test2(void);"  \ cr ." typedef void (* func)(int);
 cr ." int test3(void);"  \ cr ." int test1(int,char*,long,double,void (*)(int));"
 cr ." float test4(void);"  \ cr ." Cell *test2(void);"
 cr ." func test5(void);"  \ cr ." int test3(void);"
 cr ." void test6(void);"  \ cr ." float test4(void);"
 cr  \ cr ." func test5(void);"
   \ cr ." void test6(void);"
 c-function dlseek lseek n d n -- d  \ cr
 c-function n test1 n p d r func -- n  
 c-function p test2 -- p  \ c-function dlseek lseek n d n -- d
 c-function d test3 -- d  \ c-function n test1 n a d r func -- n
 c-function r test4 -- r  \ c-function a test2 -- a
 c-function func test5 -- func  \ c-function d test3 -- d
 c-function void test6 -- void  \ c-function r test4 -- r
   \ c-function func test5 -- func
   \ c-function void test6 -- void
   
   c-function strlen strlen a -- n
   
   cr s\" fooo\0" 2dup dump drop .s strlen cr .s cr

Removed from v.1.4  
changed lines
  Added in v.1.5


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