Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq

[mv-sheeva.git] / arch / x86 / tools / test_get_len.c

diff --git a/arch/x86/tools/test_get_len.c b/arch/x86/tools/test_get_len.c
index 1e81adb2d8a93956515a8455cbd366a9c8058a9b..d8214dc03fa7a46e4dc2c9408b8674a13017e1e0 100644 (file)
--- a/arch/x86/tools/test_get_len.c
+++ b/arch/x86/tools/test_get_len.c
@@ -20,12 +20,8 @@
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
+#include <unistd.h>
 
-#ifdef __x86_64__
-#define CONFIG_X86_64
-#else
-#define CONFIG_X86_32
-#endif
 #define unlikely(cond) (cond)
 
 #include <asm/insn.h>
@@ -41,11 +37,16 @@
  */
 
 const char *prog;
+static int verbose;
+static int x86_64;
 
 static void usage(void)
 {
        fprintf(stderr, "Usage: objdump -d a.out | awk -f distill.awk |"
-               " ./test_get_len\n");
+               " %s [-y|-n] [-v] \n", prog);
+       fprintf(stderr, "\t-y   64bit mode\n");
+       fprintf(stderr, "\t-n   32bit mode\n");
+       fprintf(stderr, "\t-v   verbose mode\n");
        exit(1);
 }
 
@@ -55,24 +56,79 @@ static void malformed_line(const char *line, int line_nr)
        exit(3);
 }
 
+static void dump_field(FILE *fp, const char *name, const char *indent,
+                      struct insn_field *field)
+{
+       fprintf(fp, "%s.%s = {\n", indent, name);
+       fprintf(fp, "%s\t.value = %d, bytes[] = {%x, %x, %x, %x},\n",
+               indent, field->value, field->bytes[0], field->bytes[1],
+               field->bytes[2], field->bytes[3]);
+       fprintf(fp, "%s\t.got = %d, .nbytes = %d},\n", indent,
+               field->got, field->nbytes);
+}
+
+static void dump_insn(FILE *fp, struct insn *insn)
+{
+       fprintf(fp, "Instruction = { \n");
+       dump_field(fp, "prefixes", "\t",        &insn->prefixes);
+       dump_field(fp, "rex_prefix", "\t",      &insn->rex_prefix);
+       dump_field(fp, "vex_prefix", "\t",      &insn->vex_prefix);
+       dump_field(fp, "opcode", "\t",          &insn->opcode);
+       dump_field(fp, "modrm", "\t",           &insn->modrm);
+       dump_field(fp, "sib", "\t",             &insn->sib);
+       dump_field(fp, "displacement", "\t",    &insn->displacement);
+       dump_field(fp, "immediate1", "\t",      &insn->immediate1);
+       dump_field(fp, "immediate2", "\t",      &insn->immediate2);
+       fprintf(fp, "\t.attr = %x, .opnd_bytes = %d, .addr_bytes = %d,\n",
+               insn->attr, insn->opnd_bytes, insn->addr_bytes);
+       fprintf(fp, "\t.length = %d, .x86_64 = %d, .kaddr = %p}\n",
+               insn->length, insn->x86_64, insn->kaddr);
+}
+
+static void parse_args(int argc, char **argv)
+{
+       int c;
+       prog = argv[0];
+       while ((c = getopt(argc, argv, "ynv")) != -1) {
+               switch (c) {
+               case 'y':
+                       x86_64 = 1;
+                       break;
+               case 'n':
+                       x86_64 = 0;
+                       break;
+               case 'v':
+                       verbose = 1;
+                       break;
+               default:
+                       usage();
+               }
+       }
+}
+
 #define BUFSIZE 256
 
 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;
+       int insns = 0, c;
+       int warnings = 0;
 
-       prog = argv[0];
-       if (argc > 1)
-               usage();
+       parse_args(argc, argv);
 
        while (fgets(line, BUFSIZE, stdin)) {
                char copy[BUFSIZE], *s, *tab1, *tab2;
                int nb = 0;
                unsigned int b;
 
+               if (line[0] == '<') {
+                       /* Symbol line */
+                       strcpy(sym, line);
+                       continue;
+               }
+
                insns++;
                memset(insn_buf, 0, 16);
                strcpy(copy, line);
@@ -93,21 +149,25 @@ int main(int argc, char **argv)
                                break;
                }
                /* Decode an instruction */
-#ifdef __x86_64__
-               insn_init(&insn, insn_buf, 1);
-#else
-               insn_init(&insn, insn_buf, 0);
-#endif
+               insn_init(&insn, insn_buf, x86_64);
                insn_get_length(&insn);
                if (insn.length != nb) {
-                       fprintf(stderr, "Error: %s", line);
-                       fprintf(stderr, "Error: objdump says %d bytes, but "
-                               "insn_get_length() says %d (attr:%x)\n", nb,
-                               insn.length, insn.attr);
-                       exit(2);
+                       warnings++;
+                       fprintf(stderr, "Warning: %s found difference at %s\n",
+                               prog, sym);
+                       fprintf(stderr, "Warning: %s", line);
+                       fprintf(stderr, "Warning: objdump says %d bytes, but "
+                               "insn_get_length() says %d\n", nb,
+                               insn.length);
+                       if (verbose)
+                               dump_insn(stderr, &insn);
                }
        }
-       fprintf(stderr, "Succeed: decoded and checked %d instructions\n",
-               insns);
+       if (warnings)
+               fprintf(stderr, "Warning: decoded and checked %d"
+                       " instructions with %d warnings\n", insns, warnings);
+       else
+               fprintf(stderr, "Succeed: decoded and checked %d"
+                       " instructions\n", insns);
        return 0;
 }