Sinipelto
/
banan-os
forked from Bananymous/banan-os
1
0
Fork 0
Code Pull Requests Activity

Kernel: Implement AML BreakOp and ContinueOp

This commit is contained in:
Bananymous 2024-08-15 19:08:00 +03:00
parent 51d1e47bfe
commit 1cfe3dd4da
4 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,8 +50,8 @@ namespace Kernel::ACPI::AML
while (context.aml_data.size() > 0) while (context.aml_data.size() > 0)
{ {
auto object_result = AML::parse_object(context); auto object_result = AML::parse_object(context);
if (object_result.returned()) if (object_result.returned() || object_result.breaked() || object_result.continued())
return ParseResult(ParseResult::Result::Returned, object_result.node()); return object_result;
if (!object_result.success()) if (!object_result.success())
return ParseResult::Failure; return ParseResult::Failure;
} }

4
kernel/include/kernel/ACPI/AML/Node.h
View File

@ -78,6 +78,8 @@ namespace Kernel::ACPI::AML
Success, Success,
Failure, Failure,
Returned, Returned,
Breaked,
Continued,
}; };
ParseResult(Result success) ParseResult(Result success)
@ -96,6 +98,8 @@ namespace Kernel::ACPI::AML
bool success() const { return m_result == Result::Success; } bool success() const { return m_result == Result::Success; }
bool returned() const { return m_result == Result::Returned; } bool returned() const { return m_result == Result::Returned; }
bool breaked() const { return m_result == Result::Breaked; }
bool continued() const { return m_result == Result::Continued; }
BAN::RefPtr<Node> node() BAN::RefPtr<Node> node()
{ {

26
kernel/include/kernel/ACPI/AML/While.h
View File

@ -12,9 +12,22 @@ namespace Kernel::ACPI::AML
static ParseResult parse(ParseContext& context) static ParseResult parse(ParseContext& context)
{ {
ASSERT(context.aml_data.size() >= 1); ASSERT(context.aml_data.size() >= 1);
ASSERT(static_cast<Byte>(context.aml_data[0]) == Byte::WhileOp);
AML::Byte opcode = static_cast<Byte>(context.aml_data[0]);
context.aml_data = context.aml_data.slice(1); context.aml_data = context.aml_data.slice(1);
switch (opcode)
{
case AML::Byte::BreakOp:
return ParseResult(ParseResult::Result::Breaked);
case AML::Byte::ContinueOp:
return ParseResult(ParseResult::Result::Continued);
case AML::Byte::WhileOp:
break;
default:
ASSERT_NOT_REACHED();
}
auto while_pkg = AML::parse_pkg(context.aml_data); auto while_pkg = AML::parse_pkg(context.aml_data);
if (!while_pkg.has_value()) if (!while_pkg.has_value())
return ParseResult::Failure; return ParseResult::Failure;
@ -43,16 +56,13 @@ namespace Kernel::ACPI::AML
while (context.aml_data.size() > 0) while (context.aml_data.size() > 0)
{ {
// NOTE: we can just parse BreakOp here, since this is the only legal place for BreakOp
if (static_cast<AML::Byte>(context.aml_data[0]) == AML::Byte::BreakOp)
{
context.aml_data = context.aml_data.slice(1);
breaked = true;
break;
}
auto object_result = AML::parse_object(context); auto object_result = AML::parse_object(context);
if (object_result.returned()) if (object_result.returned())
return ParseResult(ParseResult::Result::Returned, object_result.node()); return ParseResult(ParseResult::Result::Returned, object_result.node());
if (object_result.breaked())
breaked = true;
if (object_result.breaked() || object_result.continued())
break;
if (!object_result.success()) if (!object_result.success())
return ParseResult::Failure; return ParseResult::Failure;
} }

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

@ -173,6 +173,8 @@ namespace Kernel::ACPI
return AML::Scope::parse(context); return AML::Scope::parse(context);
case AML::Byte::IfOp: case AML::Byte::IfOp:
return AML::IfElse::parse(context); return AML::IfElse::parse(context);
case AML::Byte::BreakOp:
case AML::Byte::ContinueOp:
case AML::Byte::WhileOp: case AML::Byte::WhileOp:
return AML::While::parse(context); return AML::While::parse(context);
case AML::Byte::StoreOp: case AML::Byte::StoreOp: