Diff for /gforth/libcc.fs between versions 1.14 and 1.16

version 1.14, 2007/05/28 12:07:30 version 1.16, 2007/05/31 18:10:39
Line 104  variable c-source-file-id \ contains the Line 104  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
   
 : .nb ( n -- )  : .nb ( n -- )
     0 .r ;      0 .r ;
Line 125  variable lib-handle-addr \ points to the Line 126  variable lib-handle-addr \ points to the
     c c-addr1 c!      c c-addr1 c!
     c-addr1 u1 1 /string ;      c-addr1 u1 1 /string ;
   
   : s+ { addr1 u1 addr2 u2 -- addr u }
       u1 u2 + allocate throw { addr }
       addr1 addr u1 move
       addr2 addr u1 + u2 move
       addr u1 u2 +
   ;
   
   : 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)  \ linked list stuff (should go elsewhere)
   
 hex  hex
Line 354  create gen-wrapped-types Line 367  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 )
       \ 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 367  create gen-wrapped-types Line 391  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,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" ;
   

Removed from v.1.14  
changed lines
  Added in v.1.16


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