/*****************************************************************************/
/* */
-/* main.c */
+/* main.c */
/* */
-/* Main program for the ca65 macroassembler */
+/* Main program for the ca65 macroassembler */
/* */
/* */
/* */
-/* (C) 1998-2011, Ullrich von Bassewitz */
+/* (C) 1998-2013, Ullrich von Bassewitz */
/* Roemerstrasse 52 */
/* D-70794 Filderstadt */
/* EMail: uz@cc65.org */
#include "addrsize.h"
#include "chartype.h"
#include "cmdline.h"
+#include "debugflag.h"
#include "mmodel.h"
#include "print.h"
#include "scopedefs.h"
/* ca65 */
#include "abend.h"
#include "asserts.h"
+#include "dbginfo.h"
#include "error.h"
#include "expr.h"
#include "feature.h"
#include "istack.h"
#include "lineinfo.h"
#include "listing.h"
-#include "macpack.h"
#include "macro.h"
#include "nexttok.h"
#include "objfile.h"
#include "scanner.h"
#include "segment.h"
#include "sizeof.h"
+#include "span.h"
#include "spool.h"
#include "symbol.h"
#include "symtab.h"
/*****************************************************************************/
-/* Code */
+/* Code */
/*****************************************************************************/
" -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"
+ " -d\t\t\t\tDebug mode\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"
" --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\t\t\tDebug mode\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"
+ " --large-alignment\t\tDon't warn about large alignments\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"
+ " --relax-checks\t\tRelax some checks (see docs)\n"
" --smart\t\t\tEnable smart mode\n"
" --target sys\t\t\tSet the target system\n"
" --verbose\t\t\tIncrease verbosity\n"
/* Check if have already a symbol with this name */
if (SymIsDef (Sym)) {
- AbEnd ("`%s' is already defined", SymName);
+ AbEnd ("`%s' is already defined", SymName);
}
/* Generate an expression for the symbol */
{
switch (Target = FindTarget (Sys)) {
- case TGT_NONE:
- break;
+ case TGT_NONE:
+ break;
case TGT_MODULE:
AbEnd ("Cannot use `module' as a target for the assembler");
break;
- case TGT_ATARI:
- NewSymbol ("__ATARI__", 1);
- break;
+ case TGT_ATARI5200:
+ NewSymbol ("__ATARI5200__", 1);
+ break;
+
+ case TGT_ATARI:
+ NewSymbol ("__ATARI__", 1);
+ break;
+
+ case TGT_ATARIXL:
+ NewSymbol ("__ATARI__", 1);
+ NewSymbol ("__ATARIXL__", 1);
+ break;
- case TGT_C16:
- CBMSystem ("__C16__");
- break;
+ case TGT_C16:
+ CBMSystem ("__C16__");
+ break;
- case TGT_C64:
- CBMSystem ("__C64__");
- break;
+ case TGT_C64:
+ CBMSystem ("__C64__");
+ break;
- case TGT_VIC20:
- CBMSystem ("__VIC20__");
- break;
+ case TGT_VIC20:
+ CBMSystem ("__VIC20__");
+ break;
- case TGT_C128:
- CBMSystem ("__C128__");
- break;
+ case TGT_C128:
+ CBMSystem ("__C128__");
+ break;
- case TGT_PLUS4:
- CBMSystem ("__PLUS4__");
- break;
+ case TGT_PLUS4:
+ CBMSystem ("__C16__");
+ NewSymbol ("__PLUS4__", 1);
+ break;
- case TGT_CBM510:
- CBMSystem ("__CBM510__");
- break;
+ case TGT_CBM510:
+ CBMSystem ("__CBM510__");
+ break;
- case TGT_CBM610:
- CBMSystem ("__CBM610__");
- break;
+ case TGT_CBM610:
+ CBMSystem ("__CBM610__");
+ break;
- case TGT_PET:
- CBMSystem ("__PET__");
- break;
+ case TGT_PET:
+ CBMSystem ("__PET__");
+ break;
- case TGT_BBC:
- NewSymbol ("__BBC__", 1);
- break;
+ case TGT_BBC:
+ NewSymbol ("__BBC__", 1);
+ break;
- case TGT_APPLE2:
- NewSymbol ("__APPLE2__", 1);
- break;
+ case TGT_APPLE2:
+ NewSymbol ("__APPLE2__", 1);
+ break;
- case TGT_APPLE2ENH:
+ case TGT_APPLE2ENH:
+ NewSymbol ("__APPLE2__", 1);
NewSymbol ("__APPLE2ENH__", 1);
- break;
+ break;
+
+ case TGT_GAMATE:
+ NewSymbol ("__GAMATE__", 1);
+ break;
+
+ case TGT_GEOS_CBM:
+ /* Do not handle as a CBM system */
+ NewSymbol ("__GEOS__", 1);
+ NewSymbol ("__GEOS_CBM__", 1);
+ break;
- case TGT_GEOS:
- /* Do not handle as a CBM system */
- NewSymbol ("__GEOS__", 1);
- break;
+ case TGT_GEOS_APPLE:
+ NewSymbol ("__GEOS__", 1);
+ NewSymbol ("__GEOS_APPLE__", 1);
+ break;
- case TGT_LUNIX:
- NewSymbol ("__LUNIX__", 1);
- break;
+ case TGT_LUNIX:
+ NewSymbol ("__LUNIX__", 1);
+ break;
case TGT_ATMOS:
NewSymbol ("__ATMOS__", 1);
NewSymbol ("__LYNX__", 1);
break;
- default:
+ case TGT_SIM6502:
+ NewSymbol ("__SIM6502__", 1);
+ break;
+
+ case TGT_SIM65C02:
+ NewSymbol ("__SIM65C02__", 1);
+ break;
+
+ case TGT_OSIC1P:
+ NewSymbol ("__OSIC1P__", 1);
+ break;
+
+ case TGT_PCENGINE:
+ NewSymbol ("__PCE__", 1);
+ break;
+
+ default:
AbEnd ("Invalid target name: `%s'", Sys);
}
/* Define a symbol from the command line */
{
const char* P;
- unsigned I;
long Val;
StrBuf SymName = AUTO_STRBUF_INITIALIZER;
/* The symbol must start with a character or underline */
if (!IsIdStart (Def [0])) {
- InvDef (Def);
+ InvDef (Def);
}
P = Def;
/* Copy the symbol, checking the rest */
- I = 0;
while (IsIdChar (*P)) {
SB_AppendChar (&SymName, *P++);
}
/* Do we have a value given? */
if (*P != '=') {
- if (*P != '\0') {
- InvDef (Def);
- }
- Val = 0;
+ if (*P != '\0') {
+ InvDef (Def);
+ }
+ Val = 0;
} else {
- /* We have a value */
- ++P;
- if (*P == '$') {
- ++P;
- if (sscanf (P, "%lx", &Val) != 1) {
- InvDef (Def);
- }
- } else {
- if (sscanf (P, "%li", &Val) != 1) {
- InvDef (Def);
- }
- }
+ /* We have a value */
+ ++P;
+ if (*P == '$') {
+ ++P;
+ if (sscanf (P, "%lx", &Val) != 1) {
+ InvDef (Def);
+ }
+ } else {
+ if (sscanf (P, "%li", &Val) != 1) {
+ InvDef (Def);
+ }
+ }
}
/* Define the new symbol */
static void OptAutoImport (const char* Opt attribute ((unused)),
- const char* Arg attribute ((unused)))
+ const char* Arg attribute ((unused)))
/* Mark unresolved symbols as imported */
{
AutoImport = 1;
{
cpu_t CPU = FindCPU (Arg);
if (CPU == CPU_UNKNOWN) {
- AbEnd ("Invalid CPU: `%s'", Arg);
+ AbEnd ("Invalid CPU: `%s'", Arg);
} else {
- SetCPU (CPU);
+ SetCPU (CPU);
}
}
static void OptCreateFullDep (const char* Opt attribute ((unused)),
- const char* Arg)
+ const char* Arg)
/* Handle the --create-full-dep option */
{
FileNameOption (Opt, Arg, &FullDepName);
+static void OptDebug (const char* Opt attribute ((unused)),
+ const char* Arg attribute ((unused)))
+/* Compiler debug mode */
+{
+ ++Debug;
+}
+
+
+
static void OptDebugInfo (const char* Opt attribute ((unused)),
- const char* Arg attribute ((unused)))
+ const char* Arg attribute ((unused)))
/* Add debug info to the object file */
{
DbgSyms = 1;
/* Set the feature, check for errors */
if (SetFeature (SB_InitFromString (&Feature, Arg)) == FEAT_UNKNOWN) {
- AbEnd ("Illegal emulation feature: `%s'", Arg);
+ AbEnd ("Illegal emulation feature: `%s'", Arg);
}
}
-static void OptForgetIncPaths (const char* Opt attribute ((unused)),
- const char* Arg attribute ((unused)))
-/* Forget all currently defined include paths */
-{
- ForgetAllIncludePaths ();
-}
-
-
-
static void OptHelp (const char* Opt attribute ((unused)),
- const char* Arg attribute ((unused)))
+ const char* Arg attribute ((unused)))
/* Print usage information and exit */
{
Usage ();
static void OptIgnoreCase (const char* Opt attribute ((unused)),
- const char* Arg attribute ((unused)))
+ const char* Arg attribute ((unused)))
/* Ignore case on symbols */
{
IgnoreCase = 1;
+static void OptLargeAlignment (const char* Opt attribute ((unused)),
+ const char* Arg attribute ((unused)))
+/* Don't warn about large alignments */
+{
+ LargeAlignment = 1;
+}
+
+
+
static void OptListBytes (const char* Opt, const char* Arg)
/* Set the maximum number of bytes per listing line */
{
/* Create a listing file */
{
/* Since the meaning of -l and --listing has changed, print an error if
- * the filename is empty or begins with the option char.
- */
+ ** 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);
-static void OptMacPackDir (const char* Opt attribute ((unused)), const char* Arg)
-/* Set a macro package directory */
-{
- /* Make a string buffer from Arg */
- StrBuf Dir;
-
- /* Use the directory */
- MacPackSetDir (SB_InitFromString (&Dir, Arg));
-}
-
-
-
static void OptMemoryModel (const char* Opt, const char* Arg)
/* Set the memory model */
{
{
int Len = atoi (Arg);
if (Len != -1 && (Len < MIN_PAGE_LEN || Len > MAX_PAGE_LEN)) {
- AbEnd ("Invalid page length: %d", Len);
+ AbEnd ("Invalid page length: %d", Len);
}
PageLength = Len;
}
+static void OptRelaxChecks (const char* Opt attribute ((unused)),
+ const char* Arg attribute ((unused)))
+/* Handle the --relax-checks options */
+{
+ RelaxChecks = 1;
+}
+
+
+
static void OptSmart (const char* Opt attribute ((unused)),
- const char* Arg attribute ((unused)))
+ const char* Arg attribute ((unused)))
/* Handle the -s/--smart options */
{
SmartMode = 1;
static void OptVerbose (const char* Opt attribute ((unused)),
- const char* Arg attribute ((unused)))
+ const char* Arg attribute ((unused)))
/* Increase verbosity */
{
++Verbosity;
static void OptVersion (const char* Opt attribute ((unused)),
- const char* Arg attribute ((unused)))
+ const char* Arg attribute ((unused)))
/* Print the assembler version */
{
- fprintf (stderr, "ca65 V%s - %s\n", GetVersionAsString (), Copyright);
+ fprintf (stderr, "ca65 V%s\n", GetVersionAsString ());
}
{
long PC = ConstExpression ();
if (PC < 0 || PC > 0xFFFFFF) {
- Error ("Range error");
+ Error ("Range error");
} else {
- EnterAbsoluteMode (PC);
+ EnterAbsoluteMode (PC);
}
}
int Instr = -1;
/* Initialize the new listing line if we are actually reading from file
- * and not from internally pushed input.
- */
+ ** and not from internally pushed input.
+ */
if (!HavePushedInput ()) {
- InitListingLine ();
+ InitListingLine ();
}
/* Single colon means unnamed label */
if (CurTok.Tok == TOK_COLON) {
- ULabDef ();
- NextTok ();
+ ULabDef ();
+ NextTok ();
}
/* If the first token on the line is an identifier, check for a macro or
- * an instruction.
- */
+ ** an instruction.
+ */
if (CurTok.Tok == TOK_IDENT) {
- if (!UbiquitousIdents) {
- /* Macros and symbols cannot use instruction names */
+ if (UbiquitousIdents) {
+ /* Macros CAN be instructions, so check for them first */
+ Mac = FindMacro (&CurTok.SVal);
+ if (Mac == 0) {
+ Instr = FindInstruction (&CurTok.SVal);
+ }
+ } else {
+ /* Macros and symbols may NOT use the names of instructions */
Instr = FindInstruction (&CurTok.SVal);
if (Instr < 0) {
Mac = FindMacro (&CurTok.SVal);
}
- } else {
- /* Macros and symbols may use the names of instructions */
- Mac = FindMacro (&CurTok.SVal);
}
}
/* Handle an identifier. This may be a cheap local symbol, or a fully
- * scoped identifier which may start with a namespace token (for global
- * namespace)
- */
+ ** scoped identifier which may start with a namespace token (for global
+ ** namespace)
+ */
if (CurTok.Tok == TOK_LOCAL_IDENT ||
CurTok.Tok == TOK_NAMESPACE ||
(CurTok.Tok == TOK_IDENT && Instr < 0 && Mac == 0)) {
Sym = ParseAnySymName (SYM_ALLOC_NEW);
/* If a colon follows, this is a label definition. If there
- * is no colon, it's an assignment.
- */
+ ** is no colon, it's an assignment.
+ */
if (CurTok.Tok == TOK_EQ || CurTok.Tok == TOK_ASSIGN) {
/* Determine the symbol flags from the assignment token */
Expr = GenLiteralExpr (ConstExpression ());
/* Define the symbol with the constant expression following
- * the '='
- */
+ ** the '='
+ */
SymDef (Sym, Expr, ADDR_SIZE_DEFAULT, SF_VAR);
/* Don't allow anything after a symbol definition */
} else {
/* A label. Remember the current segment, so we can later
- * determine the size of the data stored under the label.
- */
+ ** determine the size of the data stored under the label.
+ */
Seg = ActiveSeg;
PC = GetPC ();
SymDef (Sym, GenCurrentPC (), ADDR_SIZE_DEFAULT, SF_LABEL);
/* Skip the colon. If NoColonLabels is enabled, allow labels
- * without a colon if there is no whitespace before the
- * identifier.
- */
+ ** without a colon if there is no whitespace before the
+ ** identifier.
+ */
if (CurTok.Tok != TOK_COLON) {
if (HadWS || !NoColonLabels) {
Error ("`:' expected");
}
/* If we come here, a new identifier may be waiting, which may
- * be a macro or instruction.
- */
+ ** be a macro or instruction.
+ */
if (CurTok.Tok == TOK_IDENT) {
- if (!UbiquitousIdents) {
- /* Macros and symbols cannot use instruction names */
+ if (UbiquitousIdents) {
+ /* Macros CAN be instructions, so check for them first */
+ Mac = FindMacro (&CurTok.SVal);
+ if (Mac == 0) {
+ Instr = FindInstruction (&CurTok.SVal);
+ }
+ } else {
+ /* Macros and symbols may NOT use the names of instructions */
Instr = FindInstruction (&CurTok.SVal);
if (Instr < 0) {
Mac = FindMacro (&CurTok.SVal);
}
- } else {
- /* Macros and symbols may use the names of instructions */
- Mac = FindMacro (&CurTok.SVal);
}
}
}
} else if (Mac != 0) {
/* A macro expansion */
MacExpandStart (Mac);
- } else if (Instr >= 0 ||
- (UbiquitousIdents && ((Instr = FindInstruction (&CurTok.SVal)) >= 0))) {
+ } else if (Instr >= 0) {
/* A mnemonic - assemble one instruction */
HandleInstruction (Instr);
} else if (PCAssignment && (CurTok.Tok == TOK_STAR || CurTok.Tok == TOK_PC)) {
}
/* If we have defined a label, remember its size. Sym is also set by
- * a symbol assignment, but in this case Done is false, so we don't
- * come here.
- */
+ ** a symbol assignment, but in this case Done is false, so we don't
+ ** come here.
+ */
if (Sym) {
unsigned long Size;
if (Seg == ActiveSeg) {
/* Assemble lines until end of file */
while (CurTok.Tok != TOK_EOF) {
- OneLine ();
+ OneLine ();
}
}
/* Write the export list */
WriteExports ();
- /* Write the scopes if requested */
- WriteScopes ();
-
/* Write debug symbols if requested */
WriteDbgSyms ();
+ /* Write the scopes if requested */
+ WriteScopes ();
+
/* Write line infos if requested */
WriteLineInfos ();
/* Write the assertions */
WriteAssertions ();
+ /* Write the spans */
+ WriteSpans ();
+
/* Write an updated header and close the file */
ObjClose ();
}
{
/* Program long options */
static const LongOpt OptTab[] = {
- { "--auto-import", 0, OptAutoImport },
+ { "--auto-import", 0, OptAutoImport },
{ "--bin-include-dir", 1, OptBinIncludeDir },
- { "--cpu", 1, OptCPU },
+ { "--cpu", 1, OptCPU },
{ "--create-dep", 1, OptCreateDep },
{ "--create-full-dep", 1, OptCreateFullDep },
- { "--debug-info", 0, OptDebugInfo },
- { "--feature", 1, OptFeature },
- { "--forget-inc-paths", 0, OptForgetIncPaths },
- { "--help", 0, OptHelp },
- { "--ignore-case", 0, OptIgnoreCase },
- { "--include-dir", 1, OptIncludeDir },
+ { "--debug", 0, OptDebug },
+ { "--debug-info", 0, OptDebugInfo },
+ { "--feature", 1, OptFeature },
+ { "--help", 0, OptHelp },
+ { "--ignore-case", 0, OptIgnoreCase },
+ { "--include-dir", 1, OptIncludeDir },
+ { "--large-alignment", 0, OptLargeAlignment },
{ "--list-bytes", 1, OptListBytes },
- { "--listing", 1, OptListing },
- { "--macpack-dir", 1, OptMacPackDir },
+ { "--listing", 1, OptListing },
{ "--memory-model", 1, OptMemoryModel },
- { "--pagelength", 1, OptPageLength },
- { "--smart", 0, OptSmart },
- { "--target", 1, OptTarget },
- { "--verbose", 0, OptVerbose },
- { "--version", 0, OptVersion },
+ { "--pagelength", 1, OptPageLength },
+ { "--relax-checks", 0, OptRelaxChecks },
+ { "--smart", 0, OptSmart },
+ { "--target", 1, OptTarget },
+ { "--verbose", 0, OptVerbose },
+ { "--version", 0, OptVersion },
};
/* Name of the global name space */
/* Initialize the cmdline module */
InitCmdLine (&argc, &argv, "ca65");
+ /* Initialize the string pool */
+ InitStrPool ();
+
/* Initialize the include search paths */
InitIncludePaths ();
/* Create the predefined segments */
- InitSegments ();
+ SegInit ();
/* Enter the base lexical level. We must do that here, since we may
- * define symbols using -D.
- */
+ ** define symbols using -D.
+ */
SymEnterLevel (&GlobalNameSpace, SCOPE_FILE, ADDR_SIZE_DEFAULT, 0);
/* Initialize the line infos. Must be done here, since we need line infos
- * for symbol definitions.
- */
+ ** for symbol definitions.
+ */
InitLineInfo ();
/* Check the parameters */
I = 1;
while (I < ArgCount) {
- /* Get the argument */
- const char* Arg = ArgVec [I];
+ /* Get the argument */
+ const char* Arg = ArgVec [I];
+
+ /* Check for an option */
+ if (Arg[0] == '-') {
+ switch (Arg[1]) {
- /* Check for an option */
- if (Arg[0] == '-') {
- switch (Arg[1]) {
+ case '-':
+ LongOption (&I, OptTab, sizeof(OptTab)/sizeof(OptTab[0]));
+ break;
- case '-':
- LongOption (&I, OptTab, sizeof(OptTab)/sizeof(OptTab[0]));
- break;
+ case 'd':
+ OptDebug (Arg, 0);
+ break;
- case 'g':
- OptDebugInfo (Arg, 0);
- break;
+ case 'g':
+ OptDebugInfo (Arg, 0);
+ break;
- case 'h':
- OptHelp (Arg, 0);
- break;
+ case 'h':
+ OptHelp (Arg, 0);
+ break;
- case 'i':
- OptIgnoreCase (Arg, 0);
- break;
+ case 'i':
+ OptIgnoreCase (Arg, 0);
+ break;
- case 'l':
- OptListing (Arg, GetArg (&I, 2));
- break;
+ case 'l':
+ OptListing (Arg, GetArg (&I, 2));
+ break;
case 'm':
if (Arg[2] == 'm') {
}
break;
- case 'o':
- OutFile = GetArg (&I, 2);
- break;
-
- case 's':
- OptSmart (Arg, 0);
- break;
-
- case 't':
- OptTarget (Arg, GetArg (&I, 2));
- break;
-
- case 'v':
- OptVerbose (Arg, 0);
- break;
-
- case 'D':
- DefineSymbol (GetArg (&I, 2));
- break;
-
- case 'I':
- OptIncludeDir (Arg, GetArg (&I, 2));
- break;
-
- case 'U':
- OptAutoImport (Arg, 0);
- break;
-
- case 'V':
- OptVersion (Arg, 0);
- break;
-
- case 'W':
- WarnLevel = atoi (GetArg (&I, 2));
- break;
-
- default:
- UnknownOption (Arg);
- break;
-
- }
- } else {
- /* Filename. Check if we already had one */
- if (InFile) {
- fprintf (stderr, "%s: Don't know what to do with `%s'\n",
- ProgName, Arg);
- exit (EXIT_FAILURE);
- } else {
- InFile = Arg;
- }
- }
-
- /* Next argument */
- ++I;
+ case 'o':
+ OutFile = GetArg (&I, 2);
+ break;
+
+ case 's':
+ OptSmart (Arg, 0);
+ break;
+
+ case 't':
+ OptTarget (Arg, GetArg (&I, 2));
+ break;
+
+ case 'v':
+ OptVerbose (Arg, 0);
+ break;
+
+ case 'D':
+ DefineSymbol (GetArg (&I, 2));
+ break;
+
+ case 'I':
+ OptIncludeDir (Arg, GetArg (&I, 2));
+ break;
+
+ case 'U':
+ OptAutoImport (Arg, 0);
+ break;
+
+ case 'V':
+ OptVersion (Arg, 0);
+ break;
+
+ case 'W':
+ WarnLevel = atoi (GetArg (&I, 2));
+ break;
+
+ default:
+ UnknownOption (Arg);
+ break;
+
+ }
+ } else {
+ /* Filename. Check if we already had one */
+ if (InFile) {
+ fprintf (stderr, "%s: Don't know what to do with `%s'\n",
+ ProgName, Arg);
+ exit (EXIT_FAILURE);
+ } else {
+ InFile = Arg;
+ }
+ }
+
+ /* Next argument */
+ ++I;
}
/* Do we have an input file? */
if (InFile == 0) {
- fprintf (stderr, "%s: No input files\n", ProgName);
- exit (EXIT_FAILURE);
+ fprintf (stderr, "%s: No input files\n", ProgName);
+ exit (EXIT_FAILURE);
}
+ /* Add the default include search paths. */
+ FinishIncludePaths ();
+
/* If no CPU given, use the default CPU for the target */
if (GetCPU () == CPU_UNKNOWN) {
if (Target != TGT_UNKNOWN) {
- SetCPU (DefaultCPU[Target]);
+ SetCPU (GetTargetProperties (Target)->DefaultCPU);
} else {
SetCPU (CPU_6502);
}
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, check the hll debug symbols */
+ if (ErrorCount == 0) {
+ DbgInfoCheck ();
+ }
+
/* 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 an errors, finish off the line infos */
+ DoneLineInfo ();
+
/* If we didn't have any errors, create the object, listing and
- * dependency files
- */
+ ** dependency files
+ */
if (ErrorCount == 0) {
- CreateObjFile ();
- if (SB_GetLen (&ListingName) > 0) {
- CreateListing ();
- }
+ CreateObjFile ();
+ if (SB_GetLen (&ListingName) > 0) {
+ CreateListing ();
+ }
CreateDependencies ();
}
/* Return an apropriate exit code */
return (ErrorCount == 0)? EXIT_SUCCESS : EXIT_FAILURE;
}
-
-
-
projects / cc65 / blobdiff