mirror/nasm
2
0
Fork 0
mirror of https://github.com/netwide-assembler/nasm.git synced 2024-11-21 03:14:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into elfmerge

Browse Source
This commit is contained in:
H. Peter Anvin 2016-02-17 20:33:40 -08:00
commit b2bfb580df
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/changes.src
View File

@ -32,6 +32,9 @@ since 2007.
relocations are zero-extended from 32-bits with a warning
(suppressible via \c{}); signed 64-bit relocations are an arror.
\b Line numbers in list files now correspond to the lines in the source
files, instead of simply being sequential.
\S{cl-2.11.09} Version 2.11.09
\b Fix potential stack overwrite in \c{macho32} backend.

12
listing.c
View File

@ -89,7 +89,7 @@ static void list_emit(void)
if (!listlinep && !listdata[0])
return;
fprintf(listfp, "%6"PRId32" ", ++listlineno);
fprintf(listfp, "%6"PRId32" ", listlineno);
if (listdata[0])
fprintf(listfp, "%08"PRIX32" %-*s", listoffset, LIST_HEXBIT + 1,
@ -111,7 +111,7 @@ static void list_emit(void)
listdata[0] = '\0';
if (listerror[0]) {
fprintf(listfp, "%6"PRId32" ", ++listlineno);
fprintf(listfp, "%6"PRId32" ", listlineno);
for (i = 0; i < LIST_HEXBIT; i++)
putc('*', listfp);
@ -248,10 +248,9 @@ static void list_line(int type, char *line)
{
if (!listp)
return;
if (user_nolist) { /* fbk - 9/2/00 */
listlineno++;
return;
}
if (user_nolist)
return;
if (mistack && mistack->inhibiting) {
if (type == LIST_MACRO)
@ -263,6 +262,7 @@ static void list_line(int type, char *line)
}
}
list_emit();
listlineno = src_get_linnum();
listlinep = true;
strncpy(listline, line, LIST_MAX_LEN - 1);
listline[LIST_MAX_LEN - 1] = '\0';