5b7369d7e0
1. Error messages would issue with the line number of %endrep. 2. Debug line information would ignore both macros and reps. This is doubly wrong; macros are semantically equivalent to inline functions, and it is expected that debuggers trace into these functions. These changes finishes the last parts of moving all responsibility for the listing enable/disable into the preprocessor, so remove the way over-complicated macro inhibit facility from the listing module entirely. Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
118 lines
3.5 KiB
C
118 lines
3.5 KiB
C
/* ----------------------------------------------------------------------- *
|
|
*
|
|
* Copyright 1996-2020 The NASM Authors - All Rights Reserved
|
|
* See the file AUTHORS included with the NASM distribution for
|
|
* the specific copyright holders.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following
|
|
* conditions are met:
|
|
*
|
|
* * Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* * Redistributions in binary form must reproduce the above
|
|
* copyright notice, this list of conditions and the following
|
|
* disclaimer in the documentation and/or other materials provided
|
|
* with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
|
|
* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
|
|
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
|
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
|
|
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
|
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
|
|
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
|
|
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*
|
|
* ----------------------------------------------------------------------- */
|
|
|
|
/*
|
|
* srcfile.c - keep track of the current position in the input stream.
|
|
*
|
|
* This is used for error messages, listing, and debug information. In
|
|
* both cases we also want to understand where inside a non-nolist
|
|
* macro we may be.
|
|
*
|
|
* This hierarchy is a stack that is kept as a doubly-linked list, as
|
|
* we want to traverse it in either top-down order or bottom-up.
|
|
*/
|
|
|
|
#include "compiler.h"
|
|
|
|
|
|
#include "nasmlib.h"
|
|
#include "hashtbl.h"
|
|
#include "srcfile.h"
|
|
|
|
struct src_location_stack _src_top;
|
|
struct src_location_stack *_src_bottom = &_src_top;
|
|
struct src_location_stack *_src_error = &_src_top;
|
|
|
|
static struct hash_table filename_hash;
|
|
|
|
void src_init(void)
|
|
{
|
|
}
|
|
|
|
void src_free(void)
|
|
{
|
|
hash_free_all(&filename_hash, false);
|
|
}
|
|
|
|
/*
|
|
* Set the current filename, returning the old one. The input
|
|
* filename is duplicated if needed.
|
|
*/
|
|
const char *src_set_fname(const char *newname)
|
|
{
|
|
struct hash_insert hi;
|
|
const char *oldname;
|
|
void **dp;
|
|
|
|
if (newname) {
|
|
dp = hash_find(&filename_hash, newname, &hi);
|
|
if (dp) {
|
|
newname = (const char *)(*dp);
|
|
} else {
|
|
newname = nasm_strdup(newname);
|
|
hash_add(&hi, newname, (void *)newname);
|
|
}
|
|
}
|
|
|
|
oldname = _src_bottom->l.filename;
|
|
_src_bottom->l.filename = newname;
|
|
return oldname;
|
|
}
|
|
|
|
void src_set(int32_t line, const char *fname)
|
|
{
|
|
src_set_fname(fname);
|
|
src_set_linnum(line);
|
|
}
|
|
|
|
void src_macro_push(const void *macro, struct src_location where)
|
|
{
|
|
struct src_location_stack *sl;
|
|
|
|
nasm_new(sl);
|
|
sl->l = where;
|
|
sl->macro = macro;
|
|
sl->up = _src_bottom;
|
|
_src_bottom->down = sl;
|
|
_src_bottom = sl;
|
|
}
|
|
|
|
void src_macro_pop(void)
|
|
{
|
|
struct src_location_stack *sl = _src_bottom;
|
|
|
|
_src_bottom = sl->up;
|
|
_src_bottom->down = NULL;
|
|
|
|
nasm_free(sl);
|
|
}
|