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

version 1.13, 2007/05/28 09:43:34 version 1.18, 2007/06/01 18:40:20
Line 99  struct Line 99  struct
     \  counted string: c-name      \  counted string: c-name
 end-struct cff%  end-struct cff%
   
   variable c-source-file-id \ contains the source file id of the current batch
   0 c-source-file-id !
   variable lib-handle-addr \ points to the library handle of the current batch.
                            \ the library handle is 0 if the current
                            \ batch is not yet compiled.
   2variable lib-filename \ filename without extension
   
 : .nb ( n -- )  : .nb ( n -- )
     0 .r ;      0 .r ;
Line 120  end-struct cff% Line 126  end-struct cff%
     c c-addr1 c!      c c-addr1 c!
     c-addr1 u1 1 /string ;      c-addr1 u1 1 /string ;
   
 \ linked list stuff (should go elsewhere)  : s+ { addr1 u1 addr2 u2 -- addr u }
       u1 u2 + allocate throw { addr }
       addr1 addr u1 move
       addr2 addr u1 + u2 move
       addr u1 u2 +
   ;
   
 hex  : append { addr1 u1 addr2 u2 -- addr u }
       addr1 u1 u2 + dup { u } resize throw { addr }
       addr2 addr u1 + u2 move
       addr u ;
   
   \ linked list stuff (should go elsewhere)
   
 struct  struct
     cell% field list-next      cell% field list-next
Line 158  end-struct c-prefix% Line 174  end-struct c-prefix%
 variable c-prefix-lines 0 c-prefix-lines !  variable c-prefix-lines 0 c-prefix-lines !
 variable c-prefix-lines-end c-prefix-lines c-prefix-lines-end !  variable c-prefix-lines-end c-prefix-lines c-prefix-lines-end !
   
 : save-c-prefix-line ( c-addr u -- )  
     align here 0 , c-prefix-lines-end list-append ( c-addr u )  
     longstring, ;  
   
 : \c ( "rest-of-line" -- )  
     -1 parse save-c-prefix-line ;  
   
 : print-c-prefix-line ( node -- )  : print-c-prefix-line ( node -- )
     dup c-prefix-chars swap c-prefix-count @ type cr ;      dup c-prefix-chars swap c-prefix-count @ type cr ;
   
 : print-c-prefix-lines ( -- )  : print-c-prefix-lines ( -- )
     c-prefix-lines @ ['] print-c-prefix-line list-map ;      c-prefix-lines @ ['] print-c-prefix-line list-map ;
   
   : save-c-prefix-line ( c-addr u -- )
       c-source-file-id @ ?dup-if
           >r 2dup r> write-line throw
       then
       align here 0 , c-prefix-lines-end list-append ( c-addr u )
       longstring, ;
   
   : \c ( "rest-of-line" -- ) \ gforth backslash-c
       \G One line of C declarations for the C interface
       -1 parse save-c-prefix-line ;
   
 \c #include "engine/libcc.h"  \c #include "engine/libcc.h"
   
 \ Types (for parsing)  \ Types (for parsing)
Line 346  create gen-wrapped-types Line 366  create gen-wrapped-types
     endif      endif
     .\" }\n" ;      .\" }\n" ;
   
 variable c-source-file-id \ contains the source file id of the current batch  : tempdir ( -- c-addr u )
 0 c-source-file-id !      s" TMPDIR" getenv dup 0= if
 variable lib-handle-addr \ points to the library handle of the current batch.          2drop s" /tmp"
                          \ the library handle is 0 if the current      then ;
                          \ batch is not yet compiled.  
   : gen-filename ( x -- c-addr u )
       \ generates a filename without extension for lib-handle-addr X
       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
         s" xxx.c" w/o create-file throw dup c-source-file-id !          here 0 , dup lib-handle-addr ! gen-filename 2dup lib-filename 2!
         ['] print-c-prefix-lines swap outfile-execute          s" .c" s+ 2dup w/o create-file throw dup c-source-file-id !
         here 0 , lib-handle-addr !          ['] print-c-prefix-lines swap outfile-execute
           drop free throw
     endif ;      endif ;
   
 : c-source-file ( -- file-id )  : c-source-file ( -- file-id )
Line 365  variable lib-handle-addr \ points to the Line 390  variable lib-handle-addr \ points to the
 : 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,xxx.so.1 -Wl,-export_dynamic -o xxx.so.1 -O xxx.c" system      s" gcc -I. -fPIC -shared -Wl,-soname," lib-filename 2@ s+
     $? abort" compiler generated error"      s" .so.1 -Wl,-export_dynamic -o " append lib-filename 2@ append
     s" /home/anton/gforth/xxx.so.1" open-lib dup 0= abort" open-lib failed"      s" .so.1 -O " append lib-filename 2@ append s" .c" append ( c-addr u )
     ( lib-handle ) lib-handle-addr @ ! ;      2dup system drop free throw
       $? abort" compiler generated error" \ !! call dlerror
       lib-filename 2@ s" .so.1" s+
       2dup open-lib dup 0= abort" open-lib failed" \ !! call dlerror
       ( lib-handle ) lib-handle-addr @ !
       2dup delete-file throw drop free throw
       lib-filename 2@ s" .c" s+ 2dup delete-file throw drop free throw
       lib-filename 2@ drop free throw 0 0 lib-filename 2! ;
 \    s" ar rcs xxx.a xxx.o" system  \    s" ar rcs xxx.a xxx.o" system
 \    $? abort" ar generated error" ;  \    $? abort" ar generated error" ;
   
Line 400  variable lib-handle-addr \ points to the Line 432  variable lib-handle-addr \ points to the
   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.13  
changed lines
  Added in v.1.18


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