ASLTS: changing the third argument of ERR to __LINE__ to print line numbers instead of indices.

Signed-off-by: Erik Schmauss <erik.schmauss@intel.com>

10 files changed, 109 insertions, 109 deletions

diff --git a/tests/aslts/src/runtime/collections/complex/namespace/fullpath.asl b/tests/aslts/src/runtime/collections/complex/namespace/fullpath.asl
index ef6775683..74cca255e 100644
--- a/tests/aslts/src/runtime/collections/complex/namespace/fullpath.asl
+++ b/tests/aslts/src/runtime/collections/complex/namespace/fullpath.asl
@@ -45,10 +45,10 @@ Method(fp00,, Serialized)
 		Name(\i4z0, 0xabcd0000)
 
 		if (LNotEqual(i4z0, 0xabcd0000)) {
-			err(ts, z179, 0x000, 0, 0, i4z0, 0xabcd0000)
+			err(ts, z179, __LINE__, 0, 0, i4z0, 0xabcd0000)
 		}
 		if (LNotEqual(\i4z0, 0xabcd0000)) {
-			err(ts, z179, 0x001, 0, 0, \i4z0, 0xabcd0000)
+			err(ts, z179, __LINE__, 0, 0, \i4z0, 0xabcd0000)
 		}
 		m001()
 	}
@@ -56,10 +56,10 @@ Method(fp00,, Serialized)
 	Method(m001)
 	{
 		if (LNotEqual(i4z0, 0xabcd0000)) {
-			err(ts, z179, 0x002, 0, 0, i4z0, 0xabcd0000)
+			err(ts, z179, __LINE__, 0, 0, i4z0, 0xabcd0000)
 		}
 		if (LNotEqual(\i4z0, 0xabcd0000)) {
-			err(ts, z179, 0x003, 0, 0, \i4z0, 0xabcd0000)
+			err(ts, z179, __LINE__, 0, 0, \i4z0, 0xabcd0000)
 		}
 	}
 
@@ -79,10 +79,10 @@ Method(fp01,, Serialized)
 		}
 
 		if (LNotEqual(i4z1, 0xabcd0000)) {
-			err(ts, z179, 0x000, 0, 0, i4z1, 0xabcd0000)
+			err(ts, z179, __LINE__, 0, 0, i4z1, 0xabcd0000)
 		}
 		if (LNotEqual(\i4z1, 0xabcd0000)) {
-			err(ts, z179, 0x001, 0, 0, \i4z1, 0xabcd0000)
+			err(ts, z179, __LINE__, 0, 0, \i4z1, 0xabcd0000)
 		}
 		m001()
 	}
@@ -90,10 +90,10 @@ Method(fp01,, Serialized)
 	Method(m001)
 	{
 		if (LNotEqual(i4z1, 0xabcd0000)) {
-			err(ts, z179, 0x002, 0, 0, i4z1, 0xabcd0000)
+			err(ts, z179, __LINE__, 0, 0, i4z1, 0xabcd0000)
 		}
 		if (LNotEqual(\i4z1, 0xabcd0000)) {
-			err(ts, z179, 0x003, 0, 0, \i4z1, 0xabcd0000)
+			err(ts, z179, __LINE__, 0, 0, \i4z1, 0xabcd0000)
 		}
 	}
 
diff --git a/tests/aslts/src/runtime/collections/complex/namespace/ns0.asl b/tests/aslts/src/runtime/collections/complex/namespace/ns0.asl
index 7a0f289b2..2720543ee 100644
--- a/tests/aslts/src/runtime/collections/complex/namespace/ns0.asl
+++ b/tests/aslts/src/runtime/collections/complex/namespace/ns0.asl
@@ -74,7 +74,7 @@ Method(m000, 1, Serialized)
 	}
 	Store(Add(i000, m001()), Local0)
 	if (LNotEqual(Local0, 0xabcd0003)) {
-		err(ts, z154, 0x001, 0, 0, Local0, 0xabcd0003)
+		err(ts, z154, __LINE__, 0, 0, Local0, 0xabcd0003)
 	}
 	Store(Local0, Debug)
 
@@ -136,11 +136,11 @@ Method(m001, 1, Serialized)
 	Store(Add(i000, m001()), Local0)
 
 	if (LNotEqual(Local0, 0x87654321)) {
-		err(ts, z154, 0x003, 0, 0, Local0, 0x87654321)
+		err(ts, z154, __LINE__, 0, 0, Local0, 0x87654321)
 	}
 
 	if (LNotEqual(i000, 0x80000000)) {
-		err(ts, z154, 0x004, 0, 0, i000, 0x80000000)
+		err(ts, z154, __LINE__, 0, 0, i000, 0x80000000)
 	}
 
 	CH03(ts, z154, 0x005, 0, 0)
@@ -165,11 +165,11 @@ Method(m002,, Serialized)
 	Store(Add(i000, m001()), Local0)
 
 	if (LNotEqual(Local0, 0x065013BA)) {
-		err(ts, z154, 0x006, 0, 0, Local0, 0x065013BA)
+		err(ts, z154, __LINE__, 0, 0, Local0, 0x065013BA)
 	}
 
 	if (LNotEqual(i000, 0x00100064)) {
-		err(ts, z154, 0x007, 0, 0, i000, 0x00100064)
+		err(ts, z154, __LINE__, 0, 0, i000, 0x00100064)
 	}
 
 	CH03(ts, z154, 0x008, 0, 0)
