--- gforth/fflib.fs 2003/08/15 21:45:46 1.1 +++ gforth/fflib.fs 2005/11/27 23:58:02 1.10 @@ -1,6 +1,6 @@ -\ lib.fs shared library support package 11may97py +\ lib.fs shared library support package 16aug03py -\ Copyright (C) 1995,1996,1997,1998,2000 Free Software Foundation, Inc. +\ Copyright (C) 1995,1996,1997,1998,2000,2003 Free Software Foundation, Inc. \ This file is part of Gforth. @@ -19,9 +19,19 @@ \ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. Variable libs 0 libs ! +\ links between libraries Variable thisproc Variable thislib -\G links between libraries + +Variable revdec revdec off +\ turn revdec on to compile bigFORTH libraries +Variable revarg revarg off +\ turn revarg on to compile declarations with reverse arguments +Variable legacy legacy off +\ turn legacy on to compile bigFORTH legacy libraries + +Vocabulary c-decl +Vocabulary cb-decl : @lib ( lib -- ) \G obtains library handle @@ -44,21 +54,24 @@ Variable thislib swap 2 cells + dup @ A, ! 0 , 0 A, ; +Defer legacy-proc ' noop IS legacy-proc + : proc: ( lib "name" -- ) - \G Creates a named proc stub - Create proc, 0 +\G Creates a named proc stub + Create proc, 0 also c-decl + legacy @ IF legacy-proc THEN DOES> ( x1 .. xn -- r ) dup cell+ @ swap 3 cells + >r ; : library ( "name" "file" -- ) - \G loads library "file" and creates a proc defining word "name" - \G library format: - \G linked list of libraries - \G library handle - \G linked list of library's procs - \G OS name of library as counted string +\G loads library "file" and creates a proc defining word "name" +\G library format: +\G linked list of libraries +\G library handle +\G linked list of library's procs +\G OS name of library as counted string Create here libs @ A, dup libs ! - 0 , 0 A, bl sword string, @lib + 0 , 0 A, parse-name string, @lib DOES> ( -- ) dup thislib ! proc: ; : init-shared-libs ( -- ) @@ -72,72 +85,119 @@ DOES> ( -- ) dup thislib ! proc: ; ' init-shared-libs IS 'cold -' av-int AConstant int -' av-float AConstant sf -' av-double AConstant df -' av-longlong AConstant llong -' av-ptr AConstant ptr +: argtype ( revxt pushxt fwxt "name" -- ) + Create , , , ; -Variable revdec revdec off -\ turn revdec on to compile bigFORTH libraries +: arg@ ( arg -- argxt pushxt ) + revarg @ IF 2 cells + @ ['] noop swap ELSE 2@ THEN ; -: rettype ( endxt startxt "name" -- ) - create immediate 2, - DOES> +: arg, ( xt -- ) + dup ['] noop = IF drop EXIT THEN compile, ; + +: decl, ( 0 arg1 .. argn call start -- ) 2@ compile, >r - revdec @ IF - 0 >r BEGIN dup WHILE >r REPEAT drop - BEGIN r> dup WHILE compile, REPEAT drop - ELSE - BEGIN dup WHILE compile, REPEAT drop + revdec @ IF 0 >r + BEGIN dup WHILE >r REPEAT + BEGIN r> dup WHILE arg@ arg, REPEAT drop + BEGIN dup WHILE arg, REPEAT drop + ELSE 0 >r + BEGIN dup WHILE arg@ arg, >r REPEAT drop + BEGIN r> dup WHILE arg, REPEAT drop THEN - r> compile, postpone EXIT - here thisproc @ 2 cells + ! bl sword s, + r> compile, postpone EXIT ; + +: symbol, ( "c-symbol" -- ) + here thisproc @ 2 cells + ! parse-name s, thislib @ thisproc @ @proc ; -' av-call-void ' av-start-void rettype (void) -' av-call-int ' av-start-int rettype (int) -' av-call-float ' av-start-float rettype (sf) -' av-call-double ' av-start-double rettype (fp) +: rettype ( endxt startxt "name" -- ) + Create 2, + DOES> decl, symbol, previous revarg off ; + +also c-decl definitions + +: revarg on ; + +' av-int ' av-int-r ' >r argtype int +' av-float ' av-float-r ' f>l argtype sf +' av-double ' av-double-r ' f>l argtype df +' av-longlong ' av-longlong-r ' 2>r argtype llong +' av-ptr ' av-ptr-r ' >r argtype ptr + +' av-call-void ' av-start-void rettype (void) +' av-call-int ' av-start-int rettype (int) +' av-call-float ' av-start-float rettype (sf) +' av-call-double ' av-start-double rettype (fp) ' av-call-longlong ' av-start-longlong rettype (llong) -' av-call-ptr ' av-start-ptr rettype (ptr) +' av-call-ptr ' av-start-ptr rettype (ptr) + +: (addr) postpone EXIT drop symbol, previous revarg off ; -\ compatibility layer for old library -- use is deprecated +previous definitions -Variable legacy +\ legacy support for old library interfaces +\ interface to old vararg stuff not implemented yet -\ turn legacy on for old library +also c-decl -warnings @ warnings off +:noname ( n 0 -- 0 int1 .. intn ) + legacy @ 0< revarg ! + swap 0 ?DO int LOOP (int) +; IS legacy-proc : (int) ( n -- ) - legacy @ IF - >r ' execute r> 0 ?DO int LOOP - THEN (int) ; + >r ' execute r> 0 ?DO int LOOP (int) ; : (void) ( n -- ) - legacy @ IF - >r ' execute r> 0 ?DO int LOOP - THEN (void) ; + >r ' execute r> 0 ?DO int LOOP (void) ; : (float) ( n -- ) - legacy @ IF - >r ' execute r> 0 ?DO df LOOP - THEN (df) ; + >r ' execute r> 0 ?DO df LOOP (fp) ; -warnings on +previous + +\ callback stuff + +Variable callbacks +\G link between callbacks + +: callback ( -- ) + Create 0 ] postpone >r also cb-decl + DOES> + Create here >r 0 , callbacks @ A, r@ callbacks ! + swap postpone Literal postpone call , postpone EXIT + r> dup cell+ cell+ alloc-callback swap ! + DOES> @ ; + +: callback; ( 0 xt1 .. xtn -- ) + BEGIN over WHILE compile, REPEAT + postpone r> postpone execute compile, drop + postpone EXIT postpone [ previous ; immediate + +: va-ret ( xt xt -- ) + Create A, A, immediate + DOES> 2@ compile, ; + +: init-callbacks ( -- ) + defers 'cold callbacks 1 cells - + BEGIN cell+ @ dup WHILE dup cell+ cell+ alloc-callback over ! + REPEAT drop ; -[ifdef] testing +' init-callbacks IS 'cold -library libc /lib/libc.so.6 - -libc sleep int (int) sleep -libc open int int ptr (int) open -libc lseek int llong int (llong) lseek -libc read int ptr int (int) read -libc close int (int) close +also cb-decl definitions -library libm /lib/libm.so.6 +\ arguments -libm fmodf sf sf (sf) fmodf -libm fmod df df (fp) fmod +' va-arg-int Alias int +' va-arg-float Alias sf +' va-arg-double Alias df +' va-arg-longlong Alias llong +' va-arg-ptr Alias ptr + +' va-return-void ' va-start-void va-ret (void) +' va-return-int ' va-start-int va-ret (int) +' va-return-float ' va-start-float va-ret (sf) +' va-return-double ' va-start-double va-ret (fp) +' va-return-longlong ' va-start-longlong va-ret (llong) +' va-return-ptr ' va-start-ptr va-ret (ptr) -[then] +previous definitions