aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2007-09-18 22:54:40 -0700
committerH. Peter Anvin <hpa@zytor.com>2007-09-18 22:54:40 -0700
commitbf9a24f46471abad75fa3efba059646a6c4f5026 (patch)
tree11fb8d714b12f1cf4d067233e8e9436b2bbac415
parent69db8c6963aab103d1cf9c2735c49bd25c28fb6b (diff)
downloadnasm-sse5.tar.gz
nasm-sse5.tar.xz
nasm-sse5.zip
Slightly optimize the interface to nasm_token_hash()sse5
Instead of returning -1 from nasm_token_hash, set tv->t_type to TOKEN_ID and return TOKEN_ID, since that's what stdscan.c wants to do with it anyway. This allows us to simply tailcall nasm_token_hash().
-rw-r--r--stdscan.c6
-rwxr-xr-xtokhash.pl4
2 files changed, 3 insertions, 7 deletions
diff --git a/stdscan.c b/stdscan.c
index b6a4ee8f..aecbd4a7 100644
--- a/stdscan.c
+++ b/stdscan.c
@@ -75,7 +75,6 @@ int stdscan(void *private_data, struct tokenval *tv)
(*stdscan_bufptr == '$' && isidstart(stdscan_bufptr[1]))) {
/* now we've got an identifier */
int is_sym = FALSE;
- int t;
if (*stdscan_bufptr == '$') {
is_sym = TRUE;
@@ -99,10 +98,7 @@ int stdscan(void *private_data, struct tokenval *tv)
*r = '\0';
/* right, so we have an identifier sitting in temp storage. now,
* is it actually a register or instruction name, or what? */
- if ((t = nasm_token_hash(ourcopy, tv)) != -1)
- return t;
- else
- return tv->t_type = TOKEN_ID;
+ return nasm_token_hash(ourcopy, tv);
} else if (*stdscan_bufptr == '$' && !isnumchar(stdscan_bufptr[1])) {
/*
* It's a $ sign with no following hex number; this must
diff --git a/tokhash.pl b/tokhash.pl
index 9d5888be..a63e55f3 100755
--- a/tokhash.pl
+++ b/tokhash.pl
@@ -194,14 +194,14 @@ print " }\n";
print "\n";
printf " ix = hash1[k1 & 0x%x] + hash2[k2 & 0x%x];\n", $n-1, $n-1;
printf " if (ix >= %d)\n", scalar(@tokendata);
-print " return -1;\n";
+print " return tv->t_type = TOKEN_ID;\n";
print "\n";
print " data = &tokendata[ix];\n";
# print " fprintf(stderr, \"Looked for: %s found: %s\\n\", token, data->string);\n\n";
print " if (strcmp(data->string, token))\n";
-print " return -1;\n";
+print " return tv->t_type = TOKEN_ID;\n";
print "\n";
print " tv->t_integer = data->num;\n";
print " tv->t_inttwo = data->aux;\n";