Removed obsolete comment

[cc65] / src / cl65 / main.c

diff --git a/src/cl65/main.c b/src/cl65/main.c
index e0edab79dea51a88a7748861b51311511ede3580..81e7de633675e2384a2d08add39370c6d7b18699 100644 (file)
--- a/src/cl65/main.c
+++ b/src/cl65/main.c
@@ -58,6 +58,7 @@
 #include "cmdline.h"
 #include "filetype.h"
 #include "fname.h"
+#include "mmodel.h"
 #include "strbuf.h"
 #include "target.h"
 #include "version.h"
@@ -287,13 +288,13 @@ static void SetTargetFiles (void)
 
        /* Set the startup file */
        TargetCRT0 = xmalloc (TargetNameLen + 2 + 1);
-       strcpy (TargetCRT0, TargetName);
-       strcat (TargetCRT0, ".o");
+               memcpy (TargetCRT0, TargetName, TargetNameLen);
+               strcpy (TargetCRT0 + TargetNameLen, ".o");
 
        /* Set the library file */
        TargetLib = xmalloc (TargetNameLen + 4 + 1);
-       strcpy (TargetLib, TargetName);
-       strcat (TargetLib, ".lib");
+       memcpy (TargetLib, TargetName, TargetNameLen);
+       strcpy (TargetLib + TargetNameLen, ".lib");
 
     }
 }
@@ -348,7 +349,7 @@ static void Link (void)
                CmdAddArg2 (&LD65, "-C", LinkerConfig);
     } else if (Module) {
         CmdSetTarget (&LD65, TGT_MODULE);
-    } else if (Target != TGT_NONE) {
+    } else {
        CmdSetTarget (&LD65, Target);
     }
 
@@ -596,6 +597,7 @@ static void Usage (void)
                     "  -h\t\t\tHelp (this text)\n"
                     "  -l\t\t\tCreate an assembler listing\n"
                     "  -m name\t\tCreate a map file\n"
+             "  -mm model\t\tSet the memory model\n"
                     "  -o name\t\tName the output file\n"
              "  -r\t\t\tEnable register variables\n"
                     "  -t sys\t\tSet the target system\n"
@@ -644,6 +646,7 @@ static void Usage (void)
              "  --lib-path path\tSpecify a library search path\n"
                     "  --listing\t\tCreate an assembler listing\n"
             "  --mapfile name\tCreate a map file\n"
+             "  --memory-model model\tSet the memory model\n"
              "  --module\t\tLink as a module\n"
              "  --module-id id\tSpecify a module id for the linker\n"
              "  --o65-model model\tOverride the o65 model\n"
@@ -895,6 +898,22 @@ static void OptMapFile (const char* Opt attribute ((unused)), const char* Arg)
 
 
 
+static void OptMemoryModel (const char* Opt attribute ((unused)), const char* Arg)
+/* Set the memory model */
+{
+    mmodel_t MemoryModel = FindMemoryModel (Arg);
+    if (MemoryModel == MMODEL_UNKNOWN) {
+        Error ("Unknown memory model: %s", Arg);
+    } else if (MemoryModel == MMODEL_HUGE) {
+        Error ("Unsupported memory model: %s", Arg);
+    } else {
+        CmdAddArg2 (&CA65, "-mm", Arg);
+        CmdAddArg2 (&CC65, "-mm", Arg);
+    }
+}
+
+
+
 static void OptModule (const char* Opt attribute ((unused)),
                        const char* Arg attribute ((unused)))
 /* Link as a module */
@@ -1022,7 +1041,7 @@ static void OptVersion (const char* Opt attribute ((unused)),
             VER_MAJOR, VER_MINOR, VER_PATCH);
 }
 
-        
+
 
 static void OptZeropageLabel (const char* Opt attribute ((unused)), const char* Arg)
 /* Handle the --zeropage-label option */
@@ -1071,6 +1090,7 @@ int main (int argc, char* argv [])
                { "--lib-path",         1,      OptLibPath              },
        { "--listing",          0,      OptListing              },
        { "--mapfile",          1,      OptMapFile              },
+        { "--memory-model",     1,      OptMemoryModel          },
         { "--module",           0,      OptModule               },
         { "--module-id",        1,      OptModuleId             },
         { "--o65-model",        1,      OptO65Model             },