--- gforth/libcc.fs	2008/07/13 19:20:54	1.44
+++ gforth/libcc.fs	2009/12/31 15:32:35	1.63
@@ -1,6 +1,6 @@
 \ libcc.fs	foreign function interface implemented using a C compiler
 
-\ Copyright (C) 2006,2007 Free Software Foundation, Inc.
+\ Copyright (C) 2006,2007,2008,2009 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -67,11 +67,6 @@
 \ The files are built in .../lib/gforth/$VERSION/libcc/ or
 \ ~/.gforth/libcc/$HOST/.
 
-\ other things to do:
-
-\ 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:
@@ -135,15 +130,15 @@
 \ : delete-file 2drop 0 ;
 
 require struct.fs
+require mkdir.fs
 
-    \ counted-string
-    
 \ c-function-ft word body:
 struct
     cell% field cff-cfr \ xt of c-function-rt word
     cell% field cff-deferred \ xt of c-function deferred word
     cell% field cff-lha \ address of the lib-handle for the lib that
                         \ contains the wrapper function of the word
+    char% field cff-ctype  \ call type (function=1, value=0)
     char% field cff-rtype  \ return type
     char% field cff-np     \ number of parameters
     1 0   field cff-ptypes \ #npar parameter types
@@ -161,7 +156,8 @@ variable lib-handle-addr \ points to the
 2variable libcc-named-dir-v \ directory for named libcc wrapper libraries
 0 value libcc-path       \ pointer to path of library directories
 
-: delete-file 2drop 0 ;
+defer replace-rpath ( c-addr1 u1 -- c-addr2 u2 )
+' noop is replace-rpath
 
 : .nb ( n -- )
     0 .r ;
@@ -219,24 +215,19 @@ end-struct list%
 	    node list-next @
     repeat ;
 
-\ linked libraries
-
-list%
-    cell% 2* field c-lib-string
-end-struct c-lib%
+2variable c-libs \ library names in a string (without "lib")
 
-variable c-libs \ linked list of library names (without "lib")
-
-: add-lib ( c-addr u -- )
+: add-lib ( c-addr u -- ) \ gforth
 \G Add library lib@i{string} to the list of libraries, where
-\G @i{string} is represented by @i{c-addr u}.
-    c-lib% %size allocate throw dup >r
-    c-lib-string 2!
-    r> c-libs list-insert ;
-
-: append-l ( c-addr1 u1 node -- c-addr2 u2 )
-    \ append " -l<nodelib>" to string1
-    >r s"  -l" append r> c-lib-string 2@ append ;
+    \G @i{string} is represented by @i{c-addr u}.
+    c-libs 2@ d0= IF  0 allocate throw 0 c-libs 2!  THEN
+    c-libs 2@ s"  -l" append 2swap append c-libs 2! ;
+
+: add-libpath ( c-addr u -- ) \ gforth
+\G Add path @i{string} to the list of library search pathes, where
+    \G @i{string} is represented by @i{c-addr u}.
+    c-libs 2@ d0= IF  0 allocate throw 0 c-libs 2!  THEN
+    c-libs 2@ s"  -L" append 2swap append c-libs 2! ;
 
 \ C prefix lines
 
@@ -256,13 +247,21 @@ variable c-prefix-lines-end c-prefix-lin
 : print-c-prefix-lines ( -- )
     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
+: write-c-prefix-line ( c-addr u -- )
+    c-source-file-id @ dup if
+	write-line throw
+    else
+	drop 2drop
+    then ;
+
+: save-c-prefix-line1 ( c-addr u -- )
+    2dup write-c-prefix-line
     align here 0 , c-prefix-lines-end list-append ( c-addr u )
     longstring, ;
 
+defer save-c-prefix-line ( c-addr u -- )
+' save-c-prefix-line1 is save-c-prefix-line
+
 : \c ( "rest-of-line" -- ) \ gforth backslash-c
     \G One line of C declarations for the C interface
     -1 parse save-c-prefix-line ;
@@ -289,16 +288,38 @@ drop
 
 set-current
 
-: parse-libcc-type ( "libcc-type" -- u )
-    parse-name libcc-types search-wordlist 0= -13 and throw execute ;
+\ call types
+0
+const+ c-func
+const+ c-val
+const+ c-var
+drop
+
+: libcc-type ( c-addr u -- u2 )
+	libcc-types search-wordlist 0= -13 and throw execute ;
 
