X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=direct.c;h=dc44e8e62371b5b5eb72229801c8800bd347fdf6;hp=750d5873444f38f9a542566c838230d9fb79ddbe;hb=3c68061b9cd5cc9b67d602f3f5b621efe1e844d8;hpb=71cec8e7896b200c6ae63ebc428339bef147240a

diff --git a/direct.c b/direct.c
index 750d587..dc44e8e 100644
--- a/direct.c
+++ b/direct.c
@@ -77,8 +77,8 @@ int (*dirtab[])() = {
 	d_title,			// 44 title
 	d_subttl,			// 45 subttl
 	eject,				// 46 eject
-	d_unimpl,			// 47 error
-	d_unimpl,			// 48 warn
+	d_error,			// 47 error 
+	d_warn,				// 48 warn 
 	d_noclear,			// 49 .noclear
 	d_equrundef,		// 50 .equrundef/.regundef
 	d_ccundef,			// 51 .ccundef
@@ -88,9 +88,52 @@ int (*dirtab[])() = {
 	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
 //
@@ -772,8 +815,7 @@ int d_bss(void)
 //
 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;
 
@@ -790,9 +832,14 @@ if (verb_flag)
 	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)
+		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....
+	// of zeroed memory....
 	if (scattr & SBSS)
 	{
 		listvalue(eval);
@@ -955,6 +1002,8 @@ int d_dcb(WORD siz)
 	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");
 
@@ -1541,3 +1590,30 @@ int d_gpumain(void)
 	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 optimisation flag '%s'", tmpstr);
+				return error(temperr);
+			}
+		}
+		else
+			return error(".opt directive needs every switch enclosed inside quotation marks");
+	}
+
+	return OK;
+}
+