Diff for /gforth/libcc.fs between versions 1.15 and 1.18

version 1.15, 2007/05/29 20:44:38 version 1.18, 2007/06/01 18:40:20
Line 140  variable lib-handle-addr \ points to the Line 140  variable lib-handle-addr \ points to the
   
 \ linked list stuff (should go elsewhere)  \ linked list stuff (should go elsewhere)
   
 hex  
   
 struct  struct
     cell% field list-next      cell% field list-next
     1 0   field list-payload      1 0   field list-payload
Line 189  variable c-prefix-lines-end c-prefix-lin Line 187  variable c-prefix-lines-end c-prefix-lin
     align here 0 , c-prefix-lines-end list-append ( c-addr u )      align here 0 , c-prefix-lines-end list-append ( c-addr u )
     longstring, ;      longstring, ;
   
 : \c ( "rest-of-line" -- )  : \c ( "rest-of-line" -- ) \ gforth backslash-c
       \G One line of C declarations for the C interface
     -1 parse save-c-prefix-line ;      -1 parse save-c-prefix-line ;
   
 \c #include "engine/libcc.h"  \c #include "engine/libcc.h"
Line 367  create gen-wrapped-types Line 366  create gen-wrapped-types
     endif      endif
     .\" }\n" ;      .\" }\n" ;
   
   : tempdir ( -- c-addr u )
       s" TMPDIR" getenv dup 0= if
           2drop s" /tmp"
       then ;
   
 : 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 'x hold 'x hold 'x hold #> save-mem #>> ;      0 <<# ['] #s $10 base-execute #> 
       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
Line 385  create gen-wrapped-types Line 390  create gen-wrapped-types
 : compile-wrapper-function ( -- )  : compile-wrapper-function ( -- )
     c-source-file close-file throw      c-source-file close-file throw
     0 c-source-file-id !      0 c-source-file-id !
     s" gcc -fPIC -shared -Wl,-soname," lib-filename 2@ s+      s" gcc -I. -fPIC -shared -Wl,-soname," lib-filename 2@ s+
     s" .so.1 -Wl,-export_dynamic -o " append lib-filename 2@ append      s" .so.1 -Wl,-export_dynamic -o " append lib-filename 2@ append
     s" .so.1 -O " append lib-filename 2@ append s" .c" append ( c-addr u )      s" .so.1 -O " append lib-filename 2@ append s" .c" append ( c-addr u )
     2dup system drop free throw      2dup system drop free throw
     $? abort" compiler generated error" \ !! call dlerror      $? abort" compiler generated error" \ !! call dlerror
     s" ./" lib-filename 2@ s+ s" .so.1" append      lib-filename 2@ s" .so.1" s+
     2dup open-lib dup 0= abort" open-lib failed" \ !! call dlerror      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
Line 427  create gen-wrapped-types Line 432  create gen-wrapped-types
   does> ( ... -- ... )    does> ( ... -- ... )
     @ call-c ;      @ call-c ;
   
 : c-function ( "forth-name" "c-name" "{libcc-type}" "--" "libcc-type" -- )  : c-function ( "forth-name" "c-name" "@{type@}" "--" "type" -- ) \ gforth
       \G Define a Forth word @i{forth-name}.  @i{Forth-name} has the
       \G specified stack effect and calls the C function @code{c-name}.
     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! ;
   
 s" Library not found" exception constant err-nolib  
   
 : library ( "name" "file" -- ) \ gforth  
 \G Dynamically links the library specified by @i{file}.  Defines a  
 \G word @i{name} ( -- lib ) that starts the declaration of a  
 \G function from that library.  
     create parse-name open-lib dup 0= err-nolib and throw ,  
   does> ( -- lib )  
     @ ;  

Removed from v.1.15  
changed lines
  Added in v.1.18


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