Chiebot-Mirror
/
yasm
mirror of https://github.com/yasm/yasm.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Added shift instructions, as well as new "postponed" actions for things such

Browse Source 
as shift ,1 operands and imm operands that have sign-extended imm8 forms that
can't be decided at parse-time.  The x86 bc format already had support for
these.  Also fixed a bug in the lfs family (incorrect inst len).

svn path=/trunk/yasm/; revision=677
0.3
Peter Johnson 23 years ago
parent 0af7326e75
commit ef8f221f24
6 changed files with 200 additions and 84 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      modules/arch/x86/x86arch.h
  2. 19
      modules/arch/x86/x86bc.c
  3. 120
      modules/arch/x86/x86id.re
  4. 3
      src/arch/x86/x86arch.h
  5. 19
      src/arch/x86/x86bc.c
  6. 120
      src/arch/x86/x86id.re

3
modules/arch/x86/x86arch.h
Unescape View File

@ -77,7 +77,6 @@ effaddr *x86_ea_new_expr(/*@keep@*/ expr *e);
void x86_bc_insn_opersize_override(bytecode *bc, unsigned char opersize); void x86_bc_insn_opersize_override(bytecode *bc, unsigned char opersize);
void x86_bc_insn_addrsize_override(bytecode *bc, unsigned char addrsize); void x86_bc_insn_addrsize_override(bytecode *bc, unsigned char addrsize);
void x86_bc_insn_set_lockrep_prefix(bytecode *bc, unsigned char prefix); void x86_bc_insn_set_lockrep_prefix(bytecode *bc, unsigned char prefix);
void x86_bc_insn_set_shift_flag(bytecode *bc);
void x86_set_jmprel_opcode_sel(x86_jmprel_opcode_sel *old_sel, void x86_set_jmprel_opcode_sel(x86_jmprel_opcode_sel *old_sel,
x86_jmprel_opcode_sel new_sel); x86_jmprel_opcode_sel new_sel);
@ -95,6 +94,8 @@ typedef struct x86_new_insn_data {
unsigned char spare; /* bits to go in 'spare' field of ModRM */ unsigned char spare; /* bits to go in 'spare' field of ModRM */
unsigned char im_len; unsigned char im_len;
unsigned char im_sign; unsigned char im_sign;
unsigned char shift_op;
unsigned char signext_imm8_op;
} x86_new_insn_data; } x86_new_insn_data;
bytecode *x86_bc_new_insn(x86_new_insn_data *d); bytecode *x86_bc_new_insn(x86_new_insn_data *d);

19
modules/arch/x86/x86bc.c
Unescape View File

@ -69,7 +69,8 @@ x86_bc_new_insn(x86_new_insn_data *d)
insn->addrsize = 0; insn->addrsize = 0;
insn->opersize = d->opersize; insn->opersize = d->opersize;
insn->lockrep_pre = 0; insn->lockrep_pre = 0;
insn->shift_op = 0; insn->shift_op = d->shift_op;
insn->signext_imm8_op = d->signext_imm8_op;
insn->mode_bits = x86_mode_bits; insn->mode_bits = x86_mode_bits;
@ -283,22 +284,6 @@ x86_bc_insn_set_lockrep_prefix(bytecode *bc, unsigned char prefix)
*lockrep_pre = prefix; *lockrep_pre = prefix;
} }
void
x86_bc_insn_set_shift_flag(bytecode *bc)
{
x86_insn *insn;
if (!bc)
return;
if ((x86_bytecode_type)bc->type != X86_BC_INSN)
InternalError(_("Attempted to set shift flag on non-instruction"));
insn = bc_get_data(bc);
insn->shift_op = 1;
}
void void
x86_set_jmprel_opcode_sel(x86_jmprel_opcode_sel *old_sel, x86_set_jmprel_opcode_sel(x86_jmprel_opcode_sel *old_sel,
x86_jmprel_opcode_sel new_sel) x86_jmprel_opcode_sel new_sel)

120
modules/arch/x86/x86id.re
Unescape View File

