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

Kernel: Make BufferField actually access the buffer and not copy

This commit is contained in:
Bananymous 2025-04-01 22:53:35 +03:00
parent 0474ac4262
commit ba74b352bd
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1167,17 +1167,18 @@ namespace Kernel::ACPI::AML
} }
} }
auto buffer_node = TRY(parse_node(context)); auto buffer_node_ref = TRY(parse_node(context, true));
if (buffer_node.type != Node::Type::Buffer)
auto* buffer_node = &buffer_node_ref;
if (buffer_node->type == Node::Type::Reference)
buffer_node = &buffer_node->as.reference->node;
if (buffer_node->type != Node::Type::Buffer)
{ {
dwarnln("CreateField buffer is {}", buffer_node); dwarnln("CreateField buffer is {}", buffer_node);
return BAN::Error::from_errno(EINVAL); return BAN::Error::from_errno(EINVAL);
} }
Node dummy_integer {};
dummy_integer.type = Node::Type::Integer;
dummy_integer.as.integer.value = 0;
auto index_node = TRY(convert_node(TRY(parse_node(context)), ConvInteger, sizeof(uint64_t))); auto index_node = TRY(convert_node(TRY(parse_node(context)), ConvInteger, sizeof(uint64_t)));
if (bit_count == 0) if (bit_count == 0)
@ -1196,7 +1197,7 @@ namespace Kernel::ACPI::AML
Node buffer_field; Node buffer_field;
buffer_field.type = Node::Type::BufferField; buffer_field.type = Node::Type::BufferField;
buffer_field.as.buffer_field.buffer = buffer_node.as.str_buf; buffer_field.as.buffer_field.buffer = buffer_node->as.str_buf;
buffer_field.as.buffer_field.buffer->ref_count++; buffer_field.as.buffer_field.buffer->ref_count++;
buffer_field.as.buffer_field.bit_count = bit_count; buffer_field.as.buffer_field.bit_count = bit_count;
buffer_field.as.buffer_field.bit_offset = index_in_bits ? index_node.as.integer.value : index_node.as.integer.value * 8; buffer_field.as.buffer_field.bit_offset = index_in_bits ? index_node.as.integer.value : index_node.as.integer.value * 8;