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

preproc: Pass include paths as strlist

Browse Source 
Instead of copying data just reuse already
allocated paths.

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
This commit is contained in:
Cyrill Gorcunov 2018-11-24 14:33:48 +03:00
parent b7bb5acdaf
commit 8c0666b0e6
4 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
asm/nasm.c
View File

@ -328,18 +328,11 @@ static void define_macros(void)
* Command-line specified preprocessor directives (-p, -d, -u,
* --pragma, --before) are processed after this function.
*/
static void preproc_init(struct strlist **ipath)
static void preproc_init(struct strlist *ipath)
{
struct strlist_entry *l;
preproc->init();
define_macros();
list_for_each(l, (*ipath)->head)
preproc->include_path(l->str);
strlist_free(*ipath);
*ipath = strlist_alloc();
preproc->include_path(ipath);
}
static void emit_dependencies(struct strlist *list)
@ -503,7 +496,7 @@ int main(int argc, char **argv)
}
}
preproc_init(&include_path);
preproc_init(include_path);
parse_cmdline(argc, argv, 2);
if (terminate_after_phase) {

4
asm/preproc-nop.c
View File

@ -170,9 +170,9 @@ static void nop_pre_command(const char *what, char *string)
(void)string;
}
static void nop_include_path(const char *path)
static void nop_include_path(struct strlist *list)
{
(void)path;
(void)list;
}
static void nop_error_list_macros(int severity)

17
asm/preproc.c
View File

@ -386,7 +386,7 @@ static int LocalOffset = 0;
static Context *cstk;
static Include *istk;
static struct strlist *ipath;
static const struct strlist *ipath_list;
static int pass; /* HACK: pass 0 = generate dependencies only */
static struct strlist *deplist;
@ -1501,12 +1501,15 @@ enum incopen_mode {
static FILE *inc_fopen_search(const char *file, char **slpath,
enum incopen_mode omode, enum file_flags fmode)
{
const struct strlist_entry *ip = NULL;
FILE *fp;
const char *prefix = "";
const struct strlist_entry *ip = ipath->head;
char *sp;
bool found;
if (ipath_list)
ip = ipath_list->head;
while (1) {
sp = nasm_catfile(prefix, file);
if (omode == INC_PROBE) {
@ -4993,7 +4996,6 @@ pp_reset(const char *file, int apass, struct strlist *dep_list)
static void pp_init(void)
{
hash_init(&FileHash, HASH_MEDIUM);
ipath = strlist_alloc();
}
static char *pp_getline(void)
@ -5261,16 +5263,13 @@ static void pp_cleanup(int pass)
predef = NULL;
delete_Blocks();
freeTokens = NULL;
strlist_free(ipath);
ipath_list = NULL;
}
}
static void pp_include_path(const char *path)
static void pp_include_path(struct strlist *list)
{
if (!path)
path = "";
strlist_add(ipath, path);
ipath_list = list;
}
static void pp_pre_include(char *fname)

2
include/nasm.h
View File

@ -362,7 +362,7 @@ struct preproc_ops {
void (*pre_command)(const char *what, char *str);
/* Include path from command line */
void (*include_path)(const char *path);
void (*include_path)(struct strlist *ipath);
/* Unwind the macro stack when printing an error message */
void (*error_list_macros)(int severity);