Fix for bug #71 (thanks to ggn for reporting! :-)

[rmac] / direct.c

diff --git a/direct.c b/direct.c
index e96aacb687d570c9fa85e5eecf487a453f4b312b..c0b5be5cd83ed46279b9d0f7998a28432efe81bc 100644 (file)
--- 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
@@ -91,6 +91,48 @@ int (*dirtab[])() = {
 };
 
 
+//
+// .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 +814,7 @@ int d_bss(void)
 //
 int d_ds(WORD siz)
 {
-if (debug)
-       printf("Directive: .ds.[size] = %u, sloc = $%X\n", siz, sloc);
+       DEBUG { printf("Directive: .ds.[size] = %u, sloc = $%X\n", siz, sloc); }
 
        VALUE eval;
 
@@ -955,6 +996,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");