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

Kernel: AML cleanup IfElse code

This commit is contained in:
Bananymous 2024-04-17 00:49:07 +03:00
parent 6a4f999b88
commit cbc27a94ac
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
kernel/include/kernel/ACPI/AML/IfElse.h
View File

@ -23,17 +23,11 @@ namespace Kernel::ACPI::AML
auto outer_aml_data = context.aml_data; auto outer_aml_data = context.aml_data;
context.aml_data = if_pkg.value(); context.aml_data = if_pkg.value();
auto predicate = AML::parse_object(context); auto predicate_result = AML::parse_object(context);
if (!predicate.success()) if (!predicate_result.success())
return ParseResult::Failure; return ParseResult::Failure;
auto predicate_node = predicate.node(); auto predicate = predicate_result.node() ? predicate_result.node()->as_integer() : BAN::Optional<uint64_t>();
if (!predicate_node) if (!predicate.has_value())
{
AML_ERROR("If predicate is not an integer");
return ParseResult::Failure;
}
auto predicate_integer = predicate_node->as_integer();
if (!predicate_integer.has_value())
{ {
AML_ERROR("If predicate is not an integer"); AML_ERROR("If predicate is not an integer");
return ParseResult::Failure; return ParseResult::Failure;
@ -41,7 +35,7 @@ namespace Kernel::ACPI::AML
// Else // Else
BAN::ConstByteSpan else_pkg; BAN::ConstByteSpan else_pkg;
if (outer_aml_data.size() >= 1 && static_cast<Byte>(outer_aml_data[0]) == Byte::ElseOp) if (outer_aml_data.size() >= 1 && static_cast<AML::Byte>(outer_aml_data[0]) == Byte::ElseOp)
{ {
outer_aml_data = outer_aml_data.slice(1); outer_aml_data = outer_aml_data.slice(1);
auto else_pkg_result = AML::parse_pkg(outer_aml_data); auto else_pkg_result = AML::parse_pkg(outer_aml_data);
@ -49,7 +43,7 @@ namespace Kernel::ACPI::AML
return ParseResult::Failure; return ParseResult::Failure;
else_pkg = else_pkg_result.value(); else_pkg = else_pkg_result.value();
} }
if (!predicate_integer.value()) if (!predicate.value())
context.aml_data = else_pkg; context.aml_data = else_pkg;
while (context.aml_data.size() > 0) while (context.aml_data.size() > 0)