/* */
/* */
/* */
-/* (C) 1999-2002 Ullrich von Bassewitz */
-/* Wacholderweg 14 */
-/* D-70597 Stuttgart */
-/* EMail: uz@musoftware.de */
+/* (C) 1999-2003 Ullrich von Bassewitz */
+/* Römerstrasse 52 */
+/* D-70794 Filderstadt */
+/* EMail: uz@cc65.org */
/* */
/* */
/* This software is provided 'as-is', without any expressed or implied */
/* common */
#include "attrib.h"
#include "cmdline.h"
+#include "filetype.h"
#include "fname.h"
+#include "mmodel.h"
#include "strbuf.h"
#include "target.h"
#include "version.h"
/*****************************************************************************/
-/* Data */
+/* Data */
/*****************************************************************************/
/* Command descriptors for the different programs */
static CmdDesc CC65 = { 0, 0, 0, 0, 0, 0, 0 };
static CmdDesc CA65 = { 0, 0, 0, 0, 0, 0, 0 };
+static CmdDesc CO65 = { 0, 0, 0, 0, 0, 0, 0 };
static CmdDesc LD65 = { 0, 0, 0, 0, 0, 0, 0 };
static CmdDesc GRC = { 0, 0, 0, 0, 0, 0, 0 };
-/* File types */
-enum {
- FILETYPE_UNKNOWN,
- FILETYPE_C,
- FILETYPE_ASM,
- FILETYPE_OBJ,
- FILETYPE_LIB,
- FILETYPE_GR /* GEOS resource file */
-};
-
-/* Default file type, used if type unknown */
-static unsigned DefaultFileType = FILETYPE_UNKNOWN;
-
/* Variables controlling the steps we're doing */
static int DontLink = 0;
static int DontAssemble = 0;
-/*****************************************************************************/
-/* Determine a file type */
-/*****************************************************************************/
-
-
-
-static unsigned GetFileType (const char* File)
-/* Determine the type of the given file */
-{
- /* Table mapping extensions to file types */
- static const struct {
- const char* Ext;
- unsigned Type;
- } FileTypes [] = {
- { ".c", FILETYPE_C },
- { ".s", FILETYPE_ASM },
- { ".asm", FILETYPE_ASM },
- { ".a65", FILETYPE_ASM },
- { ".o", FILETYPE_OBJ },
- { ".obj", FILETYPE_OBJ },
- { ".a", FILETYPE_LIB },
- { ".lib", FILETYPE_LIB },
- { ".grc", FILETYPE_GR },
- };
-
- unsigned I;
-
- /* Determine the file type by the extension */
- const char* Ext = FindExt (File);
-
- /* Do we have an extension? */
- if (Ext == 0) {
- return DefaultFileType;
- }
-
- /* Check for known extensions */
- for (I = 0; I < sizeof (FileTypes) / sizeof (FileTypes [0]); ++I) {
- if (strcmp (FileTypes [I].Ext, Ext) == 0) {
- /* Found */
- return FileTypes [I].Type;
- }
- }
-
- /* Not found, return the default */
- return DefaultFileType;
-}
-
-
-
/*****************************************************************************/
/* Command structure handling */
/*****************************************************************************/
+static void CmdAddArg2 (CmdDesc* Cmd, const char* Arg1, const char* Arg2)
+/* Add a new argument pair to the command */
+{
+ CmdAddArg (Cmd, Arg1);
+ CmdAddArg (Cmd, Arg2);
+}
+
+
+
static void CmdDelArgs (CmdDesc* Cmd, unsigned LastValid)
/* Remove all arguments with an index greater than LastValid */
{
static void CmdSetOutput (CmdDesc* Cmd, const char* File)
/* Set the output file in a command desc */
{
- CmdAddArg (Cmd, "-o");
- CmdAddArg (Cmd, File);
+ CmdAddArg2 (Cmd, "-o", File);
}
static void CmdSetTarget (CmdDesc* Cmd, target_t Target)
/* Set the output file in a command desc */
{
- CmdAddArg (Cmd, "-t");
- CmdAddArg (Cmd, TargetNames[Target]);
+ CmdAddArg2 (Cmd, "-t", TargetNames[Target]);
}
/* 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");
}
}
if (Module) {
Error ("Cannot use -C and --module together");
}
- CmdAddArg (&LD65, "-C");
- CmdAddArg (&LD65, LinkerConfig);
+ CmdAddArg2 (&LD65, "-C", LinkerConfig);
} else if (Module) {
CmdSetTarget (&LD65, TGT_MODULE);
- } else if (Target != TGT_NONE) {
+ } else {
CmdSetTarget (&LD65, Target);
}
{
char* AsmName = 0;
- /* Remember the current assembler argument count */
+ /* Remember the current compiler argument count */
unsigned ArgCount = CC65.ArgCount;
/* Set the target system */
+static void ConvertO65 (const char* File)
+/* Convert an o65 object file into an assembler file */
+{
+ char* AsmName = 0;
+
+ /* Remember the current converter argument count */
+ unsigned ArgCount = CO65.ArgCount;
+
+ /* If we won't link, this is the final step. In this case, set the
+ * output name.
+ */
+ if (DontAssemble && OutputName) {
+ CmdSetOutput (&CO65, OutputName);
+ } else {
+ /* The assembler file name will be the name of the source file
+ * with .c replaced by ".s".
+ */
+ AsmName = MakeFilename (File, ".s");
+ }
+
+ /* Add the file as argument for the object file converter */
+ CmdAddArg (&CO65, File);
+
+ /* Add a NULL pointer to terminate the argument list */
+ CmdAddArg (&CO65, 0);
+
+ /* Run the converter */
+ ExecProgram (&CO65);
+
+ /* Remove the excess arguments */
+ CmdDelArgs (&CO65, ArgCount);
+
+ /* If this is not the final step, assemble the generated file, then
+ * remove it
+ */
+ if (!DontAssemble) {
+ Assemble (AsmName);
+ if (remove (AsmName) < 0) {
+ Warning ("Cannot remove temporary file `%s': %s",
+ AsmName, strerror (errno));
+ }
+ }
+
+ /* Free the assembler file name which was allocated from the heap */
+ xfree (AsmName);
+}
+
+
+
/*****************************************************************************/
/* Code */
/*****************************************************************************/
" -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"
" -v\t\t\tVerbose mode\n"
" -vm\t\t\tVerbose map file\n"
" -Cl\t\t\tMake local variables static\n"
" -D sym[=defn]\t\tDefine a preprocessor symbol\n"
" -I dir\t\tSet a compiler include directory path\n"
+ " -L path\t\tSpecify a library search path\n"
" -Ln name\t\tCreate a VICE label file\n"
" -O\t\t\tOptimize code\n"
" -Oi\t\t\tOptimize code, inline functions\n"
"Long options:\n"
" --add-source\t\tInclude source as comment\n"
" --ansi\t\tStrict ANSI mode\n"
+ " --asm-define sym[=v]\tDefine an assembler symbol\n"
" --asm-include-dir dir\tSet an assembler include directory\n"
+ " --bss-label name\tDefine and export a BSS segment label\n"
" --bss-name seg\tSet the name of the BSS segment\n"
+ " --cfg-path path\tSpecify a config file search path\n"
" --check-stack\t\tGenerate stack overflow checks\n"
+ " --code-label name\tDefine and export a CODE segment label\n"
" --code-name seg\tSet the name of the CODE segment\n"
" --codesize x\t\tAccept larger code by factor x\n"
+ " --config name\t\tUse linker config file\n"
" --cpu type\t\tSet cpu type\n"
" --create-dep\t\tCreate a make dependency file\n"
+ " --data-label name\tDefine and export a DATA segment label\n"
" --data-name seg\tSet the name of the DATA segment\n"
" --debug\t\tDebug mode\n"
" --debug-info\t\tAdd debug info\n"
" --feature name\tSet an emulation feature\n"
+ " --forget-inc-paths\tForget include search paths (compiler)\n"
" --help\t\tHelp (this text)\n"
" --include-dir dir\tSet a compiler include directory path\n"
+ " --lib file\t\tLink this library\n"
+ " --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"
+ " --obj file\t\tLink this object file\n"
+ " --obj-path path\tSpecify an object file search path\n"
+ " --register-space b\tSet space available for register variables\n"
+ " --register-vars\tEnable register variables\n"
" --rodata-name seg\tSet the name of the RODATA segment\n"
" --signed-chars\tDefault characters are signed\n"
" --start-addr addr\tSet the default start address\n"
" --static-locals\tMake local variables static\n"
" --target sys\t\tSet the target system\n"
" --version\t\tPrint the version number\n"
- " --verbose\t\tVerbose mode\n",
+ " --verbose\t\tVerbose mode\n"
+ " --zeropage-label name\tDefine and export a ZEROPAGE segment label\n"
+ " --zeropage-name seg\tSet the name of the ZEROPAGE segment\n",
ProgName);
}
+static void OptAsmDefine (const char* Opt attribute ((unused)), const char* Arg)
+/* Define an assembler symbol (assembler) */
+{
+ CmdAddArg2 (&CA65, "-D", Arg);
+}
+
+
+
static void OptAsmIncludeDir (const char* Opt attribute ((unused)), const char* Arg)
/* Include directory (assembler) */
{
- CmdAddArg (&CA65, "-I");
- CmdAddArg (&CA65, Arg);
+ CmdAddArg2 (&CA65, "-I", Arg);
+}
+
+
+
+static void OptBssLabel (const char* Opt attribute ((unused)), const char* Arg)
+/* Handle the --bss-label option */
+{
+ CmdAddArg2 (&CO65, "--bss-label", Arg);
}
static void OptBssName (const char* Opt attribute ((unused)), const char* Arg)
/* Handle the --bss-name option */
{
- CmdAddArg (&CC65, "--bss-name");
- CmdAddArg (&CC65, Arg);
+ CmdAddArg2 (&CC65, "--bss-name", Arg);
+ CmdAddArg2 (&CO65, "--bss-name", Arg);
+}
+
+
+
+static void OptCfgPath (const char* Opt attribute ((unused)), const char* Arg)
+/* Config file search path (linker) */
+{
+ CmdAddArg2 (&LD65, "--cfg-path", Arg);
}
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 OptCodeLabel (const char* Opt attribute ((unused)), const char* Arg)
+/* Handle the --code-label option */
+{
+ CmdAddArg2 (&CO65, "--code-label", Arg);
+}
+
+
+
static void OptCodeName (const char* Opt attribute ((unused)), const char* Arg)
/* Handle the --code-name option */
{
- CmdAddArg (&CC65, "--code-name");
- CmdAddArg (&CC65, Arg);
+ CmdAddArg2 (&CC65, "--code-name", Arg);
+ CmdAddArg2 (&CO65, "--code-name", Arg);
}
static void OptCodeSize (const char* Opt attribute ((unused)), const char* Arg)
/* Handle the --codesize option */
{
- CmdAddArg (&CC65, "--codesize");
- CmdAddArg (&CC65, Arg);
+ CmdAddArg2 (&CC65, "--codesize", Arg);
+}
+
+
+
+static void OptConfig (const char* Opt attribute ((unused)), const char* Arg)
+/* Config file (linker) */
+{
+ if (LinkerConfig) {
+ Error ("Cannot specify -C/--config twice");
+ }
+ LinkerConfig = Arg;
}
/* Handle the --cpu option */
{
/* Add the cpu type to the assembler and compiler */
- CmdAddArg (&CA65, "--cpu");
- CmdAddArg (&CA65, Arg);
- CmdAddArg (&CC65, "--cpu");
- CmdAddArg (&CC65, Arg);
+ CmdAddArg2 (&CA65, "--cpu", Arg);
+ CmdAddArg2 (&CC65, "--cpu", Arg);
}
+static void OptDataLabel (const char* Opt attribute ((unused)), const char* Arg)
+/* Handle the --data-label option */
+{
+ CmdAddArg2 (&CO65, "--data-label", Arg);
+}
+
+
+
static void OptDataName (const char* Opt attribute ((unused)), const char* Arg)
/* Handle the --data-name option */
{
- CmdAddArg (&CC65, "--data-name");
- CmdAddArg (&CC65, Arg);
+ CmdAddArg2 (&CC65, "--data-name", Arg);
+ CmdAddArg2 (&CO65, "--data-name", Arg);
}
/* Debug mode (compiler and cl65 utility) */
{
CmdAddArg (&CC65, "-d");
+ CmdAddArg (&CO65, "-d");
Debug = 1;
}
{
CmdAddArg (&CC65, "-g");
CmdAddArg (&CA65, "-g");
+ CmdAddArg (&CO65, "-g");
}
static void OptFeature (const char* Opt attribute ((unused)), const char* Arg)
/* Emulation features for the assembler */
{
- CmdAddArg (&CA65, "--feature");
- CmdAddArg (&CA65, Arg);
+ CmdAddArg2 (&CA65, "--feature", Arg);
+}
+
+
+
+static void OptForgetIncPaths (const char* Opt attribute ((unused)), const char* Arg)
+/* Forget all currently defined include paths */
+{
+ CmdAddArg2 (&CC65, "--forget-inc-paths", Arg);
}
static void OptIncludeDir (const char* Opt attribute ((unused)), const char* Arg)
/* Include directory (compiler) */
{
- CmdAddArg (&CC65, "-I");
- CmdAddArg (&CC65, Arg);
+ CmdAddArg2 (&CC65, "-I", Arg);
+}
+
+
+
+static void OptLib (const char* Opt attribute ((unused)), const char* Arg)
+/* Library file follows (linker) */
+{
+ CmdAddArg2 (&LD65, "--lib", Arg);
+}
+
+
+
+static void OptLibPath (const char* Opt attribute ((unused)), const char* Arg)
+/* Library search path (linker) */
+{
+ CmdAddArg2 (&LD65, "--lib-path", Arg);
}
/* Create a map file */
{
/* Create a map file (linker) */
- CmdAddArg (&LD65, "-m");
- CmdAddArg (&LD65, Arg);
+ CmdAddArg2 (&LD65, "-m", 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);
+ }
}
/* Specify a module if for the linker */
{
/* Pass it straight to the linker */
- CmdAddArg (&LD65, "--module-id");
- CmdAddArg (&LD65, Arg);
+ CmdAddArg2 (&LD65, "--module-id", Arg);
+}
+
+
+
+static void OptO65Model (const char* Opt attribute ((unused)), const char* Arg)
+/* Handle the --o65-model option */
+{
+ CmdAddArg2 (&CO65, "-m", Arg);
+}
+
+
+
+static void OptObj (const char* Opt attribute ((unused)), const char* Arg)
+/* Object file follows (linker) */
+{
+ CmdAddArg2 (&LD65, "--obj", Arg);
+}
+
+
+
+static void OptObjPath (const char* Opt attribute ((unused)), const char* Arg)
+/* Object file search path (linker) */
+{
+ CmdAddArg2 (&LD65, "--obj-path", Arg);
+}
+
+
+
+static void OptRegisterSpace (const char* Opt attribute ((unused)), const char* Arg)
+/* Handle the --register-space option */
+{
+ CmdAddArg2 (&CC65, "--register-space", Arg);
+}
+
+
+
+static void OptRegisterVars (const char* Opt attribute ((unused)),
+ const char* Arg attribute ((unused)))
+/* Handle the --register-vars option */
+{
+ CmdAddArg (&CC65, "-r");
}
static void OptRodataName (const char* Opt attribute ((unused)), const char* Arg)
/* Handle the --rodata-name option */
{
- CmdAddArg (&CC65, "--rodata-name");
- CmdAddArg (&CC65, Arg);
+ CmdAddArg2 (&CC65, "--rodata-name", Arg);
}
static void OptStartAddr (const char* Opt attribute ((unused)), const char* Arg)
/* Set the default start address */
{
- CmdAddArg (&LD65, "-S");
- CmdAddArg (&LD65, Arg);
+ CmdAddArg2 (&LD65, "-S", Arg);
}
{
CmdAddArg (&CC65, "-v");
CmdAddArg (&CA65, "-v");
+ CmdAddArg (&CO65, "-v");
CmdAddArg (&LD65, "-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%u.%u.%u - (C) Copyright 1998-2002 Ullrich von Bassewitz\n",
+ "cl65 V%u.%u.%u - (C) Copyright 1998-2003 Ullrich von Bassewitz\n",
VER_MAJOR, VER_MINOR, VER_PATCH);
}
+static void OptZeropageLabel (const char* Opt attribute ((unused)), const char* Arg)
+/* Handle the --zeropage-label option */
+{
+ CmdAddArg2 (&CO65, "--zeropage-label", Arg);
+}
+
+
+
+static void OptZeropageName (const char* Opt attribute ((unused)), const char* Arg)
+/* Handle the --zeropage-name option */
+{
+ CmdAddArg2 (&CO65, "--zeropage-name", Arg);
+}
+
+
+
int main (int argc, char* argv [])
/* Utility main program */
{
static const LongOpt OptTab[] = {
{ "--add-source", 0, OptAddSource },
{ "--ansi", 0, OptAnsi },
+ { "--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 },
+ { "--config", 1, OptConfig },
{ "--cpu", 1, OptCPU },
{ "--create-dep", 0, OptCreateDep },
+ { "--data-label", 1, OptDataLabel },
{ "--data-name", 1, OptDataName },
{ "--debug", 0, OptDebug },
{ "--debug-info", 0, OptDebugInfo },
{ "--feature", 1, OptFeature },
+ { "--forget-inc-paths", 0, OptForgetIncPaths },
{ "--help", 0, OptHelp },
{ "--include-dir", 1, OptIncludeDir },
+ { "--lib", 1, OptLib },
+ { "--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 },
+ { "--obj", 1, OptObj },
+ { "--obj-path", 1, OptObjPath },
+ { "--register-space", 1, OptRegisterSpace },
+ { "--register-vars", 0, OptRegisterVars },
{ "--rodata-name", 1, OptRodataName },
{ "--signed-chars", 0, OptSignedChars },
{ "--start-addr", 1, OptStartAddr },
{ "--target", 1, OptTarget },
{ "--verbose", 0, OptVerbose },
{ "--version", 0, OptVersion },
+ { "--zeropage-label", 1, OptZeropageLabel },
+ { "--zeropage-name", 1, OptZeropageName },
};
unsigned I;
/* Initialize the command descriptors */
CmdInit (&CC65, "cc65");
CmdInit (&CA65, "ca65");
+ CmdInit (&CO65, "co65");
CmdInit (&LD65, "ld65");
CmdInit (&GRC, "grc");
OptStaticLocals (Arg, 0);
} else {
/* Specify linker config file */
- LinkerConfig = GetArg (&I, 2);
+ OptConfig (Arg, GetArg (&I, 2));
}
break;
case 'D':
/* Define a preprocessor symbol (compiler) */
- CmdAddArg (&CC65, "-D");
- CmdAddArg (&CC65, GetArg (&I, 2));
+ CmdAddArg2 (&CC65, "-D", GetArg (&I, 2));
break;
case 'I':
break;
case 'L':
- if (Arg[2] == 'n') {
+ if (Arg[2] == 'n' && Arg[3] == '\0') {
/* VICE label file (linker) */
- CmdAddArg (&LD65, "-Ln");
- CmdAddArg (&LD65, GetArg (&I, 3));
+ CmdAddArg2 (&LD65, "-Ln", GetArg (&I, 3));
} else {
- UnknownOption (Arg);
+ /* Library search path (linker) */
+ OptLibPath (Arg, GetArg (&I, 2));
}
break;
case 'W':
/* Suppress warnings - compiler and assembler */
CmdAddArg (&CC65, "-W");
- CmdAddArg (&CA65, "-W");
- CmdAddArg (&CA65, "0");
+ CmdAddArg2 (&CA65, "-W", "0");
break;
case 'c':
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));
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);
-