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 75257574A42; Fri, 11 Aug 2023 11:11:10 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 75257574A42 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1691741470; bh=g5jhd0+Kq5qkJwW29Rln06u8xFFOeoLA/YXbJWtTytU=; h=Date:To:Cc:References:In-Reply-To:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=tZM4dnvvP+usIKTI14BzNHMn1Jb1/J6qavotKrinh5IjAJKmLNkxeD8/1v5ok647y cLruLiwL1MdPLW2AXUJhZe5uhKuRC/cCYDeJEcwBf0+nAzNbMAQEAGOkqG1HLqRJEC gJ8nXGSfA2crQd8up2Nz9V+ISgLb8Hdiev4HuSiU= Received: from smtp33.i.mail.ru (smtp33.i.mail.ru [95.163.41.74]) (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 4FEEB4F3F5D for ; Fri, 11 Aug 2023 11:11:09 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 4FEEB4F3F5D Received: by smtp33.i.mail.ru with esmtpa (envelope-from ) id 1qUNEi-00BzEz-1c; Fri, 11 Aug 2023 11:11:08 +0300 Date: Fri, 11 Aug 2023 11:06:21 +0300 To: Igor Munkin , Sergey Bronnikov Cc: tarantool-patches@dev.tarantool.org Message-ID: References: <8bd95083805e240d65b2c02524ffb3ad8d91b414.1691592488.git.skaplun@tarantool.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <8bd95083805e240d65b2c02524ffb3ad8d91b414.1691592488.git.skaplun@tarantool.org> X-Mailru-Src: smtp X-4EC0790: 10 X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD969E04B5EED670DC8841989C3708580A974F6E13231883BD2182A05F53808504075F67409CA43F022AE56271B2C860DD4EB8D0CFFC7FB2B0EC8956A58AAB1028A X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7D9C4478D0B876341EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637F78F3D6E0D6791938638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D808E80BC9321ED523EE160F0597BB9FC7117882F4460429724CE54428C33FAD305F5C1EE8F4F765FC4AFB60FD1831C04CA471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD18F04B652EEC242312D2E47CDBA5A96583BA9C0B312567BB2376E601842F6C81A19E625A9149C048EE140C956E756FBB7A9935A1E27F592749D8FC6C240DEA76429C9F4D5AE37F343AA9539A8B242431040A6AB1C7CE11FEE364E7220B7C550592C0837EA9F3D19764C4224003CC836476E2F48590F00D11D6E2021AF6380DFAD1A18204E546F3947CB11811A4A51E3B096D1867E19FE1407978DA827A17800CE74E672349037D5FA5725E5C173C3A84C31C94431981024FA535872C767BF85DA2F004C90652538430E4A6367B16DE6309 X-C1DE0DAB: 0D63561A33F958A54F3DBEE1A2494384BEB671D273BC09CF6EF70D9CB5795A30F87CCE6106E1FC07E67D4AC08A07B9B065B78C30F681404DCB5012B2E24CD356 X-C8649E89: 1C3962B70DF3F0ADE00A9FD3E00BEEDF3FED46C3ACD6F73ED3581295AF09D3DF87807E0823442EA2ED31085941D9CD0AF7F820E7B07EA4CF41548A7A63013C7C74FCBEF996A6043940B5E2F19DED90532C3C974209E41765498A0925D8903450FD55C7FC667708D52A18D30BE1F7620F79D694BFC67949B3E48CAC7CA610320002C26D483E81D6BE5EF9655DD6DEA7D65774BB76CC95456EEC5B5AD62611EEC62B5AFB4261A09AF0 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojhKIV/jOMutJWT5gVkOjwcg== X-Mailru-Sender: 11C2EC085EDE56FAC07928AF2646A769C5B9B750718F6772AE56271B2C860DD421401CF93FD6FA55DEDBA653FF35249392D99EB8CC7091A70E183A470755BFD208F19895AA18418972D6B4FCE48DF648AE208404248635DF X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH luajit 10/19] Cleanup math function compilation and fix inconsistencies. 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 Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Hi, folks! I found that some changes (see ) are missing, I've updated the patch and force-pushed the branch. =================================================================== Cleanup math function compilation and fix inconsistencies. (cherry picked from commit 5655be4546d9177890c69f0d0accac4773ff0887) This patch backports the aforementioned patch for mips and ppc, because those architectures were stripped during the backporting via 71ec8eb232d4dfa8df2cbbae65b799b2ce493979 ("Cleanup math function compilation and fix inconsistencies."). This applies these missed diffs to prevent conflict during backporting future patches. This patch just removes macros, that are no more in use. Also, it removes `IR_ATAN2` usage, that is not defined. Sergey Kaplun: * added the description for the problem Part of tarantool/tarantool#8825 diff --git a/src/lj_asm.c b/src/lj_asm.c index 15de7e33..ff68f79b 100644 --- a/src/lj_asm.c +++ b/src/lj_asm.c @@ -1705,7 +1705,7 @@ static void asm_ir(ASMState *as, IRIns *ir) case IR_NEG: asm_neg(as, ir); break; #if LJ_SOFTFP32 case IR_DIV: case IR_POW: case IR_ABS: - case IR_ATAN2: case IR_LDEXP: case IR_FPMATH: case IR_TOBIT: + case IR_LDEXP: case IR_FPMATH: case IR_TOBIT: lua_assert(0); /* Unused for LJ_SOFTFP32. */ break; #else diff --git a/src/lj_asm_mips.h b/src/lj_asm_mips.h index a26a82cd..c27d8413 100644 --- a/src/lj_asm_mips.h +++ b/src/lj_asm_mips.h @@ -1794,7 +1794,6 @@ static void asm_abs(ASMState *as, IRIns *ir) } #endif -#define asm_atan2(as, ir) asm_callid(as, ir, IRCALL_atan2) #define asm_ldexp(as, ir) asm_callid(as, ir, IRCALL_ldexp) static void asm_arithov(ASMState *as, IRIns *ir) diff --git a/src/lj_asm_ppc.h b/src/lj_asm_ppc.h index 6cb608f7..6aaed058 100644 --- a/src/lj_asm_ppc.h +++ b/src/lj_asm_ppc.h @@ -1390,7 +1390,6 @@ static void asm_neg(ASMState *as, IRIns *ir) } #define asm_abs(as, ir) asm_fpunary(as, ir, PPCI_FABS) -#define asm_atan2(as, ir) asm_callid(as, ir, IRCALL_atan2) #define asm_ldexp(as, ir) asm_callid(as, ir, IRCALL_ldexp) static void asm_arithov(ASMState *as, IRIns *ir, PPCIns pi) =================================================================== -- Best regards, Sergey Kaplun