Skip to content

interpreter: Do not emit two handlers for load_imm_and_jump #323

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
merged 1 commit into from
Sep 2, 2025
+53 −2
Merged

interpreter: Do not emit two handlers for load_imm_and_jump #323

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
55 changes: 53 additions & 2 deletions crates/polkavm/src/interpreter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1851,6 +1851,25 @@ macro_rules! define_interpreter {
$body
}};

(@define $handler_name:ident $body:block $self:ident, $a0:ident: Reg, $a1:ident: u32, $a2:ident: Target) => {{
impl Args {
pub fn $handler_name(a0: impl Into<Reg>, a1: u32, a2: Target) -> Args {
Args {
a0: a0.into().to_u32(),
a1,
a2,
..Args::default()
}
}
}

let args = $self.inner.compiled_args[cast($self.inner.compiled_offset).to_usize()];
let $a0 = transmute_reg(args.a0);
let $a1 = args.a1;
let $a2 = args.a2;
$body
}};

(@define $handler_name:ident $body:block $self:ident, $a0:ident: Reg, $a1:ident: Reg, $a2:ident: Target) => {{
impl Args {
pub fn $handler_name(a0: impl Into<Reg>, a1: impl Into<Reg>, a2: Target) -> Args {
Expand Down Expand Up @@ -3707,6 +3726,15 @@ define_interpreter! {
visitor.jump_indirect_impl::<DEBUG>(program_counter, dynamic_address)
}

fn load_imm_and_jump<const DEBUG: bool>(visitor: &mut Visitor, ra: Reg, value: u32, target: Target) -> Option<Target> {
if DEBUG {
log::trace!("[{}]: {}", visitor.inner.compiled_offset, asm::load_imm_and_jump(ra, value, target));
}

visitor.set32::<DEBUG>(ra, value);
Some(target)
}

fn unresolved_branch_less_unsigned<const DEBUG: bool>(visitor: &mut Visitor, s1: Reg, s2: Reg, tt: ProgramCounter, tf: ProgramCounter) -> Option<Target> {
handle_unresolved_branch!("<u", visitor, s1, s2, tt, tf, branch_less_unsigned)
}
Expand Down Expand Up @@ -3801,6 +3829,30 @@ define_interpreter! {
}
}

fn unresolved_load_imm_and_jump<const DEBUG: bool>(visitor: &mut Visitor, program_counter: ProgramCounter, ra: Reg, value: u32, jump_to: u32) -> Option<Target> {
if DEBUG {
log::trace!("[{}]: unresolved {}", visitor.inner.compiled_offset, asm::load_imm_and_jump(ra, value, jump_to));
}

visitor.set32::<DEBUG>(ra, value);

let offset = visitor.inner.compiled_offset;
if let Some(target) = visitor.inner.resolve_jump::<DEBUG>(ProgramCounter(jump_to)) {
if DEBUG {
log::trace!(" -> resolved to jump");
}
visitor.inner.compiled_handlers[cast(offset).to_usize()] = cast_handler!(raw_handlers::load_imm_and_jump::<DEBUG>);
visitor.inner.compiled_args[cast(offset).to_usize()] = Args::load_imm_and_jump(ra, value, target);

Some(target)
} else {
if DEBUG {
log::trace!(" -> resolved to trap");
}
trap_impl::<DEBUG>(visitor, program_counter)
}
}

fn unresolved_fallthrough<const DEBUG: bool>(visitor: &mut Visitor, jump_to: ProgramCounter) -> Option<Target> {
if DEBUG {
log::trace!("[{}]: unresolved fallthrough {jump_to}", visitor.inner.compiled_offset);
Expand Down Expand Up @@ -4625,8 +4677,7 @@ impl<'a, const DEBUG: bool> InstructionVisitor for Compiler<'a, DEBUG> {
}

fn load_imm_and_jump(&mut self, dst: RawReg, imm: u32, target: u32) -> Self::ReturnTy {
emit!(self, load_imm(dst, imm));
emit!(self, unresolved_jump(self.program_counter, ProgramCounter(target)));
emit!(self, unresolved_load_imm_and_jump(self.program_counter, dst, imm, target));
}

fn load_imm_and_jump_indirect(&mut self, ra: RawReg, base: RawReg, value: u32, offset: u32) -> Self::ReturnTy {
Expand Down