Multiple fixes for 020+ mode, including:

[rmac] / 68ktab

diff --git a/68ktab b/68ktab
index e250bf75b64b4013625ed358d6b0b9bfe28bc785..2410ad50d0824370ed77501d6fca43326719d5d4 100644 (file)
--- a/68ktab
+++ b/68ktab
@@ -71,14 +71,15 @@ bclr  NL     M_DREG          M_DREG          %0000rrr110eeeeee   m_bitop  +
 -     NL     M_IMMED         M_DREG          %0000100010eeeeee   m_bitop  +
 -     NB     M_IMMED         C_ALTDATA       %0000100010eeeeee   m_bitop
 
-bfchg N      C_ALL030+M_BITFLD M_AM_NONE     %1110101011eeeeee   m_bfop
-bfclr N      C_ALL030+M_BITFLD M_AM_NONE     %1110110011eeeeee   m_bfop
-bfexts N     C_ALL030+M_BITFLD M_DREG        %1110101111eeeeee   m_bfop
-bfextu N     C_ALL030+M_BITFLD M_DREG        %1110100111eeeeee   m_bfop
-bfffo N      C_ALL030+M_BITFLD M_DREG        %1110110111eeeeee   m_bfop
-bfins N      M_DREG        C_ALL030+M_BITFLD %1110111111eeeeee   m_bfop
-bfset N      C_ALL030+M_BITFLD M_AM_NONE     %1110111011eeeeee   m_bfop
-bftst N      C_ALL030+M_BITFLD M_AM_NONE     %1110100011eeeeee   m_bfop
+bfchg N      C_BF1+M_BITFLD  M_AM_NONE       %1110101011eeeeee   m_bfop
+bfclr N      C_BF1+M_BITFLD  M_AM_NONE       %1110110011eeeeee   m_bfop
+bfexts N     C_BF2+M_BITFLD  M_DREG          %1110101111eeeeee   m_bfop
+bfextu N     C_BF2+M_BITFLD  M_DREG          %1110100111eeeeee   m_bfop
+bfffo N      C_BF2+M_BITFLD  M_DREG          %1110110111eeeeee   m_bfop
+bfins N      M_DREG          C_BF1+M_BITFLD  %1110111111eeeeee   m_bfop
+bfset N      C_BF1+M_BITFLD  M_AM_NONE       %1110111011eeeeee   m_bfop
+bftst N      C_BF2+M_BITFLD  M_AM_NONE       %1110100011eeeeee   m_bfop
+
 bkpt  N      M_IMMED         M_AM_NONE       %0100100001001bbb   m_bkpt
 
 bra   NBWS   C_LABEL         M_AM_NONE       %01100000bbbbbbbb   m_br +
@@ -106,9 +107,9 @@ cas2  !      M_AM_NONE       M_AM_NONE       %00001ss011111100   m_cas2
 chk   NW     C_DATA          M_DREG          %0100rrr110eR1000   m_ea +
 -     L      C_DATA030       M_DREG          %0100rrr100eeeeee   m_ea030
 
-cinvl N      CACHES          M_AIND          %11110100cc001rrr   m_cinv
-cinvp N      CACHES          M_AIND          %11110100cc010rrr   m_cinv
-cinva N      CACHES          M_AM_NONE       %11110100cc011rrr   m_cinv
+cinvl N      M_CACHE40       M_AIND          %11110100cc001rrr   m_cinv
+cinvp N      M_CACHE40       M_AIND          %11110100cc010rrr   m_cinv
+cinva N      M_CACHE40       M_AM_NONE       %11110100cc011rrr   m_cinv
 
 chk2  NBWL   C_DATA          M_DREG+M_AREG   %00000ss011eeeeee   m_chk2
 
@@ -159,7 +160,7 @@ cpbst NBW    C_LABEL         M_AM_NONE       %111100101s011111   m_cpbr
 cpbseq NBW   C_LABEL         M_AM_NONE       %111100101s010001   m_cpbr
 cpbsne NBW   C_LABEL         M_AM_NONE       %111100101s011110   m_cpbr
 
-cpdbeq NBW   M_DREG          C_LABEL         %111100101s000001   m_cpbr
+cpdbeq NBW   M_DREG          C_LABEL         %111100101s000001   m_cpdbr
 cpdbze
 cpdbz
 cpdbge NBW   M_DREG          C_LABEL         %111100101s010011   m_cpdbr
@@ -402,7 +403,7 @@ fmod   NBWLSQXP C_ALL030     M_FREG          %1111001000eeeeee   m_fmod   +
 -      NX       M_FREG       M_AM_NONE       %1111001000eeeeee   m_fmod
 fmove  NBWLSQXP C_ALL030     M_FREG          %1111001000eeeeee   m_fmove +
 -      NBWLSQXP M_FREG       C_ALL030        %1111001000eeeeee   m_fmove +
