Diff for /gforth/libcc.fs between versions 1.23 and 1.37

version 1.23, 2007/12/04 14:55:03 version 1.37, 2008/06/17 20:48:21
Line 1 Line 1
 \ libcc.fs      foreign function interface implemented using a C compiler  \ libcc.fs      foreign function interface implemented using a C compiler
   
 \ Copyright (C) 2006 Free Software Foundation, Inc.  \ Copyright (C) 2006,2007 Free Software Foundation, Inc.
   
 \ This file is part of Gforth.  \ This file is part of Gforth.
   
 \ Gforth is free software; you can redistribute it and/or  \ Gforth is free software; you can redistribute it and/or
 \ modify it under the terms of the GNU General Public License  \ modify it under the terms of the GNU General Public License
 \ as published by the Free Software Foundation; either version 2  \ as published by the Free Software Foundation, either version 3
 \ of the License, or (at your option) any later version.  \ of the License, or (at your option) any later version.
   
 \ This program is distributed in the hope that it will be useful,  \ This program is distributed in the hope that it will be useful,
Line 15 Line 15
 \ GNU General Public License for more details.  \ GNU General Public License for more details.
   
 \ You should have received a copy of the GNU General Public License  \ You should have received a copy of the GNU General Public License
 \ along with this program; if not, write to the Free Software  \ along with this program. If not, see http://www.gnu.org/licenses/.
 \ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.  
   
   
 \ What this implementation does is this: if it sees a declaration like  \ What this implementation does is this: if it sees a declaration like
Line 124 Line 123
 \ first-time word, then to the run-time word; the run-time word calls  \ first-time word, then to the run-time word; the run-time word calls
 \ the c function.  \ the c function.
   
 : delete-file 2drop 0 ;  [ifundef] parse-name
       ' parse-word alias parse-name
   [then]
   [ifundef] defer!
   : defer! ( xt xt-deferred -- ) \ gforth  defer-store
   \G Changes the @code{defer}red word @var{xt-deferred} to execute @var{xt}.
       >body [ has? rom [IF] ] @ [ [THEN] ] ! ;
   [then]
   
   \ : delete-file 2drop 0 ;
   
 require struct.fs  require struct.fs
   
Line 150  variable lib-handle-addr \ points to the Line 158  variable lib-handle-addr \ points to the
 2variable lib-filename   \ filename without extension  2variable lib-filename   \ filename without extension
 2variable lib-modulename \ basename of the file without extension  2variable lib-modulename \ basename of the file without extension
   
   : delete-file 2drop 0 ;
   
 : .nb ( n -- )  : .nb ( n -- )
     0 .r ;      0 .r ;
   
Line 206  end-struct list% Line 216  end-struct list%
             node list-next @              node list-next @
     repeat ;      repeat ;
   
   \ linked libraries
   
   list%
       cell% 2* field c-lib-string
   end-struct c-lib%
   
   variable c-libs \ linked list of library names (without "lib")
   
   : add-lib ( c-addr u -- )
   \G Add library lib@i{string} to the list of libraries, where
   \G @i{string} is represented by @i{c-addr u}.
       c-lib% %size allocate throw dup >r
       c-lib-string 2!
       r> c-libs list-insert ;
   
   : append-l ( c-addr1 u1 node -- c-addr2 u2 )
       \ append " -l<nodelib>" to string1
       >r s"  -l" append r> c-lib-string 2@ append ;
   
 \ C prefix lines  \ C prefix lines
   
 \ linked list of longcstrings: [ link | count-cell | characters ]  \ linked list of longcstrings: [ link | count-cell | characters ]
Line 364  create gen-par-types Line 393  create gen-par-types
     ." ," gen-par-n ." ," gen-par-n ." )" ;      ." ," 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 )
     2dup gen-par-r 2>r ." =" gen-wrapped-void 2r> ;      2dup gen-par-r 2>r ." =" gen-wrapped-call 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-a ;      gen-wrapped-a ;
