@@ -24,13 +24,15 @@ void JSDispatchEntry::MakeJSDispatchEntry(Address object, Address entrypoint,
2424 uint16_t parameter_count,
2525 bool mark_as_alive) {
2626 DCHECK_EQ (object & kHeapObjectTag , 0 );
27+ #if !defined(__illumos__) || !defined(V8_TARGET_ARCH_64_BIT)
2728 DCHECK_EQ ((((object - kObjectPointerOffset ) << kObjectPointerShift ) >>
2829 kObjectPointerShift ) +
2930 kObjectPointerOffset ,
3031 object);
3132 DCHECK_EQ ((object - kObjectPointerOffset ) + kObjectPointerOffset , object);
3233 DCHECK_LT ((object - kObjectPointerOffset ),
3334 1ULL << ((sizeof (encoded_word_) * 8 ) - kObjectPointerShift ));
35+ #endif /* __illumos__ & 64-bit */
3436
3537 Address payload = ((object - kObjectPointerOffset ) << kObjectPointerShift ) |
3638 (parameter_count & kParameterCountMask );
@@ -56,8 +58,16 @@ Address JSDispatchEntry::GetCodePointer() const {
5658 // and so may be 0 or 1 here. As the return value is a tagged pointer, the
5759 // bit must be 1 when returned, so we need to set it here.
5860 Address payload = encoded_word_.load (std::memory_order_acquire);
61+ #if defined(__illumos__) && defined(V8_TARGET_ARCH_64_BIT)
62+ // Unsigned types won't sign-extend on shift-right, but we need to do
63+ // this with illumos VA48 addressing.
64+ DCHECK_EQ (kObjectPointerOffset , 0 );
65+ return (Address)((intptr_t )payload >> (int )kObjectPointerShift ) |
66+ kHeapObjectTag ;
67+ #else
5968 return ((payload >> kObjectPointerShift ) + kObjectPointerOffset ) |
6069 kHeapObjectTag ;
70+ #endif /* __illumos__ & 64-bit */
6171}
6272
6373Tagged<Code> JSDispatchEntry::GetCode () const {
@@ -219,7 +229,12 @@ void JSDispatchEntry::MakeFreelistEntry(uint32_t next_entry_index) {
219229bool JSDispatchEntry::IsFreelistEntry () const {
220230#ifdef V8_TARGET_ARCH_64_BIT
221231 auto entrypoint = entrypoint_.load (std::memory_order_relaxed);
232+ #ifdef __illumos__
233+ // See the illumos definition of kFreeEntryTag for why we have to do this.
234+ return (entrypoint & 0xffff000000000000ull ) == kFreeEntryTag ;
235+ #else
222236 return (entrypoint & kFreeEntryTag ) == kFreeEntryTag ;
237+ #endif /* __illumos__ */
223238#else
224239 return next_free_entry_.load (std::memory_order_relaxed) != 0 ;
225240#endif
0 commit comments