Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/torch/luajit-rocks.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCédric Deltheil <cedric@moodstocks.com>2015-06-22 18:46:55 +0300
committerCédric Deltheil <cedric@moodstocks.com>2015-06-22 18:46:55 +0300
commit2a68100afa22095ff3bc29fcbbf08d69758c5768 (patch)
tree743217d3f6723761ceb641f0f09099e48108ed88
parent97299ce206ce007a6d3ec4542617f91ae7f23ca5 (diff)
ffi / cdecl: refresh all pre-computed hash values
Since commit cafad2e the lookup3 hash function has been replaced by tommyds for string hashing. However pre-computed hash values used e.g. by `ffi.abi` or the C declaration parser have not been migrated at that time.
-rw-r--r--luajit-2.0/src/lib_ffi.c16
-rw-r--r--luajit-2.0/src/lj_cparse.c30
-rw-r--r--luajit-2.1/src/lib_ffi.c18
-rw-r--r--luajit-2.1/src/lj_cparse.c30
4 files changed, 47 insertions, 47 deletions
diff --git a/luajit-2.0/src/lib_ffi.c b/luajit-2.0/src/lib_ffi.c
index f6df39d..c5a9b06 100644
--- a/luajit-2.0/src/lib_ffi.c
+++ b/luajit-2.0/src/lib_ffi.c
@@ -706,25 +706,25 @@ LJLIB_CF(ffi_abi) LJLIB_REC(.)
int b = 0;
switch (s->hash) {
#if LJ_64
- case H_(849858eb,ad35fd06): b = 1; break; /* 64bit */
+ case H_(4e599f79,1d9b9daa): b = 1; break; /* 64bit */
#else
- case H_(662d3c79,d0e22477): b = 1; break; /* 32bit */
+ case H_(db4ee6c1,a143ad71): b = 1; break; /* 32bit */
#endif
#if LJ_ARCH_HASFPU
- case H_(e33ee463,e33ee463): b = 1; break; /* fpu */
+ case H_(f6cf020e,f6cf020e): b = 1; break; /* fpu */
#endif
#if LJ_ABI_SOFTFP
- case H_(61211a23,c2e8c81c): b = 1; break; /* softfp */
+ case H_(3cbb6863,2cdff2d6): b = 1; break; /* softfp */
#else
- case H_(539417a8,8ce0812f): b = 1; break; /* hardfp */
+ case H_(2aa5a169,5eb84e86): b = 1; break; /* hardfp */
#endif
#if LJ_ABI_EABI
- case H_(2182df8f,f2ed1152): b = 1; break; /* eabi */
+ case H_(79d873f0,484cfcc6): b = 1; break; /* eabi */
#endif
#if LJ_ABI_WIN
- case H_(4ab624a8,4ab624a8): b = 1; break; /* win */
+ case H_(cd672ef5,cd672ef5): b = 1; break; /* win */
#endif
- case H_(3af93066,1f001464): b = 1; break; /* le/be */
+ case H_(67d16e1a,5765ef45): b = 1; break; /* le/be */
default:
break;
}
diff --git a/luajit-2.0/src/lj_cparse.c b/luajit-2.0/src/lj_cparse.c
index b9df88d..e383fd5 100644
--- a/luajit-2.0/src/lj_cparse.c
+++ b/luajit-2.0/src/lj_cparse.c
@@ -1065,43 +1065,43 @@ static void cp_decl_gccattribute(CPState *cp, CPDecl *decl)
GCstr *attrstr = cp->str;
cp_next(cp);
switch (attrstr->hash) {
- case H_(64a9208e,8ce14319): case H_(8e6331b2,95a282af): /* aligned */
+ case H_(e7471a47,4d0a050c): case H_(1c311a30,407787d5): /* aligned */
cp_decl_align(cp, decl);
break;
- case H_(42eb47de,f0ede26c): case H_(29f48a09,cf383e0c): /* packed */
+ case H_(5b224448,e7fa3369): case H_(1af1262a,6fe1f4a9): /* packed */
decl->attr |= CTFP_PACKED;
break;
- case H_(0a84eef6,8dfab04c): case H_(995cf92c,d5696591): /* mode */
+ case H_(3f4777d9,ab58d362): case H_(1d3d8c5d,a4ccaedf): /* mode */
cp_decl_mode(cp, decl);
break;
- case H_(0ab31997,2d5213fa): case H_(bf875611,200e9990): /* vector_size */
+ case H_(e6a57578,a46255fb): case H_(75ce2002,cffcd6f9): /* vector_size */
{
CTSize vsize = cp_decl_sizeattr(cp);
if (vsize) CTF_INSERT(decl->attr, VSIZEP, lj_fls(vsize));
}
break;
#if LJ_TARGET_X86
- case H_(5ad22db8,c689b848): case H_(439150fa,65ea78cb): /* regparm */
+ case H_(80199aeb,b13dfdf7): case H_(bf8a4622,fcdf05d8): /* regparm */
CTF_INSERT(decl->fattr, REGPARM, cp_decl_sizeattr(cp));
decl->fattr |= CTFP_CCONV;
break;
- case H_(18fc0b98,7ff4c074): case H_(4e62abed,0a747424): /* cdecl */
+ case H_(a8174bd6,2f052a31): case H_(b41f25a7,561af38e): /* cdecl */
CTF_INSERT(decl->fattr, CCONV, CTCC_CDECL);
decl->fattr |= CTFP_CCONV;
break;
- case H_(72b2e41b,494c5a44): case H_(f2356d59,f25fc9bd): /* thiscall */
+ case H_(813acdf4,2f4dc8da): case H_(407d56cf,30df0843): /* thiscall */
CTF_INSERT(decl->fattr, CCONV, CTCC_THISCALL);
decl->fattr |= CTFP_CCONV;
break;
- case H_(0d0ffc42,ab746f88): case H_(21c54ba1,7f0ca7e3): /* fastcall */
+ case H_(c93885bc,ac2a6b49): case H_(17092923,17979644): /* fastcall */
CTF_INSERT(decl->fattr, CCONV, CTCC_FASTCALL);
decl->fattr |= CTFP_CCONV;
break;
- case H_(ef76b040,9412e06a): case H_(de56697b,c750e6e1): /* stdcall */
+ case H_(27bff963,43de753b): case H_(8014db5c,728f7bd2): /* stdcall */
CTF_INSERT(decl->fattr, CCONV, CTCC_STDCALL);
decl->fattr |= CTFP_CCONV;
break;
- case H_(ea78b622,f234bd8e): case H_(252ffb06,8d50f34b): /* sseregparm */
+ case H_(f35337b4,ca968d6c): case H_(b2ade19f,1467c44f): /* sseregparm */
decl->fattr |= CTF_SSEREGPARM;
decl->fattr |= CTFP_CCONV;
break;
@@ -1134,7 +1134,7 @@ static void cp_decl_msvcattribute(CPState *cp, CPDecl *decl)
GCstr *attrstr = cp->str;
cp_next(cp);
switch (attrstr->hash) {
- case H_(bc2395fa,98f267f8): /* align */
+ case H_(44b28229,c0929327): /* align */
cp_decl_align(cp, decl);
break;
default: /* Ignore all other attributes. */
@@ -1723,16 +1723,16 @@ static void cp_pragma(CPState *cp, BCLine pragmaline)
{
cp_next(cp);
if (cp->tok == CTOK_IDENT &&
- cp->str->hash == H_(e79b999f,42ca3e85)) { /* pack */
+ cp->str->hash == H_(15124dae,9e80d09b)) { /* pack */
cp_next(cp);
cp_check(cp, '(');
if (cp->tok == CTOK_IDENT) {
- if (cp->str->hash == H_(738e923c,a1b65954)) { /* push */
+ if (cp->str->hash == H_(6a04313e,6b9cb01a)) { /* push */
if (cp->curpack < CPARSE_MAX_PACKSTACK) {
cp->packstack[cp->curpack+1] = cp->packstack[cp->curpack];
cp->curpack++;
}
- } else if (cp->str->hash == H_(6c71cf27,6c71cf27)) { /* pop */
+ } else if (cp->str->hash == H_(52fae0de,52fae0de)) { /* pop */
if (cp->curpack > 0) cp->curpack--;
} else {
cp_errmsg(cp, cp->tok, LJ_ERR_XSYMBOL);
@@ -1768,7 +1768,7 @@ static void cp_decl_multi(CPState *cp)
if (cp->tok == '#') { /* Workaround, since we have no preprocessor, yet. */
BCLine pragmaline = cp->linenumber;
if (!(cp_next(cp) == CTOK_IDENT &&
- cp->str->hash == H_(f5e6b4f8,1d509107))) /* pragma */
+ cp->str->hash == H_(3f192524,f711b0ec))) /* pragma */
cp_errmsg(cp, cp->tok, LJ_ERR_XSYMBOL);
cp_pragma(cp, pragmaline);
continue;
diff --git a/luajit-2.1/src/lib_ffi.c b/luajit-2.1/src/lib_ffi.c
index b2b2d37..343d04c 100644
--- a/luajit-2.1/src/lib_ffi.c
+++ b/luajit-2.1/src/lib_ffi.c
@@ -732,27 +732,27 @@ LJLIB_CF(ffi_abi) LJLIB_REC(.)
int b = 0;
switch (s->hash) {
#if LJ_64
- case H_(849858eb,ad35fd06): b = 1; break; /* 64bit */
+ case H_(4e599f79,1d9b9daa): b = 1; break; /* 64bit */
#else
- case H_(662d3c79,d0e22477): b = 1; break; /* 32bit */
+ case H_(db4ee6c1,a143ad71): b = 1; break; /* 32bit */
#endif
#if LJ_ARCH_HASFPU
- case H_(e33ee463,e33ee463): b = 1; break; /* fpu */
+ case H_(f6cf020e,f6cf020e): b = 1; break; /* fpu */
#endif
#if LJ_ABI_SOFTFP
- case H_(61211a23,c2e8c81c): b = 1; break; /* softfp */
+ case H_(3cbb6863,2cdff2d6): b = 1; break; /* softfp */
#else
- case H_(539417a8,8ce0812f): b = 1; break; /* hardfp */
+ case H_(2aa5a169,5eb84e86): b = 1; break; /* hardfp */
#endif
#if LJ_ABI_EABI
- case H_(2182df8f,f2ed1152): b = 1; break; /* eabi */
+ case H_(79d873f0,484cfcc6): b = 1; break; /* eabi */
#endif
#if LJ_ABI_WIN
- case H_(4ab624a8,4ab624a8): b = 1; break; /* win */
+ case H_(cd672ef5,cd672ef5): b = 1; break; /* win */
#endif
- case H_(3af93066,1f001464): b = 1; break; /* le/be */
+ case H_(67d16e1a,5765ef45): b = 1; break; /* le/be */
#if LJ_GC64
- case H_(9e89d2c9,13c83c92): b = 1; break; /* gc64 */
+ case H_(fed89f17,f32c8e26): b = 1; break; /* gc64 */
#endif
default:
break;
diff --git a/luajit-2.1/src/lj_cparse.c b/luajit-2.1/src/lj_cparse.c
index 1ec3230..d87932f 100644
--- a/luajit-2.1/src/lj_cparse.c
+++ b/luajit-2.1/src/lj_cparse.c
@@ -1051,43 +1051,43 @@ static void cp_decl_gccattribute(CPState *cp, CPDecl *decl)
GCstr *attrstr = cp->str;
cp_next(cp);
switch (attrstr->hash) {
- case H_(64a9208e,8ce14319): case H_(8e6331b2,95a282af): /* aligned */
+ case H_(e7471a47,4d0a050c): case H_(1c311a30,407787d5): /* aligned */
cp_decl_align(cp, decl);
break;
- case H_(42eb47de,f0ede26c): case H_(29f48a09,cf383e0c): /* packed */
+ case H_(5b224448,e7fa3369): case H_(1af1262a,6fe1f4a9): /* packed */
decl->attr |= CTFP_PACKED;
break;
- case H_(0a84eef6,8dfab04c): case H_(995cf92c,d5696591): /* mode */
+ case H_(3f4777d9,ab58d362): case H_(1d3d8c5d,a4ccaedf): /* mode */
cp_decl_mode(cp, decl);
break;
- case H_(0ab31997,2d5213fa): case H_(bf875611,200e9990): /* vector_size */
+ case H_(e6a57578,a46255fb): case H_(75ce2002,cffcd6f9): /* vector_size */
{
CTSize vsize = cp_decl_sizeattr(cp);
if (vsize) CTF_INSERT(decl->attr, VSIZEP, lj_fls(vsize));
}
break;
#if LJ_TARGET_X86
- case H_(5ad22db8,c689b848): case H_(439150fa,65ea78cb): /* regparm */
+ case H_(80199aeb,b13dfdf7): case H_(bf8a4622,fcdf05d8): /* regparm */
CTF_INSERT(decl->fattr, REGPARM, cp_decl_sizeattr(cp));
decl->fattr |= CTFP_CCONV;
break;
- case H_(18fc0b98,7ff4c074): case H_(4e62abed,0a747424): /* cdecl */
+ case H_(a8174bd6,2f052a31): case H_(b41f25a7,561af38e): /* cdecl */
CTF_INSERT(decl->fattr, CCONV, CTCC_CDECL);
decl->fattr |= CTFP_CCONV;
break;
- case H_(72b2e41b,494c5a44): case H_(f2356d59,f25fc9bd): /* thiscall */
+ case H_(813acdf4,2f4dc8da): case H_(407d56cf,30df0843): /* thiscall */
CTF_INSERT(decl->fattr, CCONV, CTCC_THISCALL);
decl->fattr |= CTFP_CCONV;
break;
- case H_(0d0ffc42,ab746f88): case H_(21c54ba1,7f0ca7e3): /* fastcall */
+ case H_(c93885bc,ac2a6b49): case H_(17092923,17979644): /* fastcall */
CTF_INSERT(decl->fattr, CCONV, CTCC_FASTCALL);
decl->fattr |= CTFP_CCONV;
break;
- case H_(ef76b040,9412e06a): case H_(de56697b,c750e6e1): /* stdcall */
+ case H_(27bff963,43de753b): case H_(8014db5c,728f7bd2): /* stdcall */
CTF_INSERT(decl->fattr, CCONV, CTCC_STDCALL);
decl->fattr |= CTFP_CCONV;
break;
- case H_(ea78b622,f234bd8e): case H_(252ffb06,8d50f34b): /* sseregparm */
+ case H_(f35337b4,ca968d6c): case H_(b2ade19f,1467c44f): /* sseregparm */
decl->fattr |= CTF_SSEREGPARM;
decl->fattr |= CTFP_CCONV;
break;
@@ -1120,7 +1120,7 @@ static void cp_decl_msvcattribute(CPState *cp, CPDecl *decl)
GCstr *attrstr = cp->str;
cp_next(cp);
switch (attrstr->hash) {
- case H_(bc2395fa,98f267f8): /* align */
+ case H_(44b28229,c0929327): /* align */
cp_decl_align(cp, decl);
break;
default: /* Ignore all other attributes. */
@@ -1709,16 +1709,16 @@ static void cp_pragma(CPState *cp, BCLine pragmaline)
{
cp_next(cp);
if (cp->tok == CTOK_IDENT &&
- cp->str->hash == H_(e79b999f,42ca3e85)) { /* pack */
+ cp->str->hash == H_(15124dae,9e80d09b)) { /* pack */
cp_next(cp);
cp_check(cp, '(');
if (cp->tok == CTOK_IDENT) {
- if (cp->str->hash == H_(738e923c,a1b65954)) { /* push */
+ if (cp->str->hash == H_(6a04313e,6b9cb01a)) { /* push */
if (cp->curpack < CPARSE_MAX_PACKSTACK) {
cp->packstack[cp->curpack+1] = cp->packstack[cp->curpack];
cp->curpack++;
}
- } else if (cp->str->hash == H_(6c71cf27,6c71cf27)) { /* pop */
+ } else if (cp->str->hash == H_(52fae0de,52fae0de)) { /* pop */
if (cp->curpack > 0) cp->curpack--;
} else {
cp_errmsg(cp, cp->tok, LJ_ERR_XSYMBOL);
@@ -1754,7 +1754,7 @@ static void cp_decl_multi(CPState *cp)
if (cp->tok == '#') { /* Workaround, since we have no preprocessor, yet. */
BCLine pragmaline = cp->linenumber;
if (!(cp_next(cp) == CTOK_IDENT &&
- cp->str->hash == H_(f5e6b4f8,1d509107))) /* pragma */
+ cp->str->hash == H_(3f192524,f711b0ec))) /* pragma */
cp_errmsg(cp, cp->tok, LJ_ERR_XSYMBOL);
cp_pragma(cp, pragmaline);
continue;