netwide-assembler · ElyesH · Nov 9, 2022 · Nov 9, 2022 · Nov 9, 2022 · Nov 9, 2022
diff --git a/asm/assemble.c b/asm/assemble.c
@@ -175,7 +175,6 @@
 
 #include "compiler.h"
 
-
 #include "nasm.h"
 #include "nasmlib.h"
 #include "error.h"
@@ -1059,7 +1058,6 @@ static void debug_set_type(insn *instruction)
     dfmt->debug_typevalue(typeinfo);
 }
 
-
 /* Proecess an EQU directive */
 static void define_equ(insn * instruction)
 {
@@ -1926,7 +1924,6 @@ static void gencode(struct out_data *data, insn *ins)
         opx = &ins->oprs[op1];
         opex = 0;                /* For the next iteration */
 
-
         switch (c) {
         case 01:
         case 02:
@@ -3388,7 +3385,7 @@ static void add_asp(insn *ins, int addrbits)
         ins->addr_size = addrbits;
     } else if (valid & ((addrbits == 32) ? 16 : 32)) {
         /* Add an address size prefix */
-        ins->prefixes[PPS_ASIZE] = (addrbits == 32) ? P_A16 : P_A32;;
+        ins->prefixes[PPS_ASIZE] = (addrbits == 32) ? P_A16 : P_A32;
         ins->addr_size = (addrbits == 32) ? 16 : 32;
     } else {
         /* Impossible... */

diff --git a/asm/assemble.h b/asm/assemble.h
@@ -1,5 +1,5 @@
 /* ----------------------------------------------------------------------- *
- *   
+ *
  *   Copyright 1996-2017 The NASM Authors - All Rights Reserved
  *   See the file AUTHORS included with the NASM distribution for
  *   the specific copyright holders.
@@ -14,7 +14,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

diff --git a/asm/directiv.c b/asm/directiv.c
@@ -557,7 +557,6 @@ bool process_directives(char *directive)
         break;
     }
 
-
     /* A common error message */
     if (bad_param) {
         nasm_nonfatal("invalid parameter to [%s] directive", directive);

diff --git a/asm/error.c b/asm/error.c
@@ -37,7 +37,6 @@
 
 #include "compiler.h"
 
-
 #include "nasmlib.h"
 #include "error.h"
 
@@ -53,7 +52,6 @@
 	if ((_sev) >= ERR_FATAL)                                \
 		abort();
 
-
 void nasm_error(errflags severity, const char *fmt, ...)
 {
 	nasm_do_error(severity & ERR_MASK, severity & ~ERR_MASK);
@@ -97,7 +95,6 @@ fatal_func nasm_assert_failed(const char *file, int line, const char *msg)
 	nasm_panic("assertion %s failed at %s:%d", msg, file, line);
 }
 
-
 /*
  * Warning stack management. Note that there is an implicit "push"
  * after the command line has been parsed, but this particular push
@@ -147,7 +144,6 @@ void init_warnings(void)
 	warning_state_init = warning_stack;
 }
 
-
 /* Call after each pass */
 void reset_warnings(void)
 {

diff --git a/asm/eval.c b/asm/eval.c
@@ -71,7 +71,6 @@ static int *opflags;
 static struct eval_hints *hint;
 static int64_t deadman;
 
-
 /*
  * Unimportant cleanup is done to avoid confusing people who are trying
  * to debug real memory leaks

diff --git a/asm/eval.h b/asm/eval.h
@@ -1,5 +1,5 @@
 /* ----------------------------------------------------------------------- *
- *   
+ *
  *   Copyright 1996-2009 The NASM Authors - All Rights Reserved
  *   See the file AUTHORS included with the NASM distribution for
  *   the specific copyright holders.
@@ -14,7 +14,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
@@ -31,7 +31,7 @@
  *
  * ----------------------------------------------------------------------- */
 
-/* 
+/*
  * eval.h   header file for eval.c
  */
 

diff --git a/asm/floats.h b/asm/floats.h
@@ -1,5 +1,5 @@
 /* ----------------------------------------------------------------------- *
- *   
+ *
  *   Copyright 1996-2020 The NASM Authors - All Rights Reserved
  *   See the file AUTHORS included with the NASM distribution for
  *   the specific copyright holders.
@@ -14,7 +14,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
@@ -31,7 +31,7 @@
  *
  * ----------------------------------------------------------------------- */
 
-/* 
+/*
  * floats.h   header file for the floating-point constant module of
  *	      the Netwide Assembler
  */

diff --git a/asm/labels.c b/asm/labels.c
@@ -37,7 +37,6 @@
 
 #include "compiler.h"
 
-
 #include "nasm.h"
 #include "nasmlib.h"
 #include "error.h"

diff --git a/asm/listing.c b/asm/listing.c
@@ -214,7 +214,6 @@ static void list_output(const struct out_data *data)
     uint64_t offset = data->offset;
     const uint8_t *p = data->data;
 
-
     if (!listfp || suppress || user_nolist)
         return;
 

diff --git a/asm/nasm.c b/asm/nasm.c
@@ -37,7 +37,6 @@
 
 #include "compiler.h"
 
-
 #include "nasm.h"
 #include "nasmlib.h"
 #include "nctype.h"
@@ -2339,7 +2338,6 @@ static void help(FILE *out)
         "   --limit-X val  set execution limit X\n"
         , out);
 
-
     for (i = 0; i <= LIMIT_MAX; i++) {
         fprintf(out, "       %-20s %s [",
                 limit_info[i].name, limit_info[i].help);

diff --git a/asm/parser.c b/asm/parser.c
@@ -50,7 +50,6 @@
 #include "assemble.h"
 #include "tables.h"
 
-
 static int end_expression_next(void);
 
 static struct tokenval tokval;

diff --git a/asm/parser.h b/asm/parser.h
@@ -1,5 +1,5 @@
 /* ----------------------------------------------------------------------- *
- *   
+ *
  *   Copyright 1996-2009 The NASM Authors - All Rights Reserved
  *   See the file AUTHORS included with the NASM distribution for
  *   the specific copyright holders.
@@ -14,7 +14,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
@@ -31,7 +31,7 @@
  *
  * ----------------------------------------------------------------------- */
 
-/* 
+/*
  * parser.h   header file for the parser module of the Netwide
  *            Assembler
  */

diff --git a/asm/pptok.dat b/asm/pptok.dat
@@ -1,5 +1,5 @@
 ## --------------------------------------------------------------------------
-##   
+##
 ##   Copyright 1996-2019 The NASM Authors - All Rights Reserved
 ##   See the file AUTHORS included with the NASM distribution for
 ##   the specific copyright holders.
@@ -14,7 +14,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

diff --git a/asm/preproc.c b/asm/preproc.c
@@ -310,7 +310,6 @@ struct MMacro {
     } dbg;
 };
 
-
 /* Store the definition of a multi-line macro, as defined in a
  * previous recursive macro expansion.
  */
@@ -339,7 +338,6 @@ struct Context {
     unsigned int depth;
 };
 
-
 static inline const char *tok_text(const struct Token *t)
 {
     return (t->len <= INLINE_TEXT) ? t->text.a : t->text.p.ptr;
@@ -3393,7 +3391,6 @@ static bool parse_mmacro_spec(Token *tline, MMacro *def, const char *directive)
     return true;
 }
 
-
 /*
  * Decode a size directive
  */
@@ -3628,7 +3625,6 @@ static void define_stack_smacro(const char *name, int offset)
     define_smacro(name, true, tt, NULL);
 }
 
-
 /*
  * This implements the %assign directive: expand an smacro expression,
  * then evaluate it, and assign the corresponding number to an smacro.
@@ -5093,7 +5089,6 @@ struct concat_mask {
     enum concat_flags mask_tail;
 };
 
-
 static inline bool pp_concat_match(const Token *t, enum concat_flags mask)
 {
     enum concat_flags ctype = 0;
@@ -5201,7 +5196,7 @@ static bool paste_tokens(Token **head, const struct concat_mask *m,
              * In a sequence of %+ ... %+ ... %+ pasting sequences where
              * some expansions in the middle have ended up empty,
              * we can end up having multiple %+ tokens in a row;
-             * just drop whem in that case.
+             * just drop when in that case.
              */
             next = *nextp;
             while (next) {
@@ -6506,7 +6501,6 @@ static MMacro *is_mmacro(Token * tline, int *nparamp, Token ***paramsp)
     return NULL;
 }
 
-
 #if 0
 
 /*
@@ -6529,7 +6523,6 @@ static void push_mmacro(MMacro *m)
     m->prev = i;
 }
 
-
 /*
  * Restore MMacro invocation specific fields that were
  * saved during a previous recursive macro expansion

diff --git a/asm/preproc.h b/asm/preproc.h
@@ -1,5 +1,5 @@
 /* ----------------------------------------------------------------------- *
- *   
+ *
  *   Copyright 1996-2020 The NASM Authors - All Rights Reserved
  *   See the file AUTHORS included with the NASM distribution for
  *   the specific copyright holders.
@@ -14,7 +14,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
@@ -31,7 +31,7 @@
  *
  * ----------------------------------------------------------------------- */
 
-/* 
+/*
  * preproc.h  header file for preproc.c
  */
 

diff --git a/asm/quote.h b/asm/quote.h
@@ -1,5 +1,5 @@
 /* ----------------------------------------------------------------------- *
- *   
+ *
  *   Copyright 1996-2009 The NASM Authors - All Rights Reserved
  *   See the file AUTHORS included with the NASM distribution for
  *   the specific copyright holders.
@@ -14,7 +14,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

diff --git a/asm/rdstrnum.c b/asm/rdstrnum.c
@@ -1,5 +1,5 @@
 /* ----------------------------------------------------------------------- *
- *   
+ *
  *   Copyright 1996-2016 The NASM Authors - All Rights Reserved
  *   See the file AUTHORS included with the NASM distribution for
  *   the specific copyright holders.
@@ -14,7 +14,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

diff --git a/asm/segalloc.c b/asm/segalloc.c
@@ -1,5 +1,5 @@
 /* ----------------------------------------------------------------------- *
- *   
+ *
  *   Copyright 1996-2018 The NASM Authors - All Rights Reserved
  *   See the file AUTHORS included with the NASM distribution for
  *   the specific copyright holders.
@@ -14,7 +14,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

diff --git a/asm/srcfile.c b/asm/srcfile.c
@@ -44,7 +44,6 @@
 
 #include "compiler.h"
 
-
 #include "nasmlib.h"
 #include "hashtbl.h"
 #include "srcfile.h"

diff --git a/asm/stdscan.h b/asm/stdscan.h
@@ -1,5 +1,5 @@
 /* ----------------------------------------------------------------------- *
- *   
+ *
  *   Copyright 1996-2009 The NASM Authors - All Rights Reserved
  *   See the file AUTHORS included with the NASM distribution for
  *   the specific copyright holders.
@@ -14,7 +14,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
@@ -31,7 +31,7 @@
  *
  * ----------------------------------------------------------------------- */
 
-/* 
+/*
  * stdscan.h	header file for stdscan.c
  */
-Original file line number
+Diff line change
@@ Expand Up / @@ -557,7 +557,6 @@ bool process_directives(char *directive) @@
             break;
         }
         /* A common error message */
         if (bad_param) {
             nasm_nonfatal("invalid parameter to [%s] directive", directive);
@@ Expand Down @@