--- gforth/cross.fs 2001/09/05 14:25:48 1.110 +++ gforth/cross.fs 2002/01/05 22:58:59 1.119 @@ -202,6 +202,13 @@ Create bases 10 , 2 , A , 100 , [THEN] +\ this provides assert( and struct stuff +\GFORTH [IFUNDEF] assert1( +\GFORTH also forth definitions require assert.fs previous +\GFORTH [THEN] + +>CROSS + hex \ the defualt base for the cross-compiler is hex !! \ Warnings off @@ -705,6 +712,7 @@ 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 -- ) @@ -891,10 +899,17 @@ 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 , ['] is-forward , - 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , ; + ghost-list linked , 0 , ['] NoExec , what's is-forward , + 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , ; : ghostheader ( -- ) (ghostheader) 0 , ; @@ -1007,10 +1022,13 @@ Variable reuse-ghosts reuse-ghosts off \ ' >ghostname ALIAS @name +: findghost ( "ghostname" -- ghost ) + bl word gfind 0= ABORT" CROSS: Ghost don't exists" ; + : [G'] ( -- ghost : name ) \G ticks a ghost and returns its address -\ bl word gfind 0= ABORT" CROSS: Ghost don't exists" - ghost state @ IF postpone literal THEN ; immediate + findghost + state @ IF postpone literal THEN ; immediate : g>xt ( ghost -- xt ) \G Returns the xt (cfa) of a ghost. Issues a warning if undefined. @@ -1041,32 +1059,42 @@ End-Struct addr-struct dup @ ?dup IF nip EXIT THEN addr-struct %allocerase tuck swap ! ; +>cross + \ Predefined ghosts 12dec92py +Ghost - drop \ need a ghost otherwise "-" would be treated as a number + Ghost 0= drop Ghost branch Ghost ?branch 2drop -Ghost (do) Ghost (?do) 2drop -Ghost (for) drop -Ghost (loop) Ghost (+loop) 2drop -Ghost (next) drop Ghost unloop Ghost ;S 2drop -Ghost lit Ghost (compile) Ghost ! 2drop drop -Ghost (does>) Ghost noop 2drop -Ghost (.") Ghost (S") Ghost (ABORT") 2drop drop -Ghost ' drop -Ghost :docol Ghost :doesjump Ghost :dodoes 2drop drop -Ghost :dovar drop +Ghost lit Ghost ! 2drop +Ghost noop drop Ghost over Ghost = Ghost drop 2drop drop -Ghost - drop Ghost 2drop drop Ghost 2dup drop +Ghost call drop +Ghost @ drop +Ghost useraddr drop +Ghost execute drop +Ghost + drop +Ghost decimal drop +Ghost hex drop +Ghost lit@ drop +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 ->cross \ we define it ans like... wordlist Constant target-environment @@ -1142,8 +1170,11 @@ true DefaultValue standardthreading s" relocate" T environment? H \ JAW why set NIL to this?! [IF] drop \ SetValue NIL -[ELSE] >ENVIRON T NIL H SetValue relocate +[ELSE] >ENVIRON X NIL SetValue relocate [THEN] +>TARGET + +0 Constant NIL >CROSS @@ -1224,6 +1255,10 @@ Variable mirrored-link \ linked : >rlen cell+ ; : >rstart ; +: (region) ( addr len region -- ) +\G change startaddress and length of an existing region + >r r@ last-defined-region ! + r@ >rlen ! dup r@ >rstart ! r> >rdp ! ; : region ( addr len -- ) \G create a new region @@ -1237,8 +1272,7 @@ Variable mirrored-link \ linked region-link linked 0 , 0 , 0 , bl word count string, ELSE \ store new parameters in region bl word drop - >body >r r@ last-defined-region ! - r@ >rlen ! dup r@ >rstart ! r> >rdp ! + >body (region) THEN ; : borders ( region -- startaddr endaddr ) @@ -1356,8 +1390,11 @@ T has? rom H \ MakeKernel 22feb99jaw -: makekernel ( targetsize -- targetsize ) - dup dictionary >rlen ! setup-target ; +: makekernel ( 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 ; >MINIMAL : makekernel makekernel ; @@ -1609,6 +1646,28 @@ T has? relocate H : A! swap >address swap dup relon T ! H ; : A, ( w -- ) >address T here H relon T , H ; +\ high-level ghosts + +>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 +Ghost (next) drop +Ghost (does>) Ghost (compile) 2drop +Ghost (.") Ghost (S") Ghost (ABORT") 2drop drop +Ghost (C") drop +Ghost ' drop + +\ ' prim-forward IS is-forward + +\ user ghosts + +Ghost state drop \ \ -------------------- Host/Target copy etc. 29aug01jaw @@ -1667,9 +1726,10 @@ 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 ]comp prim, comp[ tempdp> ; ' (cr) plugin-of colon-resolve +: (cr) >tempdp colon, tempdp> ; ' (cr) plugin-of colon-resolve : (ar) T ! H ; ' (ar) plugin-of addr-resolve : (dr) ( ghost res-pnt target-addr addr ) >tempdp drop over @@ -1681,7 +1741,7 @@ previous : (cm) ( -- addr ) T here align H - -1 prim, ; ' (cm) plugin-of colonmark, + -1 xt, ; ' (cm) plugin-of colonmark, >TARGET : compile, ( xt -- ) @@ -1707,7 +1767,9 @@ previous loadfile , sourceline# , space> - ; +; + +' (refered) IS do-refered : refered ( ghost tag -- ) \G creates a resolve structure @@ -1771,13 +1833,7 @@ Defer resolve-warning : prim-resolved ( ghost -- ) >link @ prim, ; -\ FIXME: not used currently -: does-resolved ( ghost -- ) - dup g>body alit, >do:ghost @ g>body colon, ; - -: (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 @@ -1798,7 +1854,10 @@ Defer resolve-warning swap >r r@ >link @ swap \ ( list tcfa R: ghost ) \ mark ghost as resolved dup r@ >link ! r@ >magic ! - r@ >comp @ ['] is-forward = IF + 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 @@ -1937,11 +1996,13 @@ Variable to-doc to-doc on \ Target TAGS creation s" kernel.TAGS" r/w create-file throw value tag-file-id +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-bof 1 c, 0C c, +Create tag-tab 1 c, 09 c, 2variable last-loadfilename 0 0 last-loadfilename 2! @@ -1955,13 +2016,13 @@ Create tag-bof 1 c, 0C c, s" ,0" tag-file-id write-line throw THEN ; -: cross-tag-entry ( -- ) +: cross-gnu-tag-entry ( -- ) 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 - tlast @ >image count 1F and tag-file-id write-file throw + Last-Header-Ghost @ >ghostname 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 @@ -1969,6 +2030,22 @@ Create tag-bof 1 c, 0C c, base ! THEN ; +: cross-vi-tag-entry ( -- ) + 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 + 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 ; + +: cross-tag-entry ( -- ) + cross-gnu-tag-entry + cross-vi-tag-entry ; + \ Check for words Defer skip? ' false IS skip? @@ -2077,6 +2154,7 @@ Variable aprim-nr -20 aprim-nr ! : copy-execution-semantics ( ghost-from ghost-dest -- ) >r dup >exec @ r@ >exec ! + dup >comp @ r@ >comp ! dup >exec2 @ r@ >exec2 ! dup >exec-compile @ r@ >exec-compile ! dup >ghost-xt @ r@ >ghost-xt ! @@ -2102,29 +2180,30 @@ Variable last-prim-ghost Defer setup-prim-semantics -: aprim ( -- ) +: mapprim ( "forthname" "asmlabel" -- ) THeader -1 aprim-nr +! aprim-nr @ T A, H asmprimname, setup-prim-semantics ; -: aprim: ( -- ) +: mapprim: ( "forthname" "asmlabel" -- ) -1 aprim-nr +! aprim-nr @ Ghost tuck swap resolve swap tuck >magic ! asmprimname, ; -: Alias: ( cfa -- ) \ name +: Doer: ( cfa -- ) \ name >in @ skip? IF 2drop EXIT THEN >in ! dup 0< s" prims" T $has? H 0= and IF .sourcepos ." needs doer: " >in @ bl word count type >in ! cr THEN - Ghost tuck swap resolve swap >magic ! ; + Ghost + tuck swap resolve swap >magic ! ; Variable prim# : first-primitive ( n -- ) prim# ! ; : Primitive ( -- ) \ name - >in @ skip? IF 2drop EXIT THEN >in ! - dup 0< s" prims" T $has? H 0= and + >in @ skip? IF drop EXIT THEN >in ! + s" prims" T $has? H 0= IF .sourcepos ." needs prim: " >in @ bl word count type >in ! cr THEN @@ -2167,8 +2246,7 @@ Comment ( Comment \ \ compile 10may93jaw : compile ( "name" -- ) \ name -\ bl word gfind 0= ABORT" CROSS: Can't compile " - ghost + findghost dup >exec-compile @ ?dup IF nip compile, ELSE postpone literal postpone gexecute THEN ; immediate restrict @@ -2190,7 +2268,8 @@ Cond: ['] T ' H alit, ;Cond : [T'] \ returns the target-cfa of a ghost, or compiles it as literal - postpone [G'] state @ IF postpone g>xt ELSE g>xt THEN ; immediate + postpone [G'] + state @ IF postpone g>xt ELSE g>xt THEN ; immediate \ \ threading modell 13dec92py \ modularized 14jun97jaw @@ -2214,10 +2293,10 @@ 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 compile :doesjump T 0 , H ; ' (doeshandler,) plugin-of doeshandler, + T cfalign H [G'] :doesjump addr, T 0 , H ; ' (doeshandler,) plugin-of doeshandler, : (dodoes,) ( does-action-ghost -- ) - ]comp [G'] :dodoes gexecute comp[ + ]comp [G'] :dodoes addr, comp[ addr, \ the relocator in the c engine, does not like the \ does-address to marked for relocation @@ -2315,6 +2394,7 @@ Cond: MAXI ;Cond >CROSS + \ Target compiling loop 12dec92py \ ">tib trick thrown out 10may93jaw \ number? defined at the top 11may93jaw @@ -2335,10 +2415,11 @@ Cond: MAXI IF 0> IF swap lit, THEN lit, discard ELSE 2drop restore-input throw Ghost gexecute THEN ; ->TARGET \ : ; DOES> 13dec92py \ ] 9may93py/jaw +>CROSS + : compiling-state ( -- ) \G set states to compililng Compiling comp-state ! @@ -2353,6 +2434,8 @@ Cond: MAXI IF >ghost-xt @ execute X off ELSE drop THEN Interpreting comp-state ! ; +>TARGET + : ] compiling-state BEGIN @@ -2406,8 +2489,8 @@ Cond: ; ( -- ) fini, comp[ ;Resolve @ - IF ;Resolve @ ;Resolve cell+ @ resolve - ['] colon-resolved ;Resolve @ >comp ! + IF ['] colon-resolved ;Resolve @ >comp ! + ;Resolve @ ;Resolve cell+ @ resolve THEN interpreting-state ;Cond @@ -2416,26 +2499,23 @@ Cond: [ ( -- ) interpreting-state ;Cond >CROSS -Create GhostDummy ghostheader - GhostDummy >magic ! +0 Value created : !does ( does-action -- ) -\ !! zusammenziehen und dodoes, machen! tlastcfa @ [G'] :dovar killref -\ tlastcfa @ dup there >r tdp ! compile :dodoes r> tdp ! T cell+ ! H ; -\ !! geht so nicht, da dodoes, ghost will! - GhostDummy >link ! GhostDummy - tlastcfa @ >tempdp dodoes, tempdp> ; - + >space here >r ghostheader space> + r@ created >do:ghost ! r@ swap resolve + r> tlastcfa @ >tempdp dodoes, tempdp> ; Defer instant-interpret-does>-hook +: does-resolved ( ghost -- ) + compile does-exec g>xt T a, H ; + : resolve-does>-part ( -- ) \ resolve words made by builders Last-Header-Ghost @ >do:ghost @ ?dup - IF there resolve - \ TODO: set special DOES> resolver action here - THEN ; + IF there resolve THEN ; >TARGET Cond: DOES> @@ -2443,9 +2523,11 @@ Cond: DOES> resolve-does>-part ;Cond -: DOES> switchrom doeshandler, T here H !does - instant-interpret-does>-hook - depth T ] H ; +: DOES> + ['] does-resolved created >comp ! + switchrom doeshandler, T here H !does + instant-interpret-does>-hook + depth T ] H ; >CROSS \ Creation 01nov92py @@ -2463,7 +2545,6 @@ Cond: DOES> ghost to built built >created @ 0= IF built >created on - ['] prim-resolved built >comp ! THEN ; : gdoes, ( ghost -- ) @@ -2483,8 +2564,8 @@ Cond: DOES> ; : takeover-x-semantics ( S constructor-ghost new-ghost -- ) -\g stores execution semantic and compilation semantic in the built word - swap >do:ghost @ + \g stores execution semantic and compilation semantic in the built word + swap >do:ghost @ 2dup swap >do:ghost ! \ we use the >exec2 field for the semantic of a created word, \ using exec or exec2 makes no difference for normal cross-compilation \ but is usefull for instant where the exec field is already @@ -2492,12 +2573,20 @@ Cond: DOES> 2dup >exec @ swap >exec2 ! >comp @ swap >comp ! ; +0 Value createhere + +: create-resolve ( -- ) + created createhere resolve 0 ;Resolve ! ; +: create-resolve-immediate ( -- ) + create-resolve T immediate H ; + : TCreate ( -- ) create-forward-warn IF ['] reswarn-forward IS resolve-warning THEN executed-ghost @ (Theader - dup >created on - 2dup takeover-x-semantics hereresolve gdoes, ; + dup >created on dup to created + 2dup takeover-x-semantics + there to createhere drop gdoes, ; : RTCreate ( -- ) \ creates a new word with code-field in ram @@ -2505,14 +2594,14 @@ Cond: DOES> IF ['] reswarn-forward IS resolve-warning THEN \ make Alias executed-ghost @ (THeader - dup >created on + dup >created on dup to created 2dup takeover-x-semantics there 0 T a, H alias-mask flag! \ store poiter to code-field switchram T cfalign H there swap T ! H there tlastcfa ! - hereresolve gdoes, ; + there to createhere drop gdoes, ; : Build: ( -- [xt] [colon-sys] ) :noname postpone TCreate ; @@ -2526,7 +2615,11 @@ Cond: DOES> [ [THEN] ] ; : ;Build - postpone ; built >exec ! ; immediate + postpone create-resolve postpone ; built >exec ! ; immediate + +: ;Build-immediate + postpone create-resolve-immediate + postpone ; built >exec ! ; immediate : gdoes> ( ghost -- addr flag ) executed-ghost @ g>body ; @@ -2651,7 +2744,7 @@ BuildSmart: ( -- ) [T'] noop T A, H ;Bu by: :dodefer ( ghost -- ) X @ texecute ;DO Builder interpret/compile: -Build: ( inter comp -- ) swap T immediate A, A, H ;Build +Build: ( inter comp -- ) swap T A, A, H ;Build-immediate DO: ( ghost -- ) ABORT" CROSS: Don't execute" ;DO \ Sturctures 23feb95py @@ -2704,7 +2797,14 @@ DO: abort" Not in cross mode" ;DO T has? peephole H [IF] >CROSS + : (callc) compile call T >body a, H ; ' (callc) plugin-of colon, +: (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, \ if we want this, we have to spilt aconstant \ and constant!! @@ -2712,23 +2812,32 @@ T has? peephole H [IF] \ compile: g>body X @ lit, ;compile Builder (Constant) -compile: g>body alit, compile @ ;compile +compile: g>body compile lit@ T a, H ;compile Builder (Value) -compile: g>body alit, compile @ ;compile +compile: g>body compile lit@ T a, H ;compile \ this changes also Variable, AVariable and 2Variable Builder Create -\ compile: g>body alit, ;compile +compile: g>body alit, ;compile Builder User compile: g>body compile useraddr T @ , H ;compile Builder Defer -compile: g>body alit, compile @ compile execute ;compile +compile: g>body compile lit-perform T A, H ;compile Builder (Field) -compile: g>body T @ H lit, compile + ;compile +compile: g>body T @ H compile lit+ T , H ;compile + +Builder interpret/compile: +compile: does-resolved ;compile + +Builder input-method +compile: does-resolved ;compile + +Builder input-var +compile: does-resolved ;compile [THEN] @@ -3004,7 +3113,7 @@ magic 7 + c! : save-cross ( "image-name" "binary-name" -- ) bl parse ." Saving to " 2dup type cr w/o bin create-file throw >r - TNIL IF + s" header" X $has? IF s" #! " r@ write-file throw bl parse r@ write-file throw s" --image-file" r@ write-file throw @@ -3020,7 +3129,7 @@ magic 7 + c! THEN image @ there r@ write-file throw \ write image - TNIL IF + s" relocate" X $has? IF bit$ @ there 1- tcell>bit rshift 1+ r@ write-file throw \ write tags THEN @@ -3085,6 +3194,7 @@ Create name-buf 200 chars allot THEN @nb ; +\ FIXME why disabled?! : label-from-ghostnameXX ( ghost -- addr len ) \ same as (label-from-ghostname) but caches generated names dup >asm-name @ ?dup IF nip count EXIT THEN @@ -3506,6 +3616,3 @@ UNLOCK >CROSS [IFDEF] extend-cross extend-cross [THEN] LOCK - - -