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

version 1.42, 2008/07/10 21:11:57 version 1.55, 2008/09/18 15:47:04
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 225  end-struct c-lib% Line 226  end-struct c-lib%
   
 variable c-libs \ linked list of library names (without "lib")  variable c-libs \ linked list of library names (without "lib")
   
 : add-lib ( c-addr u -- )  : add-lib ( c-addr u -- ) \ gforth
 \G Add library lib@i{string} to the list of libraries, where  \G Add library lib@i{string} to the list of libraries, where
 \G @i{string} is represented by @i{c-addr u}.  \G @i{string} is represented by @i{c-addr u}.
     c-lib% %size allocate throw dup >r      c-lib% %size allocate throw dup >r
Line 430  create gen-wrapped-types Line 431  create gen-wrapped-types
     dup { descriptor }      dup { descriptor }
     count { ret } count 2dup { d: pars } chars + count { d: c-name }      count { ret } count 2dup { d: pars } chars + count { d: c-name }
     ." void " lib-modulename 2@ type ." _LTX_" descriptor wrapper-function-name 2dup type drop free throw      ." void " lib-modulename 2@ type ." _LTX_" descriptor wrapper-function-name 2dup type drop free throw
     .\" (void)\n"      .\" (GFORTH_ARGS)\n"
     .\" {\n  Cell MAYBE_UNUSED *sp = gforth_SP;\n  Float MAYBE_UNUSED *fp = gforth_FP;\n  "      .\" {\n  Cell MAYBE_UNUSED *sp = gforth_SP;\n  Float MAYBE_UNUSED *fp = gforth_FP;\n  "
     pars c-name 2over count-stacks ret gen-wrapped-stmt .\" ;\n"      pars c-name 2over count-stacks ret gen-wrapped-stmt .\" ;\n"
     ?dup-if      ?dup-if
Line 464  create gen-wrapped-types Line 465  create gen-wrapped-types
     s" gforth_c_" 2swap s+ #>> ;      s" gforth_c_" 2swap s+ #>> ;
   
 : libcc-named-dir ( -- c-addr u )  : libcc-named-dir ( -- c-addr u )
     s" ~/.gforth/libcc-named/" ;      libcc-named-dir-v 2@ ;
   
 : libcc-tmp-dir ( -- c-addr u )  : libcc-tmp-dir ( -- c-addr u )
     s" ~/.gforth/libcc-tmp/" ;      s" ~/.gforth/libcc-tmp/" ;
Line 472  create gen-wrapped-types Line 473  create gen-wrapped-types
 : prepend-dirname ( c-addr1 u1 c-addr2 u2 -- c-addr3 u3 )  : prepend-dirname ( c-addr1 u1 c-addr2 u2 -- c-addr3 u3 )
     2over s+ 2swap drop free throw ;      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 )  : open-wrappers ( -- addr|0 )
     lib-filename 2@ s" .la" s+      lib-filename 2@ s" .la" s+
     2dup libcc-named-dir string-prefix? if ( c-addr u )      2dup libcc-named-dir string-prefix? if ( c-addr u )
Line 558  DEFER compile-wrapper-function ( -- ) Line 553  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          \    2dup type cr
         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+
         lib-filename 2@ dirname s+ s"  " append            libtool-cc append libtool-flags 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 617  DEFER compile-wrapper-function ( -- ) Line 614  DEFER compile-wrapper-function ( -- )
     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 ( -- )  : clear-libs ( -- ) \ gforth
 \G Clear the list of libs  \G Clear the list of libs
     c-source-file-id @ if      c-source-file-id @ if
         compile-wrapper-function          compile-wrapper-function
Line 642  clear-libs Line 639  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.42  
changed lines
  Added in v.1.55


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