diff options
Diffstat (limited to 'lldb/source/Plugins/Process/MacOSX-User')
9 files changed, 16 insertions, 16 deletions
diff --git a/lldb/source/Plugins/Process/MacOSX-User/source/MacOSX/MachException.cpp b/lldb/source/Plugins/Process/MacOSX-User/source/MacOSX/MachException.cpp index cfea47518ca..483cca2fd65 100644 --- a/lldb/source/Plugins/Process/MacOSX-User/source/MacOSX/MachException.cpp +++ b/lldb/source/Plugins/Process/MacOSX-User/source/MacOSX/MachException.cpp @@ -367,7 +367,7 @@ MachException::Message::Reply(task_t task, pid_t pid, int signal) else err.Clear(); - if (log && log->GetMask().IsSet(PD_LOG_EXCEPTIONS) || err.Fail()) + if (log && log->GetMask().Test(PD_LOG_EXCEPTIONS) || err.Fail()) err.PutToLog(log, "::ptrace (request = PT_THUPDATE, pid = %i, tid = 0x%4.4x, signal = %i)", state_pid, state.thread_port, signal); } @@ -490,7 +490,7 @@ kern_return_t MachException::PortInfo::Restore (task_t task) { Log *log = ProcessMacOSXLog::GetLogIfAllCategoriesSet (PD_LOG_EXCEPTIONS); - if (log && log->GetMask().IsSet(PD_LOG_VERBOSE)) + if (log && log->GetMask().Test(PD_LOG_VERBOSE)) log->Printf("MachException::PortInfo::Restore (task = 0x%4.4x)", task); uint32_t i = 0; Error err; diff --git a/lldb/source/Plugins/Process/MacOSX-User/source/MacOSX/MachTask.cpp b/lldb/source/Plugins/Process/MacOSX-User/source/MacOSX/MachTask.cpp index 97a0c494cfc..a315fddcc72 100644 --- a/lldb/source/Plugins/Process/MacOSX-User/source/MacOSX/MachTask.cpp +++ b/lldb/source/Plugins/Process/MacOSX-User/source/MacOSX/MachTask.cpp @@ -163,7 +163,7 @@ MachTask::ReadMemory (lldb::addr_t addr, void *buf, size_t size, Error& error) if (log) { log->Printf ("MachTask::ReadMemory ( addr = 0x%16.16llx, size = %zu, buf = %8.8p) => %u bytes read", (uint64_t)addr, size, buf, n); - if (log->GetMask().IsSet(PD_LOG_MEMORY_DATA_LONG) || (log->GetMask().IsSet(PD_LOG_MEMORY_DATA_SHORT) && size <= 8)) + if (log->GetMask().Test(PD_LOG_MEMORY_DATA_LONG) || (log->GetMask().Test(PD_LOG_MEMORY_DATA_SHORT) && size <= 8)) { DataExtractor data((uint8_t*)buf, n, eByteOrderHost, 4); data.PutToLog(log, 0, n, addr, 16, DataExtractor::TypeUInt8); @@ -189,7 +189,7 @@ MachTask::WriteMemory (lldb::addr_t addr, const void *buf, size_t size, Error& e if (log) { log->Printf ("MachTask::WriteMemory ( addr = 0x%16.16llx, size = %zu, buf = %8.8p) => %u bytes written", (uint64_t)addr, size, buf, n); - if (log->GetMask().IsSet(PD_LOG_MEMORY_DATA_LONG) || (log->GetMask().IsSet(PD_LOG_MEMORY_DATA_SHORT) && size <= 8)) + if (log->GetMask().Test(PD_LOG_MEMORY_DATA_LONG) || (log->GetMask().Test(PD_LOG_MEMORY_DATA_SHORT) && size <= 8)) { DataExtractor data((uint8_t*)buf, n, eByteOrderHost, 4); data.PutToLog(log, 0, n, addr, 16, DataExtractor::TypeUInt8); @@ -329,7 +329,7 @@ MachTask::BasicInfo(task_t task, struct task_basic_info *info) Log *log = ProcessMacOSXLog::GetLogIfAllCategoriesSet (PD_LOG_TASK); if (log || err.Fail()) err.PutToLog(log, "::task_info ( target_task = 0x%4.4x, flavor = TASK_BASIC_INFO, task_info_out => %p, task_info_outCnt => %u )", task, info, count); - if (log && log->GetMask().IsSet(PD_LOG_VERBOSE) && err.Success()) + if (log && log->GetMask().Test(PD_LOG_VERBOSE) && err.Success()) { float user = (float)info->user_time.seconds + (float)info->user_time.microseconds / 1000000.0f; float system = (float)info->user_time.seconds + (float)info->user_time.microseconds / 1000000.0f; diff --git a/lldb/source/Plugins/Process/MacOSX-User/source/MacOSX/MachThreadContext_i386.cpp b/lldb/source/Plugins/Process/MacOSX-User/source/MacOSX/MachThreadContext_i386.cpp index 0e78cdc4d6d..5b724c9702c 100644 --- a/lldb/source/Plugins/Process/MacOSX-User/source/MacOSX/MachThreadContext_i386.cpp +++ b/lldb/source/Plugins/Process/MacOSX-User/source/MacOSX/MachThreadContext_i386.cpp @@ -142,7 +142,7 @@ MachThreadContext_i386::NotifyException (MachException::Data& exc) // rflags.Clear(trace_bit); // } // -// rflags_scalar = rflags.GetAllFlagBits(); +// rflags_scalar = rflags.Get(); // // If the code makes it here we have changes to the GPRs which // // we need to write back out, so lets do that. // if (reg_ctx->WriteRegisterValue(m_flags_reg, rflags_scalar)) diff --git a/lldb/source/Plugins/Process/MacOSX-User/source/MacOSX/MachThreadContext_x86_64.cpp b/lldb/source/Plugins/Process/MacOSX-User/source/MacOSX/MachThreadContext_x86_64.cpp index 0dcbe746de4..3afcb221b3a 100644 --- a/lldb/source/Plugins/Process/MacOSX-User/source/MacOSX/MachThreadContext_x86_64.cpp +++ b/lldb/source/Plugins/Process/MacOSX-User/source/MacOSX/MachThreadContext_x86_64.cpp @@ -141,7 +141,7 @@ MachThreadContext_x86_64::NotifyException(MachException::Data& exc) // rflags.Clear(trace_bit); // } // -// rflags_scalar = rflags.GetAllFlagBits(); +// rflags_scalar = rflags.Get(); // // If the code makes it here we have changes to the GPRs which // // we need to write back out, so lets do that. // if (reg_ctx->WriteRegisterValue(m_flags_reg, rflags_scalar)) diff --git a/lldb/source/Plugins/Process/MacOSX-User/source/MacOSX/MachVMRegion.cpp b/lldb/source/Plugins/Process/MacOSX-User/source/MacOSX/MachVMRegion.cpp index 87044fb31b2..fd8636f5786 100644 --- a/lldb/source/Plugins/Process/MacOSX-User/source/MacOSX/MachVMRegion.cpp +++ b/lldb/source/Plugins/Process/MacOSX-User/source/MacOSX/MachVMRegion.cpp @@ -146,7 +146,7 @@ MachVMRegion::GetRegionForAddress(lldb::addr_t addr) } else { - if (log && log->GetMask().IsSet(PD_LOG_VERBOSE)) + if (log && log->GetMask().Test(PD_LOG_VERBOSE)) { log->Printf("info = { prot = %u, " "max_prot = %u, " diff --git a/lldb/source/Plugins/Process/MacOSX-User/source/ProcessMacOSX.cpp b/lldb/source/Plugins/Process/MacOSX-User/source/ProcessMacOSX.cpp index e1c1bcc2fae..96bb7d44e87 100644 --- a/lldb/source/Plugins/Process/MacOSX-User/source/ProcessMacOSX.cpp +++ b/lldb/source/Plugins/Process/MacOSX-User/source/ProcessMacOSX.cpp @@ -584,7 +584,7 @@ ProcessMacOSX::UpdateThreadListIfNeeded () { // locker will keep a mutex locked until it goes out of scope Log *log = ProcessMacOSXLog::GetLogIfAllCategoriesSet (PD_LOG_THREAD); - if (log && log->GetMask().IsSet(PD_LOG_VERBOSE)) + if (log && log->GetMask().Test(PD_LOG_VERBOSE)) log->Printf ("ProcessMacOSX::%s (pid = %4.4x)", __FUNCTION__, GetID()); const uint32_t stop_id = GetStopID(); diff --git a/lldb/source/Plugins/Process/MacOSX-User/source/ProcessMacOSX.h b/lldb/source/Plugins/Process/MacOSX-User/source/ProcessMacOSX.h index 9a6e1499499..afbd9b3f1ae 100644 --- a/lldb/source/Plugins/Process/MacOSX-User/source/ProcessMacOSX.h +++ b/lldb/source/Plugins/Process/MacOSX-User/source/ProcessMacOSX.h @@ -417,7 +417,7 @@ protected: bool ProcessUsingSpringBoard() const { - return m_flags.IsSet(eFlagsUsingSBS); + return m_flags.Test (eFlagsUsingSBS); } lldb_private::ArchSpec& diff --git a/lldb/source/Plugins/Process/MacOSX-User/source/ProcessMacOSXLog.cpp b/lldb/source/Plugins/Process/MacOSX-User/source/ProcessMacOSXLog.cpp index fe3e6943445..1fcb9cce58c 100644 --- a/lldb/source/Plugins/Process/MacOSX-User/source/ProcessMacOSXLog.cpp +++ b/lldb/source/Plugins/Process/MacOSX-User/source/ProcessMacOSXLog.cpp @@ -27,7 +27,7 @@ ProcessMacOSXLog::GetLogIfAllCategoriesSet (uint32_t mask) Log *log = g_log; if (log && mask) { - uint32_t log_mask = log->GetMask().GetAllFlagBits(); + uint32_t log_mask = log->GetMask().Get(); if ((log_mask & mask) != mask) return NULL; } @@ -84,8 +84,8 @@ ProcessMacOSXLog::EnableLog (StreamSP &log_stream_sp, uint32_t log_options, Args } if (flag_bits == 0) flag_bits = PD_LOG_DEFAULT; - g_log->GetMask().SetAllFlagBits(flag_bits); - g_log->GetOptions().SetAllFlagBits(log_options); + g_log->GetMask().Reset(flag_bits); + g_log->GetOptions().Reset(log_options); } return g_log; } diff --git a/lldb/source/Plugins/Process/MacOSX-User/source/ThreadMacOSX.cpp b/lldb/source/Plugins/Process/MacOSX-User/source/ThreadMacOSX.cpp index 63c9dc591de..c400ef6eaee 100644 --- a/lldb/source/Plugins/Process/MacOSX-User/source/ThreadMacOSX.cpp +++ b/lldb/source/Plugins/Process/MacOSX-User/source/ThreadMacOSX.cpp @@ -249,7 +249,7 @@ int32_t ThreadMacOSX::Suspend() { Log *log = ProcessMacOSXLog::GetLogIfAllCategoriesSet(PD_LOG_THREAD); - if (log && log->GetMask().IsSet(PD_LOG_VERBOSE)) + if (log && log->GetMask().Test(PD_LOG_VERBOSE)) log->Printf ("ThreadMacOSX::%s ( )", __FUNCTION__); lldb::tid_t tid = GetID (); if (ThreadIDIsValid(tid)) @@ -267,7 +267,7 @@ int32_t ThreadMacOSX::Resume() { Log *log = ProcessMacOSXLog::GetLogIfAllCategoriesSet(PD_LOG_THREAD); - if (log && log->GetMask().IsSet(PD_LOG_VERBOSE)) + if (log && log->GetMask().Test(PD_LOG_VERBOSE)) log->Printf ("ThreadMacOSX::%s ()", __FUNCTION__); lldb::tid_t tid = GetID (); if (ThreadIDIsValid(tid)) @@ -288,7 +288,7 @@ bool ThreadMacOSX::RestoreSuspendCount() { Log *log = ProcessMacOSXLog::GetLogIfAllCategoriesSet(PD_LOG_THREAD); - if (log && log->GetMask().IsSet(PD_LOG_VERBOSE)) + if (log && log->GetMask().Test(PD_LOG_VERBOSE)) log->Printf ("ThreadMacOSX::%s ( )", __FUNCTION__); Error err; lldb::tid_t tid = GetID (); |
