aml: monomorphise over Handler type

Author: IsaacWoods

aml/src/lib.rs

@@ -11,7 +11,6 @@ pub mod pci_routing;
 pub mod resource;
 
 use alloc::{
-    boxed::Box,
     string::{String, ToString},
     sync::Arc,
     vec,
@@ -24,23 +23,26 @@ use object::{MethodFlags, Object, ObjectType, ReferenceKind};
 use op_region::{OpRegion, RegionSpace};
 use spinning_top::Spinlock;
 
-pub struct Interpreter {
-    handler: Box<dyn Handler>,
+pub struct Interpreter<H>
+where
+    H: Handler,
+{
+    handler: H,
     pub namespace: Spinlock<Namespace>,
     context_stack: Spinlock<Vec<MethodContext>>,
 }
 
-unsafe impl Send for Interpreter {}
-unsafe impl Sync for Interpreter {}
+unsafe impl<H> Send for Interpreter<H> where H: Handler + Send {}
+unsafe impl<H> Sync for Interpreter<H> where H: Handler + Send {}
 
-impl Interpreter {
-    pub fn new<H>(handler: H) -> Interpreter
-    where
-        H: Handler + 'static,
-    {
+impl<H> Interpreter<H>
+where
+    H: Handler,
+{
+    pub fn new(handler: H) -> Interpreter<H> {
         Interpreter {
+            handler,
             namespace: Spinlock::new(Namespace::new()),
-            handler: Box::new(handler),
             context_stack: Spinlock::new(Vec::new()),
         }
     }

aml/src/pci_routing.rs

@@ -1,5 +1,6 @@
 use crate::{
     AmlError,
+    Handler,
     Interpreter,
     namespace::AmlName,
     object::{Object, ReferenceKind},
@@ -56,7 +57,10 @@ impl PciRoutingTable {
     /// `AmlError::InvalidOperationOnObject` if the value passed is not a package, or if any of the
     /// values within it are not packages. Returns the various `AmlError::Prt*` errors if the
     /// internal structure of the entries is invalid.
-    pub fn from_prt_path(prt_path: AmlName, interpreter: &Interpreter) -> Result<PciRoutingTable, AmlError> {
+    pub fn from_prt_path(
+        prt_path: AmlName,
+        interpreter: &Interpreter<impl Handler>,
+    ) -> Result<PciRoutingTable, AmlError> {
         let mut entries = Vec::new();
 
         let prt = interpreter.invoke_method(prt_path.clone(), vec![])?;
@@ -149,7 +153,7 @@ impl PciRoutingTable {
         device: u16,
         function: u16,
         pin: Pin,
-        interpreter: &Interpreter,
+        interpreter: &Interpreter<impl Handler>,
     ) -> Result<IrqDescriptor, AmlError> {
         let entry = self
             .entries