mirror/nasm
2
0
Fork 0
mirror of https://github.com/netwide-assembler/nasm.git synced 2025-03-31 18:20:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Unbreak particularly tricky hex constants

Browse Source 
Unbreak hex constants which contain 'b' or 'd' in potentially tricky
places.
This commit is contained in:
H. Peter Anvin 2007-10-22 19:48:06 -07:00
parent f41aef273b
commit 50620f4a3f
2 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
nasmlib.c
View File

@ -219,7 +219,8 @@ static int radix_letter(char c)
int64_t readnum(char *str, bool *error)
{
char *r = str, *q;
int32_t radix;
int32_t pradix, sradix, radix;
int plen, slen;
uint64_t result, checklimit;
int digit, last;
bool warn = false;
@ -251,14 +252,26 @@ int64_t readnum(char *str, bool *error)
* $<string> (hexadecimal)
* <string><radix-letter>
*/
if (*r == '0' && (radix = radix_letter(r[1])))
r += 2;
pradix = sradix = 0;
plen = slen = 0;
if (*r == '0' && (pradix = radix_letter(r[1])) != 0)
plen = 2;
else if (*r == '$')
radix = 16, r++;
else if ((radix = radix_letter(q[-1])) != 0)
q--;
else
pradix = 16, plen = 1;
if ((sradix = radix_letter(q[-1])) != 0)
slen = 1;
if (pradix && pradix > sradix) {
radix = pradix;
r += plen;
} else if (sradix && sradix > pradix) {
radix = sradix;
q -= slen;
} else {
radix = 10;
}
/*
* If this number has been found for us by something other than

9
test/radix.asm
View File

@ -23,6 +23,15 @@
dd 1010_0101x ; Hex
dd $1010_0101 ; Hex
db 0dh ; Hex
db 0bh ; Hex
db 0dx ; Hex
db 0bx ; Hex
db 0hd ; Hex
db 0hb ; Hex
db 0xd ; Hex
db 0xb ; Hex
;; Floating-point constants
;; All of these should output B4A21147
dd 3.7282705e+4 ; Decimal