libretro/Mesen
1
0
Fork 0
mirror of https://github.com/libretro/Mesen.git synced 2024-11-24 01:29:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Debugger: Prevent potential deadlock when closing debugger if using conditional breakpoints

Browse Source
This commit is contained in:
Souryo 2016-11-22 18:58:03 -05:00
parent 3751711f17
commit 502cc47c70
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Core/ExpressionEvaluator.cpp
View File

@ -253,7 +253,6 @@ int32_t ExpressionEvaluator::EvaluateExpression(vector<int> *outputQueue, DebugS
int left = 0; int left = 0;
int operandStack[1000]; int operandStack[1000];
resultType = EvalResultType::Numeric; resultType = EvalResultType::Numeric;
shared_ptr<Debugger> debugger = Console::GetInstance()->GetDebugger();
for(size_t i = 0, len = outputQueue->size(); i < len; i++) { for(size_t i = 0, len = outputQueue->size(); i < len; i++) {
int token = (*outputQueue)[i]; int token = (*outputQueue)[i];
@ -272,7 +271,7 @@ int32_t ExpressionEvaluator::EvaluateExpression(vector<int> *outputQueue, DebugS
case EvalValues::PpuScanline: token = state.PPU.Scanline; break; case EvalValues::PpuScanline: token = state.PPU.Scanline; break;
case EvalValues::Value: token = memoryValue; break; case EvalValues::Value: token = memoryValue; break;
case EvalValues::Address: token = memoryAddr; break; case EvalValues::Address: token = memoryAddr; break;
case EvalValues::AbsoluteAddress: token = debugger->GetAbsoluteAddress(memoryAddr); break; case EvalValues::AbsoluteAddress: token = _debugger->GetAbsoluteAddress(memoryAddr); break;
} }
} else if(token >= EvalOperators::Multiplication) { } else if(token >= EvalOperators::Multiplication) {
right = operandStack[--pos]; right = operandStack[--pos];
@ -303,8 +302,8 @@ int32_t ExpressionEvaluator::EvaluateExpression(vector<int> *outputQueue, DebugS
case EvalOperators::LogicalOr: token = left || right; resultType = EvalResultType::Boolean; break; case EvalOperators::LogicalOr: token = left || right; resultType = EvalResultType::Boolean; break;
//Unary operators //Unary operators
case EvalOperators::Bracket: token = debugger->GetMemoryValue(right); break; case EvalOperators::Bracket: token = _debugger->GetMemoryValue(right); break;
case EvalOperators::Braces: token = debugger->GetMemoryValue(right) | (debugger->GetMemoryValue(right+1) << 8); break; case EvalOperators::Braces: token = _debugger->GetMemoryValue(right) | (_debugger->GetMemoryValue(right+1) << 8); break;
case EvalOperators::Plus: token = right; break; case EvalOperators::Plus: token = right; break;
case EvalOperators::Minus: token = -right; break; case EvalOperators::Minus: token = -right; break;
case EvalOperators::BinaryNot: token = ~right; break; case EvalOperators::BinaryNot: token = ~right; break;