[Tarantool-patches] [PATCH luajit 4/4][v2] OSX/iOS/ARM64: Fix bytecode embedding in Mach-O object file.

Sergey Kaplun skaplun at tarantool.org
Fri Apr 12 14:27:46 MSK 2024


Hi, Sergey!
Thanks for the fixes!
LGTM, with a several minor nits below.

On 11.04.24, Sergey Bronnikov wrote:
> From: Mike Pall <mike>
> 
> Thanks to Carlo Cabrera.
> 
> (cherry picked from commit b98b37231bd2dcb79e10b0f974cefd91eb0d7b3a)
> 
> Mach-O FAT object files generated by LuaJIT for ARM64 Had

Typo: s/Had/had/

> an incorrect format due to the usage of the 32-bit version of
> FFI structure. This patch adds the 64-bit structure definition

Typo: s/FFI structure/the FFI structure/

> and uses it for ARM64.
> 
> Sergey Bronnikov:
> * added the description and the test for the problem
> 
> Part of tarantool/tarantool#9595
> ---
>  src/jit/bcsave.lua                            | 14 ++++-
>  ...-865-cross-generation-mach-o-file.test.lua | 55 +++++++++++++++++--
>  2 files changed, 63 insertions(+), 6 deletions(-)
> 

<snipped>

>  
>    -- Mach-O FAT object header.
> @@ -221,9 +263,11 @@ end
>  --
>  local SUM_CPUTYPE = {
>    arm = 7 + 12,
> +  arm64 = 0x01000007 + 0x0100000c,

Minor: The comment will be appreciated:
| x64 + arm64.

>  }
>  local SUM_CPUSUBTYPE = {
>    arm = 3 + 9,
> +  arm64 = 3 + 0,

Minor: The comment will be appreciated:
| x64 + arm64.

>  }
>  
>  -- The function builds Mach-O FAT object file and retrieves

<snipped>

> -- 
> 2.34.1
> 

-- 
Best regards,
Sergey Kaplun


More information about the Tarantool-patches mailing list