//
#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
SYM * symbolPtr[1000000]; // Symbol pointers table
static long unused; // For supressing 'write' warnings
char buffer[256]; // Scratch buffer for messages
-
+int stringtype; // Non-zero if we need any special string conversions
+
+// 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_6502, // 2 .6502
d_68000, // 3 .68000
d_bss, // 4 bss
d_data, // 5 data
{
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;
-//printf("ORG: address = $%08X...\n", orgaddr);
+ 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;
}
//
int d_even(void)
{
+ if (m6502)
+ return error(in_6502mode);
+
unsigned skip = (rgpu || rdsp ? orgaddr : sloc) & 0x01;
if (skip)
//
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++;
+ }
}
int d_globl(void)
{
+ if (m6502)
+ return error(in_6502mode);
+
symlist(globl1);
return 0;
}
{
VALUE eval;
+ if (m6502)
+ return error(in_6502mode);
+
SaveSection();
if (*tok == EOL)
{
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)
{
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;
// 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) || cursect == M6502)
{
listvalue(eval);
eval *= siz;
sloc += eval;
+
+ if (cursect == M6502)
+ chptr += eval;
+
just_bss = 1; // No data deposited (8-bit CPU mode)
}
else
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 && (siz != SIZB) && (sloc & 1))
auto_even();
// Check to see if we're trying to set LONGS on a non 32-bit aligned
if ((challoc - ch_size) < i)
chcheck(i);
- for(p=string[tok[1]]; *p!=EOS; p++)
- D_byte(*p);
+ if (stringtype == NORMAL)
+ {
+ for(p=string[tok[1]]; *p!=EOS; p++)
+ D_byte(*p);
+ }
+ else if(stringtype == A8INT)
+ {
+ for(p=string[tok[1]]; *p!=EOS; p++)
+ D_byte(strtoa8[*p]);
+ }
+ else
+ {
+ error("String format not supported... yet");
+ }
+
tok += 2;
goto comma;
MarkRelocatable(cursect, sloc, tdb, MWORD, NULL);
// 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)
{
if (movei)
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);
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);
char * p;
VALUE eval;
+ if (m6502)
+ return error(in_6502mode);
+
if (*tok != SYMBOL)
return error("missing symbol");
projects / rmac / blobdiff