dedupe opcodes

diff --git a/openpower/opcodes_deduped.csv b/openpower/opcodes_deduped.csv
index 319d7eac4e15a148ca618428d8962ce7a0421dc8..a25d63be57371f35a97bd7086f49e7cc0864dbbd 100644 (file)
--- a/openpower/opcodes_deduped.csv
+++ b/openpower/opcodes_deduped.csv
@@ -1,86 +1,57 @@
 ,,,,,,,,,,,
 in1,in2,in3,out,CR in,CR out,cry in,cry out,ldst len,BR,rc,lk
-NONE,CONST_LI,NONE,NONE,NONE,NONE,ZERO,0.0,NONE,0.0,NONE,1.0
-NONE,CONST_SH32,RS,RA,NONE,CR0,ZERO,1.0,NONE,0.0,RC,0.0
-NONE,CONST_SH32,RS,RA,NONE,NONE,ZERO,0.0,NONE,0.0,RC,0.0
-NONE,CONST_SH,RS,RA,NONE,CR0,ZERO,0.0,NONE,0.0,RC,0.0
-NONE,CONST_SH,RS,RA,NONE,CR0,ZERO,1.0,NONE,0.0,RC,0.0
+NONE,CONST,NONE,NONE,NONE,NONE,ZERO,0.0,NONE,0.0,NONE,1.0
+NONE,CONST,REG,REG,NONE,CR0,ZERO,0.0,NONE,0.0,RC,0.0
+NONE,CONST,REG,REG,NONE,CR0,ZERO,1.0,NONE,0.0,RC,0.0
+NONE,CONST,REG,REG,NONE,NONE,ZERO,0.0,NONE,0.0,RC,0.0
 NONE,NONE,NONE,NONE,BA_BB,BT,ZERO,0.0,NONE,0.0,NONE,0.0
 NONE,NONE,NONE,NONE,BFA,BF,ZERO,0.0,NONE,0.0,NONE,0.0
 NONE,NONE,NONE,NONE,NONE,NONE,ZERO,0.0,NONE,0.0,NONE,0.0
 NONE,NONE,NONE,NONE,NONE,NONE,ZERO,0.0,NONE,0.0,RC,0.0
