ppc: fix a mistake on interpreting CR registers by deleting CR8 -> CR31
diff --git a/arch/PowerPC/PPCMapping.c b/arch/PowerPC/PPCMapping.c
index 887c4de..9ac718c 100644
--- a/arch/PowerPC/PPCMapping.c
+++ b/arch/PowerPC/PPCMapping.c
@@ -27,30 +27,6 @@
 	{ PPC_REG_CR5, "cr5" },
 	{ PPC_REG_CR6, "cr6" },
 	{ PPC_REG_CR7, "cr7" },
-	{ PPC_REG_CR8, "cr8" },
-	{ PPC_REG_CR9, "cr9" },
-	{ PPC_REG_CR10, "cr10" },
-	{ PPC_REG_CR11, "cr11" },
-	{ PPC_REG_CR12, "cr12" },
-	{ PPC_REG_CR13, "cr13" },
-	{ PPC_REG_CR14, "cr14" },
-	{ PPC_REG_CR15, "cr15" },
-	{ PPC_REG_CR16, "cr16" },
-	{ PPC_REG_CR17, "cr17" },
-	{ PPC_REG_CR18, "cr18" },
-	{ PPC_REG_CR19, "cr19" },
-	{ PPC_REG_CR20, "cr20" },
-	{ PPC_REG_CR21, "cr21" },
-	{ PPC_REG_CR22, "cr22" },
-	{ PPC_REG_CR23, "cr23" },
-	{ PPC_REG_CR24, "cr24" },
-	{ PPC_REG_CR25, "cr25" },
-	{ PPC_REG_CR26, "cr26" },
-	{ PPC_REG_CR27, "cr27" },
-	{ PPC_REG_CR28, "cr28" },
-	{ PPC_REG_CR29, "cr29" },
-	{ PPC_REG_CR30, "cr30" },
-	{ PPC_REG_CR31, "cr31" },
 	{ PPC_REG_CTR, "ctr" },
 	{ PPC_REG_F0, "f0" },
 	{ PPC_REG_F1, "f1" },
@@ -7777,7 +7753,7 @@
 {
 	static unsigned int map[] = { 0,
 		0, PPC_REG_CARRY, PPC_REG_CC, PPC_REG_CTR, 0,
-		PPC_REG_LR, 0, PPC_REG_VRSAVE, PPC_REG_CR0, 0,
+		PPC_REG_LR, 0, PPC_REG_VRSAVE, PPC_REG_R0, 0,
 		PPC_REG_CR0, PPC_REG_CR1, PPC_REG_CR2, PPC_REG_CR3, PPC_REG_CR4,
 		PPC_REG_CR5, PPC_REG_CR6, PPC_REG_CR7, PPC_REG_CTR, PPC_REG_F0,
 		PPC_REG_F1, PPC_REG_F2, PPC_REG_F3, PPC_REG_F4, PPC_REG_F5,
@@ -7825,13 +7801,13 @@
 		PPC_REG_R17, PPC_REG_R18, PPC_REG_R19, PPC_REG_R20, PPC_REG_R21,
 		PPC_REG_R22, PPC_REG_R23, PPC_REG_R24, PPC_REG_R25, PPC_REG_R26,
 		PPC_REG_R27, PPC_REG_R28, PPC_REG_R29, PPC_REG_R30, PPC_REG_R31,
-		PPC_REG_CR0, PPC_REG_CR2, PPC_REG_CR6, PPC_REG_CR10, PPC_REG_CR14,
-		PPC_REG_CR18, PPC_REG_CR22, PPC_REG_CR26, PPC_REG_CR30, PPC_REG_CR1,
-		PPC_REG_CR5, PPC_REG_CR9, PPC_REG_CR13, PPC_REG_CR17, PPC_REG_CR21,
-		PPC_REG_CR25, PPC_REG_CR29, PPC_REG_CR0, PPC_REG_CR4, PPC_REG_CR8,
-		PPC_REG_CR12, PPC_REG_CR16, PPC_REG_CR20, PPC_REG_CR24, PPC_REG_CR28,
-		PPC_REG_CR3, PPC_REG_CR7, PPC_REG_CR11, PPC_REG_CR15, PPC_REG_CR19,
-		PPC_REG_CR23, PPC_REG_CR27, PPC_REG_CR31, };
+		PPC_REG_R0, PPC_REG_R2, PPC_REG_R6, PPC_REG_R10, PPC_REG_R14,
+		PPC_REG_R18, PPC_REG_R22, PPC_REG_R26, PPC_REG_R30, PPC_REG_R1,
+		PPC_REG_R5, PPC_REG_R9, PPC_REG_R13, PPC_REG_R17, PPC_REG_R21,
+		PPC_REG_R25, PPC_REG_R29, PPC_REG_R0, PPC_REG_R4, PPC_REG_R8,
+		PPC_REG_R12, PPC_REG_R16, PPC_REG_R20, PPC_REG_R24, PPC_REG_R28,
+		PPC_REG_R3, PPC_REG_R7, PPC_REG_R11, PPC_REG_R15, PPC_REG_R19,
+		PPC_REG_R23, PPC_REG_R27, PPC_REG_R31, };
 
 	if (r < ARR_SIZE(map))
 		return map[r];
