Diff for /gforth/libcc.fs between versions 1.34 and 1.42

version 1.34, 2008/04/29 20:03:40 version 1.42, 2008/07/10 21:11:57
Line 155  variable c-source-file-id \ contains the Line 155  variable c-source-file-id \ contains the
 variable lib-handle-addr \ points to the library handle of the current batch.  variable lib-handle-addr \ points to the library handle of the current batch.
                          \ the library handle is 0 if the current                           \ the library handle is 0 if the current
                          \ batch is not yet compiled.                           \ batch is not yet compiled.
     here 0 , lib-handle-addr ! \ just make sure LIB-HANDLE always works
 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 438  create gen-wrapped-types Line 441  create gen-wrapped-types
     endif      endif
     .\" }\n" ;      .\" }\n" ;
   
 : tempdir ( -- c-addr u )  : scan-back { c-addr u1 c -- c-addr u2 }
     s" TMPDIR" getenv dup 0= if      \ the last occurence of c in c-addr u1 is at u2-1; if it does not
         2drop s" /tmp"      \ occur, u2=0.
     then ;      c-addr 1- c-addr u1 + 1- u-do
           i c@ c = if
               c-addr i over - 1+ unloop exit endif
       1 -loop
       c-addr 0 ;
   
   : dirname ( c-addr1 u1 -- c-addr2 u2 )
       \ directory name of the file name c-addr1 u1, including the final "/".
       '/ scan-back ;
   
   : basename ( c-addr1 u1 -- c-addr2 u2 )
       \ file name without directory component
       2dup dirname nip /string ;
   
 : 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+ #>> ;
   
   : libcc-named-dir ( -- c-addr u )
       s" ~/.gforth/libcc-named/" ;
   
   : libcc-tmp-dir ( -- c-addr u )
       s" ~/.gforth/libcc-tmp/" ;
   
   : prepend-dirname ( c-addr1 u1 c-addr2 u2 -- c-addr3 u3 )
       2over s+ 2swap drop free throw ;
   
   0 value libcc-path
   here 1024 dup , 0 , allot to libcc-path \ !! the path words should grow buffers dynamically
   libcc-path clear-path
   libcc-named-dir libcc-path also-path
   \ !! setup path on boot
   
   : open-wrappers ( -- addr|0 )
       lib-filename 2@ s" .la" s+
       2dup libcc-named-dir string-prefix? if ( c-addr u )
           \ see if we can open it in the path
           libcc-named-dir nip /string
           libcc-path open-path-file if
               0 exit endif
           ( wfile-id c-addr2 u2 ) rot close-file throw save-mem ( c-addr2 u2 )
       endif
       \ 2dup cr type
       2dup open-lib >r
       drop free throw r> ;
   
   : c-library-name-setup ( c-addr u -- )
       assert( c-source-file-id @ 0= )
       { d: filename }
       here 0 , lib-handle-addr ! filename lib-filename 2!
       filename basename lib-modulename 2! ;
      
   : c-library-name-create ( -- )
       lib-filename 2@ s" .c" s+ 2dup w/o create-file throw
       dup c-source-file-id !
       ['] print-c-prefix-lines swap outfile-execute
       drop free throw ;
   
   : c-named-library-name ( c-addr u -- )
       \ set up filenames for a (possibly new) library; c-addr u is the
       \ basename of the library
       libcc-named-dir prepend-dirname c-library-name-setup
       open-wrappers dup if
           lib-handle-addr @ !
       else
           drop c-library-name-create
       endif ;
   
   : c-tmp-library-name ( c-addr u -- )
       \ set up filenames for a new library; c-addr u is the basename of
       \ the library
       libcc-tmp-dir prepend-dirname c-library-name-setup c-library-name-create ;
   
   : 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-tmp-library-name
         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 ) ;
   
   : notype-execute ( ... xt -- ... )
       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 ;
   
 : .lib-error ( -- )  : .lib-error ( -- )
     [ifdef] lib-error      [ifdef] lib-error
         ['] cr stderr outfile-execute          ['] cr stderr outfile-execute
Line 467  create gen-wrapped-types Line 554  create gen-wrapped-types
     [then] ;      [then] ;
   
 DEFER compile-wrapper-function ( -- )  DEFER compile-wrapper-function ( -- )
 :NONAME ( -- )  : compile-wrapper-function1 ( -- )
     c-source-file close-file throw      lib-handle 0= if
     0 c-source-file-id !          c-source-file close-file throw
     [ libtool-command s"  --silent --mode=compile gcc -I " s+          0 c-source-file-id !
     s" includedir" getenv append ] sliteral          [ libtool-command s"  --silent --mode=compile gcc -I " s+
     s"  -O -c " s+ lib-filename 2@ append s" .c -o " append          s" includedir" getenv append ] sliteral
     lib-filename 2@ append s" .lo" append ( c-addr u )          s"  -O -c " s+ lib-filename 2@ append s" .c -o " append
 \    cr 2dup type          lib-filename 2@ append s" .lo" append ( c-addr u )
     2dup system drop free throw $? abort" libtool compile failed"          \    cr 2dup type
     [ libtool-command s"  --silent --mode=link gcc -module -rpath " s+ ] sliteral          2dup system drop free throw $? abort" libtool compile failed"
     tempdir s+ s"  " append          [ libtool-command s"  --silent --mode=link gcc -module -rpath " s+ ] sliteral
     lib-filename 2@ append s" .lo -o " append          lib-filename 2@ dirname s+ s"  " append
     lib-filename 2@ append s" .la" append ( c-addr u )          lib-filename 2@ append s" .lo -o " append
     c-libs @ ['] append-l list-map          lib-filename 2@ append s" .la" append ( c-addr u )
 \    2dup type cr          c-libs @ ['] append-l list-map
     2dup system drop free throw $? abort" libtool link failed"          \    2dup type cr
     lib-filename 2@ s" .la" s+          2dup system drop free throw $? abort" libtool link failed"
 \    2dup type cr          open-wrappers dup 0= if
     2dup open-lib dup 0= if              .lib-error true abort" open-lib failed"
         .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" ;
   
Line 508  DEFER compile-wrapper-function ( -- ) Line 594  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 538  DEFER compile-wrapper-function ( -- ) Line 624  DEFER compile-wrapper-function ( -- )
     endif      endif
     0 c-libs ! ;      0 c-libs ! ;
 clear-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 interface with name @i{c-addr u}.
       clear-libs
       ['] c-library-incomplete is compile-wrapper-function
       c-named-library-name ;
   
   : c-library ( "name" -- ) \ gforth
   \G Parsing version of @code{c-library-name}
       parse-name save-mem c-library-name ;
   
   : end-c-library ( -- ) \ gforth
   \G Finish and (if necessary) build the latest C library interface.
       ['] compile-wrapper-function1 is compile-wrapper-function
       compile-wrapper-function1 ;

Removed from v.1.34  
changed lines
  Added in v.1.42


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