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

rename defined_ivar to definedivar

Browse Source 
because non-opt instructions should contain `_` char.
This commit is contained in:
Koichi Sasada 2023-03-10 00:34:38 +09:00
parent 22d8e95ffe
commit 262254dc7d
Notes: git 2023-03-09 15:42:42 +00:00 
Merged: https://github.com/ruby/ruby/pull/7485
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compile.c
View File

@ -5460,7 +5460,7 @@ defined_expr0(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
#define PUSH_VAL(type) (needstr == Qfalse ? Qtrue : rb_iseq_defined_string(type)) #define PUSH_VAL(type) (needstr == Qfalse ? Qtrue : rb_iseq_defined_string(type))
case NODE_IVAR: case NODE_IVAR:
ADD_INSN3(ret, line_node, defined_ivar, ADD_INSN3(ret, line_node, definedivar,
ID2SYM(node->nd_vid), get_ivar_ic_value(iseq,node->nd_vid), PUSH_VAL(DEFINED_IVAR)); ID2SYM(node->nd_vid), get_ivar_ic_value(iseq,node->nd_vid), PUSH_VAL(DEFINED_IVAR));
return; return;

2
insns.def
View File

@ -703,7 +703,7 @@ defined
/* defined?(@foo) */ /* defined?(@foo) */
DEFINE_INSN DEFINE_INSN
defined_ivar definedivar
(ID id, IVC ic, VALUE pushval) (ID id, IVC ic, VALUE pushval)
() ()
(VALUE val) (VALUE val)

12
yjit/src/codegen.rs
View File

@ -1,4 +1,4 @@
// We use the YARV bytecode constants which have a CRuby-style name // We use the YARV bytecode constants which have a CRuby-style name
#![allow(non_upper_case_globals)] #![allow(non_upper_case_globals)]
use crate::asm::*; use crate::asm::*;
@ -2389,7 +2389,7 @@ fn gen_defined(
KeepCompiling KeepCompiling
} }
fn gen_defined_ivar( fn gen_definedivar(
jit: &mut JITState, jit: &mut JITState,
ctx: &mut Context, ctx: &mut Context,
asm: &mut Assembler, asm: &mut Assembler,
@ -7672,7 +7672,7 @@ fn get_gen_fn(opcode: VALUE) -> Option<InsnGenFn> {
YARVINSN_putstring => Some(gen_putstring), YARVINSN_putstring => Some(gen_putstring),
YARVINSN_expandarray => Some(gen_expandarray), YARVINSN_expandarray => Some(gen_expandarray),
YARVINSN_defined => Some(gen_defined), YARVINSN_defined => Some(gen_defined),
YARVINSN_defined_ivar => Some(gen_defined_ivar), YARVINSN_definedivar => Some(gen_definedivar),
YARVINSN_checkkeyword => Some(gen_checkkeyword), YARVINSN_checkkeyword => Some(gen_checkkeyword),
YARVINSN_concatstrings => Some(gen_concatstrings), YARVINSN_concatstrings => Some(gen_concatstrings),
YARVINSN_getinstancevariable => Some(gen_getinstancevariable), YARVINSN_getinstancevariable => Some(gen_getinstancevariable),
@ -7802,11 +7802,11 @@ impl CodegenGlobals {
// Memory protection syscalls need page-aligned addresses, so check it here. Assuming // Memory protection syscalls need page-aligned addresses, so check it here. Assuming
// `virt_block` is page-aligned, `second_half` should be page-aligned as long as the // `virt_block` is page-aligned, `second_half` should be page-aligned as long as the
// page size in bytes is a power of two 2¹⁹ or smaller. This is because the user // page size in bytes is a power of two 2ﾂｹ竅ｹ or smaller. This is because the user
// requested size is half of mem_option × 2²⁰ as it's in MiB. // requested size is half of mem_option ﾃ?2ﾂｲ竅ｰ as it's in MiB.
// //
// Basically, we don't support x86-64 2MiB and 1GiB pages. ARMv8 can do up to 64KiB // Basically, we don't support x86-64 2MiB and 1GiB pages. ARMv8 can do up to 64KiB
// (2¹⁶ bytes) pages, which should be fine. 4KiB pages seem to be the most popular though. // (2ﾂｹ竅ｶ bytes) pages, which should be fine. 4KiB pages seem to be the most popular though.
let page_size = unsafe { rb_yjit_get_page_size() }; let page_size = unsafe { rb_yjit_get_page_size() };
assert_eq!( assert_eq!(
virt_block as usize % page_size.as_usize(), 0, virt_block as usize % page_size.as_usize(), 0,

6
yjit/src/cruby_bindings.inc.rs
View File

@ -1,4 +1,4 @@
/* automatically generated by rust-bindgen 0.63.0 */ /* automatically generated by rust-bindgen 0.63.0 */
#[repr(C)] #[repr(C)]
#[derive(Copy, Clone, Debug, Default, Eq, Hash, Ord, PartialEq, PartialOrd)] #[derive(Copy, Clone, Debug, Default, Eq, Hash, Ord, PartialEq, PartialOrd)]
@ -893,7 +893,7 @@ pub const YARVINSN_topn: ruby_vminsn_type = 40;
pub const YARVINSN_setn: ruby_vminsn_type = 41; pub const YARVINSN_setn: ruby_vminsn_type = 41;
pub const YARVINSN_adjuststack: ruby_vminsn_type = 42; pub const YARVINSN_adjuststack: ruby_vminsn_type = 42;
pub const YARVINSN_defined: ruby_vminsn_type = 43; pub const YARVINSN_defined: ruby_vminsn_type = 43;
pub const YARVINSN_defined_ivar: ruby_vminsn_type = 44; pub const YARVINSN_definedivar: ruby_vminsn_type = 44;
pub const YARVINSN_checkmatch: ruby_vminsn_type = 45; pub const YARVINSN_checkmatch: ruby_vminsn_type = 45;
pub const YARVINSN_checkkeyword: ruby_vminsn_type = 46; pub const YARVINSN_checkkeyword: ruby_vminsn_type = 46;
pub const YARVINSN_checktype: ruby_vminsn_type = 47; pub const YARVINSN_checktype: ruby_vminsn_type = 47;
@ -995,7 +995,7 @@ pub const YARVINSN_trace_topn: ruby_vminsn_type = 142;
pub const YARVINSN_trace_setn: ruby_vminsn_type = 143; pub const YARVINSN_trace_setn: ruby_vminsn_type = 143;
pub const YARVINSN_trace_adjuststack: ruby_vminsn_type = 144; pub const YARVINSN_trace_adjuststack: ruby_vminsn_type = 144;
pub const YARVINSN_trace_defined: ruby_vminsn_type = 145; pub const YARVINSN_trace_defined: ruby_vminsn_type = 145;
pub const YARVINSN_trace_defined_ivar: ruby_vminsn_type = 146; pub const YARVINSN_trace_definedivar: ruby_vminsn_type = 146;
pub const YARVINSN_trace_checkmatch: ruby_vminsn_type = 147; pub const YARVINSN_trace_checkmatch: ruby_vminsn_type = 147;
pub const YARVINSN_trace_checkkeyword: ruby_vminsn_type = 148; pub const YARVINSN_trace_checkkeyword: ruby_vminsn_type = 148;
pub const YARVINSN_trace_checktype: ruby_vminsn_type = 149; pub const YARVINSN_trace_checktype: ruby_vminsn_type = 149;