x86/tools/insn_sanity: Convert to insn_decode()
Simplify code, no functional changes. Signed-off-by: Borislav Petkov <bp@suse.de> Link: https://lkml.kernel.org/r/20210304174237.31945-19-bp@alien8.de
This commit is contained in:
parent
c7e41b099b
commit
a277ce601c
|
@ -218,8 +218,8 @@ static void parse_args(int argc, char **argv)
|
||||||
|
|
||||||
int main(int argc, char **argv)
|
int main(int argc, char **argv)
|
||||||
{
|
{
|
||||||
|
int insns = 0, ret;
|
||||||
struct insn insn;
|
struct insn insn;
|
||||||
int insns = 0;
|
|
||||||
int errors = 0;
|
int errors = 0;
|
||||||
unsigned long i;
|
unsigned long i;
|
||||||
unsigned char insn_buff[MAX_INSN_SIZE * 2];
|
unsigned char insn_buff[MAX_INSN_SIZE * 2];
|
||||||
|
@ -237,15 +237,15 @@ int main(int argc, char **argv)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
/* Decode an instruction */
|
/* Decode an instruction */
|
||||||
insn_init(&insn, insn_buff, sizeof(insn_buff), x86_64);
|
ret = insn_decode(&insn, insn_buff, sizeof(insn_buff),
|
||||||
insn_get_length(&insn);
|
x86_64 ? INSN_MODE_64 : INSN_MODE_32);
|
||||||
|
|
||||||
if (insn.next_byte <= insn.kaddr ||
|
if (insn.next_byte <= insn.kaddr ||
|
||||||
insn.kaddr + MAX_INSN_SIZE < insn.next_byte) {
|
insn.kaddr + MAX_INSN_SIZE < insn.next_byte) {
|
||||||
/* Access out-of-range memory */
|
/* Access out-of-range memory */
|
||||||
dump_stream(stderr, "Error: Found an access violation", i, insn_buff, &insn);
|
dump_stream(stderr, "Error: Found an access violation", i, insn_buff, &insn);
|
||||||
errors++;
|
errors++;
|
||||||
} else if (verbose && !insn_complete(&insn))
|
} else if (verbose && ret < 0)
|
||||||
dump_stream(stdout, "Info: Found an undecodable input", i, insn_buff, &insn);
|
dump_stream(stdout, "Info: Found an undecodable input", i, insn_buff, &insn);
|
||||||
else if (verbose >= 2)
|
else if (verbose >= 2)
|
||||||
dump_insn(stdout, &insn);
|
dump_insn(stdout, &insn);
|
||||||
|
|
Loading…
Reference in New Issue