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

version 1.5, 2006/12/28 20:53:04 version 1.9, 2007/02/23 22:33:21
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 46 Line 45
 \ the function pointer of gforth_c_lseek_ndn_d on the stack and  \ the function pointer of gforth_c_lseek_ndn_d on the stack and
 \ calls CALL-C.  \ calls CALL-C.
   
   \ ToDo:
   
   \ Batching, caching and lazy evaluation:
   
   \ Batching:
   
   \ New words are deferred, and the corresponding C functions are
   \ collected in one file, until the first word is EXECUTEd; then the
   \ file is compiled and linked into the system, and the word is
   \ resolved.
   
   \ Caching:
   
   \ Instead of compiling all this stuff anew for every execution, we
   \ keep the files around and have an index file containing the function
   \ names and their corresponding .so files.  If the needed wrapper name
   \ is already present, it is just linked instead of generating the
   \ wrapper again.  This is all done by loading the index file(s?),
   \ which define words for the wrappers in a separate wordlist.
   
   \ The files are built in .../lib/gforth/$VERSION/libcc/ or
   \ ~/.gforth/libcc/$HOST/.
   
 \ other things to do:  \ other things to do:
   
 \ c-variable forth-name c-name  \ c-variable forth-name c-name
Line 67 Line 89
 : const+ ( n1 "name" -- n2 )  : const+ ( n1 "name" -- n2 )
     dup constant 1+ ;      dup constant 1+ ;
   
 \ dlerror  \ 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 ]
   
 \ require lib.fs  list%
       cell% field c-prefix-count
       1 0   field c-prefix-chars
   end-struct c-prefix%
   
 \ library libc libc.so.6  variable c-prefix-lines 0 c-prefix-lines !
 \ libc sleep int (int) sleep  variable c-prefix-lines-end c-prefix-lines c-prefix-lines-end !
 \ libc dlerror (ptr) dlerror  
   : 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
   
Line 218  create gen-wrapped-types Line 291  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"      print-c-prefix-lines
     ." void gforth_c_" c-name type ." _"      ." void gforth_c_" c-name type ." _"
     pars bounds u+do      pars bounds u+do
         i c@ type-letter emit          i c@ type-letter emit
Line 240  create gen-wrapped-types Line 313  create gen-wrapped-types
 \    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 ( -- )  : link-wrapper-function ( -- sym )
     s" /home/anton/gforth/xxx.so.1" open-lib ( lib-handle )      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 ;      s" gforth_c_strlen_a_n" rot lib-sym dup 0= -&32 and throw ;
   
 : c-function ( "forth-name" "c-name" "{libcc-type}" "--" "libcc-type" -- )  
     create here >r 0 , \ place for the wrapper function pointer  : c-function-ft ( xt-defer xt-cfr "c-name" "{libcc-type}" "--" "libcc-type" -- )
       \ build time/first time action for c-function
       noname create 2,
     parse-name { d: c-name }      parse-name { d: c-name }
     parse-function-types c-name string,      here parse-function-types c-name string,
     r@ cell+      s" xxx.c" w/o create-file throw >r ( R:file-id )
     s" xxx.c" w/o create-file throw ( file-id )      ['] gen-wrapper-function r@ outfile-execute
     dup >r >outfile gen-wrapper-function outfile<  
     r> close-file throw      r> close-file throw
     does> ( ... -- ... )
       2@ { xt-defer xt-cfr }
     compile-wrapper-function      compile-wrapper-function
     link-wrapper-function      link-wrapper-function xt-cfr >body !
     r> !      xt-cfr xt-defer defer!
       xt-cfr execute ;
   
   : c-function-rt ( -- )
       \ run-time definition for c function; addr is the address where
       \ the sym should be stored
       noname create 0 ,
   does> ( ... -- ... )    does> ( ... -- ... )
     @ call-c ;      @ call-c ;
   
   : c-function ( "forth-name" "c-name" "{libcc-type}" "--" "libcc-type" -- )
       defer lastxt dup c-function-rt lastxt c-function-ft
       lastxt swap defer! ;
   
 s" Library not found" exception constant err-nolib  s" Library not found" exception constant err-nolib
   
Line 295  s" Library not found" exception constant Line 377  s" Library not found" exception constant
 \ c-function func test5 -- func  \ c-function func test5 -- func
 \ c-function void test6 -- void  \ c-function void test6 -- void
   
   \c #include <string.h>
   
 c-function strlen strlen a -- n  c-function strlen strlen a -- n
   
 cr s\" fooo\0" 2dup dump drop .s strlen cr .s cr  cr s\" fooo\0" 2dup dump drop .s strlen cr .s cr

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


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