summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/nasmdoc.src2
-rw-r--r--nasmlib.c13
2 files changed, 6 insertions, 9 deletions
diff --git a/doc/nasmdoc.src b/doc/nasmdoc.src
index b78eab3..d5eeaf1 100644
--- a/doc/nasmdoc.src
+++ b/doc/nasmdoc.src
@@ -3782,7 +3782,7 @@ Options are:
\b\c{CPU PRESCOTT} Prescott instruction set
-\b\c{CPU X64} x86-64 (x64/AMD64/EM64T) instruction set
+\b\c{CPU X64} x86-64 (x64/AMD64/Intel 64) instruction set
\b\c{CPU IA64} IA64 CPU (in x86 mode) instruction set
diff --git a/nasmlib.c b/nasmlib.c
index 1d5421c..6f59820 100644
--- a/nasmlib.c
+++ b/nasmlib.c
@@ -283,19 +283,16 @@ int64_t readnum(char *str, bool *error)
}
/*
- * `checklimit' must be 2**(32|64) / radix. We can't do that in
- * 32/64-bit arithmetic, which we're (probably) using, so we
+ * `checklimit' must be 2**64 / radix. We can't do that in
+ * 64-bit arithmetic, which we're (probably) using, so we
* cheat: since we know that all radices we use are even, we
- * can divide 2**(31|63) by radix/2 instead.
+ * can divide 2**63 by radix/2 instead.
*/
- if (globalbits == 64)
- checklimit = 0x8000000000000000ULL / (radix >> 1);
- else
- checklimit = 0x80000000UL / (radix >> 1);
+ checklimit = 0x8000000000000000ULL / (radix >> 1);
/*
* Calculate the highest allowable value for the last digit of a
- * 32-bit constant... in radix 10, it is 6, otherwise it is 0
+ * 64-bit constant... in radix 10, it is 6, otherwise it is 0
*/
last = (radix == 10 ? 6 : 0);