diff options
| author | H. Peter Anvin (Intel) <hpa@zytor.com> | 2020-06-27 15:36:59 -0700 |
|---|---|---|
| committer | H. Peter Anvin (Intel) <hpa@zytor.com> | 2020-06-27 15:36:59 -0700 |
| commit | 513e19c8da06745525492b58795d8d8caa545049 (patch) | |
| tree | da6c947aa0aff1a4fd00ee538e14d64e827166f3 /asm | |
| parent | f53966af8b81d7ef11f46f084a4f91e9faa55914 (diff) | |
| parent | a825b33423d5046dfc4c0992c3ebfea5b8a531c4 (diff) | |
| download | nasm-513e19c8da06745525492b58795d8d8caa545049.tar.gz | |
Merge tag 'nasm-2.15'
NASM 2.15
Resolved Conflicts:
version
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/assemble.c | 1 | ||||
| -rw-r--r-- | asm/directiv.c | 2 | ||||
| -rw-r--r-- | asm/eval.c | 2 | ||||
| -rw-r--r-- | asm/floats.c (renamed from asm/float.c) | 2 | ||||
| -rw-r--r-- | asm/floats.h (renamed from asm/float.h) | 10 | ||||
| -rw-r--r-- | asm/nasm.c | 2 | ||||
| -rw-r--r-- | asm/parser.c | 2 |
7 files changed, 10 insertions, 11 deletions
diff --git a/asm/assemble.c b/asm/assemble.c index 7a0830ca..e5d5682c 100644 --- a/asm/assemble.c +++ b/asm/assemble.c @@ -2083,7 +2083,6 @@ static void gencode(struct out_data *data, insn *ins) break; case 0313: - ins->rex = 0; break; case4(0314): diff --git a/asm/directiv.c b/asm/directiv.c index 96464d62..53422098 100644 --- a/asm/directiv.c +++ b/asm/directiv.c @@ -43,7 +43,7 @@ #include "nasmlib.h" #include "ilog2.h" #include "error.h" -#include "float.h" +#include "floats.h" #include "stdscan.h" #include "preproc.h" #include "eval.h" @@ -45,7 +45,7 @@ #include "error.h" #include "eval.h" #include "labels.h" -#include "float.h" +#include "floats.h" #include "assemble.h" #define TEMPEXPRS_DELTA 128 diff --git a/asm/float.c b/asm/floats.c index 77d576c6..adc6afbf 100644 --- a/asm/float.c +++ b/asm/floats.c @@ -40,7 +40,7 @@ #include "nctype.h" #include "nasm.h" -#include "float.h" +#include "floats.h" #include "error.h" /* diff --git a/asm/float.h b/asm/floats.h index b07e542a..4f80acac 100644 --- a/asm/float.h +++ b/asm/floats.h @@ -32,12 +32,12 @@ * ----------------------------------------------------------------------- */ /* - * float.h header file for the floating-point constant module of - * the Netwide Assembler + * floats.h header file for the floating-point constant module of + * the Netwide Assembler */ -#ifndef NASM_FLOAT_H -#define NASM_FLOAT_H +#ifndef NASM_FLOATS_H +#define NASM_FLOATS_H #include "nasm.h" @@ -51,4 +51,4 @@ enum float_round { int float_const(const char *string, int sign, uint8_t *result, int bytes); int float_option(const char *option); -#endif +#endif /* NASM_FLOATS_H */ @@ -44,7 +44,7 @@ #include "error.h" #include "saa.h" #include "raa.h" -#include "float.h" +#include "floats.h" #include "stdscan.h" #include "insns.h" #include "preproc.h" diff --git a/asm/parser.c b/asm/parser.c index a59acb19..de24103e 100644 --- a/asm/parser.c +++ b/asm/parser.c @@ -46,7 +46,7 @@ #include "stdscan.h" #include "eval.h" #include "parser.h" -#include "float.h" +#include "floats.h" #include "assemble.h" #include "tables.h" |