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 | |
| 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')
256 files changed, 3577 insertions, 3577 deletions
diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0000/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0000/DECL.asl index 9f7c04b0f..e83f0fa58 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0000/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0000/DECL.asl @@ -43,54 +43,54 @@ Local0 = (0x01 && 0x01) If ((Local0 != ON00)) { - ERR ("", ZFFF, 0x31, 0x00, 0x00, Local0, ON00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, ON00) } Local0 = (0x00 == 0x00) If ((Local0 != ON00)) { - ERR ("", ZFFF, 0x36, 0x00, 0x00, Local0, ON00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, ON00) } Local0 = (0x01 > 0x00) If ((Local0 != ON00)) { - ERR ("", ZFFF, 0x3B, 0x00, 0x00, Local0, ON00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, ON00) } Local0 = (0x01 >= 0x01) If ((Local0 != ON00)) { - ERR ("", ZFFF, 0x40, 0x00, 0x00, Local0, ON00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, ON00) } Local0 = (0x00 < 0x01) If ((Local0 != ON00)) { - ERR ("", ZFFF, 0x45, 0x00, 0x00, Local0, ON00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, ON00) } Local0 = (0x01 <= 0x01) If ((Local0 != ON00)) { - ERR ("", ZFFF, 0x4A, 0x00, 0x00, Local0, ON00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, ON00) } Local0 = !0x00 If ((Local0 != ON00)) { - ERR ("", ZFFF, 0x4F, 0x00, 0x00, Local0, ON00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, ON00) } Local0 = (0x01 != 0x00) If ((Local0 != ON00)) { - ERR ("", ZFFF, 0x54, 0x00, 0x00, Local0, ON00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, ON00) } Local0 = (0x00 || 0x01) If ((Local0 != ON00)) { - ERR ("", ZFFF, 0x59, 0x00, 0x00, Local0, ON00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, ON00) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0002/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0002/DECL.asl index 7a42bc5aa..bd6bb8c96 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0002/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0002/DECL.asl @@ -53,6 +53,6 @@ If ((Local0 != 0x55555555)) { - ERR ("", ZFFF, 0x34, 0x00, 0x00, Local0, 0x55555555) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x55555555) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0004/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0004/DECL.asl index 1cc5644d4..54f0cf18c 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0004/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0004/DECL.asl @@ -42,12 +42,12 @@ Local0 = ObjectType (Local5) If ((Local0 != C009)) { - ERR ("", ZFFF, 0x31, 0x00, 0x00, Local0, C009) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, C009) } Local5++ If ((Local5 != 0x01)) { - ERR ("", ZFFF, 0x37, 0x00, 0x00, Local5, 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local5, 0x01) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0005/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0005/DECL.asl index de4da8044..dfacff877 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0005/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0005/DECL.asl @@ -52,12 +52,12 @@ { If ((Local7 != 0x1234)) { - ERR ("", ZFFF, 0x34, 0x00, 0x00, Local7, 0x1234) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local7, 0x1234) } } ElseIf ((Local7 != 0x5678)) { - ERR ("", ZFFF, 0x38, 0x00, 0x00, Local7, 0x5678) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local7, 0x5678) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0006/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0006/DECL.asl index 45aef9c22..3f66ba561 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0006/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0006/DECL.asl @@ -35,12 +35,12 @@ ToInteger ("0x12345678", Local0) If ((Local0 != 0x12345678)) { - ERR ("", ZFFF, 0x27, 0x00, 0x00, Local0, 0x12345678) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } ToInteger ("12345678", Local0) If ((Local0 != 0x00BC614E)) { - ERR ("", ZFFF, 0x2C, 0x00, 0x00, Local0, 0x00BC614E) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00BC614E) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0007/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0007/DECL.asl index 4081605f6..d420893ff 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0007/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0007/DECL.asl @@ -40,6 +40,6 @@ ToString (B000, Local0, Local1) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x2C, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0008/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0008/DECL.asl index c4ea3e971..0353fe5fb 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0008/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0008/DECL.asl @@ -41,6 +41,6 @@ Local0 = ObjectType (F000) If ((Local0 != C00D)) { - ERR ("", ZFFF, 0x2B, 0x00, 0x00, Local0, C00D) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, C00D) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0009/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0009/DECL.asl index 559d74669..f1bd43149 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0009/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0009/DECL.asl @@ -35,7 +35,7 @@ Local7 = ObjectType (Local0) If ((Local7 != C008)) { - ERR ("", ZFFF, 0x27, 0x00, 0x00, Local7, C008) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local7, C008) } } @@ -49,7 +49,7 @@ Local7 = ObjectType (Local0) If ((Local7 != C008)) { - ERR ("", ZFFF, 0x32, 0x00, 0x00, Local7, C008) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local7, C008) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0010/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0010/DECL.asl index 28847ad1f..a6e7572fa 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0010/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0010/DECL.asl @@ -40,7 +40,7 @@ Local2 = ObjectType (Local1) If ((Local2 != C00B)) { - ERR ("", ZFFF, 0x2B, 0x00, 0x00, Local2, C00B) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local2, C00B) } If ((Local1 != Buffer (0x04) @@ -48,7 +48,7 @@ 0x0A, 0x0B, 0x0C, 0x0D // .... })) { - ERR ("", ZFFF, 0x2E, 0x00, 0x00, Local1, Buffer (0x04) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, Buffer (0x04) { 0x0A, 0x0B, 0x0C, 0x0D // .... }) @@ -57,7 +57,7 @@ Local2 = ObjectType (Local0) If ((Local2 != C00B)) { - ERR ("", ZFFF, 0x33, 0x00, 0x00, Local2, C00B) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local2, C00B) } If ((Local0 != Buffer (0x04) @@ -65,7 +65,7 @@ 0x0A, 0x0B, 0x0C, 0x0D // .... })) { - ERR ("", ZFFF, 0x36, 0x00, 0x00, Local0, Buffer (0x04) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Buffer (0x04) { 0x0A, 0x0B, 0x0C, 0x0D // .... }) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0013/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0013/DECL.asl index 0ea56ab6b..736d19373 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0013/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0013/DECL.asl @@ -44,48 +44,48 @@ Local7 = ObjectType (BF00) If ((Local7 != C016)) { - ERR ("", ZFFF, 0x32, 0x00, 0x00, Local7, C016) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local7, C016) } Local7 = ObjectType (BF01) If ((Local7 != C016)) { - ERR ("", ZFFF, 0x37, 0x00, 0x00, Local7, C016) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local7, C016) } Local7 = ObjectType (BF02) If ((Local7 != C016)) { - ERR ("", ZFFF, 0x3C, 0x00, 0x00, Local7, C016) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local7, C016) } Local7 = ObjectType (BF03) If ((Local7 != C016)) { - ERR ("", ZFFF, 0x41, 0x00, 0x00, Local7, C016) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local7, C016) } Local7 = ObjectType (BF04) If ((Local7 != C016)) { - ERR ("", ZFFF, 0x46, 0x00, 0x00, Local7, C016) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local7, C016) } Local7 = ObjectType (BF05) If ((Local7 != C016)) { - ERR ("", ZFFF, 0x4B, 0x00, 0x00, Local7, C016) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local7, C016) } Local7 = ObjectType (BF06) If ((Local7 != C016)) { - ERR ("", ZFFF, 0x50, 0x00, 0x00, Local7, C016) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local7, C016) } Local7 = ObjectType (BF07) If ((Local7 != C016)) { - ERR ("", ZFFF, 0x55, 0x00, 0x00, Local7, C016) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local7, C016) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0015/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0015/DECL.asl index c17500581..d95d8fa49 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0015/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0015/DECL.asl @@ -39,12 +39,12 @@ ToDecimalString (B000, Local0) If ((Local0 != "1,1")) { - ERR ("", ZFFF, 0x2A, 0x00, 0x00, Local0, "1,1") + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, "1,1") } Local1 = SizeOf (Local0) If ((Local1 != 0x03)) { - ERR ("", ZFFF, 0x2F, 0x00, 0x00, Local1, 0x03) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, 0x03) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0017/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0017/DECL.asl index a82717741..be21ca2d4 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0017/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0017/DECL.asl @@ -42,7 +42,7 @@ } If ((Local0 == Local1)) { - ERR ("", ZFFF, 0x29, 0x00, 0x00, Local0, Local1) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Local1) } If ((Local0 != Buffer (0x05) @@ -50,7 +50,7 @@ 0x20, 0x21, 0x22, 0x00, 0x25 // !".% })) { - ERR ("", ZFFF, 0x2D, 0x00, 0x00, Local0, Buffer (0x05) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Buffer (0x05) { 0x20, 0x21, 0x22, 0x00, 0x25 // !".% }) @@ -61,7 +61,7 @@ 0x20, 0x21, 0x22, 0x00, 0x26 // !".& })) { - ERR ("", ZFFF, 0x31, 0x00, 0x00, Local1, Buffer (0x05) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, Buffer (0x05) { 0x20, 0x21, 0x22, 0x00, 0x26 // !".& }) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0018/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0018/DECL.asl index ee83f7ffa..a79cb1432 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0018/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0018/DECL.asl @@ -47,7 +47,7 @@ } Else { - ERR ("", ZFFF, 0x2D, 0x00, 0x00, Local0, Local1) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Local1) } Return (Local7) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0019/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0019/DECL.asl index b11a4436b..5350d6540 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0019/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0019/DECL.asl @@ -42,6 +42,6 @@ } If ((Local0 >= Local1)) { - ERR ("", ZFFF, 0x29, 0x00, 0x00, Local0, Local1) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Local1) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0020/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0020/DECL.asl index 8a308d5f2..a521acc67 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0020/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0020/DECL.asl @@ -47,7 +47,7 @@ } Else { - ERR ("", ZFFF, 0x2D, 0x00, 0x00, Local0, Local1) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Local1) } Return (Local7) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0021/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0021/DECL.asl index b7e20d3f6..94faae058 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0021/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0021/DECL.asl @@ -42,6 +42,6 @@ } If ((Local0 <= Local1)) { - ERR ("", ZFFF, 0x29, 0x00, 0x00, Local0, Local1) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Local1) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0022/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0022/DECL.asl index 365838400..227e01c3d 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0022/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0022/DECL.asl @@ -47,7 +47,7 @@ } Else { - ERR ("", ZFFF, 0x2D, 0x00, 0x00, Local0, Local1) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Local1) } Return (Local7) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0023/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0023/DECL.asl index d8957cfe8..d8db0d25f 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0023/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0023/DECL.asl @@ -40,7 +40,7 @@ FromBCD (Local0, Local2) If ((Local2 != Local1)) { - ERR ("", ZFFF, 0x2D, 0x00, 0x00, Local2, Local1) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local2, Local1) } /* Bug, FromBCD(0x10000000000) */ @@ -51,7 +51,7 @@ FromBCD (Local0, Local2) If ((Local2 != Local1)) { - ERR ("", ZFFF, 0x38, 0x00, 0x00, Local2, Local1) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local2, Local1) } /* Ok, ToBCD(10000000000) */ @@ -62,7 +62,7 @@ ToBCD (Local0, Local2) If ((Local2 != Local1)) { - ERR ("", ZFFF, 0x43, 0x00, 0x00, Local2, Local1) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local2, Local1) } CH03 ("", 0x00, 0x00, 0x46, 0x00) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0029/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0029/DECL.asl index 9012cf39b..d1b6f6ebf 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0029/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0029/DECL.asl @@ -43,7 +43,7 @@ Local4 = (Arg1 * 0x2710) If ((Local6 < Local4)) { - ERR ("", ZFFF, 0x2D, 0x00, 0x00, Local6, Local4) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local6, Local4) } } Case (0x01) @@ -55,7 +55,7 @@ Local4 = (Arg1 * 0x0A) If ((Local6 < Local4)) { - ERR ("", ZFFF, 0x37, 0x00, 0x00, Local6, Local4) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local6, Local4) } } Case (0x02) @@ -67,7 +67,7 @@ Local4 = (Arg1 * 0x2710) If ((Local6 < Local4)) { - ERR ("", ZFFF, 0x41, 0x00, 0x00, Local6, Local4) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local6, Local4) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0031_ASL_RUNTIME/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0031_ASL_RUNTIME/DECL.asl index 61e42aa46..97dd8cc98 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0031_ASL_RUNTIME/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0031_ASL_RUNTIME/DECL.asl @@ -92,7 +92,7 @@ Name (I000, 0xABCD0003) If ((I000 != 0xABCD0003)) { - ERR ("", ZFFF, 0x68, 0x00, 0x00, I000, 0xABCD0003) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, 0xABCD0003) } } @@ -103,7 +103,7 @@ I000 = 0xABCD0005 If ((I000 != 0xABCD0005)) { - ERR ("", ZFFF, 0x73, 0x00, 0x00, I000, 0xABCD0005) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, 0xABCD0005) } } @@ -115,7 +115,7 @@ I000 = 0xABCD0007 If ((I000 != 0xABCD0007)) { - ERR ("", ZFFF, 0x7F, 0x00, 0x00, I000, 0xABCD0007) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, 0xABCD0007) } } @@ -127,7 +127,7 @@ Name (ID28, 0xABCD0008) If ((ID28 != 0xABCD0008)) { - ERR ("", ZFFF, 0x8B, 0x00, 0x00, ID28, 0xABCD0008) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, ID28, 0xABCD0008) } } @@ -137,17 +137,17 @@ CH03 ("", 0x00, 0x09, 0x92, 0x00) If ((I000 != 0xABCD0000)) { - ERR ("", ZFFF, 0x95, 0x00, 0x00, I000, 0xABCD0000) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, 0xABCD0000) } If ((I001 != 0xABCD0001)) { - ERR ("", ZFFF, 0x98, 0x00, 0x00, I001, 0xABCD0001) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I001, 0xABCD0001) } If ((I002 != 0xABCD0002)) { - ERR ("", ZFFF, 0x9B, 0x00, 0x00, I002, 0xABCD0002) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I002, 0xABCD0002) } If (Y084) @@ -178,7 +178,7 @@ { /* Successful compilation itself of this test is error */ - ERR ("", ZFFF, 0xB8, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } Method (MDC6, 0, NotSerialized) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0038/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0038/DECL.asl index 30d33ba9f..21c143e55 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0038/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0038/DECL.asl @@ -40,7 +40,7 @@ Debug = N000 /* \MDCE.N000 */ If ((N000 != 0xFDEACB01)) { - ERR ("", ZFFF, 0x2F, 0x00, 0x00, N000, 0xFDEACB01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, N000, 0xFDEACB01) } /* Show that LGreater operator indicates correctly */ @@ -51,7 +51,7 @@ } Else { - ERR ("", ZFFF, 0x38, 0x00, 0x00, 0x42345678, 0x32547698) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x42345678, 0x32547698) } /* Show that (in 32-bit mode) "FdeAcb0132547698" passed to Name operator */ @@ -63,7 +63,7 @@ } Else { - ERR ("", ZFFF, 0x42, 0x00, 0x00, N000, 0x42345678) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, N000, 0x42345678) } /* Show that, nevertheless, (in 32-bit mode) "FdeAcb01Fdeacb03" passed */ @@ -75,7 +75,7 @@ } Else { - ERR ("", ZFFF, 0x4C, 0x00, 0x00, 0xFDEACB02, "FdeAcb01Fdeacb03") + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0xFDEACB02, "FdeAcb01Fdeacb03") } Return (Local7) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0039_ASL_RUNTIME/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0039_ASL_RUNTIME/DECL.asl index f738f7fde..b40a170bc 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0039_ASL_RUNTIME/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0039_ASL_RUNTIME/DECL.asl @@ -39,7 +39,7 @@ Local0 = ObjectType (Debug) If ((Local0 != C018)) { - ERR ("", ZFFF, 0x2C, 0x00, 0x00, Local0, C018) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, C018) } /* Method */ @@ -52,6 +52,6 @@ Local0 = ObjectType (M0F2) If ((Local0 != C010)) { - ERR ("", ZFFF, 0x34, 0x00, 0x00, Local0, C010) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, C010) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0041/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0041/DECL.asl index b905f9a47..34e24addf 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0041/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0041/DECL.asl @@ -39,6 +39,6 @@ Local7 = (Local0 + 0x01) If ((Local7 != 0x01)) { - ERR ("", ZFFF, 0x2B, 0x00, 0x00, Local7, 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local7, 0x01) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0042/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0042/DECL.asl index 6a70a2e86..eab3ab987 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0042/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0042/DECL.asl @@ -39,6 +39,6 @@ Local7 = (Local0 + 0x01) If ((Local7 != 0x01)) { - ERR ("", ZFFF, 0x2B, 0x00, 0x00, Local7, 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local7, 0x01) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0043/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0043/DECL.asl index daf594340..17acd1f24 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0043/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0043/DECL.asl @@ -39,6 +39,6 @@ Local7 = (Local0 + 0x01) If ((Local7 != 0x0B)) { - ERR ("", ZFFF, 0x2C, 0x00, 0x00, Local7, 0x0B) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local7, 0x0B) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0044/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0044/DECL.asl index 3d425429a..c9a5113c7 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0044/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0044/DECL.asl @@ -44,6 +44,6 @@ } If ((Local0 != Local1)) { - ERR ("", ZFFF, 0x2B, 0x00, 0x00, Local0, Local1) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Local1) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0045/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0045/DECL.asl index 1ef59a861..3b372417c 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0045/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0045/DECL.asl @@ -57,24 +57,24 @@ ToDecimalString (B001, Local0) If ((Local0 != "1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1")) { - ERR ("", ZFFF, 0x36, 0x00, 0x00, Local0, "1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1") + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, "1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1") } Local1 = SizeOf (Local0) If ((Local1 != 0x63)) { - ERR ("", ZFFF, 0x3B, 0x00, 0x00, Local1, 0x63) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, 0x63) } ToDecimalString (B000, Local0) If ((Local0 != "1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1")) { - ERR ("", ZFFF, 0x41, 0x00, 0x00, Local0, "1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1") + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, "1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1") } Local1 = SizeOf (Local0) If ((Local1 != 0x65)) { - ERR ("", ZFFF, 0x46, 0x00, 0x00, Local1, 0x65) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, 0x65) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0046/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0046/DECL.asl index 7a4b4b57f..bb0baebd3 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0046/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0046/DECL.asl @@ -59,24 +59,24 @@ ToHexString (B001, Local0) If ((Local0 != "01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01")) { - ERR ("", ZFFF, 0x36, 0x00, 0x00, Local0, "01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01") + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, "01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01") } Local1 = SizeOf (Local0) If ((Local1 != 0xC5)) { - ERR ("", ZFFF, 0x3C, 0x00, 0x00, Local1, 0xC5) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, 0xC5) } ToHexString (B000, Local0) If ((Local0 != "01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01")) { - ERR ("", ZFFF, 0x43, 0x00, 0x00, Local0, "01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01") + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, "01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01") } Local1 = SizeOf (Local0) If ((Local1 != 0xC8)) { - ERR ("", ZFFF, 0x49, 0x00, 0x00, Local1, 0xC8) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, 0xC8) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0047/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0047/DECL.asl index 80686a4b0..67d79e9eb 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0047/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0047/DECL.asl @@ -76,7 +76,7 @@ { /* if (Local5) { */ - ERR ("", ZFFF, 0x56, 0x00, 0x00, Local0, Local7) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Local7) Debug = Concatenate ("Cur timer : 0x", Local7) Debug = Concatenate ("Start timer : 0x", Local0) Debug = Concatenate ("Step of cycle : 0x", TSLP) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0051_ASL_RUNTIME/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0051_ASL_RUNTIME/DECL.asl index 8b19f570c..30b4024a2 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0051_ASL_RUNTIME/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0051_ASL_RUNTIME/DECL.asl @@ -36,12 +36,12 @@ { If ((Arg0 != Arg1)) { - ERR ("", ZFFF, 0x29, 0x00, 0x00, Arg0, Arg1) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Arg0, Arg1) } If ((Arg2 != Arg3)) { - ERR ("", ZFFF, 0x2C, 0x00, 0x00, Arg0, Arg1) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Arg0, Arg1) } } @@ -87,6 +87,6 @@ MDDB (0x38, 0x07, 0xB0, 0x16, "_ADR") If ((RT00 != BUF0)) { - ERR ("", ZFFF, 0x4C, 0x00, 0x00, RT00, BUF0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, RT00, BUF0) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0052/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0052/DECL.asl index 4adfc0d7d..bf70a280a 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0052/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0052/DECL.asl @@ -42,18 +42,18 @@ Local0 = 0x19 If ((Local0 != 0x19)) { - ERR ("", ZFFF, 0x2D, 0x00, 0x00, Local0, 0x19) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x19) } Local0 = 0x1A If ((Local0 != 0x1A)) { - ERR ("", ZFFF, 0x32, 0x00, 0x00, Local0, 0x1A) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1A) } Local0 = 0x1B If ((Local0 != 0x1B)) { - ERR ("", ZFFF, 0x37, 0x00, 0x00, Local0, 0x1B) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1B) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0054/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0054/DECL.asl index 2587e4dcc..74c5a1d4b 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0054/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0054/DECL.asl @@ -51,7 +51,7 @@ 0x79, 0x00 // y. })) { - ERR ("", ZFFF, 0x2F, 0x00, 0x00, Local0, Buffer (0x02) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Buffer (0x02) { 0x79, 0x00 // y. }) @@ -75,7 +75,7 @@ 0x79, 0x00 // y. })) { - ERR ("", ZFFF, 0x3B, 0x00, 0x00, Local0, Buffer (0x02) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Buffer (0x02) { 0x79, 0x00 // y. }) @@ -90,7 +90,7 @@ 0x79, 0x00 // y. })) { - ERR ("", ZFFF, 0x40, 0x00, 0x00, Local0, Buffer (0x02) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Buffer (0x02) { 0x79, 0x00 // y. }) @@ -111,7 +111,7 @@ 0x79, 0x00 // y. })) { - ERR ("", ZFFF, 0x48, 0x00, 0x00, Local0, Buffer (0x02) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Buffer (0x02) { 0x79, 0x00 // y. }) @@ -132,7 +132,7 @@ }) If ((Local0 != Ones)) { - ERR ("", ZFFF, 0x54, 0x00, 0x00, Local0, Ones) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Ones) } Local0 = (Buffer (0x01) @@ -141,7 +141,7 @@ } == B000) If ((Local0 != Ones)) { - ERR ("", ZFFF, 0x59, 0x00, 0x00, Local0, Ones) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Ones) } } @@ -156,7 +156,7 @@ }) If ((Local0 != Ones)) { - ERR ("", ZFFF, 0x61, 0x00, 0x00, Local0, Ones) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Ones) } } @@ -174,7 +174,7 @@ }) If ((Local0 != Zero)) { - ERR ("", ZFFF, 0x6D, 0x00, 0x00, Local0, Zero) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Zero) } Local0 = (Buffer (0x01) @@ -183,7 +183,7 @@ } > B000) If ((Local0 != Zero)) { - ERR ("", ZFFF, 0x72, 0x00, 0x00, Local0, Zero) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Zero) } } @@ -198,7 +198,7 @@ }) If ((Local0 != Zero)) { - ERR ("", ZFFF, 0x7A, 0x00, 0x00, Local0, Zero) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Zero) } } @@ -219,7 +219,7 @@ 0x79, 0x79 // yy })) { - ERR ("", ZFFF, 0x88, 0x00, 0x00, Local0, Buffer (0x02) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Buffer (0x02) { 0x79, 0x79 // yy }) @@ -234,7 +234,7 @@ 0x79, 0x79 // yy })) { - ERR ("", ZFFF, 0x8D, 0x00, 0x00, Local0, Buffer (0x02) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Buffer (0x02) { 0x79, 0x79 // yy }) @@ -255,7 +255,7 @@ 0x79, 0x79 // yy })) { - ERR ("", ZFFF, 0x95, 0x00, 0x00, Local0, Buffer (0x02) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Buffer (0x02) { 0x79, 0x79 // yy }) @@ -276,7 +276,7 @@ }) If ((Local0 != 0xF2)) { - ERR ("", ZFFF, 0xA1, 0x00, 0x00, Local0, 0xF2) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xF2) } Local0 = (Buffer (0x01) @@ -285,7 +285,7 @@ } + B000) /* \MDE8.B000 */ If ((Local0 != 0xF2)) { - ERR ("", ZFFF, 0xA6, 0x00, 0x00, Local0, 0xF2) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xF2) } } @@ -300,7 +300,7 @@ }) If ((Local0 != 0xF2)) { - ERR ("", ZFFF, 0xAE, 0x00, 0x00, Local0, 0xF2) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xF2) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0057/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0057/DECL.asl index bc9665dd6..adbf9de5c 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0057/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0057/DECL.asl @@ -57,7 +57,7 @@ /* Store("ERROR 0: mdf2, after Return !!!", Debug) */ } - ERR ("", ZFFF, 0x3C, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) MDF0 () MDF1 () Return (0x5678) @@ -73,10 +73,10 @@ Return ( /* ASL-compiler DOESN'T report Warning in this case!!! */ /* And the Store operator below is actually processed!!! */ Zero) - ERR ("", ZFFF, 0x52, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } - ERR ("", ZFFF, 0x55, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) MDF0 () MDF1 () Return (Zero) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0058/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0058/DECL.asl index e137a08e6..8798db23c 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0058/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0058/DECL.asl @@ -50,7 +50,7 @@ /* 0008 */ 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 // ........ })) { - ERR ("", ZFFF, 0x31, 0x00, 0x00, Local0, Buffer (0x10) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Buffer (0x10) { /* 0000 */ 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // ........ /* 0008 */ 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 // ........ @@ -62,7 +62,7 @@ 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 // ........ })) { - ERR ("", ZFFF, 0x35, 0x00, 0x00, Local0, Buffer (0x08) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Buffer (0x08) { 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 // ........ }) @@ -89,7 +89,7 @@ /* 0008 */ 0x90, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 // .x...... })) { - ERR ("", ZFFF, 0x46, 0x00, 0x00, Local0, Buffer (0x10) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Buffer (0x10) { /* 0000 */ 0x34, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 4....... /* 0008 */ 0x90, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 // .x...... @@ -101,7 +101,7 @@ 0x34, 0x12, 0x00, 0x00, 0x90, 0x78, 0x00, 0x00 // 4....x.. })) { - ERR ("", ZFFF, 0x4A, 0x00, 0x00, Local0, Buffer (0x08) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Buffer (0x08) { 0x34, 0x12, 0x00, 0x00, 0x90, 0x78, 0x00, 0x00 // 4....x.. }) @@ -125,7 +125,7 @@ /* 0008 */ 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 // ........ })) { - ERR ("", ZFFF, 0x58, 0x00, 0x00, Local0, Buffer (0x10) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Buffer (0x10) { /* 0000 */ 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // ........ /* 0008 */ 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 // ........ @@ -137,7 +137,7 @@ 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 // ........ })) { - ERR ("", ZFFF, 0x5C, 0x00, 0x00, Local0, Buffer (0x08) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Buffer (0x08) { 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 // ........ }) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0059/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0059/DECL.asl index 3d3c9c81a..8d0446b5e 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0059/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0059/DECL.asl @@ -79,14 +79,14 @@ Local1 = SizeOf (B000) If ((Local0 != 0x03)) { - ERR ("", ZFFF, 0x46, 0x00, 0x00, Local0, 0x03) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x03) } ElseIf ((Local1 != 0xCA)) { - ERR ("", ZFFF, 0x48, 0x00, 0x00, Local0, 0xCA) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xCA) } ElseIf ((B000 != B001)) { - ERR ("", ZFFF, 0x4A, 0x00, 0x00, B000, B001) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, B000, B001) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0061/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0061/DECL.asl index 2b4222315..8ac67728f 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0061/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0061/DECL.asl @@ -108,6 +108,6 @@ ME06 () If ((ID09 != 0x01)) { - ERR ("", ZFFF, 0x77, 0x00, 0x00, ID09, 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, ID09, 0x01) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0062_ASL_RUNTIME/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0062_ASL_RUNTIME/DECL.asl index 3f5b56abb..1302dea0c 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0062_ASL_RUNTIME/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0062_ASL_RUNTIME/DECL.asl @@ -56,6 +56,6 @@ If ((Local0 != S000)) { - ERR ("", ZFFF, 0x90, 0x00, 0x00, S000, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, S000, Local0) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0063/File0.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0063/File0.asl index bc28fb89d..91902fcda 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0063/File0.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0063/File0.asl @@ -36,31 +36,31 @@ ToInteger ("0x0", Local0) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x29, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } ToInteger ("0x0000000", Local0) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x2E, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } ToInteger ("0x1", Local0) If ((Local0 != 0x01)) { - ERR ("", ZFFF, 0x33, 0x00, 0x00, Local0, 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x01) } ToInteger ("0x12345678", Local0) If ((Local0 != 0x12345678)) { - ERR ("", ZFFF, 0x38, 0x00, 0x00, Local0, 0x12345678) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } ToInteger ("0x12345", Local0) If ((Local0 != 0x00012345)) { - ERR ("", ZFFF, 0x3D, 0x00, 0x00, Local0, 0x00012345) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00012345) } If (F64) @@ -69,14 +69,14 @@ ToInteger (Local1, Local0) If ((Local0 != 0x1234567890123456)) { - ERR ("", ZFFF, 0x44, 0x00, 0x00, Local0, 0x1234567890123456) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1234567890123456) } Local1 = "0x123456789012345" ToInteger (Local1, Local0) If ((Local0 != 0x0123456789012345)) { - ERR ("", ZFFF, 0x4A, 0x00, 0x00, Local0, 0x0123456789012345) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x0123456789012345) } } @@ -85,13 +85,13 @@ ToInteger ("0xabcdefef", Local0) If ((Local0 != 0xABCDEFEF)) { - ERR ("", ZFFF, 0x52, 0x00, 0x00, Local0, 0xABCDEFEF) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xABCDEFEF) } ToInteger ("0xabcdef", Local0) If ((Local0 != 0x00ABCDEF)) { - ERR ("", ZFFF, 0x57, 0x00, 0x00, Local0, 0x00ABCDEF) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00ABCDEF) } If (F64) @@ -100,14 +100,14 @@ ToInteger (Local1, Local0) If ((Local0 != 0xABCDEFEFADEFBCDF)) { - ERR ("", ZFFF, 0x5E, 0x00, 0x00, Local0, 0xABCDEFEFADEFBCDF) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xABCDEFEFADEFBCDF) } Local1 = "0xabcdefefadefbcd" ToInteger (Local1, Local0) If ((Local0 != 0x0ABCDEFEFADEFBCD)) { - ERR ("", ZFFF, 0x64, 0x00, 0x00, Local0, 0x0ABCDEFEFADEFBCD) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x0ABCDEFEFADEFBCD) } } @@ -116,7 +116,7 @@ ToInteger ("0x1ab2cd34", Local0) If ((Local0 != 0x1AB2CD34)) { - ERR ("", ZFFF, 0x6C, 0x00, 0x00, Local0, 0x1AB2CD34) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1AB2CD34) } If (F64) @@ -125,14 +125,14 @@ ToInteger (Local1, Local0) If ((Local0 != 0x1AB2CD340FE05678)) { - ERR ("", ZFFF, 0x73, 0x00, 0x00, Local0, 0x1AB2CD340FE05678) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1AB2CD340FE05678) } Local1 = "0x1ab2cd340fe0" ToInteger (Local1, Local0) If ((Local0 != 0x00001AB2CD340FE0)) { - ERR ("", ZFFF, 0x79, 0x00, 0x00, Local0, 0x00001AB2CD340FE0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00001AB2CD340FE0) } } @@ -148,49 +148,49 @@ ToInteger ("0", Local0) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x89, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } ToInteger ("0000000", Local0) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x8E, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } ToInteger ("000000000000000", Local0) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x93, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } ToInteger ("000000000000000000000000000000000000000000", Local0) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x98, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } ToInteger ("1", Local0) If ((Local0 != 0x01)) { - ERR ("", ZFFF, 0x9D, 0x00, 0x00, Local0, 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x01) } ToInteger ("1234567890", Local0) If ((Local0 != 0x499602D2)) { - ERR ("", ZFFF, 0xA2, 0x00, 0x00, Local0, 0x499602D2) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x499602D2) } ToInteger ("1234567", Local0) If ((Local0 != 0x0012D687)) { - ERR ("", ZFFF, 0xA7, 0x00, 0x00, Local0, 0x0012D687) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x0012D687) } ToInteger ("4294967295", Local0) If ((Local0 != 0xFFFFFFFF)) { - ERR ("", ZFFF, 0xAC, 0x00, 0x00, Local0, 0xFFFFFFFF) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xFFFFFFFF) } If (F64) @@ -199,7 +199,7 @@ ToInteger (Local1, Local0) If ((Local0 != 0xFFFFFFFFFFFFFFFF)) { - ERR ("", ZFFF, 0xB3, 0x00, 0x00, Local0, 0xFFFFFFFFFFFFFFFF) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xFFFFFFFFFFFFFFFF) } } @@ -216,31 +216,31 @@ ToInteger (" 0x0", Local0) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0xC4, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } ToInteger (" 0x00000", Local0) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0xC9, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } ToInteger (" 0x1", Local0) If ((Local0 != 0x01)) { - ERR ("", ZFFF, 0xCE, 0x00, 0x00, Local0, 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x01) } ToInteger (" 0x12345678", Local0) If ((Local0 != 0x12345678)) { - ERR ("", ZFFF, 0xD3, 0x00, 0x00, Local0, 0x12345678) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } ToInteger (" 0x12345", Local0) If ((Local0 != 0x00012345)) { - ERR ("", ZFFF, 0xD8, 0x00, 0x00, Local0, 0x00012345) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00012345) } If (F64) @@ -249,33 +249,33 @@ ToInteger (Local1, Local0) If ((Local0 != 0x1234567890123456)) { - ERR ("", ZFFF, 0xDF, 0x00, 0x00, Local0, 0x1234567890123456) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1234567890123456) } Local1 = " 0x123456789012345" ToInteger (Local1, Local0) If ((Local0 != 0x0123456789012345)) { - ERR ("", ZFFF, 0xE5, 0x00, 0x00, Local0, 0x0123456789012345) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x0123456789012345) } } ToInteger (" 0xabcdefef", Local0) If ((Local0 != 0xABCDEFEF)) { - ERR ("", ZFFF, 0xEB, 0x00, 0x00, Local0, 0xABCDEFEF) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xABCDEFEF) } ToInteger (" 0xabcdef", Local0) If ((Local0 != 0x00ABCDEF)) { - ERR ("", ZFFF, 0xF0, 0x00, 0x00, Local0, 0x00ABCDEF) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00ABCDEF) } ToInteger ("\t0xabcdef", Local0) If ((Local0 != 0x00ABCDEF)) { - ERR ("", ZFFF, 0xF5, 0x00, 0x00, Local0, 0x00ABCDEF) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00ABCDEF) } If (F64) @@ -284,21 +284,21 @@ ToInteger (Local1, Local0) If ((Local0 != 0xABCDEFEFADEFBCDF)) { - ERR ("", ZFFF, 0xFC, 0x00, 0x00, Local0, 0xABCDEFEFADEFBCDF) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xABCDEFEFADEFBCDF) } Local1 = " 0xabcdefefadefbcd" ToInteger (Local1, Local0) If ((Local0 != 0x0ABCDEFEFADEFBCD)) { - ERR ("", ZFFF, 0x0102, 0x00, 0x00, Local0, 0x0ABCDEFEFADEFBCD) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x0ABCDEFEFADEFBCD) } } ToInteger (" 0x1ab2cd34", Local0) If ((Local0 != 0x1AB2CD34)) { - ERR ("", ZFFF, 0x0108, 0x00, 0x00, Local0, 0x1AB2CD34) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1AB2CD34) } If (F64) @@ -307,75 +307,75 @@ ToInteger (Local1, Local0) If ((Local0 != 0x1AB2CD340FE05678)) { - ERR ("", ZFFF, 0x010F, 0x00, 0x00, Local0, 0x1AB2CD340FE05678) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1AB2CD340FE05678) } Local1 = " 0x1ab2cd340fe0" ToInteger (Local1, Local0) If ((Local0 != 0x00001AB2CD340FE0)) { - ERR ("", ZFFF, 0x0115, 0x00, 0x00, Local0, 0x00001AB2CD340FE0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00001AB2CD340FE0) } } ToInteger (" 0", Local0) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x011B, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } ToInteger (" \t0000000", Local0) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x0120, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } ToInteger ("\t000000000000000", Local0) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x0125, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } ToInteger (" 000000000000000000000000000000000000000000", Local0) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x012A, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } ToInteger (" 1", Local0) If ((Local0 != 0x01)) { - ERR ("", ZFFF, 0x012F, 0x00, 0x00, Local0, 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x01) } ToInteger (" 1234567890", Local0) If ((Local0 != 0x499602D2)) { - ERR ("", ZFFF, 0x0134, 0x00, 0x00, Local0, 0x499602D2) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x499602D2) } ToInteger ("\t1234567890", Local0) If ((Local0 != 0x499602D2)) { - ERR ("", ZFFF, 0x0139, 0x00, 0x00, Local0, 0x499602D2) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x499602D2) } ToInteger ("\t\t\t\t\t\t\t\t\t1234567890", Local0) If ((Local0 != 0x499602D2)) { - ERR ("", ZFFF, 0x013E, 0x00, 0x00, Local0, 0x499602D2) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x499602D2) } ToInteger (" \t 1234567", Local0) If ((Local0 != 0x0012D687)) { - ERR ("", ZFFF, 0x0143, 0x00, 0x00, Local0, 0x0012D687) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x0012D687) } ToInteger (" \t 4294967295", Local0) If ((Local0 != 0xFFFFFFFF)) { - ERR ("", ZFFF, 0x0148, 0x00, 0x00, Local0, 0xFFFFFFFF) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xFFFFFFFF) } If (F64) @@ -384,7 +384,7 @@ ToInteger (Local1, Local0) If ((Local0 != 0xFFFFFFFFFFFFFFFF)) { - ERR ("", ZFFF, 0x014F, 0x00, 0x00, Local0, 0xFFFFFFFFFFFFFFFF) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xFFFFFFFFFFFFFFFF) } } @@ -400,79 +400,79 @@ ToInteger (" 0", Local0) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x015F, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } ToInteger (" 2", Local0) If ((Local0 != 0x02)) { - ERR ("", ZFFF, 0x0164, 0x00, 0x00, Local0, 0x02) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x02) } ToInteger (" 0xa", Local0) If ((Local0 != 0x0A)) { - ERR ("", ZFFF, 0x0169, 0x00, 0x00, Local0, 0x0A) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x0A) } ToInteger (" 04294967295", Local0) If ((Local0 != 0xFFFFFFFF)) { - ERR ("", ZFFF, 0x016E, 0x00, 0x00, Local0, 0xFFFFFFFF) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xFFFFFFFF) } ToInteger ("04294967295", Local0) If ((Local0 != 0xFFFFFFFF)) { - ERR ("", ZFFF, 0x0173, 0x00, 0x00, Local0, 0xFFFFFFFF) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xFFFFFFFF) } ToInteger ("000000000000000000004294967295", Local0) If ((Local0 != 0xFFFFFFFF)) { - ERR ("", ZFFF, 0x0178, 0x00, 0x00, Local0, 0xFFFFFFFF) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xFFFFFFFF) } ToInteger (" 000000000000000000004294967295", Local0) If ((Local0 != 0xFFFFFFFF)) { - ERR ("", ZFFF, 0x017D, 0x00, 0x00, Local0, 0xFFFFFFFF) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xFFFFFFFF) } ToInteger ("\t000000000000000000004294967295", Local0) If ((Local0 != 0xFFFFFFFF)) { - ERR ("", ZFFF, 0x0182, 0x00, 0x00, Local0, 0xFFFFFFFF) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xFFFFFFFF) } ToInteger ("\t \t \t \t \t000000000000000000004294967295", Local0) If ((Local0 != 0xFFFFFFFF)) { - ERR ("", ZFFF, 0x0187, 0x00, 0x00, Local0, 0xFFFFFFFF) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xFFFFFFFF) } ToInteger ("\t \t \t \t \t04294967295", Local0) If ((Local0 != 0xFFFFFFFF)) { - ERR ("", ZFFF, 0x018C, 0x00, 0x00, Local0, 0xFFFFFFFF) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xFFFFFFFF) } ToInteger ("\t \t \t \t \t0123456789", Local0) If ((Local0 != 0x075BCD15)) { - ERR ("", ZFFF, 0x0191, 0x00, 0x00, Local0, 0x075BCD15) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x075BCD15) } ToInteger ("0123456789", Local0) If ((Local0 != 0x075BCD15)) { - ERR ("", ZFFF, 0x0196, 0x00, 0x00, Local0, 0x075BCD15) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x075BCD15) } ToInteger ("00123456789", Local0) If ((Local0 != 0x075BCD15)) { - ERR ("", ZFFF, 0x019B, 0x00, 0x00, Local0, 0x075BCD15) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x075BCD15) } If (F64) @@ -481,21 +481,21 @@ ToInteger (Local1, Local0) If ((Local0 != 0xFFFFFFFFFFFFFFFF)) { - ERR ("", ZFFF, 0x01A2, 0x00, 0x00, Local0, 0xFFFFFFFFFFFFFFFF) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xFFFFFFFFFFFFFFFF) } Local1 = "018446744073709551615" ToInteger (Local1, Local0) If ((Local0 != 0xFFFFFFFFFFFFFFFF)) { - ERR ("", ZFFF, 0x01A8, 0x00, 0x00, Local0, 0xFFFFFFFFFFFFFFFF) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xFFFFFFFFFFFFFFFF) } Local1 = "000000000000000000000000000000000000000018446744073709551615" ToInteger (Local1, Local0) If ((Local0 != 0xFFFFFFFFFFFFFFFF)) { - ERR ("", ZFFF, 0x01AE, 0x00, 0x00, Local0, 0xFFFFFFFFFFFFFFFF) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xFFFFFFFFFFFFFFFF) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0063/File1.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0063/File1.asl index 1cf848b8b..7690b94c0 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0063/File1.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0063/File1.asl @@ -36,31 +36,31 @@ Local0 = ("" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x29, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } Local0 = ("0x0" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x2E, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } Local0 = ("0x1" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x33, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } Local0 = ("0x12345678" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x38, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } Local0 = ("0x1234567890123456" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x3D, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } /* Hex: 0x - hex */ @@ -68,13 +68,13 @@ Local0 = ("0xabcdefef" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x44, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } Local0 = ("0xabcdefefadefbcdf" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x49, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } /* Hex: 0x - dec/hex */ @@ -82,7 +82,7 @@ Local0 = ("0x1ab2cd340fe05678" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x50, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } CH03 ("", 0x00, 0x0208, 0x53, 0x00) @@ -90,7 +90,7 @@ CH03 ("", 0x00, 0x0209, 0x55, 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x58, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } CH03 ("", 0x00, 0x020B, 0x5B, 0x00) @@ -105,35 +105,35 @@ Local0 = ("0" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x67, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } CH03 ("", 0x00, 0x0201, 0x6A, 0x00) Local0 = ("0000000" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x6E, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } CH03 ("", 0x00, 0x0202, 0x71, 0x00) Local0 = ("000000000000000000000000000000" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x75, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } CH03 ("", 0x00, 0x0203, 0x78, 0x00) Local0 = ("1" + 0x00) If ((Local0 != 0x01)) { - ERR ("", ZFFF, 0x7C, 0x00, 0x00, Local0, 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x01) } CH03 ("", 0x00, 0x0204, 0x7F, 0x00) Local0 = ("12345678" + 0x00) If ((Local0 != 0x12345678)) { - ERR ("", ZFFF, 0x83, 0x00, 0x00, Local0, 0x12345678) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } CH03 ("", 0x00, 0x0205, 0x86, 0x00) @@ -152,12 +152,12 @@ { If ((Local0 != 0x1234567890123456)) { - ERR ("", ZFFF, 0x95, 0x00, 0x00, Local0, 0x1234567890123456) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1234567890123456) } } ElseIf ((Local0 != 0x12345678)) { - ERR ("", ZFFF, 0x99, 0x00, 0x00, Local0, 0x12345678) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } /* Hex: 0x - hex */ @@ -165,13 +165,13 @@ Local0 = ("abcdefef" + 0x00) If ((Local0 != 0xABCDEFEF)) { - ERR ("", ZFFF, 0xA1, 0x00, 0x00, Local0, 0xABCDEFEF) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xABCDEFEF) } Local0 = ("abcdefe" + 0x00) If ((Local0 != 0x0ABCDEFE)) { - ERR ("", ZFFF, 0xA6, 0x00, 0x00, Local0, 0x0ABCDEFE) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x0ABCDEFE) } Local0 = ("abcdefefadefbcdf" + 0x00) @@ -179,12 +179,12 @@ { If ((Local0 != 0xABCDEFEFADEFBCDF)) { - ERR ("", ZFFF, 0xAC, 0x00, 0x00, Local0, 0xABCDEFEFADEFBCDF) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xABCDEFEFADEFBCDF) } } ElseIf ((Local0 != 0xABCDEFEF)) { - ERR ("", ZFFF, 0xB0, 0x00, 0x00, Local0, 0xABCDEFEF) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xABCDEFEF) } /* Hex: 0x - dec/hex */ @@ -194,12 +194,12 @@ { If ((Local0 != 0x1AB2CD340FE05678)) { - ERR ("", ZFFF, 0xB9, 0x00, 0x00, Local0, 0x1AB2CD340FE05678) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1AB2CD340FE05678) } } ElseIf ((Local0 != 0x1AB2CD34)) { - ERR ("", ZFFF, 0xBD, 0x00, 0x00, Local0, 0x1AB2CD34) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1AB2CD34) } Local0 = ("1ab2cd340fe05" + 0x00) @@ -207,18 +207,18 @@ { If ((Local0 != 0x0001AB2CD340FE05)) { - ERR ("", ZFFF, 0xC4, 0x00, 0x00, Local0, 0x0001AB2CD340FE05) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x0001AB2CD340FE05) } } ElseIf ((Local0 != 0x1AB2CD34)) { - ERR ("", ZFFF, 0xC8, 0x00, 0x00, Local0, 0x1AB2CD34) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1AB2CD34) } Local0 = ("1a" + 0x00) If ((Local0 != 0x1A)) { - ERR ("", ZFFF, 0xCE, 0x00, 0x00, Local0, 0x1A) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1A) } CH03 ("", 0x00, 0x0219, 0xD1, 0x00) @@ -235,7 +235,7 @@ Local0 = ("1234cd" + 0x00) If ((Local0 != 0x001234CD)) { - ERR ("", ZFFF, 0xDD, 0x00, 0x00, Local0, 0x001234CD) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x001234CD) } /* 6. "000x1234" (non-decimal character in dec-image) */ @@ -244,7 +244,7 @@ Local0 = ("000x1234" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0xE4, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } /* 7. "0x1234cdQ" (non-hex character in '0x'-image) */ @@ -253,21 +253,21 @@ Local0 = ("0x1234cdQ" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0xEB, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } CH03 ("", 0x00, 0x0227, 0xED, 0x00) Local0 = ("1234cdQ" + 0x00) If ((Local0 != 0x001234CD)) { - ERR ("", ZFFF, 0xF0, 0x00, 0x00, Local0, 0x001234CD) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x001234CD) } CH03 ("", 0x00, 0x0229, 0xF3, 0x00) Local0 = ("0x0x12345" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0xF6, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } /* 8. "1234 " (white space in dec image) */ @@ -276,7 +276,7 @@ Local0 = ("1234 " + 0x00) If ((Local0 != 0x1234)) { - ERR ("", ZFFF, 0xFD, 0x00, 0x00, Local0, 0x1234) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1234) } /* 9. "0x1234cd " (white space in '0x'-image) */ @@ -285,7 +285,7 @@ Local0 = ("1234cd " + 0x00) If ((Local0 != 0x001234CD)) { - ERR ("", ZFFF, 0x0104, 0x00, 0x00, Local0, 0x001234CD) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x001234CD) } /* 10. "0x 1234cdQ" (white space after '0x') */ @@ -294,28 +294,28 @@ Local0 = ("0x 1234" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x010B, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } CH03 ("", 0x00, 0x0231, 0x010E, 0x00) Local0 = ("0x0x 1234" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x0111, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } CH03 ("", 0x00, 0x0233, 0x0114, 0x00) Local0 = ("0x0x 0x 1234" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x0117, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } CH03 ("", 0x00, 0x0235, 0x011A, 0x00) Local0 = ("0x 0x 1234" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x011D, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } /* 11. (decimal image exceeding maximal) */ @@ -328,12 +328,12 @@ { If ((Local0 != 0x0000004294967296)) { - ERR ("", ZFFF, 0x0127, 0x00, 0x00, Local0, 0x0000004294967296) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x0000004294967296) } } ElseIf ((Local0 != 0x42949672)) { - ERR ("", ZFFF, 0x012B, 0x00, 0x00, Local0, 0x42949672) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x42949672) } CH03 ("", 0x00, 0x023A, 0x012F, 0x00) @@ -342,12 +342,12 @@ { If ((Local0 != 0x1234567890123456)) { - ERR ("", ZFFF, 0x0133, 0x00, 0x00, Local0, 0x1234567890123456) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1234567890123456) } } ElseIf ((Local0 != 0x12345678)) { - ERR ("", ZFFF, 0x0137, 0x00, 0x00, Local0, 0x12345678) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } CH03 ("", 0x00, 0x023D, 0x013B, 0x00) @@ -356,12 +356,12 @@ { If ((Local0 != 0x0000004294967296)) { - ERR ("", ZFFF, 0x013F, 0x00, 0x00, Local0, 0x0000004294967296) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x0000004294967296) } } ElseIf ((Local0 != 0x42949672)) { - ERR ("", ZFFF, 0x0143, 0x00, 0x00, Local0, 0x42949672) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x42949672) } CH03 ("", 0x00, 0x0240, 0x0147, 0x00) @@ -370,12 +370,12 @@ { If ((Local0 != 0x1234567890123456)) { - ERR ("", ZFFF, 0x014B, 0x00, 0x00, Local0, 0x1234567890123456) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1234567890123456) } } ElseIf ((Local0 != 0x12345678)) { - ERR ("", ZFFF, 0x014F, 0x00, 0x00, Local0, 0x12345678) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } CH03 ("", 0x00, 0x0243, 0x0153, 0x00) @@ -384,12 +384,12 @@ { If ((Local0 != 0x1234567890123456)) { - ERR ("", ZFFF, 0x0157, 0x00, 0x00, Local0, 0x1234567890123456) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1234567890123456) } } ElseIf ((Local0 != 0x12345678)) { - ERR ("", ZFFF, 0x015B, 0x00, 0x00, Local0, 0x12345678) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } CH03 ("", 0x00, 0x0246, 0x015F, 0x00) @@ -398,12 +398,12 @@ { If ((Local0 != 0x1234567890123456)) { - ERR ("", ZFFF, 0x0163, 0x00, 0x00, Local0, 0x1234567890123456) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1234567890123456) } } ElseIf ((Local0 != 0x12345678)) { - ERR ("", ZFFF, 0x0167, 0x00, 0x00, Local0, 0x12345678) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } CH03 ("", 0x00, 0x0249, 0x016B, 0x00) @@ -412,12 +412,12 @@ { If ((Local0 != 0x1234567890123456)) { - ERR ("", ZFFF, 0x016F, 0x00, 0x00, Local0, 0x1234567890123456) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1234567890123456) } } ElseIf ((Local0 != 0x12345678)) { - ERR ("", ZFFF, 0x0173, 0x00, 0x00, Local0, 0x12345678) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } } @@ -429,12 +429,12 @@ { If ((Local0 != 0x1844674407370955)) { - ERR ("", ZFFF, 0x017D, 0x00, 0x00, Local0, 0x1844674407370955) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1844674407370955) } } ElseIf ((Local0 != 0x18446744)) { - ERR ("", ZFFF, 0x0181, 0x00, 0x00, Local0, 0x18446744) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x18446744) } CH03 ("", 0x00, 0x024F, 0x0185, 0x00) @@ -443,12 +443,12 @@ { If ((Local0 != 0x1844674407370955)) { - ERR ("", ZFFF, 0x0189, 0x00, 0x00, Local0, 0x1844674407370955) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1844674407370955) } } ElseIf ((Local0 != 0x18446744)) { - ERR ("", ZFFF, 0x018D, 0x00, 0x00, Local0, 0x18446744) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x18446744) } CH03 ("", 0x00, 0x0252, 0x0191, 0x00) @@ -457,12 +457,12 @@ { If ((Local0 != 0x1844674407370955)) { - ERR ("", ZFFF, 0x0195, 0x00, 0x00, Local0, 0x1844674407370955) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1844674407370955) } } ElseIf ((Local0 != 0x18446744)) { - ERR ("", ZFFF, 0x0199, 0x00, 0x00, Local0, 0x18446744) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x18446744) } CH03 ("", 0x00, 0x0255, 0x019D, 0x00) @@ -471,12 +471,12 @@ { If ((Local0 != 0x1844674407370955)) { - ERR ("", ZFFF, 0x01A1, 0x00, 0x00, Local0, 0x1844674407370955) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1844674407370955) } } ElseIf ((Local0 != 0x18446744)) { - ERR ("", ZFFF, 0x01A5, 0x00, 0x00, Local0, 0x18446744) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x18446744) } CH03 ("", 0x00, 0x0258, 0x01A9, 0x00) @@ -485,12 +485,12 @@ { If ((Local0 != 0x1844674407370955)) { - ERR ("", ZFFF, 0x01AD, 0x00, 0x00, Local0, 0x1844674407370955) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1844674407370955) } } ElseIf ((Local0 != 0x18446744)) { - ERR ("", ZFFF, 0x01B1, 0x00, 0x00, Local0, 0x18446744) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x18446744) } /* 12. "0x12345678901234567" (hex image exceeding maximal) */ @@ -499,7 +499,7 @@ Local0 = ("0x12345678901234567" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x01B9, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } /* 13. "0x00000000000001234" (hex image exceeding maximal; no matter that zeros) */ @@ -508,14 +508,14 @@ Local0 = ("0x00000000000001234" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x01C0, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } CH03 ("", 0x00, 0x0260, 0x01C3, 0x00) Local0 = ("0x0000000000000000000001234" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x01C6, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } /* 14. "0x123456789" (hex image exceeding maximal; for 32-bit mode only) */ @@ -526,7 +526,7 @@ Local0 = ("0x123456789" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x01CE, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } } @@ -536,7 +536,7 @@ Local0 = ("0x" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x01D6, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } CH03 ("", 0x00, 0x0266, 0x01D8, 0x00) @@ -555,25 +555,25 @@ Local0 = (" 0x0" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x01E8, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } Local0 = ("\t0x1" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x01ED, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } Local0 = ("\t 0x12345678" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x01F2, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } Local0 = (" \t0x1234567890123456" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x01F7, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } /* Hex: 0x - hex */ @@ -581,13 +581,13 @@ Local0 = (" 0xabcdefef" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x01FE, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } Local0 = ("\t\t0xabcdefefadefbcdf" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x0203, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } /* Hex: 0x - dec/hex */ @@ -595,7 +595,7 @@ Local0 = (" \t \t \t \t \t0x1ab2cd340fe05678" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x020A, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } CH03 ("", 0x00, 0x026F, 0x020D, 0x00) @@ -603,7 +603,7 @@ CH03 ("", 0x00, 0x0270, 0x020F, 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x0212, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } CH03 ("", 0x00, 0x0272, 0x0215, 0x00) @@ -616,42 +616,42 @@ Local0 = (" 0" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x0221, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } CH03 ("", 0x00, 0x0275, 0x0224, 0x00) Local0 = ("\t\t\t\t\t\t0000000" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x0228, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } CH03 ("", 0x00, 0x0277, 0x022B, 0x00) Local0 = (" 000000000000000000000000000000" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x022F, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } CH03 ("", 0x00, 0x0279, 0x0232, 0x00) Local0 = ("\t\t\t\t\t\t\t000000000000000000000000000000" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x0236, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } CH03 ("", 0x00, 0x027B, 0x0239, 0x00) Local0 = (" \t\t 1" + 0x00) If ((Local0 != 0x01)) { - ERR ("", ZFFF, 0x023D, 0x00, 0x00, Local0, 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x01) } CH03 ("", 0x00, 0x027D, 0x0240, 0x00) Local0 = (" \t \t \t12345678" + 0x00) If ((Local0 != 0x12345678)) { - ERR ("", ZFFF, 0x0244, 0x00, 0x00, Local0, 0x12345678) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } CH03 ("", 0x00, 0x027F, 0x0247, 0x00) @@ -668,12 +668,12 @@ { If ((Local0 != 0x1234567890123456)) { - ERR ("", ZFFF, 0x0256, 0x00, 0x00, Local0, 0x1234567890123456) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1234567890123456) } } ElseIf ((Local0 != 0x12345678)) { - ERR ("", ZFFF, 0x025A, 0x00, 0x00, Local0, 0x12345678) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } /* Hex: 0x - hex */ @@ -681,13 +681,13 @@ Local0 = ("\t\t\t\tabcdefef" + 0x00) If ((Local0 != 0xABCDEFEF)) { - ERR ("", ZFFF, 0x0262, 0x00, 0x00, Local0, 0xABCDEFEF) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xABCDEFEF) } Local0 = (" abcdefe" + 0x00) If ((Local0 != 0x0ABCDEFE)) { - ERR ("", ZFFF, 0x0267, 0x00, 0x00, Local0, 0x0ABCDEFE) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x0ABCDEFE) } Local0 = (" abcdefefadefbcdf" + 0x00) @@ -695,12 +695,12 @@ { If ((Local0 != 0xABCDEFEFADEFBCDF)) { - ERR ("", ZFFF, 0x026D, 0x00, 0x00, Local0, 0xABCDEFEFADEFBCDF) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xABCDEFEFADEFBCDF) } } ElseIf ((Local0 != 0xABCDEFEF)) { - ERR ("", ZFFF, 0x0271, 0x00, 0x00, Local0, 0xABCDEFEF) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xABCDEFEF) } /* Hex: 0x - dec/hex */ @@ -710,12 +710,12 @@ { If ((Local0 != 0x1AB2CD340FE05678)) { - ERR ("", ZFFF, 0x027A, 0x00, 0x00, Local0, 0x1AB2CD340FE05678) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1AB2CD340FE05678) } } ElseIf ((Local0 != 0x1AB2CD34)) { - ERR ("", ZFFF, 0x027E, 0x00, 0x00, Local0, 0x1AB2CD34) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1AB2CD34) } Local0 = (" 1ab2cd340fe05" + 0x00) @@ -723,18 +723,18 @@ { If ((Local0 != 0x0001AB2CD340FE05)) { - ERR ("", ZFFF, 0x0285, 0x00, 0x00, Local0, 0x0001AB2CD340FE05) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x0001AB2CD340FE05) } } ElseIf ((Local0 != 0x1AB2CD34)) { - ERR ("", ZFFF, 0x0289, 0x00, 0x00, Local0, 0x1AB2CD34) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1AB2CD34) } Local0 = ("\t1a" + 0x00) If ((Local0 != 0x1A)) { - ERR ("", ZFFF, 0x028F, 0x00, 0x00, Local0, 0x1A) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1A) } CH03 ("", 0x00, 0x028D, 0x0292, 0x00) @@ -748,7 +748,7 @@ Local0 = ("\t1234cd" + 0x00) If ((Local0 != 0x001234CD)) { - ERR ("", ZFFF, 0x029E, 0x00, 0x00, Local0, 0x001234CD) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x001234CD) } /* 6. "000x1234" (non-decimal character in dec-image) */ @@ -757,7 +757,7 @@ Local0 = (" \t \t\t\t 000x1234" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x02A5, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } /* 7. "0x1234cdQ" (non-hex character in '0x'-image) */ @@ -766,21 +766,21 @@ Local0 = (" \t \t\t\t\t 0x1234cdQ" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x02AC, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } CH03 ("", 0x00, 0x0294, 0x02AE, 0x00) Local0 = (" 1234cdQ" + 0x00) If ((Local0 != 0x001234CD)) { - ERR ("", ZFFF, 0x02B1, 0x00, 0x00, Local0, 0x001234CD) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x001234CD) } CH03 ("", 0x00, 0x0296, 0x02B4, 0x00) Local0 = (" \t\t0x0x12345" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x02B7, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } /* 8. "1234 " (white space in dec image) */ @@ -789,7 +789,7 @@ Local0 = (" \t\t1234 " + 0x00) If ((Local0 != 0x1234)) { - ERR ("", ZFFF, 0x02BE, 0x00, 0x00, Local0, 0x1234) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1234) } /* 9. "0x1234cd " (white space in '0x'-image) */ @@ -798,7 +798,7 @@ Local0 = ("\t\t\t 1234cd " + 0x00) If ((Local0 != 0x001234CD)) { - ERR ("", ZFFF, 0x02C5, 0x00, 0x00, Local0, 0x001234CD) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x001234CD) } /* 10. "0x 1234cdQ" (white space after '0x') */ @@ -807,28 +807,28 @@ Local0 = ("\t\t\t\t \t \t \t\t0x 1234" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x02CC, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } CH03 ("", 0x00, 0x029E, 0x02CF, 0x00) Local0 = (" \t \t \t\t \t0x0x 1234" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x02D2, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } CH03 ("", 0x00, 0x02A0, 0x02D5, 0x00) Local0 = (" \t \t \t \t\t0x0x 0x 1234" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x02D8, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } CH03 ("", 0x00, 0x02A2, 0x02DB, 0x00) Local0 = ("\t \t \t \t\t 0x 0x 1234" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x02DE, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } /* 11. (decimal image exceeding maximal) */ @@ -841,12 +841,12 @@ { If ((Local0 != 0x0000004294967296)) { - ERR ("", ZFFF, 0x02E8, 0x00, 0x00, Local0, 0x0000004294967296) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x0000004294967296) } } ElseIf ((Local0 != 0x42949672)) { - ERR ("", ZFFF, 0x02EC, 0x00, 0x00, Local0, 0x42949672) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x42949672) } CH03 ("", 0x00, 0x02A7, 0x02F0, 0x00) @@ -855,12 +855,12 @@ { If ((Local0 != 0x1234567890123456)) { - ERR ("", ZFFF, 0x02F4, 0x00, 0x00, Local0, 0x1234567890123456) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1234567890123456) } } ElseIf ((Local0 != 0x12345678)) { - ERR ("", ZFFF, 0x02F8, 0x00, 0x00, Local0, 0x12345678) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } CH03 ("", 0x00, 0x02AA, 0x02FC, 0x00) @@ -869,12 +869,12 @@ { If ((Local0 != 0x0000004294967296)) { - ERR ("", ZFFF, 0x0300, 0x00, 0x00, Local0, 0x0000004294967296) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x0000004294967296) } } ElseIf ((Local0 != 0x42949672)) { - ERR ("", ZFFF, 0x0304, 0x00, 0x00, Local0, 0x42949672) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x42949672) } CH03 ("", 0x00, 0x02AD, 0x0308, 0x00) @@ -883,12 +883,12 @@ { If ((Local0 != 0x1234567890123456)) { - ERR ("", ZFFF, 0x030C, 0x00, 0x00, Local0, 0x1234567890123456) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1234567890123456) } } ElseIf ((Local0 != 0x12345678)) { - ERR ("", ZFFF, 0x0310, 0x00, 0x00, Local0, 0x12345678) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } CH03 ("", 0x00, 0x02B0, 0x0314, 0x00) @@ -897,12 +897,12 @@ { If ((Local0 != 0x1234567890123456)) { - ERR ("", ZFFF, 0x0318, 0x00, 0x00, Local0, 0x1234567890123456) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1234567890123456) } } ElseIf ((Local0 != 0x12345678)) { - ERR ("", ZFFF, 0x031C, 0x00, 0x00, Local0, 0x12345678) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } CH03 ("", 0x00, 0x02B3, 0x0320, 0x00) @@ -911,12 +911,12 @@ { If ((Local0 != 0x1234567890123456)) { - ERR ("", ZFFF, 0x0324, 0x00, 0x00, Local0, 0x1234567890123456) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1234567890123456) } } ElseIf ((Local0 != 0x12345678)) { - ERR ("", ZFFF, 0x0328, 0x00, 0x00, Local0, 0x12345678) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } CH03 ("", 0x00, 0x02B6, 0x032C, 0x00) @@ -925,12 +925,12 @@ { If ((Local0 != 0x1234567890123456)) { - ERR ("", ZFFF, 0x0330, 0x00, 0x00, Local0, 0x1234567890123456) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1234567890123456) } } ElseIf ((Local0 != 0x12345678)) { - ERR ("", ZFFF, 0x0334, 0x00, 0x00, Local0, 0x12345678) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } } @@ -942,12 +942,12 @@ { If ((Local0 != 0x1844674407370955)) { - ERR ("", ZFFF, 0x033E, 0x00, 0x00, Local0, 0x1844674407370955) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1844674407370955) } } ElseIf ((Local0 != 0x18446744)) { - ERR ("", ZFFF, 0x0342, 0x00, 0x00, Local0, 0x18446744) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x18446744) } CH03 ("", 0x00, 0x02BB, 0x0346, 0x00) @@ -956,12 +956,12 @@ { If ((Local0 != 0x1844674407370955)) { - ERR ("", ZFFF, 0x034A, 0x00, 0x00, Local0, 0x1844674407370955) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1844674407370955) } } ElseIf ((Local0 != 0x18446744)) { - ERR ("", ZFFF, 0x034E, 0x00, 0x00, Local0, 0x18446744) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x18446744) } CH03 ("", 0x00, 0x02BE, 0x0352, 0x00) @@ -970,12 +970,12 @@ { If ((Local0 != 0x1844674407370955)) { - ERR ("", ZFFF, 0x0356, 0x00, 0x00, Local0, 0x1844674407370955) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1844674407370955) } } ElseIf ((Local0 != 0x18446744)) { - ERR ("", ZFFF, 0x035A, 0x00, 0x00, Local0, 0x18446744) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x18446744) } CH03 ("", 0x00, 0x02C1, 0x035E, 0x00) @@ -984,12 +984,12 @@ { If ((Local0 != 0x1844674407370955)) { - ERR ("", ZFFF, 0x0362, 0x00, 0x00, Local0, 0x1844674407370955) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1844674407370955) } } ElseIf ((Local0 != 0x18446744)) { - ERR ("", ZFFF, 0x0366, 0x00, 0x00, Local0, 0x18446744) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x18446744) } CH03 ("", 0x00, 0x02C4, 0x036A, 0x00) @@ -998,12 +998,12 @@ { If ((Local0 != 0x1844674407370955)) { - ERR ("", ZFFF, 0x036E, 0x00, 0x00, Local0, 0x1844674407370955) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1844674407370955) } } ElseIf ((Local0 != 0x18446744)) { - ERR ("", ZFFF, 0x0372, 0x00, 0x00, Local0, 0x18446744) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x18446744) } /* 12. "0x12345678901234567" (hex image exceeding maximal) */ @@ -1012,7 +1012,7 @@ Local0 = ("\t\t0x12345678901234567" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x037A, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } /* 13. "0x00000000000001234" (hex image exceeding maximal; no matter that zeros) */ @@ -1021,14 +1021,14 @@ Local0 = (" 0x00000000000001234" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x0381, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } CH03 ("", 0x00, 0x02CC, 0x0384, 0x00) Local0 = (" \t\t0x0000000000000000000001234" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x0387, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } /* 14. "0x123456789" (hex image exceeding maximal; for 32-bit mode only) */ @@ -1039,7 +1039,7 @@ Local0 = ("0x123456789" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x038F, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } } @@ -1049,14 +1049,14 @@ Local0 = ("\t0x" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x0397, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } CH03 ("", 0x00, 0x02D2, 0x0399, 0x00) Local0 = (" 0x" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x039D, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } CH03 ("", 0x00, 0x02D4, 0x039F, 0x00) @@ -1081,25 +1081,25 @@ Local0 = (" 0000000000x0" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x03B5, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } Local0 = ("\t0000000000x1" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x03BA, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } Local0 = ("\t 0000000000x12345678" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x03BF, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } Local0 = (" \t0000000000x1234567890123456" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x03C4, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } /* Hex: 0x - hex */ @@ -1107,13 +1107,13 @@ Local0 = (" 0000000000xabcdefef" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x03CB, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } Local0 = ("\t\t0000000000xabcdefefadefbcdf" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x03D0, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } /* Hex: 0x - dec/hex */ @@ -1121,7 +1121,7 @@ Local0 = (" \t \t \t \t \t0000000000x1ab2cd340fe05678" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x03D7, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } CH03 ("", 0x00, 0x036F, 0x03DA, 0x00) @@ -1129,7 +1129,7 @@ CH03 ("", 0x00, 0x0370, 0x03DC, 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x03DF, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } CH03 ("", 0x00, 0x0372, 0x03E2, 0x00) @@ -1142,42 +1142,42 @@ Local0 = (" 0000000000" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x03EE, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } CH03 ("", 0x00, 0x0375, 0x03F1, 0x00) Local0 = ("\t\t\t\t\t\t0000000000000000" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x03F5, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } CH03 ("", 0x00, 0x0377, 0x03F8, 0x00) Local0 = (" 000000000000000000000000000000000000000" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x03FC, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } CH03 ("", 0x00, 0x0379, 0x03FF, 0x00) Local0 = ("\t\t\t\t\t\t\t000000000000000000000000000000000000000" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x0403, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } CH03 ("", 0x00, 0x037B, 0x0406, 0x00) Local0 = (" \t\t 0000000001" + 0x00) If ((Local0 != 0x01)) { - ERR ("", ZFFF, 0x040A, 0x00, 0x00, Local0, 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x01) } CH03 ("", 0x00, 0x037D, 0x040D, 0x00) Local0 = (" \t \t \t00000000012345678" + 0x00) If ((Local0 != 0x12345678)) { - ERR ("", ZFFF, 0x0411, 0x00, 0x00, Local0, 0x12345678) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } CH03 ("", 0x00, 0x037F, 0x0414, 0x00) @@ -1194,12 +1194,12 @@ { If ((Local0 != 0x1234567890123456)) { - ERR ("", ZFFF, 0x0423, 0x00, 0x00, Local0, 0x1234567890123456) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1234567890123456) } } ElseIf ((Local0 != 0x12345678)) { - ERR ("", ZFFF, 0x0427, 0x00, 0x00, Local0, 0x12345678) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } /* Hex: 0x - hex */ @@ -1207,13 +1207,13 @@ Local0 = ("\t\t\t\t000000000abcdefef" + 0x00) If ((Local0 != 0xABCDEFEF)) { - ERR ("", ZFFF, 0x042F, 0x00, 0x00, Local0, 0xABCDEFEF) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xABCDEFEF) } Local0 = (" 000000000abcdefe" + 0x00) If ((Local0 != 0x0ABCDEFE)) { - ERR ("", ZFFF, 0x0434, 0x00, 0x00, Local0, 0x0ABCDEFE) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x0ABCDEFE) } Local0 = (" 000000000abcdefefadefbcdf" + 0x00) @@ -1221,12 +1221,12 @@ { If ((Local0 != 0xABCDEFEFADEFBCDF)) { - ERR ("", ZFFF, 0x043A, 0x00, 0x00, Local0, 0xABCDEFEFADEFBCDF) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xABCDEFEFADEFBCDF) } } ElseIf ((Local0 != 0xABCDEFEF)) { - ERR ("", ZFFF, 0x043E, 0x00, 0x00, Local0, 0xABCDEFEF) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xABCDEFEF) } /* Hex: 0x - dec/hex */ @@ -1236,12 +1236,12 @@ { If ((Local0 != 0x1AB2CD340FE05678)) { - ERR ("", ZFFF, 0x0447, 0x00, 0x00, Local0, 0x1AB2CD340FE05678) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1AB2CD340FE05678) } } ElseIf ((Local0 != 0x1AB2CD34)) { - ERR ("", ZFFF, 0x044B, 0x00, 0x00, Local0, 0x1AB2CD34) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1AB2CD34) } Local0 = (" 0000000001ab2cd340fe05" + 0x00) @@ -1249,18 +1249,18 @@ { If ((Local0 != 0x0001AB2CD340FE05)) { - ERR ("", ZFFF, 0x0452, 0x00, 0x00, Local0, 0x0001AB2CD340FE05) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x0001AB2CD340FE05) } } ElseIf ((Local0 != 0x1AB2CD34)) { - ERR ("", ZFFF, 0x0456, 0x00, 0x00, Local0, 0x1AB2CD34) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1AB2CD34) } Local0 = ("\t0000000001a" + 0x00) If ((Local0 != 0x1A)) { - ERR ("", ZFFF, 0x045C, 0x00, 0x00, Local0, 0x1A) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1A) } CH03 ("", 0x00, 0x038D, 0x045F, 0x00) @@ -1274,7 +1274,7 @@ Local0 = ("\t0000000001234cd" + 0x00) If ((Local0 != 0x001234CD)) { - ERR ("", ZFFF, 0x046B, 0x00, 0x00, Local0, 0x001234CD) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x001234CD) } /* 6. "000x1234" (non-decimal character in dec-image) */ @@ -1283,7 +1283,7 @@ Local0 = (" \t \t\t\t 000000000000x1234" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x0472, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } /* 7. "0x1234cdQ" (non-hex character in '0x'-image) */ @@ -1292,21 +1292,21 @@ Local0 = (" \t \t\t\t\t 0000000000x1234cdQ" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x0479, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } CH03 ("", 0x00, 0x0394, 0x047B, 0x00) Local0 = (" 0000000001234cdQ" + 0x00) If ((Local0 != 0x001234CD)) { - ERR ("", ZFFF, 0x047E, 0x00, 0x00, Local0, 0x001234CD) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x001234CD) } CH03 ("", 0x00, 0x0396, 0x0481, 0x00) Local0 = (" \t\t0000000000x0x12345" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x0484, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } /* 8. "1234 " (white space in dec image) */ @@ -1315,7 +1315,7 @@ Local0 = (" \t\t0000000001234 " + 0x00) If ((Local0 != 0x1234)) { - ERR ("", ZFFF, 0x048B, 0x00, 0x00, Local0, 0x1234) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1234) } /* 9. "0x1234cd " (white space in '0x'-image) */ @@ -1324,7 +1324,7 @@ Local0 = ("\t\t\t 0000000001234cd " + 0x00) If ((Local0 != 0x001234CD)) { - ERR ("", ZFFF, 0x0492, 0x00, 0x00, Local0, 0x001234CD) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x001234CD) } /* 10. "0x 1234cdQ" (white space after '0x') */ @@ -1333,28 +1333,28 @@ Local0 = ("\t\t\t\t \t \t \t\t0000000000x 1234" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x0499, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } CH03 ("", 0x00, 0x039E, 0x049C, 0x00) Local0 = (" \t \t \t\t \t0000000000x0x 1234" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x049F, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } CH03 ("", 0x00, 0x03A0, 0x04A2, 0x00) Local0 = (" \t \t \t \t\t0000000000x0x 0x 1234" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x04A5, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } CH03 ("", 0x00, 0x03A2, 0x04A8, 0x00) Local0 = ("\t \t \t \t\t 0000000000x 0x 1234" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x04AB, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } /* 11. (decimal image exceeding maximal) */ @@ -1367,12 +1367,12 @@ { If ((Local0 != 0x0000004294967296)) { - ERR ("", ZFFF, 0x04B5, 0x00, 0x00, Local0, 0x0000004294967296) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x0000004294967296) } } ElseIf ((Local0 != 0x42949672)) { - ERR ("", ZFFF, 0x04B9, 0x00, 0x00, Local0, 0x42949672) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x42949672) } CH03 ("", 0x00, 0x03A7, 0x04BD, 0x00) @@ -1381,12 +1381,12 @@ { If ((Local0 != 0x1234567890123456)) { - ERR ("", ZFFF, 0x04C1, 0x00, 0x00, Local0, 0x1234567890123456) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1234567890123456) } } ElseIf ((Local0 != 0x12345678)) { - ERR ("", ZFFF, 0x04C5, 0x00, 0x00, Local0, 0x12345678) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } CH03 ("", 0x00, 0x03AA, 0x04C9, 0x00) @@ -1395,12 +1395,12 @@ { If ((Local0 != 0x0000004294967296)) { - ERR ("", ZFFF, 0x04CD, 0x00, 0x00, Local0, 0x0000004294967296) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x0000004294967296) } } ElseIf ((Local0 != 0x42949672)) { - ERR ("", ZFFF, 0x04D1, 0x00, 0x00, Local0, 0x42949672) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x42949672) } CH03 ("", 0x00, 0x03AD, 0x04D5, 0x00) @@ -1409,12 +1409,12 @@ { If ((Local0 != 0x1234567890123456)) { - ERR ("", ZFFF, 0x04D9, 0x00, 0x00, Local0, 0x1234567890123456) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1234567890123456) } } ElseIf ((Local0 != 0x12345678)) { - ERR ("", ZFFF, 0x04DD, 0x00, 0x00, Local0, 0x12345678) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } CH03 ("", 0x00, 0x03B0, 0x04E1, 0x00) @@ -1423,12 +1423,12 @@ { If ((Local0 != 0x1234567890123456)) { - ERR ("", ZFFF, 0x04E5, 0x00, 0x00, Local0, 0x1234567890123456) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1234567890123456) } } ElseIf ((Local0 != 0x12345678)) { - ERR ("", ZFFF, 0x04E9, 0x00, 0x00, Local0, 0x12345678) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } CH03 ("", 0x00, 0x03B3, 0x04ED, 0x00) @@ -1437,12 +1437,12 @@ { If ((Local0 != 0x1234567890123456)) { - ERR ("", ZFFF, 0x04F1, 0x00, 0x00, Local0, 0x1234567890123456) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1234567890123456) } } ElseIf ((Local0 != 0x12345678)) { - ERR ("", ZFFF, 0x04F5, 0x00, 0x00, Local0, 0x12345678) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } CH03 ("", 0x00, 0x03B6, 0x04F9, 0x00) @@ -1451,12 +1451,12 @@ { If ((Local0 != 0x1234567890123456)) { - ERR ("", ZFFF, 0x04FD, 0x00, 0x00, Local0, 0x1234567890123456) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1234567890123456) } } ElseIf ((Local0 != 0x12345678)) { - ERR ("", ZFFF, 0x0501, 0x00, 0x00, Local0, 0x12345678) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } } @@ -1468,12 +1468,12 @@ { If ((Local0 != 0x1844674407370955)) { - ERR ("", ZFFF, 0x050B, 0x00, 0x00, Local0, 0x1844674407370955) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1844674407370955) } } ElseIf ((Local0 != 0x18446744)) { - ERR ("", ZFFF, 0x050F, 0x00, 0x00, Local0, 0x18446744) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x18446744) } CH03 ("", 0x00, 0x03BB, 0x0513, 0x00) @@ -1482,12 +1482,12 @@ { If ((Local0 != 0x1844674407370955)) { - ERR ("", ZFFF, 0x0517, 0x00, 0x00, Local0, 0x1844674407370955) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1844674407370955) } } ElseIf ((Local0 != 0x18446744)) { - ERR ("", ZFFF, 0x051B, 0x00, 0x00, Local0, 0x18446744) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x18446744) } CH03 ("", 0x00, 0x03BE, 0x051F, 0x00) @@ -1496,12 +1496,12 @@ { If ((Local0 != 0x1844674407370955)) { - ERR ("", ZFFF, 0x0523, 0x00, 0x00, Local0, 0x1844674407370955) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1844674407370955) } } ElseIf ((Local0 != 0x18446744)) { - ERR ("", ZFFF, 0x0527, 0x00, 0x00, Local0, 0x18446744) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x18446744) } CH03 ("", 0x00, 0x03C1, 0x052B, 0x00) @@ -1510,12 +1510,12 @@ { If ((Local0 != 0x1844674407370955)) { - ERR ("", ZFFF, 0x052F, 0x00, 0x00, Local0, 0x1844674407370955) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1844674407370955) } } ElseIf ((Local0 != 0x18446744)) { - ERR ("", ZFFF, 0x0533, 0x00, 0x00, Local0, 0x18446744) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x18446744) } CH03 ("", 0x00, 0x03C4, 0x0537, 0x00) @@ -1524,12 +1524,12 @@ { If ((Local0 != 0x1844674407370955)) { - ERR ("", ZFFF, 0x053B, 0x00, 0x00, Local0, 0x1844674407370955) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1844674407370955) } } ElseIf ((Local0 != 0x18446744)) { - ERR ("", ZFFF, 0x053F, 0x00, 0x00, Local0, 0x18446744) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x18446744) } /* 12. "0x12345678901234567" (hex image exceeding maximal) */ @@ -1538,7 +1538,7 @@ Local0 = ("\t\t0000000000x12345678901234567" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x0547, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } /* 13. "0x00000000000001234" (hex image exceeding maximal; no matter that zeros) */ @@ -1547,14 +1547,14 @@ Local0 = (" 0000000000x00000000000001234" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x054E, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } CH03 ("", 0x00, 0x03CC, 0x0551, 0x00) Local0 = (" \t\t0000000000x0000000000000000000001234" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x0554, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } /* 14. "0x123456789" (hex image exceeding maximal; for 32-bit mode only) */ @@ -1565,7 +1565,7 @@ Local0 = ("0x123456789" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x055C, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } } @@ -1575,14 +1575,14 @@ Local0 = ("\t0000000000x" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x0564, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } CH03 ("", 0x00, 0x03D2, 0x0566, 0x00) Local0 = (" 0000000000x" + 0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x056A, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } CH03 ("", 0x00, 0x03D4, 0x056C, 0x00) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0063/Misc.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0063/Misc.asl index b0a1d62d7..6b8c27ad3 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0063/Misc.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0063/Misc.asl @@ -87,7 +87,7 @@ Local0 = ("12345678" + 0x11111111) If ((Local0 != 0x23456789)) { - ERR ("", ZFFF, 0x5E, 0x00, 0x00, Local0, 0x23456789) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x23456789) } /* 8 hex */ @@ -95,7 +95,7 @@ Local0 = ("abcdefab" + 0x11111111) If ((Local0 != 0xBCDF00BC)) { - ERR ("", ZFFF, 0x64, 0x00, 0x00, Local0, 0xBCDF00BC) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xBCDF00BC) } /* 16 decimal */ @@ -103,7 +103,7 @@ Local0 = ("1234567890876543" + 0x1111111111111111) If ((Local0 != 0x23456789A1987654)) { - ERR ("", ZFFF, 0x6A, 0x00, 0x00, Local0, 0x23456789A1987654) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x23456789A1987654) } /* 16 hex */ @@ -111,7 +111,7 @@ Local0 = ("abcdefababcdfead" + 0x1111111111111111) If ((Local0 != 0xBCDF00BCBCDF0FBE)) { - ERR ("", ZFFF, 0x70, 0x00, 0x00, Local0, 0xBCDF00BCBCDF0FBE) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xBCDF00BCBCDF0FBE) } /* 17 hex */ @@ -119,7 +119,7 @@ Local0 = ("1234567890123456z" + 0x1111111111111111) If ((Local0 != 0x23456789A1234567)) { - ERR ("", ZFFF, 0x76, 0x00, 0x00, Local0, 0x23456789A1234567) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x23456789A1234567) } /* 17 hex (caused AE_BAD_HEX_CONSTANT, 28.09.2005) */ @@ -127,7 +127,7 @@ Local0 = ("12345678901234560" + 0x1111111111111111) If ((Local0 != 0x23456789A1234567)) { - ERR ("", ZFFF, 0x7C, 0x00, 0x00, Local0, 0x23456789A1234567) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x23456789A1234567) } /* Looks like octal, but should be treated as hex */ @@ -135,7 +135,7 @@ Local0 = ("01111" + 0x2222) If ((Local0 != 0x3333)) { - ERR ("", ZFFF, 0x82, 0x00, 0x00, Local0, 0x3333) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x3333) } /* The first zeros each must be put into value */ @@ -143,31 +143,31 @@ Local0 = ("000010234" + 0x00) If ((Local0 != 0x00010234)) { - ERR ("", ZFFF, 0x89, 0x00, 0x00, Local0, 0x00010234) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00010234) } Local0 = ("000000000000000010234" + 0x00) If ((Local0 != 0x00010234)) { - ERR ("", ZFFF, 0x8E, 0x00, 0x00, Local0, 0x00010234) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00010234) } Local0 = ("00000000000000010234" + 0x00) If ((Local0 != 0x00010234)) { - ERR ("", ZFFF, 0x93, 0x00, 0x00, Local0, 0x00010234) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00010234) } Local0 = ("0000000010234" + 0x00) If ((Local0 != 0x00010234)) { - ERR ("", ZFFF, 0x98, 0x00, 0x00, Local0, 0x00010234) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00010234) } Local0 = ("000000010234" + 0x00) If ((Local0 != 0x00010234)) { - ERR ("", ZFFF, 0x9D, 0x00, 0x00, Local0, 0x00010234) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00010234) } /* Non-complete 4 hex, should be extended with zeros */ @@ -175,7 +175,7 @@ Local0 = ("abcd" + 0x1111) If ((Local0 != 0xBCDE)) { - ERR ("", ZFFF, 0xA3, 0x00, 0x00, Local0, 0xBCDE) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xBCDE) } /* Non-complete 5 decimal, should be extended with zeros */ @@ -183,7 +183,7 @@ Local0 = ("12345" + 0x1111) If ((Local0 != 0x00013456)) { - ERR ("", ZFFF, 0xA9, 0x00, 0x00, Local0, 0x00013456) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00013456) } CH03 (__METHOD__, ZFFF, 0x0100, 0xAC, 0x00) @@ -194,12 +194,12 @@ { If ((Local0 != 0xABCDEF0123456789)) { - ERR ("", ZFFF, 0xB2, 0x00, 0x00, Local0, 0xABCDEF0123456789) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xABCDEF0123456789) } } ElseIf ((Local0 != 0xABCDEF01)) { - ERR ("", ZFFF, 0xB6, 0x00, 0x00, Local0, 0xABCDEF01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xABCDEF01) } CH03 (__METHOD__, ZFFF, 0x0101, 0xBA, 0x00) @@ -210,12 +210,12 @@ { If ((Local0 != 0xABCDEF0123456789)) { - ERR ("", ZFFF, 0xC0, 0x00, 0x00, Local0, 0xABCDEF0123456789) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xABCDEF0123456789) } } ElseIf ((Local0 != 0xABCDEF01)) { - ERR ("", ZFFF, 0xC4, 0x00, 0x00, Local0, 0xABCDEF01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xABCDEF01) } CH03 (__METHOD__, ZFFF, 0x0102, 0xC8, 0x00) @@ -224,7 +224,7 @@ Local0 = ("0x1111" + 0x2222) If ((Local0 != 0x2222)) { - ERR ("", ZFFF, 0xCD, 0x00, 0x00, Local0, 0x2222) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x2222) } CH03 (__METHOD__, ZFFF, 0x0103, 0xD0, 0x00) @@ -233,7 +233,7 @@ Local0 = ("" + 0xDE) If ((Local0 != 0xDE)) { - ERR ("", ZFFF, 0xD5, 0x00, 0x00, Local0, 0xDE) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xDE) } CH03 (__METHOD__, ZFFF, 0x0104, 0xD8, 0x00) @@ -242,7 +242,7 @@ Local0 = (" " + 0x0333) If ((Local0 != 0x0333)) { - ERR ("", ZFFF, 0xDD, 0x00, 0x00, Local0, 0x0333) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x0333) } CH03 (__METHOD__, ZFFF, 0x0105, 0xE0, 0x00) @@ -251,7 +251,7 @@ Local0 = (" " + 0x92) If ((Local0 != 0x92)) { - ERR ("", ZFFF, 0xE5, 0x00, 0x00, Local0, 0x92) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x92) } CH03 (__METHOD__, ZFFF, 0x0106, 0xE8, 0x00) @@ -260,7 +260,7 @@ Local0 = ("k1234567" + 0x01E9) If ((Local0 != 0x01E9)) { - ERR ("", ZFFF, 0xED, 0x00, 0x00, Local0, 0x01E9) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x01E9) } /* Conversion is terminated just by the first symbol (non-hex), single */ @@ -268,7 +268,7 @@ Local0 = ("k" + 0x000000ABCDEF0000) If ((Local0 != 0x000000ABCDEF0000)) { - ERR ("", ZFFF, 0xF3, 0x00, 0x00, Local0, 0x000000ABCDEF0000) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x000000ABCDEF0000) } CH03 (__METHOD__, ZFFF, 0x0107, 0xF6, 0x00) @@ -277,7 +277,7 @@ Local0 = ("0x" + 0x12345678) If ((Local0 != 0x12345678)) { - ERR ("", ZFFF, 0xFB, 0x00, 0x00, Local0, 0x12345678) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } CH03 (__METHOD__, ZFFF, 0x0108, 0xFE, 0x00) @@ -286,7 +286,7 @@ Local0 = ("x" + 0x00BC614E) If ((Local0 != 0x00BC614E)) { - ERR ("", ZFFF, 0x0103, 0x00, 0x00, Local0, 0x00BC614E) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00BC614E) } /* Starts with the special symbol in the hex designation (terminated by x) */ @@ -294,7 +294,7 @@ Local0 = ("x12345" + 0x6F) If ((Local0 != 0x6F)) { - ERR ("", ZFFF, 0x0109, 0x00, 0x00, Local0, 0x6F) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x6F) } /* No one hex, conversion is terminated just by the first symbol Z */ @@ -302,7 +302,7 @@ Local0 = ("ZZZZ" + 0x0001E240) If ((Local0 != 0x0001E240)) { - ERR ("", ZFFF, 0x010F, 0x00, 0x00, Local0, 0x0001E240) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x0001E240) } /* Short <= 8, conversion is terminated by non-hex symbol Z */ @@ -310,7 +310,7 @@ Local0 = ("abcdZZZZ" + 0x11) If ((Local0 != 0xABDE)) { - ERR ("", ZFFF, 0x0115, 0x00, 0x00, Local0, 0xABDE) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xABDE) } /* Short <= 8, hex in the middle (terminated by Z) */ @@ -318,7 +318,7 @@ Local0 = ("ZQ123MMM" + 0x0001E240) If ((Local0 != 0x0001E240)) { - ERR ("", ZFFF, 0x011B, 0x00, 0x00, Local0, 0x0001E240) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x0001E240) } /* Short <= 8, hex at the end (terminated by Z) */ @@ -326,7 +326,7 @@ Local0 = ("ZQMMM123" + 0x0001E240) If ((Local0 != 0x0001E240)) { - ERR ("", ZFFF, 0x0121, 0x00, 0x00, Local0, 0x0001E240) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x0001E240) } /* Long exceeding 16, no one hex */ @@ -334,7 +334,7 @@ Local0 = ("zxswqrrrrrrrrrrrrrrtttttttttttttttttttttttttyyyyyyyyyyyyyyyyyyuuuuuuuuuuuuuuuuuuuuuuu" + 0x7B) If ((Local0 != 0x7B)) { - ERR ("", ZFFF, 0x0127, 0x00, 0x00, Local0, 0x7B) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x7B) } /* Long exceeding 16, hex at the beginning */ @@ -342,7 +342,7 @@ Local0 = ("1234zxswqrrrrrrrrrrrrrrtttttttttttttttttttttttttyyyyyyyyyyyyyyyyyyuuuuuuuuuuuuuuuuuuuuuuu" + 0x53) If ((Local0 != 0x1287)) { - ERR ("", ZFFF, 0x012D, 0x00, 0x00, Local0, 0x1287) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1287) } /* Long exceeding 16, hex everywhere */ @@ -350,7 +350,7 @@ Local0 = ("123z4s5qr6rr7rrrrrrrrr8ttttttt9ttttttattttbttttcyyyydyyeyyyyyyyyuuuuuuuuuuuuuuuuuuuuf" + 0x53) If ((Local0 != 0x0176)) { - ERR ("", ZFFF, 0x0133, 0x00, 0x00, Local0, 0x0176) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x0176) } /* Long exceeding 16, hex at the end */ @@ -358,7 +358,7 @@ Local0 = ("zxswqrrrrrrrrrrrrrrtttttttttttttttttttttttttyyyyyyyyyyyyyyyyyyuuuuuuuuuuuuuuuuuuuuuuu1234" + 0x14D1) If ((Local0 != 0x14D1)) { - ERR ("", ZFFF, 0x0139, 0x00, 0x00, Local0, 0x14D1) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x14D1) } /* Long exceeding 16, hex in the middle inside the possible Integer */ @@ -366,7 +366,7 @@ Local0 = ("zx1234swqrrrrrrrrrrrrrrtttttttttttttttttttttttttyyyyyyyyyyyyyyyyyyuuuuuuuuuuuuuuuuuuuuuuu" + 0x00012321) If ((Local0 != 0x00012321)) { - ERR ("", ZFFF, 0x013F, 0x00, 0x00, Local0, 0x00012321) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00012321) } /* Long exceeding 16, hex in the middle beyond the bounds of the possible Integer */ @@ -374,7 +374,7 @@ Local0 = ("zxswqrrrrrrrrrrrrrrtttttttttttttttttttttttttyyyyyyyyyyyyyyyyyyuuuuuuuuuuuuuuuuuuuuu1234uu" + 0x3021) If ((Local0 != 0x3021)) { - ERR ("", ZFFF, 0x0145, 0x00, 0x00, Local0, 0x3021) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x3021) } CH03 (__METHOD__, ZFFF, 0x0109, 0x0148, 0x00) @@ -385,12 +385,12 @@ { If ((Local0 != 0x1234567890123456)) { - ERR ("", ZFFF, 0x014E, 0x00, 0x00, Local0, 0x1234567890123456) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1234567890123456) } } ElseIf ((Local0 != 0x12345678)) { - ERR ("", ZFFF, 0x0152, 0x00, 0x00, Local0, 0x12345678) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } CH03 (__METHOD__, ZFFF, 0x010A, 0x0156, 0x00) @@ -401,12 +401,12 @@ { If ((Local0 != 0xABCDEFABCDEFABCD)) { - ERR ("", ZFFF, 0x015C, 0x00, 0x00, Local0, 0xABCDEFABCDEFABCD) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xABCDEFABCDEFABCD) } } ElseIf ((Local0 != 0xABCDEFAB)) { - ERR ("", ZFFF, 0x0160, 0x00, 0x00, Local0, 0xABCDEFAB) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xABCDEFAB) } CH03 (__METHOD__, ZFFF, 0x010B, 0x0164, 0x00) @@ -417,12 +417,12 @@ { If ((Local0 != 0x1234567890123456)) { - ERR ("", ZFFF, 0x016A, 0x00, 0x00, Local0, 0x1234567890123456) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1234567890123456) } } ElseIf ((Local0 != 0x12345678)) { - ERR ("", ZFFF, 0x016E, 0x00, 0x00, Local0, 0x12345678) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } CH03 (__METHOD__, ZFFF, 0x010C, 0x0172, 0x00) @@ -433,12 +433,12 @@ { If ((Local0 != 0xABCDEFABCDEFABCD)) { - ERR ("", ZFFF, 0x0178, 0x00, 0x00, Local0, 0xABCDEFABCDEFABCD) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xABCDEFABCDEFABCD) } } ElseIf ((Local0 != 0xABCDEFAB)) { - ERR ("", ZFFF, 0x017C, 0x00, 0x00, Local0, 0xABCDEFAB) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xABCDEFAB) } CH03 (__METHOD__, ZFFF, 0x010D, 0x0180, 0x00) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0064/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0064/DECL.asl index 51234c87f..b464b5c77 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0064/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0064/DECL.asl @@ -36,7 +36,7 @@ Local0 = ("" + 0xABCD0000) If ((Local0 != 0xABCD0000)) { - ERR ("", ZFFF, 0x29, 0x00, 0x00, Local0, 0xABCD0000) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xABCD0000) } CH03 ("", 0x00, 0x02, 0x2B, 0x00) @@ -44,7 +44,7 @@ Local0 = (" " + 0xABCD0001) If ((Local0 != 0xABCD0001)) { - ERR ("", ZFFF, 0x30, 0x00, 0x00, Local0, 0xABCD0001) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xABCD0001) } CH03 ("", 0x00, 0x05, 0x32, 0x00) @@ -60,7 +60,7 @@ Local0 = ("q" + 0xABCD0002) If ((Local0 != 0xABCD0002)) { - ERR ("", ZFFF, 0x41, 0x00, 0x00, Local0, 0xABCD0002) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xABCD0002) } CH03 ("", 0x00, 0x0C, 0x43, 0x00) @@ -68,7 +68,7 @@ Local0 = ("q " + 0xABCD0003) If ((Local0 != 0xABCD0003)) { - ERR ("", ZFFF, 0x48, 0x00, 0x00, Local0, 0xABCD0003) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xABCD0003) } CH03 ("", 0x00, 0x0F, 0x4A, 0x00) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0065/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0065/DECL.asl index a6a5710b2..cc7cb01c2 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0065/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0065/DECL.asl @@ -43,7 +43,7 @@ Local0 = ObjectType (Arg0) If ((Local0 != C009)) { - ERR ("", ZFFF, 0x30, 0x00, 0x00, Local0, C009) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, C009) } } @@ -54,7 +54,7 @@ Local0 = ObjectType (Arg0) If ((Local0 != C00B)) { - ERR ("", ZFFF, 0x3A, 0x00, 0x00, Local0, C00B) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, C00B) } } @@ -65,13 +65,13 @@ Local0 = ObjectType (BF30) If ((Local0 != C016)) { - ERR ("", ZFFF, 0x44, 0x00, 0x00, Local0, C016) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, C016) } Local0 = ObjectType (BF31) If ((Local0 != C016)) { - ERR ("", ZFFF, 0x49, 0x00, 0x00, Local0, C016) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, C016) } MD7E (BF30) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0066/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0066/DECL.asl index 4dedaaf67..9336cfa87 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0066/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0066/DECL.asl @@ -43,7 +43,7 @@ Local0 = ObjectType (Arg0) If ((Local0 != C009)) { - ERR ("", ZFFF, 0x30, 0x00, 0x00, Local0, C009) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, C009) } } @@ -54,7 +54,7 @@ Local0 = ObjectType (Arg0) If ((Local0 != C00B)) { - ERR ("", ZFFF, 0x3A, 0x00, 0x00, Local0, C00B) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, C00B) } } @@ -65,13 +65,13 @@ Local0 = ObjectType (FD00) If ((Local0 != C00D)) { - ERR ("", ZFFF, 0x44, 0x00, 0x00, Local0, C00D) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, C00D) } Local0 = ObjectType (FD01) If ((Local0 != C00D)) { - ERR ("", ZFFF, 0x49, 0x00, 0x00, Local0, C00D) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, C00D) } MD81 (FD00) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0067/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0067/DECL.asl index cbbd0c0d1..ccf69cd18 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0067/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0067/DECL.asl @@ -54,7 +54,7 @@ Local0 = ObjectType (Local7) If ((Local0 != C009)) { - ERR ("", ZFFF, 0x3B, 0x00, 0x00, Local0, C009) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, C009) } /* BufferField converted to Buffer before return */ @@ -63,6 +63,6 @@ Local0 = ObjectType (Local7) If ((Local0 != C00B)) { - ERR ("", ZFFF, 0x43, 0x00, 0x00, Local0, C00B) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, C00B) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0068/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0068/DECL.asl index 9c367c544..a002262b2 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0068/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0068/DECL.asl @@ -54,7 +54,7 @@ Local0 = ObjectType (Local7) If ((Local0 != C009)) { - ERR ("", ZFFF, 0x3B, 0x00, 0x00, Local0, C009) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, C009) } /* FiledUnit converted to Buffer before return */ @@ -63,6 +63,6 @@ Local0 = ObjectType (Local7) If ((Local0 != C00B)) { - ERR ("", ZFFF, 0x43, 0x00, 0x00, Local0, C00B) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, C00B) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0069/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0069/DECL.asl index e0ee5cba4..44aa83234 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0069/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0069/DECL.asl @@ -43,7 +43,7 @@ 0x02 // . })) { - ERR ("", ZFFF, 0x2C, 0x00, 0x00, Local0, Buffer (0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Buffer (0x01) { 0x02 // . }) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0074/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0074/DECL.asl index 086dea0a3..25a7c33fc 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0074/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0074/DECL.asl @@ -46,6 +46,6 @@ } ElseIf ((Ones != 0xFFFFFFFF)) { - ERR ("", ZFFF, 0x30, 0x00, 0x00, Ones, 0xFFFFFFFF) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Ones, 0xFFFFFFFF) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0081/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0081/DECL.asl index aa7c3fe03..2681ffdce 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0081/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0081/DECL.asl @@ -50,7 +50,7 @@ Local0 = ObjectType (ME31) If ((Local0 != C010)) { - ERR ("", ZFFF, 0x37, 0x00, 0x00, Local0, C010) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, C010) } /* Nov. 2012: Method invocation as arg to ObjectType is now illegal */ /* */ diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0084/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0084/DECL.asl index e7b21e123..83c913b72 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0084/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0084/DECL.asl @@ -77,7 +77,7 @@ { If ((I000 != 0xABCD0000)) { - ERR ("", ZFFF, 0x55, 0x00, 0x00, I000, 0xABCD0000) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, 0xABCD0000) } I000 = 0xABCD0001 @@ -89,7 +89,7 @@ { If ((I000 != 0xABCD0001)) { - ERR ("", ZFFF, 0x60, 0x00, 0x00, I000, 0xABCD0001) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, 0xABCD0001) } I000 = 0xABCD0003 @@ -101,7 +101,7 @@ { If ((I000 != 0xABCD0003)) { - ERR ("", ZFFF, 0x6B, 0x00, 0x00, I000, 0xABCD0003) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, 0xABCD0003) } I000 = 0xABCD0005 @@ -113,7 +113,7 @@ { If ((I000 != 0xABCD0005)) { - ERR ("", ZFFF, 0x76, 0x00, 0x00, I000, 0xABCD0005) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, 0xABCD0005) } I000 = 0xABCD0007 @@ -132,7 +132,7 @@ { If ((I000 != 0xABCD0000)) { - ERR ("", ZFFF, 0x88, 0x00, 0x00, I000, 0xABCD0000) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, 0xABCD0000) } I000 = 0xABCD0001 @@ -144,7 +144,7 @@ { If ((I000 != 0xABCD0001)) { - ERR ("", ZFFF, 0x93, 0x00, 0x00, I000, 0xABCD0001) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, 0xABCD0001) } I000 = 0xABCD0003 @@ -156,7 +156,7 @@ { If ((I000 != 0xABCD0003)) { - ERR ("", ZFFF, 0x9E, 0x00, 0x00, I000, 0xABCD0003) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, 0xABCD0003) } I000 = 0xABCD0005 @@ -168,7 +168,7 @@ { If ((I000 != 0xABCD0005)) { - ERR ("", ZFFF, 0xA9, 0x00, 0x00, I000, 0xABCD0005) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, 0xABCD0005) } I000 = 0xABCD0007 @@ -185,7 +185,7 @@ { If ((I000 != 0xABCD0007)) { - ERR ("", ZFFF, 0xB9, 0x00, 0x00, I000, 0xABCD0007) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, 0xABCD0007) } I000 = 0xABCD0008 @@ -197,7 +197,7 @@ { If ((I000 != 0xABCD0008)) { - ERR ("", ZFFF, 0xC4, 0x00, 0x00, I000, 0xABCD0008) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, 0xABCD0008) } I000 = 0xABCD000A @@ -209,7 +209,7 @@ { If ((I000 != 0xABCD000A)) { - ERR ("", ZFFF, 0xCF, 0x00, 0x00, I000, 0xABCD000A) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, 0xABCD000A) } I000 = 0xABCD000C @@ -221,7 +221,7 @@ { If ((I000 != 0xABCD000C)) { - ERR ("", ZFFF, 0xDA, 0x00, 0x00, I000, 0xABCD000C) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, 0xABCD000C) } I000 = 0xABCD000E @@ -238,7 +238,7 @@ { If ((I000 != 0xABCD000E)) { - ERR ("", ZFFF, 0xEA, 0x00, 0x00, I000, 0xABCD000E) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, 0xABCD000E) } I000 = 0xABCD0010 @@ -250,7 +250,7 @@ { If ((I000 != 0xABCD0010)) { - ERR ("", ZFFF, 0xF5, 0x00, 0x00, I000, 0xABCD0010) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, 0xABCD0010) } I000 = 0xABCD0012 @@ -262,7 +262,7 @@ { If ((I000 != 0xABCD0012)) { - ERR ("", ZFFF, 0x0100, 0x00, 0x00, I000, 0xABCD0012) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, 0xABCD0012) } I000 = 0xABCD0014 @@ -274,7 +274,7 @@ { If ((I000 != 0xABCD0014)) { - ERR ("", ZFFF, 0x010B, 0x00, 0x00, I000, 0xABCD0014) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, 0xABCD0014) } I000 = 0xABCD0016 @@ -287,6 +287,6 @@ M002 () If ((I000 != 0xABCD0016)) { - ERR ("", ZFFF, 0x0117, 0x00, 0x00, I000, 0xABCD0016) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, 0xABCD0016) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0088/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0088/DECL.asl index 3aaba1431..432c8d0af 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0088/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0088/DECL.asl @@ -48,7 +48,7 @@ If ((Local0 != 0x01)) { - ERR ("", ZFFF, 0x31, 0x00, 0x00, Local0, 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x01) } } @@ -75,7 +75,7 @@ If ((Local0 != 0x01)) { - ERR ("", ZFFF, 0x43, 0x00, 0x00, Local0, 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x01) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0092/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0092/DECL.asl index 433aea816..6b8ddcfe9 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0092/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0092/DECL.asl @@ -50,7 +50,7 @@ Local0 = DerefOf (P000 [0x05]) If ((Local0 != 0x06)) { - ERR ("", ZFFF, 0x2E, 0x00, 0x00, Local0, 0x06) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x06) } CH03 ("", 0x00, 0x02, 0x30, 0x00) @@ -75,7 +75,7 @@ Local0 = DerefOf (Local1) If ((Local0 != 0x06)) { - ERR ("", ZFFF, 0x3A, 0x00, 0x00, Local0, 0x06) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x06) } CH03 ("", 0x00, 0x05, 0x3C, 0x00) @@ -103,7 +103,7 @@ { If ((Local0 != 0x06)) { - ERR ("", ZFFF, 0x46, 0x00, 0x00, Local0, 0x06) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x06) } CH03 ("", 0x00, 0x09, 0x48, 0x00) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0093/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0093/DECL.asl index 6be763add..e495c84dd 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0093/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0093/DECL.asl @@ -43,7 +43,7 @@ Local0 = DerefOf (B000 [0x05]) If ((Local0 != 0x42)) { - ERR ("", ZFFF, 0x2E, 0x00, 0x00, Local0, 0x42) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x42) } CH03 ("", 0x00, 0x02, 0x30, 0x00) @@ -61,7 +61,7 @@ Local0 = DerefOf (Local1) If ((Local0 != 0x42)) { - ERR ("", ZFFF, 0x3B, 0x00, 0x00, Local0, 0x42) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x42) } CH03 ("", 0x00, 0x05, 0x3D, 0x00) @@ -82,7 +82,7 @@ { If ((Local0 != 0x42)) { - ERR ("", ZFFF, 0x48, 0x00, 0x00, Local0, 0x42) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x42) } CH03 ("", 0x00, 0x09, 0x4A, 0x00) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0094/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0094/DECL.asl index d02075616..15448d12b 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0094/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0094/DECL.asl @@ -40,7 +40,7 @@ Local0 = DerefOf (S000 [0x05]) If ((Local0 != 0x75)) { - ERR ("", ZFFF, 0x2E, 0x00, 0x00, Local0, 0x75) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x75) } CH03 ("", 0x00, 0x02, 0x30, 0x00) @@ -55,7 +55,7 @@ Local0 = DerefOf (Local1) If ((Local0 != 0x75)) { - ERR ("", ZFFF, 0x3B, 0x00, 0x00, Local0, 0x75) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x75) } CH03 ("", 0x00, 0x05, 0x3D, 0x00) @@ -73,7 +73,7 @@ { If ((Local0 != 0x75)) { - ERR ("", ZFFF, 0x48, 0x00, 0x00, Local0, 0x75) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x75) } CH03 ("", 0x00, 0x09, 0x4A, 0x00) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0101/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0101/DECL.asl index 5815f8db1..70d5c0709 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0101/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0101/DECL.asl @@ -42,7 +42,7 @@ Local1 = ObjectType (Local0) If ((Local1 != C010)) { - ERR ("", ZFFF, 0x2F, 0x00, 0x00, Local1, C010) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, C010) } Return (0x00) @@ -64,7 +64,7 @@ Debug = Local1 If ((Local1 != C010)) { - ERR ("", ZFFF, 0x46, 0x00, 0x00, Local1, C010) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, C010) } Debug = "Finish of test" diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0103/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0103/DECL.asl index 6d208dbff..ecc2e6860 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0103/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0103/DECL.asl @@ -67,11 +67,11 @@ ME66 () If (ID0D) { - ERR ("", ZFFF, 0x41, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } If (ID0E) { - ERR ("", ZFFF, 0x45, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0104/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0104/DECL.asl index 496f1e8ec..ad80fa008 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0104/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0104/DECL.asl @@ -41,7 +41,7 @@ Debug = Local1 If ((Local1 != C008)) { - ERR ("", ZFFF, 0x33, 0x00, 0x00, Local1, C008) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, C008) } Debug = "Finish of test" diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0105/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0105/DECL.asl index 7de736ff5..7a3fa5647 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0105/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0105/DECL.asl @@ -40,7 +40,7 @@ Debug = Local1 If ((Local1 != C010)) { - ERR ("", ZFFF, 0x31, 0x00, 0x00, Local1, C010) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, C010) } Debug = "Finish of test" diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0106/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0106/DECL.asl index 6c1baacb5..945d16cc0 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0106/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0106/DECL.asl @@ -40,6 +40,6 @@ Debug = Local2 If ((Local2 != C018)) { - ERR ("", ZFFF, 0x30, 0x00, 0x00, Local2, C018) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local2, C018) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0107/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0107/DECL.asl index 2d6a1b7a1..d98bdfdeb 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0107/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0107/DECL.asl @@ -36,7 +36,7 @@ Debug = Local0 If ((Local0 != Ones)) { - ERR ("", ZFFF, 0x29, 0x00, 0x00, Local0, Ones) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Ones) } } @@ -46,7 +46,7 @@ Debug = Local0 If ((Local0 != 0x1235)) { - ERR ("", ZFFF, 0x33, 0x00, 0x00, Local0, 0x1235) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1235) } } @@ -56,7 +56,7 @@ Debug = Local0 If ((Local0 != 0xFFFFFFFFFFFFEDCB)) { - ERR ("", ZFFF, 0x3C, 0x00, 0x00, Local0, 0xFFFFFFFFFFFFEDCB) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xFFFFFFFFFFFFEDCB) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0111/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0111/DECL.asl index ee3536bd3..1e9e0a99e 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0111/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0111/DECL.asl @@ -68,7 +68,7 @@ ME73 ("1") If (!ID0F) { - ERR ("", ZFFF, 0x43, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } ID0F = 0x00 @@ -78,14 +78,14 @@ }) If (!ID0F) { - ERR ("", ZFFF, 0x49, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } ID0F = 0x00 ME73 ("0") If (ID0F) { - ERR ("", ZFFF, 0x4F, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } ID0F = 0x00 @@ -95,7 +95,7 @@ }) If (ID0F) { - ERR ("", ZFFF, 0x55, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } /* ////////// */ @@ -104,7 +104,7 @@ ME74 ("1", 0x00) If ((ID0F != 0x02)) { - ERR ("", ZFFF, 0x5D, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } ID0F = 0x00 @@ -114,14 +114,14 @@ }, 0x00) If ((ID0F != 0x02)) { - ERR ("", ZFFF, 0x63, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } ID0F = 0x00 ME74 ("0", 0x00) If (ID0F) { - ERR ("", ZFFF, 0x69, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } ID0F = 0x00 @@ -131,14 +131,14 @@ }, 0x00) If (ID0F) { - ERR ("", ZFFF, 0x6F, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } ID0F = 0x00 ME74 ("1", 0x01) If ((ID0F != 0x01)) { - ERR ("", ZFFF, 0x75, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } ID0F = 0x00 @@ -148,14 +148,14 @@ }, 0x01) If ((ID0F != 0x01)) { - ERR ("", ZFFF, 0x7B, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } ID0F = 0x00 ME75 ("0") If (ID0F) { - ERR ("", ZFFF, 0x81, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } ID0F = 0x00 @@ -165,14 +165,14 @@ }) If (ID0F) { - ERR ("", ZFFF, 0x87, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } ID0F = 0x00 ME75 ("01") If (!ID0F) { - ERR ("", ZFFF, 0x8D, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } ID0F = 0x00 @@ -182,6 +182,6 @@ }) If (!ID0F) { - ERR ("", ZFFF, 0x93, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0115/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0115/DECL.asl index bdaa3783d..66f938c8c 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0115/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0115/DECL.asl @@ -89,7 +89,7 @@ ME7E (ME85 (), Local0) If ((ID10 != Local0)) { - ERR ("", ZFFF, 0x55, 0x00, 0x00, ID10, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, ID10, Local0) } /* To show: all methods return Index references (Ok) */ @@ -111,7 +111,7 @@ Local1 = DerefOf (PD04 [0x00]) If ((Local1 != Local0)) { - ERR ("", ZFFF, 0x6A, 0x00, 0x00, Local1, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, Local0) } Local0 = 0xABCD0002 @@ -119,7 +119,7 @@ Local1 = DerefOf (PD05 [0x00]) If ((Local1 != Local0)) { - ERR ("", ZFFF, 0x71, 0x00, 0x00, Local1, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, Local0) } Local0 = 0xABCD0003 @@ -127,7 +127,7 @@ Local1 = DerefOf (PD06 [0x00]) If ((Local1 != Local0)) { - ERR ("", ZFFF, 0x78, 0x00, 0x00, Local1, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, Local0) } Local0 = 0xABCD0004 @@ -135,7 +135,7 @@ Local1 = DerefOf (PD07 [0x00]) If ((Local1 != Local0)) { - ERR ("", ZFFF, 0x7F, 0x00, 0x00, Local1, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, Local0) } Local0 = 0xABCD0005 @@ -143,7 +143,7 @@ Local1 = DerefOf (PD08 [0x00]) If ((Local1 != Local0)) { - ERR ("", ZFFF, 0x86, 0x00, 0x00, Local1, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, Local0) } Local0 = 0xABCD0006 @@ -151,6 +151,6 @@ Local1 = DerefOf (PD09 [0x00]) If ((Local1 != Local0)) { - ERR ("", ZFFF, 0x8D, 0x00, 0x00, Local1, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, Local0) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0117/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0117/DECL.asl index 07d5ba3cc..c20442cbf 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0117/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0117/DECL.asl @@ -40,11 +40,11 @@ Debug = "Modification of the copied string" If ((Local0 != "Strang")) { - ERR ("", ZFFF, 0x30, 0x00, 0x00, Local0, "Strang") + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, "Strang") } If ((S000 != "String")) { - ERR ("", ZFFF, 0x33, 0x00, 0x00, S000, "String") + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, S000, "String") } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0118/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0118/DECL.asl index c3b03b514..0aee035f4 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0118/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0118/DECL.asl @@ -55,26 +55,26 @@ Local5 = (Local1 + 0x79) If ((Local4 != C009)) { - ERR ("", ZFFF, 0x41, 0x00, 0x00, Local4, C009) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local4, C009) } ElseIf ((Local5 != 0xAAAA0279)) { - ERR ("", ZFFF, 0x43, 0x00, 0x00, Local5, 0xAAAA0279) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local5, 0xAAAA0279) } If ((I000 != 0xAAAA0300)) { - ERR ("", ZFFF, 0x47, 0x00, 0x00, I000, 0xAAAA0300) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, 0xAAAA0300) } If ((Local2 != C009)) { - ERR ("", ZFFF, 0x4B, 0x00, 0x00, Local2, C009) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local2, C009) } If ((Local3 != C009)) { - ERR ("", ZFFF, 0x4F, 0x00, 0x00, Local3, C009) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local3, C009) } CH03 ("", 0x00, 0x05, 0x52, 0x00) @@ -108,26 +108,26 @@ II05 = (II01 + 0x79) If ((II04 != C009)) { - ERR ("", ZFFF, 0x76, 0x00, 0x00, II04, C009) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, II04, C009) } ElseIf ((II05 != 0xAAAA0279)) { - ERR ("", ZFFF, 0x78, 0x00, 0x00, II05, 0xAAAA0279) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, II05, 0xAAAA0279) } If ((I000 != 0xAAAA0300)) { - ERR ("", ZFFF, 0x7C, 0x00, 0x00, I000, 0xAAAA0300) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, 0xAAAA0300) } If ((II02 != C009)) { - ERR ("", ZFFF, 0x80, 0x00, 0x00, II02, C009) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, II02, C009) } If ((II03 != C009)) { - ERR ("", ZFFF, 0x84, 0x00, 0x00, II03, C009) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, II03, C009) } CH03 ("", 0x00, 0x0C, 0x87, 0x00) @@ -159,26 +159,26 @@ II05 = (II01 + 0x79) If ((II04 != C009)) { - ERR ("", ZFFF, 0xA9, 0x00, 0x00, II04, C009) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, II04, C009) } ElseIf ((II05 != 0xAAAA0279)) { - ERR ("", ZFFF, 0xAB, 0x00, 0x00, II05, 0xAAAA0279) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, II05, 0xAAAA0279) } If ((I000 != 0xAAAA0300)) { - ERR ("", ZFFF, 0xAF, 0x00, 0x00, I000, 0xAAAA0300) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, 0xAAAA0300) } If ((II02 != C009)) { - ERR ("", ZFFF, 0xB3, 0x00, 0x00, II02, C009) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, II02, C009) } If ((II03 != C009)) { - ERR ("", ZFFF, 0xB7, 0x00, 0x00, II03, C009) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, II03, C009) } CH03 ("", 0x00, 0x13, 0xBA, 0x00) @@ -193,11 +193,11 @@ Local0 = ObjectType (Local1) If ((Local0 != C009)) { - ERR ("", ZFFF, 0xC6, 0x00, 0x00, Local0, C009) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, C009) } ElseIf ((Local1 != 0xFE7CB391D650A284)) { - ERR ("", ZFFF, 0xC9, 0x00, 0x00, Local1, 0xFE7CB391D650A284) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, 0xFE7CB391D650A284) } } @@ -210,7 +210,7 @@ Local0 = ObjectType (Local1) If ((Local0 != C016)) { - ERR ("", ZFFF, 0xD7, 0x00, 0x00, Local0, C016) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, C016) } Else { @@ -224,7 +224,7 @@ { If ((Local1 != 0x59)) { - ERR ("", ZFFF, 0xE1, 0x00, 0x00, Local1, 0x59) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, 0x59) } } } @@ -239,7 +239,7 @@ Local0 = ObjectType (Local1) If ((Local0 != C00D)) { - ERR ("", ZFFF, 0xF0, 0x00, 0x00, Local0, C00D) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, C00D) } Else { @@ -253,7 +253,7 @@ { If ((Local1 != 0x00)) { - ERR ("", ZFFF, 0xFB, 0x00, 0x00, Local1, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, 0x00) } } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0119/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0119/DECL.asl index d5fc91995..951421cbb 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0119/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0119/DECL.asl @@ -39,13 +39,13 @@ } Else { - ERR ("", ZFFF, 0x29, 0x00, 0x00, Local0, Ones) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Ones) } Local1 = (0xFFFFFFFF < 0x0000000100000000) If (Local1) { - ERR ("", ZFFF, 0x2E, 0x00, 0x00, Local1, Zero) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, Zero) } Else { diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0120/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0120/DECL.asl index 30ece167f..ff3bdddec 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0120/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0120/DECL.asl @@ -42,7 +42,7 @@ Local1 = ObjectType (Local0) If ((Local1 != C014)) { - ERR ("", ZFFF, 0x2C, 0x00, 0x00, Local1, C014) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, C014) } } @@ -58,7 +58,7 @@ Local1 = ObjectType (Local0) If ((Local1 != C012)) { - ERR ("", ZFFF, 0x39, 0x00, 0x00, Local1, C012) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, C012) } } @@ -74,7 +74,7 @@ Local1 = ObjectType (Local0) If ((Local1 != C013)) { - ERR ("", ZFFF, 0x46, 0x00, 0x00, Local1, C013) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, C013) } } @@ -90,7 +90,7 @@ Local1 = ObjectType (Local0) If ((Local1 != C00F)) { - ERR ("", ZFFF, 0x53, 0x00, 0x00, Local1, C00F) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, C00F) } } @@ -106,7 +106,7 @@ Local1 = ObjectType (Local0) If ((Local1 != C011)) { - ERR ("", ZFFF, 0x60, 0x00, 0x00, Local1, C011) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, C011) } } @@ -125,7 +125,7 @@ Local1 = ObjectType (Local0) If ((Local1 != C00E)) { - ERR ("", ZFFF, 0x72, 0x00, 0x00, Local1, C00E) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, C00E) } } @@ -144,6 +144,6 @@ Local1 = ObjectType (Local0) If ((Local1 != C015)) { - ERR ("", ZFFF, 0x84, 0x00, 0x00, Local1, C015) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, C015) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0125/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0125/DECL.asl index a35d2e409..98c84a92a 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0125/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0125/DECL.asl @@ -42,7 +42,7 @@ Mid (Arg1, Arg2, Arg3, Local0) If ((Arg4 != Local0)) { - ERR ("", ZFFF, 0x30, 0x00, 0x00, Arg4, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Arg4, Local0) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0126/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0126/DECL.asl index 0a3568161..7a72ddcf8 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0126/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0126/DECL.asl @@ -37,12 +37,12 @@ Local7 = (Local0 + 0x01) If ((Local0 != 0x07)) { - ERR ("", ZFFF, 0x2C, 0x00, 0x00, Local0, 0x07) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x07) } If ((Local7 != 0x08)) { - ERR ("", ZFFF, 0x2F, 0x00, 0x00, Local7, 0x08) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local7, 0x08) } Debug = "m000 finished" @@ -55,12 +55,12 @@ Local7 = (Arg0 + 0x01) If ((Arg0 != 0x07)) { - ERR ("", ZFFF, 0x3E, 0x00, 0x00, Arg0, 0x07) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Arg0, 0x07) } If ((Local7 != 0x08)) { - ERR ("", ZFFF, 0x41, 0x00, 0x00, Arg0, 0x08) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Arg0, 0x08) } Debug = "m001 finished" diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0128/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0128/DECL.asl index 4a7470b1f..6f8fdc95d 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0128/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0128/DECL.asl @@ -39,7 +39,7 @@ Debug = Local1 If ((Local1 != 0x1234)) { - ERR ("", ZFFF, 0x2C, 0x00, 0x00, Local1, 0x1234) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, 0x1234) } } @@ -58,7 +58,7 @@ Debug = "Before LNotEqual" If ((Local1 != 0x1234)) { - ERR ("", ZFFF, 0x41, 0x00, 0x00, Local1, 0x1234) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, 0x1234) } CH03 ("", 0x00, 0x02, 0x44, 0x00) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0130/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0130/DECL.asl index 77f8e8c48..c0c782356 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0130/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0130/DECL.asl @@ -50,7 +50,7 @@ MF1A (SD04) If ((SD04 != "qwer0000")) { - ERR ("", ZFFF, 0x36, 0x00, 0x00, SD04, "qwer0000") + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, SD04, "qwer0000") } /* Index of Buffer */ @@ -61,7 +61,7 @@ 0x01, 0x77, 0x03, 0x04 // .w.. })) { - ERR ("", ZFFF, 0x3D, 0x00, 0x00, BD08, Buffer (0x04) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, BD08, Buffer (0x04) { 0x01, 0x77, 0x03, 0x04 // .w.. }) @@ -74,6 +74,6 @@ Local1 = DerefOf (Local0) If ((Local1 != 0x77)) { - ERR ("", ZFFF, 0x48, 0x00, 0x00, Local1, 0x77) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, 0x77) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0131/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0131/DECL.asl index 0ec4e984b..f7fa20434 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0131/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0131/DECL.asl @@ -69,7 +69,7 @@ Local0 = DerefOf (P000 [0x00]) If ((Local0 != 0xABCD0001)) { - ERR ("", ZFFF, 0x40, 0x00, 0x00, Local0, 0xABCD0001) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xABCD0001) } /* // Removed 09/2015 diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0132/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0132/DECL.asl index e2acd8820..57c659cd7 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0132/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0132/DECL.asl @@ -38,7 +38,7 @@ CH03 ("", 0x00, 0x01, 0x29, 0x00) If ((Local7 != 0x78)) { - ERR ("", ZFFF, 0x2C, 0x00, 0x00, ID12, 0x05) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, ID12, 0x05) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0133/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0133/DECL.asl index cb0cc3996..78dc24173 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0133/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0133/DECL.asl @@ -43,7 +43,7 @@ MF21 (Local0) If ((ID13 != 0x77)) { - ERR ("", ZFFF, 0x2F, 0x00, 0x00, ID13, 0x77) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, ID13, 0x77) } /* Writing by Index to String */ @@ -52,7 +52,7 @@ MF21 (Local0) If ((SD05 != "qwer0000")) { - ERR ("", ZFFF, 0x37, 0x00, 0x00, SD05, "qwer0000") + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, SD05, "qwer0000") } /* Writing by Index to Buffer */ @@ -64,7 +64,7 @@ 0x01, 0x77, 0x03, 0x04 // .w.. })) { - ERR ("", ZFFF, 0x3F, 0x00, 0x00, BD09, Buffer (0x04) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, BD09, Buffer (0x04) { 0x01, 0x77, 0x03, 0x04 // .w.. }) @@ -78,6 +78,6 @@ Local1 = DerefOf (Local0) If ((Local1 != 0x77)) { - ERR ("", ZFFF, 0x4B, 0x00, 0x00, Local1, 0x77) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, 0x77) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0134/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0134/DECL.asl index 70787697f..1669d5a66 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0134/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0134/DECL.asl @@ -44,7 +44,7 @@ Debug = Local6 If ((Local6 != 0x11)) { - ERR ("", ZFFF, 0x34, 0x00, 0x00, Local6, 0x11) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local6, 0x11) } Debug = "LocalX case of Method finished" @@ -64,7 +64,7 @@ Debug = Arg6 If ((Arg6 != 0x11)) { - ERR ("", ZFFF, 0x4B, 0x00, 0x00, Arg6, 0x11) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Arg6, 0x11) } Debug = "ArgX case (1) of Method finished" @@ -84,7 +84,7 @@ Debug = Arg6 If ((Arg6 != 0x11)) { - ERR ("", ZFFF, 0x62, 0x00, 0x00, Arg6, 0x11) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Arg6, 0x11) } Debug = "ArgX case (2) of Method finished" diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0136/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0136/DECL.asl index c1e20eb43..ac6c76949 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0136/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0136/DECL.asl @@ -45,6 +45,6 @@ CopyObject (B000, B001) /* \MF27.B001 */ If ((B000 != B001)) { - ERR ("", ZFFF, 0x2D, 0x00, 0x00, B000, B001) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, B000, B001) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0137/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0137/DECL.asl index ce4c9c02d..ea63cfb70 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0137/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0137/DECL.asl @@ -40,13 +40,13 @@ Local0 = ObjectType (STR0) If ((Local0 != C009)) { - ERR ("", ZFFF, 0x2D, 0x00, 0x00, Local0, C009) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, C009) } FromBCD (0x12345678, STR1) /* \MF28.STR1 */ Local0 = ObjectType (STR1) If ((Local0 != C009)) { - ERR ("", ZFFF, 0x33, 0x00, 0x00, Local0, C009) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, C009) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0138/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0138/DECL.asl index 0e02fda70..c4794e9bf 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0138/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0138/DECL.asl @@ -43,7 +43,7 @@ /* 0008 */ 0x00 // . })) { - ERR ("", ZFFF, 0x2D, 0x00, 0x00, BF00, Buffer (0x09) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, BF00, Buffer (0x09) { /* 0000 */ 0x10, 0x32, 0x54, 0x76, 0x00, 0x00, 0x00, 0x00, // .2Tv.... /* 0008 */ 0x00 // . diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0139/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0139/DECL.asl index 2814bb778..31a1ed271 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0139/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0139/DECL.asl @@ -36,7 +36,7 @@ { If ((ID1B != 0xFEDCBA9876543210)) { - ERR ("", ZFFF, 0x28, 0x00, 0x00, ID1B, 0xFEDCBA9876543210) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, ID1B, 0xFEDCBA9876543210) } Else { @@ -45,7 +45,7 @@ Local0 = ID1B /* \ID1B */ If ((ID1B != 0xFEDCBA9876543210)) { - ERR ("", ZFFF, 0x31, 0x00, 0x00, ID1B, 0xFEDCBA9876543210) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, ID1B, 0xFEDCBA9876543210) } } } @@ -56,7 +56,7 @@ Local0 = RefOf (ID1C) If ((ID1C != 0xFEDCBA9876543211)) { - ERR ("", ZFFF, 0x3C, 0x00, 0x00, ID1C, 0xFEDCBA9876543211) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, ID1C, 0xFEDCBA9876543211) } Else { @@ -65,7 +65,7 @@ Local1 = DerefOf (Local0) If ((ID1C != 0xFEDCBA9876543211)) { - ERR ("", ZFFF, 0x45, 0x00, 0x00, ID1C, 0xFEDCBA9876543211) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, ID1C, 0xFEDCBA9876543211) } } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0143/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0143/DECL.asl index 55f91c324..47f2bd5df 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0143/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0143/DECL.asl @@ -50,13 +50,13 @@ Local0 = MF30 (0x01, 0x02) If ((Local0 != 0x03)) { - ERR ("", ZFFF, 0x36, 0x00, 0x00, Local0, 0x03) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x03) } Local0 = MF31 ("FFFF") If ((Local0 != "FFFF")) { - ERR ("", ZFFF, 0x3B, 0x00, 0x00, Local0, "FFFF") + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, "FFFF") } Local0 = MF32 (0x03, "F", Buffer (0x01) @@ -65,6 +65,6 @@ }) If ((Local0 != 0x0111)) { - ERR ("", ZFFF, 0x40, 0x00, 0x00, Local0, 0x0111) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x0111) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0144/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0144/DECL.asl index bc42de1eb..d599232e0 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0144/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0144/DECL.asl @@ -55,24 +55,24 @@ Local0 = MF34 (0x00) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x3A, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } Local0 = MF35 (0x01) If ((Local0 != 0x01)) { - ERR ("", ZFFF, 0x3F, 0x00, 0x00, Local0, 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x01) } Local0 = MF36 (0x02) If ((Local0 != 0x02)) { - ERR ("", ZFFF, 0x44, 0x00, 0x00, Local0, 0x02) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x02) } Local0 = MF37 ("3") If ((Local0 != "3")) { - ERR ("", ZFFF, 0x49, 0x00, 0x00, Local0, "3") + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, "3") } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0146/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0146/DECL.asl index 6e8a2f60b..3a8a0a088 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0146/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0146/DECL.asl @@ -61,6 +61,6 @@ }) If ((Local0 != 0x00012389)) { - ERR ("", ZFFF, 0x33, 0x00, 0x00, Local0, 0x00012389) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00012389) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0147/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0147/DECL.asl index 7cc2e1ac9..6d0504a9f 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0147/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0147/DECL.asl @@ -41,6 +41,6 @@ Local0 = MF3C () If ((Local0 != "mf3czxcvbnm")) { - ERR ("", ZFFF, 0x32, 0x00, 0x00, Local0, "mf3czxcvbnm") + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, "mf3czxcvbnm") } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0150/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0150/DECL.asl index 9baa1a9e9..2cfd4a646 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0150/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0150/DECL.asl @@ -56,14 +56,14 @@ Local1 = 0x00 If (Acquire (MX00, 0x0001)) { - ERR ("", ZFFF, 0x3F, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } Else { Local0 = 0x01 If (Acquire (MX01, 0x0001)) { - ERR ("", ZFFF, 0x43, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } Else { @@ -96,7 +96,7 @@ Local1 = 0x00 If (Acquire (MX00, 0x0001)) { - ERR ("", ZFFF, 0x60, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } Else { @@ -130,7 +130,7 @@ Local1 = 0x00 If (Acquire (MX00, 0x0001)) { - ERR ("", ZFFF, 0x7E, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } Else { @@ -164,7 +164,7 @@ Local1 = 0x00 If (Acquire (MX00, 0x0001)) { - ERR ("", ZFFF, 0x9D, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } Else { diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0151/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0151/DECL.asl index e59caa13d..8b3cca812 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0151/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0151/DECL.asl @@ -56,7 +56,7 @@ 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07 // ....... })) { - ERR ("", ZFFF, 0x37, 0x00, 0x00, Local0, Buffer (0x07) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Buffer (0x07) { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07 // ....... }) @@ -76,7 +76,7 @@ 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07 // ....... })) { - ERR ("", ZFFF, 0x46, 0x00, 0x00, Local0, Buffer (0x07) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Buffer (0x07) { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07 // ....... }) @@ -98,7 +98,7 @@ Concatenate (S000, S001, Local0) If ((Local0 != "String1")) { - ERR ("", ZFFF, 0x5C, 0x00, 0x00, Local0, "String1") + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, "String1") } /* 4. */ @@ -112,7 +112,7 @@ Concatenate (Local0, S001, Local0) If ((Local0 != "String1")) { - ERR ("", ZFFF, 0x6B, 0x00, 0x00, Local0, "String1") + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, "String1") } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0154/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0154/DECL.asl index 232d40fef..1c18577ea 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0154/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0154/DECL.asl @@ -46,25 +46,25 @@ Local0 = ObjectType (ID1D) If ((Local0 != C009)) { - ERR ("", ZFFF, 0x32, 0x00, 0x00, Local0, C009) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, C009) } If ((ID1D != 0xFEDCBA9876543210)) { - ERR ("", ZFFF, 0x35, 0x00, 0x00, ID1D, 0xFEDCBA9876543210) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, ID1D, 0xFEDCBA9876543210) } MF43 (ED02) Local0 = ObjectType (ED02) If ((Local0 != C00F)) { - ERR ("", ZFFF, 0x3B, 0x00, 0x00, Local0, C00F) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, C00F) } MF43 (DD0B) Local0 = ObjectType (DD0B) If ((Local0 != C00E)) { - ERR ("", ZFFF, 0x41, 0x00, 0x00, Local0, C00E) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, C00E) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0155/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0155/DECL.asl index 33e611ce5..038a375e1 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0155/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0155/DECL.asl @@ -41,16 +41,16 @@ { If ((ID1F != 0x32)) { - ERR ("", ZFFF, 0x2E, 0x00, 0x00, ID1F, 0x32) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, ID1F, 0x32) } If ((ID20 != 0x08)) { - ERR ("", ZFFF, 0x32, 0x00, 0x00, ID20, 0x08) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, ID20, 0x08) } If ((BFD3 != 0x99)) { - ERR ("", ZFFF, 0x36, 0x00, 0x00, BFD3, 0x99) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, BFD3, 0x99) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0157/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0157/DECL.asl index 3a4836853..3e9fae864 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0157/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0157/DECL.asl @@ -74,7 +74,7 @@ CH03 ("", 0x00, 0x00, 0x44, 0x00) If (("md00.m000" != Local0)) { - ERR ("", ZFFF, 0x47, 0x00, 0x00, Local0, "md00.m000") + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, "md00.m000") } /* Function */ @@ -85,7 +85,7 @@ CH03 ("", 0x00, 0x02, 0x53, 0x00) If (("md00.mm00" != Local0)) { - ERR ("", ZFFF, 0x56, 0x00, 0x00, Local0, "md00.mm00") + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, "md00.mm00") } CH03 ("", 0x00, 0x04, 0x59, 0x00) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0161/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0161/DECL.asl index 1468e63f4..e6f88d83c 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0161/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0161/DECL.asl @@ -37,12 +37,12 @@ { If ((BF32 != 0x14)) { - ERR ("", ZFFF, 0x2A, 0x00, 0x00, BF32, 0x14) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, BF32, 0x14) } If ((BF33 != 0x1615)) { - ERR ("", ZFFF, 0x2D, 0x00, 0x00, BF33, 0x1615) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, BF33, 0x1615) } } @@ -50,12 +50,12 @@ { If ((BF34 != 0x18)) { - ERR ("", ZFFF, 0x34, 0x00, 0x00, BF34, 0x18) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, BF34, 0x18) } If ((BF35 != 0x19)) { - ERR ("", ZFFF, 0x37, 0x00, 0x00, BF35, 0x19) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, BF35, 0x19) } } @@ -63,12 +63,12 @@ { If ((BF36 != 0x1A)) { - ERR ("", ZFFF, 0x3E, 0x00, 0x00, BF36, 0x1A) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, BF36, 0x1A) } If ((BF37 != 0x1C1B)) { - ERR ("", ZFFF, 0x41, 0x00, 0x00, BF37, 0x1C1B) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, BF37, 0x1C1B) } } @@ -80,12 +80,12 @@ CreateField (BD02, 0x28, (ID03 + 0x08), BF33) If ((BF32 != 0x14)) { - ERR ("", ZFFF, 0x4D, 0x00, 0x00, BF32, 0x14) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, BF32, 0x14) } If ((BF33 != 0x1615)) { - ERR ("", ZFFF, 0x50, 0x00, 0x00, BF33, 0x1615) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, BF33, 0x1615) } } @@ -95,12 +95,12 @@ CreateField (BD02, (ID04 + 0x08), 0x08, BF35) If ((BF34 != 0x18)) { - ERR ("", ZFFF, 0x5A, 0x00, 0x00, BF34, 0x18) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, BF34, 0x18) } If ((BF35 != 0x19)) { - ERR ("", ZFFF, 0x5D, 0x00, 0x00, BF35, 0x19) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, BF35, 0x19) } } @@ -110,12 +110,12 @@ CreateField (BD02, (ID07 + 0x08), (ID08 + 0x08), BF37) If ((BF36 != 0x1A)) { - ERR ("", ZFFF, 0x67, 0x00, 0x00, BF36, 0x1A) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, BF36, 0x1A) } If ((BF37 != 0x1C1B)) { - ERR ("", ZFFF, 0x6A, 0x00, 0x00, BF37, 0x1C1B) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, BF37, 0x1C1B) } } @@ -127,12 +127,12 @@ CreateField (BD03, 0x28, (ID03 + 0x08), BF33) If ((BF32 != 0x14)) { - ERR ("", ZFFF, 0x76, 0x00, 0x00, BF32, 0x14) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, BF32, 0x14) } If ((BF33 != 0x1615)) { - ERR ("", ZFFF, 0x79, 0x00, 0x00, BF33, 0x1615) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, BF33, 0x1615) } } @@ -142,12 +142,12 @@ CreateField (BD03, (ID04 + 0x08), 0x08, BF35) If ((BF34 != 0x18)) { - ERR ("", ZFFF, 0x83, 0x00, 0x00, BF34, 0x18) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, BF34, 0x18) } If ((BF35 != 0x19)) { - ERR ("", ZFFF, 0x86, 0x00, 0x00, BF35, 0x19) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, BF35, 0x19) } } @@ -157,12 +157,12 @@ CreateField (BD03, (ID07 + 0x08), (ID08 + 0x08), BF37) If ((BF36 != 0x1A)) { - ERR ("", ZFFF, 0x90, 0x00, 0x00, BF36, 0x1A) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, BF36, 0x1A) } If ((BF37 != 0x1C1B)) { - ERR ("", ZFFF, 0x93, 0x00, 0x00, BF37, 0x1C1B) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, BF37, 0x1C1B) } } @@ -174,39 +174,39 @@ }) If ((Arg0 != 0x01)) { - ERR ("", ZFFF, 0x9C, 0x00, 0x00, Arg0, 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Arg0, 0x01) } If ((Arg1 != 0x5D)) { - ERR ("", ZFFF, 0x9F, 0x00, 0x00, Arg1, 0x5D) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Arg1, 0x5D) } If ((Arg2 != 0x125D)) { - ERR ("", ZFFF, 0xA2, 0x00, 0x00, Arg2, 0x125D) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Arg2, 0x125D) } If ((Arg3 != 0x1413125D)) { - ERR ("", ZFFF, 0xA5, 0x00, 0x00, Arg3, 0x1413125D) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Arg3, 0x1413125D) } If (F64) { If ((Arg4 != 0x181716151413125D)) { - ERR ("", ZFFF, 0xAA, 0x00, 0x00, Arg4, 0x181716151413125D) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Arg4, 0x181716151413125D) } } ElseIf ((Arg4 != B000)) { - ERR ("", ZFFF, 0xAE, 0x00, 0x00, Arg4, B000) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Arg4, B000) } If ((Arg5 != 0x5D)) { - ERR ("", ZFFF, 0xB3, 0x00, 0x00, Arg5, 0x5D) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Arg5, 0x5D) } } @@ -214,12 +214,12 @@ { If ((Arg0 != 0x5D)) { - ERR ("", ZFFF, 0xBA, 0x00, 0x00, Arg0, 0x5D) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Arg0, 0x5D) } If ((Arg1 != 0x5D)) { - ERR ("", ZFFF, 0xBD, 0x00, 0x00, Arg1, 0x5D) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Arg1, 0x5D) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0162/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0162/DECL.asl index 4044bcc85..b2c139375 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0162/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0162/DECL.asl @@ -68,6 +68,6 @@ */ If (ID01) { - ERR ("", ZFFF, 0x47, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0167/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0167/DECL.asl index f9a48bcc4..0e1c389d8 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0167/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0167/DECL.asl @@ -311,7 +311,7 @@ Local0 = SizeOf (P000) If ((Local0 != 0x0100)) { - ERR ("", ZFFF, 0x4D, 0x00, 0x00, Local0, 0x0100) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x0100) } Else { @@ -322,7 +322,7 @@ Local3 = DerefOf (P000 [Local2]) If ((Local3 != Local1)) { - ERR ("", ZFFF, 0x54, 0x00, 0x00, Local3, Local1) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local3, Local1) Break } @@ -383,13 +383,13 @@ MM00 (0x00) If ((I000 != 0x01)) { - ERR ("", ZFFF, 0x87, 0x00, 0x00, I000, 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, 0x01) } I000 = 0x00 MM00 (0x01) If ((I000 != 0x02)) { - ERR ("", ZFFF, 0x8D, 0x00, 0x00, I000, 0x02) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, 0x02) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0169/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0169/DECL.asl index e31a1e7e5..2060cb33a 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0169/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0169/DECL.asl @@ -35,24 +35,24 @@ Local0 = (0xFFFFFFFFFFFFFFFF << 0x40) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x27, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } Local0 = (0xFFFFFFFFFFFFFFFF << 0x41) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x2B, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } Local0 = (0xFFFFFFFFFFFFFFFF >> 0x40) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x2F, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } Local0 = (0xFFFFFFFFFFFFFFFF >> 0x41) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x33, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0170/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0170/DECL.asl index 8728b16de..882795fbe 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0170/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0170/DECL.asl @@ -42,7 +42,7 @@ Local0 = ObjectType (BF90) If ((Local0 != 0x0E)) { - ERR ("", ZFFF, 0x2D, 0x00, 0x00, Local0, 0x0E) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x0E) } Else { @@ -50,11 +50,11 @@ Local1 = ObjectType (BF90) If ((Local1 != Local0)) { - ERR ("", ZFFF, 0x35, 0x00, 0x00, Local1, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, Local0) } ElseIf ((BF90 != 0x2B)) { - ERR ("", ZFFF, 0x37, 0x00, 0x00, BF90, 0x2B) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, BF90, 0x2B) } } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0171_ACTION_REQUIRED/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0171_ACTION_REQUIRED/DECL.asl index b099b7e7d..1bcac5cef 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0171_ACTION_REQUIRED/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0171_ACTION_REQUIRED/DECL.asl @@ -46,12 +46,12 @@ Local0 = ("C179B3FE" == 0xC179B3FE) If ((Local0 != Ones)) { - ERR ("", ZFFF, 0x32, 0x00, 0x00, Local0, Ones) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Ones) } Local0 = (0xC179B3FE == "C179B3FE") If ((Local0 != Ones)) { - ERR ("", ZFFF, 0x37, 0x00, 0x00, Local0, Ones) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Ones) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0174/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0174/DECL.asl index 266435a08..b668fbbb2 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0174/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0174/DECL.asl @@ -34,6 +34,6 @@ { If ((RTD1 != BD0C)) { - ERR ("", ZFFF, 0x26, 0x00, 0x00, RTD1, BD0C) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, RTD1, BD0C) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0179/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0179/DECL.asl index 9a1a48304..7d2d361bb 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0179/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0179/DECL.asl @@ -35,6 +35,6 @@ Local0 = ConcatenateResTemplate (RTD0, RTD0) If ((Local0 != BD0B)) { - ERR ("", ZFFF, 0x28, 0x00, 0x00, Local0, 0x0100) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x0100) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0180_ASL_RUNTIME/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0180_ASL_RUNTIME/DECL.asl index 266c23f74..af660f9ff 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0180_ASL_RUNTIME/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0180_ASL_RUNTIME/DECL.asl @@ -54,7 +54,7 @@ { If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x35, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } } @@ -62,7 +62,7 @@ { If ((Local0 != 0x01)) { - ERR ("", ZFFF, 0x3A, 0x00, 0x00, Local0, 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x01) } } @@ -70,7 +70,7 @@ { If ((Local0 != 0x02)) { - ERR ("", ZFFF, 0x3F, 0x00, 0x00, Local0, 0x02) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x02) } } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0181_ASL_RUNTIME/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0181_ASL_RUNTIME/DECL.asl index 60266d12b..57e149b68 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0181_ASL_RUNTIME/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0181_ASL_RUNTIME/DECL.asl @@ -41,6 +41,6 @@ MM20 (0x01) If ((I000 != 0x20)) { - ERR ("", ZFFF, 0x2A, 0x00, 0x00, I000, 0x20) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, 0x20) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0182/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0182/DECL.asl index 7d0f13e05..d395ed6b6 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0182/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0182/DECL.asl @@ -39,13 +39,13 @@ CH03 ("", 0x00, 0x00, 0x2A, 0x00) If ((ID23 != 0xABCD0000)) { - ERR ("", ZFFF, 0x2D, 0x00, 0x00, ID23, 0xABCD0000) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, ID23, 0xABCD0000) } Name (ID23, 0xABCD0001) If ((ID23 != 0xABCD0001)) { - ERR ("", ZFFF, 0x33, 0x00, 0x00, ID23, 0xABCD0001) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, ID23, 0xABCD0001) } CH03 ("", 0x00, 0x03, 0x36, 0x00) @@ -60,7 +60,7 @@ CH03 ("", 0x00, 0x04, 0x3F, 0x00) If ((I9Z8 != 0xABCD0001)) { - ERR ("", ZFFF, 0x42, 0x00, 0x00, I9Z8, 0xABCD0001) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I9Z8, 0xABCD0001) } Name (I9Z8, 0xABCD0001) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0185/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0185/DECL.asl index 08dc40ff8..3cfa44260 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0185/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0185/DECL.asl @@ -67,7 +67,7 @@ CH03 ("", 0x00, 0x01, 0x48, 0x00) If ((I000 != 0x00)) { - ERR ("", ZFFF, 0x4A, 0x00, 0x00, I000, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, 0x00) } } Else @@ -85,7 +85,7 @@ CH03 ("", 0x00, 0x05, 0x59, 0x00) If ((I000 != 0x00)) { - ERR ("", ZFFF, 0x5B, 0x00, 0x00, I000, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, 0x00) } } Else diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0186/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0186/DECL.asl index a1680480a..05be13b56 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0186/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0186/DECL.asl @@ -95,7 +95,7 @@ If ((I000 != Local0)) { - ERR ("", ZFFF, 0x5B, 0x00, 0x00, I000, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, Local0) } } Else @@ -124,7 +124,7 @@ If ((I000 != Local0)) { - ERR ("", ZFFF, 0x73, 0x00, 0x00, I000, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, Local0) } } Else @@ -153,7 +153,7 @@ If ((I000 != Local0)) { - ERR ("", ZFFF, 0x8B, 0x00, 0x00, I000, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, Local0) } } Else diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0187/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0187/DECL.asl index f54c308b4..544f91c9d 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0187/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0187/DECL.asl @@ -48,7 +48,7 @@ CH03 ("", 0x00, 0x01, 0x35, 0x00) If ((I000 != 0x00)) { - ERR ("", ZFFF, 0x37, 0x00, 0x00, I000, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, 0x00) } } Else diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0188/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0188/DECL.asl index 6a55de827..916917f1d 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0188/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0188/DECL.asl @@ -50,12 +50,12 @@ Local2 = ConcatenateResTemplate (RT00, Local1) If ((Local2 != B000)) { - ERR ("", ZFFF, 0x32, 0x00, 0x00, Local2, B000) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local2, B000) } If ((RT00 != B000)) { - ERR ("", ZFFF, 0x36, 0x00, 0x00, RT00, B000) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, RT00, B000) } CH03 ("", 0x00, 0x03, 0x39, 0x00) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0191/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0191/DECL.asl index 0d6ea43a8..6a39822e2 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0191/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0191/DECL.asl @@ -36,24 +36,24 @@ Local0 = ObjectType (BF90) If ((Local0 != 0x0E)) { - ERR ("", ZFFF, 0x29, 0x00, 0x00, Local0, 0x0E) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x0E) } If ((BF90 != 0x77)) { - ERR ("", ZFFF, 0x2D, 0x00, 0x00, BF90, 0x77) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, BF90, 0x77) } CopyObject (0x9999992B, BF90) /* \MFA3.BF90 */ Local0 = ObjectType (BF90) If ((Local0 != 0x0E)) { - ERR ("", ZFFF, 0x34, 0x00, 0x00, Local0, 0x0E) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x0E) } If ((BF90 != 0x2B)) { - ERR ("", ZFFF, 0x38, 0x00, 0x00, BF90, 0x2B) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, BF90, 0x2B) Debug = BF90 /* \MFA3.BF90 */ } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0192/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0192/DECL.asl index dc7a458e6..322c5086a 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0192/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0192/DECL.asl @@ -38,7 +38,7 @@ { If ((Arg0 != Arg1)) { - ERR ("", ZFFF, 0x29, 0x00, 0x00, Arg0, Arg1) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Arg0, Arg1) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0193/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0193/DECL.asl index 899ebcf44..01bda89d9 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0193/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0193/DECL.asl @@ -65,7 +65,7 @@ } Else { - ERR ("", ZFFF, 0x3C, 0x00, 0x00, BFL1, BD10) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, BFL1, BD10) } /* Optional storing */ @@ -90,7 +90,7 @@ } Else { - ERR ("", ZFFF, 0x4B, 0x00, 0x00, BFL1, BD10) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, BFL1, BD10) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0194/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0194/DECL.asl index b96499de6..9942d565f 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0194/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0194/DECL.asl @@ -78,7 +78,7 @@ ToBuffer (B001, B000) /* \MFA7.B000 */ If (!BCMP (B000, BB01)) { - ERR ("", ZFFF, 0x44, 0x00, 0x00, B000, BB01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, B000, BB01) } } Else @@ -87,7 +87,7 @@ ToBuffer (B000, B001) /* \MFA7.B001 */ If (!BCMP (B001, BB00)) { - ERR ("", ZFFF, 0x4A, 0x00, 0x00, B001, BB00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, B001, BB00) } } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0195/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0195/DECL.asl index 8de51a502..4f35338fa 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0195/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0195/DECL.asl @@ -61,21 +61,21 @@ Local1 = ObjectType (S001) If ((Local0 != Local1)) { - ERR ("", ZFFF, 0x3F, 0x00, 0x00, Local0, Local1) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Local1) } ElseIf ((S000 != S001)) { - ERR ("", ZFFF, 0x41, 0x00, 0x00, S000, S001) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, S000, S001) } If ((Local0 != 0x02)) { - ERR ("", ZFFF, 0x45, 0x00, 0x00, Local0, 0x02) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x02) } If ((Local1 != 0x02)) { - ERR ("", ZFFF, 0x49, 0x00, 0x00, Local1, 0x02) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, 0x02) } B000++ @@ -88,20 +88,20 @@ Local1 = ObjectType (B001) If ((Local0 != Local1)) { - ERR ("", ZFFF, 0x58, 0x00, 0x00, Local0, Local1) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Local1) } ElseIf ((B000 != B001)) { - ERR ("", ZFFF, 0x5A, 0x00, 0x00, B000, B001) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, B000, B001) } If ((Local0 != 0x03)) { - ERR ("", ZFFF, 0x5E, 0x00, 0x00, Local0, 0x03) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x03) } If ((Local1 != 0x03)) { - ERR ("", ZFFF, 0x62, 0x00, 0x00, Local1, 0x03) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, 0x03) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0201_OUTSTAND_ALLOC/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0201_OUTSTAND_ALLOC/DECL.asl index 7e130019b..50560df55 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0201_OUTSTAND_ALLOC/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0201_OUTSTAND_ALLOC/DECL.asl @@ -38,5 +38,5 @@ { Debug = "To be investigated:" Debug = "many Outstanding allocations on Reference ASLTS test run and other ASLTS tests." - ERR ("", ZFFF, 0x2C, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0203/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0203/DECL.asl index 482384e56..24f175466 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0203/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0203/DECL.asl @@ -169,7 +169,7 @@ If ((Local7 != C008)) { - ERR ("", ZFFF, 0x31, 0x00, 0x00, Local7, C008) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local7, C008) } /* or RING_OF_REFS_EXCEPTION? */ } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0210/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0210/DECL.asl index aa3d3cbd7..268710fd7 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0210/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0210/DECL.asl @@ -59,5 +59,5 @@ M001 () Debug = "Fight Outstanding allocations here" - ERR ("", ZFFF, 0x41, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0212/Misc.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0212/Misc.asl index fb20198dd..628bb4081 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0212/Misc.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0212/Misc.asl @@ -382,7 +382,7 @@ CopyObject (DerefOf (IR00), Local0) If ((Local0 != Arg0)) { - ERR ("", ZFFF, 0x017A, 0x00, 0x00, Local0, Arg0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Arg0) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0214/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0214/DECL.asl index 8b2da29a4..f7de996f0 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0214/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0214/DECL.asl @@ -55,27 +55,27 @@ M000 (OPR1) If ((RFU0 != 0x01)) { - ERR ("", ZFFF, 0x3C, 0x00, 0x00, RFU0, 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, RFU0, 0x01) } RFU0 = 0x02 M000 (OPR1) If ((RFU0 != 0x02)) { - ERR ("", ZFFF, 0x42, 0x00, 0x00, RFU0, 0x02) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, RFU0, 0x02) } RFU0 = 0x03 M000 (OPR1) If ((RFU0 != 0x03)) { - ERR ("", ZFFF, 0x48, 0x00, 0x00, RFU0, 0x03) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, RFU0, 0x03) } RFU0 = 0x04 If ((RFU0 != 0x04)) { - ERR ("", ZFFF, 0x4D, 0x00, 0x00, RFU0, 0x04) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, RFU0, 0x04) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0215/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0215/DECL.asl index efeccf504..a262553c9 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0215/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0215/DECL.asl @@ -80,19 +80,19 @@ IDF0 = 0x01 If ((IDF0 != 0x01)) { - ERR ("", ZFFF, 0x4B, 0x00, 0x00, IDF0, 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, IDF0, 0x01) } IDF1 = 0x01 If ((IDF1 != 0x01)) { - ERR ("", ZFFF, 0x50, 0x00, 0x00, IDF1, 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, IDF1, 0x01) } IDF2 = 0x01 If ((IDF2 != 0x01)) { - ERR ("", ZFFF, 0x55, 0x00, 0x00, IDF2, 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, IDF2, 0x01) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0217/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0217/DECL.asl index 38a81ddad..37119f690 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0217/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0217/DECL.asl @@ -43,7 +43,7 @@ OperationRegion (OPR0, SystemMemory, 0x2000, 0x0100) If ((ID2A != 0x01)) { - ERR ("", ZFFF, 0x30, 0x00, 0x00, ID2A, 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, ID2A, 0x01) } } @@ -51,7 +51,7 @@ { If ((ID2A != 0x00)) { - ERR ("", ZFFF, 0x37, 0x00, 0x00, ID2A, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, ID2A, 0x00) } M035 () diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0218/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0218/DECL.asl index 7419b2d22..f9fe82585 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0218/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0218/DECL.asl @@ -73,12 +73,12 @@ Debug = Local0 If ((I000 != ID29)) { - ERR ("", ZFFF, 0x52, 0x00, 0x00, I000, ID29) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, ID29) } If ((Local0 != ID29)) { - ERR ("", ZFFF, 0x56, 0x00, 0x00, Local0, ID29) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, ID29) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0219/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0219/DECL.asl index c1a211864..36436d681 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0219/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0219/DECL.asl @@ -48,6 +48,6 @@ }) If ((RT00 != BUF0)) { - ERR ("", ZFFF, 0x2E, 0x00, 0x00, RT00, BUF0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, RT00, BUF0) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0220/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0220/DECL.asl index 2b5414c7d..a0066d0e3 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0220/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0220/DECL.asl @@ -65,12 +65,12 @@ { If (\D220.NERR) { - ERR ("", ZFFF, 0x3F, 0x00, 0x00, \D220.NERR, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, \D220.NERR, 0x00) } Local0 = (\D220.ACTV - \D220.DACT) If ((Local0 != 0x01)) { - ERR ("", ZFFF, 0x45, 0x00, 0x00, Local0, 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x01) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0221/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0221/DECL.asl index 317a4ed97..9e55ef92d 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0221/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0221/DECL.asl @@ -37,7 +37,7 @@ { If ((Arg0 != Arg1)) { - ERR ("", ZFFF, 0x29, 0x00, 0x00, Arg0, Arg1) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Arg0, Arg1) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0222/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0222/DECL.asl index 13dde95ee..502211d16 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0222/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0222/DECL.asl @@ -36,7 +36,7 @@ { If ((Arg0 != Arg1)) { - ERR ("", ZFFF, 0x28, 0x00, 0x00, Arg0, Arg1) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Arg0, Arg1) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0223/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0223/DECL.asl index 179793800..bc0d61e8a 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0223/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0223/DECL.asl @@ -60,7 +60,7 @@ { If ((Arg0 != Arg1)) { - ERR ("", ZFFF, 0x3C, 0x00, 0x00, Arg0, Arg1) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Arg0, Arg1) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0224/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0224/DECL.asl index 44fd6e62b..da1d0a8a1 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0224/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0224/DECL.asl @@ -37,7 +37,7 @@ { If ((Arg0 != Arg1)) { - ERR ("", ZFFF, 0x2A, 0x00, 0x00, Arg0, Arg1) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Arg0, Arg1) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0226/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0226/DECL.asl index fe4549b78..9e3936aa4 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0226/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0226/DECL.asl @@ -55,7 +55,7 @@ Local0 = TOT0 /* \M10E.TOT0 */ If ((Local0 != 0x8001)) { - ERR ("", ZFFF, 0x3B, 0x00, 0x00, Local0, 0x8001) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x8001) } } @@ -72,11 +72,11 @@ { If ((BF00 != 0x123456789ABCDEF0)) { - ERR ("", ZFFF, 0x49, 0x00, 0x00, BF00, 0x123456789ABCDEF0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, BF00, 0x123456789ABCDEF0) } } ElseIf ((BF00 != B001)) { - ERR ("", ZFFF, 0x4D, 0x00, 0x00, BF00, B001) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, BF00, B001) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0242/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0242/DECL.asl index 6e1d7cef0..4b0c438ae 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0242/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0242/DECL.asl @@ -53,7 +53,7 @@ If (Local0) { Debug = "ERROR: Acquire T000 (Level 0, index 0)" - ERR ("", ZFFF, 0x3E, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } Else { @@ -64,7 +64,7 @@ If (Local0) { Debug = "ERROR: Acquire T001 (Level 0, index 1)" - ERR ("", ZFFF, 0x46, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } Else { @@ -75,7 +75,7 @@ If (Local0) { Debug = "ERROR: Acquire T002 (Level 0, index 2)" - ERR ("", ZFFF, 0x4E, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } Else { @@ -86,7 +86,7 @@ If (Local0) { Debug = "ERROR: Acquire T003 (Level 0, index 3)" - ERR ("", ZFFF, 0x56, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } Else { @@ -125,7 +125,7 @@ If (Local0) { Debug = "ERROR: Acquire T100 (Level 1, index 0)" - ERR ("", ZFFF, 0x81, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } Else { @@ -136,7 +136,7 @@ If (Local0) { Debug = "ERROR: Acquire T101 (Level 1, index 1)" - ERR ("", ZFFF, 0x89, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } Else { @@ -147,7 +147,7 @@ If (Local0) { Debug = "ERROR: Acquire T102 (Level 1, index 2)" - ERR ("", ZFFF, 0x91, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } Else { @@ -158,7 +158,7 @@ If (Local0) { Debug = "ERROR: Acquire T103 (Level 1, index 3)" - ERR ("", ZFFF, 0x99, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } Else { @@ -198,7 +198,7 @@ If (Local0) { Debug = "ERROR: Acquire T100 (Level 1, index 0)" - ERR ("", ZFFF, 0xC5, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } Else { @@ -209,7 +209,7 @@ If (Local0) { Debug = "ERROR: Acquire T101 (Level 1, index 1)" - ERR ("", ZFFF, 0xCD, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } Else { @@ -220,7 +220,7 @@ If (Local0) { Debug = "ERROR: Acquire T102 (Level 1, index 2)" - ERR ("", ZFFF, 0xD5, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } Else { @@ -231,7 +231,7 @@ If (Local0) { Debug = "ERROR: Acquire T103 (Level 1, index 3)" - ERR ("", ZFFF, 0xDD, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } Else { diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0243/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0243/DECL.asl index 914fea896..f0c9a2d2f 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0243/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0243/DECL.asl @@ -45,7 +45,7 @@ If (Local0) { Debug = "!!!!!!!! ERROR 0: Acquire T500 (Level 5, index 0)" - ERR ("", ZFFF, 0x32, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } Else { @@ -59,7 +59,7 @@ If (Local0) { Debug = "!!!!!!!! ERROR 1: Acquire T600 (Level 6, index 0)" - ERR ("", ZFFF, 0x3C, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } Else { @@ -83,7 +83,7 @@ If (Local0) { Debug = "!!!!!!!! ERROR 3: Acquire T700 (Level 7, index 0)" - ERR ("", ZFFF, 0x50, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } Else { diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0244/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0244/DECL.asl index 70adb272f..fff512553 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0244/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0244/DECL.asl @@ -260,7 +260,7 @@ If (!I101) { Debug = "******** Test was not run !!!!!!!!!!!!!" - ERR ("", ZFFF, 0x0139, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) Return (Zero) } @@ -269,7 +269,7 @@ If (I104) { Debug = "!!!!!!!! ERROR 1: Acquire(T804, 0xffff) failed" - ERR ("", ZFFF, 0x0144, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } Else { @@ -279,7 +279,7 @@ If (I105) { Debug = "!!!!!!!! ERROR 2: Acquire(T805, 0xffff) failed" - ERR ("", ZFFF, 0x014B, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } Else { @@ -299,7 +299,7 @@ Else { Debug = "!!!!!!!! ERROR 7: Acquire(T807, 0xffff) failed" - ERR ("", ZFFF, 0x015C, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } CH03 ("", 0x00, 0x07, 0x015E, 0x00) @@ -312,7 +312,7 @@ Else { Debug = "!!!!!!!! ERROR 5: Acquire(T806, 0xffff) failed" - ERR ("", ZFFF, 0x0166, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } CH03 ("", 0x00, 0x09, 0x0168, 0x00) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0246/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0246/DECL.asl index 4de4345ad..fac49e9bd 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0246/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0246/DECL.asl @@ -70,6 +70,6 @@ If ((Local1 != 0x03)) { - ERR ("", ZFFF, 0x41, 0x00, 0x00, Local1, 0x03) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, 0x03) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0247/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0247/DECL.asl index 979f34c60..864fee521 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0247/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0247/DECL.asl @@ -85,25 +85,25 @@ If ((CH10 != Arg1)) { - ERR ("", ZFFF, 0x4E, 0x00, 0x00, CH10, Arg1) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, CH10, Arg1) } ERRN++ If ((CH11 == Arg1)) { - ERR ("", ZFFF, 0x52, 0x00, 0x00, CH11, Arg1) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, CH11, Arg1) } ERRN++ If ((CH20 != Arg2)) { - ERR ("", ZFFF, 0x56, 0x00, 0x00, CH20, Arg2) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, CH20, Arg2) } ERRN++ If ((CH21 == Arg2)) { - ERR ("", ZFFF, 0x5A, 0x00, 0x00, CH21, Arg2) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, CH21, Arg2) } ERRN++ diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0248/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0248/DECL.asl index 9cac8f46e..fa9b23acc 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0248/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0248/DECL.asl @@ -94,7 +94,7 @@ If ((DerefOf (Local0) != 0xABCD0000)) { - ERR ("", ZFFF, 0x5A, 0x00, 0x00, DerefOf (Local0), 0xABCD0000) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, DerefOf (Local0), 0xABCD0000) } Debug = "============== sit 0 (Local0):" @@ -125,7 +125,7 @@ Debug = "============== before checking:" If ((DerefOf (Local0) != 0xABCD0000)) { - ERR ("", ZFFF, 0x80, 0x00, 0x00, DerefOf (Local0), 0xABCD0000) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, DerefOf (Local0), 0xABCD0000) } Debug = "============== end of test" diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0257/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0257/DECL.asl index 6c7011141..4f2416faf 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0257/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0257/DECL.asl @@ -68,7 +68,7 @@ F257 = B257 /* \B257 */ If (CondRefOf (\AUXD, Local0)) { - ERR ("", ZFFF, 0x4F, 0x00, 0x00, "\\AUXD", 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "\\AUXD", 0x01) Return (Zero) } @@ -86,27 +86,27 @@ If (CondRefOf (\AUXD, Local0)){} Else { - ERR ("", ZFFF, 0x5F, 0x00, 0x00, "\\AUXD", 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "\\AUXD", 0x00) Return (Zero) } Local1 = ObjectType (Local0) If ((Local1 != 0x06)) { - ERR ("", ZFFF, 0x66, 0x00, 0x00, Local1, 0x06) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, 0x06) Return (Zero) } Local0 = ObjectType (\AUXD.M000) If ((Local0 != 0x08)) { - ERR ("", ZFFF, 0x6C, 0x00, 0x00, Local0, 0x08) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x08) Return (Zero) } Unload (H257) If (CondRefOf (\AUXD, Local0)) { - ERR ("", ZFFF, 0x73, 0x00, 0x00, "\\AUXD", 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "\\AUXD", 0x01) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0258/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0258/DECL.asl index b0b089946..e00b9c7a0 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0258/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0258/DECL.asl @@ -68,7 +68,7 @@ F258 = B258 /* \B258 */ If (CondRefOf (\AUXD, Local0)) { - ERR ("", ZFFF, 0x4E, 0x00, 0x00, "\\AUXD", 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "\\AUXD", 0x01) Return (Zero) } @@ -88,27 +88,27 @@ Zero) If (CondRefOf (\AUXD, Local0)){} Else { - ERR ("", ZFFF, 0x5E, 0x00, 0x00, "\\AUXD", 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "\\AUXD", 0x00) Return (Zero) } Local1 = ObjectType (Local0) If ((Local1 != 0x06)) { - ERR ("", ZFFF, 0x65, 0x00, 0x00, Local1, 0x06) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, 0x06) Return (Zero) } Local0 = ObjectType (\AUXD.M000) If ((Local0 != 0x08)) { - ERR ("", ZFFF, 0x6B, 0x00, 0x00, Local0, 0x08) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x08) Return (Zero) } Unload (H258) If (CondRefOf (\AUXD, Local0)) { - ERR ("", ZFFF, 0x72, 0x00, 0x00, "\\AUXD", 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "\\AUXD", 0x01) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0259/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0259/DECL.asl index e6b891370..bfb0abb24 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0259/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0259/DECL.asl @@ -73,7 +73,7 @@ F259 = B259 /* \B259 */ If (CondRefOf (\AUXD, Local0)) { - ERR ("", ZFFF, 0x51, 0x00, 0x00, "\\AUXD", 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "\\AUXD", 0x01) Return (Zero) } @@ -91,27 +91,27 @@ If (CondRefOf (\AUXD, Local0)){} Else { - ERR ("", ZFFF, 0x61, 0x00, 0x00, "\\AUXD", 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "\\AUXD", 0x00) Return (Zero) } Local1 = ObjectType (Local0) If ((Local1 != 0x06)) { - ERR ("", ZFFF, 0x68, 0x00, 0x00, Local1, 0x06) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, 0x06) Return (Zero) } Local0 = \AUXD.REGC /* External reference */ If ((Local0 != 0x01)) { - ERR ("", ZFFF, 0x6E, 0x00, 0x00, Local0, 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x01) Return (Zero) } Unload (H259) If (CondRefOf (\AUXD, Local0)) { - ERR ("", ZFFF, 0x75, 0x00, 0x00, "\\AUXD", 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "\\AUXD", 0x01) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0260/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0260/DECL.asl index cdb61cad0..1bef9a0ec 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0260/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0260/DECL.asl @@ -56,7 +56,7 @@ RFU0 = BUF0 /* \M029.BUF0 */ If (CondRefOf (\AUXD, Local0)) { - ERR ("", ZFFF, 0x40, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) Return (Zero) } @@ -65,7 +65,7 @@ If (CondRefOf (\AUXD, Local0)){} Else { - ERR ("", ZFFF, 0x4A, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) Return (Zero) } @@ -73,7 +73,7 @@ If ((Local1 != 0x0F)) { Debug = Local1 - ERR ("", ZFFF, 0x51, 0x00, 0x00, Local1, 0x0F) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, 0x0F) Return (Zero) } @@ -81,7 +81,7 @@ Debug = "SSDT unloaded" If (CondRefOf (\AUXD, Local0)) { - ERR ("", ZFFF, 0x5A, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } CH03 ("", 0x00, 0x05, 0x5D, 0x00) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0261/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0261/DECL.asl index 688101555..9f9ab3195 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0261/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0261/DECL.asl @@ -59,7 +59,7 @@ RFU0 = BUF0 /* \M028.BUF0 */ If (CondRefOf (\AUXZ, Local0)) { - ERR ("", ZFFF, 0x44, 0x00, 0x00, Local0, 0x01777777) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x01777777) Return (Zero) } @@ -68,7 +68,7 @@ If (CondRefOf (\AUXZ, Local0)){} Else { - ERR ("", ZFFF, 0x4E, 0x00, 0x00, Local0, 0x01777777) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x01777777) Return (Zero) } @@ -76,7 +76,7 @@ If ((Local1 != 0x0F)) { Debug = Local1 - ERR ("", ZFFF, 0x55, 0x00, 0x00, Local0, 0x01777777) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x01777777) Return (Zero) } @@ -84,7 +84,7 @@ Debug = "SSDT unloaded" If (CondRefOf (\AUXZ, Local0)) { - ERR ("", ZFFF, 0x5E, 0x00, 0x00, Local0, 0x01777777) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x01777777) } CH03 ("", 0x00, 0x05, 0x61, 0x00) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0262/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0262/DECL.asl index 5ce68d2f1..f6d8f9728 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0262/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0262/DECL.asl @@ -63,7 +63,7 @@ Debug = Local0 If ((Local0 != 0x01777777)) { - ERR ("", ZFFF, 0x3E, 0x00, 0x00, Local0, 0x01777777) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x01777777) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0263/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0263/DECL.asl index 125574805..dd1111735 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0263/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0263/DECL.asl @@ -46,12 +46,12 @@ Debug = I000 /* \M026.MM00.I000 */ If ((Local0 != 0x50000001)) { - ERR ("", ZFFF, 0x34, 0x00, 0x00, Local0, 0x50000001) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x50000001) } If ((I000 != 0x50000000)) { - ERR ("", ZFFF, 0x38, 0x00, 0x00, I000, 0x50000000) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, 0x50000000) } } @@ -122,12 +122,12 @@ Store ((I000 + M001 ()), Local0) If ((Local0 != 0x87654321)) { - ERR ("", ZFFF, 0x72, 0x00, 0x00, Local0, 0x87654321) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x87654321) } If ((I000 != 0x80000000)) { - ERR ("", ZFFF, 0x76, 0x00, 0x00, I000, 0x80000000) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, 0x80000000) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0265/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0265/DECL.asl index c0fab2cc5..e1e2400c2 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0265/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0265/DECL.asl @@ -86,14 +86,14 @@ Store ((DerefOf (S000 [0x01]) + M001 ()), Local0) If ((Local0 != 0x24)) { - ERR ("", ZFFF, 0x54, 0x00, 0x00, Local0, 0x24) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x24) } Local0 = DerefOf (S000 [0x01]) Local1 = 0x08 If ((Local0 != Local1)) { - ERR ("", ZFFF, 0x5C, 0x00, 0x00, Local0, Local1) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Local1) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0268/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0268/DECL.asl index b9ab102a9..418b1dfa3 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0268/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0268/DECL.asl @@ -47,7 +47,7 @@ Debug = I000 /* \M023.I000 */ If ((Arg0 != 0xABCD0000)) { - ERR ("", ZFFF, 0x34, 0x00, 0x00, Arg0, 0xABCD0000) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Arg0, 0xABCD0000) } } @@ -59,6 +59,6 @@ Debug = I000 /* \M023.I000 */ If ((I000 != 0x11223344)) { - ERR ("", ZFFF, 0x43, 0x00, 0x00, I000, 0x11223344) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, 0x11223344) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0269/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0269/DECL.asl index 31bb952a2..bd3212817 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0269/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0269/DECL.asl @@ -104,12 +104,12 @@ Local0 = MADD (I000, M001 ()) If ((Local0 != 0x87654321)) { - ERR ("", ZFFF, 0x62, 0x00, 0x00, Local0, C00E) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, C00E) } If ((I000 != 0x80000000)) { - ERR ("", ZFFF, 0x66, 0x00, 0x00, Local0, C00E) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, C00E) } Debug = "Result:" diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0271/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0271/DECL.asl index e1fba7d86..16db4414e 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0271/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0271/DECL.asl @@ -57,7 +57,7 @@ Local0 = ObjectType (I001) If ((Local0 != C00E)) { - ERR ("", ZFFF, 0x3C, 0x00, 0x00, Local0, C00E) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, C00E) } CH03 ("", 0x00, 0x02, 0x3E, 0x00) @@ -65,7 +65,7 @@ Local0 = ObjectType (I001) If ((Local0 != C009)) { - ERR ("", ZFFF, 0x44, 0x00, 0x00, Local0, C009) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, C009) } CH03 ("", 0x00, 0x04, 0x46, 0x00) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0272/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0272/DECL.asl index 6dba3441b..cb313fe30 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0272/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0272/DECL.asl @@ -57,7 +57,7 @@ Local0 = ObjectType (I001) If ((Local0 != C015)) { - ERR ("", ZFFF, 0x3C, 0x00, 0x00, Local0, C015) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, C015) } CH03 ("", 0x00, 0x02, 0x3E, 0x00) @@ -65,7 +65,7 @@ Local0 = ObjectType (I001) If ((Local0 != C009)) { - ERR ("", ZFFF, 0x44, 0x00, 0x00, Local0, C009) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, C009) } CH03 ("", 0x00, 0x04, 0x46, 0x00) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0273/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0273/DECL.asl index 83fcea0f4..d51eee055 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0273/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0273/DECL.asl @@ -73,39 +73,39 @@ If ((F273 != SSDT)) { - ERR ("", ZFFF, 0x4E, 0x00, 0x00, F273, SSDT) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, F273, SSDT) } If (CondRefOf (\_XT2, Local0)) { - ERR ("", ZFFF, 0x52, 0x00, 0x00, "\\_XT2", 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "\\_XT2", 0x01) } If (CondRefOf (\D273._XT2, Local0)) { - ERR ("", ZFFF, 0x56, 0x00, 0x00, "\\D273._XT2", 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "\\D273._XT2", 0x01) } LD () If (CondRefOf (\_XT2, Local0)) { - ERR ("", ZFFF, 0x5C, 0x00, 0x00, "\\_XT2", 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "\\_XT2", 0x01) } If (CondRefOf (\D273._XT2, Local0)){} Else { - ERR ("", ZFFF, 0x61, 0x00, 0x00, "\\D273._XT2", 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "\\D273._XT2", 0x00) } UNLD () If (CondRefOf (\_XT2, Local0)) { - ERR ("", ZFFF, 0x67, 0x00, 0x00, "\\_XT2", 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "\\_XT2", 0x01) } If (CondRefOf (\D273._XT2, Local0)) { - ERR ("", ZFFF, 0x6B, 0x00, 0x00, "\\D273._XT2", 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "\\D273._XT2", 0x01) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0274/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0274/DECL.asl index 5e4aebf67..068b57932 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0274/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0274/DECL.asl @@ -51,7 +51,7 @@ Local0 = DerefOf (Arg1 [Arg2]) If ((Local0 != Arg0)) { - ERR ("", ZFFF, 0x39, 0x00, 0x00, Arg0, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Arg0, Local0) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0275/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0275/DECL.asl index 003ad5708..ffbc65493 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0275/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0275/DECL.asl @@ -66,7 +66,7 @@ If ((Local1 != 0xABCD0001)) { - ERR ("", ZFFF, 0x40, 0x00, 0x00, Local1, 0xABCD0001) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, 0xABCD0001) } Return (Zero) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0278/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0278/DECL.asl index 0af6b4fd8..13836d5a5 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0278/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0278/DECL.asl @@ -60,12 +60,12 @@ If (CondRefOf (NABS, Local0)) { - ERR ("", ZFFF, 0x3F, 0x00, 0x00, "NABS", 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "NABS", 0x01) } If (CondRefOf (NCRR, Local0)) { - ERR ("", ZFFF, 0x42, 0x00, 0x00, "NCRR", 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "NCRR", 0x01) } RFU0 = SSDT /* \D278.SSDT */ @@ -77,24 +77,24 @@ { If (("absolute location obj" != DerefOf (Local0))) { - ERR ("", ZFFF, 0x4C, 0x00, 0x00, "absolute location NABS", 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "absolute location NABS", 0x01) } } Else { - ERR ("", ZFFF, 0x4F, 0x00, 0x00, "NABS", 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "NABS", 0x00) } If (CondRefOf (NCRR, Local0)) { If (("current location obj" != DerefOf (Local0))) { - ERR ("", ZFFF, 0x53, 0x00, 0x00, "current location NCRR", 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "current location NCRR", 0x01) } } Else { - ERR ("", ZFFF, 0x56, 0x00, 0x00, "NCRR", 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "NCRR", 0x00) } /* Check location */ @@ -102,23 +102,23 @@ If (CondRefOf (\NABS, Local0)){} Else { - ERR ("", ZFFF, 0x5C, 0x00, 0x00, "\\NABS", 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "\\NABS", 0x00) } If (CondRefOf (\NCRR, Local0)) { - ERR ("", ZFFF, 0x5F, 0x00, 0x00, "\\NCRR", 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "\\NCRR", 0x01) } If (CondRefOf (\D278.NCRR, Local0)) { - ERR ("", ZFFF, 0x62, 0x00, 0x00, "\\D278.NCRR", 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "\\D278.NCRR", 0x01) } If (CondRefOf (\D278.TST0.NCRR, Local0)){} Else { - ERR ("", ZFFF, 0x66, 0x00, 0x00, "\\D278.TST0.NCRR", 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "\\D278.TST0.NCRR", 0x00) } Unload (DDBH) @@ -127,12 +127,12 @@ If (CondRefOf (NABS, Local0)) { - ERR ("", ZFFF, 0x6E, 0x00, 0x00, "NABS", 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "NABS", 0x01) } If (CondRefOf (NCRR, Local0)) { - ERR ("", ZFFF, 0x71, 0x00, 0x00, "NCRR", 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "NCRR", 0x01) } } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0281/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0281/DECL.asl index 9e3c3134b..c8e662627 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0281/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0281/DECL.asl @@ -47,13 +47,13 @@ If ((PLDT != 0x00)) { Debug = PLDT /* \D281.PLDT */ - ERR ("", ZFFF, 0x38, 0x00, 0x00, PLDT, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, PLDT, 0x00) Return (0x01) } If (CondRefOf (\_XT2, Local0)) { - ERR ("", ZFFF, 0x3D, 0x00, 0x00, "\\_XT2", 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "\\_XT2", 0x01) } /* Successful case: spaces is replaced with zeroes */ @@ -68,7 +68,7 @@ If ((PLDT != 0x01)) { Debug = PLDT /* \D281.PLDT */ - ERR ("", ZFFF, 0x4F, 0x00, 0x00, PLDT, 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, PLDT, 0x01) Return (0x01) } @@ -76,14 +76,14 @@ If (CondRefOf (\_XT2, Local0)){} Else { - ERR ("", ZFFF, 0x56, 0x00, 0x00, "\\_XT2", 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "\\_XT2", 0x00) } Unload (DDB0) Debug = "OEM1 unloaded" If (CondRefOf (\_XT2, Local0)) { - ERR ("", ZFFF, 0x5D, 0x00, 0x00, "\\_XT2", 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "\\_XT2", 0x01) } /* Unhappy case: normal strings */ @@ -93,7 +93,7 @@ If ((PLDT != 0x01)) { Debug = PLDT /* \D281.PLDT */ - ERR ("", ZFFF, 0x68, 0x00, 0x00, PLDT, 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, PLDT, 0x01) Return (0x01) } @@ -101,14 +101,14 @@ If (CondRefOf (\_XT2, Local0)){} Else { - ERR ("", ZFFF, 0x6F, 0x00, 0x00, "\\_XT2", 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "\\_XT2", 0x00) } Unload (DDB1) Debug = "OEM1 unloaded" If (CondRefOf (\_XT2, Local0)) { - ERR ("", ZFFF, 0x76, 0x00, 0x00, "\\_XT2", 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "\\_XT2", 0x01) } Return (0x00) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0287/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0287/DECL.asl index 5af934864..815fe9fe4 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0287/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0287/DECL.asl @@ -42,7 +42,7 @@ CH04 ("", 0x00, 0xFF, 0x00, 0x2D, 0x00, 0x00) If ((PLDT != 0x00)) { - ERR ("", ZFFF, 0x2F, 0x00, 0x00, PLDT, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, PLDT, 0x00) Return (0x01) } @@ -52,7 +52,7 @@ CH04 ("", 0x00, 0xFF, 0x00, 0x36, 0x00, 0x00) If ((PLDT != 0x00)) { - ERR ("", ZFFF, 0x38, 0x00, 0x00, PLDT, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, PLDT, 0x00) Return (0x01) } @@ -62,7 +62,7 @@ CH04 ("", 0x00, 0xFF, 0x00, 0x3F, 0x00, 0x00) If ((PLDT != 0x00)) { - ERR ("", ZFFF, 0x41, 0x00, 0x00, PLDT, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, PLDT, 0x00) Return (0x01) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0289/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0289/DECL.asl index 83a9919bf..ceb94a162 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0289/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0289/DECL.asl @@ -64,7 +64,7 @@ DDBH = LoadTable ("SSDT", "iASLTS", "LTBL0001", "\\", "\\D289.PLDT", 0x01) If ((PLDT == 0x01)) { - ERR ("", ZFFF, 0x46, 0x00, 0x00, "PLDT", 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "PLDT", 0x01) Unload (DDBH) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0290/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0290/DECL.asl index d3e0e8fb3..c544525cc 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0290/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0290/DECL.asl @@ -56,7 +56,7 @@ RFU0 = BUF0 /* \D290.BUF0 */ If (CondRefOf (\AUXD, Local0)) { - ERR ("", ZFFF, 0x3E, 0x00, 0x00, "\\AUXD", 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "\\AUXD", 0x01) Return (Zero) } @@ -68,7 +68,7 @@ ElseIf (CondRefOf (\AUXD, Local0)){} Else { - ERR ("", ZFFF, 0x48, 0x00, 0x00, "\\AUXD", 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "\\AUXD", 0x00) Return (Zero) } @@ -77,7 +77,7 @@ Debug = "SSDT unloaded" If (CondRefOf (\AUXD, Local0)) { - ERR ("", ZFFF, 0x53, 0x00, 0x00, "\\AUXD", 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "\\AUXD", 0x01) } Return (Zero) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0293/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0293/DECL.asl index 04077ca57..2f386b456 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0293/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0293/DECL.asl @@ -44,41 +44,41 @@ Debug = SizeOf (Local3) If ((SizeOf (Local2) != 0x00)) { - ERR ("", ZFFF, 0x32, 0x00, 0x00, SizeOf (Local2), 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, SizeOf (Local2), 0x00) } If ((SizeOf (Local3) != 0x00)) { - ERR ("", ZFFF, 0x36, 0x00, 0x00, SizeOf (Local3), 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, SizeOf (Local3), 0x00) } If (("" != Local1)) { - ERR ("", ZFFF, 0x3A, 0x00, 0x00, "", Local1) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "", Local1) } If (("" != Local2)) { - ERR ("", ZFFF, 0x3E, 0x00, 0x00, "", Local2) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "", Local2) } If (("" != Local3)) { - ERR ("", ZFFF, 0x42, 0x00, 0x00, "", Local3) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, "", Local3) } If ((Local2 != Local3)) { - ERR ("", ZFFF, 0x46, 0x00, 0x00, Local2, Local3) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local2, Local3) } If ((Local2 != Local1)) { - ERR ("", ZFFF, 0x4A, 0x00, 0x00, Local2, Local1) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local2, Local1) } If ((Local3 != Local1)) { - ERR ("", ZFFF, 0x4E, 0x00, 0x00, Local3, Local1) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local3, Local1) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0294/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0294/DECL.asl index 2c67ae4c2..cd6cf3416 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0294/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0294/DECL.asl @@ -234,7 +234,7 @@ Name (DDB3, 0x00) If (INIT ()) { - ERR ("", ZFFF, 0xF1, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) Return (0x01) } @@ -247,7 +247,7 @@ If (LD ()) { - ERR ("", ZFFF, 0xFC, 0x00, 0x00, Local0, HI0N) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, HI0N) Return (0x01) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0296/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0296/DECL.asl index e2fd6d97e..e3a22d5df 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0296/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0296/DECL.asl @@ -45,11 +45,11 @@ Local1 = ObjectType (PLDT) If ((Local1 != 0x01)) { - ERR ("", ZFFF, 0x33, 0x00, 0x00, Local1, 0x01) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, 0x01) } ElseIf ((0x01 != PLDT)) { - ERR ("", ZFFF, 0x35, 0x00, 0x00, 0x01, PLDT) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x01, PLDT) } Unload (Local0) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0297_ACTIONS_REQUIRED/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0297_ACTIONS_REQUIRED/DECL.asl index 85fd2c3a5..094fef394 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0297_ACTIONS_REQUIRED/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0297_ACTIONS_REQUIRED/DECL.asl @@ -187,7 +187,7 @@ Local0 = Acquire (MT00, 0xFFFF) If (Local0) { - ERR ("", ZFFF, 0xCA, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { @@ -196,7 +196,7 @@ If (Local0) { - ERR ("", ZFFF, 0xCE, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { @@ -205,210 +205,210 @@ If (Local0) { - ERR ("", ZFFF, 0xD2, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT10, 0xFFFF) If (Local0) { - ERR ("", ZFFF, 0xD6, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT11, 0xFFFF) If (Local0) { - ERR ("", ZFFF, 0xDA, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT20, 0xFFFF) If (Local0) { - ERR ("", ZFFF, 0xDE, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT21, 0xFFFF) If (Local0) { - ERR ("", ZFFF, 0xE2, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT30, 0xFFFF) If (Local0) { - ERR ("", ZFFF, 0xE6, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT31, 0xFFFF) If (Local0) { - ERR ("", ZFFF, 0xEA, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT40, 0xFFFF) If (Local0) { - ERR ("", ZFFF, 0xEE, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT41, 0xFFFF) If (Local0) { - ERR ("", ZFFF, 0xF2, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT50, 0xFFFF) If (Local0) { - ERR ("", ZFFF, 0xF6, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT51, 0xFFFF) If (Local0) { - ERR ("", ZFFF, 0xFA, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT60, 0xFFFF) If (Local0) { - ERR ("", ZFFF, 0xFE, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT61, 0xFFFF) If (Local0) { - ERR ("", ZFFF, 0x0102, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT70, 0xFFFF) If (Local0) { - ERR ("", ZFFF, 0x0106, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT71, 0xFFFF) If (Local0) { - ERR ("", ZFFF, 0x010A, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT80, 0xFFFF) If (Local0) { - ERR ("", ZFFF, 0x010E, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT81, 0xFFFF) If (Local0) { - ERR ("", ZFFF, 0x0112, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT90, 0xFFFF) If (Local0) { - ERR ("", ZFFF, 0x0116, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT91, 0xFFFF) If (Local0) { - ERR ("", ZFFF, 0x011A, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTA0, 0xFFFF) If (Local0) { - ERR ("", ZFFF, 0x011E, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTA1, 0xFFFF) If (Local0) { - ERR ("", ZFFF, 0x0122, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTB0, 0xFFFF) If (Local0) { - ERR ("", ZFFF, 0x0126, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTB1, 0xFFFF) If (Local0) { - ERR ("", ZFFF, 0x012A, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTC0, 0xFFFF) If (Local0) { - ERR ("", ZFFF, 0x012E, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTC1, 0xFFFF) If (Local0) { - ERR ("", ZFFF, 0x0132, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTD0, 0xFFFF) If (Local0) { - ERR ("", ZFFF, 0x0136, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTD1, 0xFFFF) If (Local0) { - ERR ("", ZFFF, 0x013A, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTE0, 0xFFFF) If (Local0) { - ERR ("", ZFFF, 0x013E, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTE1, 0xFFFF) If (Local0) { - ERR ("", ZFFF, 0x0142, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTF0, 0xFFFF) If (Local0) { - ERR ("", ZFFF, 0x0146, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { @@ -423,7 +423,7 @@ If (Local0) { - ERR ("", ZFFF, 0x014E, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { @@ -545,5 +545,5 @@ * report below (or try to find how to detect this situation * automatically now (for not fixed yet)): */ - ERR ("", ZFFF, 0x01C5, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0298_ACTIONS_REQUIRED/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0298_ACTIONS_REQUIRED/DECL.asl index 0f5d111b8..11051afc0 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0298_ACTIONS_REQUIRED/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0298_ACTIONS_REQUIRED/DECL.asl @@ -64,7 +64,7 @@ Debug = Local4 If ((Local4 != 0x11111233)) { - ERR ("", ZFFF, 0x46, 0x00, 0x00, Local4, 0x11111233) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local4, 0x11111233) } Debug = "============================== 3" @@ -73,5 +73,5 @@ * The problem is not automatically detected, * so remove this error report after the problem has been resolved. */ - ERR ("", ZFFF, 0x50, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0299_ACTIONS_REQUIRED/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0299_ACTIONS_REQUIRED/DECL.asl index e279161a6..ac3e66caf 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0299_ACTIONS_REQUIRED/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0299_ACTIONS_REQUIRED/DECL.asl @@ -149,5 +149,5 @@ * The problem is not automatically detected, * so remove this error report after the problem has been resolved. */ - ERR ("", ZFFF, 0x7D, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0300/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0300/DECL.asl index 755b33d55..ec0161085 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0300/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0300/DECL.asl @@ -70,12 +70,12 @@ If ((Arg0 != II00)) { - ERR ("", ZFFF, 0x4C, 0x00, 0x00, Arg0, II00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Arg0, II00) } If ((Arg0 != Local5)) { - ERR ("", ZFFF, 0x4F, 0x00, 0x00, Arg0, Local5) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Arg0, Local5) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0302/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0302/DECL.asl index 3830182c3..3778c9d15 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0302/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0302/DECL.asl @@ -51,7 +51,7 @@ { If ((\_SB.I2Z7 != 0xABCD0007)) { - ERR ("", ZFFF, 0x33, 0x00, 0x00, \_SB.I2Z7, 0xABCD0007) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, \_SB.I2Z7, 0xABCD0007) } } @@ -77,7 +77,7 @@ { If ((\I2Z4 != 0xABCD0004)) { - ERR ("", ZFFF, 0x48, 0x00, 0x00, \I2Z4, 0xABCD0004) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, \I2Z4, 0xABCD0004) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0303/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0303/DECL.asl index 52fb9006e..020ef89ef 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0303/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0303/DECL.asl @@ -41,12 +41,12 @@ Name (\I4Z0, 0xABCD0000) If ((I4Z0 != 0xABCD0000)) { - ERR ("", ZFFF, 0x2D, 0x00, 0x00, I4Z0, 0xABCD0000) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I4Z0, 0xABCD0000) } If ((\I4Z0 != 0xABCD0000)) { - ERR ("", ZFFF, 0x30, 0x00, 0x00, \I4Z0, 0xABCD0000) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, \I4Z0, 0xABCD0000) } M101 () @@ -56,12 +56,12 @@ { If ((I4Z0 != 0xABCD0000)) { - ERR ("", ZFFF, 0x38, 0x00, 0x00, I4Z0, 0xABCD0000) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I4Z0, 0xABCD0000) } If ((\I4Z0 != 0xABCD0000)) { - ERR ("", ZFFF, 0x3B, 0x00, 0x00, \I4Z0, 0xABCD0000) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, \I4Z0, 0xABCD0000) } } @@ -83,12 +83,12 @@ If ((I4Z1 != 0xABCD0000)) { - ERR ("", ZFFF, 0x4E, 0x00, 0x00, I4Z1, 0xABCD0000) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I4Z1, 0xABCD0000) } If ((\I4Z1 != 0xABCD0000)) { - ERR ("", ZFFF, 0x51, 0x00, 0x00, \I4Z1, 0xABCD0000) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, \I4Z1, 0xABCD0000) } M101 () @@ -98,12 +98,12 @@ { If ((I4Z1 != 0xABCD0000)) { - ERR ("", ZFFF, 0x59, 0x00, 0x00, I4Z1, 0xABCD0000) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I4Z1, 0xABCD0000) } If ((\I4Z1 != 0xABCD0000)) { - ERR ("", ZFFF, 0x5C, 0x00, 0x00, \I4Z1, 0xABCD0000) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, \I4Z1, 0xABCD0000) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0304/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0304/DECL.asl index 830fd7bfa..f221b6d3d 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0304/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0304/DECL.asl @@ -153,7 +153,7 @@ Local1 = DerefOf (Arg3 [LPC0]) If ((Local0 != Local1)) { - ERR ("", ZFFF, 0x8E, 0x00, 0x00, Local0, Local1) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Local1) Debug = Arg0 Debug = LPC0 /* \M1ED.M18A.M802.LPC0 */ } @@ -168,28 +168,28 @@ { If ((IND1 != N100)) { - ERR ("", ZFFF, 0x99, 0x00, 0x00, IND1, N100) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, IND1, N100) } } Case (0x02) { If ((IND2 != N200)) { - ERR ("", ZFFF, 0x9E, 0x00, 0x00, IND2, N200) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, IND2, N200) } } Case (0x03) { If ((IND3 != N300)) { - ERR ("", ZFFF, 0xA3, 0x00, 0x00, IND3, N300) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, IND3, N300) } } Case (0x04) { If ((IND4 != N400)) { - ERR ("", ZFFF, 0xA8, 0x00, 0x00, IND4, N400) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, IND4, N400) } } @@ -229,7 +229,7 @@ Local1 = DerefOf (P100 [Local1]) If ((Local1 != Local0)) { - ERR ("", ZFFF, 0xCE, 0x00, 0x00, Local1, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, Local0) } } @@ -254,7 +254,7 @@ Local1 = DerefOf (P200 [Local1]) If ((Local1 != Local0)) { - ERR ("", ZFFF, 0xE1, 0x00, 0x00, Local1, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, Local0) } } @@ -288,7 +288,7 @@ Local1 = DerefOf (P300 [Local1]) If ((Local1 != Local0)) { - ERR ("", ZFFF, 0xFA, 0x00, 0x00, Local1, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, Local0) } } @@ -312,7 +312,7 @@ Local1 = DerefOf (P400 [Local1]) If ((Local1 != Local0)) { - ERR ("", ZFFF, 0x010C, 0x00, 0x00, Local1, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, Local0) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0305/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0305/DECL.asl index d18ea1771..e0d55b931 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0305/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0305/DECL.asl @@ -53,7 +53,7 @@ Debug = "==================== 1" If ((Local0 != 0xABCD0003)) { - ERR ("", ZFFF, 0x35, 0x00, 0x00, Local0, 0xABCD0003) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xABCD0003) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0306/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0306/DECL.asl index 9783bab0a..dc2c054c8 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0306/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0306/DECL.asl @@ -43,13 +43,13 @@ Local0 = "87654321" If ((ObjectType (Local0) != 0x02)) { - ERR ("", ZFFF, 0x32, 0x00, 0x00, ObjectType (Local0), 0x02) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, ObjectType (Local0), 0x02) } M000 (RefOf (Local1)) If ((ObjectType (Local1) != 0x02)) { - ERR ("", ZFFF, 0x38, 0x00, 0x00, ObjectType (Local1), 0x02) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, ObjectType (Local1), 0x02) } Local3 = RefOf (Local2) @@ -58,7 +58,7 @@ DerefOf (Local4) = "87654321" If ((ObjectType (Local2) != 0x02)) { - ERR ("", ZFFF, 0x42, 0x00, 0x00, ObjectType (Local2), 0x02) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, ObjectType (Local2), 0x02) } CH03 ("", 0x00, 0x04, 0x45, 0x00) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/common/proc.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/common/proc.asl index 3ca8dfb5a..30dda3cae 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/common/proc.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/common/proc.asl @@ -75,7 +75,7 @@ TRC1 (Arg0, LPC0, Local0) If ((Local0 != LPC0)) { - ERR ("", ZFFF, 0x4D, 0x00, 0x00, Local0, LPC0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, LPC0) } LPN0-- @@ -91,7 +91,7 @@ TRC1 (Arg0, 0x00, Local0) If ((Local0 != 0x00)) { - ERR ("", ZFFF, 0x59, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } /* Last pre-initialized element */ @@ -101,7 +101,7 @@ TRC1 (Arg0, Local0, Local1) If ((Local1 != Local0)) { - ERR ("", ZFFF, 0x61, 0x00, 0x00, Local1, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, Local0) } /* Middle pre-initialized element */ @@ -111,7 +111,7 @@ TRC1 (Arg0, Local0, Local1) If ((Local1 != Local0)) { - ERR ("", ZFFF, 0x69, 0x00, 0x00, Local1, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, Local0) } } @@ -132,7 +132,7 @@ TRC1 (Arg0, LPC0, Local0) If ((Local0 != LPC0)) { - ERR ("", ZFFF, 0x7A, 0x00, 0x00, Local0, LPC0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, LPC0) } LPN0-- @@ -148,7 +148,7 @@ TRC1 (Arg0, Arg3, Local0) If ((Local0 != Arg3)) { - ERR ("", ZFFF, 0x86, 0x00, 0x00, Local0, Arg3) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Arg3) } /* Last written element */ @@ -159,7 +159,7 @@ TRC1 (Arg0, Local0, Local1) If ((Local1 != Local0)) { - ERR ("", ZFFF, 0x8F, 0x00, 0x00, Local1, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, Local0) } /* Middle written element */ @@ -170,7 +170,7 @@ TRC1 (Arg0, Local0, Local1) If ((Local1 != Local0)) { - ERR ("", ZFFF, 0x98, 0x00, 0x00, Local1, Local0) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, Local0) } } @@ -311,7 +311,7 @@ TRC1 (Arg0, Arg5, Local0) If ((Local0 != Arg5)) { - ERR ("", ZFFF, 0x011F, 0x00, 0x00, Local0, Arg5) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Arg5) } CH03 ("", 0x00, 0x0113, 0x0121, 0x00) @@ -387,14 +387,14 @@ Local0 = ObjectType (Arg0) If ((Local0 != Arg1)) { - ERR ("", ZFFF, 0x016B, 0x00, 0x00, Local0, Arg1) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Arg1) } If (Arg5) { If ((Arg0 != Arg2)) { - ERR ("", ZFFF, 0x016F, 0x00, 0x00, Arg0, Arg2) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Arg0, Arg2) } } } @@ -402,5 +402,5 @@ Method (M02A, 0, NotSerialized) { Debug = "Check the error manually and remove call to m02a() when the bug is fixed." - ERR ("", ZFFF, 0x0178, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } 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) } diff --git a/tests/aslts/src/runtime/collections/exceptions/exc/exc.asl b/tests/aslts/src/runtime/collections/exceptions/exc/exc.asl index 98a8096a9..8b856ef63 100644 --- a/tests/aslts/src/runtime/collections/exceptions/exc/exc.asl +++ b/tests/aslts/src/runtime/collections/exceptions/exc/exc.asl @@ -766,7 +766,7 @@ { /* Bug 63, Bugzilla 5329. */ - ERR (__METHOD__, Z058, 0x0332, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, Z058, __LINE__, 0x00, 0x00, Local0, 0x00) } } @@ -1376,12 +1376,12 @@ Local1 = M000 () If ((Local0 != 0xABCD0000)) { - ERR (__METHOD__, Z058, 0x05B3, 0x00, 0x00, Local0, 0xABCD0000) + ERR (__METHOD__, Z058, __LINE__, 0x00, 0x00, Local0, 0xABCD0000) } If ((Local1 != 0xABCD0001)) { - ERR (__METHOD__, Z058, 0x05B7, 0x00, 0x00, Local1, 0xABCD0001) + ERR (__METHOD__, Z058, __LINE__, 0x00, 0x00, Local1, 0xABCD0001) } } diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_00_undef.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_00_undef.asl index 676c95b60..38c1fa0ed 100644 --- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_00_undef.asl +++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_00_undef.asl @@ -947,7 +947,7 @@ Local0 = ObjectType (Arg1) If ((Local0 != 0x00)) { - ERR (Arg0, Z092, 0x04F4, 0x00, 0x00, Local0, 0x00) + ERR (Arg0, Z092, __LINE__, 0x00, 0x00, Local0, 0x00) Return (0x01) } @@ -1378,7 +1378,7 @@ CH06 (Arg0, 0x00, 0x33) If ((I001 != 0x00)) { - ERR (Arg0, Z092, 0x06F3, 0x00, 0x00, I001, 0x00) + ERR (Arg0, Z092, __LINE__, 0x00, 0x00, I001, 0x00) } I001 = 0x00 @@ -1387,7 +1387,7 @@ CH06 (Arg0, 0x02, 0x33) If ((I001 != 0x00)) { - ERR (Arg0, Z092, 0x06FB, 0x00, 0x00, I001, 0x00) + ERR (Arg0, Z092, __LINE__, 0x00, 0x00, I001, 0x00) } I001 = 0x00 @@ -1395,7 +1395,7 @@ CH06 (Arg0, 0x04, 0x33) If ((I001 != 0x00)) { - ERR (Arg0, Z092, 0x0702, 0x00, 0x00, I001, 0x00) + ERR (Arg0, Z092, __LINE__, 0x00, 0x00, I001, 0x00) } I001 = 0x00 @@ -1404,7 +1404,7 @@ CH06 (Arg0, 0x06, 0x33) If ((I001 != 0x00)) { - ERR (Arg0, Z092, 0x070A, 0x00, 0x00, I001, 0x00) + ERR (Arg0, Z092, __LINE__, 0x00, 0x00, I001, 0x00) } I001 = 0x00 @@ -1413,7 +1413,7 @@ CH06 (Arg0, 0x08, 0x33) If ((I001 != 0x00)) { - ERR (Arg0, Z092, 0x0712, 0x00, 0x00, I001, 0x00) + ERR (Arg0, Z092, __LINE__, 0x00, 0x00, I001, 0x00) } } @@ -1517,7 +1517,7 @@ CH06 (__METHOD__, 0x09, 0x31) If ((I001 != 0x00)) { - ERR (__METHOD__, Z092, 0x077B, 0x00, 0x00, I001, 0x00) + ERR (__METHOD__, Z092, __LINE__, 0x00, 0x00, I001, 0x00) } /* Uninitialized element of Package as parameter of a method */ diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_01_int.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_01_int.asl index c81350dda..d1cc39345 100644 --- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_01_int.asl +++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_01_int.asl @@ -243,7 +243,7 @@ Local0 = ObjectType (Arg1) If ((Local0 != 0x01)) { - ERR (Arg0, Z093, 0xF7, 0x00, 0x00, Local0, 0x01) + ERR (Arg0, Z093, __LINE__, 0x00, 0x00, Local0, 0x01) Return (0x01) } @@ -274,7 +274,7 @@ { If ((I000 != Arg1)) { - ERR (Arg0, Z093, 0x0119, 0x00, 0x00, I000, Arg1) + ERR (Arg0, Z093, __LINE__, 0x00, 0x00, I000, Arg1) } } @@ -349,7 +349,7 @@ { If ((I001 != Arg1)) { - ERR (Arg0, Z093, 0x015D, 0x00, 0x00, I000, Arg1) + ERR (Arg0, Z093, __LINE__, 0x00, 0x00, I000, Arg1) } } diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_02_str.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_02_str.asl index 3c31be6f0..977ebec77 100644 --- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_02_str.asl +++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_02_str.asl @@ -238,7 +238,7 @@ Local0 = ObjectType (Arg1) If ((Local0 != 0x02)) { - ERR (Arg0, Z094, 0xF3, 0x00, 0x00, Local0, 0x02) + ERR (Arg0, Z094, __LINE__, 0x00, 0x00, Local0, 0x02) Return (0x01) } @@ -269,7 +269,7 @@ { If ((I000 != Arg1)) { - ERR (Arg0, Z094, 0x0115, 0x00, 0x00, I000, Arg1) + ERR (Arg0, Z094, __LINE__, 0x00, 0x00, I000, Arg1) } } @@ -353,7 +353,7 @@ { If ((I000 != Arg1)) { - ERR (Arg0, Z094, 0x015E, 0x00, 0x00, I000, Arg1) + ERR (Arg0, Z094, __LINE__, 0x00, 0x00, I000, Arg1) } } diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_03_buf.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_03_buf.asl index e82919f07..727d00f0c 100644 --- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_03_buf.asl +++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_03_buf.asl @@ -156,7 +156,7 @@ Local0 = ObjectType (Arg1) If ((Local0 != 0x03)) { - ERR (Arg0, Z095, 0x9E, 0x00, 0x00, Local0, 0x03) + ERR (Arg0, Z095, __LINE__, 0x00, 0x00, Local0, 0x03) Return (0x01) } @@ -190,7 +190,7 @@ { If ((I000 != Arg1)) { - ERR (Arg0, Z095, 0xC0, 0x00, 0x00, I000, Arg1) + ERR (Arg0, Z095, __LINE__, 0x00, 0x00, I000, Arg1) } } @@ -277,7 +277,7 @@ { If ((I000 != Arg1)) { - ERR (Arg0, Z095, 0x0109, 0x00, 0x00, I000, Arg1) + ERR (Arg0, Z095, __LINE__, 0x00, 0x00, I000, Arg1) } } diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_04_pckg.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_04_pckg.asl index 97b5598eb..0c38fbdb6 100644 --- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_04_pckg.asl +++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_04_pckg.asl @@ -1369,7 +1369,7 @@ Local0 = ObjectType (Arg1) If ((Local0 != 0x04)) { - ERR (Arg0, Z096, 0x06D6, 0x00, 0x00, Local0, 0x04) + ERR (Arg0, Z096, __LINE__, 0x00, 0x00, Local0, 0x04) Return (0x01) } @@ -2001,7 +2001,7 @@ { If ((I000 != Arg1)) { - ERR (Arg0, Z096, 0x09D1, 0x00, 0x00, I000, Arg1) + ERR (Arg0, Z096, __LINE__, 0x00, 0x00, I000, Arg1) } } @@ -2047,7 +2047,7 @@ { If ((I000 != Arg1)) { - ERR (Arg0, Z096, 0x0A01, 0x00, 0x00, I000, Arg1) + ERR (Arg0, Z096, __LINE__, 0x00, 0x00, I000, Arg1) } } diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_05_funit.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_05_funit.asl index af6699f32..8411e8027 100644 --- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_05_funit.asl +++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_05_funit.asl @@ -144,7 +144,7 @@ Local0 = ObjectType (Arg1) If ((Local0 != 0x05)) { - ERR (Arg0, Z097, 0x87, 0x00, 0x00, Local0, 0x05) + ERR (Arg0, Z097, __LINE__, 0x00, 0x00, Local0, 0x05) Return (0x01) } @@ -217,7 +217,7 @@ { If ((I000 != Arg1)) { - ERR (Arg0, Z097, 0xC1, 0x00, 0x00, I000, Arg1) + ERR (Arg0, Z097, __LINE__, 0x00, 0x00, I000, Arg1) } } diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_06_dev.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_06_dev.asl index 80a8884fe..956a439e8 100644 --- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_06_dev.asl +++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_06_dev.asl @@ -370,7 +370,7 @@ Local0 = ObjectType (Arg1) If ((Local0 != 0x06)) { - ERR (Arg0, Z098, 0x01BC, 0x00, 0x00, Local0, 0x06) + ERR (Arg0, Z098, __LINE__, 0x00, 0x00, Local0, 0x06) Return (0x01) } @@ -982,7 +982,7 @@ { If ((I000 != Arg1)) { - ERR (Arg0, Z098, 0x04A5, 0x00, 0x00, I000, Arg1) + ERR (Arg0, Z098, __LINE__, 0x00, 0x00, I000, Arg1) } } diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_07_event.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_07_event.asl index 8bca4450a..1bcb32e43 100644 --- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_07_event.asl +++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_07_event.asl @@ -360,7 +360,7 @@ Local0 = ObjectType (Arg1) If ((Local0 != 0x07)) { - ERR (Arg0, Z099, 0x01BB, 0x00, 0x00, Local0, 0x07) + ERR (Arg0, Z099, __LINE__, 0x00, 0x00, Local0, 0x07) Return (0x01) } @@ -973,7 +973,7 @@ { If ((I000 != Arg1)) { - ERR (Arg0, Z099, 0x04A7, 0x00, 0x00, I000, Arg1) + ERR (Arg0, Z099, __LINE__, 0x00, 0x00, I000, Arg1) } } diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_08_method.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_08_method.asl index 47f83cda9..497741b7e 100644 --- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_08_method.asl +++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_08_method.asl @@ -381,7 +381,7 @@ Local0 = ObjectType (Arg1) If ((Local0 != 0x08)) { - ERR (Arg0, Z100, 0x01B9, 0x00, 0x00, Local0, 0x08) + ERR (Arg0, Z100, __LINE__, 0x00, 0x00, Local0, 0x08) Return (0x01) } @@ -998,7 +998,7 @@ { If ((I000 != Arg1)) { - ERR (Arg0, Z100, 0x04A4, 0x00, 0x00, I000, Arg1) + ERR (Arg0, Z100, __LINE__, 0x00, 0x00, I000, Arg1) } } diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_09_mux.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_09_mux.asl index 52500f95c..16a5ead86 100644 --- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_09_mux.asl +++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_09_mux.asl @@ -367,7 +367,7 @@ Local0 = ObjectType (Arg1) If ((Local0 != 0x09)) { - ERR (Arg0, Z101, 0x01BE, 0x00, 0x00, Local0, 0x09) + ERR (Arg0, Z101, __LINE__, 0x00, 0x00, Local0, 0x09) Return (0x01) } @@ -980,7 +980,7 @@ { If ((I000 != Arg1)) { - ERR (Arg0, Z101, 0x04A8, 0x00, 0x00, I000, Arg1) + ERR (Arg0, Z101, __LINE__, 0x00, 0x00, I000, Arg1) } } diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_10_oreg.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_10_oreg.asl index 4f2273ec8..8f9adf9fe 100644 --- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_10_oreg.asl +++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_10_oreg.asl @@ -367,7 +367,7 @@ Local0 = ObjectType (Arg1) If ((Local0 != 0x0A)) { - ERR (Arg0, Z102, 0x01BF, 0x00, 0x00, Local0, 0x0A) + ERR (Arg0, Z102, __LINE__, 0x00, 0x00, Local0, 0x0A) Return (0x01) } @@ -968,7 +968,7 @@ { If ((I000 != Arg1)) { - ERR (Arg0, Z102, 0x04A1, 0x00, 0x00, I000, Arg1) + ERR (Arg0, Z102, __LINE__, 0x00, 0x00, I000, Arg1) } } diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_11_pwr.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_11_pwr.asl index 6cd9108b9..543f335ce 100644 --- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_11_pwr.asl +++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_11_pwr.asl @@ -388,7 +388,7 @@ Local0 = ObjectType (Arg1) If ((Local0 != 0x0B)) { - ERR (Arg0, Z103, 0x01BD, 0x00, 0x00, Local0, 0x0B) + ERR (Arg0, Z103, __LINE__, 0x00, 0x00, Local0, 0x0B) Return (0x01) } @@ -1008,7 +1008,7 @@ { If ((I000 != Arg1)) { - ERR (Arg0, Z103, 0x04A8, 0x00, 0x00, I000, Arg1) + ERR (Arg0, Z103, __LINE__, 0x00, 0x00, I000, Arg1) } } diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_12_proc.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_12_proc.asl index f5258ea02..53b652a5f 100644 --- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_12_proc.asl +++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_12_proc.asl @@ -367,7 +367,7 @@ Local0 = ObjectType (Arg1) If ((Local0 != 0x0C)) { - ERR (Arg0, Z104, 0x01BF, 0x00, 0x00, Local0, 0x0C) + ERR (Arg0, Z104, __LINE__, 0x00, 0x00, Local0, 0x0C) Return (0x01) } @@ -980,7 +980,7 @@ { If ((I000 != Arg1)) { - ERR (Arg0, Z104, 0x04AA, 0x00, 0x00, I000, Arg1) + ERR (Arg0, Z104, __LINE__, 0x00, 0x00, I000, Arg1) } } diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_13_tzone.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_13_tzone.asl index 2b8f56c51..f653cffb9 100644 --- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_13_tzone.asl +++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_13_tzone.asl @@ -378,7 +378,7 @@ Local0 = ObjectType (Arg1) If ((Local0 != 0x0D)) { - ERR (Arg0, Z105, 0x01BF, 0x00, 0x00, Local0, 0x0D) + ERR (Arg0, Z105, __LINE__, 0x00, 0x00, Local0, 0x0D) Return (0x01) } @@ -991,7 +991,7 @@ { If ((I000 != Arg1)) { - ERR (Arg0, Z105, 0x04A7, 0x00, 0x00, I000, Arg1) + ERR (Arg0, Z105, __LINE__, 0x00, 0x00, I000, Arg1) } } diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_14_bfield.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_14_bfield.asl index 5b1d41fcf..27065be92 100644 --- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_14_bfield.asl +++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_14_bfield.asl @@ -132,7 +132,7 @@ Local0 = ObjectType (Arg1) If ((Local0 != 0x0E)) { - ERR (Arg0, Z106, 0x84, 0x00, 0x00, Local0, 0x0E) + ERR (Arg0, Z106, __LINE__, 0x00, 0x00, Local0, 0x0E) Return (0x01) } @@ -201,7 +201,7 @@ { If ((I000 != Arg1)) { - ERR (Arg0, Z106, 0xBD, 0x00, 0x00, I000, Arg1) + ERR (Arg0, Z106, __LINE__, 0x00, 0x00, I000, Arg1) } } diff --git a/tests/aslts/src/runtime/collections/functional/arithmetic/arithmetic.asl b/tests/aslts/src/runtime/collections/functional/arithmetic/arithmetic.asl index c224adbe6..6aea0b4b0 100644 --- a/tests/aslts/src/runtime/collections/functional/arithmetic/arithmetic.asl +++ b/tests/aslts/src/runtime/collections/functional/arithmetic/arithmetic.asl @@ -53,13 +53,13 @@ Local7 = (Local0 + Local1) If ((Local7 != Local2)) { - ERR (Arg0, Z083, 0x3A, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z083, __LINE__, 0x00, 0x00, Local5, Arg2) } Local7 = (Local1 + Local0) If ((Local7 != Local2)) { - ERR (Arg0, Z083, 0x3E, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z083, __LINE__, 0x00, 0x00, Local5, Arg2) } } Case (0x01) @@ -67,7 +67,7 @@ Local7 = (Local0 - Local1) If ((Local7 != Local2)) { - ERR (Arg0, Z083, 0x44, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z083, __LINE__, 0x00, 0x00, Local5, Arg2) } } Case (0x02) @@ -75,13 +75,13 @@ Local7 = (Local0 * Local1) If ((Local7 != Local2)) { - ERR (Arg0, Z083, 0x4A, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z083, __LINE__, 0x00, 0x00, Local5, Arg2) } Local7 = (Local1 * Local0) If ((Local7 != Local2)) { - ERR (Arg0, Z083, 0x4E, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z083, __LINE__, 0x00, 0x00, Local5, Arg2) } } Case (0x03) @@ -89,13 +89,13 @@ Local7 = (Local0 & Local1) If ((Local7 != Local2)) { - ERR (Arg0, Z083, 0x54, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z083, __LINE__, 0x00, 0x00, Local5, Arg2) } Local7 = (Local1 & Local0) If ((Local7 != Local2)) { - ERR (Arg0, Z083, 0x58, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z083, __LINE__, 0x00, 0x00, Local5, Arg2) } } Case (0x04) @@ -103,13 +103,13 @@ NAnd (Local0, Local1, Local7) If ((Local7 != Local2)) { - ERR (Arg0, Z083, 0x5E, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z083, __LINE__, 0x00, 0x00, Local5, Arg2) } NAnd (Local1, Local0, Local7) If ((Local7 != Local2)) { - ERR (Arg0, Z083, 0x62, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z083, __LINE__, 0x00, 0x00, Local5, Arg2) } } Case (0x05) @@ -117,13 +117,13 @@ NOr (Local0, Local1, Local7) If ((Local7 != Local2)) { - ERR (Arg0, Z083, 0x68, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z083, __LINE__, 0x00, 0x00, Local5, Arg2) } NOr (Local1, Local0, Local7) If ((Local7 != Local2)) { - ERR (Arg0, Z083, 0x6C, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z083, __LINE__, 0x00, 0x00, Local5, Arg2) } } Case (0x06) @@ -131,13 +131,13 @@ Local7 = (Local0 | Local1) If ((Local7 != Local2)) { - ERR (Arg0, Z083, 0x72, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z083, __LINE__, 0x00, 0x00, Local5, Arg2) } Local7 = (Local1 | Local0) If ((Local7 != Local2)) { - ERR (Arg0, Z083, 0x76, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z083, __LINE__, 0x00, 0x00, Local5, Arg2) } } Case (0x07) @@ -145,13 +145,13 @@ Local7 = (Local0 ^ Local1) If ((Local7 != Local2)) { - ERR (Arg0, Z083, 0x7C, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z083, __LINE__, 0x00, 0x00, Local5, Arg2) } Local7 = (Local1 ^ Local0) If ((Local7 != Local2)) { - ERR (Arg0, Z083, 0x80, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z083, __LINE__, 0x00, 0x00, Local5, Arg2) } } Case (0x08) @@ -159,7 +159,7 @@ Local7 = (Local0 % Local1) If ((Local7 != Local2)) { - ERR (Arg0, Z083, 0x86, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z083, __LINE__, 0x00, 0x00, Local5, Arg2) } } Case (0x09) @@ -167,7 +167,7 @@ Local7 = (Local0 << Local1) If ((Local7 != Local2)) { - ERR (Arg0, Z083, 0x8C, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z083, __LINE__, 0x00, 0x00, Local5, Arg2) } } Case (0x0A) @@ -175,7 +175,7 @@ Local7 = (Local0 >> Local1) If ((Local7 != Local2)) { - ERR (Arg0, Z083, 0x92, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z083, __LINE__, 0x00, 0x00, Local5, Arg2) } } @@ -213,12 +213,12 @@ Divide (Local0, Local1, Local6, Local7) If ((Local7 != Local2)) { - ERR (Arg0, Z083, 0xB5, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z083, __LINE__, 0x00, 0x00, Local5, Arg2) } If ((Local6 != Local3)) { - ERR (Arg0, Z083, 0xB8, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z083, __LINE__, 0x00, 0x00, Local5, Arg2) } } @@ -250,7 +250,7 @@ Local0++ If ((Local0 != Local1)) { - ERR (Arg0, Z083, 0xD5, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z083, __LINE__, 0x00, 0x00, Local5, Arg2) } } Case (0x01) @@ -258,7 +258,7 @@ Local0-- If ((Local0 != Local1)) { - ERR (Arg0, Z083, 0xDB, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z083, __LINE__, 0x00, 0x00, Local5, Arg2) } } Case (0x02) @@ -266,7 +266,7 @@ Local2 = ~Local0 If ((Local2 != Local1)) { - ERR (Arg0, Z083, 0xE1, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z083, __LINE__, 0x00, 0x00, Local5, Arg2) } } Case (0x03) @@ -274,7 +274,7 @@ FindSetLeftBit (Local0, Local2) If ((Local2 != Local1)) { - ERR (Arg0, Z083, 0xE7, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z083, __LINE__, 0x00, 0x00, Local5, Arg2) } } Case (0x04) @@ -282,7 +282,7 @@ FindSetRightBit (Local0, Local2) If ((Local2 != Local1)) { - ERR (Arg0, Z083, 0xED, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z083, __LINE__, 0x00, 0x00, Local5, Arg2) } } @@ -1635,7 +1635,7 @@ Local4 = (Local1 + 0x01) If ((Local3 != Local4)) { - ERR (__METHOD__, Z083, 0x05A4, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, Z083, __LINE__, 0x00, 0x00, Local0, 0x00) } Local1++ @@ -1704,7 +1704,7 @@ FindSetRightBit (Local2, Local3) If ((Local3 != Local4)) { - ERR (__METHOD__, Z083, 0x05E1, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, Z083, __LINE__, 0x00, 0x00, Local0, 0x00) } Local1++ diff --git a/tests/aslts/src/runtime/collections/functional/bfield/crbuffield.asl b/tests/aslts/src/runtime/collections/functional/bfield/crbuffield.asl index d74342be2..c58c9b0cb 100644 --- a/tests/aslts/src/runtime/collections/functional/bfield/crbuffield.asl +++ b/tests/aslts/src/runtime/collections/functional/bfield/crbuffield.asl @@ -155,13 +155,13 @@ Local0 = F001 /* \M210.F001 */ If ((Local0 != 0x00)) { - ERR (Arg0, Z001, 0xAF, 0x00, 0x00, Local0, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, 0x00) } B002 = Arg2 If ((B001 != B002)) { - ERR (Arg0, Z001, 0xB5, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, 0x00, 0x00) } If (PR00) @@ -181,13 +181,13 @@ Local0 = F001 /* \M210.F001 */ If ((Local0 != 0x00)) { - ERR (Arg0, Z001, 0xC9, 0x00, 0x00, Local0, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, 0x00) } B002 = Arg5 If ((B001 != B002)) { - ERR (Arg0, Z001, 0xCF, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, 0x00, 0x00) } If (PR00) @@ -207,13 +207,13 @@ Local0 = F001 /* \M210.F001 */ If ((Local0 != 0x01)) { - ERR (Arg0, Z001, 0xE2, 0x00, 0x00, Local0, 0x01) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, 0x01) } B002 = Arg3 If ((B001 != B002)) { - ERR (Arg0, Z001, 0xE8, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, 0x00, 0x00) } If (PR00) @@ -233,13 +233,13 @@ Local0 = F001 /* \M210.F001 */ If ((Local0 != 0x01)) { - ERR (Arg0, Z001, 0xFB, 0x00, 0x00, Local0, 0x01) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, 0x01) } B002 = Arg4 If ((B001 != B002)) { - ERR (Arg0, Z001, 0x0101, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, 0x00, 0x00) } If (PR00) @@ -252,19 +252,19 @@ Local0 = SizeOf (B001) If ((Local0 != Arg6)) { - ERR (Arg0, Z001, 0x010C, 0x00, 0x00, Local0, Arg6) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, Arg6) } Local0 = SizeOf (B002) If ((Local0 != Arg6)) { - ERR (Arg0, Z001, 0x0111, 0x00, 0x00, Local0, Arg6) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, Arg6) } Local0 = ObjectType (F001) If ((Local0 != C016)) { - ERR (Arg0, Z001, 0x0116, 0x00, 0x00, Local0, C016) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, C016) } If (PR00) @@ -293,7 +293,7 @@ { If ((NCUR >= BSZ1)) { - ERR (__METHOD__, Z001, 0x0136, 0x00, 0x00, NCUR, BSZ1) + ERR (__METHOD__, Z001, __LINE__, 0x00, 0x00, NCUR, BSZ1) Break } @@ -338,13 +338,13 @@ Local0 = F001 /* \M212.F001 */ If ((Local0 != 0x00)) { - ERR (Arg0, Z001, 0x016A, 0x00, 0x00, Local0, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, 0x00) } B002 = B000 /* \B000 */ If ((B001 != B002)) { - ERR (Arg0, Z001, 0x0170, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, 0x00, 0x00) } If (PR00) @@ -364,13 +364,13 @@ Local0 = F001 /* \M212.F001 */ If ((Local0 != 0x00)) { - ERR (Arg0, Z001, 0x0184, 0x00, 0x00, Local0, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, 0x00) } B002 = B101 /* \B101 */ If ((B001 != B002)) { - ERR (Arg0, Z001, 0x018A, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, 0x00, 0x00) } If (PR00) @@ -390,13 +390,13 @@ Local0 = F001 /* \M212.F001 */ If ((Local0 != 0xFF)) { - ERR (Arg0, Z001, 0x019D, 0x00, 0x00, Local0, 0xFF) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, 0xFF) } B002 = B0FF /* \B0FF */ If ((B001 != B002)) { - ERR (Arg0, Z001, 0x01A3, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, 0x00, 0x00) } If (PR00) @@ -416,13 +416,13 @@ Local0 = F001 /* \M212.F001 */ If ((Local0 != 0xFF)) { - ERR (Arg0, Z001, 0x01B6, 0x00, 0x00, Local0, 0xFF) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, 0xFF) } B002 = B010 /* \B010 */ If ((B001 != B002)) { - ERR (Arg0, Z001, 0x01BC, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, 0x00, 0x00) } If (PR00) @@ -442,13 +442,13 @@ Local0 = F001 /* \M212.F001 */ If ((Local0 != 0x96)) { - ERR (Arg0, Z001, 0x01CF, 0x00, 0x00, Local0, 0x96) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, 0x96) } B002 = B0B0 /* \B0B0 */ If ((B001 != B002)) { - ERR (Arg0, Z001, 0x01D5, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, 0x00, 0x00) } If (PR00) @@ -461,19 +461,19 @@ Local0 = SizeOf (B001) If ((Local0 != Arg2)) { - ERR (Arg0, Z001, 0x01E0, 0x00, 0x00, Local0, Arg2) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, Arg2) } Local0 = SizeOf (B002) If ((Local0 != Arg2)) { - ERR (Arg0, Z001, 0x01E5, 0x00, 0x00, Local0, Arg2) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, Arg2) } Local0 = ObjectType (F001) If ((Local0 != C016)) { - ERR (Arg0, Z001, 0x01EA, 0x00, 0x00, Local0, C016) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, C016) } If (PR00) @@ -502,7 +502,7 @@ { If ((NCUR >= BSZ1)) { - ERR (__METHOD__, Z001, 0x020A, 0x00, 0x00, NCUR, BSZ1) + ERR (__METHOD__, Z001, __LINE__, 0x00, 0x00, NCUR, BSZ1) Break } @@ -548,13 +548,13 @@ Local0 = F001 /* \M214.F001 */ If ((Local0 != 0x00)) { - ERR (Arg0, Z001, 0x023E, 0x00, 0x00, Local0, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, 0x00) } B002 = B000 /* \B000 */ If ((B001 != B002)) { - ERR (Arg0, Z001, 0x0244, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, 0x00, 0x00) } If (PR00) @@ -574,13 +574,13 @@ Local0 = F001 /* \M214.F001 */ If ((Local0 != 0x00)) { - ERR (Arg0, Z001, 0x0258, 0x00, 0x00, Local0, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, 0x00) } B002 = B101 /* \B101 */ If ((B001 != B002)) { - ERR (Arg0, Z001, 0x025E, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, 0x00, 0x00) } If (PR00) @@ -600,13 +600,13 @@ Local0 = F001 /* \M214.F001 */ If ((Local0 != 0xFFFF)) { - ERR (Arg0, Z001, 0x0271, 0x00, 0x00, Local0, 0xFFFF) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, 0xFFFF) } B002 = B0FF /* \B0FF */ If ((B001 != B002)) { - ERR (Arg0, Z001, 0x0277, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, 0x00, 0x00) } If (PR00) @@ -626,13 +626,13 @@ Local0 = F001 /* \M214.F001 */ If ((Local0 != 0xFFFF)) { - ERR (Arg0, Z001, 0x028A, 0x00, 0x00, Local0, 0xFFFF) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, 0xFFFF) } B002 = B010 /* \B010 */ If ((B001 != B002)) { - ERR (Arg0, Z001, 0x0290, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, 0x00, 0x00) } If (PR00) @@ -643,13 +643,13 @@ Local0 = SizeOf (B001) If ((Local0 != Arg2)) { - ERR (Arg0, Z001, 0x0299, 0x00, 0x00, Local0, Arg2) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, Arg2) } Local0 = SizeOf (B002) If ((Local0 != Arg2)) { - ERR (Arg0, Z001, 0x029E, 0x00, 0x00, Local0, Arg2) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, Arg2) } /*////////////// E. 0->1 (000->010) */ @@ -664,13 +664,13 @@ Local0 = F001 /* \M214.F001 */ If ((Local0 != 0x7698)) { - ERR (Arg0, Z001, 0x02AD, 0x00, 0x00, Local0, 0x7698) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, 0x7698) } B002 = B0B0 /* \B0B0 */ If ((B001 != B002)) { - ERR (Arg0, Z001, 0x02B3, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, 0x00, 0x00) } If (PR00) @@ -683,19 +683,19 @@ Local0 = SizeOf (B001) If ((Local0 != Arg2)) { - ERR (Arg0, Z001, 0x02BE, 0x00, 0x00, Local0, Arg2) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, Arg2) } Local0 = SizeOf (B002) If ((Local0 != Arg2)) { - ERR (Arg0, Z001, 0x02C3, 0x00, 0x00, Local0, Arg2) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, Arg2) } Local0 = ObjectType (F001) If ((Local0 != C016)) { - ERR (Arg0, Z001, 0x02C8, 0x00, 0x00, Local0, C016) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, C016) } If (PR00) @@ -724,7 +724,7 @@ { If ((NCUR >= BSZ1)) { - ERR (__METHOD__, Z001, 0x02E8, 0x00, 0x00, NCUR, BSZ1) + ERR (__METHOD__, Z001, __LINE__, 0x00, 0x00, NCUR, BSZ1) Break } @@ -775,13 +775,13 @@ Local0 = F001 /* \M216.F001 */ If ((Local0 != 0x00)) { - ERR (Arg0, Z001, 0x0324, 0x00, 0x00, Local0, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, 0x00) } B002 = B000 /* \B000 */ If ((B001 != B002)) { - ERR (Arg0, Z001, 0x032A, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, 0x00, 0x00) } If (PR00) @@ -801,13 +801,13 @@ Local0 = F001 /* \M216.F001 */ If ((Local0 != 0x00)) { - ERR (Arg0, Z001, 0x033E, 0x00, 0x00, Local0, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, 0x00) } B002 = B101 /* \B101 */ If ((B001 != B002)) { - ERR (Arg0, Z001, 0x0344, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, 0x00, 0x00) } If (PR00) @@ -827,13 +827,13 @@ Local0 = F001 /* \M216.F001 */ If ((Local0 != 0xFFFFFFFF)) { - ERR (Arg0, Z001, 0x0357, 0x00, 0x00, Local0, 0xFFFFFFFF) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, 0xFFFFFFFF) } B002 = B0FF /* \B0FF */ If ((B001 != B002)) { - ERR (Arg0, Z001, 0x035D, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, 0x00, 0x00) } If (PR00) @@ -853,13 +853,13 @@ Local0 = F001 /* \M216.F001 */ If ((Local0 != 0xFFFFFFFF)) { - ERR (Arg0, Z001, 0x0370, 0x00, 0x00, Local0, 0xFFFFFFFF) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, 0xFFFFFFFF) } B002 = B010 /* \B010 */ If ((B001 != B002)) { - ERR (Arg0, Z001, 0x0376, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, 0x00, 0x00) } If (PR00) @@ -870,13 +870,13 @@ Local0 = SizeOf (B001) If ((Local0 != Arg2)) { - ERR (Arg0, Z001, 0x037F, 0x00, 0x00, Local0, Arg2) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, Arg2) } Local0 = SizeOf (B002) If ((Local0 != Arg2)) { - ERR (Arg0, Z001, 0x0384, 0x00, 0x00, Local0, Arg2) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, Arg2) } /*////////////// E. 0->1 (000->010) */ @@ -891,13 +891,13 @@ Local0 = F001 /* \M216.F001 */ If ((Local0 != 0x32547698)) { - ERR (Arg0, Z001, 0x0393, 0x00, 0x00, Local0, 0x32547698) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, 0x32547698) } B002 = B0B0 /* \B0B0 */ If ((B001 != B002)) { - ERR (Arg0, Z001, 0x0399, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, 0x00, 0x00) } If (PR00) @@ -910,19 +910,19 @@ Local0 = SizeOf (B001) If ((Local0 != Arg2)) { - ERR (Arg0, Z001, 0x03A4, 0x00, 0x00, Local0, Arg2) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, Arg2) } Local0 = SizeOf (B002) If ((Local0 != Arg2)) { - ERR (Arg0, Z001, 0x03A9, 0x00, 0x00, Local0, Arg2) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, Arg2) } Local0 = ObjectType (F001) If ((Local0 != C016)) { - ERR (Arg0, Z001, 0x03AE, 0x00, 0x00, Local0, C016) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, C016) } If (PR00) @@ -951,7 +951,7 @@ { If ((NCUR >= BSZ1)) { - ERR (__METHOD__, Z001, 0x03CE, 0x00, 0x00, NCUR, BSZ1) + ERR (__METHOD__, Z001, __LINE__, 0x00, 0x00, NCUR, BSZ1) Break } @@ -1033,18 +1033,18 @@ { If ((Local0 != 0x00)) { - ERR (Arg0, Z001, 0x0426, 0x00, 0x00, Local0, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, 0x00) } } ElseIf ((Local0 != BB00)) { - ERR (Arg0, Z001, 0x042A, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, 0x00, 0x00) } B002 = B000 /* \B000 */ If ((B001 != B002)) { - ERR (Arg0, Z001, 0x0431, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, 0x00, 0x00) } If (PR00) @@ -1068,18 +1068,18 @@ { If ((Local0 != 0x00)) { - ERR (Arg0, Z001, 0x0448, 0x00, 0x00, Local0, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, 0x00) } } ElseIf ((Local0 != BB00)) { - ERR (Arg0, Z001, 0x044C, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, 0x00, 0x00) } B002 = B101 /* \B101 */ If ((B001 != B002)) { - ERR (Arg0, Z001, 0x0453, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, 0x00, 0x00) } If (PR00) @@ -1105,7 +1105,7 @@ { If ((Local0 != 0xFFFFFFFFFFFFFFFF)) { - ERR (Arg0, Z001, 0x046B, 0x00, 0x00, Local0, 0xFFFFFFFFFFFFFFFF) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, 0xFFFFFFFFFFFFFFFF) } } ElseIf ((Local0 != BB01)) @@ -1118,7 +1118,7 @@ Debug = "=========================." } - ERR (Arg0, Z001, 0x0477, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, 0x00, 0x00) } B002 = B0FF /* \B0FF */ @@ -1139,7 +1139,7 @@ Debug = "=========================." } - ERR (Arg0, Z001, 0x048B, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, 0x00, 0x00) } If (PR00) @@ -1181,7 +1181,7 @@ { If ((Local0 != 0xFFFFFFFFFFFFFFFF)) { - ERR (Arg0, Z001, 0x04B3, 0x00, 0x00, Local0, 0xFFFFFFFFFFFFFFFF) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, 0xFFFFFFFFFFFFFFFF) } } ElseIf ((Local0 != BB01)) @@ -1194,7 +1194,7 @@ Debug = "=========================." } - ERR (Arg0, Z001, 0x04BF, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, 0x00, 0x00) } B002 = B010 /* \B010 */ @@ -1215,7 +1215,7 @@ Debug = "=========================." } - ERR (Arg0, Z001, 0x04D3, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, 0x00, 0x00) } If (PR00) @@ -1227,13 +1227,13 @@ Local0 = SizeOf (B001) If ((Local0 != Arg2)) { - ERR (Arg0, Z001, 0x04DD, 0x00, 0x00, Local0, Arg2) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, Arg2) } Local0 = SizeOf (B002) If ((Local0 != Arg2)) { - ERR (Arg0, Z001, 0x04E2, 0x00, 0x00, Local0, Arg2) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, Arg2) } /*////////////// E. 0->1 (000->010) */ @@ -1264,12 +1264,12 @@ { If ((Local0 != 0xEFCDAB1032547698)) { - ERR (Arg0, Z001, 0x04FF, 0x00, 0x00, Local0, 0xEFCDAB1032547698) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, 0xEFCDAB1032547698) } } ElseIf ((Local0 != BB02)) { - ERR (Arg0, Z001, 0x0503, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, 0x00, 0x00) } B002 = B0B0 /* \B0B0 */ @@ -1282,7 +1282,7 @@ If ((B001 != B002)) { - ERR (Arg0, Z001, 0x050F, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, 0x00, 0x00) } If (PR00) @@ -1297,19 +1297,19 @@ Local0 = SizeOf (B001) If ((Local0 != Arg2)) { - ERR (Arg0, Z001, 0x051C, 0x00, 0x00, Local0, Arg2) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, Arg2) } Local0 = SizeOf (B002) If ((Local0 != Arg2)) { - ERR (Arg0, Z001, 0x0521, 0x00, 0x00, Local0, Arg2) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, Arg2) } Local0 = ObjectType (F001) If ((Local0 != C016)) { - ERR (Arg0, Z001, 0x0526, 0x00, 0x00, Local0, C016) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, C016) } If (PR00) @@ -1350,7 +1350,7 @@ { If ((NCUR >= BSZ1)) { - ERR (__METHOD__, Z001, 0x054F, 0x00, 0x00, NCUR, BSZ1) + ERR (__METHOD__, Z001, __LINE__, 0x00, 0x00, NCUR, BSZ1) Break } @@ -1445,7 +1445,7 @@ Local0 = ObjectType (F001) If ((Local0 != C016)) { - ERR (Arg0, Z001, 0x05BE, 0x00, 0x00, Local0, C016) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, C016) } /* Fill the entire buffer (ground) */ @@ -1481,12 +1481,12 @@ INT1 = Arg5 If ((Local0 != INT1)) { - ERR (Arg0, Z001, 0x05E2, 0x00, 0x00, Local0, INT1) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, Local0, INT1) } } ElseIf ((Local0 != Arg5)) { - ERR (Arg0, Z001, 0x05E6, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, 0x00, 0x00) } /* Check the contents of Buffer */ @@ -1494,7 +1494,7 @@ B002 = B0B0 /* \B0B0 */ If ((B001 != B002)) { - ERR (Arg0, Z001, 0x05EF, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, 0x00, 0x00) If (PR00) { Debug = "EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE:" @@ -1549,7 +1549,7 @@ If ((Arg3 == 0x00)) { - ERR (Arg0, Z001, 0x0629, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z001, __LINE__, 0x00, 0x00, 0x00, 0x00) Return (Ones) } diff --git a/tests/aslts/src/runtime/collections/functional/constant/constants.asl b/tests/aslts/src/runtime/collections/functional/constant/constants.asl index b889a6a3c..1dcedb0df 100644 --- a/tests/aslts/src/runtime/collections/functional/constant/constants.asl +++ b/tests/aslts/src/runtime/collections/functional/constant/constants.asl @@ -35,34 +35,34 @@ { If ((Zero != 0x00)) { - ERR (__METHOD__, Z002, 0x29, 0x00, 0x00, Zero, 0x00) + ERR (__METHOD__, Z002, __LINE__, 0x00, 0x00, Zero, 0x00) } If ((One != 0x01)) { - ERR (__METHOD__, Z002, 0x2D, 0x00, 0x00, One, 0x01) + ERR (__METHOD__, Z002, __LINE__, 0x00, 0x00, One, 0x01) } If ((F64 == 0x01)) { If ((Ones != 0xFFFFFFFFFFFFFFFF)) { - ERR (__METHOD__, Z002, 0x32, 0x00, 0x00, Ones, 0xFFFFFFFFFFFFFFFF) + ERR (__METHOD__, Z002, __LINE__, 0x00, 0x00, Ones, 0xFFFFFFFFFFFFFFFF) } } ElseIf ((Ones != 0xFFFFFFFF)) { - ERR (__METHOD__, Z002, 0x36, 0x00, 0x00, Ones, 0xFFFFFFFF) + ERR (__METHOD__, Z002, __LINE__, 0x00, 0x00, Ones, 0xFFFFFFFF) } If ((Revision < 0x20140114)) { - ERR (__METHOD__, Z002, 0x3B, 0x00, 0x00, Revision, 0x20050114) + ERR (__METHOD__, Z002, __LINE__, 0x00, 0x00, Revision, 0x20050114) } If ((Revision > 0x20500000)) { - ERR (__METHOD__, Z002, 0x3F, 0x00, 0x00, Revision, 0x20500000) + ERR (__METHOD__, Z002, __LINE__, 0x00, 0x00, Revision, 0x20500000) } /* @@ -74,6 +74,6 @@ */ If ((\_REV != 0x02)) { - ERR (__METHOD__, Z002, 0x4A, 0x00, 0x00, \_REV, 0x02) + ERR (__METHOD__, Z002, __LINE__, 0x00, 0x00, \_REV, 0x02) } } diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/fixeddma.asl b/tests/aslts/src/runtime/collections/functional/descriptor/fixeddma.asl index 2f751b107..580627d90 100644 --- a/tests/aslts/src/runtime/collections/functional/descriptor/fixeddma.asl +++ b/tests/aslts/src/runtime/collections/functional/descriptor/fixeddma.asl @@ -123,7 +123,7 @@ If ((SizeOf (P450) != SizeOf (P451))) { - ERR (__METHOD__, 0xB1, 0x00, 0x00, 0x00, 0x00, "Incorrect package length") + ERR (__METHOD__, 0xB1, __LINE__, 0x00, 0x00, 0x00, "Incorrect package length") Return (Zero) } diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/gpioint.asl b/tests/aslts/src/runtime/collections/functional/descriptor/gpioint.asl index 3b4df723f..c8c04c7c3 100644 --- a/tests/aslts/src/runtime/collections/functional/descriptor/gpioint.asl +++ b/tests/aslts/src/runtime/collections/functional/descriptor/gpioint.asl @@ -7357,7 +7357,7 @@ If ((SizeOf (P452) != SizeOf (P453))) { - ERR (__METHOD__, 0xB2, 0x00, 0x00, 0x00, 0x00, "Incorrect package length") + ERR (__METHOD__, 0xB2, __LINE__, 0x00, 0x00, 0x00, "Incorrect package length") Return (Zero) } diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/gpioio.asl b/tests/aslts/src/runtime/collections/functional/descriptor/gpioio.asl index deb36f336..3b4a0907f 100644 --- a/tests/aslts/src/runtime/collections/functional/descriptor/gpioio.asl +++ b/tests/aslts/src/runtime/collections/functional/descriptor/gpioio.asl @@ -5333,7 +5333,7 @@ If ((SizeOf (P454) != SizeOf (P455))) { - ERR (__METHOD__, 0xB3, 0x00, 0x00, 0x00, 0x00, "Incorrect package length") + ERR (__METHOD__, 0xB3, __LINE__, 0x00, 0x00, 0x00, "Incorrect package length") Return (Zero) } diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/i2cserialbus.asl b/tests/aslts/src/runtime/collections/functional/descriptor/i2cserialbus.asl index 1aa88016c..d4f97f001 100644 --- a/tests/aslts/src/runtime/collections/functional/descriptor/i2cserialbus.asl +++ b/tests/aslts/src/runtime/collections/functional/descriptor/i2cserialbus.asl @@ -477,7 +477,7 @@ If ((SizeOf (P456) != SizeOf (P457))) { - ERR (__METHOD__, 0xB4, 0x00, 0x00, 0x00, 0x00, "Incorrect package length") + ERR (__METHOD__, 0xB4, __LINE__, 0x00, 0x00, 0x00, "Incorrect package length") Return (Zero) } diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/pinconfig.asl b/tests/aslts/src/runtime/collections/functional/descriptor/pinconfig.asl index 694abd574..afa9cb167 100644 --- a/tests/aslts/src/runtime/collections/functional/descriptor/pinconfig.asl +++ b/tests/aslts/src/runtime/collections/functional/descriptor/pinconfig.asl @@ -1087,7 +1087,7 @@ If ((SizeOf (P45E) != SizeOf (P45F))) { - ERR (__METHOD__, 0xB3, 0x00, 0x00, 0x00, 0x00, "Incorrect package length") + ERR (__METHOD__, 0xB3, __LINE__, 0x00, 0x00, 0x00, "Incorrect package length") Return (Zero) } diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/pinfunction.asl b/tests/aslts/src/runtime/collections/functional/descriptor/pinfunction.asl index 1c9046588..2caf55bf3 100644 --- a/tests/aslts/src/runtime/collections/functional/descriptor/pinfunction.asl +++ b/tests/aslts/src/runtime/collections/functional/descriptor/pinfunction.asl @@ -301,7 +301,7 @@ If ((SizeOf (P45C) != SizeOf (P45D))) { - ERR (__METHOD__, 0xB3, 0x00, 0x00, 0x00, 0x00, "Incorrect package length") + ERR (__METHOD__, 0xB3, __LINE__, 0x00, 0x00, 0x00, "Incorrect package length") Return (Zero) } diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/pingroup.asl b/tests/aslts/src/runtime/collections/functional/descriptor/pingroup.asl index e49c248b8..52f4f749b 100644 --- a/tests/aslts/src/runtime/collections/functional/descriptor/pingroup.asl +++ b/tests/aslts/src/runtime/collections/functional/descriptor/pingroup.asl @@ -243,7 +243,7 @@ If ((SizeOf (P460) != SizeOf (P461))) { - ERR (__METHOD__, 0xB3, 0x00, 0x00, 0x00, 0x00, "Incorrect package length") + ERR (__METHOD__, 0xB3, __LINE__, 0x00, 0x00, 0x00, "Incorrect package length") Return (Zero) } diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/pingroupconfig.asl b/tests/aslts/src/runtime/collections/functional/descriptor/pingroupconfig.asl index bee68d713..54281f258 100644 --- a/tests/aslts/src/runtime/collections/functional/descriptor/pingroupconfig.asl +++ b/tests/aslts/src/runtime/collections/functional/descriptor/pingroupconfig.asl @@ -695,7 +695,7 @@ If ((SizeOf (P464) != SizeOf (P465))) { - ERR (__METHOD__, 0xB3, 0x00, 0x00, 0x00, 0x00, "Incorrect package length") + ERR (__METHOD__, 0xB3, __LINE__, 0x00, 0x00, 0x00, "Incorrect package length") Return (Zero) } diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/pingroupfunction.asl b/tests/aslts/src/runtime/collections/functional/descriptor/pingroupfunction.asl index efcaa3859..9672e1e94 100644 --- a/tests/aslts/src/runtime/collections/functional/descriptor/pingroupfunction.asl +++ b/tests/aslts/src/runtime/collections/functional/descriptor/pingroupfunction.asl @@ -159,7 +159,7 @@ If ((SizeOf (P462) != SizeOf (P463))) { - ERR (__METHOD__, 0xB3, 0x00, 0x00, 0x00, 0x00, "Incorrect package length") + ERR (__METHOD__, 0xB3, __LINE__, 0x00, 0x00, 0x00, "Incorrect package length") Return (Zero) } diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/register.asl b/tests/aslts/src/runtime/collections/functional/descriptor/register.asl index 82f5a7b77..d608bf569 100644 --- a/tests/aslts/src/runtime/collections/functional/descriptor/register.asl +++ b/tests/aslts/src/runtime/collections/functional/descriptor/register.asl @@ -414,7 +414,7 @@ If ((SizeOf (P436) != SizeOf (P437))) { - ERR (__METHOD__, 0xB3, 0x00, 0x00, 0x00, 0x00, "Incorrect package length") + ERR (__METHOD__, 0xB3, __LINE__, 0x00, 0x00, 0x00, "Incorrect package length") Return (Zero) } diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/rtemplate.asl b/tests/aslts/src/runtime/collections/functional/descriptor/rtemplate.asl index 6c56cae94..35859b92d 100644 --- a/tests/aslts/src/runtime/collections/functional/descriptor/rtemplate.asl +++ b/tests/aslts/src/runtime/collections/functional/descriptor/rtemplate.asl @@ -45,7 +45,7 @@ Local1 = DerefOf (Arg4 [LPC0]) If ((Local0 != Local1)) { - ERR (Arg0, Z029, 0x36, 0x00, 0x00, LPC0, Arg2) + ERR (Arg0, Z029, __LINE__, 0x00, 0x00, LPC0, Arg2) } LPN0-- @@ -59,12 +59,12 @@ { If ((Arg2 != Arg3)) { - ERR (Arg0, Z029, 0x42, Arg6, Arg6, Arg2, Arg3) + ERR (Arg0, Z029, __LINE__, Arg6, Arg6, Arg2, Arg3) } If ((Arg4 != Arg5)) { - ERR (Arg0, Z029, 0x45, Arg6, Arg6, Arg4, Arg5) + ERR (Arg0, Z029, __LINE__, Arg6, Arg6, Arg4, Arg5) } } @@ -90,7 +90,7 @@ { Debug = Local3 Debug = Local2 - ERR (Arg0, Z029, 0x65, 0x00, 0x00, LPC0, Arg2) + ERR (Arg0, Z029, __LINE__, 0x00, 0x00, LPC0, Arg2) } LPN0-- diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/spiserialbus.asl b/tests/aslts/src/runtime/collections/functional/descriptor/spiserialbus.asl index 783ba71f8..252e8628a 100644 --- a/tests/aslts/src/runtime/collections/functional/descriptor/spiserialbus.asl +++ b/tests/aslts/src/runtime/collections/functional/descriptor/spiserialbus.asl @@ -2759,7 +2759,7 @@ If ((SizeOf (P458) != SizeOf (P459))) { - ERR (__METHOD__, 0xB5, 0x00, 0x00, 0x00, 0x00, "Incorrect package length") + ERR (__METHOD__, 0xB5, __LINE__, 0x00, 0x00, 0x00, "Incorrect package length") Return (Zero) } diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/uartserialbus.asl b/tests/aslts/src/runtime/collections/functional/descriptor/uartserialbus.asl index 1192b5d56..f5cb197a0 100644 --- a/tests/aslts/src/runtime/collections/functional/descriptor/uartserialbus.asl +++ b/tests/aslts/src/runtime/collections/functional/descriptor/uartserialbus.asl @@ -953,7 +953,7 @@ If ((SizeOf (P45A) != SizeOf (P45B))) { - ERR (__METHOD__, 0xB6, 0x00, 0x00, 0x00, 0x00, "Incorrect package length") + ERR (__METHOD__, 0xB6, __LINE__, 0x00, 0x00, 0x00, "Incorrect package length") Return (Zero) } diff --git a/tests/aslts/src/runtime/collections/functional/external/external.asl b/tests/aslts/src/runtime/collections/functional/external/external.asl index 8a24c0913..4472b09b8 100644 --- a/tests/aslts/src/runtime/collections/functional/external/external.asl +++ b/tests/aslts/src/runtime/collections/functional/external/external.asl @@ -89,7 +89,7 @@ Local2 = ObjectType (Arg3) If ((Local1 != Local2)) { - ERR (DerefOf (Arg0), Z204, 0x01, Z204, Arg1, Local1, Local2) + ERR (DerefOf (Arg0), Z204, __LINE__, Z204, Arg1, Local1, Local2) } } @@ -100,7 +100,7 @@ Local1 = ObjectType (E000) If ((Local1 != 0x01)) { - ERR (__METHOD__, Z204, 0x00, 0x00, 0x00, Local1, 0x01) + ERR (__METHOD__, Z204, __LINE__, 0x00, 0x00, Local1, 0x01) } EXT0 (__METHOD__, 0x01, E001, NM01) diff --git a/tests/aslts/src/runtime/collections/functional/logic/logical.asl b/tests/aslts/src/runtime/collections/functional/logic/logical.asl index a4379a511..a9f2acdcc 100644 --- a/tests/aslts/src/runtime/collections/functional/logic/logical.asl +++ b/tests/aslts/src/runtime/collections/functional/logic/logical.asl @@ -53,13 +53,13 @@ Local7 = (Local0 != Local1) If ((Local7 != Local2)) { - ERR (Arg0, Z035, 0x3A, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z035, __LINE__, 0x00, 0x00, Local5, Arg2) } Local7 = (Local1 != Local0) If ((Local7 != Local2)) { - ERR (Arg0, Z035, 0x3E, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z035, __LINE__, 0x00, 0x00, Local5, Arg2) } } Case (0x01) @@ -67,13 +67,13 @@ Local7 = (Local0 && Local1) If ((Local7 != Local2)) { - ERR (Arg0, Z035, 0x44, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z035, __LINE__, 0x00, 0x00, Local5, Arg2) } Local7 = (Local1 && Local0) If ((Local7 != Local2)) { - ERR (Arg0, Z035, 0x48, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z035, __LINE__, 0x00, 0x00, Local5, Arg2) } } Case (0x02) @@ -81,13 +81,13 @@ Local7 = (Local0 || Local1) If ((Local7 != Local2)) { - ERR (Arg0, Z035, 0x4E, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z035, __LINE__, 0x00, 0x00, Local5, Arg2) } Local7 = (Local1 || Local0) If ((Local7 != Local2)) { - ERR (Arg0, Z035, 0x52, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z035, __LINE__, 0x00, 0x00, Local5, Arg2) } } Case (0x03) @@ -95,13 +95,13 @@ Local7 = (Local0 == Local1) If ((Local7 != Local2)) { - ERR (Arg0, Z035, 0x58, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z035, __LINE__, 0x00, 0x00, Local5, Arg2) } Local7 = (Local1 == Local0) If ((Local7 != Local2)) { - ERR (Arg0, Z035, 0x5C, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z035, __LINE__, 0x00, 0x00, Local5, Arg2) } } Case (0x04) @@ -109,7 +109,7 @@ Local7 = (Local0 > Local1) If ((Local7 != Local2)) { - ERR (Arg0, Z035, 0x62, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z035, __LINE__, 0x00, 0x00, Local5, Arg2) } } Case (0x05) @@ -117,7 +117,7 @@ Local7 = (Local0 >= Local1) If ((Local7 != Local2)) { - ERR (Arg0, Z035, 0x68, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z035, __LINE__, 0x00, 0x00, Local5, Arg2) } } Case (0x06) @@ -125,7 +125,7 @@ Local7 = (Local0 < Local1) If ((Local7 != Local2)) { - ERR (Arg0, Z035, 0x6E, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z035, __LINE__, 0x00, 0x00, Local5, Arg2) } } Case (0x07) @@ -133,7 +133,7 @@ Local7 = (Local0 <= Local1) If ((Local7 != Local2)) { - ERR (Arg0, Z035, 0x74, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z035, __LINE__, 0x00, 0x00, Local5, Arg2) } } @@ -175,7 +175,7 @@ Local2 = !Local0 If ((Local2 != Local1)) { - ERR (Arg0, Z035, 0x9B, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z035, __LINE__, 0x00, 0x00, Local5, Arg2) } } @@ -1100,7 +1100,7 @@ Local0 = (BIG0 == BIG0) If ((Local0 != Ones)) { - ERR (__METHOD__, Z035, 0x0243, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z035, __LINE__, 0x00, 0x00, 0x00, 0x00) } /* Buffers */ @@ -1250,7 +1250,7 @@ Local0 = (BIG0 > BIG0) If ((Local0 != Zero)) { - ERR (__METHOD__, Z035, 0x0283, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z035, __LINE__, 0x00, 0x00, 0x00, 0x00) } /* Buffers */ @@ -1400,7 +1400,7 @@ Local0 = (BIG0 >= BIG0) If ((Local0 != Ones)) { - ERR (__METHOD__, Z035, 0x02C3, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z035, __LINE__, 0x00, 0x00, 0x00, 0x00) } /* Buffers */ @@ -1550,7 +1550,7 @@ Local0 = (BIG0 < BIG0) If ((Local0 != Zero)) { - ERR (__METHOD__, Z035, 0x0303, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z035, __LINE__, 0x00, 0x00, 0x00, 0x00) } /* Buffers */ @@ -1700,7 +1700,7 @@ Local0 = (BIG0 <= BIG0) If ((Local0 != Ones)) { - ERR (__METHOD__, Z035, 0x0343, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z035, __LINE__, 0x00, 0x00, 0x00, 0x00) } /* Buffers */ @@ -1850,7 +1850,7 @@ Local0 = (BIG0 != BIG0) If ((Local0 != Zero)) { - ERR (__METHOD__, Z035, 0x0383, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z035, __LINE__, 0x00, 0x00, 0x00, 0x00) } /* Buffers */ diff --git a/tests/aslts/src/runtime/collections/functional/manipulation/concatenate.asl b/tests/aslts/src/runtime/collections/functional/manipulation/concatenate.asl index 0c7e8cb56..c463324c7 100644 --- a/tests/aslts/src/runtime/collections/functional/manipulation/concatenate.asl +++ b/tests/aslts/src/runtime/collections/functional/manipulation/concatenate.asl @@ -71,13 +71,13 @@ { If ((ObjectType (Arg1) != 0x03)) { - ERR ("m311: unexpected type of Arg1", Z036, 0x4B, 0x00, 0x00, 0x00, 0x00) + ERR ("m311: unexpected type of Arg1", Z036, __LINE__, 0x00, 0x00, 0x00, 0x00) Return (Ones) } If ((ObjectType (Arg2) != 0x03)) { - ERR ("m311: unexpected type of Arg2", Z036, 0x50, 0x00, 0x00, 0x00, 0x00) + ERR ("m311: unexpected type of Arg2", Z036, __LINE__, 0x00, 0x00, 0x00, 0x00) Return (Ones) } @@ -121,7 +121,7 @@ Concatenate (Local0, Local1, Local7) If (M311 (Arg0, Local7, Local2)) { - ERR (Arg0, Z036, 0x7A, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z036, __LINE__, 0x00, 0x00, Local5, Arg2) } } Case (0x01) @@ -131,15 +131,15 @@ Concatenate (Local0, Local1, Local7) If ((ObjectType (Local7) != 0x02)) { - ERR (Arg0, Z036, 0x83, 0x00, 0x00, Local7, Arg2) + ERR (Arg0, Z036, __LINE__, 0x00, 0x00, Local7, Arg2) } ElseIf ((ObjectType (Local2) != 0x02)) { - ERR (Arg0, Z036, 0x85, 0x00, 0x00, Local2, Arg2) + ERR (Arg0, Z036, __LINE__, 0x00, 0x00, Local2, Arg2) } ElseIf ((Local7 != Local2)) { - ERR (Arg0, Z036, 0x87, 0x00, 0x00, Local7, Arg2) + ERR (Arg0, Z036, __LINE__, 0x00, 0x00, Local7, Arg2) } } diff --git a/tests/aslts/src/runtime/collections/functional/manipulation/match1.asl b/tests/aslts/src/runtime/collections/functional/manipulation/match1.asl index 47dd96cd4..fd20211a6 100644 --- a/tests/aslts/src/runtime/collections/functional/manipulation/match1.asl +++ b/tests/aslts/src/runtime/collections/functional/manipulation/match1.asl @@ -273,7 +273,7 @@ Local6 = M306 (Arg5, Local0, Local1, Local2, Local3, Local4) If ((Local7 != Local6)) { - ERR ("err 1", Z038, 0xE3, 0x00, 0x00, LPC1, Arg2) + ERR ("err 1", Z038, __LINE__, 0x00, 0x00, LPC1, Arg2) } If ((Arg6 && (Local1 != Local3))) @@ -285,7 +285,7 @@ Local6 = M306 (Arg5, Local0, Local3, Local2, Local1, Local4) If ((Local7 != Local6)) { - ERR ("err 2", Z038, 0xF0, 0x00, 0x00, LPC2, Arg2) + ERR ("err 2", Z038, __LINE__, 0x00, 0x00, LPC2, Arg2) } } diff --git a/tests/aslts/src/runtime/collections/functional/manipulation/mid.asl b/tests/aslts/src/runtime/collections/functional/manipulation/mid.asl index 73f396d50..fba0ed1cb 100644 --- a/tests/aslts/src/runtime/collections/functional/manipulation/mid.asl +++ b/tests/aslts/src/runtime/collections/functional/manipulation/mid.asl @@ -58,7 +58,7 @@ Mid (Local0, Local1, Local4, Local7) If ((Local7 != Local2)) { - ERR (Arg0, Z039, 0x40, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z039, __LINE__, 0x00, 0x00, Local5, Arg2) } } Case (0x01) @@ -66,7 +66,7 @@ Mid (S200, Local1, Local4, Local7) If ((Local7 != Local2)) { - ERR (Arg0, Z039, 0x46, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z039, __LINE__, 0x00, 0x00, Local5, Arg2) } } @@ -444,12 +444,12 @@ Mid (Buffer (Local1){}, 0x00, 0x01, Local7) If ((Local7 != Buffer (Local1){})) { - ERR (__METHOD__, Z039, 0x011E, 0x00, 0x00, 0x00, "Buffer(0)") + ERR (__METHOD__, Z039, __LINE__, 0x00, 0x00, 0x00, "Buffer(0)") } Mid (Buffer (Local1){}, 0x012C, 0x012C, Local7) If ((Local7 != Buffer (Local1){})) { - ERR (__METHOD__, Z039, 0x0122, 0x00, 0x00, 0x00, "Buffer(0)") + ERR (__METHOD__, Z039, __LINE__, 0x00, 0x00, 0x00, "Buffer(0)") } } diff --git a/tests/aslts/src/runtime/collections/functional/manipulation/objecttype.asl b/tests/aslts/src/runtime/collections/functional/manipulation/objecttype.asl index c44f1e3d6..673b90f73 100644 --- a/tests/aslts/src/runtime/collections/functional/manipulation/objecttype.asl +++ b/tests/aslts/src/runtime/collections/functional/manipulation/objecttype.asl @@ -160,43 +160,43 @@ Local7 = ObjectType (Local0) If ((Local7 != C008)) { - ERR (Arg0, Z040, 0xA9, 0x00, 0x00, Local7, C008) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C008) } Local7 = ObjectType (Local1) If ((Local7 != C008)) { - ERR (Arg0, Z040, 0xAD, 0x00, 0x00, Local7, C008) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C008) } Local7 = ObjectType (Local2) If ((Local7 != C008)) { - ERR (Arg0, Z040, 0xB1, 0x00, 0x00, Local7, C008) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C008) } Local7 = ObjectType (Local3) If ((Local7 != C008)) { - ERR (Arg0, Z040, 0xB5, 0x00, 0x00, Local7, C008) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C008) } Local7 = ObjectType (Local4) If ((Local7 != C008)) { - ERR (Arg0, Z040, 0xB9, 0x00, 0x00, Local7, C008) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C008) } Local7 = ObjectType (Local5) If ((Local7 != C008)) { - ERR (Arg0, Z040, 0xBD, 0x00, 0x00, Local7, C008) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C008) } Local7 = ObjectType (Local6) If ((Local7 != C008)) { - ERR (Arg0, Z040, 0xC1, 0x00, 0x00, Local7, C008) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C008) } } Case (0x01) @@ -207,12 +207,12 @@ Local7 = ObjectType (Local0) If ((Local7 != C009)) { - ERR (Arg0, Z040, 0xCD, 0x00, 0x00, Local7, C009) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C009) } If ((Local0 != 0x12345678)) { - ERR (Arg0, Z040, 0xD0, 0x00, 0x00, Local0, 0x12345678) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local0, 0x12345678) } /* By ArgX */ @@ -220,12 +220,12 @@ Local7 = ObjectType (Arg2) If ((Local7 != C009)) { - ERR (Arg0, Z040, 0xD7, 0x00, 0x00, Local7, C009) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C009) } If ((Arg2 != 0x81223344)) { - ERR (Arg0, Z040, 0xDA, 0x00, 0x00, Arg2, 0x81223344) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Arg2, 0x81223344) } /* By Name locally */ @@ -234,12 +234,12 @@ Local7 = ObjectType (N000) If ((Local7 != C009)) { - ERR (Arg0, Z040, 0xE2, 0x00, 0x00, Local7, C009) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C009) } If ((N000 != 0x98127364)) { - ERR (Arg0, Z040, 0xE5, 0x00, 0x00, N000, 0x98127364) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, N000, 0x98127364) } /* By Name globally */ @@ -247,12 +247,12 @@ Local7 = ObjectType (N002) If ((Local7 != C009)) { - ERR (Arg0, Z040, 0xEC, 0x00, 0x00, Local7, C009) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C009) } If ((N002 != 0x90801020)) { - ERR (Arg0, Z040, 0xEF, 0x00, 0x00, N002, 0x90801020) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, N002, 0x90801020) } /* Not a Buffer in 32-bit mode */ @@ -261,7 +261,7 @@ Local7 = ObjectType (Local0) If ((Local7 != C009)) { - ERR (Arg0, Z040, 0xF7, 0x00, 0x00, Local7, C009) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C009) } } Case (0x02) @@ -276,12 +276,12 @@ Local7 = ObjectType (Local0) If ((Local7 != C009)) { - ERR (Arg0, Z040, 0x0105, 0x00, 0x00, Local7, C009) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C009) } If ((Local0 != 0xA1B2C3D4E5C6E7F8)) { - ERR (Arg0, Z040, 0x0108, 0x00, 0x00, Local0, 0xA1B2C3D4E5C6E7F8) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local0, 0xA1B2C3D4E5C6E7F8) } /* By ArgX */ @@ -289,12 +289,12 @@ Local7 = ObjectType (Arg2) If ((Local7 != C009)) { - ERR (Arg0, Z040, 0x010F, 0x00, 0x00, Local7, C009) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C009) } If ((Arg2 != 0xFABEFAC489501248)) { - ERR (Arg0, Z040, 0x0112, 0x00, 0x00, Arg2, 0xFABEFAC489501248) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Arg2, 0xFABEFAC489501248) } /* By Name locally */ @@ -303,12 +303,12 @@ Local7 = ObjectType (N001) If ((Local7 != C009)) { - ERR (Arg0, Z040, 0x011A, 0x00, 0x00, Local7, C009) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C009) } If ((N001 != 0x9081122384356647)) { - ERR (Arg0, Z040, 0x011D, 0x00, 0x00, N001, 0x9081122384356647) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, N001, 0x9081122384356647) } /* By Name globally */ @@ -316,12 +316,12 @@ Local7 = ObjectType (N003) If ((Local7 != C009)) { - ERR (Arg0, Z040, 0x0124, 0x00, 0x00, Local7, C009) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C009) } If ((N003 != 0x9189192989396949)) { - ERR (Arg0, Z040, 0x0127, 0x00, 0x00, N003, 0x9189192989396949) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, N003, 0x9189192989396949) } } } @@ -333,28 +333,28 @@ Local7 = ObjectType (Local0) If ((Local7 != C00A)) { - ERR (Arg0, Z040, 0x0134, 0x00, 0x00, Local7, C00A) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00A) } Local0 = "1" Local7 = ObjectType (Local0) If ((Local7 != C00A)) { - ERR (Arg0, Z040, 0x013A, 0x00, 0x00, Local7, C00A) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00A) } Local0 = "abcd" Local7 = ObjectType (Local0) If ((Local7 != C00A)) { - ERR (Arg0, Z040, 0x0140, 0x00, 0x00, Local7, C00A) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00A) } Local0 = "qwrt" Local7 = ObjectType (Local0) If ((Local7 != C00A)) { - ERR (Arg0, Z040, 0x0146, 0x00, 0x00, Local7, C00A) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00A) } /* By ArgX */ @@ -362,12 +362,12 @@ Local7 = ObjectType (Arg2) If ((Local7 != C00A)) { - ERR (Arg0, Z040, 0x014D, 0x00, 0x00, Local7, C00A) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00A) } If ((Arg2 != "zxcvbnm0912345678ok")) { - ERR (Arg0, Z040, 0x0150, 0x00, 0x00, Arg2, "zxcvbnm0912345678ok") + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Arg2, "zxcvbnm0912345678ok") } /* By Name locally */ @@ -376,12 +376,12 @@ Local7 = ObjectType (N004) If ((Local7 != C00A)) { - ERR (Arg0, Z040, 0x0158, 0x00, 0x00, Local7, C00A) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00A) } If ((N004 != "")) { - ERR (Arg0, Z040, 0x015B, 0x00, 0x00, N004, "") + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, N004, "") } /* By Name globally */ @@ -389,12 +389,12 @@ Local7 = ObjectType (N005) If ((Local7 != C00A)) { - ERR (Arg0, Z040, 0x0162, 0x00, 0x00, Local7, C00A) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00A) } If ((N005 != "9876")) { - ERR (Arg0, Z040, 0x0165, 0x00, 0x00, N005, "9876") + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, N005, "9876") } } Case (0x04) @@ -414,36 +414,36 @@ Local7 = ObjectType (F000) If ((Local7 != C00D)) { - ERR (Arg0, Z040, 0x0179, 0x00, 0x00, Local7, C00D) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00D) } If ((F000 != 0x8D)) { - ERR (Arg0, Z040, 0x017C, 0x00, 0x00, F000, 0x8D) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, F000, 0x8D) } Local7 = ObjectType (F222) If ((Local7 != C00D)) { - ERR (Arg0, Z040, 0x0181, 0x00, 0x00, Local7, C00D) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00D) } Local7 = ObjectType (F223) If ((Local7 != C00D)) { - ERR (Arg0, Z040, 0x0185, 0x00, 0x00, Local7, C00D) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00D) } Local7 = ObjectType (F224) If ((Local7 != C00D)) { - ERR (Arg0, Z040, 0x0189, 0x00, 0x00, Local7, C00D) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00D) } Local7 = ObjectType (F225) If ((Local7 != C00D)) { - ERR (Arg0, Z040, 0x018D, 0x00, 0x00, Local7, C00D) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00D) } } Case (0x05) @@ -465,12 +465,12 @@ Local7 = ObjectType (BKF0) If ((Local7 != C00D)) { - ERR (Arg0, Z040, 0x01A0, 0x00, 0x00, Local7, C00D) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00D) } If ((BKF0 != 0x95)) { - ERR (Arg0, Z040, 0x01A3, 0x00, 0x00, BKF0, 0x95) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, BKF0, 0x95) } } Case (0x06) @@ -497,25 +497,25 @@ Local7 = ObjectType (F00A) If ((Local7 != C00D)) { - ERR (Arg0, Z040, 0x01BB, 0x00, 0x00, Local7, C00D) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00D) } Local7 = ObjectType (F00B) If ((Local7 != C00D)) { - ERR (Arg0, Z040, 0x01BF, 0x00, 0x00, Local7, C00D) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00D) } Local7 = ObjectType (IF00) If ((Local7 != C00D)) { - ERR (Arg0, Z040, 0x01C3, 0x00, 0x00, Local7, C00D) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00D) } Local7 = ObjectType (IF01) If ((Local7 != C00D)) { - ERR (Arg0, Z040, 0x01C7, 0x00, 0x00, Local7, C00D) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00D) } } Case (0x07) @@ -529,7 +529,7 @@ Local7 = ObjectType (Local0) If ((Local7 != C00B)) { - ERR (Arg0, Z040, 0x01D1, 0x00, 0x00, Local7, C00B) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00B) } If ((Local0 != Buffer (0x04) @@ -537,7 +537,7 @@ 0x00, 0x01, 0x02, 0x03 // .... })) { - ERR (Arg0, Z040, 0x01D4, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, 0x00, 0x00) } } Case (0x08) @@ -547,7 +547,7 @@ Local7 = ObjectType (Arg2) If ((Local7 != C00B)) { - ERR (Arg0, Z040, 0x01DD, 0x00, 0x00, Local7, C00B) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00B) } If ((Arg2 != Buffer (0x04) @@ -555,7 +555,7 @@ 0x04, 0x05, 0x06, 0x07 // .... })) { - ERR (Arg0, Z040, 0x01E0, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, 0x00, 0x00) } } Case (0x09) @@ -569,7 +569,7 @@ Local7 = ObjectType (B000) If ((Local7 != C00B)) { - ERR (Arg0, Z040, 0x01EA, 0x00, 0x00, Local7, C00B) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00B) } If ((B000 != Buffer (0x04) @@ -577,7 +577,7 @@ 0x08, 0x09, 0x0A, 0x0B // .... })) { - ERR (Arg0, Z040, 0x01ED, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, 0x00, 0x00) } } Case (0x0A) @@ -587,7 +587,7 @@ Local7 = ObjectType (B003) If ((Local7 != C00B)) { - ERR (Arg0, Z040, 0x01F6, 0x00, 0x00, Local7, C00B) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00B) } If ((B003 != Buffer (0x04) @@ -595,7 +595,7 @@ 0x0C, 0x0D, 0x0E, 0x0F // .... })) { - ERR (Arg0, Z040, 0x01F9, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, 0x00, 0x00) } } Case (0x0B) @@ -610,7 +610,7 @@ Local7 = ObjectType (F001) If ((Local7 != C016)) { - ERR (Arg0, Z040, 0x0204, 0x00, 0x00, Local7, C016) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C016) } If ((Local0 != Buffer (0x04) @@ -618,7 +618,7 @@ 0x10, 0x11, 0x12, 0x13 // .... })) { - ERR (Arg0, Z040, 0x0207, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, 0x00, 0x00) } } Case (0x0C) @@ -633,7 +633,7 @@ Local7 = ObjectType (F002) If ((Local7 != C016)) { - ERR (Arg0, Z040, 0x0212, 0x00, 0x00, Local7, C016) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C016) } If ((Local0 != Buffer (0x04) @@ -641,7 +641,7 @@ 0x14, 0x15, 0x16, 0x17 // .... })) { - ERR (Arg0, Z040, 0x0215, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, 0x00, 0x00) } } Case (0x0D) @@ -656,7 +656,7 @@ Local7 = ObjectType (F003) If ((Local7 != C016)) { - ERR (Arg0, Z040, 0x0220, 0x00, 0x00, Local7, C016) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C016) } If ((Local0 != Buffer (0x04) @@ -664,7 +664,7 @@ 0x18, 0x19, 0x1A, 0x1B // .... })) { - ERR (Arg0, Z040, 0x0223, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, 0x00, 0x00) } } Case (0x0E) @@ -679,7 +679,7 @@ Local7 = ObjectType (F004) If ((Local7 != C016)) { - ERR (Arg0, Z040, 0x022E, 0x00, 0x00, Local7, C016) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C016) } If ((Local0 != Buffer (0x04) @@ -687,7 +687,7 @@ 0x1C, 0x1D, 0x1E, 0x1F // .... })) { - ERR (Arg0, Z040, 0x0231, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, 0x00, 0x00) } } Case (0x0F) @@ -703,7 +703,7 @@ Local7 = ObjectType (F005) If ((Local7 != C016)) { - ERR (Arg0, Z040, 0x023C, 0x00, 0x00, Local7, C016) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C016) } If ((Local0 != Buffer (0x09) @@ -712,7 +712,7 @@ /* 0008 */ 0x29 // ) })) { - ERR (Arg0, Z040, 0x0240, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, 0x00, 0x00) } } Case (0x10) @@ -728,7 +728,7 @@ Local7 = ObjectType (F006) If ((Local7 != C016)) { - ERR (Arg0, Z040, 0x024B, 0x00, 0x00, Local7, C016) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C016) } If ((Local0 != Buffer (0x09) @@ -737,21 +737,21 @@ /* 0008 */ 0x32 // 2 })) { - ERR (Arg0, Z040, 0x024E, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, 0x00, 0x00) } CreateField (Local0, 0x00, 0x11, F111) Local7 = ObjectType (F111) If ((Local7 != C016)) { - ERR (Arg0, Z040, 0x0254, 0x00, 0x00, Local7, C016) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C016) } CreateField (Local0, 0x00, 0x39, F112) Local7 = ObjectType (F112) If ((Local7 != C016)) { - ERR (Arg0, Z040, 0x0259, 0x00, 0x00, Local7, C016) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C016) } } Case (0x11) @@ -767,7 +767,7 @@ Local7 = ObjectType (F007) If ((Local7 != C016)) { - ERR (Arg0, Z040, 0x0264, 0x00, 0x00, Local7, C016) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C016) } If ((Local0 != Buffer (0x09) @@ -776,7 +776,7 @@ /* 0008 */ 0x32 // 2 })) { - ERR (Arg0, Z040, 0x0267, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, 0x00, 0x00) } } Case (0x12) @@ -791,7 +791,7 @@ Local7 = ObjectType (F008) If ((Local7 != C016)) { - ERR (Arg0, Z040, 0x0272, 0x00, 0x00, Local7, C016) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C016) } If ((Local0 != Buffer (0x04) @@ -799,7 +799,7 @@ 0x33, 0x34, 0x35, 0x36 // 3456 })) { - ERR (Arg0, Z040, 0x0275, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, 0x00, 0x00) } } Case (0x13) @@ -811,12 +811,12 @@ Local7 = ObjectType (Local1) If ((Local7 != C016)) { - ERR (Arg0, Z040, 0x0280, 0x00, 0x00, Local7, C016) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C016) } If ((Local0 != "q")) { - ERR (Arg0, Z040, 0x0283, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, 0x00, 0x00) } Local0 = "qw" @@ -824,12 +824,12 @@ Local7 = ObjectType (Local1) If ((Local7 != C016)) { - ERR (Arg0, Z040, 0x028A, 0x00, 0x00, Local7, C016) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C016) } If ((Local0 != "qw")) { - ERR (Arg0, Z040, 0x028D, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, 0x00, 0x00) } Local0 = "qwertyu" @@ -837,12 +837,12 @@ Local7 = ObjectType (Local1) If ((Local7 != C016)) { - ERR (Arg0, Z040, 0x0294, 0x00, 0x00, Local7, C016) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C016) } If ((Local0 != "qwertyu")) { - ERR (Arg0, Z040, 0x0297, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, 0x00, 0x00) } Local0 = "qwertyuiop" @@ -850,12 +850,12 @@ Local7 = ObjectType (Local1) If ((Local7 != C016)) { - ERR (Arg0, Z040, 0x029E, 0x00, 0x00, Local7, C016) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C016) } If ((Local0 != "qwertyuiop")) { - ERR (Arg0, Z040, 0x02A1, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, 0x00, 0x00) } } Case (0x14) @@ -870,7 +870,7 @@ Local7 = ObjectType (Local1) If ((Local7 != C016)) { - ERR (Arg0, Z040, 0x02AC, 0x00, 0x00, Local7, C016) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C016) } If ((Local0 != Buffer (0x04) @@ -878,7 +878,7 @@ 0x2A, 0x2B, 0x2C, 0x2D // *+,- })) { - ERR (Arg0, Z040, 0x02AF, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, 0x00, 0x00) } Local0 = Buffer (0x08) @@ -889,7 +889,7 @@ Local7 = ObjectType (Local1) If ((Local7 != C016)) { - ERR (Arg0, Z040, 0x02B6, 0x00, 0x00, Local7, C016) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C016) } If ((Local0 != Buffer (0x08) @@ -897,7 +897,7 @@ 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F, 0x30, 0x31 // *+,-./01 })) { - ERR (Arg0, Z040, 0x02B9, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, 0x00, 0x00) } Local0 = Buffer (0x09) @@ -909,7 +909,7 @@ Local7 = ObjectType (Local1) If ((Local7 != C016)) { - ERR (Arg0, Z040, 0x02C0, 0x00, 0x00, Local7, C016) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C016) } If ((Local0 != Buffer (0x09) @@ -918,7 +918,7 @@ /* 0008 */ 0x32 // 2 })) { - ERR (Arg0, Z040, 0x02C3, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, 0x00, 0x00) } } Case (0x15) @@ -957,7 +957,7 @@ Local7 = ObjectType (Local1) If ((Local7 != C00C)) { - ERR (Arg0, Z040, 0x02D9, 0x00, 0x00, Local7, C00C) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00C) } /* Buffer */ @@ -966,7 +966,7 @@ Local7 = ObjectType (Local1) If ((Local7 != C00B)) { - ERR (Arg0, Z040, 0x02E1, 0x00, 0x00, Local7, C00B) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00B) } /* String */ @@ -975,7 +975,7 @@ Local7 = ObjectType (Local1) If ((Local7 != C00A)) { - ERR (Arg0, Z040, 0x02E9, 0x00, 0x00, Local7, C00A) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00A) } /* Integer */ @@ -984,7 +984,7 @@ Local7 = ObjectType (Local1) If ((Local7 != C009)) { - ERR (Arg0, Z040, 0x02F1, 0x00, 0x00, Local7, C009) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C009) } } Case (0x16) @@ -995,7 +995,7 @@ Local7 = ObjectType (HDR0) If ((Local7 != C012)) { - ERR (Arg0, Z040, 0x02FB, 0x00, 0x00, Local7, C012) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C012) } } Case (0x17) @@ -1005,7 +1005,7 @@ Local7 = ObjectType (Debug) If ((Local7 != C018)) { - ERR (Arg0, Z040, 0x0304, 0x00, 0x00, Local7, C018) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C018) } } Case (0x18) @@ -1019,7 +1019,7 @@ Local7 = ObjectType (DV00) If ((Local7 != C00E)) { - ERR (Arg0, Z040, 0x030E, 0x00, 0x00, Local7, C00E) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00E) } } Case (0x19) @@ -1030,7 +1030,7 @@ Local7 = ObjectType (EVT0) If ((Local7 != C00F)) { - ERR (Arg0, Z040, 0x0318, 0x00, 0x00, Local7, C00F) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00F) } } Case (0x1A) @@ -1045,7 +1045,7 @@ Local7 = ObjectType (M0F2) If ((Local7 != C010)) { - ERR (Arg0, Z040, 0x0322, 0x00, 0x00, Local7, C010) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C010) } } Case (0x1B) @@ -1068,7 +1068,7 @@ Local7 = ObjectType (MT00) If ((Local7 != C011)) { - ERR (Arg0, Z040, 0x0337, 0x00, 0x00, Local7, C011) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C011) } } Case (0x1D) @@ -1078,13 +1078,13 @@ Local7 = ObjectType (R000) If ((Local7 != C012)) { - ERR (Arg0, Z040, 0x0340, 0x00, 0x00, Local7, C012) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C012) } Local7 = ObjectType (R001) If ((Local7 != C012)) { - ERR (Arg0, Z040, 0x0344, 0x00, 0x00, Local7, C012) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C012) } } Case (0x1E) @@ -1236,121 +1236,121 @@ Local7 = ObjectType (P000) If ((Local7 != C00C)) { - ERR (Arg0, Z040, 0x0364, 0x00, 0x00, Local7, C00C) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00C) } Local7 = ObjectType (P001) If ((Local7 != C00C)) { - ERR (Arg0, Z040, 0x0368, 0x00, 0x00, Local7, C00C) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00C) } Local7 = ObjectType (P002) If ((Local7 != C00C)) { - ERR (Arg0, Z040, 0x036C, 0x00, 0x00, Local7, C00C) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00C) } Local7 = ObjectType (P003) If ((Local7 != C00C)) { - ERR (Arg0, Z040, 0x0370, 0x00, 0x00, Local7, C00C) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00C) } Local7 = ObjectType (P004) If ((Local7 != C00C)) { - ERR (Arg0, Z040, 0x0374, 0x00, 0x00, Local7, C00C) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00C) } Local7 = ObjectType (P005) If ((Local7 != C00C)) { - ERR (Arg0, Z040, 0x0378, 0x00, 0x00, Local7, C00C) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00C) } Local7 = ObjectType (P006) If ((Local7 != C00C)) { - ERR (Arg0, Z040, 0x037C, 0x00, 0x00, Local7, C00C) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00C) } Local7 = ObjectType (P007) If ((Local7 != C00C)) { - ERR (Arg0, Z040, 0x0380, 0x00, 0x00, Local7, C00C) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00C) } Local7 = ObjectType (P008) If ((Local7 != C00C)) { - ERR (Arg0, Z040, 0x0384, 0x00, 0x00, Local7, C00C) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00C) } Local7 = ObjectType (P009) If ((Local7 != C00C)) { - ERR (Arg0, Z040, 0x0388, 0x00, 0x00, Local7, C00C) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00C) } Local7 = ObjectType (P00A) If ((Local7 != C00C)) { - ERR (Arg0, Z040, 0x038C, 0x00, 0x00, Local7, C00C) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00C) } Local7 = ObjectType (P00B) If ((Local7 != C00C)) { - ERR (Arg0, Z040, 0x0390, 0x00, 0x00, Local7, C00C) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00C) } Local7 = ObjectType (P00C) If ((Local7 != C00C)) { - ERR (Arg0, Z040, 0x0394, 0x00, 0x00, Local7, C00C) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00C) } Local7 = ObjectType (P00D) If ((Local7 != C00C)) { - ERR (Arg0, Z040, 0x0398, 0x00, 0x00, Local7, C00C) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00C) } Local7 = ObjectType (P00E) If ((Local7 != C00C)) { - ERR (Arg0, Z040, 0x039C, 0x00, 0x00, Local7, C00C) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00C) } Local7 = ObjectType (P00F) If ((Local7 != C00C)) { - ERR (Arg0, Z040, 0x03A0, 0x00, 0x00, Local7, C00C) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00C) } Local7 = ObjectType (P010) If ((Local7 != C00C)) { - ERR (Arg0, Z040, 0x03A4, 0x00, 0x00, Local7, C00C) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00C) } Local7 = ObjectType (P011) If ((Local7 != C00C)) { - ERR (Arg0, Z040, 0x03A8, 0x00, 0x00, Local7, C00C) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00C) } Local7 = ObjectType (P012) If ((Local7 != C00C)) { - ERR (Arg0, Z040, 0x03AC, 0x00, 0x00, Local7, C00C) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00C) } Local7 = ObjectType (P013) If ((Local7 != C00C)) { - ERR (Arg0, Z040, 0x03B0, 0x00, 0x00, Local7, C00C) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C00C) } } Case (0x1F) @@ -1368,7 +1368,7 @@ Local7 = ObjectType (PWR0) If ((Local7 != C013)) { - ERR (Arg0, Z040, 0x03BA, 0x00, 0x00, Local7, C013) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C013) } } Case (0x20) @@ -1379,7 +1379,7 @@ Local7 = ObjectType (PR00) If ((Local7 != C014)) { - ERR (Arg0, Z040, 0x03C4, 0x00, 0x00, Local7, C014) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C014) } } Case (0x21) @@ -1391,7 +1391,7 @@ Local7 = ObjectType (TZ00) If ((Local7 != C015)) { - ERR (Arg0, Z040, 0x03CB, 0x00, 0x00, Local7, C015) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, Local7, C015) } } Case (0x22) @@ -1411,7 +1411,7 @@ } Default { - ERR (Arg0, Z040, 0x03E1, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z040, __LINE__, 0x00, 0x00, 0x00, 0x00) } } diff --git a/tests/aslts/src/runtime/collections/functional/manipulation/sizeof.asl b/tests/aslts/src/runtime/collections/functional/manipulation/sizeof.asl index 026601514..bedb0516f 100644 --- a/tests/aslts/src/runtime/collections/functional/manipulation/sizeof.asl +++ b/tests/aslts/src/runtime/collections/functional/manipulation/sizeof.asl @@ -56,30 +56,30 @@ { If ((Local0 != 0x08)) { - ERR (__METHOD__, Z041, 0x32, 0x00, 0x00, Local0, 0x08) + ERR (__METHOD__, Z041, __LINE__, 0x00, 0x00, Local0, 0x08) } } ElseIf ((Local0 != 0x04)) { - ERR (__METHOD__, Z041, 0x36, 0x00, 0x00, Local0, 0x04) + ERR (__METHOD__, Z041, __LINE__, 0x00, 0x00, Local0, 0x04) } Local0 = SizeOf (S000) If ((Local0 != 0x03)) { - ERR (__METHOD__, Z041, 0x3C, 0x00, 0x00, Local0, 0x03) + ERR (__METHOD__, Z041, __LINE__, 0x00, 0x00, Local0, 0x03) } Local0 = SizeOf (B000) If ((Local0 != 0x05)) { - ERR (__METHOD__, Z041, 0x41, 0x00, 0x00, Local0, 0x05) + ERR (__METHOD__, Z041, __LINE__, 0x00, 0x00, Local0, 0x05) } Local0 = SizeOf (P000) If ((Local0 != 0x07)) { - ERR (__METHOD__, Z041, 0x46, 0x00, 0x00, Local0, 0x07) + ERR (__METHOD__, Z041, __LINE__, 0x00, 0x00, Local0, 0x07) } } diff --git a/tests/aslts/src/runtime/collections/functional/manipulation/store.asl b/tests/aslts/src/runtime/collections/functional/manipulation/store.asl index 7aac32603..1c15aa9f1 100644 --- a/tests/aslts/src/runtime/collections/functional/manipulation/store.asl +++ b/tests/aslts/src/runtime/collections/functional/manipulation/store.asl @@ -51,7 +51,7 @@ ToInteger (Local0, Local2) If ((Local2 != Local1)) { - ERR (Arg0, Z042, 0x39, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z042, __LINE__, 0x00, 0x00, Local5, Arg2) Return (0x01) } } @@ -60,7 +60,7 @@ ToBuffer (Local0, Local2) If ((Local2 != Local1)) { - ERR (Arg0, Z042, 0x40, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z042, __LINE__, 0x00, 0x00, Local5, Arg2) Return (0x01) } } @@ -69,7 +69,7 @@ ToString (Local0, Ones, Local2) If ((Local2 != Local1)) { - ERR (Arg0, Z042, 0x47, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z042, __LINE__, 0x00, 0x00, Local5, Arg2) Return (0x01) } } @@ -78,7 +78,7 @@ ToDecimalString (Local0, Local2) If ((Local2 != Local1)) { - ERR (Arg0, Z042, 0x4E, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z042, __LINE__, 0x00, 0x00, Local5, Arg2) Return (0x01) } } @@ -87,7 +87,7 @@ ToHexString (Local0, Local2) If ((Local2 != Local1)) { - ERR (Arg0, Z042, 0x55, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z042, __LINE__, 0x00, 0x00, Local5, Arg2) Return (0x01) } } @@ -96,7 +96,7 @@ ToBCD (Local0, Local2) If ((Local2 != Local1)) { - ERR (Arg0, Z042, 0x5C, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z042, __LINE__, 0x00, 0x00, Local5, Arg2) Return (0x01) } } @@ -105,7 +105,7 @@ FromBCD (Local0, Local2) If ((Local2 != Local1)) { - ERR (Arg0, Z042, 0x63, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z042, __LINE__, 0x00, 0x00, Local5, Arg2) Return (0x01) } } @@ -116,7 +116,7 @@ Local2 = Local0 If ((Local2 != Local1)) { - ERR (Arg0, Z042, 0x6A, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z042, __LINE__, 0x00, 0x00, Local5, Arg2) Return (0x01) } } @@ -127,7 +127,7 @@ Local2 = Local0 If ((Local2 != Local1)) { - ERR (Arg0, Z042, 0x71, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z042, __LINE__, 0x00, 0x00, Local5, Arg2) Return (0x01) } } @@ -138,7 +138,7 @@ Local2 = Local0 If ((Local2 != Local1)) { - ERR (Arg0, Z042, 0x78, 0x00, 0x00, Local5, Arg2) + ERR (Arg0, Z042, __LINE__, 0x00, 0x00, Local5, Arg2) Return (0x01) } } @@ -160,7 +160,7 @@ Local1 = Local0 = 0xABCDEF12 If ((Local1 != 0xABCDEF12)) { - ERR (__METHOD__, Z042, 0x8D, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } /* Integer arithmetic */ @@ -168,13 +168,13 @@ Local1 = Local0 = (0x12345678 + 0x11111111) If ((Local1 != 0x23456789)) { - ERR (__METHOD__, Z042, 0x96, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } Store ((0x23456781 + 0x11111111), Local0) If ((Local0 != 0x34567892)) { - ERR (__METHOD__, Z042, 0x9A, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } Local1 = Local0 = (0x12345678 + 0xF0000000) @@ -184,13 +184,13 @@ Local1 = Local0 = (0x87654321 - 0x11111111) If ((Local1 != 0x76543210)) { - ERR (__METHOD__, Z042, 0xA4, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } Store ((0x72387654 - 0x22221111), Local0) If ((Local0 != 0x50166543)) { - ERR (__METHOD__, Z042, 0xA8, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } /* Multiply */ @@ -198,13 +198,13 @@ Local1 = Local0 = (0x00012345 * 0x7ABC) If ((Local1 != 0x8BA4C8AC)) { - ERR (__METHOD__, Z042, 0xAF, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } Store ((0x000145AB * 0x3247), Local0) If ((Local0 != 0x3FF5B86D)) { - ERR (__METHOD__, Z042, 0xB3, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } /* Divide */ @@ -212,19 +212,19 @@ Local2 = Divide (0x12345678, 0x1000, Local0, Local1) If ((Local2 != 0x00012345)) { - ERR (__METHOD__, Z042, 0xBA, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } Store (Divide (0x7ABC56E8, 0x1000, Local0), Local1) If ((Local1 != 0x0007ABC5)) { - ERR (__METHOD__, Z042, 0xBE, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } Store ((0x55667788 / 0x1000), Local0) If ((Local0 != 0x00055667)) { - ERR (__METHOD__, Z042, 0xC3, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } /* Increment */ @@ -233,7 +233,7 @@ Local1 = Local0++ If ((Local1 != 0x12345679)) { - ERR (__METHOD__, Z042, 0xCB, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } /* Decrement */ @@ -242,7 +242,7 @@ Local1 = Local0-- If ((Local1 != 0x67812344)) { - ERR (__METHOD__, Z042, 0xD3, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } /* And */ @@ -250,13 +250,13 @@ Local1 = Local0 = (0x87654321 & 0xAAAAAAAA) If ((Local1 != 0x82200220)) { - ERR (__METHOD__, Z042, 0xDA, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } Store ((0x88AABBCC & 0xAAAAAAAA), Local0) If ((Local0 != 0x88AAAA88)) { - ERR (__METHOD__, Z042, 0xDE, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } /* FindSetLeftBit */ @@ -264,13 +264,13 @@ Local1 = FindSetLeftBit (0xF001, Local0) If ((Local1 != 0x10)) { - ERR (__METHOD__, Z042, 0xE5, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } Local0 = FindSetLeftBit (0x09007001) If ((Local0 != 0x1C)) { - ERR (__METHOD__, Z042, 0xE9, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } /* FindSetRightBit */ @@ -278,13 +278,13 @@ Local1 = FindSetRightBit (0x01080040, Local0) If ((Local1 != 0x07)) { - ERR (__METHOD__, Z042, 0xF0, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } Local0 = FindSetRightBit (0x09800000) If ((Local0 != 0x18)) { - ERR (__METHOD__, Z042, 0xF4, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } /* Mod */ @@ -292,7 +292,7 @@ Store ((0x1AFB3C4D % 0x00400000), Local0) If ((Local0 != 0x003B3C4D)) { - ERR (__METHOD__, Z042, 0xFB, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } /* ShiftLeft */ @@ -306,13 +306,13 @@ Local1 = Local0 = (0x87654321 >> 0x19) If ((Local1 != 0x43)) { - ERR (__METHOD__, Z042, 0x010A, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } Store ((0x7654A0CB >> 0x15), Local0) If ((Local0 != 0x03B2)) { - ERR (__METHOD__, Z042, 0x010E, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } /* Nand */ @@ -338,13 +338,13 @@ Local1 = Local0 = (0x9A3533AC | 0x39A696CA) If ((Local1 != 0xBBB7B7EE)) { - ERR (__METHOD__, Z042, 0x012D, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } Store ((0xCA3533A9 | 0xA9A696C3), Local0) If ((Local0 != 0xEBB7B7EB)) { - ERR (__METHOD__, Z042, 0x0131, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } /* Xor */ @@ -352,13 +352,13 @@ Local1 = Local0 = (0x9A365AC3 ^ 0x39A96CA6) If ((Local1 != 0xA39F3665)) { - ERR (__METHOD__, Z042, 0x0138, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } Store ((0xA9365AC3 ^ 0x93A96CA6), Local0) If ((Local0 != 0x3A9F3665)) { - ERR (__METHOD__, Z042, 0x013C, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } /* Logical operators */ @@ -376,7 +376,7 @@ Local0 = Acquire (MT04, 0x0005) If ((Local0 != Zero)) { - ERR (__METHOD__, Z042, 0x0151, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } /* Release (None) */ @@ -384,13 +384,13 @@ Local1 = ToInteger ("0x89abcdef", Local0) If ((Local1 != 0x89ABCDEF)) { - ERR (__METHOD__, Z042, 0x015A, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } Local0 = ToInteger ("0x89abcdef") If ((Local0 != 0x89ABCDEF)) { - ERR (__METHOD__, Z042, 0x015E, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } /* ToString */ @@ -402,25 +402,25 @@ Local1 = ToString (Local2, Ones, Local0) If ((Local1 != "\x01")) { - ERR (__METHOD__, Z042, 0x0167, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } Local0 = ToString (Local2, Ones) If ((Local0 != "\x01")) { - ERR (__METHOD__, Z042, 0x016B, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } Local1 = ToString (Local2, 0x01, Local0) If ((Local1 != "\x01")) { - ERR (__METHOD__, Z042, 0x0170, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } Local0 = ToString (Local2, 0x01) If ((Local0 != "\x01")) { - ERR (__METHOD__, Z042, 0x0174, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } /* ToBuffer */ @@ -432,7 +432,7 @@ 0x01, 0x00 // .. })) { - ERR (__METHOD__, Z042, 0x017D, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } Local0 = ToBuffer (Local2) @@ -441,7 +441,7 @@ 0x01, 0x00 // .. })) { - ERR (__METHOD__, Z042, 0x0181, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } /* ToDecimalString */ @@ -450,13 +450,13 @@ Local1 = ToDecimalString (Local2, Local0) If ((Local1 != "12")) { - ERR (__METHOD__, Z042, 0x018A, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } Local0 = ToDecimalString (Local2) If ((Local0 != "12")) { - ERR (__METHOD__, Z042, 0x018E, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } /* ToHexString */ @@ -468,13 +468,13 @@ Local1 = ToHexString (Local2, Local0) If ((Local1 != "EF")) { - ERR (__METHOD__, Z042, 0x0197, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } Local0 = ToHexString (Local2) If ((Local0 != "EF")) { - ERR (__METHOD__, Z042, 0x019B, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } /* ToBCD */ @@ -483,13 +483,13 @@ Local1 = ToBCD (Local2, Local0) If ((Local1 != 0x10)) { - ERR (__METHOD__, Z042, 0x01A4, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } Local0 = ToBCD (Local2) If ((Local0 != 0x10)) { - ERR (__METHOD__, Z042, 0x01A8, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } /* FromBCD */ @@ -498,13 +498,13 @@ Local1 = FromBCD (Local2, Local0) If ((Local1 != 0x0A)) { - ERR (__METHOD__, Z042, 0x01B1, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } Local0 = FromBCD (Local2) If ((Local0 != 0x0A)) { - ERR (__METHOD__, Z042, 0x01B5, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } /* Mid */ @@ -513,13 +513,13 @@ Local1 = Mid (Local2, 0x01, 0x02, Local0) If ((Local1 != "12")) { - ERR (__METHOD__, Z042, 0x01BE, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } Local0 = Mid (Local2, 0x01, 0x02) If ((Local0 != "12")) { - ERR (__METHOD__, Z042, 0x01C2, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } Local2 = Buffer (0x04) @@ -532,7 +532,7 @@ 0x01, 0x02 // .. })) { - ERR (__METHOD__, Z042, 0x01C9, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } Local0 = Mid (Local2, 0x01, 0x02) @@ -541,7 +541,7 @@ 0x01, 0x02 // .. })) { - ERR (__METHOD__, Z042, 0x01CD, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } /* Match */ @@ -553,7 +553,7 @@ Local0 = Match (Local2, MTR, 0x00, MTR, 0x00, 0x00) If ((Local0 != 0x00)) { - ERR (__METHOD__, Z042, 0x01D6, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } /* ConcatenateResTemplate */ @@ -575,7 +575,7 @@ 0x79, 0x00 // y. })) { - ERR (__METHOD__, Z042, 0x01E3, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } /* @@ -587,7 +587,7 @@ 0x79, 0x00 // y. })) { - ERR (__METHOD__, Z042, 0x01EA, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z042, __LINE__, 0x00, 0x00, 0x00, 0x00) } } @@ -598,7 +598,7 @@ STR0 [0x0A] = "A" If ((STR0 != STR1)) { - ERR ("m30d", Z042, 0x01F6, 0x00, 0x00, STR0, STR1) + ERR ("m30d", Z042, __LINE__, 0x00, 0x00, STR0, STR1) } } diff --git a/tests/aslts/src/runtime/collections/functional/manipulation/tobuffer.asl b/tests/aslts/src/runtime/collections/functional/manipulation/tobuffer.asl index cda17cd7e..93a68e5c3 100644 --- a/tests/aslts/src/runtime/collections/functional/manipulation/tobuffer.asl +++ b/tests/aslts/src/runtime/collections/functional/manipulation/tobuffer.asl @@ -246,11 +246,11 @@ { If ((ObjectType (Arg1) != 0x03)) { - ERR (Arg0, Z043, 0x8C, 0x00, 0x00, Arg2, "Type") + ERR (Arg0, Z043, __LINE__, 0x00, 0x00, Arg2, "Type") } ElseIf ((SizeOf (Arg1) != (Arg2 + Arg3))) { - ERR (Arg0, Z043, 0x8F, 0x00, 0x00, Arg2, "Sizeof") + ERR (Arg0, Z043, __LINE__, 0x00, 0x00, Arg2, "Sizeof") } Else { @@ -290,7 +290,7 @@ If ((Local3 != Local5)) { - ERR (Arg0, Z043, 0xB6, 0x00, 0x00, Local0, "NotEqual") + ERR (Arg0, Z043, __LINE__, 0x00, 0x00, Local0, "NotEqual") } /* Check the source string was not corrupted */ @@ -330,7 +330,7 @@ ToBuffer (Local4, Local3) If ((Local3 != Local4)) { - ERR (Arg0, Z043, 0xDF, 0x00, 0x00, Local0, "NotEqual") + ERR (Arg0, Z043, __LINE__, 0x00, 0x00, Local0, "NotEqual") } /* Check the buffers were not corrupted */ diff --git a/tests/aslts/src/runtime/collections/functional/manipulation/tointeger.asl b/tests/aslts/src/runtime/collections/functional/manipulation/tointeger.asl index 3942d09e0..4da337ac6 100644 --- a/tests/aslts/src/runtime/collections/functional/manipulation/tointeger.asl +++ b/tests/aslts/src/runtime/collections/functional/manipulation/tointeger.asl @@ -449,14 +449,14 @@ ToInteger (Local0, Local2) If ((Local2 != Local1)) { - ERR (__METHOD__, Z047, 0x019B, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, Z047, __LINE__, 0x00, 0x00, Local0, 0x00) } Local0 = "0x000123456789abcdefa" ToInteger (Local0, Local2) If ((Local2 != Local1)) { - ERR (__METHOD__, Z047, 0x01A1, 0x00, 0x00, Local0, 0x00) + ERR (__METHOD__, Z047, __LINE__, 0x00, 0x00, Local0, 0x00) } } } diff --git a/tests/aslts/src/runtime/collections/functional/manipulation/tostring.asl b/tests/aslts/src/runtime/collections/functional/manipulation/tostring.asl index 17b5f718d..4ec25214b 100644 --- a/tests/aslts/src/runtime/collections/functional/manipulation/tostring.asl +++ b/tests/aslts/src/runtime/collections/functional/manipulation/tostring.asl @@ -165,7 +165,7 @@ Local1 = ((Local0 + 0x01) % 0x0100) If ((DerefOf (Arg1 [Local0]) != Local1)) { - ERR (Arg0, Z048, 0x5F, 0x00, 0x00, Local0, Arg4) + ERR (Arg0, Z048, __LINE__, 0x00, 0x00, Local0, Arg4) } Local0++ @@ -178,11 +178,11 @@ { If ((ObjectType (Arg1) != 0x02)) { - ERR (Arg0, Z048, 0x69, 0x00, 0x00, Arg2, "Type") + ERR (Arg0, Z048, __LINE__, 0x00, 0x00, Arg2, "Type") } ElseIf ((SizeOf (Arg1) != Arg2)) { - ERR (Arg0, Z048, 0x6C, 0x00, 0x00, Arg2, "Sizeof") + ERR (Arg0, Z048, __LINE__, 0x00, 0x00, Arg2, "Sizeof") } Else { @@ -202,7 +202,7 @@ { If ((DerefOf (Local1 [Local0]) != 0xFF)) { - ERR (Arg0, Z048, 0x7C, 0x00, 0x00, Local0, "buf8") + ERR (Arg0, Z048, __LINE__, 0x00, 0x00, Local0, "buf8") } Local0++ diff --git a/tests/aslts/src/runtime/collections/functional/name/method.asl b/tests/aslts/src/runtime/collections/functional/name/method.asl index c55d5da20..e2f30e0e5 100644 --- a/tests/aslts/src/runtime/collections/functional/name/method.asl +++ b/tests/aslts/src/runtime/collections/functional/name/method.asl @@ -152,7 +152,7 @@ Local1 = ObjectType (Arg3) If ((Local0 != Local1)) { - ERR (Concatenate (Arg0, "-OType"), Z133, 0x9A, 0x00, 0x00, Local0, Local1) + ERR (Concatenate (Arg0, "-OType"), Z133, __LINE__, 0x00, 0x00, Local0, Local1) Return (0x01) } ElseIf (DerefOf (BZ00 [Local0])) @@ -172,7 +172,7 @@ If ((Arg2 != Arg3)) { - ERR (Arg0, Z133, 0xA6, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z133, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (0x01) } } @@ -212,7 +212,7 @@ Local0 = SizeOf (Arg3) If ((SizeOf (Arg2) != Local0)) { - ERR (Concatenate (Arg0, "-Size"), Z133, 0xC6, 0x00, 0x00, SizeOf (Arg2), Local0) + ERR (Concatenate (Arg0, "-Size"), Z133, __LINE__, 0x00, 0x00, SizeOf (Arg2), Local0) Return (0x01) } @@ -225,7 +225,7 @@ { /* ObjectType is corrupted */ - ERR (Concatenate (Arg0, "-OType"), Z133, 0xCF, 0x00, 0x00, Local1, Local2) + ERR (Concatenate (Arg0, "-OType"), Z133, __LINE__, 0x00, 0x00, Local1, Local2) Return (0x01) } ElseIf (DerefOf (BZ00 [Local1])) @@ -237,7 +237,7 @@ { /* The value is corrupted */ - ERR (Arg0, Z133, 0xD7, 0x00, 0x00, DerefOf (Arg2 [Local0]), DerefOf ( + ERR (Arg0, Z133, __LINE__, 0x00, 0x00, DerefOf (Arg2 [Local0]), DerefOf ( Arg3 [Local0])) Return (0x01) } diff --git a/tests/aslts/src/runtime/collections/functional/name/package.asl b/tests/aslts/src/runtime/collections/functional/name/package.asl index 4694cf717..5066f335a 100644 --- a/tests/aslts/src/runtime/collections/functional/name/package.asl +++ b/tests/aslts/src/runtime/collections/functional/name/package.asl @@ -337,7 +337,7 @@ { If ((Local2 != Local3)) { - ERR (__METHOD__, Z051, 0x93, 0x00, 0x00, Local2, Local3) + ERR (__METHOD__, Z051, __LINE__, 0x00, 0x00, Local2, Local3) } } ElseIf ((Local1 <= 0x9F)) @@ -345,7 +345,7 @@ Local3 = (0x8765AC00 + Local4) If ((Local2 != Local3)) { - ERR (__METHOD__, Z051, 0x98, 0x00, 0x00, Local2, Local3) + ERR (__METHOD__, Z051, __LINE__, 0x00, 0x00, Local2, Local3) } Local4 += Local6 @@ -355,20 +355,20 @@ Local3 = (0x8765ACBA11223300 + Local5) If ((Local2 != Local3)) { - ERR (__METHOD__, Z051, 0x9E, 0x00, 0x00, Local2, Local3) + ERR (__METHOD__, Z051, __LINE__, 0x00, 0x00, Local2, Local3) } Local5 += Local6 } ElseIf ((Local2 != Local3)) { - ERR (__METHOD__, Z051, 0xA3, 0x00, 0x00, Local2, Local3) + ERR (__METHOD__, Z051, __LINE__, 0x00, 0x00, Local2, Local3) } Local3 = ObjectType (Local2) If ((Local3 != 0x01)) { - ERR (__METHOD__, Z051, 0xA9, 0x00, 0x00, Local3, 0x01) + ERR (__METHOD__, Z051, __LINE__, 0x00, 0x00, Local3, 0x01) } Local1 += Local6 @@ -378,7 +378,7 @@ Local0 = SizeOf (P000) If ((Local0 != 0xFF)) { - ERR (__METHOD__, Z051, 0xB2, 0x00, 0x00, Local0, 0xFF) + ERR (__METHOD__, Z051, __LINE__, 0x00, 0x00, Local0, 0xFF) } } @@ -415,13 +415,13 @@ If ((Local4 != Local3)) { - ERR (__METHOD__, Z051, 0xD1, 0x00, 0x00, Local4, Local3) + ERR (__METHOD__, Z051, __LINE__, 0x00, 0x00, Local4, Local3) } Local3 = ObjectType (Local2) If ((Local3 != 0x02)) { - ERR (__METHOD__, Z051, 0xD6, 0x00, 0x00, Local3, 0x02) + ERR (__METHOD__, Z051, __LINE__, 0x00, 0x00, Local3, 0x02) } Local1++ @@ -431,7 +431,7 @@ Local0 = SizeOf (P000) If ((Local0 != 0x0A)) { - ERR (__METHOD__, Z051, 0xDF, 0x00, 0x00, Local0, 0x0A) + ERR (__METHOD__, Z051, __LINE__, 0x00, 0x00, Local0, 0x0A) } } @@ -765,13 +765,13 @@ Local4 = (Local1 + 0x01) If ((Local4 != Local3)) { - ERR (__METHOD__, Z051, 0x014E, 0x00, 0x00, Local4, Local3) + ERR (__METHOD__, Z051, __LINE__, 0x00, 0x00, Local4, Local3) } Local3 = ObjectType (Local2) If ((Local3 != 0x03)) { - ERR (__METHOD__, Z051, 0x0153, 0x00, 0x00, Local3, 0x03) + ERR (__METHOD__, Z051, __LINE__, 0x00, 0x00, Local3, 0x03) } Local1 += Local6 @@ -781,7 +781,7 @@ Local0 = SizeOf (P000) If ((Local0 != 0xFF)) { - ERR (__METHOD__, Z051, 0x015C, 0x00, 0x00, Local0, 0xFF) + ERR (__METHOD__, Z051, __LINE__, 0x00, 0x00, Local0, 0xFF) } } @@ -1246,13 +1246,13 @@ Local4 = (Local1 + 0x01) If ((Local4 != Local3)) { - ERR (__METHOD__, Z051, 0x01CF, 0x00, 0x00, Local4, Local3) + ERR (__METHOD__, Z051, __LINE__, 0x00, 0x00, Local4, Local3) } Local3 = ObjectType (Local2) If ((Local3 != 0x04)) { - ERR (__METHOD__, Z051, 0x01D4, 0x00, 0x00, Local3, 0x04) + ERR (__METHOD__, Z051, __LINE__, 0x00, 0x00, Local3, 0x04) } Local1 += Local6 @@ -1262,7 +1262,7 @@ Local0 = SizeOf (P000) If ((Local0 != 0xFF)) { - ERR (__METHOD__, Z051, 0x01DD, 0x00, 0x00, Local0, 0xFF) + ERR (__METHOD__, Z051, __LINE__, 0x00, 0x00, Local0, 0xFF) } } @@ -1354,7 +1354,7 @@ Local0 = ObjectType (Local7) If ((Local0 != N002)) { - ERR (Arg0, Z051, 0x0227, 0x00, 0x00, Local0, N002) + ERR (Arg0, Z051, __LINE__, 0x00, 0x00, Local0, N002) } /* Contents */ @@ -1373,12 +1373,12 @@ If ((Local1 != N004)) { - ERR (Arg0, Z051, 0x0239, 0x00, 0x00, Local1, N004) + ERR (Arg0, Z051, __LINE__, 0x00, 0x00, Local1, N004) Local6 = 0x01 } ElseIf ((Local7 != Local0)) { - ERR (Arg0, Z051, 0x023C, 0x00, 0x00, Local7, Local0) + ERR (Arg0, Z051, __LINE__, 0x00, 0x00, Local7, Local0) Local6 = 0x01 } @@ -4655,13 +4655,13 @@ Local0 = SizeOf (P000) If ((Local0 != 0xFF)) { - ERR (__METHOD__, Z051, 0x03E2, 0x00, 0x00, Local0, 0xFF) + ERR (__METHOD__, Z051, __LINE__, 0x00, 0x00, Local0, 0xFF) } Local0 = SizeOf (P001) If ((Local0 != 0x1D)) { - ERR (__METHOD__, Z051, 0x03E7, 0x00, 0x00, Local0, 0x1D) + ERR (__METHOD__, Z051, __LINE__, 0x00, 0x00, Local0, 0x1D) } } @@ -4720,7 +4720,7 @@ If ((Local1 != Local0)) { - ERR (__METHOD__, Z051, 0x0424, 0x00, 0x00, Local1, Local0) + ERR (__METHOD__, Z051, __LINE__, 0x00, 0x00, Local1, Local0) } Local0++ @@ -4731,13 +4731,13 @@ Local0 = ObjectType (Arg0) If ((Local0 != 0x04)) { - ERR (__METHOD__, Z051, 0x042D, 0x00, 0x00, Local0, 0x04) + ERR (__METHOD__, Z051, __LINE__, 0x00, 0x00, Local0, 0x04) } Local0 = SizeOf (Arg0) If ((Local0 != Arg1)) { - ERR (__METHOD__, Z051, 0x0432, 0x00, 0x00, Local0, Arg1) + ERR (__METHOD__, Z051, __LINE__, 0x00, 0x00, Local0, Arg1) } } @@ -4799,7 +4799,7 @@ If ((Local1 != Local0)) { - ERR (__METHOD__, Z051, 0x0470, 0x00, 0x00, Local1, Local0) + ERR (__METHOD__, Z051, __LINE__, 0x00, 0x00, Local1, Local0) } N000-- @@ -4809,13 +4809,13 @@ Local0 = ObjectType (Arg0) If ((Local0 != 0x04)) { - ERR (__METHOD__, Z051, 0x0478, 0x00, 0x00, Local0, 0x04) + ERR (__METHOD__, Z051, __LINE__, 0x00, 0x00, Local0, 0x04) } Local0 = SizeOf (Arg0) If ((Local0 != Arg1)) { - ERR (__METHOD__, Z051, 0x047D, 0x00, 0x00, Local0, Arg1) + ERR (__METHOD__, Z051, __LINE__, 0x00, 0x00, Local0, Arg1) } } @@ -4879,7 +4879,7 @@ If ((Local1 != Local0)) { - ERR (__METHOD__, Z051, 0x04BE, 0x00, 0x00, 0x00, 0x00) + ERR (__METHOD__, Z051, __LINE__, 0x00, 0x00, 0x00, 0x00) Debug = Local0 Debug = Local1 Return (Ones) @@ -4892,13 +4892,13 @@ Local0 = ObjectType (Arg0) If ((Local0 != 0x04)) { - ERR (__METHOD__, Z051, 0x04C9, 0x00, 0x00, Local0, 0x04) + ERR (__METHOD__, Z051, __LINE__, 0x00, 0x00, Local0, 0x04) } Local0 = SizeOf (Arg0) If ((Local0 != Arg1)) { - ERR (__METHOD__, Z051, 0x04CE, 0x00, 0x00, Local0, Arg1) + ERR (__METHOD__, Z051, __LINE__, 0x00, 0x00, Local0, Arg1) } Return (Zero) @@ -4980,7 +4980,7 @@ Local0 = ObjectType (Local1) If ((Local0 != 0x04)) { - ERR (__METHOD__, Z051, 0x0519, 0x00, 0x00, Local0, 0x04) + ERR (__METHOD__, Z051, __LINE__, 0x00, 0x00, Local0, 0x04) Return (Ones) } @@ -4991,13 +4991,13 @@ Local0 = ObjectType (Arg0) If ((Local0 != 0x04)) { - ERR (__METHOD__, Z051, 0x0522, 0x00, 0x00, Local0, 0x04) + ERR (__METHOD__, Z051, __LINE__, 0x00, 0x00, Local0, 0x04) } Local0 = SizeOf (Arg0) If ((Local0 != Arg1)) { - ERR (__METHOD__, Z051, 0x0527, 0x00, 0x00, Local0, Arg1) + ERR (__METHOD__, Z051, __LINE__, 0x00, 0x00, Local0, Arg1) } Return (Zero) diff --git a/tests/aslts/src/runtime/collections/functional/reference/ref00.asl b/tests/aslts/src/runtime/collections/functional/reference/ref00.asl index 7ec0020b9..5ae0ab097 100644 --- a/tests/aslts/src/runtime/collections/functional/reference/ref00.asl +++ b/tests/aslts/src/runtime/collections/functional/reference/ref00.asl @@ -55,7 +55,7 @@ Local0 = ObjectType (Arg0) If ((Local0 != Arg1)) { - ERR (C080, Z076, 0x3F, 0x00, 0x00, Local0, Arg1) + ERR (C080, Z076, __LINE__, 0x00, 0x00, Local0, Arg1) } /* if (c08b) */ /* ATTENTION: exactly the same in m1a0 and m1a2 */ @@ -133,7 +133,7 @@ Local1 = ObjectType (Local0) If ((Local1 != Arg1)) { - ERR (C080, Z076, 0x84, 0x00, 0x00, Local1, Arg1) + ERR (C080, Z076, __LINE__, 0x00, 0x00, Local1, Arg1) } Else { @@ -145,14 +145,14 @@ Local1 = CondRefOf (Arg0, Local0) If ((Local1 != Ones)) { - ERR (C080, Z076, 0x8B, 0x00, 0x00, Local1, Arg1) + ERR (C080, Z076, __LINE__, 0x00, 0x00, Local1, Arg1) } Else { Local1 = ObjectType (Local0) If ((Local1 != Arg1)) { - ERR (C080, Z076, 0x8F, 0x00, 0x00, Local1, Arg1) + ERR (C080, Z076, __LINE__, 0x00, 0x00, Local1, Arg1) } Else { @@ -169,7 +169,7 @@ Local1 = ObjectType (Local0) If ((Local1 != Arg1)) { - ERR (C080, Z076, 0x9E, 0x00, 0x00, Local1, Arg1) + ERR (C080, Z076, __LINE__, 0x00, 0x00, Local1, Arg1) } Else { @@ -178,7 +178,7 @@ Local1 = ObjectType (DerefOf (Local0)) If ((Local1 != Arg1)) { - ERR (C080, Z076, 0xA5, 0x00, 0x00, Local1, Arg1) + ERR (C080, Z076, __LINE__, 0x00, 0x00, Local1, Arg1) } /* Check that writing into M2-ArgX-RefOf_Reference */ @@ -187,11 +187,11 @@ Local1 = ObjectType (Arg0) If ((Local1 != C009)) { - ERR (C080, Z076, 0xAE, 0x00, 0x00, Local1, C009) + ERR (C080, Z076, __LINE__, 0x00, 0x00, Local1, C009) } ElseIf ((Arg0 != 0xABCD001A)) { - ERR (C080, Z076, 0xB0, 0x00, 0x00, Arg0, 0xABCD001A) + ERR (C080, Z076, __LINE__, 0x00, 0x00, Arg0, 0xABCD001A) } Else { @@ -202,14 +202,14 @@ Local1 = ObjectType (Local0) If ((Local1 != C009)) { - ERR (C080, Z076, 0xBA, 0x00, 0x00, Local1, C009) + ERR (C080, Z076, __LINE__, 0x00, 0x00, Local1, C009) } Else { Local1 = SizeOf (Local0) If ((Local1 != ISZ0)) { - ERR (C080, Z076, 0xBE, 0x00, 0x00, Local1, ISZ0) + ERR (C080, Z076, __LINE__, 0x00, 0x00, Local1, ISZ0) } } } @@ -241,7 +241,7 @@ Local0 = ObjectType (Arg0) If ((Local0 != Arg1)) { - ERR (C080, Z076, 0xDF, 0x00, 0x00, Local0, Arg1) + ERR (C080, Z076, __LINE__, 0x00, 0x00, Local0, Arg1) } /* if (c08b) */ /* ATTENTION: exactly the same in m1a0 and m1a2 */ @@ -349,11 +349,11 @@ Local0 = ObjectType (Local2) If ((Local0 != Arg4)) { - ERR (C080, Z076, 0x0136, 0x00, 0x00, Local0, Arg4) + ERR (C080, Z076, __LINE__, 0x00, 0x00, Local0, Arg4) } ElseIf ((Local2 != Arg5)) { - ERR (C080, Z076, 0x0139, 0x00, 0x00, Local2, Arg5) + ERR (C080, Z076, __LINE__, 0x00, 0x00, Local2, Arg5) } } @@ -392,7 +392,7 @@ Local1 = ObjectType (Local0) If ((Local1 != Arg1)) { - ERR (C080, Z076, 0x015D, 0x00, 0x00, Local1, Arg1) + ERR (C080, Z076, __LINE__, 0x00, 0x00, Local1, Arg1) } Else { @@ -404,14 +404,14 @@ Local1 = CondRefOf (Arg0, Local0) If ((Local1 != Ones)) { - ERR (C080, Z076, 0x0164, 0x00, 0x00, Local1, Arg1) + ERR (C080, Z076, __LINE__, 0x00, 0x00, Local1, Arg1) } Else { Local1 = ObjectType (Local0) If ((Local1 != Arg1)) { - ERR (C080, Z076, 0x0168, 0x00, 0x00, Local1, Arg1) + ERR (C080, Z076, __LINE__, 0x00, 0x00, Local1, Arg1) } Else { @@ -428,7 +428,7 @@ Local1 = ObjectType (Local0) If ((Local1 != Arg1)) { - ERR (C080, Z076, 0x0177, 0x00, 0x00, Local1, Arg1) + ERR (C080, Z076, __LINE__, 0x00, 0x00, Local1, Arg1) } Else { @@ -437,7 +437,7 @@ Local1 = ObjectType (DerefOf (Local0)) If ((Local1 != Arg1)) { - ERR (C080, Z076, 0x017E, 0x00, 0x00, Local1, Arg1) + ERR (C080, Z076, __LINE__, 0x00, 0x00, Local1, Arg1) } /* Check that writing into M2-ArgX-RefOf_Reference */ @@ -446,11 +446,11 @@ Local1 = ObjectType (Arg0) If ((Local1 != C009)) { - ERR (C080, Z076, 0x0187, 0x00, 0x00, Local1, C009) + ERR (C080, Z076, __LINE__, 0x00, 0x00, Local1, C009) } ElseIf ((Arg0 != 0xABCD001A)) { - ERR (C080, Z076, 0x0189, 0x00, 0x00, Arg0, 0xABCD001A) + ERR (C080, Z076, __LINE__, 0x00, 0x00, Arg0, 0xABCD001A) } Else { @@ -461,14 +461,14 @@ Local1 = ObjectType (Local0) If ((Local1 != C009)) { - ERR (C080, Z076, 0x0193, 0x00, 0x00, Local1, C009) + ERR (C080, Z076, __LINE__, 0x00, 0x00, Local1, C009) } Else { Local1 = SizeOf (Local0) If ((Local1 != ISZ0)) { - ERR (C080, Z076, 0x0197, 0x00, 0x00, Local1, ISZ0) + ERR (C080, Z076, __LINE__, 0x00, 0x00, Local1, ISZ0) } } } @@ -489,12 +489,12 @@ Local0 = ObjectType (Arg0) If ((Local0 != C009)) { - ERR (C080, Z076, 0x01B1, 0x00, 0x00, Local0, C009) + ERR (C080, Z076, __LINE__, 0x00, 0x00, Local0, C009) Local7 = 0x00 } ElseIf ((Arg0 != Ones)) { - ERR (C080, Z076, 0x01B4, 0x00, 0x00, Arg0, Ones) + ERR (C080, Z076, __LINE__, 0x00, 0x00, Arg0, Ones) Local7 = 0x00 } diff --git a/tests/aslts/src/runtime/collections/functional/reference/ref01.asl b/tests/aslts/src/runtime/collections/functional/reference/ref01.asl index e797d1075..010025923 100644 --- a/tests/aslts/src/runtime/collections/functional/reference/ref01.asl +++ b/tests/aslts/src/runtime/collections/functional/reference/ref01.asl @@ -1041,56 +1041,56 @@ Local0 = ObjectType (I900) If ((Local0 != C009)) { - ERR (C080, Z077, 0x016D, 0x00, 0x00, Local0, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C009) } If ((I900 != 0xFE7CB391D65A1000)) { - ERR (C080, Z077, 0x0170, 0x00, 0x00, I900, 0xFE7CB391D65A1000) + ERR (C080, Z077, __LINE__, 0x00, 0x00, I900, 0xFE7CB391D65A1000) } Local0 = ObjectType (I901) If ((Local0 != C009)) { - ERR (C080, Z077, 0x0175, 0x00, 0x00, Local0, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C009) } If ((I901 != 0xC1791001)) { - ERR (C080, Z077, 0x0178, 0x00, 0x00, I901, 0xC1791001) + ERR (C080, Z077, __LINE__, 0x00, 0x00, I901, 0xC1791001) } Local0 = ObjectType (I902) If ((Local0 != C009)) { - ERR (C080, Z077, 0x017D, 0x00, 0x00, Local0, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C009) } If ((I902 != 0x00)) { - ERR (C080, Z077, 0x0180, 0x00, 0x00, I902, 0x00) + ERR (C080, Z077, __LINE__, 0x00, 0x00, I902, 0x00) } Local0 = ObjectType (I903) If ((Local0 != C009)) { - ERR (C080, Z077, 0x0185, 0x00, 0x00, Local0, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C009) } If ((I903 != 0xFFFFFFFFFFFFFFFF)) { - ERR (C080, Z077, 0x0188, 0x00, 0x00, I903, 0xFFFFFFFFFFFFFFFF) + ERR (C080, Z077, __LINE__, 0x00, 0x00, I903, 0xFFFFFFFFFFFFFFFF) } Local0 = ObjectType (I904) If ((Local0 != C009)) { - ERR (C080, Z077, 0x018D, 0x00, 0x00, Local0, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C009) } If ((I904 != 0xFFFFFFFF)) { - ERR (C080, Z077, 0x0190, 0x00, 0x00, I904, 0xFFFFFFFF) + ERR (C080, Z077, __LINE__, 0x00, 0x00, I904, 0xFFFFFFFF) } /* String */ @@ -1098,23 +1098,23 @@ Local0 = ObjectType (S900) If ((Local0 != C00A)) { - ERR (C080, Z077, 0x0197, 0x00, 0x00, Local0, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C00A) } If ((S900 != "12341002")) { - ERR (C080, Z077, 0x019A, 0x00, 0x00, S900, "12341002") + ERR (C080, Z077, __LINE__, 0x00, 0x00, S900, "12341002") } Local0 = ObjectType (S901) If ((Local0 != C00A)) { - ERR (C080, Z077, 0x019F, 0x00, 0x00, Local0, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C00A) } If ((S901 != "qwrtyu1003")) { - ERR (C080, Z077, 0x01A2, 0x00, 0x00, S901, "qwrtyu1003") + ERR (C080, Z077, __LINE__, 0x00, 0x00, S901, "qwrtyu1003") } /* Buffer */ @@ -1122,7 +1122,7 @@ Local0 = ObjectType (B900) If ((Local0 != C00B)) { - ERR (C080, Z077, 0x01A9, 0x00, 0x00, Local0, C00B) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C00B) } If ((B900 != Buffer (0x05) @@ -1130,7 +1130,7 @@ 0x10, 0x11, 0x12, 0x13, 0x14 // ..... })) { - ERR (C080, Z077, 0x01AC, 0x00, 0x00, B900, Buffer (0x05) + ERR (C080, Z077, __LINE__, 0x00, 0x00, B900, Buffer (0x05) { 0x10, 0x11, 0x12, 0x13, 0x14 // ..... }) @@ -1141,12 +1141,12 @@ Local0 = ObjectType (BF90) If ((Local0 != C016)) { - ERR (C080, Z077, 0x01B3, 0x00, 0x00, Local0, C016) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C016) } If ((BF90 != 0x10)) { - ERR (C080, Z077, 0x01B6, 0x00, 0x00, BF90, 0x10) + ERR (C080, Z077, __LINE__, 0x00, 0x00, BF90, 0x10) } /* One level Package */ @@ -1155,7 +1155,7 @@ Local1 = ObjectType (Local0) If ((Local1 != C008)) { - ERR (C080, Z077, 0x01BE, 0x00, 0x00, Local1, C008) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, C008) } Store (P901 [0x00], Local0) @@ -1163,12 +1163,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C009)) { - ERR (C080, Z077, 0x01C5, 0x00, 0x00, Local2, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C009) } If ((Local1 != 0xABCD1004)) { - ERR (C080, Z077, 0x01C8, 0x00, 0x00, Local1, 0xABCD1004) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, 0xABCD1004) } Store (P901 [0x01], Local0) @@ -1176,12 +1176,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C009)) { - ERR (C080, Z077, 0x01CF, 0x00, 0x00, Local2, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C009) } If ((Local1 != 0x1122334455661005)) { - ERR (C080, Z077, 0x01D2, 0x00, 0x00, Local1, 0x1122334455661005) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, 0x1122334455661005) } Store (P902 [0x00], Local0) @@ -1189,12 +1189,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C00A)) { - ERR (C080, Z077, 0x01D9, 0x00, 0x00, Local2, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C00A) } If ((Local1 != "12341006")) { - ERR (C080, Z077, 0x01DC, 0x00, 0x00, Local1, "12341006") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, "12341006") } Store (P902 [0x01], Local0) @@ -1202,12 +1202,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C00A)) { - ERR (C080, Z077, 0x01E3, 0x00, 0x00, Local2, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C00A) } If ((Local1 != "q1w2e3r4t5y6u7i81007")) { - ERR (C080, Z077, 0x01E6, 0x00, 0x00, Local1, "q1w2e3r4t5y6u7i81007") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, "q1w2e3r4t5y6u7i81007") } Store (P903 [0x00], Local0) @@ -1215,12 +1215,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C00A)) { - ERR (C080, Z077, 0x01ED, 0x00, 0x00, Local2, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C00A) } If ((Local1 != "qwrtyuiop1008")) { - ERR (C080, Z077, 0x01F0, 0x00, 0x00, Local1, "qwrtyuiop1008") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, "qwrtyuiop1008") } Store (P903 [0x01], Local0) @@ -1228,12 +1228,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C00A)) { - ERR (C080, Z077, 0x01F7, 0x00, 0x00, Local2, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C00A) } If ((Local1 != "1234567890abdef0251009")) { - ERR (C080, Z077, 0x01FA, 0x00, 0x00, Local1, "1234567890abdef0251009") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, "1234567890abdef0251009") } Store (P904 [0x00], Local0) @@ -1241,7 +1241,7 @@ Local2 = ObjectType (Local1) If ((Local2 != C00B)) { - ERR (C080, Z077, 0x0201, 0x00, 0x00, Local2, C00B) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C00B) } If ((Local1 != Buffer (0x03) @@ -1249,7 +1249,7 @@ 0xA0, 0xA1, 0xA2 // ... })) { - ERR (C080, Z077, 0x0204, 0x00, 0x00, Local1, Buffer (0x03) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, Buffer (0x03) { 0xA0, 0xA1, 0xA2 // ... }) @@ -1260,7 +1260,7 @@ Local2 = ObjectType (Local1) If ((Local2 != C00B)) { - ERR (C080, Z077, 0x020B, 0x00, 0x00, Local2, C00B) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C00B) } If ((Local1 != Buffer (0x02) @@ -1268,7 +1268,7 @@ 0xA3, 0xA4 // .. })) { - ERR (C080, Z077, 0x020E, 0x00, 0x00, Local1, Buffer (0x02) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, Buffer (0x02) { 0xA3, 0xA4 // .. }) @@ -1283,12 +1283,12 @@ Local4 = ObjectType (Local3) If ((Local4 != C009)) { - ERR (C080, Z077, 0x0219, 0x00, 0x00, Local4, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local4, C009) } If ((Local3 != 0x0ABC100A)) { - ERR (C080, Z077, 0x021C, 0x00, 0x00, Local3, 0x0ABC100A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local3, 0x0ABC100A) } Store (P905 [0x00], Local0) @@ -1298,12 +1298,12 @@ Local4 = ObjectType (Local3) If ((Local4 != C00A)) { - ERR (C080, Z077, 0x0225, 0x00, 0x00, Local4, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local4, C00A) } If ((Local3 != "0xabc100b")) { - ERR (C080, Z077, 0x0228, 0x00, 0x00, Local3, "0xabc100b") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local3, "0xabc100b") } Store (P905 [0x00], Local0) @@ -1313,12 +1313,12 @@ Local4 = ObjectType (Local3) If ((Local4 != C00A)) { - ERR (C080, Z077, 0x0231, 0x00, 0x00, Local4, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local4, C00A) } If ((Local3 != "abc100c")) { - ERR (C080, Z077, 0x0234, 0x00, 0x00, Local3, "abc100c") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local3, "abc100c") } Store (P906 [0x00], Local0) @@ -1328,12 +1328,12 @@ Local4 = ObjectType (Local3) If ((Local4 != C00A)) { - ERR (C080, Z077, 0x023D, 0x00, 0x00, Local4, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local4, C00A) } If ((Local3 != "abc100d")) { - ERR (C080, Z077, 0x0240, 0x00, 0x00, Local3, "abc100d") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local3, "abc100d") } Store (P907 [0x00], Local0) @@ -1343,12 +1343,12 @@ Local4 = ObjectType (Local3) If ((Local4 != C00A)) { - ERR (C080, Z077, 0x0249, 0x00, 0x00, Local4, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local4, C00A) } If ((Local3 != "aqwevbgnm100e")) { - ERR (C080, Z077, 0x024C, 0x00, 0x00, Local3, "aqwevbgnm100e") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local3, "aqwevbgnm100e") } Store (P908 [0x00], Local0) @@ -1358,7 +1358,7 @@ Local4 = ObjectType (Local3) If ((Local4 != C00B)) { - ERR (C080, Z077, 0x0255, 0x00, 0x00, Local4, C00B) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local4, C00B) } If ((Local3 != Buffer (0x05) @@ -1366,7 +1366,7 @@ 0xA5, 0xA6, 0xA7, 0xA8, 0xA9 // ..... })) { - ERR (C080, Z077, 0x0258, 0x00, 0x00, Local3, Buffer (0x05) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local3, Buffer (0x05) { 0xA5, 0xA6, 0xA7, 0xA8, 0xA9 // ..... }) @@ -1383,12 +1383,12 @@ Local6 = ObjectType (Local5) If ((Local6 != C009)) { - ERR (C080, Z077, 0x0265, 0x00, 0x00, Local6, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local6, C009) } If ((Local5 != 0x0ABC100F)) { - ERR (C080, Z077, 0x0268, 0x00, 0x00, Local5, 0x0ABC100F) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local5, 0x0ABC100F) } Store (P90A [0x00], Local0) @@ -1400,12 +1400,12 @@ Local6 = ObjectType (Local5) If ((Local6 != C00A)) { - ERR (C080, Z077, 0x0273, 0x00, 0x00, Local6, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local6, C00A) } If ((Local5 != "12341010")) { - ERR (C080, Z077, 0x0276, 0x00, 0x00, Local5, "12341010") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local5, "12341010") } Store (P90B [0x00], Local0) @@ -1417,12 +1417,12 @@ Local6 = ObjectType (Local5) If ((Local6 != C00A)) { - ERR (C080, Z077, 0x0281, 0x00, 0x00, Local6, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local6, C00A) } If ((Local5 != "zxswefas1011")) { - ERR (C080, Z077, 0x0284, 0x00, 0x00, Local5, "zxswefas1011") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local5, "zxswefas1011") } Store (P90C [0x00], Local0) @@ -1434,7 +1434,7 @@ Local6 = ObjectType (Local5) If ((Local6 != C00B)) { - ERR (C080, Z077, 0x028F, 0x00, 0x00, Local6, C00B) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local6, C00B) } If ((Local5 != Buffer (0x03) @@ -1442,7 +1442,7 @@ 0xAA, 0xAB, 0xAC // ... })) { - ERR (C080, Z077, 0x0292, 0x00, 0x00, Local5, Buffer (0x03) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local5, Buffer (0x03) { 0xAA, 0xAB, 0xAC // ... }) @@ -1453,12 +1453,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C009)) { - ERR (C080, Z077, 0x0299, 0x00, 0x00, Local2, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C009) } If ((Local1 != 0xABCD1018)) { - ERR (C080, Z077, 0x029C, 0x00, 0x00, Local1, 0xABCD1018) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, 0xABCD1018) } Store (P953 [0x01], Local0) @@ -1466,12 +1466,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C009)) { - ERR (C080, Z077, 0x02A3, 0x00, 0x00, Local2, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C009) } If ((Local1 != 0xABCD1019)) { - ERR (C080, Z077, 0x02A6, 0x00, 0x00, Local1, 0xABCD1019) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, 0xABCD1019) } /* Not Computational Data */ @@ -2861,56 +2861,56 @@ Local0 = ObjectType (I900) If ((Local0 != C009)) { - ERR (C080, Z077, 0x064C, 0x00, 0x00, Local0, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C009) } If ((I900 != 0xFE7CB391D65A2000)) { - ERR (C080, Z077, 0x064F, 0x00, 0x00, I900, 0xFE7CB391D65A2000) + ERR (C080, Z077, __LINE__, 0x00, 0x00, I900, 0xFE7CB391D65A2000) } Local0 = ObjectType (I901) If ((Local0 != C009)) { - ERR (C080, Z077, 0x0654, 0x00, 0x00, Local0, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C009) } If ((I901 != 0xC1792001)) { - ERR (C080, Z077, 0x0657, 0x00, 0x00, I901, 0xC1792001) + ERR (C080, Z077, __LINE__, 0x00, 0x00, I901, 0xC1792001) } Local0 = ObjectType (I902) If ((Local0 != C009)) { - ERR (C080, Z077, 0x065C, 0x00, 0x00, Local0, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C009) } If ((I902 != 0x00)) { - ERR (C080, Z077, 0x065F, 0x00, 0x00, I902, 0x00) + ERR (C080, Z077, __LINE__, 0x00, 0x00, I902, 0x00) } Local0 = ObjectType (I903) If ((Local0 != C009)) { - ERR (C080, Z077, 0x0664, 0x00, 0x00, Local0, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C009) } If ((I903 != 0xFFFFFFFFFFFFFFFF)) { - ERR (C080, Z077, 0x0667, 0x00, 0x00, I903, 0xFFFFFFFFFFFFFFFF) + ERR (C080, Z077, __LINE__, 0x00, 0x00, I903, 0xFFFFFFFFFFFFFFFF) } Local0 = ObjectType (I904) If ((Local0 != C009)) { - ERR (C080, Z077, 0x066C, 0x00, 0x00, Local0, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C009) } If ((I904 != 0xFFFFFFFF)) { - ERR (C080, Z077, 0x066F, 0x00, 0x00, I904, 0xFFFFFFFF) + ERR (C080, Z077, __LINE__, 0x00, 0x00, I904, 0xFFFFFFFF) } /* String */ @@ -2918,23 +2918,23 @@ Local0 = ObjectType (S900) If ((Local0 != C00A)) { - ERR (C080, Z077, 0x0676, 0x00, 0x00, Local0, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C00A) } If ((S900 != "12342002")) { - ERR (C080, Z077, 0x0679, 0x00, 0x00, S900, "12342002") + ERR (C080, Z077, __LINE__, 0x00, 0x00, S900, "12342002") } Local0 = ObjectType (S901) If ((Local0 != C00A)) { - ERR (C080, Z077, 0x067E, 0x00, 0x00, Local0, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C00A) } If ((S901 != "qwrtyu2003")) { - ERR (C080, Z077, 0x0681, 0x00, 0x00, S901, "qwrtyu2003") + ERR (C080, Z077, __LINE__, 0x00, 0x00, S901, "qwrtyu2003") } /* Buffer */ @@ -2942,7 +2942,7 @@ Local0 = ObjectType (B900) If ((Local0 != C00B)) { - ERR (C080, Z077, 0x0688, 0x00, 0x00, Local0, C00B) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C00B) } If ((B900 != Buffer (0x05) @@ -2950,7 +2950,7 @@ 0xC0, 0xC1, 0xC2, 0xC3, 0xC4 // ..... })) { - ERR (C080, Z077, 0x068B, 0x00, 0x00, B900, Buffer (0x05) + ERR (C080, Z077, __LINE__, 0x00, 0x00, B900, Buffer (0x05) { 0xC0, 0xC1, 0xC2, 0xC3, 0xC4 // ..... }) @@ -2961,12 +2961,12 @@ Local0 = ObjectType (BF90) If ((Local0 != C016)) { - ERR (C080, Z077, 0x0692, 0x00, 0x00, Local0, C016) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C016) } If ((BF90 != 0xC0)) { - ERR (C080, Z077, 0x0695, 0x00, 0x00, BF90, 0xC0) + ERR (C080, Z077, __LINE__, 0x00, 0x00, BF90, 0xC0) } /* One level Package */ @@ -2975,7 +2975,7 @@ Local1 = ObjectType (Local0) If ((Local1 != C008)) { - ERR (C080, Z077, 0x069D, 0x00, 0x00, Local1, C008) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, C008) } Store (P901 [0x00], Local0) @@ -2983,12 +2983,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C009)) { - ERR (C080, Z077, 0x06A4, 0x00, 0x00, Local2, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C009) } If ((Local1 != 0xABCD2004)) { - ERR (C080, Z077, 0x06A7, 0x00, 0x00, Local1, 0xABCD2004) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, 0xABCD2004) } Store (P901 [0x01], Local0) @@ -2996,12 +2996,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C009)) { - ERR (C080, Z077, 0x06AE, 0x00, 0x00, Local2, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C009) } If ((Local1 != 0x1122334455662005)) { - ERR (C080, Z077, 0x06B1, 0x00, 0x00, Local1, 0x1122334455662005) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, 0x1122334455662005) } Store (P902 [0x00], Local0) @@ -3009,12 +3009,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C00A)) { - ERR (C080, Z077, 0x06B8, 0x00, 0x00, Local2, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C00A) } If ((Local1 != "12342006")) { - ERR (C080, Z077, 0x06BB, 0x00, 0x00, Local1, "12342006") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, "12342006") } Store (P902 [0x01], Local0) @@ -3022,12 +3022,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C00A)) { - ERR (C080, Z077, 0x06C2, 0x00, 0x00, Local2, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C00A) } If ((Local1 != "q1w2e3r4t5y6u7i82007")) { - ERR (C080, Z077, 0x06C5, 0x00, 0x00, Local1, "q1w2e3r4t5y6u7i82007") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, "q1w2e3r4t5y6u7i82007") } Store (P903 [0x00], Local0) @@ -3035,12 +3035,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C00A)) { - ERR (C080, Z077, 0x06CC, 0x00, 0x00, Local2, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C00A) } If ((Local1 != "qwrtyuiop2008")) { - ERR (C080, Z077, 0x06CF, 0x00, 0x00, Local1, "qwrtyuiop2008") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, "qwrtyuiop2008") } Store (P903 [0x01], Local0) @@ -3048,12 +3048,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C00A)) { - ERR (C080, Z077, 0x06D6, 0x00, 0x00, Local2, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C00A) } If ((Local1 != "1234567890abdef0252009")) { - ERR (C080, Z077, 0x06D9, 0x00, 0x00, Local1, "1234567890abdef0252009") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, "1234567890abdef0252009") } Store (P904 [0x00], Local0) @@ -3061,7 +3061,7 @@ Local2 = ObjectType (Local1) If ((Local2 != C00B)) { - ERR (C080, Z077, 0x06E0, 0x00, 0x00, Local2, C00B) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C00B) } If ((Local1 != Buffer (0x03) @@ -3069,7 +3069,7 @@ 0xC5, 0xC6, 0xC7 // ... })) { - ERR (C080, Z077, 0x06E3, 0x00, 0x00, Local1, Buffer (0x03) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, Buffer (0x03) { 0xC5, 0xC6, 0xC7 // ... }) @@ -3080,7 +3080,7 @@ Local2 = ObjectType (Local1) If ((Local2 != C00B)) { - ERR (C080, Z077, 0x06EA, 0x00, 0x00, Local2, C00B) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C00B) } If ((Local1 != Buffer (0x02) @@ -3088,7 +3088,7 @@ 0xC8, 0xC9 // .. })) { - ERR (C080, Z077, 0x06ED, 0x00, 0x00, Local1, Buffer (0x02) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, Buffer (0x02) { 0xC8, 0xC9 // .. }) @@ -3103,12 +3103,12 @@ Local4 = ObjectType (Local3) If ((Local4 != C009)) { - ERR (C080, Z077, 0x06F8, 0x00, 0x00, Local4, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local4, C009) } If ((Local3 != 0x0ABC200A)) { - ERR (C080, Z077, 0x06FB, 0x00, 0x00, Local3, 0x0ABC200A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local3, 0x0ABC200A) } Store (P905 [0x00], Local0) @@ -3118,12 +3118,12 @@ Local4 = ObjectType (Local3) If ((Local4 != C00A)) { - ERR (C080, Z077, 0x0704, 0x00, 0x00, Local4, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local4, C00A) } If ((Local3 != "0xabc200b")) { - ERR (C080, Z077, 0x0707, 0x00, 0x00, Local3, "0xabc200b") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local3, "0xabc200b") } Store (P905 [0x00], Local0) @@ -3133,12 +3133,12 @@ Local4 = ObjectType (Local3) If ((Local4 != C00A)) { - ERR (C080, Z077, 0x0710, 0x00, 0x00, Local4, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local4, C00A) } If ((Local3 != "abc200c")) { - ERR (C080, Z077, 0x0713, 0x00, 0x00, Local3, "abc200c") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local3, "abc200c") } Store (P906 [0x00], Local0) @@ -3148,12 +3148,12 @@ Local4 = ObjectType (Local3) If ((Local4 != C00A)) { - ERR (C080, Z077, 0x071C, 0x00, 0x00, Local4, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local4, C00A) } If ((Local3 != "abc200d")) { - ERR (C080, Z077, 0x071F, 0x00, 0x00, Local3, "abc200d") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local3, "abc200d") } Store (P907 [0x00], Local0) @@ -3163,12 +3163,12 @@ Local4 = ObjectType (Local3) If ((Local4 != C00A)) { - ERR (C080, Z077, 0x0728, 0x00, 0x00, Local4, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local4, C00A) } If ((Local3 != "aqwevbgnm200e")) { - ERR (C080, Z077, 0x072B, 0x00, 0x00, Local3, "aqwevbgnm200e") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local3, "aqwevbgnm200e") } Store (P908 [0x00], Local0) @@ -3178,7 +3178,7 @@ Local4 = ObjectType (Local3) If ((Local4 != C00B)) { - ERR (C080, Z077, 0x0734, 0x00, 0x00, Local4, C00B) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local4, C00B) } If ((Local3 != Buffer (0x05) @@ -3186,7 +3186,7 @@ 0xCA, 0xCB, 0xCC, 0xCD, 0xCE // ..... })) { - ERR (C080, Z077, 0x0737, 0x00, 0x00, Local3, Buffer (0x05) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local3, Buffer (0x05) { 0xCA, 0xCB, 0xCC, 0xCD, 0xCE // ..... }) @@ -3203,12 +3203,12 @@ Local6 = ObjectType (Local5) If ((Local6 != C009)) { - ERR (C080, Z077, 0x0744, 0x00, 0x00, Local6, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local6, C009) } If ((Local5 != 0x0ABC200F)) { - ERR (C080, Z077, 0x0747, 0x00, 0x00, Local5, 0x0ABC200F) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local5, 0x0ABC200F) } Store (P90A [0x00], Local0) @@ -3220,12 +3220,12 @@ Local6 = ObjectType (Local5) If ((Local6 != C00A)) { - ERR (C080, Z077, 0x0752, 0x00, 0x00, Local6, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local6, C00A) } If ((Local5 != "12342010")) { - ERR (C080, Z077, 0x0755, 0x00, 0x00, Local5, "12342010") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local5, "12342010") } Store (P90B [0x00], Local0) @@ -3237,12 +3237,12 @@ Local6 = ObjectType (Local5) If ((Local6 != C00A)) { - ERR (C080, Z077, 0x0760, 0x00, 0x00, Local6, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local6, C00A) } If ((Local5 != "zxswefas2011")) { - ERR (C080, Z077, 0x0763, 0x00, 0x00, Local5, "zxswefas2011") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local5, "zxswefas2011") } Store (P90C [0x00], Local0) @@ -3254,7 +3254,7 @@ Local6 = ObjectType (Local5) If ((Local6 != C00B)) { - ERR (C080, Z077, 0x076E, 0x00, 0x00, Local6, C00B) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local6, C00B) } If ((Local5 != Buffer (0x03) @@ -3262,7 +3262,7 @@ 0xCF, 0xD0, 0xD1 // ... })) { - ERR (C080, Z077, 0x0771, 0x00, 0x00, Local5, Buffer (0x03) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local5, Buffer (0x03) { 0xCF, 0xD0, 0xD1 // ... }) @@ -3273,12 +3273,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C009)) { - ERR (C080, Z077, 0x0778, 0x00, 0x00, Local2, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C009) } If ((Local1 != 0xABCD2018)) { - ERR (C080, Z077, 0x077B, 0x00, 0x00, Local1, 0xABCD2018) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, 0xABCD2018) } Store (P953 [0x01], Local0) @@ -3286,12 +3286,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C009)) { - ERR (C080, Z077, 0x0782, 0x00, 0x00, Local2, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C009) } If ((Local1 != 0xABCD2019)) { - ERR (C080, Z077, 0x0785, 0x00, 0x00, Local1, 0xABCD2019) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, 0xABCD2019) } /* Not Computational Data */ @@ -4532,56 +4532,56 @@ Local0 = ObjectType (I900) If ((Local0 != C009)) { - ERR (C080, Z077, 0x0AAB, 0x00, 0x00, Local0, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C009) } If ((I900 != 0xFE7CB391D65A3000)) { - ERR (C080, Z077, 0x0AAE, 0x00, 0x00, I900, 0xFE7CB391D65A3000) + ERR (C080, Z077, __LINE__, 0x00, 0x00, I900, 0xFE7CB391D65A3000) } Local0 = ObjectType (I901) If ((Local0 != C009)) { - ERR (C080, Z077, 0x0AB3, 0x00, 0x00, Local0, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C009) } If ((I901 != 0x21793001)) { - ERR (C080, Z077, 0x0AB6, 0x00, 0x00, I901, 0x21793001) + ERR (C080, Z077, __LINE__, 0x00, 0x00, I901, 0x21793001) } Local0 = ObjectType (I902) If ((Local0 != C009)) { - ERR (C080, Z077, 0x0ABB, 0x00, 0x00, Local0, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C009) } If ((I902 != 0x00)) { - ERR (C080, Z077, 0x0ABE, 0x00, 0x00, I902, 0x00) + ERR (C080, Z077, __LINE__, 0x00, 0x00, I902, 0x00) } Local0 = ObjectType (I903) If ((Local0 != C009)) { - ERR (C080, Z077, 0x0AC3, 0x00, 0x00, Local0, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C009) } If ((I903 != 0xFFFFFFFFFFFFFFFF)) { - ERR (C080, Z077, 0x0AC6, 0x00, 0x00, I903, 0xFFFFFFFFFFFFFFFF) + ERR (C080, Z077, __LINE__, 0x00, 0x00, I903, 0xFFFFFFFFFFFFFFFF) } Local0 = ObjectType (I904) If ((Local0 != C009)) { - ERR (C080, Z077, 0x0ACB, 0x00, 0x00, Local0, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C009) } If ((I904 != 0xFFFFFFFF)) { - ERR (C080, Z077, 0x0ACE, 0x00, 0x00, I904, 0xFFFFFFFF) + ERR (C080, Z077, __LINE__, 0x00, 0x00, I904, 0xFFFFFFFF) } /* String */ @@ -4589,23 +4589,23 @@ Local0 = ObjectType (S900) If ((Local0 != C00A)) { - ERR (C080, Z077, 0x0AD5, 0x00, 0x00, Local0, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C00A) } If ((S900 != "12343002")) { - ERR (C080, Z077, 0x0AD8, 0x00, 0x00, S900, "12343002") + ERR (C080, Z077, __LINE__, 0x00, 0x00, S900, "12343002") } Local0 = ObjectType (S901) If ((Local0 != C00A)) { - ERR (C080, Z077, 0x0ADD, 0x00, 0x00, Local0, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C00A) } If ((S901 != "qwrtyu3003")) { - ERR (C080, Z077, 0x0AE0, 0x00, 0x00, S901, "qwrtyu3003") + ERR (C080, Z077, __LINE__, 0x00, 0x00, S901, "qwrtyu3003") } /* Buffer */ @@ -4613,7 +4613,7 @@ Local0 = ObjectType (B900) If ((Local0 != C00B)) { - ERR (C080, Z077, 0x0AE7, 0x00, 0x00, Local0, C00B) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C00B) } If ((B900 != Buffer (0x05) @@ -4621,7 +4621,7 @@ 0xD0, 0xD1, 0xD2, 0xD3, 0xD4 // ..... })) { - ERR (C080, Z077, 0x0AEA, 0x00, 0x00, B900, Buffer (0x05) + ERR (C080, Z077, __LINE__, 0x00, 0x00, B900, Buffer (0x05) { 0xD0, 0xD1, 0xD2, 0xD3, 0xD4 // ..... }) @@ -4632,12 +4632,12 @@ Local0 = ObjectType (BF90) If ((Local0 != C016)) { - ERR (C080, Z077, 0x0AF1, 0x00, 0x00, Local0, C016) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C016) } If ((BF90 != 0xD0)) { - ERR (C080, Z077, 0x0AF4, 0x00, 0x00, BF90, 0xD0) + ERR (C080, Z077, __LINE__, 0x00, 0x00, BF90, 0xD0) } /* One level Package */ @@ -4646,7 +4646,7 @@ Local1 = ObjectType (Local0) If ((Local1 != C008)) { - ERR (C080, Z077, 0x0AFC, 0x00, 0x00, Local1, C008) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, C008) } Store (P901 [0x00], Local0) @@ -4654,12 +4654,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C009)) { - ERR (C080, Z077, 0x0B03, 0x00, 0x00, Local2, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C009) } If ((Local1 != 0xABCD3004)) { - ERR (C080, Z077, 0x0B06, 0x00, 0x00, Local1, 0xABCD3004) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, 0xABCD3004) } Store (P901 [0x01], Local0) @@ -4667,12 +4667,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C009)) { - ERR (C080, Z077, 0x0B0D, 0x00, 0x00, Local2, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C009) } If ((Local1 != 0x1122334455663005)) { - ERR (C080, Z077, 0x0B10, 0x00, 0x00, Local1, 0x1122334455663005) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, 0x1122334455663005) } Store (P902 [0x00], Local0) @@ -4680,12 +4680,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C00A)) { - ERR (C080, Z077, 0x0B17, 0x00, 0x00, Local2, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C00A) } If ((Local1 != "12343006")) { - ERR (C080, Z077, 0x0B1A, 0x00, 0x00, Local1, "12343006") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, "12343006") } Store (P902 [0x01], Local0) @@ -4693,12 +4693,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C00A)) { - ERR (C080, Z077, 0x0B21, 0x00, 0x00, Local2, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C00A) } If ((Local1 != "q1w2e3r4t5y6u7i83007")) { - ERR (C080, Z077, 0x0B24, 0x00, 0x00, Local1, "q1w2e3r4t5y6u7i83007") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, "q1w2e3r4t5y6u7i83007") } Store (P903 [0x00], Local0) @@ -4706,12 +4706,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C00A)) { - ERR (C080, Z077, 0x0B2B, 0x00, 0x00, Local2, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C00A) } If ((Local1 != "qwrtyuiop3008")) { - ERR (C080, Z077, 0x0B2E, 0x00, 0x00, Local1, "qwrtyuiop3008") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, "qwrtyuiop3008") } Store (P903 [0x01], Local0) @@ -4719,12 +4719,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C00A)) { - ERR (C080, Z077, 0x0B35, 0x00, 0x00, Local2, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C00A) } If ((Local1 != "1234567890abdef0253009")) { - ERR (C080, Z077, 0x0B38, 0x00, 0x00, Local1, "1234567890abdef0253009") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, "1234567890abdef0253009") } Store (P904 [0x00], Local0) @@ -4732,7 +4732,7 @@ Local2 = ObjectType (Local1) If ((Local2 != C00B)) { - ERR (C080, Z077, 0x0B3F, 0x00, 0x00, Local2, C00B) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C00B) } If ((Local1 != Buffer (0x03) @@ -4740,7 +4740,7 @@ 0xD5, 0xD6, 0xD7 // ... })) { - ERR (C080, Z077, 0x0B42, 0x00, 0x00, Local1, Buffer (0x03) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, Buffer (0x03) { 0xD5, 0xD6, 0xD7 // ... }) @@ -4751,7 +4751,7 @@ Local2 = ObjectType (Local1) If ((Local2 != C00B)) { - ERR (C080, Z077, 0x0B49, 0x00, 0x00, Local2, C00B) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C00B) } If ((Local1 != Buffer (0x02) @@ -4759,7 +4759,7 @@ 0xD8, 0xD9 // .. })) { - ERR (C080, Z077, 0x0B4C, 0x00, 0x00, Local1, Buffer (0x02) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, Buffer (0x02) { 0xD8, 0xD9 // .. }) @@ -4774,12 +4774,12 @@ Local4 = ObjectType (Local3) If ((Local4 != C009)) { - ERR (C080, Z077, 0x0B57, 0x00, 0x00, Local4, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local4, C009) } If ((Local3 != 0x0ABC300A)) { - ERR (C080, Z077, 0x0B5A, 0x00, 0x00, Local3, 0x0ABC300A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local3, 0x0ABC300A) } Store (P905 [0x00], Local0) @@ -4789,12 +4789,12 @@ Local4 = ObjectType (Local3) If ((Local4 != C00A)) { - ERR (C080, Z077, 0x0B63, 0x00, 0x00, Local4, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local4, C00A) } If ((Local3 != "0xabc300b")) { - ERR (C080, Z077, 0x0B66, 0x00, 0x00, Local3, "0xabc300b") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local3, "0xabc300b") } Store (P905 [0x00], Local0) @@ -4804,12 +4804,12 @@ Local4 = ObjectType (Local3) If ((Local4 != C00A)) { - ERR (C080, Z077, 0x0B6F, 0x00, 0x00, Local4, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local4, C00A) } If ((Local3 != "abc300c")) { - ERR (C080, Z077, 0x0B72, 0x00, 0x00, Local3, "abc300c") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local3, "abc300c") } Store (P906 [0x00], Local0) @@ -4819,12 +4819,12 @@ Local4 = ObjectType (Local3) If ((Local4 != C00A)) { - ERR (C080, Z077, 0x0B7B, 0x00, 0x00, Local4, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local4, C00A) } If ((Local3 != "abc300d")) { - ERR (C080, Z077, 0x0B7E, 0x00, 0x00, Local3, "abc300d") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local3, "abc300d") } Store (P907 [0x00], Local0) @@ -4834,12 +4834,12 @@ Local4 = ObjectType (Local3) If ((Local4 != C00A)) { - ERR (C080, Z077, 0x0B87, 0x00, 0x00, Local4, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local4, C00A) } If ((Local3 != "aqwevbgnm300e")) { - ERR (C080, Z077, 0x0B8A, 0x00, 0x00, Local3, "aqwevbgnm300e") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local3, "aqwevbgnm300e") } Store (P908 [0x00], Local0) @@ -4849,7 +4849,7 @@ Local4 = ObjectType (Local3) If ((Local4 != C00B)) { - ERR (C080, Z077, 0x0B93, 0x00, 0x00, Local4, C00B) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local4, C00B) } If ((Local3 != Buffer (0x05) @@ -4857,7 +4857,7 @@ 0xDA, 0xDB, 0xDC, 0xDD, 0xDE // ..... })) { - ERR (C080, Z077, 0x0B96, 0x00, 0x00, Local3, Buffer (0x05) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local3, Buffer (0x05) { 0xDA, 0xDB, 0xDC, 0xDD, 0xDE // ..... }) @@ -4874,12 +4874,12 @@ Local6 = ObjectType (Local5) If ((Local6 != C009)) { - ERR (C080, Z077, 0x0BA3, 0x00, 0x00, Local6, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local6, C009) } If ((Local5 != 0x0ABC300F)) { - ERR (C080, Z077, 0x0BA6, 0x00, 0x00, Local5, 0x0ABC300F) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local5, 0x0ABC300F) } Store (P90A [0x00], Local0) @@ -4891,12 +4891,12 @@ Local6 = ObjectType (Local5) If ((Local6 != C00A)) { - ERR (C080, Z077, 0x0BB1, 0x00, 0x00, Local6, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local6, C00A) } If ((Local5 != "12343010")) { - ERR (C080, Z077, 0x0BB4, 0x00, 0x00, Local5, "12343010") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local5, "12343010") } Store (P90B [0x00], Local0) @@ -4908,12 +4908,12 @@ Local6 = ObjectType (Local5) If ((Local6 != C00A)) { - ERR (C080, Z077, 0x0BBF, 0x00, 0x00, Local6, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local6, C00A) } If ((Local5 != "zxswefas3011")) { - ERR (C080, Z077, 0x0BC2, 0x00, 0x00, Local5, "zxswefas3011") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local5, "zxswefas3011") } Store (P90C [0x00], Local0) @@ -4925,7 +4925,7 @@ Local6 = ObjectType (Local5) If ((Local6 != C00B)) { - ERR (C080, Z077, 0x0BCD, 0x00, 0x00, Local6, C00B) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local6, C00B) } If ((Local5 != Buffer (0x03) @@ -4933,7 +4933,7 @@ 0xDF, 0x20, 0x21 // . ! })) { - ERR (C080, Z077, 0x0BD0, 0x00, 0x00, Local5, Buffer (0x03) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local5, Buffer (0x03) { 0xDF, 0x20, 0x21 // . ! }) @@ -4944,12 +4944,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C009)) { - ERR (C080, Z077, 0x0BD7, 0x00, 0x00, Local2, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C009) } If ((Local1 != 0xABCD3018)) { - ERR (C080, Z077, 0x0BDA, 0x00, 0x00, Local1, 0xABCD3018) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, 0xABCD3018) } Store (P953 [0x01], Local0) @@ -4957,12 +4957,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C009)) { - ERR (C080, Z077, 0x0BE1, 0x00, 0x00, Local2, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C009) } If ((Local1 != 0xABCD3019)) { - ERR (C080, Z077, 0x0BE4, 0x00, 0x00, Local1, 0xABCD3019) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, 0xABCD3019) } /* Not Computational Data */ @@ -6123,56 +6123,56 @@ Local0 = ObjectType (I900) If ((Local0 != C009)) { - ERR (C080, Z077, 0x0EBB, 0x00, 0x00, Local0, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C009) } If ((I900 != 0xFE7CB391D65A4000)) { - ERR (C080, Z077, 0x0EBE, 0x00, 0x00, I900, 0xFE7CB391D65A4000) + ERR (C080, Z077, __LINE__, 0x00, 0x00, I900, 0xFE7CB391D65A4000) } Local0 = ObjectType (I901) If ((Local0 != C009)) { - ERR (C080, Z077, 0x0EC3, 0x00, 0x00, Local0, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C009) } If ((I901 != 0xC1794001)) { - ERR (C080, Z077, 0x0EC6, 0x00, 0x00, I901, 0xC1794001) + ERR (C080, Z077, __LINE__, 0x00, 0x00, I901, 0xC1794001) } Local0 = ObjectType (I902) If ((Local0 != C009)) { - ERR (C080, Z077, 0x0ECB, 0x00, 0x00, Local0, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C009) } If ((I902 != 0x00)) { - ERR (C080, Z077, 0x0ECE, 0x00, 0x00, I902, 0x00) + ERR (C080, Z077, __LINE__, 0x00, 0x00, I902, 0x00) } Local0 = ObjectType (I903) If ((Local0 != C009)) { - ERR (C080, Z077, 0x0ED3, 0x00, 0x00, Local0, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C009) } If ((I903 != 0xFFFFFFFFFFFFFFFF)) { - ERR (C080, Z077, 0x0ED6, 0x00, 0x00, I903, 0xFFFFFFFFFFFFFFFF) + ERR (C080, Z077, __LINE__, 0x00, 0x00, I903, 0xFFFFFFFFFFFFFFFF) } Local0 = ObjectType (I904) If ((Local0 != C009)) { - ERR (C080, Z077, 0x0EDB, 0x00, 0x00, Local0, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C009) } If ((I904 != 0xFFFFFFFF)) { - ERR (C080, Z077, 0x0EDE, 0x00, 0x00, I904, 0xFFFFFFFF) + ERR (C080, Z077, __LINE__, 0x00, 0x00, I904, 0xFFFFFFFF) } /* String */ @@ -6180,23 +6180,23 @@ Local0 = ObjectType (S900) If ((Local0 != C00A)) { - ERR (C080, Z077, 0x0EE5, 0x00, 0x00, Local0, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C00A) } If ((S900 != "12344002")) { - ERR (C080, Z077, 0x0EE8, 0x00, 0x00, S900, "12344002") + ERR (C080, Z077, __LINE__, 0x00, 0x00, S900, "12344002") } Local0 = ObjectType (S901) If ((Local0 != C00A)) { - ERR (C080, Z077, 0x0EED, 0x00, 0x00, Local0, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C00A) } If ((S901 != "qwrtyu4003")) { - ERR (C080, Z077, 0x0EF0, 0x00, 0x00, S901, "qwrtyu4003") + ERR (C080, Z077, __LINE__, 0x00, 0x00, S901, "qwrtyu4003") } /* Buffer */ @@ -6204,7 +6204,7 @@ Local0 = ObjectType (B900) If ((Local0 != C00B)) { - ERR (C080, Z077, 0x0EF7, 0x00, 0x00, Local0, C00B) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C00B) } If ((B900 != Buffer (0x05) @@ -6212,7 +6212,7 @@ 0xE0, 0xE1, 0xE2, 0xE3, 0xE4 // ..... })) { - ERR (C080, Z077, 0x0EFA, 0x00, 0x00, B900, Buffer (0x05) + ERR (C080, Z077, __LINE__, 0x00, 0x00, B900, Buffer (0x05) { 0xE0, 0xE1, 0xE2, 0xE3, 0xE4 // ..... }) @@ -6223,12 +6223,12 @@ Local0 = ObjectType (BF90) If ((Local0 != C016)) { - ERR (C080, Z077, 0x0F01, 0x00, 0x00, Local0, C016) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C016) } If ((BF90 != 0xE0)) { - ERR (C080, Z077, 0x0F04, 0x00, 0x00, BF90, 0xE0) + ERR (C080, Z077, __LINE__, 0x00, 0x00, BF90, 0xE0) } /* One level Package */ @@ -6237,7 +6237,7 @@ Local1 = ObjectType (Local0) If ((Local1 != C008)) { - ERR (C080, Z077, 0x0F0C, 0x00, 0x00, Local1, C008) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, C008) } Store (P901 [0x00], Local0) @@ -6245,12 +6245,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C009)) { - ERR (C080, Z077, 0x0F13, 0x00, 0x00, Local2, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C009) } If ((Local1 != 0xABCD4004)) { - ERR (C080, Z077, 0x0F16, 0x00, 0x00, Local1, 0xABCD4004) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, 0xABCD4004) } Store (P901 [0x01], Local0) @@ -6258,12 +6258,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C009)) { - ERR (C080, Z077, 0x0F1D, 0x00, 0x00, Local2, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C009) } If ((Local1 != 0x1122334455664005)) { - ERR (C080, Z077, 0x0F20, 0x00, 0x00, Local1, 0x1122334455664005) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, 0x1122334455664005) } Store (P902 [0x00], Local0) @@ -6271,12 +6271,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C00A)) { - ERR (C080, Z077, 0x0F27, 0x00, 0x00, Local2, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C00A) } If ((Local1 != "12344006")) { - ERR (C080, Z077, 0x0F2A, 0x00, 0x00, Local1, "12344006") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, "12344006") } Store (P902 [0x01], Local0) @@ -6284,12 +6284,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C00A)) { - ERR (C080, Z077, 0x0F31, 0x00, 0x00, Local2, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C00A) } If ((Local1 != "q1w2e3r4t5y6u7i84007")) { - ERR (C080, Z077, 0x0F34, 0x00, 0x00, Local1, "q1w2e3r4t5y6u7i84007") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, "q1w2e3r4t5y6u7i84007") } Store (P903 [0x00], Local0) @@ -6297,12 +6297,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C00A)) { - ERR (C080, Z077, 0x0F3B, 0x00, 0x00, Local2, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C00A) } If ((Local1 != "qwrtyuiop4008")) { - ERR (C080, Z077, 0x0F3E, 0x00, 0x00, Local1, "qwrtyuiop4008") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, "qwrtyuiop4008") } Store (P903 [0x01], Local0) @@ -6310,12 +6310,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C00A)) { - ERR (C080, Z077, 0x0F45, 0x00, 0x00, Local2, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C00A) } If ((Local1 != "1234567890abdef0254009")) { - ERR (C080, Z077, 0x0F48, 0x00, 0x00, Local1, "1234567890abdef0254009") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, "1234567890abdef0254009") } Store (P904 [0x00], Local0) @@ -6323,7 +6323,7 @@ Local2 = ObjectType (Local1) If ((Local2 != C00B)) { - ERR (C080, Z077, 0x0F4F, 0x00, 0x00, Local2, C00B) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C00B) } If ((Local1 != Buffer (0x03) @@ -6331,7 +6331,7 @@ 0xE5, 0xE6, 0xE7 // ... })) { - ERR (C080, Z077, 0x0F52, 0x00, 0x00, Local1, Buffer (0x03) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, Buffer (0x03) { 0xE5, 0xE6, 0xE7 // ... }) @@ -6342,7 +6342,7 @@ Local2 = ObjectType (Local1) If ((Local2 != C00B)) { - ERR (C080, Z077, 0x0F59, 0x00, 0x00, Local2, C00B) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C00B) } If ((Local1 != Buffer (0x02) @@ -6350,7 +6350,7 @@ 0xE8, 0xE9 // .. })) { - ERR (C080, Z077, 0x0F5C, 0x00, 0x00, Local1, Buffer (0x02) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, Buffer (0x02) { 0xE8, 0xE9 // .. }) @@ -6365,12 +6365,12 @@ Local4 = ObjectType (Local3) If ((Local4 != C009)) { - ERR (C080, Z077, 0x0F67, 0x00, 0x00, Local4, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local4, C009) } If ((Local3 != 0x0ABC400A)) { - ERR (C080, Z077, 0x0F6A, 0x00, 0x00, Local3, 0x0ABC400A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local3, 0x0ABC400A) } Store (P905 [0x00], Local0) @@ -6380,12 +6380,12 @@ Local4 = ObjectType (Local3) If ((Local4 != C00A)) { - ERR (C080, Z077, 0x0F73, 0x00, 0x00, Local4, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local4, C00A) } If ((Local3 != "0xabc400b")) { - ERR (C080, Z077, 0x0F76, 0x00, 0x00, Local3, "0xabc400b") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local3, "0xabc400b") } Store (P905 [0x00], Local0) @@ -6395,12 +6395,12 @@ Local4 = ObjectType (Local3) If ((Local4 != C00A)) { - ERR (C080, Z077, 0x0F7F, 0x00, 0x00, Local4, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local4, C00A) } If ((Local3 != "abc400c")) { - ERR (C080, Z077, 0x0F82, 0x00, 0x00, Local3, "abc400c") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local3, "abc400c") } Store (P906 [0x00], Local0) @@ -6410,12 +6410,12 @@ Local4 = ObjectType (Local3) If ((Local4 != C00A)) { - ERR (C080, Z077, 0x0F8B, 0x00, 0x00, Local4, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local4, C00A) } If ((Local3 != "abc400d")) { - ERR (C080, Z077, 0x0F8E, 0x00, 0x00, Local3, "abc400d") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local3, "abc400d") } Store (P907 [0x00], Local0) @@ -6425,12 +6425,12 @@ Local4 = ObjectType (Local3) If ((Local4 != C00A)) { - ERR (C080, Z077, 0x0F97, 0x00, 0x00, Local4, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local4, C00A) } If ((Local3 != "aqwevbgnm400e")) { - ERR (C080, Z077, 0x0F9A, 0x00, 0x00, Local3, "aqwevbgnm400e") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local3, "aqwevbgnm400e") } Store (P908 [0x00], Local0) @@ -6440,7 +6440,7 @@ Local4 = ObjectType (Local3) If ((Local4 != C00B)) { - ERR (C080, Z077, 0x0FA3, 0x00, 0x00, Local4, C00B) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local4, C00B) } If ((Local3 != Buffer (0x05) @@ -6448,7 +6448,7 @@ 0xEA, 0xEB, 0xEC, 0xED, 0xEE // ..... })) { - ERR (C080, Z077, 0x0FA6, 0x00, 0x00, Local3, Buffer (0x05) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local3, Buffer (0x05) { 0xEA, 0xEB, 0xEC, 0xED, 0xEE // ..... }) @@ -6465,12 +6465,12 @@ Local6 = ObjectType (Local5) If ((Local6 != C009)) { - ERR (C080, Z077, 0x0FB3, 0x00, 0x00, Local6, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local6, C009) } If ((Local5 != 0x0ABC400F)) { - ERR (C080, Z077, 0x0FB6, 0x00, 0x00, Local5, 0x0ABC400F) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local5, 0x0ABC400F) } Store (P90A [0x00], Local0) @@ -6482,12 +6482,12 @@ Local6 = ObjectType (Local5) If ((Local6 != C00A)) { - ERR (C080, Z077, 0x0FC1, 0x00, 0x00, Local6, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local6, C00A) } If ((Local5 != "12344010")) { - ERR (C080, Z077, 0x0FC4, 0x00, 0x00, Local5, "12344010") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local5, "12344010") } Store (P90B [0x00], Local0) @@ -6499,12 +6499,12 @@ Local6 = ObjectType (Local5) If ((Local6 != C00A)) { - ERR (C080, Z077, 0x0FCF, 0x00, 0x00, Local6, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local6, C00A) } If ((Local5 != "zxswefas4011")) { - ERR (C080, Z077, 0x0FD2, 0x00, 0x00, Local5, "zxswefas4011") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local5, "zxswefas4011") } Store (P90C [0x00], Local0) @@ -6516,7 +6516,7 @@ Local6 = ObjectType (Local5) If ((Local6 != C00B)) { - ERR (C080, Z077, 0x0FDD, 0x00, 0x00, Local6, C00B) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local6, C00B) } If ((Local5 != Buffer (0x03) @@ -6524,7 +6524,7 @@ 0xEF, 0x30, 0x31 // .01 })) { - ERR (C080, Z077, 0x0FE0, 0x00, 0x00, Local5, Buffer (0x03) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local5, Buffer (0x03) { 0xEF, 0x30, 0x31 // .01 }) @@ -6535,12 +6535,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C009)) { - ERR (C080, Z077, 0x0FE7, 0x00, 0x00, Local2, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C009) } If ((Local1 != 0xABCD4018)) { - ERR (C080, Z077, 0x0FEA, 0x00, 0x00, Local1, 0xABCD4018) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, 0xABCD4018) } Store (P953 [0x01], Local0) @@ -6548,12 +6548,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C009)) { - ERR (C080, Z077, 0x0FF1, 0x00, 0x00, Local2, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C009) } If ((Local1 != 0xABCD4019)) { - ERR (C080, Z077, 0x0FF4, 0x00, 0x00, Local1, 0xABCD4019) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, 0xABCD4019) } /* Not Computational Data */ @@ -8366,56 +8366,56 @@ Local0 = ObjectType (I900) If ((Local0 != C009)) { - ERR (C080, Z077, 0x13F9, 0x00, 0x00, Local0, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C009) } If ((I900 != 0xFE7CB391D65A5000)) { - ERR (C080, Z077, 0x13FC, 0x00, 0x00, I900, 0xFE7CB391D65A5000) + ERR (C080, Z077, __LINE__, 0x00, 0x00, I900, 0xFE7CB391D65A5000) } Local0 = ObjectType (I901) If ((Local0 != C009)) { - ERR (C080, Z077, 0x1401, 0x00, 0x00, Local0, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C009) } If ((I901 != 0x41795001)) { - ERR (C080, Z077, 0x1404, 0x00, 0x00, I901, 0x41795001) + ERR (C080, Z077, __LINE__, 0x00, 0x00, I901, 0x41795001) } Local0 = ObjectType (I902) If ((Local0 != C009)) { - ERR (C080, Z077, 0x1409, 0x00, 0x00, Local0, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C009) } If ((I902 != 0x00)) { - ERR (C080, Z077, 0x140C, 0x00, 0x00, I902, 0x00) + ERR (C080, Z077, __LINE__, 0x00, 0x00, I902, 0x00) } Local0 = ObjectType (I903) If ((Local0 != C009)) { - ERR (C080, Z077, 0x1411, 0x00, 0x00, Local0, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C009) } If ((I903 != 0xFFFFFFFFFFFFFFFF)) { - ERR (C080, Z077, 0x1414, 0x00, 0x00, I903, 0xFFFFFFFFFFFFFFFF) + ERR (C080, Z077, __LINE__, 0x00, 0x00, I903, 0xFFFFFFFFFFFFFFFF) } Local0 = ObjectType (I904) If ((Local0 != C009)) { - ERR (C080, Z077, 0x1419, 0x00, 0x00, Local0, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C009) } If ((I904 != 0xFFFFFFFF)) { - ERR (C080, Z077, 0x141C, 0x00, 0x00, I904, 0xFFFFFFFF) + ERR (C080, Z077, __LINE__, 0x00, 0x00, I904, 0xFFFFFFFF) } /* String */ @@ -8423,23 +8423,23 @@ Local0 = ObjectType (S900) If ((Local0 != C00A)) { - ERR (C080, Z077, 0x1423, 0x00, 0x00, Local0, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C00A) } If ((S900 != "12345002")) { - ERR (C080, Z077, 0x1426, 0x00, 0x00, S900, "12345002") + ERR (C080, Z077, __LINE__, 0x00, 0x00, S900, "12345002") } Local0 = ObjectType (S901) If ((Local0 != C00A)) { - ERR (C080, Z077, 0x142B, 0x00, 0x00, Local0, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C00A) } If ((S901 != "qwrtyu5003")) { - ERR (C080, Z077, 0x142E, 0x00, 0x00, S901, "qwrtyu5003") + ERR (C080, Z077, __LINE__, 0x00, 0x00, S901, "qwrtyu5003") } /* Buffer */ @@ -8447,7 +8447,7 @@ Local0 = ObjectType (B900) If ((Local0 != C00B)) { - ERR (C080, Z077, 0x1435, 0x00, 0x00, Local0, C00B) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C00B) } If ((B900 != Buffer (0x05) @@ -8455,7 +8455,7 @@ 0xF0, 0xF1, 0xF2, 0xF3, 0xF4 // ..... })) { - ERR (C080, Z077, 0x1438, 0x00, 0x00, B900, Buffer (0x05) + ERR (C080, Z077, __LINE__, 0x00, 0x00, B900, Buffer (0x05) { 0xF0, 0xF1, 0xF2, 0xF3, 0xF4 // ..... }) @@ -8466,12 +8466,12 @@ Local0 = ObjectType (BF90) If ((Local0 != C016)) { - ERR (C080, Z077, 0x143F, 0x00, 0x00, Local0, C016) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local0, C016) } If ((BF90 != 0xF0)) { - ERR (C080, Z077, 0x1442, 0x00, 0x00, BF90, 0xF0) + ERR (C080, Z077, __LINE__, 0x00, 0x00, BF90, 0xF0) } /* One level Package */ @@ -8480,7 +8480,7 @@ Local1 = ObjectType (Local0) If ((Local1 != C008)) { - ERR (C080, Z077, 0x144A, 0x00, 0x00, Local1, C008) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, C008) } Store (P901 [0x00], Local0) @@ -8488,12 +8488,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C009)) { - ERR (C080, Z077, 0x1451, 0x00, 0x00, Local2, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C009) } If ((Local1 != 0xABCD5004)) { - ERR (C080, Z077, 0x1454, 0x00, 0x00, Local1, 0xABCD5004) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, 0xABCD5004) } Store (P901 [0x01], Local0) @@ -8501,12 +8501,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C009)) { - ERR (C080, Z077, 0x145B, 0x00, 0x00, Local2, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C009) } If ((Local1 != 0x1122334455665005)) { - ERR (C080, Z077, 0x145E, 0x00, 0x00, Local1, 0x1122334455665005) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, 0x1122334455665005) } Store (P902 [0x00], Local0) @@ -8514,12 +8514,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C00A)) { - ERR (C080, Z077, 0x1465, 0x00, 0x00, Local2, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C00A) } If ((Local1 != "12345006")) { - ERR (C080, Z077, 0x1468, 0x00, 0x00, Local1, "12345006") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, "12345006") } Store (P902 [0x01], Local0) @@ -8527,12 +8527,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C00A)) { - ERR (C080, Z077, 0x146F, 0x00, 0x00, Local2, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C00A) } If ((Local1 != "q1w2e3r4t5y6u7i85007")) { - ERR (C080, Z077, 0x1472, 0x00, 0x00, Local1, "q1w2e3r4t5y6u7i85007") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, "q1w2e3r4t5y6u7i85007") } Store (P903 [0x00], Local0) @@ -8540,12 +8540,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C00A)) { - ERR (C080, Z077, 0x1479, 0x00, 0x00, Local2, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C00A) } If ((Local1 != "qwrtyuiop5008")) { - ERR (C080, Z077, 0x147C, 0x00, 0x00, Local1, "qwrtyuiop5008") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, "qwrtyuiop5008") } Store (P903 [0x01], Local0) @@ -8553,12 +8553,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C00A)) { - ERR (C080, Z077, 0x1483, 0x00, 0x00, Local2, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C00A) } If ((Local1 != "1234567890abdef0255009")) { - ERR (C080, Z077, 0x1486, 0x00, 0x00, Local1, "1234567890abdef0255009") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, "1234567890abdef0255009") } Store (P904 [0x00], Local0) @@ -8566,7 +8566,7 @@ Local2 = ObjectType (Local1) If ((Local2 != C00B)) { - ERR (C080, Z077, 0x148D, 0x00, 0x00, Local2, C00B) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C00B) } If ((Local1 != Buffer (0x03) @@ -8574,7 +8574,7 @@ 0xF5, 0xF6, 0xF7 // ... })) { - ERR (C080, Z077, 0x1490, 0x00, 0x00, Local1, Buffer (0x03) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, Buffer (0x03) { 0xF5, 0xF6, 0xF7 // ... }) @@ -8585,7 +8585,7 @@ Local2 = ObjectType (Local1) If ((Local2 != C00B)) { - ERR (C080, Z077, 0x1497, 0x00, 0x00, Local2, C00B) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C00B) } If ((Local1 != Buffer (0x02) @@ -8593,7 +8593,7 @@ 0xF8, 0xF9 // .. })) { - ERR (C080, Z077, 0x149A, 0x00, 0x00, Local1, Buffer (0x02) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, Buffer (0x02) { 0xF8, 0xF9 // .. }) @@ -8608,12 +8608,12 @@ Local4 = ObjectType (Local3) If ((Local4 != C009)) { - ERR (C080, Z077, 0x14A5, 0x00, 0x00, Local4, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local4, C009) } If ((Local3 != 0x0ABC500A)) { - ERR (C080, Z077, 0x14A8, 0x00, 0x00, Local3, 0x0ABC500A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local3, 0x0ABC500A) } Store (P905 [0x00], Local0) @@ -8623,12 +8623,12 @@ Local4 = ObjectType (Local3) If ((Local4 != C00A)) { - ERR (C080, Z077, 0x14B1, 0x00, 0x00, Local4, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local4, C00A) } If ((Local3 != "0xabc500b")) { - ERR (C080, Z077, 0x14B4, 0x00, 0x00, Local3, "0xabc500b") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local3, "0xabc500b") } Store (P905 [0x00], Local0) @@ -8638,12 +8638,12 @@ Local4 = ObjectType (Local3) If ((Local4 != C00A)) { - ERR (C080, Z077, 0x14BD, 0x00, 0x00, Local4, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local4, C00A) } If ((Local3 != "abc500c")) { - ERR (C080, Z077, 0x14C0, 0x00, 0x00, Local3, "abc500c") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local3, "abc500c") } Store (P906 [0x00], Local0) @@ -8653,12 +8653,12 @@ Local4 = ObjectType (Local3) If ((Local4 != C00A)) { - ERR (C080, Z077, 0x14C9, 0x00, 0x00, Local4, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local4, C00A) } If ((Local3 != "abc500d")) { - ERR (C080, Z077, 0x14CC, 0x00, 0x00, Local3, "abc500d") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local3, "abc500d") } Store (P907 [0x00], Local0) @@ -8668,12 +8668,12 @@ Local4 = ObjectType (Local3) If ((Local4 != C00A)) { - ERR (C080, Z077, 0x14D5, 0x00, 0x00, Local4, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local4, C00A) } If ((Local3 != "aqwevbgnm500e")) { - ERR (C080, Z077, 0x14D8, 0x00, 0x00, Local3, "aqwevbgnm500e") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local3, "aqwevbgnm500e") } Store (P908 [0x00], Local0) @@ -8683,7 +8683,7 @@ Local4 = ObjectType (Local3) If ((Local4 != C00B)) { - ERR (C080, Z077, 0x14E1, 0x00, 0x00, Local4, C00B) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local4, C00B) } If ((Local3 != Buffer (0x05) @@ -8691,7 +8691,7 @@ 0xFA, 0xFB, 0xFC, 0xFD, 0xFE // ..... })) { - ERR (C080, Z077, 0x14E4, 0x00, 0x00, Local3, Buffer (0x05) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local3, Buffer (0x05) { 0xFA, 0xFB, 0xFC, 0xFD, 0xFE // ..... }) @@ -8708,12 +8708,12 @@ Local6 = ObjectType (Local5) If ((Local6 != C009)) { - ERR (C080, Z077, 0x14F1, 0x00, 0x00, Local6, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local6, C009) } If ((Local5 != 0x0ABC500F)) { - ERR (C080, Z077, 0x14F4, 0x00, 0x00, Local5, 0x0ABC500F) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local5, 0x0ABC500F) } Store (P90A [0x00], Local0) @@ -8725,12 +8725,12 @@ Local6 = ObjectType (Local5) If ((Local6 != C00A)) { - ERR (C080, Z077, 0x14FF, 0x00, 0x00, Local6, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local6, C00A) } If ((Local5 != "12345010")) { - ERR (C080, Z077, 0x1502, 0x00, 0x00, Local5, "12345010") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local5, "12345010") } Store (P90B [0x00], Local0) @@ -8742,12 +8742,12 @@ Local6 = ObjectType (Local5) If ((Local6 != C00A)) { - ERR (C080, Z077, 0x150D, 0x00, 0x00, Local6, C00A) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local6, C00A) } If ((Local5 != "zxswefas5011")) { - ERR (C080, Z077, 0x1510, 0x00, 0x00, Local5, "zxswefas5011") + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local5, "zxswefas5011") } Store (P90C [0x00], Local0) @@ -8759,7 +8759,7 @@ Local6 = ObjectType (Local5) If ((Local6 != C00B)) { - ERR (C080, Z077, 0x151B, 0x00, 0x00, Local6, C00B) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local6, C00B) } If ((Local5 != Buffer (0x03) @@ -8767,7 +8767,7 @@ 0xFF, 0x40, 0x41 // .@A })) { - ERR (C080, Z077, 0x151E, 0x00, 0x00, Local5, Buffer (0x03) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local5, Buffer (0x03) { 0xFF, 0x40, 0x41 // .@A }) @@ -8778,12 +8778,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C009)) { - ERR (C080, Z077, 0x1525, 0x00, 0x00, Local2, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C009) } If ((Local1 != 0xABCD5018)) { - ERR (C080, Z077, 0x1528, 0x00, 0x00, Local1, 0xABCD5018) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, 0xABCD5018) } Store (P953 [0x01], Local0) @@ -8791,12 +8791,12 @@ Local2 = ObjectType (Local1) If ((Local2 != C009)) { - ERR (C080, Z077, 0x152F, 0x00, 0x00, Local2, C009) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local2, C009) } If ((Local1 != 0xABCD5019)) { - ERR (C080, Z077, 0x1532, 0x00, 0x00, Local1, 0xABCD5019) + ERR (C080, Z077, __LINE__, 0x00, 0x00, Local1, 0xABCD5019) } /* Not Computational Data */ diff --git a/tests/aslts/src/runtime/collections/functional/reference/ref06.asl b/tests/aslts/src/runtime/collections/functional/reference/ref06.asl index 4751a093f..54ac84bbd 100644 --- a/tests/aslts/src/runtime/collections/functional/reference/ref06.asl +++ b/tests/aslts/src/runtime/collections/functional/reference/ref06.asl @@ -102,7 +102,7 @@ } Default { - ERR ("m1e2", Z110, 0x67, 0x00, 0x00, Local7, 0x00) + ERR ("m1e2", Z110, __LINE__, 0x00, 0x00, Local7, 0x00) } } @@ -794,7 +794,7 @@ } Default { - ERR (__METHOD__, Z110, 0x02CA, 0x00, 0x00, IND0, 0x00) + ERR (__METHOD__, Z110, __LINE__, 0x00, 0x00, IND0, 0x00) } } diff --git a/tests/aslts/src/runtime/collections/functional/reference/ref07.asl b/tests/aslts/src/runtime/collections/functional/reference/ref07.asl index 4c44d5e46..456a86d8c 100644 --- a/tests/aslts/src/runtime/collections/functional/reference/ref07.asl +++ b/tests/aslts/src/runtime/collections/functional/reference/ref07.asl @@ -931,7 +931,7 @@ Local1 = DerefOf (Local0) If ((Local1 != LPC0)) { - ERR (__METHOD__, Z116, 0x0402, Z116, 0x00, Local1, LPC0) + ERR (__METHOD__, Z116, __LINE__, Z116, 0x00, Local1, LPC0) Break } @@ -985,7 +985,7 @@ Local0 = SizeOf (P000) If ((Local0 != 0x06)) { - ERR (__METHOD__, Z116, 0x0435, 0x00, 0x00, Local0, 0x06) + ERR (__METHOD__, Z116, __LINE__, 0x00, 0x00, Local0, 0x06) } } @@ -1001,7 +1001,7 @@ Local7 = (Local0 + 0x01) If ((Local7 != Arg2)) { - ERR (Arg0, Z116, 0x0446, 0x00, 0x00, Local7, Arg2) + ERR (Arg0, Z116, __LINE__, 0x00, 0x00, Local7, Arg2) } CH03 (Arg0, Z116, 0xA7, 0x0449, 0x00) @@ -1018,7 +1018,7 @@ Local7 = (Arg1 + 0x01) If ((Local7 != Arg2)) { - ERR (Arg0, Z116, 0x0458, 0x00, 0x00, Local7, Arg2) + ERR (Arg0, Z116, __LINE__, 0x00, 0x00, Local7, Arg2) } CH03 (Arg0, Z116, 0xA9, 0x045B, 0x00) diff --git a/tests/aslts/src/runtime/collections/functional/reference/ref50.asl b/tests/aslts/src/runtime/collections/functional/reference/ref50.asl index 6f5075d76..68a82e626 100644 --- a/tests/aslts/src/runtime/collections/functional/reference/ref50.asl +++ b/tests/aslts/src/runtime/collections/functional/reference/ref50.asl @@ -218,13 +218,13 @@ CreateField (Arg0, 0x08, 0x08, BF90) If ((BF90 != 0x77)) { - ERR (__METHOD__, Z111, 0xEF, 0x00, 0x00, BF90, 0x77) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, BF90, 0x77) } BF90 = 0x9999992B If ((BF90 != 0x2B)) { - ERR (__METHOD__, Z111, 0xF3, 0x00, 0x00, BF90, 0x2B) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, BF90, 0x2B) } } @@ -233,14 +233,14 @@ CreateField (Arg0, 0x08, 0x08, BF90) If ((BF90 != 0x77)) { - ERR (__METHOD__, Z111, 0xFB, 0x00, 0x00, BF90, 0x77) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, BF90, 0x77) } BF90 = 0x2B CopyObject (0x9999992B, BF90) /* \M22C.M001.BF90 */ If ((BF90 != 0x2B)) { - ERR (__METHOD__, Z111, 0x0101, 0x00, 0x00, BF90, 0x2B) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, BF90, 0x2B) } } @@ -360,13 +360,13 @@ CreateField (Local2, 0x08, 0x08, BF90) If ((BF90 != 0x77)) { - ERR (__METHOD__, Z111, 0x0178, 0x00, 0x00, BF90, 0x77) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, BF90, 0x77) } BF90 = 0x9999992B If ((BF90 != 0x2B)) { - ERR (__METHOD__, Z111, 0x017C, 0x00, 0x00, BF90, 0x2B) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, BF90, 0x2B) } } @@ -376,13 +376,13 @@ CreateField (Local2, 0x08, 0x08, BF90) If ((BF90 != 0x77)) { - ERR (__METHOD__, Z111, 0x0186, 0x00, 0x00, BF90, 0x77) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, BF90, 0x77) } CopyObject (0x9999992B, BF90) /* \M234.M001.BF90 */ If ((BF90 != 0x2B)) { - ERR (__METHOD__, Z111, 0x018A, 0x00, 0x00, BF90, 0x2B) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, BF90, 0x2B) } } @@ -801,7 +801,7 @@ Local0 = ObjectType (Arg0) If ((Local0 != Arg1)) { - ERR (__METHOD__, Z111, 0x0318, 0x00, 0x00, Local0, Arg1) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local0, Arg1) } /* Overwrite LocalX which contains either */ @@ -3405,7 +3405,7 @@ Local7 = (Local0 + 0x05) If ((Local7 != 0x1928374B)) { - ERR (__METHOD__, Z111, 0x0E3E, 0x00, 0x00, Local7, 0x1928374B) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local7, 0x1928374B) } } @@ -3445,7 +3445,7 @@ Local7 = (Local0 + 0x05) If ((Local7 != 0x13)) { - ERR (__METHOD__, Z111, 0x0E66, 0x00, 0x00, Local7, 0x13) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local7, 0x13) } } @@ -3470,7 +3470,7 @@ Local7 = (Arg0 + 0x05) If ((Local7 != 0x13)) { - ERR (__METHOD__, Z111, 0x0E79, 0x00, 0x00, Local7, 0x13) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local7, 0x13) } } @@ -3511,13 +3511,13 @@ Local0 = 0x90 If ((Local0 != 0x90)) { - ERR (__METHOD__, Z111, 0x0E94, 0x00, 0x00, Local0, 0x90) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local0, 0x90) } Local1 = 0x91 If ((Local1 != 0x91)) { - ERR (__METHOD__, Z111, 0x0E98, 0x00, 0x00, Local1, 0x91) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local1, 0x91) } } @@ -3529,13 +3529,13 @@ CopyObject (0x94, Local0) If ((Local0 != 0x94)) { - ERR (__METHOD__, Z111, 0x0EA3, 0x00, 0x00, Local0, 0x94) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local0, 0x94) } CopyObject (0x95, Local1) If ((Local1 != 0x95)) { - ERR (__METHOD__, Z111, 0x0EA7, 0x00, 0x00, Local1, 0x95) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local1, 0x95) } } @@ -3604,24 +3604,24 @@ Local1 = ObjectType (Local0) If ((Local1 != C009)) { - ERR (__METHOD__, Z111, 0x0EF6, 0x00, 0x00, Local1, C009) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local1, C009) } Else { Local1 = SizeOf (Local0) If ((Local1 != ISZ0)) { - ERR (__METHOD__, Z111, 0x0EFA, 0x00, 0x00, Local1, ISZ0) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local1, ISZ0) } If ((Local6 != 0xABCD0000)) { - ERR (__METHOD__, Z111, 0x0EFD, 0x00, 0x00, Local6, 0xABCD0000) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local6, 0xABCD0000) } If ((Local7 != 0x11111111)) { - ERR (__METHOD__, Z111, 0x0F00, 0x00, 0x00, Local7, 0x11111111) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local7, 0x11111111) } } } @@ -3629,7 +3629,7 @@ M000 (I000) If ((I000 != 0xABCD0000)) { - ERR (__METHOD__, Z111, 0x0F07, 0x00, 0x00, I000, 0xABCD0000) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, I000, 0xABCD0000) } } @@ -3642,19 +3642,19 @@ Local1 = ObjectType (Local0) If ((Local1 != C009)) { - ERR (__METHOD__, Z111, 0x0F16, 0x00, 0x00, Local1, C009) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local1, C009) } Else { Local1 = SizeOf (Local0) If ((Local1 != ISZ0)) { - ERR (__METHOD__, Z111, 0x0F1A, 0x00, 0x00, Local1, ISZ0) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local1, ISZ0) } If ((Local0 != 0xABCD0000)) { - ERR (__METHOD__, Z111, 0x0F1D, 0x00, 0x00, Local0, 0xABCD0000) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local0, 0xABCD0000) } } } @@ -3662,7 +3662,7 @@ M000 (I000) If ((I000 != 0xABCD0000)) { - ERR (__METHOD__, Z111, 0x0F24, 0x00, 0x00, I000, 0xABCD0000) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, I000, 0xABCD0000) } } @@ -3676,7 +3676,7 @@ Local2 = DerefOf (Local1) If ((Local2 != 0xABCD0000)) { - ERR (__METHOD__, Z111, 0x0F34, 0x00, 0x00, Local2, 0xABCD0000) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local2, 0xABCD0000) } RefOf (Arg0) = 0x11111111 @@ -3684,27 +3684,27 @@ Local0 = 0x11111111 If ((Local0 != 0x11111111)) { - ERR (__METHOD__, Z111, 0x0F3C, 0x00, 0x00, Local0, 0x11111111) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local0, 0x11111111) } } M000 (RefOf (I000)) If ((I000 != 0xABCD0000)) { - ERR (__METHOD__, Z111, 0x0F42, 0x00, 0x00, I000, 0xABCD0000) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, I000, 0xABCD0000) } Local0 = RefOf (I000) M000 (Local0) If ((I000 != 0xABCD0000)) { - ERR (__METHOD__, Z111, 0x0F48, 0x00, 0x00, I000, 0xABCD0000) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, I000, 0xABCD0000) } Local2 = DerefOf (Local0) If ((Local2 != 0xABCD0000)) { - ERR (__METHOD__, Z111, 0x0F4C, 0x00, 0x00, Local2, 0xABCD0000) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local2, 0xABCD0000) } } @@ -3718,7 +3718,7 @@ Local2 = DerefOf (Local1) If ((Local2 != 0xABCD0000)) { - ERR (__METHOD__, Z111, 0x0F5C, 0x00, 0x00, Local2, 0xABCD0000) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local2, 0xABCD0000) } } @@ -3733,14 +3733,14 @@ M000 (RefOf (I000)) If ((I000 != 0xABCD0000)) { - ERR (__METHOD__, Z111, 0x0F6A, 0x00, 0x00, I000, 0xABCD0000) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, I000, 0xABCD0000) } Local0 = RefOf (I000) M000 (Local0) If ((I000 != 0xABCD0000)) { - ERR (__METHOD__, Z111, 0x0F70, 0x00, 0x00, I000, 0xABCD0000) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, I000, 0xABCD0000) } If (Y512) @@ -3748,7 +3748,7 @@ Local2 = DerefOf (Local0) If ((Local2 != 0xABCD0000)) { - ERR (__METHOD__, Z111, 0x0F75, 0x00, 0x00, Local2, 0xABCD0000) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local2, 0xABCD0000) } } @@ -3757,14 +3757,14 @@ M001 (RefOf (I001)) If ((I001 != 0x11111111)) { - ERR (__METHOD__, Z111, 0x0F7D, 0x00, 0x00, I001, 0x11111111) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, I001, 0x11111111) } Local0 = RefOf (I001) M001 (Local0) If ((I001 != 0x11111111)) { - ERR (__METHOD__, Z111, 0x0F83, 0x00, 0x00, I001, 0x11111111) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, I001, 0x11111111) } If (Y512) @@ -3772,7 +3772,7 @@ Local2 = DerefOf (Local0) If ((Local2 != 0x11111111)) { - ERR (__METHOD__, Z111, 0x0F88, 0x00, 0x00, Local2, 0x11111111) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local2, 0x11111111) } } } @@ -3788,7 +3788,7 @@ Local2 = DerefOf (Arg0) If ((Local2 != 0x69)) { - ERR (__METHOD__, Z111, 0x0F97, 0x00, 0x00, Local2, 0x69) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local2, 0x69) } } @@ -3801,7 +3801,7 @@ Local2 = DerefOf (Local1) If ((Local2 != 0x69)) { - ERR (__METHOD__, Z111, 0x0FA3, 0x00, 0x00, Local2, 0x69) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local2, 0x69) } } @@ -3812,7 +3812,7 @@ Local0 = 0x11111111 If ((Local0 != 0x11111111)) { - ERR (__METHOD__, Z111, 0x0FAE, 0x00, 0x00, Local0, 0x11111111) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local0, 0x11111111) } } @@ -3824,7 +3824,7 @@ 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. })) { - ERR (__METHOD__, Z111, 0x0FB6, 0x00, 0x00, B000, Buffer (0x05) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, B000, Buffer (0x05) { 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. }) @@ -3837,7 +3837,7 @@ 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. })) { - ERR (__METHOD__, Z111, 0x0FBC, 0x00, 0x00, B000, Buffer (0x05) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, B000, Buffer (0x05) { 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. }) @@ -3846,7 +3846,7 @@ Local2 = DerefOf (Local0) If ((Local2 != 0x69)) { - ERR (__METHOD__, Z111, 0x0FC0, 0x00, 0x00, Local2, 0x69) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local2, 0x69) } Local1 = Local0 = B000 [0x02] @@ -3856,7 +3856,7 @@ 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. })) { - ERR (__METHOD__, Z111, 0x0FC6, 0x00, 0x00, B000, Buffer (0x05) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, B000, Buffer (0x05) { 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. }) @@ -3865,7 +3865,7 @@ Local2 = DerefOf (Local0) If ((Local2 != 0x69)) { - ERR (__METHOD__, Z111, 0x0FCA, 0x00, 0x00, Local2, 0x69) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local2, 0x69) } M000 (Local1) @@ -3874,7 +3874,7 @@ 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. })) { - ERR (__METHOD__, Z111, 0x0FCE, 0x00, 0x00, B000, Buffer (0x05) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, B000, Buffer (0x05) { 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. }) @@ -3883,7 +3883,7 @@ Local2 = DerefOf (Local1) If ((Local2 != 0x69)) { - ERR (__METHOD__, Z111, 0x0FD2, 0x00, 0x00, Local2, 0x69) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local2, 0x69) } /* m001 */ @@ -3894,7 +3894,7 @@ 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. })) { - ERR (__METHOD__, Z111, 0x0FD9, 0x00, 0x00, B000, Buffer (0x05) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, B000, Buffer (0x05) { 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. }) @@ -3907,7 +3907,7 @@ 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. })) { - ERR (__METHOD__, Z111, 0x0FDF, 0x00, 0x00, B000, Buffer (0x05) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, B000, Buffer (0x05) { 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. }) @@ -3916,7 +3916,7 @@ Local2 = DerefOf (Local0) If ((Local2 != 0x69)) { - ERR (__METHOD__, Z111, 0x0FE3, 0x00, 0x00, Local2, 0x69) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local2, 0x69) } Local1 = Local0 = B000 [0x02] @@ -3926,7 +3926,7 @@ 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. })) { - ERR (__METHOD__, Z111, 0x0FE9, 0x00, 0x00, B000, Buffer (0x05) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, B000, Buffer (0x05) { 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. }) @@ -3935,7 +3935,7 @@ Local2 = DerefOf (Local0) If ((Local2 != 0x69)) { - ERR (__METHOD__, Z111, 0x0FED, 0x00, 0x00, Local2, 0x69) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local2, 0x69) } M001 (Local1) @@ -3944,7 +3944,7 @@ 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. })) { - ERR (__METHOD__, Z111, 0x0FF1, 0x00, 0x00, B000, Buffer (0x05) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, B000, Buffer (0x05) { 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. }) @@ -3953,7 +3953,7 @@ Local2 = DerefOf (Local1) If ((Local2 != 0x69)) { - ERR (__METHOD__, Z111, 0x0FF5, 0x00, 0x00, Local2, 0x69) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local2, 0x69) } /* m002 */ @@ -3964,7 +3964,7 @@ 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. })) { - ERR (__METHOD__, Z111, 0x0FFC, 0x00, 0x00, B000, Buffer (0x05) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, B000, Buffer (0x05) { 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. }) @@ -3977,7 +3977,7 @@ 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. })) { - ERR (__METHOD__, Z111, 0x1002, 0x00, 0x00, B000, Buffer (0x05) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, B000, Buffer (0x05) { 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. }) @@ -3986,7 +3986,7 @@ Local2 = DerefOf (Local0) If ((Local2 != 0x69)) { - ERR (__METHOD__, Z111, 0x1006, 0x00, 0x00, Local2, 0x69) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local2, 0x69) } Local1 = Local0 = B000 [0x02] @@ -3996,7 +3996,7 @@ 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. })) { - ERR (__METHOD__, Z111, 0x100C, 0x00, 0x00, B000, Buffer (0x05) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, B000, Buffer (0x05) { 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. }) @@ -4005,7 +4005,7 @@ Local2 = DerefOf (Local0) If ((Local2 != 0x69)) { - ERR (__METHOD__, Z111, 0x1010, 0x00, 0x00, Local2, 0x69) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local2, 0x69) } M002 (Local1) @@ -4014,7 +4014,7 @@ 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. })) { - ERR (__METHOD__, Z111, 0x1014, 0x00, 0x00, B000, Buffer (0x05) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, B000, Buffer (0x05) { 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. }) @@ -4023,7 +4023,7 @@ Local2 = DerefOf (Local1) If ((Local2 != 0x69)) { - ERR (__METHOD__, Z111, 0x1018, 0x00, 0x00, Local2, 0x69) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local2, 0x69) } } @@ -4042,7 +4042,7 @@ Local2 = DerefOf (Arg0) If ((Local2 != 0x69)) { - ERR (__METHOD__, Z111, 0x1027, 0x00, 0x00, Local2, 0x69) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local2, 0x69) } } @@ -4054,7 +4054,7 @@ Local2 = DerefOf (Local1) If ((Local2 != 0x69)) { - ERR (__METHOD__, Z111, 0x1032, 0x00, 0x00, Local2, 0x69) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local2, 0x69) } } @@ -4072,7 +4072,7 @@ 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. })) { - ERR (__METHOD__, Z111, 0x1040, 0x00, 0x00, B000, Buffer (0x05) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, B000, Buffer (0x05) { 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. }) @@ -4085,7 +4085,7 @@ 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. })) { - ERR (__METHOD__, Z111, 0x1046, 0x00, 0x00, B000, Buffer (0x05) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, B000, Buffer (0x05) { 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. }) @@ -4094,7 +4094,7 @@ Local2 = DerefOf (Local0) If ((Local2 != 0x69)) { - ERR (__METHOD__, Z111, 0x104A, 0x00, 0x00, Local2, 0x69) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local2, 0x69) } Local1 = Local0 = B000 [0x02] @@ -4104,7 +4104,7 @@ 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. })) { - ERR (__METHOD__, Z111, 0x1050, 0x00, 0x00, B000, Buffer (0x05) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, B000, Buffer (0x05) { 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. }) @@ -4113,7 +4113,7 @@ Local2 = DerefOf (Local0) If ((Local2 != 0x69)) { - ERR (__METHOD__, Z111, 0x1054, 0x00, 0x00, Local2, 0x69) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local2, 0x69) } M000 (Local1) @@ -4122,7 +4122,7 @@ 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. })) { - ERR (__METHOD__, Z111, 0x1058, 0x00, 0x00, B000, Buffer (0x05) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, B000, Buffer (0x05) { 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. }) @@ -4131,7 +4131,7 @@ Local2 = DerefOf (Local1) If ((Local2 != 0x69)) { - ERR (__METHOD__, Z111, 0x105C, 0x00, 0x00, Local2, 0x69) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local2, 0x69) } /* m001 */ @@ -4142,7 +4142,7 @@ 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. })) { - ERR (__METHOD__, Z111, 0x1063, 0x00, 0x00, B000, Buffer (0x05) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, B000, Buffer (0x05) { 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. }) @@ -4155,7 +4155,7 @@ 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. })) { - ERR (__METHOD__, Z111, 0x1069, 0x00, 0x00, B000, Buffer (0x05) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, B000, Buffer (0x05) { 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. }) @@ -4166,7 +4166,7 @@ Local2 = DerefOf (Local0) If ((Local2 != 0x69)) { - ERR (__METHOD__, Z111, 0x106E, 0x00, 0x00, Local2, 0x69) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local2, 0x69) } } @@ -4177,7 +4177,7 @@ 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. })) { - ERR (__METHOD__, Z111, 0x1075, 0x00, 0x00, B000, Buffer (0x05) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, B000, Buffer (0x05) { 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. }) @@ -4188,7 +4188,7 @@ Local2 = DerefOf (Local0) If ((Local2 != 0x69)) { - ERR (__METHOD__, Z111, 0x107A, 0x00, 0x00, Local2, 0x69) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local2, 0x69) } } @@ -4198,7 +4198,7 @@ 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. })) { - ERR (__METHOD__, Z111, 0x107F, 0x00, 0x00, B000, Buffer (0x05) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, B000, Buffer (0x05) { 0x01, 0x02, 0x69, 0x04, 0x05 // ..i.. }) @@ -4209,7 +4209,7 @@ Local2 = DerefOf (Local1) If ((Local2 != 0x69)) { - ERR (__METHOD__, Z111, 0x1084, 0x00, 0x00, Local2, 0x69) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local2, 0x69) } } @@ -4221,7 +4221,7 @@ 0x01, 0x02, 0x11, 0x04, 0x05 // ..... })) { - ERR (__METHOD__, Z111, 0x108C, 0x00, 0x00, B000, Buffer (0x05) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, B000, Buffer (0x05) { 0x01, 0x02, 0x11, 0x04, 0x05 // ..... }) @@ -4234,7 +4234,7 @@ 0x01, 0x02, 0x11, 0x04, 0x05 // ..... })) { - ERR (__METHOD__, Z111, 0x1092, 0x00, 0x00, B000, Buffer (0x05) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, B000, Buffer (0x05) { 0x01, 0x02, 0x11, 0x04, 0x05 // ..... }) @@ -4245,7 +4245,7 @@ Local2 = DerefOf (Local0) If ((Local2 != 0x11)) { - ERR (__METHOD__, Z111, 0x1097, 0x00, 0x00, Local2, 0x11) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local2, 0x11) } } @@ -4256,7 +4256,7 @@ 0x01, 0x02, 0x11, 0x04, 0x05 // ..... })) { - ERR (__METHOD__, Z111, 0x109E, 0x00, 0x00, B000, Buffer (0x05) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, B000, Buffer (0x05) { 0x01, 0x02, 0x11, 0x04, 0x05 // ..... }) @@ -4267,7 +4267,7 @@ Local2 = DerefOf (Local0) If ((Local2 != 0x11)) { - ERR (__METHOD__, Z111, 0x10A3, 0x00, 0x00, Local2, 0x11) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local2, 0x11) } } @@ -4277,7 +4277,7 @@ 0x01, 0x02, 0x11, 0x04, 0x05 // ..... })) { - ERR (__METHOD__, Z111, 0x10A8, 0x00, 0x00, B000, Buffer (0x05) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, B000, Buffer (0x05) { 0x01, 0x02, 0x11, 0x04, 0x05 // ..... }) @@ -4288,7 +4288,7 @@ Local2 = DerefOf (Local1) If ((Local2 != 0x11)) { - ERR (__METHOD__, Z111, 0x10AD, 0x00, 0x00, Local2, 0x11) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local2, 0x11) } } } @@ -4349,20 +4349,20 @@ Local3 = ObjectType (Local2) If ((Local3 != Arg1)) { - ERR (__METHOD__, Z111, 0x10CE, 0x00, 0x00, Local3, Arg1) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local3, Arg1) } Local1 = Local0 = Local2 [0x01] Local0 = 0x90 If ((Local0 != 0x90)) { - ERR (__METHOD__, Z111, 0x10D5, 0x00, 0x00, Local0, 0x90) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local0, 0x90) } Local1 = 0x91 If ((Local1 != 0x91)) { - ERR (__METHOD__, Z111, 0x10D9, 0x00, 0x00, Local1, 0x91) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local1, 0x91) } } @@ -4375,13 +4375,13 @@ CopyObject (0x94, Local0) If ((Local0 != 0x94)) { - ERR (__METHOD__, Z111, 0x10E6, 0x00, 0x00, Local0, 0x94) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local0, 0x94) } CopyObject (0x95, Local1) If ((Local1 != 0x95)) { - ERR (__METHOD__, Z111, 0x10EA, 0x00, 0x00, Local1, 0x95) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local1, 0x95) } } @@ -4428,7 +4428,7 @@ Local2 = DerefOf (Local0) If ((Local2 != 0x2B)) { - ERR (__METHOD__, Z111, 0x1110, 0x00, 0x00, Local2, 0x2B) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local2, 0x2B) } } @@ -4704,7 +4704,7 @@ Local0 = ObjectType (Arg0) If ((Local0 != Arg2)) { - ERR (__METHOD__, Z111, 0x11DE, 0x00, 0x00, Local0, Arg2) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local0, Arg2) } If (OP00) @@ -4935,7 +4935,7 @@ Local0 = ObjectType (Arg0) If ((Local0 != Arg2)) { - ERR (__METHOD__, Z111, 0x12B0, 0x00, 0x00, Local0, Arg2) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local0, Arg2) } If (OP00) @@ -5064,14 +5064,14 @@ Local1 = ObjectType (Local0) If ((Local1 != C009)) { - ERR (__METHOD__, Z111, 0x1334, 0x00, 0x00, Local1, C009) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local1, C009) } Else { Local1 = DerefOf (Local0) If ((Local1 != Local6)) { - ERR (__METHOD__, Z111, 0x1338, 0x00, 0x00, Local1, Local6) + ERR (__METHOD__, Z111, __LINE__, 0x00, 0x00, Local1, Local6) } } @@ -5284,13 +5284,13 @@ Local1 = ObjectType (Local0) If ((Local1 != C01C)) { - ERR ("mfab", Z111, 0x13FB, 0x00, 0x00, Local1, C01C) + ERR ("mfab", Z111, __LINE__, 0x00, 0x00, Local1, C01C) } Local1 = ObjectType (DerefOf (Local0)) If ((Local1 != C01C)) { - ERR ("mfab", Z111, 0x1400, 0x00, 0x00, Local1, C01C) + ERR ("mfab", Z111, __LINE__, 0x00, 0x00, Local1, C01C) } } @@ -5347,7 +5347,7 @@ Debug = Local1 If ((Local1 != C01C)) { - ERR ("mfad", Z111, 0x142B, 0x00, 0x00, Local1, C01C) + ERR ("mfad", Z111, __LINE__, 0x00, 0x00, Local1, C01C) } } Else @@ -5356,7 +5356,7 @@ * ObjectType here falls into the infinitive loop. * Sort this out! */ - ERR ("mfad", Z111, 0x1432, 0x00, 0x00, 0x00, 0x00) + ERR ("mfad", Z111, __LINE__, 0x00, 0x00, 0x00, 0x00) } } @@ -5413,7 +5413,7 @@ Debug = Local1 If ((Local1 != 0x64)) { - ERR ("mfc3", Z111, 0x145D, 0x00, 0x00, Local1, 0x64) + ERR ("mfc3", Z111, __LINE__, 0x00, 0x00, Local1, 0x64) } } Else @@ -5422,7 +5422,7 @@ * SizeOf here falls into the infinitive loop. * Sort this out! */ - ERR ("mfc3", Z111, 0x1464, 0x00, 0x00, 0x00, 0x00) + ERR ("mfc3", Z111, __LINE__, 0x00, 0x00, 0x00, 0x00) } } @@ -5479,7 +5479,7 @@ Debug = Local1 If ((Local1 != 0x64)) { - ERR ("mfc4", Z111, 0x1490, 0x00, 0x00, Local1, 0x64) + ERR ("mfc4", Z111, __LINE__, 0x00, 0x00, Local1, 0x64) } } Else @@ -5488,7 +5488,7 @@ * SizeOf here falls into the infinitive loop. * Sort this out! */ - ERR ("mfc4", Z111, 0x1497, 0x00, 0x00, 0x00, 0x00) + ERR ("mfc4", Z111, __LINE__, 0x00, 0x00, 0x00, 0x00) } } diff --git a/tests/aslts/src/runtime/collections/functional/reference/ref71.asl b/tests/aslts/src/runtime/collections/functional/reference/ref71.asl index 00412b4de..dab3abce6 100644 --- a/tests/aslts/src/runtime/collections/functional/reference/ref71.asl +++ b/tests/aslts/src/runtime/collections/functional/reference/ref71.asl @@ -62,35 +62,35 @@ Local7 = ObjectType (Local0) If ((Local7 != C009)) { - ERR (__METHOD__, Z109, 0x42, 0x00, 0x00, Local7, C009) + ERR (__METHOD__, Z109, __LINE__, 0x00, 0x00, Local7, C009) } Local0 = S900 /* \S900 */ Local7 = ObjectType (Local0) If ((Local7 != C00A)) { - ERR (__METHOD__, Z109, 0x48, 0x00, 0x00, Local7, C00A) + ERR (__METHOD__, Z109, __LINE__, 0x00, 0x00, Local7, C00A) } Local0 = B900 /* \B900 */ Local7 = ObjectType (Local0) If ((Local7 != C00B)) { - ERR (__METHOD__, Z109, 0x4E, 0x00, 0x00, Local7, C00B) + ERR (__METHOD__, Z109, __LINE__, 0x00, 0x00, Local7, C00B) } Local0 = P900 /* \P900 */ Local7 = ObjectType (Local0) If ((Local7 != C00C)) { - ERR (__METHOD__, Z109, 0x54, 0x00, 0x00, Local7, C00C) + ERR (__METHOD__, Z109, __LINE__, 0x00, 0x00, Local7, C00C) } Local0 = F900 /* \F900 */ Local7 = ObjectType (Local0) If ((Local7 != C009)) { - ERR (__METHOD__, Z109, 0x5A, 0x00, 0x00, Local7, C009) + ERR (__METHOD__, Z109, __LINE__, 0x00, 0x00, Local7, C009) } /* @@ -154,6 +154,6 @@ Local7 = ObjectType (Local0) If ((Local7 != C009)) { - ERR (__METHOD__, Z109, 0xA0, 0x00, 0x00, Local7, C009) + ERR (__METHOD__, Z109, __LINE__, 0x00, 0x00, Local7, C009) } } diff --git a/tests/aslts/src/runtime/collections/functional/region/bankfield.asl b/tests/aslts/src/runtime/collections/functional/region/bankfield.asl index 5e79ecf04..5f2eab61d 100644 --- a/tests/aslts/src/runtime/collections/functional/region/bankfield.asl +++ b/tests/aslts/src/runtime/collections/functional/region/bankfield.asl @@ -65,11 +65,11 @@ { If ((ObjectType (Arg1) != ObjectType (Arg2))) { - ERR (Arg0, Z145, 0x48, 0x00, 0x00, ObjectType (Arg1), ObjectType (Arg2)) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, ObjectType (Arg1), ObjectType (Arg2)) } ElseIf ((Arg1 != Arg2)) { - ERR (Arg0, Z145, 0x4A, 0x00, 0x00, Arg1, Arg2) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg1, Arg2) } } @@ -557,7 +557,7 @@ } Default { - ERR (Arg0, Z145, 0x0193, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -769,7 +769,7 @@ } Default { - ERR (Arg0, Z145, 0x0213, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -981,7 +981,7 @@ } Default { - ERR (Arg0, Z145, 0x0293, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -1193,7 +1193,7 @@ } Default { - ERR (Arg0, Z145, 0x0313, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -1405,7 +1405,7 @@ } Default { - ERR (Arg0, Z145, 0x0393, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -1617,7 +1617,7 @@ } Default { - ERR (Arg0, Z145, 0x0413, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -1829,7 +1829,7 @@ } Default { - ERR (Arg0, Z145, 0x0493, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -2041,7 +2041,7 @@ } Default { - ERR (Arg0, Z145, 0x0513, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -2253,7 +2253,7 @@ } Default { - ERR (Arg0, Z145, 0x0593, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -2465,7 +2465,7 @@ } Default { - ERR (Arg0, Z145, 0x0613, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -2693,7 +2693,7 @@ } Default { - ERR (Arg0, Z145, 0x0693, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -2905,7 +2905,7 @@ } Default { - ERR (Arg0, Z145, 0x0713, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -3117,7 +3117,7 @@ } Default { - ERR (Arg0, Z145, 0x0793, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -3329,7 +3329,7 @@ } Default { - ERR (Arg0, Z145, 0x0813, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -3541,7 +3541,7 @@ } Default { - ERR (Arg0, Z145, 0x0893, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -3769,7 +3769,7 @@ } Default { - ERR (Arg0, Z145, 0x0913, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -3777,7 +3777,7 @@ } Default { - ERR (Arg0, Z145, 0x0919, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -4085,7 +4085,7 @@ } Default { - ERR (Arg0, Z145, 0x09DB, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -4297,7 +4297,7 @@ } Default { - ERR (Arg0, Z145, 0x0A5B, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -4509,7 +4509,7 @@ } Default { - ERR (Arg0, Z145, 0x0ADB, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -4721,7 +4721,7 @@ } Default { - ERR (Arg0, Z145, 0x0B5B, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -4933,7 +4933,7 @@ } Default { - ERR (Arg0, Z145, 0x0BDB, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -5145,7 +5145,7 @@ } Default { - ERR (Arg0, Z145, 0x0C5B, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -5357,7 +5357,7 @@ } Default { - ERR (Arg0, Z145, 0x0CDB, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -5569,7 +5569,7 @@ } Default { - ERR (Arg0, Z145, 0x0D5B, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -5781,7 +5781,7 @@ } Default { - ERR (Arg0, Z145, 0x0DDB, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -5993,7 +5993,7 @@ } Default { - ERR (Arg0, Z145, 0x0E5B, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -6221,7 +6221,7 @@ } Default { - ERR (Arg0, Z145, 0x0EDB, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -6433,7 +6433,7 @@ } Default { - ERR (Arg0, Z145, 0x0F5B, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -6645,7 +6645,7 @@ } Default { - ERR (Arg0, Z145, 0x0FDB, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -6857,7 +6857,7 @@ } Default { - ERR (Arg0, Z145, 0x105B, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -7069,7 +7069,7 @@ } Default { - ERR (Arg0, Z145, 0x10DB, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -7297,7 +7297,7 @@ } Default { - ERR (Arg0, Z145, 0x115B, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -7305,7 +7305,7 @@ } Default { - ERR (Arg0, Z145, 0x1161, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -7613,7 +7613,7 @@ } Default { - ERR (Arg0, Z145, 0x1223, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -7825,7 +7825,7 @@ } Default { - ERR (Arg0, Z145, 0x12A3, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -8037,7 +8037,7 @@ } Default { - ERR (Arg0, Z145, 0x1323, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -8249,7 +8249,7 @@ } Default { - ERR (Arg0, Z145, 0x13A3, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -8461,7 +8461,7 @@ } Default { - ERR (Arg0, Z145, 0x1423, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -8673,7 +8673,7 @@ } Default { - ERR (Arg0, Z145, 0x14A3, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -8885,7 +8885,7 @@ } Default { - ERR (Arg0, Z145, 0x1523, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -9097,7 +9097,7 @@ } Default { - ERR (Arg0, Z145, 0x15A3, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -9309,7 +9309,7 @@ } Default { - ERR (Arg0, Z145, 0x1623, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -9521,7 +9521,7 @@ } Default { - ERR (Arg0, Z145, 0x16A3, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -9749,7 +9749,7 @@ } Default { - ERR (Arg0, Z145, 0x1723, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -9961,7 +9961,7 @@ } Default { - ERR (Arg0, Z145, 0x17A3, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -10173,7 +10173,7 @@ } Default { - ERR (Arg0, Z145, 0x1823, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -10389,7 +10389,7 @@ } Default { - ERR (Arg0, Z145, 0x18AB, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -10601,7 +10601,7 @@ } Default { - ERR (Arg0, Z145, 0x192B, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -10829,7 +10829,7 @@ } Default { - ERR (Arg0, Z145, 0x19AB, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -10837,7 +10837,7 @@ } Default { - ERR (Arg0, Z145, 0x19B1, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -11145,7 +11145,7 @@ } Default { - ERR (Arg0, Z145, 0x1A73, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -11357,7 +11357,7 @@ } Default { - ERR (Arg0, Z145, 0x1AF3, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -11569,7 +11569,7 @@ } Default { - ERR (Arg0, Z145, 0x1B73, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -11781,7 +11781,7 @@ } Default { - ERR (Arg0, Z145, 0x1BF3, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -11993,7 +11993,7 @@ } Default { - ERR (Arg0, Z145, 0x1C73, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -12205,7 +12205,7 @@ } Default { - ERR (Arg0, Z145, 0x1CF3, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -12417,7 +12417,7 @@ } Default { - ERR (Arg0, Z145, 0x1D73, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -12629,7 +12629,7 @@ } Default { - ERR (Arg0, Z145, 0x1DF3, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -12841,7 +12841,7 @@ } Default { - ERR (Arg0, Z145, 0x1E73, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -13053,7 +13053,7 @@ } Default { - ERR (Arg0, Z145, 0x1EF3, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -13281,7 +13281,7 @@ } Default { - ERR (Arg0, Z145, 0x1F73, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -13493,7 +13493,7 @@ } Default { - ERR (Arg0, Z145, 0x1FF3, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -13705,7 +13705,7 @@ } Default { - ERR (Arg0, Z145, 0x2073, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -13917,7 +13917,7 @@ } Default { - ERR (Arg0, Z145, 0x20F3, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -14129,7 +14129,7 @@ } Default { - ERR (Arg0, Z145, 0x2173, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -14357,7 +14357,7 @@ } Default { - ERR (Arg0, Z145, 0x21F3, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -14365,7 +14365,7 @@ } Default { - ERR (Arg0, Z145, 0x21F9, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -14673,7 +14673,7 @@ } Default { - ERR (Arg0, Z145, 0x22BB, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -14885,7 +14885,7 @@ } Default { - ERR (Arg0, Z145, 0x233B, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -15097,7 +15097,7 @@ } Default { - ERR (Arg0, Z145, 0x23BB, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -15309,7 +15309,7 @@ } Default { - ERR (Arg0, Z145, 0x243B, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -15521,7 +15521,7 @@ } Default { - ERR (Arg0, Z145, 0x24BB, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -15733,7 +15733,7 @@ } Default { - ERR (Arg0, Z145, 0x253B, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -15945,7 +15945,7 @@ } Default { - ERR (Arg0, Z145, 0x25BB, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -16157,7 +16157,7 @@ } Default { - ERR (Arg0, Z145, 0x263B, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -16369,7 +16369,7 @@ } Default { - ERR (Arg0, Z145, 0x26BB, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -16581,7 +16581,7 @@ } Default { - ERR (Arg0, Z145, 0x273B, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -16809,7 +16809,7 @@ } Default { - ERR (Arg0, Z145, 0x27BB, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -17021,7 +17021,7 @@ } Default { - ERR (Arg0, Z145, 0x283B, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -17233,7 +17233,7 @@ } Default { - ERR (Arg0, Z145, 0x28BB, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -17445,7 +17445,7 @@ } Default { - ERR (Arg0, Z145, 0x293B, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -17657,7 +17657,7 @@ } Default { - ERR (Arg0, Z145, 0x29BB, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -17885,7 +17885,7 @@ } Default { - ERR (Arg0, Z145, 0x2A3B, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -17893,7 +17893,7 @@ } Default { - ERR (Arg0, Z145, 0x2A41, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -18793,7 +18793,7 @@ If ((BF03 != I000)) { - ERR (Arg0, Z145, 0x2D37, 0x00, 0x00, BF03, I000) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, BF03, I000) } } @@ -18801,17 +18801,17 @@ BF00 = I000 /* \M7C8.I000 */ If ((BF00 != I000)) { - ERR (Arg0, Z145, 0x2D40, 0x00, 0x00, BF00, I000) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, BF00, I000) } If ((BF01 != I000)) { - ERR (Arg0, Z145, 0x2D43, 0x00, 0x00, BF00, I000) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, BF00, I000) } If ((BF02 != I000)) { - ERR (Arg0, Z145, 0x2D46, 0x00, 0x00, BF00, I000) + ERR (Arg0, Z145, __LINE__, 0x00, 0x00, BF00, I000) } /* */ diff --git a/tests/aslts/src/runtime/collections/functional/region/dtregions.asl b/tests/aslts/src/runtime/collections/functional/region/dtregions.asl index e6fc82316..35cf2ca91 100644 --- a/tests/aslts/src/runtime/collections/functional/region/dtregions.asl +++ b/tests/aslts/src/runtime/collections/functional/region/dtregions.asl @@ -115,22 +115,22 @@ \DTR0._REG (0x0101, 0x02) If ((\DTR0.IRSK != 0x01)) { - ERR (Arg0, Z142, 0x76, 0x00, 0x00, \DTR0.IRSK, 0x01) + ERR (Arg0, Z142, __LINE__, 0x00, 0x00, \DTR0.IRSK, 0x01) } If ((\DTR0.IFLG != 0x01)) { - ERR (Arg0, Z142, 0x79, 0x00, 0x00, \DTR0.IFLG, 0x01) + ERR (Arg0, Z142, __LINE__, 0x00, 0x00, \DTR0.IFLG, 0x01) } If ((\DTR0.VRSK != 0x02)) { - ERR (Arg0, Z142, 0x7C, 0x00, 0x00, \DTR0.VRSK, 0x02) + ERR (Arg0, Z142, __LINE__, 0x00, 0x00, \DTR0.VRSK, 0x02) } If ((DerefOf (\DTR0.VFLG [0x01]) != 0x02)) { - ERR (Arg0, Z142, 0x7F, 0x00, 0x00, DerefOf (\DTR0.VFLG [0x01]), 0x02) + ERR (Arg0, Z142, __LINE__, 0x00, 0x00, DerefOf (\DTR0.VFLG [0x01]), 0x02) } } @@ -186,44 +186,44 @@ Concatenate (Arg0, "-m7f1", Arg0) If ((VRSK != 0x00)) { - ERR (Arg0, Z142, 0xB2, 0x00, 0x00, VRSK, 0x00) + ERR (Arg0, Z142, __LINE__, 0x00, 0x00, VRSK, 0x00) } If ((DerefOf (VFLG [0x01]) != 0x00)) { - ERR (Arg0, Z142, 0xB5, 0x00, 0x00, DerefOf (VFLG [0x01]), 0x00) + ERR (Arg0, Z142, __LINE__, 0x00, 0x00, DerefOf (VFLG [0x01]), 0x00) } DataTableRegion (DR00, "SSDT", "", "") If ((IRSK != 0x00)) { - ERR (Arg0, Z142, 0xBB, 0x00, 0x00, IRSK, 0x00) + ERR (Arg0, Z142, __LINE__, 0x00, 0x00, IRSK, 0x00) } If ((IFLG != 0x00)) { - ERR (Arg0, Z142, 0xBE, 0x00, 0x00, IFLG, 0x00) + ERR (Arg0, Z142, __LINE__, 0x00, 0x00, IFLG, 0x00) } _REG (0x0101, 0x02) If ((IRSK != 0x01)) { - ERR (Arg0, Z142, 0xC4, 0x00, 0x00, IRSK, 0x01) + ERR (Arg0, Z142, __LINE__, 0x00, 0x00, IRSK, 0x01) } If ((IFLG != 0x01)) { - ERR (Arg0, Z142, 0xC7, 0x00, 0x00, IFLG, 0x01) + ERR (Arg0, Z142, __LINE__, 0x00, 0x00, IFLG, 0x01) } If ((VRSK != 0x01)) { - ERR (Arg0, Z142, 0xCA, 0x00, 0x00, VRSK, 0x01) + ERR (Arg0, Z142, __LINE__, 0x00, 0x00, VRSK, 0x01) } If ((DerefOf (VFLG [0x01]) != 0x01)) { - ERR (Arg0, Z142, 0xCD, 0x00, 0x00, DerefOf (VFLG [0x01]), 0x01) + ERR (Arg0, Z142, __LINE__, 0x00, 0x00, DerefOf (VFLG [0x01]), 0x01) } } @@ -247,7 +247,7 @@ Local3 = \DTR0.SSDT If ((Local2 != Local3)) { - ERR (Arg0, Z142, 0xE5, 0x00, 0x00, Local2, Local3) + ERR (Arg0, Z142, __LINE__, 0x00, 0x00, Local2, Local3) } } @@ -273,7 +273,7 @@ Local1 = \DTR0.SSDT If ((Local0 != Local1)) { - ERR (Arg0, Z142, 0xFC, 0x00, 0x00, Local0, Local1) + ERR (Arg0, Z142, __LINE__, 0x00, 0x00, Local0, Local1) } } @@ -293,7 +293,7 @@ Local1 = \DTR0.SSDT If ((Local0 != Local1)) { - ERR (Arg0, Z142, 0x010B, 0x00, 0x00, Local0, Local1) + ERR (Arg0, Z142, __LINE__, 0x00, 0x00, Local0, Local1) } } @@ -313,7 +313,7 @@ Local1 = \DTR0.SSDT If ((Local0 != Local1)) { - ERR (Arg0, Z142, 0x011A, 0x00, 0x00, Local0, Local1) + ERR (Arg0, Z142, __LINE__, 0x00, 0x00, Local0, Local1) } } @@ -336,7 +336,7 @@ Local1 = \DTR0.SSDT If ((Local0 != Local1)) { - ERR (Arg0, Z142, 0x012D, 0x00, 0x00, Local0, Local1) + ERR (Arg0, Z142, __LINE__, 0x00, 0x00, Local0, Local1) } } @@ -358,7 +358,7 @@ Local1 = \DTR0.SSDT If ((Local0 != Local1)) { - ERR (Arg0, Z142, 0x013F, 0x00, 0x00, Local0, Local1) + ERR (Arg0, Z142, __LINE__, 0x00, 0x00, Local0, Local1) } } @@ -386,7 +386,7 @@ Local0 = ToString (FU00, 0x04) If ((Local0 != Arg1)) { - ERR (Arg0, Z142, 0x015A, 0x00, 0x00, Local0, Arg1) + ERR (Arg0, Z142, __LINE__, 0x00, 0x00, Local0, Arg1) } } diff --git a/tests/aslts/src/runtime/collections/functional/region/indexfield.asl b/tests/aslts/src/runtime/collections/functional/region/indexfield.asl index 7e2724f79..bebad71e3 100644 --- a/tests/aslts/src/runtime/collections/functional/region/indexfield.asl +++ b/tests/aslts/src/runtime/collections/functional/region/indexfield.asl @@ -98,28 +98,28 @@ Local1 = C00D /* \C00D */ If ((Local0 != Local1)) { - ERR (Arg0, Z144, 0x67, 0x00, 0x00, Local0, Local1) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Local0, Local1) } Local0 = ObjectType (REG1) Local1 = C00D /* \C00D */ If ((Local0 != Local1)) { - ERR (Arg0, Z144, 0x6D, 0x00, 0x00, Local0, Local1) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Local0, Local1) } Local0 = ObjectType (REG2) Local1 = C00D /* \C00D */ If ((Local1 != Local0)) { - ERR (Arg0, Z144, 0x73, 0x00, 0x00, Local0, Local1) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Local0, Local1) } Local0 = ObjectType (REG3) Local1 = C00D /* \C00D */ If ((Local1 != Local0)) { - ERR (Arg0, Z144, 0x79, 0x00, 0x00, Local0, Local1) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Local0, Local1) } /* Check actual writes to the IndexField(s). */ @@ -131,7 +131,7 @@ Local1 = 0xF11A If ((Local1 != Local0)) { - ERR (Arg0, Z144, 0x86, 0x00, 0x00, Local0, Local1) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Local0, Local1) } FK32 = I000 /* \M770.I000 */ @@ -140,7 +140,7 @@ Local1 = 0xD25B If ((Local1 != Local0)) { - ERR (Arg0, Z144, 0x8F, 0x00, 0x00, Local0, Local1) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Local0, Local1) } FK32 = I000 /* \M770.I000 */ @@ -149,7 +149,7 @@ Local1 = 0x939C If ((Local1 != Local0)) { - ERR (Arg0, Z144, 0x98, 0x00, 0x00, Local0, Local1) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Local0, Local1) } FK32 = I000 /* \M770.I000 */ @@ -158,7 +158,7 @@ Local1 = 0x54ED If ((Local1 != Local0)) { - ERR (Arg0, Z144, 0xA1, 0x00, 0x00, Local0, Local1) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Local0, Local1) } } @@ -410,7 +410,7 @@ If ((Arg5 != Local2)) { - ERR (Arg0, Z144, 0x0157, Z144, Arg6, Local2, Arg5) + ERR (Arg0, Z144, __LINE__, Z144, Arg6, Local2, Arg5) } /* Fill then immediately read */ @@ -421,7 +421,7 @@ Local2 = DerefOf (Arg2) If ((Arg1 != Local2)) { - ERR (Arg0, Z144, 0x0163, Z144, Arg6, Local2, Arg1) + ERR (Arg0, Z144, __LINE__, Z144, Arg6, Local2, Arg1) } /* * November 2011: @@ -1720,7 +1720,7 @@ } Default { - ERR (Arg0, Z144, 0x0546, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -1932,7 +1932,7 @@ } Default { - ERR (Arg0, Z144, 0x05B6, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -2128,7 +2128,7 @@ } Default { - ERR (Arg0, Z144, 0x0626, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -2324,7 +2324,7 @@ } Default { - ERR (Arg0, Z144, 0x0696, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -2520,7 +2520,7 @@ } Default { - ERR (Arg0, Z144, 0x0706, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -2716,7 +2716,7 @@ } Default { - ERR (Arg0, Z144, 0x0776, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -2912,7 +2912,7 @@ } Default { - ERR (Arg0, Z144, 0x07E6, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -3108,7 +3108,7 @@ } Default { - ERR (Arg0, Z144, 0x0856, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -3304,7 +3304,7 @@ } Default { - ERR (Arg0, Z144, 0x08C6, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -3500,7 +3500,7 @@ } Default { - ERR (Arg0, Z144, 0x0936, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -3712,7 +3712,7 @@ } Default { - ERR (Arg0, Z144, 0x09A6, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -3908,7 +3908,7 @@ } Default { - ERR (Arg0, Z144, 0x0A16, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -4104,7 +4104,7 @@ } Default { - ERR (Arg0, Z144, 0x0A86, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -4300,7 +4300,7 @@ } Default { - ERR (Arg0, Z144, 0x0AF6, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -4496,7 +4496,7 @@ } Default { - ERR (Arg0, Z144, 0x0B66, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -4708,7 +4708,7 @@ } Default { - ERR (Arg0, Z144, 0x0BD6, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -4716,7 +4716,7 @@ } Default { - ERR (Arg0, Z144, 0x0BDC, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -5113,7 +5113,7 @@ } Default { - ERR (Arg0, Z144, 0x0CE8, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -5317,7 +5317,7 @@ } Default { - ERR (Arg0, Z144, 0x0D50, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -5505,7 +5505,7 @@ } Default { - ERR (Arg0, Z144, 0x0DB8, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -5693,7 +5693,7 @@ } Default { - ERR (Arg0, Z144, 0x0E20, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -5881,7 +5881,7 @@ } Default { - ERR (Arg0, Z144, 0x0E88, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -6069,7 +6069,7 @@ } Default { - ERR (Arg0, Z144, 0x0EF0, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -6257,7 +6257,7 @@ } Default { - ERR (Arg0, Z144, 0x0F58, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -6445,7 +6445,7 @@ } Default { - ERR (Arg0, Z144, 0x0FC0, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -6633,7 +6633,7 @@ } Default { - ERR (Arg0, Z144, 0x1028, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -6821,7 +6821,7 @@ } Default { - ERR (Arg0, Z144, 0x1090, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -7025,7 +7025,7 @@ } Default { - ERR (Arg0, Z144, 0x10F8, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -7213,7 +7213,7 @@ } Default { - ERR (Arg0, Z144, 0x1160, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -7401,7 +7401,7 @@ } Default { - ERR (Arg0, Z144, 0x11C8, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -7589,7 +7589,7 @@ } Default { - ERR (Arg0, Z144, 0x1230, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -7777,7 +7777,7 @@ } Default { - ERR (Arg0, Z144, 0x1298, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -7981,7 +7981,7 @@ } Default { - ERR (Arg0, Z144, 0x1300, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -7989,7 +7989,7 @@ } Default { - ERR (Arg0, Z144, 0x1306, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -8386,7 +8386,7 @@ } Default { - ERR (Arg0, Z144, 0x1412, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -8590,7 +8590,7 @@ } Default { - ERR (Arg0, Z144, 0x147A, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -8778,7 +8778,7 @@ } Default { - ERR (Arg0, Z144, 0x14E2, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -8966,7 +8966,7 @@ } Default { - ERR (Arg0, Z144, 0x154A, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -9154,7 +9154,7 @@ } Default { - ERR (Arg0, Z144, 0x15B2, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -9342,7 +9342,7 @@ } Default { - ERR (Arg0, Z144, 0x161A, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -9530,7 +9530,7 @@ } Default { - ERR (Arg0, Z144, 0x1682, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -9718,7 +9718,7 @@ } Default { - ERR (Arg0, Z144, 0x16EA, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -9906,7 +9906,7 @@ } Default { - ERR (Arg0, Z144, 0x1752, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -10094,7 +10094,7 @@ } Default { - ERR (Arg0, Z144, 0x17BA, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -10298,7 +10298,7 @@ } Default { - ERR (Arg0, Z144, 0x1822, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -10486,7 +10486,7 @@ } Default { - ERR (Arg0, Z144, 0x188A, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -10674,7 +10674,7 @@ } Default { - ERR (Arg0, Z144, 0x18F2, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -10862,7 +10862,7 @@ } Default { - ERR (Arg0, Z144, 0x195A, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -11050,7 +11050,7 @@ } Default { - ERR (Arg0, Z144, 0x19C2, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -11254,7 +11254,7 @@ } Default { - ERR (Arg0, Z144, 0x1A2A, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -11262,7 +11262,7 @@ } Default { - ERR (Arg0, Z144, 0x1A30, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -11661,7 +11661,7 @@ } Default { - ERR (Arg0, Z144, 0x1B3E, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -11865,7 +11865,7 @@ } Default { - ERR (Arg0, Z144, 0x1BA6, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -12053,7 +12053,7 @@ } Default { - ERR (Arg0, Z144, 0x1C0E, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -12241,7 +12241,7 @@ } Default { - ERR (Arg0, Z144, 0x1C76, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -12429,7 +12429,7 @@ } Default { - ERR (Arg0, Z144, 0x1CDE, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -12617,7 +12617,7 @@ } Default { - ERR (Arg0, Z144, 0x1D46, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -12805,7 +12805,7 @@ } Default { - ERR (Arg0, Z144, 0x1DAE, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -12993,7 +12993,7 @@ } Default { - ERR (Arg0, Z144, 0x1E16, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -13181,7 +13181,7 @@ } Default { - ERR (Arg0, Z144, 0x1E7E, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -13369,7 +13369,7 @@ } Default { - ERR (Arg0, Z144, 0x1EE6, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -13573,7 +13573,7 @@ } Default { - ERR (Arg0, Z144, 0x1F4E, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -13761,7 +13761,7 @@ } Default { - ERR (Arg0, Z144, 0x1FB6, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -13949,7 +13949,7 @@ } Default { - ERR (Arg0, Z144, 0x201E, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -14137,7 +14137,7 @@ } Default { - ERR (Arg0, Z144, 0x2086, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -14325,7 +14325,7 @@ } Default { - ERR (Arg0, Z144, 0x20EE, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -14529,7 +14529,7 @@ } Default { - ERR (Arg0, Z144, 0x2156, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -14537,7 +14537,7 @@ } Default { - ERR (Arg0, Z144, 0x215C, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -14935,7 +14935,7 @@ } Default { - ERR (Arg0, Z144, 0x226A, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -15139,7 +15139,7 @@ } Default { - ERR (Arg0, Z144, 0x22D2, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -15327,7 +15327,7 @@ } Default { - ERR (Arg0, Z144, 0x233A, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -15515,7 +15515,7 @@ } Default { - ERR (Arg0, Z144, 0x23A2, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -15703,7 +15703,7 @@ } Default { - ERR (Arg0, Z144, 0x240A, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -15891,7 +15891,7 @@ } Default { - ERR (Arg0, Z144, 0x2472, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -16079,7 +16079,7 @@ } Default { - ERR (Arg0, Z144, 0x24DA, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -16267,7 +16267,7 @@ } Default { - ERR (Arg0, Z144, 0x2542, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -16455,7 +16455,7 @@ } Default { - ERR (Arg0, Z144, 0x25AA, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -16643,7 +16643,7 @@ } Default { - ERR (Arg0, Z144, 0x2612, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -16847,7 +16847,7 @@ } Default { - ERR (Arg0, Z144, 0x267A, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -17035,7 +17035,7 @@ } Default { - ERR (Arg0, Z144, 0x26E2, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -17223,7 +17223,7 @@ } Default { - ERR (Arg0, Z144, 0x274A, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -17411,7 +17411,7 @@ } Default { - ERR (Arg0, Z144, 0x27B2, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -17599,7 +17599,7 @@ } Default { - ERR (Arg0, Z144, 0x281A, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -17803,7 +17803,7 @@ } Default { - ERR (Arg0, Z144, 0x2882, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -17811,7 +17811,7 @@ } Default { - ERR (Arg0, Z144, 0x2888, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z144, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } diff --git a/tests/aslts/src/runtime/collections/functional/region/opregions.asl b/tests/aslts/src/runtime/collections/functional/region/opregions.asl index 3fe94eb8b..68d090082 100644 --- a/tests/aslts/src/runtime/collections/functional/region/opregions.asl +++ b/tests/aslts/src/runtime/collections/functional/region/opregions.asl @@ -545,22 +545,22 @@ Package (NRSK) If ((IRSK != 0x00)) { - ERR (Arg0, Z141, 0x0191, 0x00, 0x00, IRSK, 0x00) + ERR (Arg0, Z141, __LINE__, 0x00, 0x00, IRSK, 0x00) } If ((IFLG != 0x00)) { - ERR (Arg0, Z141, 0x0194, 0x00, 0x00, IFLG, 0x00) + ERR (Arg0, Z141, __LINE__, 0x00, 0x00, IFLG, 0x00) } If ((\DOR0.IRSK != 0x00)) { - ERR (Arg0, Z141, 0x0198, 0x00, 0x00, IRSK, 0x00) + ERR (Arg0, Z141, __LINE__, 0x00, 0x00, IRSK, 0x00) } If ((\DOR0.IFLG != 0x00)) { - ERR (Arg0, Z141, 0x019B, 0x00, 0x00, IFLG, 0x00) + ERR (Arg0, Z141, __LINE__, 0x00, 0x00, IFLG, 0x00) } /* Emulate and verify incorrect calls */ @@ -569,29 +569,29 @@ Package (NRSK) \DOR0._REG (FRSK, 0x02) If ((IRSK != 0x01)) { - ERR (Arg0, Z141, 0x01A4, 0x00, 0x00, IRSK, 0x01) + ERR (Arg0, Z141, __LINE__, 0x00, 0x00, IRSK, 0x01) } If ((IFLG != 0x01)) { - ERR (Arg0, Z141, 0x01A7, 0x00, 0x00, IFLG, 0x01) + ERR (Arg0, Z141, __LINE__, 0x00, 0x00, IFLG, 0x01) } If ((\DOR0.IRSK != 0x01)) { - ERR (Arg0, Z141, 0x01AA, 0x00, 0x00, IRSK, 0x01) + ERR (Arg0, Z141, __LINE__, 0x00, 0x00, IRSK, 0x01) } If ((\DOR0.IFLG != 0x01)) { - ERR (Arg0, Z141, 0x01AD, 0x00, 0x00, IFLG, 0x01) + ERR (Arg0, Z141, __LINE__, 0x00, 0x00, IFLG, 0x01) } /* Check total calls to \_REG */ If ((DerefOf (VFLG [0x01]) != 0x09)) { - ERR (Arg0, Z141, 0x01B3, 0x00, 0x00, DerefOf (VFLG [0x01]), 0x09) + ERR (Arg0, Z141, __LINE__, 0x00, 0x00, DerefOf (VFLG [0x01]), 0x09) } M70E (Arg0, 0x01, VRSK, ERSK, 0x0A) @@ -599,7 +599,7 @@ Package (NRSK) If ((DerefOf (\DOR0.VFLG [0x01]) != 0x06)) { - ERR (Arg0, Z141, 0x01BA, 0x00, 0x00, DerefOf (\DOR0.VFLG [0x01]), 0x06) + ERR (Arg0, Z141, __LINE__, 0x00, 0x00, DerefOf (\DOR0.VFLG [0x01]), 0x06) } M70E (Arg0, 0x01, \DOR0.VRSK, \DOR0.ERSK, 0x0C) @@ -613,46 +613,46 @@ Package (NRSK) Concatenate (Arg0, "-m701", Arg0) If ((\DOR1.IREG != 0x00)) { - ERR (Arg0, Z141, 0x01C7, 0x00, 0x00, \DOR1.IREG, 0x00) + ERR (Arg0, Z141, __LINE__, 0x00, 0x00, \DOR1.IREG, 0x00) } If ((\DOR1.IRSK != 0x00)) { - ERR (Arg0, Z141, 0x01CA, 0x00, 0x00, \DOR1.IRSK, 0x00) + ERR (Arg0, Z141, __LINE__, 0x00, 0x00, \DOR1.IRSK, 0x00) } If ((\DOR1.IFLG != 0x00)) { - ERR (Arg0, Z141, 0x01CD, 0x00, 0x00, \DOR1.IFLG, 0x00) + ERR (Arg0, Z141, __LINE__, 0x00, 0x00, \DOR1.IFLG, 0x00) } If ((DerefOf (\DOR1.VFLG [0x01]) != 0x00)) { - ERR (Arg0, Z141, 0x01D0, 0x00, 0x00, DerefOf (\DOR1.VFLG [0x01]), 0x00) + ERR (Arg0, Z141, __LINE__, 0x00, 0x00, DerefOf (\DOR1.VFLG [0x01]), 0x00) } M70E (Arg0, 0x02, \DOR1.VRSK, 0x00, 0x11) \DOR1.M000 () If ((\DOR1.IREG != 0x00)) { - ERR (Arg0, Z141, 0x01D7, 0x00, 0x00, \DOR1.IREG, 0x01) + ERR (Arg0, Z141, __LINE__, 0x00, 0x00, \DOR1.IREG, 0x01) } If ((\DOR1.IRSK != 0x01)) { - ERR (Arg0, Z141, 0x01DA, 0x00, 0x00, \DOR1.IRSK, 0x01) + ERR (Arg0, Z141, __LINE__, 0x00, 0x00, \DOR1.IRSK, 0x01) } If ((\DOR1.IFLG != 0x01)) { - ERR (Arg0, Z141, 0x01DD, 0x00, 0x00, \DOR1.IFLG, 0x01) + ERR (Arg0, Z141, __LINE__, 0x00, 0x00, \DOR1.IFLG, 0x01) } /* Check total calls to \DOR1._REG */ If ((DerefOf (\DOR1.VFLG [0x01]) != 0x06)) { - ERR (Arg0, Z141, 0x01E3, 0x00, 0x00, DerefOf (\DOR1.VFLG [0x01]), 0x06) + ERR (Arg0, Z141, __LINE__, 0x00, 0x00, DerefOf (\DOR1.VFLG [0x01]), 0x06) } M70E (Arg0, 0x01, \DOR1.VRSK, \DOR1.ERSK, 0x16) @@ -758,14 +758,14 @@ Package (NRSK) Local1 = C00B /* \C00B */ If ((Local0 != Local1)) { - ERR (Arg0, Z141, 0x0254, 0x00, 0x00, Local0, Local1) + ERR (Arg0, Z141, __LINE__, 0x00, 0x00, Local0, Local1) } Else { Local0 = DerefOf (Local6) If ((Local0 != B000)) { - ERR (Arg0, Z141, 0x0258, Z141, Arg2, Local0, B000) + ERR (Arg0, Z141, __LINE__, Z141, Arg2, Local0, B000) } } } @@ -823,14 +823,14 @@ Package (NRSK) Local3 = Arg3 [Local0] If ((DerefOf (Local1) != DerefOf (Local3))) { - ERR (Arg0, Z141, 0x028D, Z141, Local0, DerefOf (Local1), DerefOf (Local3)) + ERR (Arg0, Z141, __LINE__, Z141, Local0, DerefOf (Local1), DerefOf (Local3)) } } Case (0x02) { If ((DerefOf (Local1) != 0x00)) { - ERR (Arg0, Z141, 0x0292, Z141, Local0, DerefOf (Local1), 0x00) + ERR (Arg0, Z141, __LINE__, Z141, Local0, DerefOf (Local1), 0x00) } } @@ -890,7 +890,7 @@ Package (NRSK) } If ((Local0 != Local1)) { - ERR (Arg0, Z141, 0x02C3, Z141, Arg4, Local0, Local1) + ERR (Arg0, Z141, __LINE__, Z141, Arg4, Local0, Local1) } } @@ -904,7 +904,7 @@ Package (NRSK) { If ((Arg1 != Arg2)) { - ERR (Arg0, Z141, 0x02D0, Z141, Arg3, Arg1, Arg2) + ERR (Arg0, Z141, __LINE__, Z141, Arg3, Arg1, Arg2) } } @@ -990,7 +990,7 @@ Package (NRSK) Local7 = DerefOf (Local5) If ((I002 != Local7)) { - ERR (Arg0, Z141, 0x031C, Z141, Arg1, Local7, I002) + ERR (Arg0, Z141, __LINE__, Z141, Arg1, Local7, I002) } } @@ -1038,7 +1038,7 @@ Package (NRSK) Local7 = DerefOf (Local5) If ((I002 != Local7)) { - ERR (Arg0, Z141, 0x033F, Z141, Arg1, Local7, I002) + ERR (Arg0, Z141, __LINE__, Z141, Arg1, Local7, I002) } } @@ -1088,7 +1088,7 @@ Package (NRSK) Local7 = DerefOf (Local5) If ((I002 != Local7)) { - ERR (Arg0, Z141, 0x0365, Z141, Arg1, Local7, I002) + ERR (Arg0, Z141, __LINE__, Z141, Arg1, Local7, I002) } } @@ -1137,7 +1137,7 @@ Package (NRSK) Local7 = DerefOf (Local5) If ((I002 != Local7)) { - ERR (Arg0, Z141, 0x038B, Z141, Arg1, Local7, I002) + ERR (Arg0, Z141, __LINE__, Z141, Arg1, Local7, I002) } } @@ -1218,7 +1218,7 @@ Package (NRSK) If ((FU04 != I000)) { - ERR (Arg0, Z141, 0x03CF, 0x00, 0x00, FU04, I000) + ERR (Arg0, Z141, __LINE__, 0x00, 0x00, FU04, I000) } } @@ -1226,48 +1226,48 @@ Package (NRSK) FU00 = I000 /* \M706.I000 */ If ((FU00 != I000)) { - ERR (Arg0, Z141, 0x03D8, 0x00, 0x00, FU00, I000) + ERR (Arg0, Z141, __LINE__, 0x00, 0x00, FU00, I000) } If ((0xFEDCBA987654321F != OFF0)) { - ERR (Arg0, Z141, 0x03DC, 0x00, 0x00, OFF0, 0xFEDCBA987654321F) + ERR (Arg0, Z141, __LINE__, 0x00, 0x00, OFF0, 0xFEDCBA987654321F) } ElseIf ((0x0123 != LEN0)) { - ERR (Arg0, Z141, 0x03DE, 0x00, 0x00, LEN0, 0x0123) + ERR (Arg0, Z141, __LINE__, 0x00, 0x00, LEN0, 0x0123) } ElseIf ((FU01 != I000)) { - ERR (Arg0, Z141, 0x03E0, 0x00, 0x00, FU00, I000) + ERR (Arg0, Z141, __LINE__, 0x00, 0x00, FU00, I000) } If ((0xFEDCBA987654321F != OFFB)) { - ERR (Arg0, Z141, 0x03E4, 0x00, 0x00, OFFB, 0xFEDCBA987654321F) + ERR (Arg0, Z141, __LINE__, 0x00, 0x00, OFFB, 0xFEDCBA987654321F) } ElseIf ((0x0123 != LENB)) { - ERR (Arg0, Z141, 0x03E6, 0x00, 0x00, LENB, 0x0123) + ERR (Arg0, Z141, __LINE__, 0x00, 0x00, LENB, 0x0123) } ElseIf ((FU02 != I000)) { - ERR (Arg0, Z141, 0x03E8, 0x00, 0x00, FU00, I000) + ERR (Arg0, Z141, __LINE__, 0x00, 0x00, FU00, I000) } If ((0xFEDCBA987654321F != OFFS)) { Local0 = (OFFS + 0x00) - ERR (Arg0, Z141, 0x03ED, 0x00, 0x00, Local0, 0xFEDCBA987654321F) + ERR (Arg0, Z141, __LINE__, 0x00, 0x00, Local0, 0xFEDCBA987654321F) } ElseIf ((0x0123 != LENS)) { Local0 = (LENS + 0x00) - ERR (Arg0, Z141, 0x03F0, 0x00, 0x00, Local0, 0x0123) + ERR (Arg0, Z141, __LINE__, 0x00, 0x00, Local0, 0x0123) } ElseIf ((FU03 != I000)) { - ERR (Arg0, Z141, 0x03F2, 0x00, 0x00, FU00, I000) + ERR (Arg0, Z141, __LINE__, 0x00, 0x00, FU00, I000) } M000 (Arg0, OFF0, LEN0, 0x2B) @@ -1361,7 +1361,7 @@ Package (NRSK) } If ((Local0 != Local1)) { - ERR (Arg0, Z141, 0x0442, 0x00, 0x00, Local0, Local1) + ERR (Arg0, Z141, __LINE__, 0x00, 0x00, Local0, Local1) } } diff --git a/tests/aslts/src/runtime/collections/functional/region/regionfield.asl b/tests/aslts/src/runtime/collections/functional/region/regionfield.asl index 34d7ed26f..507042d78 100644 --- a/tests/aslts/src/runtime/collections/functional/region/regionfield.asl +++ b/tests/aslts/src/runtime/collections/functional/region/regionfield.asl @@ -615,32 +615,32 @@ BUFR = FLD0 = BUFF /* \M751.BUFF */ /* Invoke Write Quick transaction */ If ((OB10 != 0x00)) { - ERR (Arg0, Z143, 0x01AC, 0x00, 0x00, OB10, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB10, 0x00) } If ((LEN0 != 0x00)) { - ERR (Arg0, Z143, 0x01AF, 0x00, 0x00, LEN0, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN0, 0x00) } If ((DAT0 != 0x00)) { - ERR (Arg0, Z143, 0x01B2, 0x00, 0x00, DAT0, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT0, 0x00) } If ((OB11 != 0x7A)) { - ERR (Arg0, Z143, 0x01B6, 0x00, 0x00, OB11, 0x7A) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB11, 0x7A) } If ((LEN1 != 0x00)) { - ERR (Arg0, Z143, 0x01B9, 0x00, 0x00, LEN1, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN1, 0x00) } If ((DAT1 != 0x00)) { - ERR (Arg0, Z143, 0x01BC, 0x00, 0x00, DAT1, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT1, 0x00) } OB10 = 0x00 @@ -651,14 +651,14 @@ BUFF = FLD0 /* Invoke Read Quick transaction */ /* \M751.FLD0 */ If ((OB10 != 0x7A)) { - ERR (Arg0, Z143, 0x01C7, 0x00, 0x00, OB10, 0x7A) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB10, 0x7A) } If ((LEN0 != 0x00)) { /* Length is zero for Quick operations */ - ERR (Arg0, Z143, 0x01CA, 0x00, 0x00, LEN0, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN0, 0x00) } /* Note: Since LEN0 should be zero there's no need to check DAT0 */ } @@ -694,32 +694,32 @@ BUFR = FLD0 = BUFF /* \M752.BUFF */ /* Invoke a Send Byte transaction */ If ((OB10 != 0x00)) { - ERR (Arg0, Z143, 0x01ED, 0x00, 0x00, OB10, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB10, 0x00) } If ((LEN0 != 0x00)) { - ERR (Arg0, Z143, 0x01F0, 0x00, 0x00, LEN0, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN0, 0x00) } If ((DAT0 != 0x16)) { - ERR (Arg0, Z143, 0x01F3, 0x00, 0x00, DAT0, 0x16) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT0, 0x16) } If ((OB11 != 0x7A)) { - ERR (Arg0, Z143, 0x01F7, 0x00, 0x00, OB11, 0x7A) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB11, 0x7A) } If ((LEN1 != 0x00)) { - ERR (Arg0, Z143, 0x01FA, 0x00, 0x00, LEN1, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN1, 0x00) } If ((DAT1 != 0x16)) { - ERR (Arg0, Z143, 0x01FD, 0x00, 0x00, DAT1, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT1, 0x00) } /* Receive a byte of data from the device */ @@ -727,17 +727,17 @@ BUFF = FLD0 /* Invoke a Receive Byte transaction */ /* \M752.FLD0 */ If ((OB10 != 0x7A)) { - ERR (Arg0, Z143, 0x0204, 0x00, 0x00, OB10, 0x7A) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB10, 0x7A) } If ((LEN0 != 0x01)) { - ERR (Arg0, Z143, 0x0207, 0x00, 0x00, LEN0, 0x01) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN0, 0x01) } If ((DAT0 != 0xA0)) { - ERR (Arg0, Z143, 0x020A, 0x00, 0x00, DAT0, 0xA0) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT0, 0xA0) } } @@ -774,32 +774,32 @@ BUFR = FLD2 = BUFF /* \M753.BUFF */ /* Invoke a Write Byte transaction */ If ((OB10 != 0x00)) { - ERR (Arg0, Z143, 0x022E, 0x00, 0x00, OB10, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB10, 0x00) } If ((LEN0 != 0x00)) { - ERR (Arg0, Z143, 0x0231, 0x00, 0x00, LEN0, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN0, 0x00) } If ((DAT0 != 0x16)) { - ERR (Arg0, Z143, 0x0234, 0x00, 0x00, DAT0, 0x16) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT0, 0x16) } If ((OB11 != 0x7A)) { - ERR (Arg0, Z143, 0x0238, 0x00, 0x00, OB11, 0x7A) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB11, 0x7A) } If ((LEN1 != 0x00)) { - ERR (Arg0, Z143, 0x023B, 0x00, 0x00, LEN1, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN1, 0x00) } If ((DAT1 != 0x16)) { - ERR (Arg0, Z143, 0x023E, 0x00, 0x00, DAT1, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT1, 0x00) } /* Read a byte of data from the device using command value 1 */ @@ -807,17 +807,17 @@ BUFF = FLD1 /* Invoke a Read Byte transaction */ /* \M753.FLD1 */ If ((OB10 != 0x7A)) { - ERR (Arg0, Z143, 0x0245, 0x00, 0x00, OB10, 0x7A) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB10, 0x7A) } If ((LEN0 != 0x01)) { - ERR (Arg0, Z143, 0x0248, 0x00, 0x00, LEN0, 0x01) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN0, 0x01) } If ((DAT0 != 0xA0)) { - ERR (Arg0, Z143, 0x024B, 0x00, 0x00, DAT0, 0xA0) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT0, 0xA0) } } @@ -854,32 +854,32 @@ BUFR = FLD2 = BUFF /* \M754.BUFF */ /* Invoke a Write Word transaction */ If ((OB10 != 0x00)) { - ERR (Arg0, Z143, 0x026F, 0x00, 0x00, OB10, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB10, 0x00) } If ((LEN0 != 0x00)) { - ERR (Arg0, Z143, 0x0272, 0x00, 0x00, LEN0, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN0, 0x00) } If ((DAT0 != 0x5416)) { - ERR (Arg0, Z143, 0x0275, 0x00, 0x00, DAT0, 0x16) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT0, 0x16) } If ((OB11 != 0x7A)) { - ERR (Arg0, Z143, 0x0279, 0x00, 0x00, OB11, 0x7A) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB11, 0x7A) } If ((LEN1 != 0x00)) { - ERR (Arg0, Z143, 0x027C, 0x00, 0x00, LEN1, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN1, 0x00) } If ((DAT1 != 0x5416)) { - ERR (Arg0, Z143, 0x027F, 0x00, 0x00, DAT1, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT1, 0x00) } /* Read two bytes of data from the device using command value 1 */ @@ -887,17 +887,17 @@ BUFF = FLD1 /* Invoke a Read Word transaction */ /* \M754.FLD1 */ If ((OB10 != 0x7A)) { - ERR (Arg0, Z143, 0x0286, 0x00, 0x00, OB10, 0x7A) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB10, 0x7A) } If ((LEN0 != 0x02)) { - ERR (Arg0, Z143, 0x0289, 0x00, 0x00, LEN0, 0x02) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN0, 0x02) } If ((DAT0 != 0xA1A0)) { - ERR (Arg0, Z143, 0x028C, 0x00, 0x00, DAT0, 0xA1A0) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT0, 0xA1A0) } } @@ -934,12 +934,12 @@ BUFR = FLD2 = BUFF /* \M755.BUFF */ /* Invoke a Write Block transaction */ If ((OB10 != 0x00)) { - ERR (Arg0, Z143, 0x02B0, 0x00, 0x00, OB10, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB10, 0x00) } If ((LEN0 != 0x04)) { - ERR (Arg0, Z143, 0x02B3, 0x00, 0x00, LEN0, 0x04) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN0, 0x04) } Local0 = Buffer (0x20) @@ -948,22 +948,22 @@ } If ((DAT0 != Local0)) { - ERR (Arg0, Z143, 0x02B7, 0x00, 0x00, DAT0, Local0) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT0, Local0) } If ((OB11 != 0x7A)) { - ERR (Arg0, Z143, 0x02BB, 0x00, 0x00, OB11, 0x7A) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB11, 0x7A) } If ((LEN1 != 0x00)) { - ERR (Arg0, Z143, 0x02BE, 0x00, 0x00, LEN1, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN1, 0x00) } If ((DAT1 != Local0)) { - ERR (Arg0, Z143, 0x02C1, 0x00, 0x00, DAT1, Local0) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT1, Local0) } /* Read block of data from the device using command value 1 */ @@ -971,12 +971,12 @@ BUFF = FLD1 /* Invoke a Read Block transaction */ /* \M755.FLD1 */ If ((OB10 != 0x7A)) { - ERR (Arg0, Z143, 0x02C8, 0x00, 0x00, OB10, 0x7A) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB10, 0x7A) } If ((LEN0 != 0x20)) { - ERR (Arg0, Z143, 0x02CB, 0x00, 0x00, LEN0, 0x20) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN0, 0x20) } Local1 = Buffer (0x20) @@ -988,7 +988,7 @@ } If ((DAT0 != Local1)) { - ERR (Arg0, Z143, 0x02D4, 0x00, 0x00, DAT0, Local1) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT0, Local1) } } @@ -1025,32 +1025,32 @@ BUFR = FLD1 = BUFF /* \M756.BUFF */ /* Invoke a Process Call transaction */ If ((OB10 != 0x00)) { - ERR (Arg0, Z143, 0x02F8, 0x00, 0x00, OB10, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB10, 0x00) } If ((LEN0 != 0x00)) { - ERR (Arg0, Z143, 0x02FB, 0x00, 0x00, LEN0, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN0, 0x00) } If ((DAT0 != 0x5416)) { - ERR (Arg0, Z143, 0x02FE, 0x00, 0x00, DAT0, 0x16) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT0, 0x16) } If ((OB11 != 0x7A)) { - ERR (Arg0, Z143, 0x0302, 0x00, 0x00, OB11, 0x7A) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB11, 0x7A) } If ((LEN1 != 0x02)) { - ERR (Arg0, Z143, 0x0305, 0x00, 0x00, LEN1, 0x02) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN1, 0x02) } If ((DAT1 != 0xA1A0)) { - ERR (Arg0, Z143, 0x0308, 0x00, 0x00, DAT1, 0xA1A0) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT1, 0xA1A0) } } @@ -1086,12 +1086,12 @@ BUFR = FLD1 = BUFF /* \M757.BUFF */ /* Invoke a Write Block transaction */ If ((OB10 != 0x00)) { - ERR (Arg0, Z143, 0x032B, 0x00, 0x00, OB10, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB10, 0x00) } If ((LEN0 != 0x04)) { - ERR (Arg0, Z143, 0x032E, 0x00, 0x00, LEN0, 0x04) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN0, 0x04) } Local0 = Buffer (0x20) @@ -1100,17 +1100,17 @@ } If ((DAT0 != Local0)) { - ERR (Arg0, Z143, 0x0332, 0x00, 0x00, DAT0, Local0) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT0, Local0) } If ((OB11 != 0x7A)) { - ERR (Arg0, Z143, 0x0336, 0x00, 0x00, OB11, 0x7A) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB11, 0x7A) } If ((LEN1 != 0x20)) { - ERR (Arg0, Z143, 0x0339, 0x00, 0x00, LEN1, 0x20) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN1, 0x20) } Local1 = Buffer (0x20) @@ -1122,7 +1122,7 @@ } If ((DAT1 != Local1)) { - ERR (Arg0, Z143, 0x0342, 0x00, 0x00, DAT1, Local1) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT1, Local1) } } @@ -1209,32 +1209,32 @@ BUFR = FLD0 = BUFF /* \M758.BUFF */ /* Invoke Write Quick transaction */ If ((OB10 != 0x00)) { - ERR (Arg0, Z143, 0x039A, 0x00, 0x00, OB10, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB10, 0x00) } If ((LEN0 != 0x00)) { - ERR (Arg0, Z143, 0x039D, 0x00, 0x00, LEN0, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN0, 0x00) } If ((DAT0 != 0x00)) { - ERR (Arg0, Z143, 0x03A0, 0x00, 0x00, DAT0, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT0, 0x00) } If ((OB11 != 0x7A)) { - ERR (Arg0, Z143, 0x03A4, 0x00, 0x00, OB11, 0x7A) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB11, 0x7A) } If ((LEN1 != 0x00)) { - ERR (Arg0, Z143, 0x03A7, 0x00, 0x00, LEN1, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN1, 0x00) } If ((DAT1 != 0x00)) { - ERR (Arg0, Z143, 0x03AA, 0x00, 0x00, DAT1, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT1, 0x00) } OB10 = 0x00 @@ -1245,14 +1245,14 @@ BUFF = FLD0 /* Invoke Read Quick transaction */ /* \M758.FLD0 */ If ((OB10 != 0x7A)) { - ERR (Arg0, Z143, 0x03B5, 0x00, 0x00, OB10, 0x7A) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB10, 0x7A) } If ((LEN0 != 0x00)) { /* Length is zero for Quick operations */ - ERR (Arg0, Z143, 0x03B8, 0x00, 0x00, LEN0, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN0, 0x00) } /* Note: Since LEN0 should be zero there's no need to check DAT0 */ } @@ -1296,32 +1296,32 @@ BUFR = FLD0 = BUFF /* \M759.BUFF */ /* Invoke a Send Byte transaction */ If ((OB10 != 0x00)) { - ERR (Arg0, Z143, 0x03E2, 0x00, 0x00, OB10, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB10, 0x00) } If ((LEN0 != 0x00)) { - ERR (Arg0, Z143, 0x03E5, 0x00, 0x00, LEN0, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN0, 0x00) } If ((DAT0 != 0x16)) { - ERR (Arg0, Z143, 0x03E8, 0x00, 0x00, DAT0, 0x16) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT0, 0x16) } If ((OB11 != 0x7A)) { - ERR (Arg0, Z143, 0x03EC, 0x00, 0x00, OB11, 0x7A) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB11, 0x7A) } If ((LEN1 != 0x00)) { - ERR (Arg0, Z143, 0x03EF, 0x00, 0x00, LEN1, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN1, 0x00) } If ((DAT1 != 0x16)) { - ERR (Arg0, Z143, 0x03F2, 0x00, 0x00, DAT1, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT1, 0x00) } /* Receive a byte of data from the device */ @@ -1329,17 +1329,17 @@ BUFF = FLD0 /* Invoke a Receive Byte transaction */ /* \M759.FLD0 */ If ((OB10 != 0x7A)) { - ERR (Arg0, Z143, 0x03F9, 0x00, 0x00, OB10, 0x7A) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB10, 0x7A) } If ((LEN0 != 0x01)) { - ERR (Arg0, Z143, 0x03FC, 0x00, 0x00, LEN0, 0x01) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN0, 0x01) } If ((DAT0 != 0xA0)) { - ERR (Arg0, Z143, 0x03FF, 0x00, 0x00, DAT0, 0xA0) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT0, 0xA0) } } @@ -1384,32 +1384,32 @@ BUFR = FLD2 = BUFF /* \M75A.BUFF */ /* Invoke a Write Byte transaction */ If ((OB10 != 0x00)) { - ERR (Arg0, Z143, 0x042A, 0x00, 0x00, OB10, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB10, 0x00) } If ((LEN0 != 0x00)) { - ERR (Arg0, Z143, 0x042D, 0x00, 0x00, LEN0, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN0, 0x00) } If ((DAT0 != 0x16)) { - ERR (Arg0, Z143, 0x0430, 0x00, 0x00, DAT0, 0x16) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT0, 0x16) } If ((OB11 != 0x7A)) { - ERR (Arg0, Z143, 0x0434, 0x00, 0x00, OB11, 0x7A) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB11, 0x7A) } If ((LEN1 != 0x00)) { - ERR (Arg0, Z143, 0x0437, 0x00, 0x00, LEN1, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN1, 0x00) } If ((DAT1 != 0x16)) { - ERR (Arg0, Z143, 0x043A, 0x00, 0x00, DAT1, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT1, 0x00) } /* Read a byte of data from the device using command value 1 */ @@ -1417,17 +1417,17 @@ BUFF = FLD1 /* Invoke a Read Byte transaction */ /* \M75A.FLD1 */ If ((OB10 != 0x7A)) { - ERR (Arg0, Z143, 0x0441, 0x00, 0x00, OB10, 0x7A) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB10, 0x7A) } If ((LEN0 != 0x01)) { - ERR (Arg0, Z143, 0x0444, 0x00, 0x00, LEN0, 0x01) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN0, 0x01) } If ((DAT0 != 0xA0)) { - ERR (Arg0, Z143, 0x0447, 0x00, 0x00, DAT0, 0xA0) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT0, 0xA0) } } @@ -1472,32 +1472,32 @@ BUFR = FLD2 = BUFF /* \M75B.BUFF */ /* Invoke a Write Word transaction */ If ((OB10 != 0x00)) { - ERR (Arg0, Z143, 0x0472, 0x00, 0x00, OB10, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB10, 0x00) } If ((LEN0 != 0x00)) { - ERR (Arg0, Z143, 0x0475, 0x00, 0x00, LEN0, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN0, 0x00) } If ((DAT0 != 0x5416)) { - ERR (Arg0, Z143, 0x0478, 0x00, 0x00, DAT0, 0x16) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT0, 0x16) } If ((OB11 != 0x7A)) { - ERR (Arg0, Z143, 0x047C, 0x00, 0x00, OB11, 0x7A) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB11, 0x7A) } If ((LEN1 != 0x00)) { - ERR (Arg0, Z143, 0x047F, 0x00, 0x00, LEN1, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN1, 0x00) } If ((DAT1 != 0x5416)) { - ERR (Arg0, Z143, 0x0482, 0x00, 0x00, DAT1, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT1, 0x00) } /* Read two bytes of data from the device using command value 1 */ @@ -1505,17 +1505,17 @@ BUFF = FLD1 /* Invoke a Read Word transaction */ /* \M75B.FLD1 */ If ((OB10 != 0x7A)) { - ERR (Arg0, Z143, 0x0489, 0x00, 0x00, OB10, 0x7A) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB10, 0x7A) } If ((LEN0 != 0x02)) { - ERR (Arg0, Z143, 0x048C, 0x00, 0x00, LEN0, 0x02) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN0, 0x02) } If ((DAT0 != 0xA1A0)) { - ERR (Arg0, Z143, 0x048F, 0x00, 0x00, DAT0, 0xA1A0) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT0, 0xA1A0) } } @@ -1560,12 +1560,12 @@ BUFR = FLD2 = BUFF /* \M75C.BUFF */ /* Invoke a Write Block transaction */ If ((OB10 != 0x00)) { - ERR (Arg0, Z143, 0x04BA, 0x00, 0x00, OB10, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB10, 0x00) } If ((LEN0 != 0x04)) { - ERR (Arg0, Z143, 0x04BD, 0x00, 0x00, LEN0, 0x04) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN0, 0x04) } Local0 = Buffer (0x20) @@ -1574,22 +1574,22 @@ } If ((DAT0 != Local0)) { - ERR (Arg0, Z143, 0x04C1, 0x00, 0x00, DAT0, Local0) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT0, Local0) } If ((OB11 != 0x7A)) { - ERR (Arg0, Z143, 0x04C5, 0x00, 0x00, OB11, 0x7A) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB11, 0x7A) } If ((LEN1 != 0x00)) { - ERR (Arg0, Z143, 0x04C8, 0x00, 0x00, LEN1, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN1, 0x00) } If ((DAT1 != Local0)) { - ERR (Arg0, Z143, 0x04CB, 0x00, 0x00, DAT1, Local0) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT1, Local0) } /* Read block of data from the device using command value 1 */ @@ -1597,12 +1597,12 @@ BUFF = FLD1 /* Invoke a Read Block transaction */ /* \M75C.FLD1 */ If ((OB10 != 0x7A)) { - ERR (Arg0, Z143, 0x04D2, 0x00, 0x00, OB10, 0x7A) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB10, 0x7A) } If ((LEN0 != 0x20)) { - ERR (Arg0, Z143, 0x04D5, 0x00, 0x00, LEN0, 0x20) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN0, 0x20) } Local1 = Buffer (0x20) @@ -1614,7 +1614,7 @@ } If ((DAT0 != Local1)) { - ERR (Arg0, Z143, 0x04DE, 0x00, 0x00, DAT0, Local1) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT0, Local1) } } @@ -1659,32 +1659,32 @@ BUFR = FLD1 = BUFF /* \M75D.BUFF */ /* Invoke a Process Call transaction */ If ((OB10 != 0x00)) { - ERR (Arg0, Z143, 0x0509, 0x00, 0x00, OB10, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB10, 0x00) } If ((LEN0 != 0x00)) { - ERR (Arg0, Z143, 0x050C, 0x00, 0x00, LEN0, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN0, 0x00) } If ((DAT0 != 0x5416)) { - ERR (Arg0, Z143, 0x050F, 0x00, 0x00, DAT0, 0x16) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT0, 0x16) } If ((OB11 != 0x7A)) { - ERR (Arg0, Z143, 0x0513, 0x00, 0x00, OB11, 0x7A) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB11, 0x7A) } If ((LEN1 != 0x02)) { - ERR (Arg0, Z143, 0x0516, 0x00, 0x00, LEN1, 0x02) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN1, 0x02) } If ((DAT1 != 0xA1A0)) { - ERR (Arg0, Z143, 0x0519, 0x00, 0x00, DAT1, 0xA1A0) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT1, 0xA1A0) } } @@ -1728,12 +1728,12 @@ BUFR = FLD1 = BUFF /* \M75E.BUFF */ /* Invoke a Write Block transaction */ If ((OB10 != 0x00)) { - ERR (Arg0, Z143, 0x0543, 0x00, 0x00, OB10, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB10, 0x00) } If ((LEN0 != 0x04)) { - ERR (Arg0, Z143, 0x0546, 0x00, 0x00, LEN0, 0x04) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN0, 0x04) } Local0 = Buffer (0x20) @@ -1742,17 +1742,17 @@ } If ((DAT0 != Local0)) { - ERR (Arg0, Z143, 0x054A, 0x00, 0x00, DAT0, Local0) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT0, Local0) } If ((OB11 != 0x7A)) { - ERR (Arg0, Z143, 0x054E, 0x00, 0x00, OB11, 0x7A) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB11, 0x7A) } If ((LEN1 != 0x20)) { - ERR (Arg0, Z143, 0x0551, 0x00, 0x00, LEN1, 0x20) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN1, 0x20) } Local1 = Buffer (0x20) @@ -1764,7 +1764,7 @@ } If ((DAT1 != Local1)) { - ERR (Arg0, Z143, 0x055A, 0x00, 0x00, DAT1, Local1) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT1, Local1) } } @@ -1812,12 +1812,12 @@ BUFR = FLD1 = BUFF /* \M75F.BUFF */ /* Invoke a Write Block transaction */ If ((OB10 != 0x00)) { - ERR (Arg0, Z143, 0x058A, 0x00, 0x00, OB10, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB10, 0x00) } If ((LEN0 != 0x04)) { - ERR (Arg0, Z143, 0x058D, 0x00, 0x00, LEN0, 0x04) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN0, 0x04) } Local0 = Buffer (0x20) @@ -1826,17 +1826,17 @@ } If ((DAT0 != Local0)) { - ERR (Arg0, Z143, 0x0591, 0x00, 0x00, DAT0, Local0) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT0, Local0) } If ((OB11 != 0x7A)) { - ERR (Arg0, Z143, 0x0595, 0x00, 0x00, OB11, 0x7A) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB11, 0x7A) } If ((LEN1 != 0x20)) { - ERR (Arg0, Z143, 0x0598, 0x00, 0x00, LEN1, 0x20) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN1, 0x20) } Local1 = Buffer (0x20) @@ -1848,7 +1848,7 @@ } If ((DAT1 != Local1)) { - ERR (Arg0, Z143, 0x05A1, 0x00, 0x00, DAT1, Local1) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT1, Local1) } } @@ -1896,12 +1896,12 @@ BUFR = FLD1 = BUFF /* \M760.BUFF */ /* Invoke a Write Block transaction */ If ((OB10 != 0x00)) { - ERR (Arg0, Z143, 0x05D1, 0x00, 0x00, OB10, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB10, 0x00) } If ((LEN0 != 0x04)) { - ERR (Arg0, Z143, 0x05D4, 0x00, 0x00, LEN0, 0x04) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN0, 0x04) } Local0 = Buffer (0x20) @@ -1910,17 +1910,17 @@ } If ((DAT0 != Local0)) { - ERR (Arg0, Z143, 0x05D8, 0x00, 0x00, DAT0, Local0) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT0, Local0) } If ((OB11 != 0x7A)) { - ERR (Arg0, Z143, 0x05DC, 0x00, 0x00, OB11, 0x7A) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB11, 0x7A) } If ((LEN1 != 0x20)) { - ERR (Arg0, Z143, 0x05DF, 0x00, 0x00, LEN1, 0x20) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN1, 0x20) } Local1 = Buffer (0x20) @@ -1932,7 +1932,7 @@ } If ((DAT1 != Local1)) { - ERR (Arg0, Z143, 0x05E8, 0x00, 0x00, DAT1, Local1) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT1, Local1) } } @@ -1980,12 +1980,12 @@ BUFR = FLD1 = BUFF /* \M761.BUFF */ /* Invoke a Write Block transaction */ If ((OB10 != 0x00)) { - ERR (Arg0, Z143, 0x0618, 0x00, 0x00, OB10, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB10, 0x00) } If ((LEN0 != 0x04)) { - ERR (Arg0, Z143, 0x061B, 0x00, 0x00, LEN0, 0x04) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN0, 0x04) } Local0 = Buffer (0x20) @@ -1994,17 +1994,17 @@ } If ((DAT0 != Local0)) { - ERR (Arg0, Z143, 0x061F, 0x00, 0x00, DAT0, Local0) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT0, Local0) } If ((OB11 != 0x7A)) { - ERR (Arg0, Z143, 0x0623, 0x00, 0x00, OB11, 0x7A) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, OB11, 0x7A) } If ((LEN1 != 0x20)) { - ERR (Arg0, Z143, 0x0626, 0x00, 0x00, LEN1, 0x20) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, LEN1, 0x20) } Local1 = Buffer (0x20) @@ -2016,7 +2016,7 @@ } If ((DAT1 != Local1)) { - ERR (Arg0, Z143, 0x062F, 0x00, 0x00, DAT1, Local1) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, DAT1, Local1) } } @@ -2083,21 +2083,21 @@ Local0 = MODE /* \M764.MODE */ If ((Local0 != 0x03)) { - ERR (Arg0, Z143, 0x0660, 0x00, 0x00, Local0, 0x03) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Local0, 0x03) } MODE = 0x01 Local0 = MODE /* \M764.MODE */ If ((Local0 != 0x01)) { - ERR (Arg0, Z143, 0x0666, 0x00, 0x00, Local0, 0x01) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Local0, 0x01) } STAT = 0x01 Local0 = STAT /* \M764.STAT */ If ((Local0 != 0x01)) { - ERR (Arg0, Z143, 0x066C, 0x00, 0x00, Local0, 0x01) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Local0, 0x01) } Name (TBUF, Buffer (0x10) @@ -2109,7 +2109,7 @@ Local0 = BUFF /* \M764.BUFF */ If ((Local0 != TBUF)) { - ERR (Arg0, Z143, 0x0676, 0x00, 0x00, Local0, TBUF) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Local0, TBUF) } } @@ -2159,17 +2159,17 @@ } If ((STAT != 0x00)) { - ERR (Arg0, Z143, 0x06AC, 0x00, 0x00, STAT, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, STAT, 0x00) } If ((CMPC != 0x00)) { - ERR (Arg0, Z143, 0x06B0, 0x00, 0x00, CMPC, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, CMPC, 0x00) } If ((BUFF != Local1)) { - ERR (Arg0, Z143, 0x06B4, 0x00, 0x00, Local1, BUFF) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Local1, BUFF) } } @@ -2877,19 +2877,19 @@ Local4 = DerefOf (Arg2 [0x00]) If ((Local4 != Local0)) { - ERR (Arg0, Z143, 0x0905, Z143, Local3, Local4, Local0) + ERR (Arg0, Z143, __LINE__, Z143, Local3, Local4, Local0) } Local4 = DerefOf (Arg2 [0x01]) If ((Local4 != Local1)) { - ERR (Arg0, Z143, 0x0909, Z143, Local3, Local4, Local1) + ERR (Arg0, Z143, __LINE__, Z143, Local3, Local4, Local1) } Local4 = DerefOf (Arg2 [0x02]) If ((Local4 != Local2)) { - ERR (Arg0, Z143, 0x090D, Z143, Local3, Local4, Local2) + ERR (Arg0, Z143, __LINE__, Z143, Local3, Local4, Local2) } /* 1-2 */ @@ -2897,14 +2897,14 @@ Local4 = DerefOf (Arg2 [0x03]) If ((Local4 != Local0)) { - ERR (Arg0, Z143, 0x0913, Z143, Local3, Local4, Local0) + ERR (Arg0, Z143, __LINE__, Z143, Local3, Local4, Local0) } Local4 = DerefOf (Arg2 [0x04]) Local5 = (Local1 | (Local2 << 0x01)) If ((Local4 != Local5)) { - ERR (Arg0, Z143, 0x0918, Z143, Local3, Local4, Local5) + ERR (Arg0, Z143, __LINE__, Z143, Local3, Local4, Local5) } /* 2-1 */ @@ -2913,13 +2913,13 @@ Local5 = (Local0 | (Local1 << 0x01)) If ((Local4 != Local5)) { - ERR (Arg0, Z143, 0x091F, Z143, Local3, Local4, Local5) + ERR (Arg0, Z143, __LINE__, Z143, Local3, Local4, Local5) } Local4 = DerefOf (Arg2 [0x06]) If ((Local4 != Local2)) { - ERR (Arg0, Z143, 0x0923, Z143, Local3, Local4, Local2) + ERR (Arg0, Z143, __LINE__, Z143, Local3, Local4, Local2) } } @@ -3071,7 +3071,7 @@ If ((Arg3 == 0x00)) { - ERR (Arg0, Z143, 0x09BB, 0x00, 0x00, 0x00, 0x00) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, 0x00, 0x00) Return (Ones) } @@ -3375,7 +3375,7 @@ } Default { - ERR (Arg0, Z143, 0x0AB2, 0x00, 0x00, Local4, Local5) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Local4, Local5) Return (Ones) } @@ -3574,7 +3574,7 @@ } Default { - ERR (Arg0, Z143, 0x0B25, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -3746,7 +3746,7 @@ } Default { - ERR (Arg0, Z143, 0x0B7D, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -3934,7 +3934,7 @@ } Default { - ERR (Arg0, Z143, 0x0BD5, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -4106,7 +4106,7 @@ } Default { - ERR (Arg0, Z143, 0x0C2D, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -4278,7 +4278,7 @@ } Default { - ERR (Arg0, Z143, 0x0C85, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -4450,7 +4450,7 @@ } Default { - ERR (Arg0, Z143, 0x0CDD, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -4622,7 +4622,7 @@ } Default { - ERR (Arg0, Z143, 0x0D35, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -4794,7 +4794,7 @@ } Default { - ERR (Arg0, Z143, 0x0D8D, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -4966,7 +4966,7 @@ } Default { - ERR (Arg0, Z143, 0x0DE5, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -5138,7 +5138,7 @@ } Default { - ERR (Arg0, Z143, 0x0E3D, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -5326,7 +5326,7 @@ } Default { - ERR (Arg0, Z143, 0x0E95, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -5498,7 +5498,7 @@ } Default { - ERR (Arg0, Z143, 0x0EED, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -5670,7 +5670,7 @@ } Default { - ERR (Arg0, Z143, 0x0F45, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -5842,7 +5842,7 @@ } Default { - ERR (Arg0, Z143, 0x0F9D, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -6014,7 +6014,7 @@ } Default { - ERR (Arg0, Z143, 0x0FF5, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -6202,7 +6202,7 @@ } Default { - ERR (Arg0, Z143, 0x104D, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -6210,7 +6210,7 @@ } Default { - ERR (Arg0, Z143, 0x1053, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -6398,7 +6398,7 @@ } Default { - ERR (Arg0, Z143, 0x10BA, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -6570,7 +6570,7 @@ } Default { - ERR (Arg0, Z143, 0x1112, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -6758,7 +6758,7 @@ } Default { - ERR (Arg0, Z143, 0x116A, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -6930,7 +6930,7 @@ } Default { - ERR (Arg0, Z143, 0x11C2, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -7102,7 +7102,7 @@ } Default { - ERR (Arg0, Z143, 0x121A, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -7274,7 +7274,7 @@ } Default { - ERR (Arg0, Z143, 0x1272, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -7446,7 +7446,7 @@ } Default { - ERR (Arg0, Z143, 0x12CA, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -7618,7 +7618,7 @@ } Default { - ERR (Arg0, Z143, 0x1322, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -7790,7 +7790,7 @@ } Default { - ERR (Arg0, Z143, 0x137A, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -7962,7 +7962,7 @@ } Default { - ERR (Arg0, Z143, 0x13D2, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -8150,7 +8150,7 @@ } Default { - ERR (Arg0, Z143, 0x142A, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -8322,7 +8322,7 @@ } Default { - ERR (Arg0, Z143, 0x1482, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -8494,7 +8494,7 @@ } Default { - ERR (Arg0, Z143, 0x14DA, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -8666,7 +8666,7 @@ } Default { - ERR (Arg0, Z143, 0x1532, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -8838,7 +8838,7 @@ } Default { - ERR (Arg0, Z143, 0x158A, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -9026,7 +9026,7 @@ } Default { - ERR (Arg0, Z143, 0x15E2, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -9034,7 +9034,7 @@ } Default { - ERR (Arg0, Z143, 0x15E8, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -9222,7 +9222,7 @@ } Default { - ERR (Arg0, Z143, 0x164F, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -9394,7 +9394,7 @@ } Default { - ERR (Arg0, Z143, 0x16A7, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -9582,7 +9582,7 @@ } Default { - ERR (Arg0, Z143, 0x16FF, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -9754,7 +9754,7 @@ } Default { - ERR (Arg0, Z143, 0x1757, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -9926,7 +9926,7 @@ } Default { - ERR (Arg0, Z143, 0x17AF, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -10098,7 +10098,7 @@ } Default { - ERR (Arg0, Z143, 0x1807, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -10270,7 +10270,7 @@ } Default { - ERR (Arg0, Z143, 0x185F, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -10442,7 +10442,7 @@ } Default { - ERR (Arg0, Z143, 0x18B7, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -10614,7 +10614,7 @@ } Default { - ERR (Arg0, Z143, 0x190F, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -10786,7 +10786,7 @@ } Default { - ERR (Arg0, Z143, 0x1967, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -10974,7 +10974,7 @@ } Default { - ERR (Arg0, Z143, 0x19BF, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -11146,7 +11146,7 @@ } Default { - ERR (Arg0, Z143, 0x1A17, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -11318,7 +11318,7 @@ } Default { - ERR (Arg0, Z143, 0x1A6F, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -11490,7 +11490,7 @@ } Default { - ERR (Arg0, Z143, 0x1AC7, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -11662,7 +11662,7 @@ } Default { - ERR (Arg0, Z143, 0x1B1F, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -11850,7 +11850,7 @@ } Default { - ERR (Arg0, Z143, 0x1B77, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -11858,7 +11858,7 @@ } Default { - ERR (Arg0, Z143, 0x1B7D, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -12046,7 +12046,7 @@ } Default { - ERR (Arg0, Z143, 0x1BE4, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -12218,7 +12218,7 @@ } Default { - ERR (Arg0, Z143, 0x1C3C, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -12406,7 +12406,7 @@ } Default { - ERR (Arg0, Z143, 0x1C94, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -12578,7 +12578,7 @@ } Default { - ERR (Arg0, Z143, 0x1CEC, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -12750,7 +12750,7 @@ } Default { - ERR (Arg0, Z143, 0x1D44, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -12922,7 +12922,7 @@ } Default { - ERR (Arg0, Z143, 0x1D9C, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -13094,7 +13094,7 @@ } Default { - ERR (Arg0, Z143, 0x1DF4, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -13266,7 +13266,7 @@ } Default { - ERR (Arg0, Z143, 0x1E4C, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -13438,7 +13438,7 @@ } Default { - ERR (Arg0, Z143, 0x1EA4, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -13610,7 +13610,7 @@ } Default { - ERR (Arg0, Z143, 0x1EFC, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -13798,7 +13798,7 @@ } Default { - ERR (Arg0, Z143, 0x1F54, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -13970,7 +13970,7 @@ } Default { - ERR (Arg0, Z143, 0x1FAC, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -14142,7 +14142,7 @@ } Default { - ERR (Arg0, Z143, 0x2004, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -14314,7 +14314,7 @@ } Default { - ERR (Arg0, Z143, 0x205C, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -14486,7 +14486,7 @@ } Default { - ERR (Arg0, Z143, 0x20B4, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -14674,7 +14674,7 @@ } Default { - ERR (Arg0, Z143, 0x210C, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -14682,7 +14682,7 @@ } Default { - ERR (Arg0, Z143, 0x2112, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -14870,7 +14870,7 @@ } Default { - ERR (Arg0, Z143, 0x2179, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -15042,7 +15042,7 @@ } Default { - ERR (Arg0, Z143, 0x21D1, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -15230,7 +15230,7 @@ } Default { - ERR (Arg0, Z143, 0x2229, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -15402,7 +15402,7 @@ } Default { - ERR (Arg0, Z143, 0x2281, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -15574,7 +15574,7 @@ } Default { - ERR (Arg0, Z143, 0x22D9, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -15746,7 +15746,7 @@ } Default { - ERR (Arg0, Z143, 0x2331, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -15918,7 +15918,7 @@ } Default { - ERR (Arg0, Z143, 0x2389, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -16090,7 +16090,7 @@ } Default { - ERR (Arg0, Z143, 0x23E1, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -16262,7 +16262,7 @@ } Default { - ERR (Arg0, Z143, 0x2439, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -16434,7 +16434,7 @@ } Default { - ERR (Arg0, Z143, 0x2491, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -16622,7 +16622,7 @@ } Default { - ERR (Arg0, Z143, 0x24E9, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -16794,7 +16794,7 @@ } Default { - ERR (Arg0, Z143, 0x2541, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -16966,7 +16966,7 @@ } Default { - ERR (Arg0, Z143, 0x2599, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -17138,7 +17138,7 @@ } Default { - ERR (Arg0, Z143, 0x25F1, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -17310,7 +17310,7 @@ } Default { - ERR (Arg0, Z143, 0x2649, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -17498,7 +17498,7 @@ } Default { - ERR (Arg0, Z143, 0x26A1, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -17506,7 +17506,7 @@ } Default { - ERR (Arg0, Z143, 0x26A7, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -17694,7 +17694,7 @@ } Default { - ERR (Arg0, Z143, 0x270E, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -17866,7 +17866,7 @@ } Default { - ERR (Arg0, Z143, 0x2766, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -18054,7 +18054,7 @@ } Default { - ERR (Arg0, Z143, 0x27BE, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -18226,7 +18226,7 @@ } Default { - ERR (Arg0, Z143, 0x2816, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -18398,7 +18398,7 @@ } Default { - ERR (Arg0, Z143, 0x286E, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -18570,7 +18570,7 @@ } Default { - ERR (Arg0, Z143, 0x28C6, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -18742,7 +18742,7 @@ } Default { - ERR (Arg0, Z143, 0x291E, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -18914,7 +18914,7 @@ } Default { - ERR (Arg0, Z143, 0x2976, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -19086,7 +19086,7 @@ } Default { - ERR (Arg0, Z143, 0x29CE, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -19258,7 +19258,7 @@ } Default { - ERR (Arg0, Z143, 0x2A26, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -19446,7 +19446,7 @@ } Default { - ERR (Arg0, Z143, 0x2A7E, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -19618,7 +19618,7 @@ } Default { - ERR (Arg0, Z143, 0x2AD6, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -19790,7 +19790,7 @@ } Default { - ERR (Arg0, Z143, 0x2B2E, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -19962,7 +19962,7 @@ } Default { - ERR (Arg0, Z143, 0x2B86, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -20134,7 +20134,7 @@ } Default { - ERR (Arg0, Z143, 0x2BDE, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -20322,7 +20322,7 @@ } Default { - ERR (Arg0, Z143, 0x2C36, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -20330,7 +20330,7 @@ } Default { - ERR (Arg0, Z143, 0x2C3C, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -20518,7 +20518,7 @@ } Default { - ERR (Arg0, Z143, 0x2CA3, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -20690,7 +20690,7 @@ } Default { - ERR (Arg0, Z143, 0x2CFB, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -20878,7 +20878,7 @@ } Default { - ERR (Arg0, Z143, 0x2D53, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -21050,7 +21050,7 @@ } Default { - ERR (Arg0, Z143, 0x2DAB, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -21222,7 +21222,7 @@ } Default { - ERR (Arg0, Z143, 0x2E03, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -21394,7 +21394,7 @@ } Default { - ERR (Arg0, Z143, 0x2E5B, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -21566,7 +21566,7 @@ } Default { - ERR (Arg0, Z143, 0x2EB3, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -21738,7 +21738,7 @@ } Default { - ERR (Arg0, Z143, 0x2F0B, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -21910,7 +21910,7 @@ } Default { - ERR (Arg0, Z143, 0x2F63, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -22082,7 +22082,7 @@ } Default { - ERR (Arg0, Z143, 0x2FBB, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -22270,7 +22270,7 @@ } Default { - ERR (Arg0, Z143, 0x3013, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -22442,7 +22442,7 @@ } Default { - ERR (Arg0, Z143, 0x306B, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -22614,7 +22614,7 @@ } Default { - ERR (Arg0, Z143, 0x30C3, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -22786,7 +22786,7 @@ } Default { - ERR (Arg0, Z143, 0x311B, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -22958,7 +22958,7 @@ } Default { - ERR (Arg0, Z143, 0x3173, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -23146,7 +23146,7 @@ } Default { - ERR (Arg0, Z143, 0x31CB, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -23154,7 +23154,7 @@ } Default { - ERR (Arg0, Z143, 0x31D1, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -23342,7 +23342,7 @@ } Default { - ERR (Arg0, Z143, 0x3238, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -23514,7 +23514,7 @@ } Default { - ERR (Arg0, Z143, 0x3290, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -23702,7 +23702,7 @@ } Default { - ERR (Arg0, Z143, 0x32E8, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -23874,7 +23874,7 @@ } Default { - ERR (Arg0, Z143, 0x3340, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -24046,7 +24046,7 @@ } Default { - ERR (Arg0, Z143, 0x3398, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -24218,7 +24218,7 @@ } Default { - ERR (Arg0, Z143, 0x33F0, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -24390,7 +24390,7 @@ } Default { - ERR (Arg0, Z143, 0x3448, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -24562,7 +24562,7 @@ } Default { - ERR (Arg0, Z143, 0x34A0, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -24734,7 +24734,7 @@ } Default { - ERR (Arg0, Z143, 0x34F8, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -24906,7 +24906,7 @@ } Default { - ERR (Arg0, Z143, 0x3550, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -25094,7 +25094,7 @@ } Default { - ERR (Arg0, Z143, 0x35A8, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -25266,7 +25266,7 @@ } Default { - ERR (Arg0, Z143, 0x3600, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -25438,7 +25438,7 @@ } Default { - ERR (Arg0, Z143, 0x3658, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -25610,7 +25610,7 @@ } Default { - ERR (Arg0, Z143, 0x36B0, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -25782,7 +25782,7 @@ } Default { - ERR (Arg0, Z143, 0x3708, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -25970,7 +25970,7 @@ } Default { - ERR (Arg0, Z143, 0x3760, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -25978,7 +25978,7 @@ } Default { - ERR (Arg0, Z143, 0x3766, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -26166,7 +26166,7 @@ } Default { - ERR (Arg0, Z143, 0x37CD, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -26338,7 +26338,7 @@ } Default { - ERR (Arg0, Z143, 0x3825, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -26526,7 +26526,7 @@ } Default { - ERR (Arg0, Z143, 0x387D, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -26698,7 +26698,7 @@ } Default { - ERR (Arg0, Z143, 0x38D5, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -26870,7 +26870,7 @@ } Default { - ERR (Arg0, Z143, 0x392D, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -27042,7 +27042,7 @@ } Default { - ERR (Arg0, Z143, 0x3985, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -27214,7 +27214,7 @@ } Default { - ERR (Arg0, Z143, 0x39DD, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -27386,7 +27386,7 @@ } Default { - ERR (Arg0, Z143, 0x3A35, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -27558,7 +27558,7 @@ } Default { - ERR (Arg0, Z143, 0x3A8D, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -27730,7 +27730,7 @@ } Default { - ERR (Arg0, Z143, 0x3AE5, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -27918,7 +27918,7 @@ } Default { - ERR (Arg0, Z143, 0x3B3D, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -28090,7 +28090,7 @@ } Default { - ERR (Arg0, Z143, 0x3B95, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -28262,7 +28262,7 @@ } Default { - ERR (Arg0, Z143, 0x3BED, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -28434,7 +28434,7 @@ } Default { - ERR (Arg0, Z143, 0x3C45, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -28606,7 +28606,7 @@ } Default { - ERR (Arg0, Z143, 0x3C9D, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -28794,7 +28794,7 @@ } Default { - ERR (Arg0, Z143, 0x3CF5, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -28802,7 +28802,7 @@ } Default { - ERR (Arg0, Z143, 0x3CFB, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -28990,7 +28990,7 @@ } Default { - ERR (Arg0, Z143, 0x3D62, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -29162,7 +29162,7 @@ } Default { - ERR (Arg0, Z143, 0x3DBA, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -29350,7 +29350,7 @@ } Default { - ERR (Arg0, Z143, 0x3E12, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -29522,7 +29522,7 @@ } Default { - ERR (Arg0, Z143, 0x3E6A, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -29694,7 +29694,7 @@ } Default { - ERR (Arg0, Z143, 0x3EC2, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -29866,7 +29866,7 @@ } Default { - ERR (Arg0, Z143, 0x3F1A, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -30038,7 +30038,7 @@ } Default { - ERR (Arg0, Z143, 0x3F72, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -30210,7 +30210,7 @@ } Default { - ERR (Arg0, Z143, 0x3FCA, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -30382,7 +30382,7 @@ } Default { - ERR (Arg0, Z143, 0x4022, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -30554,7 +30554,7 @@ } Default { - ERR (Arg0, Z143, 0x407A, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -30742,7 +30742,7 @@ } Default { - ERR (Arg0, Z143, 0x40D2, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -30914,7 +30914,7 @@ } Default { - ERR (Arg0, Z143, 0x412A, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -31086,7 +31086,7 @@ } Default { - ERR (Arg0, Z143, 0x4182, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -31258,7 +31258,7 @@ } Default { - ERR (Arg0, Z143, 0x41DA, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -31430,7 +31430,7 @@ } Default { - ERR (Arg0, Z143, 0x4232, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -31618,7 +31618,7 @@ } Default { - ERR (Arg0, Z143, 0x428A, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -31626,7 +31626,7 @@ } Default { - ERR (Arg0, Z143, 0x4290, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -31814,7 +31814,7 @@ } Default { - ERR (Arg0, Z143, 0x42F7, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -31986,7 +31986,7 @@ } Default { - ERR (Arg0, Z143, 0x434F, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -32174,7 +32174,7 @@ } Default { - ERR (Arg0, Z143, 0x43A7, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -32346,7 +32346,7 @@ } Default { - ERR (Arg0, Z143, 0x43FF, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -32518,7 +32518,7 @@ } Default { - ERR (Arg0, Z143, 0x4457, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -32690,7 +32690,7 @@ } Default { - ERR (Arg0, Z143, 0x44AF, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -32862,7 +32862,7 @@ } Default { - ERR (Arg0, Z143, 0x4507, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -33034,7 +33034,7 @@ } Default { - ERR (Arg0, Z143, 0x455F, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -33206,7 +33206,7 @@ } Default { - ERR (Arg0, Z143, 0x45B7, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -33378,7 +33378,7 @@ } Default { - ERR (Arg0, Z143, 0x460F, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -33566,7 +33566,7 @@ } Default { - ERR (Arg0, Z143, 0x4667, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -33738,7 +33738,7 @@ } Default { - ERR (Arg0, Z143, 0x46BF, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -33910,7 +33910,7 @@ } Default { - ERR (Arg0, Z143, 0x4717, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -34082,7 +34082,7 @@ } Default { - ERR (Arg0, Z143, 0x476F, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -34254,7 +34254,7 @@ } Default { - ERR (Arg0, Z143, 0x47C7, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -34442,7 +34442,7 @@ } Default { - ERR (Arg0, Z143, 0x481F, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -34450,7 +34450,7 @@ } Default { - ERR (Arg0, Z143, 0x4825, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -34638,7 +34638,7 @@ } Default { - ERR (Arg0, Z143, 0x488C, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -34810,7 +34810,7 @@ } Default { - ERR (Arg0, Z143, 0x48E4, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -34998,7 +34998,7 @@ } Default { - ERR (Arg0, Z143, 0x493C, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -35170,7 +35170,7 @@ } Default { - ERR (Arg0, Z143, 0x4994, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -35342,7 +35342,7 @@ } Default { - ERR (Arg0, Z143, 0x49EC, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -35514,7 +35514,7 @@ } Default { - ERR (Arg0, Z143, 0x4A44, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -35686,7 +35686,7 @@ } Default { - ERR (Arg0, Z143, 0x4A9C, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -35858,7 +35858,7 @@ } Default { - ERR (Arg0, Z143, 0x4AF4, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -36030,7 +36030,7 @@ } Default { - ERR (Arg0, Z143, 0x4B4C, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -36202,7 +36202,7 @@ } Default { - ERR (Arg0, Z143, 0x4BA4, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -36390,7 +36390,7 @@ } Default { - ERR (Arg0, Z143, 0x4BFC, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -36562,7 +36562,7 @@ } Default { - ERR (Arg0, Z143, 0x4C54, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -36734,7 +36734,7 @@ } Default { - ERR (Arg0, Z143, 0x4CAC, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -36906,7 +36906,7 @@ } Default { - ERR (Arg0, Z143, 0x4D04, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -37078,7 +37078,7 @@ } Default { - ERR (Arg0, Z143, 0x4D5C, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -37266,7 +37266,7 @@ } Default { - ERR (Arg0, Z143, 0x4DB4, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -37274,7 +37274,7 @@ } Default { - ERR (Arg0, Z143, 0x4DBA, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -37462,7 +37462,7 @@ } Default { - ERR (Arg0, Z143, 0x4E21, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -37634,7 +37634,7 @@ } Default { - ERR (Arg0, Z143, 0x4E79, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -37822,7 +37822,7 @@ } Default { - ERR (Arg0, Z143, 0x4ED1, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -37994,7 +37994,7 @@ } Default { - ERR (Arg0, Z143, 0x4F29, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -38166,7 +38166,7 @@ } Default { - ERR (Arg0, Z143, 0x4F81, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -38338,7 +38338,7 @@ } Default { - ERR (Arg0, Z143, 0x4FD9, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -38510,7 +38510,7 @@ } Default { - ERR (Arg0, Z143, 0x5031, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -38682,7 +38682,7 @@ } Default { - ERR (Arg0, Z143, 0x5089, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -38854,7 +38854,7 @@ } Default { - ERR (Arg0, Z143, 0x50E1, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -39026,7 +39026,7 @@ } Default { - ERR (Arg0, Z143, 0x5139, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -39214,7 +39214,7 @@ } Default { - ERR (Arg0, Z143, 0x5191, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -39386,7 +39386,7 @@ } Default { - ERR (Arg0, Z143, 0x51E9, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -39558,7 +39558,7 @@ } Default { - ERR (Arg0, Z143, 0x5241, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -39730,7 +39730,7 @@ } Default { - ERR (Arg0, Z143, 0x5299, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -39902,7 +39902,7 @@ } Default { - ERR (Arg0, Z143, 0x52F1, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -40090,7 +40090,7 @@ } Default { - ERR (Arg0, Z143, 0x5349, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -40098,7 +40098,7 @@ } Default { - ERR (Arg0, Z143, 0x534F, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -40286,7 +40286,7 @@ } Default { - ERR (Arg0, Z143, 0x53B6, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -40458,7 +40458,7 @@ } Default { - ERR (Arg0, Z143, 0x540E, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -40646,7 +40646,7 @@ } Default { - ERR (Arg0, Z143, 0x5466, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -40818,7 +40818,7 @@ } Default { - ERR (Arg0, Z143, 0x54BE, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -40990,7 +40990,7 @@ } Default { - ERR (Arg0, Z143, 0x5516, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -41162,7 +41162,7 @@ } Default { - ERR (Arg0, Z143, 0x556E, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -41334,7 +41334,7 @@ } Default { - ERR (Arg0, Z143, 0x55C6, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -41506,7 +41506,7 @@ } Default { - ERR (Arg0, Z143, 0x561E, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -41678,7 +41678,7 @@ } Default { - ERR (Arg0, Z143, 0x5676, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -41850,7 +41850,7 @@ } Default { - ERR (Arg0, Z143, 0x56CE, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -42038,7 +42038,7 @@ } Default { - ERR (Arg0, Z143, 0x5726, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -42210,7 +42210,7 @@ } Default { - ERR (Arg0, Z143, 0x577E, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -42382,7 +42382,7 @@ } Default { - ERR (Arg0, Z143, 0x57D6, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -42554,7 +42554,7 @@ } Default { - ERR (Arg0, Z143, 0x582E, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -42726,7 +42726,7 @@ } Default { - ERR (Arg0, Z143, 0x5886, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -42914,7 +42914,7 @@ } Default { - ERR (Arg0, Z143, 0x58DE, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -42922,7 +42922,7 @@ } Default { - ERR (Arg0, Z143, 0x58E4, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -43110,7 +43110,7 @@ } Default { - ERR (Arg0, Z143, 0x594B, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -43282,7 +43282,7 @@ } Default { - ERR (Arg0, Z143, 0x59A3, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -43470,7 +43470,7 @@ } Default { - ERR (Arg0, Z143, 0x59FB, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -43642,7 +43642,7 @@ } Default { - ERR (Arg0, Z143, 0x5A53, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -43814,7 +43814,7 @@ } Default { - ERR (Arg0, Z143, 0x5AAB, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -43986,7 +43986,7 @@ } Default { - ERR (Arg0, Z143, 0x5B03, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -44158,7 +44158,7 @@ } Default { - ERR (Arg0, Z143, 0x5B5B, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -44330,7 +44330,7 @@ } Default { - ERR (Arg0, Z143, 0x5BB3, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -44502,7 +44502,7 @@ } Default { - ERR (Arg0, Z143, 0x5C0B, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -44674,7 +44674,7 @@ } Default { - ERR (Arg0, Z143, 0x5C63, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -44862,7 +44862,7 @@ } Default { - ERR (Arg0, Z143, 0x5CBB, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -45034,7 +45034,7 @@ } Default { - ERR (Arg0, Z143, 0x5D13, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -45206,7 +45206,7 @@ } Default { - ERR (Arg0, Z143, 0x5D6B, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -45378,7 +45378,7 @@ } Default { - ERR (Arg0, Z143, 0x5DC3, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -45550,7 +45550,7 @@ } Default { - ERR (Arg0, Z143, 0x5E1B, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -45738,7 +45738,7 @@ } Default { - ERR (Arg0, Z143, 0x5E73, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -45746,7 +45746,7 @@ } Default { - ERR (Arg0, Z143, 0x5E79, 0x00, 0x00, Arg2, Arg3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Arg2, Arg3) Return (Zero) } @@ -45803,7 +45803,7 @@ Local0 = DerefOf (DerefOf (FCP0 [0x01])) If ((Local0 != 0xA5)) { - ERR (Arg0, Z143, 0x5EA9, 0x00, 0x00, Local0, 0xA5) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Local0, 0xA5) } } @@ -45820,7 +45820,7 @@ Local0 = DerefOf (DerefOf (FCP0 [0x01])) If ((Local0 != DerefOf (FCP0 [0x02]))) { - ERR (Arg0, Z143, 0x5EB7, 0x00, 0x00, Local0, DerefOf (FCP0 [0x02])) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Local0, DerefOf (FCP0 [0x02])) } } @@ -45844,7 +45844,7 @@ Local0 = DerefOf (DerefOf (FCP0 [0x01])) If ((Local0 != 0xA5)) { - ERR (Arg0, Z143, 0x5ECB, 0x00, 0x00, Local0, 0xA5) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Local0, 0xA5) } } @@ -45872,7 +45872,7 @@ Local0 = DerefOf (DerefOf (FCP0 [0x01])) If ((Local0 != DerefOf (FCP0 [0x02]))) { - ERR (Arg0, Z143, 0x5EE2, 0x00, 0x00, Local0, DerefOf (FCP0 [0x02])) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Local0, DerefOf (FCP0 [0x02])) } } @@ -45883,7 +45883,7 @@ Local0 = ObjectType (Arg1) If ((Local0 != C00D)) { - ERR (Arg0, Z143, 0x5EEB, 0x00, 0x00, Local0, C00D) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Local0, C00D) } /* Retrieve the field back */ @@ -45898,7 +45898,7 @@ Local0 = DerefOf (DerefOf (FCP0 [0x01])) If ((Local0 != 0xA5)) { - ERR (Arg0, Z143, 0x5EF8, 0x00, 0x00, Local0, 0xA5) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Local0, 0xA5) } } @@ -45926,12 +45926,12 @@ Local1 = ObjectType (Local0) If ((Local1 != INT0)) { - ERR (Arg0, Z143, 0x5F0E, 0x00, 0x00, Local1, INT0) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Local1, INT0) } If ((Local0 != Arg5)) { - ERR (Arg0, Z143, 0x5F12, 0x00, 0x00, Local0, Arg5) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Local0, Arg5) } Switch (ToInteger (PR01)) @@ -45943,7 +45943,7 @@ Local0 = DerefOf (DerefOf (FCP0 [0x01])) If ((Local0 != DerefOf (FCP0 [0x02]))) { - ERR (Arg0, Z143, 0x5F1B, 0x00, 0x00, Local0, DerefOf (FCP0 [0x02])) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Local0, DerefOf (FCP0 [0x02])) } } @@ -45961,7 +45961,7 @@ Local0 = DerefOf (DerefOf (FCP0 [0x01])) If ((Local0 != 0xA5)) { - ERR (Arg0, Z143, 0x5F2A, 0x00, 0x00, Local0, 0xA5) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Local0, 0xA5) } } @@ -45977,7 +45977,7 @@ Local0 = DerefOf (DerefOf (FCP0 [0x01])) If ((Local0 != DerefOf (FCP0 [0x02]))) { - ERR (Arg0, Z143, 0x5F37, 0x00, 0x00, Local0, DerefOf (FCP0 [0x02])) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Local0, DerefOf (FCP0 [0x02])) } } @@ -45985,7 +45985,7 @@ If ((Local1 != BRB0)) { - ERR (Arg0, Z143, 0x5F3D, 0x00, 0x00, Local1, BRB0) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Local1, BRB0) } ElseIf (PR00) { @@ -46878,7 +46878,7 @@ } Default { - ERR (Arg0, Z143, 0x6043, 0x00, 0x00, Local1, Local3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Local1, Local3) Return (Zero) } @@ -46954,7 +46954,7 @@ } Default { - ERR (Arg0, Z143, 0x605B, 0x00, 0x00, Local1, Local3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Local1, Local3) Return (Zero) } @@ -47030,7 +47030,7 @@ } Default { - ERR (Arg0, Z143, 0x6073, 0x00, 0x00, Local1, Local3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Local1, Local3) Return (Zero) } @@ -47106,7 +47106,7 @@ } Default { - ERR (Arg0, Z143, 0x608B, 0x00, 0x00, Local1, Local3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Local1, Local3) Return (Zero) } @@ -47114,7 +47114,7 @@ } Default { - ERR (Arg0, Z143, 0x6091, 0x00, 0x00, Local1, Local3) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, Local1, Local3) Return (Zero) } @@ -47161,7 +47161,7 @@ Mid (Local6, DerefOf (Local4 [0x00]), SizeOf (Local5), Local7) If ((Local7 != Local5)) { - ERR (Arg0, Z143, 0x60BF, Z143, ((0x10 * Local1) + Local3), + ERR (Arg0, Z143, __LINE__, Z143, ((0x10 * Local1) + Local3), Local7, Local5) } @@ -47189,7 +47189,7 @@ If ((DerefOf (Local6 [((DerefOf (Local4 [0x00] ) - Local7) - 0x01)]) != 0x00)) { - ERR (Arg0, Z143, 0x60D6, Z143, ((0x10 * Local1) + Local3), + ERR (Arg0, Z143, __LINE__, Z143, ((0x10 * Local1) + Local3), DerefOf (Local6 [(DerefOf (Local4 [0x00]) - Local7)]), 0x00) } } @@ -47201,7 +47201,7 @@ If ((DerefOf (Local6 [(DerefOf (Local4 [0x00]) - Local7)]) != 0xFF)) { - ERR (Arg0, Z143, 0x60E2, Z143, ((0x10 * Local1) + Local3), + ERR (Arg0, Z143, __LINE__, Z143, ((0x10 * Local1) + Local3), DerefOf (Local6 [(DerefOf (Local4 [0x00]) - Local7)]), 0xFF) } @@ -47226,7 +47226,7 @@ If ((DerefOf (Local6 [(I000 + Local7)]) != 0x00)) { - ERR (Arg0, Z143, 0x60FC, Z143, ((0x10 * Local1) + Local3), + ERR (Arg0, Z143, __LINE__, Z143, ((0x10 * Local1) + Local3), DerefOf (Local6 [(I000 + Local7)]), 0x00) } @@ -47237,7 +47237,7 @@ Local7-- If ((DerefOf (Local6 [(I000 + Local7)]) != 0xFF)) { - ERR (Arg0, Z143, 0x6108, Z143, ((0x10 * Local1) + Local3), + ERR (Arg0, Z143, __LINE__, Z143, ((0x10 * Local1) + Local3), DerefOf (Local6 [(I000 + Local7)]), 0xFF) } } @@ -47284,7 +47284,7 @@ F001 = 0x01 If ((F000 != 0x08)) { - ERR (Arg0, Z143, 0x6132, 0x00, 0x00, F000, 0x08) + ERR (Arg0, Z143, __LINE__, 0x00, 0x00, F000, 0x08) } } diff --git a/tests/aslts/src/runtime/collections/functional/synchronization/mutex2.asl b/tests/aslts/src/runtime/collections/functional/synchronization/mutex2.asl index 7bb1b149d..51de8ca63 100644 --- a/tests/aslts/src/runtime/collections/functional/synchronization/mutex2.asl +++ b/tests/aslts/src/runtime/collections/functional/synchronization/mutex2.asl @@ -71,7 +71,7 @@ Local0 = Acquire (MT00, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x53, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { @@ -80,112 +80,112 @@ If (Local0) { - ERR (__METHOD__, Z150, 0x57, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT10, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x5B, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT20, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x5F, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT30, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x63, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT40, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x67, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT50, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x6B, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT60, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x6F, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT70, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x73, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT80, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x77, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT90, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x7B, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTA0, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x7F, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTB0, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x83, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTC0, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x87, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTD0, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x8B, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTE0, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x8F, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTF0, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x93, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { @@ -284,7 +284,7 @@ Local0 = Acquire (MT00, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0xF6, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { @@ -293,7 +293,7 @@ If (Local0) { - ERR (__METHOD__, Z150, 0xFA, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { @@ -302,210 +302,210 @@ If (Local0) { - ERR (__METHOD__, Z150, 0xFE, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT10, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0102, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT11, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0106, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT20, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x010A, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT21, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x010E, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT30, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0112, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT31, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0116, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT40, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x011A, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT41, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x011E, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT50, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0122, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT51, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0126, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT60, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x012A, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT61, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x012E, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT70, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0132, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT71, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0136, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT80, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x013A, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT81, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x013E, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT90, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0142, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT91, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0146, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTA0, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x014A, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTA1, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x014E, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTB0, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0152, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTB1, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0156, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTC0, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x015A, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTC1, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x015E, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTD0, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0162, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTD1, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0166, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTE0, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x016A, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTE1, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x016E, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTF0, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0172, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { @@ -520,7 +520,7 @@ If (Local0) { - ERR (__METHOD__, Z150, 0x017A, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { @@ -638,119 +638,119 @@ Local0 = Acquire (MT00, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x01EC, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (\_GL, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x01F0, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT10, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x01F4, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT20, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x01F8, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT30, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x01FC, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT40, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0200, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT50, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0204, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT60, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0208, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT70, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x020C, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT80, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0210, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT90, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0214, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTA0, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0218, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTB0, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x021C, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTC0, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0220, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTD0, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0224, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTE0, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0228, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTF0, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x022C, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { @@ -835,119 +835,119 @@ Local0 = Acquire (MT00, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0280, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (\_GL, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0284, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT10, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0288, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT20, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x028C, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT30, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0290, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT40, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0294, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT50, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0298, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT60, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x029C, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT70, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x02A0, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT80, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x02A4, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MT90, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x02A8, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTA0, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x02AC, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTB0, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x02B0, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTC0, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x02B4, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTD0, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x02B8, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTE0, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x02BC, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { Local0 = Acquire (MTF0, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x02C0, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } } } @@ -1577,7 +1577,7 @@ I103 = Acquire (T805, 0xFFFF) If (I103) { - ERR (__METHOD__, Z150, 0x0557, 0x00, 0x00, 0x00, I103) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, I103) } Debug = "m13e completed" @@ -1617,13 +1617,13 @@ If (I102) { Debug = "Acquire(T804, 0xffff) failed" - ERR (__METHOD__, Z150, 0x0575, 0x00, 0x00, 0x00, I102) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, I102) } If (I103) { Debug = "Acquire(T805, 0xffff) failed" - ERR (__METHOD__, Z150, 0x057A, 0x00, 0x00, 0x00, I103) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, I103) } CH03 (__METHOD__, Z150, 0x04, 0x057D, 0x00) @@ -1649,103 +1649,103 @@ Local0 = Acquire (\_GL, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0595, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Local0 = Acquire (T000, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x059A, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Local0 = Acquire (T100, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x059F, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Local0 = Acquire (T200, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x05A4, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Local0 = Acquire (T300, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x05A9, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Local0 = Acquire (T400, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x05AE, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Local0 = Acquire (T500, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x05B3, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Local0 = Acquire (T600, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x05B8, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Local0 = Acquire (T700, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x05BD, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Local0 = Acquire (T800, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x05C2, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Local0 = Acquire (T900, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x05C7, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Local0 = Acquire (TA00, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x05CC, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Local0 = Acquire (TB00, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x05D1, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Local0 = Acquire (TC00, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x05D6, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Local0 = Acquire (TD00, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x05DB, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Local0 = Acquire (TE00, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x05E0, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Local0 = Acquire (TF00, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x05E5, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } CH03 (__METHOD__, Z150, 0x00, 0x05E8, 0x00) @@ -1781,103 +1781,103 @@ Local0 = Acquire (\_GL, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x060A, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Local0 = Acquire (T000, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x060F, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Local0 = Acquire (T100, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0614, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Local0 = Acquire (T200, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0619, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Local0 = Acquire (T300, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x061E, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Local0 = Acquire (T400, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0623, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Local0 = Acquire (T500, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0628, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Local0 = Acquire (T600, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x062D, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Local0 = Acquire (T700, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0632, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Local0 = Acquire (T800, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0637, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Local0 = Acquire (T900, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x063C, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Local0 = Acquire (TA00, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0641, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Local0 = Acquire (TB00, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0646, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Local0 = Acquire (TC00, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x064B, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Local0 = Acquire (TD00, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0650, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Local0 = Acquire (TE00, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x0655, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Local0 = Acquire (TF00, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z150, 0x065A, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } CH03 (__METHOD__, Z150, 0x00, 0x065D, 0x00) @@ -1985,13 +1985,13 @@ Local0 = (Acquire (\_GL, 0xFFFF) + 0x01) If ((Local0 != 0x01)) { - ERR (__METHOD__, Z150, 0x06C9, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Local0 = (Acquire (T500, 0xFFFF) + 0x01) If ((Local0 != 0x01)) { - ERR (__METHOD__, Z150, 0x06CE, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Release (T500) @@ -2001,13 +2001,13 @@ Local0 = (0x01 - Acquire (\_GL, 0xFFFF)) If ((Local0 != 0x01)) { - ERR (__METHOD__, Z150, 0x06D8, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Local0 = (0x01 - Acquire (T500, 0xFFFF)) If ((Local0 != 0x01)) { - ERR (__METHOD__, Z150, 0x06DD, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Release (T500) @@ -2016,7 +2016,7 @@ If ((Acquire (T500, 0xFFFF) != 0x00)) { - ERR (__METHOD__, Z150, 0x06E6, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } Release (T500) @@ -2347,7 +2347,7 @@ SRMT ("m300") If (ERR7) { - ERR ("ERRORS were detected during the loading stage", Z150, 0x083C, 0x00, 0x00, 0x00, ERR7) + ERR ("ERRORS were detected during the loading stage", Z150, __LINE__, 0x00, 0x00, 0x00, ERR7) } /* ATTENTION: this test must be run the first */ diff --git a/tests/aslts/src/runtime/collections/functional/synchronization/mutex_proc.asl b/tests/aslts/src/runtime/collections/functional/synchronization/mutex_proc.asl index 3b7b23cc6..880d96322 100644 --- a/tests/aslts/src/runtime/collections/functional/synchronization/mutex_proc.asl +++ b/tests/aslts/src/runtime/collections/functional/synchronization/mutex_proc.asl @@ -52,7 +52,7 @@ Local0 = Acquire (T000, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z151, 0x3A, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z151, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { @@ -64,7 +64,7 @@ Local0 = Acquire (\_GL, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z151, 0x41, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z151, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { @@ -76,7 +76,7 @@ Local0 = Acquire (T100, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z151, 0x48, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z151, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { @@ -88,7 +88,7 @@ Local0 = Acquire (T200, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z151, 0x4F, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z151, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { @@ -100,7 +100,7 @@ Local0 = Acquire (T300, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z151, 0x56, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z151, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { @@ -112,7 +112,7 @@ Local0 = Acquire (T400, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z151, 0x5D, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z151, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { @@ -124,7 +124,7 @@ Local0 = Acquire (T500, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z151, 0x64, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z151, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { @@ -136,7 +136,7 @@ Local0 = Acquire (T600, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z151, 0x6B, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z151, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { @@ -148,7 +148,7 @@ Local0 = Acquire (T700, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z151, 0x72, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z151, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { @@ -160,7 +160,7 @@ Local0 = Acquire (T800, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z151, 0x79, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z151, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { @@ -172,7 +172,7 @@ Local0 = Acquire (T900, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z151, 0x80, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z151, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { @@ -184,7 +184,7 @@ Local0 = Acquire (TA00, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z151, 0x87, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z151, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { @@ -196,7 +196,7 @@ Local0 = Acquire (TB00, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z151, 0x8E, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z151, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { @@ -208,7 +208,7 @@ Local0 = Acquire (TC00, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z151, 0x95, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z151, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { @@ -220,7 +220,7 @@ Local0 = Acquire (TD00, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z151, 0x9C, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z151, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { @@ -232,7 +232,7 @@ Local0 = Acquire (TE00, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z151, 0xA3, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z151, __LINE__, 0x00, 0x00, 0x00, Local0) } Else { @@ -244,7 +244,7 @@ Local0 = Acquire (TF00, 0xFFFF) If (Local0) { - ERR (__METHOD__, Z151, 0xAA, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z151, __LINE__, 0x00, 0x00, 0x00, Local0) } ElseIf ((Arg0 == 0x11)) { @@ -491,7 +491,7 @@ { If (Local0) { - ERR ("m36f", Z151, 0x015D, 0x00, 0x00, Local0, 0x00) + ERR ("m36f", Z151, __LINE__, 0x00, 0x00, Local0, 0x00) } } diff --git a/tests/aslts/src/runtime/collections/functional/synchronization/serialized.asl b/tests/aslts/src/runtime/collections/functional/synchronization/serialized.asl index ab6940f2f..2f981395b 100644 --- a/tests/aslts/src/runtime/collections/functional/synchronization/serialized.asl +++ b/tests/aslts/src/runtime/collections/functional/synchronization/serialized.asl @@ -137,7 +137,7 @@ Debug = "m016" If ((I000 != 0x11)) { - ERR (__METHOD__, Z173, 0x3F, 0x00, 0x00, I000, 0x11) + ERR (__METHOD__, Z173, __LINE__, 0x00, 0x00, I000, 0x11) } } @@ -255,7 +255,7 @@ Debug = "m016" If ((I000 != 0x11)) { - ERR (__METHOD__, Z173, 0x65, 0x00, 0x00, I000, 0x11) + ERR (__METHOD__, Z173, __LINE__, 0x00, 0x00, I000, 0x11) } } @@ -440,7 +440,7 @@ Debug = "m016" If ((I000 != 0x1C)) { - ERR (__METHOD__, Z173, 0xA6, 0x00, 0x00, I000, 0x1C) + ERR (__METHOD__, Z173, __LINE__, 0x00, 0x00, I000, 0x1C) } I001 = 0xABCD0000 @@ -450,7 +450,7 @@ M000 () If ((I001 != 0xABCD0000)) { - ERR (__METHOD__, Z173, 0xAF, 0x00, 0x00, I001, 0xABCD0000) + ERR (__METHOD__, Z173, __LINE__, 0x00, 0x00, I001, 0xABCD0000) } CH03 (__METHOD__, Z173, 0x09, 0xB1, 0x00) @@ -811,12 +811,12 @@ { If ((I003 != Arg0)) { - ERR (__METHOD__, Z173, 0x0137, 0x00, 0x00, I003, Arg0) + ERR (__METHOD__, Z173, __LINE__, 0x00, 0x00, I003, Arg0) } If ((I004 != Arg1)) { - ERR (__METHOD__, Z173, 0x013A, 0x00, 0x00, I004, Arg1) + ERR (__METHOD__, Z173, __LINE__, 0x00, 0x00, I004, Arg1) } } @@ -1180,12 +1180,12 @@ { If ((I003 != Arg0)) { - ERR (__METHOD__, Z173, 0x01BB, 0x00, 0x00, I003, Arg0) + ERR (__METHOD__, Z173, __LINE__, 0x00, 0x00, I003, Arg0) } If ((I004 != Arg1)) { - ERR (__METHOD__, Z173, 0x01BE, 0x00, 0x00, I004, Arg1) + ERR (__METHOD__, Z173, __LINE__, 0x00, 0x00, I004, Arg1) } } @@ -1590,12 +1590,12 @@ { If ((I003 != Arg0)) { - ERR (__METHOD__, Z173, 0x0268, 0x00, 0x00, I003, Arg0) + ERR (__METHOD__, Z173, __LINE__, 0x00, 0x00, I003, Arg0) } If ((I004 != Arg1)) { - ERR (__METHOD__, Z173, 0x026B, 0x00, 0x00, I004, Arg1) + ERR (__METHOD__, Z173, __LINE__, 0x00, 0x00, I004, Arg1) } } @@ -1984,7 +1984,7 @@ { If (Local0) { - ERR (__METHOD__, Z173, 0x0327, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z173, __LINE__, 0x00, 0x00, 0x00, Local0) } } @@ -2011,7 +2011,7 @@ { If (Local0) { - ERR (__METHOD__, Z173, 0x0338, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z173, __LINE__, 0x00, 0x00, 0x00, Local0) } } @@ -2038,7 +2038,7 @@ { If (Local0) { - ERR (__METHOD__, Z173, 0x0349, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z173, __LINE__, 0x00, 0x00, 0x00, Local0) } } @@ -2065,7 +2065,7 @@ { If (Local0) { - ERR (__METHOD__, Z173, 0x035A, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z173, __LINE__, 0x00, 0x00, 0x00, Local0) } } @@ -2092,7 +2092,7 @@ { If (Local0) { - ERR (__METHOD__, Z173, 0x036B, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z173, __LINE__, 0x00, 0x00, 0x00, Local0) } } @@ -2119,7 +2119,7 @@ { If (Local0) { - ERR (__METHOD__, Z173, 0x037C, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z173, __LINE__, 0x00, 0x00, 0x00, Local0) } } @@ -2146,7 +2146,7 @@ { If (Local0) { - ERR (__METHOD__, Z173, 0x038D, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z173, __LINE__, 0x00, 0x00, 0x00, Local0) } } @@ -2173,7 +2173,7 @@ { If (Local0) { - ERR (__METHOD__, Z173, 0x039E, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z173, __LINE__, 0x00, 0x00, 0x00, Local0) } } @@ -2200,7 +2200,7 @@ { If (Local0) { - ERR (__METHOD__, Z173, 0x03AF, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z173, __LINE__, 0x00, 0x00, 0x00, Local0) } } @@ -2227,7 +2227,7 @@ { If (Local0) { - ERR (__METHOD__, Z173, 0x03C0, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z173, __LINE__, 0x00, 0x00, 0x00, Local0) } } @@ -2254,7 +2254,7 @@ { If (Local0) { - ERR (__METHOD__, Z173, 0x03D1, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z173, __LINE__, 0x00, 0x00, 0x00, Local0) } } @@ -2281,7 +2281,7 @@ { If (Local0) { - ERR (__METHOD__, Z173, 0x03E2, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z173, __LINE__, 0x00, 0x00, 0x00, Local0) } } @@ -2308,7 +2308,7 @@ { If (Local0) { - ERR (__METHOD__, Z173, 0x03F3, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z173, __LINE__, 0x00, 0x00, 0x00, Local0) } } @@ -2335,7 +2335,7 @@ { If (Local0) { - ERR (__METHOD__, Z173, 0x0404, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z173, __LINE__, 0x00, 0x00, 0x00, Local0) } } @@ -2362,7 +2362,7 @@ { If (Local0) { - ERR (__METHOD__, Z173, 0x0415, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z173, __LINE__, 0x00, 0x00, 0x00, Local0) } } @@ -2389,7 +2389,7 @@ { If (Local0) { - ERR (__METHOD__, Z173, 0x0426, 0x00, 0x00, 0x00, Local0) + ERR (__METHOD__, Z173, __LINE__, 0x00, 0x00, 0x00, Local0) } } @@ -2634,12 +2634,12 @@ { If ((I003 != Arg0)) { - ERR (__METHOD__, Z173, 0x04DA, 0x00, 0x00, I003, Arg0) + ERR (__METHOD__, Z173, __LINE__, 0x00, 0x00, I003, Arg0) } If ((I004 != Arg1)) { - ERR (__METHOD__, Z173, 0x04DD, 0x00, 0x00, I004, Arg1) + ERR (__METHOD__, Z173, __LINE__, 0x00, 0x00, I004, Arg1) } } diff --git a/tests/aslts/src/runtime/collections/functional/table/load.asl b/tests/aslts/src/runtime/collections/functional/table/load.asl index cfb378eee..d7729655c 100644 --- a/tests/aslts/src/runtime/collections/functional/table/load.asl +++ b/tests/aslts/src/runtime/collections/functional/table/load.asl @@ -316,7 +316,7 @@ RFU0 = BUF0 /* \DTM0.BUF0 */ If (CondRefOf (\SSS0, Local0)) { - ERR (Arg0, Z174, 0x013B, 0x00, 0x00, "\\SSS0", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x01) Return (Zero) } @@ -355,7 +355,7 @@ Default { Debug = "Unexpected parameter of the test" - ERR (Arg0, Z174, 0x0152, 0x00, 0x00, "\\SSS0", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x01) Return (Zero) } @@ -394,7 +394,7 @@ { /* DDB Handle */ - ERR (Arg0, Z174, 0x0165, 0x00, 0x00, Local1, C017) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local1, C017) } /* Check the new Object appears */ @@ -402,7 +402,7 @@ If (CondRefOf (\SSS0, Local0)){} Else { - ERR (Arg0, Z174, 0x016C, 0x00, 0x00, "\\SSS0", 0x00) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x00) } Local1 = ObjectType (Local0) @@ -410,7 +410,7 @@ { /* Method */ - ERR (Arg0, Z174, 0x0171, 0x00, 0x00, Local1, C010) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local1, C010) } Else { @@ -422,7 +422,7 @@ If (("\\SSS0" != Local0)) { - ERR (Arg0, Z174, 0x0178, 0x00, 0x00, Local0, "\\SSS0") + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local0, "\\SSS0") } } @@ -457,7 +457,7 @@ Debug = "Table Unloaded" If (CondRefOf (\SSS0, Local0)) { - ERR (Arg0, Z174, 0x018B, 0x00, 0x00, "\\SSS0", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x01) } Return (Zero) @@ -471,7 +471,7 @@ RFU0 = BUF0 /* \DTM0.BUF0 */ If (CondRefOf (\SSS0, Local0)) { - ERR (Arg0, Z174, 0x019A, 0x00, 0x00, "\\SSS0", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x01) Return (0x01) } @@ -511,7 +511,7 @@ { /* DDB Handle */ - ERR (Arg0, Z174, 0x01BE, 0x00, 0x00, Local1, C017) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local1, C017) } /* Check the new Object appears */ @@ -519,7 +519,7 @@ If (CondRefOf (\SSS0, Local0)){} Else { - ERR (Arg0, Z174, 0x01C5, 0x00, 0x00, "\\SSS0", 0x00) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x00) } Local1 = ObjectType (Local0) @@ -527,7 +527,7 @@ { /* Method */ - ERR (Arg0, Z174, 0x01CA, 0x00, 0x00, Local1, C010) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local1, C010) } Else { @@ -539,7 +539,7 @@ If (("\\SSS0" != Local0)) { - ERR (Arg0, Z174, 0x01D1, 0x00, 0x00, Local0, "\\SSS0") + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local0, "\\SSS0") } } @@ -552,7 +552,7 @@ Debug = "SSDT Unloaded" If (CondRefOf (\SSS0, Local0)) { - ERR (Arg0, Z174, 0x01DE, 0x00, 0x00, "\\SSS0", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x01) } Return (Zero) @@ -693,7 +693,7 @@ RFU0 = BUF0 /* \DTM0.BUF0 */ If (CondRefOf (\SSS0, Local0)) { - ERR (Arg0, Z174, 0x0264, 0x00, 0x00, "\\SSS0", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x01) Return (Zero) } @@ -732,7 +732,7 @@ Default { Debug = "Unexpected parameter of the test" - ERR (Arg0, Z174, 0x027B, 0x00, 0x00, "\\SSS0", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x01) Return (Zero) } @@ -771,7 +771,7 @@ { /* DDB Handle */ - ERR (Arg0, Z174, 0x028E, 0x00, 0x00, Local1, C017) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local1, C017) } /* Check the new Object appears */ @@ -779,7 +779,7 @@ If (CondRefOf (\SSS0, Local0)){} Else { - ERR (Arg0, Z174, 0x0295, 0x00, 0x00, "\\SSS0", 0x00) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x00) } Local1 = ObjectType (Local0) @@ -787,7 +787,7 @@ { /* Method */ - ERR (Arg0, Z174, 0x029A, 0x00, 0x00, Local1, C010) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local1, C010) } Else { @@ -799,7 +799,7 @@ If (("\\SSS0" != Local0)) { - ERR (Arg0, Z174, 0x02A1, 0x00, 0x00, Local0, "\\SSS0") + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local0, "\\SSS0") } } @@ -834,7 +834,7 @@ Debug = "SSDT Unloaded" If (CondRefOf (\SSS0, Local0)) { - ERR (Arg0, Z174, 0x02B4, 0x00, 0x00, "\\SSS0", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x01) } Return (Zero) @@ -871,7 +871,7 @@ RFU0 = BUF0 /* \DTM0.BUF0 */ If (CondRefOf (\SSS0, Local0)) { - ERR (Arg0, Z174, 0x02DA, 0x00, 0x00, "\\SSS0", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x01) Return (0x01) } @@ -969,7 +969,7 @@ Local2 = Buffer (0x0A) Else { Debug = "This Region type\'s AddrSpace Handler not installed" - ERR (Arg0, Z174, 0x0335, 0x00, 0x00, Local2, Arg1) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local2, Arg1) } } @@ -1038,12 +1038,12 @@ Local2 = Buffer (0x0A) If (CondRefOf (NABS, Local0)) { - ERR (Arg0, Z174, 0x037B, 0x00, 0x00, "NABS", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "NABS", 0x01) } If (CondRefOf (NCRR, Local0)) { - ERR (Arg0, Z174, 0x037E, 0x00, 0x00, "NCRR", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "NCRR", 0x01) } RFU1 = BUF1 /* \DTM0.BUF1 */ @@ -1055,24 +1055,24 @@ Local2 = Buffer (0x0A) { If (("absolute location obj" != DerefOf (Local0))) { - ERR (Arg0, Z174, 0x0388, 0x00, 0x00, DerefOf (Local0), "absolute location obj") + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, DerefOf (Local0), "absolute location obj") } } Else { - ERR (Arg0, Z174, 0x038C, 0x00, 0x00, "NABS", 0x00) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "NABS", 0x00) } If (CondRefOf (NCRR, Local0)) { If (("current location obj" != DerefOf (Local0))) { - ERR (Arg0, Z174, 0x0390, 0x00, 0x00, DerefOf (Local0), "current location obj") + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, DerefOf (Local0), "current location obj") } } Else { - ERR (Arg0, Z174, 0x0394, 0x00, 0x00, "NCRR", 0x00) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "NCRR", 0x00) } /* Check location */ @@ -1080,7 +1080,7 @@ Local2 = Buffer (0x0A) If (CondRefOf (\NABS, Local0)){} Else { - ERR (Arg0, Z174, 0x039A, 0x00, 0x00, "NABS", 0x00) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "NABS", 0x00) } /*Note: We load the table objects relative to the root of the namespace. */ @@ -1088,17 +1088,17 @@ Local2 = Buffer (0x0A) If (CondRefOf (\NCRR, Local0)){} Else { - ERR (Arg0, Z174, 0x039F, 0x00, 0x00, "\\NCRR", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\NCRR", 0x01) } If (CondRefOf (\DTM0.NCRR, Local0)) { - ERR (Arg0, Z174, 0x03A2, 0x00, 0x00, "\\DTM0.NCRR", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\DTM0.NCRR", 0x01) } If (CondRefOf (\DTM0.TST8.NCRR, Local0)) { - ERR (Arg0, Z174, 0x03A5, 0x00, 0x00, "\\DTM0.TST8.NCRR", 0x00) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\DTM0.TST8.NCRR", 0x00) } Unload (DDBH) @@ -1107,12 +1107,12 @@ Local2 = Buffer (0x0A) If (CondRefOf (NABS, Local0)) { - ERR (Arg0, Z174, 0x03AD, 0x00, 0x00, "NABS", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "NABS", 0x01) } If (CondRefOf (NCRR, Local0)) { - ERR (Arg0, Z174, 0x03B0, 0x00, 0x00, "NCRR", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "NCRR", 0x01) } } @@ -1172,7 +1172,7 @@ Local2 = Buffer (0x0A) RFU2 = BUF2 /* \DTM0.BUF2 */ If (CondRefOf (\AUXD, Local0)) { - ERR (Arg0, Z174, 0x03F0, 0x00, 0x00, "\\AUXD", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\AUXD", 0x01) Return (Zero) } @@ -1190,41 +1190,41 @@ Local2 = Buffer (0x0A) If (CondRefOf (\AUXD, Local0)){} Else { - ERR (Arg0, Z174, 0x0400, 0x00, 0x00, "\\AUXD", 0x00) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\AUXD", 0x00) Return (Zero) } Local1 = ObjectType (Local0) If ((Local1 != 0x06)) { - ERR (Arg0, Z174, 0x0407, 0x00, 0x00, Local1, 0x06) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local1, 0x06) Return (Zero) } If (CondRefOf (\AUXD.REGC, Local0)){} Else { - ERR (Arg0, Z174, 0x040D, 0x00, 0x00, "\\AUXD.REGC", 0x00) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\AUXD.REGC", 0x00) Return (Zero) } Local1 = DerefOf (Local0) If ((0x01 != Local1)) { - ERR (Arg0, Z174, 0x0414, 0x00, 0x00, Local1, 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local1, 0x01) } If (CondRefOf (\AUXD.REGD, Local0)){} Else { - ERR (Arg0, Z174, 0x0419, 0x00, 0x00, "\\AUXD.REGD", 0x00) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\AUXD.REGD", 0x00) Return (Zero) } Local1 = DerefOf (Local0) If ((0xFFFFFFFF != Local1)) { - ERR (Arg0, Z174, 0x0420, 0x00, 0x00, Local1, 0xFFFFFFFF) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local1, 0xFFFFFFFF) } ElseIf (CondRefOf (\AUXD.M000, Local2)) { @@ -1232,18 +1232,18 @@ Local2 = Buffer (0x0A) Local1 = DerefOf (Local0) If ((0x01 != Local1)) { - ERR (Arg0, Z174, 0x0428, 0x00, 0x00, Local1, 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local1, 0x01) } } Else { - ERR (Arg0, Z174, 0x042B, 0x00, 0x00, "\\AUXD.M000", 0x00) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\AUXD.M000", 0x00) } Unload (DDBH) If (CondRefOf (\AUXD, Local0)) { - ERR (Arg0, Z174, 0x0431, 0x00, 0x00, "\\AUXD", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\AUXD", 0x01) } Return (Zero) @@ -1314,7 +1314,7 @@ Local2 = Buffer (0x0A) If ((Local5 != Local2)) { - ERR (Arg0, Z174, 0x0466, 0x00, 0x00, Local2, Local5) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local2, Local5) } } ElseIf (CH04 (Arg0, 0x00, 0xFF, Z174, 0x0469, 0x00, 0x00)) @@ -1338,7 +1338,7 @@ Local2 = Buffer (0x0A) Concatenate (Arg0, "-tsta", Arg0) If (INIT ()) { - ERR (Arg0, Z174, 0x047B, 0x00, 0x00, "INIT", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "INIT", 0x01) Return (0x01) } @@ -1352,7 +1352,7 @@ Local2 = Buffer (0x0A) { If (LD ()) { - ERR (Arg0, Z174, 0x0485, 0x00, 0x00, "HI0N", HI0N) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "HI0N", HI0N) Return (0x01) } @@ -1364,7 +1364,7 @@ Local2 = Buffer (0x0A) Local0-- If (LDCH (Arg0)) { - ERR (Arg0, Z174, 0x048E, 0x00, 0x00, "HI0N", HI0N) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "HI0N", HI0N) Return (0x01) } } @@ -1374,7 +1374,7 @@ Local2 = Buffer (0x0A) { If (UNLD ()) { - ERR (Arg0, Z174, 0x0496, 0x00, 0x00, "HI0N", HI0N) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "HI0N", HI0N) Return (0x01) } @@ -1386,7 +1386,7 @@ Local2 = Buffer (0x0A) Local0-- If (LDCH (Arg0)) { - ERR (Arg0, Z174, 0x049F, 0x00, 0x00, "HI0N", HI0N) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "HI0N", HI0N) Return (0x01) } } @@ -1462,7 +1462,7 @@ Local2 = Buffer (0x0A) Local0 = ObjectType (\AUXD.INT0) If ((C009 != Local0)) { - ERR (Arg0, Z174, 0x04EE, 0x00, 0x00, Local0, C009) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local0, C009) } /* String */ @@ -1472,7 +1472,7 @@ Local2 = Buffer (0x0A) Local0 = ObjectType (\AUXD.STR0) If ((C00A != Local0)) { - ERR (Arg0, Z174, 0x04F6, 0x00, 0x00, Local0, C00A) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local0, C00A) } /* Buffer */ @@ -1486,7 +1486,7 @@ Local2 = Buffer (0x0A) Local0 = ObjectType (\AUXD.BUF0) If ((C00B != Local0)) { - ERR (Arg0, Z174, 0x0500, 0x00, 0x00, Local0, C00B) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local0, C00B) } } @@ -1497,7 +1497,7 @@ Local2 = Buffer (0x0A) Local0 = ObjectType (\AUXD.PAC0) If ((C00C != Local0)) { - ERR (Arg0, Z174, 0x0509, 0x00, 0x00, Local0, C00C) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local0, C00C) } /* Field Unit */ @@ -1507,7 +1507,7 @@ Local2 = Buffer (0x0A) Local0 = ObjectType (\AUXD.DEV0) If ((C00E != Local0)) { - ERR (Arg0, Z174, 0x0513, 0x00, 0x00, Local0, C00E) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local0, C00E) } /* Event */ @@ -1517,7 +1517,7 @@ Local2 = Buffer (0x0A) Local0 = ObjectType (\AUXD.EVE0) If ((C00F != Local0)) { - ERR (Arg0, Z174, 0x051B, 0x00, 0x00, Local0, C00F) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local0, C00F) } /* Method */ @@ -1527,7 +1527,7 @@ Local2 = Buffer (0x0A) Local0 = ObjectType (\AUXD.MMM0) If ((C010 != Local0)) { - ERR (Arg0, Z174, 0x0523, 0x00, 0x00, Local0, C010) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local0, C010) } /* Mutex */ @@ -1537,7 +1537,7 @@ Local2 = Buffer (0x0A) Local0 = ObjectType (\AUXD.MTX0) If ((C011 != Local0)) { - ERR (Arg0, Z174, 0x052B, 0x00, 0x00, Local0, C011) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local0, C011) } /* OpRegion */ @@ -1547,7 +1547,7 @@ Local2 = Buffer (0x0A) Local0 = ObjectType (\AUXD.PWR0) If ((C013 != Local0)) { - ERR (Arg0, Z174, 0x0535, 0x00, 0x00, Local0, C013) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local0, C013) } /* Processor */ @@ -1557,7 +1557,7 @@ Local2 = Buffer (0x0A) Local0 = ObjectType (\AUXD.CPU0) If ((C014 != Local0)) { - ERR (Arg0, Z174, 0x053D, 0x00, 0x00, Local0, C014) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local0, C014) } /* Thermal Zone */ @@ -1567,7 +1567,7 @@ Local2 = Buffer (0x0A) Local0 = ObjectType (\AUXD.TZN0) If ((C015 != Local0)) { - ERR (Arg0, Z174, 0x0545, 0x00, 0x00, Local0, C015) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local0, C015) } /* Buffer Field */ @@ -1581,7 +1581,7 @@ Local2 = Buffer (0x0A) Local0 = ObjectType (\AUXD.BFL0) If ((C016 != Local0)) { - ERR (Arg0, Z174, 0x054F, 0x00, 0x00, Local0, C016) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local0, C016) } } @@ -1592,7 +1592,7 @@ Local2 = Buffer (0x0A) Local0 = ObjectType (DDB0) If ((C017 != Local0)) { - ERR (Arg0, Z174, 0x0558, 0x00, 0x00, Local0, C017) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local0, C017) } Unload (DDB0) @@ -1628,7 +1628,7 @@ Local2 = Buffer (0x0A) Local0 = ObjectType (RGN1) If ((C012 != Local0)) { - ERR (Arg0, Z174, 0x057D, 0x00, 0x00, Local0, C012) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local0, C012) } /* PCI_Config */ @@ -1638,7 +1638,7 @@ Local2 = Buffer (0x0A) Local0 = ObjectType (RGN2) If ((C012 != Local0)) { - ERR (Arg0, Z174, 0x0585, 0x00, 0x00, Local0, C012) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local0, C012) } /* EmbeddedControl */ @@ -1648,7 +1648,7 @@ Local2 = Buffer (0x0A) Local0 = ObjectType (RGN3) If ((C012 != Local0)) { - ERR (Arg0, Z174, 0x058D, 0x00, 0x00, Local0, C012) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local0, C012) } /* SMBus */ @@ -1658,7 +1658,7 @@ Local2 = Buffer (0x0A) Local0 = ObjectType (RGN4) If ((C012 != Local0)) { - ERR (Arg0, Z174, 0x0595, 0x00, 0x00, Local0, C012) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local0, C012) } /* SystemCMOS */ @@ -1668,7 +1668,7 @@ Local2 = Buffer (0x0A) Local0 = ObjectType (RGN5) If ((C012 != Local0)) { - ERR (Arg0, Z174, 0x059D, 0x00, 0x00, Local0, C012) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local0, C012) } /* PciBarTarget */ @@ -1678,7 +1678,7 @@ Local2 = Buffer (0x0A) Local0 = ObjectType (RGN6) If ((C012 != Local0)) { - ERR (Arg0, Z174, 0x05A5, 0x00, 0x00, Local0, C012) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local0, C012) } /* UserDefRegionSpace 0x80 */ @@ -1688,7 +1688,7 @@ Local2 = Buffer (0x0A) Local0 = ObjectType (RGN7) If ((C012 != Local0)) { - ERR (Arg0, Z174, 0x05AD, 0x00, 0x00, Local0, C012) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local0, C012) } /* UserDefRegionSpace 0xcf */ @@ -1698,7 +1698,7 @@ Local2 = Buffer (0x0A) Local0 = ObjectType (RGN8) If ((C012 != Local0)) { - ERR (Arg0, Z174, 0x05B5, 0x00, 0x00, Local0, C012) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local0, C012) } /* UserDefRegionSpace 0xff */ @@ -1708,7 +1708,7 @@ Local2 = Buffer (0x0A) Local0 = ObjectType (RGN9) If ((C012 != Local0)) { - ERR (Arg0, Z174, 0x05BD, 0x00, 0x00, Local0, C012) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local0, C012) } Return (0x00) @@ -1722,7 +1722,7 @@ Local2 = Buffer (0x0A) Concatenate (Arg0, "-tstd", Arg0) If (CondRefOf (\SSS0, Local0)) { - ERR (Arg0, Z174, 0x05CC, 0x00, 0x00, "\\SSS0", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x01) Return (0x01) } @@ -1749,7 +1749,7 @@ Local2 = Buffer (0x0A) CH04 (Arg0, 0x00, 0x25, Z174, 0x05E2, 0x00, 0x00) /* AE_BAD_SIGNATURE */ If (CondRefOf (\SSS0, Local0)) { - ERR (Arg0, Z174, 0x05E5, 0x00, 0x00, "\\SSS0", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x01) Return (0x01) } } @@ -1760,7 +1760,7 @@ Local2 = Buffer (0x0A) CH04 (Arg0, 0x00, 0x25, Z174, 0x05EC, 0x00, 0x00) /* AE_BAD_SIGNATURE */ If (CondRefOf (\SSS0, Local0)) { - ERR (Arg0, Z174, 0x05EF, 0x00, 0x00, "\\SSS0", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x01) } Return (0x00) @@ -1781,7 +1781,7 @@ Local2 = Buffer (0x0A) If (CondRefOf (\SSS0, Local0)) { - ERR (Arg0, Z174, 0x0604, 0x00, 0x00, "\\SSS0", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x01) Return (0x01) } @@ -1816,7 +1816,7 @@ Local2 = Buffer (0x0A) CH04 (Arg0, 0x00, 0x2A, Z174, 0x061E, 0x00, 0x00) /* AE_INVALID_TABLE_LENGTH */ If (CondRefOf (\SSS0, Local0)) { - ERR (Arg0, Z174, 0x0621, 0x00, 0x00, "\\SSS0", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x01) /* CleanUp */ Unload (HI0) @@ -1827,7 +1827,7 @@ Local2 = Buffer (0x0A) If (CondRefOf (\SSS0, Local0)) { - ERR (Arg0, Z174, 0x0629, 0x00, 0x00, "\\SSS0", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x01) Return (0x01) } } @@ -1851,7 +1851,7 @@ Local2 = Buffer (0x0A) If (CondRefOf (\SSS0, Local0)) { - ERR (Arg0, Z174, 0x063A, 0x00, 0x00, "\\SSS0", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x01) Unload (HI0) If (CH03 (Arg0, Z174, 0x98, 0x063C, 0x00)) { @@ -1860,7 +1860,7 @@ Local2 = Buffer (0x0A) If (CondRefOf (\SSS0, Local0)) { - ERR (Arg0, Z174, 0x0640, 0x00, 0x00, "\\SSS0", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x01) Return (0x01) } } @@ -1876,7 +1876,7 @@ Local2 = Buffer (0x0A) Concatenate (Arg0, "-tstf", Arg0) If (CondRefOf (\SSS0, Local0)) { - ERR (Arg0, Z174, 0x0650, 0x00, 0x00, "\\SSS0", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x01) Return (0x01) } @@ -1901,7 +1901,7 @@ Local2 = Buffer (0x0A) CH04 (Arg0, 0x00, 0x27, Z174, 0x0664, 0x00, 0x00) /* AE_BAD_CHECKSUM */ If (CondRefOf (\SSS0, Local0)) { - ERR (Arg0, Z174, 0x0667, 0x00, 0x00, "\\SSS0", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x01) /*Cleanup */ Unload (HI0) @@ -1920,7 +1920,7 @@ Local2 = Buffer (0x0A) CH04 (Arg0, 0x00, 0x27, Z174, 0x0674, 0x00, 0x00) /* AE_BAD_CHECKSUM */ If (CondRefOf (\SSS0, Local0)) { - ERR (Arg0, Z174, 0x0677, 0x00, 0x00, "\\SSS0", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x01) /*Cleanup */ Unload (HI0) @@ -1952,13 +1952,13 @@ Local2 = Buffer (0x0A) Local0 = ObjectType (Arg2) If ((Arg3 != Local0)) { - ERR (Arg0, Z174, 0x0695, 0x00, 0x00, Local0, Arg3) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local0, Arg3) Return (0x01) } If (CondRefOf (\SSS0, Local0)) { - ERR (Arg0, Z174, 0x069A, 0x00, 0x00, "\\SSS0", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x01) Return (0x01) } @@ -1971,13 +1971,13 @@ Local2 = Buffer (0x0A) Local0 = ObjectType (Arg2) If ((C017 != Local0)) { - ERR (Arg0, Z174, 0x06A4, 0x00, 0x00, Local0, C017) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local0, C017) } If (CondRefOf (\SSS0, Local0)){} Else { - ERR (Arg0, Z174, 0x06A8, 0x00, 0x00, "\\SSS0", 0x00) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x00) Return (0x01) } @@ -1989,7 +1989,7 @@ Local2 = Buffer (0x0A) If (CondRefOf (\SSS0, Local0)) { - ERR (Arg0, Z174, 0x06B1, 0x00, 0x00, "\\SSS0", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x01) Return (0x01) } @@ -2082,7 +2082,7 @@ Local2 = Buffer (0x0A) Concatenate (Arg0, "-tsth", Arg0) If (INIT ()) { - ERR (Arg0, Z174, 0x070F, 0x00, 0x00, "INIT", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "INIT", 0x01) Return (0x01) } @@ -2099,7 +2099,7 @@ Local2 = Buffer (0x0A) Debug = HI0N /* \DTM0.HI0N */ If (LD ()) { - ERR (Arg0, Z174, 0x071C, 0x00, 0x00, "HI0N", HI0N) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "HI0N", HI0N) Return (0x01) } @@ -2134,7 +2134,7 @@ Local2 = Buffer (0x0A) { If (UNLD ()) { - ERR (Arg0, Z174, 0x0738, 0x00, 0x00, "HI0N", HI0N) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "HI0N", HI0N) Return (0x01) } @@ -2148,7 +2148,7 @@ Local2 = Buffer (0x0A) If (LDCH (0x00)) { - ERR (Arg0, Z174, 0x0742, 0x00, 0x00, "HI0N", HI0N) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "HI0N", HI0N) Return (0x01) } @@ -2164,7 +2164,7 @@ Local2 = Buffer (0x0A) Concatenate (Arg0, "-tsti", Arg0) If (CondRefOf (\SSS0, Local0)) { - ERR (Arg0, Z174, 0x0753, 0x00, 0x00, "\\SSS0", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x01) Return (0x01) } @@ -2189,13 +2189,13 @@ Local2 = Buffer (0x0A) Local0 = ObjectType (HI0) If ((C017 != Local0)) { - ERR (Arg0, Z174, 0x0769, 0x00, 0x00, Local0, C017) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local0, C017) } If (CondRefOf (\SSS0, Local0)){} Else { - ERR (Arg0, Z174, 0x076E, 0x00, 0x00, "\\SSS0", 0x00) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x00) Return (0x01) } @@ -2209,7 +2209,7 @@ Local2 = Buffer (0x0A) Local0 = ObjectType (HI1) If ((C009 != Local0)) { - ERR (Arg0, Z174, 0x077B, 0x00, 0x00, Local0, C009) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local0, C009) } Local1-- @@ -2223,7 +2223,7 @@ Local2 = Buffer (0x0A) If (CondRefOf (\SSS0, Local0)) { - ERR (Arg0, Z174, 0x0788, 0x00, 0x00, "\\SSS0", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x01) } Return (0x00) @@ -2238,7 +2238,7 @@ Local2 = Buffer (0x0A) Concatenate (Arg0, "-tstj", Arg0) If (CondRefOf (\SSS0, Local0)) { - ERR (Arg0, Z174, 0x0798, 0x00, 0x00, "\\SSS0", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x01) Return (0x01) } @@ -2263,13 +2263,13 @@ Local2 = Buffer (0x0A) Local0 = ObjectType (HI0) If ((C017 != Local0)) { - ERR (Arg0, Z174, 0x07AE, 0x00, 0x00, Local0, C017) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local0, C017) } If (CondRefOf (\SSS0, Local0)){} Else { - ERR (Arg0, Z174, 0x07B3, 0x00, 0x00, "\\SSS0", 0x00) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x00) Return (0x01) } @@ -2316,7 +2316,7 @@ Local2 = Buffer (0x0A) Local0 = ObjectType (HI1) If ((C009 != Local0)) { - ERR (Arg0, Z174, 0x07E1, 0x00, 0x00, Local0, C009) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local0, C009) } Local1-- @@ -2330,7 +2330,7 @@ Local2 = Buffer (0x0A) If (CondRefOf (\SSS0, Local0)) { - ERR (Arg0, Z174, 0x07EE, 0x00, 0x00, "\\SSS0", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x01) } Return (0x00) @@ -2377,13 +2377,13 @@ Local2 = Buffer (0x0A) Concatenate (Arg0, "-tstk", Arg0) If (CondRefOf (\DDBX, Local0)) { - ERR (Arg0, Z174, 0x0819, 0x00, 0x00, "\\DDBX", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\DDBX", 0x01) Return (Zero) } If (CondRefOf (\SSS0, Local0)) { - ERR (Arg0, Z174, 0x081D, 0x00, 0x00, "\\SSS0", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x01) Return (Zero) } @@ -2397,14 +2397,14 @@ Local2 = Buffer (0x0A) If (CondRefOf (\DDBX, Local0)){} Else { - ERR (Arg0, Z174, 0x0829, 0x00, 0x00, "\\DDBX", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\DDBX", 0x01) Return (Zero) } If (CondRefOf (\SSS0, Local0)){} Else { - ERR (Arg0, Z174, 0x082E, 0x00, 0x00, "\\SSS0", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x01) Return (Zero) } @@ -2416,7 +2416,7 @@ Local2 = Buffer (0x0A) If (CondRefOf (\SSS0, Local0)) { - ERR (Arg0, Z174, 0x0838, 0x00, 0x00, "\\SSS0", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x01) Return (Zero) } @@ -2428,7 +2428,7 @@ Local2 = Buffer (0x0A) If (CondRefOf (\DDBX, Local0)) { - ERR (Arg0, Z174, 0x0842, 0x00, 0x00, "\\DDBX", 0x01) + ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\DDBX", 0x01) Return (Zero) } } diff --git a/tests/aslts/src/runtime/collections/functional/table/loadtable.asl b/tests/aslts/src/runtime/collections/functional/table/loadtable.asl index 5b17fc83c..f7dfc5226 100644 --- a/tests/aslts/src/runtime/collections/functional/table/loadtable.asl +++ b/tests/aslts/src/runtime/collections/functional/table/loadtable.asl @@ -160,7 +160,7 @@ Concatenate (Arg0, "-tst0", Arg0) If ((OEMT != FU00)) { - ERR (Arg0, Z176, 0x9F, 0x00, 0x00, FU00, OEMT) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, FU00, OEMT) Return (0x01) } @@ -180,7 +180,7 @@ If (CondRefOf (\_XT2, Local0)) { - ERR (Arg0, Z176, 0xB2, 0x00, 0x00, "\\_XT2", 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x01) Return (0x01) } @@ -196,19 +196,19 @@ { /* DDB Handle */ - ERR (Arg0, Z176, 0xC0, 0x00, 0x00, Local1, C017) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local1, C017) Return (0x01) } If ((0x01 != \DTM2.PLDT)) { - ERR (Arg0, Z176, 0xC5, 0x00, 0x00, \DTM2.PLDT, 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, \DTM2.PLDT, 0x01) } If (CondRefOf (\_XT2, Local0)){} Else { - ERR (Arg0, Z176, 0xCA, 0x00, 0x00, "\\_XT2", 0x00) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x00) } Unload (DDBH) @@ -220,7 +220,7 @@ If (CondRefOf (\_XT2, Local0)) { - ERR (Arg0, Z176, 0xD5, 0x00, 0x00, "\\_XT2", 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x01) } Return (0x00) @@ -234,7 +234,7 @@ Concatenate (Arg0, "-tst1", Arg0) If (CondRefOf (\_XT2, Local0)) { - ERR (Arg0, Z176, 0xE4, 0x00, 0x00, "\\_XT2", 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x01) Return (0x01) } @@ -260,19 +260,19 @@ { /* DDB Handle */ - ERR (Arg0, Z176, 0xF8, 0x00, 0x00, Local1, C017) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local1, C017) Return (0x01) } If ((0x01 != \DTM2.PLDT)) { - ERR (Arg0, Z176, 0xFD, 0x00, 0x00, \DTM2.PLDT, 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, \DTM2.PLDT, 0x01) } If (CondRefOf (\_XT2, Local0)){} Else { - ERR (Arg0, Z176, 0x0102, 0x00, 0x00, "\\_XT2", 0x00) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x00) } Unload (DDBH) @@ -284,7 +284,7 @@ If (CondRefOf (\_XT2, Local0)) { - ERR (Arg0, Z176, 0x010D, 0x00, 0x00, "\\_XT2", 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x01) } /* Unhappy comparison due to the SignatureString */ @@ -293,7 +293,7 @@ Local1 = ObjectType (Local2) If ((Local1 != C008)) { - ERR (Arg0, Z176, 0x0116, 0x00, 0x00, Local1, C008) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local1, C008) } Local2 = LoadTable ("OeM1", "Intel", "Many", "\\", PPST, 0x01) @@ -318,27 +318,27 @@ { If ((Local1 != C009)) { - ERR (Arg0, Z176, 0x0128, 0x00, 0x00, Local1, C009) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local1, C009) } If ((Local2 != 0x00)) { - ERR (Arg0, Z176, 0x012B, 0x00, 0x00, Local2, 0x00) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local2, 0x00) } } ElseIf ((Local1 != C008)) { - ERR (Arg0, Z176, 0x012F, 0x00, 0x00, Local1, C008) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local1, C008) } If ((0x00 != \DTM2.PLDT)) { - ERR (Arg0, Z176, 0x0134, 0x00, 0x00, \DTM2.PLDT, 0x00) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, \DTM2.PLDT, 0x00) } If (CondRefOf (\_XT2, Local0)) { - ERR (Arg0, Z176, 0x0138, 0x00, 0x00, "\\_XT2", 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x01) } /* Unhappy comparison due to the OEMIDString */ @@ -347,7 +347,7 @@ Local1 = ObjectType (Local3) If ((Local1 != C008)) { - ERR (Arg0, Z176, 0x0141, 0x00, 0x00, Local1, C008) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local1, C008) } Local3 = LoadTable ("OEM1", "InteL", "Many", "\\", PPST, 0x01) @@ -359,22 +359,22 @@ Local1 = ObjectType (Local3) If ((Local1 != C009)) { - ERR (Arg0, Z176, 0x014C, 0x00, 0x00, Local1, C009) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local1, C009) } If ((Local3 != 0x00)) { - ERR (Arg0, Z176, 0x0150, 0x00, 0x00, Local3, 0x00) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local3, 0x00) } If ((0x00 != \DTM2.PLDT)) { - ERR (Arg0, Z176, 0x0154, 0x00, 0x00, \DTM2.PLDT, 0x00) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, \DTM2.PLDT, 0x00) } If (CondRefOf (\_XT2, Local0)) { - ERR (Arg0, Z176, 0x0158, 0x00, 0x00, "\\_XT2", 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x01) } /* Unhappy comparison due to the OEMTableIDString */ @@ -383,7 +383,7 @@ Local1 = ObjectType (Local4) If ((Local1 != C008)) { - ERR (Arg0, Z176, 0x0161, 0x00, 0x00, Local1, C008) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local1, C008) } Local4 = LoadTable ("OEM1", "Intel", "many", "\\", PPST, 0x01) @@ -395,22 +395,22 @@ Local1 = ObjectType (Local4) If ((Local1 != C009)) { - ERR (Arg0, Z176, 0x016C, 0x00, 0x00, Local1, C009) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local1, C009) } If ((Local4 != 0x00)) { - ERR (Arg0, Z176, 0x0170, 0x00, 0x00, Local4, 0x00) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local4, 0x00) } If ((0x00 != \DTM2.PLDT)) { - ERR (Arg0, Z176, 0x0174, 0x00, 0x00, \DTM2.PLDT, 0x00) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, \DTM2.PLDT, 0x00) } If (CondRefOf (\_XT2, Local0)) { - ERR (Arg0, Z176, 0x0178, 0x00, 0x00, "\\_XT2", 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x01) } Return (0x00) @@ -427,7 +427,7 @@ Concatenate (Arg0, "-tst2", Arg0) If (CondRefOf (\_XT2, Local0)) { - ERR (Arg0, Z176, 0x018A, 0x00, 0x00, "\\_XT2", 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x01) Return (0x01) } @@ -445,19 +445,19 @@ { /* DDB Handle */ - ERR (Arg0, Z176, 0x019A, 0x00, 0x00, Local1, C017) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local1, C017) Return (0x01) } If ((0x01 != \DTM2.PLDT)) { - ERR (Arg0, Z176, 0x019F, 0x00, 0x00, \DTM2.PLDT, 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, \DTM2.PLDT, 0x01) } If (CondRefOf (\_XT2, Local0)){} Else { - ERR (Arg0, Z176, 0x01A4, 0x00, 0x00, "\\_XT2", 0x00) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x00) } Unload (DDB0) @@ -469,7 +469,7 @@ If (CondRefOf (\_XT2, Local0)) { - ERR (Arg0, Z176, 0x01AF, 0x00, 0x00, "\\_XT2", 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x01) } /* Check when ParameterPathString omitted */ @@ -486,19 +486,19 @@ { /* DDB Handle */ - ERR (Arg0, Z176, 0x01BE, 0x00, 0x00, Local1, C017) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local1, C017) Return (0x01) } If ((0x00 != \DTM2.PLDT)) { - ERR (Arg0, Z176, 0x01C3, 0x00, 0x00, \DTM2.PLDT, 0x00) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, \DTM2.PLDT, 0x00) } If (CondRefOf (\_XT2, Local0)){} Else { - ERR (Arg0, Z176, 0x01C8, 0x00, 0x00, "\\_XT2", 0x00) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x00) } Unload (DDB1) @@ -510,7 +510,7 @@ If (CondRefOf (\_XT2, Local0)) { - ERR (Arg0, Z176, 0x01D3, 0x00, 0x00, "\\_XT2", 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x01) } /* Check when ParameterData omitted */ @@ -527,19 +527,19 @@ { /* DDB Handle */ - ERR (Arg0, Z176, 0x01E2, 0x00, 0x00, Local1, C017) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local1, C017) Return (0x01) } If ((0x00 != \DTM2.PLDT)) { - ERR (Arg0, Z176, 0x01E7, 0x00, 0x00, \DTM2.PLDT, 0x00) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, \DTM2.PLDT, 0x00) } If (CondRefOf (\_XT2, Local0)){} Else { - ERR (Arg0, Z176, 0x01EC, 0x00, 0x00, "\\_XT2", 0x00) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x00) } Unload (DDB2) @@ -551,7 +551,7 @@ If (CondRefOf (\_XT2, Local0)) { - ERR (Arg0, Z176, 0x01F7, 0x00, 0x00, "\\_XT2", 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x01) } /* Check when all optional parameters omitted */ @@ -568,19 +568,19 @@ { /* DDB Handle */ - ERR (Arg0, Z176, 0x0206, 0x00, 0x00, Local1, C017) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local1, C017) Return (0x01) } If ((0x00 != \DTM2.PLDT)) { - ERR (Arg0, Z176, 0x020B, 0x00, 0x00, \DTM2.PLDT, 0x00) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, \DTM2.PLDT, 0x00) } If (CondRefOf (\_XT2, Local0)){} Else { - ERR (Arg0, Z176, 0x0210, 0x00, 0x00, "\\_XT2", 0x00) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x00) } Unload (DDB3) @@ -592,7 +592,7 @@ If (CondRefOf (\_XT2, Local0)) { - ERR (Arg0, Z176, 0x021B, 0x00, 0x00, "\\_XT2", 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x01) } Return (0x00) @@ -635,19 +635,19 @@ { /* DDB Handle */ - ERR (Arg0, Z176, 0x023E, 0x00, 0x00, Local1, C017) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local1, C017) Return (0x01) } If ((0x00 != \DTM2.PLDT)) { - ERR (Arg0, Z176, 0x0243, 0x00, 0x00, \DTM2.PLDT, 0x00) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, \DTM2.PLDT, 0x00) } If (CondRefOf (\_XT2, Local0)){} Else { - ERR (Arg0, Z176, 0x0248, 0x00, 0x00, "\\DTM2._XT2", 0x00) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\DTM2._XT2", 0x00) } Unload (Arg1) @@ -659,7 +659,7 @@ If (CondRefOf (\_XT2, Local0)) { - ERR (Arg0, Z176, 0x0253, 0x00, 0x00, "\\DTM2._XT2", 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\DTM2._XT2", 0x01) Return (0x01) } @@ -691,7 +691,7 @@ If (CondRefOf (\DTM2._XT2, Local0)) { - ERR (Arg0, Z176, 0x0272, 0x00, 0x00, "\\_XT2", 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x01) Return (0x01) } @@ -814,19 +814,19 @@ { /* DDB Handle */ - ERR (Arg0, Z176, 0x02F7, 0x00, 0x00, Local1, C017) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local1, C017) Return (0x01) } If ((0x01 != \DTM2.PLDT)) { - ERR (Arg0, Z176, 0x02FC, 0x00, 0x00, \DTM2.PLDT, 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, \DTM2.PLDT, 0x01) } If (CondRefOf (\DTM2._XT2, Local0)){} Else { - ERR (Arg0, Z176, 0x0301, 0x00, 0x00, "\\DTM2._XT2", 0x00) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\DTM2._XT2", 0x00) } Unload (Arg1) @@ -838,7 +838,7 @@ If (CondRefOf (\DTM2._XT2, Local0)) { - ERR (Arg0, Z176, 0x030C, 0x00, 0x00, "\\DTM2._XT2", 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\DTM2._XT2", 0x01) Return (0x01) } @@ -872,7 +872,7 @@ Concatenate (Arg0, "-tst4", Arg0) If (CondRefOf (\DTM2._XT2, Local0)) { - ERR (Arg0, Z176, 0x032E, 0x00, 0x00, "\\DTM2._XT2", 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\DTM2._XT2", 0x01) Return (0x01) } @@ -973,13 +973,13 @@ Concatenate (Arg0, "-tst5", Arg0) If (CondRefOf (\_XT2, Local0)) { - ERR (Arg0, Z176, 0x03A7, 0x00, 0x00, "\\_XT2", 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x01) Return (0x01) } If (CondRefOf (\DTM2.DEVR._XT2, Local0)) { - ERR (Arg0, Z176, 0x03AC, 0x00, 0x00, "\\DTM2.DEVR._XT2", 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\DTM2.DEVR._XT2", 0x01) Return (0x01) } @@ -995,24 +995,24 @@ { /* DDB Handle */ - ERR (Arg0, Z176, 0x03BA, 0x00, 0x00, Local1, C017) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local1, C017) Return (0x01) } If ((0x01 != \DTM2.PLDT)) { - ERR (Arg0, Z176, 0x03BF, 0x00, 0x00, \DTM2.PLDT, 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, \DTM2.PLDT, 0x01) } If (CondRefOf (\_XT2, Local0)) { - ERR (Arg0, Z176, 0x03C3, 0x00, 0x00, "\\_XT2", 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x01) } If (CondRefOf (\DTM2.DEVR._XT2, Local0)){} Else { - ERR (Arg0, Z176, 0x03C8, 0x00, 0x00, "\\DTM2.DEVR._XT2", 0x00) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\DTM2.DEVR._XT2", 0x00) } Unload (DDBH) @@ -1024,12 +1024,12 @@ If (CondRefOf (\_XT2, Local0)) { - ERR (Arg0, Z176, 0x03D3, 0x00, 0x00, "\\_XT2", 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x01) } If (CondRefOf (\DTM2.DEVR._XT2, Local0)) { - ERR (Arg0, Z176, 0x03D7, 0x00, 0x00, "\\DTM2.DEVR._XT2", 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\DTM2.DEVR._XT2", 0x01) } Return (0x00) @@ -1043,7 +1043,7 @@ Concatenate (Arg0, "-tst6", Arg0) If (CondRefOf (\_XT2, Local0)) { - ERR (Arg0, Z176, 0x03E6, 0x00, 0x00, "\\_XT2", 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x01) Return (0x01) } @@ -1059,19 +1059,19 @@ { /* DDB Handle */ - ERR (Arg0, Z176, 0x03F4, 0x00, 0x00, Local1, C017) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local1, C017) Return (0x01) } If ((0x01 != \DTM2.PLDT)) { - ERR (Arg0, Z176, 0x03F9, 0x00, 0x00, \DTM2.PLDT, 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, \DTM2.PLDT, 0x01) } If (CondRefOf (\_XT2, Local0)){} Else { - ERR (Arg0, Z176, 0x03FE, 0x00, 0x00, "\\_XT2", 0x00) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x00) } Unload (DDBH) @@ -1083,7 +1083,7 @@ If (CondRefOf (\_XT2, Local0)) { - ERR (Arg0, Z176, 0x0409, 0x00, 0x00, "\\_XT2", 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x01) } Return (0x00) @@ -1109,13 +1109,13 @@ { /* DDB Handle */ - ERR (Arg0, Z176, 0x0422, 0x00, 0x00, Local1, C017) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local1, C017) Return (0x01) } If ((0x01 != PLDT)) { - ERR (Arg0, Z176, 0x0427, 0x00, 0x00, PLDT, 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, PLDT, 0x01) } Unload (DDBH) @@ -1137,18 +1137,18 @@ { /* DDB Handle */ - ERR (Arg0, Z176, 0x043B, 0x00, 0x00, Local1, C017) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local1, C017) Return (0x01) } If ((0x00 != PLDT)) { - ERR (Arg0, Z176, 0x0440, 0x00, 0x00, PLDT, 0x00) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, PLDT, 0x00) } If ((0x01 != \DTM2.PLDT)) { - ERR (Arg0, Z176, 0x0444, 0x00, 0x00, \DTM2.PLDT, 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, \DTM2.PLDT, 0x01) } Unload (DDBH) @@ -1182,7 +1182,7 @@ CH04 (Arg0, 0x00, 0x3D, Z176, 0x0462, 0x00, 0x00) /* AE_AML_STRING_LIMIT */ If ((0x00 != \DTM2.PLDT)) { - ERR (Arg0, Z176, 0x0465, 0x00, 0x00, \DTM2.PLDT, 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, \DTM2.PLDT, 0x01) If (Y287) { Return (0x01) @@ -1202,7 +1202,7 @@ CH04 (Arg0, 0x00, 0x3D, Z176, 0x0473, 0x00, 0x00) /* AE_AML_STRING_LIMIT */ If ((0x00 != \DTM2.PLDT)) { - ERR (Arg0, Z176, 0x0476, 0x00, 0x00, \DTM2.PLDT, 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, \DTM2.PLDT, 0x01) Return (0x01) } @@ -1212,7 +1212,7 @@ CH04 (Arg0, 0x00, 0x3D, Z176, 0x047D, 0x00, 0x00) /* AE_AML_STRING_LIMIT */ If ((0x00 != \DTM2.PLDT)) { - ERR (Arg0, Z176, 0x0480, 0x00, 0x00, \DTM2.PLDT, 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, \DTM2.PLDT, 0x01) Return (0x01) } @@ -1231,7 +1231,7 @@ CH04 (Arg0, 0x00, 0x07, Z176, 0x0492, 0x00, 0x00) /* AE_ALREADY_EXISTS */ If ((0x00 != \DTM2.PLDT)) { - ERR (Arg0, Z176, 0x0495, 0x00, 0x00, \DTM2.PLDT, 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, \DTM2.PLDT, 0x01) } /* SignatureString is "SSDT" */ @@ -1240,7 +1240,7 @@ CH04 (Arg0, 0x00, 0x07, Z176, 0x049B, 0x00, 0x00) /* AE_ALREADY_EXISTS */ If ((0x00 != \DTM2.PLDT)) { - ERR (Arg0, Z176, 0x049E, 0x00, 0x00, \DTM2.PLDT, 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, \DTM2.PLDT, 0x01) } Return (0x00) @@ -1254,7 +1254,7 @@ Concatenate (Arg0, "-tsta", Arg0) If (CondRefOf (\_XT2, Local0)) { - ERR (Arg0, Z176, 0x04AC, 0x00, 0x00, "\\_XT2", 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x01) Return (0x01) } @@ -1270,19 +1270,19 @@ { /* DDB Handle */ - ERR (Arg0, Z176, 0x04BA, 0x00, 0x00, Local1, C017) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local1, C017) Return (0x01) } If ((0x01 != \DTM2.PLDT)) { - ERR (Arg0, Z176, 0x04BF, 0x00, 0x00, \DTM2.PLDT, 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, \DTM2.PLDT, 0x01) } If (CondRefOf (\_XT2, Local0)){} Else { - ERR (Arg0, Z176, 0x04C4, 0x00, 0x00, "\\_XT2", 0x00) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x00) } \DTM2.PLDT = 0x00 @@ -1290,18 +1290,18 @@ CH04 (Arg0, 0x00, 0x07, Z176, 0x04CB, 0x00, 0x00) /* AE_ALREADY_EXISTS */ If ((0x00 != \DTM2.PLDT)) { - ERR (Arg0, Z176, 0x04CE, 0x00, 0x00, \DTM2.PLDT, 0x00) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, \DTM2.PLDT, 0x00) } If (CondRefOf (\DTM2._XT2, Local0)) { - ERR (Arg0, Z176, 0x04D2, 0x00, 0x00, "\\DTM2._XT2", 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\DTM2._XT2", 0x01) } If (CondRefOf (\_XT2, Local0)){} Else { - ERR (Arg0, Z176, 0x04D7, 0x00, 0x00, "\\_XT2", 0x00) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x00) } Unload (DDBH) @@ -1313,7 +1313,7 @@ If (CondRefOf (\_XT2, Local0)) { - ERR (Arg0, Z176, 0x04E2, 0x00, 0x00, "\\_XT2", 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x01) } Return (0x00) @@ -1347,7 +1347,7 @@ Concatenate (Arg0, "-tstb", Arg0) If (CondRefOf (\_XT2, Local0)) { - ERR (Arg0, Z176, 0x0504, 0x00, 0x00, "\\_XT2", 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x01) Return (0x01) } @@ -1363,14 +1363,14 @@ { /* DDB Handle */ - ERR (Arg0, Z176, 0x0511, 0x00, 0x00, Local1, C017) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local1, C017) Return (0x01) } If (CondRefOf (\_XT2, Local0)){} Else { - ERR (Arg0, Z176, 0x0517, 0x00, 0x00, "\\_XT2", 0x00) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x00) } \DTM2.PLDT = 0x00 @@ -1378,13 +1378,13 @@ CH04 (Arg0, 0x00, 0x07, Z176, 0x051E, 0x00, 0x00) /* AE_ALREADY_EXISTS */ If ((0x00 != \DTM2.PLDT)) { - ERR (Arg0, Z176, 0x0521, 0x00, 0x00, \DTM2.PLDT, 0x00) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, \DTM2.PLDT, 0x00) } If (CondRefOf (\_XT2, Local0)){} Else { - ERR (Arg0, Z176, 0x0526, 0x00, 0x00, "\\_XT2", 0x00) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x00) } Unload (DDBH) @@ -1396,7 +1396,7 @@ If (CondRefOf (\_XT2, Local0)) { - ERR (Arg0, Z176, 0x0531, 0x00, 0x00, "\\_XT2", 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x01) } Return (0x00) @@ -1422,12 +1422,12 @@ CH04 (Arg0, 0x00, 0x2F, Z176, 0x054E, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ If ((0x00 != \DTM2.PLDT)) { - ERR (Arg0, Z176, 0x0551, 0x00, 0x00, \DTM2.PLDT, 0x00) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, \DTM2.PLDT, 0x00) } If (CondRefOf (\_XT2, Local0)) { - ERR (Arg0, Z176, 0x0555, 0x00, 0x00, "\\_XT2", 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x01) } Return (0x00) @@ -1484,7 +1484,7 @@ If ((0x00 != \DTM2.PLDT)) { - ERR (Arg0, Z176, 0x0588, 0x00, 0x00, \DTM2.PLDT, 0x00) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, \DTM2.PLDT, 0x00) Return (0x01) } @@ -1498,13 +1498,13 @@ { /* Integer */ - ERR (Arg0, Z176, 0x0593, 0x00, 0x00, Local5, C009) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local5, C009) Return (0x01) } If ((0x00 != DDBH)) { - ERR (Arg0, Z176, 0x0598, 0x00, 0x00, DDBH, 0x00) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, DDBH, 0x00) Return (0x01) } @@ -1555,31 +1555,31 @@ If ((ToBuffer (SOEM) != Local0)) { - ERR (Arg0, Z176, 0x05B9, 0x00, 0x00, Local0, ToBuffer (SOEM)) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, ToBuffer (SOEM)) Return (0x01) } If ((ToBuffer (SOID) != Local1)) { - ERR (Arg0, Z176, 0x05BE, 0x00, 0x00, Local1, ToBuffer (SOID)) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local1, ToBuffer (SOID)) Return (0x01) } If ((ToBuffer (STID) != Local2)) { - ERR (Arg0, Z176, 0x05C3, 0x00, 0x00, Local2, ToBuffer (STID)) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local2, ToBuffer (STID)) Return (0x01) } If ((ToBuffer (RPST) != Local3)) { - ERR (Arg0, Z176, 0x05C8, 0x00, 0x00, Local3, ToBuffer (RPST)) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local3, ToBuffer (RPST)) Return (0x01) } If ((ToBuffer (PPST) != Local4)) { - ERR (Arg0, Z176, 0x05CD, 0x00, 0x00, Local4, ToBuffer (PPST)) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local4, ToBuffer (PPST)) Return (0x01) } @@ -1609,7 +1609,7 @@ { If (CondRefOf (\_XT2, Local0)) { - ERR (Arg0, Z176, 0x05E3, 0x00, 0x00, "\\_XT2", 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x01) Return (0x01) } @@ -1624,14 +1624,14 @@ If ((0x01 != \DTM2.PLDT)) { - ERR (Arg0, Z176, 0x05F3, 0x00, 0x00, \DTM2.PLDT, 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, \DTM2.PLDT, 0x01) Return (0x01) } If (CondRefOf (\_XT2, Local0)){} Else { - ERR (Arg0, Z176, 0x05F9, 0x00, 0x00, "\\_XT2", 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x01) Return (0x01) } @@ -1643,7 +1643,7 @@ If (CondRefOf (\_XT2, Local0)) { - ERR (Arg0, Z176, 0x0604, 0x00, 0x00, "\\_XT2", 0x01) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, "\\_XT2", 0x01) Return (0x01) } } @@ -1745,7 +1745,7 @@ Local0 = ObjectType (Arg2) If ((Arg3 != Local0)) { - ERR (Arg0, Z176, 0x0678, 0x00, 0x00, Local0, Arg3) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, Arg3) Return (0x01) } @@ -1761,7 +1761,7 @@ Local0 = ObjectType (Arg2) If ((Arg3 != Local0)) { - ERR (Arg0, Z176, 0x0689, 0x00, 0x00, Local0, Arg3) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, Arg3) Return (0x01) } @@ -1777,7 +1777,7 @@ Local0 = ObjectType (Arg2) If ((Arg3 != Local0)) { - ERR (Arg0, Z176, 0x069A, 0x00, 0x00, Local0, Arg3) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, Arg3) Return (0x01) } @@ -1793,7 +1793,7 @@ Local0 = ObjectType (Arg2) If ((Arg3 != Local0)) { - ERR (Arg0, Z176, 0x06AB, 0x00, 0x00, Local0, Arg3) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, Arg3) Return (0x01) } @@ -1817,7 +1817,7 @@ Local0 = ObjectType (Arg2) If ((Arg3 != Local0)) { - ERR (Arg0, Z176, 0x06C0, 0x00, 0x00, Local0, Arg3) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, Arg3) Return (0x01) } @@ -1854,7 +1854,7 @@ Local0 = ObjectType (Local1) If ((C008 != Local0)) { - ERR (Arg0, Z176, 0x06DE, 0x00, 0x00, Local0, C008) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, C008) } Else { @@ -1954,7 +1954,7 @@ Local0 = ObjectType (\AUXD.PAC0) If ((C00C != Local0)) { - ERR (Arg0, Z176, 0x0726, 0x00, 0x00, Local0, C00C) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, C00C) } /* Field Unit */ @@ -1976,7 +1976,7 @@ Local0 = ObjectType (\AUXD.DEV0) If ((C00E != Local0)) { - ERR (Arg0, Z176, 0x073A, 0x00, 0x00, Local0, C00E) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, C00E) } /* Event */ @@ -2036,7 +2036,7 @@ Local0 = ObjectType (\AUXD.TZN0) If ((C015 != Local0)) { - ERR (Arg0, Z176, 0x0774, 0x00, 0x00, Local0, C015) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, C015) } /* Buffer Field */ @@ -2074,7 +2074,7 @@ Local0 = ObjectType (Local1) If ((C008 != Local0)) { - ERR (Arg0, Z176, 0x0799, 0x00, 0x00, Local0, C008) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, C008) } /* Bug 288: iASL unexpectedly forbids ParameterData of Loadtable to be LocalX or UserTerm */ /* @@ -2094,7 +2094,7 @@ Local0 = ObjectType (\DTM2.PLDT) If ((C009 != Local0)) { - ERR (Arg0, Z176, 0x07A9, 0x00, 0x00, Local0, C009) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, C009) Return (0x01) } @@ -2107,13 +2107,13 @@ Local0 = ObjectType (\DTM2.PLDT) If ((C009 != Local0)) { - ERR (Arg0, Z176, 0x07B2, 0x00, 0x00, Local0, C009) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, C009) Return (0x01) } If ((\DTM2.PLDT != \AUXD.INT0)) { - ERR (Arg0, Z176, 0x07B6, 0x00, 0x00, \DTM2.PLDT, \AUXD.INT0) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, \DTM2.PLDT, \AUXD.INT0) Return (0x01) } @@ -2126,7 +2126,7 @@ Local0 = ObjectType (\AUXD.INT0) If ((C009 != Local0)) { - ERR (Arg0, Z176, 0x07BF, 0x00, 0x00, Local0, C009) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, C009) } /* String */ @@ -2136,7 +2136,7 @@ Local0 = ObjectType (\DTM2.PLDT) If ((C009 != Local0)) { - ERR (Arg0, Z176, 0x07C6, 0x00, 0x00, Local0, C009) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, C009) Return (0x01) } @@ -2149,13 +2149,13 @@ Local0 = ObjectType (\DTM2.PLDT) If ((C009 != Local0)) { - ERR (Arg0, Z176, 0x07CF, 0x00, 0x00, Local0, C009) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, C009) Return (0x01) } If ((\DTM2.PLDT != \AUXD.STR0)) { - ERR (Arg0, Z176, 0x07D3, 0x00, 0x00, \DTM2.PLDT, \AUXD.STR0) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, \DTM2.PLDT, \AUXD.STR0) Return (0x01) } @@ -2168,7 +2168,7 @@ Local0 = ObjectType (\AUXD.STR0) If ((C00A != Local0)) { - ERR (Arg0, Z176, 0x07DC, 0x00, 0x00, Local0, C00A) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, C00A) } } @@ -2179,7 +2179,7 @@ Local0 = ObjectType (\DTM2.PLDT) If ((C009 != Local0)) { - ERR (Arg0, Z176, 0x07E4, 0x00, 0x00, Local0, C009) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, C009) Return (0x01) } @@ -2192,13 +2192,13 @@ Local0 = ObjectType (\DTM2.PLDT) If ((C009 != Local0)) { - ERR (Arg0, Z176, 0x07ED, 0x00, 0x00, Local0, C009) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, C009) Return (0x01) } If ((\DTM2.PLDT != \AUXD.BUF0)) { - ERR (Arg0, Z176, 0x07F1, 0x00, 0x00, \DTM2.PLDT, \AUXD.BUF0) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, \DTM2.PLDT, \AUXD.BUF0) Return (0x01) } @@ -2211,7 +2211,7 @@ Local0 = ObjectType (\AUXD.BUF0) If ((C00B != Local0)) { - ERR (Arg0, Z176, 0x07FA, 0x00, 0x00, Local0, C00B) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, C00B) } } @@ -2222,7 +2222,7 @@ Local0 = ObjectType (\AUXD.PAC0) If ((C00C != Local0)) { - ERR (Arg0, Z176, 0x0803, 0x00, 0x00, Local0, C00C) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, C00C) } /* Field Unit */ @@ -2232,7 +2232,7 @@ Local0 = ObjectType (\DTM2.PLDT) If ((C009 != Local0)) { - ERR (Arg0, Z176, 0x080A, 0x00, 0x00, Local0, C009) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, C009) Return (0x01) } @@ -2245,13 +2245,13 @@ Local0 = ObjectType (\DTM2.PLDT) If ((C009 != Local0)) { - ERR (Arg0, Z176, 0x0813, 0x00, 0x00, Local0, C009) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, C009) Return (0x01) } If ((\DTM2.PLDT != \AUXD.FLU0)) { - ERR (Arg0, Z176, 0x0817, 0x00, 0x00, \DTM2.PLDT, \AUXD.FLU0) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, \DTM2.PLDT, \AUXD.FLU0) Return (0x01) } @@ -2264,7 +2264,7 @@ Local0 = ObjectType (\AUXD.FLU0) If ((C00D != Local0)) { - ERR (Arg0, Z176, 0x0820, 0x00, 0x00, Local0, C00D) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, C00D) } } @@ -2275,7 +2275,7 @@ Local0 = ObjectType (\AUXD.DEV0) If ((C00E != Local0)) { - ERR (Arg0, Z176, 0x0829, 0x00, 0x00, Local0, C00E) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, C00E) } /* Event */ @@ -2285,7 +2285,7 @@ Local0 = ObjectType (\AUXD.EVE0) If ((C00F != Local0)) { - ERR (Arg0, Z176, 0x0831, 0x00, 0x00, Local0, C00F) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, C00F) } /* Method */ @@ -2297,7 +2297,7 @@ Local0 = ObjectType (\AUXD.MMM0) If ((C010 != Local0)) { - ERR (Arg0, Z176, 0x083A, 0x00, 0x00, Local0, C010) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, C010) } } @@ -2308,7 +2308,7 @@ Local0 = ObjectType (\AUXD.MTX0) If ((C011 != Local0)) { - ERR (Arg0, Z176, 0x0843, 0x00, 0x00, Local0, C011) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, C011) } /* OpRegion */ @@ -2318,7 +2318,7 @@ Local0 = ObjectType (\AUXD.OPR0) If ((C012 != Local0)) { - ERR (Arg0, Z176, 0x084B, 0x00, 0x00, Local0, C012) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, C012) } /* Power Resource */ @@ -2328,7 +2328,7 @@ Local0 = ObjectType (\AUXD.PWR0) If ((C013 != Local0)) { - ERR (Arg0, Z176, 0x0853, 0x00, 0x00, Local0, C013) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, C013) } /* Processor */ @@ -2338,7 +2338,7 @@ Local0 = ObjectType (\AUXD.CPU0) If ((C014 != Local0)) { - ERR (Arg0, Z176, 0x085B, 0x00, 0x00, Local0, C014) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, C014) } /* Thermal Zone */ @@ -2348,7 +2348,7 @@ Local0 = ObjectType (\AUXD.TZN0) If ((C015 != Local0)) { - ERR (Arg0, Z176, 0x0863, 0x00, 0x00, Local0, C015) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, C015) } /* Buffer Field */ @@ -2358,7 +2358,7 @@ Local0 = ObjectType (\DTM2.PLDT) If ((C009 != Local0)) { - ERR (Arg0, Z176, 0x086A, 0x00, 0x00, Local0, C009) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, C009) Return (0x01) } @@ -2371,13 +2371,13 @@ Local0 = ObjectType (\DTM2.PLDT) If ((C009 != Local0)) { - ERR (Arg0, Z176, 0x0873, 0x00, 0x00, Local0, C009) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, C009) Return (0x01) } If ((\DTM2.PLDT != \AUXD.BFL0)) { - ERR (Arg0, Z176, 0x0877, 0x00, 0x00, \DTM2.PLDT, \AUXD.BFL0) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, \DTM2.PLDT, \AUXD.BFL0) Return (0x01) } @@ -2390,7 +2390,7 @@ Local0 = ObjectType (\AUXD.BFL0) If ((C016 != Local0)) { - ERR (Arg0, Z176, 0x0880, 0x00, 0x00, Local0, C016) + ERR (Arg0, Z176, __LINE__, 0x00, 0x00, Local0, C016) } } diff --git a/tests/aslts/src/runtime/collections/functional/table/unload.asl b/tests/aslts/src/runtime/collections/functional/table/unload.asl index 314e72739..b0f2bb7c4 100644 --- a/tests/aslts/src/runtime/collections/functional/table/unload.asl +++ b/tests/aslts/src/runtime/collections/functional/table/unload.asl @@ -91,7 +91,7 @@ \DTM0.RFU0 = \DTM0.BUF0 If (CondRefOf (\SSS0, Local0)) { - ERR (Arg0, Z175, 0x62, 0x00, 0x00, "\\SSS0", 0x01) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, "\\SSS0", 0x01) Return (Zero) } @@ -119,7 +119,7 @@ { /* DDB Handle */ - ERR (Arg0, Z175, 0x7B, 0x00, 0x00, Local1, C017) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, Local1, C017) } /* Check the new Object appears */ @@ -127,7 +127,7 @@ If (CondRefOf (\SSS0, Local0)){} Else { - ERR (Arg0, Z175, 0x82, 0x00, 0x00, "\\SSS0", 0x00) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, "\\SSS0", 0x00) } Local1 = ObjectType (Local0) @@ -135,7 +135,7 @@ { /* Method */ - ERR (Arg0, Z175, 0x87, 0x00, 0x00, Local1, C010) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, Local1, C010) } Else { @@ -147,7 +147,7 @@ If (("\\SSS0" != Local0)) { - ERR (Arg0, Z175, 0x8E, 0x00, 0x00, Local0, "\\SSS0") + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, Local0, "\\SSS0") } } @@ -162,7 +162,7 @@ Debug = "Table Unloaded" If (CondRefOf (\SSS0, Local0)) { - ERR (Arg0, Z175, 0x9C, 0x00, 0x00, "\\SSS0", 0x01) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, "\\SSS0", 0x01) } Return (Zero) @@ -181,7 +181,7 @@ Local0 = ObjectType (Arg2) If ((Arg3 != Local0)) { - ERR (Arg0, Z175, 0xAF, 0x00, 0x00, Local0, Arg3) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, Local0, Arg3) Return (0x01) } @@ -195,7 +195,7 @@ If (CondRefOf (\AUXD.INT0, Local0)) { - ERR (Arg0, Z175, 0xBC, 0x00, 0x00, "\\AUXD.INT0", 0x01) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, "\\AUXD.INT0", 0x01) Return (0x01) } @@ -203,7 +203,7 @@ If (CondRefOf (\AUXD.STR0, Local0)) { - ERR (Arg0, Z175, 0xC2, 0x00, 0x00, "\\AUXD.STR0", 0x01) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, "\\AUXD.STR0", 0x01) Return (0x01) } @@ -211,7 +211,7 @@ If (CondRefOf (\AUXD.BUF0, Local0)) { - ERR (Arg0, Z175, 0xC8, 0x00, 0x00, "\\AUXD.BUF0", 0x01) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, "\\AUXD.BUF0", 0x01) Return (0x01) } @@ -219,7 +219,7 @@ If (CondRefOf (\AUXD.PAC0, Local0)) { - ERR (Arg0, Z175, 0xCE, 0x00, 0x00, "\\AUXD.PAC0", 0x01) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, "\\AUXD.PAC0", 0x01) Return (0x01) } @@ -227,7 +227,7 @@ If (CondRefOf (\AUXD.FLU0, Local0)) { - ERR (Arg0, Z175, 0xD4, 0x00, 0x00, "\\AUXD.FLU0", 0x01) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, "\\AUXD.FLU0", 0x01) Return (0x01) } @@ -235,7 +235,7 @@ If (CondRefOf (\AUXD.DEV0, Local0)) { - ERR (Arg0, Z175, 0xDA, 0x00, 0x00, "\\AUXD.DEV0", 0x01) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, "\\AUXD.DEV0", 0x01) Return (0x01) } @@ -243,7 +243,7 @@ If (CondRefOf (\AUXD.EVE0, Local0)) { - ERR (Arg0, Z175, 0xE0, 0x00, 0x00, "\\AUXD.EVE0", 0x01) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, "\\AUXD.EVE0", 0x01) Return (0x01) } @@ -251,7 +251,7 @@ If (CondRefOf (\AUXD.MMM0, Local0)) { - ERR (Arg0, Z175, 0xE6, 0x00, 0x00, "\\AUXD.MMM0", 0x01) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, "\\AUXD.MMM0", 0x01) Return (0x01) } @@ -259,7 +259,7 @@ If (CondRefOf (\AUXD.MTX0, Local0)) { - ERR (Arg0, Z175, 0xEC, 0x00, 0x00, "\\AUXD.MTX0", 0x01) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, "\\AUXD.MTX0", 0x01) Return (0x01) } @@ -267,7 +267,7 @@ If (CondRefOf (\AUXD.OPR0, Local0)) { - ERR (Arg0, Z175, 0xF2, 0x00, 0x00, "\\AUXD.OPR0", 0x01) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, "\\AUXD.OPR0", 0x01) Return (0x01) } @@ -275,7 +275,7 @@ If (CondRefOf (\AUXD.PWR0, Local0)) { - ERR (Arg0, Z175, 0xF8, 0x00, 0x00, "\\AUXD.PWR0", 0x01) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, "\\AUXD.PWR0", 0x01) Return (0x01) } @@ -283,7 +283,7 @@ If (CondRefOf (\AUXD.CPU0, Local0)) { - ERR (Arg0, Z175, 0xFE, 0x00, 0x00, "\\AUXD.CPU0", 0x01) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, "\\AUXD.CPU0", 0x01) Return (0x01) } @@ -291,7 +291,7 @@ If (CondRefOf (\AUXD.TZN0, Local0)) { - ERR (Arg0, Z175, 0x0104, 0x00, 0x00, "\\AUXD.TZN0", 0x01) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, "\\AUXD.TZN0", 0x01) Return (0x01) } @@ -299,7 +299,7 @@ If (CondRefOf (\AUXD.BFL0, Local0)) { - ERR (Arg0, Z175, 0x010A, 0x00, 0x00, "\\AUXD.BFL0", 0x01) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, "\\AUXD.BFL0", 0x01) Return (0x01) } @@ -331,7 +331,7 @@ } Else { - ERR (Arg0, Z175, 0x0124, 0x00, 0x00, "\\AUXD.INT0", 0x00) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, "\\AUXD.INT0", 0x00) } /* String */ @@ -342,7 +342,7 @@ } Else { - ERR (Arg0, Z175, 0x012B, 0x00, 0x00, "\\AUXD.STR0", 0x00) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, "\\AUXD.STR0", 0x00) } /* Buffer */ @@ -353,7 +353,7 @@ } Else { - ERR (Arg0, Z175, 0x0132, 0x00, 0x00, "\\AUXD.BUF0", 0x00) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, "\\AUXD.BUF0", 0x00) } /* Package */ @@ -366,7 +366,7 @@ } Else { - ERR (Arg0, Z175, 0x013A, 0x00, 0x00, "\\AUXD.PAC0", 0x00) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, "\\AUXD.PAC0", 0x00) } } @@ -378,7 +378,7 @@ } Else { - ERR (Arg0, Z175, 0x0142, 0x00, 0x00, "\\AUXD.FLU0", 0x00) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, "\\AUXD.FLU0", 0x00) } /* Device */ @@ -389,7 +389,7 @@ } Else { - ERR (Arg0, Z175, 0x0149, 0x00, 0x00, "\\AUXD.DEV0", 0x00) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, "\\AUXD.DEV0", 0x00) } /* Event */ @@ -400,7 +400,7 @@ } Else { - ERR (Arg0, Z175, 0x0150, 0x00, 0x00, "\\AUXD.EVE0", 0x00) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, "\\AUXD.EVE0", 0x00) } /* Method */ @@ -411,7 +411,7 @@ } Else { - ERR (Arg0, Z175, 0x0157, 0x00, 0x00, "\\AUXD.MMM0", 0x00) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, "\\AUXD.MMM0", 0x00) } /* Mutex */ @@ -422,7 +422,7 @@ } Else { - ERR (Arg0, Z175, 0x015E, 0x00, 0x00, "\\AUXD.MTX0", 0x00) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, "\\AUXD.MTX0", 0x00) } /* OpRegion */ @@ -433,7 +433,7 @@ } Else { - ERR (Arg0, Z175, 0x0165, 0x00, 0x00, "\\AUXD.OPR0", 0x00) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, "\\AUXD.OPR0", 0x00) } /* Power Resource */ @@ -444,7 +444,7 @@ } Else { - ERR (Arg0, Z175, 0x016C, 0x00, 0x00, "\\AUXD.PWR0", 0x00) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, "\\AUXD.PWR0", 0x00) } /* Processor */ @@ -455,7 +455,7 @@ } Else { - ERR (Arg0, Z175, 0x0173, 0x00, 0x00, "\\AUXD.CPU0", 0x00) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, "\\AUXD.CPU0", 0x00) } /* Thermal Zone */ @@ -466,7 +466,7 @@ } Else { - ERR (Arg0, Z175, 0x017A, 0x00, 0x00, "\\AUXD.TZN0", 0x00) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, "\\AUXD.TZN0", 0x00) } /* Buffer Field */ @@ -477,7 +477,7 @@ } Else { - ERR (Arg0, Z175, 0x0181, 0x00, 0x00, "\\AUXD.BFL0", 0x00) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, "\\AUXD.BFL0", 0x00) } Unload (DDB0) @@ -524,7 +524,7 @@ Local0 = ObjectType (Arg2) If ((Arg3 != Local0)) { - ERR (Arg0, Z175, 0x01AF, 0x00, 0x00, Local0, Arg3) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, Local0, Arg3) Return (0x01) } @@ -553,7 +553,7 @@ Local0 = ObjectType (Local1) If ((C008 != Local0)) { - ERR (Arg0, Z175, 0x01C9, 0x00, 0x00, Local0, C008) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, Local0, C008) } Else { @@ -587,7 +587,7 @@ Local0 = ObjectType (\AUXD.PAC0) If ((C00C != Local0)) { - ERR (Arg0, Z175, 0x01E4, 0x00, 0x00, Local0, C00C) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, Local0, C00C) } Else { @@ -603,7 +603,7 @@ Local0 = ObjectType (\AUXD.DEV0) If ((C00E != Local0)) { - ERR (Arg0, Z175, 0x01F0, 0x00, 0x00, Local0, C00E) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, Local0, C00E) } Else { @@ -634,7 +634,7 @@ Local0 = ObjectType (\AUXD.TZN0) If ((C015 != Local0)) { - ERR (Arg0, Z175, 0x020B, 0x00, 0x00, Local0, C015) + ERR (Arg0, Z175, __LINE__, 0x00, 0x00, Local0, C015) } Else { diff --git a/tests/aslts/src/runtime/collections/mt/mutex/common.asl b/tests/aslts/src/runtime/collections/mt/mutex/common.asl index 7202fee94..82231529c 100644 --- a/tests/aslts/src/runtime/collections/mt/mutex/common.asl +++ b/tests/aslts/src/runtime/collections/mt/mutex/common.asl @@ -671,7 +671,7 @@ * lpC0 - Index of thread * Local0 - the scale of its errors */ - ERR (Arg0, Z147, 0x027E, 0x00, 0x00, LPC0, Local0) + ERR (Arg0, Z147, __LINE__, 0x00, 0x00, LPC0, Local0) } LPN0-- @@ -710,7 +710,7 @@ Local1 = ObjectType (Local0) If ((Local1 != C00C)) { - ERR ("m107", Z147, 0x02A4, 0x00, 0x00, Local1, C00C) + ERR ("m107", Z147, __LINE__, 0x00, 0x00, Local1, C00C) Return (0x00) } @@ -720,13 +720,13 @@ Local7 = DerefOf (Local0 [0x01]) If ((Local6 != Arg1)) { - ERR ("m107", Z147, 0x02AD, 0x00, 0x00, Local6, Arg1) + ERR ("m107", Z147, __LINE__, 0x00, 0x00, Local6, Arg1) Return (0x00) } If ((Local7 != Arg2)) { - ERR ("m107", Z147, 0x02B2, 0x00, 0x00, Local7, Arg2) + ERR ("m107", Z147, __LINE__, 0x00, 0x00, Local7, Arg2) Return (0x00) } } @@ -939,7 +939,7 @@ { If ((Local0 != CMD0)) { - ERR ("m110", Z147, 0x0380, 0x00, 0x00, Local0, CMD0) + ERR ("m110", Z147, __LINE__, 0x00, 0x00, Local0, CMD0) Debug = LPC0 /* \M110.LPC0 */ } @@ -954,7 +954,7 @@ { /* Has executed unexpected command */ - ERR ("m110", Z147, 0x0389, 0x00, 0x00, Local1, Local0) + ERR ("m110", Z147, __LINE__, 0x00, 0x00, Local1, Local0) Debug = LPC0 /* \M110.LPC0 */ } } @@ -981,11 +981,11 @@ { /* Has executed unexpected command */ - ERR ("m110", Z147, 0x039C, 0x00, 0x00, Local1, Local0) + ERR ("m110", Z147, __LINE__, 0x00, 0x00, Local1, Local0) Debug = LPC0 /* \M110.LPC0 */ } - ERR ("m110", Z147, 0x039F, 0x00, 0x00, Local0, Local4) + ERR ("m110", Z147, __LINE__, 0x00, 0x00, Local0, Local4) Debug = LPC0 /* \M110.LPC0 */ } } @@ -993,7 +993,7 @@ { If ((Local0 != C100)) { - ERR ("m110", Z147, 0x03A4, 0x00, 0x00, Local0, CMD0) + ERR ("m110", Z147, __LINE__, 0x00, 0x00, Local0, CMD0) Debug = LPC0 /* \M110.LPC0 */ } @@ -1008,13 +1008,13 @@ { /* Has executed unexpected command */ - ERR ("m110", Z147, 0x03AD, 0x00, 0x00, Local0, CMD0) + ERR ("m110", Z147, __LINE__, 0x00, 0x00, Local0, CMD0) Debug = LPC0 /* \M110.LPC0 */ } } Else { - ERR ("m110", Z147, 0x03B1, 0x00, 0x00, LPC0, Local0) + ERR ("m110", Z147, __LINE__, 0x00, 0x00, LPC0, Local0) Debug = LPC0 /* \M110.LPC0 */ } } @@ -1208,7 +1208,7 @@ If (!Arg3) { - ERR ("m112", Z147, 0x045F, 0x00, 0x00, Arg3, 0x01) + ERR ("m112", Z147, __LINE__, 0x00, 0x00, Arg3, 0x01) } } ElseIf (Arg2) diff --git a/tests/aslts/src/runtime/collections/mt/mutex/mxs.asl b/tests/aslts/src/runtime/collections/mt/mutex/mxs.asl index 9c6dcfdbe..11e9a445d 100644 --- a/tests/aslts/src/runtime/collections/mt/mutex/mxs.asl +++ b/tests/aslts/src/runtime/collections/mt/mutex/mxs.asl @@ -560,7 +560,7 @@ Local1 = DerefOf (Local0 [Arg1]) If ((Local1 != Arg2)) { - ERR ("m333", Z149, 0x01EC, 0x00, 0x00, Local1, Arg2) + ERR ("m333", Z149, __LINE__, 0x00, 0x00, Local1, Arg2) Debug = Arg0 Debug = Arg1 } @@ -717,12 +717,12 @@ Local0 = M10F (Arg0, Arg1) If ((Local0 & 0x01)) { - ERR ("m33d", Z149, 0x0280, 0x00, 0x00, Local0, 0x00) + ERR ("m33d", Z149, __LINE__, 0x00, 0x00, Local0, 0x00) } If ((Local0 & 0x02)) { - ERR ("m33d", Z149, 0x0283, 0x00, 0x00, Local0, 0x00) + ERR ("m33d", Z149, __LINE__, 0x00, 0x00, Local0, 0x00) } } @@ -861,7 +861,7 @@ Local0 = M344 (Arg5, Arg6) If (Local0) { - ERR ("m33f: incorrect parameters", Z149, 0x030D, 0x00, 0x00, Arg5, Arg6) + ERR ("m33f: incorrect parameters", Z149, __LINE__, 0x00, 0x00, Arg5, Arg6) Debug = Local0 Return (Zero) } @@ -1132,7 +1132,7 @@ } Default { - ERR ("m341: unexpected command:", Z149, 0x0403, 0x00, 0x00, 0x00, Arg0) + ERR ("m341: unexpected command:", Z149, __LINE__, 0x00, 0x00, 0x00, Arg0) } } @@ -1262,7 +1262,7 @@ If (ERR0) { - ERR ("m333", Z149, 0x0477, 0x00, 0x00, 0x00, 0x00) + ERR ("m333", Z149, __LINE__, 0x00, 0x00, 0x00, 0x00) } Return (B000) /* \M343.B000 */ @@ -1333,14 +1333,14 @@ { /* Expected exceptions but have none */ - ERR ("m333", Z149, 0x04B3, 0x00, 0x00, EXC0, 0x00) + ERR ("m333", Z149, __LINE__, 0x00, 0x00, EXC0, 0x00) } } ElseIf (EXC0) { /* Unexpected exceptions */ - ERR ("m333", Z149, 0x04B8, 0x00, 0x00, EXC0, 0x00) + ERR ("m333", Z149, __LINE__, 0x00, 0x00, EXC0, 0x00) } /*Reset EXC0 (the current number of exceptions handled) */ diff --git a/tests/aslts/src/runtime/collections/mt/mutex/service.asl b/tests/aslts/src/runtime/collections/mt/mutex/service.asl index 8cf39b728..b3d57a972 100644 --- a/tests/aslts/src/runtime/collections/mt/mutex/service.asl +++ b/tests/aslts/src/runtime/collections/mt/mutex/service.asl @@ -78,7 +78,7 @@ Name (IX02, 0x00) If ((Arg3 >= Arg1)) { - ERR ("m210", Z153, 0x55, 0x00, 0x00, Arg3, Arg1) + ERR ("m210", Z153, __LINE__, 0x00, 0x00, Arg3, Arg1) Return (Zero) } @@ -96,7 +96,7 @@ IX02 = (Arg3 + SZ01) /* \M210.SZ01 */ If ((IX02 > Arg1)) { - ERR ("m210", Z153, 0x61, 0x00, 0x00, IX02, Arg1) + ERR ("m210", Z153, __LINE__, 0x00, 0x00, IX02, Arg1) Debug = Arg1 Debug = Arg3 Debug = Arg4 diff --git a/tests/aslts/src/runtime/collections/mt/mutex/tests.asl b/tests/aslts/src/runtime/collections/mt/mutex/tests.asl index 241340c23..68262cf3e 100644 --- a/tests/aslts/src/runtime/collections/mt/mutex/tests.asl +++ b/tests/aslts/src/runtime/collections/mt/mutex/tests.asl @@ -2630,11 +2630,11 @@ M103 (Arg0) If ((FLG2 != THR1)) { - ERR (Arg0, Z152, 0x0953, 0x00, 0x00, FLG2, THR1) + ERR (Arg0, Z152, __LINE__, 0x00, 0x00, FLG2, THR1) } If ((FLG3 != THR2)) { - ERR (Arg0, Z152, 0x0956, 0x00, 0x00, FLG3, THR2) + ERR (Arg0, Z152, __LINE__, 0x00, 0x00, FLG3, THR2) } } diff --git a/tests/aslts/src/runtime/collections/service/condbranches/condbranches.asl b/tests/aslts/src/runtime/collections/service/condbranches/condbranches.asl index 175beddd8..0f59a11d1 100644 --- a/tests/aslts/src/runtime/collections/service/condbranches/condbranches.asl +++ b/tests/aslts/src/runtime/collections/service/condbranches/condbranches.asl @@ -43,7 +43,7 @@ SRMT (Arg1) If (!Arg0) { - ERR (Arg0, Z135, 0x30, 0x00, 0x00, 0x00, 0x01) + ERR (Arg0, Z135, __LINE__, 0x00, 0x00, 0x00, 0x01) } I000++ |