powerpc: Sort and de-dup primary opcodes in ppc-opcode.h

Some of the primary opcodes are duplicated. Remove those, and sort the
rest of the primary opcodes to make it easy to read.

Signed-off-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/a05edf638a2638d708fc2db0272f6317837b5eab.1648648712.git.naveen.n.rao@linux.vnet.ibm.com

diff --git a/arch/powerpc/include/asm/ppc-opcode.h b/arch/powerpc/include/asm/ppc-opcode.h
index 82f1f00..a5d89cd 100644 (file)
--- a/arch/powerpc/include/asm/ppc-opcode.h
+++ b/arch/powerpc/include/asm/ppc-opcode.h
@@ -127,8 +127,37 @@
 
 
 /* opcode and xopcode for instructions */
-#define OP_TRAP 3
-#define OP_TRAP_64 2
+#define OP_PREFIX      1
+#define OP_TRAP_64     2
+#define OP_TRAP                3
+#define OP_31          31
+#define OP_LWZ         32
+#define OP_LWZU                33
+#define OP_LBZ         34
+#define OP_LBZU                35
+#define OP_STW         36
+#define OP_STWU                37
+#define OP_STB         38
+#define OP_STBU                39
+#define OP_LHZ         40
+#define OP_LHZU                41
+#define OP_LHA         42
+#define OP_LHAU                43
+#define OP_STH         44
+#define OP_STHU                45
+#define OP_LMW         46
+#define OP_STMW                47
+#define OP_LFS         48
+#define OP_LFSU                49
+#define OP_LFD         50
+#define OP_LFDU                51
+#define OP_STFS                52
+#define OP_STFSU       53
+#define OP_STFD                54
+#define OP_STFDU       55
+#define OP_LQ          56
+#define OP_LD          58
+#define OP_STD         62
 
 #define OP_31_XOP_TRAP      4
 #define OP_31_XOP_LDX       21
@@ -208,42 +237,6 @@
 /* VMX Vector Store Instructions */
 #define OP_31_XOP_STVX          231
 
-/* Prefixed Instructions */
-#define OP_PREFIX              1
-
-#define OP_31   31
-#define OP_LWZ  32
-#define OP_STFS 52
-#define OP_STFSU 53
-#define OP_STFD 54
-#define OP_STFDU 55
-#define OP_LD   58
-#define OP_LWZU 33
-#define OP_LBZ  34
-#define OP_LBZU 35
-#define OP_STW  36
-#define OP_STWU 37
-#define OP_STD  62
-#define OP_STB  38
-#define OP_STBU 39
-#define OP_LHZ  40
-#define OP_LHZU 41
-#define OP_LHA  42
-#define OP_LHAU 43
-#define OP_STH  44
-#define OP_STHU 45
-#define OP_LMW  46
-#define OP_STMW 47
-#define OP_LFS  48
-#define OP_LFSU 49
-#define OP_LFD  50
-#define OP_LFDU 51
-#define OP_STFS 52
-#define OP_STFSU 53
-#define OP_STFD  54
-#define OP_STFDU 55
-#define OP_LQ    56
-
 /* sorted alphabetically */
 #define PPC_INST_BCCTR_FLUSH           0x4c400420
 #define PPC_INST_COPY                  0x7c20060c