@@ -193,11 +193,11 @@ Method(m003,, Serialized)
 	Store(Add(i000, m001()), Local0)
 
 	if (LNotEqual(Local0, 0x065013BA)) {
-		err(ts, z154, 0x009, 0, 0, Local0, 0x065013BA)
+		err(ts, z154, __LINE__, 0, 0, Local0, 0x065013BA)
 	}
 
 	if (LNotEqual(i000, 0x00100064)) {
-		err(ts, z154, 0x00a, 0, 0, i000, 0x00100064)
+		err(ts, z154, __LINE__, 0, 0, i000, 0x00100064)
 	}
 
 	CH03(ts, z154, 0x00b, 0, 0)
@@ -262,11 +262,11 @@ Method(m004, 1, Serialized)
 	Store(Add(Local7, m001()), Local0)
 
 	if (LNotEqual(Local0, 0x87654321)) {
-		err(ts, z154, 0x00c, 0, 0, Local0, 0x87654321)
+		err(ts, z154, __LINE__, 0, 0, Local0, 0x87654321)
 	}
 
 	if (LNotEqual(Local7, 1)) {
-		err(ts, z154, 0x00d, 0, 0, Local7, 1)
+		err(ts, z154, __LINE__, 0, 0, Local7, 1)
 	}
 
 	CH03(ts, z154, 0x00e, 0, 0)
@@ -331,11 +331,11 @@ Method(m005, 2, Serialized)
 	Store(Add(arg1, m001()), Local0)
 
 	if (LNotEqual(Local0, 0x87654321)) {
-		err(ts, z154, 0x00f, 0, 0, Local0, 0x87654321)
+		err(ts, z154, __LINE__, 0, 0, Local0, 0x87654321)
 	}
 
 	if (LNotEqual(arg1, 1)) {
-		err(ts, z154, 0x010, 0, 0, arg1, 1)
+		err(ts, z154, __LINE__, 0, 0, arg1, 1)
 	}
 
 	CH03(ts, z154, 0x011, 0, 0)
