From: Sergey Bronnikov via Tarantool-patches <tarantool-patches@dev.tarantool.org> To: Maxim Kokryashkin <m.kokryashkin@tarantool.org>, Sergey Bronnikov <estetus@gmail.com> Cc: tarantool-patches@dev.tarantool.org Subject: Re: [Tarantool-patches] [PATCH luajit 2/2] OSX/iOS/ARM64: Fix bytecode embedding in Mach-O object file. Date: Tue, 19 Mar 2024 11:22:20 +0300 [thread overview] Message-ID: <d23fa8c0-ce29-4989-9185-3359ea4bac94@tarantool.org> (raw) In-Reply-To: <5fprjxcjy4f4ugliudwqmc5pu4xbv53vdir34hl6gu2vtgjtfe@fqtnkjrf4z4l> Max, thanks for review. See my comments below. Changes force-pushed. On 3/18/24 16:44, Maxim Kokryashkin wrote: > Hi, Sergey! > Thanks for the patch! > Please consider my comments below. > On Thu, Mar 14, 2024 at 02:39:51PM +0300, Sergey Bronnikov wrote: >> From: sergeyb@tarantool.org >> >> Thanks to Carlo Cabrera. >> >> (cherry picked from commit b98b37231bd2dcb79e10b0f974cefd91eb0d7b3a) >> >> Mach-O FAR object files generated by LuaJIT for arm64 had an incorrect > Typo: s/FAR/FAT/ > Typo: s/arm64/ARM64/ Fixed. >> format because FFI structure used for generation was wrong: > Typo: s/FFI/The FFI/ Fixed. >> `mach_fat_obj` instead of `mach_fat_obj_64`. >> >> Sergey Bronnikov: >> * added the description and a test for the problem > Typo: s/a test/the test/ Fixed. >> Part of tarantool/tarantool#9595 >> --- >> src/jit/bcsave.lua | 14 +++++++++++++- >> ...-fix_generation_of_mach-o_object_files.test.lua | 4 +++- >> 2 files changed, 16 insertions(+), 2 deletions(-) >> >> diff --git a/src/jit/bcsave.lua b/src/jit/bcsave.lua >> index 7aec1555..069cf1a3 100644 >> --- a/src/jit/bcsave.lua >> +++ b/src/jit/bcsave.lua >> @@ -491,6 +491,18 @@ typedef struct { >> mach_nlist sym_entry; >> uint8_t space[4096]; >> } mach_fat_obj; >> +typedef struct { >> + mach_fat_header fat; >> + mach_fat_arch fat_arch[2]; >> + struct { >> + mach_header_64 hdr; >> + mach_segment_command_64 seg; >> + mach_section_64 sec; >> + mach_symtab_command sym; >> + } arch[2]; >> + mach_nlist_64 sym_entry; >> + uint8_t space[4096]; >> +} mach_fat_obj_64; >> ]] >> local symname = '_'..LJBC_PREFIX..ctx.modname >> local isfat, is64, align, mobj = false, false, 4, "mach_obj" >> @@ -499,7 +511,7 @@ typedef struct { >> elseif ctx.arch == "arm" then >> isfat, mobj = true, "mach_fat_obj" >> elseif ctx.arch == "arm64" then >> - is64, align, isfat, mobj = true, 8, true, "mach_fat_obj" >> + is64, align, isfat, mobj = true, 8, true, "mach_fat_obj_64" >> else >> check(ctx.arch == "x86", "unsupported architecture for OSX") >> end >> diff --git a/test/tarantool-tests/lj-865-fix_generation_of_mach-o_object_files.test.lua b/test/tarantool-tests/lj-865-fix_generation_of_mach-o_object_files.test.lua >> index 0519e134..0a11f163 100644 >> --- a/test/tarantool-tests/lj-865-fix_generation_of_mach-o_object_files.test.lua >> +++ b/test/tarantool-tests/lj-865-fix_generation_of_mach-o_object_files.test.lua >> @@ -7,7 +7,7 @@ local test = tap.test('lj-865-fix_generation_of_mach-o_object_files'):skipcond({ >> ['Test uses exotic type of loaders (see #9671)'] = _TARANTOOL, >> }) >> >> -test:plan(4) >> +test:plan(8) >> >> -- Test creates an object file in Mach-O format with LuaJIT bytecode >> -- and checks validness of the object file fields. >> @@ -267,5 +267,7 @@ end >> >> -- ARM >> build_and_check_mach_o(false) >> +-- ARM64 >> +build_and_check_mach_o(true) > These `true/false` should be explained as platform toggle. > An even better solution would be to pass the platform name > explicitly. Why comment above is not sufficient? >> test:done(true) >> -- >> 2.34.1 >>
next prev parent reply other threads:[~2024-03-19 8:22 UTC|newest] Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top 2024-03-14 11:39 [Tarantool-patches] [PATCH luajit 0/2] Mach-O generation fixes Sergey Bronnikov via Tarantool-patches 2024-03-14 11:39 ` [Tarantool-patches] [PATCH luajit 1/2] OSX/iOS/ARM64: Fix generation of Mach-O object files Sergey Bronnikov via Tarantool-patches 2024-03-18 12:53 ` Maxim Kokryashkin via Tarantool-patches 2024-03-19 8:19 ` Sergey Bronnikov via Tarantool-patches 2024-03-19 16:28 ` Maxim Kokryashkin via Tarantool-patches 2024-03-26 13:53 ` Sergey Bronnikov via Tarantool-patches 2024-03-26 15:44 ` Maxim Kokryashkin via Tarantool-patches 2024-04-08 15:01 ` Sergey Kaplun via Tarantool-patches 2024-04-09 11:07 ` Sergey Bronnikov via Tarantool-patches 2024-04-09 12:47 ` Sergey Kaplun via Tarantool-patches 2024-03-18 12:55 ` Maxim Kokryashkin via Tarantool-patches 2024-03-14 11:39 ` [Tarantool-patches] [PATCH luajit 2/2] OSX/iOS/ARM64: Fix bytecode embedding in Mach-O object file Sergey Bronnikov via Tarantool-patches 2024-03-18 13:44 ` Maxim Kokryashkin via Tarantool-patches 2024-03-19 8:22 ` Sergey Bronnikov via Tarantool-patches [this message] 2024-03-19 16:15 ` Maxim Kokryashkin via Tarantool-patches 2024-03-26 14:01 ` Sergey Bronnikov via Tarantool-patches 2024-03-26 15:45 ` Maxim Kokryashkin via Tarantool-patches 2024-04-08 15:16 ` Sergey Kaplun via Tarantool-patches 2024-04-11 7:56 ` Sergey Bronnikov via Tarantool-patches 2024-04-08 7:47 ` [Tarantool-patches] [PATCH luajit 0/2] Mach-O generation fixes Sergey Kaplun via Tarantool-patches 2024-04-08 13:06 ` Sergey Kaplun via Tarantool-patches 2024-04-11 8:08 ` Sergey Bronnikov via Tarantool-patches 2024-04-11 8:27 ` Sergey Kaplun via Tarantool-patches 2024-04-11 12:39 ` Sergey Bronnikov via Tarantool-patches
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=d23fa8c0-ce29-4989-9185-3359ea4bac94@tarantool.org \ --to=tarantool-patches@dev.tarantool.org \ --cc=estetus@gmail.com \ --cc=m.kokryashkin@tarantool.org \ --cc=sergeyb@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH luajit 2/2] OSX/iOS/ARM64: Fix bytecode embedding in Mach-O object file.' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox