Commit 0194eb58 authored by Sigurd Schneider's avatar Sigurd Schneider Committed by Commit Bot

Fix pointer-compression related #defines

1) Ensure 31bit Smis are enabled if pointer compression is.
2) Enable some code for 31bit Smis

Bug: v8:8344
Change-Id: Ib1e68ebfcfd49e16d1548879b7670c88dc73449b
Reviewed-on: https://chromium-review.googlesource.com/c/1445979
Commit-Queue: Sigurd Schneider <sigurds@chromium.org>
Reviewed-by: 's avatarJaroslav Sevcik <jarin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#59248}
parent f0d94ede
......@@ -339,7 +339,7 @@ config("features") {
if (v8_enable_pointer_compression) {
defines += [ "V8_COMPRESS_POINTERS" ]
}
if (v8_enable_31bit_smis_on_64bit_arch) {
if (v8_enable_pointer_compression || v8_enable_31bit_smis_on_64bit_arch) {
defines += [ "V8_31BIT_SMIS_ON_64BIT_ARCH" ]
}
if (v8_enable_object_print) {
......
......@@ -2007,7 +2007,7 @@ void TurboAssembler::CallBuiltinPointer(Register builtin_pointer) {
// The builtin_pointer register contains the builtin index as a Smi.
// Untagging is folded into the indexing operand below.
#ifdef V8_COMPRESS_POINTERS
#if defined(V8_COMPRESS_POINTERS) || defined(V8_31BIT_SMIS_ON_64BIT_ARCH)
STATIC_ASSERT(kSmiShiftSize == 0);
Lsl(builtin_pointer, builtin_pointer, kSystemPointerSizeLog2 - kSmiShift);
#else
......
......@@ -1619,7 +1619,7 @@ void TurboAssembler::CallBuiltinPointer(Register builtin_pointer) {
// of times_8 since smis are already shifted by one).
Call(Operand(kRootRegister, builtin_pointer, times_4,
IsolateData::builtin_entry_table_offset()));
#else // V8_COMPRESS_POINTERS
#else // defined(V8_COMPRESS_POINTERS) || defined(V8_31BIT_SMIS_ON_64BIT_ARCH)
STATIC_ASSERT(kSmiShiftSize == 31);
STATIC_ASSERT(kSmiTagSize == 1);
STATIC_ASSERT(kSmiTag == 0);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment