1 files changed, 44 insertions, 38 deletions

diff --git a/asm/nasm.c b/asm/nasm.c
index 557484c1..69a3db55 100644
--- a/asm/nasm.c
+++ b/asm/nasm.c
@@ -1933,14 +1933,39 @@ static fatal_func die_hard(errflags true_type, errflags severity)
 }
 
 /*
+ * Returns the struct src_location appropriate for use, after some
+ * potential filename mangling.
+ */
+static struct src_location error_where(errflags severity)
+{
+    struct src_location where;
+
+    if (severity & ERR_NOFILE) {
+        where.filename = NULL;
+        where.lineno = 0;
+    } else {
+        where = src_where_error();
+
+        if (!where.filename) {
+            where.filename =
+            inname && inname[0] ? inname :
+                outname && outname[0] ? outname :
+                NULL;
+            where.lineno = 0;
+        }
+    }
+
+    return where;
+}
+
+/*
  * error reporting for critical and panic errors: minimize
  * the amount of system dependencies for getting a message out,
  * and in particular try to avoid memory allocations.
  */
 fatal_func nasm_verror_critical(errflags severity, const char *fmt, va_list args)
 {
-    const char *currentfile = no_file_name;
-    int32_t lineno = 0;
+    struct src_location where;
     errflags true_type = severity & ERR_MASK;
     static bool been_here = false;
 
@@ -1949,22 +1974,15 @@ fatal_func nasm_verror_critical(errflags severity, const char *fmt, va_list args
 
     been_here = true;
 
-    if (!(severity & ERR_NOFILE)) {
-        src_get(&lineno, &currentfile);
-        if (!currentfile) {
-            currentfile =
-                inname && inname[0] ? inname :
-                outname && outname[0] ? outname :
-                no_file_name;
-                lineno = 0;
-        }
-    }
+    where = error_where(severity);
+    if (!where.filename)
+        where.filename = no_file_name;
 
     fputs(error_pfx_table[severity], error_file);
-    fputs(currentfile, error_file);
-    if (lineno) {
+    fputs(where.filename, error_file);
+    if (where.lineno) {
         fprintf(error_file, "%s%"PRId32"%s",
-                errfmt->beforeline, lineno, errfmt->afterline);
+                errfmt->beforeline, where.lineno, errfmt->afterline);
     }
     fputs(errfmt->beforemsg, error_file);
     vfprintf(error_file, fmt, args);
@@ -1978,11 +1996,10 @@ fatal_func nasm_verror_critical(errflags severity, const char *fmt, va_list args
  */
 struct nasm_errtext {
     struct nasm_errtext *next;
-    const char *currentfile;    /* Owned by the filename system */
     char *msg;                  /* Owned by this structure */
+    struct src_location where;  /* Owned by the srcfile system */
     errflags severity;
     errflags true_type;
-    int32_t lineno;
 };
 struct nasm_errhold {
     struct nasm_errhold *up;
@@ -2067,17 +2084,7 @@ void nasm_verror(errflags severity, const char *fmt, va_list args)
     et->severity = severity;
     et->true_type = true_type;
     et->msg = nasm_vasprintf(fmt, args);
-    if (!(severity & ERR_NOFILE)) {
-        src_get(&et->lineno, &et->currentfile);
-
-        if (!et->currentfile) {
-            et->currentfile =
-                inname && inname[0] ? inname :
-                outname && outname[0] ? outname :
-                NULL;
-            et->lineno = 0;
-        }
-    }
+    et->where = error_where(severity);
 
     if (errhold_stack && true_type <= ERR_NONFATAL) {
         /* It is a tentative error */
@@ -2109,8 +2116,7 @@ static void nasm_issue_error(struct nasm_errtext *et)
     char linestr[64];           /* Formatted line number if applicable */
     const errflags severity  = et->severity;
     const errflags true_type = et->true_type;
-    const char * const currentfile = et->currentfile;
-    const uint32_t lineno = et->lineno;
+    const struct src_location where = et->where;
 
     if (severity & ERR_NO_SEVERITY)
         pfx = "";
@@ -2129,17 +2135,17 @@ static void nasm_issue_error(struct nasm_errtext *et)
     }
 
     *linestr = 0;
-    if (lineno) {
+    if (where.lineno) {
         snprintf(linestr, sizeof linestr, "%s%"PRId32"%s",
-                 errfmt->beforeline, lineno, errfmt->afterline);
+                 errfmt->beforeline, where.lineno, errfmt->afterline);
     }
 
     if (!skip_this_pass(severity)) {
-        const char *file = currentfile ? currentfile : no_file_name;
+        const char *file = where.filename ? where.filename : no_file_name;
         const char *here = "";
 
         if (severity & ERR_HERE) {
-            here = currentfile ? " here" : " in an unknown location";
+            here = where.filename ? " here" : " in an unknown location";
         }
 
         if (warn_list && true_type < ERR_NONFATAL &&
@@ -2176,12 +2182,12 @@ static void nasm_issue_error(struct nasm_errtext *et)
      * pass1 or preprocessor warnings in the list file
      */
     if (severity & ERR_HERE) {
-        if (lineno)
+        if (where.lineno)
             lfmt->error(severity, "%s%s at %s:%"PRId32"%s",
-                        pfx, et->msg, currentfile, lineno, warnsuf);
-        else if (currentfile)
+                        pfx, et->msg, where.filename, where.lineno, warnsuf);
+        else if (where.filename)
             lfmt->error(severity, "%s%s in file %s%s",
-                        pfx, et->msg, currentfile, warnsuf);
+                        pfx, et->msg, where.filename, warnsuf);
         else
             lfmt->error(severity, "%s%s in an unknown location%s",
                         pfx, et->msg, warnsuf);