-: parse-function-types ( "{libcc-type}" "--" "libcc-type" -- )
-    here 2 chars allot here begin
+: parse-libcc-type ( "libcc-type" -- u )  parse-name libcc-type ;
+
+: parse-return-type ( "libcc-type" -- u )
+	parse-libcc-type dup 0< -32 and throw ;
+
+: parse-function-types ( "{libcc-type}" "--" "libcc-type" -- addr )
+    c-func c, here
+    dup 2 chars allot here begin
 	parse-libcc-type dup 0>= while
 	    c,
     repeat
     drop here swap - over char+ c!
-    parse-libcc-type dup 0< -32 and throw swap c! ;
+    parse-return-type swap c! ;
+
+: parse-value-type ( "{--}" "libcc-type" -- addr )
+    c-val c, here
+    parse-libcc-type  dup 0< if drop parse-return-type then
+    c,  0 c, ;
+
+: parse-variable-type ( -- addr )
+	c-var c, here
+	s" a" libcc-type c,  0 c, ;
 
 : type-letter ( n -- c )
     chars s" nadrfv" drop + c@ ;
@@ -370,7 +391,7 @@ create gen-par-types
 
 \ the call itself
 
-: gen-wrapped-call { d: pars d: c-name fp-change1 sp-change1 -- }
+: gen-wrapped-func { d: pars d: c-name fp-change1 sp-change1 -- }
     c-name type ." ("
     fp-change1 sp-change1 pars over + swap u+do 
 	i c@ gen-par
@@ -380,6 +401,20 @@ create gen-par-types
     loop
     2drop ." )" ;
 
+: gen-wrapped-const { d: pars d: c-name fp-change1 sp-change1 -- }
+	." (" c-name type ." )" ;
+
+: gen-wrapped-var { d: pars d: c-name fp-change1 sp-change1 -- }
+	." &(" c-name type ." )" ;
+
+create gen-call-types
+' gen-wrapped-func ,
+' gen-wrapped-const ,
+' gen-wrapped-var ,
+
+: gen-wrapped-call ( pars c-name fp-change1 sp-change1 -- )
+	5 pick 3 chars - c@ cells gen-call-types + @ execute ;
+
 \ calls for various kinds of return values
 
 : gen-wrapped-void ( pars c-name fp-change1 sp-change1 -- fp-change sp-change )
@@ -432,7 +467,7 @@ create gen-wrapped-types
     dup { descriptor }
     count { ret } count 2dup { d: pars } chars + count { d: c-name }
     ." void " lib-modulename 2@ type ." _LTX_" descriptor wrapper-function-name 2dup type drop free throw
-    .\" (void)\n"
+    .\" (GFORTH_ARGS)\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"
     ?dup-if
@@ -491,12 +526,12 @@ create gen-wrapped-types
     assert( c-source-file-id @ 0= )
     { d: filename }
     here 0 , lib-handle-addr ! filename lib-filename 2!
