summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/mruby/boxing_nan.h41
-rw-r--r--mrbgems/mruby-bin-mrbc/tools/mrbc/mrbc.c17
-rw-r--r--mrbgems/mruby-complex/src/complex.c8
-rw-r--r--mrbgems/mruby-rational/src/rational.c6
-rw-r--r--src/class.c11
-rw-r--r--src/object.c28
6 files changed, 67 insertions, 44 deletions
diff --git a/include/mruby/boxing_nan.h b/include/mruby/boxing_nan.h
index a80f8ea22..f412568dd 100644
--- a/include/mruby/boxing_nan.h
+++ b/include/mruby/boxing_nan.h
@@ -19,10 +19,10 @@
#define MRB_FIXNUM_MAX INT32_MAX
enum mrb_nanbox_tt_inline {
- MRB_NANBOX_TT_POINTER = 0,
+ MRB_NANBOX_TT_OBJECT = 0,
MRB_NANBOX_TT_INTEGER = 1,
- MRB_NANBOX_TT_SYMBOL = 2,
- MRB_NANBOX_TT_MISC = 3,
+ MRB_NANBOX_TT_MISC = 2,
+ MRB_NANBOX_TT_CPTR = 3,
};
/* value representation by nan-boxing:
@@ -30,10 +30,10 @@ enum mrb_nanbox_tt_inline {
* +/-inf: S1111111 11110000 00000000 00000000 00000000 00000000 00000000 00000000
* nan : 01111111 11111000 00000000 00000000 00000000 00000000 00000000 00000000
* int : 01111111 11111001 00000000 00000000 IIIIIIII IIIIIIII IIIIIIII IIIIIIII
- * sym : 01111111 11111110 00000000 00000000 SSSSSSSS SSSSSSSS SSSSSSSS SSSSSSSS
- * misc : 01111111 11111111 00000000 00000000 00000000 00000000 00TTTTTT 0000MMMM
+ * sym : 01111111 11111110 00000000 00TTTTTT SSSSSSSS SSSSSSSS SSSSSSSS SSSSSSSS
+ * misc : 01111111 11111110 00000000 00TTTTTT 00000000 00000000 00000000 0000MMMM
* object: 01111111 11111100 PPPPPPPP PPPPPPPP PPPPPPPP PPPPPPPP PPPPPPPP PPPPPP00
- * ptr : 01111111 11111100 PPPPPPPP PPPPPPPP PPPPPPPP PPPPPPPP PPPPPPPP PPPPPP01
+ * cptr : 01111111 11111111 PPPPPPPP PPPPPPPP PPPPPPPP PPPPPPPP PPPPPPPP PPPPPPPP
* Stored as O = R + 0x8004000000000000, retrieved as R = O - 0x8004000000000000.
* This makes pointers have all zeros in the top 32 bits.
*/
@@ -73,7 +73,7 @@ struct RInteger {
mrb_int i;
};
-#define mrb_nb_tt(o) ((((o).u>>48)&3))
+#define mrb_nb_tt(o) ((enum mrb_nanbox_tt_inline)((uint32_t)((o).u>>48)&3))
MRB_INLINE enum mrb_vtype
mrb_type(mrb_value o)
@@ -81,25 +81,24 @@ mrb_type(mrb_value o)
if (mrb_float_p(o)) return MRB_TT_FLOAT;
int64_t u = o.u;
- switch ((enum mrb_nanbox_tt_inline)((u >> 48) & 3)) {
- case MRB_NANBOX_TT_POINTER: {
+ switch (mrb_nb_tt(o)) {
+ case MRB_NANBOX_TT_OBJECT: {
if (u == 0) return MRB_TT_FALSE;
- if (u & 1) return MRB_TT_CPTR;
return ((struct RBasic*)(uintptr_t)u)->tt;
}
case MRB_NANBOX_TT_INTEGER:
return MRB_TT_INTEGER;
- case MRB_NANBOX_TT_SYMBOL:
- return MRB_TT_SYMBOL;
case MRB_NANBOX_TT_MISC:
- return (enum mrb_vtype)((o.u >> 8) & 0x1f);
+ return (enum mrb_vtype)((uint32_t)(o.u >> 32) & 0x1f);
+ case MRB_NANBOX_TT_CPTR:
+ return MRB_TT_CPTR;
default:
/* never happen */
return MRB_TT_FLOAT;
}
}
-#define NANBOX_SET_MISC_VALUE(r,t,i) NANBOX_SET_VALUE(r, MRB_NANBOX_TT_MISC, ((t)<<8) | i)
+#define NANBOX_SET_MISC_VALUE(r,t,i) NANBOX_SET_VALUE(r, MRB_NANBOX_TT_MISC, ((uint64_t)(t)<<32) | (i))
#define mrb_float(o) mrb_nan_boxing_value_float(o)
#ifdef MRB_INT64
@@ -117,7 +116,7 @@ static inline mrb_int
mrb_nan_boxing_value_int(mrb_value v)
{
uint64_t u = v.u;
- if (mrb_nb_tt(v)==MRB_NANBOX_TT_POINTER) {
+ if (mrb_nb_tt(v)==MRB_NANBOX_TT_OBJECT) {
struct RInteger *p = (struct RInteger*)(uintptr_t)u;
return p->i;
}
@@ -130,10 +129,10 @@ mrb_nan_boxing_value_int(mrb_value v)
#endif
#define mrb_symbol(o) ((mrb_sym)((uintptr_t)0xffffffff)&((o).u))
#define mrb_ptr(o) ((void*)(uintptr_t)(o).u)
-#define mrb_cptr(o) ((void*)(uintptr_t)(0xfffffffffffe&(o).u))
+#define mrb_cptr(o) ((void*)(uintptr_t)(0xffffffffffffULL&(o).u))
#define NANBOX_SET_VALUE(o, tt, v) do { \
- (o).u = ((uint64_t)tt<<48) | ((uint64_t)(v)); \
+ (o).u = ((uint64_t)(tt)<<48) | ((uint64_t)(v)); \
} while (0)
#define SET_NIL_VALUE(r) ((r).u = 0)
@@ -147,12 +146,12 @@ MRB_API mrb_value mrb_boxing_int_value(struct mrb_state*, mrb_int);
#define SET_INT_VALUE(mrb, r, n) SET_FIXNUM_VALUE(r, n)
#endif
#define SET_FIXNUM_VALUE(r,n) NANBOX_SET_VALUE(r, MRB_NANBOX_TT_INTEGER, (uint32_t)(n))
-#define SET_SYM_VALUE(r,v) NANBOX_SET_VALUE(r, MRB_NANBOX_TT_SYMBOL, (uint32_t)(v))
-#define SET_OBJ_VALUE(r,v) do {(r).u = (uint64_t)(uintptr_t)v;} while (0)
-#define SET_CPTR_VALUE(mrb,r,v) do {(r).u = ((uint64_t)(uintptr_t)v) | 1;} while (0)
+#define SET_SYM_VALUE(r,v) NANBOX_SET_MISC_VALUE(r, MRB_TT_SYMBOL, (uint32_t)(v))
+#define SET_OBJ_VALUE(r,v) do {(r).u = (uint64_t)(uintptr_t)(v);} while (0)
+#define SET_CPTR_VALUE(mrb,r,v) NANBOX_SET_VALUE(r, MRB_NANBOX_TT_CPTR, (uint64_t)(uintptr_t)(v) & 0x0000ffffffffffffULL)
#define SET_UNDEF_VALUE(r) NANBOX_SET_MISC_VALUE(r, MRB_TT_UNDEF, 4)
-#define mrb_immediate_p(o) ((mrb_float_p(o) || mrb_nb_tt(o) != MRB_NANBOX_TT_POINTER) || (o).u == 0)
+#define mrb_immediate_p(o) ((mrb_float_p(o) || mrb_nb_tt(o) != MRB_NANBOX_TT_OBJECT) || (o).u == 0)
#define mrb_nil_p(o) ((o).u == 0)
#define mrb_false_p(o) (mrb_type(o) == MRB_TT_FALSE || (o).u == 0)
#define mrb_fixnum_p(o) (!mrb_float_p(o) && mrb_nb_tt(o)==MRB_NANBOX_TT_INTEGER)
diff --git a/mrbgems/mruby-bin-mrbc/tools/mrbc/mrbc.c b/mrbgems/mruby-bin-mrbc/tools/mrbc/mrbc.c
index c3e37e0a6..7732914d7 100644
--- a/mrbgems/mruby-bin-mrbc/tools/mrbc/mrbc.c
+++ b/mrbgems/mruby-bin-mrbc/tools/mrbc/mrbc.c
@@ -368,16 +368,29 @@ mrb_final_mrbgems(mrb_state *mrb)
#endif
#ifdef MRB_USE_COMPLEX
+mrb_value mrb_complex_to_i(mrb_state *mrb, mrb_value comp)
+{
+ /* dummy method */
+ return mrb_nil_value();
+}
mrb_value mrb_complex_to_f(mrb_state *mrb, mrb_value comp)
{
- mrb_raise(mrb, E_NOTIMP_ERROR, "unavailable for core only");
+ /* dummy method */
+ return mrb_nil_value();
}
#endif
#ifdef MRB_USE_RATIONAL
mrb_value
+mrb_rational_to_i(mrb_state *mrb, mrb_value rat)
+{
+ /* dummy method */
+ return mrb_nil_value();
+}
+mrb_value
mrb_rational_to_f(mrb_state *mrb, mrb_value rat)
{
- mrb_raise(mrb, E_NOTIMP_ERROR, "unavailable for core only");
+ /* dummy method */
+ return mrb_nil_value();
}
#endif
diff --git a/mrbgems/mruby-complex/src/complex.c b/mrbgems/mruby-complex/src/complex.c
index 6a2f5248e..6a02b1e93 100644
--- a/mrbgems/mruby-complex/src/complex.c
+++ b/mrbgems/mruby-complex/src/complex.c
@@ -117,13 +117,13 @@ mrb_complex_to_f(mrb_state *mrb, mrb_value self)
return mrb_float_value(mrb, p->real);
}
-static mrb_value
-complex_to_i(mrb_state *mrb, mrb_value self)
+mrb_value
+mrb_complex_to_i(mrb_state *mrb, mrb_value self)
{
struct mrb_complex *p = complex_ptr(mrb, self);
if (p->imaginary != 0) {
- mrb_raisef(mrb, E_RANGE_ERROR, "can't convert %v into Float", self);
+ mrb_raisef(mrb, E_RANGE_ERROR, "can't convert %v into Integer", self);
}
return mrb_int_value(mrb, (mrb_int)p->real);
}
@@ -416,7 +416,7 @@ void mrb_mruby_complex_gem_init(mrb_state *mrb)
mrb_define_method(mrb, comp, "real", complex_real, MRB_ARGS_NONE());
mrb_define_method(mrb, comp, "imaginary", complex_imaginary, MRB_ARGS_NONE());
mrb_define_method(mrb, comp, "to_f", mrb_complex_to_f, MRB_ARGS_NONE());
- mrb_define_method(mrb, comp, "to_i", complex_to_i, MRB_ARGS_NONE());
+ mrb_define_method(mrb, comp, "to_i", mrb_complex_to_i, MRB_ARGS_NONE());
mrb_define_method(mrb, comp, "to_c", complex_to_c, MRB_ARGS_NONE());
mrb_define_method(mrb, comp, "+", complex_add, MRB_ARGS_REQ(1));
mrb_define_method(mrb, comp, "-", complex_sub, MRB_ARGS_REQ(1));
diff --git a/mrbgems/mruby-rational/src/rational.c b/mrbgems/mruby-rational/src/rational.c
index b12f45bde..e66046543 100644
--- a/mrbgems/mruby-rational/src/rational.c
+++ b/mrbgems/mruby-rational/src/rational.c
@@ -299,8 +299,8 @@ mrb_rational_to_f(mrb_state *mrb, mrb_value self)
}
#endif
-static mrb_value
-rational_to_i(mrb_state *mrb, mrb_value self)
+mrb_value
+mrb_rational_to_i(mrb_state *mrb, mrb_value self)
{
struct mrb_rational *p = rational_ptr(mrb, self);
if (p->denominator == 0) {
@@ -714,7 +714,7 @@ void mrb_mruby_rational_gem_init(mrb_state *mrb)
#ifndef MRB_NO_FLOAT
mrb_define_method(mrb, rat, "to_f", mrb_rational_to_f, MRB_ARGS_NONE());
#endif
- mrb_define_method(mrb, rat, "to_i", rational_to_i, MRB_ARGS_NONE());
+ mrb_define_method(mrb, rat, "to_i", mrb_rational_to_i, MRB_ARGS_NONE());
mrb_define_method(mrb, rat, "to_r", rational_to_r, MRB_ARGS_NONE());
mrb_define_method(mrb, rat, "negative?", rational_negative_p, MRB_ARGS_NONE());
mrb_define_method(mrb, rat, "==", rational_eq, MRB_ARGS_REQ(1));
diff --git a/src/class.c b/src/class.c
index f97cc4c40..ec9c648e5 100644
--- a/src/class.c
+++ b/src/class.c
@@ -929,13 +929,6 @@ mrb_block_given_p(mrb_state *mrb)
MRB_API mrb_int
mrb_get_args(mrb_state *mrb, const char *format, ...)
{
-#define ADJUST_STACK() do { \
- if (argv_on_stack) { \
- ci = mrb->c->ci; \
- argv = mrb->c->ci->stack + 1; \
- } \
-} while (0)
-
const char *fmt = format;
char c;
int i = 0;
@@ -1198,7 +1191,6 @@ mrb_get_args(mrb_state *mrb, const char *format, ...)
p = va_arg(ap, mrb_float*);
if (pickarg) {
*p = mrb_as_float(mrb, *pickarg);
- ADJUST_STACK();
}
}
break;
@@ -1210,7 +1202,6 @@ mrb_get_args(mrb_state *mrb, const char *format, ...)
p = va_arg(ap, mrb_int*);
if (pickarg) {
*p = mrb_as_int(mrb, *pickarg);
- ADJUST_STACK();
}
}
break;
@@ -1373,8 +1364,6 @@ mrb_get_args(mrb_state *mrb, const char *format, ...)
finish:
va_end(ap);
return i;
-
-#undef ADJUST_STACK
}
static struct RClass*
diff --git a/src/object.c b/src/object.c
index 21376d08c..a42293016 100644
--- a/src/object.c
+++ b/src/object.c
@@ -484,6 +484,17 @@ mrb_obj_is_kind_of(mrb_state *mrb, mrb_value obj, struct RClass *c)
return FALSE;
}
+#ifdef MRB_USE_RATIONAL
+// provided by mruby-rational with MRB_USE_RATIONAL
+mrb_value mrb_rational_to_i(mrb_state *mrb, mrb_value rat);
+mrb_value mrb_rational_to_f(mrb_state *mrb, mrb_value rat);
+#endif
+#ifdef MRB_USE_COMPLEX
+// provided by mruby-complex with MRB_USE_COMPLEX
+mrb_value mrb_complex_to_f(mrb_state *mrb, mrb_value comp);
+mrb_value mrb_complex_to_i(mrb_state *mrb, mrb_value comp);
+#endif
+
MRB_API mrb_value
mrb_ensure_int_type(mrb_state *mrb, mrb_value val)
{
@@ -492,6 +503,20 @@ mrb_ensure_int_type(mrb_state *mrb, mrb_value val)
if (mrb_float_p(val)) {
return mrb_float_to_integer(mrb, val);
}
+ else {
+ switch (mrb_type(val)) {
+#ifdef MRB_USE_RATIONAL
+ case MRB_TT_RATIONAL:
+ return mrb_rational_to_i(mrb, val);
+#endif
+#ifdef MRB_USE_COMPLEX
+ case MRB_TT_COMPLEX:
+ return mrb_complex_to_i(mrb, val);
+#endif
+ default:
+ break;
+ }
+ }
#endif
mrb_raisef(mrb, E_TYPE_ERROR, "%Y cannot be converted to Integer", val);
}
@@ -499,9 +524,6 @@ mrb_ensure_int_type(mrb_state *mrb, mrb_value val)
}
#ifndef MRB_NO_FLOAT
-mrb_value mrb_complex_to_f(mrb_state *mrb, mrb_value comp); // provided by mruby-complex with MRB_USE_COMPLEX
-mrb_value mrb_rational_to_f(mrb_state *mrb, mrb_value rat); // provided by mruby-rational with MRB_USE_RATIONAL
-
MRB_API mrb_value
mrb_ensure_float_type(mrb_state *mrb, mrb_value val)
{
generated by cgit v1.2.3 (git 2.39.1) at 2026-04-14 17:27:58 +0000