ASLTS: Update for ObjectType syntax change.

A method invocation is no longer legal as an argument to ObjectType. This is because the interpreter cannot determine the difference between a simple ObjectType on a method versus a method invocation that is intended to return an object to be typed. This is pending as a change to the ACPI specification.
2025-02-22 16:34:24 +03:00 · 2012-11-26 09:41:27 -08:00 · 2012-11-26 09:41:27 -08:00 · 53f8c132e4
commit 53f8c132e4
parent 59b9a857b8
13 changed files with 71 additions and 54 deletions
--- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0073_ASL/misc.asl
+++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0073_ASL/misc.asl
@ -578,15 +578,17 @@ Method(mZ16, 1)
 		err(arg0, z054, 31, 0, 0, Local0, c010)
 	}

-	Store(ObjectType(m000()), Local0)
-	if (LNotEqual(Local0, c009)) {
-		err(arg0, z054, 32, 0, 0, Local0, c009)
-	}
-
-	Store(ObjectType(m001(123)), Local1)
-	if (LNotEqual(Local1, c009)) {
-		err(arg0, z054, 33, 0, 0, Local1, c009)
-	}
+    /* Nov. 2012: Method invocation as arg to ObjectType is now illegal */
+//
+//	Store(ObjectType(m000()), Local0)
+//	if (LNotEqual(Local0, c009)) {
+//		err(arg0, z054, 32, 0, 0, Local0, c009)
+//	}
+//
+//	Store(ObjectType(m001(123)), Local1)
+//	if (LNotEqual(Local1, c009)) {
+//		err(arg0, z054, 33, 0, 0, Local1, c009)
+//	}
 }

 // Run-method
--- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0073_ASL/misc.old.asl
+++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0073_ASL/misc.old.asl
@ -578,15 +578,17 @@ Method(m116, 1)
 		err(arg0, z054, 31, Local0, c010)
 	}

-	Store(ObjectType(m000()), Local0)
-	if (LNotEqual(Local0, c009)) {
-		err(arg0, z054, 32, Local0, c009)
-	}
-
-	Store(ObjectType(m001(123)), Local1)
-	if (LNotEqual(Local1, c009)) {
-		err(arg0, z054, 33, Local1, c009)
-	}
+    /* Nov. 2012: Method invocation as arg to ObjectType is now illegal */
+//
+//	Store(ObjectType(m000()), Local0)
+//	if (LNotEqual(Local0, c009)) {
+//		err(arg0, z054, 32, Local0, c009)
+//	}
+//
+//	Store(ObjectType(m001(123)), Local1)
+//	if (LNotEqual(Local1, c009)) {
+//		err(arg0, z054, 33, Local1, c009)
+//	}
 }

 // Run-method
--- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0081/DECL.asl
+++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0081/DECL.asl
@ -55,13 +55,15 @@
 			err("", zFFF, 0x000, 0, 0, Local0, c010)
 		}

-		Store(ObjectType(me31()), Local0)
-		if (LNotEqual(Local0, c009)) {
-			err("", zFFF, 0x001, 0, 0, Local0, c009)
-		}
-
-		Store(ObjectType(me32("String")), Local0)
-		if (LNotEqual(Local0, c00a)) {
-			err("", zFFF, 0x002, 0, 0, Local0, c00a)
-		}
+    /* Nov. 2012: Method invocation as arg to ObjectType is now illegal */
+//
+//		Store(ObjectType(me31()), Local0)
+//		if (LNotEqual(Local0, c009)) {
+//			err("", zFFF, 0x001, 0, 0, Local0, c009)
+//		}
+//
+//		Store(ObjectType(me32("String")), Local0)
+//		if (LNotEqual(Local0, c00a)) {
+//			err("", zFFF, 0x002, 0, 0, Local0, c00a)
+//		}
 	}
--- a/tests/aslts/src/runtime/collections/complex/misc/misc.asl
+++ b/tests/aslts/src/runtime/collections/complex/misc/misc.asl
@ -803,6 +803,8 @@ Method(m124, 1)
 	 * Removed, invalid test.
 	 * Compiler disallow method invocation as an operand to ObjectType.
 	 */
+    /* Nov. 2012: Method invocation as arg to ObjectType is now illegal */
+
 	//Store(ObjectType(m000()), Local0)
 	//if (LNotEqual(Local0, c009)) {
 	//	err(arg0, z054, 44, 0, 0, Local0, c009)
--- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_04_pckg.asl
+++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_04_pckg.asl
@ -2857,9 +2857,10 @@ Method(m4b4, 1)
 		CH06(arg0, 13, 47)

 		// ObjectType
-
-		ObjectType(m000())
-		CH03(ts, z096, 63, 0, 0)
+        /* Nov. 2012: Method invocation as arg to ObjectType is now illegal */
+//
+//		ObjectType(m000())
+//		CH03(ts, z096, 63, 0, 0)

 		// RefOf

--- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_06_dev.asl
+++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_06_dev.asl
@ -1139,9 +1139,10 @@ Method(m4b6)
 		CH06(arg0, 13, 47)

 		// ObjectType
-
-		ObjectType(m000())
-		CH03(ts, z098, 8, 0, 0)
+        /* Nov. 2012: Method invocation as arg to ObjectType is now illegal */
+//
+//		ObjectType(m000())
+//		CH03(ts, z098, 8, 0, 0)

 		// RefOf

--- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_07_event.asl
+++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_07_event.asl
@ -1135,9 +1135,10 @@ Method(m4b7)
 		CH06(arg0, 13, 47)

 		// ObjectType
-
-		ObjectType(m000())
-		CH03(ts, z099, 8, 0, 0)
+        /* Nov. 2012: Method invocation as arg to ObjectType is now illegal */
+//
+//		ObjectType(m000())
+//		CH03(ts, z099, 8, 0, 0)

 		// RefOf

--- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_08_method.asl
+++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_08_method.asl
@ -1135,9 +1135,10 @@ Method(m4b8)
 		CH06(arg0, 13, 47)

 		// ObjectType
-
-		ObjectType(m000())
-		CH03(ts, z100, 8, 0, 0)
+        /* Nov. 2012: Method invocation as arg to ObjectType is now illegal */
+//
+//		ObjectType(m000())
+//		CH03(ts, z100, 8, 0, 0)

 		// RefOf

--- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_09_mux.asl
+++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_09_mux.asl
@ -1135,9 +1135,10 @@ Method(m4b9)
 		CH06(arg0, 13, 47)

 		// ObjectType
-
-		ObjectType(m000())
-		CH03(ts, z101, 8, 0, 0)
+        /* Nov. 2012: Method invocation as arg to ObjectType is now illegal */
+//
+//		ObjectType(m000())
+//		CH03(ts, z101, 8, 0, 0)

 		// RefOf

--- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_10_oreg.asl
+++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_10_oreg.asl
@ -1131,9 +1131,10 @@ Method(m4ba)
 		CH06(arg0, 13, 47)

 		// ObjectType
-
-		ObjectType(m000())
-		CH03(ts, z102, 8, 0, 0)
+        /* Nov. 2012: Method invocation as arg to ObjectType is now illegal */
+//
+//		ObjectType(m000())
+//		CH03(ts, z102, 8, 0, 0)

 		// RefOf

--- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_11_pwr.asl
+++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_11_pwr.asl
@ -1135,9 +1135,10 @@ Method(m4bb)
 		CH06(arg0, 13, 47)

 		// ObjectType
-
-		ObjectType(m000())
-		CH03(ts, z103, 8, 0, 0)
+        /* Nov. 2012: Method invocation as arg to ObjectType is now illegal */
+//
+//		ObjectType(m000())
+//		CH03(ts, z103, 8, 0, 0)

 		// RefOf

--- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_12_proc.asl
+++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_12_proc.asl
@ -1135,9 +1135,10 @@ Method(m4bc)
 		CH06(arg0, 13, 47)

 		// ObjectType
-
-		ObjectType(m000())
-		CH03(ts, z104, 8, 0, 0)
+        /* Nov. 2012: Method invocation as arg to ObjectType is now illegal */
+//
+//		ObjectType(m000())
+//		CH03(ts, z104, 8, 0, 0)

 		// RefOf

--- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_13_tzone.asl
+++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_13_tzone.asl
@ -1139,9 +1139,10 @@ Method(m4bd)
 		CH06(arg0, 13, 47)

 		// ObjectType
-
-		ObjectType(m000())
-		CH03(ts, z105, 8, 0, 0)
+        /* Nov. 2012: Method invocation as arg to ObjectType is now illegal */
+//
+//		ObjectType(m000())
+//		CH03(ts, z105, 8, 0, 0)

 		// RefOf