Skip to content

Use contribute_arg to handle NoCurrentOp at the top-level #293

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
IsaacWoods wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Use contribute_arg to handle NoCurrentOp at the top-level #293

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 21 additions & 25 deletions src/aml/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1174,10 +1174,13 @@ where
* most places, but could also encode a `NullName` if we are expecting a
* `Target`. We handle the latter in logic for stores to targets.
*/
context.last_op()?.arguments.push(Argument::Object(Object::Integer(0).wrap()));
context.contribute_arg(Argument::Object(Object::Integer(0).wrap()));
}
Opcode::One => {
context.last_op()?.arguments.push(Argument::Object(Object::Integer(1).wrap()));
context.contribute_arg(Argument::Object(Object::Integer(1).wrap()));
}
Opcode::Ones => {
context.contribute_arg(Argument::Object(Object::Integer(u64::MAX).wrap()));
}
Opcode::Alias => {
let source = context.namestring()?;
Expand All @@ -1198,15 +1201,15 @@ where
}
Opcode::BytePrefix => {
let value = context.next()?;
context.last_op()?.arguments.push(Argument::Object(Object::Integer(value as u64).wrap()));
context.contribute_arg(Argument::Object(Object::Integer(value as u64).wrap()));
}
Opcode::WordPrefix => {
let value = context.next_u16()?;
context.last_op()?.arguments.push(Argument::Object(Object::Integer(value as u64).wrap()));
context.contribute_arg(Argument::Object(Object::Integer(value as u64).wrap()));
}
Opcode::DWordPrefix => {
let value = context.next_u32()?;
context.last_op()?.arguments.push(Argument::Object(Object::Integer(value as u64).wrap()));
context.contribute_arg(Argument::Object(Object::Integer(value as u64).wrap()));
}
Opcode::StringPrefix => {
let str_start = context.current_block.pc;
Expand All @@ -1216,11 +1219,11 @@ where
str::from_utf8(&context.current_block.stream()[str_start..(context.current_block.pc - 1)])
.unwrap(),
);
context.last_op()?.arguments.push(Argument::Object(Object::String(str).wrap()));
context.contribute_arg(Argument::Object(Object::String(str).wrap()));
}
Opcode::QWordPrefix => {
let value = context.next_u64()?;
context.last_op()?.arguments.push(Argument::Object(Object::Integer(value).wrap()));
context.contribute_arg(Argument::Object(Object::Integer(value).wrap()));
}
Opcode::Scope => {
let start_pc = context.current_block.pc;
Expand Down Expand Up @@ -1521,16 +1524,15 @@ where
}
Opcode::Local(local) => {
let local = context.locals[local as usize].clone();
context.last_op()?.arguments.push(Argument::Object(
context.contribute_arg(Argument::Object(
Object::Reference { kind: ReferenceKind::Local, inner: local }.wrap(),
));
}
Opcode::Arg(arg) => {
let arg = context.args[arg as usize].clone();
context
.last_op()?
.arguments
.push(Argument::Object(Object::Reference { kind: ReferenceKind::Arg, inner: arg }.wrap()));
context.contribute_arg(Argument::Object(
Object::Reference { kind: ReferenceKind::Arg, inner: arg }.wrap(),
));
}
Opcode::Store => context.start(OpInFlight::new(
Opcode::Store,
Expand Down Expand Up @@ -1566,7 +1568,7 @@ where
let object = self.namespace.lock().search(&name, &context.current_scope);
match object {
Ok((_resolved_name, object)) => {
context.last_op()?.arguments.push(Argument::Object(
context.contribute_arg(Argument::Object(
Object::Reference { kind: ReferenceKind::Named, inner: object }.wrap(),
));
}
Expand All @@ -1577,14 +1579,14 @@ where
let object = self.namespace.lock().search(&name, &context.current_scope);
match object {
Ok((_resolved_name, object)) => {
context.last_op()?.arguments.push(Argument::Object(object));
context.contribute_arg(Argument::Object(object));
}
Err(AmlError::ObjectDoesNotExist(_)) => {
let reference = Object::Reference {
kind: ReferenceKind::Unresolved,
inner: Object::String(name.to_string()).wrap(),
};
context.last_op()?.arguments.push(Argument::Object(reference.wrap()));
context.contribute_arg(Argument::Object(reference.wrap()));
}
Err(err) => Err(err)?,
}
Expand Down Expand Up @@ -1615,22 +1617,19 @@ where
))
} else if let Object::FieldUnit(ref field) = *object {
let value = self.do_field_read(field)?;
context.last_op()?.arguments.push(Argument::Object(value));
context.contribute_arg(Argument::Object(value));
} else if let Object::BufferField { .. } = *object {
let value = object.read_buffer_field(self.integer_size())?;
context.last_op()?.arguments.push(Argument::Object(value.wrap()));
context.contribute_arg(Argument::Object(value.wrap()));
} else {
context.last_op()?.arguments.push(Argument::Object(object));
context.contribute_arg(Argument::Object(object));
}
}
Err(err) => Err(err)?,
}
}
ResolveBehaviour::AsPackageElements => {
context
.last_op()?
.arguments
.push(Argument::Object(Object::String(name.to_string()).wrap()));
context.contribute_arg(Argument::Object(Object::String(name.to_string()).wrap()));
}
ResolveBehaviour::Placeholder => {
panic!("Invalid resolve behaviour for name to be resolved!")
Expand Down Expand Up @@ -1789,9 +1788,6 @@ where
Opcode::Breakpoint => {
self.handler.breakpoint();
}
Opcode::Ones => {
context.last_op()?.arguments.push(Argument::Object(Object::Integer(u64::MAX).wrap()));
}

Opcode::InternalMethodCall => panic!(),
}
Expand Down
Loading