diff --git a/tests/aslts/src/runtime/collections/complex/namespace/ns0_root.asl b/tests/aslts/src/runtime/collections/complex/namespace/ns0_root.asl
index b4c0f05cd..e5299ab7c 100644
--- a/tests/aslts/src/runtime/collections/complex/namespace/ns0_root.asl
+++ b/tests/aslts/src/runtime/collections/complex/namespace/ns0_root.asl
@@ -96,10 +96,10 @@ Method(m006, 1, Serialized)
 	if (FLG9) {
 		CH03(ts, z154, 0x014, 0, 0)
 		if (LNotEqual(Local0, 0x87654321)) {
-			err(ts, z154, 0x012, 0, 0, Local0, 0x87654321)
+			err(ts, z154, __LINE__, 0, 0, Local0, 0x87654321)
 		}
 		if (LNotEqual(d000.i000, 0x80000000)) {
-			err(ts, z154, 0x013, 0, 0, d000.i000, 0x80000000)
+			err(ts, z154, __LINE__, 0, 0, d000.i000, 0x80000000)
 		}
 	} else {
 		CH04(ts, 1, 5, z154, 0x014, 0, 0)	// AE_NOT_FOUND
@@ -171,10 +171,10 @@ Method(m007, 1, Serialized)
 	if (FLG9) {
 		CH03(ts, z154, 0x014, 0, 0)
 		if (LNotEqual(Local0, 0x87654321)) {
-			err(ts, z154, 0x015, 0, 0, Local0, 0x87654321)
+			err(ts, z154, __LINE__, 0, 0, Local0, 0x87654321)
 		}
 		if (LNotEqual(tz00.i000, 0x80000000)) {
-			err(ts, z154, 0x016, 0, 0, tz00.i000, 0x80000000)
+			err(ts, z154, __LINE__, 0, 0, tz00.i000, 0x80000000)
 		}
 	} else {
 		CH04(ts, 1, 5, z154, 0x014, 0, 0)	// AE_NOT_FOUND
@@ -247,10 +247,10 @@ Method(m008, 1, Serialized)
 	if (FLG9) {
 		CH03(ts, z154, 0x014, 0, 0)
 		if (LNotEqual(Local0, 0x87654321)) {
-			err(ts, z154, 0x018, 0, 0, Local0, 0x87654321)
+			err(ts, z154, __LINE__, 0, 0, Local0, 0x87654321)
 		}
 		if (LNotEqual(pr00.i000, 0x80000000)) {
-			err(ts, z154, 0x019, 0, 0, pr00.i000, 0x80000000)
+			err(ts, z154, __LINE__, 0, 0, pr00.i000, 0x80000000)
 		}
 	} else {
 		CH04(ts, 1, 5, z154, 0x014, 0, 0)	// AE_NOT_FOUND
@@ -323,10 +323,10 @@ Method(m009, 1, Serialized)
 	if (FLG9) {
 		CH03(ts, z154, 0x014, 0, 0)
 		if (LNotEqual(Local0, 0x87654321)) {
-			err(ts, z154, 0x01b, 0, 0, Local0, 0x87654321)
+			err(ts, z154, __LINE__, 0, 0, Local0, 0x87654321)
 		}
 		if (LNotEqual(pw00.i000, 0x80000000)) {
-			err(ts, z154, 0x01c, 0, 0, pw00.i000, 0x80000000)
+			err(ts, z154, __LINE__, 0, 0, pw00.i000, 0x80000000)
 		}
 	} else {
 		CH04(ts, 1, 5, z154, 0x014, 0, 0)	// AE_NOT_FOUND
diff --git a/tests/aslts/src/runtime/collections/complex/namespace/ns1.asl b/tests/aslts/src/runtime/collections/complex/namespace/ns1.asl
index dd31c5f0b..9223aa53a 100644
--- a/tests/aslts/src/runtime/collections/complex/namespace/ns1.asl
+++ b/tests/aslts/src/runtime/collections/complex/namespace/ns1.asl
@@ -49,7 +49,7 @@ Method(m100,, Serialized)
 	Store(DerefOf(Index(p000, 0)), Local0)
 
 	if (LNotEqual(Local0, 0x11112222)) {
-		err(ts, z155, 0x000, 0, 0, Local0, 0x11112222)
+		err(ts, z155, __LINE__, 0, 0, Local0, 0x11112222)
 	}
 
 	CH03(ts, z155, 0x001, 0, 0)
@@ -69,7 +69,7 @@ Method(m101,, Serialized)
 	Store(DerefOf(Index(b000, 0)), Local0)
 
 	if (LNotEqual(Local0, 0x67)) {
-		err(ts, z155, 0x002, 0, 0, Local0, 0x67)
+		err(ts, z155, __LINE__, 0, 0, Local0, 0x67)
 	}
 
 	CH03(ts, z155, 0x003, 0, 0)
@@ -89,7 +89,7 @@ Method(m102,, Serialized)
 	Store(DerefOf(Index(s000, 0)), Local0)
 
 	if (LNotEqual(Local0, 0x38)) {
-		err(ts, z155, 0x004, 0, 0, Local0, 0x38)
+		err(ts, z155, __LINE__, 0, 0, Local0, 0x38)
 	}
 
 	CH03(ts, z155, 0x005, 0, 0)
@@ -155,13 +155,13 @@ Method(m103, 1, Serialized)
 	Store(Add(DerefOf(Index(pp00, 1)), m001()), Local0)
 
 	if (LNotEqual(Local0, 0x87654321)) {
-		err(ts, z155, 0x007, 0, 0, Local0, 0x87654321)
+		err(ts, z155, __LINE__, 0, 0, Local0, 0x87654321)
 	}
 
 	Store(DerefOf(Index(pp00, 1)), Local0)
 
 	if (LNotEqual(Local0, 0x80000000)) {
-		err(ts, z155, 0x008, 0, 0, Local0, 0x80000000)
+		err(ts, z155, __LINE__, 0, 0, Local0, 0x80000000)
 	}
 
 	CH03(ts, z155, 0x009, 0, 0)
@@ -192,13 +192,13 @@ Method(m104,, Serialized)
 	Store(Add(DerefOf(Index(pp00, 1)), m001()), Local0)
 
 	if (LNotEqual(Local0, 0x065013BA)) {
-		err(ts, z155, 0x00a, 0, 0, Local0, 0x065013BA)
+		err(ts, z155, __LINE__, 0, 0, Local0, 0x065013BA)
 	}
 
 	Store(DerefOf(Index(pp00, 1)), Local0)
 
 	if (LNotEqual(Local0, 0x00100064)) {
-		err(ts, z155, 0x00b, 0, 0, Local0, 0x00100064)
+		err(ts, z155, __LINE__, 0, 0, Local0, 0x00100064)
 	}
 
 	CH03(ts, z155, 0x00c, 0, 0)
@@ -267,7 +267,7 @@ Method(m105, 1, Serialized)
 	Store(Add(bf00, m001()), Local0)
 
 	if (LNotEqual(Local0, 0x87654321)) {
-		err(ts, z155, 0x00e, 0, 0, Local0, 0x87654321)
+		err(ts, z155, __LINE__, 0, 0, Local0, 0x87654321)
 	}
 
 	if (arg0) {
@@ -277,7 +277,7 @@ Method(m105, 1, Serialized)
 	}
 
 	if (LNotEqual(bf00, Local1)) {
-		err(ts, z155, 0x00f, 0, 0, bf00, Local1)
+		err(ts, z155, __LINE__, 0, 0, bf00, Local1)
 	}
 
 	CH03(ts, z155, 0x010, 0, 0)
@@ -346,7 +346,7 @@ Method(m106, 1, Serialized)
 	Store(Add(f001, m001()), Local0)
 
 	if (LNotEqual(Local0, 0x87654321)) {
-		err(ts, z155, 0x012, 0, 0, Local0, 0x87654321)
+		err(ts, z155, __LINE__, 0, 0, Local0, 0x87654321)
 	}
 
 	if (arg0) {
@@ -356,7 +356,7 @@ Method(m106, 1, Serialized)
 	}
 
 	if (LNotEqual(f001, Local1)) {
-		err(ts, z155, 0x013, 0, 0, f001, Local1)
+		err(ts, z155, __LINE__, 0, 0, f001, Local1)
 	}
 
 	CH03(ts, z155, 0x014, 0, 0)
@@ -428,7 +428,7 @@ Method(m107, 1, Serialized)
 	Store(Add(bnk0, m001()), Local0)
 
 	if (LNotEqual(Local0, 0x87654321)) {
-		err(ts, z155, 0x016, 0, 0, Local0, 0x87654321)
+		err(ts, z155, __LINE__, 0, 0, Local0, 0x87654321)
 	}
 
 	if (arg0) {
@@ -438,7 +438,7 @@ Method(m107, 1, Serialized)
 	}
 
 	if (LNotEqual(bnk0, Local1)) {
-		err(ts, z155, 0x017, 0, 0, bnk0, Local1)
+		err(ts, z155, __LINE__, 0, 0, bnk0, Local1)
 	}
 
 	CH03(ts, z155, 0x018, 0, 0)
@@ -510,7 +510,7 @@ Method(m108, 1, Serialized)
 	Store(Add(if00, m001()), Local0)
 
 	if (LNotEqual(Local0, 0x87654321)) {
-		err(ts, z155, 0x01a, 0, 0, Local0, 0x87654321)
+		err(ts, z155, __LINE__, 0, 0, Local0, 0x87654321)
 	}
 
 	if (arg0) {
@@ -520,7 +520,7 @@ Method(m108, 1, Serialized)
 	}
 
 	if (LNotEqual(if00, Local1)) {
-		err(ts, z155, 0x01b, 0, 0, if00, Local1)
+		err(ts, z155, __LINE__, 0, 0, if00, Local1)
 	}
 
 	CH03(ts, z155, 0x01c, 0, 0)
@@ -585,7 +585,7 @@ Method(m109, 1, Serialized)
 	Store(Add(DerefOf(Index(b000, 1)), m001()), Local0)
 
 	if (LNotEqual(Local0, 0x24)) {
-		err(ts, z155, 0x01e, 0, 0, Local0, 0x24)
+		err(ts, z155, __LINE__, 0, 0, Local0, 0x24)
 	}
 
 	Store(DerefOf(Index(b000, 1)), Local0)
@@ -597,7 +597,7 @@ Method(m109, 1, Serialized)
 	}
 
 	if (LNotEqual(Local0, Local1)) {
-		err(ts, z155, 0x01f, 0, 0, Local0, Local1)
+		err(ts, z155, __LINE__, 0, 0, Local0, Local1)
 	}
 
 	CH03(ts, z155, 0x020, 0, 0)
@@ -662,7 +662,7 @@ Method(m10a, 1, Serialized)
 	Store(Add(DerefOf(Index(s000, 1)), m001()), Local0)
 
 	if (LNotEqual(Local0, 0x24)) {
-		err(ts, z155, 0x022, 0, 0, Local0, 0x24)
+		err(ts, z155, __LINE__, 0, 0, Local0, 0x24)
 	}
 
 	Store(DerefOf(Index(s000, 1)), Local0)
@@ -674,7 +674,7 @@ Method(m10a, 1, Serialized)
 	}
 
 	if (LNotEqual(Local0, Local1)) {
-		err(ts, z155, 0x023, 0, 0, Local0, Local1)
+		err(ts, z155, __LINE__, 0, 0, Local0, Local1)
 	}
 
 	CH03(ts, z155, 0x024, 0, 0)
diff --git a/tests/aslts/src/runtime/collections/complex/namespace/ns2.asl b/tests/aslts/src/runtime/collections/complex/namespace/ns2.asl
index e58bf1c91..b5b0807ae 100644
--- a/tests/aslts/src/runtime/collections/complex/namespace/ns2.asl
+++ b/tests/aslts/src/runtime/collections/complex/namespace/ns2.asl
@@ -51,7 +51,7 @@ Method(m200,, Serialized)
 	Store(DerefOf(Index(d000.p000, 0)), Local0)
 
 	if (LNotEqual(Local0, 0x11112222)) {
-		err(ts, z156, 0x000, 0, 0, Local0, 0x11112222)
+		err(ts, z156, __LINE__, 0, 0, Local0, 0x11112222)
 	}
 
 	CH03(ts, z156, 0x001, 0, 0)
@@ -74,7 +74,7 @@ Method(m201,, Serialized)
 	Store(DerefOf(Index(d000.b000, 0)), Local0)
 
 	if (LNotEqual(Local0, 0x67)) {
-		err(ts, z156, 0x002, 0, 0, Local0, 0x67)
+		err(ts, z156, __LINE__, 0, 0, Local0, 0x67)
 	}
 
 	CH03(ts, z156, 0x003, 0, 0)
@@ -97,7 +97,7 @@ Method(m202,, Serialized)
 	Store(DerefOf(Index(d000.s000, 0)), Local0)
 
 	if (LNotEqual(Local0, 0x38)) {
-		err(ts, z156, 0x004, 0, 0, Local0, 0x38)
+		err(ts, z156, __LINE__, 0, 0, Local0, 0x38)
 	}
 
 	CH03(ts, z156, 0x005, 0, 0)
@@ -131,13 +131,13 @@ Method(m204,, Serialized)
 	Store(Add(DerefOf(Index(d000.pp00, 1)), m001()), Local0)
 
 	if (LNotEqual(Local0, 0x065013BA)) {
-		err(ts, z156, 0x00a, 0, 0, Local0, 0x065013BA)
+		err(ts, z156, __LINE__, 0, 0, Local0, 0x065013BA)
 	}
 
 	Store(DerefOf(Index(d000.pp00, 1)), Local0)
 
 	if (LNotEqual(Local0, 0x00100064)) {
-		err(ts, z156, 0x00b, 0, 0, Local0, 0x00100064)
+		err(ts, z156, __LINE__, 0, 0, Local0, 0x00100064)
 	}
 
 	CH03(ts, z156, 0x00c, 0, 0)
diff --git a/tests/aslts/src/runtime/collections/complex/namespace/ns2_root.asl b/tests/aslts/src/runtime/collections/complex/namespace/ns2_root.asl
index 95f573731..af53ce68f 100644
--- a/tests/aslts/src/runtime/collections/complex/namespace/ns2_root.asl
+++ b/tests/aslts/src/runtime/collections/complex/namespace/ns2_root.asl
@@ -93,13 +93,13 @@ Method(m203, 1, Serialized)
 	Store(Add(DerefOf(Index(d000.pp00, 1)), m001()), Local0)
 
 	if (LNotEqual(Local0, 0x87654321)) {
-		err(ts, z156, 0x007, 0, 0, Local0, 0x87654321)
+		err(ts, z156, __LINE__, 0, 0, Local0, 0x87654321)
 	}
 
 	Store(DerefOf(Index(d000.pp00, 1)), Local0)
 
 	if (LNotEqual(Local0, 0x80000000)) {
-		err(ts, z156, 0x008, 0, 0, Local0, 0x80000000)
+		err(ts, z156, __LINE__, 0, 0, Local0, 0x80000000)
 	}
 
 	CH03(ts, z156, 0x009, 0, 0)
@@ -176,13 +176,13 @@ Method(m205, 1, Serialized)
 	Store(Add(DerefOf(Index(d000.bf00, 1)), m001()), Local0)
 
 	if (LNotEqual(Local0, 0x87654321)) {
-		err(ts, z156, 0x00f, 0, 0, Local0, 0x87654321)
+		err(ts, z156, __LINE__, 0, 0, Local0, 0x87654321)
 	}
 
 	Store(DerefOf(Index(d000.bf00, 1)), Local0)
 
 	if (LNotEqual(Local0, 0x80000000)) {
-		err(ts, z156, 0x010, 0, 0, Local0, 0x80000000)
+		err(ts, z156, __LINE__, 0, 0, Local0, 0x80000000)
 	}
 
 	CH03(ts, z156, 0x011, 0, 0)
diff --git a/tests/aslts/src/runtime/collections/complex/namespace/ns3.asl b/tests/aslts/src/runtime/collections/complex/namespace/ns3.asl
index a91885934..0edd763c2 100644
--- a/tests/aslts/src/runtime/collections/complex/namespace/ns3.asl
+++ b/tests/aslts/src/runtime/collections/complex/namespace/ns3.asl
@@ -48,7 +48,7 @@ Method(m300,, Serialized)
 		Store(DerefOf(Index(arg0, 0)), Local0)
 
 		if (LNotEqual(Local0, 0x11112222)) {
-			err(ts, z157, 0x000, 0, 0, Local0, 0x11112222)
+			err(ts, z157, __LINE__, 0, 0, Local0, 0x11112222)
 		}
 	}
 
@@ -57,7 +57,7 @@ Method(m300,, Serialized)
 	Store(DerefOf(Index(p000, 0)), Local0)
 
 	if (LNotEqual(Local0, 0x11112222)) {
-		err(ts, z157, 0x001, 0, 0, Local0, 0x11112222)
+		err(ts, z157, __LINE__, 0, 0, Local0, 0x11112222)
 	}
 
 	CH03(ts, z157, 0x002, 0, 0)
@@ -80,7 +80,7 @@ Method(m301,, Serialized)
 		Store(DerefOf(Index(arg0, 0)), Local0)
 
 		if (LNotEqual(Local0, 0x67)) {
-			err(ts, z157, 0x003, 0, 0, Local0, 0x67)
+			err(ts, z157, __LINE__, 0, 0, Local0, 0x67)
 		}
 	}
 
