OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 6
Code Issues Packages Projects Releases Wiki Activity

Fix a logic error in the condition for a warning log message. 

llvm-svn: 172442
This commit is contained in:
Jim Ingham 2013-01-14 18:30:01 +00:00
parent ea02f26536
commit d7931f7047
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lldb/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp
View File

@ -821,7 +821,7 @@ DNBArchImplI386::GetWatchAddress(const DBG &debug_state, uint32_t hw_index)
bool bool
DNBArchImplI386::StartTransForHWP() 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); 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_dbg_checkpoint = m_state.context.dbg;
m_2pc_trans_state = Trans_Pending; m_2pc_trans_state = Trans_Pending;

2
lldb/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp
View File

@ -795,7 +795,7 @@ DNBArchImplX86_64::GetWatchAddress(const DBG &debug_state, uint32_t hw_index)
bool bool
DNBArchImplX86_64::StartTransForHWP() 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); 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_dbg_checkpoint = m_state.context.dbg;
m_2pc_trans_state = Trans_Pending; m_2pc_trans_state = Trans_Pending;