aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorH. Peter Anvin (Intel) <hpa@zytor.com>2019-08-15 11:53:19 -0700
committerH. Peter Anvin (Intel) <hpa@zytor.com>2019-08-15 11:53:19 -0700
commit4b282d05039f6bfc1510c295f8e21a59846d7bfb (patch)
treec3dc36045a17712b2285f03fd5f2fe4095968478 /include
parent6d5c77c95fcbc582de14ed3ebce19e7cd462acb8 (diff)
downloadnasm-4b282d05039f6bfc1510c295f8e21a59846d7bfb.tar.gz
nasm-4b282d05039f6bfc1510c295f8e21a59846d7bfb.tar.xz
nasm-4b282d05039f6bfc1510c295f8e21a59846d7bfb.zip
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) <hpa@zytor.com>
Diffstat (limited to 'include')
-rw-r--r--include/tables.h9
1 files changed, 8 insertions, 1 deletions
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: --- */