Cool_Tools/ImHex
1
0
Fork 0
mirror of synced 2025-02-06 14:14:22 +01:00
Code Releases Wiki Activity

pattern: Added left_to_right and right_to_left attribute for bitfields

Browse Source
This commit is contained in:
WerWolv 2022-02-07 20:08:19 +01:00
parent 97db5e9698
commit 94506848e0
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/libimhex/include/hex/pattern_language/ast_node.hpp
View File

@ -89,7 +89,7 @@ namespace hex::pl {
} }
public: public:
void addAttribute(ASTNodeAttribute *attribute) { virtual void addAttribute(ASTNodeAttribute *attribute) {
this->m_attributes.push_back(attribute); this->m_attributes.push_back(attribute);
} }
@ -482,6 +482,13 @@ namespace hex::pl {
return patterns; return patterns;
} }
void addAttribute(ASTNodeAttribute *attribute) override {
Attributable::addAttribute(attribute);
if (auto attributable = dynamic_cast<Attributable *>(this->m_type); attributable != nullptr)
attributable->addAttribute(static_cast<ASTNodeAttribute *>(attribute->clone()));
}
private: private:
std::string m_name; std::string m_name;
ASTNode *m_type; ASTNode *m_type;
@ -1517,6 +1524,15 @@ namespace hex::pl {
delete field; delete field;
}; };
auto &attributes = this->getAttributes();
bool isLeftToRight = false;
if (std::any_of(attributes.begin(), attributes.end(), [](ASTNodeAttribute *attribute) { return attribute->getAttribute() == "left_to_right" && !attribute->getValue().has_value(); }))
isLeftToRight = true;
else if (std::any_of(attributes.begin(), attributes.end(), [](ASTNodeAttribute *attribute) { return attribute->getAttribute() == "right_to_left" && !attribute->getValue().has_value(); }))
isLeftToRight = false;
evaluator->pushScope(pattern, fields); evaluator->pushScope(pattern, fields);
for (auto [name, bitSizeNode] : this->m_entries) { for (auto [name, bitSizeNode] : this->m_entries) {
auto literal = bitSizeNode->evaluate(evaluator); auto literal = bitSizeNode->evaluate(evaluator);
@ -1532,7 +1548,11 @@ namespace hex::pl {
if (name != "padding") { if (name != "padding") {
auto field = new PatternDataBitfieldField(evaluator, evaluator->dataOffset(), bitOffset, bitSize, pattern); auto field = new PatternDataBitfieldField(evaluator, evaluator->dataOffset(), bitOffset, bitSize, pattern);
field->setVariableName(name); field->setVariableName(name);
fields.push_back(field);
if (isLeftToRight)
fields.insert(fields.begin(), field);
else
fields.push_back(field);
} }
bitOffset += bitSize; bitOffset += bitSize;

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

@ -1469,7 +1469,7 @@ namespace hex::pl {
std::vector<u8> value(this->m_bitField->getSize(), 0); std::vector<u8> value(this->m_bitField->getSize(), 0);
provider->read(this->m_bitField->getOffset(), &value[0], value.size()); provider->read(this->m_bitField->getOffset(), &value[0], value.size());
if (this->m_bitField->getEndian() == std::endian::little) if (this->m_bitField->getEndian() != std::endian::native)
std::reverse(value.begin(), value.end()); std::reverse(value.begin(), value.end());
ImGui::TableNextRow(); ImGui::TableNextRow();