@@ -89,7 +89,7 @@ Method(m301,, Serialized)
 	Store(DerefOf(Index(b000, 0)), Local0)
 
 	if (LNotEqual(Local0, 0x67)) {
-		err(ts, z157, 0x004, 0, 0, Local0, 0x67)
+		err(ts, z157, __LINE__, 0, 0, Local0, 0x67)
 	}
 
 	CH03(ts, z157, 0x005, 0, 0)
@@ -111,7 +111,7 @@ Method(m302,, Serialized)
 		Store(DerefOf(Index(arg0, 0)), Local0)
 
 		if (LNotEqual(Local0, 0x38)) {
-			err(ts, z157, 0x006, 0, 0, Local0, 0x38)
+			err(ts, z157, __LINE__, 0, 0, Local0, 0x38)
 		}
 	}
 
@@ -120,7 +120,7 @@ Method(m302,, Serialized)
 	Store(DerefOf(Index(s000, 0)), Local0)
 
 	if (LNotEqual(Local0, 0x38)) {
-		err(ts, z157, 0x007, 0, 0, Local0, 0x38)
+		err(ts, z157, __LINE__, 0, 0, Local0, 0x38)
 	}
 
 	CH03(ts, z157, 0x008, 0, 0)
@@ -189,13 +189,13 @@ Method(m303, 1, Serialized)
 		Store(Add(DerefOf(Index(arg0, 1)), m001(arg0)), Local0)
 
 		if (LNotEqual(Local0, 0x87654321)) {
-			err(ts, z157, 0x00a, 0, 0, Local0, 0x87654321)
+			err(ts, z157, __LINE__, 0, 0, Local0, 0x87654321)
 		}
 
 		Store(DerefOf(Index(arg0, 1)), Local1)
 
 		if (LNotEqual(Local1, 0x80000000)) {
-			err(ts, z157, 0x00b, 0, 0, Local1, 0x80000000)
+			err(ts, z157, __LINE__, 0, 0, Local1, 0x80000000)
 		}
 
 		CH03(ts, z157, 0x00c, 0, 0)