-    filename basename lib-modulename 2! ;
+    filename basename lib-modulename 2!
+    ['] write-c-prefix-line is save-c-prefix-line ;
    
 : c-library-name-create ( -- )
     lib-filename 2@ s" .c" s+ 2dup w/o create-file throw
-    dup c-source-file-id !
-    ['] print-c-prefix-lines swap outfile-execute
+    c-source-file-id !
     drop free throw ;
 
 : c-named-library-name ( c-addr u -- )
@@ -506,13 +541,18 @@ create gen-wrapped-types
     open-wrappers dup if
 	lib-handle-addr @ !
     else
+        libcc-named-dir $1ff mkdir-parents drop
 	drop c-library-name-create
+	c-prefix-lines @ ['] print-c-prefix-line \ first line only
+	c-source-file-id @ outfile-execute
     endif ;
 
 : c-tmp-library-name ( c-addr u -- )
     \ set up filenames for a new library; c-addr u is the basename of
     \ the library
-    libcc-tmp-dir prepend-dirname c-library-name-setup c-library-name-create ;
+    libcc-tmp-dir 2dup $1ff mkdir-parents drop
+    prepend-dirname c-library-name-setup c-library-name-create
+    ['] print-c-prefix-lines c-source-file-id @ outfile-execute ;
 
 : lib-handle ( -- addr )
     lib-handle-addr @ @ ;
@@ -554,17 +594,19 @@ DEFER compile-wrapper-function ( -- )
     lib-handle 0= if
 	c-source-file close-file throw
 	0 c-source-file-id !
-	[ libtool-command s"  --silent --mode=compile gcc -I " s+
-	s" includedir" getenv append ] sliteral
+	[ libtool-command s"  --silent --mode=compile " s+
+	  libtool-cc append s"  -I '" append
+	  s" includedir" getenv append  s" '" append ] sliteral
 	s"  -O -c " s+ lib-filename 2@ append s" .c -o " append
 	lib-filename 2@ append s" .lo" append ( c-addr u )
-	\    cr 2dup type
+	\    2dup type cr
 	2dup system drop free throw $? abort" libtool compile failed"
-	[ libtool-command s"  --silent --mode=link gcc -module -rpath " s+ ] sliteral
-	lib-filename 2@ dirname s+ s"  " append
+	[ libtool-command s"  --silent --mode=link " s+
+	  libtool-cc append libtool-flags append s"  -module -rpath " s+ ] sliteral
+	lib-filename 2@ dirname replace-rpath s+ s"  " append
 	lib-filename 2@ append s" .lo -o " append
 	lib-filename 2@ append s" .la" append ( c-addr u )
-	c-libs @ ['] append-l list-map
+	c-libs 2@ append
 	\    2dup type cr
 	2dup system drop free throw $? abort" libtool link failed"
 	open-wrappers dup 0= if
@@ -584,12 +626,12 @@ DEFER compile-wrapper-function ( -- )
     endif
     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 xt-parse "c-name" "type signature" -- )
     \ build time/first time action for c-function
-    init-c-source-file
+    { xt-parse-types } init-c-source-file
     noname create 2, lib-handle-addr @ ,
     parse-name { d: c-name }
-    here parse-function-types c-name string,
+    xt-parse-types execute c-name string,
     ['] gen-wrapper-function c-source-file-execute
   does> ( ... -- ... )
     dup 2@ { xt-defer xt-cfr }
@@ -607,18 +649,32 @@ DEFER compile-wrapper-function ( -- )
   does> ( ... -- ... )
     @ call-c ;
 
-: c-function ( "forth-name" "c-name" "@{type@}" "--" "type" -- ) \ gforth
+: (c-function) ( xt-parse "forth-name" "c-name" "{stack effect}" -- )
+    { xt-parse-types } defer lastxt dup c-function-rt
+    lastxt xt-parse-types c-function-ft
+    lastxt swap defer! ;
+
+: 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! ;
+    ['] parse-function-types (c-function) ;
+
+: c-value ( "forth-name" "c-name" "[---]" "type" -- ) \ gforth
+    \G Define a Forth word @i{forth-name}.  @i{Forth-name} has the
+    \G specified stack effect and gives the C value of @code{c-name}.
+    ['] parse-value-type (c-function) ;
+
+: c-variable ( "forth-name" "c-name" -- ) \ gforth
+    \G Define a Forth word @i{forth-name}.  @i{Forth-name} returns the
+    \G address of @code{c-name}.
+    ['] parse-variable-type (c-function) ;
 
-: clear-libs ( -- )
+: clear-libs ( -- ) \ gforth
 \G Clear the list of libs
     c-source-file-id @ if
 	compile-wrapper-function
     endif
-    0 c-libs ! ;
+    0. c-libs 2! ;
 clear-libs
 
 : c-library-incomplete ( -- )
@@ -636,14 +692,17 @@ clear-libs
 
 : end-c-library ( -- ) \ gforth
 \G Finish and (if necessary) build the latest C library interface.
+    ['] save-c-prefix-line1 is save-c-prefix-line
     ['] compile-wrapper-function1 is compile-wrapper-function
     compile-wrapper-function1 ;
 
 : init-libcc ( -- )
     s" ~/.gforth/libcc-named/" libcc-named-dir-v 2!
+[IFDEF] make-path
     make-path to libcc-path
     libcc-named-dir libcc-path also-path
     [ s" libccdir" getenv ] sliteral libcc-path also-path
+[THEN]
 ;
 
 init-libcc