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

internal/array.h rework

Browse Source 
Rearrange contents for better readability, reduce macros for the same
reason, and mark MJIT_FUNC_EXPORTED functions as such.
This commit is contained in:
卜部昌平 2019-12-03 15:32:02 +09:00
parent f3a229fe2d
commit 0723db6c39
Notes: git 2019-12-26 20:46:01 +09:00 
Merged: https://github.com/ruby/ruby/pull/2711
1 changed files with 55 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
internal/array.h
View File

@ -10,57 +10,44 @@
* file COPYING are met. Consult the file for details. * file COPYING are met. Consult the file for details.
*/ */
/* array.c */ #include "ruby/config.h"
#include <stddef.h> /* for size_t */
#include "internal/static_assert.h" /* for STATIC_ASSERT */
#include "internal/stdbool.h" /* for bool */
#include "ruby/ruby.h" /* for RARRAY_LEN */
#ifndef ARRAY_DEBUG #ifndef ARRAY_DEBUG
# define ARRAY_DEBUG (0+RUBY_DEBUG) # define ARRAY_DEBUG (0+RUBY_DEBUG)
#endif #endif
#ifdef ARRAY_DEBUG
#define RARRAY_PTR_IN_USE_FLAG FL_USER14 #define RARRAY_PTR_IN_USE_FLAG FL_USER14
#define ARY_PTR_USING_P(ary) FL_TEST_RAW((ary), RARRAY_PTR_IN_USE_FLAG)
#else
/* disable debug function */
#undef RARRAY_PTR_USE_START_TRANSIENT
#undef RARRAY_PTR_USE_END_TRANSIENT
#define RARRAY_PTR_USE_START_TRANSIENT(a) ((VALUE *)RARRAY_CONST_PTR_TRANSIENT(a))
#define RARRAY_PTR_USE_END_TRANSIENT(a)
#define ARY_PTR_USING_P(ary) 0
#endif
#if USE_TRANSIENT_HEAP
#define RARY_TRANSIENT_SET(ary) FL_SET_RAW((ary), RARRAY_TRANSIENT_FLAG);
#define RARY_TRANSIENT_UNSET(ary) FL_UNSET_RAW((ary), RARRAY_TRANSIENT_FLAG);
#else
#undef RARRAY_TRANSIENT_P
#define RARRAY_TRANSIENT_P(a) 0
#define RARY_TRANSIENT_SET(ary) ((void)0)
#define RARY_TRANSIENT_UNSET(ary) ((void)0)
#endif
/* array.c */
VALUE rb_ary_last(int, const VALUE *, VALUE); VALUE rb_ary_last(int, const VALUE *, VALUE);
void rb_ary_set_len(VALUE, long); void rb_ary_set_len(VALUE, long);
void rb_ary_delete_same(VALUE, VALUE); void rb_ary_delete_same(VALUE, VALUE);
VALUE rb_ary_tmp_new_fill(long capa); VALUE rb_ary_tmp_new_fill(long capa);
VALUE rb_ary_at(VALUE, VALUE); VALUE rb_ary_at(VALUE, VALUE);
VALUE rb_ary_aref1(VALUE ary, VALUE i);
size_t rb_ary_memsize(VALUE); size_t rb_ary_memsize(VALUE);
VALUE rb_to_array_type(VALUE obj); VALUE rb_to_array_type(VALUE obj);
VALUE rb_check_to_array(VALUE ary); static inline VALUE rb_ary_entry_internal(VALUE ary, long offset);
static inline bool ARY_PTR_USING_P(VALUE ary);
static inline void RARY_TRANSIENT_SET(VALUE ary);
static inline void RARY_TRANSIENT_UNSET(VALUE ary);
RUBY_SYMBOL_EXPORT_BEGIN
/* array.c (export) */
void rb_ary_detransient(VALUE a);
VALUE *rb_ary_ptr_use_start(VALUE ary);
void rb_ary_ptr_use_end(VALUE ary);
RUBY_SYMBOL_EXPORT_END
MJIT_SYMBOL_EXPORT_BEGIN
VALUE rb_ary_tmp_new_from_values(VALUE, long, const VALUE *); VALUE rb_ary_tmp_new_from_values(VALUE, long, const VALUE *);
VALUE rb_check_to_array(VALUE ary);
VALUE rb_ary_behead(VALUE, long); VALUE rb_ary_behead(VALUE, long);
#if defined(__GNUC__) && defined(HAVE_VA_ARGS_MACRO) VALUE rb_ary_aref1(VALUE ary, VALUE i);
#define rb_ary_new_from_args(n, ...) \ MJIT_SYMBOL_EXPORT_END
__extension__ ({ \
const VALUE args_to_new_ary[] = {__VA_ARGS__}; \
if (__builtin_constant_p(n)) { \
STATIC_ASSERT(rb_ary_new_from_args, numberof(args_to_new_ary) == (n)); \
} \
rb_ary_new_from_values(numberof(args_to_new_ary), args_to_new_ary); \
})
#endif
static inline VALUE static inline VALUE
rb_ary_entry_internal(VALUE ary, long offset) rb_ary_entry_internal(VALUE ary, long offset)
@ -78,11 +65,37 @@ rb_ary_entry_internal(VALUE ary, long offset)
return ptr[offset]; return ptr[offset];
} }
RUBY_SYMBOL_EXPORT_BEGIN static inline bool
/* array.c (export) */ ARY_PTR_USING_P(VALUE ary)
void rb_ary_detransient(VALUE a); {
VALUE *rb_ary_ptr_use_start(VALUE ary); return FL_TEST_RAW(ary, RARRAY_PTR_IN_USE_FLAG);
void rb_ary_ptr_use_end(VALUE ary); }
RUBY_SYMBOL_EXPORT_END
static inline void
RARY_TRANSIENT_SET(VALUE ary)
{
#if USE_TRANSIENT_HEAP
FL_SET_RAW(ary, RARRAY_TRANSIENT_FLAG);
#endif
}
static inline void
RARY_TRANSIENT_UNSET(VALUE ary)
{
#if USE_TRANSIENT_HEAP
FL_UNSET_RAW(ary, RARRAY_TRANSIENT_FLAG);
#endif
}
#if defined(__GNUC__) && defined(HAVE_VA_ARGS_MACRO)
#define rb_ary_new_from_args(n, ...) \
__extension__ ({ \
const VALUE args_to_new_ary[] = {__VA_ARGS__}; \
if (__builtin_constant_p(n)) { \
STATIC_ASSERT(rb_ary_new_from_args, numberof(args_to_new_ary) == (n)); \
} \
rb_ary_new_from_values(numberof(args_to_new_ary), args_to_new_ary); \
})
#endif
#endif /* INTERNAL_ARRAY_H */ #endif /* INTERNAL_ARRAY_H */