diff --git a/bindings/java/capstone/Ppc_const.java b/bindings/java/capstone/Ppc_const.java
index 2821b4f..1cd2a6d 100644
--- a/bindings/java/capstone/Ppc_const.java
+++ b/bindings/java/capstone/Ppc_const.java
@@ -57,198 +57,174 @@
 	public static final int PPC_REG_CR5 = 8;
 	public static final int PPC_REG_CR6 = 9;
 	public static final int PPC_REG_CR7 = 10;
-	public static final int PPC_REG_CR8 = 11;
-	public static final int PPC_REG_CR9 = 12;
-	public static final int PPC_REG_CR10 = 13;
-	public static final int PPC_REG_CR11 = 14;
-	public static final int PPC_REG_CR12 = 15;
-	public static final int PPC_REG_CR13 = 16;
-	public static final int PPC_REG_CR14 = 17;
-	public static final int PPC_REG_CR15 = 18;
-	public static final int PPC_REG_CR16 = 19;
-	public static final int PPC_REG_CR17 = 20;
-	public static final int PPC_REG_CR18 = 21;
-	public static final int PPC_REG_CR19 = 22;
-	public static final int PPC_REG_CR20 = 23;
-	public static final int PPC_REG_CR21 = 24;
-	public static final int PPC_REG_CR22 = 25;
-	public static final int PPC_REG_CR23 = 26;
-	public static final int PPC_REG_CR24 = 27;
-	public static final int PPC_REG_CR25 = 28;
-	public static final int PPC_REG_CR26 = 29;
-	public static final int PPC_REG_CR27 = 30;
-	public static final int PPC_REG_CR28 = 31;
-	public static final int PPC_REG_CR29 = 32;
-	public static final int PPC_REG_CR30 = 33;
-	public static final int PPC_REG_CR31 = 34;
-	public static final int PPC_REG_CTR = 35;
-	public static final int PPC_REG_F0 = 36;
-	public static final int PPC_REG_F1 = 37;
-	public static final int PPC_REG_F2 = 38;
-	public static final int PPC_REG_F3 = 39;
-	public static final int PPC_REG_F4 = 40;
-	public static final int PPC_REG_F5 = 41;
-	public static final int PPC_REG_F6 = 42;
-	public static final int PPC_REG_F7 = 43;
-	public static final int PPC_REG_F8 = 44;
-	public static final int PPC_REG_F9 = 45;
-	public static final int PPC_REG_F10 = 46;
-	public static final int PPC_REG_F11 = 47;
-	public static final int PPC_REG_F12 = 48;
-	public static final int PPC_REG_F13 = 49;
-	public static final int PPC_REG_F14 = 50;
-	public static final int PPC_REG_F15 = 51;
-	public static final int PPC_REG_F16 = 52;
-	public static final int PPC_REG_F17 = 53;
-	public static final int PPC_REG_F18 = 54;
-	public static final int PPC_REG_F19 = 55;
-	public static final int PPC_REG_F20 = 56;
-	public static final int PPC_REG_F21 = 57;
-	public static final int PPC_REG_F22 = 58;
-	public static final int PPC_REG_F23 = 59;
-	public static final int PPC_REG_F24 = 60;
-	public static final int PPC_REG_F25 = 61;
-	public static final int PPC_REG_F26 = 62;
-	public static final int PPC_REG_F27 = 63;
-	public static final int PPC_REG_F28 = 64;
-	public static final int PPC_REG_F29 = 65;
-	public static final int PPC_REG_F30 = 66;
-	public static final int PPC_REG_F31 = 67;
-	public static final int PPC_REG_LR = 68;
-	public static final int PPC_REG_R0 = 69;
-	public static final int PPC_REG_R1 = 70;
-	public static final int PPC_REG_R2 = 71;
-	public static final int PPC_REG_R3 = 72;
-	public static final int PPC_REG_R4 = 73;
-	public static final int PPC_REG_R5 = 74;
-	public static final int PPC_REG_R6 = 75;
-	public static final int PPC_REG_R7 = 76;
-	public static final int PPC_REG_R8 = 77;
-	public static final int PPC_REG_R9 = 78;
-	public static final int PPC_REG_R10 = 79;
-	public static final int PPC_REG_R11 = 80;
-	public static final int PPC_REG_R12 = 81;
-	public static final int PPC_REG_R13 = 82;
-	public static final int PPC_REG_R14 = 83;
-	public static final int PPC_REG_R15 = 84;
-	public static final int PPC_REG_R16 = 85;
-	public static final int PPC_REG_R17 = 86;
-	public static final int PPC_REG_R18 = 87;
-	public static final int PPC_REG_R19 = 88;
-	public static final int PPC_REG_R20 = 89;
-	public static final int PPC_REG_R21 = 90;
-	public static final int PPC_REG_R22 = 91;
-	public static final int PPC_REG_R23 = 92;
-	public static final int PPC_REG_R24 = 93;
-	public static final int PPC_REG_R25 = 94;
-	public static final int PPC_REG_R26 = 95;
-	public static final int PPC_REG_R27 = 96;
-	public static final int PPC_REG_R28 = 97;
-	public static final int PPC_REG_R29 = 98;
-	public static final int PPC_REG_R30 = 99;
-	public static final int PPC_REG_R31 = 100;
-	public static final int PPC_REG_V0 = 101;
-	public static final int PPC_REG_V1 = 102;
-	public static final int PPC_REG_V2 = 103;
-	public static final int PPC_REG_V3 = 104;
-	public static final int PPC_REG_V4 = 105;
-	public static final int PPC_REG_V5 = 106;
-	public static final int PPC_REG_V6 = 107;
-	public static final int PPC_REG_V7 = 108;
-	public static final int PPC_REG_V8 = 109;
-	public static final int PPC_REG_V9 = 110;
-	public static final int PPC_REG_V10 = 111;
-	public static final int PPC_REG_V11 = 112;
-	public static final int PPC_REG_V12 = 113;
-	public static final int PPC_REG_V13 = 114;
-	public static final int PPC_REG_V14 = 115;
-	public static final int PPC_REG_V15 = 116;
-	public static final int PPC_REG_V16 = 117;
-	public static final int PPC_REG_V17 = 118;
-	public static final int PPC_REG_V18 = 119;
-	public static final int PPC_REG_V19 = 120;
-	public static final int PPC_REG_V20 = 121;
-	public static final int PPC_REG_V21 = 122;
-	public static final int PPC_REG_V22 = 123;
-	public static final int PPC_REG_V23 = 124;
-	public static final int PPC_REG_V24 = 125;
-	public static final int PPC_REG_V25 = 126;
-	public static final int PPC_REG_V26 = 127;
-	public static final int PPC_REG_V27 = 128;
-	public static final int PPC_REG_V28 = 129;
-	public static final int PPC_REG_V29 = 130;
-	public static final int PPC_REG_V30 = 131;
-	public static final int PPC_REG_V31 = 132;
-	public static final int PPC_REG_VRSAVE = 133;
-	public static final int PPC_REG_VS0 = 134;
-	public static final int PPC_REG_VS1 = 135;
-	public static final int PPC_REG_VS2 = 136;
-	public static final int PPC_REG_VS3 = 137;
-	public static final int PPC_REG_VS4 = 138;
-	public static final int PPC_REG_VS5 = 139;
-	public static final int PPC_REG_VS6 = 140;
-	public static final int PPC_REG_VS7 = 141;
-	public static final int PPC_REG_VS8 = 142;
-	public static final int PPC_REG_VS9 = 143;
-	public static final int PPC_REG_VS10 = 144;
-	public static final int PPC_REG_VS11 = 145;
-	public static final int PPC_REG_VS12 = 146;
-	public static final int PPC_REG_VS13 = 147;
-	public static final int PPC_REG_VS14 = 148;
-	public static final int PPC_REG_VS15 = 149;
-	public static final int PPC_REG_VS16 = 150;
-	public static final int PPC_REG_VS17 = 151;
-	public static final int PPC_REG_VS18 = 152;
-	public static final int PPC_REG_VS19 = 153;
-	public static final int PPC_REG_VS20 = 154;
-	public static final int PPC_REG_VS21 = 155;
-	public static final int PPC_REG_VS22 = 156;
-	public static final int PPC_REG_VS23 = 157;
-	public static final int PPC_REG_VS24 = 158;
-	public static final int PPC_REG_VS25 = 159;
-	public static final int PPC_REG_VS26 = 160;
-	public static final int PPC_REG_VS27 = 161;
-	public static final int PPC_REG_VS28 = 162;
-	public static final int PPC_REG_VS29 = 163;
-	public static final int PPC_REG_VS30 = 164;
-	public static final int PPC_REG_VS31 = 165;
-	public static final int PPC_REG_VS32 = 166;
-	public static final int PPC_REG_VS33 = 167;
-	public static final int PPC_REG_VS34 = 168;
-	public static final int PPC_REG_VS35 = 169;
-	public static final int PPC_REG_VS36 = 170;
-	public static final int PPC_REG_VS37 = 171;
-	public static final int PPC_REG_VS38 = 172;
-	public static final int PPC_REG_VS39 = 173;
-	public static final int PPC_REG_VS40 = 174;
-	public static final int PPC_REG_VS41 = 175;
-	public static final int PPC_REG_VS42 = 176;
-	public static final int PPC_REG_VS43 = 177;
-	public static final int PPC_REG_VS44 = 178;
-	public static final int PPC_REG_VS45 = 179;
-	public static final int PPC_REG_VS46 = 180;
-	public static final int PPC_REG_VS47 = 181;
-	public static final int PPC_REG_VS48 = 182;
-	public static final int PPC_REG_VS49 = 183;
-	public static final int PPC_REG_VS50 = 184;
-	public static final int PPC_REG_VS51 = 185;
-	public static final int PPC_REG_VS52 = 186;
-	public static final int PPC_REG_VS53 = 187;
-	public static final int PPC_REG_VS54 = 188;
-	public static final int PPC_REG_VS55 = 189;
-	public static final int PPC_REG_VS56 = 190;
-	public static final int PPC_REG_VS57 = 191;
-	public static final int PPC_REG_VS58 = 192;
-	public static final int PPC_REG_VS59 = 193;
-	public static final int PPC_REG_VS60 = 194;
-	public static final int PPC_REG_VS61 = 195;
-	public static final int PPC_REG_VS62 = 196;
-	public static final int PPC_REG_VS63 = 197;
-	public static final int PPC_REG_RM = 198;
-	public static final int PPC_REG_CTR8 = 199;
-	public static final int PPC_REG_LR8 = 200;
-	public static final int PPC_REG_CR1EQ = 201;
-	public static final int PPC_REG_MAX = 202;
+	public static final int PPC_REG_CTR = 11;
+	public static final int PPC_REG_F0 = 12;
+	public static final int PPC_REG_F1 = 13;
+	public static final int PPC_REG_F2 = 14;
+	public static final int PPC_REG_F3 = 15;
+	public static final int PPC_REG_F4 = 16;
+	public static final int PPC_REG_F5 = 17;
+	public static final int PPC_REG_F6 = 18;
+	public static final int PPC_REG_F7 = 19;
+	public static final int PPC_REG_F8 = 20;
+	public static final int PPC_REG_F9 = 21;
+	public static final int PPC_REG_F10 = 22;
+	public static final int PPC_REG_F11 = 23;
+	public static final int PPC_REG_F12 = 24;
+	public static final int PPC_REG_F13 = 25;
+	public static final int PPC_REG_F14 = 26;
+	public static final int PPC_REG_F15 = 27;
+	public static final int PPC_REG_F16 = 28;
+	public static final int PPC_REG_F17 = 29;
+	public static final int PPC_REG_F18 = 30;
+	public static final int PPC_REG_F19 = 31;
+	public static final int PPC_REG_F20 = 32;
+	public static final int PPC_REG_F21 = 33;
+	public static final int PPC_REG_F22 = 34;
+	public static final int PPC_REG_F23 = 35;
+	public static final int PPC_REG_F24 = 36;
+	public static final int PPC_REG_F25 = 37;
+	public static final int PPC_REG_F26 = 38;
+	public static final int PPC_REG_F27 = 39;
+	public static final int PPC_REG_F28 = 40;
+	public static final int PPC_REG_F29 = 41;
+	public static final int PPC_REG_F30 = 42;
+	public static final int PPC_REG_F31 = 43;
+	public static final int PPC_REG_LR = 44;
+	public static final int PPC_REG_R0 = 45;
+	public static final int PPC_REG_R1 = 46;
+	public static final int PPC_REG_R2 = 47;
+	public static final int PPC_REG_R3 = 48;
+	public static final int PPC_REG_R4 = 49;
+	public static final int PPC_REG_R5 = 50;
+	public static final int PPC_REG_R6 = 51;
+	public static final int PPC_REG_R7 = 52;
+	public static final int PPC_REG_R8 = 53;
+	public static final int PPC_REG_R9 = 54;
+	public static final int PPC_REG_R10 = 55;
+	public static final int PPC_REG_R11 = 56;
+	public static final int PPC_REG_R12 = 57;
+	public static final int PPC_REG_R13 = 58;
+	public static final int PPC_REG_R14 = 59;
+	public static final int PPC_REG_R15 = 60;
+	public static final int PPC_REG_R16 = 61;
+	public static final int PPC_REG_R17 = 62;
+	public static final int PPC_REG_R18 = 63;
+	public static final int PPC_REG_R19 = 64;
+	public static final int PPC_REG_R20 = 65;
+	public static final int PPC_REG_R21 = 66;
+	public static final int PPC_REG_R22 = 67;
+	public static final int PPC_REG_R23 = 68;
+	public static final int PPC_REG_R24 = 69;
+	public static final int PPC_REG_R25 = 70;
+	public static final int PPC_REG_R26 = 71;
+	public static final int PPC_REG_R27 = 72;
+	public static final int PPC_REG_R28 = 73;
+	public static final int PPC_REG_R29 = 74;
+	public static final int PPC_REG_R30 = 75;
+	public static final int PPC_REG_R31 = 76;
+	public static final int PPC_REG_V0 = 77;
+	public static final int PPC_REG_V1 = 78;
+	public static final int PPC_REG_V2 = 79;
+	public static final int PPC_REG_V3 = 80;
+	public static final int PPC_REG_V4 = 81;
+	public static final int PPC_REG_V5 = 82;
+	public static final int PPC_REG_V6 = 83;
+	public static final int PPC_REG_V7 = 84;
+	public static final int PPC_REG_V8 = 85;
+	public static final int PPC_REG_V9 = 86;
+	public static final int PPC_REG_V10 = 87;
+	public static final int PPC_REG_V11 = 88;
+	public static final int PPC_REG_V12 = 89;
+	public static final int PPC_REG_V13 = 90;
+	public static final int PPC_REG_V14 = 91;
+	public static final int PPC_REG_V15 = 92;
+	public static final int PPC_REG_V16 = 93;
+	public static final int PPC_REG_V17 = 94;
+	public static final int PPC_REG_V18 = 95;
+	public static final int PPC_REG_V19 = 96;
+	public static final int PPC_REG_V20 = 97;
+	public static final int PPC_REG_V21 = 98;
+	public static final int PPC_REG_V22 = 99;
+	public static final int PPC_REG_V23 = 100;
+	public static final int PPC_REG_V24 = 101;
+	public static final int PPC_REG_V25 = 102;
+	public static final int PPC_REG_V26 = 103;
+	public static final int PPC_REG_V27 = 104;
+	public static final int PPC_REG_V28 = 105;
+	public static final int PPC_REG_V29 = 106;
+	public static final int PPC_REG_V30 = 107;
+	public static final int PPC_REG_V31 = 108;
+	public static final int PPC_REG_VRSAVE = 109;
+	public static final int PPC_REG_VS0 = 110;
+	public static final int PPC_REG_VS1 = 111;
+	public static final int PPC_REG_VS2 = 112;
+	public static final int PPC_REG_VS3 = 113;
+	public static final int PPC_REG_VS4 = 114;
+	public static final int PPC_REG_VS5 = 115;
+	public static final int PPC_REG_VS6 = 116;
+	public static final int PPC_REG_VS7 = 117;
+	public static final int PPC_REG_VS8 = 118;
+	public static final int PPC_REG_VS9 = 119;
+	public static final int PPC_REG_VS10 = 120;
+	public static final int PPC_REG_VS11 = 121;
+	public static final int PPC_REG_VS12 = 122;
+	public static final int PPC_REG_VS13 = 123;
+	public static final int PPC_REG_VS14 = 124;
+	public static final int PPC_REG_VS15 = 125;
+	public static final int PPC_REG_VS16 = 126;
+	public static final int PPC_REG_VS17 = 127;
+	public static final int PPC_REG_VS18 = 128;
+	public static final int PPC_REG_VS19 = 129;
+	public static final int PPC_REG_VS20 = 130;
+	public static final int PPC_REG_VS21 = 131;
+	public static final int PPC_REG_VS22 = 132;
+	public static final int PPC_REG_VS23 = 133;
+	public static final int PPC_REG_VS24 = 134;
+	public static final int PPC_REG_VS25 = 135;
+	public static final int PPC_REG_VS26 = 136;
+	public static final int PPC_REG_VS27 = 137;
+	public static final int PPC_REG_VS28 = 138;
+	public static final int PPC_REG_VS29 = 139;
+	public static final int PPC_REG_VS30 = 140;
+	public static final int PPC_REG_VS31 = 141;
+	public static final int PPC_REG_VS32 = 142;
+	public static final int PPC_REG_VS33 = 143;
+	public static final int PPC_REG_VS34 = 144;
+	public static final int PPC_REG_VS35 = 145;
+	public static final int PPC_REG_VS36 = 146;
+	public static final int PPC_REG_VS37 = 147;
+	public static final int PPC_REG_VS38 = 148;
+	public static final int PPC_REG_VS39 = 149;
+	public static final int PPC_REG_VS40 = 150;
+	public static final int PPC_REG_VS41 = 151;
+	public static final int PPC_REG_VS42 = 152;
+	public static final int PPC_REG_VS43 = 153;
+	public static final int PPC_REG_VS44 = 154;
+	public static final int PPC_REG_VS45 = 155;
+	public static final int PPC_REG_VS46 = 156;
+	public static final int PPC_REG_VS47 = 157;
+	public static final int PPC_REG_VS48 = 158;
+	public static final int PPC_REG_VS49 = 159;
+	public static final int PPC_REG_VS50 = 160;
+	public static final int PPC_REG_VS51 = 161;
+	public static final int PPC_REG_VS52 = 162;
+	public static final int PPC_REG_VS53 = 163;
+	public static final int PPC_REG_VS54 = 164;
+	public static final int PPC_REG_VS55 = 165;
+	public static final int PPC_REG_VS56 = 166;
+	public static final int PPC_REG_VS57 = 167;
+	public static final int PPC_REG_VS58 = 168;
+	public static final int PPC_REG_VS59 = 169;
+	public static final int PPC_REG_VS60 = 170;
+	public static final int PPC_REG_VS61 = 171;
+	public static final int PPC_REG_VS62 = 172;
+	public static final int PPC_REG_VS63 = 173;
+	public static final int PPC_REG_RM = 174;
+	public static final int PPC_REG_CTR8 = 175;
+	public static final int PPC_REG_LR8 = 176;
+	public static final int PPC_REG_CR1EQ = 177;
+	public static final int PPC_REG_MAX = 178;
 
 	// PPC instruction
 
