Rename OP_MCRF to OP_CROP and trim insn_type_t

OP_MCRF covers the CR logical ops as well as mcrf since commit
c05441bf4793 ("Implement CRNOR and friends"), so this renames
OP_MCRF to OP_CROP.  The OP_* values for the individual CR logical
ops (OP_CRAND, etc.) are not used, so remove them from insn_type_t.

No functional change.

Signed-off-by: Paul Mackerras <paulus@ozlabs.org>

diff --git a/decode1.vhdl b/decode1.vhdl
index 5230fa4f2c8f2277dadbe98929291939f37cc303..8a62726de72756a9a577cd39caafdd8c41514681 100644 (file)
--- a/decode1.vhdl
+++ b/decode1.vhdl
@@ -103,7 +103,7 @@ architecture behaviour of decode1 is
                --                 unit     internal      in1         in2          in3   out   CR   CR   inv  inv  cry   cry  ldst  BR   sgn  upd  rsrv 32b  sgn  rc    lk   sgl
                --                               op                                            in   out   A   out  in    out  len        ext                                 pipe
                 -- mcrf; and cr logical ops
-               2#000#    =>       (ALU,    OP_MCRF,      NONE,       NONE,        NONE, NONE, '1', '1', '0', '0', ZERO, '0', NONE, '0', '0', '0', '0', '0', '0', NONE, '0', '0'),
+               2#000#    =>       (ALU,    OP_CROP,      NONE,       NONE,        NONE, NONE, '1', '1', '0', '0', ZERO, '0', NONE, '0', '0', '0', '0', '0', '0', NONE, '0', '0'),
                -- addpcis not implemented yet
                2#001#    =>       (ALU,    OP_ILLEGAL,   NONE,       NONE,        NONE, NONE, '0', '0', '0', '0', ZERO, '0', NONE, '0', '0', '0', '0', '0', '0', RC,   '0', '1'),
                 -- bclr, bcctr, bctar

diff --git a/decode_types.vhdl b/decode_types.vhdl
index b2d9846d5decdfc463ba52334cc35c6c8b8ab290..f22e4b26d497e1b76e0be7961a4dfa323e8e9fef 100644 (file)
--- a/decode_types.vhdl
+++ b/decode_types.vhdl
@@ -5,12 +5,11 @@ package decode_types is
     type insn_type_t is (OP_ILLEGAL, OP_NOP, OP_ADD,
                         OP_ADDPCIS, OP_AND, OP_ATTN, OP_B, OP_BC, OP_BCREG,
                         OP_BPERM, OP_CMP, OP_CMPB, OP_CMPEQB, OP_CMPRB,
-                        OP_CNTZ, OP_CRAND,
-                        OP_CRANDC, OP_CREQV, OP_CRNAND, OP_CRNOR, OP_CROR, OP_CRORC,
-                        OP_CRXOR, OP_DARN, OP_DCBF, OP_DCBST, OP_DCBT, OP_DCBTST,
+                        OP_CNTZ, OP_CROP,
+                        OP_DARN, OP_DCBF, OP_DCBST, OP_DCBT, OP_DCBTST,
                         OP_DCBZ, OP_DIV, OP_DIVE, OP_EXTS,
                         OP_EXTSWSLI, OP_ICBI, OP_ICBT, OP_ISEL, OP_ISYNC,
-                        OP_LOAD, OP_STORE, OP_MADDHD, OP_MADDHDU, OP_MADDLD, OP_MCRF,
+                        OP_LOAD, OP_STORE, OP_MADDHD, OP_MADDHDU, OP_MADDLD,
                         OP_MCRXR, OP_MCRXRX, OP_MFCR, OP_MFMSR, OP_MFSPR, OP_MOD,
                         OP_MTCRF, OP_MTMSRD, OP_MTSPR, OP_MUL_L64,
                         OP_MUL_H64, OP_MUL_H32, OP_OR,

diff --git a/execute1.vhdl b/execute1.vhdl
index 2668364849cfa236856310b69ddaa9c5d07ba010..ffa9048b37e75003ab752853f0115b3deab70efd 100644 (file)
--- a/execute1.vhdl
+++ b/execute1.vhdl
@@ -581,7 +581,7 @@ begin
                    result := b_in;
                end if;
                result_en := '1';
-           when OP_MCRF =>
+           when OP_CROP =>
                cr_op := insn_cr(e_in.insn);
                report "CR OP " & to_hstring(cr_op);
                if cr_op(0) = '0' then -- MCRF