Implement DefIncrement and DefDecrement

Author: IsaacWoods

aml/src/lib.rs

@@ -292,6 +292,19 @@ impl AmlContext {
         Ok(())
     }
 
+    pub(crate) fn read_target(&self, target: &Target) -> Result<&AmlValue, AmlError> {
+        match target {
+            Target::Null => todo!(),
+            Target::Name(name) => {
+                let (_, handle) = self.namespace.search(name, &self.current_scope)?;
+                self.namespace.get(handle)
+            }
+            Target::Debug => todo!(),
+            Target::Arg(arg) => self.current_arg(*arg),
+            Target::Local(local) => self.local(*local),
+        }
+    }
+
     /// Get the value of an argument by its argument number. Can only be executed from inside a control method.
     pub(crate) fn current_arg(&self, arg: ArgNum) -> Result<&AmlValue, AmlError> {
         self.method_context.as_ref().ok_or(AmlError::NotExecutingControlMethod)?.args.arg(arg)

aml/src/opcode.rs

@@ -60,6 +60,8 @@ pub const DEF_BREAKPOINT_OP: u8 = 0xcc;
 pub const DEF_STORE_OP: u8 = 0x70;
 pub const DEF_ADD_OP: u8 = 0x72;
 pub const DEF_CONCAT_OP: u8 = 0x73;
+pub const DEF_INCREMENT_OP: u8 = 0x75;
+pub const DEF_DECREMENT_OP: u8 = 0x76;
 pub const DEF_SHIFT_LEFT: u8 = 0x79;
 pub const DEF_SHIFT_RIGHT: u8 = 0x7a;
 pub const DEF_AND_OP: u8 = 0x7b;

aml/src/type2.rs

@@ -51,6 +51,8 @@ where
             def_buffer(),
             def_concat(),
             def_concat_res(),
+            def_increment(),
+            def_decrement(),
             def_l_equal(),
             def_l_greater(),
             def_l_greater_equal(),
@@ -258,6 +260,50 @@ where
         .map(|((), result)| Ok(result))
 }
 
+fn def_increment<'a, 'c>() -> impl Parser<'a, 'c, AmlValue>
+where
+    'c: 'a,
+{
+    /*
+     * DefIncrement := 0x75 SuperName
+     */
+    opcode(opcode::DEF_INCREMENT_OP)
+        .then(comment_scope(
+            DebugVerbosity::AllScopes,
+            "DefIncrement",
+            super_name().map_with_context(|addend, context| {
+                let value = try_with_context!(context, context.read_target(&addend));
+                let value = try_with_context!(context, value.as_integer(context));
+                let new_value = AmlValue::Integer(value + 1);
+                try_with_context!(context, context.store(addend, new_value.clone()));
+                (Ok(new_value), context)
+            }),
+        ))
+        .map(|((), result)| Ok(result))
+}
+
+fn def_decrement<'a, 'c>() -> impl Parser<'a, 'c, AmlValue>
+where
+    'c: 'a,
+{
+    /*
+     * DefDecrement := 0x76 SuperName
+     */
+    opcode(opcode::DEF_DECREMENT_OP)
+        .then(comment_scope(
+            DebugVerbosity::AllScopes,
+            "DefDecrement",
+            super_name().map_with_context(|minuend, context| {
+                let value = try_with_context!(context, context.read_target(&minuend));
+                let value = try_with_context!(context, value.as_integer(context));
+                let new_value = AmlValue::Integer(value - 1);
+                try_with_context!(context, context.store(minuend, new_value.clone()));
+                (Ok(new_value), context)
+            }),
+        ))
+        .map(|((), result)| Ok(result))
+}
+
 fn def_l_or<'a, 'c>() -> impl Parser<'a, 'c, AmlValue>
 where
     'c: 'a,

tests/while.asl

@@ -1,8 +1,7 @@
-// TODO: when implemented, the `+= 1`s can be turned into `++` - this requires DefIncrement
 DefinitionBlock("while.aml", "DSDT", 1, "RSACPI", "WHILE", 1) {
 	Name(X, 0)
 	While (X < 5) {
-		X += 1
+		X++
 	}
 
 	// Test `DefBreak` - Y should only make it to 5
@@ -12,15 +11,15 @@ DefinitionBlock("while.aml", "DSDT", 1, "RSACPI", "WHILE", 1) {
 			Break
 		}
 
-		Y += 1
+		Y++
 	}
 
 	// Test `DefContinue` - Z should remain at zero
 	Name(CNT, 0)
 	Name(Z, 0)
 	While (CNT < 5) {
-		CNT += 1
+		CNT++
 		Continue
-		Z += 1
+		Z++
 	}
 }