Diff for /gforth/libcc.fs between versions 1.43 and 1.59

version 1.43, 2008/07/12 20:14:26 version 1.59, 2009/10/03 21:33:48
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 135 Line 135
 \ : delete-file 2drop 0 ;  \ : delete-file 2drop 0 ;
   
 require struct.fs  require struct.fs
   require mkdir.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 157  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 217  end-struct list% Line 219  end-struct list%
             node list-next @              node list-next @
     repeat ;      repeat ;
   
 \ linked libraries  2variable c-libs \ library names in a string (without "lib")
   
 list%  : add-lib ( c-addr u -- ) \ gforth
     cell% 2* field c-lib-string  
 end-struct c-lib%  
   
 variable c-libs \ linked list of library names (without "lib")  
   
 : add-lib ( c-addr u -- )  
 \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-libs 2@ d0= IF  0 allocate throw 0 c-libs 2!  THEN
     c-lib-string 2!      c-libs 2@ s"  -l" append 2swap append c-libs 2! ;
     r> c-libs list-insert ;  
   : add-libpath ( c-addr u -- ) \ gforth
 : append-l ( c-addr1 u1 node -- c-addr2 u2 )  \G Add path @i{string} to the list of library search pathes, where
     \ append " -l<nodelib>" to string1      \G @i{string} is represented by @i{c-addr u}.
     >r s"  -l" append r> c-lib-string 2@ append ;      c-libs 2@ d0= IF  0 allocate throw 0 c-libs 2!  THEN
       c-libs 2@ s"  -L" append 2swap append c-libs 2! ;
   
 \ C prefix lines  \ C prefix lines
   
Line 430  create gen-wrapped-types Line 427  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 463  create gen-wrapped-types Line 460  create gen-wrapped-types
     0 <<# ['] #s $10 base-execute #>       0 <<# ['] #s $10 base-execute #> 
     s" gforth_c_" 2swap s+ #>> ;      s" gforth_c_" 2swap s+ #>> ;
   
 2variable libcc-named-dir-v  
   
 : libcc-named-dir ( -- c-addr u )  : libcc-named-dir ( -- c-addr u )
     libcc-named-dir-v 2@ ;      libcc-named-dir-v 2@ ;
   
Line 474  create gen-wrapped-types Line 469  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  
   
 : 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 508  create gen-wrapped-types Line 501  create gen-wrapped-types
     open-wrappers dup if      open-wrappers dup if
         lib-handle-addr @ !          lib-handle-addr @ !
     else      else
           libcc-named-dir $1ff mkdir-parents drop
         drop c-library-name-create          drop c-library-name-create
     endif ;      endif ;
   
 : c-tmp-library-name ( 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
     libcc-tmp-dir prepend-dirname c-library-name-setup c-library-name-create ;      libcc-tmp-dir 2dup $1ff mkdir-parents drop
       prepend-dirname c-library-name-setup c-library-name-create ;
   
 : lib-handle ( -- addr )  : lib-handle ( -- addr )
     lib-handle-addr @ @ ;      lib-handle-addr @ @ ;
Line 556  DEFER compile-wrapper-function ( -- ) Line 551  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 " s+
         s" includedir" getenv append ] sliteral            libtool-cc append s"  -I '" append
             s" includedir" getenv append  s" '" 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 " 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 2@ append
         \    2dup type cr          \    2dup type cr
         2dup system drop free throw $? abort" libtool link failed"          2dup system drop free throw $? abort" libtool link failed"
         open-wrappers dup 0= if          open-wrappers dup 0= if
Line 615  DEFER compile-wrapper-function ( -- ) Line 612  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
     endif      endif
     0 c-libs ! ;      0. c-libs 2! ;
 clear-libs  clear-libs
   
 : c-library-incomplete ( -- )  : c-library-incomplete ( -- )
Line 643  clear-libs Line 640  clear-libs
   
 : init-libcc ( -- )  : init-libcc ( -- )
     s" ~/.gforth/libcc-named/" libcc-named-dir-v 2!      s" ~/.gforth/libcc-named/" libcc-named-dir-v 2!
   [IFDEF] make-path
     make-path to libcc-path      make-path to libcc-path
     libcc-named-dir libcc-path also-path      libcc-named-dir libcc-path also-path
     [ s" libccdir" getenv ] sliteral libcc-path also-path      [ s" libccdir" getenv ] sliteral libcc-path also-path
   [THEN]
 ;  ;
   
 init-libcc  init-libcc

Removed from v.1.43  
changed lines
  Added in v.1.59


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