//
-// RMAC - Reboot's Macro Assembler for all Atari computers
+// RMAC - Renamed Macro Assembler for all Atari computers
// ERROR.C - Error Handling
-// Copyright (C) 199x Landon Dyer, 2011-2018 Reboot and Friends
+// Copyright (C) 199x Landon Dyer, 2011-2021 Reboot and Friends
// RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
// Source utilised with the kind permission of Landon Dyer
//
#include "error.h"
#include <stdarg.h>
+#include <token.h>
#include "listing.h"
-#include "token.h"
-
+char * interror_msg[] = {
+ "Unknown internal error", // Error not referenced, should not be displayed
+ "Unknown internal error", // Error not referenced, should not be displayed
+ "Bad MULTX entry in chrtab", // Error #2
+ "Unknown internal error", // Error not referenced, should not be displayed
+ "Bad fixup type", // Error #4
+ "Bad operator in expression stream", // Error #5
+ "Can't find generated code in section", // Error #6
+ "Fixup (loc) out of range", // Error #7
+ "Absolute top filename found", // Error #8
+ "The RISC expression evaluator blew up, sorry" // Error #9
+};
+
+// Exported variables
int errcnt; // Error count
char * err_fname; // Name of error message file
+// Internal variables
static long unused; // For supressing 'write' warnings
-
//
// Report error if not at EOL
+//
// N.B.: Since this should *never* happen, we can feel free to add whatever
// diagnostics that will help in tracking down a problem to this function.
//
-int at_eol(void)
+int ErrorIfNotAtEOL(void)
{
if (*tok != EOL)
{
return 0;
}
-
//
// Cannot create a file
//
-void cantcreat(const char * fn)
+void CantCreateFile(const char * fn)
{
- printf("cannot create: '%s'\n", fn);
+ printf("Cannot create file: '%s'\n", fn);
exit(1);
}
-
//
// Setup for error message
// o Create error listing file (if necessary)
err_fname = NULL;
if ((err_fd = open(fnbuf, _OPEN_FLAGS, _PERM_MODE)) < 0)
- cantcreat(fnbuf);
+ CantCreateFile(fnbuf);
err_flag = 1;
}
}
-
//
// Display error message (uses printf() style variable arguments)
//
sprintf(buf1, "%s %d: Error: %s\n", curfname, curlineno, buf);
break;
case SRC_IMACRO:
- sprintf(buf1, "%s %d: Error: %s\n", curfname, cur_inobj->inobj.imacro->im_macro->lineList->lineno, buf);
+ {
+ // This is basically SetFilenameForErrorReporting() but we don't
+ // call it here as it will clobber curfname. That function is used
+ // during fixups only so it really doesn't matter at that point...
+ char * filename;
+ FILEREC * fr;
+ uint16_t fnum = cur_inobj->inobj.imacro->im_macro->cfileno;
+
+ // Check for absolute top filename (this should never happen)
+ if (fnum == -1)
+ interror(8);
+ else
+ {
+ fr = filerec;
+
+ // Advance to the correct record...
+ while (fr != NULL && fnum != 0)
+ {
+ fr = fr->frec_next;
+ fnum--;
+ }
+ }
+ // Check for file # record not found (this should never happen either)
+ if (fr == NULL)
+ interror(8);
+
+ filename = fr->frec_name;
+
+ sprintf(buf1, "%s %d: Error: %s\nCalled from: %s %d\n", filename, cur_inobj->inobj.imacro->im_macro->lineList->lineno, buf,
+ curfname, curlineno);
+ }
break;
case SRC_IREPT:
sprintf(buf1, "%s %d: Error: %s\n", curfname, cur_inobj->inobj.irept->lineno, buf);
return ERROR;
}
-
//
// Display warning message (uses printf() style variable arguments)
//
return OK;
}
-
int fatal(const char * s)
{
char buf[EBUFSIZ];
exit(1);
}
-
int interror(int n)
{
char buf[EBUFSIZ];
err_setup();
- sprintf(buf, "%s %d: Internal error #%d\n", curfname, curlineno, n);
+ sprintf(buf, "%s %d: Internal error #%d: %s\n", curfname, curlineno, n, interror_msg[n]);
if (listing > 0)
ship_ln(buf);
exit(1);
}
-