diff --git a/bindings/python/capstone/ppc_const.py b/bindings/python/capstone/ppc_const.py
index c364a61..1ab7913 100644
--- a/bindings/python/capstone/ppc_const.py
+++ b/bindings/python/capstone/ppc_const.py
@@ -54,198 +54,174 @@
 PPC_REG_CR5 = 8
 PPC_REG_CR6 = 9
 PPC_REG_CR7 = 10
-PPC_REG_CR8 = 11
-PPC_REG_CR9 = 12
-PPC_REG_CR10 = 13
-PPC_REG_CR11 = 14
-PPC_REG_CR12 = 15
-PPC_REG_CR13 = 16
-PPC_REG_CR14 = 17
-PPC_REG_CR15 = 18
-PPC_REG_CR16 = 19
-PPC_REG_CR17 = 20
-PPC_REG_CR18 = 21
-PPC_REG_CR19 = 22
-PPC_REG_CR20 = 23
-PPC_REG_CR21 = 24
-PPC_REG_CR22 = 25
-PPC_REG_CR23 = 26
-PPC_REG_CR24 = 27
-PPC_REG_CR25 = 28
-PPC_REG_CR26 = 29
-PPC_REG_CR27 = 30
-PPC_REG_CR28 = 31
-PPC_REG_CR29 = 32
-PPC_REG_CR30 = 33
-PPC_REG_CR31 = 34
-PPC_REG_CTR = 35
-PPC_REG_F0 = 36
-PPC_REG_F1 = 37
-PPC_REG_F2 = 38
-PPC_REG_F3 = 39
-PPC_REG_F4 = 40
-PPC_REG_F5 = 41
-PPC_REG_F6 = 42
-PPC_REG_F7 = 43
-PPC_REG_F8 = 44
-PPC_REG_F9 = 45
-PPC_REG_F10 = 46
-PPC_REG_F11 = 47
-PPC_REG_F12 = 48
-PPC_REG_F13 = 49
-PPC_REG_F14 = 50
-PPC_REG_F15 = 51
-PPC_REG_F16 = 52
-PPC_REG_F17 = 53
-PPC_REG_F18 = 54
-PPC_REG_F19 = 55
-PPC_REG_F20 = 56
-PPC_REG_F21 = 57
-PPC_REG_F22 = 58
-PPC_REG_F23 = 59
-PPC_REG_F24 = 60
-PPC_REG_F25 = 61
-PPC_REG_F26 = 62
-PPC_REG_F27 = 63
-PPC_REG_F28 = 64
-PPC_REG_F29 = 65
-PPC_REG_F30 = 66
-PPC_REG_F31 = 67
-PPC_REG_LR = 68
-PPC_REG_R0 = 69
-PPC_REG_R1 = 70
-PPC_REG_R2 = 71
-PPC_REG_R3 = 72
-PPC_REG_R4 = 73
-PPC_REG_R5 = 74
-PPC_REG_R6 = 75
-PPC_REG_R7 = 76
-PPC_REG_R8 = 77
-PPC_REG_R9 = 78
-PPC_REG_R10 = 79
-PPC_REG_R11 = 80
-PPC_REG_R12 = 81
-PPC_REG_R13 = 82
-PPC_REG_R14 = 83
-PPC_REG_R15 = 84
-PPC_REG_R16 = 85
-PPC_REG_R17 = 86
-PPC_REG_R18 = 87
-PPC_REG_R19 = 88
-PPC_REG_R20 = 89
-PPC_REG_R21 = 90
-PPC_REG_R22 = 91
-PPC_REG_R23 = 92
-PPC_REG_R24 = 93
-PPC_REG_R25 = 94
-PPC_REG_R26 = 95
-PPC_REG_R27 = 96
-PPC_REG_R28 = 97
-PPC_REG_R29 = 98
-PPC_REG_R30 = 99
-PPC_REG_R31 = 100
-PPC_REG_V0 = 101
-PPC_REG_V1 = 102
-PPC_REG_V2 = 103
-PPC_REG_V3 = 104
-PPC_REG_V4 = 105
-PPC_REG_V5 = 106
-PPC_REG_V6 = 107
-PPC_REG_V7 = 108
-PPC_REG_V8 = 109
-PPC_REG_V9 = 110
-PPC_REG_V10 = 111
-PPC_REG_V11 = 112
-PPC_REG_V12 = 113
-PPC_REG_V13 = 114
-PPC_REG_V14 = 115
-PPC_REG_V15 = 116
-PPC_REG_V16 = 117
-PPC_REG_V17 = 118
-PPC_REG_V18 = 119
-PPC_REG_V19 = 120
-PPC_REG_V20 = 121
-PPC_REG_V21 = 122
-PPC_REG_V22 = 123
-PPC_REG_V23 = 124
-PPC_REG_V24 = 125
-PPC_REG_V25 = 126
-PPC_REG_V26 = 127
-PPC_REG_V27 = 128
-PPC_REG_V28 = 129
-PPC_REG_V29 = 130
-PPC_REG_V30 = 131
-PPC_REG_V31 = 132
-PPC_REG_VRSAVE = 133
-PPC_REG_VS0 = 134
-PPC_REG_VS1 = 135
-PPC_REG_VS2 = 136
-PPC_REG_VS3 = 137
-PPC_REG_VS4 = 138
-PPC_REG_VS5 = 139
-PPC_REG_VS6 = 140
-PPC_REG_VS7 = 141
-PPC_REG_VS8 = 142
-PPC_REG_VS9 = 143
-PPC_REG_VS10 = 144
-PPC_REG_VS11 = 145
-PPC_REG_VS12 = 146
-PPC_REG_VS13 = 147
-PPC_REG_VS14 = 148
-PPC_REG_VS15 = 149
-PPC_REG_VS16 = 150
-PPC_REG_VS17 = 151
-PPC_REG_VS18 = 152
-PPC_REG_VS19 = 153
-PPC_REG_VS20 = 154
-PPC_REG_VS21 = 155
-PPC_REG_VS22 = 156
-PPC_REG_VS23 = 157
-PPC_REG_VS24 = 158
-PPC_REG_VS25 = 159
-PPC_REG_VS26 = 160
-PPC_REG_VS27 = 161
-PPC_REG_VS28 = 162
-PPC_REG_VS29 = 163
-PPC_REG_VS30 = 164
-PPC_REG_VS31 = 165
-PPC_REG_VS32 = 166
-PPC_REG_VS33 = 167
-PPC_REG_VS34 = 168
-PPC_REG_VS35 = 169
-PPC_REG_VS36 = 170
-PPC_REG_VS37 = 171
-PPC_REG_VS38 = 172
-PPC_REG_VS39 = 173
-PPC_REG_VS40 = 174
-PPC_REG_VS41 = 175
-PPC_REG_VS42 = 176
-PPC_REG_VS43 = 177
-PPC_REG_VS44 = 178
-PPC_REG_VS45 = 179
-PPC_REG_VS46 = 180
-PPC_REG_VS47 = 181
-PPC_REG_VS48 = 182
-PPC_REG_VS49 = 183
-PPC_REG_VS50 = 184
-PPC_REG_VS51 = 185
-PPC_REG_VS52 = 186
-PPC_REG_VS53 = 187
-PPC_REG_VS54 = 188
-PPC_REG_VS55 = 189
-PPC_REG_VS56 = 190
-PPC_REG_VS57 = 191
-PPC_REG_VS58 = 192
-PPC_REG_VS59 = 193
-PPC_REG_VS60 = 194
-PPC_REG_VS61 = 195
-PPC_REG_VS62 = 196
-PPC_REG_VS63 = 197
-PPC_REG_RM = 198
-PPC_REG_CTR8 = 199
-PPC_REG_LR8 = 200
-PPC_REG_CR1EQ = 201
-PPC_REG_MAX = 202
+PPC_REG_CTR = 11
+PPC_REG_F0 = 12
+PPC_REG_F1 = 13
+PPC_REG_F2 = 14
+PPC_REG_F3 = 15
+PPC_REG_F4 = 16
+PPC_REG_F5 = 17
+PPC_REG_F6 = 18
+PPC_REG_F7 = 19
+PPC_REG_F8 = 20
+PPC_REG_F9 = 21
+PPC_REG_F10 = 22
+PPC_REG_F11 = 23
+PPC_REG_F12 = 24
+PPC_REG_F13 = 25
+PPC_REG_F14 = 26
+PPC_REG_F15 = 27
+PPC_REG_F16 = 28
+PPC_REG_F17 = 29
+PPC_REG_F18 = 30
+PPC_REG_F19 = 31
+PPC_REG_F20 = 32
+PPC_REG_F21 = 33
+PPC_REG_F22 = 34
+PPC_REG_F23 = 35
+PPC_REG_F24 = 36
+PPC_REG_F25 = 37
+PPC_REG_F26 = 38
+PPC_REG_F27 = 39
+PPC_REG_F28 = 40
+PPC_REG_F29 = 41
+PPC_REG_F30 = 42
+PPC_REG_F31 = 43
+PPC_REG_LR = 44
+PPC_REG_R0 = 45
+PPC_REG_R1 = 46
+PPC_REG_R2 = 47
+PPC_REG_R3 = 48
+PPC_REG_R4 = 49
+PPC_REG_R5 = 50
+PPC_REG_R6 = 51
+PPC_REG_R7 = 52
+PPC_REG_R8 = 53
+PPC_REG_R9 = 54
+PPC_REG_R10 = 55
+PPC_REG_R11 = 56
+PPC_REG_R12 = 57
+PPC_REG_R13 = 58
+PPC_REG_R14 = 59
+PPC_REG_R15 = 60
+PPC_REG_R16 = 61
+PPC_REG_R17 = 62
+PPC_REG_R18 = 63
+PPC_REG_R19 = 64
+PPC_REG_R20 = 65
+PPC_REG_R21 = 66
+PPC_REG_R22 = 67
+PPC_REG_R23 = 68
+PPC_REG_R24 = 69
+PPC_REG_R25 = 70
+PPC_REG_R26 = 71
+PPC_REG_R27 = 72
+PPC_REG_R28 = 73
+PPC_REG_R29 = 74
+PPC_REG_R30 = 75
+PPC_REG_R31 = 76
+PPC_REG_V0 = 77
+PPC_REG_V1 = 78
+PPC_REG_V2 = 79
+PPC_REG_V3 = 80
+PPC_REG_V4 = 81
+PPC_REG_V5 = 82
+PPC_REG_V6 = 83
+PPC_REG_V7 = 84
+PPC_REG_V8 = 85
+PPC_REG_V9 = 86
+PPC_REG_V10 = 87
+PPC_REG_V11 = 88
+PPC_REG_V12 = 89
+PPC_REG_V13 = 90
+PPC_REG_V14 = 91
+PPC_REG_V15 = 92
+PPC_REG_V16 = 93
+PPC_REG_V17 = 94
+PPC_REG_V18 = 95
+PPC_REG_V19 = 96
+PPC_REG_V20 = 97
+PPC_REG_V21 = 98
+PPC_REG_V22 = 99
+PPC_REG_V23 = 100
+PPC_REG_V24 = 101
+PPC_REG_V25 = 102
+PPC_REG_V26 = 103
+PPC_REG_V27 = 104
+PPC_REG_V28 = 105
+PPC_REG_V29 = 106
+PPC_REG_V30 = 107
+PPC_REG_V31 = 108
+PPC_REG_VRSAVE = 109
+PPC_REG_VS0 = 110
+PPC_REG_VS1 = 111
+PPC_REG_VS2 = 112
+PPC_REG_VS3 = 113
+PPC_REG_VS4 = 114
+PPC_REG_VS5 = 115
+PPC_REG_VS6 = 116
+PPC_REG_VS7 = 117
+PPC_REG_VS8 = 118
+PPC_REG_VS9 = 119
+PPC_REG_VS10 = 120
+PPC_REG_VS11 = 121
+PPC_REG_VS12 = 122
+PPC_REG_VS13 = 123
+PPC_REG_VS14 = 124
+PPC_REG_VS15 = 125
+PPC_REG_VS16 = 126
+PPC_REG_VS17 = 127
+PPC_REG_VS18 = 128
+PPC_REG_VS19 = 129
+PPC_REG_VS20 = 130
+PPC_REG_VS21 = 131
+PPC_REG_VS22 = 132
+PPC_REG_VS23 = 133
+PPC_REG_VS24 = 134
+PPC_REG_VS25 = 135
+PPC_REG_VS26 = 136
+PPC_REG_VS27 = 137
+PPC_REG_VS28 = 138
+PPC_REG_VS29 = 139
+PPC_REG_VS30 = 140
+PPC_REG_VS31 = 141
+PPC_REG_VS32 = 142
+PPC_REG_VS33 = 143
+PPC_REG_VS34 = 144
+PPC_REG_VS35 = 145
+PPC_REG_VS36 = 146
+PPC_REG_VS37 = 147
+PPC_REG_VS38 = 148
+PPC_REG_VS39 = 149
+PPC_REG_VS40 = 150
+PPC_REG_VS41 = 151
+PPC_REG_VS42 = 152
+PPC_REG_VS43 = 153
+PPC_REG_VS44 = 154
+PPC_REG_VS45 = 155
+PPC_REG_VS46 = 156
+PPC_REG_VS47 = 157
+PPC_REG_VS48 = 158
+PPC_REG_VS49 = 159
+PPC_REG_VS50 = 160
+PPC_REG_VS51 = 161
+PPC_REG_VS52 = 162
+PPC_REG_VS53 = 163
+PPC_REG_VS54 = 164
+PPC_REG_VS55 = 165
+PPC_REG_VS56 = 166
+PPC_REG_VS57 = 167
+PPC_REG_VS58 = 168
+PPC_REG_VS59 = 169
+PPC_REG_VS60 = 170
+PPC_REG_VS61 = 171
+PPC_REG_VS62 = 172
+PPC_REG_VS63 = 173
+PPC_REG_RM = 174
+PPC_REG_CTR8 = 175
+PPC_REG_LR8 = 176
+PPC_REG_CR1EQ = 177
+PPC_REG_MAX = 178
 
 # PPC instruction
 
diff --git a/include/ppc.h b/include/ppc.h
index 4c09a5d..548552d 100644
--- a/include/ppc.h
+++ b/include/ppc.h
@@ -107,30 +107,6 @@
 	PPC_REG_CR5,
 	PPC_REG_CR6,
 	PPC_REG_CR7,
-	PPC_REG_CR8,
-	PPC_REG_CR9,
-	PPC_REG_CR10,
-	PPC_REG_CR11,
-	PPC_REG_CR12,
-	PPC_REG_CR13,
-	PPC_REG_CR14,
-	PPC_REG_CR15,
-	PPC_REG_CR16,
-	PPC_REG_CR17,
-	PPC_REG_CR18,
-	PPC_REG_CR19,
-	PPC_REG_CR20,
-	PPC_REG_CR21,
-	PPC_REG_CR22,
-	PPC_REG_CR23,
-	PPC_REG_CR24,
-	PPC_REG_CR25,
-	PPC_REG_CR26,
-	PPC_REG_CR27,
-	PPC_REG_CR28,
-	PPC_REG_CR29,
-	PPC_REG_CR30,
-	PPC_REG_CR31,
 	PPC_REG_CTR,
 	PPC_REG_F0,
 	PPC_REG_F1,