From 4b282d05039f6bfc1510c295f8e21a59846d7bfb Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin (Intel)" Date: Thu, 15 Aug 2019 11:53:19 -0700 Subject: macros: can't use the __USE_*__ macro string anymore; fix comment stripping Since we use 127 not 0 for end of line in stdmac packages now, we can't simply use the __USE_*__ macro as a string to test for a %use package. Keep an internal array of state instead. Fix the stripping of comments from lines in macro files. Signed-off-by: H. Peter Anvin (Intel) --- include/tables.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/tables.h b/include/tables.h index 24a665e2..2b36357e 100644 --- a/include/tables.h +++ b/include/tables.h @@ -49,7 +49,14 @@ extern const unsigned char nasm_stdmac_tasm[]; extern const unsigned char nasm_stdmac_nasm[]; extern const unsigned char nasm_stdmac_version[]; -const unsigned char *nasm_stdmac_find_package(const char *); + +struct use_package { + const char *package; + const unsigned char *macros; + int index; +}; +extern const struct use_package *nasm_find_use_package(const char *); +extern const int use_package_count; /* --- From insns.dat via insns.pl: --- */ -- cgit v1.2.1