Tests/ASLTS: Reduce warnings related to use of Switch().

Serialize methods that use Switch(), use ToInteger where appropriate.

16 files changed, 138 insertions, 138 deletions

diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0005/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0005/DECL.asl
index 754946ec4..c38cedafc 100644
--- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0005/DECL.asl
+++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0005/DECL.asl
@@ -34,11 +34,11 @@
  * Default is not yet implemented at all.
  */
 
-Method(mda1, 1)
+Method(mda1, 1, Serialized)
 {
 	Store(0, Local7)
 
-	Switch (Arg0) {
+	Switch (ToInteger (Arg0)) {
 		Case (5) {
 			Store(0x1234, Local7)
 		}
diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0029/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0029/DECL.asl
index db451a4d1..2db0bccb5 100644
--- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0029/DECL.asl
+++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0029/DECL.asl
@@ -32,9 +32,9 @@
  * SUMMARY: Looks, like Sleep (or Wait) spend less time than specified
  */
 
-Method(mdbf, 2)
+Method(mdbf, 2, Serialized)
 {
-	Switch (arg0) {
+	Switch (ToInteger (arg0)) {
 	case (0) {
 		Store(Timer, Local1)
 		Sleep(arg1)
diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0075/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0075/DECL.asl
index 98b828a3a..5ebdb1058 100644
--- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0075/DECL.asl
+++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0075/DECL.asl
@@ -34,141 +34,141 @@
  * Compiler should return an error...
  */
 
-	Method(me0c, 1)
+	Method(me0c, 1, Serialized)
 	{
 		Store(0x100, Local0)
 
-		Switch (arg0) {
+		Switch (ToInteger (arg0)) {
 			Case (1) {
 				Store(1, Local0)
 			}
 		}
-		Switch (arg0) {
+		Switch (ToInteger (arg0)) {
 			Case (2) {
 				Store(2, Local0)
 			}
 		}
-		Switch (arg0) {
+		Switch (ToInteger (arg0)) {
 			Case (3) {
 				Store(3, Local0)
 			}
 		}
-		Switch (arg0) {
+		Switch (ToInteger (arg0)) {
 			Case (4) {
 				Store(4, Local0)
 			}
 		}
-		Switch (arg0) {
+		Switch (ToInteger (arg0)) {
 			Case (5) {
 				Store(5, Local0)
 			}
 		}
-		Switch (arg0) {
+		Switch (ToInteger (arg0)) {
 			Case (6) {
 				Store(6, Local0)
 			}
 		}
-		Switch (arg0) {
+		Switch (ToInteger (arg0)) {
 			Case (7) {
 				Store(7, Local0)
 			}
 		}
-		Switch (arg0) {
+		Switch (ToInteger (arg0)) {
 			Case (8) {
 				Store(8, Local0)
 			}
 		}
-		Switch (arg0) {
+		Switch (ToInteger (arg0)) {
 			Case (9) {
 				Store(9, Local0)
 			}
 		}
-		Switch (arg0) {
+		Switch (ToInteger (arg0)) {
 			Case (10) {
 				Store(10, Local0)
 			}
 		}
-		Switch (arg0) {
+		Switch (ToInteger (arg0)) {
 			Case (11) {
 				Store(11, Local0)
 			}
 		}
-		Switch (arg0) {
+		Switch (ToInteger (arg0)) {
 			Case (12) {
 				Store(12, Local0)
 			}
 		}
-		Switch (arg0) {
+		Switch (ToInteger (arg0)) {
 			Case (13) {
 				Store(13, Local0)
 			}
 		}
-		Switch (arg0) {
+		Switch (ToInteger (arg0)) {
 			Case (14) {
 				Store(14, Local0)
 			}
 		}
-		Switch (arg0) {
+		Switch (ToInteger (arg0)) {
 			Case (15) {
 				Store(15, Local0)
 			}
 		}
-		Switch (arg0) {
+		Switch (ToInteger (arg0)) {
 			Case (16) {
 				Store(16, Local0)
 			}
 		}
-		Switch (arg0) {
+		Switch (ToInteger (arg0)) {
 			Case (17) {
 				Store(17, Local0)
 			}
 		}
-		Switch (arg0) {
+		Switch (ToInteger (arg0)) {
 			Case (18) {
 				Store(18, Local0)
 			}
 		}
-		Switch (arg0) {
+		Switch (ToInteger (arg0)) {
 			Case (19) {
 				Store(19, Local0)
 			}
 		}
-		Switch (arg0) {
+		Switch (ToInteger (arg0)) {
 			Case (20) {
 				Store(20, Local0)
 			}
 		}
-		Switch (arg0) {
+		Switch (ToInteger (arg0)) {
 			Case (21) {
 				Store(21, Local0)
 			}
 		}
-		Switch (arg0) {
+		Switch (ToInteger (arg0)) {
 			Case (22) {
 				Store(22, Local0)
 			}
 		}
-		Switch (arg0) {
+		Switch (ToInteger (arg0)) {
 			Case (23) {
 				Store(23, Local0)
 			}
 		}
-		Switch (arg0) {
+		Switch (ToInteger (arg0)) {
 			Case (24) {
 				Store(24, Local0)
 			}
 		}
-		Switch (arg0) {
+		Switch (ToInteger (arg0)) {
 			Case (25) {
 				Store(25, Local0)
 			}
 		}
-		Switch (arg0) {
+		Switch (ToInteger (arg0)) {
 			Case (26) {
 				Store(26, Local0)
 			}
 		}
-		Switch (arg0) {
+		Switch (ToInteger (arg0)) {
 			Case (27) {
 				Store(27, Local0)
 			}
@@ -195,11 +195,11 @@
 
 	// //////////////////////
 
-	Method(me0e, 1)
+	Method(me0e, 1, Serialized)
 	{
 		Store(0x100, Local0)
 
-		Switch (arg0) {
+		Switch (ToInteger (arg0)) {
 			Case (1) {
 				Store(1, Local0)
 			}
@@ -208,11 +208,11 @@
 		return (Local0)
 	}
 
-	Method(me0f, 1)
+	Method(me0f, 1, Serialized)
 	{
 		Store(0x100, Local0)
 
-		Switch (arg0) {
+		Switch (ToInteger (arg0)) {
 			Case (2) {
 				Store(2, Local0)
 			}
@@ -221,11 +221,11 @@
 		return (Local0)
 	}
 
-	Method(me10, 1)
+	Method(me10, 1, Serialized)
 	{
 		Store(0x100, Local0)
 
-		Switch (arg0) {
+		Switch (ToInteger (arg0)) {
 			Case (3) {
 				Store(3, Local0)
 			}
@@ -234,11 +234,11 @@
 		return (Local0)
 	}
 
-	Method(me11, 1)
+	Method(me11, 1, Serialized)
 	{
 		Store(0x100, Local0)
 
-		Switch (arg0) {
+		Switch (ToInteger (arg0)) {
 			Case (4) {
 				Store(4, Local0)
 			}
@@ -247,11 +247,11 @@
 		return (Local0)
 	}
 
-	Method(me12, 1)
+	Method(me12, 1, Serialized)
 	{
 		Store(0x100, Local0)
 
-		Switch (arg0) {
+		Switch (ToInteger (arg0)) {
 			Case (5) {
 				Store(5, Local0)
 			}
@@ -260,11 +260,11 @@
 		return (Local0)
 	}
 
-	Method(me13, 1)
+	Method(me13, 1, Serialized)
 	{
 		Store(0x100, Local0)
 
-		Switch (arg0) {
+		Switch (ToInteger (arg0)) {
 			Case (6) {
 				Store(6, Local0)
 			}
@@ -273,11 +273,11 @@
 		return (Local0)
 	}
 
-	Method(me14, 1)
+	Method(me14, 1, Serialized)
 	{
 		Store(0x100, Local0)
 
-		Switch (arg0) {
+		Switch (ToInteger (arg0)) {
 			Case (7) {
 				Store(7, Local0)
 			}
@@ -286,11 +286,11 @@
 		return (Local0)
 	}
 
-	Method(me15, 1)
+	Method(me15, 1, Serialized)
 	{
 		Store(0x100, Local0)
 
-		Switch (arg0) {
+		Switch (ToInteger (arg0)) {
 			Case (8) {
 				Store(8, Local0)
 			}
@@ -299,11 +299,11 @@
 		return (Local0)
 	}
 
-	Method(me16, 1)
+	Method(me16, 1, Serialized)
 	{
 		Store(0x100, Local0)
 
-		Switch (arg0) {
+		Switch (ToInteger (arg0)) {
 			Case (9) {
 				Store(9, Local0)
 			}
@@ -312,11 +312,11 @@
 		return (Local0)
 	}
 
-	Method(me17, 1)
+	Method(me17, 1, Serialized)
 	{
 		Store(0x100, Local0)
 
-		Switch (arg0) {
+		Switch (ToInteger (arg0)) {
 			Case (10) {
 				Store(10, Local0)
 			}
@@ -325,11 +325,11 @@
 		return (Local0)
 	}
 
-	Method(me18, 1)
+	Method(me18, 1, Serialized)
 	{
 		Store(0x100, Local0)
 
-		Switch (arg0) {
+		Switch (ToInteger (arg0)) {
 			Case (11) {
 				Store(11, Local0)
 			}
@@ -338,11 +338,11 @@
 		return (Local0)
 	}
 
-	Method(me19, 1)
+	Method(me19, 1, Serialized)
 	{
 		Store(0x100, Local0)
 
-		Switch (arg0) {
+		Switch (ToInteger (arg0)) {
 			Case (12) {
 				Store(12, Local0)
 			}
@@ -351,11 +351,11 @@
 		return (Local0)
 	}
 
-	Method(me1a, 1)
+	Method(me1a, 1, Serialized)
 	{
 		Store(0x100, Local0)
 
-		Switch (arg0) {
+		Switch (ToInteger (arg0)) {
 			Case (13) {
 				Store(13, Local0)
 			}
@@ -364,11 +364,11 @@
 		return (Local0)
 	}
 
-	Method(me1b, 1)
+	Method(me1b, 1, Serialized)
 	{
 		Store(0x100, Local0)
 
-		Switch (arg0) {
+		Switch (ToInteger (arg0)) {
 			Case (14) {
 				Store(14, Local0)
 			}
@@ -377,11 +377,11 @@
 		return (Local0)
 	}
 
-	Method(me1c, 1)
+	Method(me1c, 1, Serialized)
 	{
 		Store(0x100, Local0)
 
-		Switch (arg0) {
+		Switch (ToInteger (arg0)) {
 			Case (15) {
 				Store(15, Local0)
 			}
@@ -390,11 +390,11 @@
 		return (Local0)
 	}
 
-	Method(me1d, 1)
+	Method(me1d, 1, Serialized)
 	{
 		Store(0x100, Local0)
 
-		Switch (arg0) {
+		Switch (ToInteger (arg0)) {
 			Case (16) {
 				Store(16, Local0)
 			}
@@ -403,11 +403,11 @@
 		return (Local0)
 	}
 
-	Method(me1e, 1)
+	Method(me1e, 1, Serialized)
 	{
 		Store(0x100, Local0)
 
-		Switch (arg0) {
+		Switch (ToInteger (arg0)) {
 			Case (17) {
 				Store(17, Local0)
 			}
@@ -416,11 +416,11 @@
 		return (Local0)
 	}
 
-	Method(me1f, 1)
+	Method(me1f, 1, Serialized)
 	{
 		Store(0x100, Local0)
 
-		Switch (arg0) {
+		Switch (ToInteger (arg0)) {
 			Case (18) {
 				Store(18, Local0)
 			}
@@ -429,11 +429,11 @@
 		return (Local0)
 	}
 
-	Method(me20, 1)
+	Method(me20, 1, Serialized)
 	{
 		Store(0x100, Local0)
 
-		Switch (arg0) {
+		Switch (ToInteger (arg0)) {
 			Case (19) {
 				Store(19, Local0)
 			}
@@ -442,11 +442,11 @@
 		return (Local0)
 	}
 
-	Method(me21, 1)
+	Method(me21, 1, Serialized)
 	{
 		Store(0x100, Local0)
 
-		Switch (arg0) {
+		Switch (ToInteger (arg0)) {
 			Case (20) {
 				Store(20, Local0)
 			}
@@ -455,11 +455,11 @@
 		return (Local0)
 	}
 
-	Method(me22, 1)
+	Method(me22, 1, Serialized)
 	{
 		Store(0x100, Local0)
 
-		Switch (arg0) {
+		Switch (ToInteger (arg0)) {
 			Case (21) {
 				Store(21, Local0)
 			}
@@ -468,11 +468,11 @@
 		return (Local0)
 	}
 
-	Method(me23, 1)
+	Method(me23, 1, Serialized)
 	{
 		Store(0x100, Local0)
 
-		Switch (arg0) {
+		Switch (ToInteger (arg0)) {
 			Case (22) {
 				Store(22, Local0)
 			}
@@ -481,11 +481,11 @@
 		return (Local0)
 	}
 
-	Method(me24, 1)
+	Method(me24, 1, Serialized)
 	{
 		Store(0x100, Local0)
 
-		Switch (arg0) {
+		Switch (ToInteger (arg0)) {
 			Case (23) {
 				Store(23, Local0)
 			}
@@ -494,11 +494,11 @@
 		return (Local0)
 	}
 
-	Method(me25, 1)
+	Method(me25, 1, Serialized)
 	{
 		Store(0x100, Local0)
 
-		Switch (arg0) {
+		Switch (ToInteger (arg0)) {
 			Case (24) {
 				Store(24, Local0)
 			}
@@ -507,11 +507,11 @@
 		return (Local0)
 	}
 
-	Method(me26, 1)
+	Method(me26, 1, Serialized)
 	{
 		Store(0x100, Local0)
 
-		Switch (arg0) {
+		Switch (ToInteger (arg0)) {
 			Case (25) {
 				Store(25, Local0)
 			}
@@ -520,11 +520,11 @@
 		return (Local0)
 	}
 
-	Method(me27, 1)
+	Method(me27, 1, Serialized)
 	{
 		Store(0x100, Local0)
 
-		Switch (arg0) {
+		Switch (ToInteger (arg0)) {
 			Case (26) {
 				Store(26, Local0)
 			}
@@ -533,11 +533,11 @@
 		return (Local0)
 	}
 
-	Method(me28, 1)
+	Method(me28, 1, Serialized)
 	{
 		Store(0x100, Local0)
 
-		Switch (arg0) {
+		Switch (ToInteger (arg0)) {
 			Case (27) {
 				Store(27, Local0)
 			}
diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0087/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0087/DECL.asl
index 1c3f55594..e58a513bf 100644
--- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0087/DECL.asl
+++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0087/DECL.asl
@@ -32,7 +32,7 @@
  * SUMMARY: Exception on Switch operator applied to the result of ToBuffer operator
  */
 
-	Method(me3c)
+	Method(me3c, 0, Serialized)
 	{
 		Name(b000, Buffer(1){10})
 		Name(s000, "qwrtyuiop")
diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0088/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0088/DECL.asl
index 1a5bef9c6..ca449ac1f 100644
--- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0088/DECL.asl
+++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0088/DECL.asl
@@ -32,7 +32,7 @@
  * SUMMARY: Spec of Match operator should be changed (conversion/null package entries)
  */
 
-	Method(me3d, 1)
+	Method(me3d, 1, Serialized)
 	{
 		Store(0, Local0)
 
@@ -50,7 +50,7 @@
 		}
 	}
 
-	Method(me3e, 1)
+	Method(me3e, 1, Serialized)
 	{
 		Store(0, Local0)
 
diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0098/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0098/DECL.asl
index 3f08a644f..5e2722fe9 100644
--- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0098/DECL.asl
+++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0098/DECL.asl
@@ -77,7 +77,7 @@
 
 	// Arg0 - the type of object
 	// (for 8 (- Method) causes crash, Bug 0097)
-	Method(me54, 1)
+	Method(me54, 1, Serialized)
 	{
 		Name(pd02, Package(32) {
 			0,
@@ -87,7 +87,7 @@
 
 		Store("============= Test started:", Debug)
 
-		Switch (Arg0) {
+		Switch (ToInteger (Arg0)) {
 		Case (0) {
 			Store("============= Uninitialized:", Debug)
 		}
diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0135/Common.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0135/Common.asl
index c44405ff1..9e5bf7788 100644
--- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0135/Common.asl
+++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0135/Common.asl
@@ -160,14 +160,14 @@ Method(mfcd, 4)
  *
  * arg6 - for auxiliary usage
  */
-Method(mfc8, 7)
+Method(mfc8, 7, Serialized)
 {
 	Name(i000, 0)
 	Name(i001, 0)
 
 	While (arg4) {
 
-		Switch (arg5) {
+		Switch (ToInteger (arg5)) {
 
 			/* (none, none) */
 
@@ -354,7 +354,7 @@ Method(mfc9, 5)
  * arg5 - for auxiliary usage (see comment to "additional assignments")
  * arg6 - for auxiliary usage (see comment to "additional assignments")
  */
-Method(mfc6, 7)
+Method(mfc6, 7, Serialized)
 {
 	Name(pr00, 0)
 	Name(num, 0)		// half-size of Package
@@ -426,14 +426,14 @@ Method(mfc6, 7)
 
 	/* Identical calculations for different AR20 below */
 
-	Switch (AR23) {
+	Switch (ToInteger (AR23)) {
 
 
 	Case (0) {
 
 	/* AR23: 0 ( , ) */
 
-	Switch (AR20) {
+	Switch (ToInteger (AR20)) {
 	Case (0) {
 
 		/* 0 - (pd12, pd13) */
@@ -686,7 +686,7 @@ Method(mfc6, 7)
 
 	/* AR23: 1 (Named0, Named1) */
 
-	Switch (AR20) {
+	Switch (ToInteger (AR20)) {
 	Case (0) {
 
 		CopyObject(pd12, nm00)
@@ -827,7 +827,7 @@ Method(mfc6, 7)
 
 	/* AR23: 2 (arg5, Named1) */
 
-	Switch (AR20) {
+	Switch (ToInteger (AR20)) {
 	Case (0) {
 
 		CopyObject(pd12, arg5)
@@ -968,7 +968,7 @@ Method(mfc6, 7)
 
 	/* AR23: 3 (Loc4, Named1) */
 
-	Switch (AR20) {
+	Switch (ToInteger (AR20)) {
 	Case (0) {
 
 		CopyObject(pd12, Local4)
@@ -1109,7 +1109,7 @@ Method(mfc6, 7)
 
 	/* AR23: 4 (Named0, Arg6) */
 
-	Switch (AR20) {
+	Switch (ToInteger (AR20)) {
 	Case (0) {
 
 		CopyObject(pd12, nm00)
@@ -1250,7 +1250,7 @@ Method(mfc6, 7)
 
 	/* AR23: 5 (Arg5, Arg6) */
 
-	Switch (AR20) {
+	Switch (ToInteger (AR20)) {
 	Case (0) {
 
 		CopyObject(pd12, arg5)
@@ -1391,7 +1391,7 @@ Method(mfc6, 7)
 
 	/* AR23: 6 (Loc4, Arg6) */
 
-	Switch (AR20) {
+	Switch (ToInteger (AR20)) {
 	Case (0) {
 
 		CopyObject(pd12, Local4)
@@ -1532,7 +1532,7 @@ Method(mfc6, 7)
 
 	/* AR23: 7 (Named0, Loc5) */
 
-	Switch (AR20) {
+	Switch (ToInteger (AR20)) {
 	Case (0) {
 
 		CopyObject(pd12, nm00)
@@ -1673,7 +1673,7 @@ Method(mfc6, 7)
 
 	/* AR23: 8 (Arg5, Loc5) */
 
-	Switch (AR20) {
+	Switch (ToInteger (AR20)) {
 	Case (0) {
 
 		CopyObject(pd12, arg5)
@@ -1814,7 +1814,7 @@ Method(mfc6, 7)
 
 	/* AR23: 9 (Loc4, Loc5) */
 
-	Switch (AR20) {
+	Switch (ToInteger (AR20)) {
 	Case (0) {
 
 		CopyObject(pd12, Local4)
@@ -1955,7 +1955,7 @@ Method(mfc6, 7)
 
 	/* AR23: 10 (Arg5, Arg5) */
 
-	Switch (AR20) {
+	Switch (ToInteger (AR20)) {
 	Case (0) {
 
 		CopyObject(pd12, arg5)
@@ -2096,7 +2096,7 @@ Method(mfc6, 7)
 
 	/* AR23: 11 (Loc4, Loc4) */
 
-	Switch (AR20) {
+	Switch (ToInteger (AR20)) {
 	Case (0) {
 
 		CopyObject(pd12, Local4)
@@ -2237,7 +2237,7 @@ Method(mfc6, 7)
 
 	/* AR23: 12 (Named0, Named0) */
 
-	Switch (AR20) {
+	Switch (ToInteger (AR20)) {
 	Case (0) {
 
 		CopyObject(pd12, nm00)
@@ -2378,7 +2378,7 @@ Method(mfc6, 7)
 
 	/* AR23: 13 (Named0,  ) */
 
-	Switch (AR20) {
+	Switch (ToInteger (AR20)) {
 	Case (0) {
 
 		/* 0 - (pd12, pd13) */
@@ -2655,7 +2655,7 @@ Method(mfc6, 7)
 
 	/* AR23: 14 (Arg5,  ) */
 
-	Switch (AR20) {
+	Switch (ToInteger (AR20)) {
 	Case (0) {
 
 		/* 0 - (pd12, pd13) */
@@ -2932,7 +2932,7 @@ Method(mfc6, 7)
 
 	/* AR23: 15 (Loc4,  ) */
 
-	Switch (AR20) {
+	Switch (ToInteger (AR20)) {
 	Case (0) {
 
 		/* 0 - (pd12, pd13) */
@@ -3209,7 +3209,7 @@ Method(mfc6, 7)
 
 	/* AR23: 16 (  , Named1) */
 
-	Switch (AR20) {
+	Switch (ToInteger (AR20)) {
 	Case (0) {
 
 		/* 0 - (pd12, pd13) */
@@ -3486,7 +3486,7 @@ Method(mfc6, 7)
 
 	/* AR23: 17 (  , Arg6) */
 
-	Switch (AR20) {
+	Switch (ToInteger (AR20)) {
 	Case (0) {
 
 		/* 0 - (pd12, pd13) */
@@ -3763,7 +3763,7 @@ Method(mfc6, 7)
 
 	/* AR23: 18 (  , Loc5) */
 
-	Switch (AR20) {
+	Switch (ToInteger (AR20)) {
 	Case (0) {
 
 		/* 0 - (pd12, pd13) */
diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0135/PkgsHierarchy.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0135/PkgsHierarchy.asl
index d030eebc0..430437d4e 100644
--- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0135/PkgsHierarchy.asl
+++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0135/PkgsHierarchy.asl
@@ -595,7 +595,7 @@ Method(mfe1, 6)
  * arg3 - start index of location of references in pkg-nodes
  * arg4 - bit-map of operations
  */
-Method(mfe4, 5)
+Method(mfe4, 5, Serialized)
 {
 	Name(lpN0, 0)
 	Name(lpC0, 0)
@@ -622,7 +622,7 @@ Method(mfe4, 5)
 
 	And(arg4, OPFF, op00)
 
-	Switch (op00) {
+	Switch (ToInteger (op00)) {
 	Case (0x02) {
 		/* re-write Integer-IDs */
 		Store(1, wrID)
diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0146/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0146/DECL.asl
index eb3f3a358..bf332fe6c 100644
--- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0146/DECL.asl
+++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0146/DECL.asl
@@ -32,10 +32,10 @@
  * SUMMARY: The ASL compiler refuses Package in Case operator
  */
 
-	Method(mf3a, 1)
+	Method(mf3a, 1, Serialized)
 	{
 		Store(0, Local7)
-		Switch (arg0) {
+		Switch (ToInteger (arg0)) {
 			Case (Package(1) {Buffer(1) {10}}) {
 				Store(0x12389, Local7)
 			}
diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0180_ASL_RUNTIME/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0180_ASL_RUNTIME/DECL.asl
index 2a05c9373..99254882f 100644
--- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0180_ASL_RUNTIME/DECL.asl
+++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0180_ASL_RUNTIME/DECL.asl
@@ -32,11 +32,11 @@
  * SUMMARY: Failed to compiler Switch/Case operators
  */
 
-Method(me89, 1)
+Method(me89, 1, Serialized)
 {
 	Store(0xff, Local0)
 
-	Switch (arg0) {
+	Switch (ToInteger (arg0)) {
 		Case (0) {
 			Store(0, Local0)
 		}
diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0186/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0186/DECL.asl
index 60d7fa3c1..4e809406c 100644
--- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0186/DECL.asl
+++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0186/DECL.asl
@@ -33,7 +33,7 @@
  */
 
 
-Method(mf6d)
+Method(mf6d, 0, Serialized)
 {
 	Name(fl00, 0)
 	Name(i000, 0xabcd0000)
@@ -41,7 +41,7 @@ Method(mf6d)
 
 	Method(m000)
 	{
-		Switch (Store(0xabcd0000, i001)) {
+		Switch (ToInteger (Store(0xabcd0000, i001))) {
 			Case (0) {
 				if (fl00) {
 					Return (0)
diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0200/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0200/DECL.asl
index ac60fe7d2..0698718c2 100644
--- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0200/DECL.asl
+++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0200/DECL.asl
@@ -88,7 +88,7 @@ Method(mfb9)
 	}
 }
 
-Method(mfba)
+Method(mfba, 0, Serialized)
 {
 	Store(0, Local7)
 	Divide(1, Local7, Local2)
@@ -100,7 +100,7 @@ Method(mfba)
 	}
 }
 
-Method(mfbb)
+Method(mfbb, 0, Serialized)
 {
 	Store(0, Local7)
 	Divide(1, Local7, Local2)
@@ -134,9 +134,9 @@ Method(mfbe)
 	}
 }
 
-Method(mfbf)
+Method(mfbf, 0, Serialized)
 {
-	switch (mfbc()) {
+	switch (ToInteger (mfbc())) {
 		case (0)
 		{
 			Store("Message 4 !!!!!!!!!!!!!!!!!!!!!!", Debug)
diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0246/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0246/DECL.asl
index f8bdf5fdc..b4e6dc22c 100644
--- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0246/DECL.asl
+++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0246/DECL.asl
@@ -33,7 +33,7 @@
  *          is within While
  */
 
-Method(m17b)
+Method(m17b, 0, Serialized)
 {
 	Store(2, Local0)
 	Store(0, Local1)
@@ -44,7 +44,7 @@ Method(m17b)
 			return
 		}
 		Increment(Local2)
-		switch (Local0) {
+		switch (ToInteger (Local0)) {
 			case (1) {
 				Store("Case 1", Debug)
 				Add(Local1, 1, Local1)
diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0248/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0248/DECL.asl
index bdf9342ad..d7cb46927 100644
--- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0248/DECL.asl
+++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0248/DECL.asl
@@ -39,11 +39,11 @@ Method(m02d)
 	 * all them are for tracking only - to simplify debugging
 	 */
 
-	Method(m003, 1)
+	Method(m003, 1, Serialized)
 	{
 		NoOp
 
-		Switch (arg0) {
+		Switch (ToInteger (arg0)) {
 			Case (0) {
 				Store("m003", debug)
 			}
diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0302/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0302/DECL.asl
index 065874bfd..3fdf63497 100644
--- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0302/DECL.asl
+++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0302/DECL.asl
@@ -38,9 +38,9 @@ Method(m1eb)
 	{
 		Method(m200)
 		{
-			Store("---------------- Before <Scope(\_SB)>",debug)
+			Store("---------------- Before <Scope(\\_SB)>",debug)
 			Scope(\_SB) { Name(i2z7, 0xabcd0007) }
-			Store("---------------- After Scope(\_SB)",debug)
+			Store("---------------- After Scope(\\_SB)",debug)
 			m201()
 			Store("---------------- Completed.",debug)
 		}
@@ -59,9 +59,9 @@ Method(m1eb)
 	{
 		Method(m202)
 		{
-			Store("---------------- Before <Scope(\)>",debug)
+			Store("---------------- Before <Scope(\\)>",debug)
 			Scope(\) { Name(i2z4, 0xabcd0004) }
-			Store("---------------- After Scope(\)",debug)
+			Store("---------------- After Scope(\\)",debug)
 			m203()
 			Store("---------------- Completed.",debug)
 		}
diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0304/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0304/DECL.asl
index acf2328ed..bb2a03d87 100644
--- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0304/DECL.asl
+++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0304/DECL.asl
@@ -78,7 +78,7 @@ Method(m18a, 1)
 	 * arg0 - ID of method (1,2,3...)
 	 * arg1 - the message to be reported
 	 */
-	Method(m800, 2)
+	Method(m800, 2, Serialized)
 	{
 		if (rpt0) {
 			Store(arg1, Debug)
@@ -89,7 +89,7 @@ Method(m18a, 1)
 			Store(cnt0, max0)
 		}
 
-		Switch (arg0) {
+		Switch (ToInteger (arg0)) {
 			Case (1) {
 				Store(ix00, Index(p100, ind1))
 				Increment(ind1)
@@ -127,7 +127,7 @@ Method(m18a, 1)
 	 * arg2 - Package
 	 * arg3 - Package with the benchmark values
 	 */
-	Method(m802, 4) {
+	Method(m802, 4, Serialized) {
 		Name(lpN0, 0)
 		Name(lpC0, 0)
 
@@ -147,7 +147,7 @@ Method(m18a, 1)
 			Increment(lpC0)
 		}
 
-		Switch (arg0) {
+		Switch (ToInteger (arg0)) {
 			Case (1) {
 				if (LNotEqual(ind1, n100)) {
 					err("", zFFF, 0x001, 0, 0, ind1, n100)