diff options
| author | Cyrille Bagard <nocbos@gmail.com> | 2009-05-17 22:59:55 (GMT) |
|---|---|---|
| committer | Cyrille Bagard <nocbos@gmail.com> | 2009-05-17 22:59:55 (GMT) |
| commit | 4d0ff0c23862c242d533d9b2d34e8812ef99ad61 (patch) | |
| tree | 3b8504b8d3946a8bc9a702b819138ab1e5501be6 /src/arch/x86/op_dec.c | |
| parent | 96cb6971ee3ca529958b8cb1e8e55a6eb4e60eae (diff) | |
Used only the new format of processor/instructions/operands for x86.
git-svn-id: svn://svn.gna.org/svn/chrysalide/trunk@64 abbe820e-26c8-41b2-8c08-b7b2b41f8b0a
Diffstat (limited to 'src/arch/x86/op_dec.c')
| -rw-r--r-- | src/arch/x86/op_dec.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/arch/x86/op_dec.c b/src/arch/x86/op_dec.c index dd3562e..f140b85 100644 --- a/src/arch/x86/op_dec.c +++ b/src/arch/x86/op_dec.c @@ -35,7 +35,8 @@ * Paramètres : data = flux de données à analyser. * * pos = position courante dans ce flux. [OUT] * * len = taille totale des données à analyser. * -* offset = adresse virtuelle de l'instruction. * +* addr = adresse virtuelle de l'instruction. * +* prefix = éventuel(s) préfixe(s) remarqué(s). * * proc = architecture ciblée par le désassemblage. * * * * Description : Décode une instruction de type 'dec' (16 ou 32 bits). * @@ -46,20 +47,21 @@ * * ******************************************************************************/ -asm_x86_instr *x86_read_instr_dec_r1632(const uint8_t *data, off_t *pos, off_t len, uint64_t offset, const asm_x86_processor *proc) +GArchInstruction *x86_read_instr_dec_r1632(const bin_t *data, off_t *pos, off_t len, vmpa_t addr, X86Prefix prefix, const GX86Processor *proc) { - asm_x86_instr *result; /* Instruction à retourner */ + GArchInstruction *result; /* Instruction à retourner */ + X86Opcodes opcode; /* Instruction effective */ AsmOperandSize oprsize; /* Taille des opérandes */ - result = (asm_x86_instr *)calloc(1, sizeof(asm_x86_instr)); + opcode = XOP_DEC_E_AX + (data[*pos] - 0x48); - oprsize = switch_x86_operand_size_if_needed(proc, data, pos); + result = g_x86_instruction_new(opcode); - ASM_INSTRUCTION(result)->opcode = data[*pos]; + oprsize = g_x86_processor_get_operand_size(proc, prefix); if (!x86_read_one_operand(result, data, pos, len, X86_OTP_OP_R1632, oprsize, 0x48)) { - free(result); + /* TODO free(result);*/ return NULL; } |