summaryrefslogtreecommitdiff
path: root/src/lib.rs
diff options
context:
space:
mode:
authoriximeow <me@iximeow.net>2020-10-11 18:27:07 -0700
committeriximeow <me@iximeow.net>2020-10-11 18:27:07 -0700
commit37617948420982554928e4ba3213f489c2f5054e (patch)
treeaa0cd3f0f3d9d7673762c53fcb56902c245388c6 /src/lib.rs
parent30d51caec4caf4a1af7408471da1f5e7cdb0c173 (diff)
immediate forms of instructions are not distinct opcodes
Diffstat (limited to 'src/lib.rs')
-rw-r--r--src/lib.rs19
1 files changed, 5 insertions, 14 deletions
diff --git a/src/lib.rs b/src/lib.rs
index 3b12704..75b75a7 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -36,16 +36,11 @@ pub enum Opcode {
Addl,
Add,
AddPlusOne,
- Sub,
- SubMinusOne,
- SubImm,
- AndImm,
- AndcmImm,
- OrImm,
- XorImm,
And,
Andcm,
Or,
+ Sub,
+ SubMinusOne,
Xor,
Ptc_l,
@@ -566,11 +561,7 @@ impl fmt::Display for Opcode {
Opcode::AddPlusOne => { write!(f, "addplusone") }
Opcode::Sub => { write!(f, "sub") }
Opcode::SubMinusOne => { write!(f, "subminusone") }
- Opcode::SubImm => { write!(f, "subimm") }
- Opcode::AndImm => { write!(f, "andimm") }
- Opcode::AndcmImm => { write!(f, "andcmimm") }
- Opcode::OrImm => { write!(f, "orimm") }
- Opcode::XorImm => { write!(f, "xorimm") }
+ Opcode::Sub => { write!(f, "sub") }
Opcode::And => { write!(f, "and") }
Opcode::Andcm => { write!(f, "andcm") }
Opcode::Or => { write!(f, "or") }
@@ -3892,9 +3883,9 @@ fn get_a_opcode_and_encoding(tag: u8, word: &BitSlice<Lsb0, u8>) -> (Opcode, Ope
(Shladdp4, A2), (Shladdp4, A2), (Shladdp4, A2), (Shladdp4, A2),
(Purple, None), (Purple, None), (Purple, None), (Purple, None),
(Purple, None), (Purple, None), (Purple, None), (Purple, None),
- (Purple, None), (SubImm, A3), (Purple, None), (Purple, None),
+ (Purple, None), (Sub, A3), (Purple, None), (Purple, None),
(Purple, None), (Purple, None), (Purple, None), (Purple, None),
- (AndImm, A3), (AndcmImm, A3), (OrImm, A3), (XorImm, A3),
+ (And, A3), (Andcm, A3), (Or, A3), (Xor, A3),
(Purple, None), (Purple, None), (Purple, None), (Purple, None),
(Purple, None), (Purple, None), (Purple, None), (Purple, None),
(Purple, None), (Purple, None), (Purple, None), (Purple, None),