--- gforth/cross.fs 2002/03/21 17:20:38 1.125 +++ gforth/cross.fs 2005/08/21 22:09:14 1.149 @@ -1,7 +1,7 @@ \ CROSS.FS The Cross-Compiler 06oct92py \ Idea and implementation: Bernd Paysan (py) -\ Copyright (C) 1995,1996,1997,1998,1999,2000 Free Software Foundation, Inc. +\ Copyright (C) 1995,1996,1997,1998,1999,2000,2003,2004 Free Software Foundation, Inc. \ This file is part of Gforth. @@ -30,6 +30,8 @@ ToDo: [THEN] +s" compat/strcomp.fs" included + hex \ debugging for compiling @@ -259,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 ( -- ) @@ -445,7 +447,7 @@ sourcepath value fpath \G Make a complete new Forth search path; the path separator is |. fpath path= ; -: path>counted cell+ dup cell+ swap @ ; +: path>string cell+ dup cell+ swap @ ; : next-path ( adr len -- adr2 len2 ) 2dup 0 scan @@ -454,12 +456,12 @@ sourcepath value fpath r> - ; : previous-path ( path^ -- ) - dup path>counted + dup path>string BEGIN tuck dup WHILE repeat ; : .path ( path-addr -- ) \ gforth \G Display the contents of the search path @var{path-addr}. - path>counted + path>string BEGIN next-path dup WHILE type space REPEAT 2drop 2drop ; : .fpath ( -- ) \ gforth @@ -474,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 @@ -491,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 @@ -511,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 - @@ -544,7 +546,7 @@ Create tfile 0 c, 255 chars allot IF rdrop ofile place open-ofile dup 0= IF >r ofile count r> THEN EXIT - ELSE r> path>counted + ELSE r> path>string BEGIN next-path dup WHILE 5 pick 5 pick check-path 0= IF >r 2drop 2drop r> ofile count 0 EXIT ELSE drop THEN @@ -574,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 @@ -660,6 +662,7 @@ stack-warn [IF] : defempty? empty? ; [ELSE] : defempty? ; immediate +\ : defempty? .sourcepos ; [THEN] \ \ -------------------- Compiler Plug Ins 01aug97jaw @@ -1172,13 +1175,22 @@ false DefaultValue header false DefaultValue backtrace false DefaultValue new-input false DefaultValue peephole +false DefaultValue abranch +true DefaultValue f83headerstring +true DefaultValue control-rack [THEN] +true DefaultValue gforthcross true DefaultValue interpreter true DefaultValue ITC false DefaultValue rom true DefaultValue standardthreading +\ ANSForth environment stuff +8 DefaultValue ADDRESS-UNIT-BITS +255 DefaultValue MAX-CHAR +255 DefaultValue /COUNTED-STRING + >TARGET s" relocate" T environment? H \ JAW why set NIL to this?! @@ -1233,11 +1245,9 @@ tbits/char bits/byte / Constant tbyte \ Variables 06oct92py -Variable image Variable (tlast) (tlast) Value tlast TNIL tlast ! \ Last name field Variable tlastcfa \ Last code field -Variable bit$ \ statistics 10jun97jaw @@ -1259,7 +1269,8 @@ Variable region-link \ linked Variable mirrored-link \ linked list for mirrored regions 0 dup mirrored-link ! region-link ! -: >rname 8 cells + ; +: >rname 9 cells + ; +: >rtouch 8 cells + ; \ executed when region is accessed : >rbm 4 cells + ; \ bitfield per cell witch indicates relocation : >rmem 5 cells + ; : >rtype 6 cells + ; \ field per cell witch points to a type struct @@ -1274,6 +1285,8 @@ Variable mirrored-link \ linked >r r@ last-defined-region ! r@ >rlen ! dup r@ >rstart ! r> >rdp ! ; +: uninitialized -1 ABORT" CROSS: Region is uninitialized" ; + : region ( addr len -- "name" ) \G create a new region \ check whether predefined region exists @@ -1283,7 +1296,9 @@ Variable mirrored-link \ linked save-input create restore-input throw here last-defined-region ! over ( startaddr ) , ( length ) , ( dp ) , - region-link linked 0 , 0 , 0 , 0 , bl word count string, + region-link linked 0 , 0 , 0 , 0 , + ['] uninitialized , + bl word count string, ELSE \ store new parameters in region bl word drop >body (region) @@ -1301,6 +1316,9 @@ Variable mirrored-link \ linked \G returns the total area dup >rstart @ swap >rlen @ ; +: dp@ ( region -- dp ) + >rdp @ ; + : mirrored ( -- ) \G mark last defined region as mirrored mirrored-link @@ -1346,6 +1364,10 @@ Variable mirrored-link \ linked 0 0 region address-space \ total memory addressed and used by the target system +0 0 region user-region +\ data for user variables goes here +\ this has to be defined before dictionary or ram-dictionary + 0 0 region dictionary \ rom area for the compiler @@ -1365,6 +1387,21 @@ T has? rom H ' dictionary ALIAS rom-dictionary +: setup-region ( region -- ) + >r + \ allocate mem + r@ >rlen @ allocatetarget + r@ >rmem ! + + r@ >rlen @ + target>bitmask-size allocatetarget + r@ >rbm ! + + r@ >rlen @ + tcell / 1+ cells allocatetarget r@ >rtype ! + + ['] noop r@ >rtouch ! + rdrop ; : setup-target ( -- ) \G initialize target's memory space s" rom" T $has? H @@ -1390,29 +1427,16 @@ T has? rom H WHILE dup 0 >rlink - >r r@ >rlen @ - IF \ allocate mem - r@ >rlen @ allocatetarget dup image ! - r@ >rmem ! - - r@ >rlen @ - target>bitmask-size allocatetarget - dup bit$ ! - r@ >rbm ! - - r@ >rlen @ - tcell / 1+ cells allocatetarget r@ >rtype ! - - rdrop - ELSE r> drop THEN + IF r@ setup-region + THEN rdrop REPEAT drop ; \ MakeKernel 22feb99jaw -: makekernel ( targetsize -- ) +: makekernel ( start 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 ; + dictionary (region) setup-target ; >MINIMAL : makekernel makekernel ; @@ -1540,7 +1564,9 @@ bigendian 0 >rlink - >r r@ >rlen @ IF dup r@ borders within - IF r> r> drop nip EXIT THEN + IF r> r> drop nip + dup >rtouch @ EXECUTE EXIT + THEN THEN r> drop r> @@ -1622,8 +1648,6 @@ CREATE Bittable 80 c, 40 c, 20 c, 10 c, [ [THEN] ] (>regionbm) swap cell/ -bit ; -: (>image) ( taddr -- absaddr ) image @ + ; - DEFER >image DEFER >ramimage DEFER relon @@ -1698,9 +1722,10 @@ Ghost (do) Ghost (?do) Ghost (for) drop Ghost (loop) Ghost (+loop) 2drop Ghost (next) drop -Ghost (does>) Ghost (compile) 2drop +Ghost (does>) Ghost (does>1) Ghost (does>2) 2drop drop +Ghost compile, drop Ghost (.") Ghost (S") Ghost (ABORT") 2drop drop -Ghost (C") drop +Ghost (C") Ghost c(abort") Ghost type 2drop drop Ghost ' drop \ user ghosts @@ -1729,13 +1754,15 @@ 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 : count dup X c@ swap X char+ swap ; -: on -1 -1 rot TD! ; +: on >r -1 -1 r> TD! ; : off T 0 swap ! H ; : tcmove ( source dest len -- ) @@ -2000,7 +2027,7 @@ variable ResolveFlag \ Header states 12dec92py \ : flag! ( 8b -- ) tlast @ dup >r T c@ xor r> c! H ; -bigendian [IF] 0 [ELSE] tcell 1- [THEN] Constant flag+ +X has? f83headerstring bigendian or [IF] 0 [ELSE] tcell 1- [THEN] Constant flag+ : flag! ( w -- ) tlast @ flag+ + dup >r T c@ xor r> c! H ; VARIABLE ^imm @@ -2029,7 +2056,11 @@ $20 constant restrict-mask dup T , H bounds ?DO I c@ T c, H LOOP ; >TARGET +X has? f83headerstring [IF] +: name, ( "name" -- ) bl word count ht-string, X cfalign ; +[ELSE] : name, ( "name" -- ) bl word count ht-lstring, X cfalign ; +[THEN] : view, ( -- ) ( dummy ) ; >CROSS @@ -2066,8 +2097,8 @@ s" kernel.TAGS" r/w create-file throw va 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-beg 1 c, 7F c, +Create tag-end 1 c, 01 c, Create tag-bof 1 c, 0C c, Create tag-tab 1 c, 09 c, @@ -2147,8 +2178,9 @@ Defer skip? ' false IS skip? 0= ELSE drop true THEN ; -: doer? ( -- flag ) \ name - Ghost >magic @ = ; +: doer? ( "name" -- 0 | addr ) \ name + Ghost dup >magic @ = + IF >link @ ELSE drop 0 THEN ; : skip-defs ( -- ) BEGIN refill WHILE source -trailing nip 0= UNTIL THEN ; @@ -2173,7 +2205,7 @@ NoHeaderFlag off ENDCASE LOOP ; -Defer setup-execution-semantics +Defer setup-execution-semantics ' noop IS setup-execution-semantics 0 Value lastghost : (THeader ( "name" -- ghost ) @@ -2264,6 +2296,8 @@ Defer setup-prim-semantics Variable prim# : first-primitive ( n -- ) prim# ! ; +: group 0 word drop prim# @ 1- -$200 and prim# ! ; +: groupadd ( n -- ) drop ; : Primitive ( -- ) \ name >in @ skip? IF drop EXIT THEN >in ! s" prims" T $has? H 0= @@ -2432,6 +2466,15 @@ Cond: ALiteral ( n -- ) alit, ;Cond : Char ( "" -- ) bl word char+ c@ ; Cond: [Char] ( "" -- ) Char lit, ;Cond +: (x#) ( adr len base -- ) + base @ >r base ! 0 0 name >number 2drop drop r> base ! ; + +: d# $0a (x#) ; +: h# $010 (x#) ; + +Cond: d# $0a (x#) lit, ;Cond +Cond: h# $010 (x#) lit, ;Cond + tchar 1 = [IF] Cond: chars ;Cond [THEN] @@ -2572,10 +2615,15 @@ Cond: [ ( -- ) interpreting-state ;Cond r@ created >do:ghost ! r@ swap resolve r> tlastcfa @ >tempdp dodoes, tempdp> ; -Defer instant-interpret-does>-hook +Defer instant-interpret-does>-hook ' noop IS instant-interpret-does>-hook +T has? peephole H [IF] : does-resolved ( ghost -- ) compile does-exec g>xt T a, H ; +[ELSE] +: does-resolved ( ghost -- ) + g>xt T a, H ; +[THEN] : resolve-does>-part ( -- ) \ resolve words made by builders @@ -2584,8 +2632,8 @@ Defer instant-interpret-does>-hook >TARGET Cond: DOES> - compile (does>) doeshandler, - resolve-does>-part + T here 5 cells H + alit, compile (does>2) compile ;s + doeshandler, resolve-does>-part ;Cond : DOES> @@ -2767,20 +2815,43 @@ by Create \ User variables 04may94py -Variable tup 0 tup ! -Variable tudp 0 tudp ! +: tup@ user-region >rstart @ ; + +\ Variable tup 0 tup ! +\ Variable tudp 0 tudp ! : u, ( n -- udp ) - tup @ tudp @ + T ! H - tudp @ dup T cell+ H tudp ! ; + current-region >r user-region activate + X here swap X , tup@ - + r> activate ; : au, ( n -- udp ) - tup @ tudp @ + T A! H - tudp @ dup T cell+ H tudp ! ; + current-region >r user-region activate + X here swap X a, tup@ - + r> activate ; + +T has? no-userspace H [IF] + +: buildby + ghost >exec @ built >exec ! ; + +Builder User +buildby Variable +by Variable + +Builder 2User +buildby 2Variable +by 2Variable + +Builder AUser +buildby AVariable +by AVariable + +[ELSE] Builder User Build: 0 u, X , ;Build -by: :douser ( ghost -- up-addr ) X @ tup @ + ;DO +by: :douser ( ghost -- up-addr ) X @ tup@ + ;DO Builder 2User Build: 0 u, X , 0 u, drop ;Build @@ -2790,6 +2861,8 @@ Builder AUser Build: 0 au, X , ;Build by User +[THEN] + Builder (Value) Build: ( n -- ) ;Build by: :docon ( target-body-addr -- n ) T @ H ;DO @@ -2861,6 +2934,8 @@ DO: abort" Not in cross mode" ;DO T has? peephole H [IF] +\ .( loading peephole optimization) cr + >CROSS : (callc) compile call T >body a, H ; ' (callc) plugin-of colon, @@ -2923,23 +2998,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 ; @@ -3156,14 +3248,14 @@ Cond: postpone ( -- ) \ name ABORT" CROSS: Can't postpone on forward declaration" dup >magic @ = IF (gexecute) - ELSE compile (compile) addr, THEN ;Cond + ELSE >link @ alit, compile compile, THEN ;Cond \ save-cross 17mar93py 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 @@ -3193,10 +3285,10 @@ magic 7 + c! ELSE bl parse 2drop THEN - image @ there + dictionary >rmem @ there r@ write-file throw \ write image s" relocate" X $has? IF - bit$ @ there 1- tcell>bit rshift 1+ + dictionary >rbm @ there 1- tcell>bit rshift 1+ r@ write-file throw \ write tags THEN r> close-file throw ; @@ -3352,7 +3444,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,17 +3531,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 @@ -3497,7 +3589,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 @@ -3588,15 +3680,19 @@ previous : * * ; : / / ; : dup dup ; +: ?dup ?dup ; : over over ; : swap swap ; : rot rot ; : drop drop ; +: 2drop 2drop ; : = = ; : <> <> ; : 0= 0= ; : lshift lshift ; : 2/ 2/ ; +: hex. base @ $10 base ! swap . base ! ; +: invert invert ; \ : . . ; : all-words ['] forced? IS skip? ; @@ -3612,6 +3708,11 @@ previous : require require ; : needs require ; : .( [char] ) parse type ; +: ERROR" [char] " parse + rot + IF cr ." *** " type ." ***" -1 ABORT" CROSS: Target error, see text above" + ELSE 2drop + THEN ; : ." [char] " parse type ; : cr cr ; @@ -3631,12 +3732,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] @@ -3652,7 +3753,6 @@ previous : bye bye ; \ dummy -: group 0 word drop ; \ turnkey direction : H forth ; immediate