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

version 1.18, 2007/06/01 18:40:20 version 1.26, 2007/12/05 13:54:38
Line 73 Line 73
 \ c-variable forth-name c-name  \ c-variable forth-name c-name
 \ c-constant forth-name c-name  \ c-constant forth-name c-name
   
   \ Todo: conversion between function pointers and xts (both directions)
   
   \ taking an xt and turning it into a function pointer:
   
   \ e.g., assume we have the xt of + and want to create a C function int
   \ gforth_callback_plus(int, int), and then pass the pointer to that
   \ function:
   
   \ There should be Forth code like this:
   \   ] + 0 (bye)
   \ Assume that the start of this code is START
           
   \ Now, there should be a C function:
   
   \ int gforth_callback_plus(int p1, int p2)
   \ {
   \   Cell   *sp = gforth_SP;
   \   Float  *fp = gforth_FP;
   \   Float  *fp = gforth_FP;
   \   Address lp = gforth_LP;
   \   sp -= 2;
   \   sp[0] = p1;
   \   sp[1] = p2;
   \   gforth_engine(START, sp, rp, fp, lp);
   \   sp += 1;
   \   gforth_RP = rp;
   \   gforth_SP = sp;
   \   gforth_FP = fp;
   \   gforth_LP = lp;
   \   return sp[0];
   \ }
   
   \ and the pointer to that function is the C function pointer for the XT of +.
   
   \ Future problems:
   \   how to combine the Forth code generation with inlining
   \   START is not a constant across executions (when caching the C files)
   \      Solution: make START a variable, and store into it on startup with dlsym
   
   \ Syntax:
   \  callback <rettype> <params> <paramtypes> -- <rettype>
   
   
 \ data structures  \ data structures
   
Line 82 Line 124
 \ first-time word, then to the run-time word; the run-time word calls  \ first-time word, then to the run-time word; the run-time word calls
 \ the c function.  \ the c function.
   
   : delete-file 2drop 0 ;
   
 require struct.fs  require struct.fs
   
Line 104  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 191  variable c-prefix-lines-end c-prefix-lin Line 235  variable c-prefix-lines-end c-prefix-lin
     \G One line of C declarations for the C interface      \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"  s" #include <gforth/" version-string s+ s" /libcc.h>" append ( c-addr u )
     2dup save-c-prefix-line drop free throw
   
 \ Types (for parsing)  \ Types (for parsing)
   
Line 354  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 374  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 387  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 ) ;
   
 : compile-wrapper-function ( -- )  : .lib-error ( -- )
       [ifdef] lib-error
           ['] cr stderr outfile-execute
           lib-error ['] type outfile-execute
       [then] ;
   
   DEFER compile-wrapper-function
   :NONAME ( -- )
     c-source-file close-file throw      c-source-file close-file throw
     0 c-source-file-id !      0 c-source-file-id !
     s" gcc -I. -fPIC -shared -Wl,-soname," lib-filename 2@ s+      [ libtool-command s"  --silent --mode=compile gcc -I " s+
     s" .so.1 -Wl,-export_dynamic -o " append lib-filename 2@ append      s" includedir" getenv append ] sliteral
     s" .so.1 -O " append lib-filename 2@ append s" .c" append ( c-addr u )      s"  -O -c " s+ lib-filename 2@ append s" .c -o " append
     2dup system drop free throw      lib-filename 2@ append s" .lo" append ( c-addr u )
     $? abort" compiler generated error" \ !! call dlerror      2dup system drop free throw $? abort" libtool compile failed"
     lib-filename 2@ s" .so.1" s+      [ libtool-command s"  --silent --mode=link gcc -module -rpath " s+ ] sliteral
     2dup open-lib dup 0= abort" open-lib failed" \ !! call dlerror      tempdir s+ s"  " append
       lib-filename 2@ append s" .lo -o " append
       lib-filename 2@ append s" .la" append ( c-addr u )
       2dup system drop free throw $? abort" libtool link failed"
       lib-filename 2@ s" .la" s+
       2dup open-lib dup 0= if
           .lib-error true abort" open-lib failed"
       endif
     ( 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
     lib-filename 2@ drop free throw 0 0 lib-filename 2! ;      lib-filename 2@ drop free throw 0 0 lib-filename 2! ; IS compile-wrapper-function
 \    s" ar rcs xxx.a xxx.o" system  \    s" ar rcs xxx.a xxx.o" system
 \    $? abort" ar generated error" ;  \    $? abort" ar generated error" ;
   
 : 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.18  
changed lines
  Added in v.1.26


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