Diff for /gforth/libcc.fs between versions 1.22 and 1.27

version 1.22, 2007/10/29 15:56:31 version 1.27, 2007/12/31 17:34:58
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 Free Software Foundation, Inc.  \ Copyright (C) 2006,2007 Free Software Foundation, Inc.
   
 \ This file is part of Gforth.  \ This file is part of Gforth.
   
Line 147  variable c-source-file-id \ contains the Line 147  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.
 2variable lib-filename \ filename without extension  2variable lib-filename   \ filename without extension
   2variable lib-modulename \ basename of the file without extension
   
 : .nb ( n -- )  : .nb ( n -- )
     0 .r ;      0 .r ;
Line 398  create gen-wrapped-types Line 399  create gen-wrapped-types
     \ addr points to the return type index of a c-function descriptor      \ addr points to the return type index of a c-function descriptor
     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 " 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"      .\" (void)\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"
Line 418  create gen-wrapped-types Line 419  create gen-wrapped-types
 : gen-filename ( x -- c-addr u )  : gen-filename ( x -- c-addr u )
     \ generates a filename without extension for lib-handle-addr X      \ generates a filename without extension for lib-handle-addr X
     0 <<# ['] #s $10 base-execute #>       0 <<# ['] #s $10 base-execute #> 
     tempdir s" /gforth-c-" s+ 2swap append #>> ;      tempdir s" /gforth_c_" s+ 2swap append #>> ;
   
 : init-c-source-file ( -- )  : init-c-source-file ( -- )
     c-source-file-id @ 0= if      c-source-file-id @ 0= if
         here 0 , dup lib-handle-addr ! gen-filename 2dup lib-filename 2!          here 0 , dup lib-handle-addr ! gen-filename 2dup lib-filename 2!
           2dup tempdir nip 1+ /string lib-modulename 2!
         s" .c" s+ 2dup w/o create-file throw dup c-source-file-id !          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
Line 431  create gen-wrapped-types Line 433  create gen-wrapped-types
 : c-source-file ( -- file-id )  : c-source-file ( -- file-id )
     c-source-file-id @ assert( dup ) ;      c-source-file-id @ assert( dup ) ;
   
   : .lib-error ( -- )
       [ifdef] lib-error
           ['] cr stderr outfile-execute
           lib-error ['] type outfile-execute
       [then] ;
   
 DEFER compile-wrapper-function  DEFER compile-wrapper-function
 :NONAME ( -- )  :NONAME ( -- )
     c-source-file close-file throw      c-source-file close-file throw
     0 c-source-file-id !      0 c-source-file-id !
     [ s" libtool --silent --mode=link gcc -module -I "      [ libtool-command s"  --silent --mode=compile gcc -I " s+
       s" includedir" getenv append s"  -rpath " append ] sliteral      s" includedir" getenv append ] sliteral
     tempdir s+ s"  -O -c " append 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 )
       2dup system drop free throw $? abort" libtool compile failed"
       [ libtool-command s"  --silent --mode=link gcc -module -rpath " s+ ] sliteral
       tempdir s+ s"  " 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 )
 \    s" gcc -fPIC -shared -Wl,-soname," lib-filename 2@ s+      2dup system drop free throw $? abort" libtool link failed"
 \    s" .so.1 -Wl,-export_dynamic -o " append lib-filename 2@ append      lib-filename 2@ s" .la" s+
 \    [ s" .so.1 -O -I " s" includedir" getenv append s"  " append ] sliteral      2dup open-lib dup 0= if
 \    append lib-filename 2@ append s" .c" append ( c-addr u )          .lib-error true abort" open-lib failed"
     ~~ 2dup type 2dup system drop free throw      endif
     $? abort" compiler generated error" \ !! call dlerror  
     tempdir s" /.libs/" s+ lib-filename 2@ append s" .so.0" append  
     2dup type  
     2dup open-lib dup 0= abort" open-lib failed" \ !! call dlerror  
     ( lib-handle ) lib-handle-addr @ !      ( lib-handle ) lib-handle-addr @ !
     2dup delete-file throw drop free throw      2dup delete-file throw drop free throw
     lib-filename 2@ s" .c" s+ 2dup delete-file throw drop free throw      lib-filename 2@ s" .c" s+ 2dup delete-file throw drop free throw
Line 457  DEFER compile-wrapper-function Line 466  DEFER compile-wrapper-function
   
 : link-wrapper-function { cff -- sym }  : link-wrapper-function { cff -- sym }
     cff cff-rtype wrapper-function-name { d: wrapper-name }      cff cff-rtype wrapper-function-name { d: wrapper-name }
     wrapper-name cff cff-lha @ @ assert( dup ) lib-sym dup 0= -&32 and throw      wrapper-name cff cff-lha @ @ assert( dup ) lib-sym dup 0= if
           .lib-error -&32 throw
       endif
     wrapper-name drop free throw ;      wrapper-name drop free throw ;
   
 : c-function-ft ( xt-defr xt-cfr "c-name" "{libcc-type}" "--" "libcc-type" -- )  : c-function-ft ( xt-defr xt-cfr "c-name" "{libcc-type}" "--" "libcc-type" -- )

Removed from v.1.22  
changed lines
  Added in v.1.27


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