Diff for /gforth/libcc.fs between versions 1.38 and 1.41

version 1.38, 2008/06/17 21:27:54 version 1.41, 2008/07/10 19:59:41
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 442  create gen-wrapped-types Line 443  create gen-wrapped-types
   
 : open-wrappers ( -- addr )  : open-wrappers ( -- addr )
     lib-filename 2@ s" .la" s+      lib-filename 2@ s" .la" s+
       \ 2dup cr type
     2dup open-lib >r      2dup open-lib >r
     drop free throw r> ;      drop free throw r> ;
   
 : 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 file basename for lib-handle-addr X      \ generates a file basename for lib-handle-addr X
     0 <<# ['] #s $10 base-execute #>       0 <<# ['] #s $10 base-execute #> 
     s" gforth_c_" 2swap s+ #>> ;      s" gforth_c_" 2swap s+ #>> ;
   
 : prepend-dirname ( c-addr1 u1 -- c-addr2 u2 )  : libcc-named-dir ( -- c-addr u )
     tempdir s" /" s+ 2over append      s" ~/.gforth/libcc-named/" ;
     2swap drop free throw ;  
   
 : c-library-name1 ( c-addr u -- )  : libcc-tmp-dir ( -- c-addr u )
     \ set up filenames for a new library; c-addr u is the basename of      s" ~/.gforth/libcc-tmp/" ;
     \ the library  
   : prepend-dirname ( c-addr1 u1 c-addr2 u2 -- c-addr3 u3 )
       2over s+ 2swap drop free throw ;
   
   : c-library-name-setup ( c-addr u -- )
     assert( c-source-file-id @ 0= )      assert( c-source-file-id @ 0= )
     prepend-dirname { d: filename }      { d: filename }
     here 0 , lib-handle-addr ! filename lib-filename 2!      here 0 , lib-handle-addr ! filename lib-filename 2!
     filename tempdir nip 1+ /string lib-modulename 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      open-wrappers dup if
         lib-handle-addr @ !          lib-handle-addr @ !
         ( 0 c-source-file-id ! ) \ already set  
     else      else
         drop          drop c-library-name-create
         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 ;      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 )
     lib-handle-addr @ @ ;      lib-handle-addr @ @ ;
   
 : init-c-source-file ( -- )  : init-c-source-file ( -- )
     lib-handle 0= if      lib-handle 0= if
         c-source-file-id @ 0= if          c-source-file-id @ 0= if
             here gen-filename c-library-name1              here gen-filename c-tmp-library-name
         endif          endif
     endif ;      endif ;
   
Line 523  DEFER compile-wrapper-function ( -- ) Line 552  DEFER compile-wrapper-function ( -- )
         \    cr 2dup type          \    cr 2dup type
         2dup system drop free throw $? abort" libtool compile failed"          2dup system drop free throw $? abort" libtool compile failed"
         [ libtool-command s"  --silent --mode=link gcc -module -rpath " s+ ] sliteral          [ libtool-command s"  --silent --mode=link gcc -module -rpath " s+ ] sliteral
         tempdir s+ s"  " append          lib-filename 2@ dirname s+ s"  " append
         lib-filename 2@ append s" .lo -o " append          lib-filename 2@ append s" .lo -o " append
         lib-filename 2@ append s" .la" append ( c-addr u )          lib-filename 2@ append s" .la" append ( c-addr u )
         c-libs @ ['] append-l list-map          c-libs @ ['] append-l list-map
Line 590  clear-libs Line 619  clear-libs
 \G Start a C library interface 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-named-library-name ;
   
 : 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 ( -- ) \ gforth  : end-c-library ( -- ) \ gforth
 \G Finish and (if necessary) build the latest C library interface.  \G Finish and (if necessary) build the latest C library interface.

Removed from v.1.38  
changed lines
  Added in v.1.41


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