mirror/nasm
2
0
Fork 0
mirror of https://github.com/netwide-assembler/nasm.git synced 2025-03-31 18:20:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

BR3074517: Print %macro name inside %rep blocks

Browse Source 
If we're to print inside %rep block we should find
out which %macro it belongs.

Reported-by: Rob Neff
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
This commit is contained in:
Cyrill Gorcunov 2010-09-24 15:24:42 +04:00
parent db6975919c
commit 71787fda1b
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
preproc.c
View File

@ -4746,12 +4746,22 @@ static int expand_mmacro(Token * tline)
static void verror(int severity, const char *fmt, va_list arg)
{
char buff[1024];
MMacro *mmac = NULL;
int delta = 0;
vsnprintf(buff, sizeof(buff), fmt, arg);
if (istk && istk->mstk && istk->mstk->name)
nasm_error(severity, "(%s:%d) %s", istk->mstk->name,
istk->mstk->lineno, buff);
/* get %macro name */
if (istk && istk->mstk) {
mmac = istk->mstk;
/* but %rep blocks should be skipped */
while (mmac && !mmac->name)
mmac = mmac->next_active, delta++;
}
if (mmac)
nasm_error(severity, "(%s:%d) %s",
mmac->name, mmac->lineno - delta, buff);
else
nasm_error(severity, "%s", buff);
}