DEFAULT_ZVERSION added instead of magic number.

[zilutils.git] / zilasm / main.c

diff --git a/zilasm/main.c b/zilasm/main.c
index bbc5a9327bc0654d3a4a065cfd1e173a85821ff4..5dbd24020e15bcf663f48b0f5eaea3e57c45d1eb 100644 (file)
--- a/zilasm/main.c
+++ b/zilasm/main.c
@@ -28,8 +28,12 @@
 
 #include "config.h"
 
+const int DEFAULT_ZVERSION = 6;
+
 enum { ZVERSION = 11, ZORKID, ZSERIAL };
 
+enum { FAIL = -1, OK = 0, NEED_RESTART = 1 };
+
 static struct option const long_options[] =
 {
     { "help",     no_argument,       NULL, 'h' },
@@ -41,11 +45,17 @@ static struct option const long_options[] =
     { NULL, 0, NULL, 0 }
 };
 
+typedef struct
+{
+    int todo;
+} Opcode_dict;
+
 struct
 {
     int  zversion;     /* 0 - 8     */
     int  zorkid;       /* 0 - 65535 */
     char zserial[7];   /* YYMMDD    */
+    Opcode_dict *opcode_dict;
 } Config;
 
 void wrong_arg(const char *err, ...)
@@ -79,10 +89,11 @@ void print_usage(int failed)
            "--version  Display program version and exit\n"
            "--help     Display this help\n"
            "\n"
-           "--zversion (accepts numbers 1 - 8, defaults to 1 if not specified)\n"
+           "--zversion (accepts numbers 1 - 8, defaults to %d if not specified)\n"
            "--zorkid   (integer between 0 and 65535, defaults to 0 if not specified)\n"
            "--serial   (six characters of ASCII, defaults to current date\n"
-           "            in the form YYMMDD if not specified)\n"
+           "            in the form YYMMDD if not specified)\n",
+           DEFAULT_ZVERSION
           );
     exit(failed);
 }
@@ -98,8 +109,8 @@ void fill_zserial(void)
 
 void fill_config(void)
 {
-    Config.zversion = 6;
-    Config.zorkid   = 0;
+    bzero(&Config, sizeof(Config));
+    Config.zversion = DEFAULT_ZVERSION;
     fill_zserial();
 }
 
@@ -133,7 +144,7 @@ void parse_zserial(void)
         char *p = optarg;
         while (*p && isalnum(*p))
             p++;
-        if (!*p)    /* ..optarg contains alphanumeric only? */
+        if (!*p)      /* ..optarg contains alphanumeric only? */
         {
             strncpy(Config.zserial, optarg, sizeof(Config.zserial));
             return;
@@ -159,6 +170,31 @@ void new_file_suffix(char *result, size_t maxlen, const char *src, const char *n
     result[maxlen] = 0;
 }
 
+char *build_output_filename(const char basename[], const char *suffix)
+{
+    int n = strlen(basename) + strlen(suffix);
+    char *ofile = malloc(n + 1);  /* todo!!! check for NULL. free. */
+    new_file_suffix(ofile, n, basename, suffix);
+    return ofile;
+}
+
+void build_opcode_dict(void)
+{
+    /* TODO */
+}
+
+int init_assembly(void)
+{
+    /* TODO */
+    return OK;
+}
+
+int assembly(void)
+{
+    /* TODO */
+    return OK;
+}
+
 int main(int argc, char *argv[], char *envp[])
 {
     const char *output_file = NULL;
@@ -196,16 +232,8 @@ int main(int argc, char *argv[], char *envp[])
     int first_input_file = optind;
     if (first_input_file >= argc)
         wrong_arg("Missing input file\n");
-
     if (!output_file)
-    {
-        const char suffix[] = ".dat";
-        const char *input_file = argv[first_input_file];
-        int n = strlen(input_file) + strlen(suffix);
-        char *ofile = malloc(n);  /* todo!!! check for NULL. free. */
-        new_file_suffix(ofile, n, input_file, suffix);
-        output_file = ofile;
-    }
+        output_file = build_output_filename(argv[first_input_file], ".dat");
 
     // TODO: Everything :)
 
@@ -222,5 +250,9 @@ int main(int argc, char *argv[], char *envp[])
            Config.zversion, Config.zorkid, Config.zserial
           );
 
+    build_opcode_dict();  /* ..fills Config.opcode_dict */
+
+    while(init_assembly() == OK && assembly() == NEED_RESTART);
+
     return 0;
 }