/* */
/* */
/* */
-/* (C) 1998-2009, Ullrich von Bassewitz */
+/* (C) 1998-2011, Ullrich von Bassewitz */
/* Roemerstrasse 52 */
/* D-70794 Filderstadt */
/* EMail: uz@cc65.org */
#include "cmdline.h"
#include "mmodel.h"
#include "print.h"
+#include "scopedefs.h"
#include "strbuf.h"
#include "target.h"
#include "tgttrans.h"
{
printf ("Usage: %s [options] file\n"
"Short options:\n"
- " -D name[=value]\tDefine a symbol\n"
- " -I dir\t\tSet an include directory search path\n"
- " -U\t\t\tMark unresolved symbols as import\n"
- " -V\t\t\tPrint the assembler version\n"
- " -W n\t\t\tSet warning level n\n"
- " -g\t\t\tAdd debug info to object file\n"
- " -h\t\t\tHelp (this text)\n"
- " -i\t\t\tIgnore case of symbols\n"
- " -l\t\t\tCreate a listing if assembly was ok\n"
- " -mm model\t\tSet the memory model\n"
- " -o name\t\tName the output file\n"
- " -s\t\t\tEnable smart mode\n"
- " -t sys\t\tSet the target system\n"
- " -v\t\t\tIncrease verbosity\n"
+ " -D name[=value]\t\tDefine a symbol\n"
+ " -I dir\t\t\tSet an include directory search path\n"
+ " -U\t\t\t\tMark unresolved symbols as import\n"
+ " -V\t\t\t\tPrint the assembler version\n"
+ " -W n\t\t\t\tSet warning level n\n"
+ " -g\t\t\t\tAdd debug info to object file\n"
+ " -h\t\t\t\tHelp (this text)\n"
+ " -i\t\t\t\tIgnore case of symbols\n"
+ " -l name\t\t\tCreate a listing file if assembly was ok\n"
+ " -mm model\t\t\tSet the memory model\n"
+ " -o name\t\t\tName the output file\n"
+ " -s\t\t\t\tEnable smart mode\n"
+ " -t sys\t\t\tSet the target system\n"
+ " -v\t\t\t\tIncrease verbosity\n"
"\n"
"Long options:\n"
- " --auto-import\t\tMark unresolved symbols as import\n"
- " --cpu type\t\tSet cpu type\n"
- " --debug-info\t\tAdd debug info to object file\n"
- " --feature name\tSet an emulation feature\n"
- " --forget-inc-paths\tForget include search paths\n"
- " --help\t\tHelp (this text)\n"
- " --ignore-case\t\tIgnore case of symbols\n"
- " --include-dir dir\tSet an include directory search path\n"
- " --listing\t\tCreate a listing if assembly was ok\n"
- " --list-bytes n\tMaximum number of bytes per listing line\n"
- " --macpack-dir dir\tSet a macro package directory\n"
- " --memory-model model\tSet the memory model\n"
- " --pagelength n\tSet the page length for the listing\n"
- " --smart\t\tEnable smart mode\n"
- " --target sys\t\tSet the target system\n"
- " --verbose\t\tIncrease verbosity\n"
- " --version\t\tPrint the assembler version\n",
+ " --auto-import\t\t\tMark unresolved symbols as import\n"
+ " --bin-include-dir dir\t\tSet a search path for binary includes\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"
+ " --debug-info\t\t\tAdd debug info to object file\n"
+ " --feature name\t\tSet an emulation feature\n"
+ " --forget-inc-paths\t\tForget include search paths\n"
+ " --help\t\t\tHelp (this text)\n"
+ " --ignore-case\t\t\tIgnore case of symbols\n"
+ " --include-dir dir\t\tSet an include directory search path\n"
+ " --listing name\t\tCreate a listing file if assembly was ok\n"
+ " --list-bytes n\t\tMaximum number of bytes per listing line\n"
+ " --macpack-dir dir\t\tSet a macro package directory\n"
+ " --memory-model model\t\tSet the memory model\n"
+ " --pagelength n\t\tSet the page length for the listing\n"
+ " --smart\t\t\tEnable smart mode\n"
+ " --target sys\t\t\tSet the target system\n"
+ " --verbose\t\t\tIncrease verbosity\n"
+ " --version\t\t\tPrint the assembler version\n",
ProgName);
}
+static void FileNameOption (const char* Opt, const char* Arg, StrBuf* Name)
+/* Handle an option that remembers a file name for later */
+{
+ /* Cannot have the option twice */
+ if (SB_NotEmpty (Name)) {
+ AbEnd ("Cannot use option `%s' twice", Opt);
+ }
+ /* Remember the file name for later */
+ SB_CopyStr (Name, Arg);
+ SB_Terminate (Name);
+}
+
+
+
static void DefineSymbol (const char* Def)
/* Define a symbol from the command line */
{
+static void OptBinIncludeDir (const char* Opt attribute ((unused)), const char* Arg)
+/* Add an include search path for binaries */
+{
+ AddSearchPath (BinSearchPath, Arg);
+}
+
+
+
static void OptCPU (const char* Opt attribute ((unused)), const char* Arg)
/* Handle the --cpu option */
{
+static void OptCreateDep (const char* Opt, const char* Arg)
+/* Handle the --create-dep option */
+{
+ FileNameOption (Opt, Arg, &DepName);
+}
+
+
+
+static void OptCreateFullDep (const char* Opt attribute ((unused)),
+ const char* Arg)
+/* Handle the --create-full-dep option */
+{
+ FileNameOption (Opt, Arg, &FullDepName);
+}
+
+
+
static void OptDebugInfo (const char* Opt attribute ((unused)),
const char* Arg attribute ((unused)))
/* Add debug info to the object file */
static void OptIncludeDir (const char* Opt attribute ((unused)), const char* Arg)
/* Add an include search path */
{
- AddIncludePath (Arg);
+ AddSearchPath (IncSearchPath, Arg);
}
-static void OptListing (const char* Opt attribute ((unused)),
- const char* Arg attribute ((unused)))
+static void OptListing (const char* Opt, const char* Arg)
/* Create a listing file */
{
- Listing = 1;
+ /* Since the meaning of -l and --listing has changed, print an error if
+ * the filename is empty or begins with the option char.
+ */
+ if (Arg == 0 || *Arg == '\0' || *Arg == '-') {
+ Fatal ("The meaning of `%s' has changed. It does now "
+ "expect a file name as argument.", Opt);
+ }
+
+ /* Get the file name */
+ FileNameOption (Opt, Arg, &ListingName);
}
Segment* Seg = 0;
unsigned long PC = 0;
SymEntry* Sym = 0;
- int Macro = 0;
+ Macro* Mac = 0;
int Instr = -1;
/* Initialize the new listing line if we are actually reading from file
InitListingLine ();
}
- if (Tok == TOK_COLON) {
- /* An unnamed label */
+ /* Single colon means unnamed label */
+ if (CurTok.Tok == TOK_COLON) {
ULabDef ();
NextTok ();
}
/* If the first token on the line is an identifier, check for a macro or
* an instruction.
*/
- if (Tok == TOK_IDENT) {
+ if (CurTok.Tok == TOK_IDENT) {
if (!UbiquitousIdents) {
/* Macros and symbols cannot use instruction names */
- Instr = FindInstruction (&SVal);
+ Instr = FindInstruction (&CurTok.SVal);
if (Instr < 0) {
- Macro = IsMacro (&SVal);
+ Mac = FindMacro (&CurTok.SVal);
}
} else {
/* Macros and symbols may use the names of instructions */
- Macro = IsMacro (&SVal);
+ Mac = FindMacro (&CurTok.SVal);
}
}
* scoped identifier which may start with a namespace token (for global
* namespace)
*/
- if (Tok == TOK_LOCAL_IDENT ||
- Tok == TOK_NAMESPACE ||
- (Tok == TOK_IDENT && Instr < 0 && !Macro)) {
+ if (CurTok.Tok == TOK_LOCAL_IDENT ||
+ CurTok.Tok == TOK_NAMESPACE ||
+ (CurTok.Tok == TOK_IDENT && Instr < 0 && Mac == 0)) {
/* Did we have whitespace before the ident? */
- int HadWS = WS;
+ int HadWS = CurTok.WS;
/* Generate the symbol table entry, then skip the name */
- if (Tok == TOK_LOCAL_IDENT) {
- Sym = SymFindLocal (SymLast, &SVal, SYM_ALLOC_NEW);
- NextTok ();
- } else {
- Sym = ParseScopedSymName (SYM_ALLOC_NEW);
- }
+ Sym = ParseAnySymName (SYM_ALLOC_NEW);
/* If a colon follows, this is a label definition. If there
* is no colon, it's an assignment.
*/
- if (Tok == TOK_EQ || Tok == TOK_ASSIGN) {
+ if (CurTok.Tok == TOK_EQ || CurTok.Tok == TOK_ASSIGN) {
/* Determine the symbol flags from the assignment token */
- unsigned Flags = (Tok == TOK_ASSIGN)? SF_LABEL : SF_NONE;
+ unsigned Flags = (CurTok.Tok == TOK_ASSIGN)? SF_LABEL : SF_NONE;
/* Skip the '=' */
NextTok ();
ConsumeSep ();
return;
- } else if (Tok == TOK_SET) {
+ } else if (CurTok.Tok == TOK_SET) {
ExprNode* Expr;
* without a colon if there is no whitespace before the
* identifier.
*/
- if (Tok != TOK_COLON) {
+ if (CurTok.Tok != TOK_COLON) {
if (HadWS || !NoColonLabels) {
Error ("`:' expected");
/* Try some smart error recovery */
- if (Tok == TOK_NAMESPACE) {
+ if (CurTok.Tok == TOK_NAMESPACE) {
NextTok ();
}
}
/* If we come here, a new identifier may be waiting, which may
* be a macro or instruction.
*/
- if (Tok == TOK_IDENT) {
+ if (CurTok.Tok == TOK_IDENT) {
if (!UbiquitousIdents) {
/* Macros and symbols cannot use instruction names */
- Instr = FindInstruction (&SVal);
+ Instr = FindInstruction (&CurTok.SVal);
if (Instr < 0) {
- Macro = IsMacro (&SVal);
+ Mac = FindMacro (&CurTok.SVal);
}
} else {
/* Macros and symbols may use the names of instructions */
- Macro = IsMacro (&SVal);
+ Mac = FindMacro (&CurTok.SVal);
}
}
}
}
/* We've handled a possible label, now handle the remainder of the line */
- if (Tok >= TOK_FIRSTPSEUDO && Tok <= TOK_LASTPSEUDO) {
+ if (CurTok.Tok >= TOK_FIRSTPSEUDO && CurTok.Tok <= TOK_LASTPSEUDO) {
/* A control command */
HandlePseudo ();
- } else if (Macro) {
+ } else if (Mac != 0) {
/* A macro expansion */
- MacExpandStart ();
+ MacExpandStart (Mac);
} else if (Instr >= 0 ||
- (UbiquitousIdents && ((Instr = FindInstruction (&SVal)) >= 0))) {
+ (UbiquitousIdents && ((Instr = FindInstruction (&CurTok.SVal)) >= 0))) {
/* A mnemonic - assemble one instruction */
HandleInstruction (Instr);
- } else if (PCAssignment && (Tok == TOK_STAR || Tok == TOK_PC)) {
+ } else if (PCAssignment && (CurTok.Tok == TOK_STAR || CurTok.Tok == TOK_PC)) {
NextTok ();
- if (Tok != TOK_EQ) {
+ if (CurTok.Tok != TOK_EQ) {
Error ("`=' expected");
SkipUntilSep ();
} else {
NextTok ();
/* Assemble lines until end of file */
- while (Tok != TOK_EOF) {
+ while (CurTok.Tok != TOK_EOF) {
OneLine ();
}
}
/* Write debug symbols if requested */
WriteDbgSyms ();
+ /* Write the scopes if requested */
+ WriteScopes ();
+
/* Write line infos if requested */
- WriteLineInfo ();
+ WriteLineInfos ();
/* Write the string pool */
WriteStrPool ();
/* Program long options */
static const LongOpt OptTab[] = {
{ "--auto-import", 0, OptAutoImport },
+ { "--bin-include-dir", 1, OptBinIncludeDir },
{ "--cpu", 1, OptCPU },
+ { "--create-dep", 1, OptCreateDep },
+ { "--create-full-dep", 1, OptCreateFullDep },
{ "--debug-info", 0, OptDebugInfo },
{ "--feature", 1, OptFeature },
{ "--forget-inc-paths", 0, OptForgetIncPaths },
{ "--ignore-case", 0, OptIgnoreCase },
{ "--include-dir", 1, OptIncludeDir },
{ "--list-bytes", 1, OptListBytes },
- { "--listing", 0, OptListing },
+ { "--listing", 1, OptListing },
{ "--macpack-dir", 1, OptMacPackDir },
{ "--memory-model", 1, OptMemoryModel },
{ "--pagelength", 1, OptPageLength },
/* Initialize the include search paths */
InitIncludePaths ();
+ /* Create the predefined segments */
+ SegInit ();
+
/* Enter the base lexical level. We must do that here, since we may
* define symbols using -D.
*/
- SymEnterLevel (&GlobalNameSpace, ST_GLOBAL, ADDR_SIZE_DEFAULT);
+ SymEnterLevel (&GlobalNameSpace, SCOPE_FILE, ADDR_SIZE_DEFAULT, 0);
+
+ /* Initialize the line infos. Must be done here, since we need line infos
+ * for symbol definitions.
+ */
+ InitLineInfo ();
/* Check the parameters */
I = 1;
break;
case 'l':
- OptListing (Arg, 0);
+ OptListing (Arg, GetArg (&I, 2));
break;
case 'm':
break;
case 'o':
- OutFile = GetArg (&I, 2);
+ OutFile = GetArg (&I, 2);
break;
case 's':
break;
case 'U':
- OptAutoImport (Arg, 0);
+ OptAutoImport (Arg, 0);
break;
case 'V':
SetMemoryModel (MMODEL_NEAR);
}
- /* Initialize the segments */
- InitSegments ();
+ /* Set the default segment sizes according to the memory model */
+ SetSegmentSizes ();
/* Initialize the scanner, open the input file */
InitScanner (InFile);
/* Assemble the input */
Assemble ();
- /* If we didn't have any errors, check the segment stack */
+ /* If we didn't have any errors, check the pseudo insn stacks */
if (ErrorCount == 0) {
- SegStackCheck ();
+ CheckPseudo ();
}
- /* If we didn't have any errors, check the unnamed labels */
+ /* If we didn't have any errors, check and cleanup the unnamed labels */
if (ErrorCount == 0) {
- ULabCheck ();
+ ULabDone ();
}
/* If we didn't have any errors, check the symbol table */
SymCheck ();
}
+ /* If we didn't have any errors, close the file scope lexical level */
+ if (ErrorCount == 0) {
+ SymLeaveLevel ();
+ }
+
/* If we didn't have any errors, check and resolve the segment data */
if (ErrorCount == 0) {
- SegCheck ();
+ SegDone ();
}
- /* If we didn't have any errors, check the assertions */
+ /* If we didn't have any errors, check the assertions */
if (ErrorCount == 0) {
CheckAssertions ();
}
- /* If we didn't have an errors, index the line infos */
- MakeLineInfoIndex ();
-
/* Dump the data */
if (Verbosity >= 2) {
SymDump (stdout);
SegDump ();
}
- /* If we didn't have any errors, create the object and listing files */
+ /* If we didn't have an errors, finish off the line infos */
+ DoneLineInfo ();
+
+ /* If we didn't have any errors, create the object, listing and
+ * dependency files
+ */
if (ErrorCount == 0) {
- CreateObjFile ();
- if (Listing) {
- CreateListing ();
- }
+ CreateObjFile ();
+ if (SB_GetLen (&ListingName) > 0) {
+ CreateListing ();
+ }
+ CreateDependencies ();
}
/* Close the input file */
projects / cc65 / blobdiff