@ -132,6 +132,15 @@ static unsigned long cpu_enabled = ~CPU_Any;
* 5 = operand data is added to opcode byte 0 * 5 = operand data is added to opcode byte 0
* 6 = operand data goes into BOTH ea and spare * 6 = operand data goes into BOTH ea and spare
* [special case for imul opcode] * [special case for imul opcode]
* The below describes postponed actions: actions which can't be completed at
* parse-time due to things like EQU and complex expressions. For these, some
* additional data (stored in the second byte of the opcode with a one-byte
* opcode) is passed to later stages of the assembler with flags set to
* indicate postponed actions.
* - 2 bits = postponed action:
* 0 = none
* 1 = shift operation with a ,1 short form (instead of imm8).
* 2 = large imm16/32 that can become a sign-extended imm8.
*/ */
#define OPT_Imm 0x0 #define OPT_Imm 0x0
#define OPT_Reg 0x1 #define OPT_Reg 0x1
@ -177,6 +186,11 @@ static unsigned long cpu_enabled = ~CPU_Any;
#define OPA_SpareEA (6<<9) #define OPA_SpareEA (6<<9)
#define OPA_MASK 0x0E00 #define OPA_MASK 0x0E00
#define OPAP_None (0<<12)
#define OPAP_ShiftOp (1<<12)
#define OPAP_SImm8Avail (2<<12)
#define OPAP_MASK 0x3000
typedef struct x86_insn_info { typedef struct x86_insn_info {
/* The CPU feature flags needed to execute this instruction. This is OR'ed /* The CPU feature flags needed to execute this instruction. This is OR'ed
* with arch-specific data[2]. This combined value is compared with * with arch-specific data[2]. This combined value is compared with
@ -441,9 +455,9 @@ static const x86_insn_info ldes_insn[] = {
{OPT_Reg|OPS_32|OPA_Spare, OPT_Mem|OPS_Any|OPS_Relaxed|OPA_EA, 0} } {OPT_Reg|OPS_32|OPA_Spare, OPT_Mem|OPS_Any|OPS_Relaxed|OPA_EA, 0} }
}; };
static const x86_insn_info lfgss_insn[] = { static const x86_insn_info lfgss_insn[] = {
{ CPU_386, MOD_Op1Add, 16, 1, {0x0F, 0, 0}, 0, 2, { CPU_386, MOD_Op1Add, 16, 2, {0x0F, 0x00, 0}, 0, 2,
{OPT_Reg|OPS_16|OPA_Spare, OPT_Mem|OPS_Any|OPS_Relaxed|OPA_EA, 0} }, {OPT_Reg|OPS_16|OPA_Spare, OPT_Mem|OPS_Any|OPS_Relaxed|OPA_EA, 0} },
{ CPU_386, MOD_Op1Add, 32, 1, {0x0F, 0, 0}, 0, 2, { CPU_386, MOD_Op1Add, 32, 2, {0x0F, 0x00, 0}, 0, 2,
{OPT_Reg|OPS_32|OPA_Spare, OPT_Mem|OPS_Any|OPS_Relaxed|OPA_EA, 0} } {OPT_Reg|OPS_32|OPA_Spare, OPT_Mem|OPS_Any|OPS_Relaxed|OPA_EA, 0} }
}; };
@ -461,14 +475,16 @@ static const x86_insn_info arith_insn[] = {
{OPT_RM|OPS_8|OPS_Relaxed|OPA_EA, OPT_Imm|OPS_8|OPA_Imm, 0} }, {OPT_RM|OPS_8|OPS_Relaxed|OPA_EA, OPT_Imm|OPS_8|OPA_Imm, 0} },
{ CPU_Any, MOD_Gap0|MOD_SpAdd, 16, 1, {0x83, 0, 0}, 0, 2, { CPU_Any, MOD_Gap0|MOD_SpAdd, 16, 1, {0x83, 0, 0}, 0, 2,
{OPT_RM|OPS_16|OPA_EA, OPT_Imm|OPS_8|OPA_SImm, 0} }, {OPT_RM|OPS_16|OPA_EA, OPT_Imm|OPS_8|OPA_SImm, 0} },
{ CPU_Any, MOD_Gap0|MOD_SpAdd, 16, 1, {0x81, 0, 0}, 0, 2, { CPU_Any, MOD_Gap0|MOD_SpAdd, 16, 1, {0x81, 0x83, 0}, 0, 2,
{OPT_RM|OPS_16|OPA_EA, OPT_Imm|OPS_16|OPS_Relaxed|OPA_Imm, 0} }, {OPT_RM|OPS_16|OPA_EA,
OPT_Imm|OPS_16|OPS_Relaxed|OPA_Imm|OPAP_SImm8Avail, 0} },
{ CPU_Any, MOD_Gap0|MOD_SpAdd, 16, 1, {0x81, 0, 0}, 0, 2, { CPU_Any, MOD_Gap0|MOD_SpAdd, 16, 1, {0x81, 0, 0}, 0, 2,
{OPT_RM|OPS_16|OPS_Relaxed|OPA_EA, OPT_Imm|OPS_16|OPA_Imm, 0} }, {OPT_RM|OPS_16|OPS_Relaxed|OPA_EA, OPT_Imm|OPS_16|OPA_Imm, 0} },
{ CPU_386, MOD_Gap0|MOD_SpAdd, 32, 1, {0x83, 0, 0}, 0, 2, { CPU_386, MOD_Gap0|MOD_SpAdd, 32, 1, {0x83, 0, 0}, 0, 2,
{OPT_RM|OPS_32|OPA_EA, OPT_Imm|OPS_8|OPA_SImm, 0} }, {OPT_RM|OPS_32|OPA_EA, OPT_Imm|OPS_8|OPA_SImm, 0} },
{ CPU_386, MOD_Gap0|MOD_SpAdd, 32, 1, {0x81, 0, 0}, 0, 2, { CPU_386, MOD_Gap0|MOD_SpAdd, 32, 1, {0x81, 0x83, 0}, 0, 2,
{OPT_RM|OPS_32|OPA_EA, OPT_Imm|OPS_32|OPS_Relaxed|OPA_Imm, 0} }, {OPT_RM|OPS_32|OPA_EA,
OPT_Imm|OPS_32|OPS_Relaxed|OPA_Imm|OPAP_SImm8Avail, 0} },
{ CPU_386, MOD_Gap0|MOD_SpAdd, 32, 1, {0x81, 0, 0}, 0, 2, { CPU_386, MOD_Gap0|MOD_SpAdd, 32, 1, {0x81, 0, 0}, 0, 2,
{OPT_RM|OPS_32|OPS_Relaxed|OPA_EA, OPT_Imm|OPS_32|OPA_Imm, 0} }, {OPT_RM|OPS_32|OPS_Relaxed|OPA_EA, OPT_Imm|OPS_32|OPA_Imm, 0} },
{ CPU_Any, MOD_Op0Add, 0, 1, {0x00, 0, 0}, 0, 2, { CPU_Any, MOD_Op0Add, 0, 1, {0x00, 0, 0}, 0, 2,
@ -569,16 +585,57 @@ static const x86_insn_info imul_insn[] = {
{OPT_Reg|OPS_16|OPA_SpareEA, OPT_Imm|OPS_8|OPA_SImm, 0} }, {OPT_Reg|OPS_16|OPA_SpareEA, OPT_Imm|OPS_8|OPA_SImm, 0} },
{ CPU_386, 0, 32, 1, {0x6B, 0, 0}, 0, 3, { CPU_386, 0, 32, 1, {0x6B, 0, 0}, 0, 3,
{OPT_Reg|OPS_32|OPA_SpareEA, OPT_Imm|OPS_8|OPA_SImm, 0} }, {OPT_Reg|OPS_32|OPA_SpareEA, OPT_Imm|OPS_8|OPA_SImm, 0} },
{ CPU_186, 0, 16, 1, {0x69, 0, 0}, 0, 3, { CPU_186, 0, 16, 1, {0x69, 0x6B, 0}, 0, 3,
{OPT_Reg|OPS_16|OPA_Spare, OPT_RM|OPS_16|OPS_Relaxed|OPA_EA, {OPT_Reg|OPS_16|OPA_Spare, OPT_RM|OPS_16|OPS_Relaxed|OPA_EA,
OPT_Imm|OPS_16|OPS_Relaxed|OPA_SImm} }, OPT_Imm|OPS_16|OPS_Relaxed|OPA_SImm|OPAP_SImm8Avail} },
{ CPU_386, 0, 32, 1, {0x69, 0, 0}, 0, 3, { CPU_386, 0, 32, 1, {0x69, 0x6B, 0}, 0, 3,
{OPT_Reg|OPS_32|OPA_Spare, OPT_RM|OPS_32|OPS_Relaxed|OPA_EA, {OPT_Reg|OPS_32|OPA_Spare, OPT_RM|OPS_32|OPS_Relaxed|OPA_EA,
OPT_Imm|OPS_32|OPS_Relaxed|OPA_SImm} }, OPT_Imm|OPS_32|OPS_Relaxed|OPA_SImm|OPAP_SImm8Avail} },
{ CPU_186, 0, 16, 1, {0x69, 0, 0}, 0, 2, { CPU_186, 0, 16, 1, {0x69, 0x6B, 0}, 0, 2,
{OPT_Reg|OPS_16|OPA_SpareEA, OPT_Imm|OPS_16|OPS_Relaxed|OPA_SImm, 0} }, {OPT_Reg|OPS_16|OPA_SpareEA,
{ CPU_386, 0, 32, 1, {0x69, 0, 0}, 0, 3, OPT_Imm|OPS_16|OPS_Relaxed|OPA_SImm|OPAP_SImm8Avail, 0} },
{OPT_Reg|OPS_32|OPA_SpareEA, OPT_Imm|OPS_32|OPS_Relaxed|OPA_SImm, 0} } { CPU_386, 0, 32, 1, {0x69, 0x6B, 0}, 0, 3,
{OPT_Reg|OPS_32|OPA_SpareEA,
OPT_Imm|OPS_32|OPS_Relaxed|OPA_SImm|OPAP_SImm8Avail, 0} }
};
/* Shifts - standard */
static const x86_insn_info shift_insn[] = {
{ CPU_Any, MOD_SpAdd, 0, 1, {0xD2, 0, 0}, 0, 2,
{OPT_RM|OPS_8|OPA_EA, OPT_Creg|OPS_8|OPA_None, 0} },
/* FIXME: imm8 is only avail on 186+, but we use imm8 to get to postponed
* ,1 form, so it has to be marked as Any. We need to store the active
* CPU flags somewhere to pass that parse-time info down the line.
*/
{ CPU_Any, MOD_SpAdd, 0, 1, {0xC0, 0xD0, 0}, 0, 2,
{OPT_RM|OPS_8|OPA_EA, OPT_Imm|OPS_8|OPS_Relaxed|OPA_Imm|OPAP_ShiftOp,
0} },
{ CPU_Any, MOD_SpAdd, 16, 1, {0xD3, 0, 0}, 0, 2,
{OPT_RM|OPS_16|OPA_EA, OPT_Creg|OPS_8|OPA_None, 0} },
{ CPU_Any, MOD_SpAdd, 16, 1, {0xC1, 0xD1, 0}, 0, 2,
{OPT_RM|OPS_16|OPA_EA, OPT_Imm|OPS_8|OPS_Relaxed|OPA_Imm|OPAP_ShiftOp,
0} },
{ CPU_Any, MOD_SpAdd, 32, 1, {0xD3, 0, 0}, 0, 2,
{OPT_RM|OPS_32|OPA_EA, OPT_Creg|OPS_8|OPA_None, 0} },
{ CPU_Any, MOD_SpAdd, 32, 1, {0xC1, 0xD1, 0}, 0, 2,
{OPT_RM|OPS_32|OPA_EA, OPT_Imm|OPS_8|OPS_Relaxed|OPA_Imm|OPAP_ShiftOp,
0} }
};
/* Shifts - doubleword */
static const x86_insn_info shlrd_insn[] = {
{ CPU_386, MOD_Op1Add, 16, 2, {0x0F, 0x00, 0}, 0, 3,
{OPT_RM|OPS_16|OPS_Relaxed|OPA_EA, OPT_Reg|OPS_16|OPA_Spare,
OPT_Imm|OPS_8|OPS_Relaxed|OPA_Imm} },
{ CPU_386, MOD_Op1Add, 16, 2, {0x0F, 0x01, 0}, 0, 3,
{OPT_RM|OPS_16|OPS_Relaxed|OPA_EA, OPT_Reg|OPS_16|OPA_Spare,
OPT_Creg|OPS_8|OPA_None} },
{ CPU_386, MOD_Op1Add, 32, 2, {0x0F, 0x00, 0}, 0, 3,
{OPT_RM|OPS_32|OPS_Relaxed|OPA_EA, OPT_Reg|OPS_32|OPA_Spare,
OPT_Imm|OPS_8|OPS_Relaxed|OPA_Imm} },
{ CPU_386, MOD_Op1Add, 32, 2, {0x0F, 0x01, 0}, 0, 3,
{OPT_RM|OPS_32|OPS_Relaxed|OPA_EA, OPT_Reg|OPS_32|OPA_Spare,
OPT_Creg|OPS_8|OPA_None} }
}; };
@ -795,6 +852,8 @@ x86_new_insn(const unsigned long data[4], int num_operands,
d.spare = info->spare; d.spare = info->spare;
d.im_len = 0; d.im_len = 0;
d.im_sign = 0; d.im_sign = 0;
d.shift_op = 0;
d.signext_imm8_op = 0;
/* Apply modifiers */ /* Apply modifiers */
if (info->modifiers & MOD_Op2Add) { if (info->modifiers & MOD_Op2Add) {
@ -911,6 +970,19 @@ x86_new_insn(const unsigned long data[4], int num_operands,
default: default:
InternalError(_("unknown operand action")); InternalError(_("unknown operand action"));
} }
switch (info->operands[i] & OPAP_MASK) {
case OPAP_None:
break;
case OPAP_ShiftOp:
d.shift_op = 1;
break;
case OPAP_SImm8Avail:
d.signext_imm8_op = 1;
break;
default:
InternalError(_("unknown operand postponed action"));
}
} }
} }
@ -1292,16 +1364,16 @@ x86_check_identifier(unsigned long data[4], const char *id)
D I V { RET_INSN(f6, 0x06, CPU_Any); } D I V { RET_INSN(f6, 0x06, CPU_Any); }
I D I V { RET_INSN(f6, 0x07, CPU_Any); } I D I V { RET_INSN(f6, 0x07, CPU_Any); }
/* Shifts */ /* Shifts */
/* R O L */ R O L { RET_INSN(shift, 0x00, CPU_Any); }
/* R O R */ R O R { RET_INSN(shift, 0x01, CPU_Any); }
/* R C L */ R C L { RET_INSN(shift, 0x02, CPU_Any); }
/* R C R */ R C R { RET_INSN(shift, 0x03, CPU_Any); }
/* S A L */ S A L { RET_INSN(shift, 0x04, CPU_Any); }
/* S H L */ S H L { RET_INSN(shift, 0x04, CPU_Any); }
/* S H R */ S H R { RET_INSN(shift, 0x05, CPU_Any); }
/* S A R */ S A R { RET_INSN(shift, 0x07, CPU_Any); }
/* S H L D */ S H L D { RET_INSN(shlrd, 0xA4, CPU_386); }
/* S H R D */ S H R D { RET_INSN(shlrd, 0xAC, CPU_386); }
/* Control transfer instructions (unconditional) */ /* Control transfer instructions (unconditional) */
/* C A L L */ /* C A L L */
/* J M P */ /* J M P */

