Diff for /gforth/libcc.fs between versions 1.35 and 1.39

version 1.35, 2008/06/17 18:46:04 version 1.39, 2008/07/05 20:09:42
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
   
Line 440  create gen-wrapped-types Line 441  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"
Line 454  create gen-wrapped-types Line 460  create gen-wrapped-types
     tempdir s" /" s+ 2over append      tempdir s" /" s+ 2over append
     2swap drop free throw ;      2swap drop free throw ;
   
 : c-library-name1 ( c-addr u -- )  : c-library-name-setup ( 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= )      assert( c-source-file-id @ 0= )
     prepend-dirname { d: filename }      prepend-dirname { d: filename }
     here 0 , lib-handle-addr ! filename 2dup lib-filename 2!      here 0 , lib-handle-addr ! filename lib-filename 2!
     2dup tempdir nip 1+ /string lib-modulename 2!      filename tempdir nip 1+ /string lib-modulename 2! ;
     s" .c" s+ 2dup w/o create-file throw dup c-source-file-id !     
   : 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      ['] print-c-prefix-lines swap outfile-execute
     drop free throw ;      drop free throw ;
   
   : c-library-name1 ( c-addr u -- )
       \ set up filenames for a (possibly new) library; c-addr u is the
       \ basename of the library
       c-library-name-setup
       open-wrappers dup if
           lib-handle-addr @ !
       else
           drop c-library-name-create
       endif ;
   
   : c-library-name2 ( c-addr u -- )
       \ set up filenames for a new library; c-addr u is the basename of
       \ the library
       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 gen-filename c-library-name1          c-source-file-id @ 0= if
               here gen-filename c-library-name2
           endif
     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 481  create gen-wrapped-types Line 524  create gen-wrapped-types
   
 DEFER compile-wrapper-function ( -- )  DEFER compile-wrapper-function ( -- )
 : compile-wrapper-function1 ( -- )  : 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          tempdir 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 @ !  
     2dup delete-file throw drop free throw  
     lib-filename 2@ s" .c" s+ 2dup delete-file throw drop free throw  
     lib-filename 2@ drop free throw 0 0 lib-filename 2! ;      lib-filename 2@ drop free throw 0 0 lib-filename 2! ;
 ' compile-wrapper-function1 IS compile-wrapper-function  ' compile-wrapper-function1 IS compile-wrapper-function
 \    s" ar rcs xxx.a xxx.o" system  \    s" ar rcs xxx.a xxx.o" system
Line 522  DEFER compile-wrapper-function ( -- ) Line 563  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 557  clear-libs Line 598  clear-libs
     true abort" Called function of unfinished named C library" ;      true abort" Called function of unfinished named C library" ;
   
 : c-library-name ( c-addr u -- ) \ gforth  : c-library-name ( c-addr u -- ) \ gforth
 \G Start a C library with name @i{c-addr u}.  \G Start a C library interface with name @i{c-addr u}.
     clear-libs      clear-libs
     ['] c-library-incomplete is compile-wrapper-function      ['] c-library-incomplete is compile-wrapper-function
     c-library-name1 ;      c-library-name1 ;
   
 : c-library ( "name" -- ) \ gforth  : c-library ( "name" -- ) \ gforth
 \G Parsing version of @code{c-library-name}  \G Parsing version of @code{c-library-name}
     name save-mem c-library-name ;      parse-name save-mem c-library-name ;
   
 : end-c-library ( -- )  : 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 is compile-wrapper-function
     compile-wrapper-function1 ;      compile-wrapper-function1 ;

Removed from v.1.35  
changed lines
  Added in v.1.39


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