From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from [87.239.111.99] (localhost [127.0.0.1]) by dev.tarantool.org (Postfix) with ESMTP id 3C27F57648C; Wed, 9 Aug 2023 18:45:29 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 3C27F57648C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1691595929; bh=8b4VtO8b7U0syQqWkrYB7TjpioVt7dNY11b1CkxR0T8=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=yqO2VRkOLXGwpZZmgn33WcXpTNVjplvfBeCqdTpG72BfeLiHyVKP5HpqWTDHpojcz fLb2SxQIJcD7G6ONafu5zx/e9KW12VzIplJVmMh3RQ7b2YZ6hRguboPU5FSShLC/mL pbaL+o1R66XXLqyTngKbnucsqIXEEY/6txYvxZSw= Received: from smtp32.i.mail.ru (smtp32.i.mail.ru [95.163.41.73]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 4FA90576491 for ; Wed, 9 Aug 2023 18:41:07 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 4FA90576491 Received: by smtp32.i.mail.ru with esmtpa (envelope-from ) id 1qTlJ4-003Nbf-26; Wed, 09 Aug 2023 18:41:07 +0300 To: Igor Munkin , Sergey Bronnikov Date: Wed, 9 Aug 2023 18:35:58 +0300 Message-ID: <3ea79a870cded9d8cd90c9b930e965d2ca075200.1691592488.git.skaplun@tarantool.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Mailru-Src: smtp X-4EC0790: 10 X-7564579A: 78E4E2B564C1792B X-77F55803: 4F1203BC0FB41BD969E04B5EED670DC8BEB87106826C4595A10F7F5F18564AA6182A05F5380850402272F93094528EA96A27CB2E765B1616C5C1797901FA28025313236A3AEEDC1F X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7EEF2A6A9DCF3640FC2099A533E45F2D0395957E7521B51C2CFCAF695D4D8E9FCEA1F7E6F0F101C6778DA827A17800CE72DF3470F92485B86EA1F7E6F0F101C6723150C8DA25C47586E58E00D9D99D84E1BDDB23E98D2D38BE5CCB53A13BC8DBA7F4B5F286F156C15403E82225B263F50CC7F00164DA146DAFE8445B8C89999728AA50765F7900637F1F33655BFBB40449FA2833FD35BB23D2EF20D2F80756B5F868A13BD56FB6657A471835C12D1D977725E5C173C3A84C3A12191B5F2BB8629117882F4460429728AD0CFFFB425014E868A13BD56FB6657D81D268191BDAD3DC09775C1D3CA48CF05E80F4396618BB276E601842F6C81A12EF20D2F80756B5FB606B96278B59C4276E601842F6C81A127C277FBC8AE2E8B406C66621D3021AFD81D268191BDAD3D3666184CF4C3C14F3FC91FA280E0CE3D1A620F70A64A45A98AA50765F79006372E808ACE2090B5E1725E5C173C3A84C3C5EA940A35A165FF2DBA43225CD8A89F83C798A30B85E16BC6EABA9B74D0DA47B5C8C57E37DE458BEDA766A37F9254B7 X-C1DE0DAB: 0D63561A33F958A5D763394BCF5525F42F6BEBBAB7CE8134411A8D1EFCC30483F87CCE6106E1FC07E67D4AC08A07B9B0632EDEA9CD5989A39C5DF10A05D560A950611B66E3DA6D700B0A020F03D25A0997E3FB2386030E77 X-C8649E89: 1C3962B70DF3F0ADE00A9FD3E00BEEDF3FED46C3ACD6F73ED3581295AF09D3DF87807E0823442EA2ED31085941D9CD0AF7F820E7B07EA4CF60038163BB0044B994F707778D91AC7C8FAA997CB11EFAA1460709BBF62C1B20065B4C0772F80DDC1529AA6C8ABD04CA4F5A6459975263577DA169A18C9F4EA5A74DFFEFA5DC0E7F02C26D483E81D6BE5EF9655DD6DEA7D65774BB76CC95456EEC5B5AD62611EEC62B5AFB4261A09AF0 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojUzxoxvtYX2rxLgVsLn3Qxw== X-Mailru-Sender: 11C2EC085EDE56FAC07928AF2646A76930F48A247AAB12326A27CB2E765B161681AE5054A97140B9DEDBA653FF35249392D99EB8CC7091A70E183A470755BFD208F19895AA18418972D6B4FCE48DF648AE208404248635DF X-Mras: Ok Subject: [Tarantool-patches] [PATCH luajit 09/19] FFI: Eliminate hardcoded string hashes. X-BeenThere: tarantool-patches@dev.tarantool.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Sergey Kaplun via Tarantool-patches Reply-To: Sergey Kaplun Cc: tarantool-patches@dev.tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" From: Mike Pall (cherry-picked from commit 70f4b15ee45a6137fe6b48b941faea79d72f7159) This patch refactors FFI parsing of supported C attributes and pragmas, `ffi.abi()` parameter check. It replaces usage of comparison (with hardcoded string hashes) with search in the given string with the format: "\XXXattribute1\XXXattribute2", where `\XXX` is the length of "attribute" name. Sergey Kaplun: * added the description for the commit Part of tarantool/tarantool#8825 --- src/lib_ffi.c | 35 ++++++++++------------ src/lj_cparse.c | 77 +++++++++++++++++++++++++++++++------------------ src/lj_cparse.h | 2 ++ 3 files changed, 67 insertions(+), 47 deletions(-) diff --git a/src/lib_ffi.c b/src/lib_ffi.c index d1fe1a14..62af54c1 100644 --- a/src/lib_ffi.c +++ b/src/lib_ffi.c @@ -720,50 +720,47 @@ LJLIB_CF(ffi_fill) LJLIB_REC(.) return 0; } -#define H_(le, be) LJ_ENDIAN_SELECT(0x##le, 0x##be) - /* Test ABI string. */ LJLIB_CF(ffi_abi) LJLIB_REC(.) { GCstr *s = lj_lib_checkstr(L, 1); - int b = 0; - switch (s->hash) { + int b = lj_cparse_case(s, #if LJ_64 - case H_(849858eb,ad35fd06): b = 1; break; /* 64bit */ + "\00564bit" #else - case H_(662d3c79,d0e22477): b = 1; break; /* 32bit */ + "\00532bit" #endif #if LJ_ARCH_HASFPU - case H_(e33ee463,e33ee463): b = 1; break; /* fpu */ + "\003fpu" #endif #if LJ_ABI_SOFTFP - case H_(61211a23,c2e8c81c): b = 1; break; /* softfp */ + "\006softfp" #else - case H_(539417a8,8ce0812f): b = 1; break; /* hardfp */ + "\006hardfp" #endif #if LJ_ABI_EABI - case H_(2182df8f,f2ed1152): b = 1; break; /* eabi */ + "\004eabi" #endif #if LJ_ABI_WIN - case H_(4ab624a8,4ab624a8): b = 1; break; /* win */ + "\003win" #endif #if LJ_TARGET_UWP - case H_(a40f0bcb,a40f0bcb): b = 1; break; /* uwp */ + "\003uwp" +#endif +#if LJ_LE + "\002le" +#else + "\002be" #endif - case H_(3af93066,1f001464): b = 1; break; /* le/be */ #if LJ_GC64 - case H_(9e89d2c9,13c83c92): b = 1; break; /* gc64 */ + "\004gc64" #endif - default: - break; - } + ) >= 0; setboolV(L->top-1, b); setboolV(&G(L)->tmptv2, b); /* Remember for trace recorder. */ return 1; } -#undef H_ - LJLIB_PUSH(top-8) LJLIB_SET(!) /* Store reference to miscmap table. */ LJLIB_CF(ffi_metatype) diff --git a/src/lj_cparse.c b/src/lj_cparse.c index fb440567..07c643d4 100644 --- a/src/lj_cparse.c +++ b/src/lj_cparse.c @@ -28,6 +28,24 @@ ** If in doubt, please check the input against your favorite C compiler. */ +/* -- Miscellaneous ------------------------------------------------------- */ + +/* Match string against a C literal. */ +#define cp_str_is(str, k) \ + ((str)->len == sizeof(k)-1 && !memcmp(strdata(str), k, sizeof(k)-1)) + +/* Check string against a linear list of matches. */ +int lj_cparse_case(GCstr *str, const char *match) +{ + MSize len; + int n; + for (n = 0; (len = (MSize)*match++); n++, match += len) { + if (str->len == len && !memcmp(match, strdata(str), len)) + return n; + } + return -1; +} + /* -- C lexer ------------------------------------------------------------- */ /* C lexer token names. */ @@ -930,8 +948,6 @@ static CTypeID cp_decl_intern(CPState *cp, CPDecl *decl) /* -- C declaration parser ------------------------------------------------ */ -#define H_(le, be) LJ_ENDIAN_SELECT(0x##le, 0x##be) - /* Reset declaration state to declaration specifier. */ static void cp_decl_reset(CPDecl *decl) { @@ -1071,44 +1087,57 @@ static void cp_decl_gccattribute(CPState *cp, CPDecl *decl) attrstr = lj_str_new(cp->L, c+2, attrstr->len-4); #endif cp_next(cp); - switch (attrstr->hash) { - case H_(64a9208e,8ce14319): case H_(8e6331b2,95a282af): /* aligned */ + switch (lj_cparse_case(attrstr, + "\007aligned" "\013__aligned__" + "\006packed" "\012__packed__" + "\004mode" "\010__mode__" + "\013vector_size" "\017__vector_size__" +#if LJ_TARGET_X86 + "\007regparm" "\013__regparm__" + "\005cdecl" "\011__cdecl__" + "\010thiscall" "\014__thiscall__" + "\010fastcall" "\014__fastcall__" + "\007stdcall" "\013__stdcall__" + "\012sseregparm" "\016__sseregparm__" +#endif + )) { + case 0: case 1: /* aligned */ cp_decl_align(cp, decl); break; - case H_(42eb47de,f0ede26c): case H_(29f48a09,cf383e0c): /* packed */ + case 2: case 3: /* packed */ decl->attr |= CTFP_PACKED; break; - case H_(0a84eef6,8dfab04c): case H_(995cf92c,d5696591): /* mode */ + case 4: case 5: /* mode */ cp_decl_mode(cp, decl); break; - case H_(0ab31997,2d5213fa): case H_(bf875611,200e9990): /* vector_size */ + case 6: case 7: /* 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 8: case 9: /* 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 10: case 11: /* cdecl */ CTF_INSERT(decl->fattr, CCONV, CTCC_CDECL); decl->fattr |= CTFP_CCONV; break; - case H_(72b2e41b,494c5a44): case H_(f2356d59,f25fc9bd): /* thiscall */ + case 12: case 13: /* thiscall */ CTF_INSERT(decl->fattr, CCONV, CTCC_THISCALL); decl->fattr |= CTFP_CCONV; break; - case H_(0d0ffc42,ab746f88): case H_(21c54ba1,7f0ca7e3): /* fastcall */ + case 14: case 15: /* fastcall */ CTF_INSERT(decl->fattr, CCONV, CTCC_FASTCALL); decl->fattr |= CTFP_CCONV; break; - case H_(ef76b040,9412e06a): case H_(de56697b,c750e6e1): /* stdcall */ + case 16: case 17: /* stdcall */ CTF_INSERT(decl->fattr, CCONV, CTCC_STDCALL); decl->fattr |= CTFP_CCONV; break; - case H_(ea78b622,f234bd8e): case H_(252ffb06,8d50f34b): /* sseregparm */ + case 18: case 19: /* sseregparm */ decl->fattr |= CTF_SSEREGPARM; decl->fattr |= CTFP_CCONV; break; @@ -1140,16 +1169,13 @@ static void cp_decl_msvcattribute(CPState *cp, CPDecl *decl) while (cp->tok == CTOK_IDENT) { GCstr *attrstr = cp->str; cp_next(cp); - switch (attrstr->hash) { - case H_(bc2395fa,98f267f8): /* align */ + if (cp_str_is(attrstr, "align")) { cp_decl_align(cp, decl); - break; - default: /* Ignore all other attributes. */ + } else { /* Ignore all other attributes. */ if (cp_opt(cp, '(')) { while (cp->tok != ')' && cp->tok != CTOK_EOF) cp_next(cp); cp_check(cp, ')'); } - break; } } cp_check(cp, ')'); @@ -1729,17 +1755,16 @@ static CTypeID cp_decl_abstract(CPState *cp) static void cp_pragma(CPState *cp, BCLine pragmaline) { cp_next(cp); - if (cp->tok == CTOK_IDENT && - cp->str->hash == H_(e79b999f,42ca3e85)) { /* pack */ + if (cp->tok == CTOK_IDENT && cp_str_is(cp->str, "pack")) { cp_next(cp); cp_check(cp, '('); if (cp->tok == CTOK_IDENT) { - if (cp->str->hash == H_(738e923c,a1b65954)) { /* push */ + if (cp_str_is(cp->str, "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_is(cp->str, "pop")) { if (cp->curpack > 0) cp->curpack--; } else { cp_errmsg(cp, cp->tok, LJ_ERR_XSYMBOL); @@ -1788,13 +1813,11 @@ static void cp_decl_multi(CPState *cp) if (tok == CTOK_INTEGER) { cp_line(cp, hashline); continue; - } else if (tok == CTOK_IDENT && - cp->str->hash == H_(187aab88,fcb60b42)) { /* line */ + } else if (tok == CTOK_IDENT && cp_str_is(cp->str, "line")) { if (cp_next(cp) != CTOK_INTEGER) cp_err_token(cp, tok); cp_line(cp, hashline); continue; - } else if (tok == CTOK_IDENT && - cp->str->hash == H_(f5e6b4f8,1d509107)) { /* pragma */ + } else if (tok == CTOK_IDENT && cp_str_is(cp->str, "pragma")) { cp_pragma(cp, hashline); continue; } else { @@ -1865,8 +1888,6 @@ static void cp_decl_single(CPState *cp) if (cp->tok != CTOK_EOF) cp_err_token(cp, CTOK_EOF); } -#undef H_ - /* ------------------------------------------------------------------------ */ /* Protected callback for C parser. */ diff --git a/src/lj_cparse.h b/src/lj_cparse.h index bad1060b..e40b4047 100644 --- a/src/lj_cparse.h +++ b/src/lj_cparse.h @@ -60,6 +60,8 @@ typedef struct CPState { LJ_FUNC int lj_cparse(CPState *cp); +LJ_FUNC int lj_cparse_case(GCstr *str, const char *match); + #endif #endif -- 2.41.0