3
src/arch/x86/x86arch.h
Unescape View File

@ -77,7 +77,6 @@ effaddr *x86_ea_new_expr(/*@keep@*/ expr *e);
void x86_bc_insn_opersize_override(bytecode *bc, unsigned char opersize); void x86_bc_insn_opersize_override(bytecode *bc, unsigned char opersize);
void x86_bc_insn_addrsize_override(bytecode *bc, unsigned char addrsize); void x86_bc_insn_addrsize_override(bytecode *bc, unsigned char addrsize);
void x86_bc_insn_set_lockrep_prefix(bytecode *bc, unsigned char prefix); void x86_bc_insn_set_lockrep_prefix(bytecode *bc, unsigned char prefix);
void x86_bc_insn_set_shift_flag(bytecode *bc);
void x86_set_jmprel_opcode_sel(x86_jmprel_opcode_sel *old_sel, void x86_set_jmprel_opcode_sel(x86_jmprel_opcode_sel *old_sel,
x86_jmprel_opcode_sel new_sel); x86_jmprel_opcode_sel new_sel);
@ -95,6 +94,8 @@ typedef struct x86_new_insn_data {
unsigned char spare; /* bits to go in 'spare' field of ModRM */ unsigned char spare; /* bits to go in 'spare' field of ModRM */
unsigned char im_len; unsigned char im_len;
unsigned char im_sign; unsigned char im_sign;
unsigned char shift_op;
unsigned char signext_imm8_op;
} x86_new_insn_data; } x86_new_insn_data;
bytecode *x86_bc_new_insn(x86_new_insn_data *d); bytecode *x86_bc_new_insn(x86_new_insn_data *d);

