--- gforth/libcc.fs	2007/05/31 18:10:39	1.16
+++ gforth/libcc.fs	2007/06/09 15:55:44	1.20
@@ -73,6 +73,48 @@
 \ c-variable 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
 
@@ -140,8 +182,6 @@ variable lib-handle-addr \ points to the
 
 \ linked list stuff (should go elsewhere)
 
-hex
-
 struct
     cell% field list-next
     1 0   field list-payload
@@ -189,10 +229,12 @@ variable c-prefix-lines-end c-prefix-lin
     align here 0 , c-prefix-lines-end list-append ( c-addr u )
     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 ;
 
-\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)
 
@@ -391,9 +433,10 @@ create gen-wrapped-types
 : compile-wrapper-function ( -- )
     c-source-file close-file throw
     0 c-source-file-id !
-    s" gcc -I. -fPIC -shared -Wl,-soname," lib-filename 2@ s+
+    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 " append lib-filename 2@ append s" .c" append ( c-addr u )
+    [ s" .so.1 -O -I " s" includedir" getenv append s"  " append ] sliteral
+    append lib-filename 2@ append s" .c" append ( c-addr u )
     2dup system drop free throw
     $? abort" compiler generated error" \ !! call dlerror
     lib-filename 2@ s" .so.1" s+
@@ -433,16 +476,8 @@ create gen-wrapped-types
   does> ( ... -- ... )
     @ 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
     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 )
-    @ ;