listing: move the setting of options to one function

Disentangle the list option setting from the list option
checking. This makes the code simpler for the compiler to grok, and
centralizing code is usually a good idea.

The option setting is hardly performance critical anyway.

Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>

Author: H. Peter Anvin (Intel)

asm/listing.c

@@ -349,29 +349,37 @@ static void list_set_offset(uint64_t offset)
     listoffset = offset;
 }
 
-static void list_update_options(const char *str)
+/*
+ * from_cmdline is passed in to handle -L+ -> LIST_PLUS_OPTIONS,
+ * and to prevent active_list_options from being set (that will
+ * be done when list_init() is called.)
+ *
+ * As listing options are assumed non-critical, ignore errors
+ * to help forward compatibility.
+ */
+void list_update_options(const char *str, bool from_cmdline)
 {
-    bool state = true;
     unsigned char c;
-    uint64_t mask;
+    uint64_t setmask = LIST_ALL_OPTIONS_MASK;
+    uint64_t amask   = from_cmdline ? 0 : setmask;
 
     while ((c = *str++)) {
+        uint64_t mask = 0;
         switch (c) {
         case '+':
-            state = true;
+            if (from_cmdline && setmask)
+                list_update_options(LIST_PLUS_OPTIONS, true);
+            setmask = LIST_ALL_OPTIONS_MASK;
             break;
         case '-':
-            state = false;
+            setmask = 0;
             break;
         default:
             mask = list_option_mask(c);
-            if (state) {
-                list_options |= mask;
-                active_list_options |= mask;
-            } else {
-                list_options &= ~mask;
-                active_list_options &= ~mask;
-            }
+            list_options = (list_options & ~mask) | (setmask & mask);
+            active_list_options =
+                (active_list_options & ~mask) |
+                (setmask & amask & mask);
             break;
         }
     }
@@ -381,7 +389,7 @@ enum directive_result list_pragma(const struct pragma *pragma)
 {
     switch (pragma->opcode) {
     case D_OPTIONS:
-        list_update_options(pragma->tail);
+        list_update_options(pragma->tail, false);
         return DIRR_OK;
 
     default:

asm/listing.h

@@ -10,6 +10,9 @@
 
 #include "nasm.h"
 
+/* List options implied by -L+ */
+#define LIST_PLUS_OPTIONS "bdefFmps"
+
 /*
  * List-file generators should look like this:
  */
@@ -107,13 +110,10 @@ extern uint64_t list_options, active_list_options;
  * This isn't particularly efficient code, but just about every
  * instance of it should be fed a constant, so the entire function can
  * be precomputed at compile time. The only cases where the full
- * computation is needed is when parsing the -L option or %pragma list
- * options, neither of which is in any way performance critical.
- *
- * The character + represents ALL listing options except -Lw (flush
- * after every line.)
+ * computation is needed is in list_update_options(), which is not
+ * performance critical.
  */
-static inline const_func uint64_t list_option_mask_val(unsigned char x)
+static inline const_func uint64_t list_option_mask(unsigned char x)
 {
     if (x >= 'a') {
         if (x > 'z')
@@ -134,18 +134,7 @@ static inline const_func uint64_t list_option_mask_val(unsigned char x)
     return UINT64_C(1) << x;
 }
 
-static inline const_func uint64_t list_option_mask(unsigned char x)
-{
-    if (x == '+') {
-        const char *p = "bdefFmps";
-        uint64_t v = 0;
-        while (*p)
-            v |= list_option_mask_val(*p++);
-        return v;
-    } else {
-        return list_option_mask_val(x);
-    }
-}
+#define LIST_ALL_OPTIONS_MASK (~UINT64_C(3))
 
 /* Return true if the listing engine is active and a certain option is set. */
 static inline pure_func bool list_option(unsigned char x)
@@ -165,6 +154,9 @@ static inline pure_func bool list_active(void)
     return (active_list_options & 1);
 }
 
+/* Change listing options */
+void list_update_options(const char *str, bool from_cmdline);
+
 /* Pragma handler */
 enum directive_result list_pragma(const struct pragma *);
 

asm/nasm.c

@@ -1052,10 +1052,8 @@ static bool process_arg(char *p, char *q, int pass)
             break;
 
         case 'L':        /* listing options */
-            if (pass == 2) {
-                while (*param)
-                    list_options |= list_option_mask(*param++);
-            }
+            if (pass == 2)
+                list_update_options(param, true);
             break;
 
         case 'Z':       /* error messages file */