disassembler: Use 4 digits for code address

[b43-tools.git] / disassembler / args.c

diff --git a/disassembler/args.c b/disassembler/args.c
index 3663c59f1aabb183bfed7cadb2baa0802ea69999..08e3a402c3ac25cb68b5ae7d7adb9595876e3654 100644 (file)
--- a/disassembler/args.c
+++ b/disassembler/args.c
@@ -25,9 +25,10 @@
 int _debug;
 
 struct cmdline_args cmdargs = {
-       .arch = 5,              /* Default to v5 architecture. */
-       .informat = FMT_B43,    /* Input file format */
-       .print_addresses = 0,   /* Print the code addresses in the output. */
+       .arch = 5,
+       .informat = FMT_B43,
+       .print_addresses = 0,
+       .unknown_decode = 0,
 };
 
 #define ARG_MATCH              0
@@ -100,9 +101,10 @@ static void usage(FILE *fd, int argc, char **argv)
 {
        fprintf(fd, "Usage: %s INPUT_FILE OUTPUT_FILE [OPTIONS]\n", argv[0]);
        fprintf(fd, "  -a|--arch ARCH      The architecture type of the input file (5 or 15)\n");
-       fprintf(fd, "  -f|--format FMT     Input file format. FMT may be one of:\n");
+       fprintf(fd, "  -f|--format FMT     Input file format. FMT must be one of:\n");
        fprintf(fd, "                      raw-le32, raw-be32, b43\n");
-       fprintf(fd, "  --paddr             Print the code addresses\n");
+       fprintf(fd, "  -p|--paddr          Print the code addresses\n");
+       fprintf(fd, "  -u|--unkdec         Decode operands of unknown instructions\n");
        fprintf(fd, "  -d|--debug          Print verbose debugging info\n");
        fprintf(fd, "                      Repeat for more verbose debugging\n");
        fprintf(fd, "  -h|--help           Print this help\n");
@@ -132,8 +134,10 @@ int parse_args(int argc, char **argv)
                                fprintf(stderr, "Invalid -f|--format\n");
                                return -1;
                        }
-               } else if ((res = cmp_arg(argv, &i, "--paddr", NULL, NULL)) == ARG_MATCH) {
+               } else if ((res = cmp_arg(argv, &i, "--paddr", "-p", NULL)) == ARG_MATCH) {
                        cmdargs.print_addresses = 1;
+               } else if ((res = cmp_arg(argv, &i, "--unkdec", "-u", NULL)) == ARG_MATCH) {
+                       cmdargs.unknown_decode = 1;
                } else if ((res = cmp_arg(argv, &i, "--debug", "-d", NULL)) == ARG_MATCH) {
                        _debug++;
                } else if ((res = cmp_arg(argv, &i, "--arch", "-a", &param)) == ARG_MATCH) {