X-Git-Url: https://jxself.org/git/?p=zilutils.git;a=blobdiff_plain;f=zilasm%2Fmain.c;h=df48b7c86cd9b3cecdbbd0ca8391ec6a4d6b8070;hp=558130c60c868248b39b249858ace05dc11b4fad;hb=512d2cae11f05d1b2eb0824557b6daf4ec6c17e9;hpb=674e1038aa0b6b437a2216cf2360896da8dfa473

diff --git a/zilasm/main.c b/zilasm/main.c
index 558130c..df48b7c 100644
--- a/zilasm/main.c
+++ b/zilasm/main.c
@@ -30,6 +30,8 @@
 
 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 +43,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,7 +87,7 @@ 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 6 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"
@@ -133,7 +141,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;
@@ -142,9 +150,52 @@ void parse_zserial(void)
     wrong_arg("Wrong zserial value %s, must be 6 ascii characters\n", optarg);
 }
 
+void new_file_suffix(char *result, size_t maxlen, const char *src, const char *newsuffix)
+{
+    strncpy(result, src, maxlen);
+    char *p = strrchr(result, '.');
+    if (p && strchr(p, '/'))
+        p = NULL;
+    if (p)
+    {
+        strncpy(p, newsuffix, maxlen - (p - result));
+    }
+    else
+    {
+        strncat(result, newsuffix, maxlen);
+    }
+    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;
+    int i;
 
     fill_config();
 
@@ -159,7 +210,7 @@ int main(int argc, char *argv[], char *envp[])
             print_version();
         case 'o'     :
             if (output_file) wrong_arg("Output file must be given once\n");
-            output_file = argv[optind];
+            output_file = optarg;
             break;
         case ZVERSION:
             parse_intarg(&Config.zversion, "zversion", 1, 8,      1);
@@ -175,9 +226,19 @@ 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)
+        output_file = build_output_filename(argv[first_input_file], ".dat");
+
     // TODO: Everything :)
 
-    printf("Output file: %s\n\n", output_file ? output_file : "MISSING");
+    printf("Input files:\n");
+    for (i = optind; i < argc; i++)
+        printf("\t%s\n", argv[i]);
+
+    printf("Output file: %s\n\n", output_file);
 
     printf("Config:\n"
            "- ZVersion: %d\n"
@@ -186,5 +247,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;
 }