Parser refactored

Author: psrok1

BLSI.c

@@ -8,7 +8,7 @@ int __stdcall BLSIInstructionEmulator(
 	UNREFERENCED_PARAMETER(instruction);
 	UNREFERENCED_PARAMETER(context);
 
-	unsigned int src;
+	int src;
 	if (instruction.src1 == MEM_32)
 	{
 		src = *(unsigned int*)getEffectiveVA(instruction.mem, context);
@@ -20,7 +20,7 @@ int __stdcall BLSIInstructionEmulator(
 
 	unsigned int operand_size = 32;
 
-	unsigned int dest = (-src) & src;
+	int dest = -src & src;
 
 	// Set flags
 	context->flags &= (~FLAG_ZF) & (~FLAG_SF) & (~FLAG_CF) & (~FLAG_OF);

Consts.h

@@ -40,13 +40,23 @@
 
 // Instruction descriptors
 
-#define INSTR_ANDN	    0x00000000
-#define INSTR_BEXTR	    0x10000000
-#define INSTR_BLSI	    0x20000000
-#define INSTR_BLSMSK    0x30000000
-#define INSTR_BLSR	    0x40000000
-#define INSTR_LZCNT	    0x50000000
-#define INSTR_POPCNT    0x60000000
-#define INSTR_TZCNT	    0x70000000
-#define INSTR_DEBUG     0xFFFFFFFE
-#define INSTR_UNKNOWN   0xFFFFFFFF
+#define INSTR_VVVV_USED 0x0001
+#define INSTR_16BIT     0x0002
+#define INSTR_SRC1_VVVV 0x0010
+#define INSTR_SRC1_RM   0x0020
+#define INSTR_SRC2_VVVV 0x0100
+#define INSTR_SRC2_RM   0x0200
+#define INSTR_DEST_VVVV 0x1000
+#define INSTR_DEST_REG  0x2000
+
+
+#define INSTR_ANDN	    (0x00000000 | INSTR_VVVV_USED | INSTR_SRC1_VVVV | INSTR_SRC2_RM   | INSTR_DEST_REG)
+#define INSTR_BEXTR	    (0x10000000 | INSTR_VVVV_USED | INSTR_SRC1_RM   | INSTR_SRC2_VVVV | INSTR_DEST_REG)
+#define INSTR_BLSI	    (0x20000000 | INSTR_VVVV_USED | INSTR_SRC1_RM                     | INSTR_DEST_VVVV)
+#define INSTR_BLSMSK    (0x30000000 | INSTR_VVVV_USED | INSTR_SRC1_RM                     | INSTR_DEST_VVVV)
+#define INSTR_BLSR	    (0x40000000 | INSTR_VVVV_USED | INSTR_SRC1_RM                     | INSTR_DEST_VVVV)
+#define INSTR_LZCNT	    (0x50000000 | INSTR_16BIT     | INSTR_SRC1_RM                     | INSTR_DEST_REG)
+#define INSTR_POPCNT    (0x60000000 | INSTR_16BIT     | INSTR_SRC1_RM                     | INSTR_DEST_REG)
+#define INSTR_TZCNT	    (0x70000000 | INSTR_16BIT     | INSTR_SRC1_RM                     | INSTR_DEST_REG)
+#define INSTR_DEBUG     (0xE0000000)
+#define INSTR_UNKNOWN   (0xF0000000)

LZCNT.c

@@ -25,8 +25,8 @@ int __stdcall LZCNTInstructionEmulator(
 		operand_size = 16;
 	}
 
-	unsigned int temp = operand_size - 1;
-	unsigned int dest = 0;
+	int temp = operand_size - 1;
+	int dest = 0;
 
 	while ((temp >= 0) && (src >> temp == 0))
 	{
@@ -36,7 +36,7 @@ int __stdcall LZCNTInstructionEmulator(
 
 	// Set flags
 	context->flags &= (~FLAG_ZF) & (~FLAG_CF);
-	if (dest == operand_size)
+	if (dest == (int)operand_size)
 	{
 		context->flags |= FLAG_CF;
 	}