Merge branch 'master' into fix-6

Author: Yongjie2017

SubmittingPatches

@@ -6,10 +6,10 @@ Actually the rules are pretty simple
 Obtaining the source code
 -------------------------
 
-The NASM sources are tracked by Git SCM at http://repo.or.cz/w/nasm.git
+The NASM sources are tracked by Git SCM at https://github.com/netwide-assembler/nasm.git
 repository. You either could download packed sources or use git tool itself
 
-        git clone git://repo.or.cz/nasm.git
+        git clone https://github.com/netwide-assembler/nasm.git
 
 Changin the source code
 -----------------------

asm/eval.c

@@ -736,6 +736,7 @@ static expr *eval_strfunc(enum strfunc type, const char *name)
     }
 
     val = readstrnum(string, string_len, &rn_warn);
+    nasm_free(string);
     if (parens) {
         scan();
         if (tt != ')') {

asm/listing.c

@@ -21,7 +21,7 @@
 
 static const char xdigit[] = "0123456789ABCDEF";
 
-#define HEX(a,b) (*(a)=xdigit[((b)>>4)&15],(a)[1]=xdigit[(b)&15]);
+#define HEX(a,b) (*(a)=xdigit[((b)>>4)&15],(a)[1]=xdigit[(b)&15])
 
 uint64_t list_options, active_list_options;
 bool user_nolist;

asm/parser.c

@@ -1202,7 +1202,8 @@ insn *parse_line(char *buffer, insn *result, const int bits)
                 i = tokval.t_type;
             }
             if (!recover && i != 0 && i != ',') {
-                nasm_nonfatal("comma, decorator or end of line expected, got %d", i);
+                nasm_nonfatal("comma, decorator or end of line expected, got `%*s'",
+                              (int)tokval.t_len, tokval.t_start);
                 recover = true;
             }
         } else {                /* immediate operand */

asm/preproc.c

@@ -2813,6 +2813,9 @@ static Token **count_mmac_params(Token *tline, int *nparamp, Token ***paramsp)
                 }
             }
 
+            if (!t)
+                break;              /* End of string, no comma */
+
             /* Advance to the next comma */
             maybe_comma = &t->next;
             while (tok_isnt(t, ',')) {

doc/changes.src

@@ -24,6 +24,13 @@ It is the production version of NASM since 2025.
 \b Fix encoding of \c{TCVTROWPS2PHL}, correct multiple AVX512-BF16
    instructions' operand formats and typoed mnemonics.
 
+\b The unofficial but obvious alternate form \c{TEST reg,mem} was not
+   accepted by NASM 3.00; corrected.
+
+\b For the \c{obj} output format, multiple \c{GROUP} directives can
+   now be specified for the same group; the resulting group includes
+   all sections specified in all \c{GROUP} directives for the group.
+
 
 \S{cl-3.00} Version 3.00
 

doc/outfmt.src

@@ -327,6 +327,10 @@ A group does not have to contain any segments; you can still make
 you are referring to. OS/2, for example, defines the special group
 \c{FLAT} with no segments in it.
 
+\c{GROUP} is cumulative. The above example can be done like this:
+
+\c group dgroup data
+\c group dgroup bss
 
 \S{uppercase} \i\c{UPPERCASE}: Disabling Case Sensitivity in Output
 

doc/stdmac.src

@@ -45,7 +45,7 @@ or
 
 \c         db      1,32,98,0
 
-Note that the above lines are generate exactly the same code, the second
+Note that the above lines generate exactly the same code, the second
 line is used just to give an indication of the order that the separate
 values will be present in memory.
 

include/nasmlib.h

@@ -367,9 +367,11 @@ const char *filename_set_extension(const char *inname, const char *extension);
 #define list_for_each_safe(pos, _n, head)                \
     for (pos = head, _n = (pos ? pos->next : NULL); pos; \
         pos = _n, _n = (_n ? _n->next : NULL))
-#define list_last(pos, head)                            \
-    for (pos = head; pos && pos->next; pos = pos->next) \
-        ;
+#define list_last(pos, head)                                    \
+    do {                                                        \
+        for (pos = head; pos && pos->next; pos = pos->next)     \
+            ;                                                   \
+    } while (0)
 #define list_reverse(head)                              \
     do {                                                \
         void *_p, *_n;                                  \

output/outaout.c

@@ -466,6 +466,11 @@ static int32_t aout_add_gsym_reloc(struct Section *sect,
         list_for_each(sym, shead)
             if (sym->value == offset)
                 break;
+        if (!sym) {
+            nasm_nonfatal("unable to find a suitable global symbol"
+                          " for this reference");
+            return 0;
+        }
     } else {
         /*
          * Find the nearest symbol below this one.
@@ -474,11 +479,11 @@ static int32_t aout_add_gsym_reloc(struct Section *sect,
         list_for_each(sm, shead)
             if (sm->value <= offset && (!sym || sm->value > sym->value))
                 sym = sm;
-    }
-    if (!sym && exact) {
-        nasm_nonfatal("unable to find a suitable global symbol"
-                      " for this reference");
-        return 0;
+        if (!sym) {
+            nasm_nonfatal("unable to find a suitable nearest symbol"
+                          " below this reference");
+            return 0;
+        }
     }
 
     r = *sect->tail = nasm_malloc(sizeof(struct Reloc));
@@ -522,9 +527,11 @@ static int32_t aout_add_gotoff_reloc(struct Section *sect, int32_t segment,
         asym = sdata.asym;
     else if (segment == sbss.index)
         asym = sbss.asym;
-    if (!asym)
+    if (!asym) {
         nasm_nonfatal("`..gotoff' relocations require a non-global"
                       " symbol in the section");
+        return 0;
+    }
 
     r = *sect->tail = nasm_malloc(sizeof(struct Reloc));
     sect->tail = &r->next;