X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=direct.c;h=a7368550bd82857811166b1aa6956cfe59889d71;hp=e9eb8ac3aa6b8dde78fffae0ddc943893a59f64c;hb=732c626abe986e60ea947bd65cad4a4a1b84e800;hpb=0d4ab16ff12046dfaf5f51dc0add2a9bbe777573

diff --git a/direct.c b/direct.c
index e9eb8ac..a736855 100644
--- a/direct.c
+++ b/direct.c
@@ -7,32 +7,71 @@
 //
 
 #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
 
+// 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
@@ -141,10 +180,8 @@ int d_org(void)
 {
 	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)
 	{
@@ -152,9 +189,32 @@ int d_org(void)
 		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;
 }
@@ -467,6 +527,9 @@ static inline void SkipBytes(unsigned bytesToSkip)
 //
 int d_even(void)
 {
+	if (m6502)
+		return error(in_6502mode);
+
 	unsigned skip = (rgpu || rdsp ? orgaddr : sloc) & 0x01;
 
 	if (skip)
@@ -562,13 +625,16 @@ int d_qphrase(void)
 //
 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++;
+	}
 }
 
 
@@ -737,6 +803,9 @@ int globl1(char * p)
 
 int d_globl(void)
 {
+	if (m6502)
+		return error(in_6502mode);
+
 	symlist(globl1);
 	return 0;
 }
@@ -770,6 +839,9 @@ int d_abs(void)
 {
 	VALUE eval;
 
+	if (m6502)
+		return error(in_6502mode);
+
 	SaveSection();
 
 	if (*tok == EOL)
@@ -790,6 +862,8 @@ 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)
 	{
@@ -805,6 +879,8 @@ int d_data(void)
 {
 	if (rgpu || rdsp)
 		return error("directive forbidden in gpu/dsp mode");
+	else if (m6502)
+		return error(in_6502mode);
 
 	if (cursect != DATA)
 	{
@@ -820,6 +896,8 @@ int d_bss(void)
 {
 	if (rgpu || rdsp)
 		return error("directive forbidden in gpu/dsp mode");
+	else if (m6502)
+		return error(in_6502mode);
 
 	if (cursect != BSS)
 	{
@@ -840,25 +918,34 @@ int d_ds(WORD siz)
 
 	VALUE eval;
 
-	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)
-	if (eval < 0)
+	// 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)
+	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
@@ -884,7 +971,7 @@ int d_dc(WORD siz)
 		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
@@ -897,15 +984,27 @@ int d_dc(WORD siz)
 	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))
 		{
 			uint32_t i = strlen(string[tok[1]]);
 
 			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;
@@ -971,11 +1070,17 @@ int d_dc(WORD siz)
 					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)
@@ -1030,7 +1135,7 @@ int d_dcb(WORD siz)
 	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);
@@ -1160,11 +1265,18 @@ int dep_block(VALUE count, WORD siz, VALUE eval, WORD eattr, TOKEN * 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);
@@ -1195,6 +1307,9 @@ int d_comm(void)
 	char * p;
 	VALUE eval;
 
+	if (m6502)
+		return error(in_6502mode);
+
 	if (*tok != SYMBOL)
 		return error("missing symbol");