From f07f66ba03dfeed222f419e1bae274e95cbcd2d4 Mon Sep 17 00:00:00 2001 From: Zichuan Li <34680029+river-li@users.noreply.github.com> Date: Thu, 15 Aug 2024 18:23:43 -0400 Subject: misc: formated code and fixed several small issues 1. Fix code related to SMI handlers 2. also parse handlers registered by SxDispatch and parse them together 3. Set Progress Text properly --- platform/efi/efi_resolver/src/GuidRenderer.cpp | 65 ++++++++++++-------------- 1 file changed, 30 insertions(+), 35 deletions(-) (limited to 'platform/efi/efi_resolver/src/GuidRenderer.cpp') diff --git a/platform/efi/efi_resolver/src/GuidRenderer.cpp b/platform/efi/efi_resolver/src/GuidRenderer.cpp index ef148094..deac0265 100644 --- a/platform/efi/efi_resolver/src/GuidRenderer.cpp +++ b/platform/efi/efi_resolver/src/GuidRenderer.cpp @@ -2,55 +2,50 @@ bool isType(const vector>& context, const string& name) { - if (context.empty()) - return false; + if (context.empty()) + return false; - auto [deepestType, size] = context.back(); - if (!deepestType->IsNamedTypeRefer()) - return false; + auto [deepestType, size] = context.back(); + if (!deepestType->IsNamedTypeRefer()) + return false; - return deepestType->GetTypeName().GetString() == name; + return deepestType->GetTypeName().GetString() == name; } -bool EfiGuidRenderer::IsValidForData(BinaryView* bv, uint64_t address, Type* type, - vector>& context) +bool EfiGuidRenderer::IsValidForData(BinaryView* bv, uint64_t address, Type* type, vector>& context) { - return isType(context, "EFI_GUID"); + return isType(context, "EFI_GUID"); } static string formatGuid(uint32_t data1, uint16_t data2, uint16_t data3, uint64_t data4) { - std::ostringstream oss; - oss << std::hex << std::uppercase << std::setfill('0') - << std::setw(8) << data1 << "-" - << std::setw(4) << data2 << "-" - << std::setw(4) << data3 << "-" - << std::setw(16) << data4; - return oss.str(); + std::ostringstream oss; + oss << std::hex << std::uppercase << std::setfill('0') << std::setw(8) << data1 << "-" << std::setw(4) << data2 + << "-" << std::setw(4) << data3 << "-" << std::setw(16) << data4; + return oss.str(); } -vector EfiGuidRenderer::GetLinesForData( - BinaryView* bv, uint64_t address, Type*, const vector& prefix, - size_t, vector>& context) +vector EfiGuidRenderer::GetLinesForData(BinaryView* bv, uint64_t address, Type*, + const vector& prefix, size_t, vector>& context) { - BinaryReader reader(bv); - reader.Seek(address); - auto data1 = reader.Read32(); - auto data2 = reader.Read16(); - auto data3 = reader.Read16(); - auto data4 = reader.ReadBE64(); - string guidStr = formatGuid(data1, data2, data3, data4); - - DisassemblyTextLine line; - line.addr = address; - line.tokens = prefix; - line.tokens.emplace_back(TextToken, "[EFI_GUID(\""); - line.tokens.emplace_back(StringToken, guidStr); - line.tokens.emplace_back(TextToken, "\")]"); - return { line }; + BinaryReader reader(bv); + reader.Seek(address); + auto data1 = reader.Read32(); + auto data2 = reader.Read16(); + auto data3 = reader.Read16(); + auto data4 = reader.ReadBE64(); + string guidStr = formatGuid(data1, data2, data3, data4); + + DisassemblyTextLine line; + line.addr = address; + line.tokens = prefix; + line.tokens.emplace_back(TextToken, "[EFI_GUID(\""); + line.tokens.emplace_back(StringToken, guidStr); + line.tokens.emplace_back(TextToken, "\")]"); + return {line}; } void EfiGuidRenderer::Register() { - DataRendererContainer::RegisterTypeSpecificDataRenderer(new EfiGuidRenderer()); + DataRendererContainer::RegisterTypeSpecificDataRenderer(new EfiGuidRenderer()); } -- cgit v1.3.1