1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Invalidate i-cache after link_labels (#6388)

Browse Source
This commit is contained in:
Takashi Kokubun 2022-09-16 20:44:58 +09:00 committed by GitHub
parent a28e7871e5
commit 5b735d0beb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
Notes: git 2022-09-16 20:45:31 +09:00 
Merged-By: k0kubun <takashikkbn@gmail.com>
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
yjit/src/backend/arm64/mod.rs
View File

@ -971,17 +971,6 @@ impl Assembler
}; };
} }
// Invalidate icache for newly written out region so we don't run
// stale code.
#[cfg(not(test))]
{
let start = cb.get_ptr(start_write_pos).raw_ptr();
let write_ptr = cb.get_write_ptr().raw_ptr();
let codeblock_end = cb.get_ptr(cb.get_mem_size()).raw_ptr();
let end = std::cmp::min(write_ptr, codeblock_end);
unsafe { rb_yjit_icache_invalidate(start as _, end as _) };
}
gc_offsets gc_offsets
} }
@ -996,12 +985,23 @@ impl Assembler
assert!(label_idx == idx); assert!(label_idx == idx);
} }
let start_write_pos = cb.get_write_pos();
let gc_offsets = asm.arm64_emit(cb); let gc_offsets = asm.arm64_emit(cb);
if !cb.has_dropped_bytes() { if !cb.has_dropped_bytes() {
cb.link_labels(); cb.link_labels();
} }
// Invalidate icache for newly written out region so we don't run stale code.
#[cfg(not(test))]
{
let start = cb.get_ptr(start_write_pos).raw_ptr();
let write_ptr = cb.get_write_ptr().raw_ptr();
let codeblock_end = cb.get_ptr(cb.get_mem_size()).raw_ptr();
let end = std::cmp::min(write_ptr, codeblock_end);
unsafe { rb_yjit_icache_invalidate(start as _, end as _) };
}
gc_offsets gc_offsets
} }
} }