From 57086ed76ff3c54ab7d0744b23d4ed17982fabdc Mon Sep 17 00:00:00 2001 From: Jason Molenda Date: Tue, 26 Jul 2016 03:10:15 +0000 Subject: [PATCH] DynamicLoaderDarwinKernel will look in four addresses for the kernel load address on 64-bit devices; it only needs to look in three. llvm-svn: 276721 --- .../DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp b/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp index 4021b44..6fcec3d 100644 --- a/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp +++ b/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp @@ -254,8 +254,9 @@ DynamicLoaderDarwinKernel::SearchForKernelWithDebugHints (Process *process) Error read_err; addr_t addr = LLDB_INVALID_ADDRESS; - addr_t kernel_addresses_64[] = { 0xffffff8000002010ULL, 0xffffff8000004010ULL, - 0xfffffff000002010ULL, 0xfffffff000004010ULL, + addr_t kernel_addresses_64[] = { 0xfffffff000004010ULL, // newest arm64 devices + 0xffffff8000004010ULL, // 2014-2015-ish arm64 devices + 0xffffff8000002010ULL, // oldest arm64 devices LLDB_INVALID_ADDRESS }; addr_t kernel_addresses_32[] = { 0xffff0110, LLDB_INVALID_ADDRESS }; -- 2.7.4