//
-// RMAC - Reboot's Macro Assembler for the Atari Jaguar Console System
+// RMAC - Reboot's Macro Assembler for all Atari computers
// DIRECT.C - Directive Handling
-// Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
+// Copyright (C) 199x Landon Dyer, 2011-2020 Reboot and Friends
// RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
// Source utilised with the kind permission of Landon Dyer
//
#include "direct.h"
-#include "sect.h"
-#include "riscasm.h"
+#include "6502.h"
+#include "amode.h"
+#include "dsp56k.h"
#include "error.h"
-#include "token.h"
-#include "procln.h"
#include "expr.h"
-#include "mach.h"
+#include "fltpoint.h"
#include "listing.h"
+#include "mach.h"
+#include "macro.h"
#include "mark.h"
+#include "procln.h"
+#include "riscasm.h"
+#include "sect.h"
#include "symbol.h"
+#include "token.h"
#define DEF_KW
#include "kwtab.h"
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_68000(void);
+int d_68020(void);
+int d_68030(void);
+int d_68040(void);
+int d_68060(void);
+int d_68881(void);
+int d_68882(void);
+int d_56001(void);
+int d_nofpu(void);
+int d_bss(void);
+int d_data(void);
+int d_text(void);
+int d_abs(void);
+int d_comm(void);
+int d_dc(WORD);
+int d_ds(WORD);
+int d_dsm(WORD);
+int d_dcb(WORD);
+int d_globl(void);
+int d_gpu(void);
+int d_dsp(void);
+int d_assert(void);
+int d_include(void);
+int d_list(void);
+int d_nlist(void);
+int d_error(char *);
+int d_warn(char *);
+int d_org(void);
+int d_init(WORD);
+int d_cargs(void);
+int d_undmac(void);
+int d_regbank0(void);
+int d_regbank1(void);
+int d_incbin(void);
+int d_noclear(void);
+int d_equrundef(void);
+int d_ccundef(void);
+int d_print(void);
+int d_gpumain(void);
+int d_jpad(void);
+int d_nojpad(void);
+int d_fail(void);
+int d_cstruct(void);
+int d_prgflags(void);
+int d_opt(void);
+int d_dsp(void);
+int d_objproc(void);
+void SetLargestAlignment(int);
// Directive handler table
int (*dirtab[])() = {
d_org, // 0 org
d_even, // 1 even
- d_unimpl, // 2 .6502
+ d_6502, // 2 .6502
d_68000, // 3 .68000
d_bss, // 4 bss
d_data, // 5 data
d_title, // 44 title
d_subttl, // 45 subttl
eject, // 46 eject
- d_error, // 47 error
- d_warn, // 48 warn
+ d_error, // 47 error
+ d_warn, // 48 warn
d_noclear, // 49 .noclear
d_equrundef, // 50 .equrundef/.regundef
d_ccundef, // 51 .ccundef
d_nojpad, // 55 .nojpad (deprecated)
d_gpumain, // 56 .gpumain (deprecated)
d_prgflags, // 57 .prgflags
+ d_68020, // 58 .68020
+ d_68030, // 59 .68030
+ d_68040, // 60 .68040
+ d_68060, // 61 .68060
+ d_68881, // 62 .68881
+ d_68882, // 63 .68882
+ d_56001, // 64 .56001
+ d_nofpu, // 65 nofpu
+ d_opt, // 66 .opt
+ d_objproc, // 67 .objproc
+ d_dsm, // 68 .dsm
};
+//
+// 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;
-
- if (!rgpu && !rdsp)
- return error(".org permitted only in gpu/dsp section");
+ uint64_t address;
- orgaddr = 0;
+ if (!rgpu && !rdsp && !robjproc && !m6502 && !dsp56001)
+ return error(".org permitted only in GPU/DSP/OP, 56001 and 6502 sections");
- if (abs_expr(&address) == ERROR)
+ // M56K can leave the expression off the org for some reason :-/
+ // (It's because the expression is non-standard, and so we have to look at
+ // it in isolation)
+ if (!dsp56001 && (abs_expr(&address) == ERROR))
{
error("cannot determine org'd address");
return ERROR;
}
- orgaddr = address;
- orgactive = 1;
-//printf("ORG: address = $%08X...\n", orgaddr);
+ if (rgpu | rdsp | robjproc)
+ {
+ orgaddr = address;
+ orgactive = 1;
+ }
+ else if (m6502)
+ {
+ // 6502. We also kludge 'lsloc' so the listing generator doesn't try
+ // to spew out megabytes.
+ if (address > 0xFFFF)
+ return error(range_error);
+
+ if (sloc != currentorg[0])
+ {
+ currentorg[1] = sloc;
+ currentorg += 2;
+ }
+ currentorg[0] = address;
+ ch_size = 0;
+ lsloc = sloc = address;
+ chptr = scode->chptr + address;
+ orgaddr = address;
+ orgactive = 1;
+ }
+ else if (dsp56001)
+ {
+ // Only mark segments we actually wrote something
+ if (chptr != dsp_currentorg->start && dsp_written_data_in_current_org)
+ {
+ dsp_currentorg->end = chptr;
+ dsp_currentorg++;
+ }
+
+ // Maybe we switched from a non-DSP section (TEXT, DATA, etc) and
+ // scode isn't initialised yet. Not that it's going to be a valid
+ // scenario, but if we try it anyhow it's going to lead to a crash. So
+ // let's fudge a value of 0 and get on with it.
+ orgaddr = (scode != NULL ? sloc : 0);
+ SaveSection();
+
+ if (tok[1] != ':')
+ return error(syntax_error);
+
+ int sectionToSwitch = 0;
+
+ switch (tok[0])
+ {
+ case KW_X:
+ dsp_currentorg->memtype = ORG_X;
+ sectionToSwitch = M56001X;
+ break;
+
+ case KW_Y:
+ dsp_currentorg->memtype = ORG_Y;
+ sectionToSwitch = M56001Y;
+ break;
+
+ case KW_P:
+ dsp_currentorg->memtype = ORG_P;
+ sectionToSwitch = M56001P;
+ break;
+
+ case KW_L:
+ dsp_currentorg->memtype = ORG_L;
+ sectionToSwitch = M56001L;
+ break;
+
+ default:
+ return error("unknown type in ORG");
+ }
+
+ if ((obj_format == LOD) || (obj_format == P56))
+ SwitchSection(sectionToSwitch);
+
+ tok += 2;
+ chcheck(3); // Ensure we got a valid address to write
+ dsp_currentorg->chunk = scode; // Mark down which chunk this org starts from (will be needed when outputting)
+
+ if (*tok == EOL)
+ {
+ // Well, the user didn't specify an address at all so we'll have to
+ // use the last used address of that section (or 0 if there wasn't one)
+ address = orgaddr;
+ dsp_currentorg->start = chptr;
+ dsp_currentorg->orgadr = orgaddr;
+ }
+ else
+ {
+ if (abs_expr(&address) == ERROR)
+ {
+ error("cannot determine org'd address");
+ return ERROR;
+ }
+
+ dsp_currentorg->start = chptr;
+ dsp_currentorg->orgadr = (uint32_t)address;
+ sect[cursect].orgaddr = (uint32_t)address;
+ }
+
+ if (address > DSP_MAX_RAM)
+ {
+ return error(range_error);
+ }
+
+ dsp_written_data_in_current_org = 0;
+
+ // Copied from 6502 above: kludge `lsloc' so the listing generator
+ // doesn't try to spew out megabytes.
+ lsloc = sloc = (int32_t)address;
+// N.B.: It seems that by enabling this, even though it works elsewhere, will cause symbols to royally fuck up. Will have to do some digging to figure out why.
+// orgactive = 1;
+ }
+
+ ErrorIfNotAtEOL();
return 0;
}
int wordlong = 0; // WORD = 0, LONG = 1
int outtype = 0; // 0:hex, 1:decimal, 2:unsigned
- VALUE eval; // Expression value
+ uint64_t eval; // Expression value
WORD eattr; // Expression attributes
SYM * esym; // External symbol involved in expr.
TOKEN r_expr[EXPRSIZE];
while (*tok != EOL)
{
- switch(*tok)
+ switch (*tok)
{
case STRING:
sprintf(prntstr, "%s", string[tok[1]]);
printf("%s", prntstr);
- if (list_fd)
+ if (list_fd)
unused = write(list_fd, prntstr, (LONG)strlen(prntstr));
tok += 2;
case '/':
formatting = 1;
- if (tok[1] != SYMBOL)
+ // "X" & "L" get tokenized now... :-/ Probably should look into preventing this kind of thing from happening (was added with DSP56K code)
+ if ((tok[1] != SYMBOL) && (tok[1] != KW_L) && (tok[1] != KW_X))
goto token_err;
-// strcpy(prntstr, (char *)tok[2]);
- strcpy(prntstr, string[tok[2]]);
-
- switch(prntstr[0])
+ if (tok[1] == KW_L)
{
- case 'l': case 'L': wordlong = 1; break;
- case 'w': case 'W': wordlong = 0; break;
- case 'x': case 'X': outtype = 0; break;
- case 'd': case 'D': outtype = 1; break;
- case 'u': case 'U': outtype = 2; break;
- default:
- error("unknown print format flag");
- return ERROR;
+ wordlong = 1;
+ tok += 2;
+ }
+ else if (tok[1] == KW_X)
+ {
+ outtype = 0;
+ tok += 2;
+ }
+ else
+ {
+ strcpy(prntstr, string[tok[2]]);
+
+ switch (prntstr[0])
+ {
+ case 'l': case 'L': wordlong = 1; break;
+ case 'w': case 'W': wordlong = 0; break;
+ case 'x': case 'X': outtype = 0; break;
+ case 'd': case 'D': outtype = 1; break;
+ case 'u': case 'U': outtype = 2; break;
+ default:
+ error("unknown print format flag");
+ return ERROR;
+ }
+
+ tok += 3;
}
- tok += 3;
break;
case ',':
tok++;
{
switch(outtype)
{
- case 0: strcpy(format, "%X"); break;
- case 1: strcpy(format, "%d" ); break;
- case 2: strcpy(format, "%u" ); break;
+ case 0: strcpy(format, "%X"); break;
+ case 1: strcpy(format, "%d" ); break;
+ case 2: strcpy(format, "%u" ); break;
}
if (wordlong)
printf("%s", prntstr);
- if (list_fd)
+ if (list_fd)
unused = write(list_fd, prntstr, (LONG)strlen(prntstr));
formatting = 0;
return 0;
token_err:
- error("illegal print token");
+ error("illegal print token [@ '%s']", prntstr);
return ERROR;
}
}
-//
+//
// Include binary file
//
int d_incbin(void)
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;
}
if (*tok != STRING)
{
- error("syntax error; string missing");
+ error("syntax error; file to include missing");
return ERROR;
}
- if ((fd = open(string[tok[1]], _OPEN_INC)) < 0)
+ // 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 ((fd = open(string[tok[1]], _OPEN_INC)) < 0)
{
- errors("cannot open include binary file (%s)", string[tok[1]]);
- return ERROR;
+ for(i=0; nthpath("RMACPATH", i, buf1)!=0; i++)
+ {
+ fd = strlen(buf1);
+
+ // Append path char if necessary
+ if (fd > 0 && buf1[fd - 1] != SLASHCHAR)
+ strcat(buf1, SLASHSTRING);
+
+ strcat(buf1, string[tok[1]]);
+
+ if ((fd = open(buf1, _OPEN_INC)) >= 0)
+ goto allright;
+ }
+
+ return error("cannot open: \"%s\"", string[tok[1]]);
}
+allright:
+
size = lseek(fd, 0L, SEEK_END);
pos = lseek(fd, 0L, SEEK_SET);
chcheck(size);
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;
}
}
-//
+//
// Set RISC register banks
//
int d_regbank0(void)
//
int d_even(void)
{
+ if (m6502)
+ return error(in_6502mode);
+
unsigned skip = (rgpu || rdsp ? orgaddr : sloc) & 0x01;
-
+
if (skip)
{
if ((scattr & SBSS) == 0)
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;
}
//
void auto_even(void)
{
- if (scattr & SBSS)
- sloc++; // Bump BSS section
- else
- D_byte(0); // Deposit 0.b in non-BSS
+ if (cursect != M6502)
+ {
+ if (scattr & SBSS)
+ sloc++; // Bump BSS section
+ else
+ D_byte(0); // Deposit 0.b in non-BSS
- if (lab_sym != NULL) // Bump label if we have to
- lab_sym->svalue++;
+ if (lab_sym != NULL) // Bump label if we have to
+ lab_sym->svalue++;
+ }
}
}
-//
+//
// Return absolute (not TDB) and defined expression or return an error
//
-int abs_expr(VALUE * a_eval)
+int abs_expr(uint64_t * a_eval)
{
WORD eattr;
char buf[128];
char buf1[128];
- if (*tok == STRING) // Leave strings ALONE
+ if (*tok == STRING) // Leave strings ALONE
fn = string[*++tok];
else if (*tok == SYMBOL) // Try to append ".s" to symbols
{
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:
// .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
- // the "-d" option.
+ // the "-i" option.
if ((j = open(fn, 0)) < 0)
{
for(i=0; nthpath("RMACPATH", i, buf1)!=0; i++)
{
j = strlen(buf1);
- if (j > 0 && buf1[j - 1] != SLASHCHAR) // Append path char if necessary
+ // Append path char if necessary
+ if (j > 0 && buf1[j - 1] != SLASHCHAR)
strcat(buf1, SLASHSTRING);
strcat(buf1, fn);
goto allright;
}
- return errors("cannot open: \"%s\"", fn);
+ return error("cannot open: \"%s\"", fn);
}
allright:
int d_assert(void)
{
WORD eattr;
- VALUE eval;
+ uint64_t eval;
for(; expr(exprbuf, &eval, &eattr, NULL)==OK; ++tok)
{
break;
}
- at_eol();
+ ErrorIfNotAtEOL();
return 0;
}
sy->sattr = GLOBAL;
//printf("glob1: Making global symbol: attr=%04X, eattr=%08X, %s\n", sy->sattr, sy->sattre, sy->sname);
}
- else
+ else
sy->sattr |= GLOBAL;
return OK;
int d_globl(void)
{
+ if (m6502)
+ return error(in_6502mode);
+
symlist(globl1);
return 0;
}
//
int d_prgflags(void)
{
- VALUE eval;
+ uint64_t eval;
if (*tok == EOL)
return error("PRGFLAGS requires value");
else if (abs_expr(&eval) == OK)
{
- PRGFLAGS=eval;
+ PRGFLAGS = (uint32_t)eval;
return 0;
}
else
//
int d_abs(void)
{
- VALUE eval;
+ uint64_t eval;
+
+ if (m6502)
+ return error(in_6502mode);
SaveSection();
return 0;
SwitchSection(ABS);
- sloc = eval;
+ sloc = (uint32_t)eval;
return 0;
}
{
if (rgpu || rdsp)
return error("directive forbidden in gpu/dsp mode");
+ else if (m6502)
+ return error(in_6502mode);
if (cursect != TEXT)
{
{
if (rgpu || rdsp)
return error("directive forbidden in gpu/dsp mode");
+ else if (m6502)
+ return error(in_6502mode);
if (cursect != DATA)
{
{
if (rgpu || rdsp)
return error("directive forbidden in gpu/dsp mode");
+ else if (m6502)
+ return error(in_6502mode);
if (cursect != BSS)
{
{
DEBUG { printf("Directive: .ds.[size] = %u, sloc = $%X\n", siz, sloc); }
- VALUE eval;
-
- // This gets kind of stupid. This directive is disallowed in normal 68000
- // mode ("for your own good!"), but is permitted for 6502 and Alcyon-
- // compatibility modes. For obvious reasons, no auto-even is done in 8-bit
- // processor modes.
- if (as68_flag == 0 && (scattr & SBSS) == 0)
- return error(".ds permitted only in BSS");
+ uint64_t eval;
- if (siz != SIZB && (sloc & 1)) // Automatic .even
- auto_even();
+ if ((cursect & (M6502 | M56KPXYL)) == 0)
+ {
+ if ((siz != SIZB) && (sloc & 1)) // Automatic .even
+ auto_even();
+ }
if (abs_expr(&eval) != OK)
return 0;
+ // 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, what does it)
+ // N.B.: Since 'eval' is of type uint64_t, if it goes negative, it will
+ // have its high bit set.
+ if (eval & 0x8000000000000000)
+ return error("negative sizes not allowed in DS");
+
// 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)
+ // of zeroed memory....
+ if ((scattr & SBSS) || cursect == M6502)
{
- listvalue(eval);
+ listvalue((uint32_t)eval);
eval *= siz;
- sloc += eval;
- just_bss = 1; // No data deposited (8-bit CPU mode)
+ sloc += (uint32_t)eval;
+
+ if (cursect == M6502)
+ chptr += eval;
+
+ just_bss = 1; // No data deposited (8-bit CPU mode)
+ }
+ else if (cursect & M56KPXYL)
+ {
+ // Change segment instead of marking blanks.
+ // Only mark segments we actually wrote something
+ if (chptr != dsp_currentorg->start && dsp_written_data_in_current_org)
+ {
+ dsp_currentorg->end = chptr;
+ dsp_currentorg++;
+ dsp_currentorg->memtype = dsp_currentorg[-1].memtype;
+ }
+
+ listvalue((uint32_t)eval);
+ sloc += (uint32_t)eval;
+
+ // And now let's create a new segment
+ dsp_currentorg->start = chptr;
+ dsp_currentorg->chunk = scode; // Mark down which chunk this org starts from (will be needed when outputting)
+ sect[cursect].orgaddr = sloc;
+ dsp_currentorg->orgadr = sloc;
+ dsp_written_data_in_current_org = 0;
+
+ just_bss = 1; // No data deposited
}
else
{
- dep_block(eval, siz, (VALUE)0, (WORD)(DEFINED | ABS), NULL);
+ dep_block(eval, siz, 0, (DEFINED | ABS), NULL);
}
- at_eol();
- return 0;
+ ErrorIfNotAtEOL();
+ return OK;
}
//
-// dc.b, dc.w / dc, dc.l
+// dsm[.siz] expression
+// Define modulo storage
+// Quoting the Motorola assembler manual:
+// "The DSM directive reserves a block of memory the length of which in words is equal to
+// the value of <expression>.If the runtime location counter is not zero, this directive first
+// advances the runtime location counter to a base address that is a multiple of 2k, where
+// 2k >= <expression>."
+// The kicker of course is written a few sentences after:
+// "<label>, if present, will be assigned the value of the runtime location counter after a valid
+// base address has been established."
+//
+int d_dsm(WORD siz)
+{
+ TOKEN * tok_current = tok; // Keep track of where tok was when we entered this procedure
+ uint64_t eval;
+
+ if (abs_expr(&eval) != OK)
+ return 0;
+
+ // Round up to the next highest power of 2
+ // Nicked from https://graphics.stanford.edu/~seander/bithacks.html#RoundUpPowerOf2
+ eval--;
+ eval |= eval >> 1;
+ eval |= eval >> 2;
+ eval |= eval >> 4;
+ eval |= eval >> 8;
+ eval |= eval >> 16;
+
+ int units_to_skip;
+ units_to_skip = eval + 1 - sloc;
+ sloc += units_to_skip; // Bump up sloc - TODO: check if this goes over the RAM limits?
+
+ // If a label has been defined in the same line as dsm, its value also needs to be adjusted
+ if (label_defined)
+ {
+ SYM * label = lookup(label_defined, LABEL, 0);
+ label->svalue += units_to_skip;
+ }
+
+ tok = tok_current; // Rewind tok back to where it was
+ return d_ds(siz); // And let d_ds take over from here
+}
+
+
+//
+// dc.b, dc.w / dc, dc.l, dc.i, dc.q, dc.d, dc.s, dc.x
//
int d_dc(WORD siz)
{
WORD eattr;
- VALUE eval;
- WORD tdb;
- WORD defined;
- LONG i;
- char * p;
- int movei = 0; // movei flag for dc.i
+ uint64_t eval;
+ uint8_t * p;
if ((scattr & SBSS) != 0)
return error("illegal initialization of section");
// Do an auto_even if it's not BYTE sized (hmm, should we be doing this???)
- if ((siz != SIZB) && (sloc & 1))
+ if ((cursect != M6502) && (cursect != M56001P) && (cursect != M56001X)
+ && (cursect != M56001Y) && (cursect != M56001L)
+ && (siz != SIZB) && (sloc & 1))
auto_even();
// Check to see if we're trying to set LONGS on a non 32-bit aligned
|| (rdsp && (orgaddr >= 0xF1B000) && (orgaddr <= 0xF1CFFFF))))
warn("depositing LONGs on a non-long address in local RAM");
- for(;; ++tok)
+ for(;; tok++)
{
// dc.b 'string' [,] ...
- if (siz == SIZB && *tok == STRING && (tok[2] == ',' || tok[2] == EOL))
+ if (siz == SIZB && (*tok == STRING || *tok == STRINGA8) && (tok[2] == ',' || tok[2] == EOL))
{
- i = strlen(string[tok[1]]);
+ uint32_t i = strlen(string[tok[1]]);
- if ((challoc - ch_size) < i)
+ if ((challoc - ch_size) < i)
chcheck(i);
- for(p=string[tok[1]]; *p!=EOS; ++p)
- D_byte(*p);
+ if (*tok == STRING)
+ {
+ for(p=string[tok[1]]; *p!=EOS; p++)
+ D_byte(*p);
+ }
+ else if (*tok == STRINGA8)
+ {
+ for(p=string[tok[1]]; *p!=EOS; p++)
+ D_byte(strtoa8[*p]);
+ }
+ else
+ {
+ error("String format not supported... yet");
+ }
tok += 2;
goto comma;
}
- if (*tok == 'I')
+ int movei = 0; // MOVEI flag for dc.i
+
+ if (*tok == DOTI)
{
movei = 1;
tok++;
}
// dc.x <expression>
- if (expr(exprbuf, &eval, &eattr, NULL) != OK)
+ SYM * esym = 0;
+
+ if (expr(exprbuf, &eval, &eattr, &esym) != OK)
return 0;
- tdb = (WORD)(eattr & TDB);
- defined = (WORD)(eattr & DEFINED);
+ uint16_t tdb = eattr & TDB;
+ uint16_t defined = eattr & DEFINED;
- if ((challoc - ch_size) < 4)
- chcheck(4);
+// N.B.: This is awful. This needs better handling, rather than just bodging something in that, while works, is basically an ugly wart on the assembler. !!! FIX !!!
+ if (dsp56001)
+ {
+ if (cursect != M56001L)
+ {
+ if (!defined)
+ {
+ AddFixup(FU_DSPIMM24 | FU_SEXT, sloc, exprbuf);
+ D_dsp(0);
+ }
+ else
+ {
+ if (eattr & FLOAT)
+ {
+ double fval = *(double *)&eval;
+ eval = DoubleToDSPFloat(fval);
+ }
+ else
+ {
+ if ((uint32_t)eval + 0x1000000 >= 0x2000000)
+ return error(range_error);
+ }
+
+ // Deposit DSP word (24-bit)
+ D_dsp(eval);
+ }
+ }
+ else
+ {
+ // In L: we deposit stuff to both X: and Y: instead
+ // We will be a bit lazy and require that there is a 2nd value
+ // in the same source line. (Motorola's assembler can parse
+ // 12-digit hex values, which we can't do at the moment) This
+ // of course requires to parse 2 values in one pass. If there
+ // isn't another value in this line, assume X: value is 0.
+ int secondword = 0;
+ uint32_t evaly;
+l_parse_loop:
+
+ if (!defined)
+ {
+ AddFixup(FU_DSPIMM24 | FU_SEXT, sloc, exprbuf);
+ D_dsp(0);
+ }
+ else
+ {
+ if (eattr & FLOAT)
+ {
+ float fval = *(float *)&eval;
+ eval = DoubleToDSPFloat(fval);
+ }
+ else
+ {
+ if (eval + 0x1000000 >= 0x2000000)
+ return error(range_error);
+ }
+
+ // Parse 2nd value if we didn't do this yet
+ if (secondword == 0)
+ {
+ evaly = (uint32_t)eval;
+ secondword = 1;
+
+ if (*tok != ':')
+ {
+ // If we don't have a : then we're probably at EOL,
+ // which means the X: value will be 0
+ eval = 0;
+ ErrorIfNotAtEOL();
+ }
+ else
+ {
+ tok++; // Eat the comma;
+
+ if (expr(exprbuf, &eval, &eattr, NULL) != OK)
+ return 0;
+
+ defined = (WORD)(eattr & DEFINED);
+ goto l_parse_loop;
+ }
+ }
+
+ // Deposit DSP words (24-bit)
+ D_dsp(eval);
+ D_dsp(evaly);
+ sloc--; // We do write 2 DSP words but as far as L: space is concerned we actually advance our counter by one
+ }
+
+ }
+
+ goto comma;
+ }
switch (siz)
{
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);
}
break;
+
case SIZW:
case SIZN:
if (!defined)
}
else
{
- if (tdb)
- rmark(cursect, sloc, tdb, MWORD, NULL);
-
if (eval + 0x10000 >= 0x20000)
return error(range_error);
- // Deposit 68000 or 6502 (byte-reversed) word
- D_word(eval);
+ if (tdb)
+ MarkRelocatable(cursect, sloc, tdb, MWORD, NULL);
+
+ // Deposit 68000 or 6502 (byte-reversed) word
+ if (cursect != M6502)
+ D_word(eval)
+ else
+ D_rword(eval)
}
break;
+
case SIZL:
+ // Shamus: Why can't we do longs in 6502 mode?
+ if (m6502)
+ return error(in_6502mode);
+
if (!defined)
{
- if (movei)
- AddFixup(FU_LONG | FU_MOVEI, sloc, exprbuf);
- else
- AddFixup(FU_LONG, sloc, exprbuf);
-
+ AddFixup(FU_LONG | (movei ? FU_MOVEI : 0), sloc, exprbuf);
D_long(0);
}
else
{
if (tdb)
- rmark(cursect, sloc, tdb, MLONG, NULL);
+ MarkRelocatable(cursect, sloc, tdb, MLONG, NULL);
- if (movei)
- eval = ((eval >> 16) & 0x0000FFFF) | ((eval << 16) & 0xFFFF0000);
+ if (movei)
+ eval = WORDSWAP32(eval);
D_long(eval);
}
+
+ break;
+
+ case SIZQ:
+ // 64-bit size
+ if (m6502)
+ return error(in_6502mode);
+
+ // DEFINITELY NEED FIXUPS HERE!
+ if (!defined)
+ {
+ AddFixup(FU_QUAD, sloc, exprbuf);
+ eval = 0;
+ }
+
+ D_quad(eval);
+ break;
+
+ case SIZS:
+ // 32-bit float size
+ if (m6502)
+ return error(in_6502mode);
+
+/* Seems to me that if something is undefined here, then that should be an error. Likewise for the D & X variants. */
+ if (!defined)
+ {
+// AddFixup(FU_FLOATSING, sloc, exprbuf);
+// D_long(0);
+ return error("labels not allowed in floating point expressions");
+ }
+ else
+ {
+//Would this *ever* happen?
+// if (tdb)
+// MarkRelocatable(cursect, sloc, tdb, MSINGLE, NULL);
+
+ PTR ptr;
+ ptr.u64 = &eval;
+ uint32_t ieee754 = FloatToIEEE754((float)*ptr.dp);
+ D_long(ieee754);
+ }
+
+ break;
+
+ case SIZD:
+ // 64-bit double size
+ if (m6502)
+ return error(in_6502mode);
+
+ if (!defined)
+ {
+// AddFixup(FU_FLOATDOUB, sloc, exprbuf);
+// D_quad(0LL);
+ return error("labels not allowed in floating point expressions");
+ }
+ else
+ {
+//Would this *ever* happen?
+// if (tdb)
+// MarkRelocatable(cursect, sloc, tdb, MDOUBLE, NULL);
+
+ PTR ptr;
+ ptr.u64 = &eval;
+ uint64_t ieee754 = DoubleToIEEE754(*ptr.dp);
+ D_quad(ieee754);
+ }
+
+ break;
+
+ case SIZX:
+ if (m6502)
+ return error(in_6502mode);
+
+ uint8_t extDbl[12];
+ memset(extDbl, 0, 12);
+
+ if (!defined)
+ {
+// AddFixup(FU_FLOATEXT, sloc, exprbuf);
+// D_extend(extDbl);
+ return error("labels not allowed in floating point expressions");
+ }
+ else
+ {
+//Would this *ever* happen?
+// if (tdb)
+// MarkRelocatable(cursect, sloc, tdb, MEXTEND, NULL);
+
+ PTR ptr;
+ ptr.u64 = &eval;
+ DoubleToExtended(*ptr.dp, extDbl);
+ D_extend(extDbl);
+ }
+
break;
}
-
+
comma:
if (*tok != ',')
break;
}
- at_eol();
+ ErrorIfNotAtEOL();
return 0;
}
//
int d_dcb(WORD siz)
{
- VALUE evalc, eval;
+ uint64_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); }
if (expr(exprbuf, &eval, &eattr, NULL) < 0)
return 0;
- if ((siz != SIZB) && (sloc & 1))
+ if (cursect != M6502 && (siz != SIZB) && (sloc & 1))
auto_even();
- dep_block(evalc, siz, eval, eattr, exprbuf);
+ dep_block((uint32_t)evalc, siz, (uint32_t)eval, eattr, exprbuf);
return 0;
}
//
// Generalized initialization directive
-//
+//
// .init[.siz] [#count,] expression [.size] , ...
-//
+//
// The size suffix on the ".init" directive becomes the default size of the
// objects to deposit. If an item is preceeded with a sharp (immediate) sign
// and an expression, it specifies a repeat count. The value to be deposited
//
int d_init(WORD def_siz)
{
- VALUE count;
- VALUE eval;
+ uint64_t count;
+ uint64_t eval;
WORD eattr;
WORD siz;
// Get repeat count (defaults to 1)
if (*tok == '#')
{
- ++tok;
+ tok++;
if (abs_expr(&count) != OK)
return 0;
if (expr(exprbuf, &eval, &eattr, NULL) < 0)
return 0;
- switch ((int)*tok++)
+ switch (*tok++)
{ // Determine size of object to deposit
case DOTB: siz = SIZB; break;
case DOTW: siz = SIZB; break;
case DOTL: siz = SIZL; break;
- default:
+ default:
siz = def_siz;
- --tok;
+ tok--;
break;
}
- dep_block(count, siz, eval, eattr, exprbuf);
+ dep_block((uint32_t)count, siz, (uint32_t)eval, eattr, exprbuf);
- switch ((int)*tok)
+ switch (*tok)
{
case EOL:
return 0;
case ',':
- ++tok;
+ tok++;
continue;
default:
return error(comma_error);
//
// 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;
-
- tdb = (WORD)(eattr & TDB);
- defined = (WORD)(eattr & DEFINED);
+ WORD tdb = eattr & TDB;
+ WORD defined = eattr & DEFINED;
while (count--)
{
else
{
if (tdb)
- rmark(cursect, sloc, tdb, MWORD, NULL);
+ MarkRelocatable(cursect, sloc, tdb, MWORD, NULL);
if (eval + 0x10000 >= 0x20000)
return error(range_error);
// Deposit 68000 or 6502 (byte-reversed) word
- D_word(eval);
+ if (cursect != M6502)
+ D_word(eval)
+ else
+ D_rword(eval)
+
}
break;
case SIZL:
+ if (m6502)
+ return error(in_6502mode);
+
if (!defined)
{
AddFixup(FU_LONG, sloc, exprbuf);
else
{
if (tdb)
- rmark(cursect, sloc, tdb, MLONG, NULL);
+ MarkRelocatable(cursect, sloc, tdb, MLONG, NULL);
D_long(eval);
}
{
SYM * sym;
char * p;
- VALUE eval;
+ uint64_t eval;
+
+ if (m6502)
+ return error(in_6502mode);
if (*tok != SYMBOL)
return error("missing symbol");
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)
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
- at_eol();
+ sym->svalue = eval; // Install common symbol's size
+ ErrorIfNotAtEOL();
return 0;
}
//
int d_68000(void)
{
- rgpu = rdsp = 0;
+ rgpu = rdsp = robjproc = dsp56001 = 0;
// Switching from gpu/dsp sections should reset any ORG'd Address
- orgactive = 0;
+ orgactive = 0;
orgwarning = 0;
SaveSection();
SwitchSection(TEXT);
+ activecpu = CPU_68000;
+ return 0;
+}
+
+
+//
+// .68020 - Back to 68000 TEXT segment and select 68020
+//
+int d_68020(void)
+{
+ d_68000();
+ activecpu = CPU_68020;
+ return 0;
+}
+
+
+//
+// .68030 - Back to 68000 TEXT segment and select 68030
+//
+int d_68030(void)
+{
+ d_68000();
+ activecpu = CPU_68030;
+ return 0;
+}
+
+
+//
+// .68040 - Back to 68000 TEXT segment and select 68040
+//
+int d_68040(void)
+{
+ d_68000();
+ activecpu = CPU_68040;
+ activefpu = FPU_68040;
+ return 0;
+}
+
+
+//
+// .68060 - Back to 68000 TEXT segment and select 68060
+//
+int d_68060(void)
+{
+ d_68000();
+ activecpu = CPU_68060;
+ activefpu = FPU_68060;
+ return 0;
+}
+
+
+//
+// .68881 - Back to 680x0 TEXT segment and select 68881 FPU
+//
+int d_68881(void)
+{
+ //d_68000();
+ activefpu = FPU_68881;
+ return 0;
+}
+
+
+//
+// .68882 - Back to 680x0 TEXT segment and select 68882 FPU
+//
+int d_68882(void)
+{
+ //d_68000();
+ activefpu = FPU_68882;
+ return 0;
+}
+
+
+//
+// nofpu - Deselect FPUs.
+//
+int d_nofpu(void)
+{
+ activefpu = FPU_NONE;
+ return 0;
+}
+
+
+//
+// .56001 - Switch to DSP56001 assembler
+//
+int d_56001(void)
+{
+ dsp56001 = 1;
+ rgpu = rdsp = robjproc = 0;
+ SaveSection();
+
+ if ((obj_format == LOD) || (obj_format == P56))
+ SwitchSection(M56001P);
+
return 0;
}
return ERROR;
}
- // If previous section was dsp or 68000 then we need to reset ORG'd Addresses
+ // If previous section was DSP or 68000 then we need to reset ORG'd Addresses
if (!rgpu)
{
-//printf("Resetting ORG...\n");
orgactive = 0;
orgwarning = 0;
}
-//else printf("NOT resetting ORG!\n");
rgpu = 1; // Set GPU assembly
rdsp = 0; // Unset DSP assembly
+ robjproc = 0; // Unset OP assembly
+ dsp56001 = 0; // Unset 56001 assembly
regbank = BANK_N; // Set no default register bank
return 0;
}
rdsp = 1; // Set DSP assembly
rgpu = 0; // Unset GPU assembly
+ robjproc = 0; // Unset OP assembly
+ dsp56001 = 0; // Unset 56001 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:
-//
+//
// .cargs a6, .arg1, .arg2, .arg3...
-//
+//
// Symbols thus created are ABS and EQUATED.
//
int d_cargs(void)
{
- VALUE eval = 4; // Default to 4 if no offset specified (to account for
+ uint64_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);
//
// .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
+ uint64_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);
}
+//
+// Define start of OP object list (allows the use of ORG)
+//
+int d_objproc(void)
+{
+ if ((cursect != TEXT) && (cursect != DATA))
+ {
+ error(".objproc 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 (!robjproc)
+ {
+ orgactive = 0;
+ orgwarning = 0;
+ }
+
+ robjproc = 1; // Set OP assembly
+ rgpu = 0; // Unset GPU assembly
+ rdsp = 0; // Unset DSP assembly
+ dsp56001 = 0; // Unset 56001 assembly
+ return OK;
+}
+
+
//
// Undefine a macro - .undefmac macname [, macname...]
//
SYM * symbol = lookup(p, MACRO, 0);
// 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 error("What the hell? Do you think we adhere to the Goof standard?");
}
+
+//
+// .opt - turn a specific (or all) optimisation on or off
+//
+int d_opt(void)
+{
+ while (*tok != EOL)
+ {
+ if (*tok == STRING)
+ {
+ tok++;
+ char * tmpstr = string[*tok++];
+
+ if (ParseOptimization(tmpstr) != OK)
+ 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;
+ uint64_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