Bananymous
/
banan-os
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Kernel: Fix AML FieldUnit conversion and NameString construction

This commit is contained in:
Bananymous 2024-12-18 18:29:04 +02:00
parent 1b94957b07
commit c26e347e91
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
kernel/kernel/ACPI/AML/Node.cpp
View File

@ -803,7 +803,7 @@ namespace Kernel::ACPI::AML
if (pkg_element.value.node->type == Node::Type::Reference) if (pkg_element.value.node->type == Node::Type::Reference)
*pkg_element.value.node = TRY(convert_node(BAN::move(source_copy), pkg_element.value.node->as.reference->node)); *pkg_element.value.node = TRY(convert_node(BAN::move(source_copy), pkg_element.value.node->as.reference->node));
else else
*pkg_element.value.node = BAN::move(source_copy); *pkg_element.value.node = TRY(convert_node(BAN::move(source_copy), *pkg_element.value.node));
break; break;
} }
default: default:
@ -816,7 +816,11 @@ namespace Kernel::ACPI::AML
if (target_type == TargetType::Reference) if (target_type == TargetType::Reference)
target->node = TRY(convert_node(BAN::move(source_copy), target->node)); target->node = TRY(convert_node(BAN::move(source_copy), target->node));
else else
{
if (source_copy.type == Node::Type::FieldUnit)
source_copy = TRY(convert_from_field_unit(source_copy, ConvInteger | ConvBuffer, ONES));
target->node = BAN::move(source_copy); target->node = BAN::move(source_copy);
}
return {}; return {};
} }
@ -2949,8 +2953,11 @@ namespace Kernel::ACPI::AML
name = name.substring(result.base); name = name.substring(result.base);
} }
ASSERT((name.size() % 4) == 0); if (name.empty())
TRY(result.parts.reserve(name.size() / 4)); return result;
ASSERT((name.size() % 5) == 4);
TRY(result.parts.reserve((name.size() / 5) + 1));
while (!name.empty()) while (!name.empty())
{ {
@ -2962,6 +2969,11 @@ namespace Kernel::ACPI::AML
}; };
TRY(result.parts.push_back(name_seg)); TRY(result.parts.push_back(name_seg));
name = name.substring(4); name = name.substring(4);
if (!name.empty())
{
ASSERT(name.front() == '.');
name = name.substring(1);
}
} }
return result; return result;