#include "direct.h"
#include "sect.h"
-#include "risca.h"
+#include "riscasm.h"
#include "error.h"
#include "token.h"
#include "procln.h"
#define DEF_KW
#include "kwtab.h"
-TOKEN exprbuf[128]; // Expression buffer
+
+TOKEN exprbuf[128]; // Expression buffer
+SYM * symbolPtr[1000000]; // Symbol pointers table
+static long unused; // For supressing 'write' warnings
+
// Directive handler table
int (*dirtab[])() = {
- d_org, // 0 org
- d_even, // 1 even
- d_unimpl, // 2 .6502
- d_68000, // 3 .68000
- d_bss, // 4 bss
- d_data, // 5 data
- d_text, // 6 text
- d_abs, // 7 abs
- d_comm, // 8 comm
- d_init, // 9 init
- d_cargs, // 10 cargs
- d_goto, // 11 goto
- d_dc, // 12 dc
- d_ds, // 13 ds
- d_undmac, // 14 undefmac
- d_gpu, // 15 .gpu
- d_dsp, // 16 .dsp
- d_dcb, // 17 dcb
- d_unimpl, // 18* set
- d_unimpl, // 19* reg
- d_unimpl, // 20 dump
- d_incbin, // 21 .incbin //load
- d_unimpl, // 22 disable
- d_unimpl, // 23 enable
- d_globl, // 24 globl
- d_regbank0, // 25 .regbank0
- d_regbank1, // 26 .regbank1
- d_unimpl, // 27 xdef
- d_assert, // 28 assert
- d_unimpl, // 29* if
- d_unimpl, // 30* endif
- d_unimpl, // 31* endc
- d_unimpl, // 32* iif
- d_include, // 33 include
- fpop, // 34 end
- d_unimpl, // 35* macro
- exitmac, // 36* exitm
- d_unimpl, // 37* endm
- d_list, // 38 list
- d_nlist, // 39 nlist
- d_long, // 40* rept
- d_phrase, // 41* endr
- d_dphrase, // 42 struct
- d_qphrase, // 43 ends
- d_title, // 44 title
- d_subttl, // 45 subttl
- eject, // 46 eject
- d_unimpl, // 47 error
- d_unimpl, // 48 warn
- d_noclear, // 49 .noclear
- d_equrundef, // 50 .equrundef/.regundef
- d_ccundef, // 51 .ccundef
- d_print, // 52 .print
- d_gpumain, // 53 .gpumain
- d_jpad, // 54 .jpad
- d_nojpad, // 55 .nojpad
- d_fail, // 56 .fail
+ d_org, // 0 org
+ d_even, // 1 even
+ d_unimpl, // 2 .6502
+ d_68000, // 3 .68000
+ d_bss, // 4 bss
+ d_data, // 5 data
+ d_text, // 6 text
+ d_abs, // 7 abs
+ d_comm, // 8 comm
+ d_init, // 9 init
+ d_cargs, // 10 cargs
+ d_goto, // 11 goto
+ d_dc, // 12 dc
+ d_ds, // 13 ds
+ d_undmac, // 14 undefmac
+ d_gpu, // 15 .gpu
+ d_dsp, // 16 .dsp
+ d_dcb, // 17 dcb
+ d_unimpl, // 18* set
+ d_unimpl, // 19* reg
+ d_unimpl, // 20 dump
+ d_incbin, // 21 .incbin //load
+ d_unimpl, // 22 disable
+ d_unimpl, // 23 enable
+ d_globl, // 24 globl
+ d_regbank0, // 25 .regbank0
+ d_regbank1, // 26 .regbank1
+ d_unimpl, // 27 xdef
+ d_assert, // 28 assert
+ d_unimpl, // 29* if
+ d_unimpl, // 30* endif
+ d_unimpl, // 31* endc
+ d_unimpl, // 32* iif
+ d_include, // 33 include
+ fpop, // 34 end
+ d_unimpl, // 35* macro
+ ExitMacro, // 36* exitm
+ d_unimpl, // 37* endm
+ d_list, // 38 list
+ d_nlist, // 39 nlist
+ d_long, // 40* rept
+ d_phrase, // 41* endr
+ d_dphrase, // 42 struct
+ d_qphrase, // 43 ends
+ d_title, // 44 title
+ d_subttl, // 45 subttl
+ eject, // 46 eject
+ d_unimpl, // 47 error
+ d_unimpl, // 48 warn
+ d_noclear, // 49 .noclear
+ d_equrundef, // 50 .equrundef/.regundef
+ d_ccundef, // 51 .ccundef
+ d_print, // 52 .print
+ d_cstruct, // 53 .cstruct
+ d_jpad, // 54 .jpad (deprecated)
+ d_nojpad, // 55 .nojpad (deprecated)
+ d_gpumain, // 56 .gpumain (deprecated)
};
-//
-// .org - Set origin
-//
-int d_fail(void)
-{
- fatal("user abort");
- return 0;
-}
-
-
//
// .org - Set origin
//
}
-//
-// NOP Padding Directive
-//
-int d_jpad(void)
-{
- jpad = 1;
- return 0;
-}
-
-
-int d_nojpad(void)
-{
- jpad = 0;
- return 0;
-}
-
-
//
// Print Directive
//
int d_print(void)
{
- char prntstr[LNSIZ]; // String for PRINT directive
- char format[LNSIZ]; // Format for PRINT directive
- int formatting = 0; // Formatting on/off
- int wordlong = 0; // WORD = 0, LONG = 1
- int outtype = 0; // 0:hex, 1:decimal, 2:unsigned
-
- VALUE eval; // Expression value
- WORD eattr; // Expression attributes
- SYM * esym; // External symbol involved in expr.
+ char prntstr[LNSIZ]; // String for PRINT directive
+ char format[LNSIZ]; // Format for PRINT directive
+ int formatting = 0; // Formatting on/off
+ int wordlong = 0; // WORD = 0, LONG = 1
+ int outtype = 0; // 0:hex, 1:decimal, 2:unsigned
+
+ VALUE eval; // Expression value
+ WORD eattr; // Expression attributes
+ SYM * esym; // External symbol involved in expr.
TOKEN r_expr[EXPRSIZE];
while (*tok != EOL)
switch(*tok)
{
case STRING:
- sprintf(prntstr, "%s", (char *)tok[1]);
+// sprintf(prntstr, "%s", (char *)tok[1]);
+ sprintf(prntstr, "%s", string[tok[1]]);
printf("%s", prntstr);
if (list_fd)
- write(list_fd, prntstr, (LONG)strlen(prntstr));
+ unused = write(list_fd, prntstr, (LONG)strlen(prntstr));
tok += 2;
break;
if (tok[1] != SYMBOL)
goto token_err;
- strcpy(prntstr, (char *)tok[2]);
+// strcpy(prntstr, (char *)tok[2]);
+ strcpy(prntstr, string[tok[2]]);
switch(prntstr[0])
{
printf("%s", prntstr);
if (list_fd)
- write(list_fd, prntstr, (LONG)strlen(prntstr));
+ unused = write(list_fd, prntstr, (LONG)strlen(prntstr));
formatting = 0;
wordlong = 0;
}
printf("\n");
- println("\n");
+// println("\n");
return 0;
if (*tok != SYMBOL)
{
- error(syntax_error);
+// error(syntax_error);
+ error("syntax error; expected symbol");
return ERROR;
}
- ccname = lookup((char *)tok[1], LABEL, 0);
+// ccname = lookup((char *)tok[1], LABEL, 0);
+ ccname = lookup(string[tok[1]], LABEL, 0);
// Make sure symbol is a valid ccdef
if (!ccname || !(ccname->sattre & EQUATEDCC))
// Check that we are in a RISC section
if (!rgpu && !rdsp)
- {
- error(".equrundef/.regundef must be defined in .gpu/.dsp section");
- return ERROR;
- }
+ return error(".equrundef/.regundef must be defined in .gpu/.dsp section");
while (*tok != EOL)
{
- // Skip preceeding or seperating commas
+ // Skip preceeding or seperating commas (if any)
if (*tok == ',')
tok++;
// Check we are dealing with a symbol
if (*tok != SYMBOL)
- {
- error(syntax_error);
- return ERROR;
- }
+ return error("syntax error; expected symbol");
// Lookup and undef if equated register
- regname = lookup((char *)tok[1], LABEL, 0);
+ regname = lookup(string[tok[1]], LABEL, 0);
if (regname && (regname->sattre & EQUATEDREG))
regname->sattre |= UNDEF_EQUR;
//
int d_incbin(void)
{
- int i, j;
+ int fd;
int bytes = 0;
- long pos, size;
- char buf;
+ long pos, size, bytesRead;
+ char msg[256];
+
+ // 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]]);
+ return ERROR;
+ }
if (*tok != STRING)
{
- error(syntax_error);
+// error(syntax_error);
+ error("syntax error; string missing");
return ERROR;
}
- if ((j = open((char *)tok[1], _OPEN_INC)) >= 0)
+ if ((fd = open(string[tok[1]], _OPEN_INC)) < 0)
{
- size = lseek(j, 0L, SEEK_END);
- chcheck(size);
- pos = lseek(j, 0L, SEEK_SET);
-
- for(i=0; i<size; i++)
- {
- buf = '\0';
- bytes = read(j, &buf, 1);
- D_byte(buf);
- }
+ errors("cannot open include binary file (%s)", string[tok[1]]);
+ return ERROR;
}
- else
+
+ size = lseek(fd, 0L, SEEK_END);
+ pos = lseek(fd, 0L, SEEK_SET);
+ chcheck(size);
+
+ DEBUG { printf("INCBIN: File '%s' is %li bytes.\n", string[tok[1]], size); }
+
+ char * fileBuffer = (char *)malloc(size);
+ bytesRead = read(fd, fileBuffer, size);
+
+ if (bytesRead != size)
{
- errors("cannot open include binary file (%s)", (char *)tok[1]);
+ sprintf(msg, "was only able to read %li bytes from binary file (%s, %li bytes)", bytesRead, string[tok[1]], size);
+ error(msg);
return ERROR;
}
- close(j);
+//#define D_byte(b) {*chptr++=(char)b; ++sloc; ++ch_size; if(orgactive) ++orgaddr;}
+ memcpy(chptr, fileBuffer, size);
+ chptr += size;
+ sloc += size;
+ ch_size += size;
+
+ if (orgactive)
+ orgaddr += size;
+
+ free(fileBuffer);
+ close(fd);
return 0;
}
//
int d_regbank0(void)
{
- regbank = BANK_0; // Set active register bank zero
+ // Set active register bank zero
+ regbank = BANK_0;
return 0;
}
int d_regbank1(void)
{
- regbank = BANK_1; // Set active register bank one
+ // Set active register bank one
+ regbank = BANK_1;
return 0;
}
{
if ((scattr & SBSS) == 0)
{
- savsect();
+ SaveSection();
chcheck(val);
for(i=0; i<val; i++)
//
int symlist(int(* func)())
{
- char * em = "symbol list syntax";
+ const char * em = "symbol list syntax";
for(;;)
{
if (*tok != SYMBOL)
return error(em);
- if ((*func)(tok[1]) != OK)
+ if ((*func)(string[tok[1]]) != OK)
break;
tok += 2;
if (*tok != ',')
return error(em);
- ++tok;
+ tok++;
}
return 0;
char buf[128];
char buf1[128];
- if (*tok == STRING) // Leave strings ALONE
+ if (*tok == STRING) // Leave strings ALONE
+#if 0
fn = (char *)*++tok;
+#else
+ fn = string[*++tok];
+#endif
else if (*tok == SYMBOL) // Try to append ".s" to symbols
{
+#if 0
strcpy(buf, (char *)*++tok);
+#else
+ strcpy(buf, string[*++tok]);
+#endif
fext(buf, ".s", 0);
fn = &buf[0];
}
- else // Punt if no STRING or SYMBOL
+ else // Punt if no STRING or SYMBOL
return error("missing filename");
// Make sure the user didn't try anything like:
if (*++tok != EOL)
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 the "-d" option.
+ // 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
+ // the "-d" option.
if ((j = open(fn, 0)) < 0)
{
- for(i=0; nthpath("RMACPATH", i, buf1)!=0; ++i)
+ for(i=0; nthpath("RMACPATH", i, buf1)!=0; i++)
{
j = strlen(buf1);
- if (j > 0 && buf1[j-1] != SLASHCHAR) // Append path char if necessary
+ if (j > 0 && buf1[j - 1] != SLASHCHAR) // Append path char if necessary
strcat(buf1, SLASHSTRING);
strcat(buf1, fn);
//
int globl1(char * p)
{
- SYM *sy;
+ SYM * sy;
if (*p == '.')
return error("cannot .globl local symbol");
if ((sy = lookup(p, LABEL, 0)) == NULL)
{
- sy = newsym(p, LABEL, 0);
+ sy = NewSymbol(p, LABEL, 0);
sy->svalue = 0;
sy->sattr = GLOBAL;
+//printf("glob1: Making global symbol: attr=%04X, eattr=%08X, %s\n", sy->sattr, sy->sattre, sy->sname);
}
else
sy->sattr |= GLOBAL;
{
VALUE eval;
- savsect();
+ SaveSection();
if (*tok == EOL)
eval = 0;
else if (abs_expr(&eval) != OK)
return 0;
- switchsect(ABS);
+ SwitchSection(ABS);
sloc = eval;
return 0;
}
if (cursect != TEXT)
{
- savsect();
- switchsect(TEXT);
+ SaveSection();
+ SwitchSection(TEXT);
}
return 0;
if (cursect != DATA)
{
- savsect();
- switchsect(DATA);
+ SaveSection();
+ SwitchSection(DATA);
}
return 0;
if (cursect != BSS)
{
- savsect();
- switchsect(BSS);
+ SaveSection();
+ SwitchSection(BSS);
}
return 0;
//
int d_ds(WORD siz)
{
+if (verb_flag)
+ printf("Directive: .ds.[size] = %u, sloc = $%X\n", siz, sloc);
+
VALUE eval;
// This gets kind of stupid. This directive is disallowed in normal 68000
// In non-TDB section (BSS, ABS and M6502) just advance the location
// counter appropriately. In TDB sections, deposit (possibly large) chunks
//of zeroed memory....
- if ((scattr & SBSS))
+ if (scattr & SBSS)
{
listvalue(eval);
eval *= siz;
}
else
{
- dep_block(eval, siz, (VALUE)0, (WORD)(DEFINED|ABS), NULL);
+ dep_block(eval, siz, (VALUE)0, (WORD)(DEFINED | ABS), NULL);
}
at_eol();
// dc.b 'string' [,] ...
if (siz == SIZB && *tok == STRING && (tok[2] == ',' || tok[2] == EOL))
{
- i = strlen((const char*)tok[1]);
+// i = strlen((const char*)tok[1]);
+ i = strlen(string[tok[1]]);
if ((challoc - ch_size) < i)
chcheck(i);
- for(p=(char *)tok[1]; *p!=EOS; ++p)
+ for(p=string[tok[1]]; *p!=EOS; ++p)
D_byte(*p);
tok += 2;
defined = (WORD)(eattr & DEFINED);
if ((challoc - ch_size) < 4)
- chcheck(4L);
+ chcheck(4);
switch (siz)
{
case SIZB:
if (!defined)
{
- fixup(FU_BYTE|FU_SEXT, sloc, exprbuf);
+ AddFixup(FU_BYTE | FU_SEXT, sloc, exprbuf);
D_byte(0);
}
else
case SIZN:
if (!defined)
{
- fixup(FU_WORD|FU_SEXT, sloc, exprbuf);
+ AddFixup(FU_WORD | FU_SEXT, sloc, exprbuf);
D_word(0);
}
else
if (!defined)
{
if (movei)
- fixup(FU_LONG|FU_MOVEI, sloc, exprbuf);
+ AddFixup(FU_LONG | FU_MOVEI, sloc, exprbuf);
else
- fixup(FU_LONG, sloc, exprbuf);
+ AddFixup(FU_LONG, sloc, exprbuf);
D_long(0);
}
case SIZB:
if (!defined)
{
- fixup(FU_BYTE|FU_SEXT, sloc, exprbuf);
+ AddFixup(FU_BYTE | FU_SEXT, sloc, exprbuf);
D_byte(0);
}
else
case SIZN:
if (!defined)
{
- fixup(FU_WORD|FU_SEXT, sloc, exprbuf);
+ AddFixup(FU_WORD | FU_SEXT, sloc, exprbuf);
D_word(0);
}
else
case SIZL:
if (!defined)
{
- fixup(FU_LONG, sloc, exprbuf);
+ AddFixup(FU_LONG, sloc, exprbuf);
D_long(0);
}
else
if (*tok != SYMBOL)
return error("missing symbol");
- p = (char *)tok[1];
+// p = (char *)tok[1];
+ p = string[tok[1]];
tok += 2;
- if (*p == '.') // Cannot .comm a local symbol
+ if (*p == '.') // Cannot .comm a local symbol
return error(locgl_error);
if ((sym = lookup(p, LABEL, 0)) == NULL)
- sym = newsym(p, LABEL, 0);
+ sym = NewSymbol(p, LABEL, 0);
else
{
if (sym->sattr & DEFINED)
return error(".comm symbol already defined");
}
- sym->sattr = GLOBAL|COMMON|BSS;
+ sym->sattr = GLOBAL | COMMON | BSS;
if (*tok++ != ',')
return error(comma_error);
- if (abs_expr(&eval) != OK) // Parse size of common region
+ if (abs_expr(&eval) != OK) // Parse size of common region
return 0;
- sym->svalue = eval; // Install common symbol's size
+ sym->svalue = eval; // Install common symbol's size
at_eol();
return 0;
}
int d_list(void)
{
if (list_flag)
- ++listing;
+ listing++;
return 0;
}
int d_nlist(void)
{
if (list_flag)
- --listing;
+ listing--;
return 0;
}
int d_68000(void)
{
rgpu = rdsp = 0;
- in_main = 0;
// Switching from gpu/dsp sections should reset any ORG'd Address
orgactive = 0;
orgwarning = 0;
- savsect();
- switchsect(TEXT);
+ SaveSection();
+ SwitchSection(TEXT);
return 0;
}
orgwarning = 0;
}
- rgpu = 1; // Set GPU assembly
- rdsp = 0; // Unset DSP assembly
- regbank = BANK_N; // Set no default register bank
- in_main = 0;
- jpad = 0;
- return 0;
-}
-
-
-//
-// GPU Main Code Directive
-//
-
-int d_gpumain(void)
-{
- if ((cursect != TEXT) && (cursect != DATA))
- {
- error(".gpumain can only be used in the TEXT or DATA segments");
- return ERROR;
- }
-
- // If previous section was dsp or 68000 then we need to reset ORG'd Addresses
- if (!rgpu)
- {
- orgactive = 0;
- orgwarning = 0;
- }
-
- rgpu = 1; // Set GPU assembly
- rdsp = 0; // Unset DSP assembly
- regbank = BANK_N; // Set no default register bank
- in_main = 1; // Enable main code execution rules
- jpad = 0;
+ rgpu = 1; // Set GPU assembly
+ rdsp = 0; // Unset DSP assembly
+ regbank = BANK_N; // Set no default register bank
return 0;
}
orgwarning = 0;
}
- rdsp = 1; // Set DSP assembly
- rgpu = 0; // Unset GPU assembly
- regbank = BANK_N; // Set no default register bank
- in_main = 0;
- jpad = 0;
+ rdsp = 1; // Set DSP assembly
+ rgpu = 0; // Unset GPU assembly
+ regbank = BANK_N; // Set no default register bank
return 0;
}
// .cargs [#offset], symbol[.size], ...
//
// Lists of registers may also be mentioned; they just take up space. Good for
-// "documentation" purposes.
+// "documentation" purposes:
//
-// .cargs a6,.arg1, .arg2, .arg3...
+// .cargs a6, .arg1, .arg2, .arg3...
//
-// The symbols are ABS and EQUATED.
+// Symbols thus created are ABS and EQUATED.
//
int d_cargs(void)
{
- VALUE eval;
+ VALUE eval = 4; // Default to 4 if no offset specified (to account for
+ // return address)
WORD rlist;
- SYM * sy;
+ SYM * symbol;
char * p;
int env;
int i;
if (*tok == '#')
{
- ++tok;
+ tok++;
if (abs_expr(&eval) != OK)
return 0;
- if (*tok == ',') // Eat comma if it's there
- ++tok;
+ // Eat the comma, if it's there
+ if (*tok == ',')
+ tok++;
}
- else
- eval = 4;
for(;;)
{
if (*tok == SYMBOL)
{
- p = (char *)tok[1];
+// p = (char *)tok[1];
+ p = string[tok[1]];
+#if 0
if (*p == '.')
- env = curenv;
+ env = curenv; // Label is local
else
- env = 0;
-
- sy = lookup(p, LABEL, env);
-
- if (sy == NULL)
+ env = 0; // Label is global
+#else
+ // Set env to either local (dot prefixed) or global scope
+ env = (*p == '.' ? curenv : 0);
+#endif
+ symbol = lookup(p, LABEL, env);
+
+ if (symbol == NULL)
{
- sy = newsym(p, LABEL, env);
- sy->sattr = 0;
+ symbol = NewSymbol(p, LABEL, env);
+ symbol->sattr = 0;
}
- else if (sy->sattr & DEFINED)
+ else if (symbol->sattr & DEFINED)
return errors("multiply-defined label '%s'", p);
// Put symbol in "order of definition" list
- if (!(sy->sattr & SDECLLIST))
- sym_decl(sy);
+ if (!(symbol->sattr & SDECLLIST))
+ AddToSymbolOrderList(symbol);
- sy->sattr |= ABS|DEFINED|EQUATED;
- sy->svalue = eval;
+ symbol->sattr |= (ABS | DEFINED | EQUATED);
+ symbol->svalue = eval;
tok += 2;
- switch((int)*tok)
+ // What this does is eat any dot suffixes attached to a symbol. If
+ // it's a .L, it adds 4 to eval; if it's .W or .B, it adds 2. If
+ // there is no dot suffix, it assumes a size of 2.
+ switch ((int)*tok)
{
case DOTL:
eval += 2;
case DOTB:
case DOTW:
- ++tok;
+ tok++;
}
eval += 2;
}
- else
+ else if (*tok >= KW_D0 && *tok <= KW_A7)
{
- if (*tok >= KW_D0 && *tok <= KW_A7)
+ if (reglist(&rlist) < 0)
+ return 0;
+
+// for(i=0; i++<16; rlist>>=1)
+ for(i=0; i<16; i++, rlist>>=1)
{
- if (reglist(&rlist) < 0)
- return 0;
+ if (rlist & 1)
+ eval += 4;
+ }
+ }
+ else
+ {
+ switch ((int)*tok)
+ {
+ case KW_USP:
+ case KW_SSP:
+ case KW_PC:
+ eval += 2;
+ // FALLTHROUGH
+ case KW_SR:
+ case KW_CCR:
+ eval += 2;
+ tok++;
+ break;
+ case EOL:
+ return 0;
+ default:
+ return error(".cargs syntax");
+ }
+ }
- for(i=0; i++<16; rlist>>=1)
- if (rlist & 1)
- eval += 4;
+ // Eat commas in between each argument, if they exist
+ if (*tok == ',')
+ tok++;
+ }
+}
+
+
+//
+// .cstruct [#offset], symbol[.size], ...
+//
+// Lists of registers may also be mentioned; they just take up space. Good for
+// "documentation" purposes:
+//
+// .cstruct a6, .arg1, .arg2, .arg3...
+//
+// Symbols thus created are ABS and EQUATED. Note that this is for
+// compatibility with VBCC and the Remover's library. Thanks to GroovyBee for
+// the suggestion.
+//
+int d_cstruct(void)
+{
+ VALUE eval = 0; // Default, if no offset specified, is zero
+ WORD rlist;
+ SYM * symbol;
+ char * symbolName;
+ int env;
+ int i;
+
+ if (rgpu || rdsp)
+ return error("directive forbidden in gpu/dsp mode");
+
+ if (*tok == '#')
+ {
+ tok++;
+
+ if (abs_expr(&eval) != OK)
+ return 0;
+
+ // Eat the comma, if it's there
+ if (*tok == ',')
+ tok++;
+ }
+
+ for(;;)
+ {
+ if (*tok == SYMBOL)
+ {
+ symbolName = string[tok[1]];
+
+ // Set env to either local (dot prefixed) or global scope
+ env = (symbolName[0] == '.' ? curenv : 0);
+ symbol = lookup(symbolName, LABEL, env);
+
+ // If the symbol wasn't found, then define it. Otherwise, throw an
+ // error.
+ if (symbol == NULL)
+ {
+ symbol = NewSymbol(symbolName, LABEL, env);
+ symbol->sattr = 0;
}
- else
+ else if (symbol->sattr & DEFINED)
+ return errors("multiply-defined label '%s'", symbolName);
+
+ // Put symbol in "order of definition" list
+ if (!(symbol->sattr & SDECLLIST))
+ AddToSymbolOrderList(symbol);
+
+ tok += 2;
+
+ // Adjust label start address if it's a word or a long, as a byte
+ // label might have left us on an odd address.
+ switch ((int)*tok)
{
- switch((int)*tok)
- {
- case KW_USP:
- case KW_SSP:
- case KW_PC:
- eval += 2;
- // FALLTHROUGH
- case KW_SR:
- case KW_CCR:
- eval += 2;
- ++tok;
- break;
- case EOL:
- return 0;
- default:
- return error(".cargs syntax");
- }
+ case DOTW:
+ case DOTL:
+ eval += eval & 0x01;
+ }
+
+ symbol->sattr |= (ABS | DEFINED | EQUATED);
+ symbol->svalue = eval;
+
+ // Check for dot suffixes and adjust space accordingly (longs and
+ // words on an odd boundary get bumped to the next word aligned
+ // address). If no suffix, then throw an error.
+ switch ((int)*tok)
+ {
+ case DOTL:
+ eval += 4;
+ break;
+ case DOTW:
+ eval += 2;
+ break;
+ case DOTB:
+ eval += 1;
+ break;
+ default:
+ return error("Symbol missing dot suffix in .cstruct construct");
}
- if (*tok == ',')
- ++tok;
+ tok++;
+ }
+ else if (*tok >= KW_D0 && *tok <= KW_A7)
+ {
+ if (reglist(&rlist) < 0)
+ return 0;
+
+ for(i=0; i<16; i++, rlist>>=1)
+ {
+ if (rlist & 1)
+ eval += 4;
+ }
+ }
+ else
+ {
+ switch ((int)*tok)
+ {
+ case KW_USP:
+ case KW_SSP:
+ case KW_PC:
+ eval += 2;
+ // FALLTHROUGH
+ case KW_SR:
+ case KW_CCR:
+ eval += 2;
+ tok++;
+ break;
+ case EOL:
+ return 0;
+ default:
+ return error(".cstruct syntax");
+ }
}
+
+ // Eat commas in between each argument, if they exist
+ if (*tok == ',')
+ tok++;
}
}
//
int undmac1(char * p)
{
- SYM * sy;
+ SYM * symbol = lookup(p, MACRO, 0);
- // If the macro symbol exists, cause it to dissappear
- if ((sy = lookup(p, MACRO, 0)) != NULL)
- sy->stype = (BYTE)SY_UNDEF;
+ // If the macro symbol exists, cause it to disappear
+// if ((sy = lookup(p, MACRO, 0)) != NULL)
+ if (symbol != NULL)
+ symbol->stype = (BYTE)SY_UNDEF;
return OK;
}
symlist(undmac1);
return 0;
}
+
+
+int d_jpad(void)
+{
+ warn("JPAD directive is deprecated/non-functional");
+ return OK;
+}
+
+
+int d_nojpad(void)
+{
+ warn("NOJPAD directive is deprecated/non-functional");
+ return OK;
+}
+
+
+int d_gpumain(void)
+{
+ return error("What the hell? Do you think we adhere to the Goof standard?");
+}
+
projects / rmac / blobdiff