@@ -206,13 +206,13 @@ Method(m303, 1, Serialized)
 	Store(m000(pp00, arg0), Local0)
 
 	if (LNotEqual(Local0, 0x87654321)) {
-		err(ts, z157, 0x00d, 0, 0, Local0, 0x87654321)
+		err(ts, z157, __LINE__, 0, 0, Local0, 0x87654321)
 	}
 
 	Store(DerefOf(Index(pp00, 1)), Local0)
 
 	if (LNotEqual(Local0, 0x80000000)) {
-		err(ts, z157, 0x00e, 0, 0, Local0, 0x80000000)
+		err(ts, z157, __LINE__, 0, 0, Local0, 0x80000000)
 	}
 
 	CH03(ts, z157, 0x00f, 0, 0)
@@ -244,13 +244,13 @@ Method(m304,, Serialized)
 		Store(Add(DerefOf(Index(arg0, 1)), m001(arg0)), Local0)
 
 		if (LNotEqual(Local0, 0x065013BA)) {
-			err(ts, z157, 0x010, 0, 0, Local0, 0x065013BA)
+			err(ts, z157, __LINE__, 0, 0, Local0, 0x065013BA)
 		}
 
 		Store(DerefOf(Index(arg0, 1)), Local1)
 
 		if (LNotEqual(Local1, 0x00100064)) {
-			err(ts, z157, 0x011, 0, 0, Local1, 0x00100064)
+			err(ts, z157, __LINE__, 0, 0, Local1, 0x00100064)
 		}
 		Return (Local0)
 	}