--      NBWLSQXP M_FREG       M_FREG          %1111001000eeeeee   m_fmove +
+-      NX       M_FREG       M_FREG          %1111001000eeeeee   m_fmove +
 -      NL       M_FPSCR      C_ALL030        %1111001000eeeeee   m_fmovescr +
 -      NL       C_ALL030     M_FPSCR         %1111001000eeeeee   m_fmovescr +
 fsmove NBWLSQXP C_ALL030     M_FREG          %1111001000eeeeee   m_fsmove
@@ -502,7 +503,7 @@ ftentox NBWLSQXP C_ALL030    M_FREG          %1111001000eeeeee   m_ftentox   +
 -       NX       M_FREG      M_FREG          %1111001000eeeeee   m_ftentox   +
 -       NX       M_FREG      M_AM_NONE       %1111001000eeeeee   m_ftentox
 ftst  NBWLSQXP C_ALL030      M_AM_NONE       %1111001000eeeeee   m_ftst +
--      X          M_FREG      M_AM_NONE       %1111001000eeeeee  m_ftst
+-     NX         M_FREG      M_AM_NONE       %1111001000eeeeee   m_ftst
 ftwotox NBWLSQXP C_ALL030    M_FREG          %1111001000eeeeee   m_ftwotox   +
 -       NX       M_FREG      M_FREG          %1111001000eeeeee   m_ftwotox   +
 -       NX       M_FREG      M_AM_NONE       %1111001000eeeeee   m_ftwotox
@@ -583,7 +584,8 @@ illegal N    M_AM_NONE       M_AM_NONE       %0100101011111100   m_self
 jmp   N      C_CTRL          M_AM_NONE       %0100111011eee000   m_ea     +
 -     N      C_CTRL030       M_AM_NONE       %0100111011eee000   m_ea030
 
-jsr   N      C_CTRL          M_AM_NONE       %0100111010eee000   m_ea
+jsr   N      C_CTRL          M_AM_NONE       %0100111010eee000   m_ea     +
+-     N      C_CTRL030       M_AM_NONE       %0100111010eee000   m_ea030
 
 lea   NL     C_CTRL          M_AREG          %0100rrr111eR1000   m_lea
 
@@ -681,16 +683,18 @@ pdbic NWL    M_DREG          C_LABEL         %1111000001001ccc   m_cpdbr
 pdbgc NWL    M_DREG          C_LABEL         %1111000001001ccc   m_cpdbr
 pdbcc NWL    M_DREG          C_LABEL         %1111000001001ccc   m_cpdbr
 
+pflush !     M_AM_NONE       M_AM_NONE       %1111000000eeeeee   m_pflush
+pflushn !    M_AM_NONE       M_AM_NONE       %1111010100000111   m_pflush
+pflushan N   M_AM_NONE       M_AM_NONE       %1111010100010000   m_self
 pflusha N    M_AM_NONE       M_AM_NONE       %1111000000000000   m_pflusha
-pflush N     M_CREG+M_DREG+M_IMMED M_IMMED   %1111000000eeeeee   m_pflush
 pflushr N    C_ALL030        M_AM_NONE       %1111000000eeeeee   m_pflushr
 
-ploadr N     M_FC            C_ALL030        %1111000000eeeeee   m_pload
-ploadw N     M_FC            C_ALL030        %1111000000eeeeee   m_pload      
+ploadr N     M_FC            C_PMOVE         %1111000000eeeeee   m_ploadr
+ploadw N     M_FC            C_PMOVE         %1111000000eeeeee   m_ploadw     
 
-pmove NWLD   M_MRN           C_ALL030        %1111000000eeeeee   m_pmove +
--     NWLD   C_ALL030        M_MRN           %1111000000eeeeee   m_pmove
-pmovefd NWLD C_ALL030        M_MRN           %1111000000eeeeee   m_pmovefd
+pmove NWLD   M_MRN           C_PMOVE         %1111000000eeeeee   m_pmove +
+-     NWLD   C_PMOVE         M_MRN           %1111000000eeeeee   m_pmove
+pmovefd NWLD C_PMOVE         M_MRN           %1111000000eeeeee   m_pmovefd
 
 prestore N   C_ALL030        M_AM_NONE       %1111000101eeeeee   m_ea
 psave  N     C_ALL030        M_AM_NONE       %1111000100eeeeee   m_ea
@@ -839,4 +843,4 @@ trapv N      M_AM_NONE       M_AM_NONE       0x4e76              m_self
 tst   NBWL   C_ALTDATA       M_AM_NONE       %01001010sseeeS00   m_ea      +
 -     NBWL   C_ALL030        M_AM_NONE       %01001010sseeeS00   m_ea030
 unlk  N      M_AREG          M_AM_NONE       %0100111001011rrr   m_reg
-unpack !     M_AM_NONE       M_AM_NONE       %1000rrr11000mrrr   m_pack
+unpk  !      M_AM_NONE       M_AM_NONE       %1000rrr11000mrrr   m_pack