--- gforth/cross.fs 2002/03/20 11:28:26 1.122 +++ gforth/cross.fs 2003/01/01 17:28:29 1.133 @@ -27,10 +27,11 @@ 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] +s" compat/strcomp.fs" included + hex \ debugging for compiling @@ -71,6 +72,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 ; @@ -256,9 +261,9 @@ hex \ FIXME move down : comment? ( c-addr u -- c-addr u ) - 2dup s" (" compare 0= + 2dup s" (" str= IF postpone ( - ELSE 2dup s" \" compare 0= IF postpone \ THEN + ELSE 2dup s" \" str= IF postpone \ THEN THEN ; : X ( -- ) @@ -315,6 +320,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 @@ -459,8 +476,8 @@ sourcepath value fpath 2dup 2 u> swap 1+ c@ [char] : = and >r \ dos absoulte: c:/.... over c@ [char] / = >r over c@ [char] ~ = >r - \ 2dup 3 min S" ../" compare 0= r> or >r \ not catered for in expandtopic - 2 min S" ./" compare 0= + \ 2dup S" ../" string-prefix? r> or >r \ not catered for in expandtopic + S" ./" string-prefix? r> r> r> or or or ; Create ofile 0 c, 255 chars allot @@ -476,14 +493,14 @@ Create tfile 0 c, 255 chars allot REPEAT ; : remove~+ ( -- ) - ofile count 3 min s" ~+/" compare 0= + ofile count s" ~+/" string-prefix? IF ofile count 3 /string ofile place THEN ; : expandtopic ( -- ) \ stack effect correct? - anton \ expands "./" into an absolute name - ofile count 2 min s" ./" compare 0= + ofile count s" ./" string-prefix? IF ofile count 1 /string tfile place 0 ofile c! sourcefilename extractpath ofile place @@ -496,7 +513,7 @@ Create tfile 0 c, 255 chars allot \ deletes phrases like "xy/.." out of our directory name 2dec97jaw over swap BEGIN dup WHILE - dup >r '/ scan 2dup 4 min s" /../" compare 0= + dup >r '/ scan 2dup s" /../" string-prefix? IF dup r> - >r 4 /string over r> + 4 - swap 2dup + >r move dup r> over - @@ -559,7 +576,7 @@ fpath= ~+ : included? ( c-addr u -- f ) file-list BEGIN @ dup - WHILE >r 2dup r@ >fl-name count compare 0= + WHILE >r 2dup r@ >fl-name count str= IF rdrop 2drop true EXIT THEN r> REPEAT @@ -1157,6 +1174,8 @@ false DefaultValue header false DefaultValue backtrace false DefaultValue new-input false DefaultValue peephole +false DefaultValue abranch +true DefaultValue control-rack [THEN] true DefaultValue interpreter @@ -1219,7 +1238,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 +1263,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 +1278,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 +1287,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 +1305,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 +1441,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 +1458,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 @@ -1545,6 +1569,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 +1629,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 +1639,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 +1673,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 ; @@ -1656,7 +1704,7 @@ Ghost (loop) Ghost (+loop) Ghost (next) drop Ghost (does>) Ghost (compile) 2drop Ghost (.") Ghost (S") Ghost (ABORT") 2drop drop -Ghost (C") drop +Ghost (C") Ghost c(abort") Ghost type 2drop drop Ghost ' drop \ user ghosts @@ -1685,7 +1733,9 @@ Ghost state drop : ht-string, ( addr count -- ) dup there swap last-string 2! - dup T c, H bounds ?DO I c@ T c, H LOOP ; + dup T c, H bounds ?DO I c@ T c, H LOOP ; +: ht-mem, ( addr count ) + bounds ?DO I c@ T c, H LOOP ; >TARGET @@ -2150,11 +2200,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! @@ -2224,6 +2270,7 @@ Defer setup-prim-semantics Variable prim# : first-primitive ( n -- ) prim# ! ; +: group 0 word drop prim# @ 1- -$200 and prim# ! ; : Primitive ( -- ) \ name >in @ skip? IF drop EXIT THEN >in ! s" prims" T $has? H 0= @@ -2367,6 +2414,7 @@ Defer (end-code) : Code: defempty? Ghost >r + r@ >ghostname there symentry r@ there ca>native resolve-noforwards r@ >magic ! r> drop @@ -2397,35 +2445,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 @@ -2893,23 +2930,23 @@ compile: does-resolved ;compile : >mark ( -- sys ) T here ( dup ." M" hex. ) 0 , H ; -: branchoffset ( src dest -- ) - tchar / ; \ ?? jaw - -: >resolve ( sys -- ) - X here ( dup ." >" hex. ) over branchoffset swap X ! ; - -: r ahead, there 2r> ht-mem, X align + >r then, r> compile ALiteral compile Literal compile type ;Cond +Cond: S" '" parse tuck 2>r ahead, there 2r> ht-mem, X align + >r then, r> compile ALiteral compile Literal ;Cond +Cond: C" ahead, there [char] " parse ht-string, X align + >r then, r> compile ALiteral ;Cond +Cond: ABORT" if, ahead, there [char] " parse ht-string, X align + >r then, r> compile ALiteral compile c(abort") then, ;Cond +[THEN] Cond: IS T ' >body H compile ALiteral compile ! ;Cond : IS T >address ' >body ! H ; @@ -3133,7 +3187,7 @@ Cond: postpone ( -- ) \ name hex >CROSS -Create magic s" Gforth2x" here over allot swap move +Create magic s" Gforth3x" here over allot swap move bigendian 1+ \ strangely, in magic big=0, little=1 tcell 1 = 0 and or @@ -3322,7 +3376,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 @@ -3409,17 +3463,17 @@ Create parsed 20 chars allot \ store wor 1 BEGIN BEGIN bl word count dup WHILE comment? 20 umin parsed place upcase parsed count - 2dup s" [IF]" compare 0= >r - 2dup s" [IFUNDEF]" compare 0= >r - 2dup s" [IFDEF]" compare 0= r> or r> or + 2dup s" [IF]" str= >r + 2dup s" [IFUNDEF]" str= >r + 2dup s" [IFDEF]" str= r> or r> or IF 2drop 1+ - ELSE 2dup s" [ELSE]" compare 0= + ELSE 2dup s" [ELSE]" str= IF 2drop 1- dup IF 1+ THEN ELSE - 2dup s" [ENDIF]" compare 0= >r - s" [THEN]" compare 0= r> or + 2dup s" [ENDIF]" str= >r + s" [THEN]" str= r> or IF 1- THEN THEN THEN @@ -3467,7 +3521,7 @@ Cond: [IFUNDEF] postpone [IFUNDEF] ;Cond IF >in ! X : ELSE drop BEGIN bl word dup c@ - IF count comment? s" ;" compare 0= ?EXIT + IF count comment? s" ;" str= ?EXIT ELSE refill 0= ABORT" CROSS: Out of Input while C:" THEN AGAIN @@ -3475,18 +3529,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 ; @@ -3593,12 +3655,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] @@ -3614,7 +3676,6 @@ previous : bye bye ; \ dummy -: group 0 word drop ; \ turnkey direction : H forth ; immediate