Skip to content

Commit

Permalink
x86: Show symbol name if insn decoder test failed
Browse files Browse the repository at this point in the history
Show symbol name if insn decoder test find a difference.
This will help us to find out where the issue is.

Signed-off-by: Masami Hiramatsu <mhiramat@redhat.com>
Cc: systemtap <systemtap@sources.redhat.com>
Cc: DLE <dle-develop@lists.sourceforge.net>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Randy Dunlap <rdunlap@xenotime.net>
Cc: Jim Keniston <jkenisto@us.ibm.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
LKML-Reference: <20091116230624.5250.49813.stgit@harusame>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Masami Hiramatsu authored and Ingo Molnar committed Nov 17, 2009
1 parent d65ff75 commit 35039eb
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 1 deletion.
5 changes: 5 additions & 0 deletions arch/x86/tools/distill.awk
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@ BEGIN {
fwait_str="9b\tfwait"
}

/^ *[0-9a-f]+ <[^>]*>:/ {
# Symbol entry
printf("%s%s\n", $2, $1)
}

/^ *[0-9a-f]+:/ {
if (split($0, field, "\t") < 3) {
# This is a continuation of the same insn.
Expand Down
10 changes: 9 additions & 1 deletion arch/x86/tools/test_get_len.c
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ static void parse_args(int argc, char **argv)

int main(int argc, char **argv)
{
char line[BUFSIZE];
char line[BUFSIZE], sym[BUFSIZE] = "<unknown>";
unsigned char insn_buf[16];
struct insn insn;
int insns = 0, c;
Expand All @@ -122,6 +122,12 @@ int main(int argc, char **argv)
int nb = 0;
unsigned int b;

if (line[0] == '<') {
/* Symbol line */
strcpy(sym, line);
continue;
}

insns++;
memset(insn_buf, 0, 16);
strcpy(copy, line);
Expand All @@ -145,6 +151,8 @@ int main(int argc, char **argv)
insn_init(&insn, insn_buf, x86_64);
insn_get_length(&insn);
if (insn.length != nb) {
fprintf(stderr, "Error: %s found a difference at %s\n",
prog, sym);
fprintf(stderr, "Error: %s", line);
fprintf(stderr, "Error: objdump says %d bytes, but "
"insn_get_length() says %d\n", nb,
Expand Down

0 comments on commit 35039eb

Please sign in to comment.