Centralized all the code used to decode instructions.

git-svn-id: svn://svn.gna.org/svn/chrysalide/trunk@32 abbe820e-26c8-41b2-8c08-b7b2b41f8b0a

1 files changed, 6 insertions, 63 deletions

diff --git a/src/arch/x86/op_sub.c b/src/arch/x86/op_sub.c
index 18d8dce..7c282cc 100644
--- a/src/arch/x86/op_sub.c
+++ b/src/arch/x86/op_sub.c
@@ -46,53 +46,23 @@
 *                                                                             *
 ******************************************************************************/
 
-asm_x86_instr *x86_read_instr_sub8_with_reg1632(const uint8_t *data, off_t *pos, off_t len, uint64_t offset, const asm_x86_processor *proc)
+asm_x86_instr *x86_read_instr_sub_imm8_from_rm1632(const uint8_t *data, off_t *pos, off_t len, uint64_t offset, const asm_x86_processor *proc)
 {
     asm_x86_instr *result;                  /* Instruction à retourner     */
     AsmOperandSize oprsize;                 /* Taille des opérandes        */
-    asm_x86_operand *reg;                   /* Registre de destination     */
-    asm_x86_operand *value;                 /* Valeur empilée              */
 
     result = (asm_x86_instr *)calloc(1, sizeof(asm_x86_instr));
 
-    /* Utilisation des registres 32 bits ? */
-    if (data[*pos] == 0x66)
-    {
-        oprsize = switch_x86_operand_size(proc);
-        (*pos)++;
-    }
-    else oprsize = get_x86_current_operand_size(proc);
+    oprsize = switch_x86_operand_size_if_needed(proc, data, pos);
 
     ASM_INSTRUCTION(result)->opcode = data[(*pos)++];
 
-    /* TODO ! */
-    if ((data[*pos] & 0xc0) != 0xc0)
-        return NULL;
-
-    reg = x86_create_reg1632_operand_from_modrm(data[*pos], oprsize == AOS_32_BITS, false);
-    if (reg == NULL)
+    if (!x86_read_two_operands(result, data, pos, len, X86_OTP_RM1632, X86_OTP_IMM8, oprsize))
     {
         free(result);
         return NULL;
     }
 
-    (*pos)++;
-
-    value = create_new_x86_operand();
-    if (!fill_imm_operand(ASM_OPERAND(value), AOS_8_BITS, data, pos, len))
-    {
-        free(reg);
-        free(value);
-        free(result);
-        return NULL;
-    }
-
-    ASM_INSTRUCTION(result)->operands = (asm_operand **)calloc(2, sizeof(asm_operand *));
-    ASM_INSTRUCTION(result)->operands_count = 2;
-
-    ASM_INSTRUCTION(result)->operands[0] = ASM_OPERAND(reg);
-    ASM_INSTRUCTION(result)->operands[1] = ASM_OPERAND(value);
-
     return result;
 
 }
@@ -114,50 +84,23 @@ asm_x86_instr *x86_read_instr_sub8_with_reg1632(const uint8_t *data, off_t *pos,
 *                                                                             *
 ******************************************************************************/
 
-asm_x86_instr *x86_read_instr_sub_r1632_to_rm1632(const uint8_t *data, off_t *pos, off_t len, uint64_t offset, const asm_x86_processor *proc)
+asm_x86_instr *x86_read_instr_sub_r1632_from_rm1632(const uint8_t *data, off_t *pos, off_t len, uint64_t offset, const asm_x86_processor *proc)
 {
     asm_x86_instr *result;                  /* Instruction à retourner     */
     AsmOperandSize oprsize;                 /* Taille des opérandes        */
-    off_t reg1_pos;                         /* POsition après lecture #1   */
-    asm_x86_operand *reg1;                  /* Registre de destination     */
-    asm_x86_operand *reg2;                  /* Registre de source          */
 
     result = (asm_x86_instr *)calloc(1, sizeof(asm_x86_instr));
 
-    /* Utilisation des registres 32 bits ? */
-    if (data[*pos] == 0x66)
-    {
-        oprsize = switch_x86_operand_size(proc);
-        (*pos)++;
-    }
-    else oprsize = get_x86_current_operand_size(proc);
+    oprsize = switch_x86_operand_size_if_needed(proc, data, pos);
 
     ASM_INSTRUCTION(result)->opcode = data[(*pos)++];
 
-    reg1_pos = *pos;
-    reg1 = x86_create_rm1632_operand(data, &reg1_pos, len, oprsize == AOS_32_BITS, true);
-    if (reg1 == NULL)
+    if (!x86_read_two_operands(result, data, pos, len, X86_OTP_RM1632, X86_OTP_R1632, oprsize))
     {
         free(result);
         return NULL;
     }
 
-    reg2 = x86_create_r1632_operand(data[*pos], oprsize == AOS_32_BITS, false);
-    if (reg2 == NULL)
-    {
-        free(result);
-        free(reg1);
-        return NULL;
-    }
-
-    *pos = reg1_pos;
-
-    ASM_INSTRUCTION(result)->operands = (asm_operand **)calloc(2, sizeof(asm_operand *));
-    ASM_INSTRUCTION(result)->operands_count = 2;
-
-    ASM_INSTRUCTION(result)->operands[0] = ASM_OPERAND(reg1);
-    ASM_INSTRUCTION(result)->operands[1] = ASM_OPERAND(reg2);
-
     return result;
 
 }