Add REV and others to Rasm2, related to bug #7250 (#9365)

radareorg · Feb 12, 2018 · 8c683ea · 8c683ea
1 parent e46939e
commit 8c683ea
Showing 1 changed file with 20 additions and 0 deletions.
diff --git a/libr/asm/arch/arm/armass.c b/libr/asm/arch/arm/armass.c
@@ -42,6 +42,7 @@ enum {
 	TYPE_ENDIAN = 17,
 	TYPE_MUL = 18,
 	TYPE_CLZ = 19,
+	TYPE_REV = 20,
 };
 
 static int strcmpnull(const char *a, const char *b) {
@@ -139,6 +140,11 @@ static ArmOp ops[] = {
 	{"lsl", 0x1000a0e1, TYPE_SHFT},
 	{"ror", 0x7000a0e1, TYPE_SHFT},
 
+	{"rev16", 0xb00fbf06, TYPE_REV},
+	{"revsh", 0xb00fff06, TYPE_REV},
+	{"rev",   0x300fbf06, TYPE_REV},
+	{"rbit",  0x300fff06, TYPE_REV},
+
 	{"mrc", 0x100010ee, TYPE_COPROC},
 	{"setend", 0x000001f1, TYPE_ENDIAN},
 	{ "clz", 0x000f6f01, TYPE_CLZ},
@@ -1335,6 +1341,20 @@ static int arm_assemble(ArmOpcode *ao, ut64 off, const char *str) {
 					return 0;
 				}
 				ao->o |= reg << 24;
+				break;
+			case TYPE_REV:
+				reg = getreg (ao->a[0]);
+				if (reg == -1 || reg > 14) {
+					return 0;
+				}
+				ao->o |= reg << 20;
+
+				reg = getreg (ao->a[1]);
+				if (reg == -1 || reg > 14) {
+					return 0;
+				}
+				ao->o |= reg << 24;
+
 				break;
 			case TYPE_ENDIAN:
 				if (!strcmp (ao->a[0], "le")) {