[Lldb-commits] [lldb] r173982 - Verified that the plugin.dynamic-loader.darwin-kernel.scan-type

[Jason Molenda]

Author: jmolenda
Date: Wed Jan 30 16:19:51 2013
New Revision: 173982

URL: http://llvm.org/viewvc/llvm-project?rev=173982&view=rev
Log:
Verified that the plugin.dynamic-loader.darwin-kernel.scan-type
setting is working correctly now; remove the #if 0's around its
use.


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=173982&r1=173981&r2=173982&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp (original)
+++ lldb/trunk/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp Wed Jan 30 16:19:51 2013
@@ -239,10 +239,8 @@ DynamicLoaderDarwinKernel::SearchForKern
 lldb::addr_t
 DynamicLoaderDarwinKernel::SearchForKernelWithDebugHints (Process *process)
 {
-#if 0
     if (GetGlobalProperties()->GetScanType() == eKASLRScanNone)
         return LLDB_INVALID_ADDRESS;
-#endif
 
     Error read_err;
     addr_t addr = LLDB_INVALID_ADDRESS;
@@ -276,13 +274,11 @@ DynamicLoaderDarwinKernel::SearchForKern
 lldb::addr_t
 DynamicLoaderDarwinKernel::SearchForKernelNearPC (Process *process)
 {
-#if 0
     if (GetGlobalProperties()->GetScanType() == eKASLRScanNone 
         || GetGlobalProperties()->GetScanType() == eKASLRScanLowgloAddresses)
     {
         return LLDB_INVALID_ADDRESS;
     }
-#endif
 
     ThreadSP thread = process->GetThreadList().GetSelectedThread ();
     if (thread.get() == NULL)
@@ -339,12 +335,10 @@ DynamicLoaderDarwinKernel::SearchForKern
 lldb::addr_t
 DynamicLoaderDarwinKernel::SearchForKernelViaExhaustiveSearch (Process *process)
 {
-#if 0
     if (GetGlobalProperties()->GetScanType() != eKASLRScanExhaustiveScan)
     {
         return LLDB_INVALID_ADDRESS;
     }
-#endif
 
     addr_t kernel_range_low, kernel_range_high;
     if (process->GetTarget().GetArchitecture().GetAddressByteSize() == 8)