Line 411  create gen-wrapped-types Line 440  create gen-wrapped-types
     endif      endif
     .\" }\n" ;      .\" }\n" ;
   
   : open-wrappers ( -- addr )
       lib-filename 2@ s" .la" s+
       2dup open-lib >r
       drop free throw r> ;
   
 : tempdir ( -- c-addr u )  : tempdir ( -- c-addr u )
     s" TMPDIR" getenv dup 0= if      s" TMPDIR" getenv dup 0= if
         2drop s" /tmp"          2drop s" /tmp"
     then ;      then ;
   
 : gen-filename ( x -- c-addr u )  : gen-filename ( x -- c-addr u )
     \ generates a filename without extension for lib-handle-addr X      \ generates a file basename for lib-handle-addr X
     0 <<# ['] #s $10 base-execute #>       0 <<# ['] #s $10 base-execute #> 
     tempdir s" /gforth_c_" s+ 2swap append #>> ;      s" gforth_c_" 2swap s+ #>> ;
   
   : prepend-dirname ( c-addr1 u1 -- c-addr2 u2 )
       tempdir s" /" s+ 2over append
       2swap drop free throw ;
   
   : c-library-name1 ( c-addr u -- )
       \ set up filenames for a new library; c-addr u is the basename of
       \ the library
       assert( c-source-file-id @ 0= )
       prepend-dirname { d: filename }
       here 0 , lib-handle-addr ! filename lib-filename 2!
       filename tempdir nip 1+ /string lib-modulename 2!
       open-wrappers dup if
           lib-handle-addr @ !
           ( 0 c-source-file-id ! ) \ already set
       else
           drop
           filename s" .c" s+ 2dup w/o create-file throw dup c-source-file-id !
           ['] print-c-prefix-lines swap outfile-execute
           drop free throw
       endif ;
   
   : lib-handle ( -- addr )
       lib-handle-addr @ @ ;
   
 : init-c-source-file ( -- )  : init-c-source-file ( -- )
     c-source-file-id @ 0= if      lib-handle 0= if
         here 0 , dup lib-handle-addr ! gen-filename 2dup lib-filename 2!          c-source-file-id @ 0= if
         2dup tempdir nip 1+ /string lib-modulename 2!              here gen-filename c-library-name1
         s" .c" s+ 2dup w/o create-file throw dup c-source-file-id !          endif
         ['] print-c-prefix-lines swap outfile-execute  
         drop free throw  
     endif ;      endif ;
   
 : c-source-file ( -- file-id )  : c-source-file ( -- file-id )
     c-source-file-id @ assert( dup ) ;      c-source-file-id @ assert( dup ) ;
   
 \ libtool --mode=compile gcc -I /nfs/a5/anton/gforth-amd64/include -O -c /tmp/gforth_c_2AAAAB2E7C50.c -o /tmp/gforth_c_2AAAAB2E7C50.lo  : notype-execute ( ... xt -- ... )
 \ libtool --mode=link gcc -module -rpath /tmp /tmp/gforth_c_2AAAAB2E7C50.lo -o /tmp/gforth_c_2AAAAB2E7C50.la      what's type { oldtype } try
           ['] 2drop is type execute 0
       restore
           oldtype is type
       endtry
       throw ;
   
   : c-source-file-execute ( ... xt -- ... )
       \ direct the output of xt to c-source-file, or nothing
       lib-handle if
           notype-execute
       else
           c-source-file outfile-execute
       endif ;
   
 DEFER compile-wrapper-function  : .lib-error ( -- )
 :NONAME ( -- )      [ifdef] lib-error
     c-source-file close-file throw          ['] cr stderr outfile-execute
     0 c-source-file-id !          lib-error ['] type stderr outfile-execute
     [ s" libtool --silent --mode=compile gcc -I "      [then] ;
       s" includedir" getenv append ] sliteral  
     s"  -O -c " s+ lib-filename 2@ append s" .c -o " append  DEFER compile-wrapper-function ( -- )
     lib-filename 2@ append s" .lo" append ( c-addr u )  : compile-wrapper-function1 ( -- )
     2dup system drop free throw $? abort" libtool compile failed"      lib-handle 0= if
     s" libtool --silent --mode=link gcc -module -rpath " tempdir s+ s"  " append          c-source-file close-file throw
     lib-filename 2@ append s" .lo -o " append          0 c-source-file-id !
     lib-filename 2@ append s" .la" append ( c-addr u )          [ libtool-command s"  --silent --mode=compile gcc -I " s+
     2dup system drop free throw $? abort" libtool link failed"          s" includedir" getenv append ] sliteral
     lib-filename 2@ s" .la" s+          s"  -O -c " s+ lib-filename 2@ append s" .c -o " append
     2dup open-lib dup 0= if          lib-filename 2@ append s" .lo" append ( c-addr u )
         cr lib-error type true abort" open-lib failed"          \    cr 2dup type
           2dup system drop free throw $? abort" libtool compile failed"
           [ libtool-command s"  --silent --mode=link gcc -module -rpath " s+ ] sliteral
           tempdir s+ s"  " append
           lib-filename 2@ append s" .lo -o " append
           lib-filename 2@ append s" .la" append ( c-addr u )
           c-libs @ ['] append-l list-map
           \    2dup type cr
           2dup system drop free throw $? abort" libtool link failed"
           open-wrappers dup 0= if
               .lib-error true abort" open-lib failed"
           endif
           ( lib-handle ) lib-handle-addr @ !
     endif      endif
     ( lib-handle ) lib-handle-addr @ !      lib-filename 2@ drop free throw 0 0 lib-filename 2! ;
     2dup delete-file throw drop free throw  ' compile-wrapper-function1 IS compile-wrapper-function
     lib-filename 2@ s" .c" s+ 2dup delete-file throw drop free throw  
     lib-filename 2@ drop free throw 0 0 lib-filename 2! ; IS compile-wrapper-function  
 \    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 { cff -- sym }  : link-wrapper-function { cff -- sym }
     cff cff-rtype wrapper-function-name { d: wrapper-name }      cff cff-rtype wrapper-function-name { d: wrapper-name }
     wrapper-name cff cff-lha @ @ assert( dup ) lib-sym dup 0= if      wrapper-name cff cff-lha @ @ assert( dup ) lib-sym dup 0= if
         cr lib-error type -&32 throw          .lib-error -&32 throw
     endif      endif
     wrapper-name drop free throw ;      wrapper-name drop free throw ;
   
Line 473  DEFER compile-wrapper-function Line 552  DEFER compile-wrapper-function
     noname create 2, lib-handle-addr @ ,      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,
     ['] gen-wrapper-function c-source-file outfile-execute      ['] gen-wrapper-function c-source-file-execute
   does> ( ... -- ... )    does> ( ... -- ... )
     dup 2@ { xt-defer xt-cfr }      dup 2@ { xt-defer xt-cfr }
     dup cff-lha @ @ 0= if      dup cff-lha @ @ 0= if
Line 495  DEFER compile-wrapper-function Line 574  DEFER compile-wrapper-function
     \G specified stack effect and calls the C function @code{c-name}.      \G specified stack effect and calls the C function @code{c-name}.
     defer lastxt dup c-function-rt lastxt c-function-ft      defer lastxt dup c-function-rt lastxt c-function-ft
     lastxt swap defer! ;      lastxt swap defer! ;
   
   : clear-libs ( -- )
   \G Clear the list of libs
       c-source-file-id @ if
           compile-wrapper-function
       endif
       0 c-libs ! ;
   clear-libs
   
   : c-library-incomplete ( -- )
       true abort" Called function of unfinished named C library" ;
   
   : c-library-name ( c-addr u -- ) \ gforth
   \G Start a C library with name @i{c-addr u}.
       clear-libs
       ['] c-library-incomplete is compile-wrapper-function
       c-library-name1 ;
   
   : c-library ( "name" -- ) \ gforth
   \G Parsing version of @code{c-library-name}
       name save-mem c-library-name ;
   
   : end-c-library ( -- )
       ['] compile-wrapper-function1 is compile-wrapper-function
       compile-wrapper-function1 ;

Removed from v.1.23  
changed lines
  Added in v.1.37


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