Skip to content

x86_64: fix near jump check #352

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zherczeg merged 3 commits into from
Dec 27, 2025
Merged

x86_64: fix near jump check #352

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d0d325a
x86_64: fix near jump check
inkydragon Dec 25, 2025
e04c42c
build: fix 'mixed declarations and code'
inkydragon Dec 26, 2025
c24d525
build: fix warning on x86
inkydragon Dec 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion sljit_src/sljitNativeX86_common.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -681,6 +681,9 @@ static sljit_u8* detect_near_jump_type(struct sljit_jump *jump, sljit_u8 *code_p
sljit_s32 short_jump;
sljit_uw label_addr;
sljit_uw jump_addr;
#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
sljit_uw rel_size;

@zherczeg zherczeg Dec 27, 2025

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably you need to add #if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64) arond this as well.

#endif /* SLJIT_CONFIG_X86_64 */

jump_addr = (sljit_uw)code_ptr;
if (!(jump->flags & JUMP_ADDR)) {
Expand All @@ -692,7 +695,8 @@ static sljit_u8* detect_near_jump_type(struct sljit_jump *jump, sljit_u8 *code_p
label_addr = jump->u.target - (sljit_uw)executable_offset;

#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
if ((sljit_sw)(label_addr - (jump_addr + 6)) > HALFWORD_MAX || (sljit_sw)(label_addr - (jump_addr + 5)) < HALFWORD_MIN)
rel_size = (type < SLJIT_JUMP) ? 6 : 5;
if ((sljit_sw)(label_addr - (jump_addr + rel_size)) > HALFWORD_MAX || (sljit_sw)(label_addr - (jump_addr + rel_size)) < HALFWORD_MIN)
return detect_far_jump_type(jump, code_ptr);
#endif /* SLJIT_CONFIG_X86_64 */

Expand Down