kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Use new assembler to support global invalidation on A64

Browse source 
Previously, we patched in an x64 JMP even on A64, which resulted in
invalid machine code. Use the new assembler to generate a jump instead.

Add an assert to make sure patches don't step on each other since it's
less clear cut on A64, where the size of the jump varies depending on
its placement relative to the target.

Fixes a lot of tests that use `set_trace_func` in `test_insns.rb`.

PR: https://github.com/Shopify/ruby/pull/379
This commit is contained in:
Alan Wu 2022-08-08 14:49:46 -04:00 • committed by Takashi Kokubun
parent 726a451955
commit a375784275
No known key found for this signature in database
GPG key ID: 6FFC433B12EE23DD
1 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
yjit/src/invariants.rs
View file

@ -528,8 +528,6 @@ pub extern "C" fn rb_yjit_tracing_invalidate_all() {
return; return;
} }
use crate::asm::x86_64::jmp_ptr;
// Stop other ractors since we are going to patch machine code. // Stop other ractors since we are going to patch machine code.
with_vm_lock(src_loc!(), || { with_vm_lock(src_loc!(), || {
// Make it so all live block versions are no longer valid branch targets // Make it so all live block versions are no longer valid branch targets
@ -561,13 +559,18 @@ pub extern "C" fn rb_yjit_tracing_invalidate_all() {
// Apply patches // Apply patches
let old_pos = cb.get_write_pos(); let old_pos = cb.get_write_pos();
let patches = CodegenGlobals::take_global_inval_patches(); let mut patches = CodegenGlobals::take_global_inval_patches();
patches.sort_by_cached_key(|patch| patch.inline_patch_pos.raw_ptr());
let mut last_patch_end = std::ptr::null();
for patch in &patches { for patch in &patches {
cb.set_write_ptr(patch.inline_patch_pos); assert!(last_patch_end <= patch.inline_patch_pos.raw_ptr(), "patches should not overlap");
jmp_ptr(cb, patch.outlined_target_pos);
// FIXME: Can't easily check we actually wrote out the JMP at the moment. let mut asm = crate::backend::ir::Assembler::new();
// assert!(!cb.has_dropped_bytes(), "patches should have space and jump offsets should fit in JMP rel32"); asm.jmp(patch.outlined_target_pos.into());
cb.set_write_ptr(patch.inline_patch_pos);
asm.compile(cb);
last_patch_end = cb.get_write_ptr().raw_ptr();
} }
cb.set_pos(old_pos); cb.set_pos(old_pos);