//
// RMAC - Reboot's Macro Assembler for the Atari Jaguar Console System
// DIRECT.C - Directive Handling
-// Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
+// Copyright (C) 199x Landon Dyer, 2017 Reboot and Friends
// RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
-// Source Utilised with the Kind Permission of Landon Dyer
+// Source utilised with the kind permission of Landon Dyer
//
#include "direct.h"
-#include "sect.h"
-#include "riscasm.h"
+#include "6502.h"
#include "error.h"
-#include "token.h"
-#include "procln.h"
#include "expr.h"
-#include "mach.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"
-
-TOKEN exprbuf[128]; // Expression buffer
+TOKEN exprbuf[128]; // Expression buffer
SYM * symbolPtr[1000000]; // Symbol pointers table
static long unused; // For supressing 'write' warnings
-
+char buffer[256]; // Scratch buffer for messages
+
+// Function prototypes
+int d_unimpl(void);
+int d_68000(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_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);
// Directive handler table
int (*dirtab[])() = {
d_org, // 0 org
d_even, // 1 even
- d_unimpl, // 2 .6502
- d_68000, // 3 .68000
+ d_6502, // 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_data, // 5 data
+ d_text, // 6 text
+ d_abs, // 7 abs
+ d_comm, // 8 comm
+ (void *)d_init, // 9 init
+ d_cargs, // 10 cargs
+ (void *)d_goto, // 11 goto
+ (void *)d_dc, // 12 dc
+ (void *)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
+ (void *)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_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_error, // 47 error
+ d_warn, // 48 warn
d_noclear, // 49 .noclear
d_equrundef, // 50 .equrundef/.regundef
d_ccundef, // 51 .ccundef
d_jpad, // 54 .jpad (deprecated)
d_nojpad, // 55 .nojpad (deprecated)
d_gpumain, // 56 .gpumain (deprecated)
+ d_prgflags, // 57 .prgflags
+ d_opt, // 58 .opt
};
+//
+// .error - Abort compilation, printing an error message
+//
+int d_error(char *str)
+{
+ if (*tok == EOL)
+ return error("error directive encountered - aborting assembling");
+ else
+ {
+ switch(*tok)
+ {
+ case STRING:
+ return error(string[tok[1]]);
+ break;
+ default:
+ return error("error directive encountered - aborting assembling");
+ }
+ }
+}
+
+
+//
+// .warn - Just display a warning on screen
+//
+int d_warn(char *str)
+{
+ if (*tok == EOL)
+ return warn("WARNING WARNING WARNING");
+ else
+ {
+ switch(*tok)
+ {
+ case STRING:
+ return warn(string[tok[1]]);
+ break;
+ default:
+ return warn("WARNING WARNING WARNING");
+ }
+ }
+}
+
+
//
// .org - Set origin
//
{
VALUE address;
- if (!rgpu && !rdsp)
- return error(".org permitted only in gpu/dsp section");
-
- orgaddr = 0;
+ if (!rgpu && !rdsp && !m6502)
+ return error(".org permitted only in gpu/dsp and 6502 sections");
if (abs_expr(&address) == ERROR)
{
return ERROR;
}
- orgaddr = address;
- orgactive = 1;
+ if (rgpu | rdsp)
+ {
+ orgaddr = address;
+ orgactive = 1;
+ }
+ else
+ {
+ // 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;
+ at_eol();
+ }
return 0;
}
//
-// Print Directive
+// 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", string[tok[1]]);
printf("%s", prntstr);
- if (list_fd)
+ if (list_fd)
unused = write(list_fd, prntstr, (LONG)strlen(prntstr));
tok += 2;
{
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;
}
printf("\n");
-// println("\n");
return 0;
//
-// Undefine an Equated Condition Code
+// Undefine an equated condition code
//
int d_ccundef(void)
{
if (*tok != SYMBOL)
{
-// error(syntax_error);
error("syntax error; expected symbol");
return ERROR;
}
-// ccname = lookup((char *)tok[1], LABEL, 0);
ccname = lookup(string[tok[1]], LABEL, 0);
// Make sure symbol is a valid ccdef
//
-// Undefine an Equated Register
+// Undefine an equated register
//
int d_equrundef(void)
{
regname = lookup(string[tok[1]], LABEL, 0);
if (regname && (regname->sattre & EQUATEDREG))
+ {
+ // Reset the attributes of this symbol...
+ regname->sattr = 0;
+ regname->sattre &= ~(EQUATEDREG | BANK_0 | BANK_1);
regname->sattre |= UNDEF_EQUR;
+ }
// Skip over symbol token and address
tok += 2;
//
-// Do Not Allow the Use of the CLR.L Opcode
+// Do not allow use of the CLR.L opcode
//
int d_noclear(void)
{
+ warn("CLR.L opcode ignored...");
return 0;
}
-//
-// Include Binary File
+//
+// Include binary file
//
int d_incbin(void)
{
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)
if (*tok != STRING)
{
-// error(syntax_error);
error("syntax error; string 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 errors("cannot open: \"%s\"", string[tok[1]]);
}
+allright:
+
size = lseek(fd, 0L, SEEK_END);
pos = lseek(fd, 0L, SEEK_SET);
chcheck(size);
return ERROR;
}
-//#define D_byte(b) {*chptr++=(char)b; ++sloc; ++ch_size; if(orgactive) ++orgaddr;}
memcpy(chptr, fileBuffer, size);
chptr += size;
sloc += size;
}
-//
-// Set RISC Register Banks
+//
+// Set RISC register banks
//
int d_regbank0(void)
{
//
-// Adjust Location to an EVEN Value
+// Helper function, to cut down on mistakes & typing
//
-int d_even(void)
+static inline void SkipBytes(unsigned bytesToSkip)
{
- if (sloc & 1)
+ if (!bytesToSkip)
+ return;
+
+ if ((scattr & SBSS) == 0)
{
- if ((scattr & SBSS) == 0)
- {
- chcheck(1);
- D_byte(0);
- }
- else
- {
- ++sloc;
- }
+ chcheck(bytesToSkip);
+ D_ZEROFILL(bytesToSkip);
}
+ else
+ {
+ sloc += bytesToSkip;
- return 0;
+ if (orgactive)
+ orgaddr += bytesToSkip;
+ }
}
//
-// Adjust Location to an LONG Value
+// Adjust location to an EVEN value
//
-int d_long(void)
+int d_even(void)
{
- unsigned i;
- unsigned val = 4;
-
- i = sloc & ~(val - 1);
+ if (m6502)
+ return error(in_6502mode);
- if (i != sloc)
- val = val - (sloc - i);
- else
- val = 0;
+ unsigned skip = (rgpu || rdsp ? orgaddr : sloc) & 0x01;
- if (val)
+ if (skip)
{
if ((scattr & SBSS) == 0)
{
- chcheck(val);
-
- for(i=0; i<val; i++)
- D_byte(0);
+ chcheck(1);
+ D_byte(0);
}
else
{
- sloc += val;
+ sloc++;
+
+ if (orgactive)
+ orgaddr++;
}
}
//
-// Adjust Location to an PHRASE Value
+// Adjust location to a LONG value
//
-int d_phrase(void)
+int d_long(void)
{
- unsigned i;
- unsigned val = 8;
-
- i = sloc & ~(val - 1);
+ unsigned lower2Bits = (rgpu || rdsp ? orgaddr : sloc) & 0x03;
+ unsigned bytesToSkip = (0x04 - lower2Bits) & 0x03;
+ SkipBytes(bytesToSkip);
- if (i != sloc)
- val = val - (sloc - i);
- else
- val = 0;
+ return 0;
+}
- if (val)
- {
- if ((scattr & SBSS) == 0)
- {
- chcheck(val);
- for(i=0; i<val; i++)
- D_byte(0);
- }
- else
- {
- sloc += val;
- }
- }
+//
+// Adjust location to a PHRASE value
+//
+// N.B.: We have to handle the GPU/DSP cases separately because you can embed
+// RISC code in the middle of a regular 68K section. Also note that all
+// of the alignment pseudo-ops will have to be fixed this way.
+//
+// This *must* behave differently when in a RISC section, as following sloc
+// (instead of orgaddr) will fuck things up royally. Note that we do it this
+// way because you can embed RISC code in a 68K section, and have the origin
+// pointing to a different alignment in the RISC section than the 68K section.
+//
+int d_phrase(void)
+{
+ unsigned lower3Bits = (rgpu || rdsp ? orgaddr : sloc) & 0x07;
+ unsigned bytesToSkip = (0x08 - lower3Bits) & 0x07;
+ SkipBytes(bytesToSkip);
return 0;
}
//
-// Adjust Location to an DPHRASE Value
+// Adjust location to a DPHRASE value
//
int d_dphrase(void)
{
- unsigned i;
- unsigned val = 16;
-
- i = sloc & ~(val - 1);
-
- if (i != sloc)
- val = val - (sloc - i);
- else
- val = 0;
-
- if (val)
- {
- if ((scattr & SBSS) == 0)
- {
- chcheck(val);
-
- for(i=0; i<val; i++)
- D_byte(0);
- }
- else
- {
- sloc += val;
- }
- }
+ unsigned lower4Bits = (rgpu || rdsp ? orgaddr : sloc) & 0x0F;
+ unsigned bytesToSkip = (0x10 - lower4Bits) & 0x0F;
+ SkipBytes(bytesToSkip);
return 0;
}
//
-// Adjust Location to an QPHRASE Value
+// Adjust location to a QPHRASE value
//
int d_qphrase(void)
{
- unsigned i;
- unsigned val = 32;
-
- i = sloc & ~(val - 1);
-
- if (i != sloc)
- val = val - (sloc - i);
- else
- val = 0;
-
- if (val)
- {
- if ((scattr & SBSS) == 0)
- {
- SaveSection();
- chcheck(val);
-
- for(i=0; i<val; i++)
- D_byte(0);
- }
- else
- {
- sloc += val;
- }
- }
+ unsigned lower5Bits = (rgpu || rdsp ? orgaddr : sloc) & 0x1F;
+ unsigned bytesToSkip = (0x20 - lower5Bits) & 0x1F;
+ SkipBytes(bytesToSkip);
return 0;
}
// which is OK since multiple labels are only allowed in AS68 kludge mode, and
// the C compiler is VERY paranoid and uses ".even" whenever it can
//
+// N.B.: This probably needs the same fixes as above...
+//
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++;
+ }
}
//
-// Unimplemened Directive Error
+// Unimplemened directive error
//
int d_unimpl(void)
{
}
-//
+//
// Return absolute (not TDB) and defined expression or return an error
//
int abs_expr(VALUE * a_eval)
char buf[128];
char buf1[128];
- if (*tok == STRING) // Leave strings ALONE
-#if 0
- fn = (char *)*++tok;
-#else
+ if (*tok == STRING) // Leave strings ALONE
fn = string[*++tok];
-#endif
- else if (*tok == SYMBOL) // Try to append ".s" to symbols
+ 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:
// 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);
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;
}
+//
+// .prgflags expression
+//
+int d_prgflags(void)
+{
+ VALUE eval;
+
+ if (*tok == EOL)
+ return error("PRGFLAGS requires value");
+ else if (abs_expr(&eval) == OK)
+ {
+ PRGFLAGS=eval;
+ return 0;
+ }
+ else
+ {
+ return error("PRGFLAGS requires value");
+ }
+}
+
+
//
// .abs [expression]
//
{
VALUE eval;
+ if (m6502)
+ return error(in_6502mode);
+
SaveSection();
if (*tok == EOL)
//
-// Switch Segments
+// Switch segments
//
-
int d_text(void)
{
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)
{
//
int d_ds(WORD siz)
{
-if (verb_flag)
- printf("Directive: .ds.[size] = %u, sloc = $%X\n", siz, sloc);
+ 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");
-
- if (siz != SIZB && (sloc & 1)) // Automatic .even
- auto_even();
+ if (cursect != M6502)
+ {
+ 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, that does it)
+ // N.B.: Since VALUE 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");
+
// 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);
eval *= siz;
sloc += eval;
- just_bss = 1; // No data deposited (8-bit CPU mode)
+
+ if (cursect == M6502)
+ chptr += eval;
+
+ just_bss = 1; // No data deposited (8-bit CPU mode)
}
else
{
//
-// dc.b, dc.w / dc, dc.l
+// dc.b, dc.w / dc, dc.l, dc.i
//
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
+ uint8_t * p;
if ((scattr & SBSS) != 0)
return error("illegal initialization of section");
- if ((siz != SIZB) && (sloc & 1))
+ // Do an auto_even if it's not BYTE sized (hmm, should we be doing this???)
+ if (cursect != M6502 && (siz != SIZB) && (sloc & 1))
auto_even();
- for(;; ++tok)
+ // Check to see if we're trying to set LONGS on a non 32-bit aligned
+ // address in a GPU or DSP section, in their local RAM
+ if ((siz == SIZL) && (orgaddr & 0x03)
+ && ((rgpu && (orgaddr >= 0xF03000) && (orgaddr <= 0xF03FFFF))
+ || (rdsp && (orgaddr >= 0xF1B000) && (orgaddr <= 0xF1CFFFF))))
+ warn("depositing LONGs on a non-long address in local RAM");
+
+ 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((const char*)tok[1]);
- 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);
}
else
{
+ if (eval + 0x100 >= 0x200)
+ {
+ sprintf(buffer, "%s (value = $%X)", range_error, eval);
+ return error(buffer);
+ }
+
if (tdb)
return error("non-absolute byte value");
- if (eval + 0x100 >= 0x200)
- return error(range_error);
-
D_byte(eval);
}
}
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:
+ if (m6502)
+ return error(in_6502mode);
+
if (!defined)
{
if (movei)
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;
}
-
+
comma:
if (*tok != ',')
break;
VALUE 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 ((scattr & SBSS) != 0)
return error("illegal initialization of section");
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);
//
// 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
case DOTB: siz = SIZB; break;
case DOTW: siz = SIZB; break;
case DOTL: siz = SIZL; break;
- default:
+ default:
siz = def_siz;
- --tok;
+ tok--;
break;
}
case EOL:
return 0;
case ',':
- ++tok;
+ tok++;
continue;
default:
return error(comma_error);
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);
}
char * p;
VALUE eval;
+ if (m6502)
+ return error(in_6502mode);
+
if (*tok != SYMBOL)
return error("missing symbol");
-// p = (char *)tok[1];
p = string[tok[1]];
tok += 2;
{
rgpu = rdsp = 0;
// Switching from gpu/dsp sections should reset any ORG'd Address
- orgactive = 0;
+ orgactive = 0;
orgwarning = 0;
SaveSection();
SwitchSection(TEXT);
//
-// .gpu - Switch to GPU Assembler
+// .gpu - Switch to GPU assembler
//
int d_gpu(void)
{
// 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
//
-// .dsp - Switch to DSP Assembler
+// .dsp - Switch to DSP assembler
//
int d_dsp(void)
{
//
// .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)
{
if (*tok == SYMBOL)
{
-// p = (char *)tok[1];
p = string[tok[1]];
-#if 0
- if (*p == '.')
- env = curenv; // Label is local
- else
- 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)
return errors("multiply-defined label '%s'", p);
// Put symbol in "order of definition" list
- if (!(symbol->sattr & SDECLLIST))
- AddToSymbolOrderList(symbol);
+ AddToSymbolDeclarationList(symbol);
symbol->sattr |= (ABS | DEFINED | EQUATED);
symbol->svalue = eval;
if (reglist(&rlist) < 0)
return 0;
-// for(i=0; i++<16; rlist>>=1)
for(i=0; i<16; i++, rlist>>=1)
{
if (rlist & 1)
//
// .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.
return errors("multiply-defined label '%s'", symbolName);
// Put symbol in "order of definition" list
- if (!(symbol->sattr & SDECLLIST))
- AddToSymbolOrderList(symbol);
+ AddToSymbolDeclarationList(symbol);
tok += 2;
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)
+ {
+ char temperr[256];
+ sprintf(temperr, "unknown optimization flag '%s'", tmpstr);
+ return error(temperr);
+ }
+ }
+ else
+ return error(".opt directive needs every switch enclosed inside quotation marks");
+ }
+
+ return OK;
+}
+