@@ -258,13 +258,13 @@ Method(m304,, Serialized)
 	Store(m000(pp00), Local0)
 
 	if (LNotEqual(Local0, 0x065013BA)) {
-		err(ts, z157, 0x012, 0, 0, Local0, 0x065013BA)
+		err(ts, z157, __LINE__, 0, 0, Local0, 0x065013BA)
 	}
 
 	Store(DerefOf(Index(pp00, 1)), Local1)
 
 	if (LNotEqual(Local1, 0x00100064)) {
-		err(ts, z157, 0x013, 0, 0, Local1, 0x00100064)
+		err(ts, z157, __LINE__, 0, 0, Local1, 0x00100064)
 	}
 
 	CH03(ts, z157, 0x014, 0, 0)
@@ -330,13 +330,13 @@ Method(m305,, Serialized)
 		Store(Add(arg0, m001()), Local0)
 
 		if (LNotEqual(Local0, 0x87654321)) {
-			err(ts, z157, 0x016, 0, 0, Local0, 0x87654321)
+			err(ts, z157, __LINE__, 0, 0, Local0, 0x87654321)
 		}
 
 		Store(0x0000001, Local1)
 
 		if (LNotEqual(arg0, Local1)) {
-			err(ts, z157, 0x017, 0, 0, arg0, Local1)
+			err(ts, z157, __LINE__, 0, 0, arg0, Local1)
 		}
 
 		CH03(ts, z157, 0x018, 0, 0)
@@ -347,13 +347,13 @@ Method(m305,, Serialized)
 	Store(m000(bf00), Local0)
 
 	if (LNotEqual(Local0, 0x87654321)) {
-		err(ts, z157, 0x019, 0, 0, Local0, 0x87654321)
+		err(ts, z157, __LINE__, 0, 0, Local0, 0x87654321)
 	}
 
 	Store(0xabcdef70, Local1)
 
 	if (LNotEqual(bf00, Local1)) {
-		err(ts, z157, 0x01a, 0, 0, bf00, Local1)
+		err(ts, z157, __LINE__, 0, 0, bf00, Local1)
 	}
 
 	CH03(ts, z157, 0x01b, 0, 0)
@@ -420,13 +420,13 @@ Method(m306,, Serialized)
 		Store(Add(arg0, m001()), Local0)
 
 		if (LNotEqual(Local0, 0x87654321)) {
-			err(ts, z157, 0x01d, 0, 0, Local0, 0x87654321)
+			err(ts, z157, __LINE__, 0, 0, Local0, 0x87654321)
 		}
 
 		Store(0x0000001, Local1)
 
 		if (LNotEqual(arg0, Local1)) {
-			err(ts, z157, 0x01e, 0, 0, arg0, Local1)
+			err(ts, z157, __LINE__, 0, 0, arg0, Local1)
 		}
 
 		CH03(ts, z157, 0x01f, 0, 0)
@@ -437,13 +437,13 @@ Method(m306,, Serialized)
 	Store(m000(f000), Local0)
 
 	if (LNotEqual(Local0, 0x87654321)) {
-		err(ts, z157, 0x020, 0, 0, Local0, 0x87654321)
+		err(ts, z157, __LINE__, 0, 0, Local0, 0x87654321)
 	}
 
 	Store(0xabcdef70, Local1)
 
 	if (LNotEqual(f000, Local1)) {
-		err(ts, z157, 0x021, 0, 0, f000, Local1)
+		err(ts, z157, __LINE__, 0, 0, f000, Local1)
 	}
 
 	CH03(ts, z157, 0x022, 0, 0)
@@ -511,13 +511,13 @@ Method(m307,, Serialized)
 		Store(Add(arg0, m001()), Local0)
 
 		if (LNotEqual(Local0, 0x87654321)) {
-			err(ts, z157, 0x024, 0, 0, Local0, 0x87654321)
+			err(ts, z157, __LINE__, 0, 0, Local0, 0x87654321)
 		}
 
 		Store(0x0000001, Local1)
 
 		if (LNotEqual(arg0, Local1)) {
-			err(ts, z157, 0x025, 0, 0, arg0, Local1)
+			err(ts, z157, __LINE__, 0, 0, arg0, Local1)
 		}
 
 		CH03(ts, z157, 0x026, 0, 0)
@@ -528,13 +528,13 @@ Method(m307,, Serialized)
 	Store(m000(bnk0), Local0)
 
 	if (LNotEqual(Local0, 0x87654321)) {
-		err(ts, z157, 0x027, 0, 0, Local0, 0x87654321)
+		err(ts, z157, __LINE__, 0, 0, Local0, 0x87654321)
 	}
 
 	Store(0xabcdef70, Local1)
 
 	if (LNotEqual(bnk0, Local1)) {
-		err(ts, z157, 0x028, 0, 0, bnk0, Local1)
+		err(ts, z157, __LINE__, 0, 0, bnk0, Local1)
 	}
 
 	CH03(ts, z157, 0x029, 0, 0)
@@ -602,13 +602,13 @@ Method(m308,, Serialized)
 		Store(Add(arg0, m001()), Local0)
 
 		if (LNotEqual(Local0, 0x87654321)) {
-			err(ts, z157, 0x02b, 0, 0, Local0, 0x87654321)
+			err(ts, z157, __LINE__, 0, 0, Local0, 0x87654321)
 		}
 
 		Store(0x0000001, Local1)
 
 		if (LNotEqual(arg0, Local1)) {
-			err(ts, z157, 0x02c, 0, 0, arg0, Local1)
+			err(ts, z157, __LINE__, 0, 0, arg0, Local1)
 		}
 
 		CH03(ts, z157, 0x02d, 0, 0)
