SYM * symbolPtr[1000000]; // Symbol pointers table
static long unused; // For supressing 'write' warnings
char buffer[256]; // Scratch buffer for messages
+int largestAlign[3] = { 2, 2, 2 }; // Largest alignment value seen per section
// Function prototypes
int d_unimpl(void);
int d_prgflags(void);
int d_opt(void);
int d_dsp(void);
+void SetLargestAlignment(int);
// Directive handler table
int (*dirtab[])() = {
};
+//
+// Set the largest alignment seen in the current section
+//
+void SetLargestAlignment(int size)
+{
+ if ((scattr & TEXT) && (largestAlign[0] < size))
+ largestAlign[0] = size;
+ else if ((scattr & DATA) && (largestAlign[1] < size))
+ largestAlign[1] = size;
+ else if ((scattr & BSS) && (largestAlign[2] < size))
+ largestAlign[2] = size;
+}
+
+
//
// .error - Abort compilation, printing an error message
//
return error(string[tok[1]]);
break;
default:
- return error("error directive encountered - aborting assembling");
+ return error("error directive encountered--aborting assembly");
}
}
}
//
int d_org(void)
{
- VALUE address;
+ uint32_t address;
if (!rgpu && !rdsp && !m6502)
return error(".org permitted only in gpu/dsp and 6502 sections");
int wordlong = 0; // WORD = 0, LONG = 1
int outtype = 0; // 0:hex, 1:decimal, 2:unsigned
- VALUE eval; // Expression value
+ uint32_t eval; // Expression value
WORD eattr; // Expression attributes
SYM * esym; // External symbol involved in expr.
TOKEN r_expr[EXPRSIZE];
int fd;
int bytes = 0;
long pos, size, bytesRead;
- char msg[256];
char buf1[256];
int i;
// Check to see if we're in BSS, and, if so, throw an error
if (scattr & SBSS)
{
- errors("cannot include binary file \"%s\" in BSS section", string[tok[1]]);
+ error("cannot include binary file \"%s\" in BSS section", string[tok[1]]);
return ERROR;
}
goto allright;
}
- return errors("cannot open: \"%s\"", string[tok[1]]);
+ return error("cannot open: \"%s\"", string[tok[1]]);
}
allright:
if (bytesRead != size)
{
- sprintf(msg, "was only able to read %li bytes from binary file (%s, %li bytes)", bytesRead, string[tok[1]], size);
- error(msg);
+ error("was only able to read %li bytes from binary file (%s, %li bytes)", bytesRead, string[tok[1]], size);
return ERROR;
}
unsigned lower2Bits = (rgpu || rdsp ? orgaddr : sloc) & 0x03;
unsigned bytesToSkip = (0x04 - lower2Bits) & 0x03;
SkipBytes(bytesToSkip);
+ SetLargestAlignment(4);
return 0;
}
unsigned lower3Bits = (rgpu || rdsp ? orgaddr : sloc) & 0x07;
unsigned bytesToSkip = (0x08 - lower3Bits) & 0x07;
SkipBytes(bytesToSkip);
+ SetLargestAlignment(8);
return 0;
}
unsigned lower4Bits = (rgpu || rdsp ? orgaddr : sloc) & 0x0F;
unsigned bytesToSkip = (0x10 - lower4Bits) & 0x0F;
SkipBytes(bytesToSkip);
+ SetLargestAlignment(16);
return 0;
}
unsigned lower5Bits = (rgpu || rdsp ? orgaddr : sloc) & 0x1F;
unsigned bytesToSkip = (0x20 - lower5Bits) & 0x1F;
SkipBytes(bytesToSkip);
+ SetLargestAlignment(32);
return 0;
}
//
// Return absolute (not TDB) and defined expression or return an error
//
-int abs_expr(VALUE * a_eval)
+int abs_expr(uint32_t * a_eval)
{
WORD eattr;
// Make sure the user didn't try anything like:
// .include equates.s
if (*++tok != EOL)
- return error("extra stuff after filename -- enclose it in quotes");
+ return error("extra stuff after filename--enclose it in quotes");
// Attempt to open the include file in the current directory, then (if that
// failed) try list of include files passed in the enviroment string or by
goto allright;
}
- return errors("cannot open: \"%s\"", fn);
+ return error("cannot open: \"%s\"", fn);
}
allright:
int d_assert(void)
{
WORD eattr;
- VALUE eval;
+ uint32_t eval;
for(; expr(exprbuf, &eval, &eattr, NULL)==OK; ++tok)
{
//
int d_prgflags(void)
{
- VALUE eval;
+ uint32_t eval;
if (*tok == EOL)
return error("PRGFLAGS requires value");
//
int d_abs(void)
{
- VALUE eval;
+ uint32_t eval;
if (m6502)
return error(in_6502mode);
{
DEBUG { printf("Directive: .ds.[size] = %u, sloc = $%X\n", siz, sloc); }
- VALUE eval;
+ uint32_t eval;
if (cursect != M6502)
{
// Check to see if the value being passed in is negative (who the hell does
// that?--nobody does; it's the code gremlins, or rum, that does it)
- // N.B.: Since VALUE is of type uint32_t, if it goes negative, it will have
+ // N.B.: Since 'eval' is of type uint32_t, if it goes negative, it will have
// its high bit set.
if (eval & 0x80000000)
return error("negative sizes not allowed");
}
else
{
- dep_block(eval, siz, (VALUE)0, (WORD)(DEFINED | ABS), NULL);
+ dep_block(eval, siz, 0, (WORD)(DEFINED | ABS), NULL);
}
at_eol();
int d_dc(WORD siz)
{
WORD eattr;
- VALUE eval;
+ uint32_t eval;
uint8_t * p;
if ((scattr & SBSS) != 0)
return error("non-absolute byte value");
if (eval + 0x100 >= 0x200)
- {
- sprintf(buffer, "%s (value = $%X)", range_error, eval);
- return error(buffer);
- }
+ return error("%s (value = $%X)", range_error, eval);
D_byte(eval);
}
//
int d_dcb(WORD siz)
{
- VALUE evalc, eval;
+ uint32_t evalc, eval;
WORD eattr;
DEBUG { printf("dcb: section is %s%s%s (scattr=$%X)\n", (cursect & TEXT ? "TEXT" : ""), (cursect & DATA ? " DATA" : ""), (cursect & BSS ? "BSS" : ""), scattr); }
//
int d_init(WORD def_siz)
{
- VALUE count;
- VALUE eval;
+ uint32_t count;
+ uint32_t eval;
WORD eattr;
WORD siz;
//
// Deposit 'count' values of size 'siz' in the current (non-BSS) segment
//
-int dep_block(VALUE count, WORD siz, VALUE eval, WORD eattr, TOKEN * exprbuf)
+int dep_block(uint32_t count, WORD siz, uint32_t eval, WORD eattr, TOKEN * exprbuf)
{
WORD tdb;
WORD defined;
{
SYM * sym;
char * p;
- VALUE eval;
+ uint32_t eval;
if (m6502)
return error(in_6502mode);
//
int d_cargs(void)
{
- VALUE eval = 4; // Default to 4 if no offset specified (to account for
+ uint32_t eval = 4; // Default to 4 if no offset specified (to account for
// return address)
WORD rlist;
SYM * symbol;
symbol->sattr = 0;
}
else if (symbol->sattr & DEFINED)
- return errors("multiply-defined label '%s'", p);
+ return error("multiply-defined label '%s'", p);
// Put symbol in "order of definition" list
AddToSymbolDeclarationList(symbol);
//
int d_cstruct(void)
{
- VALUE eval = 0; // Default, if no offset specified, is zero
+ uint32_t eval = 0; // Default, if no offset specified, is zero
WORD rlist;
SYM * symbol;
char * symbolName;
symbol->sattr = 0;
}
else if (symbol->sattr & DEFINED)
- return errors("multiply-defined label '%s'", symbolName);
+ return error("multiply-defined label '%s'", symbolName);
// Put symbol in "order of definition" list
AddToSymbolDeclarationList(symbol);
char * tmpstr = string[*tok++];
if (ParseOptimization(tmpstr) != OK)
- {
- char temperr[256];
- sprintf(temperr, "unknown optimization flag '%s'", tmpstr);
- return error(temperr);
- }
+ return error("unknown optimization flag '%s'", tmpstr);
}
else
return error(".opt directive needs every switch enclosed inside quotation marks");
return OK;
}
+
+//
+// .if, Start conditional assembly
+//
+int d_if(void)
+{
+ WORD eattr;
+ uint32_t eval;
+ SYM * esym;
+ IFENT * rif = f_ifent;
+
+ // Alloc an IFENTRY
+ if (rif == NULL)
+ rif = (IFENT *)malloc(sizeof(IFENT));
+ else
+ f_ifent = rif->if_prev;
+
+ rif->if_prev = ifent;
+ ifent = rif;
+
+ if (!disabled)
+ {
+ if (expr(exprbuf, &eval, &eattr, &esym) != OK)
+ return 0;
+
+ if ((eattr & DEFINED) == 0)
+ return error(undef_error);
+
+ disabled = !eval;
+ }
+
+ rif->if_state = (WORD)disabled;
+ return 0;
+}
+
+
+//
+// .else, Do alternate case for .if
+//
+int d_else(void)
+{
+ IFENT * rif = ifent;
+
+ if (rif->if_prev == NULL)
+ return error("mismatched .else");
+
+ if (disabled)
+ disabled = rif->if_prev->if_state;
+ else
+ disabled = 1;
+
+ rif->if_state = (WORD)disabled;
+ return 0;
+}
+
+
+//
+// .endif, End of conditional assembly block
+// This is also called by fpop() to pop levels of IFENTs in case a macro or
+// include file exits early with `exitm' or `end'.
+//
+int d_endif(void)
+{
+ IFENT * rif = ifent;
+
+ if (rif->if_prev == NULL)
+ return error("mismatched .endif");
+
+ ifent = rif->if_prev;
+ disabled = rif->if_prev->if_state;
+ rif->if_prev = f_ifent;
+ f_ifent = rif;
+ return 0;
+}
+
projects / rmac / blobdiff