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>

3 files changed, 41 insertions, 25 deletions

diff --git a/asm/preproc.c b/asm/preproc.c
index 251768ee..24deb2d7 100644
--- a/asm/preproc.c
+++ b/asm/preproc.c
@@ -444,6 +444,11 @@ static macros_t *stdmacros[8];
 static macros_t *extrastdmac;
 
 /*
+ * Map of which %use packages have been loaded
+ */
+static bool *use_loaded;
+
+/*
  * Tokens are allocated in blocks to improve speed
  */
 #define TOKEN_BLOCKSIZE 4096
@@ -2872,8 +2877,7 @@ static int do_directive(Token *tline, Token **output)
 
     case PP_USE:
     {
-        static macros_t *use_pkg;
-        const char *pkg_macro = NULL;
+        const struct use_package *pkg;
 
         if (!(mname = get_id(&tline, dname, "package name")))
             goto done;
@@ -2881,18 +2885,17 @@ static int do_directive(Token *tline, Token **output)
             nasm_warn(WARN_OTHER, "trailing garbage after `%s' ignored", dname);
         if (tline->type == TOK_STRING)
             nasm_unquote_cstr(tline->text, NULL);
-        use_pkg = nasm_stdmac_find_package(tline->text);
-        if (!use_pkg)
+        pkg = nasm_find_use_package(tline->text);
+        if (!pkg) {
             nasm_nonfatal("unknown `%s' package: %s", dname, tline->text);
-        else
-            pkg_macro = (char *)use_pkg + 1; /* The first string will be <%define>__USE_*__ */
-        if (use_pkg && ! smacro_defined(NULL, pkg_macro, 0, NULL, true)) {
+        } else if (!use_loaded[pkg->index]) {
             /*
              * Not already included, go ahead and include it.
              * Treat it as an include file for the purpose of
              * producing a listing.
              */
-            stdmacpos = use_pkg;
+            use_loaded[pkg->index] = true;
+            stdmacpos = pkg->macros;
             nasm_new(inc);
             inc->next = istk;
             inc->fname = src_set_fname(NULL);
@@ -5293,6 +5296,10 @@ pp_reset(const char *file, enum preproc_mode mode, struct strlist *dep_list)
     deplist = dep_list;
     pp_mode = mode;
 
+    if (!use_loaded)
+        use_loaded = nasm_malloc(use_package_count * sizeof(bool));
+    memset(use_loaded, 0, use_package_count * sizeof(bool));
+
     /* First set up the top level input file */
     nasm_new(istk);
     istk->fp = nasm_open_read(file, NF_TEXT);
@@ -5651,6 +5658,7 @@ static void pp_cleanup_pass(void)
 
 static void pp_cleanup_session(void)
 {
+    nasm_free(use_loaded);
     free_llist(predef);
     predef = NULL;
     delete_Blocks();
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: --- */
 
diff --git a/macros/macros.pl b/macros/macros.pl
index eb79d1ee..59f19c91 100755
--- a/macros/macros.pl
+++ b/macros/macros.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 ## --------------------------------------------------------------------------
-##   
+##
 ##   Copyright 1996-2009 The NASM Authors - All Rights Reserved
 ##   See the file AUTHORS included with the NASM distribution for
 ##   the specific copyright holders.
@@ -15,7 +15,7 @@
 ##     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
@@ -150,10 +150,11 @@ foreach $args ( @ARGV ) {
 		chomp;
 		$line++;
 	    }
-	    s/^\s*(|\S|\S.*\S|)\s*(\;([^\"\']|\"[^\"]*\"|\'[^\']*\')*|)$/$1/;
+	    s/^\s*(([^\'\"\;]|\"[^\"]*\"|\'[^\']*\')*?)\s*(\;.*)?$/$1/;
 	    s/\s+/ /g;
 	    next if ($_ eq '');
-	    print '"',$_, "\"\n";
+
+	    print "\"", $_, "\"\n";
 
 	    if (m/^OUT:\s*(\S.*)$/) {
 		undef $pkg;
@@ -215,7 +216,7 @@ foreach $args ( @ARGV ) {
 		if (!defined($name)) {
 		    die "$0: $fname: macro declarations outside a known block\n";
 		}
-		
+
 		$s1 = $_;
 		$s2 = '';
 		while ($s1 =~ /(\%[a-zA-Z_][a-zA-Z0-9_]*)((\s+)(.*)|)$/) {
@@ -234,7 +235,7 @@ foreach $args ( @ARGV ) {
 		    if ($lastname ne $fname) {
 			print OUT "\n    /* From $fname */\n";
 			$lastname = $fname;
-		    }	
+		    }
 		    printf OUT "        /* %4d */ %sEOL,\n",
 			$index, charcify($s2);
 		    $index += length($s2)+1;
@@ -260,15 +261,15 @@ verify_hash_table(\%pkg_number, \@hashinfo);
 my ($n, $sv, $g) = @hashinfo;
 die if ($n & ($n-1));
 
-print OUT "const unsigned char *nasm_stdmac_find_package(const char *package)\n";
+printf OUT "const int use_package_count = %d;\n\n", $npkg;
+
+print OUT "const struct use_package *nasm_find_use_package(const char *name)\n";
 print OUT "{\n";
-print OUT "    static const struct {\n";
-print OUT "         const char *package;\n";
-print OUT "         const unsigned char *macros;\n";
-print OUT "    } packages[$npkg] = {\n";
+print OUT "    static const struct use_package packages[$npkg] = {\n";
+my $ix = 0;
 foreach $pkg (@pkg_list) {
-    printf OUT "        { \"%s\", nasm_usemac_%s },\n",
-	$pkg, $pkg;
+    printf OUT "        { \"%s\", nasm_usemac_%s, %d },\n",
+	$pkg, $pkg, $ix++;
 }
 print OUT "    };\n";
 
@@ -298,7 +299,7 @@ print OUT  "    uint64_t crc;\n";
 print OUT  "    uint16_t ix;\n";
 print OUT  "\n";
 
-printf OUT "    crc = crc64i(UINT64_C(0x%08x%08x), package);\n",
+printf OUT "    crc = crc64i(UINT64_C(0x%08x%08x), name);\n",
     $$sv[0], $$sv[1];
 print  OUT "    k1 = (uint32_t)crc;\n";
 print  OUT "    k2 = (uint32_t)(crc >> 32);\n";
@@ -307,10 +308,10 @@ printf OUT "    ix = hash1[k1 & 0x%x] + hash2[k2 & 0x%x];\n", $n-1, $n-1;
 printf OUT "    if (ix >= %d)\n", scalar(@pkg_list);
 print OUT  "        return NULL;\n";
 print OUT  "\n";
-print OUT  "    if (nasm_stricmp(packages[ix].package, package))\n";
+print OUT  "    if (nasm_stricmp(packages[ix].package, name))\n";
 print OUT  "        return NULL;\n";
 print OUT  "\n";
-print OUT  "    return packages[ix].macros;\n";
+print OUT  "    return &packages[ix];\n";
 print OUT  "}\n";
 
 close(OUT);