Author: enrico
Date: Mon Apr 11 16:50:35 2016
New Revision: 266001
URL: http://llvm.org/viewvc/llvm-project?rev=266001&view=rev
Log:
Add support for resolving dynamic types of extended ObjC tagged pointers
rdar://problem/24401051
Modified:
lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp
lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.h
Modified:
lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp?rev=266001&r1=266000&r2=266001&view=diff
==============================================================================
---
lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp
(original)
+++
lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp
Mon Apr 11 16:50:35 2016
@@ -2034,6 +2034,74 @@ AppleObjCRuntimeV2::TaggedPointerVendorV
if (error.Fail())
return new TaggedPointerVendorLegacy(runtime);
+ // try to detect the "extended tagged pointer" variables - if any are
missing, use the non-extended vendor
+ do
+ {
+ auto objc_debug_taggedpointer_ext_mask =
ExtractRuntimeGlobalSymbol(process,
+
ConstString("objc_debug_taggedpointer_ext_mask"),
+
objc_module_sp,
+
error);
+ if (error.Fail())
+ break;
+
+ auto objc_debug_taggedpointer_ext_slot_shift =
ExtractRuntimeGlobalSymbol(process,
+
ConstString("objc_debug_taggedpointer_ext_slot_shift"),
+
objc_module_sp,
+
error,
+
true,
+
4);
+ if (error.Fail())
+ break;
+
+ auto objc_debug_taggedpointer_ext_slot_mask =
ExtractRuntimeGlobalSymbol(process,
+
ConstString("objc_debug_taggedpointer_ext_slot_mask"),
+
objc_module_sp,
+
error,
+
true,
+
4);
+ if (error.Fail())
+ break;
+
+ auto objc_debug_taggedpointer_ext_classes =
ExtractRuntimeGlobalSymbol(process,
+
ConstString("objc_debug_taggedpointer_ext_classes"),
+
objc_module_sp,
+
error,
+
false);
+ if (error.Fail())
+ break;
+
+ auto objc_debug_taggedpointer_ext_payload_lshift =
ExtractRuntimeGlobalSymbol(process,
+
ConstString("objc_debug_taggedpointer_ext_payload_lshift"),
+
objc_module_sp,
+
error,
+
true,
+
4);
+ if (error.Fail())
+ break;
+
+ auto objc_debug_taggedpointer_ext_payload_rshift =
ExtractRuntimeGlobalSymbol(process,
+
ConstString("objc_debug_taggedpointer_ext_payload_rshift"),
+
objc_module_sp,
+
error,
+
true,
+
4);
+ if (error.Fail())
+ break;
+
+ return new TaggedPointerVendorExtended(runtime,
+ objc_debug_taggedpointer_mask,
+
objc_debug_taggedpointer_ext_mask,
+
objc_debug_taggedpointer_slot_shift,
+
objc_debug_taggedpointer_ext_slot_shift,
+
objc_debug_taggedpointer_slot_mask,
+
objc_debug_taggedpointer_ext_slot_mask,
+
objc_debug_taggedpointer_payload_lshift,
+
objc_debug_taggedpointer_payload_rshift,
+
objc_debug_taggedpointer_ext_payload_lshift,
+
objc_debug_taggedpointer_ext_payload_rshift,
+
objc_debug_taggedpointer_classes,
+
objc_debug_taggedpointer_ext_classes);
+ } while(false);
// we might want to have some rules to outlaw these values (e.g if the
table's address is zero)
@@ -2172,6 +2240,87 @@ AppleObjCRuntimeV2::TaggedPointerVendorR
return ClassDescriptorSP(new
ClassDescriptorV2Tagged(actual_class_descriptor_sp,data_payload));
}
+
+AppleObjCRuntimeV2::TaggedPointerVendorExtended::TaggedPointerVendorExtended
(AppleObjCRuntimeV2& runtime,
+
uint64_t objc_debug_taggedpointer_mask,
+
uint64_t objc_debug_taggedpointer_ext_mask,
+
uint32_t objc_debug_taggedpointer_slot_shift,
+
uint32_t objc_debug_taggedpointer_ext_slot_shift,
+
uint32_t objc_debug_taggedpointer_slot_mask,
+
uint32_t objc_debug_taggedpointer_ext_slot_mask,
+
uint32_t objc_debug_taggedpointer_payload_lshift,
+
uint32_t objc_debug_taggedpointer_payload_rshift,
+
uint32_t objc_debug_taggedpointer_ext_payload_lshift,
+
uint32_t objc_debug_taggedpointer_ext_payload_rshift,
+
lldb::addr_t objc_debug_taggedpointer_classes,
+
lldb::addr_t objc_debug_taggedpointer_ext_classes) :
+TaggedPointerVendorRuntimeAssisted(runtime,
+ objc_debug_taggedpointer_mask,
+ objc_debug_taggedpointer_slot_shift,
+ objc_debug_taggedpointer_slot_mask,
+ objc_debug_taggedpointer_payload_lshift,
+ objc_debug_taggedpointer_payload_rshift,
+ objc_debug_taggedpointer_classes),
+m_ext_cache(),
+m_objc_debug_taggedpointer_ext_mask(objc_debug_taggedpointer_ext_mask),
+m_objc_debug_taggedpointer_ext_slot_shift(objc_debug_taggedpointer_ext_slot_shift),
+m_objc_debug_taggedpointer_ext_slot_mask(objc_debug_taggedpointer_ext_slot_mask),
+m_objc_debug_taggedpointer_ext_payload_lshift(objc_debug_taggedpointer_ext_payload_lshift),
+m_objc_debug_taggedpointer_ext_payload_rshift(objc_debug_taggedpointer_ext_payload_rshift),
+m_objc_debug_taggedpointer_ext_classes(objc_debug_taggedpointer_ext_classes)
+{
+}
+
+bool
+AppleObjCRuntimeV2::TaggedPointerVendorExtended::IsPossibleExtendedTaggedPointer
(lldb::addr_t ptr)
+{
+ if (!IsPossibleTaggedPointer(ptr))
+ return false;
+
+ if (m_objc_debug_taggedpointer_ext_mask == 0)
+ return false;
+
+ return ((ptr & m_objc_debug_taggedpointer_ext_mask) ==
m_objc_debug_taggedpointer_ext_mask);
+}
+
+ObjCLanguageRuntime::ClassDescriptorSP
+AppleObjCRuntimeV2::TaggedPointerVendorExtended::GetClassDescriptor
(lldb::addr_t ptr)
+{
+ ClassDescriptorSP actual_class_descriptor_sp;
+ uint64_t data_payload;
+
+ if (!IsPossibleTaggedPointer(ptr))
+ return ObjCLanguageRuntime::ClassDescriptorSP();
+
+ if (!IsPossibleExtendedTaggedPointer(ptr))
+ return
this->TaggedPointerVendorRuntimeAssisted::GetClassDescriptor(ptr);
+
+ uintptr_t slot = (ptr >> m_objc_debug_taggedpointer_ext_slot_shift) &
m_objc_debug_taggedpointer_ext_slot_mask;
+
+ CacheIterator iterator = m_ext_cache.find(slot),
+ end = m_ext_cache.end();
+ if (iterator != end)
+ {
+ actual_class_descriptor_sp = iterator->second;
+ }
+ else
+ {
+ Process* process(m_runtime.GetProcess());
+ uintptr_t slot_ptr =
slot*process->GetAddressByteSize()+m_objc_debug_taggedpointer_ext_classes;
+ Error error;
+ uintptr_t slot_data = process->ReadPointerFromMemory(slot_ptr, error);
+ if (error.Fail() || slot_data == 0 || slot_data ==
uintptr_t(LLDB_INVALID_ADDRESS))
+ return nullptr;
+ actual_class_descriptor_sp =
m_runtime.GetClassDescriptorFromISA((ObjCISA)slot_data);
+ if (!actual_class_descriptor_sp)
+ return ObjCLanguageRuntime::ClassDescriptorSP();
+ m_ext_cache[slot] = actual_class_descriptor_sp;
+ }
+
+ data_payload = (((uint64_t)ptr <<
m_objc_debug_taggedpointer_ext_payload_lshift) >>
m_objc_debug_taggedpointer_ext_payload_rshift);
+
+ return ClassDescriptorSP(new
ClassDescriptorV2Tagged(actual_class_descriptor_sp,data_payload));
+}
AppleObjCRuntimeV2::NonPointerISACache::NonPointerISACache
(AppleObjCRuntimeV2& runtime,
uint64_t
objc_debug_isa_class_mask,
Modified:
lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.h
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.h?rev=266001&r1=266000&r2=266001&view=diff
==============================================================================
---
lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.h
(original)
+++
lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.h
Mon Apr 11 16:50:35 2016
@@ -234,6 +234,45 @@ private:
DISALLOW_COPY_AND_ASSIGN(TaggedPointerVendorRuntimeAssisted);
};
+ class TaggedPointerVendorExtended : public
TaggedPointerVendorRuntimeAssisted
+ {
+ public:
+ ObjCLanguageRuntime::ClassDescriptorSP
+ GetClassDescriptor(lldb::addr_t ptr) override;
+
+ protected:
+ TaggedPointerVendorExtended (AppleObjCRuntimeV2& runtime,
+ uint64_t objc_debug_taggedpointer_mask,
+ uint64_t
objc_debug_taggedpointer_ext_mask,
+ uint32_t
objc_debug_taggedpointer_slot_shift,
+ uint32_t
objc_debug_taggedpointer_ext_slot_shift,
+ uint32_t
objc_debug_taggedpointer_slot_mask,
+ uint32_t
objc_debug_taggedpointer_ext_slot_mask,
+ uint32_t
objc_debug_taggedpointer_payload_lshift,
+ uint32_t
objc_debug_taggedpointer_payload_rshift,
+ uint32_t
objc_debug_taggedpointer_ext_payload_lshift,
+ uint32_t
objc_debug_taggedpointer_ext_payload_rshift,
+ lldb::addr_t
objc_debug_taggedpointer_classes,
+ lldb::addr_t
objc_debug_taggedpointer_ext_classes);
+
+ bool
+ IsPossibleExtendedTaggedPointer (lldb::addr_t ptr);
+
+ typedef std::map<uint8_t,ObjCLanguageRuntime::ClassDescriptorSP> Cache;
+ typedef Cache::iterator CacheIterator;
+ Cache
m_ext_cache;
+ uint64_t
m_objc_debug_taggedpointer_ext_mask;
+ uint32_t
m_objc_debug_taggedpointer_ext_slot_shift;
+ uint32_t
m_objc_debug_taggedpointer_ext_slot_mask;
+ uint32_t
m_objc_debug_taggedpointer_ext_payload_lshift;
+ uint32_t
m_objc_debug_taggedpointer_ext_payload_rshift;
+ lldb::addr_t
m_objc_debug_taggedpointer_ext_classes;
+
+ friend class AppleObjCRuntimeV2::TaggedPointerVendorV2;
+
+ DISALLOW_COPY_AND_ASSIGN(TaggedPointerVendorExtended);
+ };
+
class TaggedPointerVendorLegacy : public TaggedPointerVendorV2
{
public:
_______________________________________________
lldb-commits mailing list
[email protected]
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
