empathicqubit/Mesen-X
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Debugger: Fixed modulo operator in expressions

Browse source
This commit is contained in:
Sour 2020-05-19 21:55:43 -04:00
parent c52cacd9e5
commit b8a0a7a59b
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Core/ExpressionEvaluator.cpp
View file

@ -143,7 +143,7 @@ bool ExpressionEvaluator::CheckSpecialTokens(string expression, size_t &pos, str
return true; return true;
} }
string ExpressionEvaluator::GetNextToken(string expression, size_t &pos, ExpressionData &data, bool &success) string ExpressionEvaluator::GetNextToken(string expression, size_t& pos, ExpressionData& data, bool& success, bool previousTokenIsOp)
{ {
string output; string output;
success = true; success = true;
@ -165,12 +165,12 @@ string ExpressionEvaluator::GetNextToken(string expression, size_t &pos, Express
success = false; success = false;
} }
output = std::to_string((uint32_t)HexUtilities::FromHex(output)); output = std::to_string((uint32_t)HexUtilities::FromHex(output));
} else if(c == '%') { } else if(c == '%' && previousTokenIsOp) {
//Binary numbers //Binary numbers
pos++; pos++;
for(size_t len = expression.size(); pos < len; pos++) { for(size_t len = expression.size(); pos < len; pos++) {
c = std::tolower(expression[pos]); c = std::tolower(expression[pos]);
if(c == '0' || c <= '1') { if(c == '0' || c == '1') {
output += c; output += c;
} else { } else {
break; break;
@ -257,7 +257,7 @@ bool ExpressionEvaluator::ToRpn(string expression, ExpressionData &data)
bool operatorOrEndTokenExpected = false; bool operatorOrEndTokenExpected = false;
while(true) { while(true) {
bool success = true; bool success = true;
string token = GetNextToken(expression, position, data, success); string token = GetNextToken(expression, position, data, success, previousTokenIsOp);
if(!success) { if(!success) {
return false; return false;
} }
@ -617,6 +617,14 @@ void ExpressionEvaluator::RunTests()
test("%1011", EvalResultType::Numeric, 11); test("%1011", EvalResultType::Numeric, 11);
test("%12", EvalResultType::Invalid, 0); test("%12", EvalResultType::Invalid, 0);
test("10 % 5", EvalResultType::Numeric, 0);
test("%100 % 5", EvalResultType::Numeric, 4);
test("%100%5", EvalResultType::Numeric, 4);
test("%10(10)", EvalResultType::Invalid, 0);
test("10%4*10", EvalResultType::Numeric, 20);
test("(5+5)%3", EvalResultType::Numeric, 1);
test("11%%10", EvalResultType::Numeric, 1); //11 modulo of 2 in binary (%10)
test(":$00", EvalResultType::Numeric, 0); test(":$00", EvalResultType::Numeric, 0);
test(":50", EvalResultType::Numeric, 50); test(":50", EvalResultType::Numeric, 50);
test(":$50", EvalResultType::Numeric, 0x50); test(":$50", EvalResultType::Numeric, 0x50);

2
Core/ExpressionEvaluator.h
View file

@ -123,7 +123,7 @@ private:
bool IsOperator(string token, int &precedence, bool unaryOperator); bool IsOperator(string token, int &precedence, bool unaryOperator);
EvalOperators GetOperator(string token, bool unaryOperator); EvalOperators GetOperator(string token, bool unaryOperator);
bool CheckSpecialTokens(string expression, size_t &pos, string &output, ExpressionData &data); bool CheckSpecialTokens(string expression, size_t &pos, string &output, ExpressionData &data);
string GetNextToken(string expression, size_t &pos, ExpressionData &data, bool &success); string GetNextToken(string expression, size_t &pos, ExpressionData &data, bool &success, bool previousTokenIsOp);
bool ProcessSpecialOperator(EvalOperators evalOp, std::stack<EvalOperators> &opStack, std::stack<int> &precedenceStack, vector<int64_t> &outputQueue); bool ProcessSpecialOperator(EvalOperators evalOp, std::stack<EvalOperators> &opStack, std::stack<int> &precedenceStack, vector<int64_t> &outputQueue);
bool ToRpn(string expression, ExpressionData &data); bool ToRpn(string expression, ExpressionData &data);
int32_t PrivateEvaluate(string expression, DebugState &state, EvalResultType &resultType, OperationInfo &operationInfo, bool &success); int32_t PrivateEvaluate(string expression, DebugState &state, EvalResultType &resultType, OperationInfo &operationInfo, bool &success);