diff options
| author | Jim Ingham <jingham@apple.com> | 2013-01-14 18:30:01 +0000 |
|---|---|---|
| committer | Jim Ingham <jingham@apple.com> | 2013-01-14 18:30:01 +0000 |
| commit | d7931f70471d6ec68dc89cbf992aa6ac7cee9947 (patch) | |
| tree | 892aea3e8a3a4a038a1ca98194422a50a20b65bf | |
| parent | ea02f2653655d464345de1d26c8bfb8fdcdac491 (diff) | |
| download | llvm-d7931f70471d6ec68dc89cbf992aa6ac7cee9947.zip llvm-d7931f70471d6ec68dc89cbf992aa6ac7cee9947.tar.gz llvm-d7931f70471d6ec68dc89cbf992aa6ac7cee9947.tar.bz2 | |
Fix a logic error in the condition for a warning log message.
llvm-svn: 172442
| -rw-r--r-- | lldb/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp | 2 | ||||
| -rw-r--r-- | lldb/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lldb/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp b/lldb/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp index 7b4dcf7..e3f00fc 100644 --- a/lldb/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp +++ b/lldb/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp @@ -821,7 +821,7 @@ DNBArchImplI386::GetWatchAddress(const DBG &debug_state, uint32_t hw_index) bool DNBArchImplI386::StartTransForHWP() { - if (m_2pc_trans_state != Trans_Done || m_2pc_trans_state != Trans_Rolled_Back) + if (m_2pc_trans_state != Trans_Done && m_2pc_trans_state != Trans_Rolled_Back) DNBLogError ("%s inconsistent state detected, expected %d or %d, got: %d", __FUNCTION__, Trans_Done, Trans_Rolled_Back, m_2pc_trans_state); m_2pc_dbg_checkpoint = m_state.context.dbg; m_2pc_trans_state = Trans_Pending; diff --git a/lldb/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp b/lldb/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp index d0ba27a..266536d 100644 --- a/lldb/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp +++ b/lldb/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp @@ -795,7 +795,7 @@ DNBArchImplX86_64::GetWatchAddress(const DBG &debug_state, uint32_t hw_index) bool DNBArchImplX86_64::StartTransForHWP() { - if (m_2pc_trans_state != Trans_Done || m_2pc_trans_state != Trans_Rolled_Back) + if (m_2pc_trans_state != Trans_Done && m_2pc_trans_state != Trans_Rolled_Back) DNBLogError ("%s inconsistent state detected, expected %d or %d, got: %d", __FUNCTION__, Trans_Done, Trans_Rolled_Back, m_2pc_trans_state); m_2pc_dbg_checkpoint = m_state.context.dbg; m_2pc_trans_state = Trans_Pending; |