@@ -619,13 +619,13 @@ Method(m308,, Serialized)
 	Store(m000(if00), Local0)
 
 	if (LNotEqual(Local0, 0x87654321)) {
-		err(ts, z157, 0x02e, 0, 0, Local0, 0x87654321)
+		err(ts, z157, __LINE__, 0, 0, Local0, 0x87654321)
 	}
 
 	Store(0xabcdef70, Local1)
 
 	if (LNotEqual(if00, Local1)) {
-		err(ts, z157, 0x02f, 0, 0, if00, Local1)
+		err(ts, z157, __LINE__, 0, 0, if00, Local1)
 	}
 
 	CH03(ts, z157, 0x030, 0, 0)
@@ -692,7 +692,7 @@ Method(m309, 1, Serialized)
 		Store(Add(DerefOf(Index(arg0, 1)), m001(arg0)), Local0)
 
 		if (LNotEqual(Local0, 0x24)) {
-			err(ts, z157, 0x032, 0, 0, Local0, 0x24)
+			err(ts, z157, __LINE__, 0, 0, Local0, 0x24)
 		}
 
 		Store(DerefOf(Index(arg0, 1)), Local1)
@@ -704,7 +704,7 @@ Method(m309, 1, Serialized)
 		}
 
 		if (LNotEqual(Local1, Local2)) {
-			err(ts, z157, 0x033, 0, 0, Local1, Local2)
+			err(ts, z157, __LINE__, 0, 0, Local1, Local2)
 		}
 
 		CH03(ts, z157, 0x034, 0, 0)
@@ -715,7 +715,7 @@ Method(m309, 1, Serialized)
 	Store(m000(b000, arg0), Local0)
 
 	if (LNotEqual(Local0, 0x24)) {
-		err(ts, z157, 0x035, 0, 0, Local0, 0x24)
+		err(ts, z157, __LINE__, 0, 0, Local0, 0x24)
 	}
 
 	Store(DerefOf(Index(b000, 1)), Local1)
@@ -727,7 +727,7 @@ Method(m309, 1, Serialized)
 	}
 
 	if (LNotEqual(Local1, Local2)) {
-		err(ts, z157, 0x036, 0, 0, Local1, Local2)
+		err(ts, z157, __LINE__, 0, 0, Local1, Local2)
 	}
 
 	CH03(ts, z157, 0x037, 0, 0)
@@ -794,7 +794,7 @@ Method(m30a, 1, Serialized)
 		Store(Add(DerefOf(Index(arg0, 1)), m001(arg0)), Local0)
 
 		if (LNotEqual(Local0, 0x24)) {
-			err(ts, z157, 0x039, 0, 0, Local0, 0x24)
+			err(ts, z157, __LINE__, 0, 0, Local0, 0x24)
 		}
 
 		Store(DerefOf(Index(arg0, 1)), Local1)
@@ -806,7 +806,7 @@ Method(m30a, 1, Serialized)
 		}
 
 		if (LNotEqual(Local1, Local2)) {
-			err(ts, z157, 0x03a, 0, 0, Local1, Local2)
+			err(ts, z157, __LINE__, 0, 0, Local1, Local2)
 		}
 
 		CH03(ts, z157, 0x03b, 0, 0)
@@ -817,7 +817,7 @@ Method(m30a, 1, Serialized)
 	Store(m000(s000, arg0), Local0)
 
 	if (LNotEqual(Local0, 0x24)) {
-		err(ts, z157, 0x03c, 0, 0, Local0, 0x24)
+		err(ts, z157, __LINE__, 0, 0, Local0, 0x24)
 	}
 
 	Store(DerefOf(Index(s000, 1)), Local1)
@@ -829,7 +829,7 @@ Method(m30a, 1, Serialized)
 	}
 
 	if (LNotEqual(Local1, Local2)) {
-		err(ts, z157, 0x03d, 0, 0, Local1, Local2)
+		err(ts, z157, __LINE__, 0, 0, Local1, Local2)
 	}
 
 	CH03(ts, z157, 0x03e, 0, 0)
@@ -903,7 +903,7 @@ Method(m30b, 1, Serialized)
 		Store(Add(bf00, m001()), Local0)
 
 		if (LNotEqual(Local0, 0x87654321)) {
-			err(ts, z157, 0x040, 0, 0, Local0, 0x87654321)
+			err(ts, z157, __LINE__, 0, 0, Local0, 0x87654321)
 		}
 
 		if (arg1) {
@@ -913,7 +913,7 @@ Method(m30b, 1, Serialized)
 		}
 
 		if (LNotEqual(bf00, Local1)) {
-			err(ts, z157, 0x041, 0, 0, bf00, Local1)
+			err(ts, z157, __LINE__, 0, 0, bf00, Local1)
 		}
 
 		CH03(ts, z157, 0x042, 0, 0)
@@ -924,7 +924,7 @@ Method(m30b, 1, Serialized)
 	Store(m000(0, arg0), Local0)
 
 	if (LNotEqual(Local0, 0x87654321)) {
-		err(ts, z157, 0x043, 0, 0, Local0, 0x87654321)
+		err(ts, z157, __LINE__, 0, 0, Local0, 0x87654321)
 	}
 
 	CH03(ts, z157, 0x044, 0, 0)
