diff options
| author | Tomasz Dąbrowski <[email protected]> | 2016-11-21 12:02:52 +0100 |
|---|---|---|
| committer | Tomasz Dąbrowski <[email protected]> | 2016-11-21 12:37:45 +0100 |
| commit | 8cdaf1ed35e808f73fe06c84998ffa59d414f8cc (patch) | |
| tree | 1fc860234fbc8fc114d6a74881a6ca683511c3be /include | |
| parent | d86f5d2dca3d17e1dc114085a0cd9a32d61f3014 (diff) | |
| download | mruby-8cdaf1ed35e808f73fe06c84998ffa59d414f8cc.tar.gz mruby-8cdaf1ed35e808f73fe06c84998ffa59d414f8cc.zip | |
Fixed NaN boxing for 64-bit configrations on platforms that use full 48-bit usermode pointers
Definition of boxed pointer is following:
`111111111111TTTT TTPPPPPPPPPPPPPP PPPPPPPPPPPPPPPP PPPPPPPPPPPPPPPP`
Previously, only the last 32-bit were set, and remaining 14 bits were zeroed when setting `ttt`.
Diffstat (limited to 'include')
| -rw-r--r-- | include/mruby/boxing_nan.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/include/mruby/boxing_nan.h b/include/mruby/boxing_nan.h index b71c4b746..154150ece 100644 --- a/include/mruby/boxing_nan.h +++ b/include/mruby/boxing_nan.h @@ -60,6 +60,12 @@ typedef struct mrb_value { #define mrb_fixnum(o) (o).value.i #define mrb_symbol(o) (o).value.sym +#ifdef MRB_64BIT +#define BOXNAN_SHIFT_LONG_POINTER(v) (((uintptr_t)(v)>>34)&0x3fff) +#else +#define BOXNAN_SHIFT_LONG_POINTER(v) 0 +#endif + #define BOXNAN_SET_VALUE(o, tt, attr, v) do {\ switch (tt) {\ case MRB_TT_FALSE:\ @@ -69,7 +75,7 @@ typedef struct mrb_value { case MRB_TT_SYMBOL: (o).attr = (v); break;\ default: (o).value.i = 0; (o).value.p = (void*)((uintptr_t)(o).value.p | (((uintptr_t)(v))>>2)); break;\ }\ - (o).value.ttt = (0xfff00000|(((tt)+1)<<14));\ + (o).value.ttt = (0xfff00000|(((tt)+1)<<14)|BOXNAN_SHIFT_LONG_POINTER(v));\ } while (0) #define SET_FLOAT_VALUE(mrb,r,v) do { \ |