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

version 1.39, 2008/07/05 20:09:42 version 1.51, 2008/07/27 10:34:06
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,2007 Free Software Foundation, Inc.  \ Copyright (C) 2006,2007,2008 Free Software Foundation, Inc.
   
 \ This file is part of Gforth.  \ This file is part of Gforth.
   
Line 136 Line 136
   
 require struct.fs  require struct.fs
   
     \ counted-string  
       
 \ c-function-ft word body:  \ c-function-ft word body:
 struct  struct
     cell% field cff-cfr \ xt of c-function-rt word      cell% field cff-cfr \ xt of c-function-rt word
Line 158  variable lib-handle-addr \ points to the Line 156  variable lib-handle-addr \ points to the
   here 0 , lib-handle-addr ! \ just make sure LIB-HANDLE always works    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
   2variable libcc-named-dir-v \ directory for named libcc wrapper libraries
   0 value libcc-path       \ pointer to path of library directories
   
 : delete-file 2drop 0 ;  defer replace-rpath ( c-addr1 u1 -- c-addr2 u2 )
   ' noop is replace-rpath
   
 : .nb ( n -- )  : .nb ( n -- )
     0 .r ;      0 .r ;
Line 283  const+ d \ double Line 284  const+ d \ double
 const+ r \ float  const+ r \ float
 const+ func \ C function pointer  const+ func \ C function pointer
 const+ void  const+ void
   const+ file \ C file pointer
 drop  drop
   
 set-current  set-current
Line 299  set-current Line 301  set-current
     parse-libcc-type dup 0< -32 and throw swap c! ;      parse-libcc-type dup 0< -32 and throw swap c! ;
   
 : type-letter ( n -- c )  : type-letter ( n -- c )
     chars s" nadrfv" drop + c@ ;      chars s" nadrfvF" drop + c@ ;
   
 \ count-stacks  \ count-stacks
   
Line 328  create count-stacks-types Line 330  create count-stacks-types
 ' count-stacks-r ,  ' count-stacks-r ,
 ' count-stacks-func ,  ' count-stacks-func ,
 ' count-stacks-void ,  ' count-stacks-void ,
   ' count-stacks-a ,
   
 : count-stacks ( pars -- fp-change sp-change )  : count-stacks ( pars -- fp-change sp-change )
     \ pars is an addr u pair      \ pars is an addr u pair
Line 355  create count-stacks-types Line 358  create count-stacks-types
 : gen-par-void ( fp-depth1 sp-depth1 -- fp-depth2 sp-depth2 )  : gen-par-void ( fp-depth1 sp-depth1 -- fp-depth2 sp-depth2 )
     -32 throw ;      -32 throw ;
   
   : gen-par-file ( fp-depth1 sp-depth1 -- fp-depth2 sp-depth2 )
       ." (FILE *)(" gen-par-n ." )" ;
   
 create gen-par-types  create gen-par-types
 ' gen-par-n ,  ' gen-par-n ,
 ' gen-par-a ,  ' gen-par-a ,
Line 362  create gen-par-types Line 368  create gen-par-types
 ' gen-par-r ,  ' gen-par-r ,
 ' gen-par-func ,  ' gen-par-func ,
 ' gen-par-void ,  ' gen-par-void ,
   ' gen-par-file ,
   
 : gen-par ( fp-depth1 sp-depth1 partype -- fp-depth2 sp-depth2 )  : gen-par ( fp-depth1 sp-depth1 partype -- fp-depth2 sp-depth2 )
     cells gen-par-types + @ execute ;      cells gen-par-types + @ execute ;
Line 406  create gen-wrapped-types Line 413  create gen-wrapped-types
 ' gen-wrapped-r ,  ' gen-wrapped-r ,
 ' gen-wrapped-func ,  ' gen-wrapped-func ,
 ' gen-wrapped-void ,  ' gen-wrapped-void ,
   ' gen-wrapped-a ,
   
 : gen-wrapped-stmt ( pars c-name fp-change1 sp-change1 ret -- fp-change sp-change )  : gen-wrapped-stmt ( pars c-name fp-change1 sp-change1 ret -- fp-change sp-change )
     cells gen-wrapped-types + @ execute ;      cells gen-wrapped-types + @ execute ;
