Add ToInteger test case from uACPI

Author: IsaacWoods

src/aml/mod.rs

@@ -1548,6 +1548,12 @@ where
                 Object::Integer(u64::from_le_bytes(to_interpret))
             }
             Object::String(ref value) => {
+                /*
+                 * This is about the same level of effort as ACPICA puts in. The uACPI test suite
+                 * has tests that this fails - namely because of support for octal, signs, strings
+                 * that won't fit in a `u64` etc. We probably need to write a more robust parser
+                 * 'real' parser to handle those cases.
+                 */
                 if let Some(value) = value.strip_prefix("0x") {
                     let parsed = u64::from_str_radix(value, 16).map_err(|_| {
                         AmlError::InvalidOperationOnObject { op: Operation::ToInteger, typ: ObjectType::String }

tests/to_integer.asl

@@ -0,0 +1,109 @@
+DefinitionBlock ("", "SSDT", 2, "uTEST", "TESTTABL", 0xF0F0F0F0)
+{
+    Name(FCNT, 0)
+
+    Method (CHEK, 3)
+    {
+        If (Arg0 != Arg1) {
+            FCNT++
+            Printf("On line %o: invalid number %o, expected %o", ToDecimalString(Arg2), ToHexString(Arg0), ToHexString(Arg1))
+        }
+    }
+
+    Method (MAIN, 0, NotSerialized)
+    {
+        Local0 = ToInteger(123)
+        Local1 = 123
+        CHEK(Local0, Local1, __LINE__)
+
+        Local0 = ToInteger("123")
+        Local1 = 123
+        CHEK(Local0, Local1, __LINE__)
+
+        Local0 = ToInteger("       \t\t\t\v       123")
+        Local1 = 123
+        CHEK(Local0, Local1, __LINE__)
+
+        Local0 = ToInteger("123abcd")
+        Local1 = 123
+        CHEK(Local0, Local1, __LINE__)
+
+        Local0 = ToInteger("0x123abcd")
+        Local1 = 0x123abcd
+        CHEK(Local0, Local1, __LINE__)
+
+        Local0 = ToInteger("")
+        Local1 = 0
+        CHEK(Local0, Local1, __LINE__)
+
+        Local0 = ToInteger("0X")
+        Local1 = 0
+        CHEK(Local0, Local1, __LINE__)
+
+        Local0 = ToInteger("0x")
+        Local1 = 0
+        CHEK(Local0, Local1, __LINE__)
+
+        Local0 = ToInteger("0")
+        Local1 = 0
+        CHEK(Local0, Local1, __LINE__)
+
+        Local0 = ToInteger("0xDeAdBeeF")
+        Local1 = 0xDEADBEEF
+        CHEK(Local0, Local1, __LINE__)
+
+        Local0 = ToInteger("0XDeAdBeeFCafeBabeHelloWorld")
+        Local1 = 0xDEADBEEFCAFEBABE
+        CHEK(Local0, Local1, __LINE__)
+
+        Local0 = ToInteger(Buffer { 0xDE, 0xAD, 0xBE, 0xEF })
+        Local1 = 0xEFBEADDE
+        CHEK(Local0, Local1, __LINE__)
+
+        Local0 = ToInteger(Buffer { 1 })
+        Local1 = 1
+        CHEK(Local0, Local1, __LINE__)
+
+        Local0 = ToInteger(Buffer { 0 })
+        Local1 = 0
+        CHEK(Local0, Local1, __LINE__)
+
+        Local0 = ToInteger(Buffer { 0xDE, 0xAD, 0xBE, 0xEF, 0xCA, 0xFE, 0xBA, 0xBE })
+        Local1 = 0xBEBAFECAEFBEADDE
+        CHEK(Local0, Local1, __LINE__)
+
+        // These are incompatible with ACPICA, skip if it's detected
+        // TODO: these currently fail on our interpreter too. Can fix later.
+        /*If (ToHexString(0xF) == "0xF") {
+            Local0 = ToInteger("99999999999999999999999999999999999999999999999")
+            Local1 = 0xFFFFFFFFFFFFFFFF
+            CHEK(Local0, Local1, __LINE__)
+
+            Local0 = ToInteger("0xDEADBEEFCAFEBABE1")
+            Local1 = 0xFFFFFFFFFFFFFFFF
+            CHEK(Local0, Local1, __LINE__)
+
+            Local0 = ToInteger("+123")
+            Local1 = 123
+            CHEK(Local0, Local1, __LINE__)
+
+            Local0 = ToInteger("-123")
+            Local1 = 0xFFFFFFFFFFFFFF85
+            CHEK(Local0, Local1, __LINE__)
+
+            Local0 = ToInteger("-0xDEADBEF HELLOWORLD")
+            Local1 = 0xFFFFFFFFF2152411
+            CHEK(Local0, Local1, __LINE__)
+
+            Local0 = ToInteger("+0XC0D\t123")
+            Local1 = 0xC0D
+            CHEK(Local0, Local1, __LINE__)
+
+            Local0 = ToInteger("0123")
+            Local1 = 83
+            CHEK(Local0, Local1, __LINE__)
+        }*/
+
+        Return (FCNT)
+    }
+}