espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-23 11:39:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

x86: Add has_sib to struct instr_info

Browse Source 
Add has_sib to struct instr_info and use SIB info only if ins->has_sib
is true.

	PR binutils/28892
	* i386-dis.c (instr_info): Add has_sib.
	(get_sib): Set has_sib.
	(OP_E_memory): Replace havesib with ins->has_sib.
	(OP_VEX): Use ins->sib.index only if ins->has_sib is true.
This commit is contained in:
H.J. Lu
2022-02-15 09:00:17 -08:00
parent 0b35f123c2
commit ce20459e16
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
opcodes/i386-dis.c
View File

@ -153,6 +153,7 @@ struct instr_info
bool need_modrm; bool need_modrm;
bool need_vex; bool need_vex;
bool has_sib;
/* Flags for ins->prefixes which we somehow handled when printing the /* Flags for ins->prefixes which we somehow handled when printing the
current instruction. */ current instruction. */
@ -9291,7 +9292,10 @@ get_sib (instr_info *ins, int sizeflag)
ins->sib.index = (ins->codep[1] >> 3) & 7; ins->sib.index = (ins->codep[1] >> 3) & 7;
ins->sib.scale = (ins->codep[1] >> 6) & 3; ins->sib.scale = (ins->codep[1] >> 6) & 3;
ins->sib.base = ins->codep[1] & 7; ins->sib.base = ins->codep[1] & 7;
ins->has_sib = true;
} }
else
ins->has_sib = false;
} }
/* Like oappend (below), but S is a string starting with '%'. /* Like oappend (below), but S is a string starting with '%'.
@ -11396,7 +11400,6 @@ OP_E_memory (instr_info *ins, int bytemode, int sizeflag)
{ {
/* 32/64 bit address mode */ /* 32/64 bit address mode */
int havedisp; int havedisp;
int havesib;
int havebase; int havebase;
int needindex; int needindex;
int needaddr32; int needaddr32;
@ -11411,13 +11414,11 @@ OP_E_memory (instr_info *ins, int bytemode, int sizeflag)
bool check_gather = false; bool check_gather = false;
const char *const *indexes = NULL; const char *const *indexes = NULL;
havesib = 0;
havebase = 1; havebase = 1;
base = ins->modrm.rm; base = ins->modrm.rm;
if (base == 4) if (base == 4)
{ {
havesib = 1;
vindex = ins->sib.index; vindex = ins->sib.index;
USED_REX (REX_X); USED_REX (REX_X);
if (ins->rex & REX_X) if (ins->rex & REX_X)
@ -11487,7 +11488,7 @@ OP_E_memory (instr_info *ins, int bytemode, int sizeflag)
if (base == 5) if (base == 5)
{ {
havebase = 0; havebase = 0;
if (ins->address_mode == mode_64bit && !havesib) if (ins->address_mode == mode_64bit && !ins->has_sib)
riprel = 1; riprel = 1;
disp = get32s (ins); disp = get32s (ins);
if (riprel && bytemode == v_bndmk_mode) if (riprel && bytemode == v_bndmk_mode)
@ -11512,7 +11513,7 @@ OP_E_memory (instr_info *ins, int bytemode, int sizeflag)
needindex = 0; needindex = 0;
needaddr32 = 0; needaddr32 = 0;
if (havesib if (ins->has_sib
&& !havebase && !havebase
&& !indexes && !indexes
&& ins->address_mode != mode_16bit) && ins->address_mode != mode_16bit)
@ -11538,7 +11539,7 @@ OP_E_memory (instr_info *ins, int bytemode, int sizeflag)
havedisp = (havebase havedisp = (havebase
|| needindex || needindex
|| (havesib && (indexes || scale != 0))); || (ins->has_sib && (indexes || scale != 0)));
if (!ins->intel_syntax) if (!ins->intel_syntax)
if (ins->modrm.mod != 0 || base == 5) if (ins->modrm.mod != 0 || base == 5)
@ -11576,7 +11577,7 @@ OP_E_memory (instr_info *ins, int bytemode, int sizeflag)
oappend_maybe_intel (ins, oappend_maybe_intel (ins,
(ins->address_mode == mode_64bit && !addr32flag (ins->address_mode == mode_64bit && !addr32flag
? att_names64 : att_names32)[rbase]); ? att_names64 : att_names32)[rbase]);
if (havesib) if (ins->has_sib)
{ {
/* ESP/RSP won't allow index. If base isn't ESP/RSP, /* ESP/RSP won't allow index. If base isn't ESP/RSP,
print index to tell base + index from base. */ print index to tell base + index from base. */
@ -13190,7 +13191,7 @@ OP_VEX (instr_info *ins, int bytemode, int sizeflag ATTRIBUTE_UNUSED)
if (ins->rex & REX_R) if (ins->rex & REX_R)
modrm_reg += 8; modrm_reg += 8;
if (ins->modrm.rm == 4) if (ins->has_sib && ins->modrm.rm == 4)
{ {
sib_index = ins->sib.index; sib_index = ins->sib.index;
if (ins->rex & REX_X) if (ins->rex & REX_X)