[Lldb-commits] [lldb] r276721 - DynamicLoaderDarwinKernel will look in four addresses for the kernel

[Jason Molenda via lldb-commits]

Author: jmolenda
Date: Mon Jul 25 22:10:15 2016
New Revision: 276721

URL: http://llvm.org/viewvc/llvm-project?rev=276721&view=rev
Log:
DynamicLoaderDarwinKernel will look in four addresses for the kernel
load address on 64-bit devices; it only needs to look in three.

<rdar://problem/27061405> 

Modified:
    lldb/trunk/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp

Modified: lldb/trunk/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp?rev=276721&r1=276720&r2=276721&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp (original)
+++ lldb/trunk/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp Mon Jul 25 22:10:15 2016
@@ -254,8 +254,9 @@ DynamicLoaderDarwinKernel::SearchForKern
 
     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 };