Cool_Tools/ImHex
1
0
Fork 0
mirror of synced 2025-01-29 19:17:28 +01:00
Code Releases Wiki Activity

patterns: Fix bitfield member access

Browse Source
This commit is contained in:
WerWolv 2021-09-12 20:27:23 +02:00
parent ea2d181741
commit 1df64031c8
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/libimhex/include/hex/pattern_language/pattern_data.hpp
View File

@ -1382,7 +1382,7 @@ namespace hex::pl {
return false;
for (u64 i = 0; i < this->m_fields.size(); i++) {
if (this->m_fields[i] != otherBitfield.m_fields[i])
if (*this->m_fields[i] != *otherBitfield.m_fields[i])
return false;
}

14
plugins/libimhex/source/pattern_language/evaluator.cpp
View File

@ -250,19 +250,13 @@ namespace hex::pl {
default: this->getConsole().abortEvaluation("invalid rvalue size");
}
} else if (auto bitfieldFieldPattern = dynamic_cast<PatternDataBitfieldField*>(currPattern); bitfieldFieldPattern != nullptr) {
u8 value[bitfieldFieldPattern->getSize()];
std::vector<u8> value(bitfieldFieldPattern->getSize());
if (currPattern->isLocal())
std::memcpy(value, this->m_localStack.data() + bitfieldFieldPattern->getOffset(), bitfieldFieldPattern->getSize());
std::memcpy(value.data(), this->m_localStack.data() + bitfieldFieldPattern->getOffset(), value.size());
else
this->m_provider->read(bitfieldFieldPattern->getOffset(), value, bitfieldFieldPattern->getSize());
this->m_provider->read(bitfieldFieldPattern->getOffset(), value.data(), value.size());
u8 bitOffset = bitfieldFieldPattern->getBitOffset();
u8 bitSize = bitfieldFieldPattern->getBitSize();
u128 fieldValue = 0;
std::memcpy(&fieldValue, value + (bitOffset / 8), (bitSize / 8) + 1);
return new ASTNodeIntegerLiteral(hex::extract((bitOffset + bitSize) - 1 - ((bitOffset / 8) * 8), bitOffset - ((bitOffset / 8) * 8), fieldValue));
return new ASTNodeIntegerLiteral(hex::extract(bitfieldFieldPattern->getBitOffset() + (bitfieldFieldPattern->getBitSize() - 1), bitfieldFieldPattern->getBitOffset(), value));
} else
this->getConsole().abortEvaluation("tried to use non-integer value in numeric expression");
}