diff options
| -rw-r--r-- | depend | 26 | ||||
| -rw-r--r-- | yjit/src/cruby_bindings.inc.rs | 53 | ||||
| -rw-r--r-- | zjit/src/cruby_bindings.inc.rs | 3 |
3 files changed, 28 insertions, 54 deletions
@@ -9263,6 +9263,26 @@ namespace.$(OBJEXT): $(top_srcdir)/internal/string.h namespace.$(OBJEXT): $(top_srcdir)/internal/variable.h namespace.$(OBJEXT): $(top_srcdir)/internal/vm.h namespace.$(OBJEXT): $(top_srcdir)/internal/warnings.h +namespace.$(OBJEXT): $(top_srcdir)/prism/defines.h +namespace.$(OBJEXT): $(top_srcdir)/prism/encoding.h +namespace.$(OBJEXT): $(top_srcdir)/prism/node.h +namespace.$(OBJEXT): $(top_srcdir)/prism/options.h +namespace.$(OBJEXT): $(top_srcdir)/prism/pack.h +namespace.$(OBJEXT): $(top_srcdir)/prism/parser.h +namespace.$(OBJEXT): $(top_srcdir)/prism/prettyprint.h +namespace.$(OBJEXT): $(top_srcdir)/prism/prism.h +namespace.$(OBJEXT): $(top_srcdir)/prism/regexp.h +namespace.$(OBJEXT): $(top_srcdir)/prism/static_literals.h +namespace.$(OBJEXT): $(top_srcdir)/prism/util/pm_buffer.h +namespace.$(OBJEXT): $(top_srcdir)/prism/util/pm_char.h +namespace.$(OBJEXT): $(top_srcdir)/prism/util/pm_constant_pool.h +namespace.$(OBJEXT): $(top_srcdir)/prism/util/pm_integer.h +namespace.$(OBJEXT): $(top_srcdir)/prism/util/pm_list.h +namespace.$(OBJEXT): $(top_srcdir)/prism/util/pm_memchr.h +namespace.$(OBJEXT): $(top_srcdir)/prism/util/pm_newline_list.h +namespace.$(OBJEXT): $(top_srcdir)/prism/util/pm_string.h +namespace.$(OBJEXT): $(top_srcdir)/prism/util/pm_strncasecmp.h +namespace.$(OBJEXT): $(top_srcdir)/prism/util/pm_strpbrk.h namespace.$(OBJEXT): {$(VPATH)}assert.h namespace.$(OBJEXT): {$(VPATH)}atomic.h namespace.$(OBJEXT): {$(VPATH)}backward/2/assume.h @@ -9279,6 +9299,7 @@ namespace.$(OBJEXT): {$(VPATH)}constant.h namespace.$(OBJEXT): {$(VPATH)}debug_counter.h namespace.$(OBJEXT): {$(VPATH)}defines.h namespace.$(OBJEXT): {$(VPATH)}encoding.h +namespace.$(OBJEXT): {$(VPATH)}eval_intern.h namespace.$(OBJEXT): {$(VPATH)}id.h namespace.$(OBJEXT): {$(VPATH)}id_table.h namespace.$(OBJEXT): {$(VPATH)}intern.h @@ -9433,12 +9454,17 @@ namespace.$(OBJEXT): {$(VPATH)}internal/value_type.h namespace.$(OBJEXT): {$(VPATH)}internal/variable.h namespace.$(OBJEXT): {$(VPATH)}internal/warning_push.h namespace.$(OBJEXT): {$(VPATH)}internal/xmalloc.h +namespace.$(OBJEXT): {$(VPATH)}iseq.h namespace.$(OBJEXT): {$(VPATH)}method.h namespace.$(OBJEXT): {$(VPATH)}missing.h namespace.$(OBJEXT): {$(VPATH)}namespace.c namespace.$(OBJEXT): {$(VPATH)}node.h namespace.$(OBJEXT): {$(VPATH)}onigmo.h namespace.$(OBJEXT): {$(VPATH)}oniguruma.h +namespace.$(OBJEXT): {$(VPATH)}prism/ast.h +namespace.$(OBJEXT): {$(VPATH)}prism/diagnostic.h +namespace.$(OBJEXT): {$(VPATH)}prism/version.h +namespace.$(OBJEXT): {$(VPATH)}prism_compile.h namespace.$(OBJEXT): {$(VPATH)}ruby_assert.h namespace.$(OBJEXT): {$(VPATH)}ruby_atomic.h namespace.$(OBJEXT): {$(VPATH)}rubyparser.h diff --git a/yjit/src/cruby_bindings.inc.rs b/yjit/src/cruby_bindings.inc.rs index d9ef2d494f..1e34440460 100644 --- a/yjit/src/cruby_bindings.inc.rs +++ b/yjit/src/cruby_bindings.inc.rs @@ -259,33 +259,6 @@ pub const RSTRING_FSTR: ruby_rstring_flags = 536870912; pub type ruby_rstring_flags = u32; pub type st_data_t = ::std::os::raw::c_ulong; pub type st_index_t = st_data_t; -#[repr(C)] -#[derive(Debug, Copy, Clone)] -pub struct st_hash_type { - pub compare: ::std::option::Option< - unsafe extern "C" fn(arg1: st_data_t, arg2: st_data_t) -> ::std::os::raw::c_int, - >, - pub hash: ::std::option::Option<unsafe extern "C" fn(arg1: st_data_t) -> st_index_t>, -} -#[repr(C)] -#[derive(Debug, Copy, Clone)] -pub struct st_table_entry { - _unused: [u8; 0], -} -#[repr(C)] -#[derive(Debug, Copy, Clone)] -pub struct st_table { - pub entry_power: ::std::os::raw::c_uchar, - pub bin_power: ::std::os::raw::c_uchar, - pub size_ind: ::std::os::raw::c_uchar, - pub rebuilds_num: ::std::os::raw::c_uint, - pub type_: *const st_hash_type, - pub num_entries: st_index_t, - pub bins: *mut st_index_t, - pub entries_start: st_index_t, - pub entries_bound: st_index_t, - pub entries: *mut st_table_entry, -} pub const ST_CONTINUE: st_retval = 0; pub const ST_STOP: st_retval = 1; pub const ST_DELETE: st_retval = 2; @@ -373,28 +346,6 @@ pub const BOP_PACK: ruby_basic_operators = 32; pub const BOP_INCLUDE_P: ruby_basic_operators = 33; pub const BOP_LAST_: ruby_basic_operators = 34; pub type ruby_basic_operators = u32; -#[repr(C)] -pub struct rb_namespace_struct { - pub ns_object: VALUE, - pub ns_id: ::std::os::raw::c_long, - pub top_self: VALUE, - pub load_path: VALUE, - pub load_path_snapshot: VALUE, - pub load_path_check_cache: VALUE, - pub expanded_load_path: VALUE, - pub loaded_features: VALUE, - pub loaded_features_snapshot: VALUE, - pub loaded_features_realpaths: VALUE, - pub loaded_features_realpath_map: VALUE, - pub loaded_features_index: *mut st_table, - pub loading_table: *mut st_table, - pub ruby_dln_libmap: VALUE, - pub gvar_tbl: VALUE, - pub is_builtin: bool, - pub is_user: bool, - pub is_optional: bool, -} -pub type rb_namespace_t = rb_namespace_struct; pub type rb_serial_t = ::std::os::raw::c_ulonglong; pub const imemo_env: imemo_type = 0; pub const imemo_cref: imemo_type = 1; @@ -580,7 +531,6 @@ pub type rb_control_frame_t = rb_control_frame_struct; #[repr(C)] pub struct rb_proc_t { pub block: rb_block, - pub ns: *const rb_namespace_t, pub _bitfield_align_1: [u8; 0], pub _bitfield_1: __BindgenBitfieldUnit<[u8; 1usize]>, pub __bindgen_padding_0: [u8; 7usize], @@ -676,8 +626,7 @@ pub const VM_FRAME_FLAG_LAMBDA: vm_frame_env_flags = 256; pub const VM_FRAME_FLAG_MODIFIED_BLOCK_PARAM: vm_frame_env_flags = 512; pub const VM_FRAME_FLAG_CFRAME_KW: vm_frame_env_flags = 1024; pub const VM_FRAME_FLAG_PASSED: vm_frame_env_flags = 2048; -pub const VM_FRAME_FLAG_NS_SWITCH: vm_frame_env_flags = 4096; -pub const VM_FRAME_FLAG_LOAD_ISEQ: vm_frame_env_flags = 8192; +pub const VM_FRAME_FLAG_NS_REQUIRE: vm_frame_env_flags = 4096; pub const VM_ENV_FLAG_LOCAL: vm_frame_env_flags = 2; pub const VM_ENV_FLAG_ESCAPED: vm_frame_env_flags = 4; pub const VM_ENV_FLAG_WB_REQUIRED: vm_frame_env_flags = 8; diff --git a/zjit/src/cruby_bindings.inc.rs b/zjit/src/cruby_bindings.inc.rs index 5a06d99f9e..17a2d5a63d 100644 --- a/zjit/src/cruby_bindings.inc.rs +++ b/zjit/src/cruby_bindings.inc.rs @@ -390,8 +390,7 @@ pub const VM_FRAME_FLAG_LAMBDA: vm_frame_env_flags = 256; pub const VM_FRAME_FLAG_MODIFIED_BLOCK_PARAM: vm_frame_env_flags = 512; pub const VM_FRAME_FLAG_CFRAME_KW: vm_frame_env_flags = 1024; pub const VM_FRAME_FLAG_PASSED: vm_frame_env_flags = 2048; -pub const VM_FRAME_FLAG_NS_SWITCH: vm_frame_env_flags = 4096; -pub const VM_FRAME_FLAG_LOAD_ISEQ: vm_frame_env_flags = 8192; +pub const VM_FRAME_FLAG_NS_REQUIRE: vm_frame_env_flags = 4096; pub const VM_ENV_FLAG_LOCAL: vm_frame_env_flags = 2; pub const VM_ENV_FLAG_ESCAPED: vm_frame_env_flags = 4; pub const VM_ENV_FLAG_WB_REQUIRED: vm_frame_env_flags = 8; |