--- gforth/cross.fs 2001/09/05 09:42:38 1.105 +++ gforth/cross.fs 2002/03/21 16:35:18 1.123 @@ -23,11 +23,11 @@ [IF] ToDo: -Crossdoc destination ./doc/crossdoc.fd makes no sense when -cross.fs is uses seperately. jaw -Do we need this char translation with >address and in branchoffset? -(>body also affected) jaw -Clean up mark> and >resolve stuff jaw +- Crossdoc destination ./doc/crossdoc.fd makes no sense when + cross.fs is used seperately. jaw +- Do we need this char translation with >address and in branchoffset? + (>body also affected) jaw +- MAXU etc. can be done with dlit, [THEN] @@ -71,6 +71,10 @@ H >CROSS +\ Test against this definitions to find out whether we are cross-compiling +\ may be usefull for assemblers +0 Constant gforth-cross-indicator + \ find out whether we are compiling with gforth : defined? bl word find nip ; @@ -202,6 +206,13 @@ Create bases 10 , 2 , A , 100 , [THEN] +\ this provides assert( and struct stuff +\GFORTH [IFUNDEF] assert1( +\GFORTH also forth definitions require assert.fs previous +\GFORTH [THEN] + +>CROSS + hex \ the defualt base for the cross-compiler is hex !! \ Warnings off @@ -242,21 +253,26 @@ hex \ the defualt base for the cross hex +\ FIXME delete` \ 1 Constant Cross-Flag \ to check whether assembler compiler plug-ins are \ for cross-compiling \ No! we use "[IFUNDEF]" there to find out whether we are target compiling!!! +\ FIXME move down : comment? ( c-addr u -- c-addr u ) 2dup s" (" compare 0= IF postpone ( ELSE 2dup s" \" compare 0= IF postpone \ THEN THEN ; -: X bl word count [ ' target >wordlist ] Literal search-wordlist - IF state @ IF compile, - ELSE execute THEN - ELSE -1 ABORT" Cross: access method not supported!" - THEN ; immediate +: X ( -- ) +\G The next word in the input is a target word. +\G Equivalent to T but without permanent +\G switch to target dictionary. Used as prefix e.g. for @, !, here etc. + bl word count [ ' target >wordlist ] Literal search-wordlist + IF state @ IF compile, ELSE execute THEN + ELSE -1 ABORT" Cross: access method not supported!" + THEN ; immediate \ Begin CROSS COMPILER: @@ -303,6 +319,18 @@ set-order previous \ POSTPONE false THEN ; immediate +: symentry ( adr len taddr -- ) +\G Produce a symbol table (an optional symbol address +\G map) if wanted + [ [IFDEF] fd-symbol-table ] + base @ swap hex s>d <# 8 0 DO # LOOP #> fd-symbol-table write-file throw base ! + s" :" fd-symbol-table write-file throw + fd-symbol-table write-line throw + [ [ELSE] ] + 2drop drop + [ [THEN] ] ; + + \ \ -------------------- source file decimal @@ -690,6 +718,7 @@ Variable ppi-temp 0 ppi-temp ! POSTPONE ; ppi-temp @ ! 0 ppi-temp ! ; immediate +Plugin dlit, ( d -- ) \ compile numerical value the target Plugin lit, ( n -- ) Plugin alit, ( n -- ) @@ -737,9 +766,14 @@ Plugin next, ( for-token ) Plugin leave, ( -- ) Plugin ?leave, ( -- ) -[IFUNDEF] ca>native -Plugin ca>native -[THEN] +Plugin ca>native \ Convert a code address to the processors + \ native address. This is used in doprim, and + \ code/code: primitive definitions word to + \ convert the addresses. + \ The only target where we need this is the misc + \ which is a 16 Bit processor with word addresses + \ but the forth system we build has a normal byte + \ addressed memory model Plugin doprim, \ compiles start of a primitive Plugin docol, \ compiles start of a colon definition @@ -801,13 +835,25 @@ Struct \ points to the where we have to resolve (linked-list) cell% field >link - \ execution symantics (while target compiling) of ghost + \ execution semantics (while target compiling) of ghost cell% field >exec + \ compilation action of this ghost; this is what is + \ done to compile a call (or whatever) to this definition. + \ E.g. >comp contains the semantic of postpone s" + \ whereas >exec-compile contains the semantic of s" cell% field >comp + \ Compilation sematics (while parsing) of this ghost. E.g. + \ "\" will skip the rest of line. + \ These semantics are defined by Cond: and + \ if a word is made immediate in instant, then the >exec2 field + \ gets copied to here cell% field >exec-compile + \ Additional execution semantics of this ghost. This is used + \ for code generated by instant and for the doer-xt of created + \ words cell% field >exec2 cell% field >created @@ -865,6 +911,7 @@ Variable cross-space-dp-orig cross-space-end u> ABORT" CROSS: cross-space overflow" cross-space-dp-orig @ dp ! ; +\ this is just for debugging, to see this in the backtrace : execute-exec execute ; : execute-exec2 execute ; : execute-exec-compile execute ; @@ -879,8 +926,8 @@ Variable cross-space-dp-orig Defer is-forward : (ghostheader) ( -- ) - ghost-list linked , 0 , ['] NoExec , ['] is-forward , - 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , ; + ghost-list linked , 0 , ['] NoExec , ['] is-forward , + 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , ; : ghostheader ( -- ) (ghostheader) 0 , ; @@ -972,7 +1019,6 @@ Exists-Warnings on Variable reuse-ghosts reuse-ghosts off -1 [IF] \ FIXME: define when vocs are ready : HeaderGhost ( "name" -- ghost ) >in @ bl word count @@ -989,17 +1035,18 @@ Variable reuse-ghosts reuse-ghosts off \ defined words, this is a workaround \ for the redefined \ until vocs work Make-Ghost ; -[THEN] - : .ghost ( ghost -- ) >ghostname type ; \ ' >ghostname ALIAS @name +: findghost ( "ghostname" -- ghost ) + bl word gfind 0= ABORT" CROSS: Ghost don't exists" ; + : [G'] ( -- ghost : name ) \G ticks a ghost and returns its address -\ bl word gfind 0= ABORT" CROSS: Ghost don't exists" - ghost state @ IF postpone literal THEN ; immediate + findghost + state @ IF postpone literal THEN ; immediate : g>xt ( ghost -- xt ) \G Returns the xt (cfa) of a ghost. Issues a warning if undefined. @@ -1030,32 +1077,38 @@ End-Struct addr-struct dup @ ?dup IF nip EXIT THEN addr-struct %allocerase tuck swap ! ; +>cross + \ Predefined ghosts 12dec92py +Ghost - drop \ need a ghost otherwise "-" would be treated as a number + Ghost 0= drop Ghost branch Ghost ?branch 2drop -Ghost (do) Ghost (?do) 2drop -Ghost (for) drop -Ghost (loop) Ghost (+loop) 2drop -Ghost (next) drop Ghost unloop Ghost ;S 2drop -Ghost lit Ghost (compile) Ghost ! 2drop drop -Ghost (does>) Ghost noop 2drop -Ghost (.") Ghost (S") Ghost (ABORT") 2drop drop -Ghost ' drop -Ghost :docol Ghost :doesjump Ghost :dodoes 2drop drop -Ghost :dovar drop +Ghost lit Ghost ! 2drop +Ghost noop drop Ghost over Ghost = Ghost drop 2drop drop -Ghost - drop Ghost 2drop drop Ghost 2dup drop +Ghost call drop +Ghost @ drop +Ghost useraddr drop +Ghost execute drop +Ghost + drop +Ghost decimal drop +Ghost hex drop +Ghost lit@ drop +Ghost lit-perform drop +Ghost lit+ drop +Ghost does-exec drop - +Ghost :docol Ghost :doesjump Ghost :dodoes 2drop drop +Ghost :dovar drop \ \ Parameter for target systems 06oct92py ->cross \ we define it ans like... wordlist Constant target-environment @@ -1131,8 +1184,11 @@ true DefaultValue standardthreading s" relocate" T environment? H \ JAW why set NIL to this?! [IF] drop \ SetValue NIL -[ELSE] >ENVIRON T NIL H SetValue relocate +[ELSE] >ENVIRON X NIL SetValue relocate [THEN] +>TARGET + +0 Constant NIL >CROSS @@ -1213,8 +1269,12 @@ Variable mirrored-link \ linked : >rlen cell+ ; : >rstart ; +: (region) ( addr len region -- ) +\G change startaddress and length of an existing region + >r r@ last-defined-region ! + r@ >rlen ! dup r@ >rstart ! r> >rdp ! ; -: region ( addr len -- ) +: region ( addr len -- "name" ) \G create a new region \ check whether predefined region exists save-input bl word find >r >r restore-input throw r> r> 0= @@ -1226,8 +1286,7 @@ Variable mirrored-link \ linked region-link linked 0 , 0 , 0 , bl word count string, ELSE \ store new parameters in region bl word drop - >body >r r@ last-defined-region ! - r@ >rlen ! dup r@ >rstart ! r> >rdp ! + >body (region) THEN ; : borders ( region -- startaddr endaddr ) @@ -1345,8 +1404,11 @@ T has? rom H \ MakeKernel 22feb99jaw -: makekernel ( targetsize -- targetsize ) - dup dictionary >rlen ! setup-target ; +: makekernel ( targetsize -- ) +\G convenience word to setup the memory of the target +\G used by main.fs of the c-engine based systems + 100 swap dictionary (region) + setup-target ; >MINIMAL : makekernel makekernel ; @@ -1371,9 +1433,9 @@ variable sromdp \ start of rom-area for [THEN] - -0 value tdp -variable fixed \ flag: true: no automatic switching +0 Value current-region +0 Value tdp +Variable fixed \ flag: true: no automatic switching \ false: switching is done automatically \ Switch-Policy: @@ -1388,7 +1450,7 @@ variable constflag constflag off : activate ( region -- ) \G next code goes to this region - >rdp to tdp ; + dup to current-region >rdp to tdp ; : (switchram) fixed @ ?EXIT s" rom" T $has? H 0= ?EXIT @@ -1443,25 +1505,28 @@ variable constflag constflag off bigendian [IF] - : S! ( n addr -- ) >r s>d r> tcell bounds swap 1- + : DS! ( d addr -- ) tcell bounds swap 1- DO maxbyte ud/mod rot I c! -1 +LOOP 2drop ; - : S@ ( addr -- n ) >r 0 0 r> tcell bounds - DO maxbyte * swap maxbyte um* rot + swap I c@ + swap LOOP d>s ; + : DS@ ( addr -- d ) >r 0 0 r> tcell bounds + DO maxbyte * swap maxbyte um* rot + swap I c@ + swap LOOP ; : Sc! ( n addr -- ) >r s>d r> tchar bounds swap 1- DO maxbyte ud/mod rot I c! -1 +LOOP 2drop ; : Sc@ ( addr -- n ) >r 0 0 r> tchar bounds DO maxbyte * swap maxbyte um* rot + swap I c@ + swap LOOP d>s ; [ELSE] - : S! ( n addr -- ) >r s>d r> tcell bounds + : DS! ( d addr -- ) tcell bounds DO maxbyte ud/mod rot I c! LOOP 2drop ; - : S@ ( addr -- n ) >r 0 0 r> tcell bounds swap 1- - DO maxbyte * swap maxbyte um* rot + swap I c@ + swap -1 +LOOP d>s ; + : DS@ ( addr -- n ) >r 0 0 r> tcell bounds swap 1- + DO maxbyte * swap maxbyte um* rot + swap I c@ + swap -1 +LOOP ; : Sc! ( n addr -- ) >r s>d r> tchar bounds DO maxbyte ud/mod rot I c! LOOP 2drop ; : Sc@ ( addr -- n ) >r 0 0 r> tchar bounds swap 1- DO maxbyte * swap maxbyte um* rot + swap I c@ + swap -1 +LOOP d>s ; [THEN] +: S! ( n addr -- ) >r s>d r> DS! ; +: S@ ( addr -- n ) DS@ d>s ; + : taddr>region ( taddr -- region | 0 ) \G finds for a target-address the correct region \G returns 0 if taddr is not in range of a target memory region @@ -1479,6 +1544,8 @@ bigendian 2drop 0 ; : taddr>region-abort ( taddr -- region | 0 ) +\G Same as taddr>region but aborts if taddr is not +\G a valid address in the target address space dup taddr>region dup 0= IF drop cr ." Wrong address: " .addr -1 ABORT" Address out of range!" @@ -1595,33 +1662,31 @@ T has? relocate H : A! swap >address swap dup relon T ! H ; : A, ( w -- ) >address T here H relon T , H ; +\ high-level ghosts >CROSS -: tcmove ( source dest len -- ) -\G cmove in target memory - tchar * bounds - ?DO dup T c@ H I T c! H 1+ - tchar +LOOP drop ; - - -\ \ Load Assembler - ->TARGET -H also Forth definitions +Ghost (do) Ghost (?do) 2drop +Ghost (for) drop +Ghost (loop) Ghost (+loop) 2drop +Ghost (next) drop +Ghost (does>) Ghost (compile) 2drop +Ghost (.") Ghost (S") Ghost (ABORT") 2drop drop +Ghost (C") drop +Ghost ' drop -\ FIXME: should we include the assembler really in the forth -\ dictionary?!?!?!? This conflicts with the existing assembler -\ of the host forth system!! -[IFDEF] asm-include asm-include [THEN] hex +\ user ghosts -previous +Ghost state drop \ \ -------------------- Host/Target copy etc. 29aug01jaw >CROSS +: TD! >image DS! ; +: TD@ >image DS@ ; + : th-count ( taddr -- host-addr len ) \G returns host address of target string assert1( tbyte 1 = ) @@ -1641,16 +1706,39 @@ previous >TARGET : count dup X c@ swap X char+ swap ; -\ FIXME -1 on 64 bit machines?!?! -: on T -1 swap ! H ; + +: on -1 -1 rot TD! ; : off T 0 swap ! H ; +: tcmove ( source dest len -- ) +\G cmove in target memory + tchar * bounds + ?DO dup T c@ H I T c! H 1+ + tchar +LOOP drop ; + +: td, ( d -- ) +\G Store a host value as one cell into the target + there tcell X allot TD! ; + +\ \ Load Assembler + +>TARGET +H also Forth definitions + +\ FIXME: should we include the assembler really in the forth +\ dictionary?!?!?!? This conflicts with the existing assembler +\ of the host forth system!! +[IFDEF] asm-include asm-include [THEN] hex + +previous + + >CROSS : (cc) T a, H ; ' (cc) plugin-of colon, : (prim) T a, H ; ' (prim) plugin-of prim, -: (cr) >tempdp ]comp prim, comp[ tempdp> ; ' (cr) plugin-of colon-resolve +: (cr) >tempdp colon, tempdp> ; ' (cr) plugin-of colon-resolve : (ar) T ! H ; ' (ar) plugin-of addr-resolve : (dr) ( ghost res-pnt target-addr addr ) >tempdp drop over @@ -1661,13 +1749,11 @@ previous tempdp> ; ' (dr) plugin-of doer-resolve : (cm) ( -- addr ) - T here align H - -1 colon, ; ' (cm) plugin-of colonmark, + there -1 colon, ; ' (cm) plugin-of colonmark, >TARGET : compile, ( xt -- ) - dup xt>ghost >ghost-flags get-flag - IF prim, ELSE colon, THEN ; + dup xt>ghost >comp @ EXECUTE ; >CROSS \ resolve structure @@ -1689,7 +1775,7 @@ previous loadfile , sourceline# , space> - ; +; : refered ( ghost tag -- ) \G creates a resolve structure @@ -1748,67 +1834,91 @@ Defer resolve-warning >link ! ; : colon-resolved ( ghost -- ) - >link @ colon, ; \ compile-call +\ compiles a call to a colon definition, +\ compile action for >comp field + >link @ colon, ; : prim-resolved ( ghost -- ) +\ compiles a call to a primitive >link @ prim, ; -\ FIXME: not activated -: does-resolved ( ghost -- ) - dup g>body alit, >do:ghost @ g>body colon, ; - : (is-forward) ( ghost -- ) - colonmark, 0 (refered) ; \ compile space for call + colonmark, 0 (refered) ; \ compile space for call ' (is-forward) IS is-forward -: resolve ( ghost tcfa -- ) -\G resolve referencies to ghost with tcfa +0 Value resolved + +: resolve-forward-references ( ghost resolve-list -- ) + \ loop through forward referencies + comp-state @ >r Resolving comp-state ! + over >link @ resolve-loop + r> comp-state ! + + ['] noop IS resolve-warning ; + + +: (resolve) ( ghost tcfa -- ghost resolve-list ) + \ check for a valid address, it is a primitive reference + \ otherwise dup taddr>region 0<> IF + \ define this address in the region address type table 2dup (>regiontype) define-addr-struct addr-xt-ghost - \ we define new address only if empty \ this is for not to take over the alias ghost \ (different ghost, but identical xt) \ but the very first that really defines it dup @ 0= IF ! ELSE 2drop THEN THEN + swap >r + r@ to resolved + +\ r@ >comp @ ['] is-forward = +\ ABORT" >comp action not set on a resolved ghost" + \ copmile action defaults to colon-resolved + \ if this is not right something must be set before + \ calling resolve + r@ >comp @ ['] is-forward = IF + ['] colon-resolved r@ >comp ! + THEN + r@ >link @ swap \ ( list tcfa R: ghost ) + \ mark ghost as resolved + r@ >link ! r@ >magic ! + r> swap ; + +: resolve ( ghost tcfa -- ) +\G resolve referencies to ghost with tcfa \ is ghost resolved?, second resolve means another \ definition with the same name over undefined? 0= IF exists EXIT THEN - \ get linked-list - swap >r r@ >link @ swap \ ( list tcfa R: ghost ) - \ mark ghost as resolved - dup r@ >link ! r@ >magic ! - r@ >comp @ ['] is-forward = IF - ['] prim-resolved r@ >comp ! THEN - \ loop through forward referencies - r> -rot - comp-state @ >r Resolving comp-state ! - resolve-loop - r> comp-state ! - - ['] noop IS resolve-warning - ; + (resolve) + ( ghost resolve-list ) + resolve-forward-references ; + +: resolve-noforwards ( ghost tcfa -- ) +\G Same as resolve but complain if there are any +\G forward references on this ghost + \ is ghost resolved?, second resolve means another + \ definition with the same name + over undefined? 0= IF exists EXIT THEN + (resolve) + IF cr ." No forward references allowed on: " .ghost cr + -1 ABORT" Illegal forward reference" + THEN + drop ; \ gexecute ghost, 01nov92py -\ FIXME cleanup -\ : is-resolved ( ghost -- ) -\ >link @ colon, ; \ compile-call - : (gexecute) ( ghost -- ) dup >comp @ EXECUTE ; : gexecute ( ghost -- ) - dup >magic @ = IF -1 ABORT" CROSS: gexecute on immediate word" THEN + dup >magic @ = ABORT" CROSS: gexecute on immediate word" (gexecute) ; : addr, ( ghost -- ) dup forward? IF 1 refered 0 T a, H ELSE >link @ T a, H THEN ; -\ !! : ghost, ghost gexecute ; - \ .unresolved 11may93jaw variable ResolveFlag @@ -1925,11 +2035,13 @@ Variable to-doc to-doc on \ Target TAGS creation s" kernel.TAGS" r/w create-file throw value tag-file-id +s" kernel.tags" r/w create-file throw value vi-tag-file-id \ contains the file-id of the tags file Create tag-beg 2 c, 7F c, bl c, Create tag-end 2 c, bl c, 01 c, Create tag-bof 1 c, 0C c, +Create tag-tab 1 c, 09 c, 2variable last-loadfilename 0 0 last-loadfilename 2! @@ -1943,13 +2055,13 @@ Create tag-bof 1 c, 0C c, s" ,0" tag-file-id write-line throw THEN ; -: cross-tag-entry ( -- ) +: cross-gnu-tag-entry ( -- ) tlast @ 0<> \ not an anonymous (i.e. noname) header IF put-load-file-name source >in @ min tag-file-id write-file throw tag-beg count tag-file-id write-file throw - tlast @ >image count 1F and tag-file-id write-file throw + Last-Header-Ghost @ >ghostname tag-file-id write-file throw tag-end count tag-file-id write-file throw base @ decimal sourceline# 0 <# #s #> tag-file-id write-file throw \ >in @ 0 <# #s [char] , hold #> tag-file-id write-line throw @@ -1957,6 +2069,22 @@ Create tag-bof 1 c, 0C c, base ! THEN ; +: cross-vi-tag-entry ( -- ) + tlast @ 0<> \ not an anonymous (i.e. noname) header + IF + sourcefilename vi-tag-file-id write-file throw + tag-tab count vi-tag-file-id write-file throw + Last-Header-Ghost @ >ghostname vi-tag-file-id write-file throw + tag-tab count vi-tag-file-id write-file throw + s" /^" vi-tag-file-id write-file throw + source vi-tag-file-id write-file throw + s" $/" vi-tag-file-id write-line throw + THEN ; + +: cross-tag-entry ( -- ) + cross-gnu-tag-entry + cross-vi-tag-entry ; + \ Check for words Defer skip? ' false IS skip? @@ -2038,11 +2166,7 @@ Defer setup-execution-semantics \ >in @ cr ." sym:s/CFA=" there 4 0.r ." /" bl word count .sym ." /g" cr >in ! HeaderGhost \ output symbol table to extra file - [ [IFDEF] fd-symbol-table ] - base @ hex there s>d <# 8 0 DO # LOOP #> fd-symbol-table write-file throw base ! - s" :" fd-symbol-table write-file throw - dup >ghostname fd-symbol-table write-line throw - [ [THEN] ] + dup >ghostname there symentry dup Last-Header-Ghost ! dup to lastghost dup >magic ^imm ! \ a pointer for immediate alias-mask flag! @@ -2065,6 +2189,7 @@ Variable aprim-nr -20 aprim-nr ! : copy-execution-semantics ( ghost-from ghost-dest -- ) >r dup >exec @ r@ >exec ! + dup >comp @ r@ >comp ! dup >exec2 @ r@ >exec2 ! dup >exec-compile @ r@ >exec-compile ! dup >ghost-xt @ r@ >ghost-xt ! @@ -2090,35 +2215,37 @@ Variable last-prim-ghost Defer setup-prim-semantics -: aprim ( -- ) +: mapprim ( "forthname" "asmlabel" -- ) THeader -1 aprim-nr +! aprim-nr @ T A, H asmprimname, setup-prim-semantics ; -: aprim: ( -- ) +: mapprim: ( "forthname" "asmlabel" -- ) -1 aprim-nr +! aprim-nr @ - Ghost tuck swap resolve swap tuck >magic ! + Ghost tuck swap resolve-noforwards swap tuck >magic ! asmprimname, ; -: Alias: ( cfa -- ) \ name +: Doer: ( cfa -- ) \ name >in @ skip? IF 2drop EXIT THEN >in ! dup 0< s" prims" T $has? H 0= and IF .sourcepos ." needs doer: " >in @ bl word count type >in ! cr THEN - Ghost tuck swap resolve swap >magic ! ; + Ghost + tuck swap resolve-noforwards swap >magic ! ; Variable prim# : first-primitive ( n -- ) prim# ! ; : Primitive ( -- ) \ name - >in @ skip? IF 2drop EXIT THEN >in ! - dup 0< s" prims" T $has? H 0= and + >in @ skip? IF drop EXIT THEN >in ! + s" prims" T $has? H 0= IF .sourcepos ." needs prim: " >in @ bl word count type >in ! cr THEN prim# @ (THeader ( S xt ghost ) + ['] prim-resolved over >comp ! dup >ghost-flags set-flag - over resolve T A, H alias-mask flag! + over resolve-noforwards T A, H alias-mask flag! -1 prim# +! ; >CROSS @@ -2155,8 +2282,7 @@ Comment ( Comment \ \ compile 10may93jaw : compile ( "name" -- ) \ name -\ bl word gfind 0= ABORT" CROSS: Can't compile " - ghost + findghost dup >exec-compile @ ?dup IF nip compile, ELSE postpone literal postpone gexecute THEN ; immediate restrict @@ -2178,18 +2304,19 @@ Cond: ['] T ' H alit, ;Cond : [T'] \ returns the target-cfa of a ghost, or compiles it as literal - postpone [G'] state @ IF postpone g>xt ELSE g>xt THEN ; immediate + postpone [G'] + state @ IF postpone g>xt ELSE g>xt THEN ; immediate \ \ threading modell 13dec92py \ modularized 14jun97jaw -T 2 cells H .s Value xt>body +T 2 cells H Value xt>body : (>body) ( cfa -- pfa ) xt>body + ; ' (>body) plugin-of t>body : fillcfa ( usedcells -- ) - T cells H xt>body swap - dup . + T cells H xt>body swap - assert1( dup 0 >= ) 0 ?DO 0 X c, tchar +LOOP ; @@ -2198,21 +2325,25 @@ T 2 cells H .s Value xt>body : (docol,) ( -- ) [G'] :docol (doer,) ; ' (docol,) plugin-of docol, + ' NOOP plugin-of ca>native + : (doprim,) ( -- ) there xt>body + ca>native T a, H 1 fillcfa ; ' (doprim,) plugin-of doprim, : (doeshandler,) ( -- ) - T cfalign H compile :doesjump T 0 , H ; ' (doeshandler,) plugin-of doeshandler, + T cfalign H [G'] :doesjump addr, T 0 , H ; ' (doeshandler,) plugin-of doeshandler, : (dodoes,) ( does-action-ghost -- ) - ]comp [G'] :dodoes gexecute comp[ + ]comp [G'] :dodoes addr, comp[ addr, \ the relocator in the c engine, does not like the \ does-address to marked for relocation [ T e? ec H 0= [IF] ] T here H tcell - reloff [ [THEN] ] 2 fillcfa ; ' (dodoes,) plugin-of dodoes, -: (lit,) ( n -- ) compile lit T , H ; ' (lit,) plugin-of lit, +: (dlit,) ( n -- ) compile lit td, ; ' (dlit,) plugin-of dlit, + +: (lit,) ( n -- ) s>d dlit, ; ' (lit,) plugin-of lit, \ if we dont produce relocatable code alit, defaults to lit, jaw \ this is just for convenience, so we don't have to define alit, @@ -2234,15 +2365,24 @@ Defer (end-code) >TARGET : Code defempty? - (THeader there resolve + (THeader ( ghost ) + ['] prim-resolved over >comp ! + there resolve-noforwards + [ T e? prims H 0= [IF] T e? ITC H [ELSE] true [THEN] ] [IF] doprim, [THEN] depth (code) ; +\ FIXME : no-compile -1 ABORT" this ghost is not for compilation" ; + : Code: defempty? - Ghost dup there ca>native resolve swap >magic ! + Ghost >r + r@ >ghostname there symentry + r@ there ca>native resolve-noforwards + r@ >magic ! + r> drop depth (code) ; : end-code @@ -2273,6 +2413,9 @@ Cond: chars ;Cond \ !! Known Bug: Special Literals and plug-ins work only correct \ on 16 and 32 Bit Targets and 32 Bit Hosts! +\ This section could be done with dlit, now. But first I need +\ some test code JAW + Cond: MAXU tcell 1 cells u> IF compile lit tcell 0 ?DO FF T c, H LOOP @@ -2298,6 +2441,7 @@ Cond: MAXI ;Cond >CROSS + \ Target compiling loop 12dec92py \ ">tib trick thrown out 10may93jaw \ number? defined at the top 11may93jaw @@ -2318,10 +2462,11 @@ Cond: MAXI IF 0> IF swap lit, THEN lit, discard ELSE 2drop restore-input throw Ghost gexecute THEN ; ->TARGET \ : ; DOES> 13dec92py \ ] 9may93py/jaw +>CROSS + : compiling-state ( -- ) \G set states to compililng Compiling comp-state ! @@ -2336,6 +2481,8 @@ Cond: MAXI IF >ghost-xt @ execute X off ELSE drop THEN Interpreting comp-state ! ; +>TARGET + : ] compiling-state BEGIN @@ -2350,22 +2497,23 @@ Cond: MAXI \ by the way: defining a second interpreter (a compiler-)loop \ is not allowed if a system should be ans conform +: (:) ( ghost -- ) +\ common factor of : and :noname. Prepare ;Resolve and start definition + ;Resolve ! there ;Resolve cell+ ! + docol, ]comp colon-start depth T ] H ; + : : ( -- colon-sys ) \ Name defempty? constflag off \ don't let this flag work over colon defs \ just to go sure nothing unwanted happens >in @ skip? IF drop skip-defs EXIT THEN >in ! - (THeader ;Resolve ! there ;Resolve cell+ ! - docol, ]comp colon-start depth T ] H ; + (THeader (:) ; : :noname ( -- colon-sys ) - X cfalign - \ FIXME: cleanup!!!!!!!! - \ idtentical to : with dummy ghost?! - here ghostheader dup ;Resolve ! dup last-header-ghost ! to lastghost - there ;Resolve cell+ ! - there docol, ]comp - colon-start depth T ] H ; + X cfalign there + \ define a nameless ghost + here ghostheader dup last-header-ghost ! dup to lastghost + (:) ; Cond: EXIT ( -- ) compile ;S ;Cond @@ -2388,8 +2536,8 @@ Cond: ; ( -- ) fini, comp[ ;Resolve @ - IF ;Resolve @ ;Resolve cell+ @ resolve - ['] colon-resolved ;Resolve @ >comp ! + IF ['] colon-resolved ;Resolve @ >comp ! + ;Resolve @ ;Resolve cell+ @ resolve THEN interpreting-state ;Cond @@ -2398,26 +2546,24 @@ Cond: [ ( -- ) interpreting-state ;Cond >CROSS -Create GhostDummy ghostheader - GhostDummy >magic ! +0 Value created : !does ( does-action -- ) -\ !! zusammenziehen und dodoes, machen! tlastcfa @ [G'] :dovar killref -\ tlastcfa @ dup there >r tdp ! compile :dodoes r> tdp ! T cell+ ! H ; -\ !! geht so nicht, da dodoes, ghost will! - GhostDummy >link ! GhostDummy - tlastcfa @ >tempdp dodoes, tempdp> ; - + >space here >r ghostheader space> + ['] colon-resolved r@ >comp ! + r@ created >do:ghost ! r@ swap resolve + r> tlastcfa @ >tempdp dodoes, tempdp> ; Defer instant-interpret-does>-hook +: does-resolved ( ghost -- ) + compile does-exec g>xt T a, H ; + : resolve-does>-part ( -- ) \ resolve words made by builders Last-Header-Ghost @ >do:ghost @ ?dup - IF there resolve - \ TODO: set special DOES> resolver action here - THEN ; + IF there resolve THEN ; >TARGET Cond: DOES> @@ -2425,28 +2571,29 @@ Cond: DOES> resolve-does>-part ;Cond -: DOES> switchrom doeshandler, T here H !does - instant-interpret-does>-hook - depth T ] H ; +: DOES> + ['] does-resolved created >comp ! + switchrom doeshandler, T here H !does + instant-interpret-does>-hook + depth T ] H ; >CROSS -\ Creation 01nov92py +\ Creation 01nov92py \ Builder 11may93jaw +0 Value built + : Builder ( Create-xt do-ghost "name" -- ) \ builds up a builder in current vocabulary \ create-xt is executed when word is interpreted -\ do:-xt is executet when the created word from builder is executed +\ do:-xt is executed when the created word from builder is executed \ for do:-xt an additional entry after the normal ghost-entrys is used - Make-Ghost ( Create-xt do-ghost ghost ) - dup >created on - rot swap ( do-ghost Create-xt ghost ) - tuck >exec ! - tuck >do:ghost ! - ['] prim-resolved over >comp ! - drop ; + ghost to built + built >created @ 0= IF + built >created on + THEN ; : gdoes, ( ghost -- ) \ makes the codefield for a word that is built @@ -2465,25 +2612,29 @@ Cond: DOES> ; : takeover-x-semantics ( S constructor-ghost new-ghost -- ) -\g stores execution semantic and compilation semantic in the built word -\g if the word already has a semantic (concerns S", IS, .", DOES>) -\g then keep it - swap >do:ghost @ - \ we use the >exec2 field for the semantic of a crated word, - \ so predefined semantics e.g. for .... - \ FIXME: find an example in the normal kernel!!! + \g stores execution semantic and compilation semantic in the built word + swap >do:ghost @ 2dup swap >do:ghost ! + \ we use the >exec2 field for the semantic of a created word, + \ using exec or exec2 makes no difference for normal cross-compilation + \ but is usefull for instant where the exec field is already + \ defined (e.g. Vocabularies) 2dup >exec @ swap >exec2 ! >comp @ swap >comp ! ; -\ old version of this: -\ >exec dup @ ['] NoExec = -\ IF swap >do:ghost @ >exec @ swap ! ELSE 2drop THEN ; + +0 Value createhere + +: create-resolve ( -- ) + created createhere resolve 0 ;Resolve ! ; +: create-resolve-immediate ( -- ) + create-resolve T immediate H ; : TCreate ( -- ) create-forward-warn IF ['] reswarn-forward IS resolve-warning THEN executed-ghost @ (Theader - dup >created on - 2dup takeover-x-semantics hereresolve gdoes, ; + dup >created on dup to created + 2dup takeover-x-semantics + there to createhere drop gdoes, ; : RTCreate ( -- ) \ creates a new word with code-field in ram @@ -2491,14 +2642,14 @@ Cond: DOES> IF ['] reswarn-forward IS resolve-warning THEN \ make Alias executed-ghost @ (THeader - dup >created on + dup >created on dup to created 2dup takeover-x-semantics there 0 T a, H alias-mask flag! \ store poiter to code-field switchram T cfalign H there swap T ! H there tlastcfa ! - hereresolve gdoes, ; + there to createhere drop gdoes, ; : Build: ( -- [xt] [colon-sys] ) :noname postpone TCreate ; @@ -2511,88 +2662,94 @@ Cond: DOES> postpone TCreate [ [THEN] ] ; +: ;Build + postpone create-resolve postpone ; built >exec ! ; immediate + +: ;Build-immediate + postpone create-resolve-immediate + postpone ; built >exec ! ; immediate + : gdoes> ( ghost -- addr flag ) - executed-ghost @ -\ FIXME: cleanup -\ compiling? ABORT" CROSS: Executing gdoes> while compiling" -\ ?! compiling? IF gexecute true EXIT THEN - g>body ( false ) ; + executed-ghost @ g>body ; \ DO: ;DO 11may93jaw -\ changed to ?EXIT 10may93jaw -: DO: ( -- ghost [xt] [colon-sys] ) - here ghostheader - :noname postpone gdoes> ( postpone ?EXIT ) ; +: do:ghost! ( ghost -- ) built >do:ghost ! ; +: doexec! ( xt -- ) built >do:ghost @ >exec ! ; -: by: ( -- ghost [xt] [colon-sys] ) \ name - Ghost - :noname postpone gdoes> ( postpone ?EXIT ) ; - -: ;DO ( ghost [xt] [colon-sys] -- addr ) - postpone ; ( S addr xt ) - over >exec ! ; immediate +: DO: ( -- [xt] [colon-sys] ) + here ghostheader do:ghost! + :noname postpone gdoes> ; + +: by: ( -- [xt] [colon-sys] ) \ name + Ghost do:ghost! + :noname postpone gdoes> ; + +: ;DO ( [xt] [colon-sys] -- ) + postpone ; doexec! ; immediate + +: by ( -- ) \ Name + Ghost >do:ghost @ do:ghost! ; + +: compile: ( --[xt] [colon-sys] ) +\G defines a compile time action for created words +\G by this builder + :noname ; -: by ( -- addr ) \ Name - Ghost >do:ghost @ ; +: ;compile ( [xt] [colon-sys] -- ) + postpone ; built >do:ghost @ >comp ! ; immediate ->TARGET \ Variables and Constants 05dec92py -Build: ( n -- ) ; -by: :docon ( target-body-addr -- n ) T @ H ;DO Builder (Constant) +Build: ( n -- ) ;Build +by: :docon ( target-body-addr -- n ) T @ H ;DO -Build: ( n -- ) T , H ; -by (Constant) Builder Constant - -Build: ( n -- ) T A, H ; +Build: ( n -- ) T , H ;Build by (Constant) + Builder AConstant +Build: ( n -- ) T A, H ;Build +by (Constant) -Build: ( d -- ) T , , H ; -DO: ( ghost -- d ) T dup cell+ @ swap @ H ;DO Builder 2Constant +Build: ( d -- ) T , , H ;Build +DO: ( ghost -- d ) T dup cell+ @ swap @ H ;DO -BuildSmart: ; -by: :dovar ( target-body-addr -- addr ) ;DO Builder Create +BuildSmart: ;Build +by: :dovar ( target-body-addr -- addr ) ;DO +Builder Variable T has? rom H [IF] -Build: ( -- ) T here 0 A, H switchram T align here swap ! 0 , H ( switchrom ) ; +Build: ( -- ) T here 0 A, H switchram T align here swap ! 0 , H ( switchrom ) ;Build by (Constant) -Builder Variable [ELSE] -Build: T 0 , H ; +Build: T 0 , H ;Build by Create -Builder Variable [THEN] +Builder 2Variable T has? rom H [IF] -Build: ( -- ) T here 0 A, H switchram T align here swap ! 0 , 0 , H ( switchrom ) ; +Build: ( -- ) T here 0 A, H switchram T align here swap ! 0 , 0 , H ( switchrom ) ;Build by (Constant) -Builder 2Variable [ELSE] -Build: T 0 , 0 , H ; +Build: T 0 , 0 , H ;Build by Create -Builder 2Variable [THEN] +Builder AVariable T has? rom H [IF] -Build: ( -- ) T here 0 A, H switchram T align here swap ! 0 A, H ( switchrom ) ; +Build: ( -- ) T here 0 A, H switchram T align here swap ! 0 A, H ( switchrom ) ;Build by (Constant) -Builder AVariable [ELSE] -Build: T 0 A, H ; +Build: T 0 A, H ;Build by Create -Builder AVariable [THEN] \ User variables 04may94py ->CROSS - Variable tup 0 tup ! Variable tudp 0 tudp ! @@ -2604,74 +2761,134 @@ Variable tudp 0 tudp ! tup @ tudp @ + T A! H tudp @ dup T cell+ H tudp ! ; ->TARGET - -Build: 0 u, X , ; -by: :douser ( ghost -- up-addr ) X @ tup @ + ;DO Builder User +Build: 0 u, X , ;Build +by: :douser ( ghost -- up-addr ) X @ tup @ + ;DO -Build: 0 u, X , 0 u, drop ; -by User Builder 2User - -Build: 0 au, X , ; +Build: 0 u, X , 0 u, drop ;Build by User + Builder AUser +Build: 0 au, X , ;Build +by User + +Builder (Value) +Build: ( n -- ) ;Build +by: :docon ( target-body-addr -- n ) T @ H ;DO -BuildSmart: T , H ; -by (Constant) Builder Value +BuildSmart: T , H ;Build +by (Value) -BuildSmart: T A, H ; -by (Constant) Builder AValue +BuildSmart: T A, H ;Build +by (Value) Defer texecute -BuildSmart: ( -- ) [T'] noop T A, H ; -by: :dodefer ( ghost -- ) X @ texecute ;DO Builder Defer +BuildSmart: ( -- ) [T'] noop T A, H ;Build +by: :dodefer ( ghost -- ) X @ texecute ;DO -Build: ( inter comp -- ) swap T immediate A, A, H ; -DO: ( ghost -- ) ABORT" CROSS: Don't execute" ;DO Builder interpret/compile: +Build: ( inter comp -- ) swap T A, A, H ;Build-immediate +DO: ( ghost -- ) ABORT" CROSS: Don't execute" ;DO \ Sturctures 23feb95py ->CROSS : nalign ( addr1 n -- addr2 ) \ addr2 is the aligned version of addr1 wrt the alignment size n 1- tuck + swap invert and ; ->TARGET -Build: ; -by: :dofield T @ H + ;DO + Builder (Field) +Build: ;Build +by: :dofield T @ H + ;DO +Builder Field Build: ( align1 offset1 align size "name" -- align2 offset2 ) rot dup T , H ( align1 align size offset1 ) - + >r nalign r> ; + + >r nalign r> ;Build by (Field) -Builder Field +>TARGET : struct T 1 chars 0 H ; : end-struct T 2Constant H ; : cell% ( n -- size align ) T 1 cells H dup ; +>CROSS \ Input-Methods 01py -Build: ( m v -- m' v ) dup T , cell+ H ; -DO: abort" Not in cross mode" ;DO Builder input-method - -Build: ( m v size -- m v' ) over T , H + ; +Build: ( m v -- m' v ) dup T , cell+ H ;Build DO: abort" Not in cross mode" ;DO + Builder input-var +Build: ( m v size -- m v' ) over T , H + ;Build +DO: abort" Not in cross mode" ;DO + +\ Peephole optimization 05sep01jaw + +\ this section defines different compilation +\ actions for created words +\ this will help the peephole optimizer +\ I (jaw) took this from bernds latest cross-compiler +\ changes but seperated it from the original +\ Builder words. The final plan is to put this +\ into a seperate file, together with the peephole +\ optimizer for cross + + +T has? peephole H [IF] + +>CROSS + +: (callc) compile call T >body a, H ; ' (callc) plugin-of colon, +: (callcm) T here 0 a, 0 a, H ; ' (callcm) plugin-of colonmark, +: (call-res) >tempdp resolved gexecute tempdp> drop ; + ' (call-res) plugin-of colon-resolve +: (pprim) dup 0< IF $4000 - ELSE + cr ." wrong usage of (prim) " + dup gdiscover IF .ghost ELSE . THEN cr -1 throw THEN + T a, H ; ' (pprim) plugin-of prim, + +\ if we want this, we have to spilt aconstant +\ and constant!! +\ Builder (Constant) +\ compile: g>body X @ lit, ;compile + +Builder (Constant) +compile: g>body compile lit@ T a, H ;compile + +Builder (Value) +compile: g>body compile lit@ T a, H ;compile + +\ this changes also Variable, AVariable and 2Variable +Builder Create +compile: g>body alit, ;compile + +Builder User +compile: g>body compile useraddr T @ , H ;compile + +Builder Defer +compile: g>body compile lit-perform T A, H ;compile + +Builder (Field) +compile: g>body T @ H compile lit+ T , H ;compile +Builder interpret/compile: +compile: does-resolved ;compile +Builder input-method +compile: does-resolved ;compile + +Builder input-var +compile: does-resolved ;compile +[THEN] \ structural conditionals 17dec92py @@ -2945,7 +3162,7 @@ magic 7 + c! : save-cross ( "image-name" "binary-name" -- ) bl parse ." Saving to " 2dup type cr w/o bin create-file throw >r - TNIL IF + s" header" X $has? IF s" #! " r@ write-file throw bl parse r@ write-file throw s" --image-file" r@ write-file throw @@ -2961,7 +3178,7 @@ magic 7 + c! THEN image @ there r@ write-file throw \ write image - TNIL IF + s" relocate" X $has? IF bit$ @ there 1- tcell>bit rshift 1+ r@ write-file throw \ write tags THEN @@ -2972,7 +3189,7 @@ magic 7 + c! swap >image swap r@ write-file throw r> close-file throw ; -1 [IF] +\ save-asm-region 29aug01jaw Variable name-ptr Create name-buf 200 chars allot @@ -3026,6 +3243,7 @@ Create name-buf 200 chars allot THEN @nb ; +\ FIXME why disabled?! : label-from-ghostnameXX ( ghost -- addr len ) \ same as (label-from-ghostname) but caches generated names dup >asm-name @ ?dup IF nip count EXIT THEN @@ -3179,8 +3397,6 @@ Variable outfile-fd : save-asm-region ( region adr len -- ) create-outfile (save-asm-region) close-outfile ; -[THEN] - \ \ minimal definitions >MINIMAL also minimal @@ -3192,8 +3408,8 @@ Variable outfile-fd \ \ [IF] [ELSE] [THEN] ... 14sep97jaw \ it is useful to define our own structures and not to rely -\ on the words in the compiler -\ The words in the compiler might be defined with vocabularies +\ on the words in the host system +\ The words in the host system might be defined with vocabularies \ this doesn't work with our self-made compile-loop Create parsed 20 chars allot \ store word we parsed @@ -3272,18 +3488,26 @@ Cond: [IFUNDEF] postpone [IFUNDEF] ;Cond : d? d? ; +: \D ( -- "debugswitch" ) \G doesn't skip line when debug switch is on -: \D D? 0= IF postpone \ THEN ; + D? 0= IF postpone \ THEN ; +: \- ( -- "wordname" ) \G interprets the line if word is not defined -: \- tdefined? IF postpone \ THEN ; + tdefined? IF postpone \ THEN ; +: \+ ( -- "wordname" ) \G interprets the line if word is defined -: \+ tdefined? 0= IF postpone \ THEN ; + tdefined? 0= IF postpone \ THEN ; + +: \? ( -- "envorinstring" ) +\G Skip line if environmental variable evaluates to false + X has? 0= IF postpone \ THEN ; Cond: \- \- ;Cond Cond: \+ \+ ;Cond Cond: \D \D ;Cond +Cond: \? \? ;Cond : ?? bl word find IF execute ELSE drop 0 THEN ; @@ -3352,6 +3576,7 @@ previous : rot rot ; : drop drop ; : = = ; +: <> <> ; : 0= 0= ; : lshift lshift ; : 2/ 2/ ; @@ -3406,6 +3631,7 @@ previous \ : words also ghosts \ words previous ; : .s .s ; +: depth depth ; : bye bye ; \ dummy @@ -3449,6 +3675,3 @@ UNLOCK >CROSS [IFDEF] extend-cross extend-cross [THEN] LOCK - - -