Minor changes to `nedasm`. Updated usage and wrapped long line.

[ned1] / nedasm / nedasm.c

diff --git a/nedasm/nedasm.c b/nedasm/nedasm.c
index 4b4d3bc..19da917 100644 (file)
--- a/nedasm/nedasm.c
+++ b/nedasm/nedasm.c
@@ -14,13 +14,13 @@
 #include "nedasm_parser.h"
 #include "nedasm_codegen.h"
 
 #include "nedasm_parser.h"
 #include "nedasm_codegen.h"
 

-#define VERSION 1
+#define VERSION 3

 
 void
 print_usage(char ** argv)
 {
     printf( "NED Assembler v%d (www.subgeniuskitty.com)\n"
 
 void
 print_usage(char ** argv)
 {
     printf( "NED Assembler v%d (www.subgeniuskitty.com)\n"

-            "Usage: %s [option] ...\n"
+            "Usage: %s -i <file> -o <file>\n"

             "  -h         Help (prints this message)\n"
             "  -i <file>  Specify file name of assembly code input.\n"
             "  -o <file>  Specify file name for assembled output.\n"
             "  -h         Help (prints this message)\n"
             "  -i <file>  Specify file name of assembly code input.\n"
             "  -o <file>  Specify file name for assembled output.\n"


@@ -195,10 +195,6 @@ main(int argc, char ** argv)
      */
     parse_assembly(&instructions, input);
     fclose(input);
      */
     parse_assembly(&instructions, input);
     fclose(input);

-//    if (instructions == NULL) {
-//        fprintf(stderr, "ERROR: Failed to parse any input.\n");
-//       exit(EXIT_FAILURE);
-//    }

 
     /*
      * Make passes over the intermediate representation to enforce architecture
 
     /*
      * Make passes over the intermediate representation to enforce architecture


@@ -208,7 +204,6 @@ main(int argc, char ** argv)
     enforce_word_boundary(instructions);
     assign_addresses(instructions);
     resolve_labels(instructions);
     enforce_word_boundary(instructions);
     assign_addresses(instructions);
     resolve_labels(instructions);

-    prune_label_structs(instructions);

 
     generate_code(instructions, output);
 
 
     generate_code(instructions, output);