x86: Show symbol name if insn decoder test failed

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>

diff --git a/arch/x86/tools/distill.awk b/arch/x86/tools/distill.awk
index d433619..c13c0ee 100644 (file)
--- a/arch/x86/tools/distill.awk
+++ b/arch/x86/tools/distill.awk
@@ -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.

diff --git a/arch/x86/tools/test_get_len.c b/arch/x86/tools/test_get_len.c
index 5743e51..af75e07 100644 (file)
--- a/arch/x86/tools/test_get_len.c
+++ b/arch/x86/tools/test_get_len.c
@@ -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;
@@ -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);
@@ -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,