x64dbg/x64dbg
x64dbg
/
x64dbg
1
0
Fork 0
Code Releases 2 Activity

DBG: fixed uglyness in ExpressionParser

This commit is contained in:
Mr. eXoDia 2015-06-08 01:00:10 +02:00
parent a0be994c5a
commit 6447ec0139
2 changed files with 11 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
x64_dbg_dbg/expressionparser.cpp
View File

@ -306,7 +306,7 @@ static inline int mulhi(int x, int y)
#endif //__MINGW64__ #endif //__MINGW64__
template<typename T> template<typename T>
static bool operation(const ExpressionParser::Token::Type type, const T op1, const T op2, T & result) static bool operation(const ExpressionParser::Token::Type type, const T op1, const T op2, T & result, const bool signedcalc)
{ {
result = 0; result = 0;
switch(type) switch(type)
@ -321,7 +321,10 @@ static bool operation(const ExpressionParser::Token::Type type, const T op1, con
result = op1 * op2; result = op1 * op2;
return true; return true;
case ExpressionParser::Token::Type::OperatorHiMul: case ExpressionParser::Token::Type::OperatorHiMul:
result = umulhi(op1, op2); if(signedcalc)
result = mulhi(op1, op2);
else
result = umulhi(op1, op2);
return true; return true;
case ExpressionParser::Token::Type::OperatorDiv: case ExpressionParser::Token::Type::OperatorDiv:
if(op2 != 0) if(op2 != 0)
@ -365,35 +368,16 @@ static bool operation(const ExpressionParser::Token::Type type, const T op1, con
bool ExpressionParser::unsignedoperation(const Token::Type type, const uint op1, const uint op2, uint & result) bool ExpressionParser::unsignedoperation(const Token::Type type, const uint op1, const uint op2, uint & result)
{ {
if(type == Token::Type::OperatorHiMul) return operation<uint>(type, op1, op2, result, false);
{
result = umulhi(op1, op2);
return true;
}
else
return operation<uint>(type, op1, op2, result);
} }
bool ExpressionParser::signedoperation(const Token::Type type, const sint op1, const sint op2, uint & result) bool ExpressionParser::signedoperation(const Token::Type type, const sint op1, const sint op2, uint & result)
{ {
if(type == Token::Type::OperatorHiMul) sint signedResult;
{ if(!operation<sint>(type, op1, op2, signedResult, true))
result = mulhi(op1, op2); return false;
return true; result = (uint)signedResult;
} return true;
else
{
sint signedResult;
if(!operation<sint>(type, op1, op2, signedResult))
return false;
result = (uint)signedResult;
return true;
}
}
bool ExpressionParser::valFromString(const String & data, uint & value)
{
return sscanf_s(data.c_str(), "%u", &value) == 1;
} }
bool ExpressionParser::calculate(uint & value, bool signedcalc, bool silent, bool baseonly, int* value_size, bool* isvar, bool* hexonly) bool ExpressionParser::calculate(uint & value, bool signedcalc, bool silent, bool baseonly, int* value_size, bool* isvar, bool* hexonly)

1
x64_dbg_dbg/expressionparser.h
View File

@ -59,7 +59,6 @@ private:
void addOperatorToken(const char ch, const Token::Type type); void addOperatorToken(const char ch, const Token::Type type);
bool unsignedoperation(const Token::Type type, const uint op1, const uint op2, uint & result); bool unsignedoperation(const Token::Type type, const uint op1, const uint op2, uint & result);
bool signedoperation(const Token::Type type, const sint op1, const sint op2, uint & result); bool signedoperation(const Token::Type type, const sint op1, const sint op2, uint & result);
bool valFromString(const String & data, uint & value);
std::vector<Token> _tokens; std::vector<Token> _tokens;
std::vector<Token> _prefixTokens; std::vector<Token> _prefixTokens;