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

version 1.16, 2007/05/31 18:10:39 version 1.22, 2007/10/29 15:56:31
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 140  variable lib-handle-addr \ points to the Line 183  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 230  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"  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 388  create gen-wrapped-types Line 431  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 ( -- )  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+      [ s" libtool --silent --mode=link gcc -module -I "
     s" .so.1 -Wl,-export_dynamic -o " append lib-filename 2@ append        s" includedir" getenv append s"  -rpath " append ] sliteral
     s" .so.1 -O " append lib-filename 2@ append s" .c" append ( c-addr u )      tempdir s+ s"  -O -c " append lib-filename 2@ append s" .c -o " append
     2dup system drop free throw      lib-filename 2@ append s" .la" append ( c-addr u )
   \    s" gcc -fPIC -shared -Wl,-soname," lib-filename 2@ s+
   \    s" .so.1 -Wl,-export_dynamic -o " append lib-filename 2@ append
   \    [ s" .so.1 -O -I " s" includedir" getenv append s"  " append ] sliteral
   \    append lib-filename 2@ append s" .c" append ( c-addr u )
       ~~ 2dup type 2dup system drop free throw
     $? abort" compiler generated error" \ !! call dlerror      $? abort" compiler generated error" \ !! call dlerror
     lib-filename 2@ s" .so.1" s+      tempdir s" /.libs/" s+ lib-filename 2@ append s" .so.0" append
       2dup type
     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
     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" ;
   
Line 433  create gen-wrapped-types Line 483  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.16  
changed lines
  Added in v.1.22


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