Line 441  create gen-wrapped-types Line 449  create gen-wrapped-types
     endif      endif
     .\" }\n" ;      .\" }\n" ;
   
 : open-wrappers ( -- addr )  : scan-back { c-addr u1 c -- c-addr u2 }
     lib-filename 2@ s" .la" s+      \ the last occurence of c in c-addr u1 is at u2-1; if it does not
     2dup open-lib >r      \ occur, u2=0.
     drop free throw r> ;      c-addr 1- c-addr u1 + 1- u-do
           i c@ c = if
 : tempdir ( -- c-addr u )              c-addr i over - 1+ unloop exit endif
     s" TMPDIR" getenv dup 0= if      1 -loop
         2drop s" /tmp"      c-addr 0 ;
     then ;  
   : 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      libcc-named-dir-v 2@ ;
     2swap drop free throw ;  
   : 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 ;
   
   : 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 -- )  : 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 ( -- )  : c-library-name-create ( -- )
     lib-filename 2@ s" .c" s+ 2dup w/o create-file throw      lib-filename 2@ s" .c" s+ 2dup w/o create-file throw
Line 472  create gen-wrapped-types Line 505  create gen-wrapped-types
     ['] 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 -- )  : c-named-library-name ( c-addr u -- )
     \ set up filenames for a (possibly new) library; c-addr u is the      \ set up filenames for a (possibly new) library; c-addr u is the
     \ basename of the library      \ basename of the library
     c-library-name-setup      libcc-named-dir prepend-dirname c-library-name-setup
     open-wrappers dup if      open-wrappers dup if
         lib-handle-addr @ !          lib-handle-addr @ !
     else      else
         drop c-library-name-create          drop c-library-name-create
     endif ;      endif ;
   
 : c-library-name2 ( c-addr u -- )  : c-tmp-library-name ( c-addr u -- )
     \ set up filenames for a new library; c-addr u is the basename of      \ set up filenames for a new library; c-addr u is the basename of
     \ the library      \ the library
     c-library-name-setup c-library-name-create ;      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 @ @ ;
Line 493  create gen-wrapped-types Line 526  create gen-wrapped-types
 : 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-name2              here gen-filename c-tmp-library-name
         endif          endif
     endif ;      endif ;
   
Line 527  DEFER compile-wrapper-function ( -- ) Line 560  DEFER compile-wrapper-function ( -- )
     lib-handle 0= if      lib-handle 0= if
         c-source-file close-file throw          c-source-file close-file throw
         0 c-source-file-id !          0 c-source-file-id !
         [ libtool-command s"  --silent --mode=compile gcc -I " s+          [ libtool-command s"  --silent --mode=compile --tag=CC " s+
         s" includedir" getenv append ] sliteral            libtool-cc append s"  -I " append
             s" includedir" getenv append ] sliteral
         s"  -O -c " s+ lib-filename 2@ append s" .c -o " append          s"  -O -c " s+ lib-filename 2@ append s" .c -o " append
         lib-filename 2@ append s" .lo" append ( c-addr u )          lib-filename 2@ append s" .lo" append ( c-addr u )
         \    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 --tag=CC " s+
         tempdir s+ s"  " append            libtool-cc append s"  -module -rpath " s+ ] sliteral
           lib-filename 2@ dirname replace-rpath 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 601  clear-libs Line 636  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}
Line 611  clear-libs Line 646  clear-libs
 \G Finish and (if necessary) build the latest C library interface.  \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 ;
   
   : init-libcc ( -- )
       s" ~/.gforth/libcc-named/" libcc-named-dir-v 2!
   [IFDEF] make-path
       make-path to libcc-path
       libcc-named-dir libcc-path also-path
       [ s" libccdir" getenv ] sliteral libcc-path also-path
   [THEN]
   ;
   
   init-libcc
   
   :noname ( -- )
       defers 'cold
       init-libcc ;
   is 'cold

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


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