/*****************************************************************************/
-/* */
-/* main.c */
-/* */
-/* Main module for the cl65 compile and link utility */
-/* */
-/* */
-/* */
-/* (C) 1999-2010, Ullrich von Bassewitz */
+/* */
+/* main.c */
+/* */
+/* Main module for the cl65 compile-and-link utility */
+/* */
+/* */
+/* */
+/* (C) 1999-2013, Ullrich von Bassewitz */
/* Roemerstrasse 52 */
/* D-70794 Filderstadt */
/* EMail: uz@cc65.org */
-/* */
-/* */
-/* This software is provided 'as-is', without any expressed or implied */
+/* */
+/* */
+/* This software is provided 'as-is', without any expressed or implied */
/* warranty. In no event will the authors be held liable for any damages */
-/* arising from the use of this software. */
-/* */
+/* arising from the use of this software. */
+/* */
/* Permission is granted to anyone to use this software for any purpose, */
/* including commercial applications, and to alter it and redistribute it */
-/* freely, subject to the following restrictions: */
-/* */
+/* freely, subject to the following restrictions: */
+/* */
/* 1. The origin of this software must not be misrepresented; you must not */
/* claim that you wrote the original software. If you use this software */
/* in a product, an acknowledgment in the product documentation would be */
-/* appreciated but is not required. */
+/* appreciated but is not required. */
/* 2. Altered source versions must be plainly marked as such, and must not */
-/* be misrepresented as being the original software. */
-/* 3. This notice may not be removed or altered from any source */
-/* distribution. */
-/* */
+/* be misrepresented as being the original software. */
+/* 3. This notice may not be removed or altered from any source */
+/* distribution. */
+/* */
/*****************************************************************************/
#else
# define NEED_SPAWN 1
#endif
-
+#if defined(_MSC_VER)
+# pragma warning(disable : 4996)
+#endif
#include <stdio.h>
/*****************************************************************************/
-/* Data */
+/* Data */
/*****************************************************************************/
/* Struct that describes a command */
typedef struct CmdDesc CmdDesc;
struct CmdDesc {
- char* Name; /* The command name */
+ char* Name; /* The command name */
- unsigned ArgCount; /* Count of arguments */
- unsigned ArgMax; /* Maximum count of arguments */
- char** Args; /* The arguments */
+ unsigned ArgCount; /* Count of arguments */
+ unsigned ArgMax; /* Maximum count of arguments */
+ char** Args; /* The arguments */
- unsigned FileCount; /* Count of files to translate */
- unsigned FileMax; /* Maximum count of files */
- char** Files; /* The files */
+ unsigned FileCount; /* Count of files to translate */
+ unsigned FileMax; /* Maximum count of files */
+ char** Files; /* The files */
};
/* Command descriptors for the different programs */
#define MODULE_EXT ".o65"
/* Name of the target specific runtime library */
-static char* TargetLib = 0;
+static char* TargetLib = 0;
#if defined(NEED_SPAWN)
-# if defined(SPAWN_UNIX)
-# include "spawn-unix.inc"
-# elif defined(SPAWN_AMIGA)
+# if defined(SPAWN_AMIGA)
# include "spawn-amiga.inc"
# else
-# error "Don't know which spawn module to include!"
+# include "spawn-unix.inc"
# endif
#endif
/*****************************************************************************/
-/* Command structure handling */
+/* Command structure handling */
/*****************************************************************************/
/* Expand the argument vector */
{
unsigned NewMax = Cmd->ArgMax + 10;
- char** NewArgs = xmalloc (NewMax * sizeof (char*));
+ char** NewArgs = xmalloc (NewMax * sizeof (char*));
memcpy (NewArgs, Cmd->Args, Cmd->ArgMax * sizeof (char*));
xfree (Cmd->Args);
Cmd->Args = NewArgs;
/* Add a copy of the new argument, allow a NULL pointer */
if (Arg) {
- Cmd->Args[Cmd->ArgCount++] = xstrdup (Arg);
+ Cmd->Args[Cmd->ArgCount++] = xstrdup (Arg);
} else {
- Cmd->Args[Cmd->ArgCount++] = 0;
+ Cmd->Args[Cmd->ArgCount++] = 0;
}
}
/* Remove all arguments with an index greater than LastValid */
{
while (Cmd->ArgCount > LastValid) {
- Cmd->ArgCount--;
- xfree (Cmd->Args [Cmd->ArgCount]);
- Cmd->Args [Cmd->ArgCount] = 0;
+ Cmd->ArgCount--;
+ xfree (Cmd->Args [Cmd->ArgCount]);
+ Cmd->Args [Cmd->ArgCount] = 0;
}
}
{
/* Expand the file vector if needed */
if (Cmd->FileCount == Cmd->FileMax) {
- unsigned NewMax = Cmd->FileMax + 10;
- char** NewFiles = xmalloc (NewMax * sizeof (char*));
- memcpy (NewFiles, Cmd->Files, Cmd->FileMax * sizeof (char*));
- xfree (Cmd->Files);
- Cmd->Files = NewFiles;
- Cmd->FileMax = NewMax;
+ unsigned NewMax = Cmd->FileMax + 10;
+ char** NewFiles = xmalloc (NewMax * sizeof (char*));
+ memcpy (NewFiles, Cmd->Files, Cmd->FileMax * sizeof (char*));
+ xfree (Cmd->Files);
+ Cmd->Files = NewFiles;
+ Cmd->FileMax = NewMax;
}
/* If the file name is not NULL (which is legal and is used to terminate
* the file.
*/
if (File) {
- unsigned I;
- for (I = 0; I < Cmd->FileCount; ++I) {
- if (strcmp (Cmd->Files[I], File) == 0) {
- /* Duplicate file */
- Warning ("Duplicate file in argument list: `%s'", File);
- /* No need to search further */
- break;
- }
- }
-
- /* Add the file */
- Cmd->Files [Cmd->FileCount++] = xstrdup (File);
+ unsigned I;
+ for (I = 0; I < Cmd->FileCount; ++I) {
+ if (strcmp (Cmd->Files[I], File) == 0) {
+ /* Duplicate file */
+ Warning ("Duplicate file in argument list: `%s'", File);
+ /* No need to search further */
+ break;
+ }
+ }
+
+ /* Add the file */
+ Cmd->Files [Cmd->FileCount++] = xstrdup (File);
} else {
- /* Add a NULL pointer */
- Cmd->Files [Cmd->FileCount++] = 0;
+ /* Add a NULL pointer */
+ Cmd->Files [Cmd->FileCount++] = 0;
}
}
-static void CmdInit (CmdDesc* Cmd, const char* Path)
-/* Initialize the command using the given path to the executable */
+static void CmdInit (CmdDesc* Cmd, const char* Path, const char* Name)
+/* Initialize the command using the given path and name of the executable */
{
+ char* FullName;
+
+ FullName = (char*) xmalloc (strlen (Path) + strlen (Name) + 1);
+ strcpy (FullName, Path);
+ strcat (FullName, Name);
+
/* Remember the command */
- Cmd->Name = xstrdup (Path);
+ Cmd->Name = xstrdup (FullName);
/* Use the command name as first argument */
- CmdAddArg (Cmd, Path);
+ CmdAddArg (Cmd, FullName);
+
+ xfree (FullName);
}
static void CmdSetTarget (CmdDesc* Cmd, target_t Target)
/* Set the output file in a command desc */
{
- CmdAddArg2 (Cmd, "-t", TargetNames[Target]);
+ CmdAddArg2 (Cmd, "-t", GetTargetName (Target));
}
{
unsigned I;
for (I = 0; I < Cmd->ArgCount && Cmd->Args[I] != 0; ++I) {
- fprintf (F, "%s ", Cmd->Args[I]);
+ fprintf (F, "%s ", Cmd->Args[I]);
}
}
/*****************************************************************************/
-/* Target handling */
+/* Target handling */
/*****************************************************************************/
/* Determine the names of the target specific library file */
if (Target != TGT_NONE) {
- /* Get a pointer to the system name and its length */
- const char* TargetName = TargetNames [Target];
- unsigned TargetNameLen = strlen (TargetName);
+ /* Get a pointer to the system name and its length */
+ const char* TargetName = GetTargetName (Target);
+ unsigned TargetNameLen = strlen (TargetName);
- /* Set the library file */
- TargetLib = xmalloc (TargetNameLen + 4 + 1);
- memcpy (TargetLib, TargetName, TargetNameLen);
- strcpy (TargetLib + TargetNameLen, ".lib");
+ /* Set the library file */
+ TargetLib = xmalloc (TargetNameLen + 4 + 1);
+ memcpy (TargetLib, TargetName, TargetNameLen);
+ strcpy (TargetLib + TargetNameLen, ".lib");
}
}
/*****************************************************************************/
-/* Subprocesses */
+/* Subprocesses */
/*****************************************************************************/
/* If in debug mode, output the command line we will execute */
if (Debug) {
- printf ("Executing: ");
- CmdPrint (Cmd, stdout);
- printf ("\n");
+ printf ("Executing: ");
+ CmdPrint (Cmd, stdout);
+ printf ("\n");
}
/* Call the program */
/* Check the result code */
if (Status < 0) {
- /* Error executing the program */
- Error ("Cannot execute `%s': %s", Cmd->Name, strerror (errno));
+ /* Error executing the program */
+ Error ("Cannot execute `%s': %s", Cmd->Name, strerror (errno));
} else if (Status != 0) {
- /* Called program had an error */
- exit (Status);
+ /* Called program had an error */
+ exit (Status);
}
}
{
unsigned I;
+ /* Since linking is always the final step, if we have an output file name
+ * given, set it here. If we don't have an explicit output name given,
+ * try to build one from the name of the first input file.
+ */
+ if (OutputName) {
+
+ CmdSetOutput (&LD65, OutputName);
+
+ } else if (FirstInput && FindExt (FirstInput)) { /* Only if ext present! */
+
+ const char* Extension = Module? MODULE_EXT : "";
+ char* Output = MakeFilename (FirstInput, Extension);
+ CmdSetOutput (&LD65, Output);
+ xfree (Output);
+
+ }
+
/* If we have a linker config file given, add it to the command line.
* Otherwise pass the target to the linker if we have one.
*/
if (Module) {
Error ("Cannot use -C and --module together");
}
- CmdAddArg2 (&LD65, "-C", LinkerConfig);
+ CmdAddArg2 (&LD65, "-C", LinkerConfig);
} else if (Module) {
CmdSetTarget (&LD65, TGT_MODULE);
} else {
- CmdSetTarget (&LD65, Target);
+ CmdSetTarget (&LD65, Target);
}
/* Determine which target libraries are needed */
SetTargetFiles ();
- /* Since linking is always the final step, if we have an output file name
- * given, set it here. If we don't have an explicit output name given,
- * try to build one from the name of the first input file.
- */
- if (OutputName) {
-
- CmdSetOutput (&LD65, OutputName);
-
- } else if (FirstInput && FindExt (FirstInput)) { /* Only if ext present! */
-
- const char* Extension = Module? MODULE_EXT : "";
- char* Output = MakeFilename (FirstInput, Extension);
- CmdSetOutput (&LD65, Output);
- xfree (Output);
-
- }
-
/* Add all object files as parameters */
for (I = 0; I < LD65.FileCount; ++I) {
- CmdAddArg (&LD65, LD65.Files [I]);
+ CmdAddArg (&LD65, LD65.Files [I]);
}
/* Add the system runtime library */
if (TargetLib) {
- CmdAddArg (&LD65, TargetLib);
+ CmdAddArg (&LD65, TargetLib);
}
/* Terminate the argument list with a NULL pointer */
* the the file list of the linker. The name of the output
* file is that of the input file with ".s" replaced by ".o".
*/
- char* ObjName = MakeFilename (File, ".o");
- CmdAddFile (&LD65, ObjName);
- xfree (ObjName);
+ char* ObjName = MakeFilename (File, ".o");
+ CmdAddFile (&LD65, ObjName);
+ xfree (ObjName);
} else {
/* This is the final step. If an output name is given, set it */
if (OutputName) {
/* Set the target system */
CmdSetTarget (&CC65, Target);
- /* If we won't assemble, this is the final step. In this case, set the
- * output name.
- */
- if (!DoAssemble && OutputName) {
- CmdSetOutput (&CC65, OutputName);
+ /* Check if this is the final step */
+ if (DoAssemble) {
+ /* We will assemble this file later. If a dependency file is to be
+ * generated, set the dependency target to be the final object file,
+ * not the intermediate assembler file. But beware: There may be an
+ * output name specified for the assembler.
+ */
+ if (DepName || FullDepName) {
+ /* Was an output name for the assembler specified? */
+ if (!DoLink && OutputName) {
+ /* Use this name as the dependency target */
+ CmdAddArg2 (&CC65, "--dep-target", OutputName);
+ } else {
+ /* Use the object file name as the dependency target */
+ char* ObjName = MakeFilename (File, ".o");
+ CmdAddArg2 (&CC65, "--dep-target", ObjName);
+ xfree (ObjName);
+ }
+ }
+ } else {
+ /* If we won't assemble, this is the final step. In this case, set
+ * the output name if it was given.
+ */
+ if (OutputName) {
+ CmdSetOutput (&CC65, OutputName);
+ }
}
/* Add the file as argument for the compiler */
*/
if (DoAssemble) {
/* Assemble the intermediate file and remove it */
- AssembleIntermediate (File);
+ AssembleIntermediate (File);
}
}
/* Remember the current assembler argument count */
unsigned ArgCount = GRC.ArgCount;
+ /* Resource files need an geos-apple or geos-cbm target but this
+ * is checked within grc65.
+ */
+ CmdSetTarget (&GRC, Target);
+
/* Add the file as argument for the resource compiler */
CmdAddArg (&GRC, File);
*/
if (DoAssemble) {
/* Assemble the intermediate file and remove it */
- AssembleIntermediate (File);
+ AssembleIntermediate (File);
}
}
* output name.
*/
if (!DoAssemble && OutputName) {
- CmdSetOutput (&CO65, OutputName);
+ CmdSetOutput (&CO65, OutputName);
}
/* Add the file as argument for the object file converter */
*/
if (DoAssemble) {
/* Assemble the intermediate file and remove it */
- AssembleIntermediate (File);
+ AssembleIntermediate (File);
}
}
/*****************************************************************************/
-/* Code */
+/* Code */
/*****************************************************************************/
{
printf ("Usage: %s [options] file [...]\n"
"Short options:\n"
- " -c\t\t\t\tCompile and assemble but don't link\n"
+ " -c\t\t\t\tCompile and assemble, but don't link\n"
" -d\t\t\t\tDebug mode\n"
" -g\t\t\t\tAdd debug info\n"
" -h\t\t\t\tHelp (this text)\n"
- " -l\t\t\t\tCreate an assembler listing\n"
+ " -l name\t\t\tCreate an assembler listing file\n"
" -m name\t\t\tCreate a map file\n"
" -mm model\t\t\tSet the memory model\n"
" -o name\t\t\tName the output file\n"
" -L path\t\t\tSpecify a library search path\n"
" -Ln name\t\t\tCreate a VICE label file\n"
" -O\t\t\t\tOptimize code\n"
- " -Oi\t\t\t\tOptimize code, inline functions\n"
+ " -Oi\t\t\t\tOptimize code, inline runtime functions\n"
" -Or\t\t\t\tOptimize code, honour the register keyword\n"
- " -Os\t\t\t\tOptimize code, inline known C funtions\n"
- " -S\t\t\t\tCompile but don't assemble and link\n"
+ " -Os\t\t\t\tOptimize code, inline known C functions\n"
+ " -S\t\t\t\tCompile, but don't assemble and link\n"
" -T\t\t\t\tInclude source as comment\n"
" -V\t\t\t\tPrint the version number\n"
- " -W\t\t\t\tSuppress warnings\n"
+ " -W name[,...]\t\t\tSuppress compiler warnings\n"
" -Wa options\t\t\tPass options to the assembler\n"
+ " -Wc options\t\t\tPass options to the compiler\n"
" -Wl options\t\t\tPass options to the linker\n"
"\n"
"Long options:\n"
" --asm-args options\t\tPass options to the assembler\n"
" --asm-define sym[=v]\t\tDefine an assembler symbol\n"
" --asm-include-dir dir\t\tSet an assembler include directory\n"
+ " --bin-include-dir dir\t\tSet an assembler binary include directory\n"
" --bss-label name\t\tDefine and export a BSS segment label\n"
" --bss-name seg\t\tSet the name of the BSS segment\n"
+ " --cc-args options\t\tPass options to the compiler\n"
" --cfg-path path\t\tSpecify a config file search path\n"
" --check-stack\t\t\tGenerate stack overflow checks\n"
" --code-label name\t\tDefine and export a CODE segment label\n"
" --code-name seg\t\tSet the name of the CODE segment\n"
" --codesize x\t\t\tAccept larger code by factor x\n"
" --config name\t\t\tUse linker config file\n"
- " --cpu type\t\t\tSet cpu type\n"
+ " --cpu type\t\t\tSet CPU type\n"
" --create-dep name\t\tCreate a make dependency file\n"
" --create-full-dep name\tCreate a full make dependency file\n"
" --data-label name\t\tDefine and export a DATA segment label\n"
" --debug-info\t\t\tAdd debug info\n"
" --feature name\t\tSet an emulation feature\n"
" --force-import sym\t\tForce an import of symbol `sym'\n"
- " --forget-inc-paths\t\tForget include search paths (compiler)\n"
" --help\t\t\tHelp (this text)\n"
" --include-dir dir\t\tSet a compiler include directory path\n"
" --ld-args options\t\tPass options to the linker\n"
" --lib file\t\t\tLink this library\n"
" --lib-path path\t\tSpecify a library search path\n"
" --list-targets\t\tList all available targets\n"
- " --listing\t\t\tCreate an assembler listing\n"
+ " --listing name\t\tCreate an assembler listing file\n"
" --list-bytes n\t\tNumber of bytes per assembler listing line\n"
" --mapfile name\t\tCreate a map file\n"
" --memory-model model\t\tSet the memory model\n"
" --module\t\t\tLink as a module\n"
- " --module-id id\t\tSpecify a module id for the linker\n"
+ " --module-id id\t\tSpecify a module ID for the linker\n"
" --o65-model model\t\tOverride the o65 model\n"
" --obj file\t\t\tLink this object file\n"
" --obj-path path\t\tSpecify an object file search path\n"
static void OptAddSource (const char* Opt attribute ((unused)),
- const char* Arg attribute ((unused)))
+ const char* Arg attribute ((unused)))
/* Strict source code as comments to the generated asm code */
{
CmdAddArg (&CC65, "-T");
+static void OptBinIncludeDir (const char* Opt attribute ((unused)), const char* Arg)
+/* Binary include directory (assembler) */
+{
+ CmdAddArg2 (&CA65, "--bin-include-dir", Arg);
+}
+
+
+
static void OptBssLabel (const char* Opt attribute ((unused)), const char* Arg)
/* Handle the --bss-label option */
{
+static void OptCCArgs (const char* Opt attribute ((unused)), const char* Arg)
+/* Pass arguments to the compiler */
+{
+ CmdAddArgList (&CC65, Arg);
+}
+
+
+
static void OptCfgPath (const char* Opt attribute ((unused)), const char* Arg)
/* Config file search path (linker) */
{
static void OptCheckStack (const char* Opt attribute ((unused)),
- const char* Arg attribute ((unused)))
+ const char* Arg attribute ((unused)))
/* Handle the --check-stack option */
{
CmdAddArg (&CC65, "--check-stack");
static void OptDebug (const char* Opt attribute ((unused)),
- const char* Arg attribute ((unused)))
+ const char* Arg attribute ((unused)))
/* Debug mode (compiler and cl65 utility) */
{
CmdAddArg (&CC65, "-d");
static void OptDebugInfo (const char* Opt attribute ((unused)),
- const char* Arg attribute ((unused)))
+ const char* Arg attribute ((unused)))
/* Debug Info - add to compiler and assembler */
{
CmdAddArg (&CC65, "-g");
-static void OptForgetIncPaths (const char* Opt attribute ((unused)),
- const char* Arg attribute ((unused)))
-/* Forget all currently defined include paths */
-{
- CmdAddArg (&CC65, "--forget-inc-paths");
-}
-
-
-
static void OptHelp (const char* Opt attribute ((unused)),
- const char* Arg attribute ((unused)))
+ const char* Arg attribute ((unused)))
/* Print help - cl65 */
{
Usage ();
-static void OptListing (const char* Opt attribute ((unused)),
- const char* Arg attribute ((unused)))
+static void OptListing (const char* Opt attribute ((unused)), const char* Arg)
/* Create an assembler listing */
{
- CmdAddArg (&CA65, "-l");
+ CmdAddArg2 (&CA65, "-l", Arg);
}
static void OptListTargets (const char* Opt attribute ((unused)),
- const char* Arg attribute ((unused)))
+ const char* Arg attribute ((unused)))
/* List all targets */
{
- unsigned I;
+ target_t T;
/* List the targets */
- for (I = TGT_NONE; I < TGT_COUNT; ++I) {
- printf ("%s\n", TargetNames[I]);
+ for (T = TGT_NONE; T < TGT_COUNT; ++T) {
+ printf ("%s\n", GetTargetName (T));
}
/* Terminate */
static void OptSignedChars (const char* Opt attribute ((unused)),
- const char* Arg attribute ((unused)))
+ const char* Arg attribute ((unused)))
/* Make default characters signed */
{
CmdAddArg (&CC65, "-j");
static void OptStaticLocals (const char* Opt attribute ((unused)),
- const char* Arg attribute ((unused)))
+ const char* Arg attribute ((unused)))
/* Place local variables in static storage */
{
CmdAddArg (&CC65, "-Cl");
static void OptVerbose (const char* Opt attribute ((unused)),
- const char* Arg attribute ((unused)))
+ const char* Arg attribute ((unused)))
/* Verbose mode (compiler, assembler, linker) */
{
CmdAddArg (&CC65, "-v");
static void OptVersion (const char* Opt attribute ((unused)),
- const char* Arg attribute ((unused)))
+ const char* Arg attribute ((unused)))
/* Print version number */
{
- fprintf (stderr,
- "cl65 V%s - (C) Copyright 1998-2009 Ullrich von Bassewitz\n",
- GetVersionAsString ());
+ fprintf (stderr, "cl65 V%s\n", GetVersionAsString ());
}
{
/* Program long options */
static const LongOpt OptTab[] = {
- { "--add-source", 0, OptAddSource },
+ { "--add-source", 0, OptAddSource },
{ "--asm-args", 1, OptAsmArgs },
- { "--asm-define", 1, OptAsmDefine },
- { "--asm-include-dir", 1, OptAsmIncludeDir },
- { "--bss-label", 1, OptBssLabel },
- { "--bss-name", 1, OptBssName },
- { "--cfg-path", 1, OptCfgPath },
- { "--check-stack", 0, OptCheckStack },
- { "--code-label", 1, OptCodeLabel },
- { "--code-name", 1, OptCodeName },
- { "--codesize", 1, OptCodeSize },
+ { "--asm-define", 1, OptAsmDefine },
+ { "--asm-include-dir", 1, OptAsmIncludeDir },
+ { "--bin-include-dir", 1, OptBinIncludeDir },
+ { "--bss-label", 1, OptBssLabel },
+ { "--bss-name", 1, OptBssName },
+ { "--cc-args", 1, OptCCArgs },
+ { "--cfg-path", 1, OptCfgPath },
+ { "--check-stack", 0, OptCheckStack },
+ { "--code-label", 1, OptCodeLabel },
+ { "--code-name", 1, OptCodeName },
+ { "--codesize", 1, OptCodeSize },
{ "--config", 1, OptConfig },
- { "--cpu", 1, OptCPU },
- { "--create-dep", 1, OptCreateDep },
- { "--create-full-dep", 1, OptCreateFullDep },
- { "--data-label", 1, OptDataLabel },
- { "--data-name", 1, OptDataName },
- { "--debug", 0, OptDebug },
- { "--debug-info", 0, OptDebugInfo },
- { "--feature", 1, OptFeature },
+ { "--cpu", 1, OptCPU },
+ { "--create-dep", 1, OptCreateDep },
+ { "--create-full-dep", 1, OptCreateFullDep },
+ { "--data-label", 1, OptDataLabel },
+ { "--data-name", 1, OptDataName },
+ { "--debug", 0, OptDebug },
+ { "--debug-info", 0, OptDebugInfo },
+ { "--feature", 1, OptFeature },
{ "--force-import", 1, OptForceImport },
- { "--forget-inc-paths", 0, OptForgetIncPaths },
- { "--help", 0, OptHelp },
- { "--include-dir", 1, OptIncludeDir },
+ { "--help", 0, OptHelp },
+ { "--include-dir", 1, OptIncludeDir },
{ "--ld-args", 1, OptLdArgs },
- { "--lib", 1, OptLib },
- { "--lib-path", 1, OptLibPath },
- { "--list-targets", 0, OptListTargets },
- { "--listing", 0, OptListing },
+ { "--lib", 1, OptLib },
+ { "--lib-path", 1, OptLibPath },
+ { "--list-targets", 0, OptListTargets },
+ { "--listing", 1, OptListing },
{ "--list-bytes", 1, OptListBytes },
- { "--mapfile", 1, OptMapFile },
+ { "--mapfile", 1, OptMapFile },
{ "--memory-model", 1, OptMemoryModel },
{ "--module", 0, OptModule },
{ "--module-id", 1, OptModuleId },
{ "--o65-model", 1, OptO65Model },
- { "--obj", 1, OptObj },
- { "--obj-path", 1, OptObjPath },
+ { "--obj", 1, OptObj },
+ { "--obj-path", 1, OptObjPath },
{ "--register-space", 1, OptRegisterSpace },
{ "--register-vars", 0, OptRegisterVars },
- { "--rodata-name", 1, OptRodataName },
- { "--signed-chars", 0, OptSignedChars },
+ { "--rodata-name", 1, OptRodataName },
+ { "--signed-chars", 0, OptSignedChars },
{ "--standard", 1, OptStandard },
- { "--start-addr", 1, OptStartAddr },
- { "--static-locals", 0, OptStaticLocals },
- { "--target", 1, OptTarget },
- { "--verbose", 0, OptVerbose },
- { "--version", 0, OptVersion },
- { "--zeropage-label", 1, OptZeropageLabel },
- { "--zeropage-name", 1, OptZeropageName },
+ { "--start-addr", 1, OptStartAddr },
+ { "--static-locals", 0, OptStaticLocals },
+ { "--target", 1, OptTarget },
+ { "--verbose", 0, OptVerbose },
+ { "--version", 0, OptVersion },
+ { "--zeropage-label", 1, OptZeropageLabel },
+ { "--zeropage-name", 1, OptZeropageName },
};
+ char* CmdPath;
unsigned I;
/* Initialize the cmdline module */
InitCmdLine (&argc, &argv, "cl65");
/* Initialize the command descriptors */
- CmdInit (&CC65, "cc65");
- CmdInit (&CA65, "ca65");
- CmdInit (&CO65, "co65");
- CmdInit (&LD65, "ld65");
- CmdInit (&GRC, "grc");
+ if (argc == 0) {
+ CmdPath = xstrdup ("");
+ } else {
+ char* Ptr;
+ CmdPath = xstrdup (argv[0]);
+ Ptr = strrchr (CmdPath, '/');
+ if (Ptr == 0) {
+ Ptr = strrchr (CmdPath, '\\');
+ }
+ if (Ptr == 0) {
+ *CmdPath = '\0';
+ } else {
+ *(Ptr + 1) = '\0';
+ }
+ }
+ CmdInit (&CC65, CmdPath, "cc65");
+ CmdInit (&CA65, CmdPath, "ca65");
+ CmdInit (&CO65, CmdPath, "co65");
+ CmdInit (&LD65, CmdPath, "ld65");
+ CmdInit (&GRC, CmdPath, "grc65");
+ xfree (CmdPath);
/* Our default target is the C64 instead of "none" */
Target = TGT_C64;
I = 1;
while (I < ArgCount) {
- /* Get the argument */
- const char* Arg = ArgVec[I];
-
- /* Check for an option */
- if (Arg [0] == '-') {
-
- switch (Arg [1]) {
-
- case '-':
- LongOption (&I, OptTab, sizeof(OptTab)/sizeof(OptTab[0]));
- break;
-
- case 'C':
- if (Arg[2] == 'l' && Arg[3] == '\0') {
- /* Make local variables static */
- OptStaticLocals (Arg, 0);
- } else {
- /* Specify linker config file */
- OptConfig (Arg, GetArg (&I, 2));
- }
- break;
-
- case 'D':
- /* Define a preprocessor symbol (compiler) */
- CmdAddArg2 (&CC65, "-D", GetArg (&I, 2));
- break;
-
- case 'I':
- /* Include directory (compiler) */
- OptIncludeDir (Arg, GetArg (&I, 2));
- break;
-
- case 'L':
- if (Arg[2] == 'n' && Arg[3] == '\0') {
- /* VICE label file (linker) */
- CmdAddArg2 (&LD65, "-Ln", GetArg (&I, 3));
- } else {
+ /* Get the argument */
+ const char* Arg = ArgVec[I];
+
+ /* Check for an option */
+ if (Arg [0] == '-') {
+
+ switch (Arg [1]) {
+
+ case '-':
+ LongOption (&I, OptTab, sizeof(OptTab)/sizeof(OptTab[0]));
+ break;
+
+ case 'C':
+ if (Arg[2] == 'l' && Arg[3] == '\0') {
+ /* Make local variables static */
+ OptStaticLocals (Arg, 0);
+ } else {
+ /* Specify linker config file */
+ OptConfig (Arg, GetArg (&I, 2));
+ }
+ break;
+
+ case 'D':
+ /* Define a preprocessor symbol (compiler) */
+ CmdAddArg2 (&CC65, "-D", GetArg (&I, 2));
+ break;
+
+ case 'I':
+ /* Include directory (compiler) */
+ OptIncludeDir (Arg, GetArg (&I, 2));
+ break;
+
+ case 'L':
+ if (Arg[2] == 'n' && Arg[3] == '\0') {
+ /* VICE label file (linker) */
+ CmdAddArg2 (&LD65, "-Ln", GetArg (&I, 3));
+ } else {
/* Library search path (linker) */
OptLibPath (Arg, GetArg (&I, 2));
- }
- break;
+ }
+ break;
- case 'O':
- /* Optimize code (compiler, also covers -Oi and others) */
- CmdAddArg (&CC65, Arg);
- break;
+ case 'O':
+ /* Optimize code (compiler, also covers -Oi and others) */
+ CmdAddArg (&CC65, Arg);
+ break;
- case 'S':
- /* Dont assemble and link the created files */
+ case 'S':
+ /* Dont assemble and link the created files */
DoAssemble = 0;
- DoLink = 0;
- break;
-
- case 'T':
- /* Include source as comment (compiler) */
- OptAddSource (Arg, 0);
- break;
-
- case 'V':
- /* Print version number */
- OptVersion (Arg, 0);
- break;
-
- case 'W':
- switch (Arg[2]) {
-
- case 'a':
- OptAsmArgs (Arg, GetArg (&I, 3));
- break;
-
- case 'l':
- OptLdArgs (Arg, GetArg (&I, 3));
- break;
-
- case '\0':
- /* Suppress warnings - compiler and assembler */
- CmdAddArg (&CC65, "-W");
- CmdAddArg2 (&CA65, "-W", "0");
- break;
-
- default:
- UnknownOption (Arg);
- break;
+ DoLink = 0;
+ break;
+
+ case 'T':
+ /* Include source as comment (compiler) */
+ OptAddSource (Arg, 0);
+ break;
+
+ case 'V':
+ /* Print version number */
+ OptVersion (Arg, 0);
+ break;
+
+ case 'W':
+ if (Arg[2] == 'a' && Arg[3] == '\0') {
+ /* -Wa: Pass options to assembler */
+ OptAsmArgs (Arg, GetArg (&I, 3));
+ } else if (Arg[2] == 'c' && Arg[3] == '\0') {
+ /* -Wc: Pass options to compiler */
+ OptCCArgs (Arg, GetArg (&I, 3));
+ } else if (Arg[2] == 'l' && Arg[3] == '\0') {
+ /* -Wl: Pass options to linker */
+ OptLdArgs (Arg, GetArg (&I, 3));
+ } else {
+ /* Anything else: Suppress warnings (compiler) */
+ CmdAddArg2 (&CC65, "-W", GetArg (&I, 2));
+ }
+ break;
+
+ case 'c':
+ /* Don't link the resulting files */
+ DoLink = 0;
+ break;
+
+ case 'd':
+ /* Debug mode (compiler) */
+ OptDebug (Arg, 0);
+ break;
+
+ case 'g':
+ /* Debugging - add to compiler and assembler */
+ OptDebugInfo (Arg, 0);
+ break;
+
+ case 'h':
+ case '?':
+ /* Print help - cl65 */
+ OptHelp (Arg, 0);
+ break;
+
+ case 'j':
+ /* Default characters are signed */
+ OptSignedChars (Arg, 0);
+ break;
+
+ case 'l':
+ /* Create an assembler listing */
+ OptListing (Arg, GetArg (&I, 2));
+ break;
+
+ case 'm':
+ /* Create a map file (linker) */
+ OptMapFile (Arg, GetArg (&I, 2));
+ break;
+
+ case 'o':
+ /* Name the output file */
+ OutputName = GetArg (&I, 2);
+ break;
+
+ case 'r':
+ /* Enable register variables */
+ OptRegisterVars (Arg, 0);
+ break;
+
+ case 't':
+ /* Set target system - compiler, assembler and linker */
+ OptTarget (Arg, GetArg (&I, 2));
+ break;
+
+ case 'u':
+ /* Force an import (linker) */
+ OptForceImport (Arg, GetArg (&I, 2));
+ break;
+
+ case 'v':
+ if (Arg [2] == 'm') {
+ /* Verbose map file (linker) */
+ CmdAddArg (&LD65, "-vm");
+ } else {
+ /* Verbose mode (compiler, assembler, linker) */
+ OptVerbose (Arg, 0);
}
break;
- case 'c':
- /* Don't link the resulting files */
- DoLink = 0;
- break;
-
- case 'd':
- /* Debug mode (compiler) */
- OptDebug (Arg, 0);
- break;
-
- case 'g':
- /* Debugging - add to compiler and assembler */
- OptDebugInfo (Arg, 0);
- break;
-
- case 'h':
- case '?':
- /* Print help - cl65 */
- OptHelp (Arg, 0);
- break;
-
- case 'j':
- /* Default characters are signed */
- OptSignedChars (Arg, 0);
- break;
-
- case 'l':
- /* Create an assembler listing */
- OptListing (Arg, 0);
- break;
-
- case 'm':
- /* Create a map file (linker) */
- OptMapFile (Arg, GetArg (&I, 2));
- break;
-
- case 'o':
- /* Name the output file */
- OutputName = GetArg (&I, 2);
- break;
-
- case 'r':
- /* Enable register variables */
- OptRegisterVars (Arg, 0);
- break;
-
- case 't':
- /* Set target system - compiler, assembler and linker */
- OptTarget (Arg, GetArg (&I, 2));
- break;
-
- case 'u':
- /* Force an import (linker) */
- OptForceImport (Arg, GetArg (&I, 2));
- break;
-
- case 'v':
- if (Arg [2] == 'm') {
- /* Verbose map file (linker) */
- CmdAddArg (&LD65, "-vm");
- } else {
- /* Verbose mode (compiler, assembler, linker) */
- OptVerbose (Arg, 0);
- }
- break;
-
- default:
- UnknownOption (Arg);
- }
- } else {
-
- /* Remember the first file name */
- if (FirstInput == 0) {
- FirstInput = Arg;
- }
-
- /* Determine the file type by the extension */
- switch (GetFileType (Arg)) {
-
- case FILETYPE_C:
- /* Compile the file */
- Compile (Arg);
- break;
-
- case FILETYPE_ASM:
- /* Assemble the file */
- if (DoAssemble) {
- Assemble (Arg);
- }
- break;
-
- case FILETYPE_OBJ:
- case FILETYPE_LIB:
- /* Add to the linker files */
- CmdAddFile (&LD65, Arg);
- break;
-
- case FILETYPE_GR:
- /* Add to the resource compiler files */
- CompileRes (Arg);
- break;
+ default:
+ UnknownOption (Arg);
+ }
+ } else {
+
+ /* Remember the first file name */
+ if (FirstInput == 0) {
+ FirstInput = Arg;
+ }
+
+ /* Determine the file type by the extension */
+ switch (GetFileType (Arg)) {
+
+ case FILETYPE_C:
+ /* Compile the file */
+ Compile (Arg);
+ break;
+
+ case FILETYPE_ASM:
+ /* Assemble the file */
+ if (DoAssemble) {
+ Assemble (Arg);
+ }
+ break;
+
+ case FILETYPE_OBJ:
+ case FILETYPE_LIB:
+ /* Add to the linker files */
+ CmdAddFile (&LD65, Arg);
+ break;
+
+ case FILETYPE_GR:
+ /* Add to the resource compiler files */
+ CompileRes (Arg);
+ break;
case FILETYPE_O65:
/* Add the the object file converter files */
ConvertO65 (Arg);
break;
- default:
- Error ("Don't know what to do with `%s'", Arg);
+ default:
+ Error ("Don't know what to do with `%s'", Arg);
- }
+ }
- }
+ }
- /* Next argument */
- ++I;
+ /* Next argument */
+ ++I;
}
/* Check if we had any input files */
if (FirstInput == 0) {
- Warning ("No input files");
+ Warning ("No input files");
}
/* Link the given files if requested and if we have any */
if (DoLink && LD65.FileCount > 0) {
- Link ();
+ Link ();
}
/* Return an apropriate exit code */
projects / cc65 / blobdiff