-NONE,NONE,NONE,RT,BFA,NONE,ZERO,0.0,NONE,0.0,NONE,0.0
-NONE,NONE,NONE,RT,NONE,NONE,ZERO,0.0,NONE,0.0,NONE,0.0
-NONE,NONE,NONE,RT,WHOLE_REG,NONE,ZERO,0.0,NONE,0.0,NONE,0.0
-NONE,RB,NONE,NONE,NONE,NONE,ZERO,0.0,NONE,0.0,NONE,0.0
-NONE,RB,RS,RA,NONE,CR0,ZERO,0.0,NONE,0.0,RC,0.0
-NONE,RB,RS,RA,NONE,CR0,ZERO,1.0,NONE,0.0,RC,0.0
-NONE,RB,RS,RA,NONE,NONE,ZERO,0.0,NONE,0.0,RC,0.0
-RA,CONST_DS,NONE,RT,NONE,NONE,ZERO,0.0,is4B,0.0,NONE,0.0
-RA,CONST_DS,NONE,RT,NONE,NONE,ZERO,0.0,is8B,0.0,NONE,0.0
-RA,CONST_DS,RS,NONE,NONE,NONE,ZERO,0.0,is8B,0.0,NONE,0.0
-RA,CONST_M1,NONE,RT,NONE,CR0,CA,1.0,NONE,0.0,RC,0.0
-RA,CONST_SH32,RS,RA,NONE,NONE,ZERO,0.0,NONE,0.0,RC,0.0
-RA,CONST_SH,RS,RA,NONE,CR0,ZERO,0.0,NONE,0.0,RC,0.0
-RA,CONST_SI_HI,NONE,RT,NONE,NONE,ZERO,0.0,NONE,0.0,NONE,0.0
-RA,CONST_SI,NONE,NONE,NONE,BF,ONE,0.0,NONE,0.0,NONE,0.0
-RA,CONST_SI,NONE,NONE,NONE,NONE,ZERO,0.0,NONE,0.0,NONE,0.0
-RA,CONST_SI,NONE,RT,NONE,CR0,ZERO,0.0,NONE,0.0,NONE,0.0
-RA,CONST_SI,NONE,RT,NONE,CR0,ZERO,1.0,NONE,0.0,ONE,0.0
-RA,CONST_SI,NONE,RT,NONE,NONE,ONE,1.0,NONE,0.0,NONE,0.0
-RA,CONST_SI,NONE,RT,NONE,NONE,ZERO,0.0,is1B,0.0,NONE,0.0
-RA,CONST_SI,NONE,RT,NONE,NONE,ZERO,0.0,is2B,0.0,NONE,0.0
-RA,CONST_SI,NONE,RT,NONE,NONE,ZERO,0.0,is4B,0.0,NONE,0.0
-RA,CONST_SI,NONE,RT,NONE,NONE,ZERO,0.0,NONE,0.0,NONE,0.0
-RA,CONST_SI,NONE,RT,NONE,NONE,ZERO,1.0,NONE,0.0,NONE,0.0
-RA,CONST_SI,RS,NONE,NONE,NONE,ZERO,0.0,is1B,0.0,NONE,0.0
-RA,CONST_SI,RS,NONE,NONE,NONE,ZERO,0.0,is2B,0.0,NONE,0.0
-RA,CONST_SI,RS,NONE,NONE,NONE,ZERO,0.0,is4B,0.0,NONE,0.0
-RA,CONST_UI,NONE,NONE,NONE,BF,ONE,0.0,NONE,0.0,NONE,0.0
-RA,NONE,NONE,RT,NONE,CR0,CA,1.0,NONE,0.0,RC,0.0
-RA,NONE,NONE,RT,NONE,NONE,ONE,0.0,NONE,0.0,RC,0.0
-RA,RB,NONE,NONE,NONE,BF,ONE,0.0,NONE,0.0,NONE,0.0
-RA,RB,NONE,NONE,NONE,BF,ZERO,0.0,NONE,0.0,NONE,0.0
-RA,RB,NONE,NONE,NONE,NONE,ZERO,0.0,NONE,0.0,NONE,0.0
-RA,RB,NONE,RT,BC,NONE,ZERO,0.0,NONE,0.0,NONE,0.0
-RA,RB,NONE,RT,NONE,CR0,CA,1.0,NONE,0.0,RC,0.0
-RA,RB,NONE,RT,NONE,CR0,ONE,0.0,NONE,0.0,RC,0.0
-RA,RB,NONE,RT,NONE,CR0,ONE,1.0,NONE,0.0,RC,0.0
-RA,RB,NONE,RT,NONE,CR0,ZERO,0.0,NONE,0.0,RC,0.0
-RA,RB,NONE,RT,NONE,CR0,ZERO,1.0,NONE,0.0,RC,0.0
-RA,RB,NONE,RT,NONE,NONE,ZERO,0.0,is1B,0.0,NONE,0.0
-RA,RB,NONE,RT,NONE,NONE,ZERO,0.0,is2B,0.0,NONE,0.0
-RA,RB,NONE,RT,NONE,NONE,ZERO,0.0,is2B,1.0,NONE,0.0
-RA,RB,NONE,RT,NONE,NONE,ZERO,0.0,is4B,0.0,NONE,0.0
-RA,RB,NONE,RT,NONE,NONE,ZERO,0.0,is4B,1.0,NONE,0.0
-RA,RB,NONE,RT,NONE,NONE,ZERO,0.0,is8B,0.0,NONE,0.0
-RA,RB,NONE,RT,NONE,NONE,ZERO,0.0,is8B,1.0,NONE,0.0
-RA,RB,NONE,RT,NONE,NONE,ZERO,0.0,NONE,0.0,NONE,0.0
-RA,RB,RS,NONE,NONE,CR0,ZERO,0.0,is1B,0.0,RC,0.0
-RA,RB,RS,NONE,NONE,NONE,ZERO,0.0,is1B,0.0,NONE,0.0
-RA,RB,RS,NONE,NONE,NONE,ZERO,0.0,is2B,0.0,NONE,0.0
-RA,RB,RS,NONE,NONE,NONE,ZERO,0.0,is2B,1.0,NONE,0.0
-RA,RB,RS,NONE,NONE,NONE,ZERO,0.0,is4B,0.0,NONE,0.0
-RA,RB,RS,NONE,NONE,NONE,ZERO,0.0,is4B,1.0,NONE,0.0
-RA,RB,RS,NONE,NONE,NONE,ZERO,0.0,is8B,0.0,NONE,0.0
-RA,RB,RS,NONE,NONE,NONE,ZERO,0.0,is8B,1.0,NONE,0.0
-RS,CONST_UI_HI,NONE,RA,NONE,CR0,ZERO,0.0,NONE,0.0,ONE,0.0
-RS,CONST_UI_HI,NONE,RA,NONE,NONE,ZERO,0.0,NONE,0.0,NONE,0.0
-RS,CONST_UI,NONE,RA,NONE,CR0,ZERO,0.0,NONE,0.0,ONE,0.0
-RS,CONST_UI,NONE,RA,NONE,NONE,ZERO,0.0,NONE,0.0,NONE,0.0
-RS,NONE,NONE,NONE,NONE,NONE,ZERO,0.0,NONE,0.0,NONE,0.0
-RS,NONE,NONE,NONE,WHOLE_REG,WHOLE_REG,ZERO,0.0,NONE,0.0,NONE,0.0
-RS,NONE,NONE,RA,NONE,CR0,ZERO,0.0,is1B,0.0,RC,0.0
-RS,NONE,NONE,RA,NONE,CR0,ZERO,0.0,is2B,0.0,RC,0.0
-RS,NONE,NONE,RA,NONE,CR0,ZERO,0.0,is4B,0.0,RC,0.0
-RS,NONE,NONE,RA,NONE,CR0,ZERO,0.0,NONE,0.0,RC,0.0
-RS,NONE,NONE,RA,NONE,NONE,ZERO,0.0,is1B,0.0,NONE,0.0
-RS,NONE,NONE,RA,NONE,NONE,ZERO,0.0,is4B,0.0,NONE,0.0
-RS,NONE,NONE,RA,NONE,NONE,ZERO,0.0,is8B,0.0,NONE,0.0
-RS,NONE,NONE,SPR,NONE,NONE,ZERO,0.0,NONE,0.0,NONE,0.0
-RS,RB,NONE,RA,NONE,CR0,ZERO,0.0,NONE,0.0,RC,0.0
-RS,RB,NONE,RA,NONE,NONE,ZERO,0.0,NONE,0.0,NONE,0.0
-SPR,CONST_BD,NONE,SPR,BI,NONE,ZERO,0.0,NONE,0.0,NONE,1.0
-SPR,NONE,NONE,RT,NONE,NONE,ZERO,0.0,NONE,0.0,NONE,0.0
+NONE,NONE,NONE,REG,BFA,NONE,ZERO,0.0,NONE,0.0,NONE,0.0
+NONE,NONE,NONE,REG,NONE,NONE,ZERO,0.0,NONE,0.0,NONE,0.0
+NONE,NONE,NONE,REG,WHOLE_REG,NONE,ZERO,0.0,NONE,0.0,NONE,0.0
+NONE,REG,NONE,NONE,NONE,NONE,ZERO,0.0,NONE,0.0,NONE,0.0
+NONE,REG,REG,REG,NONE,CR0,ZERO,0.0,NONE,0.0,RC,0.0
+NONE,REG,REG,REG,NONE,CR0,ZERO,1.0,NONE,0.0,RC,0.0
+NONE,REG,REG,REG,NONE,NONE,ZERO,0.0,NONE,0.0,RC,0.0
+REG,CONST,NONE,NONE,NONE,BF,ONE,0.0,NONE,0.0,NONE,0.0
+REG,CONST,NONE,NONE,NONE,NONE,ZERO,0.0,NONE,0.0,NONE,0.0
+REG,CONST,NONE,REG,NONE,CR0,CA,1.0,NONE,0.0,RC,0.0
+REG,CONST,NONE,REG,NONE,CR0,ZERO,0.0,NONE,0.0,NONE,0.0
+REG,CONST,NONE,REG,NONE,CR0,ZERO,0.0,NONE,0.0,ONE,0.0
+REG,CONST,NONE,REG,NONE,CR0,ZERO,1.0,NONE,0.0,ONE,0.0
+REG,CONST,NONE,REG,NONE,NONE,ONE,1.0,NONE,0.0,NONE,0.0
+REG,CONST,NONE,REG,NONE,NONE,ZERO,0.0,1,0.0,NONE,0.0
+REG,CONST,NONE,REG,NONE,NONE,ZERO,0.0,NONE,0.0,NONE,0.0
+REG,CONST,NONE,REG,NONE,NONE,ZERO,1.0,NONE,0.0,NONE,0.0
+REG,CONST,REG,NONE,NONE,NONE,ZERO,0.0,1,0.0,NONE,0.0
+REG,CONST,REG,REG,NONE,CR0,ZERO,0.0,NONE,0.0,RC,0.0
+REG,CONST,REG,REG,NONE,NONE,ZERO,0.0,NONE,0.0,RC,0.0
+REG,NONE,NONE,NONE,NONE,NONE,ZERO,0.0,NONE,0.0,NONE,0.0
+REG,NONE,NONE,NONE,WHOLE_REG,WHOLE_REG,ZERO,0.0,NONE,0.0,NONE,0.0
+REG,NONE,NONE,REG,NONE,CR0,CA,1.0,NONE,0.0,RC,0.0
+REG,NONE,NONE,REG,NONE,CR0,ZERO,0.0,1,0.0,RC,0.0
+REG,NONE,NONE,REG,NONE,CR0,ZERO,0.0,NONE,0.0,RC,0.0
+REG,NONE,NONE,REG,NONE,NONE,ONE,0.0,NONE,0.0,RC,0.0
+REG,NONE,NONE,REG,NONE,NONE,ZERO,0.0,1,0.0,NONE,0.0
+REG,NONE,NONE,SPR,NONE,NONE,ZERO,0.0,NONE,0.0,NONE,0.0
+REG,REG,NONE,NONE,NONE,BF,ONE,0.0,NONE,0.0,NONE,0.0
+REG,REG,NONE,NONE,NONE,BF,ZERO,0.0,NONE,0.0,NONE,0.0
+REG,REG,NONE,NONE,NONE,NONE,ZERO,0.0,NONE,0.0,NONE,0.0
+REG,REG,NONE,REG,BC,NONE,ZERO,0.0,NONE,0.0,NONE,0.0
+REG,REG,NONE,REG,NONE,CR0,CA,1.0,NONE,0.0,RC,0.0
+REG,REG,NONE,REG,NONE,CR0,ONE,0.0,NONE,0.0,RC,0.0
+REG,REG,NONE,REG,NONE,CR0,ONE,1.0,NONE,0.0,RC,0.0
+REG,REG,NONE,REG,NONE,CR0,ZERO,0.0,NONE,0.0,RC,0.0
+REG,REG,NONE,REG,NONE,CR0,ZERO,1.0,NONE,0.0,RC,0.0
+REG,REG,NONE,REG,NONE,NONE,ZERO,0.0,1,0.0,NONE,0.0
+REG,REG,NONE,REG,NONE,NONE,ZERO,0.0,1,1.0,NONE,0.0
+REG,REG,NONE,REG,NONE,NONE,ZERO,0.0,NONE,0.0,NONE,0.0
+REG,REG,REG,NONE,NONE,CR0,ZERO,0.0,1,0.0,RC,0.0
+REG,REG,REG,NONE,NONE,NONE,ZERO,0.0,1,0.0,NONE,0.0
+REG,REG,REG,NONE,NONE,NONE,ZERO,0.0,1,1.0,NONE,0.0
+SPR,CONST,NONE,SPR,BI,NONE,ZERO,0.0,NONE,0.0,NONE,1.0
+SPR,NONE,NONE,REG,NONE,NONE,ZERO,0.0,NONE,0.0,NONE,0.0
 SPR,SPR,NONE,NONE,NONE,NONE,ZERO,0.0,NONE,0.0,NONE,0.0
 SPR,SPR,NONE,SPR,BI,NONE,ZERO,0.0,NONE,0.0,NONE,1.0