diff options
| author | Aaron Patterson <[email protected]> | 2022-11-18 10:29:41 -0800 |
|---|---|---|
| committer | Aaron Patterson <[email protected]> | 2022-11-18 12:04:10 -0800 |
| commit | 6582f34831cc665b2adcf7d475aceb9b918badb6 () | |
| tree | 4d7de2ed25e59c6c2d9861003054fabfa7689e32 | |
| parent | ba3b40a9aeb752d1b3e4c87748c977bfd3cf6f2c (diff) | |
rename SHAPE_BITS to SHAPE_ID_NUM_BITS
Notes: Merged: https://.com/ruby/ruby/pull/6737
| -rw-r--r-- | mjit_c.rb | 8 | ||||
| -rw-r--r-- | ractor_core.h | 2 | ||||
| -rw-r--r-- | shape.c | 2 | ||||
| -rw-r--r-- | shape.h | 14 | ||||
| -rwxr-xr-x | tool/mjit/bindgen.rb | 2 |
5 files changed, 14 insertions, 14 deletions
@@ -158,10 +158,6 @@ module RubyVM::MJIT Primitive.cexpr! %q{ INT2NUM(VM_METHOD_TYPE_ISEQ) } end - def C.SHAPE_BITS - Primitive.cexpr! %q{ UINT2NUM(SHAPE_BITS) } - end - def C.SHAPE_CAPACITY_CHANGE Primitive.cexpr! %q{ UINT2NUM(SHAPE_CAPACITY_CHANGE) } end @@ -174,6 +170,10 @@ module RubyVM::MJIT Primitive.cexpr! %q{ UINT2NUM(SHAPE_FROZEN) } end def C.SHAPE_INITIAL_CAPACITY Primitive.cexpr! %q{ UINT2NUM(SHAPE_INITIAL_CAPACITY) } end @@ -290,7 +290,7 @@ rb_ractor_id(const rb_ractor_t *r) #if RACTOR_CHECK_MODE > 0 uint32_t rb_ractor_current_id(void); // If ractor check mode is enabled, shape bits needs to be smaller -STATIC_ASSERT(shape_bits, SHAPE_BITS == 16); static inline void rb_ractor_setup_belonging_to(VALUE obj, uint32_t rid) @@ -665,7 +665,7 @@ Init_shape(void) rb_define_const(rb_cShape, "SHAPE_T_OBJECT", INT2NUM(SHAPE_T_OBJECT)); rb_define_const(rb_cShape, "SHAPE_IVAR_UNDEF", INT2NUM(SHAPE_IVAR_UNDEF)); rb_define_const(rb_cShape, "SHAPE_FROZEN", INT2NUM(SHAPE_FROZEN)); - rb_define_const(rb_cShape, "SHAPE_BITS", INT2NUM(SHAPE_BITS)); rb_define_const(rb_cShape, "SHAPE_FLAG_SHIFT", INT2NUM(SHAPE_FLAG_SHIFT)); rb_define_const(rb_cShape, "SPECIAL_CONST_SHAPE_ID", INT2NUM(SPECIAL_CONST_SHAPE_ID)); @@ -15,25 +15,25 @@ typedef uint16_t attr_index_t; #if RUBY_DEBUG || (defined(VM_CHECK_MODE) && VM_CHECK_MODE > 0) # if SIZEOF_SHAPE_T == 4 typedef uint32_t shape_id_t; -# define SHAPE_BITS 16 # else typedef uint16_t shape_id_t; -# define SHAPE_BITS 16 # endif #else # if SIZEOF_SHAPE_T == 4 typedef uint32_t shape_id_t; -# define SHAPE_BITS 32 # else typedef uint16_t shape_id_t; -# define SHAPE_BITS 16 # endif #endif -# define SHAPE_MASK (((uintptr_t)1 << SHAPE_BITS) - 1) -# define SHAPE_FLAG_MASK (((VALUE)-1) >> SHAPE_BITS) -# define SHAPE_FLAG_SHIFT ((SIZEOF_VALUE * 8) - SHAPE_BITS) # define SHAPE_BITMAP_SIZE 16384 @@ -346,7 +346,7 @@ generator = BindingGenerator.new( VM_METHOD_TYPE_ISEQ ], UINT: %w[ - SHAPE_BITS SHAPE_CAPACITY_CHANGE SHAPE_FLAG_SHIFT SHAPE_FROZEN |