diff --git a/tests/aslts/src/runtime/collections/complex/namespace/ns4.asl b/tests/aslts/src/runtime/collections/complex/namespace/ns4.asl
index e245d1a6f..f914fbdfb 100644
--- a/tests/aslts/src/runtime/collections/complex/namespace/ns4.asl
+++ b/tests/aslts/src/runtime/collections/complex/namespace/ns4.asl
@@ -100,11 +100,11 @@ Method(m401, 1, Serialized)
 	Store(MAdd(i000, m001()), Local0)
 
 	if (LNotEqual(Local0, 0x87654321)) {
-		err(ts, z158, 0x001, 0, 0, Local0, 0x87654321)
+		err(ts, z158, __LINE__, 0, 0, Local0, 0x87654321)
 	}
 
 	if (LNotEqual(i000, 0x80000000)) {
-		err(ts, z158, 0x002, 0, 0, i000, 0x80000000)
+		err(ts, z158, __LINE__, 0, 0, i000, 0x80000000)
 	}
 
 	CH03(ts, z158, 0x003, 0, 0)
diff --git a/tests/aslts/src/runtime/collections/complex/namespace/ns5.asl b/tests/aslts/src/runtime/collections/complex/namespace/ns5.asl
index 6704e14d3..99b7c25e5 100644
--- a/tests/aslts/src/runtime/collections/complex/namespace/ns5.asl
+++ b/tests/aslts/src/runtime/collections/complex/namespace/ns5.asl
@@ -37,7 +37,7 @@ Method(m500)
 	Store(DerefOf(Index(d000.p000, 0)), Local0)
 
 	if (LNotEqual(Local0, 0x11112222)) {
-		err(ts, z159, 0x000, 0, 0, Local0, 0x11112222)
+		err(ts, z159, __LINE__, 0, 0, Local0, 0x11112222)
 	}
 
 	CH03(ts, z159, 0x100, 0, 0)
@@ -60,7 +60,7 @@ Method(m501)
 	Store(DerefOf(Index(d000.b000, 0)), Local0)
 
 	if (LNotEqual(Local0, 0x67)) {
-		err(ts, z159, 0x001, 0, 0, Local0, 0x67)
+		err(ts, z159, __LINE__, 0, 0, Local0, 0x67)
 	}
 
 	CH03(ts, z159, 0x101, 0, 0)
@@ -83,7 +83,7 @@ Method(m502)
 	Store(DerefOf(Index(d000.s000, 0)), Local0)
 
 	if (LNotEqual(Local0, 0x38)) {
-		err(ts, z159, 0x002, 0, 0, Local0, 0x38)
+		err(ts, z159, __LINE__, 0, 0, Local0, 0x38)
 	}
 
 	CH03(ts, z159, 0x102, 0, 0)
@@ -152,13 +152,13 @@ Method(m503, 1)
 	Store(Add(DerefOf(Index(d000.pp00, 1)), m001()), Local0)
 
 	if (LNotEqual(Local0, 0x87654321)) {
-		err(ts, z159, 0x003, 0, 0, Local0, 0x87654321)
+		err(ts, z159, __LINE__, 0, 0, Local0, 0x87654321)
 	}
 
 	Store(DerefOf(Index(d000.pp00, 1)), Local0)
 
 	if (LNotEqual(Local0, 0x80000000)) {
-		err(ts, z159, 0x004, 0, 0, Local0, 0x80000000)
+		err(ts, z159, __LINE__, 0, 0, Local0, 0x80000000)
 	}
 
 	CH03(ts, z159, 0x104, 0, 0)
@@ -192,13 +192,13 @@ Method(m504)
 	Store(Add(DerefOf(Index(d000.pp00, 1)), m001()), Local0)
 
 	if (LNotEqual(Local0, 0x065013BA)) {
-		err(ts, z159, 0x005, 0, 0, Local0, 0x065013BA)
+		err(ts, z159, __LINE__, 0, 0, Local0, 0x065013BA)
 	}
 
 	Store(DerefOf(Index(d000.pp00, 1)), Local0)
 
 	if (LNotEqual(Local0, 0x00100064)) {
-		err(ts, z159, 0x006, 0, 0, Local0, 0x00100064)
+		err(ts, z159, __LINE__, 0, 0, Local0, 0x00100064)
 	}
 
 	CH03(ts, z159, 0x105, 0, 0)
@@ -275,13 +275,13 @@ Method(m505, 1)
 	Store(Add(DerefOf(Index(d000.bf00, 1)), m001()), Local0)
 
 	if (LNotEqual(Local0, 0x87654321)) {
-		err(ts, z159, 0x007, 0, 0, Local0, 0x87654321)
+		err(ts, z159, __LINE__, 0, 0, Local0, 0x87654321)
 	}
 
 	Store(DerefOf(Index(d000.bf00, 1)), Local0)
 
 	if (LNotEqual(Local0, 0x80000000)) {
-		err(ts, z159, 0x008, 0, 0, Local0, 0x80000000)
+		err(ts, z159, __LINE__, 0, 0, Local0, 0x80000000)
 	}
 
 	CH03(ts, z159, 0x107, 0, 0)
diff --git a/tests/aslts/src/runtime/collections/complex/namespace/ns6.asl b/tests/aslts/src/runtime/collections/complex/namespace/ns6.asl
index 6d60f772c..d80b77777 100644
--- a/tests/aslts/src/runtime/collections/complex/namespace/ns6.asl
+++ b/tests/aslts/src/runtime/collections/complex/namespace/ns6.asl
@@ -10,14 +10,14 @@ Method(m600,, Serialized)
 	{
 		Store(0x11223344, i000)
 		if (LNotEqual(arg0, 0xabcd0000)) {
-			err(ts, z160, 0x000, 0, 0, arg0, 0xabcd0000)
+			err(ts, z160, __LINE__, 0, 0, arg0, 0xabcd0000)
 		}
 	}
 
 	m000(i000)
 
 	if (LNotEqual(i000, 0x11223344)) {
-		err(ts, z160, 0x001, 0, 0, i000, 0x11223344)
+		err(ts, z160, __LINE__, 0, 0, i000, 0x11223344)
 	}
 }