19
src/arch/x86/x86bc.c
Unescape View File

@ -69,7 +69,8 @@ x86_bc_new_insn(x86_new_insn_data *d)
insn->addrsize = 0; insn->addrsize = 0;
insn->opersize = d->opersize; insn->opersize = d->opersize;
insn->lockrep_pre = 0; insn->lockrep_pre = 0;
insn->shift_op = 0; insn->shift_op = d->shift_op;
insn->signext_imm8_op = d->signext_imm8_op;
insn->mode_bits = x86_mode_bits; insn->mode_bits = x86_mode_bits;
@ -283,22 +284,6 @@ x86_bc_insn_set_lockrep_prefix(bytecode *bc, unsigned char prefix)
*lockrep_pre = prefix; *lockrep_pre = prefix;
} }
void
x86_bc_insn_set_shift_flag(bytecode *bc)
{
x86_insn *insn;
if (!bc)
return;
if ((x86_bytecode_type)bc->type != X86_BC_INSN)
InternalError(_("Attempted to set shift flag on non-instruction"));
insn = bc_get_data(bc);
insn->shift_op = 1;
}
void void
x86_set_jmprel_opcode_sel(x86_jmprel_opcode_sel *old_sel, x86_set_jmprel_opcode_sel(x86_jmprel_opcode_sel *old_sel,
x86_jmprel_opcode_sel new_sel) x86_jmprel_opcode_sel new_sel)

