--- gforth/cross.fs 2002/01/05 22:58:59 1.119 +++ gforth/cross.fs 2002/08/22 20:07:33 1.127 @@ -27,7 +27,6 @@ ToDo: 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 +70,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 ; @@ -249,21 +252,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: @@ -310,6 +318,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 @@ -712,7 +732,6 @@ Plugin branchtoresolve, ( branch-addr -- Plugin branchtomark, ( -- target-addr ) \ marks a branch destination Plugin colon, ( tcfa -- ) \ compiles call to tcfa at current position -Plugin xt, ( tcfa -- ) \ compiles xt Plugin prim, ( tcfa -- ) \ compiles primitive invocation Plugin colonmark, ( -- addr ) \ marks a colon call Plugin colon-resolve ( tcfa addr -- ) @@ -746,9 +765,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 @@ -899,16 +923,9 @@ Variable cross-space-dp-orig THEN ; Defer is-forward -Defer do-refered - -: prim-forward ( ghost -- ) - colonmark, 0 do-refered ; \ compile space for call -: doer-forward ( ghost -- ) - colonmark, 2 do-refered ; \ compile space for doer -' prim-forward IS is-forward : (ghostheader) ( -- ) - ghost-list linked , 0 , ['] NoExec , what's is-forward , + ghost-list linked , 0 , ['] NoExec , ['] is-forward , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , ; : ghostheader ( -- ) (ghostheader) 0 , ; @@ -1085,13 +1102,9 @@ Ghost lit-perform drop Ghost lit+ drop Ghost does-exec drop -' doer-forward IS is-forward - Ghost :docol Ghost :doesjump Ghost :dodoes 2drop drop Ghost :dovar drop -' prim-forward IS is-forward - \ \ Parameter for target systems 06oct92py @@ -1221,7 +1234,8 @@ tbits/char bits/byte / Constant tbyte \ Variables 06oct92py Variable image -Variable tlast TNIL tlast ! \ Last name field +Variable (tlast) +(tlast) Value tlast TNIL tlast ! \ Last name field Variable tlastcfa \ Last code field Variable bit$ @@ -1245,11 +1259,11 @@ Variable region-link \ linked Variable mirrored-link \ linked list for mirrored regions 0 dup mirrored-link ! region-link ! - -: >rname 7 cells + ; -: >rbm 4 cells + ; +: >rname 8 cells + ; +: >rbm 4 cells + ; \ bitfield per cell witch indicates relocation : >rmem 5 cells + ; -: >rtype 6 cells + ; +: >rtype 6 cells + ; \ field per cell witch points to a type struct +: >rrom 7 cells + ; \ a -1 indicates that this region is rom : >rlink 3 cells + ; : >rdp 2 cells + ; : >rlen cell+ ; @@ -1260,7 +1274,7 @@ Variable mirrored-link \ linked >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= @@ -1269,7 +1283,7 @@ Variable mirrored-link \ linked save-input create restore-input throw here last-defined-region ! over ( startaddr ) , ( length ) , ( dp ) , - region-link linked 0 , 0 , 0 , bl word count string, + region-link linked 0 , 0 , 0 , 0 , bl word count string, ELSE \ store new parameters in region bl word drop >body (region) @@ -1287,11 +1301,15 @@ Variable mirrored-link \ linked \G returns the total area dup >rstart @ swap >rlen @ ; -: mirrored -\G mark a region as mirrored +: mirrored ( -- ) +\G mark last defined region as mirrored mirrored-link align linked last-defined-region @ , ; +: writeprotected +\G mark a region as write protected + -1 last-defined-region @ >rrom ! ; + : .addr ( u -- ) \G prints a 16 or 32 Bit nice hex value base @ >r hex @@ -1419,9 +1437,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: @@ -1436,7 +1454,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 @@ -1530,6 +1548,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!" @@ -1545,6 +1565,18 @@ bigendian \ add regions real address in our memory r> >rmem @ + ; +: (>regionramimage) ( taddr -- 'taddr ) +\G same as (>regionimage) but aborts if the region is rom + dup + \ find region we want to address + taddr>region-abort + >r + r@ >rrom @ ABORT" CROSS: region is write-protected!" + \ calculate offset in region + r@ >rstart @ - + \ add regions real address in our memory + r> >rmem @ + ; + : (>regionbm) ( taddr -- 'taddr bitmaskbaseaddr ) dup \ find region we want to address @@ -1593,6 +1625,7 @@ CREATE Bittable 80 c, 40 c, 20 c, 10 c, : (>image) ( taddr -- absaddr ) image @ + ; DEFER >image +DEFER >ramimage DEFER relon DEFER reloff DEFER correcter @@ -1602,12 +1635,23 @@ T has? relocate H ' (relon) IS relon ' (reloff) IS reloff ' (>regionimage) IS >image +' (>regionimage) IS >ramimage [ELSE] ' drop IS relon ' drop IS reloff ' (>regionimage) IS >image +' (>regionimage) IS >ramimage [THEN] +: enforce-writeprotection ( -- ) + ['] (>regionramimage) IS >ramimage ; + +: relax-writeprotection ( -- ) + ['] (>regionimage) IS >ramimage ; + +: writeprotection-relaxed? ( -- ) + ['] >ramimage >body @ ['] (>regionimage) = ; + \ Target memory access 06oct92py : align+ ( taddr -- rest ) @@ -1625,9 +1669,9 @@ T has? relocate H dup cfalign+ + ; : @ ( taddr -- w ) >image S@ ; -: ! ( w taddr -- ) >image S! ; +: ! ( w taddr -- ) >ramimage S! ; : c@ ( taddr -- char ) >image Sc@ ; -: c! ( char taddr -- ) >image Sc! ; +: c! ( char taddr -- ) >ramimage Sc! ; : 2@ ( taddr -- x1 x2 ) T dup cell+ @ swap @ H ; : 2! ( x1 x2 taddr -- ) T tuck ! cell+ ! H ; @@ -1650,10 +1694,6 @@ T has? relocate H >CROSS -: call-forward ( ghost -- ) - there 0 colon, 0 do-refered ; -' call-forward IS is-forward - Ghost (do) Ghost (?do) 2drop Ghost (for) drop Ghost (loop) Ghost (+loop) 2drop @@ -1663,8 +1703,6 @@ Ghost (.") Ghost (S") Ghost (A Ghost (C") drop Ghost ' drop -\ ' prim-forward IS is-forward - \ user ghosts Ghost state drop @@ -1726,7 +1764,6 @@ previous >CROSS : (cc) T a, H ; ' (cc) plugin-of colon, -: (xt) T a, H ; ' (xt) plugin-of xt, : (prim) T a, H ; ' (prim) plugin-of prim, : (cr) >tempdp colon, tempdp> ; ' (cr) plugin-of colon-resolve @@ -1740,8 +1777,7 @@ previous tempdp> ; ' (dr) plugin-of doer-resolve : (cm) ( -- addr ) - T here align H - -1 xt, ; ' (cm) plugin-of colonmark, + there -1 colon, ; ' (cm) plugin-of colonmark, >TARGET : compile, ( xt -- ) @@ -1769,8 +1805,6 @@ previous space> ; -' (refered) IS do-refered - : refered ( ghost tag -- ) \G creates a resolve structure T here aligned H swap (refered) @@ -1828,45 +1862,78 @@ 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, ; +: (is-forward) ( ghost -- ) + colonmark, 0 (refered) ; \ compile space for call +' (is-forward) IS is-forward + 0 Value resolved -: resolve ( ghost tcfa -- ) -\G resolve referencies to ghost with tcfa +: 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@ to resolved - r@ >comp @ ['] prim-forward = IF - ['] prim-resolved r@ >comp ! THEN - r@ >comp @ what's 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 @@ -1874,7 +1941,7 @@ Defer resolve-warning 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 -- ) @@ -2127,11 +2194,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! @@ -2187,7 +2250,7 @@ Defer setup-prim-semantics : mapprim: ( "forthname" "asmlabel" -- ) -1 aprim-nr +! aprim-nr @ - Ghost tuck swap resolve swap tuck >magic ! + Ghost tuck swap resolve-noforwards swap tuck >magic ! asmprimname, ; : Doer: ( cfa -- ) \ name @@ -2197,7 +2260,7 @@ Defer setup-prim-semantics .sourcepos ." needs doer: " >in @ bl word count type >in ! cr THEN Ghost - tuck swap resolve swap >magic ! ; + tuck swap resolve-noforwards swap >magic ! ; Variable prim# : first-primitive ( n -- ) prim# ! ; @@ -2208,8 +2271,9 @@ Variable prim# .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 @@ -2289,6 +2353,8 @@ T 2 cells H 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, @@ -2327,15 +2393,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 @@ -2363,35 +2438,24 @@ Cond: chars ;Cond \ some special literals 27jan97jaw -\ !! 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 - ELSE ffffffff lit, THEN + -1 s>d dlit, ;Cond +tcell 2 = tcell 4 = or tcell 8 = or 0= +[IF] +.( Warning: MINI and MAXI may not work with this host) cr +[THEN] + Cond: MINI - tcell 1 cells u> - IF compile lit bigendian - IF 80 T c, H tcell 1 ?DO 0 T c, H LOOP - ELSE tcell 1 ?DO 0 T c, H LOOP 80 T c, H - THEN - ELSE tcell 2 = IF 8000 ELSE 80000000 THEN lit, THEN + tcell 2 = IF $8000 ELSE $80000000 THEN 0 + tcell 8 = IF swap THEN dlit, ;Cond Cond: MAXI - tcell 1 cells u> - IF compile lit bigendian - IF 7F T c, H tcell 1 ?DO FF T c, H LOOP - ELSE tcell 1 ?DO FF T c, H LOOP 7F T c, H - THEN - ELSE tcell 2 = IF 7fff ELSE 7fffffff THEN lit, THEN - ;Cond + tcell 2 = IF $7fff ELSE $7fffffff THEN 0 + tcell 8 = IF drop -1 swap THEN dlit, + ;Cond >CROSS @@ -2504,6 +2568,7 @@ Cond: [ ( -- ) interpreting-state ;Cond : !does ( does-action -- ) tlastcfa @ [G'] :dovar killref >space here >r ghostheader space> + ['] colon-resolved r@ >comp ! r@ created >do:ghost ! r@ swap resolve r> tlastcfa @ >tempdp dodoes, tempdp> ; @@ -2787,7 +2852,7 @@ DO: abort" Not in cross mode" ;DO \ this section defines different compilation \ actions for created words \ this will help the peephole optimizer -\ I (jaw) took this from bernds lates cross-compiler +\ 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 @@ -2799,12 +2864,13 @@ 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 -: (prim) dup 0< IF $4000 - ELSE - ." wrong usage of (prim) " - dup gdiscover IF .ghost ELSE . THEN cr -2 throw THEN - T a, H ; ' (prim) plugin-of prim, +: (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!! @@ -3286,7 +3352,7 @@ Variable outfile-fd dup @ dup IF addr-refs @ THEN swap >r over align+ tuck tcell swap - rshift swap 0 - DO dup 1 and + ?DO dup 1 and IF drop rdrop snl-calc UNLOOP EXIT THEN 2/ swap 1+ swap LOOP @@ -3439,18 +3505,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 ; @@ -3519,6 +3593,7 @@ previous : rot rot ; : drop drop ; : = = ; +: <> <> ; : 0= 0= ; : lshift lshift ; : 2/ 2/ ; @@ -3556,12 +3631,12 @@ previous : doc-on true to-doc ! ; : declareunique ( "name" -- ) -\G Sets the unique flag for a ghost. The assembler output -\G generates labels with the ghostname concatenated with the address -\G while cross-compiling. The address is concatenated -\G because we have double occurences of the same name. -\G If we want to reference the labels from the assembler or C -\G code we declare them unique, so the address is skipped. +\ Sets the unique flag for a ghost. The assembler output +\ generates labels with the ghostname concatenated with the address +\ while cross-compiling. The address is concatenated +\ because we have double occurences of the same name. +\ If we want to reference the labels from the assembler or C +\ code we declare them unique, so the address is skipped. Ghost >ghost-flags dup @ or swap ! ; \ [IFDEF] dbg : dbg dbg ; [THEN] @@ -3573,6 +3648,7 @@ previous \ : words also ghosts \ words previous ; : .s .s ; +: depth depth ; : bye bye ; \ dummy