--- gforth/arch/mips/disasm.fs	2000/06/03 07:56:03	1.6
+++ gforth/arch/mips/disasm.fs	2000/06/11 11:06:23	1.9
@@ -23,6 +23,13 @@
 \ particular pages A3, A181, A182 (p. 471, 649, 650 in xpdf).
 \ it is limited to the R3000 (MIPS-I) architecture, though.
 
+\ test this with
+\ gforth arch/mips/disasm.fs -e "here" arch/mips/testdisasm.fs -e "here over - disasm bye" |sed 's/([^)]*) //'|diff -u - arch/mips/testasm.fs
+
+get-current
+vocabulary disassembler
+also disassembler definitions
+
 \ instruction fields
 
 : disasm-op ( w -- u )
@@ -80,17 +87,21 @@ $40 disasm-table cp0-tab-entry     \ COP
 
 \ disassembler central decode cascade
 
+dup set-current
+
 : disasm-inst ( addr w -- )
     \G disassemble instruction w at addr (addr is used for computing
     \G branch targets)
     dup disasm-op opc-tab-entry @ execute ;
 
-: disasm-dump ( addr u -- ) \ gforth
+: disasm ( addr u -- ) \ gforth
     \G disassemble u aus starting at addr
     bounds u+do
 	cr ." ( " i hex. ." ) " i i @ disasm-inst
 	1 cells +loop ;
 
+definitions
+
 : disasm-special ( addr w -- )
     \ disassemble inst with opcode special
     dup disasm-funct funct-tab-entry @ execute ;
@@ -128,7 +139,7 @@ $40 disasm-table cp0-tab-entry     \ COP
 
 : disasm-J-target ( addr w -- )
     \ print jump target
-    $03ffffff and swap $fc000000 and or 2 lshift hex. ;
+    2 lshift $0fffffff and swap $f0000000 and or hex. ;
 
 : disasm-I-rs,rt,imm ( addr w -- )
     dup disasm-rs .
@@ -266,3 +277,5 @@ does> ( addr w -- )
     drop nip asm-copz-imm1 ;
 
 include ./insts.fs
+
+previous set-current