Skip to content

Commit

Permalink
goforth, disasm: S" should be s" to match all other builtin words.
Browse files Browse the repository at this point in the history
  • Loading branch information
MostAwesomeDude committed May 9, 2012
1 parent d2db171 commit 7f6aeff
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions disasm.ft
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,9 @@

variable /disasm-pc
: disasm-pc@ ( -- u ) /disasm-pc @ 1 /disasm-pc +! ;
: "regs" S" abcxyzij" ;
: "regs" s" abcxyzij" ;
: reg ( reg -- ) "regs" drop + @ emit ;
: "opname" S" ---setaddsubmulmlidivdvimodmdiandborxorshrasrshlifbifcifeifnifgifaiflifu------adxsbx------stistd" ;
: "opname" s" ---setaddsubmulmlidivdvimodmdiandborxorshrasrshlifbifcifeifnifgifaiflifu------adxsbx------stistd" ;
: opname ( op -- ) 3 * "opname" drop + 3 type space ;
: disasm-op ( inst -- op ) 0x 1f and ;
: disasm-nextlit ( arg -- ea ) case
Expand All @@ -84,9 +84,9 @@ variable /disasm-pc
0 swap
endcase ;
: fetch-b ( inst -- arg ) 5 rshift 0x 1f and ;
: disasm-b ( inst -- pa pl ea arg ) S" push" rot fetch-b
: disasm-b ( inst -- pa pl ea arg ) s" push" rot fetch-b
dup disasm-nextlit swap ;
: disasm-a ( inst -- pa pl ea arg ) S" pop" rot 10 rshift
: disasm-a ( inst -- pa pl ea arg ) s" pop" rot 10 rshift
dup disasm-nextlit swap ;
: decode-arg ( pa pl ea arg -- ) case
0x 18 of drop 2dup type endof
Expand Down
6 changes: 3 additions & 3 deletions goforth.ft
Original file line number Diff line number Diff line change
Expand Up @@ -236,13 +236,13 @@
\ strings
: .( char ) parse type ; immediate

: S" compile litstring char " parse
: s" compile litstring char " parse
dup , \ compile the count
here \ save current compile location
swap dup allot \ advance it
move ; immediate \ copy the string

: ." [compile] S" compile type ; immediate
: ." [compile] s" compile type ; immediate


\ memory dump
Expand All @@ -266,7 +266,7 @@ variable quitword
: abort s0 @ dsp! quitword @ execute ;
\ abort" is similar, but prints a message and only fires if n is non-zero
: doabrt ( n a u -- ) rot if cr ." ABORT: " type abort else 2drop then ;
: abort" ( n -- ) [compile] S" compile doabrt ; immediate
: abort" ( n -- ) [compile] s" compile doabrt ; immediate


\ words to handle terminal attributes. see below for examples...
Expand Down

0 comments on commit 7f6aeff

Please sign in to comment.