diff options
| author | Erik Schmauss <erik.schmauss@intel.com> | 2018-02-14 14:40:27 -0800 |
|---|---|---|
| committer | Erik Schmauss <erik.schmauss@intel.com> | 2018-02-14 16:51:09 -0800 |
| commit | e4af07e9b948bb38f0348e72c55d1f3e5c407f48 (patch) | |
| tree | 09b7b872844f54931687dd5b49bcc1c5a008de20 /tests/aslts/src/runtime/collections/complex | |
| parent | 17ec2f46a66dd2591013631986bedc41068650af (diff) | |
| download | acpica-e4af07e9b948bb38f0348e72c55d1f3e5c407f48.tar.gz | |
ASLTS: adding macros to ERR functions
This change replaces the first parameter of ERR with __METHOD__ in
bdemo testcases and replaces the third parameter of ERR with
__LINE__. The __METHOD macro evaluates to the current method and
__LINE__ evaluates to the current line number during compilation. By
doing these macros help clarify error messages in ASLTS.
Signed-off-by: Erik Schmauss <erik.schmauss@intel.com>
Diffstat (limited to 'tests/aslts/src/runtime/collections/complex')
29 files changed, 673 insertions, 673 deletions
diff --git a/tests/aslts/src/runtime/collections/complex/misc/misc.asl b/tests/aslts/src/runtime/collections/complex/misc/misc.asl index bd3e9a904..a31fd9e30 100644 --- a/tests/aslts/src/runtime/collections/complex/misc/misc.asl +++ b/tests/aslts/src/runtime/collections/complex/misc/misc.asl @@ -57,7 +57,7 @@ If ((Local0 != 0x01)) { - ERR (Arg0, Z054, 0x3B, 0x00, 0x00, Local0, 0x00) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local0, 0x00) } } @@ -74,14 +74,14 @@ M111 (Local0) If ((Local0 != 0x00)) { - ERR (Arg0, Z054, 0x4A, 0x00, 0x00, Local0, 0x00) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local0, 0x00) } Local0 = 0x00 Local5 = Concatenate ("qwertyuiop", Local0) If ((Local0 != 0x00)) { - ERR (Arg0, Z054, 0x50, 0x00, 0x00, Local0, 0x00) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local0, 0x00) } } @@ -98,7 +98,7 @@ Local0 = ObjectType (RefOf (F000)) If ((Local0 != 0x05)) { - ERR (Arg0, Z054, 0x60, 0x00, 0x00, Local0, 0x00) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local0, 0x00) } } @@ -129,18 +129,18 @@ BNK0 = 0x00 If ((BNK0 != 0x00)) { - ERR (Arg0, Z054, 0x7B, 0x00, 0x00, BNK0, 0x00) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, BNK0, 0x00) } BF00 = 0x87 If ((BNK0 != 0x00)) { - ERR (Arg0, Z054, 0x80, 0x00, 0x00, BNK0, 0x00) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, BNK0, 0x00) } If ((BF00 != 0x87)) { - ERR (Arg0, Z054, 0x84, 0x00, 0x00, BF00, 0x87) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, BF00, 0x87) } /* Deal with 1-th bank layout: */ @@ -148,7 +148,7 @@ BNK0 = 0x01 If ((BNK0 != 0x01)) { - ERR (Arg0, Z054, 0x8B, 0x00, 0x00, BNK0, 0x01) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, BNK0, 0x01) } BF01 = 0x96 @@ -156,13 +156,13 @@ { If ((BNK0 != 0x01)) { - ERR (Arg0, Z054, 0x92, 0x00, 0x00, BNK0, 0x01) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, BNK0, 0x01) } } If ((BF01 != 0x96)) { - ERR (Arg0, Z054, 0x97, 0x00, 0x00, BF01, 0x96) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, BF01, 0x96) } } @@ -177,7 +177,7 @@ Local1 = ObjectType (Local0) If ((Local1 != C00B)) { - ERR (Arg0, Z054, 0xA2, 0x00, 0x00, Local1, 0x00) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local1, 0x00) } ToBuffer (Local0, Local2) @@ -185,7 +185,7 @@ Local3 = ObjectType (Local0) If ((Local3 != C00B)) { - ERR (Arg0, Z054, 0xAC, 0x00, 0x00, Local3, 0x00) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local3, 0x00) } } @@ -212,7 +212,7 @@ Local1 = ObjectType (Local0) If ((Local1 != 0x00)) { - ERR (Arg0, Z054, 0xC9, 0x00, 0x00, Local1, 0x00) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local1, 0x00) } CH03 (__METHOD__, Z054, 0x0101, 0xCC, 0x00) @@ -242,7 +242,7 @@ Local2 = ObjectType (Local1) If ((Local2 != 0x03)) { - ERR (Arg0, Z054, 0xE9, 0x00, 0x00, Local2, 0x00) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local2, 0x00) } Debug = "================ 2:" @@ -345,7 +345,7 @@ /* Store("ERROR 0: m121, after Return !!!", Debug) */ } - ERR (Arg0, Z054, 0x0167, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, 0x00, 0x00) Return (0x5678) } @@ -356,10 +356,10 @@ Return ( /* ASL-compiler DOESN'T report Warning in this case!!! */ /* And the Store operator below is actually processed!!! */ Zero) - ERR (Arg0, Z054, 0x0175, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, 0x00, 0x00) } - ERR (Arg0, Z054, 0x0178, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, 0x00, 0x00) Return (Zero) } @@ -400,7 +400,7 @@ Zero) 0x01, 0x02, 0x00, 0x00 // .... })) { - ERR (Arg0, Z054, 0x019E, 0x00, 0x00, BUF0, Buffer (0x04) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, BUF0, Buffer (0x04) { 0x01, 0x02, 0x00, 0x00 // .... }) @@ -431,13 +431,13 @@ Zero) Local0 = ObjectType (Arg1) If ((Local0 != Arg2)) { - ERR (Arg0, Z054, 0x01B9, 0x00, 0x00, Local0, Arg2) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local0, Arg2) } Local0 = SizeOf (Arg1) If ((Local0 != Arg3)) { - ERR (Arg0, Z054, 0x01BE, 0x00, 0x00, Local0, Arg3) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local0, Arg3) } } @@ -446,37 +446,37 @@ Zero) Local0 = ObjectType (BF00) If ((Local0 != 0x0E)) { - ERR (Arg0, Z054, 0x01C6, 0x00, 0x00, Local0, 0x0E) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local0, 0x0E) } Local0 = ObjectType (BF01) If ((Local0 != 0x0E)) { - ERR (Arg0, Z054, 0x01CA, 0x00, 0x00, Local0, 0x0E) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local0, 0x0E) } Local0 = ObjectType (BF02) If ((Local0 != 0x0E)) { - ERR (Arg0, Z054, 0x01CE, 0x00, 0x00, Local0, 0x0E) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local0, 0x0E) } Local0 = ObjectType (BF03) If ((Local0 != 0x0E)) { - ERR (Arg0, Z054, 0x01D2, 0x00, 0x00, Local0, 0x0E) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local0, 0x0E) } Local0 = ObjectType (BF04) If ((Local0 != 0x0E)) { - ERR (Arg0, Z054, 0x01D6, 0x00, 0x00, Local0, 0x0E) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local0, 0x0E) } Local0 = ObjectType (BF05) If ((Local0 != 0x0E)) { - ERR (Arg0, Z054, 0x01DA, 0x00, 0x00, Local0, 0x0E) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local0, 0x0E) } If (F64) @@ -528,13 +528,13 @@ Zero) Local0 = ObjectType (Arg1) If ((Local0 != Arg2)) { - ERR (Arg0, Z054, 0x0208, 0x00, 0x00, Local0, Arg2) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local0, Arg2) } Local0 = SizeOf (Arg1) If ((Local0 != Arg3)) { - ERR (Arg0, Z054, 0x020D, 0x00, 0x00, Local0, Arg3) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local0, Arg3) } } @@ -543,37 +543,37 @@ Zero) Local0 = ObjectType (F000) If ((Local0 != 0x05)) { - ERR (Arg0, Z054, 0x0215, 0x00, 0x00, Local0, 0x05) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local0, 0x05) } Local0 = ObjectType (F001) If ((Local0 != 0x05)) { - ERR (Arg0, Z054, 0x0219, 0x00, 0x00, Local0, 0x05) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local0, 0x05) } Local0 = ObjectType (F002) If ((Local0 != 0x05)) { - ERR (Arg0, Z054, 0x021D, 0x00, 0x00, Local0, 0x05) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local0, 0x05) } Local0 = ObjectType (F003) If ((Local0 != 0x05)) { - ERR (Arg0, Z054, 0x0221, 0x00, 0x00, Local0, 0x05) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local0, 0x05) } Local0 = ObjectType (F004) If ((Local0 != 0x05)) { - ERR (Arg0, Z054, 0x0225, 0x00, 0x00, Local0, 0x05) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local0, 0x05) } Local0 = ObjectType (F005) If ((Local0 != 0x05)) { - ERR (Arg0, Z054, 0x0229, 0x00, 0x00, Local0, 0x05) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local0, 0x05) } If (F64) @@ -652,13 +652,13 @@ Zero) Local0 = ObjectType (Local1) If ((Local0 != Arg2)) { - ERR (Arg0, Z054, 0x0269, 0x00, 0x00, Local0, Arg2) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local0, Arg2) } Local0 = SizeOf (Local1) If ((Local0 != Arg3)) { - ERR (Arg0, Z054, 0x026E, 0x00, 0x00, Local0, Arg3) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local0, Arg3) } } @@ -744,13 +744,13 @@ Zero) Local0 = ObjectType (Local1) If ((Local0 != Arg2)) { - ERR (Arg0, Z054, 0x02B2, 0x00, 0x00, Local0, Arg2) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local0, Arg2) } Local0 = SizeOf (Local1) If ((Local0 != Arg3)) { - ERR (Arg0, Z054, 0x02B7, 0x00, 0x00, Local0, Arg3) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local0, Arg3) } } @@ -859,7 +859,7 @@ Zero) Local0 = ObjectType (M000) If ((Local0 != C010)) { - ERR (Arg0, Z054, 0x031E, 0x00, 0x00, Local0, C010) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local0, C010) } /* Bug 81. */ /* @@ -898,12 +898,12 @@ Zero) Local0 [0x03] = 0x61 If ((Local0 != "Strang")) { - ERR (Arg0, Z054, 0x0349, 0x00, 0x00, Local0, "Strang") + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local0, "Strang") } If ((S000 != "String")) { - ERR (Arg0, Z054, 0x034C, 0x00, 0x00, S000, "String") + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, S000, "String") } } @@ -920,7 +920,7 @@ Zero) 0xA0, 0xA1, 0xA2, 0x61, 0xA4, 0xA5 // ...a.. })) { - ERR (Arg0, Z054, 0x0359, 0x00, 0x00, Local0, Buffer (0x06) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local0, Buffer (0x06) { 0xA0, 0xA1, 0xA2, 0x61, 0xA4, 0xA5 // ...a.. }) @@ -931,7 +931,7 @@ Zero) 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5 // ...... })) { - ERR (Arg0, Z054, 0x035C, 0x00, 0x00, B000, Buffer (0x06) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, B000, Buffer (0x06) { 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5 // ...... }) @@ -953,62 +953,62 @@ Zero) Local0 [0x03] = 0x61 If ((DerefOf (Local0 [0x00]) != 0xFFF0)) { - ERR (Arg0, Z054, 0x0369, 0x00, 0x00, DerefOf (Local0 [0x00]), 0xFFF0) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, DerefOf (Local0 [0x00]), 0xFFF0) } If ((DerefOf (Local0 [0x01]) != 0xFFF1)) { - ERR (Arg0, Z054, 0x036C, 0x00, 0x00, DerefOf (Local0 [0x01]), 0xFFF1) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, DerefOf (Local0 [0x01]), 0xFFF1) } If ((DerefOf (Local0 [0x02]) != 0xFFF2)) { - ERR (Arg0, Z054, 0x036F, 0x00, 0x00, DerefOf (Local0 [0x02]), 0xFFF2) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, DerefOf (Local0 [0x02]), 0xFFF2) } If ((DerefOf (Local0 [0x03]) != 0x61)) { - ERR (Arg0, Z054, 0x0372, 0x00, 0x00, DerefOf (Local0 [0x03]), 0x61) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, DerefOf (Local0 [0x03]), 0x61) } If ((DerefOf (Local0 [0x04]) != 0xFFF4)) { - ERR (Arg0, Z054, 0x0375, 0x00, 0x00, DerefOf (Local0 [0x04]), 0xFFF4) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, DerefOf (Local0 [0x04]), 0xFFF4) } If ((DerefOf (Local0 [0x05]) != 0xFFF5)) { - ERR (Arg0, Z054, 0x0378, 0x00, 0x00, DerefOf (Local0 [0x05]), 0xFFF5) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, DerefOf (Local0 [0x05]), 0xFFF5) } If ((DerefOf (P000 [0x00]) != 0xFFF0)) { - ERR (Arg0, Z054, 0x037C, 0x00, 0x00, DerefOf (P000 [0x00]), 0xFFF0) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, DerefOf (P000 [0x00]), 0xFFF0) } If ((DerefOf (P000 [0x01]) != 0xFFF1)) { - ERR (Arg0, Z054, 0x037F, 0x00, 0x00, DerefOf (P000 [0x01]), 0xFFF1) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, DerefOf (P000 [0x01]), 0xFFF1) } If ((DerefOf (P000 [0x02]) != 0xFFF2)) { - ERR (Arg0, Z054, 0x0382, 0x00, 0x00, DerefOf (P000 [0x02]), 0xFFF2) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, DerefOf (P000 [0x02]), 0xFFF2) } If ((DerefOf (P000 [0x03]) != 0xFFF3)) { - ERR (Arg0, Z054, 0x0385, 0x00, 0x00, DerefOf (P000 [0x03]), 0xFFF3) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, DerefOf (P000 [0x03]), 0xFFF3) } If ((DerefOf (P000 [0x04]) != 0xFFF4)) { - ERR (Arg0, Z054, 0x0388, 0x00, 0x00, DerefOf (P000 [0x04]), 0xFFF4) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, DerefOf (P000 [0x04]), 0xFFF4) } If ((DerefOf (P000 [0x05]) != 0xFFF5)) { - ERR (Arg0, Z054, 0x038B, 0x00, 0x00, DerefOf (P000 [0x05]), 0xFFF5) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, DerefOf (P000 [0x05]), 0xFFF5) } } @@ -1172,7 +1172,7 @@ Zero) ToInteger (Local1, Local0) If ((Local0 != 0x00)) { - ERR (Arg0, Z054, 0x040C, 0x00, 0x00, Local0, 0x00) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local0, 0x00) } CH04 ("mf86", 0x00, 0xFF, Z054, 0x040F, 0x00, 0x00) @@ -1184,14 +1184,14 @@ Zero) Local0 = ("0x0xabcdef" + 0x00010234) If ((Local0 != 0x00010234)) { - ERR (Arg0, Z054, 0x0418, 0x00, 0x00, Local0, 0x00010234) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local0, 0x00010234) } CH03 ("mf87", Z054, 0x01, 0x041B, 0x00) Local0 = (0x00010234 + "0x0xabcdef") If ((Local0 != 0x00010234)) { - ERR (Arg0, Z054, 0x041F, 0x00, 0x00, Local0, 0x00010234) + ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local0, 0x00010234) } CH03 ("mf87", Z054, 0x02, 0x0422, 0x00) @@ -1219,7 +1219,7 @@ Zero) Local0 = MM00 () If ((Local0 != 0xABCD0000)) { - ERR (__METHOD__, Z054, 0x043A, 0x00, 0x00, Local0, 0xABCD0000) + ERR (__METHOD__, Z054, __LINE__, 0x00, 0x00, Local0, 0xABCD0000) } } @@ -1233,7 +1233,7 @@ Zero) Local1 = ObjectType (Local0) If ((Local1 != C010)) { - ERR (__METHOD__, Z054, 0x0446, 0x00, 0x00, Local1, C010) + ERR (__METHOD__, Z054, __LINE__, 0x00, 0x00, Local1, C010) } } Else @@ -1252,7 +1252,7 @@ Zero) Local1 = ObjectType (Local0) If ((Local1 != C010)) { - ERR (__METHOD__, Z054, 0x0455, 0x00, 0x00, Local1, C010) + ERR (__METHOD__, Z054, __LINE__, 0x00, 0x00, Local1, C010) } } Else @@ -1284,7 +1284,7 @@ Zero) CopyObject (MM00 (), Local0) If ((Local0 != 0xABCD0000)) { - ERR (__METHOD__, Z054, 0x0472, 0x00, 0x00, Local0, 0xABCD0000) + ERR (__METHOD__, Z054, __LINE__, 0x00, 0x00, Local0, 0xABCD0000) } } @@ -1296,7 +1296,7 @@ Zero) Local1 = ObjectType (Local0) If ((Local1 != C010)) { - ERR (__METHOD__, Z054, 0x047E, 0x00, 0x00, Local1, C010) + ERR (__METHOD__, Z054, __LINE__, 0x00, 0x00, Local1, C010) } } @@ -1308,7 +1308,7 @@ Zero) Local1 = ObjectType (Local0) If ((Local1 != C010)) { - ERR (__METHOD__, Z054, 0x048A, 0x00, 0x00, Local1, C010) + ERR (__METHOD__, Z054, __LINE__, 0x00, 0x00, Local1, C010) } } @@ -1332,7 +1332,7 @@ Zero) Local0 = (MM00 () + 0x01) If ((Local0 != 0xABCD0001)) { - ERR (__METHOD__, Z054, 0x04A2, 0x00, 0x00, Local0, 0xABCD0001) + ERR (__METHOD__, Z054, __LINE__, 0x00, 0x00, Local0, 0xABCD0001) } } @@ -1365,7 +1365,7 @@ Zero) Local0 = ObjectType (MM00) If ((Local0 != C010)) { - ERR (__METHOD__, Z054, 0x04C3, 0x00, 0x00, Local0, C010) + ERR (__METHOD__, Z054, __LINE__, 0x00, 0x00, Local0, C010) } } @@ -1374,7 +1374,7 @@ Zero) Local0 = ObjectType (DerefOf (RefOf (MM00))) If ((Local0 != C010)) { - ERR (__METHOD__, Z054, 0x04CB, 0x00, 0x00, Local0, C010) + ERR (__METHOD__, Z054, __LINE__, 0x00, 0x00, Local0, C010) } } @@ -1383,7 +1383,7 @@ Zero) Local0 = ObjectType (DerefOf (P000 [0x01])) If ((Local0 != C010)) { - ERR (__METHOD__, Z054, 0x04D3, 0x00, 0x00, Local0, C010) + ERR (__METHOD__, Z054, __LINE__, 0x00, 0x00, Local0, C010) } } diff --git a/tests/aslts/src/runtime/collections/complex/namespace/fullpath.asl b/tests/aslts/src/runtime/collections/complex/namespace/fullpath.asl index a00eaea08..947c8f1bf 100644 --- a/tests/aslts/src/runtime/collections/complex/namespace/fullpath.asl +++ b/tests/aslts/src/runtime/collections/complex/namespace/fullpath.asl @@ -39,12 +39,12 @@ Name (\I4Z0, 0xABCD0000) If ((I4Z0 != 0xABCD0000)) { - ERR (__METHOD__, Z179, 0x30, 0x00, 0x00, I4Z0, 0xABCD0000) + ERR (__METHOD__, Z179, __LINE__, 0x00, 0x00, I4Z0, 0xABCD0000) } If ((\I4Z0 != 0xABCD0000)) { - ERR (__METHOD__, Z179, 0x33, 0x00, 0x00, \I4Z0, 0xABCD0000) + ERR (__METHOD__, Z179, __LINE__, 0x00, 0x00, \I4Z0, 0xABCD0000) } M001 () @@ -54,12 +54,12 @@ { If ((I4Z0 != 0xABCD0000)) { - ERR (__METHOD__, Z179, 0x3B, 0x00, 0x00, I4Z0, 0xABCD0000) + ERR (__METHOD__, Z179, __LINE__, 0x00, 0x00, I4Z0, 0xABCD0000) } If ((\I4Z0 != 0xABCD0000)) { - ERR (__METHOD__, Z179, 0x3E, 0x00, 0x00, \I4Z0, 0xABCD0000) + ERR (__METHOD__, Z179, __LINE__, 0x00, 0x00, \I4Z0, 0xABCD0000) } } @@ -79,12 +79,12 @@ If ((I4Z1 != 0xABCD0000)) { - ERR (__METHOD__, Z179, 0x52, 0x00, 0x00, I4Z1, 0xABCD0000) + ERR (__METHOD__, Z179, __LINE__, 0x00, 0x00, I4Z1, 0xABCD0000) } If ((\I4Z1 != 0xABCD0000)) { - ERR (__METHOD__, Z179, 0x55, 0x00, 0x00, \I4Z1, 0xABCD0000) + ERR (__METHOD__, Z179, __LINE__, 0x00, 0x00, \I4Z1, 0xABCD0000) } M001 () @@ -94,12 +94,12 @@ { If ((I4Z1 != 0xABCD0000)) { - ERR (__METHOD__, Z179, 0x5D, 0x00, 0x00, I4Z1, 0xABCD0000) + ERR (__METHOD__, Z179, __LINE__, 0x00, 0x00, I4Z1, 0xABCD0000) } If ((\I4Z1 != 0xABCD0000)) { - ERR (__METHOD__, Z179, 0x60, 0x00, 0x00, \I4Z1, 0xABCD0000) + ERR (__METHOD__, Z179, __LINE__, 0x00, 0x00, \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 27ff81664..7bae3e062 100644 --- a/tests/aslts/src/runtime/collections/complex/namespace/ns0.asl +++ b/tests/aslts/src/runtime/collections/complex/namespace/ns0.asl @@ -78,7 +78,7 @@ Store ((I000 + M001 ()), Local0) If ((Local0 != 0xABCD0003)) { - ERR (__METHOD__, Z154, 0x4D, 0x00, 0x00, Local0, 0xABCD0003) + ERR (__METHOD__, Z154, __LINE__, 0x00, 0x00, Local0, 0xABCD0003) } Debug = Local0 @@ -152,12 +152,12 @@ Store ((I000 + M001 ()), Local0) If ((Local0 != 0x87654321)) { - ERR (__METHOD__, Z154, 0x8B, 0x00, 0x00, Local0, 0x87654321) + ERR (__METHOD__, Z154, __LINE__, 0x00, 0x00, Local0, 0x87654321) } If ((I000 != 0x80000000)) { - ERR (__METHOD__, Z154, 0x8F, 0x00, 0x00, I000, 0x80000000) + ERR (__METHOD__, Z154, __LINE__, 0x00, 0x00, I000, 0x80000000) } CH03 (__METHOD__, Z154, 0x05, 0x92, 0x00) @@ -183,12 +183,12 @@ Store ((I000 + M001 ()), Local0) If ((Local0 != 0x065013BA)) { - ERR (__METHOD__, Z154, 0xA8, 0x00, 0x00, Local0, 0x065013BA) + ERR (__METHOD__, Z154, __LINE__, 0x00, 0x00, Local0, 0x065013BA) } If ((I000 != 0x00100064)) { - ERR (__METHOD__, Z154, 0xAC, 0x00, 0x00, I000, 0x00100064) + ERR (__METHOD__, Z154, __LINE__, 0x00, 0x00, I000, 0x00100064) } CH03 (__METHOD__, Z154, 0x08, 0xAF, 0x00) @@ -213,12 +213,12 @@ Store ((I000 + M001 ()), Local0) If ((Local0 != 0x065013BA)) { - ERR (__METHOD__, Z154, 0xC4, 0x00, 0x00, Local0, 0x065013BA) + ERR (__METHOD__, Z154, __LINE__, 0x00, 0x00, Local0, 0x065013BA) } If ((I000 != 0x00100064)) { - ERR (__METHOD__, Z154, 0xC8, 0x00, 0x00, I000, 0x00100064) + ERR (__METHOD__, Z154, __LINE__, 0x00, 0x00, I000, 0x00100064) } CH03 (__METHOD__, Z154, 0x0B, 0xCB, 0x00) @@ -294,12 +294,12 @@ Store ((Local7 + M001 ()), Local0) If ((Local0 != 0x87654321)) { - ERR (__METHOD__, Z154, 0x0109, 0x00, 0x00, Local0, 0x87654321) + ERR (__METHOD__, Z154, __LINE__, 0x00, 0x00, Local0, 0x87654321) } If ((Local7 != 0x01)) { - ERR (__METHOD__, Z154, 0x010D, 0x00, 0x00, Local7, 0x01) + ERR (__METHOD__, Z154, __LINE__, 0x00, 0x00, Local7, 0x01) } CH03 (__METHOD__, Z154, 0x0E, 0x0110, 0x00) @@ -375,12 +375,12 @@ Store ((Arg1 + M001 ()), Local0) If ((Local0 != 0x87654321)) { - ERR (__METHOD__, Z154, 0x014E, 0x00, 0x00, Local0, 0x87654321) + ERR (__METHOD__, Z154, __LINE__, 0x00, 0x00, Local0, 0x87654321) } If ((Arg1 != 0x01)) { - ERR (__METHOD__, Z154, 0x0152, 0x00, 0x00, Arg1, 0x01) + ERR (__METHOD__, Z154, __LINE__, 0x00, 0x00, Arg1, 0x01) } CH03 (__METHOD__, Z154, 0x11, 0x0155, 0x00) 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 e33041cfb..1f29e49a1 100644 --- a/tests/aslts/src/runtime/collections/complex/namespace/ns0_root.asl +++ b/tests/aslts/src/runtime/collections/complex/namespace/ns0_root.asl @@ -106,12 +106,12 @@ CH03 (__METHOD__, Z154, 0x14, 0x61, 0x00) If ((Local0 != 0x87654321)) { - ERR (__METHOD__, Z154, 0x63, 0x00, 0x00, Local0, 0x87654321) + ERR (__METHOD__, Z154, __LINE__, 0x00, 0x00, Local0, 0x87654321) } If ((D000.I000 != 0x80000000)) { - ERR (__METHOD__, Z154, 0x66, 0x00, 0x00, D000.I000, 0x80000000) + ERR (__METHOD__, Z154, __LINE__, 0x00, 0x00, D000.I000, 0x80000000) } } Else @@ -198,12 +198,12 @@ CH03 (__METHOD__, Z154, 0x14, 0xAC, 0x00) If ((Local0 != 0x87654321)) { - ERR (__METHOD__, Z154, 0xAE, 0x00, 0x00, Local0, 0x87654321) + ERR (__METHOD__, Z154, __LINE__, 0x00, 0x00, Local0, 0x87654321) } If ((TZ00.I000 != 0x80000000)) { - ERR (__METHOD__, Z154, 0xB1, 0x00, 0x00, TZ00.I000, 0x80000000) + ERR (__METHOD__, Z154, __LINE__, 0x00, 0x00, TZ00.I000, 0x80000000) } } Else @@ -290,12 +290,12 @@ CH03 (__METHOD__, Z154, 0x14, 0xF8, 0x00) If ((Local0 != 0x87654321)) { - ERR (__METHOD__, Z154, 0xFA, 0x00, 0x00, Local0, 0x87654321) + ERR (__METHOD__, Z154, __LINE__, 0x00, 0x00, Local0, 0x87654321) } If ((PR00.I000 != 0x80000000)) { - ERR (__METHOD__, Z154, 0xFD, 0x00, 0x00, PR00.I000, 0x80000000) + ERR (__METHOD__, Z154, __LINE__, 0x00, 0x00, PR00.I000, 0x80000000) } } Else @@ -382,12 +382,12 @@ CH03 (__METHOD__, Z154, 0x14, 0x0144, 0x00) If ((Local0 != 0x87654321)) { - ERR (__METHOD__, Z154, 0x0146, 0x00, 0x00, Local0, 0x87654321) + ERR (__METHOD__, Z154, __LINE__, 0x00, 0x00, Local0, 0x87654321) } If ((PW00.I000 != 0x80000000)) { - ERR (__METHOD__, Z154, 0x0149, 0x00, 0x00, PW00.I000, 0x80000000) + ERR (__METHOD__, Z154, __LINE__, 0x00, 0x00, PW00.I000, 0x80000000) } } Else diff --git a/tests/aslts/src/runtime/collections/complex/namespace/ns1.asl b/tests/aslts/src/runtime/collections/complex/namespace/ns1.asl index 260401fc1..08d244048 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 @@ Local0 = DerefOf (P000 [0x00]) If ((Local0 != 0x11112222)) { - ERR (__METHOD__, Z155, 0x34, 0x00, 0x00, Local0, 0x11112222) + ERR (__METHOD__, Z155, __LINE__, 0x00, 0x00, Local0, 0x11112222) } CH03 (__METHOD__, Z155, 0x01, 0x37, 0x00) @@ -70,7 +70,7 @@ Local0 = DerefOf (B000 [0x00]) If ((Local0 != 0x67)) { - ERR (__METHOD__, Z155, 0x48, 0x00, 0x00, Local0, 0x67) + ERR (__METHOD__, Z155, __LINE__, 0x00, 0x00, Local0, 0x67) } CH03 (__METHOD__, Z155, 0x03, 0x4B, 0x00) @@ -88,7 +88,7 @@ Local0 = DerefOf (S000 [0x00]) If ((Local0 != 0x38)) { - ERR (__METHOD__, Z155, 0x5C, 0x00, 0x00, Local0, 0x38) + ERR (__METHOD__, Z155, __LINE__, 0x00, 0x00, Local0, 0x38) } CH03 (__METHOD__, Z155, 0x05, 0x5F, 0x00) @@ -170,13 +170,13 @@ Store ((DerefOf (PP00 [0x01]) + M001 ()), Local0) If ((Local0 != 0x87654321)) { - ERR (__METHOD__, Z155, 0x9E, 0x00, 0x00, Local0, 0x87654321) + ERR (__METHOD__, Z155, __LINE__, 0x00, 0x00, Local0, 0x87654321) } Local0 = DerefOf (PP00 [0x01]) If ((Local0 != 0x80000000)) { - ERR (__METHOD__, Z155, 0xA4, 0x00, 0x00, Local0, 0x80000000) + ERR (__METHOD__, Z155, __LINE__, 0x00, 0x00, Local0, 0x80000000) } CH03 (__METHOD__, Z155, 0x09, 0xA7, 0x00) @@ -212,13 +212,13 @@ Store ((DerefOf (PP00 [0x01]) + M001 ()), Local0) If ((Local0 != 0x065013BA)) { - ERR (__METHOD__, Z155, 0xC3, 0x00, 0x00, Local0, 0x065013BA) + ERR (__METHOD__, Z155, __LINE__, 0x00, 0x00, Local0, 0x065013BA) } Local0 = DerefOf (PP00 [0x01]) If ((Local0 != 0x00100064)) { - ERR (__METHOD__, Z155, 0xC9, 0x00, 0x00, Local0, 0x00100064) + ERR (__METHOD__, Z155, __LINE__, 0x00, 0x00, Local0, 0x00100064) } CH03 (__METHOD__, Z155, 0x0C, 0xCC, 0x00) @@ -290,7 +290,7 @@ Store ((BF00 + M001 ()), Local0) If ((Local0 != 0x87654321)) { - ERR (__METHOD__, Z155, 0x010E, 0x00, 0x00, Local0, 0x87654321) + ERR (__METHOD__, Z155, __LINE__, 0x00, 0x00, Local0, 0x87654321) } If (Arg0) @@ -304,7 +304,7 @@ If ((BF00 != Local1)) { - ERR (__METHOD__, Z155, 0x0118, 0x00, 0x00, BF00, Local1) + ERR (__METHOD__, Z155, __LINE__, 0x00, 0x00, BF00, Local1) } CH03 (__METHOD__, Z155, 0x10, 0x011B, 0x00) @@ -381,7 +381,7 @@ Store ((F001 + M001 ()), Local0) If ((Local0 != 0x87654321)) { - ERR (__METHOD__, Z155, 0x015D, 0x00, 0x00, Local0, 0x87654321) + ERR (__METHOD__, Z155, __LINE__, 0x00, 0x00, Local0, 0x87654321) } If (Arg0) @@ -395,7 +395,7 @@ If ((F001 != Local1)) { - ERR (__METHOD__, Z155, 0x0167, 0x00, 0x00, F001, Local1) + ERR (__METHOD__, Z155, __LINE__, 0x00, 0x00, F001, Local1) } CH03 (__METHOD__, Z155, 0x14, 0x016A, 0x00) @@ -479,7 +479,7 @@ Store ((BNK0 + M001 ()), Local0) If ((Local0 != 0x87654321)) { - ERR (__METHOD__, Z155, 0x01AF, 0x00, 0x00, Local0, 0x87654321) + ERR (__METHOD__, Z155, __LINE__, 0x00, 0x00, Local0, 0x87654321) } If (Arg0) @@ -493,7 +493,7 @@ If ((BNK0 != Local1)) { - ERR (__METHOD__, Z155, 0x01B9, 0x00, 0x00, BNK0, Local1) + ERR (__METHOD__, Z155, __LINE__, 0x00, 0x00, BNK0, Local1) } CH03 (__METHOD__, Z155, 0x18, 0x01BC, 0x00) @@ -577,7 +577,7 @@ Store ((IF00 + M001 ()), Local0) If ((Local0 != 0x87654321)) { - ERR (__METHOD__, Z155, 0x0201, 0x00, 0x00, Local0, 0x87654321) + ERR (__METHOD__, Z155, __LINE__, 0x00, 0x00, Local0, 0x87654321) } If (Arg0) @@ -591,7 +591,7 @@ If ((IF00 != Local1)) { - ERR (__METHOD__, Z155, 0x020B, 0x00, 0x00, IF00, Local1) + ERR (__METHOD__, Z155, __LINE__, 0x00, 0x00, IF00, Local1) } CH03 (__METHOD__, Z155, 0x1C, 0x020E, 0x00) @@ -664,7 +664,7 @@ Store ((DerefOf (B000 [0x01]) + M001 ()), Local0) If ((Local0 != 0x24)) { - ERR (__METHOD__, Z155, 0x024C, 0x00, 0x00, Local0, 0x24) + ERR (__METHOD__, Z155, __LINE__, 0x00, 0x00, Local0, 0x24) } Local0 = DerefOf (B000 [0x01]) @@ -679,7 +679,7 @@ If ((Local0 != Local1)) { - ERR (__METHOD__, Z155, 0x0258, 0x00, 0x00, Local0, Local1) + ERR (__METHOD__, Z155, __LINE__, 0x00, 0x00, Local0, Local1) } CH03 (__METHOD__, Z155, 0x20, 0x025B, 0x00) @@ -749,7 +749,7 @@ Store ((DerefOf (S000 [0x01]) + M001 ()), Local0) If ((Local0 != 0x24)) { - ERR (__METHOD__, Z155, 0x0299, 0x00, 0x00, Local0, 0x24) + ERR (__METHOD__, Z155, __LINE__, 0x00, 0x00, Local0, 0x24) } Local0 = DerefOf (S000 [0x01]) @@ -764,7 +764,7 @@ If ((Local0 != Local1)) { - ERR (__METHOD__, Z155, 0x02A5, 0x00, 0x00, Local0, Local1) + ERR (__METHOD__, Z155, __LINE__, 0x00, 0x00, Local0, Local1) } CH03 (__METHOD__, Z155, 0x24, 0x02A8, 0x00) diff --git a/tests/aslts/src/runtime/collections/complex/namespace/ns2.asl b/tests/aslts/src/runtime/collections/complex/namespace/ns2.asl index 75a6f07aa..b2a51de21 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 @@ Local0 = DerefOf (D000.P000 [0x00]) If ((Local0 != 0x11112222)) { - ERR (__METHOD__, Z156, 0x36, 0x00, 0x00, Local0, 0x11112222) + ERR (__METHOD__, Z156, __LINE__, 0x00, 0x00, Local0, 0x11112222) } CH03 (__METHOD__, Z156, 0x01, 0x39, 0x00) @@ -76,7 +76,7 @@ Local0 = DerefOf (D000.B000 [0x00]) If ((Local0 != 0x67)) { - ERR (__METHOD__, Z156, 0x4D, 0x00, 0x00, Local0, 0x67) + ERR (__METHOD__, Z156, __LINE__, 0x00, 0x00, Local0, 0x67) } CH03 (__METHOD__, Z156, 0x03, 0x50, 0x00) @@ -98,7 +98,7 @@ Local0 = DerefOf (D000.S000 [0x00]) If ((Local0 != 0x38)) { - ERR (__METHOD__, Z156, 0x64, 0x00, 0x00, Local0, 0x38) + ERR (__METHOD__, Z156, __LINE__, 0x00, 0x00, Local0, 0x38) } CH03 (__METHOD__, Z156, 0x05, 0x67, 0x00) @@ -138,13 +138,13 @@ Store ((DerefOf (D000.PP00 [0x01]) + M001 ()), Local0) If ((Local0 != 0x065013BA)) { - ERR (__METHOD__, Z156, 0x86, 0x00, 0x00, Local0, 0x065013BA) + ERR (__METHOD__, Z156, __LINE__, 0x00, 0x00, Local0, 0x065013BA) } Local0 = DerefOf (D000.PP00 [0x01]) If ((Local0 != 0x00100064)) { - ERR (__METHOD__, Z156, 0x8C, 0x00, 0x00, Local0, 0x00100064) + ERR (__METHOD__, Z156, __LINE__, 0x00, 0x00, Local0, 0x00100064) } CH03 (__METHOD__, Z156, 0x0C, 0x8F, 0x00) 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 61ea925d9..aa1e84eb5 100644 --- a/tests/aslts/src/runtime/collections/complex/namespace/ns2_root.asl +++ b/tests/aslts/src/runtime/collections/complex/namespace/ns2_root.asl @@ -108,13 +108,13 @@ Store ((DerefOf (D000.PP00 [0x01]) + M001 ()), Local0) If ((Local0 != 0x87654321)) { - ERR (__METHOD__, Z156, 0x60, 0x00, 0x00, Local0, 0x87654321) + ERR (__METHOD__, Z156, __LINE__, 0x00, 0x00, Local0, 0x87654321) } Local0 = DerefOf (D000.PP00 [0x01]) If ((Local0 != 0x80000000)) { - ERR (__METHOD__, Z156, 0x66, 0x00, 0x00, Local0, 0x80000000) + ERR (__METHOD__, Z156, __LINE__, 0x00, 0x00, Local0, 0x80000000) } CH03 (__METHOD__, Z156, 0x09, 0x69, 0x00) @@ -202,13 +202,13 @@ Store ((DerefOf (D000.BF00 [0x01]) + M001 ()), Local0) If ((Local0 != 0x87654321)) { - ERR (__METHOD__, Z156, 0xB3, 0x00, 0x00, Local0, 0x87654321) + ERR (__METHOD__, Z156, __LINE__, 0x00, 0x00, Local0, 0x87654321) } Local0 = DerefOf (D000.BF00 [0x01]) If ((Local0 != 0x80000000)) { - ERR (__METHOD__, Z156, 0xB9, 0x00, 0x00, Local0, 0x80000000) + ERR (__METHOD__, Z156, __LINE__, 0x00, 0x00, Local0, 0x80000000) } CH03 (__METHOD__, Z156, 0x11, 0xBC, 0x00) diff --git a/tests/aslts/src/runtime/collections/complex/namespace/ns3.asl b/tests/aslts/src/runtime/collections/complex/namespace/ns3.asl index 8ef76b555..052580b09 100644 --- a/tests/aslts/src/runtime/collections/complex/namespace/ns3.asl +++ b/tests/aslts/src/runtime/collections/complex/namespace/ns3.asl @@ -49,7 +49,7 @@ Local0 = DerefOf (Arg0 [0x00]) If ((Local0 != 0x11112222)) { - ERR (__METHOD__, Z157, 0x33, 0x00, 0x00, Local0, 0x11112222) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local0, 0x11112222) } } @@ -57,7 +57,7 @@ Local0 = DerefOf (P000 [0x00]) If ((Local0 != 0x11112222)) { - ERR (__METHOD__, Z157, 0x3C, 0x00, 0x00, Local0, 0x11112222) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local0, 0x11112222) } CH03 (__METHOD__, Z157, 0x02, 0x3F, 0x00) @@ -80,7 +80,7 @@ Local0 = DerefOf (Arg0 [0x00]) If ((Local0 != 0x67)) { - ERR (__METHOD__, Z157, 0x53, 0x00, 0x00, Local0, 0x67) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local0, 0x67) } } @@ -88,7 +88,7 @@ Local0 = DerefOf (B000 [0x00]) If ((Local0 != 0x67)) { - ERR (__METHOD__, Z157, 0x5C, 0x00, 0x00, Local0, 0x67) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local0, 0x67) } CH03 (__METHOD__, Z157, 0x05, 0x5F, 0x00) @@ -108,7 +108,7 @@ Local0 = DerefOf (Arg0 [0x00]) If ((Local0 != 0x38)) { - ERR (__METHOD__, Z157, 0x72, 0x00, 0x00, Local0, 0x38) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local0, 0x38) } } @@ -116,7 +116,7 @@ Local0 = DerefOf (S000 [0x00]) If ((Local0 != 0x38)) { - ERR (__METHOD__, Z157, 0x7B, 0x00, 0x00, Local0, 0x38) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local0, 0x38) } CH03 (__METHOD__, Z157, 0x08, 0x7E, 0x00) @@ -200,13 +200,13 @@ Store ((DerefOf (Arg0 [0x01]) + M001 (Arg0)), Local0) If ((Local0 != 0x87654321)) { - ERR (__METHOD__, Z157, 0xC0, 0x00, 0x00, Local0, 0x87654321) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local0, 0x87654321) } Local1 = DerefOf (Arg0 [0x01]) If ((Local1 != 0x80000000)) { - ERR (__METHOD__, Z157, 0xC6, 0x00, 0x00, Local1, 0x80000000) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local1, 0x80000000) } CH03 (__METHOD__, Z157, 0x0C, 0xC9, 0x00) @@ -216,13 +216,13 @@ Local0 = M000 (PP00, Arg0) If ((Local0 != 0x87654321)) { - ERR (__METHOD__, Z157, 0xD1, 0x00, 0x00, Local0, 0x87654321) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local0, 0x87654321) } Local0 = DerefOf (PP00 [0x01]) If ((Local0 != 0x80000000)) { - ERR (__METHOD__, Z157, 0xD7, 0x00, 0x00, Local0, 0x80000000) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local0, 0x80000000) } CH03 (__METHOD__, Z157, 0x0F, 0xDA, 0x00) @@ -260,13 +260,13 @@ Store ((DerefOf (Arg0 [0x01]) + M001 (Arg0)), Local0) If ((Local0 != 0x065013BA)) { - ERR (__METHOD__, Z157, 0xF7, 0x00, 0x00, Local0, 0x065013BA) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local0, 0x065013BA) } Local1 = DerefOf (Arg0 [0x01]) If ((Local1 != 0x00100064)) { - ERR (__METHOD__, Z157, 0xFD, 0x00, 0x00, Local1, 0x00100064) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local1, 0x00100064) } Return (Local0) @@ -275,13 +275,13 @@ Local0 = M000 (PP00) If ((Local0 != 0x065013BA)) { - ERR (__METHOD__, Z157, 0x0105, 0x00, 0x00, Local0, 0x065013BA) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local0, 0x065013BA) } Local1 = DerefOf (PP00 [0x01]) If ((Local1 != 0x00100064)) { - ERR (__METHOD__, Z157, 0x010B, 0x00, 0x00, Local1, 0x00100064) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local1, 0x00100064) } CH03 (__METHOD__, Z157, 0x14, 0x010E, 0x00) @@ -349,13 +349,13 @@ Store ((Arg0 + M001 ()), Local0) If ((Local0 != 0x87654321)) { - ERR (__METHOD__, Z157, 0x014D, 0x00, 0x00, Local0, 0x87654321) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local0, 0x87654321) } Local1 = 0x01 If ((Arg0 != Local1)) { - ERR (__METHOD__, Z157, 0x0153, 0x00, 0x00, Arg0, Local1) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Arg0, Local1) } CH03 (__METHOD__, Z157, 0x18, 0x0156, 0x00) @@ -365,13 +365,13 @@ Local0 = M000 (BF00) If ((Local0 != 0x87654321)) { - ERR (__METHOD__, Z157, 0x015E, 0x00, 0x00, Local0, 0x87654321) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local0, 0x87654321) } Local1 = 0xABCDEF70 If ((BF00 != Local1)) { - ERR (__METHOD__, Z157, 0x0164, 0x00, 0x00, BF00, Local1) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, BF00, Local1) } CH03 (__METHOD__, Z157, 0x1B, 0x0167, 0x00) @@ -445,13 +445,13 @@ Store ((Arg0 + M001 ()), Local0) If ((Local0 != 0x87654321)) { - ERR (__METHOD__, Z157, 0x01A7, 0x00, 0x00, Local0, 0x87654321) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local0, 0x87654321) } Local1 = 0x01 If ((Arg0 != Local1)) { - ERR (__METHOD__, Z157, 0x01AD, 0x00, 0x00, Arg0, Local1) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Arg0, Local1) } CH03 (__METHOD__, Z157, 0x1F, 0x01B0, 0x00) @@ -461,13 +461,13 @@ Local0 = M000 (F000) If ((Local0 != 0x87654321)) { - ERR (__METHOD__, Z157, 0x01B8, 0x00, 0x00, Local0, 0x87654321) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local0, 0x87654321) } Local1 = 0xABCDEF70 If ((F000 != Local1)) { - ERR (__METHOD__, Z157, 0x01BE, 0x00, 0x00, F000, Local1) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, F000, Local1) } CH03 (__METHOD__, Z157, 0x22, 0x01C1, 0x00) @@ -546,13 +546,13 @@ Store ((Arg0 + M001 ()), Local0) If ((Local0 != 0x87654321)) { - ERR (__METHOD__, Z157, 0x0202, 0x00, 0x00, Local0, 0x87654321) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local0, 0x87654321) } Local1 = 0x01 If ((Arg0 != Local1)) { - ERR (__METHOD__, Z157, 0x0208, 0x00, 0x00, Arg0, Local1) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Arg0, Local1) } CH03 (__METHOD__, Z157, 0x26, 0x020B, 0x00) @@ -562,13 +562,13 @@ Local0 = M000 (BNK0) If ((Local0 != 0x87654321)) { - ERR (__METHOD__, Z157, 0x0213, 0x00, 0x00, Local0, 0x87654321) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local0, 0x87654321) } Local1 = 0xABCDEF70 If ((BNK0 != Local1)) { - ERR (__METHOD__, Z157, 0x0219, 0x00, 0x00, BNK0, Local1) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, BNK0, Local1) } CH03 (__METHOD__, Z157, 0x29, 0x021C, 0x00) @@ -647,13 +647,13 @@ Store ((Arg0 + M001 ()), Local0) If ((Local0 != 0x87654321)) { - ERR (__METHOD__, Z157, 0x025D, 0x00, 0x00, Local0, 0x87654321) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local0, 0x87654321) } Local1 = 0x01 If ((Arg0 != Local1)) { - ERR (__METHOD__, Z157, 0x0263, 0x00, 0x00, Arg0, Local1) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Arg0, Local1) } CH03 (__METHOD__, Z157, 0x2D, 0x0266, 0x00) @@ -663,13 +663,13 @@ Local0 = M000 (IF00) If ((Local0 != 0x87654321)) { - ERR (__METHOD__, Z157, 0x026E, 0x00, 0x00, Local0, 0x87654321) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local0, 0x87654321) } Local1 = 0xABCDEF70 If ((IF00 != Local1)) { - ERR (__METHOD__, Z157, 0x0274, 0x00, 0x00, IF00, Local1) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, IF00, Local1) } CH03 (__METHOD__, Z157, 0x30, 0x0277, 0x00) @@ -744,7 +744,7 @@ Store ((DerefOf (Arg0 [0x01]) + M001 (Arg0)), Local0) If ((Local0 != 0x24)) { - ERR (__METHOD__, Z157, 0x02B7, 0x00, 0x00, Local0, 0x24) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local0, 0x24) } Local1 = DerefOf (Arg0 [0x01]) @@ -759,7 +759,7 @@ If ((Local1 != Local2)) { - ERR (__METHOD__, Z157, 0x02C3, 0x00, 0x00, Local1, Local2) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local1, Local2) } CH03 (__METHOD__, Z157, 0x34, 0x02C6, 0x00) @@ -769,7 +769,7 @@ Local0 = M000 (B000, Arg0) If ((Local0 != 0x24)) { - ERR (__METHOD__, Z157, 0x02CE, 0x00, 0x00, Local0, 0x24) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local0, 0x24) } Local1 = DerefOf (B000 [0x01]) @@ -784,7 +784,7 @@ If ((Local1 != Local2)) { - ERR (__METHOD__, Z157, 0x02DA, 0x00, 0x00, Local1, Local2) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local1, Local2) } CH03 (__METHOD__, Z157, 0x37, 0x02DD, 0x00) @@ -856,7 +856,7 @@ Store ((DerefOf (Arg0 [0x01]) + M001 (Arg0)), Local0) If ((Local0 != 0x24)) { - ERR (__METHOD__, Z157, 0x031D, 0x00, 0x00, Local0, 0x24) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local0, 0x24) } Local1 = DerefOf (Arg0 [0x01]) @@ -871,7 +871,7 @@ If ((Local1 != Local2)) { - ERR (__METHOD__, Z157, 0x0329, 0x00, 0x00, Local1, Local2) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local1, Local2) } CH03 (__METHOD__, Z157, 0x3B, 0x032C, 0x00) @@ -881,7 +881,7 @@ Local0 = M000 (S000, Arg0) If ((Local0 != 0x24)) { - ERR (__METHOD__, Z157, 0x0334, 0x00, 0x00, Local0, 0x24) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local0, 0x24) } Local1 = DerefOf (S000 [0x01]) @@ -896,7 +896,7 @@ If ((Local1 != Local2)) { - ERR (__METHOD__, Z157, 0x0340, 0x00, 0x00, Local1, Local2) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local1, Local2) } CH03 (__METHOD__, Z157, 0x3E, 0x0343, 0x00) @@ -972,7 +972,7 @@ Store ((BF00 + M001 ()), Local0) If ((Local0 != 0x87654321)) { - ERR (__METHOD__, Z157, 0x038A, 0x00, 0x00, Local0, 0x87654321) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local0, 0x87654321) } If (Arg1) @@ -986,7 +986,7 @@ If ((BF00 != Local1)) { - ERR (__METHOD__, Z157, 0x0394, 0x00, 0x00, BF00, Local1) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, BF00, Local1) } CH03 (__METHOD__, Z157, 0x42, 0x0397, 0x00) @@ -996,7 +996,7 @@ Local0 = M000 (0x00, Arg0) If ((Local0 != 0x87654321)) { - ERR (__METHOD__, Z157, 0x039F, 0x00, 0x00, Local0, 0x87654321) + ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local0, 0x87654321) } CH03 (__METHOD__, Z157, 0x44, 0x03A2, 0x00) diff --git a/tests/aslts/src/runtime/collections/complex/namespace/ns4.asl b/tests/aslts/src/runtime/collections/complex/namespace/ns4.asl index c9cbbdadc..9ac438fbf 100644 --- a/tests/aslts/src/runtime/collections/complex/namespace/ns4.asl +++ b/tests/aslts/src/runtime/collections/complex/namespace/ns4.asl @@ -107,12 +107,12 @@ Local0 = MADD (I000, M001 ()) If ((Local0 != 0x87654321)) { - ERR (__METHOD__, Z158, 0x67, 0x00, 0x00, Local0, 0x87654321) + ERR (__METHOD__, Z158, __LINE__, 0x00, 0x00, Local0, 0x87654321) } If ((I000 != 0x80000000)) { - ERR (__METHOD__, Z158, 0x6B, 0x00, 0x00, I000, 0x80000000) + ERR (__METHOD__, Z158, __LINE__, 0x00, 0x00, I000, 0x80000000) } CH03 (__METHOD__, Z158, 0x03, 0x6E, 0x00) diff --git a/tests/aslts/src/runtime/collections/complex/namespace/ns6.asl b/tests/aslts/src/runtime/collections/complex/namespace/ns6.asl index f66fd9ca3..2106fa2fb 100644 --- a/tests/aslts/src/runtime/collections/complex/namespace/ns6.asl +++ b/tests/aslts/src/runtime/collections/complex/namespace/ns6.asl @@ -9,14 +9,14 @@ I000 = 0x11223344 If ((Arg0 != 0xABCD0000)) { - ERR (__METHOD__, Z160, 0x0D, 0x00, 0x00, Arg0, 0xABCD0000) + ERR (__METHOD__, Z160, __LINE__, 0x00, 0x00, Arg0, 0xABCD0000) } } M000 (I000) If ((I000 != 0x11223344)) { - ERR (__METHOD__, Z160, 0x14, 0x00, 0x00, I000, 0x11223344) + ERR (__METHOD__, Z160, __LINE__, 0x00, 0x00, I000, 0x11223344) } } diff --git a/tests/aslts/src/runtime/collections/complex/operand/common/ocommon.asl b/tests/aslts/src/runtime/collections/complex/operand/common/ocommon.asl index 41ef2eaac..8e0bcd53f 100644 --- a/tests/aslts/src/runtime/collections/complex/operand/common/ocommon.asl +++ b/tests/aslts/src/runtime/collections/complex/operand/common/ocommon.asl @@ -1102,11 +1102,11 @@ Local1 = ObjectType (Arg3) If ((Local0 != Local1)) { - ERR (Concatenate (Arg0, "-OType"), Z084, 0x0313, 0x00, 0x00, Local0, Local1) + ERR (Concatenate (Arg0, "-OType"), Z084, __LINE__, 0x00, 0x00, Local0, Local1) } ElseIf ((Arg2 != Arg3)) { - ERR (Arg0, Z084, 0x0315, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z084, __LINE__, 0x00, 0x00, Arg2, Arg3) } } @@ -1219,7 +1219,7 @@ } Default { - ERR (TERR, Z084, 0x0369, 0x00, 0x00, Arg0, Arg1) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg0, Arg1) } } @@ -1276,7 +1276,7 @@ } Default { - ERR (TERR, Z084, 0x0391, 0x00, 0x00, Arg0, Arg1) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg0, Arg1) } } @@ -1352,7 +1352,7 @@ } Default { - ERR (TERR, Z084, 0x03B3, 0x00, 0x00, Arg0, Arg1) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg0, Arg1) } } @@ -1386,14 +1386,14 @@ } Default { - ERR (TERR, Z084, 0x03BF, 0x00, 0x00, Arg0, Arg1) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg0, Arg1) } } } Default { - ERR (TERR, Z084, 0x03C4, 0x00, 0x00, Arg0, Arg1) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg0, Arg1) } } @@ -1789,7 +1789,7 @@ } Default { - ERR (TERR, Z084, 0x04BD, 0x00, 0x00, Arg0, Arg1) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg0, Arg1) } } @@ -1978,7 +1978,7 @@ } Default { - ERR (TERR, Z084, 0x0532, 0x00, 0x00, Arg0, Arg1) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg0, Arg1) } } @@ -2135,7 +2135,7 @@ } Default { - ERR (TERR, Z084, 0x0593, 0x00, 0x00, Arg0, Arg1) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg0, Arg1) } } @@ -2164,21 +2164,21 @@ } Default { - ERR (TERR, Z084, 0x05A4, 0x00, 0x00, Arg0, Arg1) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg0, Arg1) } } } Default { - ERR (TERR, Z084, 0x05A9, 0x00, 0x00, Arg0, Arg1) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg0, Arg1) } } } Else { - ERR (TERR, Z084, 0x05AD, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg1, Arg2) } Return (Local0) @@ -2217,14 +2217,14 @@ } Default { - ERR (TERR, Z084, 0x05C9, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg1, Arg2) } } } Else { - ERR (TERR, Z084, 0x05CD, 0x00, 0x00, Arg0, Arg1) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg0, Arg1) } } Case (0x02) @@ -2250,14 +2250,14 @@ } Default { - ERR (TERR, Z084, 0x05DE, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg1, Arg2) } } } Else { - ERR (TERR, Z084, 0x05E2, 0x00, 0x00, Arg0, Arg1) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg0, Arg1) } } Case (0x03) @@ -2283,14 +2283,14 @@ } Default { - ERR (TERR, Z084, 0x05F3, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg1, Arg2) } } } Else { - ERR (TERR, Z084, 0x05F7, 0x00, 0x00, Arg0, Arg1) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg0, Arg1) } } Case (0x04) @@ -2316,19 +2316,19 @@ } Default { - ERR (TERR, Z084, 0x0608, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg1, Arg2) } } } Else { - ERR (TERR, Z084, 0x060C, 0x00, 0x00, Arg0, Arg1) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg0, Arg1) } } Default { - ERR (TERR, Z084, 0x0610, 0x00, 0x00, Arg0, Arg1) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg0, Arg1) } } @@ -2351,7 +2351,7 @@ If (Arg3) { - ERR (TERR, Z084, 0x0620, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg1, Arg2) } Switch (ToInteger (Arg1)) @@ -2388,7 +2388,7 @@ } Default { - ERR (TERR, Z084, 0x0638, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg1, Arg2) } } @@ -2449,7 +2449,7 @@ } Default { - ERR (TERR, Z084, 0x0663, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg1, Arg2) } } @@ -2541,14 +2541,14 @@ } Default { - ERR (TERR, Z084, 0x068D, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg1, Arg2) } } } Default { - ERR (TERR, Z084, 0x0692, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg1, Arg2) } } @@ -2584,7 +2584,7 @@ } Default { - ERR (TERR, Z084, 0x06A7, 0x00, 0x00, Arg2, Arg3) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg2, Arg3) } } @@ -2608,21 +2608,21 @@ } Default { - ERR (TERR, Z084, 0x06B8, 0x00, 0x00, Arg2, Arg3) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg2, Arg3) } } } Default { - ERR (TERR, Z084, 0x06BD, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg1, Arg2) } } } Default { - ERR (TERR, Z084, 0x06C2, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg1, Arg2) } } @@ -2656,14 +2656,14 @@ } Default { - ERR (TERR, Z084, 0x06D6, 0x00, 0x00, Arg2, Arg3) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg2, Arg3) } } } Else { - ERR (TERR, Z084, 0x06DA, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg1, Arg2) } } Case (0x02) @@ -2689,14 +2689,14 @@ } Default { - ERR (TERR, Z084, 0x06EB, 0x00, 0x00, Arg2, Arg3) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg2, Arg3) } } } Else { - ERR (TERR, Z084, 0x06EF, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg1, Arg2) } } Case (0x03) @@ -2722,26 +2722,26 @@ } Default { - ERR (TERR, Z084, 0x0700, 0x00, 0x00, Arg2, Arg3) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg2, Arg3) } } } Else { - ERR (TERR, Z084, 0x0704, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg1, Arg2) } } Default { - ERR (TERR, Z084, 0x0708, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg1, Arg2) } } } Default { - ERR (TERR, Z084, 0x070D, 0x00, 0x00, Arg0, Arg1) + ERR (TERR, Z084, __LINE__, 0x00, 0x00, Arg0, Arg1) } } diff --git a/tests/aslts/src/runtime/collections/complex/operand/tests/oarg/oarg.asl b/tests/aslts/src/runtime/collections/complex/operand/tests/oarg/oarg.asl index a5a64e701..98adb2a20 100644 --- a/tests/aslts/src/runtime/collections/complex/operand/tests/oarg/oarg.asl +++ b/tests/aslts/src/runtime/collections/complex/operand/tests/oarg/oarg.asl @@ -10721,7 +10721,7 @@ Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z121, 0x314F, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z121, __LINE__, 0x00, 0x00, Local2, C08C) } /* Stall */ @@ -10733,7 +10733,7 @@ Local2 = (Local1 - Local0) If ((Local2 < 0x03DE)) { - ERR (Arg0, Z121, 0x315C, 0x00, 0x00, Local2, 0x03DE) + ERR (Arg0, Z121, __LINE__, 0x00, 0x00, Local2, 0x03DE) } } @@ -10753,7 +10753,7 @@ Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z121, 0x3173, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z121, __LINE__, 0x00, 0x00, Local2, C08C) } } @@ -10770,7 +10770,7 @@ Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z121, 0x3187, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z121, __LINE__, 0x00, 0x00, Local2, C08C) } } @@ -20752,7 +20752,7 @@ Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z121, 0x5DF7, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z121, __LINE__, 0x00, 0x00, Local2, C08C) } /* Stall */ @@ -20764,7 +20764,7 @@ Local2 = (Local1 - Local0) If ((Local2 < 0x03DE)) { - ERR (Arg0, Z121, 0x5E04, 0x00, 0x00, Local2, 0x03DE) + ERR (Arg0, Z121, __LINE__, 0x00, 0x00, Local2, 0x03DE) } } @@ -20784,7 +20784,7 @@ Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z121, 0x5E1C, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z121, __LINE__, 0x00, 0x00, Local2, C08C) } } @@ -20801,7 +20801,7 @@ Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z121, 0x5E30, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z121, __LINE__, 0x00, 0x00, Local2, C08C) } } diff --git a/tests/aslts/src/runtime/collections/complex/operand/tests/oconst/oconst.asl b/tests/aslts/src/runtime/collections/complex/operand/tests/oconst/oconst.asl index 87cd56b92..3e3b0780f 100644 --- a/tests/aslts/src/runtime/collections/complex/operand/tests/oconst/oconst.asl +++ b/tests/aslts/src/runtime/collections/complex/operand/tests/oconst/oconst.asl @@ -11696,7 +11696,7 @@ Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z085, 0x3355, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z085, __LINE__, 0x00, 0x00, Local2, C08C) } /* Stall */ @@ -11708,7 +11708,7 @@ Local2 = (Local1 - Local0) If ((Local2 < 0x03DE)) { - ERR (Arg0, Z085, 0x3362, 0x00, 0x00, Local2, 0x03DE) + ERR (Arg0, Z085, __LINE__, 0x00, 0x00, Local2, 0x03DE) } } @@ -11728,7 +11728,7 @@ Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z085, 0x3379, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z085, __LINE__, 0x00, 0x00, Local2, C08C) } } @@ -11745,7 +11745,7 @@ Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z085, 0x338D, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z085, __LINE__, 0x00, 0x00, Local2, C08C) } } @@ -32373,7 +32373,7 @@ Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z085, 0x61D5, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z085, __LINE__, 0x00, 0x00, Local2, C08C) } /* Stall */ @@ -32388,7 +32388,7 @@ Local2 = (Local1 - Local0) If ((Local2 < 0x03DE)) { - ERR (Arg0, Z085, 0x61E2, 0x00, 0x00, Local2, 0x03DE) + ERR (Arg0, Z085, __LINE__, 0x00, 0x00, Local2, 0x03DE) } } @@ -32408,7 +32408,7 @@ Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z085, 0x61FA, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z085, __LINE__, 0x00, 0x00, Local2, C08C) } } @@ -32428,7 +32428,7 @@ Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z085, 0x620E, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z085, __LINE__, 0x00, 0x00, Local2, C08C) } } diff --git a/tests/aslts/src/runtime/collections/complex/operand/tests/olocal/olocal.asl b/tests/aslts/src/runtime/collections/complex/operand/tests/olocal/olocal.asl index 35a29f8d8..819ac0347 100644 --- a/tests/aslts/src/runtime/collections/complex/operand/tests/olocal/olocal.asl +++ b/tests/aslts/src/runtime/collections/complex/operand/tests/olocal/olocal.asl @@ -10857,7 +10857,7 @@ Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z117, 0x3223, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z117, __LINE__, 0x00, 0x00, Local2, C08C) } /* Stall */ @@ -10869,7 +10869,7 @@ Local2 = (Local1 - Local0) If ((Local2 < 0x03DE)) { - ERR (Arg0, Z117, 0x3230, 0x00, 0x00, Local2, 0x03DE) + ERR (Arg0, Z117, __LINE__, 0x00, 0x00, Local2, 0x03DE) } } @@ -10890,7 +10890,7 @@ Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z117, 0x3249, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z117, __LINE__, 0x00, 0x00, Local2, C08C) } } @@ -10908,7 +10908,7 @@ Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z117, 0x325F, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z117, __LINE__, 0x00, 0x00, Local2, C08C) } } @@ -21088,7 +21088,7 @@ Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z117, 0x5F6D, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z117, __LINE__, 0x00, 0x00, Local2, C08C) } /* Stall */ @@ -21100,7 +21100,7 @@ Local2 = (Local1 - Local0) If ((Local2 < 0x03DE)) { - ERR (Arg0, Z117, 0x5F7A, 0x00, 0x00, Local2, 0x03DE) + ERR (Arg0, Z117, __LINE__, 0x00, 0x00, Local2, 0x03DE) } } @@ -21124,7 +21124,7 @@ Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z117, 0x5F94, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z117, __LINE__, 0x00, 0x00, Local2, C08C) } } @@ -21145,7 +21145,7 @@ Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z117, 0x5FAA, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z117, __LINE__, 0x00, 0x00, Local2, C08C) } } diff --git a/tests/aslts/src/runtime/collections/complex/operand/tests/onamedglob/onamedglob1.asl b/tests/aslts/src/runtime/collections/complex/operand/tests/onamedglob/onamedglob1.asl index b6b748e50..3e8eafb49 100644 --- a/tests/aslts/src/runtime/collections/complex/operand/tests/onamedglob/onamedglob1.asl +++ b/tests/aslts/src/runtime/collections/complex/operand/tests/onamedglob/onamedglob1.asl @@ -10722,7 +10722,7 @@ Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z086, 0x3151, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z086, __LINE__, 0x00, 0x00, Local2, C08C) } /* Stall */ @@ -10734,7 +10734,7 @@ Local2 = (Local1 - Local0) If ((Local2 < 0x03DE)) { - ERR (Arg0, Z086, 0x315E, 0x00, 0x00, Local2, 0x03DE) + ERR (Arg0, Z086, __LINE__, 0x00, 0x00, Local2, 0x03DE) } } @@ -10754,7 +10754,7 @@ Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z086, 0x3175, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z086, __LINE__, 0x00, 0x00, Local2, C08C) } } @@ -10771,7 +10771,7 @@ Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z086, 0x3189, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z086, __LINE__, 0x00, 0x00, Local2, C08C) } } @@ -20468,7 +20468,7 @@ Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z086, 0x5DEE, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z086, __LINE__, 0x00, 0x00, Local2, C08C) } /* Stall */ @@ -20480,7 +20480,7 @@ Local2 = (Local1 - Local0) If ((Local2 < 0x03DE)) { - ERR (Arg0, Z086, 0x5DFB, 0x00, 0x00, Local2, 0x03DE) + ERR (Arg0, Z086, __LINE__, 0x00, 0x00, Local2, 0x03DE) } } @@ -20500,7 +20500,7 @@ Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z086, 0x5E13, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z086, __LINE__, 0x00, 0x00, Local2, C08C) } } @@ -20517,7 +20517,7 @@ Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z086, 0x5E27, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z086, __LINE__, 0x00, 0x00, Local2, C08C) } } diff --git a/tests/aslts/src/runtime/collections/complex/operand/tests/onamedglob/onamedglob2.asl b/tests/aslts/src/runtime/collections/complex/operand/tests/onamedglob/onamedglob2.asl index 865dc2147..c39224558 100644 --- a/tests/aslts/src/runtime/collections/complex/operand/tests/onamedglob/onamedglob2.asl +++ b/tests/aslts/src/runtime/collections/complex/operand/tests/onamedglob/onamedglob2.asl @@ -10101,7 +10101,7 @@ Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z087, 0x2E62, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z087, __LINE__, 0x00, 0x00, Local2, C08C) } /* Stall */ @@ -10113,7 +10113,7 @@ Local2 = (Local1 - Local0) If ((Local2 < 0x03DE)) { - ERR (Arg0, Z087, 0x2E6F, 0x00, 0x00, Local2, 0x03DE) + ERR (Arg0, Z087, __LINE__, 0x00, 0x00, Local2, 0x03DE) } } @@ -10133,7 +10133,7 @@ Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z087, 0x2E87, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z087, __LINE__, 0x00, 0x00, Local2, C08C) } } @@ -10150,7 +10150,7 @@ Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z087, 0x2E9B, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z087, __LINE__, 0x00, 0x00, Local2, C08C) } } diff --git a/tests/aslts/src/runtime/collections/complex/operand/tests/onamedloc/onamedloc1.asl b/tests/aslts/src/runtime/collections/complex/operand/tests/onamedloc/onamedloc1.asl index ebeba5387..14a248aed 100644 --- a/tests/aslts/src/runtime/collections/complex/operand/tests/onamedloc/onamedloc1.asl +++ b/tests/aslts/src/runtime/collections/complex/operand/tests/onamedloc/onamedloc1.asl @@ -10859,7 +10859,7 @@ Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z088, 0x3225, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z088, __LINE__, 0x00, 0x00, Local2, C08C) } /* Stall */ @@ -10871,7 +10871,7 @@ Local2 = (Local1 - Local0) If ((Local2 < 0x03DE)) { - ERR (Arg0, Z088, 0x3232, 0x00, 0x00, Local2, 0x03DE) + ERR (Arg0, Z088, __LINE__, 0x00, 0x00, Local2, 0x03DE) } } @@ -10892,7 +10892,7 @@ Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z088, 0x324B, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z088, __LINE__, 0x00, 0x00, Local2, C08C) } } @@ -10910,7 +10910,7 @@ Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z088, 0x3261, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z088, __LINE__, 0x00, 0x00, Local2, C08C) } } @@ -21104,7 +21104,7 @@ Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z088, 0x5F84, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z088, __LINE__, 0x00, 0x00, Local2, C08C) } /* Stall */ @@ -21116,7 +21116,7 @@ Local2 = (Local1 - Local0) If ((Local2 < 0x03DE)) { - ERR (Arg0, Z088, 0x5F91, 0x00, 0x00, Local2, 0x03DE) + ERR (Arg0, Z088, __LINE__, 0x00, 0x00, Local2, 0x03DE) } } @@ -21140,7 +21140,7 @@ Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z088, 0x5FAB, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z088, __LINE__, 0x00, 0x00, Local2, C08C) } } @@ -21161,7 +21161,7 @@ Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z088, 0x5FC1, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z088, __LINE__, 0x00, 0x00, Local2, C08C) } } diff --git a/tests/aslts/src/runtime/collections/complex/operand/tests/onamedloc/onamedloc2.asl b/tests/aslts/src/runtime/collections/complex/operand/tests/onamedloc/onamedloc2.asl index 7db9e0a6b..399bc5953 100644 --- a/tests/aslts/src/runtime/collections/complex/operand/tests/onamedloc/onamedloc2.asl +++ b/tests/aslts/src/runtime/collections/complex/operand/tests/onamedloc/onamedloc2.asl @@ -10723,7 +10723,7 @@ Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z089, 0x2FFF, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z089, __LINE__, 0x00, 0x00, Local2, C08C) } /* Stall */ @@ -10735,7 +10735,7 @@ Local2 = (Local1 - Local0) If ((Local2 < 0x03DE)) { - ERR (Arg0, Z089, 0x300C, 0x00, 0x00, Local2, 0x03DE) + ERR (Arg0, Z089, __LINE__, 0x00, 0x00, Local2, 0x03DE) } } @@ -10760,7 +10760,7 @@ Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z089, 0x3028, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z089, __LINE__, 0x00, 0x00, Local2, C08C) } } @@ -10782,7 +10782,7 @@ Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z089, 0x3040, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z089, __LINE__, 0x00, 0x00, Local2, C08C) } } diff --git a/tests/aslts/src/runtime/collections/complex/operand/tests/opackageel/opackageel.asl b/tests/aslts/src/runtime/collections/complex/operand/tests/opackageel/opackageel.asl index 2057358ea..f5e0d54ad 100644 --- a/tests/aslts/src/runtime/collections/complex/operand/tests/opackageel/opackageel.asl +++ b/tests/aslts/src/runtime/collections/complex/operand/tests/opackageel/opackageel.asl @@ -11530,7 +11530,7 @@ Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z090, 0x3151, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z090, __LINE__, 0x00, 0x00, Local2, C08C) } /* Stall */ @@ -11542,7 +11542,7 @@ Local2 = (Local1 - Local0) If ((Local2 < 0x03DE)) { - ERR (Arg0, Z090, 0x315E, 0x00, 0x00, Local2, 0x03DE) + ERR (Arg0, Z090, __LINE__, 0x00, 0x00, Local2, 0x03DE) } } @@ -11562,7 +11562,7 @@ Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z090, 0x3175, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z090, __LINE__, 0x00, 0x00, Local2, C08C) } } @@ -11579,7 +11579,7 @@ Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z090, 0x3189, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z090, __LINE__, 0x00, 0x00, Local2, C08C) } } @@ -21970,7 +21970,7 @@ Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z090, 0x5DEE, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z090, __LINE__, 0x00, 0x00, Local2, C08C) } /* Stall */ @@ -21982,7 +21982,7 @@ Local2 = (Local1 - Local0) If ((Local2 < 0x03DE)) { - ERR (Arg0, Z090, 0x5DFB, 0x00, 0x00, Local2, 0x03DE) + ERR (Arg0, Z090, __LINE__, 0x00, 0x00, Local2, 0x03DE) } } @@ -22002,7 +22002,7 @@ Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z090, 0x5E13, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z090, __LINE__, 0x00, 0x00, Local2, C08C) } } @@ -22019,7 +22019,7 @@ Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z090, 0x5E27, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z090, __LINE__, 0x00, 0x00, Local2, C08C) } } diff --git a/tests/aslts/src/runtime/collections/complex/operand/tests/oreftonamed/oreftonamed1.asl b/tests/aslts/src/runtime/collections/complex/operand/tests/oreftonamed/oreftonamed1.asl index 1ff194add..c8b969699 100644 --- a/tests/aslts/src/runtime/collections/complex/operand/tests/oreftonamed/oreftonamed1.asl +++ b/tests/aslts/src/runtime/collections/complex/operand/tests/oreftonamed/oreftonamed1.asl @@ -10780,7 +10780,7 @@ Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z091, 0x3151, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z091, __LINE__, 0x00, 0x00, Local2, C08C) } /* Stall */ @@ -10792,7 +10792,7 @@ Local2 = (Local1 - Local0) If ((Local2 < 0x03DE)) { - ERR (Arg0, Z091, 0x315E, 0x00, 0x00, Local2, 0x03DE) + ERR (Arg0, Z091, __LINE__, 0x00, 0x00, Local2, 0x03DE) } } @@ -10812,7 +10812,7 @@ Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z091, 0x3175, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z091, __LINE__, 0x00, 0x00, Local2, C08C) } } @@ -10829,7 +10829,7 @@ Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z091, 0x3189, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z091, __LINE__, 0x00, 0x00, Local2, C08C) } } @@ -20572,7 +20572,7 @@ Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z091, 0x5DEE, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z091, __LINE__, 0x00, 0x00, Local2, C08C) } /* Stall */ @@ -20584,7 +20584,7 @@ Local2 = (Local1 - Local0) If ((Local2 < 0x03DE)) { - ERR (Arg0, Z091, 0x5DFB, 0x00, 0x00, Local2, 0x03DE) + ERR (Arg0, Z091, __LINE__, 0x00, 0x00, Local2, 0x03DE) } } @@ -20604,7 +20604,7 @@ Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z091, 0x5E13, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z091, __LINE__, 0x00, 0x00, Local2, C08C) } } @@ -20621,7 +20621,7 @@ Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z091, 0x5E27, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z091, __LINE__, 0x00, 0x00, Local2, C08C) } } diff --git a/tests/aslts/src/runtime/collections/complex/operand/tests/oreftonamed/oreftonamed2.asl b/tests/aslts/src/runtime/collections/complex/operand/tests/oreftonamed/oreftonamed2.asl index 474663fa9..b4e7ec1d8 100644 --- a/tests/aslts/src/runtime/collections/complex/operand/tests/oreftonamed/oreftonamed2.asl +++ b/tests/aslts/src/runtime/collections/complex/operand/tests/oreftonamed/oreftonamed2.asl @@ -10155,7 +10155,7 @@ Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z120, 0x2E54, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z120, __LINE__, 0x00, 0x00, Local2, C08C) } /* Stall */ @@ -10167,7 +10167,7 @@ Local2 = (Local1 - Local0) If ((Local2 < 0x03DE)) { - ERR (Arg0, Z120, 0x2E61, 0x00, 0x00, Local2, 0x03DE) + ERR (Arg0, Z120, __LINE__, 0x00, 0x00, Local2, 0x03DE) } } @@ -10187,7 +10187,7 @@ Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z120, 0x2E79, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z120, __LINE__, 0x00, 0x00, Local2, C08C) } } @@ -10204,7 +10204,7 @@ Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z120, 0x2E8D, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z120, __LINE__, 0x00, 0x00, Local2, C08C) } } diff --git a/tests/aslts/src/runtime/collections/complex/operand/tests/oreftopackageel/oreftopackageel.asl b/tests/aslts/src/runtime/collections/complex/operand/tests/oreftopackageel/oreftopackageel.asl index a33ea48c4..5bc701e6e 100644 --- a/tests/aslts/src/runtime/collections/complex/operand/tests/oreftopackageel/oreftopackageel.asl +++ b/tests/aslts/src/runtime/collections/complex/operand/tests/oreftopackageel/oreftopackageel.asl @@ -12368,7 +12368,7 @@ Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z119, 0x3152, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z119, __LINE__, 0x00, 0x00, Local2, C08C) } /* Stall */ @@ -12380,7 +12380,7 @@ Local2 = (Local1 - Local0) If ((Local2 < 0x03DE)) { - ERR (Arg0, Z119, 0x315F, 0x00, 0x00, Local2, 0x03DE) + ERR (Arg0, Z119, __LINE__, 0x00, 0x00, Local2, 0x03DE) } } @@ -12400,7 +12400,7 @@ Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z119, 0x3176, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z119, __LINE__, 0x00, 0x00, Local2, C08C) } } @@ -12417,7 +12417,7 @@ Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z119, 0x318A, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z119, __LINE__, 0x00, 0x00, Local2, C08C) } } @@ -23568,7 +23568,7 @@ Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z119, 0x5DF0, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z119, __LINE__, 0x00, 0x00, Local2, C08C) } /* Stall */ @@ -23580,7 +23580,7 @@ Local2 = (Local1 - Local0) If ((Local2 < 0x03DE)) { - ERR (Arg0, Z119, 0x5DFD, 0x00, 0x00, Local2, 0x03DE) + ERR (Arg0, Z119, __LINE__, 0x00, 0x00, Local2, 0x03DE) } } @@ -23600,7 +23600,7 @@ Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z119, 0x5E15, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z119, __LINE__, 0x00, 0x00, Local2, C08C) } } @@ -23617,7 +23617,7 @@ Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z119, 0x5E29, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z119, __LINE__, 0x00, 0x00, Local2, C08C) } } diff --git a/tests/aslts/src/runtime/collections/complex/operand/tests/oreturn/oreturn.asl b/tests/aslts/src/runtime/collections/complex/operand/tests/oreturn/oreturn.asl index 17f9012cc..babd67f98 100644 --- a/tests/aslts/src/runtime/collections/complex/operand/tests/oreturn/oreturn.asl +++ b/tests/aslts/src/runtime/collections/complex/operand/tests/oreturn/oreturn.asl @@ -11530,7 +11530,7 @@ Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z118, 0x3151, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z118, __LINE__, 0x00, 0x00, Local2, C08C) } /* Stall */ @@ -11542,7 +11542,7 @@ Local2 = (Local1 - Local0) If ((Local2 < 0x03DE)) { - ERR (Arg0, Z118, 0x315E, 0x00, 0x00, Local2, 0x03DE) + ERR (Arg0, Z118, __LINE__, 0x00, 0x00, Local2, 0x03DE) } } @@ -11562,7 +11562,7 @@ Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z118, 0x3175, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z118, __LINE__, 0x00, 0x00, Local2, C08C) } } @@ -11579,7 +11579,7 @@ Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z118, 0x3189, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z118, __LINE__, 0x00, 0x00, Local2, C08C) } } @@ -21971,7 +21971,7 @@ Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z118, 0x5DEE, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z118, __LINE__, 0x00, 0x00, Local2, C08C) } /* Stall */ @@ -21983,7 +21983,7 @@ Local2 = (Local1 - Local0) If ((Local2 < 0x03DE)) { - ERR (Arg0, Z118, 0x5DFB, 0x00, 0x00, Local2, 0x03DE) + ERR (Arg0, Z118, __LINE__, 0x00, 0x00, Local2, 0x03DE) } } @@ -22003,7 +22003,7 @@ Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z118, 0x5E13, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z118, __LINE__, 0x00, 0x00, Local2, C08C) } } @@ -22020,7 +22020,7 @@ Local2 = (Local1 - Local0) If ((Local2 < C08C)) { - ERR (Arg0, Z118, 0x5E27, 0x00, 0x00, Local2, C08C) + ERR (Arg0, Z118, __LINE__, 0x00, 0x00, Local2, C08C) } } diff --git a/tests/aslts/src/runtime/collections/complex/provoke/provoke.asl b/tests/aslts/src/runtime/collections/complex/provoke/provoke.asl index 0c6abf446..6927f064b 100644 --- a/tests/aslts/src/runtime/collections/complex/provoke/provoke.asl +++ b/tests/aslts/src/runtime/collections/complex/provoke/provoke.asl @@ -46,7 +46,7 @@ Local2 = ToString (B000, Local0) If ((Local0 != 0x00)) { - ERR (Arg0, Z055, 0x33, 0x00, 0x00, Local0, 0x00) + ERR (Arg0, Z055, __LINE__, 0x00, 0x00, Local0, 0x00) } CH03 (Arg0, Z055, 0x01, 0x36, 0x00) @@ -68,7 +68,7 @@ M131 (Local0) If ((Local0 != 0x0A)) { - ERR (Arg0, Z055, 0x48, 0x00, 0x00, Local0, 0x0A) + ERR (Arg0, Z055, __LINE__, 0x00, 0x00, Local0, 0x0A) } CH03 (Arg0, Z055, 0x03, 0x4B, 0x00) @@ -83,7 +83,7 @@ M131 (Local1) If ((Local0 != 0x09)) { - ERR (Arg0, Z055, 0x56, 0x00, 0x00, Local0, 0x09) + ERR (Arg0, Z055, __LINE__, 0x00, 0x00, Local0, 0x09) } CH03 (Arg0, Z055, 0x05, 0x59, 0x00) @@ -95,7 +95,7 @@ M131 (RefOf (Local0)) If ((Local0 != 0x09)) { - ERR (Arg0, Z055, 0x61, 0x00, 0x00, Local0, 0x09) + ERR (Arg0, Z055, __LINE__, 0x00, 0x00, Local0, 0x09) } CH03 (Arg0, Z055, 0x07, 0x64, 0x00) @@ -112,7 +112,7 @@ M135 (RefOf (Local0)) If ((Local0 != 0x05)) { - ERR (Arg0, Z055, 0x71, 0x00, 0x00, Local0, 0x05) + ERR (Arg0, Z055, __LINE__, 0x00, 0x00, Local0, 0x05) } CH03 (Arg0, Z055, 0x09, 0x74, 0x00) 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 0302abe57..48129df31 100644 --- a/tests/aslts/src/runtime/collections/complex/result/common/rcommon.asl +++ b/tests/aslts/src/runtime/collections/complex/result/common/rcommon.asl @@ -659,14 +659,14 @@ Local1 = ObjectType (Arg4) If ((Local0 != Local1)) { - ERR (Concatenate (Arg0, "-OType"), Z122, 0x0148, Arg2, 0x00, Local0, Local1) + ERR (Concatenate (Arg0, "-OType"), Z122, __LINE__, Arg2, 0x00, Local0, Local1) Return (0x01) } ElseIf (DerefOf (B679 [Local0])) { If ((Arg3 != Arg4)) { - ERR (Arg0, Z122, 0x014C, Arg2, 0x00, Arg3, Arg4) + ERR (Arg0, Z122, __LINE__, Arg2, 0x00, Arg3, Arg4) Return (0x01) } } @@ -1140,7 +1140,7 @@ { If ((Arg0 != Arg1)) { - ERR (Arg0, Z122, 0x027D, 0x00, 0x00, Arg0, Arg1) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, Arg0, Arg1) If (STCS) { M000 (0x03, 0x0100, Arg2, Arg1) @@ -1674,7 +1674,7 @@ Default { - ERR (Concatenate (Arg0, TERR), Z122, 0x0452, 0x00, 0x00, Arg1, 0x00) + ERR (Concatenate (Arg0, TERR), Z122, __LINE__, 0x00, 0x00, Arg1, 0x00) Return (0x01) } @@ -1699,7 +1699,7 @@ { /* ObjectType of Target can not be set up */ - ERR (Arg0, Z122, 0x0463, 0x00, 0x00, Local0, Arg1) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, Local0, Arg1) Return (0x01) } @@ -1823,7 +1823,7 @@ Default { - ERR (Concatenate (Arg0, TERR), Z122, 0x04BC, 0x00, 0x00, Arg1, 0x00) + ERR (Concatenate (Arg0, TERR), Z122, __LINE__, 0x00, 0x00, Arg1, 0x00) Return (0x01) } @@ -1848,7 +1848,7 @@ { /* ObjectType of Source can not be set up */ - ERR (Arg0, Z122, 0x04CD, 0x00, 0x00, Local0, Arg1) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, Local0, Arg1) Return (0x01) } @@ -1882,7 +1882,7 @@ { /* ObjectType of Source object is corrupted */ - ERR (Arg0, Z122, 0x04EA, 0x00, 0x00, Local0, Arg1) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, Local0, Arg1) Return (0x01) } @@ -1976,7 +1976,7 @@ Default { - ERR (Arg0, Z122, 0x052C, 0x00, 0x00, Arg1, 0x00) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, Arg1, 0x00) Return (0x01) } @@ -1986,7 +1986,7 @@ { /* Mismatch of Source Type against specified Result Type */ - ERR (Arg0, Z122, 0x0533, 0x00, 0x00, Local0, Arg1) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, Local0, Arg1) If (STCS) { M000 (0x03, 0x01000000, Local0, Arg1) @@ -2004,13 +2004,13 @@ { If ((INT0 != DerefOf (Arg3))) { - ERR (Arg0, Z122, 0x053D, 0x00, 0x00, INT0, DerefOf (Arg3)) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, INT0, DerefOf (Arg3)) Return (0x01) } If ((DerefOf (Arg2) != INT0)) { - ERR (Arg0, Z122, 0x0541, 0x00, 0x00, DerefOf (Arg2), INT0) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, DerefOf (Arg2), INT0) Return (0x01) } } @@ -2018,13 +2018,13 @@ { If ((STR0 != DerefOf (Arg3))) { - ERR (Arg0, Z122, 0x0547, 0x00, 0x00, STR0, DerefOf (Arg3)) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, STR0, DerefOf (Arg3)) Return (0x01) } If ((DerefOf (Arg2) != STR0)) { - ERR (Arg0, Z122, 0x054B, 0x00, 0x00, DerefOf (Arg2), STR0) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, DerefOf (Arg2), STR0) Return (0x01) } } @@ -2032,13 +2032,13 @@ { If ((BUF0 != DerefOf (Arg3))) { - ERR (Arg0, Z122, 0x0551, 0x00, 0x00, BUF0, DerefOf (Arg3)) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, BUF0, DerefOf (Arg3)) Return (0x01) } If ((DerefOf (Arg2) != BUF0)) { - ERR (Arg0, Z122, 0x0555, 0x00, 0x00, DerefOf (Arg2), BUF0) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, DerefOf (Arg2), BUF0) Return (0x01) } } @@ -2047,7 +2047,7 @@ Local0 = SizeOf (PAC0) If ((SizeOf (Arg3) != Local0)) { - ERR (Arg0, Z122, 0x055D, 0x00, 0x00, SizeOf (Arg3), Local0) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, SizeOf (Arg3), Local0) Return (0x01) } @@ -2060,7 +2060,7 @@ { /* ObjectType is corrupted */ - ERR (Arg0, Z122, 0x0566, 0x00, 0x00, Local1, Local2) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, Local1, Local2) Return (0x01) } ElseIf (DerefOf (B679 [Local1])) @@ -2072,7 +2072,7 @@ { /* The value is corrupted */ - ERR (Arg0, Z122, 0x056E, 0x00, 0x00, DerefOf (DerefOf (Arg3) [Local0]), + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, DerefOf (DerefOf (Arg3) [Local0]), Local0) Return (0x01) } @@ -2082,7 +2082,7 @@ Local0 = SizeOf (PAC0) If ((SizeOf (Arg2) != Local0)) { - ERR (Arg0, Z122, 0x0576, 0x00, 0x00, SizeOf (Arg2), Local0) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, SizeOf (Arg2), Local0) Return (0x01) } @@ -2095,7 +2095,7 @@ { /* ObjectType is corrupted */ - ERR (Arg0, Z122, 0x057F, 0x00, 0x00, Local1, Local2) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, Local1, Local2) Return (0x01) } ElseIf (DerefOf (B679 [Local1])) @@ -2107,7 +2107,7 @@ { /* The value is corrupted */ - ERR (Arg0, Z122, 0x0587, 0x00, 0x00, DerefOf (DerefOf (Arg2) [Local0]), + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, DerefOf (DerefOf (Arg2) [Local0]), Local0) Return (0x01) } @@ -2121,14 +2121,14 @@ { If ((FLU0 != DerefOf (DerefOf (Arg3) [0x01]))) { - ERR (Arg0, Z122, 0x0591, 0x00, 0x00, FLU0, DerefOf (DerefOf (Arg3) [0x01] + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, FLU0, DerefOf (DerefOf (Arg3) [0x01] )) Return (0x01) } If ((DerefOf (Arg2) != FLU0)) { - ERR (Arg0, Z122, 0x0595, 0x00, 0x00, DerefOf (Arg2), FLU0) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, DerefOf (Arg2), FLU0) Return (0x01) } } @@ -2136,14 +2136,14 @@ { If ((FLU2 != DerefOf (DerefOf (Arg3) [0x01]))) { - ERR (Arg0, Z122, 0x059A, 0x00, 0x00, FLU2, DerefOf (DerefOf (Arg3) [0x01] + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, FLU2, DerefOf (DerefOf (Arg3) [0x01] )) Return (0x01) } If ((DerefOf (Arg2) != FLU2)) { - ERR (Arg0, Z122, 0x059E, 0x00, 0x00, DerefOf (Arg2), FLU2) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, DerefOf (Arg2), FLU2) Return (0x01) } } @@ -2151,14 +2151,14 @@ { If ((FLU4 != DerefOf (DerefOf (Arg3) [0x01]))) { - ERR (Arg0, Z122, 0x05A3, 0x00, 0x00, FLU4, DerefOf (DerefOf (Arg3) [0x01] + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, FLU4, DerefOf (DerefOf (Arg3) [0x01] )) Return (0x01) } If ((DerefOf (Arg2) != FLU4)) { - ERR (Arg0, Z122, 0x05A7, 0x00, 0x00, DerefOf (Arg2), FLU4) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, DerefOf (Arg2), FLU4) Return (0x01) } } @@ -2168,7 +2168,7 @@ CopyObject (DerefOf (Arg2), MMM2) /* \M689.M005.MMM2 */ If ((MMM2 != MMM0)) { - ERR (Arg0, Z122, 0x05AF, 0x00, 0x00, MMM2, MMM0) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, MMM2, MMM0) Return (0x01) } } @@ -2179,14 +2179,14 @@ { If ((BFL0 != DerefOf (DerefOf (Arg3) [0x01]))) { - ERR (Arg0, Z122, 0x05B7, 0x00, 0x00, BFL0, DerefOf (DerefOf (Arg3) [0x01] + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, BFL0, DerefOf (DerefOf (Arg3) [0x01] )) Return (0x01) } If ((DerefOf (Arg2) != BFL0)) { - ERR (Arg0, Z122, 0x05BB, 0x00, 0x00, DerefOf (Arg2), BFL0) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, DerefOf (Arg2), BFL0) Return (0x01) } } @@ -2194,14 +2194,14 @@ { If ((BFL2 != DerefOf (DerefOf (Arg3) [0x01]))) { - ERR (Arg0, Z122, 0x05C0, 0x00, 0x00, BFL2, DerefOf (DerefOf (Arg3) [0x01] + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, BFL2, DerefOf (DerefOf (Arg3) [0x01] )) Return (0x01) } If ((DerefOf (Arg2) != BFL2)) { - ERR (Arg0, Z122, 0x05C4, 0x00, 0x00, DerefOf (Arg2), BFL2) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, DerefOf (Arg2), BFL2) Return (0x01) } } @@ -2209,14 +2209,14 @@ { If ((BFL4 != DerefOf (DerefOf (Arg3) [0x01]))) { - ERR (Arg0, Z122, 0x05C9, 0x00, 0x00, BFL4, DerefOf (DerefOf (Arg3) [0x01] + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, BFL4, DerefOf (DerefOf (Arg3) [0x01] )) Return (0x01) } If ((DerefOf (Arg2) != BFL4)) { - ERR (Arg0, Z122, 0x05CD, 0x00, 0x00, DerefOf (Arg2), BFL4) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, DerefOf (Arg2), BFL4) Return (0x01) } } @@ -2259,7 +2259,7 @@ } Else { - ERR (Arg0, Z122, 0x05EE, 0x00, 0x00, Local2, Arg2) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, Local2, Arg2) } If (STCS) @@ -2291,14 +2291,14 @@ { /* Types mismatch Result/Target on storing */ - ERR (Arg0, Z122, 0x0605, 0x00, 0x00, Local2, Arg3) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, Local2, Arg3) Return (0x01) } ElseIf ((Local2 != 0x03)) { /* Types mismatch Result/Target on storing */ /* Test fixed type Objects are converted to Buffer */ - ERR (Arg0, Z122, 0x060A, 0x00, 0x00, Local2, 0x03) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, Local2, 0x03) Return (0x01) } @@ -2346,7 +2346,7 @@ CopyObject (DerefOf (Arg1), MMM2) /* \M689.M006.MMM2 */ If ((MMM2 != Local7)) { - ERR (Arg0, Z122, 0x062B, 0x00, 0x00, MMM2, Local7) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, MMM2, Local7) Return (0x01) } } @@ -2356,7 +2356,7 @@ If ((DerefOf (Arg1) != Local7)) { - ERR (Arg0, Z122, 0x0630, 0x00, 0x00, DerefOf (Arg1), Local7) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, DerefOf (Arg1), Local7) Return (0x01) } } @@ -2367,7 +2367,7 @@ Local0 = SizeOf (Local7) If ((SizeOf (Arg1) != Local0)) { - ERR (Arg0, Z122, 0x0636, 0x00, 0x00, SizeOf (Arg1), Local0) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, SizeOf (Arg1), Local0) Return (0x01) } @@ -2380,7 +2380,7 @@ { /* ObjectType is corrupted */ - ERR (Arg0, Z122, 0x063F, 0x00, 0x00, Local1, Local2) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, Local1, Local2) Return (0x01) } ElseIf (DerefOf (B679 [Local1])) @@ -2392,7 +2392,7 @@ { /* The value is corrupted */ - ERR (Arg0, Z122, 0x0647, 0x00, 0x00, DerefOf (DerefOf (Arg1) [Local0]), + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, DerefOf (DerefOf (Arg1) [Local0]), DerefOf (Local7 [Local0])) Return (0x01) } @@ -2612,7 +2612,7 @@ { /* Source Object can not be prepared */ - ERR (Concatenate (Arg0, TERR), Z122, 0x06D1, 0x00, 0x00, Arg3, 0x00) + ERR (Concatenate (Arg0, TERR), Z122, __LINE__, 0x00, 0x00, Arg3, 0x00) Return (0x01) } @@ -2647,7 +2647,7 @@ { /* Target Object can not be prepared */ - ERR (Concatenate (Arg0, TERR), Z122, 0x06E2, 0x00, 0x00, Arg2, 0x00) + ERR (Concatenate (Arg0, TERR), Z122, __LINE__, 0x00, 0x00, Arg2, 0x00) Return (0x01) } @@ -2759,7 +2759,7 @@ { /* Unexpected Kind of Op (0 - Store, ...) */ - ERR (Concatenate (Arg0, TERR), Z122, 0x071C, 0x00, 0x00, Arg4, 0x00) + ERR (Concatenate (Arg0, TERR), Z122, __LINE__, 0x00, 0x00, Arg4, 0x00) Return (0x01) } } @@ -2861,7 +2861,7 @@ { /* Unexpected Kind of Op (0 - Store, ...) */ - ERR (Concatenate (Arg0, TERR), Z122, 0x074E, 0x00, 0x00, Arg4, 0x00) + ERR (Concatenate (Arg0, TERR), Z122, __LINE__, 0x00, 0x00, Arg4, 0x00) Return (0x01) } } @@ -2959,7 +2959,7 @@ { /* Unexpected Kind of Op (0 - Store, ...) */ - ERR (Concatenate (Arg0, TERR), Z122, 0x0782, 0x00, 0x00, Arg4, 0x00) + ERR (Concatenate (Arg0, TERR), Z122, __LINE__, 0x00, 0x00, Arg4, 0x00) Return (0x01) } @@ -3242,7 +3242,7 @@ DerefOf (Index (Buffer (0x12) { /* Source Object can not be prepared */ - ERR (Concatenate (Arg0, TERR), Z122, 0x0839, 0x00, 0x00, Arg3, 0x00) + ERR (Concatenate (Arg0, TERR), Z122, __LINE__, 0x00, 0x00, Arg3, 0x00) Return (0x01) } @@ -3253,7 +3253,7 @@ DerefOf (Index (Buffer (0x12) { /* Target Object can not be prepared */ - ERR (Concatenate (Arg0, TERR), Z122, 0x0841, 0x00, 0x00, Arg2, 0x00) + ERR (Concatenate (Arg0, TERR), Z122, __LINE__, 0x00, 0x00, Arg2, 0x00) Return (0x01) } @@ -3361,7 +3361,7 @@ DerefOf (Index (Buffer (0x12) { /* Unexpected Kind of Op (0 - Store, ...) */ - ERR (Concatenate (Arg0, TERR), Z122, 0x087A, 0x00, 0x00, Arg4, 0x00) + ERR (Concatenate (Arg0, TERR), Z122, __LINE__, 0x00, 0x00, Arg4, 0x00) Return (0x01) } @@ -3493,7 +3493,7 @@ DerefOf (Index (Buffer (0x12) { /* Source Object can not be prepared */ - ERR (Concatenate (Arg0, TERR), Z122, 0x08D1, 0x00, 0x00, Arg3, 0x00) + ERR (Concatenate (Arg0, TERR), Z122, __LINE__, 0x00, 0x00, Arg3, 0x00) Return (0x01) } @@ -3528,7 +3528,7 @@ DerefOf (Index (Buffer (0x12) { /* Target Object can not be prepared */ - ERR (Concatenate (Arg0, TERR), Z122, 0x08E2, 0x00, 0x00, Arg2, 0x00) + ERR (Concatenate (Arg0, TERR), Z122, __LINE__, 0x00, 0x00, Arg2, 0x00) Return (0x01) } @@ -3561,7 +3561,7 @@ DerefOf (Index (Buffer (0x12) { /* Unexpected Kind of Op (0 - Store, ...) */ - ERR (Concatenate (Arg0, TERR), Z122, 0x08F3, 0x00, 0x00, Arg4, 0x00) + ERR (Concatenate (Arg0, TERR), Z122, __LINE__, 0x00, 0x00, Arg4, 0x00) Return (0x01) } } @@ -3585,7 +3585,7 @@ DerefOf (Index (Buffer (0x12) { /* Unexpected Kind of Op (0 - Store, ...) */ - ERR (Concatenate (Arg0, TERR), Z122, 0x08FD, 0x00, 0x00, Arg4, 0x00) + ERR (Concatenate (Arg0, TERR), Z122, __LINE__, 0x00, 0x00, Arg4, 0x00) Return (0x01) } } @@ -3605,7 +3605,7 @@ DerefOf (Index (Buffer (0x12) { /* Unexpected Kind of Op (0 - Store, ...) */ - ERR (Concatenate (Arg0, TERR), Z122, 0x0909, 0x00, 0x00, Arg4, 0x00) + ERR (Concatenate (Arg0, TERR), Z122, __LINE__, 0x00, 0x00, Arg4, 0x00) Return (0x01) } @@ -3812,7 +3812,7 @@ DerefOf (Index (Buffer (0x12) { /* Source Object can not be prepared */ - ERR (Concatenate (Arg0, TERR), Z122, 0x0995, 0x00, 0x00, Arg3, 0x00) + ERR (Concatenate (Arg0, TERR), Z122, __LINE__, 0x00, 0x00, Arg3, 0x00) Return (0x01) } @@ -3823,7 +3823,7 @@ DerefOf (Index (Buffer (0x12) { /* Target Object can not be prepared */ - ERR (Concatenate (Arg0, TERR), Z122, 0x099D, 0x00, 0x00, Arg2, 0x00) + ERR (Concatenate (Arg0, TERR), Z122, __LINE__, 0x00, 0x00, Arg2, 0x00) Return (0x01) } @@ -3852,7 +3852,7 @@ DerefOf (Index (Buffer (0x12) { /* Unexpected Kind of Op (0 - Store, ...) */ - ERR (Concatenate (Arg0, TERR), Z122, 0x09AD, 0x00, 0x00, Arg4, 0x00) + ERR (Concatenate (Arg0, TERR), Z122, __LINE__, 0x00, 0x00, Arg4, 0x00) Return (0x01) } @@ -4042,7 +4042,7 @@ DerefOf (Index (Buffer (0x12) { /* Source Object can not be prepared */ - ERR (Concatenate (Arg0, TERR), Z122, 0x0A2C, 0x00, 0x00, Arg3, 0x00) + ERR (Concatenate (Arg0, TERR), Z122, __LINE__, 0x00, 0x00, Arg3, 0x00) Return (0x01) } @@ -4151,7 +4151,7 @@ DerefOf (Index (Buffer (0x12) { /* Unexpected Kind of Op (0 - Store, ...) */ - ERR (Concatenate (Arg0, TERR), Z122, 0x0A69, 0x00, 0x00, Arg4, 0x00) + ERR (Concatenate (Arg0, TERR), Z122, __LINE__, 0x00, 0x00, Arg4, 0x00) Return (0x01) } @@ -4311,7 +4311,7 @@ DerefOf (Index (Buffer (0x12) { /* Target Object can not be prepared */ - ERR (Concatenate (Arg0, TERR), Z122, 0x0ACE, 0x00, 0x00, Arg2, 0x00) + ERR (Concatenate (Arg0, TERR), Z122, __LINE__, 0x00, 0x00, Arg2, 0x00) Return (0x01) } @@ -4451,7 +4451,7 @@ DerefOf (Index (Buffer (0x12) { /* Source Object can not be prepared */ - ERR (Concatenate (Arg0, TERR), Z122, 0x0B2D, 0x00, 0x00, Arg3, 0x00) + ERR (Concatenate (Arg0, TERR), Z122, __LINE__, 0x00, 0x00, Arg3, 0x00) Return (0x01) } @@ -4559,7 +4559,7 @@ DerefOf (Index (Buffer (0x12) { /* Unexpected Kind of Op (0 - Store, ...) */ - ERR (Concatenate (Arg0, TERR), Z122, 0x0B68, 0x00, 0x00, Arg4, 0x00) + ERR (Concatenate (Arg0, TERR), Z122, __LINE__, 0x00, 0x00, Arg4, 0x00) Return (0x01) } @@ -4727,7 +4727,7 @@ DerefOf (Index (Buffer (0x12) { /* Target Object can not be prepared */ - ERR (Concatenate (Arg0, TERR), Z122, 0x0BD0, 0x00, 0x00, Arg2, 0x00) + ERR (Concatenate (Arg0, TERR), Z122, __LINE__, 0x00, 0x00, Arg2, 0x00) Return (0x01) } @@ -4778,7 +4778,7 @@ DerefOf (Index (Buffer (0x12) { /* Source Object can not be prepared */ - ERR (Concatenate (Arg0, TERR), Z122, 0x0BF6, 0x00, 0x00, Arg3, 0x00) + ERR (Concatenate (Arg0, TERR), Z122, __LINE__, 0x00, 0x00, Arg3, 0x00) Return (0x01) } @@ -4790,7 +4790,7 @@ DerefOf (Index (Buffer (0x12) { /* Target Object can not be prepared */ - ERR (Concatenate (Arg0, TERR), Z122, 0x0BFF, 0x00, 0x00, Arg2, 0x00) + ERR (Concatenate (Arg0, TERR), Z122, __LINE__, 0x00, 0x00, Arg2, 0x00) Return (0x01) } @@ -4807,7 +4807,7 @@ DerefOf (Index (Buffer (0x12) { /* Target Object can not be prepared */ - ERR (Concatenate (Arg0, TERR), Z122, 0x0C0B, 0x00, 0x00, Arg2, 0x00) + ERR (Concatenate (Arg0, TERR), Z122, __LINE__, 0x00, 0x00, Arg2, 0x00) Return (0x01) } @@ -4825,7 +4825,7 @@ DerefOf (Index (Buffer (0x12) { /* Unexpected Kind of Op (0 - Store, ...) */ - ERR (Concatenate (Arg0, TERR), Z122, 0x0C16, 0x00, 0x00, Arg4, 0x00) + ERR (Concatenate (Arg0, TERR), Z122, __LINE__, 0x00, 0x00, Arg4, 0x00) Return (0x01) } @@ -4973,7 +4973,7 @@ DerefOf (Index (Buffer (0x12) Default { - ERR (Concatenate (Arg0, TERR), Z122, 0x0C7C, 0x00, 0x00, Arg1, 0x00) + ERR (Concatenate (Arg0, TERR), Z122, __LINE__, 0x00, 0x00, Arg1, 0x00) Return (0x01) } @@ -4998,7 +4998,7 @@ DerefOf (Index (Buffer (0x12) { /* ObjectType of Target can not be set up */ - ERR (Arg0, Z122, 0x0C8D, 0x00, 0x00, Local0, Arg1) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, Local0, Arg1) Return (0x01) } @@ -5031,7 +5031,7 @@ DerefOf (Index (Buffer (0x12) { /* ObjectType of Target object is corrupted */ - ERR (Arg0, Z122, 0x0CA8, 0x00, 0x00, Local0, Arg1) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, Local0, Arg1) Return (0x01) } } @@ -5116,7 +5116,7 @@ DerefOf (Index (Buffer (0x12) Default { - ERR (Arg0, Z122, 0x0CE6, 0x00, 0x00, Arg1, 0x00) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, Arg1, 0x00) Return (0x01) } @@ -5126,7 +5126,7 @@ DerefOf (Index (Buffer (0x12) { /* Mismatch of Target Type against the specified one */ - ERR (Arg0, Z122, 0x0CED, 0x00, 0x00, Local0, Arg1) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, Local0, Arg1) If (STCS) { M000 (0x03, 0x01000000, Local0, Arg1) @@ -5144,13 +5144,13 @@ DerefOf (Index (Buffer (0x12) { If ((INT1 != DerefOf (Arg3))) { - ERR (Arg0, Z122, 0x0CF7, 0x00, 0x00, INT1, DerefOf (Arg3)) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, INT1, DerefOf (Arg3)) Return (0x01) } If ((DerefOf (Arg2) != INT1)) { - ERR (Arg0, Z122, 0x0CFB, 0x00, 0x00, DerefOf (Arg2), INT1) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, DerefOf (Arg2), INT1) Return (0x01) } } @@ -5158,13 +5158,13 @@ DerefOf (Index (Buffer (0x12) { If ((STR1 != DerefOf (Arg3))) { - ERR (Arg0, Z122, 0x0D01, 0x00, 0x00, STR1, DerefOf (Arg3)) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, STR1, DerefOf (Arg3)) Return (0x01) } If ((DerefOf (Arg2) != STR1)) { - ERR (Arg0, Z122, 0x0D05, 0x00, 0x00, DerefOf (Arg2), STR1) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, DerefOf (Arg2), STR1) Return (0x01) } } @@ -5172,13 +5172,13 @@ DerefOf (Index (Buffer (0x12) { If ((BUF1 != DerefOf (Arg3))) { - ERR (Arg0, Z122, 0x0D0B, 0x00, 0x00, BUF1, DerefOf (Arg3)) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, BUF1, DerefOf (Arg3)) Return (0x01) } If ((DerefOf (Arg2) != BUF1)) { - ERR (Arg0, Z122, 0x0D0F, 0x00, 0x00, DerefOf (Arg2), BUF1) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, DerefOf (Arg2), BUF1) Return (0x01) } } @@ -5187,7 +5187,7 @@ DerefOf (Index (Buffer (0x12) Local0 = SizeOf (PAC1) If ((SizeOf (Arg3) != Local0)) { - ERR (Arg0, Z122, 0x0D17, 0x00, 0x00, SizeOf (Arg3), Local0) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, SizeOf (Arg3), Local0) Return (0x01) } @@ -5200,7 +5200,7 @@ DerefOf (Index (Buffer (0x12) { /* ObjectType is corrupted */ - ERR (Arg0, Z122, 0x0D20, 0x00, 0x00, Local1, Local2) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, Local1, Local2) Return (0x01) } ElseIf (DerefOf (B679 [Local1])) @@ -5212,7 +5212,7 @@ DerefOf (Index (Buffer (0x12) { /* The value is corrupted */ - ERR (Arg0, Z122, 0x0D28, 0x00, 0x00, DerefOf (DerefOf (Arg3) [Local0]), + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, DerefOf (DerefOf (Arg3) [Local0]), Local0) Return (0x01) } @@ -5222,7 +5222,7 @@ DerefOf (Index (Buffer (0x12) Local0 = SizeOf (PAC1) If ((SizeOf (Arg2) != Local0)) { - ERR (Arg0, Z122, 0x0D30, 0x00, 0x00, SizeOf (Arg2), Local0) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, SizeOf (Arg2), Local0) Return (0x01) } @@ -5235,7 +5235,7 @@ DerefOf (Index (Buffer (0x12) { /* ObjectType is corrupted */ - ERR (Arg0, Z122, 0x0D39, 0x00, 0x00, Local1, Local2) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, Local1, Local2) Return (0x01) } ElseIf (DerefOf (B679 [Local1])) @@ -5247,7 +5247,7 @@ DerefOf (Index (Buffer (0x12) { /* The value is corrupted */ - ERR (Arg0, Z122, 0x0D41, 0x00, 0x00, DerefOf (DerefOf (Arg2) [Local0]), + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, DerefOf (DerefOf (Arg2) [Local0]), Local0) Return (0x01) } @@ -5258,7 +5258,7 @@ DerefOf (Index (Buffer (0x12) { If ((DerefOf (Arg2) != DerefOf (Arg3))) { - ERR (Arg0, Z122, 0x0D49, 0x00, 0x00, DerefOf (Arg2), DerefOf (Arg3)) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, DerefOf (Arg2), DerefOf (Arg3)) Return (0x01) } } @@ -5267,7 +5267,7 @@ DerefOf (Index (Buffer (0x12) CopyObject (DerefOf (Arg2), MMM2) /* \M689.M015.MMM2 */ If ((MMM2 != MMM1)) { - ERR (Arg0, Z122, 0x0D50, 0x00, 0x00, MMM2, MMM1) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, MMM2, MMM1) Return (0x01) } } @@ -5275,7 +5275,7 @@ DerefOf (Index (Buffer (0x12) { If ((DerefOf (Arg2) != DerefOf (Arg3))) { - ERR (Arg0, Z122, 0x0D56, 0x00, 0x00, DerefOf (Arg2), DerefOf (Arg3)) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, DerefOf (Arg2), DerefOf (Arg3)) Return (0x01) } } @@ -5371,7 +5371,7 @@ DerefOf (Index (Buffer (0x12) Default { - ERR (Arg0, Z122, 0x0D9D, 0x00, 0x00, Arg1, 0x00) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, Arg1, 0x00) Return (0x01) } @@ -5381,7 +5381,7 @@ DerefOf (Index (Buffer (0x12) { /* Mismatch of Target Type against the specified one */ - ERR (Arg0, Z122, 0x0DA4, 0x00, 0x00, Local0, Arg1) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, Local0, Arg1) If (STCS) { M000 (0x03, 0x01000000, Local0, Arg1) @@ -5399,7 +5399,7 @@ DerefOf (Index (Buffer (0x12) { If ((INT1 != DerefOf (Arg3))) { - ERR (Arg0, Z122, 0x0DAE, 0x00, 0x00, INT1, DerefOf (Arg3)) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, INT1, DerefOf (Arg3)) Return (0x01) } } @@ -5407,7 +5407,7 @@ DerefOf (Index (Buffer (0x12) { If ((STR1 != DerefOf (Arg3))) { - ERR (Arg0, Z122, 0x0DB4, 0x00, 0x00, STR1, DerefOf (Arg3)) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, STR1, DerefOf (Arg3)) Return (0x01) } } @@ -5415,7 +5415,7 @@ DerefOf (Index (Buffer (0x12) { If ((BUF1 != DerefOf (Arg3))) { - ERR (Arg0, Z122, 0x0DBA, 0x00, 0x00, BUF1, DerefOf (Arg3)) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, BUF1, DerefOf (Arg3)) Return (0x01) } } @@ -5424,7 +5424,7 @@ DerefOf (Index (Buffer (0x12) Local0 = SizeOf (PAC1) If ((SizeOf (Arg3) != Local0)) { - ERR (Arg0, Z122, 0x0DC2, 0x00, 0x00, SizeOf (Arg3), Local0) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, SizeOf (Arg3), Local0) Return (0x01) } @@ -5437,7 +5437,7 @@ DerefOf (Index (Buffer (0x12) { /* ObjectType is corrupted */ - ERR (Arg0, Z122, 0x0DCB, 0x00, 0x00, Local1, Local2) + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, Local1, Local2) Return (0x01) } ElseIf (DerefOf (B679 [Local1])) @@ -5449,7 +5449,7 @@ DerefOf (Index (Buffer (0x12) { /* The value is corrupted */ - ERR (Arg0, Z122, 0x0DD3, 0x00, 0x00, DerefOf (DerefOf (Arg3) [Local0]), + ERR (Arg0, Z122, __LINE__, 0x00, 0x00, DerefOf (DerefOf (Arg3) [Local0]), Local0) Return (0x01) } @@ -7067,7 +7067,7 @@ DerefOf (Index (Buffer (0x12) { /* Unexpected Kind of Op (0 - Store, ...) */ - ERR (Concatenate (Arg0, TERR), Z122, 0x10F7, 0x00, 0x00, Arg1, 0x00) + ERR (Concatenate (Arg0, TERR), Z122, __LINE__, 0x00, 0x00, Arg1, 0x00) Return (0x01) } @@ -7075,7 +7075,7 @@ DerefOf (Index (Buffer (0x12) { /* Unexpected Kind of Source-Target pair */ - ERR (Concatenate (Arg0, TERR), Z122, 0x10FD, 0x00, 0x00, Arg5, 0x00) + ERR (Concatenate (Arg0, TERR), Z122, __LINE__, 0x00, 0x00, Arg5, 0x00) Return (0x01) } @@ -7146,7 +7146,7 @@ DerefOf (Index (Buffer (0x12) { /* Unexpected data package */ - ERR (Concatenate (Arg0, TERR), Z122, 0x1130, 0x00, 0x00, Arg1, LPC1) + ERR (Concatenate (Arg0, TERR), Z122, __LINE__, 0x00, 0x00, Arg1, LPC1) Return (0x01) } 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 580775a38..269f8560b 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 @@ -277,7 +277,7 @@ Local0 = SizeOf (BUF1) If ((Local0 != 0x11)) { - ERR (Concatenate (Arg0, TERR), Z126, 0x0103, 0x00, 0x00, Local0, 0x11) + ERR (Concatenate (Arg0, TERR), Z126, __LINE__, 0x00, 0x00, Local0, 0x11) Return (0x01) } @@ -343,7 +343,7 @@ Default { - ERR (Concatenate (Arg0, TERR), Z126, 0x0133, 0x00, 0x00, Arg1, 0x00) + ERR (Concatenate (Arg0, TERR), Z126, __LINE__, 0x00, 0x00, Arg1, 0x00) Return (0x01) } @@ -361,7 +361,7 @@ { /* ObjectType of Target can not be set up */ - ERR (Arg0, Z126, 0x013F, 0x00, 0x00, Local0, Arg1) + ERR (Arg0, Z126, __LINE__, 0x00, 0x00, Local0, Arg1) Return (0x01) } @@ -401,7 +401,7 @@ Default { - ERR (Concatenate (Arg0, TERR), Z126, 0x015C, 0x00, 0x00, Arg1, 0x00) + ERR (Concatenate (Arg0, TERR), Z126, __LINE__, 0x00, 0x00, Arg1, 0x00) Return (0x01) } @@ -419,7 +419,7 @@ { /* ObjectType of Source can not be set up */ - ERR (Arg0, Z126, 0x0168, 0x00, 0x00, Local0, Arg1) + ERR (Arg0, Z126, __LINE__, 0x00, 0x00, Local0, Arg1) Return (0x01) } @@ -436,7 +436,7 @@ { /* ObjectType of Source object is corrupted */ - ERR (Arg0, Z126, 0x0177, 0x00, 0x00, Local0, Arg1) + ERR (Arg0, Z126, __LINE__, 0x00, 0x00, Local0, Arg1) Return (0x01) } @@ -458,7 +458,7 @@ Default { - ERR (Arg0, Z126, 0x0187, 0x00, 0x00, Arg1, 0x00) + ERR (Arg0, Z126, __LINE__, 0x00, 0x00, Arg1, 0x00) Return (0x01) } @@ -468,7 +468,7 @@ { /* Mismatch of Source Type against specified one */ - ERR (Arg0, Z126, 0x018E, 0x00, 0x00, Local0, Arg1) + ERR (Arg0, Z126, __LINE__, 0x00, 0x00, Local0, Arg1) If (STCS) { M000 (0x03, 0x01000000, Local0, Arg0) @@ -486,13 +486,13 @@ { If ((INT0 != DerefOf (Arg3))) { - ERR (Arg0, Z126, 0x0196, 0x00, 0x00, INT0, DerefOf (Arg3)) + ERR (Arg0, Z126, __LINE__, 0x00, 0x00, INT0, DerefOf (Arg3)) Return (0x01) } If ((DerefOf (Arg2) != INT0)) { - ERR (Arg0, Z126, 0x019A, 0x00, 0x00, DerefOf (Arg2), INT0) + ERR (Arg0, Z126, __LINE__, 0x00, 0x00, DerefOf (Arg2), INT0) Return (0x01) } } @@ -500,13 +500,13 @@ { If ((STR0 != DerefOf (Arg3))) { - ERR (Arg0, Z126, 0x01A0, 0x00, 0x00, STR0, DerefOf (Arg3)) + ERR (Arg0, Z126, __LINE__, 0x00, 0x00, STR0, DerefOf (Arg3)) Return (0x01) } If ((DerefOf (Arg2) != STR0)) { - ERR (Arg0, Z126, 0x01A4, 0x00, 0x00, DerefOf (Arg2), STR0) + ERR (Arg0, Z126, __LINE__, 0x00, 0x00, DerefOf (Arg2), STR0) Return (0x01) } } @@ -514,13 +514,13 @@ { If ((BUF0 != DerefOf (Arg3))) { - ERR (Arg0, Z126, 0x01AA, 0x00, 0x00, BUF0, DerefOf (Arg3)) + ERR (Arg0, Z126, __LINE__, 0x00, 0x00, BUF0, DerefOf (Arg3)) Return (0x01) } If ((DerefOf (Arg2) != BUF0)) { - ERR (Arg0, Z126, 0x01AE, 0x00, 0x00, DerefOf (Arg2), BUF0) + ERR (Arg0, Z126, __LINE__, 0x00, 0x00, DerefOf (Arg2), BUF0) Return (0x01) } } @@ -558,12 +558,12 @@ { If (X170) { - ERR (Arg0, Z126, 0x01CA, 0x00, 0x00, Local2, Arg2) + ERR (Arg0, Z126, __LINE__, 0x00, 0x00, Local2, Arg2) } } Else { - ERR (Arg0, Z126, 0x01CD, 0x00, 0x00, Local2, Arg2) + ERR (Arg0, Z126, __LINE__, 0x00, 0x00, Local2, Arg2) } If (STCS) @@ -582,14 +582,14 @@ { /* Types mismatch Result/Target on storing */ - ERR (Arg0, Z126, 0x01D8, 0x00, 0x00, Local2, Arg3) + ERR (Arg0, Z126, __LINE__, 0x00, 0x00, Local2, Arg3) Return (0x01) } ElseIf ((Local2 != 0x03)) { /* Types mismatch Result/Target on storing */ /* Test fixed type Objects are converted to Buffer */ - ERR (Arg0, Z126, 0x01DD, 0x00, 0x00, Local2, 0x03) + ERR (Arg0, Z126, __LINE__, 0x00, 0x00, Local2, 0x03) Return (0x01) } @@ -618,12 +618,12 @@ { If (X194) { - ERR (Arg0, Z126, 0x01F1, 0x00, 0x00, DerefOf (Arg1), Local7) + ERR (Arg0, Z126, __LINE__, 0x00, 0x00, DerefOf (Arg1), Local7) } } Else { - ERR (Arg0, Z126, 0x01F4, 0x00, 0x00, DerefOf (Arg1), Local7) + ERR (Arg0, Z126, __LINE__, 0x00, 0x00, DerefOf (Arg1), Local7) } Return (0x01) @@ -663,7 +663,7 @@ { /* Source Object can not be prepared */ - ERR (Concatenate (Arg0, TERR), Z126, 0x0212, 0x00, 0x00, Arg3, 0x00) + ERR (Concatenate (Arg0, TERR), Z126, __LINE__, 0x00, 0x00, Arg3, 0x00) Return (0x01) } @@ -698,7 +698,7 @@ { /* Target Object can not be prepared */ - ERR (Concatenate (Arg0, TERR), Z126, 0x0223, 0x00, 0x00, Arg2, 0x00) + ERR (Concatenate (Arg0, TERR), Z126, __LINE__, 0x00, 0x00, Arg2, 0x00) Return (0x01) } @@ -823,7 +823,7 @@ { /* Unexpected Kind of Op (0 - Store, ...) */ - ERR (Concatenate (Arg0, TERR), Z126, 0x0249, 0x00, 0x00, Arg4, 0x00) + ERR (Concatenate (Arg0, TERR), Z126, __LINE__, 0x00, 0x00, Arg4, 0x00) Return (0x01) } } @@ -946,7 +946,7 @@ { /* Unexpected Kind of Op (0 - Store, ...) */ - ERR (Concatenate (Arg0, TERR), Z126, 0x026D, 0x00, 0x00, Arg4, 0x00) + ERR (Concatenate (Arg0, TERR), Z126, __LINE__, 0x00, 0x00, Arg4, 0x00) Return (0x01) } } @@ -1065,7 +1065,7 @@ { /* Unexpected Kind of Op (0 - Store, ...) */ - ERR (Concatenate (Arg0, TERR), Z126, 0x0291, 0x00, 0x00, Arg4, 0x00) + ERR (Concatenate (Arg0, TERR), Z126, __LINE__, 0x00, 0x00, Arg4, 0x00) Return (0x01) } @@ -1148,7 +1148,7 @@ { /* Source Object can not be prepared */ - ERR (Concatenate (Arg0, TERR), Z126, 0x02CA, 0x00, 0x00, Arg3, 0x00) + ERR (Concatenate (Arg0, TERR), Z126, __LINE__, 0x00, 0x00, Arg3, 0x00) Return (0x01) } @@ -1159,7 +1159,7 @@ { /* Target Object can not be prepared */ - ERR (Concatenate (Arg0, TERR), Z126, 0x02D2, 0x00, 0x00, Arg2, 0x00) + ERR (Concatenate (Arg0, TERR), Z126, __LINE__, 0x00, 0x00, Arg2, 0x00) Return (0x01) } @@ -1280,7 +1280,7 @@ { /* Unexpected Kind of Op (0 - Store, ...) */ - ERR (Concatenate (Arg0, TERR), Z126, 0x02F7, 0x00, 0x00, Arg4, 0x00) + ERR (Concatenate (Arg0, TERR), Z126, __LINE__, 0x00, 0x00, Arg4, 0x00) Return (0x01) } @@ -2513,7 +2513,7 @@ { /* Unexpected Kind of Op (0 - Store, ...) */ - ERR (Concatenate (TS, TERR), Z126, 0x050B, 0x00, 0x00, Arg0, 0x00) + ERR (Concatenate (TS, TERR), Z126, __LINE__, 0x00, 0x00, Arg0, 0x00) Return (0x01) } @@ -2521,7 +2521,7 @@ { /* Unexpected Kind of Source-Target pair */ - ERR (Concatenate (TS, TERR), Z126, 0x0511, 0x00, 0x00, Arg4, 0x00) + ERR (Concatenate (TS, TERR), Z126, __LINE__, 0x00, 0x00, Arg4, 0x00) Return (0x01) } 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 da86348b5..65c5147b5 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 @@ -321,7 +321,7 @@ Default { - ERR (Concatenate (Arg0, TERR), Z125, 0x0112, 0x00, 0x00, Arg1, 0x00) + ERR (Concatenate (Arg0, TERR), Z125, __LINE__, 0x00, 0x00, Arg1, 0x00) Return (0x01) } @@ -339,7 +339,7 @@ { /* ObjectType of Source can not be set up */ - ERR (Arg0, Z125, 0x011E, 0x00, 0x00, Local0, Arg1) + ERR (Arg0, Z125, __LINE__, 0x00, 0x00, Local0, Arg1) Return (0x01) } @@ -363,12 +363,12 @@ { If (X195) { - ERR (Arg0, Z125, 0x0134, 0x00, 0x00, Local2, Arg2) + ERR (Arg0, Z125, __LINE__, 0x00, 0x00, Local2, Arg2) } } Else { - ERR (Arg0, Z125, 0x0137, 0x00, 0x00, Local2, Arg2) + ERR (Arg0, Z125, __LINE__, 0x00, 0x00, Local2, Arg2) } If (STCS) @@ -404,7 +404,7 @@ If ((DerefOf (Arg1) != Local0)) { - ERR (Arg0, Z125, 0x014A, 0x00, 0x00, DerefOf (Arg1), Local0) + ERR (Arg0, Z125, __LINE__, 0x00, 0x00, DerefOf (Arg1), Local0) Return (0x01) } } @@ -427,7 +427,7 @@ If ((DerefOf (Arg1) != Local0)) { - ERR (Arg0, Z125, 0x0158, 0x00, 0x00, DerefOf (Arg1), Local0) + ERR (Arg0, Z125, __LINE__, 0x00, 0x00, DerefOf (Arg1), Local0) Return (0x01) } } @@ -450,13 +450,13 @@ If ((DerefOf (Arg1) != Local0)) { - ERR (Arg0, Z125, 0x0166, 0x00, 0x00, DerefOf (Arg1), Local0) + ERR (Arg0, Z125, __LINE__, 0x00, 0x00, DerefOf (Arg1), Local0) Return (0x01) } } Default { - ERR (Concatenate (Arg0, TERR), Z125, 0x016B, 0x00, 0x00, Arg1, Arg3) + ERR (Concatenate (Arg0, TERR), Z125, __LINE__, 0x00, 0x00, Arg1, Arg3) Return (0x01) } @@ -485,13 +485,13 @@ If ((DerefOf (Arg1) != STR1)) { - ERR (Arg0, Z125, 0x017C, 0x00, 0x00, DerefOf (Arg1), STR1) + ERR (Arg0, Z125, __LINE__, 0x00, 0x00, DerefOf (Arg1), STR1) Return (0x01) } } Default { - ERR (Concatenate (Arg0, TERR), Z125, 0x0181, 0x00, 0x00, Arg1, Arg3) + ERR (Concatenate (Arg0, TERR), Z125, __LINE__, 0x00, 0x00, Arg1, Arg3) Return (0x01) } @@ -520,13 +520,13 @@ If ((DerefOf (Arg1) != BUF1)) { - ERR (Arg0, Z125, 0x0192, 0x00, 0x00, DerefOf (Arg1), BUF1) + ERR (Arg0, Z125, __LINE__, 0x00, 0x00, DerefOf (Arg1), BUF1) Return (0x01) } } Default { - ERR (Concatenate (Arg0, TERR), Z125, 0x0197, 0x00, 0x00, Arg1, Arg3) + ERR (Concatenate (Arg0, TERR), Z125, __LINE__, 0x00, 0x00, Arg1, Arg3) Return (0x01) } @@ -555,13 +555,13 @@ If ((DerefOf (Arg1) != FLU1)) { - ERR (Arg0, Z125, 0x01A8, 0x00, 0x00, DerefOf (Arg1), FLU1) + ERR (Arg0, Z125, __LINE__, 0x00, 0x00, DerefOf (Arg1), FLU1) Return (0x01) } } Default { - ERR (Concatenate (Arg0, TERR), Z125, 0x01AD, 0x00, 0x00, Arg1, Arg3) + ERR (Concatenate (Arg0, TERR), Z125, __LINE__, 0x00, 0x00, Arg1, Arg3) Return (0x01) } @@ -590,13 +590,13 @@ If ((DerefOf (Arg1) != BFL1)) { - ERR (Arg0, Z125, 0x01BE, 0x00, 0x00, DerefOf (Arg1), BFL1) + ERR (Arg0, Z125, __LINE__, 0x00, 0x00, DerefOf (Arg1), BFL1) Return (0x01) } } Default { - ERR (Concatenate (Arg0, TERR), Z125, 0x01C3, 0x00, 0x00, Arg1, Arg3) + ERR (Concatenate (Arg0, TERR), Z125, __LINE__, 0x00, 0x00, Arg1, Arg3) Return (0x01) } @@ -604,7 +604,7 @@ } Default { - ERR (Concatenate (Arg0, TERR), Z125, 0x01C9, 0x00, 0x00, Arg1, Arg3) + ERR (Concatenate (Arg0, TERR), Z125, __LINE__, 0x00, 0x00, Arg1, Arg3) Return (0x01) } @@ -656,7 +656,7 @@ { /* Source Object can not be prepared */ - ERR (Concatenate (Arg0, TERR), Z125, 0x01EC, 0x00, 0x00, Arg3, 0x00) + ERR (Concatenate (Arg0, TERR), Z125, __LINE__, 0x00, 0x00, Arg3, 0x00) Return (0x01) } @@ -682,7 +682,7 @@ { /* Unexpected Kind of Op (0 - Increment, 1 - Decrement) */ - ERR (Concatenate (Arg0, TERR), Z125, 0x01F8, 0x00, 0x00, Arg4, 0x00) + ERR (Concatenate (Arg0, TERR), Z125, __LINE__, 0x00, 0x00, Arg4, 0x00) Return (0x01) } } @@ -706,7 +706,7 @@ { /* Unexpected Kind of Op (0 - Increment, 1 - Decrement) */ - ERR (Concatenate (Arg0, TERR), Z125, 0x0202, 0x00, 0x00, Arg4, 0x00) + ERR (Concatenate (Arg0, TERR), Z125, __LINE__, 0x00, 0x00, Arg4, 0x00) Return (0x01) } } @@ -726,7 +726,7 @@ { /* Unexpected Kind of Op (0 - Increment, 1 - Decrement) */ - ERR (Concatenate (Arg0, TERR), Z125, 0x020B, 0x00, 0x00, Arg4, 0x00) + ERR (Concatenate (Arg0, TERR), Z125, __LINE__, 0x00, 0x00, Arg4, 0x00) Return (0x01) } @@ -784,7 +784,7 @@ { /* Source Object can not be prepared */ - ERR (Concatenate (Arg0, TERR), Z125, 0x0230, 0x00, 0x00, Arg3, 0x00) + ERR (Concatenate (Arg0, TERR), Z125, __LINE__, 0x00, 0x00, Arg3, 0x00) Return (0x01) } @@ -804,7 +804,7 @@ { /* Unexpected Kind of Op (0 - Increment, 1 - Decrement) */ - ERR (Concatenate (Arg0, TERR), Z125, 0x023A, 0x00, 0x00, Arg4, 0x00) + ERR (Concatenate (Arg0, TERR), Z125, __LINE__, 0x00, 0x00, Arg4, 0x00) Return (0x01) } @@ -890,7 +890,7 @@ { /* Source Object can not be prepared */ - ERR (Concatenate (Arg0, TERR), Z125, 0x0277, 0x00, 0x00, Arg3, 0x00) + ERR (Concatenate (Arg0, TERR), Z125, __LINE__, 0x00, 0x00, Arg3, 0x00) Return (0x01) } @@ -910,7 +910,7 @@ { /* Unexpected Kind of Op (0 - Increment, 1 - Decrement) */ - ERR (Concatenate (Arg0, TERR), Z125, 0x0281, 0x00, 0x00, Arg4, 0x00) + ERR (Concatenate (Arg0, TERR), Z125, __LINE__, 0x00, 0x00, Arg4, 0x00) Return (0x01) } @@ -1015,7 +1015,7 @@ { /* Source Object can not be prepared */ - ERR (Concatenate (Arg0, TERR), Z125, 0x02C7, 0x00, 0x00, Arg3, 0x00) + ERR (Concatenate (Arg0, TERR), Z125, __LINE__, 0x00, 0x00, Arg3, 0x00) Return (0x01) } @@ -1037,7 +1037,7 @@ { /* Unexpected Kind of Op (0 - Increment, 1 - Decrement) */ - ERR (Concatenate (Arg0, TERR), Z125, 0x02D2, 0x00, 0x00, Arg4, 0x00) + ERR (Concatenate (Arg0, TERR), Z125, __LINE__, 0x00, 0x00, Arg4, 0x00) Return (0x01) } @@ -1097,7 +1097,7 @@ { /* Unexpected Kind of Op (0 - Increment, 1 - Decrement) */ - ERR (Concatenate (TS, TERR), Z125, 0x02FB, 0x00, 0x00, Arg0, 0x00) + ERR (Concatenate (TS, TERR), Z125, __LINE__, 0x00, 0x00, Arg0, 0x00) Return (0x01) } 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 93583dc1a..7116d30de 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 @@ -319,7 +319,7 @@ Local0 = SizeOf (BUF1) If ((Local0 != 0x11)) { - ERR (Concatenate (Arg0, TERR), Z127, 0x0120, 0x00, 0x00, Local0, 0x11) + ERR (Concatenate (Arg0, TERR), Z127, __LINE__, 0x00, 0x00, Local0, 0x11) Return (0x01) } @@ -385,7 +385,7 @@ Default { - ERR (Concatenate (Arg0, TERR), Z127, 0x0150, 0x00, 0x00, Arg1, 0x00) + ERR (Concatenate (Arg0, TERR), Z127, __LINE__, 0x00, 0x00, Arg1, 0x00) Return (0x01) } @@ -410,7 +410,7 @@ { /* ObjectType of Target can not be set up */ - ERR (Arg0, Z127, 0x0161, 0x00, 0x00, Local0, Arg1) + ERR (Arg0, Z127, __LINE__, 0x00, 0x00, Local0, Arg1) Return (0x01) } @@ -455,7 +455,7 @@ Default { - ERR (Concatenate (Arg0, TERR), Z127, 0x0182, 0x00, 0x00, Arg1, 0x00) + ERR (Concatenate (Arg0, TERR), Z127, __LINE__, 0x00, 0x00, Arg1, 0x00) Return (0x01) } @@ -473,7 +473,7 @@ { /* ObjectType of Source can not be set up */ - ERR (Arg0, Z127, 0x018E, 0x00, 0x00, Local0, Arg1) + ERR (Arg0, Z127, __LINE__, 0x00, 0x00, Local0, Arg1) Return (0x01) } @@ -490,7 +490,7 @@ { /* ObjectType of Source object is corrupted */ - ERR (Arg0, Z127, 0x019D, 0x00, 0x00, Local0, Arg1) + ERR (Arg0, Z127, __LINE__, 0x00, 0x00, Local0, Arg1) Return (0x01) } @@ -516,7 +516,7 @@ Default { - ERR (Arg0, Z127, 0x01B0, 0x00, 0x00, Arg1, 0x00) + ERR (Arg0, Z127, __LINE__, 0x00, 0x00, Arg1, 0x00) Return (0x01) } @@ -526,7 +526,7 @@ { /* Mismatch of Source Type against specified one */ - ERR (Arg0, Z127, 0x01B7, 0x00, 0x00, Local0, Arg1) + ERR (Arg0, Z127, __LINE__, 0x00, 0x00, Local0, Arg1) If (STCS) { M000 (0x03, 0x01000000, Local0, Arg0) @@ -544,13 +544,13 @@ { If ((INT0 != DerefOf (Arg3))) { - ERR (Arg0, Z127, 0x01BF, 0x00, 0x00, INT0, DerefOf (Arg3)) + ERR (Arg0, Z127, __LINE__, 0x00, 0x00, INT0, DerefOf (Arg3)) Return (0x01) } If ((DerefOf (Arg2) != INT0)) { - ERR (Arg0, Z127, 0x01C3, 0x00, 0x00, DerefOf (Arg2), INT0) + ERR (Arg0, Z127, __LINE__, 0x00, 0x00, DerefOf (Arg2), INT0) Return (0x01) } } @@ -558,13 +558,13 @@ { If ((STR0 != DerefOf (Arg3))) { - ERR (Arg0, Z127, 0x01C9, 0x00, 0x00, STR0, DerefOf (Arg3)) + ERR (Arg0, Z127, __LINE__, 0x00, 0x00, STR0, DerefOf (Arg3)) Return (0x01) } If ((DerefOf (Arg2) != STR0)) { - ERR (Arg0, Z127, 0x01CD, 0x00, 0x00, DerefOf (Arg2), STR0) + ERR (Arg0, Z127, __LINE__, 0x00, 0x00, DerefOf (Arg2), STR0) Return (0x01) } } @@ -572,13 +572,13 @@ { If ((BUF0 != DerefOf (Arg3))) { - ERR (Arg0, Z127, 0x01D3, 0x00, 0x00, BUF0, DerefOf (Arg3)) + ERR (Arg0, Z127, __LINE__, 0x00, 0x00, BUF0, DerefOf (Arg3)) Return (0x01) } If ((DerefOf (Arg2) != BUF0)) { - ERR (Arg0, Z127, 0x01D7, 0x00, 0x00, DerefOf (Arg2), BUF0) + ERR (Arg0, Z127, __LINE__, 0x00, 0x00, DerefOf (Arg2), BUF0) Return (0x01) } } @@ -619,7 +619,7 @@ } Else { - ERR (Arg0, Z127, 0x01F5, 0x00, 0x00, Local2, Arg2) + ERR (Arg0, Z127, __LINE__, 0x00, 0x00, Local2, Arg2) } If (STCS) @@ -651,14 +651,14 @@ { /* Types mismatch Result/Target on storing */ - ERR (Arg0, Z127, 0x020A, 0x00, 0x00, Local2, Arg3) + ERR (Arg0, Z127, __LINE__, 0x00, 0x00, Local2, Arg3) Return (0x01) } ElseIf ((Local2 != 0x03)) { /* Types mismatch Result/Target on storing */ /* Test fixed type Objects are converted to Buffer */ - ERR (Arg0, Z127, 0x020F, 0x00, 0x00, Local2, 0x03) + ERR (Arg0, Z127, __LINE__, 0x00, 0x00, Local2, 0x03) Return (0x01) } @@ -687,12 +687,12 @@ { If (X193) { - ERR (Arg0, Z127, 0x0223, 0x00, 0x00, DerefOf (Arg1), Local7) + ERR (Arg0, Z127, __LINE__, 0x00, 0x00, DerefOf (Arg1), Local7) } } Else { - ERR (Arg0, Z127, 0x0226, 0x00, 0x00, DerefOf (Arg1), Local7) + ERR (Arg0, Z127, __LINE__, 0x00, 0x00, DerefOf (Arg1), Local7) } Return (0x01) @@ -743,7 +743,7 @@ { /* Source Object can not be prepared */ - ERR (Concatenate (Arg0, TERR), Z127, 0x024A, 0x00, 0x00, Arg3, 0x00) + ERR (Concatenate (Arg0, TERR), Z127, __LINE__, 0x00, 0x00, Arg3, 0x00) Return (0x01) } @@ -778,7 +778,7 @@ { /* Target Object can not be prepared */ - ERR (Concatenate (Arg0, TERR), Z127, 0x025B, 0x00, 0x00, Arg2, 0x00) + ERR (Concatenate (Arg0, TERR), Z127, __LINE__, 0x00, 0x00, Arg2, 0x00) Return (0x01) } @@ -1056,7 +1056,7 @@ { /* Unexpected Kind of Op (0 - Store, ...) */ - ERR (Concatenate (Arg0, TERR), Z127, 0x02A5, 0x00, 0x00, Arg4, 0x00) + ERR (Concatenate (Arg0, TERR), Z127, __LINE__, 0x00, 0x00, Arg4, 0x00) Return (0x01) } } @@ -1332,7 +1332,7 @@ { /* Unexpected Kind of Op (0 - Store, ...) */ - ERR (Concatenate (Arg0, TERR), Z127, 0x02ED, 0x00, 0x00, Arg4, 0x00) + ERR (Concatenate (Arg0, TERR), Z127, __LINE__, 0x00, 0x00, Arg4, 0x00) Return (0x01) } } @@ -1604,7 +1604,7 @@ { /* Unexpected Kind of Op (0 - Store, ...) */ - ERR (Concatenate (Arg0, TERR), Z127, 0x0335, 0x00, 0x00, Arg4, 0x00) + ERR (Concatenate (Arg0, TERR), Z127, __LINE__, 0x00, 0x00, Arg4, 0x00) Return (0x01) } @@ -1681,7 +1681,7 @@ { /* Source Object can not be prepared */ - ERR (Concatenate (Arg0, TERR), Z127, 0x036B, 0x00, 0x00, Arg3, 0x00) + ERR (Concatenate (Arg0, TERR), Z127, __LINE__, 0x00, 0x00, Arg3, 0x00) Return (0x01) } @@ -1692,7 +1692,7 @@ { /* Target Object can not be prepared */ - ERR (Concatenate (Arg0, TERR), Z127, 0x0373, 0x00, 0x00, Arg2, 0x00) + ERR (Concatenate (Arg0, TERR), Z127, __LINE__, 0x00, 0x00, Arg2, 0x00) Return (0x01) } @@ -1966,7 +1966,7 @@ { /* Unexpected Kind of Op (0 - Store, ...) */ - ERR (Concatenate (Arg0, TERR), Z127, 0x03BC, 0x00, 0x00, Arg4, 0x00) + ERR (Concatenate (Arg0, TERR), Z127, __LINE__, 0x00, 0x00, Arg4, 0x00) Return (0x01) } @@ -5089,7 +5089,7 @@ { /* Unexpected Kind of Op (0 - Store, ...) */ - ERR (Concatenate (TS, TERR), Z127, 0x08D0, 0x00, 0x00, Arg0, 0x00) + ERR (Concatenate (TS, TERR), Z127, __LINE__, 0x00, 0x00, Arg0, 0x00) Return (0x01) } @@ -5097,7 +5097,7 @@ { /* Unexpected Kind of Source-Target pair */ - ERR (Concatenate (TS, TERR), Z127, 0x08D6, 0x00, 0x00, Arg4, 0x00) + ERR (Concatenate (TS, TERR), Z127, __LINE__, 0x00, 0x00, Arg4, 0x00) Return (0x01) } diff --git a/tests/aslts/src/runtime/collections/complex/result/tests/rstore/rstore.asl b/tests/aslts/src/runtime/collections/complex/result/tests/rstore/rstore.asl index c0c84d31d..61011b04f 100644 --- a/tests/aslts/src/runtime/collections/complex/result/tests/rstore/rstore.asl +++ b/tests/aslts/src/runtime/collections/complex/result/tests/rstore/rstore.asl @@ -87,7 +87,7 @@ /* ArgX Object */ /* Store(Src0, arg3) */ Debug = "Not implemented" - ERR (TERR, Z123, 0x53, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } ElseIf ((Arg2 == 0x03)) @@ -101,7 +101,7 @@ /* Reference in ArgX Object */ /* Store(Src0, arg4) */ Debug = "Not implemented" - ERR (TERR, Z123, 0x5C, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } ElseIf ((Arg2 == 0x05)) @@ -109,13 +109,13 @@ /* Elemenf of a Package */ /* Store(Src0, Index(p680, 0)) */ Debug = "Not implemented" - ERR (TERR, Z123, 0x62, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Else { Debug = "Unexpected Kind of the Object to store into" - ERR (TERR, Z123, 0x66, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } } @@ -128,7 +128,7 @@ /* Constant */ /* Store(Src0, "") */ Debug = "Not implemented" - ERR (TERR, Z123, 0x70, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } ElseIf ((Arg2 == 0x01)) @@ -142,7 +142,7 @@ /* ArgX Object */ /* Store(Src0, arg3) */ Debug = "Not implemented" - ERR (TERR, Z123, 0x79, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } ElseIf ((Arg2 == 0x03)) @@ -156,7 +156,7 @@ /* Reference in ArgX Object */ /* Store(Src0, arg4) */ Debug = "Not implemented" - ERR (TERR, Z123, 0x82, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } ElseIf ((Arg2 == 0x05)) @@ -164,13 +164,13 @@ /* Elemenf of a Package */ /* Store(Src0, Index(p680, 0)) */ Debug = "Not implemented" - ERR (TERR, Z123, 0x88, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Else { Debug = "Unexpected Kind of the Object to store into" - ERR (TERR, Z123, 0x8C, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } } @@ -183,7 +183,7 @@ /* Constant */ /* Store(Src0, Buffer(1){}) */ Debug = "Not implemented" - ERR (TERR, Z123, 0x96, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } ElseIf ((Arg2 == 0x01)) @@ -197,7 +197,7 @@ /* ArgX Object */ /* Store(Src0, arg3) */ Debug = "Not implemented" - ERR (TERR, Z123, 0x9F, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } ElseIf ((Arg2 == 0x03)) @@ -205,7 +205,7 @@ /* LocalX Object */ /* Store(Src0, Local2) */ Debug = "Not implemented" - ERR (TERR, Z123, 0xA5, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } ElseIf ((Arg2 == 0x04)) @@ -213,7 +213,7 @@ /* Reference in ArgX Object */ /* Store(Src0, arg4) */ Debug = "Not implemented" - ERR (TERR, Z123, 0xAB, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } ElseIf ((Arg2 == 0x05)) @@ -221,13 +221,13 @@ /* Elemenf of a Package */ /* Store(Src0, Index(p680, 0)) */ Debug = "Not implemented" - ERR (TERR, Z123, 0xB1, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Else { Debug = "Unexpected Kind of the Object to store into" - ERR (TERR, Z123, 0xB5, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } } @@ -236,7 +236,7 @@ /* Package */ /* Store(Src0, p680) */ Debug = "Not implemented" - ERR (TERR, Z123, 0xBC, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -248,7 +248,7 @@ /* Constant (like Store(Src0, Zero)) */ Debug = "Not implemented" - ERR (TERR, Z123, 0xC4, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } ElseIf ((Arg2 == 0x01)) @@ -264,7 +264,7 @@ /* ArgX Object */ /* Store(Src0, arg3) */ Debug = "Not implemented" - ERR (TERR, Z123, 0xCF, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } ElseIf ((Arg2 == 0x03)) @@ -272,7 +272,7 @@ /* LocalX Object */ /* Store(Src0, Local2) */ Debug = "Not implemented" - ERR (TERR, Z123, 0xD5, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } ElseIf ((Arg2 == 0x04)) @@ -280,7 +280,7 @@ /* Reference in ArgX Object */ /* Store(Src0, arg4) */ Debug = "Not implemented" - ERR (TERR, Z123, 0xDB, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } ElseIf ((Arg2 == 0x05)) @@ -288,20 +288,20 @@ /* Elemenf of a Package */ /* Store(Src0, Index(p680, 0)) */ Debug = "Not implemented" - ERR (TERR, Z123, 0xE1, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Else { Debug = "Unexpected Kind of the Object to store into" - ERR (TERR, Z123, 0xE5, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } } Default { Debug = "Unexpected type of the Object to store into" - ERR (TERR, Z123, 0xEB, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -386,7 +386,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x011D, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -394,7 +394,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0122, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -441,7 +441,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x013D, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -449,7 +449,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0142, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -501,7 +501,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0162, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -509,7 +509,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0167, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -553,7 +553,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x017F, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -561,7 +561,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0184, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -608,7 +608,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x019A, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -616,7 +616,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x019F, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -656,7 +656,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x01B5, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -664,7 +664,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x01BA, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -714,7 +714,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x01D5, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -722,7 +722,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x01DA, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -766,7 +766,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x01F2, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -774,7 +774,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x01F7, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -818,7 +818,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x020F, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -826,7 +826,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0214, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -870,7 +870,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x022C, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -878,7 +878,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0231, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -891,7 +891,7 @@ Default { Debug = "Unexpected way to obtain some result Object" - ERR (TERR, Z123, 0x023C, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -970,7 +970,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0270, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -978,7 +978,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0275, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -1053,7 +1053,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x02A6, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -1061,7 +1061,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x02AB, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -1131,7 +1131,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x02D8, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -1139,7 +1139,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x02DD, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -1217,7 +1217,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0311, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -1225,7 +1225,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0316, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -1272,7 +1272,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x032C, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -1280,7 +1280,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0331, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -1418,7 +1418,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0387, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -1426,7 +1426,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x038C, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -1498,7 +1498,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x03B9, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -1506,7 +1506,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x03BE, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -1578,7 +1578,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x03EB, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -1586,7 +1586,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x03F0, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -1658,7 +1658,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x041D, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -1666,7 +1666,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0422, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -1679,7 +1679,7 @@ Default { Debug = "Unexpected way to obtain some result Object" - ERR (TERR, Z123, 0x042D, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -1754,7 +1754,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x045B, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -1762,7 +1762,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0460, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -1833,7 +1833,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x048B, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -1841,7 +1841,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0490, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -1906,7 +1906,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x04B7, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -1914,7 +1914,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x04BC, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -1979,7 +1979,7 @@ Default { Debug = "Unexpected type of the result Object to be stored" - ERR (TERR, Z123, 0x04E1, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -2032,7 +2032,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x04FA, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -2040,7 +2040,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x04FF, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -2168,7 +2168,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0545, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -2176,7 +2176,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x054A, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -2302,7 +2302,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x058F, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -2310,7 +2310,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0594, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -2377,7 +2377,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x05BA, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -2385,7 +2385,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x05BF, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -2398,7 +2398,7 @@ Default { Debug = "Unexpected way to obtain some result Object" - ERR (TERR, Z123, 0x05CA, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -2474,7 +2474,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x05FA, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -2482,7 +2482,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x05FF, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -2554,7 +2554,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x062C, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -2562,7 +2562,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0631, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -2623,7 +2623,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0656, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -2631,7 +2631,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x065B, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -2700,7 +2700,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0684, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -2708,7 +2708,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0689, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -2755,7 +2755,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x069F, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -2763,7 +2763,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x06A4, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -2895,7 +2895,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x06F2, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -2903,7 +2903,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x06F7, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -2972,7 +2972,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0720, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -2980,7 +2980,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0725, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -3049,7 +3049,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x074E, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -3057,7 +3057,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0753, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -3126,7 +3126,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x077D, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -3134,7 +3134,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0782, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -3147,7 +3147,7 @@ Default { Debug = "Unexpected way to obtain some result Object" - ERR (TERR, Z123, 0x078D, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -3267,7 +3267,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x07BD, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -3275,7 +3275,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x07C2, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -3391,7 +3391,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x07EF, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -3399,7 +3399,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x07F4, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -3488,7 +3488,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x081B, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -3496,7 +3496,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0820, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -3609,7 +3609,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0849, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -3617,7 +3617,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x084E, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -3664,7 +3664,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0864, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -3672,7 +3672,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0869, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -3892,7 +3892,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x08B7, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -3900,7 +3900,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x08BC, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -4013,7 +4013,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x08E5, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -4021,7 +4021,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x08EA, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -4134,7 +4134,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0913, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -4142,7 +4142,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0918, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -4255,7 +4255,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0942, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -4263,7 +4263,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0947, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -4276,7 +4276,7 @@ Default { Debug = "Unexpected way to obtain some result Object" - ERR (TERR, Z123, 0x0952, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -4327,7 +4327,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0972, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -4335,7 +4335,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0977, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -4382,7 +4382,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0993, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -4390,7 +4390,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0998, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -4483,7 +4483,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x09DD, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -4491,7 +4491,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x09E2, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -4535,7 +4535,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x09FA, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -4543,7 +4543,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x09FF, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -4590,7 +4590,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0A15, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -4598,7 +4598,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0A1A, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -4680,7 +4680,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0A46, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -4688,7 +4688,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0A4B, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -4732,7 +4732,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0A63, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -4740,7 +4740,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0A68, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -4784,7 +4784,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0A80, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -4792,7 +4792,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0A85, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -4847,7 +4847,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0AA6, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -4855,7 +4855,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0AAB, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -4868,7 +4868,7 @@ Default { Debug = "Unexpected way to obtain some result Object" - ERR (TERR, Z123, 0x0AB6, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -4919,7 +4919,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0AD6, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -4927,7 +4927,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0ADB, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -4974,7 +4974,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0AF7, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -4982,7 +4982,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0AFC, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -5147,7 +5147,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0B5F, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -5155,7 +5155,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0B64, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -5199,7 +5199,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0B7C, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -5207,7 +5207,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0B81, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -5254,7 +5254,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0B97, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -5262,7 +5262,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0B9C, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -5344,7 +5344,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0BC8, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -5352,7 +5352,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0BCD, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -5396,7 +5396,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0BE5, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -5404,7 +5404,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0BEA, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -5448,7 +5448,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0C02, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -5456,7 +5456,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0C07, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -5555,7 +5555,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0C38, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -5563,7 +5563,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0C3D, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -5576,7 +5576,7 @@ Default { Debug = "Unexpected way to obtain some result Object" - ERR (TERR, Z123, 0x0C48, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -5627,7 +5627,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0C68, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -5635,7 +5635,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0C6D, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -5682,7 +5682,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0C89, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -5690,7 +5690,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0C8E, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -5827,7 +5827,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0CDD, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -5835,7 +5835,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0CE2, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -5879,7 +5879,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0CFA, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -5887,7 +5887,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0CFF, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -5934,7 +5934,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0D15, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -5942,7 +5942,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0D1A, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -6024,7 +6024,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0D46, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -6032,7 +6032,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0D4B, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -6076,7 +6076,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0D63, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -6084,7 +6084,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0D68, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -6128,7 +6128,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0D80, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -6136,7 +6136,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0D85, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -6206,7 +6206,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0DA6, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -6214,7 +6214,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0DAB, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -6227,7 +6227,7 @@ Default { Debug = "Unexpected way to obtain some result Object" - ERR (TERR, Z123, 0x0DB6, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -6302,7 +6302,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0DE4, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -6310,7 +6310,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0DE9, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -6381,7 +6381,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0E14, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -6389,7 +6389,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0E19, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -6454,7 +6454,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0E40, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -6462,7 +6462,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0E45, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -6527,7 +6527,7 @@ Default { Debug = "Unexpected type of the result Object to be stored" - ERR (TERR, Z123, 0x0E6A, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -6580,7 +6580,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0E83, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -6588,7 +6588,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0E88, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -6716,7 +6716,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0ECE, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -6724,7 +6724,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0ED3, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -6850,7 +6850,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0F18, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -6858,7 +6858,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0F1D, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -6925,7 +6925,7 @@ /* Field Unit */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0F43, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } Case (0x0E) @@ -6933,7 +6933,7 @@ /* Buffer Field */ Debug = "Not implemented" - ERR (TERR, Z123, 0x0F48, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } @@ -6946,7 +6946,7 @@ Default { Debug = "Unexpected way to obtain some result Object" - ERR (TERR, Z123, 0x0F53, 0x00, 0x00, Arg1, Arg2) + ERR (TERR, Z123, __LINE__, 0x00, 0x00, Arg1, Arg2) Return (0x01) } |