Tests: Fix some ASL generation warnings for ASLTS.

Fix some warnings related to the use of Switch().

4 files changed, 56 insertions, 56 deletions

diff --git a/tests/aslts/src/runtime/collections/complex/result/common/rcommon.asl b/tests/aslts/src/runtime/collections/complex/result/common/rcommon.asl
index b7afdca7e..948ce92e0 100644
--- a/tests/aslts/src/runtime/collections/complex/result/common/rcommon.asl
+++ b/tests/aslts/src/runtime/collections/complex/result/common/rcommon.asl
@@ -345,11 +345,11 @@ Method(m681, 2)
 
 // Return the value of an Auxiliary Source Named Object
 // m682(<type>, <index>)
-Method(m682, 2)
+Method(m682, 2, Serialized)
 {
-	Switch(arg0) {
+	Switch(ToInteger(arg0)) {
 		Case(1) {
-			Switch(arg1) {
+			Switch(ToInteger(arg1)) {
 				Case(0) {Return (i6e0)}
 				Case(1) {Return (i6e1)}
 				Case(2) {Return (i6e2)}
@@ -363,7 +363,7 @@ Method(m682, 2)
 			}
 		}
 		Case(2) {
-			Switch(arg1) {
+			Switch(ToInteger(arg1)) {
 				Case(0) {Return (s6e0)}
 				Case(1) {Return (s6e1)}
 				Case(2) {Return (s6e2)}
@@ -377,7 +377,7 @@ Method(m682, 2)
 			}
 		}
 		Case(3) {
-			Switch(arg1) {
+			Switch(ToInteger(arg1)) {
 				Case(0) {Return (b6e0)}
 				Case(1) {Return (b6e1)}
 				Case(2) {Return (b6e2)}
@@ -1035,9 +1035,9 @@ if (y361) {
 	}
 
 	// Prepare Target of specified type
-	Method(m003, 4)
+	Method(m003, 4, Serialized)
 	{
-		Switch(arg1) {
+		Switch(ToInteger(arg1)) {
 			Case(0) {	// Only check
 			}
 			Case(1) {
@@ -1125,9 +1125,9 @@ if (y361) {
 	}
 
 	// Prepare Source of specified type
-	Method(m004, 4)
+	Method(m004, 4, Serialized)
 	{
-		Switch(arg1) {
+		Switch(ToInteger(arg1)) {
 			Case(0) {
 			}
 			Case(1) {
@@ -1233,7 +1233,7 @@ if (y361) {
 	// Check Source Object type is not corrupted after storing,
 	// for the computational data types verify its value against
 	// the Object-initializer value
-	Method(m005, 4)
+	Method(m005, 4, Serialized)
 	{
 		Name(MMM2, 0) // An auxiliary Object to invoke Method
 
@@ -1256,7 +1256,7 @@ if (y361) {
 			Return (1)
 		}
 
-		Switch(arg1) {
+		Switch(ToInteger(arg1)) {
 			Case(0) {
 				Return (0)
 			}
@@ -1332,7 +1332,7 @@ if (y361) {
 			Return (1)
 		} else {
 			// Check equality of the Source value to the Object-initializer one
-			Switch(arg1) {
+			Switch(ToInteger(arg1)) {
 				Case(1) {
 					if (LNotEqual(INT0, Derefof(arg3))) {
 						err(arg0, z122, 14, 0, 0, INT0, Derefof(arg3))
@@ -3150,9 +3150,9 @@ if (y361) {
 	}
 
 	// Prepare Target as Package Element of specified type
-	Method(m013, 4)
+	Method(m013, 4, Serialized)
 	{
-		Switch(arg1) {
+		Switch(ToInteger(arg1)) {
 			Case(0) {	// Only check
 			}
 			Case(1) {
@@ -3212,7 +3212,7 @@ if (y361) {
 	// Check Target Object type is not corrupted after storing,
 	// for the computational data types verify its value against
 	// the Object-initializer value
-	Method(m015, 4)
+	Method(m015, 4, Serialized)
 	{
 		Name(MMM2, 0) // An auxiliary Object to invoke Method
 
@@ -3234,7 +3234,7 @@ if (y361) {
 			}
 		}
 
-		Switch(arg1) {
+		Switch(ToInteger(arg1)) {
 			Case(0) {
 				Return (0)
 			}
@@ -3304,7 +3304,7 @@ if (y361) {
 			Return (1)
 		} else {
 			// Check equality of the Source value to the Object-initializer one
-			Switch(arg1) {
+			Switch(ToInteger(arg1)) {
 				Case(1) {
 					if (LNotEqual(INT1, Derefof(arg3))) {
 						err(arg0, z122, 106, 0, 0, INT1, Derefof(arg3))
@@ -3414,9 +3414,9 @@ if (y361) {
 	// Check auxiliary Target Named Object type is not corrupted,
 	// for the computational data types verify its value against
 	// the Object-initializer value
-	Method(m016, 4)
+	Method(m016, 4, Serialized)
 	{
-		Switch(arg1) {
+		Switch(ToInteger(arg1)) {
 			Case(0) {
 				Return (0)
 			}
@@ -3486,7 +3486,7 @@ if (y361) {
 			Return (1)
 		} else {
 			// Check equality of the Source value to the Object-initializer one
-			Switch(arg1) {
+			Switch(ToInteger(arg1)) {
 				Case(1) {
 					if (LNotEqual(INT1, Derefof(arg3))) {
 						err(arg0, z122, 124, 0, 0, INT1, Derefof(arg3))
diff --git a/tests/aslts/src/runtime/collections/complex/result/tests/rexplicitconv/rexplicitconv.asl b/tests/aslts/src/runtime/collections/complex/result/tests/rexplicitconv/rexplicitconv.asl
index fb3b4e018..0e3ef8fb1 100644
--- a/tests/aslts/src/runtime/collections/complex/result/tests/rexplicitconv/rexplicitconv.asl
+++ b/tests/aslts/src/runtime/collections/complex/result/tests/rexplicitconv/rexplicitconv.asl
@@ -239,7 +239,7 @@ Method(m693, 5)
 	}
 
 	// Prepare Target of specified type
-	Method(m003, 4)
+	Method(m003, 4, Serialized)
 	{
 		Switch(ToInteger(arg1)) {
 			Case(0) {	// Only check
@@ -324,7 +324,7 @@ Method(m693, 5)
 	}
 
 	// Prepare Source of specified type
-	Method(m004, 4)
+	Method(m004, 4, Serialized)
 	{
 		Switch(ToInteger(arg1)) {
 			Case(1) {
@@ -367,7 +367,7 @@ Method(m693, 5)
 	// Check Source Object type is not corrupted after storing,
 	// for the computational data types verify its value against
 	// the Object-initializer value
-	Method(m005, 4)
+	Method(m005, 4, Serialized)
 	{
 		Store(ObjectType(arg2), Local0)
 		if (LNotEqual(Local0, arg1)) {
@@ -509,7 +509,7 @@ Method(m693, 5)
 	// on immediate storing to a Target Named Object of the specified type
 	// m008(<msg>, <aux>, <target type>, <source type>,
 	//      <op>, <exc. condition>, <test data package>)
-	Method(m008, 7)
+	Method(m008, 7, Serialized)
 	{
 		// Source Named Object
 		Name(SRC0, 0)
@@ -551,7 +551,7 @@ Method(m693, 5)
 		// Use a Source Object to immediately store into the Target
 		if (LEqual(arg2, 5)) {				// Field Unit Target
 			if (LEqual(arg4, 0)) {				// Store
-				Switch(Local6) {
+				Switch(ToInteger(Local6)) {
 					Case(0) {Store(ToInteger(SRC0), FLU1)}
 					Case(1) {Store(ToBCD(SRC0), FLU1)}
 					Case(2) {Store(FromBCD(SRC0), FLU1)}
@@ -561,7 +561,7 @@ Method(m693, 5)
 					Case(6) {Store(ToBuffer(SRC0), FLU1)}
 				}
 			} elseif (LEqual(arg4, 1)) {		// CopyObject
-				Switch(Local6) {
+				Switch(ToInteger(Local6)) {
 					Case(0) {CopyObject(ToInteger(SRC0), FLU1)}
 					Case(1) {CopyObject(ToBCD(SRC0), FLU1)}
 					Case(2) {CopyObject(FromBCD(SRC0), FLU1)}
@@ -571,7 +571,7 @@ Method(m693, 5)
 					Case(6) {CopyObject(ToBuffer(SRC0), FLU1)}
 				}
 			} elseif (LEqual(arg4, 2)) {		// Optional storing
-				Switch(Local6) {
+				Switch(ToInteger(Local6)) {
 					Case(0) {ToInteger(SRC0, FLU1)}
 					Case(1) {ToBCD(SRC0, FLU1)}
 					Case(2) {FromBCD(SRC0, FLU1)}
@@ -587,7 +587,7 @@ Method(m693, 5)
 			}
 		} elseif (LEqual(arg2, 14)) {		// Buffer Field Target
 			if (LEqual(arg4, 0)) {				// Store
-				Switch(Local6) {
+				Switch(ToInteger(Local6)) {
 					Case(0) {Store(ToInteger(SRC0), BFL1)}
 					Case(1) {Store(ToBCD(SRC0), BFL1)}
 					Case(2) {Store(FromBCD(SRC0), BFL1)}
@@ -597,7 +597,7 @@ Method(m693, 5)
 					Case(6) {Store(ToBuffer(SRC0), BFL1)}
 				}
 			} elseif (LEqual(arg4, 1)) {		// CopyObject
-				Switch(Local6) {
+				Switch(ToInteger(Local6)) {
 					Case(0) {CopyObject(ToInteger(SRC0), BFL1)}
 					Case(1) {CopyObject(ToBCD(SRC0), BFL1)}
 					Case(2) {CopyObject(FromBCD(SRC0), BFL1)}
@@ -607,7 +607,7 @@ Method(m693, 5)
 					Case(6) {CopyObject(ToBuffer(SRC0), BFL1)}
 				}
 			} elseif (LEqual(arg4, 2)) {		// Optional storing
-				Switch(Local6) {
+				Switch(ToInteger(Local6)) {
 					Case(0) {ToInteger(SRC0, BFL1)}
 					Case(1) {ToBCD(SRC0, BFL1)}
 					Case(2) {FromBCD(SRC0, BFL1)}
@@ -623,7 +623,7 @@ Method(m693, 5)
 			}
 
 		} elseif (LEqual(arg4, 0)) {		// Store
-			Switch(Local6) {
+			Switch(ToInteger(Local6)) {
 				Case(0) {Store(ToInteger(SRC0), DST0)}
 				Case(1) {Store(ToBCD(SRC0), DST0)}
 				Case(2) {Store(FromBCD(SRC0), DST0)}
@@ -633,7 +633,7 @@ Method(m693, 5)
 				Case(6) {Store(ToBuffer(SRC0), DST0)}
 			}
 		} elseif (LEqual(arg4, 1)) {		// CopyObject
-			Switch(Local6) {
+			Switch(ToInteger(Local6)) {
 				Case(0) {CopyObject(ToInteger(SRC0), DST0)}
 				Case(1) {CopyObject(ToBCD(SRC0), DST0)}
 				Case(2) {CopyObject(FromBCD(SRC0), DST0)}
@@ -643,7 +643,7 @@ Method(m693, 5)
 				Case(6) {CopyObject(ToBuffer(SRC0), DST0)}
 			}
 		} elseif (LEqual(arg4, 2)) {		// Optional storing
-			Switch(Local6) {
+			Switch(ToInteger(Local6)) {
 				Case(0) {ToInteger(SRC0, DST0)}
 				Case(1) {ToBCD(SRC0, DST0)}
 				Case(2) {FromBCD(SRC0, DST0)}
@@ -694,7 +694,7 @@ Method(m693, 5)
 	// on immediate storing to a Target LocalX Object of the specified type
 	// m009(<msg>, <aux>, <target type>, <source type>,
 	//      <op>, <exc. condition>, <test data package>)
-	Method(m009, 7)
+	Method(m009, 7, Serialized)
 	{
 		// Source Named Object
 		Name(SRC0, 0)
@@ -725,7 +725,7 @@ Method(m693, 5)
 
 		// Use a Source Object to immediately store into the Target
 		if (LEqual(arg4, 0)) {				// Store
-			Switch(Local6) {
+			Switch(ToInteger(Local6)) {
 				Case(0) {Store(ToInteger(SRC0), Local4)}
 				Case(1) {Store(ToBCD(SRC0), Local4)}
 				Case(2) {Store(FromBCD(SRC0), Local4)}
@@ -735,7 +735,7 @@ Method(m693, 5)
 				Case(6) {Store(ToBuffer(SRC0), Local4)}
 			}
 		} elseif (LEqual(arg4, 1)) {		// CopyObject
-			Switch(Local6) {
+			Switch(ToInteger(Local6)) {
 				Case(0) {CopyObject(ToInteger(SRC0), Local4)}
 				Case(1) {CopyObject(ToBCD(SRC0), Local4)}
 				Case(2) {CopyObject(FromBCD(SRC0), Local4)}
@@ -745,7 +745,7 @@ Method(m693, 5)
 				Case(6) {CopyObject(ToBuffer(SRC0), Local4)}
 			}
 		} elseif (LEqual(arg4, 2)) {		// Optional storing
-			Switch(Local6) {
+			Switch(ToInteger(Local6)) {
 				Case(0) {ToInteger(SRC0, Local4)}
 				Case(1) {ToBCD(SRC0, Local4)}
 				Case(2) {FromBCD(SRC0, Local4)}
diff --git a/tests/aslts/src/runtime/collections/complex/result/tests/rindecrement/rindecrement.asl b/tests/aslts/src/runtime/collections/complex/result/tests/rindecrement/rindecrement.asl
index 6786d9403..b3a354af4 100644
--- a/tests/aslts/src/runtime/collections/complex/result/tests/rindecrement/rindecrement.asl
+++ b/tests/aslts/src/runtime/collections/complex/result/tests/rindecrement/rindecrement.asl
@@ -221,7 +221,7 @@ Method(m692, 2)
 	}
 
 	// Prepare Source of specified type
-	Method(m004, 3)
+	Method(m004, 3, Serialized)
 	{
 		Switch(ToInteger(arg1)) {
 			Case(0) {
@@ -293,7 +293,7 @@ Method(m692, 2)
 	// Check Target Object to have the expected type and value
 	// m006(<msg>, <ref to target>, <target type>, <source type>,
 	//      <op>, <target save type>)
-	Method(m006, 6)
+	Method(m006, 6, Serialized)
 	{
 		Name(MMM2, 0) // The auxiliary Object to invoke Method
 
diff --git a/tests/aslts/src/runtime/collections/complex/result/tests/roptional/roptional.asl b/tests/aslts/src/runtime/collections/complex/result/tests/roptional/roptional.asl
index 1847f904b..96013c987 100644
--- a/tests/aslts/src/runtime/collections/complex/result/tests/roptional/roptional.asl
+++ b/tests/aslts/src/runtime/collections/complex/result/tests/roptional/roptional.asl
@@ -268,7 +268,7 @@ Method(m694, 5)
 	}
 
 	// Prepare Target of specified type
-	Method(m003, 4)
+	Method(m003, 4, Serialized)
 	{
 		Switch(ToInteger(arg1)) {
 			Case(0) {	// Only check
@@ -358,7 +358,7 @@ Method(m694, 5)
 	}
 
 	// Prepare Source of specified type
-	Method(m004, 4)
+	Method(m004, 4, Serialized)
 	{
 		Switch(ToInteger(arg1)) {
 			Case(1) {
@@ -405,7 +405,7 @@ Method(m694, 5)
 	// Check Source Object type is not corrupted after storing,
 	// for the computational data types verify its value against
 	// the Object-initializer value
-	Method(m005, 4)
+	Method(m005, 4, Serialized)
 	{
 		Store(ObjectType(arg2), Local0)
 		if (LNotEqual(Local0, arg1)) {
@@ -557,7 +557,7 @@ Method(m694, 5)
 	// on immediate storing to a Target Named Object of the specified type
 	// m008(<msg>, <aux>, <target type>, <source type>,
 	//      <op>, <exc. condition>, <test data package>)
-	Method(m008, 7)
+	Method(m008, 7, Serialized)
 	{
 		// Source Named Object
 		Name(SRC0, 0)
@@ -606,7 +606,7 @@ Method(m694, 5)
 		// Use a Source Object to immediately store into the Target
 		if (LEqual(arg2, 5)) {				// Field Unit Target
 			if (LEqual(arg4, 0)) {				// Store
-				Switch(Local6) {
+				Switch(ToInteger(Local6)) {
 					Case(0) {Store(FindSetLeftBit(SRC0), FLU1)}
 					Case(1) {Store(FindSetRightBit(SRC0), FLU1)}
 					Case(2) {Store(Not(SRC0), FLU1)}
@@ -628,7 +628,7 @@ Method(m694, 5)
 					Case(18) {Store(Mid(SRC0, 0, Ones), FLU1)}
 				}
 			} elseif (LEqual(arg4, 1)) {		// CopyObject
-				Switch(Local6) {
+				Switch(ToInteger(Local6)) {
 					Case(0) {CopyObject(FindSetLeftBit(SRC0), FLU1)}
 					Case(1) {CopyObject(FindSetRightBit(SRC0), FLU1)}
 					Case(2) {CopyObject(Not(SRC0), FLU1)}
@@ -650,7 +650,7 @@ Method(m694, 5)
 					Case(18) {CopyObject(Mid(SRC0, 0, Ones), FLU1)}
 				}
 			} elseif (LEqual(arg4, 2)) {		// Optional storing
-				Switch(Local6) {
+				Switch(ToInteger(Local6)) {
 					Case(0) {FindSetLeftBit(SRC0, FLU1)}
 					Case(1) {FindSetRightBit(SRC0, FLU1)}
 					Case(2) {Not(SRC0, FLU1)}
@@ -678,7 +678,7 @@ Method(m694, 5)
 			}
 		} elseif (LEqual(arg2, 14)) {		// Buffer Field Target
 			if (LEqual(arg4, 0)) {				// Store
-				Switch(Local6) {
+				Switch(ToInteger(Local6)) {
 					Case(0) {Store(FindSetLeftBit(SRC0), BFL1)}
 					Case(1) {Store(FindSetRightBit(SRC0), BFL1)}
 					Case(2) {Store(Not(SRC0), BFL1)}
@@ -700,7 +700,7 @@ Method(m694, 5)
 					Case(18) {Store(Mid(SRC0, 0, Ones), BFL1)}
 				}
 			} elseif (LEqual(arg4, 1)) {		// CopyObject
-				Switch(Local6) {
+				Switch(ToInteger(Local6)) {
 					Case(0) {CopyObject(FindSetLeftBit(SRC0), BFL1)}
 					Case(1) {CopyObject(FindSetRightBit(SRC0), BFL1)}
 					Case(2) {CopyObject(Not(SRC0), BFL1)}
@@ -722,7 +722,7 @@ Method(m694, 5)
 					Case(18) {CopyObject(Mid(SRC0, 0, Ones), BFL1)}
 				}
 			} elseif (LEqual(arg4, 2)) {		// Optional storing
-				Switch(Local6) {
+				Switch(ToInteger(Local6)) {
 					Case(0) {FindSetLeftBit(SRC0, BFL1)}
 					Case(1) {FindSetRightBit(SRC0, BFL1)}
 					Case(2) {Not(SRC0, BFL1)}
@@ -750,7 +750,7 @@ Method(m694, 5)
 			}
 
 		} elseif (LEqual(arg4, 0)) {		// Store
-			Switch(Local6) {
+			Switch(ToInteger(Local6)) {
 				Case(0) {Store(FindSetLeftBit(SRC0), DST0)}
 				Case(1) {Store(FindSetRightBit(SRC0), DST0)}
 				Case(2) {Store(Not(SRC0), DST0)}
@@ -772,7 +772,7 @@ Method(m694, 5)
 				Case(18) {Store(Mid(SRC0, 0, Ones), DST0)}
 			}
 		} elseif (LEqual(arg4, 1)) {		// CopyObject
-			Switch(Local6) {
+			Switch(ToInteger(Local6)) {
 				Case(0) {CopyObject(FindSetLeftBit(SRC0), DST0)}
 				Case(1) {CopyObject(FindSetRightBit(SRC0), DST0)}
 				Case(2) {CopyObject(Not(SRC0), DST0)}
@@ -794,7 +794,7 @@ Method(m694, 5)
 				Case(18) {CopyObject(Mid(SRC0, 0, Ones), DST0)}
 			}
 		} elseif (LEqual(arg4, 2)) {		// Optional storing
-			Switch(Local6) {
+			Switch(ToInteger(Local6)) {
 				Case(0) {FindSetLeftBit(SRC0, DST0)}
 				Case(1) {FindSetRightBit(SRC0, DST0)}
 				Case(2) {Not(SRC0, DST0)}
@@ -854,7 +854,7 @@ Method(m694, 5)
 	// on immediate storing to a Target LocalX Object of the specified type
 	// m009(<msg>, <aux>, <target type>, <source type>,
 	//      <op>, <exc. condition>, <test data package>)
-	Method(m009, 7)
+	Method(m009, 7, Serialized)
 	{
 		// Source Named Object
 		Name(SRC0, 0)
@@ -885,7 +885,7 @@ Method(m694, 5)
 
 		// Use a Source Object to immediately store into the Target
 		if (LEqual(arg4, 0)) {		// Store
-			Switch(Local6) {
+			Switch(ToInteger(Local6)) {
 				Case(0) {Store(FindSetLeftBit(SRC0), Local4)}
 				Case(1) {Store(FindSetRightBit(SRC0), Local4)}
 				Case(2) {Store(Not(SRC0), Local4)}
@@ -907,7 +907,7 @@ Method(m694, 5)
 				Case(18) {Store(Mid(SRC0, 0, Ones), Local4)}
 			}
 		} elseif (LEqual(arg4, 1)) {		// CopyObject
-			Switch(Local6) {
+			Switch(ToInteger(Local6)) {
 				Case(0) {CopyObject(FindSetLeftBit(SRC0), Local4)}
 				Case(1) {CopyObject(FindSetRightBit(SRC0), Local4)}
 				Case(2) {CopyObject(Not(SRC0), Local4)}
@@ -929,7 +929,7 @@ Method(m694, 5)
 				Case(18) {CopyObject(Mid(SRC0, 0, Ones), Local4)}
 			}
 		} elseif (LEqual(arg4, 2)) {		// Optional storing
-			Switch(Local6) {
+			Switch(ToInteger(Local6)) {
 				Case(0) {FindSetLeftBit(SRC0, Local4)}
 				Case(1) {FindSetRightBit(SRC0, Local4)}
 				Case(2) {Not(SRC0, Local4)}