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, 5 insertions, 34 deletions

diff --git a/src/arch/x86/op_call.c b/src/arch/x86/op_call.c
index 28964b2..980a5e7 100644
--- a/src/arch/x86/op_call.c
+++ b/src/arch/x86/op_call.c
@@ -46,38 +46,23 @@
 *                                                                             *
 ******************************************************************************/
 
-asm_x86_instr *x86_read_instr_call(const uint8_t *data, off_t *pos, off_t len, uint64_t offset, const asm_x86_processor *proc)
+asm_x86_instr *x86_read_instr_call_rel1632(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 *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)++;
-        offset++;
-    }
-    else oprsize = get_x86_current_operand_size(proc);
+    oprsize = switch_x86_operand_size_if_needed(proc, data, pos);
 
     ASM_INSTRUCTION(result)->opcode = data[(*pos)++];
 
-    value = create_new_x86_operand();
-    if (!fill_relimm_operand(ASM_OPERAND(value), oprsize, data, pos, len, ++offset))
+    if (!x86_read_one_operand(result, data, pos, len, X86_OTP_REL1632, oprsize, offset))
     {
-        free(value);
         free(result);
         return NULL;
     }
 
-    ASM_INSTRUCTION(result)->operands = (asm_operand **)calloc(1, sizeof(asm_operand *));
-    ASM_INSTRUCTION(result)->operands_count = 1;
-
-    ASM_INSTRUCTION(result)->operands[0] = ASM_OPERAND(value);
-
     return result;
 
 }
@@ -103,33 +88,19 @@ asm_x86_instr *x86_read_instr_call_rm1632(const uint8_t *data, off_t *pos, off_t
 {
     asm_x86_instr *result;                  /* Instruction à retourner     */
     AsmOperandSize oprsize;                 /* Taille des opérandes        */
-    asm_x86_operand *reg;                   /* Elément à appeler           */
 
     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)++;
-        offset++;
-    }
-    else oprsize = get_x86_current_operand_size(proc);
+    oprsize = switch_x86_operand_size_if_needed(proc, data, pos);
 
     ASM_INSTRUCTION(result)->opcode = data[(*pos)++];
 
-    reg = x86_create_rm1632_operand(data, pos, len, oprsize == AOS_32_BITS, true);
-    if (reg == NULL)
+    if (!x86_read_one_operand(result, data, pos, len, X86_OTP_RM1632, oprsize))
     {
         free(result);
         return NULL;
     }
 
-    ASM_INSTRUCTION(result)->operands = (asm_operand **)calloc(1, sizeof(asm_operand *));
-    ASM_INSTRUCTION(result)->operands_count = 1;
-
-    ASM_INSTRUCTION(result)->operands[0] = ASM_OPERAND(reg);
-
     return result;
 
 }