[BACK]Return to libcc.fs CVS log [TXT] [DIR] Up to [gforth] / gforth

Diff for /gforth/libcc.fs between versions 1.2 and 1.6

version 1.2, 2006/12/26 19:10:54 version 1.6, 2007/01/14 22:19:35
Line 21 Line 21
   
 \ What this implementation does is this: if it sees a declaration like  \ What this implementation does is this: if it sees a declaration like
   
 \ \ something that tells it to include <unistd.h>  
 \ \ something that tells it that the current library is libc  \ \ something that tells it that the current library is libc
   \ \c #include <unistd.h>
 \ c-function dlseek lseek n d n -- d  \ c-function dlseek lseek n d n -- d
   
 \ it genererates C code similar to the following:  \ it genererates C code similar to the following:
Line 61 Line 60
 \  char*n parameters (type indices)  \  char*n parameters (type indices)
 \  counted string: c-name  \  counted string: c-name
   
 : .n ( n -- )  : .nb ( n -- )
     0 .r ;      0 .r ;
   
 : const+ ( n1 "name" -- n2 )  : const+ ( n1 "name" -- n2 )
     dup constant 1+ ;      dup constant 1+ ;
   
   \ linked list stuff (should go elsewhere)
   
   hex
   
   require struct.fs
   
   struct
       cell% field list-next
       1 0   field list-payload
   end-struct list%
   
   : list-insert { node list -- }
       list list-next @ node list-next !
       node list list-next ! ;
   
   : list-append { node endlistp -- }
       \ insert node at place pointed to by endlistp
       node endlistp @ list-insert
       node list-next endlistp ! ;
   
   : list-map ( ... list xt -- ... )
       \ xt ( ... node -- ... )
       { xt } begin { node }
           node while
               node xt execute
               node list-next @
       repeat ;
   
   \ C prefix lines
   
   \ linked list of longcstrings: [ link | count-cell | characters ]
   
   list%
       cell% field c-prefix-count
       1 0   field c-prefix-chars
   end-struct c-prefix%
   
   variable c-prefix-lines 0 c-prefix-lines !
   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 -- )
       dup c-prefix-chars swap c-prefix-count @ type cr ;
   
   : print-c-prefix-lines ( -- )
       c-prefix-lines @ ['] print-c-prefix-line list-map ;
   
   \c #include "engine/libcc.h"
   
   print-c-prefix-lines
   
   \ Types (for parsing)
   
 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 133  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 92  set-current Line 150  set-current
         parse-libcc-type dup 0>= while          parse-libcc-type dup 0>= while
             c,              c,
     repeat      repeat
     drop swap - over char+ c!      drop here swap - over char+ c!
     parse-libcc-type 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 178  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 129  create count-stacks-types Line 187  create count-stacks-types
 : count-stacks ( pars -- fp-change sp-change )  : count-stacks ( pars -- fp-change sp-change )
     \ pars is an addr u pair      \ pars is an addr u pair
     0 0 2swap over + swap u+do      0 0 2swap over + swap u+do
         i c@ cells count-stacks-type + @ execute          i c@ cells count-stacks-types + @ execute
     loop ;      loop ;
   
 \ 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[" .n ." ]" ;      ." 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 )
     ." gforthd2ll(" gen-par-n ." ," gen-par-n ." )" ;      ." gforth_d2ll(" gen-par-n ." ," gen-par-n ." )" ;
   
 : gen-par-r ( fp-depth1 sp-depth1 -- fp-depth2 sp-depth2 )  : gen-par-r ( fp-depth1 sp-depth1 -- fp-depth2 sp-depth2 )
     swap 1- tuck ." fp[" .n ." ]" ;      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 ,
 ' gen-par-void ,  ' gen-par-void ,
   
 : gen-par ( fp-depth1 sp-depth1 partype -- fp-depth2 sp-depth2 )  : gen-par ( fp-depth1 sp-depth1 partype -- fp-depth2 sp-depth2 )
     cells gen-par-types @ execute ;      cells gen-par-types + @ execute ;
   
 \ the call itself  \ the call itself
   
 : gen-wrapped-call { d: pars d: c-name fp-change1 sp-change1 -- }  : gen-wrapped-call { d: pars d: c-name fp-change1 sp-change1 -- }
     c-name type ." ("      c-name type ." ("
     fp-change1 sp-change1 pars over + swap u+do      fp-change1 sp-change1 pars over + swap u+do 
         i c@ gen-par          i c@ gen-par
         i 1+ i' < if          i 1+ i' < if
             ." ,"              ." ,"
Line 180  create gen-par-types Line 238  create gen-par-types
 : gen-wrapped-void ( pars c-name fp-change1 sp-change1 -- fp-change sp-change )  : gen-wrapped-void ( pars c-name fp-change1 sp-change1 -- fp-change sp-change )
     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 )
       2dup gen-par-n 2>r ." =" gen-wrapped-call 2r> ;
   
   : gen-wrapped-a ( pars c-name fp-change1 sp-change1 -- fp-change sp-change )
       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 )
       ." gforth_ll2d(" gen-wrapped-void
       ." ," gen-par-n ." ," gen-par-n ." )" ;
   
   : gen-wrapped-r ( pars c-name fp-change1 sp-change1 -- fp-change sp-change )
       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-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 ,
 ' gen-wrapped-void ,  ' gen-wrapped-void ,
   
 : 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 -- )  : 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 }
       print-c-prefix-lines
     ." 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 *sp = gforth_SP;\n  Float *fp = gforth_FP;"      .\" {\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
         ."   gforth_SP = sp+" .n .\" ;\n"          ."   gforth_SP = sp+" .nb .\" ;\n"
     endif      endif
     ?dup-if      ?dup-if
         ."   gforth_FP = fp+" .n .\" ;\n"          ."   gforth_FP = fp+" .nb .\" ;\n"
     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+
       s" xxx.c" w/o create-file throw ( file-id )
       dup >r >outfile gen-wrapper-function outfile<
       r> close-file throw
     compile-wrapper-function      compile-wrapper-function
     link-wrapper-function      link-wrapper-function
     r> !      r> !
Line 234  s" Library not found" exception constant Line 322  s" Library not found" exception constant
   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-function strlen strlen a -- n
   
   cr s\" fooo\0" 2dup dump drop .s strlen cr .s cr
Removed from v.1.2  
changed lines
  Added in v.1.6

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