0
@@ -10,9 +10,9 @@ typedef intptr_t native_int;
0
 /* OOP layout:
0
  * [30 bits of data | 2 bits of tag]
0
  * if tag == 00, the whole thing is a pointer to a memory location.
0
- * if tag == 11, the data is a symbol index
0
  * if tag == 01, the data is a fixnum
0
  * if tag == 10, the data is a literal
0
+ * if tag == 11, the data is any data, using the DATA_* macros 
0
  */
0
 
0
 #define TAG_MASK    0x3
0
@@ -25,7 +25,7 @@ typedef intptr_t native_int;
0
 
0
 #define TAG(v) (((uintptr_t)v) & TAG_MASK)
0
 #define APPLY_TAG(v, tag) ((OBJECT)(((uintptr_t)v << TAG_SHIFT) | tag))
0
-#define STRIP_TAG(v) (((intptr_t)v) >> TAG_SHIFT)
0
+#define STRIP_TAG(v) (((uintptr_t)v) >> TAG_SHIFT)
0
 
0
 #define DATA_P(v) (TAG(v) == TAG_DATA)
0
 #define FIXNUM_P(v) (TAG(v) == TAG_FIXNUM)

0
@@ -180,28 +180,29 @@ void XFREE(void *p);
0
 #define FREE(v) XFREE(v)
0
 
0
 static inline native_int rbs_to_int(OBJECT obj) {
0
-  return STRIP_TAG(obj);
0
+  return (native_int)STRIP_TAG(obj);
0
 }
0
 
0
 static inline OBJECT rbs_int_to_numeric(STATE, int num) {
0
   OBJECT ret;
0
   ret = APPLY_TAG(num, TAG_FIXNUM);
0
 
0
-  /* Number is too big for fixnum. Use bignum. */
0
-  if((int)rbs_to_int(ret) != num) {
0
+  /* Number is too big for Fixnum. Use Bignum. */
0
+  if((native_int)rbs_to_int(ret) != num) {
0
     return bignum_new(state, num);
0
+  } else {
0
+    return ret;
0
   }
0
-  return ret;
0
 }
0
 
0
 static inline OBJECT rbs_uint_to_numeric(STATE, unsigned int num) {
0
   OBJECT ret;
0
+  ret = APPLY_TAG(num, TAG_FIXNUM);
0
 
0
-  if (num > FIXNUM_MAX) {
0
+  /* Number is too big for Fixnum. Use Bignum. */
0
+  if((native_int)rbs_to_int(ret) != num) {
0
     return bignum_new_unsigned(state, num);
0
   } else {
0
-    ret = APPLY_TAG(num, TAG_FIXNUM);
0
-    rbs_to_int(ret);
0
     return ret;
0
   }
0
 }
0
@@ -210,21 +211,22 @@ static inline OBJECT rbs_ll_to_numeric(STATE, long long num) {
0
   OBJECT ret;
0
   ret = APPLY_TAG(num, TAG_FIXNUM);
0
 
0
-  /* Number is too big for fixnum. Use bignum. */
0
-  if((int)rbs_to_int(ret) != num) {
0
+  /* Number is too big for Fixnum. Use Bignum. */
0
+  if((native_int)rbs_to_int(ret) != num) {
0
     return bignum_from_ll(state, num);
0
+  } else {
0
+    return ret;
0
   }
0
-  return ret;
0
 }
0
 
0
 static inline OBJECT rbs_ull_to_numeric(STATE, unsigned long long num) {
0
   OBJECT ret;
0
+  ret = APPLY_TAG(num, TAG_FIXNUM);
0
 
0
-  if (num > FIXNUM_MAX) {
0
+  /* Number is too big for Fixnum. Use Bignum. */
0
+  if((native_int)rbs_to_int(ret) != num) {
0
     return bignum_from_ull(state, num);
0
   } else {
0
-    ret = APPLY_TAG(num, TAG_FIXNUM);
0
-    rbs_to_int(ret);
0
     return ret;
0
   }
0
 }
0
@@ -234,11 +236,11 @@ static inline OBJECT rbs_max_long_to_numeric(STATE, long long num) {
0
   ret = APPLY_TAG(num, TAG_FIXNUM);
0
 
0
   /* Number is too big for Fixnum. Use Bignum. */
0
-  /* TODO - Change this to native_int when Fixnum becomes platform-specific */
0
-  if((int)rbs_to_int(ret) != num) {
0
+  if((native_int)rbs_to_int(ret) != num) {
0
     return bignum_from_ll(state, num);
0
+  } else {
0
+    return ret;
0
   }
0
-  return ret;
0
 }
0
 
0
 static inline double rbs_fixnum_to_double(OBJECT obj) {