ASLTS: cntl: Cleanup y260 checks

The y260 bug excluded code now works. We are using y260 to exclude an
implicit target operand conversion bug. So this patch corrects the y260
code.
Note that there is no bug demo code related to this bug, so we can simply
remove old exclusions for y260 as it is useless to keep such kind of
simple exclusions.

Link: https://bugs.acpica.org/show_bug.cgi?id=1327
Signed-off-by: Lv Zheng <lv.zheng@intel.com>

4 files changed, 94 insertions, 146 deletions

diff --git a/tests/aslts/src/runtime/collections/Identity2MS/abbu/misc/ms1.asl b/tests/aslts/src/runtime/collections/Identity2MS/abbu/misc/ms1.asl
index 16596bee8..b21667821 100644
--- a/tests/aslts/src/runtime/collections/Identity2MS/abbu/misc/ms1.asl
+++ b/tests/aslts/src/runtime/collections/Identity2MS/abbu/misc/ms1.asl
@@ -6480,13 +6480,7 @@ Method(ms31, 1, Serialized)
 
 		if (y290) {
 			m002()
-		}
-
-		if (LAnd(y260, y290)) {
 			m003()
-		}
-
-		if (LAnd(y260, y290)) {
 			m004()
 		}
 
diff --git a/tests/aslts/src/runtime/collections/functional/table/load.asl b/tests/aslts/src/runtime/collections/functional/table/load.asl
index 56c882c14..ad4efffc0 100644
--- a/tests/aslts/src/runtime/collections/functional/table/load.asl
+++ b/tests/aslts/src/runtime/collections/functional/table/load.asl
@@ -347,16 +347,14 @@ Device(DTM0) {
 		Store("Table Loaded", Debug)
 
 		// Check DDBHandle ObjectType
-		if (y260) {
-			switch (ToInteger (arg1)) {
-				case (0) {Store(ObjectType(HI0), Local1)}
-				case (1) {Store(ObjectType(\DTM0.HI0), Local1)}
-				case (2) {Store(ObjectType(Local2), Local1)}
-				case (3) {Store(ObjectType(Index(PHI0, 0)), Local1)}
-			}
-			if (LNotEqual(Local1, c017)) { // DDB Handle
-				err(arg0, z174, 0x004, 0, 0, Local1, c017)
-			}
+		switch (ToInteger (arg1)) {
+			case (0) {Store(ObjectType(HI0), Local1)}
+			case (1) {Store(ObjectType(\DTM0.HI0), Local1)}
+			case (2) {Store(ObjectType(Local2), Local1)}
+			case (3) {Store(ObjectType(Index(PHI0, 0)), Local1)}
+		}
+		if (LNotEqual(Local1, c017)) { // DDB Handle
+			err(arg0, z174, 0x004, 0, 0, Local1, c017)
 		}
 
 		// Check the new Object appears
@@ -443,11 +441,9 @@ Device(DTM0) {
 		Concatenate(arg0, "-m002", arg0)
 
 		// Check DDBHandle ObjectType
-		if (y260) {
-			Store(ObjectType(Arg1), Local1)
-			if (LNotEqual(Local1, c017)) { // DDB Handle
-				err(arg0, z174, 0x00e, 0, 0, Local1, c017)
-			}
+		Store(ObjectType(Arg1), Local1)
+		if (LNotEqual(Local1, c017)) { // DDB Handle
+			err(arg0, z174, 0x00e, 0, 0, Local1, c017)
 		}
 
 		// Check the new Object appears
@@ -648,16 +644,14 @@ Device(DTM0) {
 			Store("SSDT Loaded", Debug)
 
 			// Check DDBHandle ObjectType
-			if (y260) {
-				switch (ToInteger (arg1)) {
-					case (0) {Store(ObjectType(HI0), Local1)}
-					case (1) {Store(ObjectType(\DTM0.HI0), Local1)}
-					case (2) {Store(ObjectType(Local2), Local1)}
-					case (3) {Store(ObjectType(Index(PHI0, 0)), Local1)}
-				}
-				if (LNotEqual(Local1, c017)) { // DDB Handle
-					err(arg0, z174, 0x019, 0, 0, Local1, c017)
-				}
+			switch (ToInteger (arg1)) {
+				case (0) {Store(ObjectType(HI0), Local1)}
+				case (1) {Store(ObjectType(\DTM0.HI0), Local1)}
+				case (2) {Store(ObjectType(Local2), Local1)}
+				case (3) {Store(ObjectType(Index(PHI0, 0)), Local1)}
+			}
+			if (LNotEqual(Local1, c017)) { // DDB Handle
+				err(arg0, z174, 0x019, 0, 0, Local1, c017)
 			}
 
 			// Check the new Object appears
@@ -1369,11 +1363,9 @@ Device(DTM0) {
 		// DDB Handle
 		Load(DDB0, DDBH)
 		CH04(arg0, 0, 47, z174, 0x069, 0, 0)	// AE_AML_OPERAND_TYPE
-		if (y260) {
-			Store(ObjectType(DDB0), Local0)
-			if (LNotEqual(c017, Local0)) {
-				err(arg0, z174, 0x06a, 0, 0, Local0, c017)
-			}
+		Store(ObjectType(DDB0), Local0)
+		if (LNotEqual(c017, Local0)) {
+			err(arg0, z174, 0x06a, 0, 0, Local0, c017)
 		}
 		
 		UnLoad(DDB0)
@@ -1703,11 +1695,9 @@ Device(DTM0) {
 			if (CH03(arg0, z174, 0x0b2, 0, 0)) {
 				return (1)
 			}
-			if (y260) {
-				Store(ObjectType(arg2), Local0)
-				if (LNotEqual(c017, Local0)) {
-					err(arg0, z174, 0x0b3, 0, 0, Local0, c017)
-				}
+			Store(ObjectType(arg2), Local0)
+			if (LNotEqual(c017, Local0)) {
+				err(arg0, z174, 0x0b3, 0, 0, Local0, c017)
 			}
 			if (CondRefof(\SSS0, Local0)) {
 			} else {
@@ -1902,11 +1892,9 @@ Device(DTM0) {
 			return (1)
 		}
 
-		if (y260) {
-			Store(ObjectType(HI0), Local0)
-			if (LNotEqual(c017, Local0)) {
-				err(arg0, z174, 0x0d3, 0, 0, Local0, c017)
-			}
+		Store(ObjectType(HI0), Local0)
+		if (LNotEqual(c017, Local0)) {
+			err(arg0, z174, 0x0d3, 0, 0, Local0, c017)
 		}
 
 		if (CondRefof(\SSS0, Local0)) {
@@ -1973,11 +1961,9 @@ Device(DTM0) {
 			return (1)
 		}
 
-		if (y260) {
-			Store(ObjectType(HI0), Local0)
-			if (LNotEqual(c017, Local0)) {
-				err(arg0, z174, 0x0e3, 0, 0, Local0, c017)
-			}
+		Store(ObjectType(HI0), Local0)
+		if (LNotEqual(c017, Local0)) {
+			err(arg0, z174, 0x0e3, 0, 0, Local0, c017)
 		}
 
 		if (CondRefof(\SSS0, Local0)) {
diff --git a/tests/aslts/src/runtime/collections/functional/table/loadtable.asl b/tests/aslts/src/runtime/collections/functional/table/loadtable.asl
index e9b62950f..7431d8be2 100644
--- a/tests/aslts/src/runtime/collections/functional/table/loadtable.asl
+++ b/tests/aslts/src/runtime/collections/functional/table/loadtable.asl
@@ -187,12 +187,10 @@ Device(DTM2) {
 			return (1)
 		}
 
-		if (y260) {
-			Store(ObjectType(DDBH), Local1)
-			if (LNotEqual(Local1, c017)) { // DDB Handle
-				err(arg0, z176, 0x005, 0, 0, Local1, c017)
-				return (1)
-			}
+		Store(ObjectType(DDBH), Local1)
+		if (LNotEqual(Local1, c017)) { // DDB Handle
+			err(arg0, z176, 0x005, 0, 0, Local1, c017)
+			return (1)
 		}
 
 		if (LNotEqual(1, \DTM2.PLDT)) {
@@ -245,12 +243,10 @@ Device(DTM2) {
 			return (1)
 		}
 
-		if (y260) {
-			Store(ObjectType(DDBH), Local1)
-			if (LNotEqual(Local1, c017)) { // DDB Handle
-				err(arg0, z176, 0x012, 0, 0, Local1, c017)
-				return (1)
-			}
+		Store(ObjectType(DDBH), Local1)
+		if (LNotEqual(Local1, c017)) { // DDB Handle
+			err(arg0, z176, 0x012, 0, 0, Local1, c017)
+			return (1)
 		}
 
 		if (LNotEqual(1, \DTM2.PLDT)) {
@@ -409,12 +405,10 @@ Device(DTM2) {
 			return (1)
 		}
 
-		if (y260) {
-			Store(ObjectType(DDB0), Local1)
-			if (LNotEqual(Local1, c017)) { // DDB Handle
-				err(arg0, z176, 0x032, 0, 0, Local1, c017)
-				return (1)
-			}
+		Store(ObjectType(DDB0), Local1)
+		if (LNotEqual(Local1, c017)) { // DDB Handle
+			err(arg0, z176, 0x032, 0, 0, Local1, c017)
+			return (1)
 		}
 
 		if (LNotEqual(1, \DTM2.PLDT)) {
@@ -447,12 +441,10 @@ Device(DTM2) {
 			return (1)
 		}
 
-		if (y260) {
-			Store(ObjectType(DDB1), Local1)
-			if (LNotEqual(Local1, c017)) { // DDB Handle
-				err(arg0, z176, 0x038, 0, 0, Local1, c017)
-				return (1)
-			}
+		Store(ObjectType(DDB1), Local1)
+		if (LNotEqual(Local1, c017)) { // DDB Handle
+			err(arg0, z176, 0x038, 0, 0, Local1, c017)
+			return (1)
 		}
 
 		if (LNotEqual(0, \DTM2.PLDT)) {
@@ -485,12 +477,10 @@ Device(DTM2) {
 			return (1)
 		}
 
-		if (y260) {
-			Store(ObjectType(DDB2), Local1)
-			if (LNotEqual(Local1, c017)) { // DDB Handle
-				err(arg0, z176, 0x03e, 0, 0, Local1, c017)
-				return (1)
-			}
+		Store(ObjectType(DDB2), Local1)
+		if (LNotEqual(Local1, c017)) { // DDB Handle
+			err(arg0, z176, 0x03e, 0, 0, Local1, c017)
+			return (1)
 		}
 
 		if (LNotEqual(0, \DTM2.PLDT)) {
@@ -523,12 +513,10 @@ Device(DTM2) {
 			return (1)
 		}
 
-		if (y260) {
-			Store(ObjectType(DDB3), Local1)
-			if (LNotEqual(Local1, c017)) { // DDB Handle
-				err(arg0, z176, 0x044, 0, 0, Local1, c017)
-				return (1)
-			}
+		Store(ObjectType(DDB3), Local1)
+		if (LNotEqual(Local1, c017)) { // DDB Handle
+			err(arg0, z176, 0x044, 0, 0, Local1, c017)
+			return (1)
 		}
 
 		if (LNotEqual(0, \DTM2.PLDT)) {
@@ -581,12 +569,10 @@ Device(DTM2) {
 				return (1)
 			}
 
-			if (y260) {
-				Store(ObjectType(arg1), Local1)
-				if (LNotEqual(Local1, c017)) { // DDB Handle
-					err(arg0, z176, 0x052, 0, 0, Local1, c017)
-					return (1)
-				}
+			Store(ObjectType(arg1), Local1)
+			if (LNotEqual(Local1, c017)) { // DDB Handle
+				err(arg0, z176, 0x052, 0, 0, Local1, c017)
+				return (1)
 			}
 
 			if (LNotEqual(0, \DTM2.PLDT)) {
@@ -768,12 +754,10 @@ Device(DTM2) {
 				return (1)
 			}
 
-			if (y260) {
-				Store(ObjectType(arg1), Local1)
-				if (LNotEqual(Local1, c017)) { // DDB Handle
-					err(arg0, z176, 0x062, 0, 0, Local1, c017)
-					return (1)
-				}
+			Store(ObjectType(arg1), Local1)
+			if (LNotEqual(Local1, c017)) { // DDB Handle
+				err(arg0, z176, 0x062, 0, 0, Local1, c017)
+				return (1)
 			}
 
 			if (LNotEqual(1, \DTM2.PLDT)) {
@@ -965,12 +949,10 @@ Device(DTM2) {
 			return (1)
 		}
 
-		if (y260) {
-			Store(ObjectType(DDBH), Local1)
-			if (LNotEqual(Local1, c017)) { // DDB Handle
-				err(arg0, z176, 0x073, 0, 0, Local1, c017)
-				return (1)
-			}
+		Store(ObjectType(DDBH), Local1)
+		if (LNotEqual(Local1, c017)) { // DDB Handle
+			err(arg0, z176, 0x073, 0, 0, Local1, c017)
+			return (1)
 		}
 
 		if (LNotEqual(1, \DTM2.PLDT)) {
@@ -1025,12 +1007,10 @@ Device(DTM2) {
 			return (1)
 		}
 
-		if (y260) {
-			Store(ObjectType(DDBH), Local1)
-			if (LNotEqual(Local1, c017)) { // DDB Handle
-				err(arg0, z176, 0x082, 0, 0, Local1, c017)
-				return (1)
-			}
+		Store(ObjectType(DDBH), Local1)
+		if (LNotEqual(Local1, c017)) { // DDB Handle
+			err(arg0, z176, 0x082, 0, 0, Local1, c017)
+			return (1)
 		}
 
 		if (LNotEqual(1, \DTM2.PLDT)) {
@@ -1073,12 +1053,10 @@ Device(DTM2) {
 			return (1)
 		}
 
-		if (y260) {
-			Store(ObjectType(DDBH), Local1)
-			if (LNotEqual(Local1, c017)) { // DDB Handle
-				err(arg0, z176, 0x092, 0, 0, Local1, c017)
-				return (1)
-			}
+		Store(ObjectType(DDBH), Local1)
+		if (LNotEqual(Local1, c017)) { // DDB Handle
+			err(arg0, z176, 0x092, 0, 0, Local1, c017)
+			return (1)
 		}
 
 		if (LNotEqual(1, PLDT)) {
@@ -1100,12 +1078,10 @@ Device(DTM2) {
 			return (1)
 		}
 
-		if (y260) {
-			Store(ObjectType(DDBH), Local1)
-			if (LNotEqual(Local1, c017)) { // DDB Handle
-				err(arg0, z176, 0x096, 0, 0, Local1, c017)
-				return (1)
-			}
+		Store(ObjectType(DDBH), Local1)
+		if (LNotEqual(Local1, c017)) { // DDB Handle
+			err(arg0, z176, 0x096, 0, 0, Local1, c017)
+			return (1)
 		}
 
 		if (LNotEqual(0, PLDT)) {
@@ -1229,12 +1205,10 @@ Device(DTM2) {
 			return (1)
 		}
 
-		if (y260) {
-			Store(ObjectType(DDBH), Local1)
-			if (LNotEqual(Local1, c017)) { // DDB Handle
-				err(arg0, z176, 0x0b2, 0, 0, Local1, c017)
-				return (1)
-			}
+		Store(ObjectType(DDBH), Local1)
+		if (LNotEqual(Local1, c017)) { // DDB Handle
+			err(arg0, z176, 0x0b2, 0, 0, Local1, c017)
+			return (1)
 		}
 
 		if (LNotEqual(1, \DTM2.PLDT)) {
@@ -1318,12 +1292,10 @@ Device(DTM2) {
 			return (1)
 		}
 
-		if (y260) {
-			Store(ObjectType(DDBH), Local1)
-			if (LNotEqual(Local1, c017)) { // DDB Handle
-				err(arg0, z176, 0x0c2, 0, 0, Local1, c017)
-				return (1)
-			}
+		Store(ObjectType(DDBH), Local1)
+		if (LNotEqual(Local1, c017)) { // DDB Handle
+			err(arg0, z176, 0x0c2, 0, 0, Local1, c017)
+			return (1)
 		}
 
 		if (CondRefof(\_XT2, Local0)) {
@@ -1609,12 +1581,10 @@ Device(DTM2) {
 			return (1)
 		}
 
-		if (y260) {
-			Store(ObjectType(DDBH), Local1)
-			if (LNotEqual(Local1, c017)) { // DDB Handle
-				err(arg0, z176, 0x0f3, 0, 0, Local1, c017)
-				return (1)
-			}
+		Store(ObjectType(DDBH), Local1)
+		if (LNotEqual(Local1, c017)) { // DDB Handle
+			err(arg0, z176, 0x0f3, 0, 0, Local1, c017)
+			return (1)
 		}
 
 		if (CondRefof(\_XT2, Local0)) {
diff --git a/tests/aslts/src/runtime/collections/functional/table/unload.asl b/tests/aslts/src/runtime/collections/functional/table/unload.asl
index d5f36cbc6..2e280aece 100644
--- a/tests/aslts/src/runtime/collections/functional/table/unload.asl
+++ b/tests/aslts/src/runtime/collections/functional/table/unload.asl
@@ -118,11 +118,9 @@ Device(DTM1) {
 
 		Store("Table Loaded", Debug)
 
-		if (y260) {
-			Store(ObjectType(HI0), Local1)
-			if (LNotEqual(Local1, c017)) { // DDB Handle
-				err(arg0, z175, 0x003, 0, 0, Local1, c017)
-			}
+		Store(ObjectType(HI0), Local1)
+		if (LNotEqual(Local1, c017)) { // DDB Handle
+			err(arg0, z175, 0x003, 0, 0, Local1, c017)
 		}
 
 		// Check the new Object appears