--- gforth/cross.fs 2002/03/19 18:07:55 1.121 +++ gforth/cross.fs 2002/03/21 17:11:10 1.124 @@ -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 ; @@ -315,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 @@ -1219,7 +1235,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$ @@ -1243,11 +1260,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+ ; @@ -1258,7 +1275,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= @@ -1267,7 +1284,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) @@ -1285,11 +1302,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 @@ -1417,9 +1438,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: @@ -1434,7 +1455,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 @@ -1528,6 +1549,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!" @@ -1543,6 +1566,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 @@ -1591,6 +1626,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 @@ -1600,12 +1636,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 ) @@ -1623,9 +1670,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 ; @@ -1830,25 +1877,28 @@ Defer resolve-warning 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 - - \ 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 ! + swap >r r@ to resolved \ r@ >comp @ ['] is-forward = @@ -1858,16 +1908,33 @@ Defer resolve-warning \ if this is not right something must be set before \ calling resolve r@ >comp @ ['] is-forward = IF - ['] colon-resolved r@ >comp ! - THEN - \ loop through forward referencies - r> -rot - comp-state @ >r Resolving comp-state ! - resolve-loop - r> comp-state ! + ['] colon-resolved r@ >comp ! + THEN + r@ >link @ swap \ ( list tcfa R: ghost ) + \ mark ghost as resolved + r@ >link ! r@ >magic ! + r> swap ; - ['] noop IS resolve-warning - ; +: 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 + (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 @@ -2128,11 +2195,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! @@ -2188,7 +2251,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 @@ -2198,7 +2261,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# ! ; @@ -2211,7 +2274,7 @@ Variable prim# 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 @@ -2333,7 +2396,7 @@ Defer (end-code) defempty? (THeader ( ghost ) ['] prim-resolved over >comp ! - there resolve + there resolve-noforwards [ T e? prims H 0= [IF] T e? ITC H [ELSE] true [THEN] ] [IF] doprim, @@ -2345,7 +2408,8 @@ Defer (end-code) : Code: defempty? Ghost >r - r@ there ca>native resolve + r@ >ghostname there symentry + r@ there ca>native resolve-noforwards r@ >magic ! r> drop depth (code) ; @@ -3453,18 +3517,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 ; @@ -3533,6 +3605,7 @@ previous : rot rot ; : drop drop ; : = = ; +: <> <> ; : 0= 0= ; : lshift lshift ; : 2/ 2/ ; @@ -3587,6 +3660,7 @@ previous \ : words also ghosts \ words previous ; : .s .s ; +: depth depth ; : bye bye ; \ dummy