Diff for /gforth/libcc.fs between versions 1.61 and 1.62

version 1.61, 2009/10/18 17:52:50 version 1.62, 2009/12/27 01:00:52
Line 67 Line 67
 \ The files are built in .../lib/gforth/$VERSION/libcc/ or  \ The files are built in .../lib/gforth/$VERSION/libcc/ or
 \ ~/.gforth/libcc/$HOST/.  \ ~/.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)  \ Todo: conversion between function pointers and xts (both directions)
   
 \ taking an xt and turning it into a function pointer:  \ taking an xt and turning it into a function pointer:
Line 143  struct Line 138  struct
     cell% field cff-deferred \ xt of c-function deferred word      cell% field cff-deferred \ xt of c-function deferred word
     cell% field cff-lha \ address of the lib-handle for the lib that      cell% field cff-lha \ address of the lib-handle for the lib that
                         \ contains the wrapper function of the word                          \ 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-rtype  \ return type
     char% field cff-np     \ number of parameters      char% field cff-np     \ number of parameters
     1 0   field cff-ptypes \ #npar parameter types      1 0   field cff-ptypes \ #npar parameter types
Line 292  drop Line 288  drop
   
 set-current  set-current
   
 : parse-libcc-type ( "libcc-type" -- u )  \ call types
     parse-name libcc-types search-wordlist 0= -13 and throw execute ;  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-libcc-type ( "libcc-type" -- u )  parse-name libcc-type ;
   
 : parse-function-types ( "{libcc-type}" "--" "libcc-type" -- )  : parse-return-type ( "libcc-type" -- u )
     here 2 chars allot here begin          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          parse-libcc-type dup 0>= while
             c,              c,
     repeat      repeat
     drop here swap - over char+ c!      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 )  : type-letter ( n -- c )
     chars s" nadrfv" drop + c@ ;      chars s" nadrfv" drop + c@ ;
Line 373  create gen-par-types Line 391  create gen-par-types
   
 \ the call itself  \ 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 ." ("      c-name type ." ("
     fp-change1 sp-change1 pars over + swap u+do       fp-change1 sp-change1 pars over + swap u+do 
         i c@ gen-par          i c@ gen-par
Line 383  create gen-par-types Line 401  create gen-par-types
     loop      loop
     2drop ." )" ;      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  \ calls for various kinds of return values
   
 : gen-wrapped-void ( pars c-name fp-change1 sp-change1 -- fp-change sp-change )  : gen-wrapped-void ( pars c-name fp-change1 sp-change1 -- fp-change sp-change )
Line 594  DEFER compile-wrapper-function ( -- ) Line 626  DEFER compile-wrapper-function ( -- )
     endif      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 xt-parse "c-name" "type signature" -- )
     \ build time/first time action for c-function      \ 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 @ ,      noname create 2, lib-handle-addr @ ,
     parse-name { d: c-name }      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      ['] gen-wrapper-function c-source-file-execute
   does> ( ... -- ... )    does> ( ... -- ... )
     dup 2@ { xt-defer xt-cfr }      dup 2@ { xt-defer xt-cfr }
Line 617  DEFER compile-wrapper-function ( -- ) Line 649  DEFER compile-wrapper-function ( -- )
   does> ( ... -- ... )    does> ( ... -- ... )
     @ call-c ;      @ 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 Define a Forth word @i{forth-name}.  @i{Forth-name} has the
     \G specified stack effect and calls the C function @code{c-name}.      \G specified stack effect and calls the C function @code{c-name}.
     defer lastxt dup c-function-rt lastxt c-function-ft      ['] parse-function-types (c-function) ;
     lastxt swap defer! ;  
   : 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 ( -- ) \ gforth  : clear-libs ( -- ) \ gforth
 \G Clear the list of libs  \G Clear the list of libs

Removed from v.1.61  
changed lines
  Added in v.1.62


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