Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-01-07 13:51:16 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Better handling of number constants

Browse Source
This commit is contained in:
Aaron Puchert 2015-02-05 22:48:53 +01:00 committed by pancake
parent b0ae267c2c
commit 1efc66eec5
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libr/asm/p/asm_x86_new.c
View File

@ -111,8 +111,7 @@ typedef struct operand_t {
typedef enum tokentype_t {
TT_EOF,
TT_WORD,
TT_DECIMAL,
TT_HEXADECIMAL,
TT_NUMBER,
TT_SPECIAL
} x86newTokenType;
@ -137,16 +136,10 @@ static x86newTokenType getToken(const char *str, int *begin, int *end) {
return TT_WORD;
}
else if (isdigit(str[*begin])) { // number token
x86newTokenType type = TT_DECIMAL;
if (str[*begin] == '0' && str[*begin + 1] == 'x') {
*begin += 2;
type = TT_HEXADECIMAL;
}
*end = *begin;
while (isalnum(str[*end])) // accept alphanumeric characters, because hex.
++(*end);
return type;
return TT_NUMBER;
}
else { // special character: [, ], +, *, ...
*end = *begin + 1;
@ -192,7 +185,8 @@ static Register parseReg(const char *str, int len, ut32 *type) {
* Read decimal or hexadecimal number.
*/
static ut64 readNumber(const char *str, x86newTokenType type) {
return strtol(str, 0, type == TT_DECIMAL ? 10 : 16);
int hex = (str[0] == '0' && str[1] == 'x');
return strtol(str + 2*hex, 0, hex ? 16 : 10);
}
// Parse operand