Updating compiler to commit dabfa73 from upstream dated Oct 1 2016. These changes...

[inform.git] / asm.c

diff --git a/asm.c b/asm.c
index a14493984a1203a2332f2038b7cb425953b7782a..d3a9d995b8cb13d2d9eadd5fd2486ce9269e288f 100644 (file)
--- a/asm.c
+++ b/asm.c
@@ -1423,9 +1423,8 @@ extern int32 assemble_routine_header(int no_locals,
       stackargs = TRUE;
     }
 
       stackargs = TRUE;
     }
 

-    if (veneer_mode) routine_starts_line = -1;
-    else routine_starts_line = ErrorReport.line_number
-             + FILE_LINE_SCALE_FACTOR*ErrorReport.file_number;
+    if (veneer_mode) routine_starts_line = blank_brief_location;
+    else routine_starts_line = get_brief_location(&ErrorReport);

 
     if (asm_trace_level > 0)
     {   printf("\n%5d  +%05lx  [ %s ", ErrorReport.line_number,
 
     if (asm_trace_level > 0)
     {   printf("\n%5d  +%05lx  [ %s ", ErrorReport.line_number,