[BACK]Return to libcc.fs CVS log [TXT] [DIR] Up to [gforth] / gforth

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

version 1.46, 2008/07/13 23:53:08 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 161  variable lib-handle-addr \ points to the Line 159  variable lib-handle-addr \ points to the
 2variable libcc-named-dir-v \ directory for named libcc wrapper libraries  2variable libcc-named-dir-v \ directory for named libcc wrapper libraries
 0 value libcc-path       \ pointer to path of library directories  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 285  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 301  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 330  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 357  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 364  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 408  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 554  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-4.2 -arch x86_64' -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-4.2 -arch x86_64' -module -rpath " s+ ] sliteral          [ libtool-command s"  --silent --mode=link --tag=CC " s+
         lib-filename 2@ dirname 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
             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
             .lib-error true abort" open-lib failed"              .lib-error true abort" open-lib failed"
Removed from v.1.46  
changed lines
  Added in v.1.51

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