Diff for /gforth/libcc.fs between versions 1.73 and 1.76

version 1.73, 2012/07/23 13:27:47 version 1.76, 2012/08/16 20:16:31
Line 217  end-struct list% Line 217  end-struct list%
   
 2variable c-libs \ library names in a string (without "lib")  2variable c-libs \ library names in a string (without "lib")
   
   : lib-prefix ( -- addr u )  s" libgf" ;
   
 : add-lib ( c-addr u -- ) \ gforth  : add-lib ( c-addr u -- ) \ gforth
 \G Add library lib@i{string} to the list of libraries, where  \G Add library lib@i{string} to the list of libraries, where
     \G @i{string} is represented by @i{c-addr u}.      \G @i{string} is represented by @i{c-addr u}.
Line 318  drop Line 320  drop
     c,  0 c, ;      c,  0 c, ;
   
 : parse-variable-type ( -- addr )  : parse-variable-type ( -- addr )
         c-var c, here      c-var c, here
         s" a" libcc-type c,  0 c, ;      s" a" libcc-type c,  0 c, ;
   
   0 Value is-funptr?
   : parse-funptr-types ( "{libcc-type}" "--" "libcc-type" -- addr )
       true to is-funptr?  parse-function-types ;
   
 : type-letter ( n -- c )  : type-letter ( n -- c )
     chars s" nadrfv" drop + c@ ;      chars s" nadrfv" drop + c@ ;
Line 447  create gen-wrapped-types Line 453  create gen-wrapped-types
 : gen-wrapped-stmt ( pars c-name fp-change1 sp-change1 ret -- fp-change sp-change )  : gen-wrapped-stmt ( pars c-name fp-change1 sp-change1 ret -- fp-change sp-change )
     cells gen-wrapped-types + @ execute ;      cells gen-wrapped-types + @ execute ;
   
   : sanitize ( addr u -- )
       bounds ?DO
           I c@
           dup 'a' 'z' 1+ within
           over 'A' 'Z' 1+ within or
           over '0' '9' 1+ within or
           swap '_' = or 0= IF  '_' I c!  THEN
       LOOP ;
   
 : wrapper-function-name ( addr -- c-addr u )  : wrapper-function-name ( addr -- c-addr u )
     \ addr points to the return type index of a c-function descriptor      \ addr points to the return type index of a c-function descriptor
     count { r-type } count { d: pars }      count { r-type } count { d: pars }
Line 460  create gen-wrapped-types Line 475  create gen-wrapped-types
         i c@ type-letter front-char          i c@ type-letter front-char
     loop      loop
     '_ front-char r-type type-letter front-char assert( dup 0= )      '_ front-char r-type type-letter front-char assert( dup 0= )
     2drop c-addr u ;      2drop c-addr u 2dup sanitize ;
   
 : gen-wrapper-function ( addr -- )  : gen-wrapper-function ( addr -- )
     \ 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 "      ." void "
     [ lib-suffix s" .la" str= [IF] ] ." lib" lib-modulename 2@ type ." _LTX_" [ [THEN] ]      [ lib-suffix s" .la" str= [IF] ] lib-prefix type lib-modulename 2@ type ." _LTX_" [ [THEN] ]
     descriptor wrapper-function-name 2dup type drop free throw      descriptor wrapper-function-name 2dup type drop free throw
     .\" (GFORTH_ARGS)\n"      .\" (GFORTH_ARGS)\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  "
       is-funptr? IF  .\" Cell ptr = *gforth_SP++;\n  "  0 to is-funptr?  THEN
     pars c-name 2over count-stacks ret gen-wrapped-stmt .\" ;\n"      pars c-name 2over count-stacks ret gen-wrapped-stmt .\" ;\n"
     ?dup-if      ?dup-if
         ."   gforth_SP = sp+" .nb .\" ;\n"          ."   gforth_SP = sp+" .nb .\" ;\n"
Line 512  create gen-wrapped-types Line 528  create gen-wrapped-types
     2over s+ 2swap drop free throw ;      2over s+ 2swap drop free throw ;
   
 : open-wrappers ( -- addr|0 )  : open-wrappers ( -- addr|0 )
     lib-filename 2@ dirname s" lib" s+      lib-filename 2@ dirname lib-prefix s+
     lib-filename 2@ basename append lib-suffix append      lib-filename 2@ basename append lib-suffix append
     2dup libcc-named-dir string-prefix? if ( c-addr u )      2dup libcc-named-dir string-prefix? if ( c-addr u )
         \ see if we can open it in the path          \ see if we can open it in the path
Line 608  DEFER compile-wrapper-function ( -- ) Line 624  DEFER compile-wrapper-function ( -- )
           libtool-cc append libtool-flags append s"  -module -rpath " s+ ] sliteral            libtool-cc append libtool-flags append s"  -module -rpath " s+ ] sliteral
         lib-filename 2@ dirname replace-rpath s+ s"  " append          lib-filename 2@ dirname replace-rpath s+ s"  " append
         lib-filename 2@ append s" .lo -o " append          lib-filename 2@ append s" .lo -o " append
         lib-filename 2@ dirname append s" lib" append          lib-filename 2@ dirname append lib-prefix append
         lib-filename 2@ basename append s" .la" append ( c-addr u )          lib-filename 2@ basename append s" .la" append ( c-addr u )
         c-libs 2@ append          c-libs 2@ append
         \    2dup type cr          \    2dup type cr
Line 673  DEFER compile-wrapper-function ( -- ) Line 689  DEFER compile-wrapper-function ( -- )
     \G address of @code{c-name}.      \G address of @code{c-name}.
     ['] parse-variable-type (c-function) ;      ['] parse-variable-type (c-function) ;
   
   : c-funptr ( "forth-name" "c-typecast" "@{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 pointer
       \G ptr using the typecast or struct access @code{c-typecast}.
       ['] parse-funptr-types (c-function) ;
   
 : clear-libs ( -- ) \ gforth  : clear-libs ( -- ) \ gforth
 \G Clear the list of libs  \G Clear the list of libs
     c-source-file-id @ if      c-source-file-id @ if

Removed from v.1.73  
changed lines
  Added in v.1.76


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