remove carry columns

diff --git a/openpower/opcodes_deduped.csv b/openpower/opcodes_deduped.csv
index 97e36e03a0ec1832f5027357c39e69c82b10e115..effb2cbadd776e5af9121ab99512654b04714a1b 100644 (file)
--- a/openpower/opcodes_deduped.csv
+++ b/openpower/opcodes_deduped.csv
@@ -1,50 +1,38 @@
-,,,,,,,,,,,
-in1,in2,in3,out,CR in,CR out,cry in,cry out,ldst len,BR,rc,lk
-NONE,CONST,NONE,NONE,NONE,NONE,ZERO,0.0,NONE,0.0,NONE,1.0
-NONE,CONST,REG,REG,NONE,1,ZERO,0.0,NONE,0.0,RC,0.0
-NONE,CONST,REG,REG,NONE,1,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,1,1,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,REG,1,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,REG,NONE,NONE,NONE,NONE,ZERO,0.0,NONE,0.0,NONE,0.0
-NONE,REG,REG,REG,NONE,1,ZERO,0.0,NONE,0.0,RC,0.0
-NONE,REG,REG,REG,NONE,1,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,1,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,1,CA,1.0,NONE,0.0,RC,0.0
-REG,CONST,NONE,REG,NONE,1,ZERO,0.0,NONE,0.0,NONE,0.0
-REG,CONST,NONE,REG,NONE,1,ZERO,0.0,NONE,0.0,ONE,0.0
-REG,CONST,NONE,REG,NONE,1,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,1,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,1,1,ZERO,0.0,NONE,0.0,NONE,0.0
-REG,NONE,NONE,NONE,NONE,NONE,ZERO,0.0,NONE,0.0,NONE,0.0
-REG,NONE,NONE,REG,NONE,1,CA,1.0,NONE,0.0,RC,0.0
-REG,NONE,NONE,REG,NONE,1,ZERO,0.0,1,0.0,RC,0.0
-REG,NONE,NONE,REG,NONE,1,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,REG,NONE,NONE,NONE,1,ONE,0.0,NONE,0.0,NONE,0.0
-REG,REG,NONE,NONE,NONE,1,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,1,CA,1.0,NONE,0.0,RC,0.0
-REG,REG,NONE,REG,NONE,1,ONE,0.0,NONE,0.0,RC,0.0
-REG,REG,NONE,REG,NONE,1,ONE,1.0,NONE,0.0,RC,0.0
-REG,REG,NONE,REG,NONE,1,ZERO,0.0,NONE,0.0,RC,0.0
-REG,REG,NONE,REG,NONE,1,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,1,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
+in1,in2,in3,out,CR in,CR out,ldst len,BR,rc,lk
+NONE,CONST,NONE,NONE,NONE,NONE,NONE,0.0,NONE,1.0
+NONE,CONST,REG,REG,NONE,1,NONE,0.0,RC,0.0
+NONE,CONST,REG,REG,NONE,NONE,NONE,0.0,RC,0.0
+NONE,NONE,NONE,NONE,1,1,NONE,0.0,NONE,0.0
+NONE,NONE,NONE,NONE,NONE,NONE,NONE,0.0,NONE,0.0
+NONE,NONE,NONE,NONE,NONE,NONE,NONE,0.0,RC,0.0
+NONE,NONE,NONE,REG,1,NONE,NONE,0.0,NONE,0.0
+NONE,NONE,NONE,REG,NONE,NONE,NONE,0.0,NONE,0.0
+NONE,REG,NONE,NONE,NONE,NONE,NONE,0.0,NONE,0.0
+NONE,REG,REG,REG,NONE,1,NONE,0.0,RC,0.0
+NONE,REG,REG,REG,NONE,NONE,NONE,0.0,RC,0.0
+REG,CONST,NONE,NONE,NONE,1,NONE,0.0,NONE,0.0
+REG,CONST,NONE,NONE,NONE,NONE,NONE,0.0,NONE,0.0
+REG,CONST,NONE,REG,NONE,1,NONE,0.0,NONE,0.0
+REG,CONST,NONE,REG,NONE,1,NONE,0.0,ONE,0.0
+REG,CONST,NONE,REG,NONE,1,NONE,0.0,RC,0.0
+REG,CONST,NONE,REG,NONE,NONE,1,0.0,NONE,0.0
+REG,CONST,NONE,REG,NONE,NONE,NONE,0.0,NONE,0.0
+REG,CONST,REG,NONE,NONE,NONE,1,0.0,NONE,0.0
+REG,CONST,REG,REG,NONE,1,NONE,0.0,RC,0.0
+REG,CONST,REG,REG,NONE,NONE,NONE,0.0,RC,0.0
+REG,NONE,NONE,NONE,1,1,NONE,0.0,NONE,0.0
+REG,NONE,NONE,NONE,NONE,NONE,NONE,0.0,NONE,0.0
+REG,NONE,NONE,REG,NONE,1,1,0.0,RC,0.0
+REG,NONE,NONE,REG,NONE,1,NONE,0.0,RC,0.0
+REG,NONE,NONE,REG,NONE,NONE,1,0.0,NONE,0.0
+REG,NONE,NONE,REG,NONE,NONE,NONE,0.0,RC,0.0
+REG,REG,NONE,NONE,NONE,1,NONE,0.0,NONE,0.0
+REG,REG,NONE,NONE,NONE,NONE,NONE,0.0,NONE,0.0
+REG,REG,NONE,REG,BC,NONE,NONE,0.0,NONE,0.0
+REG,REG,NONE,REG,NONE,1,NONE,0.0,RC,0.0
+REG,REG,NONE,REG,NONE,NONE,1,0.0,NONE,0.0
+REG,REG,NONE,REG,NONE,NONE,1,1.0,NONE,0.0
+REG,REG,NONE,REG,NONE,NONE,NONE,0.0,NONE,0.0
+REG,REG,REG,NONE,NONE,1,1,0.0,RC,0.0
+REG,REG,REG,NONE,NONE,NONE,1,0.0,NONE,0.0
+REG,REG,REG,NONE,NONE,NONE,1,1.0,NONE,0.0