--- gforth/libcc.fs 2007/01/14 22:19:35 1.6 +++ gforth/libcc.fs 2007/04/25 17:59:36 1.11 @@ -45,6 +45,29 @@ \ the function pointer of gforth_c_lseek_ndn_d on the stack and \ 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: \ c-variable forth-name c-name @@ -53,8 +76,15 @@ \ data structures -\ c-function word body: -\ cell function pointer +\ For every c-function, we have three words: two anonymous words +\ created by c-function-ft (first time) and c-function-rt (run-time), +\ and a named deferred word. The deferred word first points to the +\ first-time word, then to the run-time word; the run-time word calls +\ the c function. + +\ c-function-ft word body: +\ cell xt of c-function-rt word +\ cell xt of c-function deferred word \ char return type index \ char parameter count n \ char*n parameters (type indices) @@ -66,6 +96,20 @@ : const+ ( n1 "name" -- n2 ) 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) hex @@ -265,15 +309,27 @@ create gen-wrapped-types : gen-wrapped-stmt ( pars c-name fp-change1 sp-change1 ret -- fp-change sp-change ) 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 - c@+ { ret } count 2dup { d: pars } chars + count { d: c-name } - print-c-prefix-lines - ." void gforth_c_" c-name type ." _" + count { r-type } count { d: pars } + pars + count { d: c-name } + 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 - i c@ type-letter emit + i c@ type-letter front-char 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 } + c@+ { 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 " pars c-name 2over count-stacks ret gen-wrapped-stmt .\" ;\n" ?dup-if @@ -284,33 +340,53 @@ create gen-wrapped-types endif .\" }\n" ; +variable c-source-file-id +0 c-source-file-id ! + +: c-source-file ( -- file-id ) + c-source-file-id @ ?dup-if + 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 ( -- ) + c-source-file-id @ assert( dup ) + 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 $? abort" compiler generated error" ; \ s" ar rcs xxx.a xxx.o" system \ $? abort" ar generated error" ; -: link-wrapper-function ( -- ) +: link-wrapper-function ( addr -- sym ) + wrapper-function-name { d: wrapper-name } 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 ; + wrapper-name rot lib-sym dup 0= -&32 and throw + wrapper-name drop free 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-function-types c-name string, - r@ cell+ - s" xxx.c" w/o create-file throw ( file-id ) - dup >r >outfile gen-wrapper-function outfile< - r> close-file throw + here parse-function-types c-name string, + ['] gen-wrapper-function c-source-file outfile-execute + does> ( ... -- ... ) + dup 2@ { xt-defer xt-cfr } compile-wrapper-function - link-wrapper-function - r> ! + 2 cells + link-wrapper-function xt-cfr >body ! + 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> ( ... -- ... ) @ 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 @@ -345,6 +421,13 @@ s" Library not found" exception constant \ c-function func test5 -- func \ c-function void test6 -- void +\c #include +\c #include + +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 cr +cr s\" fooo\0" 2dup dump drop .s strlen cr .s drop cr +\ -5 labs .s drop cr