120
src/arch/x86/x86id.re
Unescape View File

@ -132,6 +132,15 @@ static unsigned long cpu_enabled = ~CPU_Any;
* 5 = operand data is added to opcode byte 0 * 5 = operand data is added to opcode byte 0
* 6 = operand data goes into BOTH ea and spare * 6 = operand data goes into BOTH ea and spare
* [special case for imul opcode] * [special case for imul opcode]
* The below describes postponed actions: actions which can't be completed at
* parse-time due to things like EQU and complex expressions. For these, some
* additional data (stored in the second byte of the opcode with a one-byte
* opcode) is passed to later stages of the assembler with flags set to
* indicate postponed actions.
* - 2 bits = postponed action:
* 0 = none
* 1 = shift operation with a ,1 short form (instead of imm8).
* 2 = large imm16/32 that can become a sign-extended imm8.
*/ */
#define OPT_Imm 0x0 #define OPT_Imm 0x0
#define OPT_Reg 0x1 #define OPT_Reg 0x1
@ -177,6 +186,11 @@ static unsigned long cpu_enabled = ~CPU_Any;
#define OPA_SpareEA (6<<9) #define OPA_SpareEA (6<<9)
#define OPA_MASK 0x0E00 #define OPA_MASK 0x0E00
#define OPAP_None (0<<12)
#define OPAP_ShiftOp (1<<12)
#define OPAP_SImm8Avail (2<<12)
#define OPAP_MASK 0x3000
typedef struct x86_insn_info { typedef struct x86_insn_info {
/* The CPU feature flags needed to execute this instruction. This is OR'ed /* The CPU feature flags needed to execute this instruction. This is OR'ed
* with arch-specific data[2]. This combined value is compared with * with arch-specific data[2]. This combined value is compared with
@ -441,9 +455,9 @@ static const x86_insn_info ldes_insn[] = {
{OPT_Reg|OPS_32|OPA_Spare, OPT_Mem|OPS_Any|OPS_Relaxed|OPA_EA, 0} } {OPT_Reg|OPS_32|OPA_Spare, OPT_Mem|OPS_Any|OPS_Relaxed|OPA_EA, 0} }
}; };
static const x86_insn_info lfgss_insn[] = { static const x86_insn_info lfgss_insn[] = {
{ CPU_386, MOD_Op1Add, 16, 1, {0x0F, 0, 0}, 0, 2, { CPU_386, MOD_Op1Add, 16, 2, {0x0F, 0x00, 0}, 0, 2,
{OPT_Reg|OPS_16|OPA_Spare, OPT_Mem|OPS_Any|OPS_Relaxed|OPA_EA, 0} }, {OPT_Reg|OPS_16|OPA_Spare, OPT_Mem|OPS_Any|OPS_Relaxed|OPA_EA, 0} },
{ CPU_386, MOD_Op1Add, 32, 1, {0x0F, 0, 0}, 0, 2, { CPU_386, MOD_Op1Add, 32, 2, {0x0F, 0x00, 0}, 0, 2,
{OPT_Reg|OPS_32|OPA_Spare, OPT_Mem|OPS_Any|OPS_Relaxed|OPA_EA, 0} } {OPT_Reg|OPS_32|OPA_Spare, OPT_Mem|OPS_Any|OPS_Relaxed|OPA_EA, 0} }
}; };
@ -461,14 +475,16 @@ static const x86_insn_info arith_insn[] = {
{OPT_RM|OPS_8|OPS_Relaxed|OPA_EA, OPT_Imm|OPS_8|OPA_Imm, 0} }, {OPT_RM|OPS_8|OPS_Relaxed|OPA_EA, OPT_Imm|OPS_8|OPA_Imm, 0} },
{ CPU_Any, MOD_Gap0|MOD_SpAdd, 16, 1, {0x83, 0, 0}, 0, 2, { CPU_Any, MOD_Gap0|MOD_SpAdd, 16, 1, {0x83, 0, 0}, 0, 2,
{OPT_RM|OPS_16|OPA_EA, OPT_Imm|OPS_8|OPA_SImm, 0} }, {OPT_RM|OPS_16|OPA_EA, OPT_Imm|OPS_8|OPA_SImm, 0} },
{ CPU_Any, MOD_Gap0|MOD_SpAdd, 16, 1, {0x81, 0, 0}, 0, 2, { CPU_Any, MOD_Gap0|MOD_SpAdd, 16, 1, {0x81, 0x83, 0}, 0, 2,
{OPT_RM|OPS_16|OPA_EA, OPT_Imm|OPS_16|OPS_Relaxed|OPA_Imm, 0} }, {OPT_RM|OPS_16|OPA_EA,
OPT_Imm|OPS_16|OPS_Relaxed|OPA_Imm|OPAP_SImm8Avail, 0} },
{ CPU_Any, MOD_Gap0|MOD_SpAdd, 16, 1, {0x81, 0, 0}, 0, 2, { CPU_Any, MOD_Gap0|MOD_SpAdd, 16, 1, {0x81, 0, 0}, 0, 2,
{OPT_RM|OPS_16|OPS_Relaxed|OPA_EA, OPT_Imm|OPS_16|OPA_Imm, 0} }, {OPT_RM|OPS_16|OPS_Relaxed|OPA_EA, OPT_Imm|OPS_16|OPA_Imm, 0} },
{ CPU_386, MOD_Gap0|MOD_SpAdd, 32, 1, {0x83, 0, 0}, 0, 2, { CPU_386, MOD_Gap0|MOD_SpAdd, 32, 1, {0x83, 0, 0}, 0, 2,
{OPT_RM|OPS_32|OPA_EA, OPT_Imm|OPS_8|OPA_SImm, 0} }, {OPT_RM|OPS_32|OPA_EA, OPT_Imm|OPS_8|OPA_SImm, 0} },
{ CPU_386, MOD_Gap0|MOD_SpAdd, 32, 1, {0x81, 0, 0}, 0, 2, { CPU_386, MOD_Gap0|MOD_SpAdd, 32, 1, {0x81, 0x83, 0}, 0, 2,
{OPT_RM|OPS_32|OPA_EA, OPT_Imm|OPS_32|OPS_Relaxed|OPA_Imm, 0} }, {OPT_RM|OPS_32|OPA_EA,
OPT_Imm|OPS_32|OPS_Relaxed|OPA_Imm|OPAP_SImm8Avail, 0} },
{ CPU_386, MOD_Gap0|MOD_SpAdd, 32, 1, {0x81, 0, 0}, 0, 2, { CPU_386, MOD_Gap0|MOD_SpAdd, 32, 1, {0x81, 0, 0}, 0, 2,
{OPT_RM|OPS_32|OPS_Relaxed|OPA_EA, OPT_Imm|OPS_32|OPA_Imm, 0} }, {OPT_RM|OPS_32|OPS_Relaxed|OPA_EA, OPT_Imm|OPS_32|OPA_Imm, 0} },
{ CPU_Any, MOD_Op0Add, 0, 1, {0x00, 0, 0}, 0, 2, { CPU_Any, MOD_Op0Add, 0, 1, {0x00, 0, 0}, 0, 2,
@ -569,16 +585,57 @@ static const x86_insn_info imul_insn[] = {
{OPT_Reg|OPS_16|OPA_SpareEA, OPT_Imm|OPS_8|OPA_SImm, 0} }, {OPT_Reg|OPS_16|OPA_SpareEA, OPT_Imm|OPS_8|OPA_SImm, 0} },
{ CPU_386, 0, 32, 1, {0x6B, 0, 0}, 0, 3, { CPU_386, 0, 32, 1, {0x6B, 0, 0}, 0, 3,
{OPT_Reg|OPS_32|OPA_SpareEA, OPT_Imm|OPS_8|OPA_SImm, 0} }, {OPT_Reg|OPS_32|OPA_SpareEA, OPT_Imm|OPS_8|OPA_SImm, 0} },
{ CPU_186, 0, 16, 1, {0x69, 0, 0}, 0, 3, { CPU_186, 0, 16, 1, {0x69, 0x6B, 0}, 0, 3,
{OPT_Reg|OPS_16|OPA_Spare, OPT_RM|OPS_16|OPS_Relaxed|OPA_EA, {OPT_Reg|OPS_16|OPA_Spare, OPT_RM|OPS_16|OPS_Relaxed|OPA_EA,
OPT_Imm|OPS_16|OPS_Relaxed|OPA_SImm} }, OPT_Imm|OPS_16|OPS_Relaxed|OPA_SImm|OPAP_SImm8Avail} },
{ CPU_386, 0, 32, 1, {0x69, 0, 0}, 0, 3, { CPU_386, 0, 32, 1, {0x69, 0x6B, 0}, 0, 3,
{OPT_Reg|OPS_32|OPA_Spare, OPT_RM|OPS_32|OPS_Relaxed|OPA_EA, {OPT_Reg|OPS_32|OPA_Spare, OPT_RM|OPS_32|OPS_Relaxed|OPA_EA,
OPT_Imm|OPS_32|OPS_Relaxed|OPA_SImm} }, OPT_Imm|OPS_32|OPS_Relaxed|OPA_SImm|OPAP_SImm8Avail} },
{ CPU_186, 0, 16, 1, {0x69, 0, 0}, 0, 2, { CPU_186, 0, 16, 1, {0x69, 0x6B, 0}, 0, 2,
{OPT_Reg|OPS_16|OPA_SpareEA, OPT_Imm|OPS_16|OPS_Relaxed|OPA_SImm, 0} }, {OPT_Reg|OPS_16|OPA_SpareEA,
{ CPU_386, 0, 32, 1, {0x69, 0, 0}, 0, 3, OPT_Imm|OPS_16|OPS_Relaxed|OPA_SImm|OPAP_SImm8Avail, 0} },
{OPT_Reg|OPS_32|OPA_SpareEA, OPT_Imm|OPS_32|OPS_Relaxed|OPA_SImm, 0} } { CPU_386, 0, 32, 1, {0x69, 0x6B, 0}, 0, 3,
{OPT_Reg|OPS_32|OPA_SpareEA,
OPT_Imm|OPS_32|OPS_Relaxed|OPA_SImm|OPAP_SImm8Avail, 0} }
};
/* Shifts - standard */
static const x86_insn_info shift_insn[] = {
{ CPU_Any, MOD_SpAdd, 0, 1, {0xD2, 0, 0}, 0, 2,
{OPT_RM|OPS_8|OPA_EA, OPT_Creg|OPS_8|OPA_None, 0} },
/* FIXME: imm8 is only avail on 186+, but we use imm8 to get to postponed
* ,1 form, so it has to be marked as Any. We need to store the active
* CPU flags somewhere to pass that parse-time info down the line.
*/
{ CPU_Any, MOD_SpAdd, 0, 1, {0xC0, 0xD0, 0}, 0, 2,
{OPT_RM|OPS_8|OPA_EA, OPT_Imm|OPS_8|OPS_Relaxed|OPA_Imm|OPAP_ShiftOp,
0} },
{ CPU_Any, MOD_SpAdd, 16, 1, {0xD3, 0, 0}, 0, 2,
{OPT_RM|OPS_16|OPA_EA, OPT_Creg|OPS_8|OPA_None, 0} },
{ CPU_Any, MOD_SpAdd, 16, 1, {0xC1, 0xD1, 0}, 0, 2,
{OPT_RM|OPS_16|OPA_EA, OPT_Imm|OPS_8|OPS_Relaxed|OPA_Imm|OPAP_ShiftOp,
0} },
{ CPU_Any, MOD_SpAdd, 32, 1, {0xD3, 0, 0}, 0, 2,
{OPT_RM|OPS_32|OPA_EA, OPT_Creg|OPS_8|OPA_None, 0} },
{ CPU_Any, MOD_SpAdd, 32, 1, {0xC1, 0xD1, 0}, 0, 2,
{OPT_RM|OPS_32|OPA_EA, OPT_Imm|OPS_8|OPS_Relaxed|OPA_Imm|OPAP_ShiftOp,
0} }
};
/* Shifts - doubleword */
static const x86_insn_info shlrd_insn[] = {
{ CPU_386, MOD_Op1Add, 16, 2, {0x0F, 0x00, 0}, 0, 3,
{OPT_RM|OPS_16|OPS_Relaxed|OPA_EA, OPT_Reg|OPS_16|OPA_Spare,
OPT_Imm|OPS_8|OPS_Relaxed|OPA_Imm} },
{ CPU_386, MOD_Op1Add, 16, 2, {0x0F, 0x01, 0}, 0, 3,
{OPT_RM|OPS_16|OPS_Relaxed|OPA_EA, OPT_Reg|OPS_16|OPA_Spare,
OPT_Creg|OPS_8|OPA_None} },
{ CPU_386, MOD_Op1Add, 32, 2, {0x0F, 0x00, 0}, 0, 3,
{OPT_RM|OPS_32|OPS_Relaxed|OPA_EA, OPT_Reg|OPS_32|OPA_Spare,
OPT_Imm|OPS_8|OPS_Relaxed|OPA_Imm} },
{ CPU_386, MOD_Op1Add, 32, 2, {0x0F, 0x01, 0}, 0, 3,
{OPT_RM|OPS_32|OPS_Relaxed|OPA_EA, OPT_Reg|OPS_32|OPA_Spare,
OPT_Creg|OPS_8|OPA_None} }
}; };
@ -795,6 +852,8 @@ x86_new_insn(const unsigned long data[4], int num_operands,
d.spare = info->spare; d.spare = info->spare;
d.im_len = 0; d.im_len = 0;
d.im_sign = 0; d.im_sign = 0;
d.shift_op = 0;
d.signext_imm8_op = 0;
/* Apply modifiers */ /* Apply modifiers */
if (info->modifiers & MOD_Op2Add) { if (info->modifiers & MOD_Op2Add) {
@ -911,6 +970,19 @@ x86_new_insn(const unsigned long data[4], int num_operands,
default: default:
InternalError(_("unknown operand action")); InternalError(_("unknown operand action"));
} }
switch (info->operands[i] & OPAP_MASK) {
case OPAP_None:
break;
case OPAP_ShiftOp:
d.shift_op = 1;
break;
case OPAP_SImm8Avail:
d.signext_imm8_op = 1;
break;
default:
InternalError(_("unknown operand postponed action"));
}
} }
} }
@ -1292,16 +1364,16 @@ x86_check_identifier(unsigned long data[4], const char *id)
D I V { RET_INSN(f6, 0x06, CPU_Any); } D I V { RET_INSN(f6, 0x06, CPU_Any); }
I D I V { RET_INSN(f6, 0x07, CPU_Any); } I D I V { RET_INSN(f6, 0x07, CPU_Any); }
/* Shifts */ /* Shifts */
/* R O L */ R O L { RET_INSN(shift, 0x00, CPU_Any); }
/* R O R */ R O R { RET_INSN(shift, 0x01, CPU_Any); }
/* R C L */ R C L { RET_INSN(shift, 0x02, CPU_Any); }
/* R C R */ R C R { RET_INSN(shift, 0x03, CPU_Any); }
/* S A L */ S A L { RET_INSN(shift, 0x04, CPU_Any); }
/* S H L */ S H L { RET_INSN(shift, 0x04, CPU_Any); }
/* S H R */ S H R { RET_INSN(shift, 0x05, CPU_Any); }
/* S A R */ S A R { RET_INSN(shift, 0x07, CPU_Any); }
/* S H L D */ S H L D { RET_INSN(shlrd, 0xA4, CPU_386); }
/* S H R D */ S H R D { RET_INSN(shlrd, 0xAC, CPU_386); }
/* Control transfer instructions (unconditional) */ /* Control transfer instructions (unconditional) */
/* C A L L */ /* C A L L */
/* J M P */ /* J M P */

Write Preview
Loading…
Cancel
Save