--- gforth/see.fs 1996/08/26 10:07:21 1.14 +++ gforth/see.fs 1997/06/01 20:50:39 1.17 @@ -50,6 +50,7 @@ VARIABLE Level : level- -7 Level +! ; VARIABLE nlflag +VARIABLE uppercase \ structure words are in uppercase DEFER nlcount ' noop IS nlcount @@ -68,8 +69,14 @@ DEFER nlcount ' noop IS nlcount nlflag @ IF (nl) nlflag off THEN XPos @ over + cols u>= IF (nl) THEN ; +: c-to-upper + dup [char] a >= over [char] z <= and if bl - then ; + : ctype ( adr len -- ) - warp? dup XPos +! C-Output @ IF type ELSE 2drop THEN ; + warp? dup XPos +! C-Output @ + IF uppercase @ IF bounds ?DO i c@ c-to-upper emit LOOP + uppercase off ELSE type THEN + ELSE 2drop THEN ; : cemit 1 warp? over bl = Level @ XPos @ = and @@ -98,9 +105,10 @@ VARIABLE Colors Colors on ' (.string) IS .string -: .struc Str# .string ; +: .struc + uppercase on Str# .string ; -\ CODES 15may93jaw +\ CODES (Branchtypes) 15may93jaw 21 CONSTANT RepeatCode 22 CONSTANT AgainCode @@ -110,21 +118,30 @@ VARIABLE Colors Colors on 11 CONSTANT AheadCode 13 CONSTANT WhileCode2 14 CONSTANT Disable +15 CONSTANT LeaveCode + \ FORMAT WORDS 13jun93jaw VARIABLE C-Stop VARIABLE Branches -VARIABLE BranchPointer +VARIABLE BranchPointer \ point to the end of branch table VARIABLE SearchPointer + +\ The branchtable consists of three entrys: +\ address of branch , branch destination , branch type + CREATE BranchTable 500 allot here 3 cells - ACONSTANT MaxTable : FirstBranch BranchTable cell+ SearchPointer ! ; -: (BranchAddr?) ( a-addr -- a-addr true | false ) +: (BranchAddr?) ( a-addr1 -- a-addr2 true | false ) +\ searches a branch with destination a-addr1 +\ a-addr1: branch destination +\ a-addr2: pointer in branch table SearchPointer @ BEGIN dup BranchPointer @ u< WHILE @@ -153,6 +170,20 @@ ACONSTANT MaxTable 2drop true THEN ; +: MyBranch ( a-addr -- a-addr a-addr2 ) +\ finds branch table entry for branch at a-addr + dup @ over + + BranchAddr? + BEGIN + WHILE 1 cells - @ + over <> + WHILE dup @ over + + MoreBranchAddr? + REPEAT + SearchPointer @ 3 cells - + ELSE true ABORT" SEE: Table failure" + THEN ; + \ \ addrw addrt \ BEGIN ... WHILE ... AGAIN ... THEN @@ -216,46 +247,6 @@ VARIABLE C-Pass THEN cell+ ; -: c-@local# - Display? IF - S" @local" 0 .string - dup @ dup 1 cells / abs 0 <# #S rot sign #> 0 .string bl cemit - THEN - cell+ ; - -: c-flit - Display? IF - dup f@ scratch represent 0= - IF 2drop scratch 3 min 0 .string - ELSE - IF '- cemit THEN 1- - scratch over c@ cemit '. cemit 1 /string 0 .string - 'E cemit - dup abs 0 <# #S rot sign #> 0 .string bl cemit - THEN THEN - float+ ; - -: c-f@local# - Display? IF - S" f@local" 0 .string - dup @ dup 1 floats / abs 0 <# #S rot sign #> 0 .string bl cemit - THEN - cell+ ; - -: c-laddr# - Display? IF - S" laddr# " 0 .string - dup @ dup abs 0 <# #S rot sign #> 0 .string bl cemit - THEN - cell+ ; - -: c-lp+!# - Display? IF - S" lp+!# " 0 .string - dup @ dup abs 0 <# #S rot sign #> 0 .string bl cemit - THEN - cell+ ; - : c-s" count 2dup + aligned -rot Display? @@ -282,13 +273,15 @@ VARIABLE C-Pass THEN ; -: Forward? ( a-addr true | false -- ) +: Forward? ( a-addr true | false -- a-addr true | false ) +\ a-addr1 is pointer into branch table +\ returns true when jump is a forward jump IF dup dup @ swap 1 cells - @ - Ahead? IF true ELSE drop false THEN \ only if forward jump ELSE false THEN ; -: RepeatCheck +: RepeatCheck ( a-addr1 a-addr2 true | false -- false ) IF BEGIN 2dup 1 cells - @ swap dup @ + u<= @@ -327,13 +320,17 @@ VARIABLE C-Pass IF drop S" REPEAT " .struc nl ELSE S" AGAIN " .struc nl THEN - ELSE dup cell+ BranchAddr? Forward? - IF dup cell+ @ WhileCode2 = - IF nl S" ELSE" .struc level+ - ELSE level- nl S" ELSE" .struc level+ THEN - cell+ Disable swap ! - ELSE S" AHEAD" .struc level+ - THEN + ELSE MyBranch cell+ @ LeaveCode = + IF S" LEAVE " .struc + ELSE + dup cell+ BranchAddr? Forward? + IF dup cell+ @ WhileCode2 = + IF nl S" ELSE" .struc level+ + ELSE level- nl S" ELSE" .struc level+ THEN + cell+ Disable swap ! + ELSE S" AHEAD" .struc level+ + THEN + THEN THEN THEN Debug? @@ -341,19 +338,6 @@ VARIABLE C-Pass ELSE cell+ THEN ; -: MyBranch ( a-addr -- a-addr a-addr2 ) - dup @ over + - BranchAddr? - BEGIN - WHILE 1 cells - @ - over <> - WHILE dup @ over + - MoreBranchAddr? - REPEAT - SearchPointer @ 3 cells - - ELSE true ABORT" SEE: Table failure" - THEN ; - : DebugBranch Debug? IF dup @ over + swap THEN ; \ return 2 different addresses @@ -376,59 +360,40 @@ VARIABLE C-Pass level- nl S" WHILE " .struc level+ - ELSE nl S" IF " .struc level+ + ELSE MyBranch cell+ @ LeaveCode = + IF s" 0= ?LEAVE " .struc + ELSE nl S" IF " .struc level+ + THEN THEN THEN THEN DebugBranch cell+ ; -: c-?branch-lp+!# c-?branch cell+ ; -: c-branch-lp+!# c-branch cell+ ; - -: c-do - Display? IF nl S" DO" .struc level+ THEN ; - -: c-?do - Display? IF nl S" ?DO" .struc level+ THEN - DebugBranch cell+ ; - : c-for Display? IF nl S" FOR" .struc level+ THEN ; -: c-next - Display? IF level- nl S" NEXT " .struc nl THEN - DebugBranch cell+ cell+ ; +: .name-without +\ prints a name without () e.g. (+LOOP) + dup 1 cells - @ look IF name>string 1 /string 1- .struc ELSE drop THEN ; : c-loop - Display? IF level- nl S" LOOP " .struc nl THEN - DebugBranch cell+ cell+ ; + Display? IF level- nl .name-without bl cemit nl THEN + DebugBranch cell+ + Scan? + IF dup BranchAddr? + BEGIN WHILE cell+ LeaveCode swap ! + dup MoreBranchAddr? + REPEAT + THEN + cell+ ; -: c-+loop - Display? IF level- nl S" +LOOP " .struc nl THEN - DebugBranch cell+ cell+ ; - -: c-s+loop - Display? IF level- nl S" S+LOOP " .struc nl THEN - DebugBranch cell+ cell+ ; - -: c--loop - Display? IF level- nl S" -LOOP " .struc nl THEN - DebugBranch cell+ cell+ ; - -: c-next-lp+!# c-next cell+ ; -: c-loop-lp+!# c-loop cell+ ; -: c-+loop-lp+!# c-+loop cell+ ; -: c-s+loop-lp+!# c-s+loop cell+ ; -: c--loop-lp+!# c--loop cell+ ; - -: c-leave - Display? IF S" LEAVE " .struc THEN - Debug? IF dup @ + THEN cell+ ; - -: c-?leave - Display? IF S" ?LEAVE " .struc THEN - cell+ DebugBranch swap cell+ swap cell+ ; +: c-do + Display? IF nl .name-without level+ THEN ; + +: c-?do + Display? IF nl S" ?DO" .struc level+ THEN + DebugBranch cell+ ; : c-exit dup 1 cells - CheckEnd @@ -454,59 +419,56 @@ VARIABLE C-Pass CREATE C-Table ' lit A, ' c-lit A, - ' @local# A, ' c-@local# A, - ' flit A, ' c-flit A, - ' f@local# A, ' c-f@local# A, - ' laddr# A, ' c-laddr# A, - ' lp+!# A, ' c-lp+!# A, ' (s") A, ' c-s" A, ' (.") A, ' c-." A, ' "lit A, ' c-c" A, - comp' leave drop A, ' c-leave A, - comp' ?leave drop A, ' c-?leave A, ' (do) A, ' c-do A, + ' (+do) A, ' c-do A, + ' (u+do) A, ' c-do A, + ' (-do) A, ' c-do A, + ' (u-do) A, ' c-do A, ' (?do) A, ' c-?do A, ' (for) A, ' c-for A, ' ?branch A, ' c-?branch A, ' branch A, ' c-branch A, ' (loop) A, ' c-loop A, - ' (+loop) A, ' c-+loop A, - ' (s+loop) A, ' c-s+loop A, - ' (-loop) A, ' c--loop A, - ' (next) A, ' c-next A, - ' ?branch-lp+!# A, ' c-?branch-lp+!# A, - ' branch-lp+!# A, ' c-branch-lp+!# A, - ' (loop)-lp+!# A, ' c-loop-lp+!# A, - ' (+loop)-lp+!# A, ' c-+loop-lp+!# A, - ' (s+loop)-lp+!# A, ' c-s+loop-lp+!# A, - ' (-loop)-lp+!# A, ' c--loop-lp+!# A, - ' (next)-lp+!# A, ' c-next-lp+!# A, + ' (+loop) A, ' c-loop A, + ' (s+loop) A, ' c-loop A, + ' (-loop) A, ' c-loop A, + ' (next) A, ' c-loop A, ' ;s A, ' c-exit A, ' (does>) A, ' c-does> A, ' (abort") A, ' c-abort" A, ' (compile) A, ' c-(compile) A, - 0 , + 0 , here 0 , + +avariable c-extender +c-extender ! \ DOTABLE 15may93jaw : DoTable ( cfa -- flag ) C-Table - BEGIN dup @ dup - WHILE 2 pick <> + BEGIN dup @ dup 0= + IF drop cell+ @ dup + IF ( next table!) dup @ ELSE + ( end!) 2drop false EXIT THEN + THEN + \ jump over to extender, if any 26jan97jaw + 2 pick <> WHILE 2 cells + REPEAT nip cell+ perform true - ELSE - 2drop drop false - THEN ; + ; : BranchTo? ( a-addr -- a-addr ) - Display? IF dup BranchAddr? - IF BEGIN cell+ @ dup 20 u> + Display? IF dup BranchAddr? + IF + BEGIN cell+ @ dup 20 u> IF drop nl S" BEGIN " .struc level+ ELSE - dup Disable <> + dup Disable <> over LeaveCode <> and IF WhileCode2 = IF nl S" THEN " .struc nl ELSE level- nl S" THEN " .struc nl THEN @@ -523,7 +485,10 @@ CREATE C-Table dup >r DoTable r> swap IF drop EXIT THEN Display? IF look 0= IF drop dup 1 cells - @ . \ ABORT" SEE: Bua!" - ELSE dup cell+ count 31 and rot wordinfo .string THEN bl cemit + ELSE + dup cell+ count dup immediate-mask and + IF bl cemit ." POSTPONE " THEN + 31 and rot wordinfo .string THEN bl cemit ELSE drop THEN ; @@ -594,7 +559,7 @@ IS discode S" DOES> " Com# .string XPos @ Level ! >does-code see-threaded ; : seecol ( xt -- ) - dup s" :" .defname cr + dup s" :" .defname nl 2 Level ! >body see-threaded ; : seefield ( xt -- )