M src/arm/decoder-thumb.c → src/arm/decoder-thumb.c

@@ -380,6 +380,11 @@ ADVANCE(1);
 	return total;
 }
 
+static int _decodeMemory(struct ARMMemoryAccess memory, char* buffer, int blen) {
+	// TODO
+	return 0;
+}
+
 static const char* _thumbMnemonicStrings[] = {
 	"ill",
 	"adc",
@@ -437,12 +442,51 @@ written = _decodeRegister(info.memory.baseReg, buffer, blen);
 		ADVANCE(written);
 		strncpy(buffer, "!, ", blen);
 		ADVANCE(3);
+		// Fall through
 	case THUMB_MN_POP:
 	case THUMB_MN_PUSH:
 		written = _decodeRegisterList(info.op1.immediate, buffer, blen);
 		ADVANCE(written);
 		break;
 	default:
+		if (info.operandFormat & ARM_OPERAND_IMMEDIATE_1) {
+			written = snprintf(buffer, blen, "#%i", info.op1.immediate);
+			ADVANCE(written);
+		} else if (info.operandFormat & ARM_OPERAND_MEMORY_1) {
+			written = _decodeMemory(info.memory, buffer, blen);
+			ADVANCE(written);
+		} else if (info.operandFormat & ARM_OPERAND_REGISTER_1) {
+			written = _decodeRegister(info.op1.reg, buffer, blen);
+			ADVANCE(written);
+		}
+		if (info.operandFormat & ARM_OPERAND_2) {
+			strncpy(buffer, ", ", blen);
+			ADVANCE(2);
+		}
+		if (info.operandFormat & ARM_OPERAND_IMMEDIATE_2) {
+			written = snprintf(buffer, blen, "#%i", info.op2.immediate);
+			ADVANCE(written);
+		} else if (info.operandFormat & ARM_OPERAND_MEMORY_2) {
+			written = _decodeMemory(info.memory, buffer, blen);
+			ADVANCE(written);
+		} else if (info.operandFormat & ARM_OPERAND_REGISTER_2) {
+			written = _decodeRegister(info.op2.reg, buffer, blen);
+			ADVANCE(written);
+		}
+		if (info.operandFormat & ARM_OPERAND_3) {
+			strncpy(buffer, ", ", blen);
+			ADVANCE(2);
+		}
+		if (info.operandFormat & ARM_OPERAND_IMMEDIATE_3) {
+			written = snprintf(buffer, blen, "#%i", info.op3.immediate);
+			ADVANCE(written);
+		} else if (info.operandFormat & ARM_OPERAND_MEMORY_3) {
+			written = _decodeMemory(info.memory, buffer, blen);
+			ADVANCE(written);
+		} else if (info.operandFormat & ARM_OPERAND_REGISTER_3) {
+			written = _decodeRegister(info.op1.reg, buffer, blen);
+			ADVANCE(written);
+		}
 		break;
 	}
 	buffer[total] = '\0';

M src/arm/decoder.h → src/arm/decoder.h

@@ -18,6 +18,7 @@ ARM_OPERAND_MEMORY_1 =           0x00000004,
 	ARM_OPERAND_AFFECTED_1 =         0x00000008,
 	ARM_OPERAND_SHIFT_REGISTER_1 =   0x00000010,
 	ARM_OPERAND_SHIFT_IMMEDIATE_1 =  0x00000020,
+	ARM_OPERAND_1 =                  0x000000FF,
 
 	ARM_OPERAND_REGISTER_2 =         0x00000100,
 	ARM_OPERAND_IMMEDIATE_2 =        0x00000200,
@@ -25,13 +26,15 @@ ARM_OPERAND_MEMORY_2 =           0x00000400,
 	ARM_OPERAND_AFFECTED_2 =         0x00000800,
 	ARM_OPERAND_SHIFT_REGISTER_2 =   0x00001000,
 	ARM_OPERAND_SHIFT_IMMEDIATE_2 =  0x00002000,
+	ARM_OPERAND_2 =                  0x0000FF00,
 
 	ARM_OPERAND_REGISTER_3 =         0x00010000,
 	ARM_OPERAND_IMMEDIATE_3 =        0x00020000,
 	ARM_OPERAND_MEMORY_3 =           0x00040000,
 	ARM_OPERAND_AFFECTED_3 =         0x00080000,
 	ARM_OPERAND_SHIFT_REGISTER_3 =   0x00100000,
-	ARM_OPERAND_SHIFT_IMMEDIATE_3 =  0x00200000
+	ARM_OPERAND_SHIFT_IMMEDIATE_3 =  0x00200000,
+	ARM_OPERAND_3 =                  0x00FF0000
 };
 
 enum ARMMemoryFormat {