Skip to content
Snippets Groups Projects
Commit a46db772 authored by Jason Molenda's avatar Jason Molenda
Browse files

Verified that the plugin.dynamic-loader.darwin-kernel.scan-type

setting is working correctly now; remove the #if 0's around its
use.

llvm-svn: 173982
parent c40b0fab
No related branches found
No related tags found
No related merge requests found
...@@ -239,10 +239,8 @@ DynamicLoaderDarwinKernel::SearchForKernelAtSameLoadAddr (Process *process) ...@@ -239,10 +239,8 @@ DynamicLoaderDarwinKernel::SearchForKernelAtSameLoadAddr (Process *process)
lldb::addr_t lldb::addr_t
DynamicLoaderDarwinKernel::SearchForKernelWithDebugHints (Process *process) DynamicLoaderDarwinKernel::SearchForKernelWithDebugHints (Process *process)
{ {
#if 0
if (GetGlobalProperties()->GetScanType() == eKASLRScanNone) if (GetGlobalProperties()->GetScanType() == eKASLRScanNone)
return LLDB_INVALID_ADDRESS; return LLDB_INVALID_ADDRESS;
#endif
Error read_err; Error read_err;
addr_t addr = LLDB_INVALID_ADDRESS; addr_t addr = LLDB_INVALID_ADDRESS;
...@@ -276,13 +274,11 @@ DynamicLoaderDarwinKernel::SearchForKernelWithDebugHints (Process *process) ...@@ -276,13 +274,11 @@ DynamicLoaderDarwinKernel::SearchForKernelWithDebugHints (Process *process)
lldb::addr_t lldb::addr_t
DynamicLoaderDarwinKernel::SearchForKernelNearPC (Process *process) DynamicLoaderDarwinKernel::SearchForKernelNearPC (Process *process)
{ {
#if 0
if (GetGlobalProperties()->GetScanType() == eKASLRScanNone if (GetGlobalProperties()->GetScanType() == eKASLRScanNone
|| GetGlobalProperties()->GetScanType() == eKASLRScanLowgloAddresses) || GetGlobalProperties()->GetScanType() == eKASLRScanLowgloAddresses)
{ {
return LLDB_INVALID_ADDRESS; return LLDB_INVALID_ADDRESS;
} }
#endif
ThreadSP thread = process->GetThreadList().GetSelectedThread (); ThreadSP thread = process->GetThreadList().GetSelectedThread ();
if (thread.get() == NULL) if (thread.get() == NULL)
...@@ -339,12 +335,10 @@ DynamicLoaderDarwinKernel::SearchForKernelNearPC (Process *process) ...@@ -339,12 +335,10 @@ DynamicLoaderDarwinKernel::SearchForKernelNearPC (Process *process)
lldb::addr_t lldb::addr_t
DynamicLoaderDarwinKernel::SearchForKernelViaExhaustiveSearch (Process *process) DynamicLoaderDarwinKernel::SearchForKernelViaExhaustiveSearch (Process *process)
{ {
#if 0
if (GetGlobalProperties()->GetScanType() != eKASLRScanExhaustiveScan) if (GetGlobalProperties()->GetScanType() != eKASLRScanExhaustiveScan)
{ {
return LLDB_INVALID_ADDRESS; return LLDB_INVALID_ADDRESS;
} }
#endif
addr_t kernel_range_low, kernel_range_high; addr_t kernel_range_low, kernel_range_high;
if (process->GetTarget().GetArchitecture().GetAddressByteSize() == 8) if (process->GetTarget().GetArchitecture().GetAddressByteSize() == 8)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment