--- gforth/cross.fs 2002/03/21 17:11:10 1.124 +++ gforth/cross.fs 2012/12/31 15:25:18 1.184 @@ -1,13 +1,13 @@ \ 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,2005,2006,2007,2009,2010,2011,2012 Free Software Foundation, Inc. \ This file is part of Gforth. \ Gforth is free software; you can redistribute it and/or \ modify it under the terms of the GNU General Public License -\ as published by the Free Software Foundation; either version 2 +\ as published by the Free Software Foundation, either version 3 \ of the License, or (at your option) any later version. \ This program is distributed in the hope that it will be useful, @@ -16,8 +16,7 @@ \ GNU General Public License for more details. \ You should have received a copy of the GNU General Public License -\ along with this program; if not, write to the Free Software -\ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. +\ along with this program. If not, see http://www.gnu.org/licenses/. 0 [IF] @@ -27,10 +26,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 @@ -191,7 +191,7 @@ Create bases 10 , 2 , A , 100 , 1+ THEN ; -: number? ( string -- string 0 / n -1 / d 0> ) +: (number?) ( string -- string 0 / n -1 / d 0> ) dup >r count snumber? dup if rdrop else @@ -199,13 +199,15 @@ Create bases 10 , 2 , A , 100 , then ; : number ( string -- d ) - number? ?dup 0= abort" ?" 0< + (number?) ?dup 0= abort" ?" 0< IF s>d THEN ; [THEN] +[IFUNDEF] (number?) : (number?) number? ; [THEN] + \ this provides assert( and struct stuff \GFORTH [IFUNDEF] assert1( \GFORTH also forth definitions require assert.fs previous @@ -260,9 +262,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 ( -- ) @@ -446,7 +448,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 @@ -455,12 +457,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 @@ -475,8 +477,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 @@ -492,14 +494,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 @@ -512,7 +514,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 - @@ -545,7 +547,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 @@ -575,7 +577,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 @@ -661,6 +663,7 @@ stack-warn [IF] : defempty? empty? ; [ELSE] : defempty? ; immediate +\ : defempty? .sourcepos ; [THEN] \ \ -------------------- Compiler Plug Ins 01aug97jaw @@ -762,6 +765,7 @@ Plugin ?do, ( -- ?do-token ) Plugin for, ( -- for-token ) Plugin loop, ( do-token / ?do-token -- ) Plugin +loop, ( do-token / ?do-token -- ) +Plugin -loop, ( do-token / ?do-token -- ) Plugin next, ( for-token ) Plugin leave, ( -- ) Plugin ?leave, ( -- ) @@ -1173,13 +1177,24 @@ false DefaultValue header false DefaultValue backtrace false DefaultValue new-input false DefaultValue peephole +false DefaultValue primcentric +false DefaultValue abranch +true DefaultValue f83headerstring +true DefaultValue control-rack [THEN] +true DefaultValue gforthcross true DefaultValue interpreter true DefaultValue ITC false DefaultValue rom +false DefaultValue flash 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?! @@ -1231,14 +1246,15 @@ bits/byte Constant tbits/byte H tbits/char bits/byte / Constant tbyte +: >signed ( u -- n ) + 1 tbits/char tcell * 1- lshift 2dup and + IF negate or ELSE drop THEN ; \ Variables 06oct92py -Variable image Variable (tlast) (tlast) Value tlast TNIL tlast ! \ Last name field Variable tlastcfa \ Last code field -Variable bit$ \ statistics 10jun97jaw @@ -1260,7 +1276,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 @@ -1275,6 +1292,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 @@ -1284,7 +1303,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) @@ -1302,6 +1323,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 @@ -1347,6 +1371,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 @@ -1366,6 +1394,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 @@ -1391,29 +1434,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 ; @@ -1541,7 +1571,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> @@ -1623,8 +1655,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 @@ -1697,11 +1727,12 @@ T has? relocate H Ghost (do) Ghost (?do) 2drop Ghost (for) drop -Ghost (loop) Ghost (+loop) 2drop +Ghost (loop) Ghost (+loop) Ghost (-loop) 2drop drop Ghost (next) drop -Ghost (does>) Ghost (compile) 2drop +Ghost !does 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 @@ -1727,16 +1758,22 @@ Ghost state drop swap -rot bounds ?DO I c@ over X c! X char+ LOOP drop ; 2Variable last-string +X has? rom [IF] $60 [ELSE] $00 [THEN] Constant header-masks +: ht-header, ( addr count -- ) + dup there swap last-string 2! + dup header-masks or T c, H bounds ?DO I c@ T c, H LOOP ; : 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 -- ) @@ -1745,6 +1782,9 @@ Ghost state drop ?DO dup T c@ H I T c! H 1+ tchar +LOOP drop ; +: tcallot ( char size -- ) + 0 ?DO dup T c, H tchar +LOOP drop ; + : td, ( d -- ) \G Store a host value as one cell into the target there tcell X allot TD! ; @@ -2001,7 +2041,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 @@ -2017,6 +2057,7 @@ $20 constant restrict-mask <> ABORT" CROSS: Cannot immediate a unresolved word" ^imm @ ! ; : restrict restrict-mask flag! ; +: compile-only restrict-mask flag! ; : isdoer \G define a forth word as doer, this makes obviously only sence on @@ -2030,7 +2071,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-header, X cfalign ; +[ELSE] : name, ( "name" -- ) bl word count ht-lstring, X cfalign ; +[THEN] : view, ( -- ) ( dummy ) ; >CROSS @@ -2067,8 +2112,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, @@ -2084,36 +2129,49 @@ Create tag-tab 1 c, 09 c, s" ,0" tag-file-id write-line throw THEN ; -: cross-gnu-tag-entry ( -- ) +: put-cross-gnu-tag-entry ( addr u -- ) 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 - Last-Header-Ghost @ >ghostname tag-file-id write-file throw + 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 s" ,0" tag-file-id write-line throw base ! - THEN ; + ELSE 2drop THEN ; -: cross-vi-tag-entry ( -- ) +: cross-gnu-tag-entry ( -- ) + Last-Header-Ghost @ >ghostname put-cross-gnu-tag-entry ; + +: put-cross-vi-tag-entry ( addr u -- ) 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 + 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 ; + ELSE 2drop THEN ; + +: cross-vi-tag-entry ( -- ) + Last-Header-Ghost @ >ghostname put-cross-vi-tag-entry ; : cross-tag-entry ( -- ) cross-gnu-tag-entry cross-vi-tag-entry ; +: put-cross-tag-entry ( addr u -- ) + 2dup put-cross-gnu-tag-entry + put-cross-vi-tag-entry ; + +: cross-record-name ( -- ) + >in @ parse-name put-cross-tag-entry >in ! ; + \ Check for words Defer skip? ' false IS skip? @@ -2148,8 +2206,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 ; @@ -2174,7 +2233,7 @@ NoHeaderFlag off ENDCASE LOOP ; -Defer setup-execution-semantics +Defer setup-execution-semantics ' noop IS setup-execution-semantics 0 Value lastghost : (THeader ( "name" -- ghost ) @@ -2265,6 +2324,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= @@ -2274,7 +2335,13 @@ Variable prim# prim# @ (THeader ( S xt ghost ) ['] prim-resolved over >comp ! dup >ghost-flags set-flag - over resolve-noforwards T A, H alias-mask flag! + s" EC" T $has? H 0= + IF + over resolve-noforwards T A, H + alias-mask flag! + ELSE + T here H resolve-noforwards T A, H + THEN -1 prim# +! ; >CROSS @@ -2360,14 +2427,11 @@ T 2 cells H Value xt>body there xt>body + ca>native T a, H 1 fillcfa ; ' (doprim,) plugin-of doprim, : (doeshandler,) ( -- ) - T cfalign H [G'] :doesjump addr, T 0 , H ; ' (doeshandler,) plugin-of doeshandler, + T H ; ' (doeshandler,) plugin-of doeshandler, : (dodoes,) ( does-action-ghost -- ) ]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, : (dlit,) ( n -- ) compile lit td, ; ' (dlit,) plugin-of dlit, @@ -2433,41 +2497,39 @@ 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] \ 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 @@ -2487,7 +2549,7 @@ Cond: MAXI IF nip execute-exec-compile ELSE gexecute THEN EXIT THEN - number? dup + (number?) dup IF 0> IF swap lit, THEN lit, discard ELSE 2drop restore-input throw Ghost gexecute THEN ; @@ -2539,7 +2601,7 @@ Cond: MAXI (THeader (:) ; : :noname ( -- colon-sys ) - X cfalign there + switchrom X cfalign there \ define a nameless ghost here ghostheader dup last-header-ghost ! dup to lastghost (:) ; @@ -2584,10 +2646,16 @@ 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? primcentric H [IF] : does-resolved ( ghost -- ) +\ g>xt dup T >body H alit, compile call T cell+ @ a, H ; 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 @@ -2596,8 +2664,9 @@ Defer instant-interpret-does>-hook >TARGET Cond: DOES> - compile (does>) doeshandler, - resolve-does>-part + T here H [ T has? primcentric H [IF] ] 5 [ [ELSE] ] 4 [ [THEN] ] T cells + H + alit, compile !does compile ;s + doeshandler, resolve-does>-part ;Cond : DOES> @@ -2779,20 +2848,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 @@ -2802,9 +2894,24 @@ Builder AUser Build: 0 au, X , ;Build by User +[THEN] + +T has? rom H [IF] Builder (Value) Build: ( n -- ) ;Build -by: :docon ( target-body-addr -- n ) T @ H ;DO +by: :dovalue ( target-body-addr -- n ) T @ @ H ;DO + +Builder Value +Build: T here 0 A, H switchram T align here swap ! , H ;Build +by (Value) + +Builder AValue +Build: T here 0 A, H switchram T align here swap ! A, H ;Build +by (Value) +[ELSE] +Builder (Value) +Build: ( n -- ) ;Build +by: :dovalue ( target-body-addr -- n ) T @ H ;DO Builder Value BuildSmart: T , H ;Build @@ -2813,12 +2920,18 @@ by (Value) Builder AValue BuildSmart: T A, H ;Build by (Value) +[THEN] Defer texecute Builder Defer -BuildSmart: ( -- ) [T'] noop T A, H ;Build -by: :dodefer ( ghost -- ) X @ texecute ;DO +T has? rom H [IF] + Build: ( -- ) T here 0 A, H switchram T align here swap ! H [T'] noop T A, H ( switchrom ) ;Build + by: :dodefer ( ghost -- ) X @ X @ texecute ;DO +[ELSE] + BuildSmart: ( -- ) [T'] noop T A, H ;Build + by: :dodefer ( ghost -- ) X @ texecute ;DO +[THEN] Builder interpret/compile: Build: ( inter comp -- ) swap T A, A, H ;Build-immediate @@ -2849,6 +2962,15 @@ by (Field) T 1 cells H dup ; >CROSS +\ ABI-CODE support +Builder (ABI-CODE) +Build: ;Build +by: :doabicode noop ;DO + +BUILDER (;abi-code) +Build: ;Build +by: :do;abicode noop ;DO + \ Input-Methods 01py Builder input-method @@ -2859,6 +2981,25 @@ Builder input-var Build: ( m v size -- m v' ) over T , H + ;Build DO: abort" Not in cross mode" ;DO +\ Mini-OOF + +Builder method +Build: ( m v -- m' v ) over T , swap cell+ swap H ;Build +DO: abort" Not in cross mode" ;DO + +Builder var +Build: ( m v size -- m v+size ) over T , H + ;Build +DO: ( o -- addr ) T @ H + ;DO + +Builder end-class +Build: ( addr m v -- ) + T here >r , dup , 2 cells H ?DO T ['] noop , 1 cells H +LOOP + T cell+ dup cell+ r> rot @ 2 cells /string move H ;Build +by Create + +: class ( class -- class methods vars ) dup T 2@ H ; +: defines ( xt class -- ) T ' >body @ + ! H ; + \ Peephole optimization 05sep01jaw \ this section defines different compilation @@ -2871,7 +3012,9 @@ DO: abort" Not in cross mode" ;DO \ optimizer for cross -T has? peephole H [IF] +T has? primcentric H [IF] + +\ .( loading peephole optimization) cr >CROSS @@ -2879,10 +3022,17 @@ T has? peephole H [IF] : (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 +T has? ec H [IF] +: (pprim) T @ H >signed 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, +[ELSE] : (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, +[THEN] \ if we want this, we have to spilt aconstant \ and constant!! @@ -2906,7 +3056,7 @@ Builder Defer compile: g>body compile lit-perform T A, H ;compile Builder (Field) -compile: g>body T @ H compile lit+ T , H ;compile +compile: g>body T @ H compile lit+ T here H reloff T , H ;compile Builder interpret/compile: compile: does-resolved ;compile @@ -2933,25 +3083,25 @@ compile: does-resolved ;compile \ : ?struc ( flag -- ) ABORT" CROSS: unstructured " ; \ : sys? ( sys -- sys ) dup 0= ?struc ; -: >mark ( -- sys ) T here ( dup ." M" hex. ) 0 , H ; - -: branchoffset ( src dest -- ) - tchar / ; \ ?? jaw +: >mark ( -- sys ) T here 0 , H ; -: >resolve ( sys -- ) - X here ( dup ." >" hex. ) over branchoffset swap X ! ; - -: body H compile ALiteral compile ! ;Cond -: IS T >address ' >body ! H ; +[ELSE] +Cond: ." '" parse tuck 2>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] + +X has? rom [IF] +Cond: IS cross-record-name T ' >body @ H compile ALiteral compile ! ;Cond +: IS cross-record-name T >address ' >body @ ! H ; +Cond: TO T ' >body @ H compile ALiteral compile ! ;Cond +: TO T ' >body @ ! H ; +Cond: CTO T ' >body H compile ALiteral compile ! ;Cond +: CTO T ' >body ! H ; +[ELSE] +Cond: IS cross-record-name T ' >body H compile ALiteral compile ! ;Cond +: IS cross-record-name T >address ' >body ! H ; Cond: TO T ' >body H compile ALiteral compile ! ;Cond : TO T ' >body ! H ; +[THEN] Cond: defers T ' >body @ compile, H ;Cond @@ -3168,14 +3349,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" Gforth4x" here over allot swap move bigendian 1+ \ strangely, in magic big=0, little=1 tcell 1 = 0 and or @@ -3189,6 +3370,7 @@ tchar 8 = 78 and or magic 7 + c! : save-cross ( "image-name" "binary-name" -- ) + .regions \ s" ec" X $has? IF .regions THEN bl parse ." Saving to " 2dup type cr w/o bin create-file throw >r s" header" X $has? IF @@ -3205,10 +3387,11 @@ magic 7 + c! ELSE bl parse 2drop THEN - image @ there + >rom dictionary >rmem @ there + s" rom" X $has? IF dictionary >rstart @ - THEN 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 ; @@ -3364,7 +3547,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 @@ -3451,17 +3634,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 @@ -3509,7 +3692,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 @@ -3600,15 +3783,21 @@ 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 ; +: linkstring ( addr u n addr -- ) + X here over X @ X , swap X ! X , ht-string, X align ; \ : . . ; : all-words ['] forced? IS skip? ; @@ -3624,6 +3813,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 ; @@ -3643,12 +3837,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] @@ -3664,7 +3858,6 @@ previous : bye bye ; \ dummy -: group 0 word drop ; \ turnkey direction : H forth ; immediate