summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoichi Sasada <ko1@atdot.net>2023-03-10 00:34:38 +0900
committerKoichi Sasada <ko1@atdot.net>2023-03-10 00:37:11 +0900
commit262254dc7dd9b503ca01ab701eb5cdd96bce4c4d (patch)
tree35e91b5be422f033740a81f8a969f70f95f9cd71
parent22d8e95ffe60f9a1267f362bc919c99f03affcae (diff)
downloadruby-262254dc7dd9b503ca01ab701eb5cdd96bce4c4d.tar.gz
rename `defined_ivar` to `definedivar`
because non-opt instructions should contain `_` char.
-rw-r--r--compile.c2
-rw-r--r--insns.def2
-rw-r--r--yjit/src/codegen.rs12
-rw-r--r--yjit/src/cruby_bindings.inc.rs6
4 files changed, 11 insertions, 11 deletions
diff --git a/compile.c b/compile.c
index f4bb2c9107..7a6f324601 100644
--- a/compile.c
+++ b/compile.c
@@ -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))
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));
return;
diff --git a/insns.def b/insns.def
index b98e44bc01..16efac81d3 100644
--- a/insns.def
+++ b/insns.def
@@ -703,7 +703,7 @@ defined
/* defined?(@foo) */
DEFINE_INSN
-defined_ivar
+definedivar
(ID id, IVC ic, VALUE pushval)
()
(VALUE val)
diff --git a/yjit/src/codegen.rs b/yjit/src/codegen.rs
index 4c129e99d8..0c3ca8c372 100644
--- a/yjit/src/codegen.rs
+++ b/yjit/src/codegen.rs
@@ -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)]
use crate::asm::*;
@@ -2389,7 +2389,7 @@ fn gen_defined(
KeepCompiling
}
-fn gen_defined_ivar(
+fn gen_definedivar(
jit: &mut JITState,
ctx: &mut Context,
asm: &mut Assembler,
@@ -7672,7 +7672,7 @@ fn get_gen_fn(opcode: VALUE) -> Option<InsnGenFn> {
YARVINSN_putstring => Some(gen_putstring),
YARVINSN_expandarray => Some(gen_expandarray),
YARVINSN_defined => Some(gen_defined),
- YARVINSN_defined_ivar => Some(gen_defined_ivar),
+ YARVINSN_definedivar => Some(gen_definedivar),
YARVINSN_checkkeyword => Some(gen_checkkeyword),
YARVINSN_concatstrings => Some(gen_concatstrings),
YARVINSN_getinstancevariable => Some(gen_getinstancevariable),
@@ -7802,11 +7802,11 @@ impl CodegenGlobals {
// 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
- // 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.
+ // 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.
//
// 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() };
assert_eq!(
virt_block as usize % page_size.as_usize(), 0,
diff --git a/yjit/src/cruby_bindings.inc.rs b/yjit/src/cruby_bindings.inc.rs
index a64bc70cac..77364adef3 100644
--- a/yjit/src/cruby_bindings.inc.rs
+++ b/yjit/src/cruby_bindings.inc.rs
@@ -1,4 +1,4 @@
-/* automatically generated by rust-bindgen 0.63.0 */
+/* automatically generated by rust-bindgen 0.63.0 */
#[repr(C)]
#[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_adjuststack: ruby_vminsn_type = 42;
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_checkkeyword: ruby_vminsn_type = 46;
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_adjuststack: ruby_vminsn_type = 144;
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_checkkeyword: ruby_vminsn_type = 148;
pub const YARVINSN_trace_checktype: ruby_vminsn_type = 149;