/* */
/* */
/* */
-/* (C) 1999-2010, Ullrich von Bassewitz */
+/* (C) 1999-2011, Ullrich von Bassewitz */
/* Roemerstrasse 52 */
/* D-70794 Filderstadt */
/* EMail: uz@cc65.org */
static CmdDesc GRC = { 0, 0, 0, 0, 0, 0, 0 };
/* Variables controlling the steps we're doing */
-static int DontLink = 0;
-static int DontAssemble = 0;
+static int DoLink = 1;
+static int DoAssemble = 1;
/* The name of the output file, NULL if none given */
static const char* OutputName = 0;
{
unsigned I;
- /* 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 (LinkerConfig) {
- if (Module) {
- Error ("Cannot use -C and --module together");
- }
- CmdAddArg2 (&LD65, "-C", LinkerConfig);
- } else if (Module) {
- CmdSetTarget (&LD65, TGT_MODULE);
- } else {
- 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 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 (LinkerConfig) {
+ if (Module) {
+ Error ("Cannot use -C and --module together");
+ }
+ CmdAddArg2 (&LD65, "-C", LinkerConfig);
+ } else if (Module) {
+ CmdSetTarget (&LD65, TGT_MODULE);
+ } else {
+ CmdSetTarget (&LD65, Target);
+ }
+
+ /* Determine which target libraries are needed */
+ SetTargetFiles ();
+
/* Add all object files as parameters */
for (I = 0; I < LD65.FileCount; ++I) {
CmdAddArg (&LD65, LD65.Files [I]);
/* Set the target system */
CmdSetTarget (&CA65, Target);
- /* If we won't link, this is the final step. In this case, set the
- * output name.
- */
- if (DontLink && OutputName) {
- CmdSetOutput (&CA65, OutputName);
- } else {
- /* The object file name will be the name of the source file
- * with .s replaced by ".o". Add this file to the list of
- * linker files.
- */
+ /* Check if this is the last processing step */
+ if (DoLink) {
+ /* We're linking later. Add the output file of the assembly
+ * 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);
+ } else {
+ /* This is the final step. If an output name is given, set it */
+ if (OutputName) {
+ CmdSetOutput (&CA65, OutputName);
+ }
}
/* Add the file as argument for the assembler */
-static void AssembleIntermediate (const char* File)
-/* Assemble an intermediate file. The -dep options won't be added and
- * the file is removed after assembly.
+static void AssembleIntermediate (const char* SourceFile)
+/* Assemble an intermediate file which was generated by a previous processing
+ * step with SourceFile as input. The -dep options won't be added and
+ * the intermediate assembler file is removed after assembly.
*/
{
- /* Use common routine */
- AssembleFile (File, CA65.ArgCount);
+ /* Generate the name of the assembler output file from the source file
+ * name. It's the same name with the extension replaced by ".s"
+ */
+ char* AsmName = MakeFilename (SourceFile, ".s");
- /* Remove the generated file */
- if (remove (File) < 0) {
+ /* Assemble the intermediate assembler file */
+ AssembleFile (AsmName, CA65.ArgCount);
+
+ /* Remove the input file */
+ if (remove (AsmName) < 0) {
Warning ("Cannot remove temporary file `%s': %s",
- File, strerror (errno));
+ AsmName, strerror (errno));
}
+
+ /* Free the assembler file name which was allocated from the heap */
+ xfree (AsmName);
}
static void Compile (const char* File)
/* Compile the given file */
{
- char* AsmName = 0;
-
/* Remember the current compiler argument count */
unsigned ArgCount = CC65.ArgCount;
/* 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 (DontAssemble && 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 {
- /* The assembler file name will be the name of the source file
- * with .c replaced by ".s".
- */
- AsmName = MakeFilename (File, ".s");
+ /* 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 this is not the final step, assemble the generated file, then
* remove it
*/
- if (!DontAssemble) {
- AssembleIntermediate (AsmName);
+ if (DoAssemble) {
+ /* Assemble the intermediate file and remove it */
+ AssembleIntermediate (File);
}
-
- /* Free the assembler file name which was allocated from the heap */
- xfree (AsmName);
}
static void CompileRes (const char* File)
/* Compile the given geos resource file */
{
- char* AsmName = 0;
-
/* Remember the current assembler argument count */
unsigned ArgCount = GRC.ArgCount;
- /* The assembler file name will be the name of the source file
- * with .grc replaced by ".s".
- */
- AsmName = MakeFilename (File, ".s");
-
/* Add the file as argument for the resource compiler */
CmdAddArg (&GRC, File);
/* If this is not the final step, assemble the generated file, then
* remove it
*/
- if (!DontAssemble) {
- AssembleIntermediate (AsmName);
+ if (DoAssemble) {
+ /* Assemble the intermediate file and remove it */
+ AssembleIntermediate (File);
}
-
- /* Free the assembler file name which was allocated from the heap */
- xfree (AsmName);
}
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 assemble, 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");
+ if (!DoAssemble && OutputName) {
+ CmdSetOutput (&CO65, OutputName);
}
/* Add the file as argument for the object file converter */
/* If this is not the final step, assemble the generated file, then
* remove it
*/
- if (!DontAssemble) {
- AssembleIntermediate (AsmName);
+ if (DoAssemble) {
+ /* Assemble the intermediate file and remove it */
+ AssembleIntermediate (File);
}
-
- /* Free the assembler file name which was allocated from the heap */
- xfree (AsmName);
}
" -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"
" --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 assembker 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"
" --cfg-path path\t\tSpecify a config file search path\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"
}
-
+
static void OptAsmDefine (const char* Opt attribute ((unused)), const char* Arg)
/* Define an assembler symbol (assembler) */
{
+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 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;
/* Print version number */
{
fprintf (stderr,
- "cl65 V%s - (C) Copyright 1998-2009 Ullrich von Bassewitz\n",
+ "cl65 V%s - (C) Copyright 1998-2011 Ullrich von Bassewitz\n",
GetVersionAsString ());
}
{ "--asm-args", 1, OptAsmArgs },
{ "--asm-define", 1, OptAsmDefine },
{ "--asm-include-dir", 1, OptAsmIncludeDir },
+ { "--bin-include-dir", 1, OptBinIncludeDir },
{ "--bss-label", 1, OptBssLabel },
{ "--bss-name", 1, OptBssName },
{ "--cfg-path", 1, OptCfgPath },
{ "--lib", 1, OptLib },
{ "--lib-path", 1, OptLibPath },
{ "--list-targets", 0, OptListTargets },
- { "--listing", 0, OptListing },
+ { "--listing", 1, OptListing },
{ "--list-bytes", 1, OptListBytes },
{ "--mapfile", 1, OptMapFile },
{ "--memory-model", 1, OptMemoryModel },
case 'S':
/* Dont assemble and link the created files */
- DontLink = DontAssemble = 1;
+ DoAssemble = 0;
+ DoLink = 0;
break;
case 'T':
case 'c':
/* Don't link the resulting files */
- DontLink = 1;
+ DoLink = 0;
break;
case 'd':
case 'l':
/* Create an assembler listing */
- OptListing (Arg, 0);
+ OptListing (Arg, GetArg (&I, 2));
break;
case 'm':
case FILETYPE_ASM:
/* Assemble the file */
- if (!DontAssemble) {
+ if (DoAssemble) {
Assemble (Arg);
}
break;
}
/* Link the given files if requested and if we have any */
- if (DontLink == 0 && LD65.FileCount > 0) {
+ if (DoLink && LD65.FileCount > 0) {
Link ();
}