Thread: [Win32forth-cvs] win32forth-stc/src dis486.f,1.1,1.2

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/win32forth/win32forth-stc/src
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv23151

Modified Files:
	dis486.f 
Log Message:
arm: correct spacing on output, support REST and SEE

Index: dis486.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth-stc/src/dis486.f,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** dis486.f	21 Sep 2006 16:26:33 -0000	1.1
--- dis486.f	27 Sep 2006 21:01:56 -0000	1.2
***************
*** 101,105 ****
  : cmnt-col 60 col ; \ set to comment field
  
! : .ss     ( n adr len w ) oper-col >r drop swap r@ * + r> type ;
  : .#      ( -- )          ." # " ;
  : .,      ( -- )          ." , " ;
--- 101,105 ----
  : cmnt-col 60 col ; \ set to comment field
  
! : .ss     ( n adr len w ) oper-col >r drop swap r@ * + r> type opnd-col ;
  : .#      ( -- )          ." # " ;
  : .,      ( -- )          ." , " ;
***************
*** 366,370 ****
  \ -------------------- ALU Opcodes --------------------
  
! : .alu  ( n -- )            bits3-5 S" addor adcsbbandsubxorcmp" 3 .ss opnd-col ;
  : alu   ( adr op -- adr' )  dup .alu r/m() ;
  
--- 366,370 ----
  \ -------------------- ALU Opcodes --------------------
  
! : .alu  ( n -- )            bits3-5 S" addor adcsbbandsubxorcmp" 3 .ss ;
  : alu   ( adr op -- adr' )  dup .alu r/m() ;
  
***************
*** 388,392 ****
  
  : txb   ( addr op -- addr' )
!         dup bits0-1 S" testtestxchgxchg" 4 .ss opnd-col
          1 and
          IF      1 to dis.size r,r/m()     \ SMuB removed COUNT
--- 388,392 ----
  
  : txb   ( addr op -- addr' )
!         dup bits0-1 S" testtestxchgxchg" 4 .ss
          1 and
          IF      1 to dis.size r,r/m()     \ SMuB removed COUNT
***************
*** 508,512 ****
  : .jxx ( addr op -- addr' ) oper-col ." j" .cnd-code(op) opnd-col ;
  : bra  ( addr op -- addr' ) .jxx .rel8 ;
! : lup  ( addr op -- addr' ) bits0-1 S" loopnzloopz loop  jecxz " 6 .ss opnd-col .rel8 ;
  : lbr  ( addr op -- addr' ) .jxx .rel16/32 ;
  : rtn  ( addr op -- addr' ) .sop" ret"     ." near " 1 and 0= IF wCount $. THEN ;
--- 508,512 ----
  : .jxx ( addr op -- addr' ) oper-col ." j" .cnd-code(op) opnd-col ;
  : bra  ( addr op -- addr' ) .jxx .rel8 ;
! : lup  ( addr op -- addr' ) bits0-1 S" loopnzloopz loop  jecxz " 6 .ss .rel8 ;
  : lbr  ( addr op -- addr' ) .jxx .rel16/32 ;
  : rtn  ( addr op -- addr' ) .sop" ret"     ." near " 1 and 0= IF wCount $. THEN ;
***************
*** 543,547 ****
  \ -------------------- Shifts & Rotates --------------------
  
! : .shift ( n -- ) bits0-2 S" rolrorrclrcrshlshrxxxsar" 3 .ss opnd-col ;
  
  
--- 543,547 ----
  \ -------------------- Shifts & Rotates --------------------
  
! : .shift ( n -- ) bits0-2 S" rolrorrclrcrshlshrxxxsar" 3 .ss ;
  
  
***************
*** 605,613 ****
          THEN ;
  
! : falu1   ( xopcode -- )   bits3-5 S" fadd fmul fcom fcompfsub fsubrfdiv fdivr"         5 .ss opnd-col ;
! : falu3   ( op -- )        bits3-5 S" fiadd fimul ficom ficompfisub fisubrfidiv fidivr" 6 .ss opnd-col ;
! : falu5   ( xopcode -- )   bits3-5 s" fadd fmul ???? ???? fsubrfsub fdivrfdiv "         5 .ss opnd-col ;
! : falu6   ( op -- )        bits3-5 s" ffree ???   fst   fstp  fucom fucomp???   ???   " 6 .ss opnd-col ;
! : falu7   ( op -- )        bits3-5 S" faddp fmulp ???   ???   fsubrpfsubp fdivrpfdivp " 6 .ss opnd-col ;
  
  : sti.   ( op -- )         bits0-2 ." st(" 1 .r ." )" ;
--- 605,613 ----
          THEN ;
  
! : falu1   ( xopcode -- )   bits3-5 S" fadd fmul fcom fcompfsub fsubrfdiv fdivr"         5 .ss ;
! : falu3   ( op -- )        bits3-5 S" fiadd fimul ficom ficompfisub fisubrfidiv fidivr" 6 .ss ;
! : falu5   ( xopcode -- )   bits3-5 s" fadd fmul ???? ???? fsubrfsub fdivrfdiv "         5 .ss ;
! : falu6   ( op -- )        bits3-5 s" ffree ???   fst   fstp  fucom fucomp???   ???   " 6 .ss ;
! : falu7   ( op -- )        bits3-5 S" faddp fmulp ???   ???   fsubrpfsubp fdivrpfdivp " 6 .ss ;
  
  : sti.   ( op -- )         bits0-2 ." st(" 1 .r ." )" ;
***************
*** 637,641 ****
             S" fprem  fyl2xp1fsqrt  fsincosfrndintfscale fsin   fcos   "
          THEN
!         7 .ss opnd-col ;
  
  : fnullary-e   ( op -- )
--- 637,641 ----
             S" fprem  fyl2xp1fsqrt  fsincosfrndintfscale fsin   fcos   "
          THEN
!         7 .ss ;
  
  : fnullary-e   ( op -- )
***************
*** 646,650 ****
             S" fld1   fldl2t fldl2e fldpi  fldlg2 fldln2 fldz   ???    "
          THEN
!         7 .ss opnd-col ;
  
  : fnullary   ( op -- )
--- 646,650 ----
             S" fld1   fldl2t fldl2e fldpi  fldlg2 fldln2 fldz   ???    "
          THEN
!         7 .ss ;
  
  : fnullary   ( op -- )
***************
*** 712,716 ****
  : fcmovb  ( op -- )
          bits3-5
!         S" fcmovnb fcmovne fcmovnbefcmovnu ???     fucomi  fcomi   ???     " 8 .ss opnd-col ;
  
  : fdb   ( addr op -- addr' )
--- 712,716 ----
  : fcmovb  ( op -- )
          bits3-5
!         S" fcmovnb fcmovne fcmovnbefcmovnu ???     fucomi  fcomi   ???     " 8 .ss ;
  
  : fdb   ( addr op -- addr' )
***************
*** 771,778 ****
  
  : gp6 ( addr op -- addr' )
!         drop count dup bits3-5 S" sldtstr lldtltr verrverw??? ???" 4 .ss opnd-col r/m16(ModR/M) ;
  
  : gp7 ( addr op -- addr' )
!         drop count dup bits3-5 dup S" sgdt  sidt  lgdt  lidt  smsw  ???   lmsw  invlpg" 6 .ss opnd-col
          4 and 4 =
          if   r/m16(ModR/M)
--- 771,778 ----
  
  : gp6 ( addr op -- addr' )
!         drop count dup bits3-5 S" sldtstr lldtltr verrverw??? ???" 4 .ss r/m16(ModR/M) ;
  
  : gp7 ( addr op -- addr' )
!         drop count dup bits3-5 dup S" sgdt  sidt  lgdt  lidt  smsw  ???   lmsw  invlpg" 6 .ss
          4 and 4 =
          if   r/m16(ModR/M)
***************
*** 780,784 ****
          then ;
  
! : .btx(XXXN-NXXX)  ( n -- )   bits3-4 S" bt btsbtrbtc" 3 .ss opnd-col ;
  
  : gp8 ( addr op -- addr' )
--- 780,784 ----
          then ;
  
! : .btx(XXXN-NXXX)  ( n -- )   bits3-4 S" bt btsbtrbtc" 3 .ss ;
  
  : gp8 ( addr op -- addr' )
***************
*** 887,891 ****
  \ --------------------- MMX Operations -----------------
  
! : mmx-size ( op -- ) bits0-1 S" bwdq" 1 .ss opnd-col ;
  
  
--- 887,891 ----
  \ --------------------- MMX Operations -----------------
  
! : mmx-size ( op -- ) bits0-1 S" bwdq" 1 .ss ;
  
  
***************
*** 1070,1080 ****
  : rest          ( -- )
                  begin
!                   cr
!                   dup next?                    \ NEXT ?
                  while
!                   inst
                    start/stop
                  repeat
!                 dis-loc .sop" next" ." ;c" cmnt-col ."  \ end of word sequence"
                  ;
  
--- 1070,1090 ----
  : rest          ( -- )
                  begin
!                   dup cr inst
!                   start/stop
!                   swap next? 0=                \ NEXT ?
!                 until drop
!                 ;
! 
! : see           ( -- )
!                 defined ?missing
!                 dup xt>name n>ofa w@ over +    \ length to disassemble
!                 swap
!                 begin
!                   2dup - 0> over next? 0= or   \ anything left?
                  while
!                   cr inst
                    start/stop
                  repeat
!                 ."  ( end )" 2drop
                  ;
  
***************
*** 1086,1090 ****
  
  : rest rest ;
! : see  defined ?missing rest ;
  
  ONLY FORTH ALSO DEFINITIONS
--- 1096,1100 ----
  
  : rest rest ;
! : see  see  ;
  
  ONLY FORTH ALSO DEFINITIONS

Thread: [Win32forth-cvs] win32forth-stc/src dis486.f,1.1,1.2

win32forth-cvs