diff options
Diffstat (limited to 'tests/aslts/src/runtime/collections')
155 files changed, 1596 insertions, 1596 deletions
diff --git a/tests/aslts/src/runtime/collections/IMPL/ACPICA/tests/dynobj/dobexceptions.asl b/tests/aslts/src/runtime/collections/IMPL/ACPICA/tests/dynobj/dobexceptions.asl index 47fa4d8d4..0dbbb610f 100644 --- a/tests/aslts/src/runtime/collections/IMPL/ACPICA/tests/dynobj/dobexceptions.asl +++ b/tests/aslts/src/runtime/collections/IMPL/ACPICA/tests/dynobj/dobexceptions.asl @@ -49,7 +49,7 @@ SET0 (Z132, __METHOD__, 0x00) If (RN00) { - CH03 (__METHOD__, Z132, 0x00, 0x3B, 0x00) + CH03 (__METHOD__, Z132, __LINE__, 0x00, 0x00) _TCI (C200, Local1) M000 (0x00) _TCI (C201, PP0A) 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 e83f0fa58..0f8f31c32 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0000/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0000/DECL.asl @@ -39,7 +39,7 @@ * Check that exceptions initiated by some bdemo tests on the * global level are all actually handled and reset at this point. */ - CH03 ("", 0x00, 0x0999, 0x2D, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (0x01 && 0x01) If ((Local0 != ON00)) { diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0014/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0014/DECL.asl index d7e40116a..d61c90c46 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0014/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0014/DECL.asl @@ -37,9 +37,9 @@ Method (MDAF, 0, NotSerialized) { - CH03 ("", 0x00, 0x00, 0x2A, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) MDAE (0x64) - CH03 ("", 0x00, 0x01, 0x2C, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) MDAE (0x65) CH04 (__METHOD__, 0x00, 0x30, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_VALUE */ MDAE (0xFF) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0016/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0016/DECL.asl index c3d61f1ff..8cbc35a96 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0016/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0016/DECL.asl @@ -38,9 +38,9 @@ /* 101 characters */ Local1 = "01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890" - CH03 ("", 0x00, 0x00, 0x2B, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Concatenate (Local0, Local1, Local2) - CH03 ("", 0x00, 0x01, 0x2F, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) /* * The length of String is no more restricted. * 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 d8db0d25f..265f6c51e 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0023/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0023/DECL.asl @@ -36,7 +36,7 @@ Local0 = 0x0000009999999999 Local1 = 0x00000002540BE3FF - CH03 ("", 0x00, 0x00, 0x2A, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) FromBCD (Local0, Local2) If ((Local2 != Local1)) { @@ -47,7 +47,7 @@ Local0 = 0x0000010000000000 Local1 = 0x00000002540BE400 - CH03 ("", 0x00, 0x03, 0x35, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) FromBCD (Local0, Local2) If ((Local2 != Local1)) { @@ -58,12 +58,12 @@ Local0 = 0x00000002540BE400 Local1 = 0x0000010000000000 - CH03 ("", 0x00, 0x06, 0x40, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) ToBCD (Local0, Local2) If ((Local2 != Local1)) { ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local2, Local1) } - CH03 ("", 0x00, 0x00, 0x46, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0028/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0028/DECL.asl index 896818842..e86104127 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0028/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0028/DECL.asl @@ -45,31 +45,31 @@ Method (MDBD, 0, Serialized) { Name (B000, Buffer (0x10){}) - CH03 ("", 0x00, 0x00, 0x34, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) CreateBitField (B000, 0x80, F000) CH04 (__METHOD__, 0x00, 0x36, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ - CH03 ("", 0x00, 0x02, 0x38, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) CreateByteField (B000, 0x10, F001) CH04 (__METHOD__, 0x00, 0x36, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ - CH03 ("", 0x00, 0x04, 0x3C, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) CreateWordField (B000, 0x0F, F002) CH04 (__METHOD__, 0x00, 0x36, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ - CH03 ("", 0x00, 0x06, 0x40, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) CreateDWordField (B000, 0x0D, F003) CH04 (__METHOD__, 0x00, 0x36, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ - CH03 ("", 0x00, 0x08, 0x44, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) CreateQWordField (B000, 0x09, F004) CH04 (__METHOD__, 0x00, 0x36, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ - CH03 ("", 0x00, 0x0A, 0x48, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) CreateField (B000, 0x7F, 0x02, F005) CH04 (__METHOD__, 0x00, 0x36, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ - CH03 ("", 0x00, 0x0C, 0x4C, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) CreateField (B000, 0x78, 0x09, F006) CH04 (__METHOD__, 0x00, 0x36, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ - CH03 ("", 0x00, 0x0E, 0x50, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) CreateField (B000, 0x80, 0x01, F007) CH04 (__METHOD__, 0x00, 0x36, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ - CH03 ("", 0x00, 0x10, 0x54, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) CreateField (B000, 0x79, 0x08, F008) CH04 (__METHOD__, 0x00, 0x36, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ } 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 5af4a1431..32891be06 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 @@ -49,7 +49,7 @@ Name (ID28, 0x00) Method (MDC7, 0, Serialized) { - CH03 ("", 0x00, 0x00, 0x37, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) I000 = 0x12345678 Name (I000, 0x00) CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) @@ -78,15 +78,15 @@ { Name (I000, 0x00) I000 = 0xABCD0000 - CH03 ("", 0x00, 0x02, 0x55, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Name (I001, 0x00) I001 = 0xABCD0001 - CH03 ("", 0x00, 0x03, 0x5A, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Name (I002, 0xABCD0002) - CH03 ("", 0x00, 0x03, 0x5E, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) If (Y084) { - CH03 ("", 0x00, 0x04, 0x62, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Method (M000, 0, Serialized) { Name (I000, 0xABCD0003) @@ -96,7 +96,7 @@ } } - CH03 ("", 0x00, 0x05, 0x6C, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Method (M001, 0, Serialized) { Name (I000, 0xABCD0004) @@ -107,7 +107,7 @@ } } - CH03 ("", 0x00, 0x06, 0x77, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Method (M002, 0, Serialized) { Debug = I000 /* \M802.M002.I000 */ @@ -119,7 +119,7 @@ } } - CH03 ("", 0x00, 0x07, 0x83, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Method (M003, 0, Serialized) { Debug = "------------------------------ 000000000" @@ -131,10 +131,10 @@ } } - CH03 ("", 0x00, 0x08, 0x8F, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } - CH03 ("", 0x00, 0x09, 0x92, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) If ((I000 != 0xABCD0000)) { ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, 0xABCD0000) @@ -152,15 +152,15 @@ If (Y084) { - CH03 ("", 0x00, 0x0D, 0x9F, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) M000 () - CH03 ("", 0x00, 0x0E, 0xA1, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) M001 () - CH03 ("", 0x00, 0x0F, 0xA3, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) M002 () - CH03 ("", 0x00, 0x10, 0xA5, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) M003 () - CH03 ("", 0x00, 0x11, 0xA7, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } Else { @@ -168,7 +168,7 @@ BLCK () } - CH03 ("", 0x00, 0x12, 0xAD, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) II99 = 0xABCD0009 Name (II99, 0x00) CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0048/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0048/DECL.asl index a7f21671f..14129686f 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0048/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0048/DECL.asl @@ -40,12 +40,12 @@ Local1 = "01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890" /* Concatenate 100-byte long string with 101-byte long */ /* string and expect AE_AML_STRING_LIMIT exception. */ - CH03 ("", 0x00, 0x00, 0x2E, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local2 = Concatenate (Local0, Local1) /* * No restriction on the length of String objects now: * * CH04("", 0, 61, 0, __LINE__, 0, 0) // AE_AML_STRING_LIMIT */ - CH03 ("", 0x00, 0x01, 0x38, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0049/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0049/DECL.asl index b93a37222..b40015db7 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0049/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0049/DECL.asl @@ -53,12 +53,12 @@ /* ToDecimalString for 101-byte long buffer attempt */ /* to produce 201 byte long string and have to result */ /* in AE_AML_STRING_LIMIT exception. */ - CH03 ("", 0x00, 0x00, 0x36, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) ToDecimalString (B000, Local0) /* * No restriction on the length of String objects now: * * CH04("", 0, 61, 0, __LINE__, 0, 0) // AE_AML_STRING_LIMIT */ - CH03 ("", 0x00, 0x01, 0x40, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0050/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0050/DECL.asl index f83963796..949e3f584 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0050/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0050/DECL.asl @@ -49,7 +49,7 @@ /* ToHexString for 68-byte long buffer attempt */ /* to produce 203 byte long string and have to */ /* result in AE_AML_STRING_LIMIT exception. */ - CH03 ("", 0x00, 0x00, 0x33, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) ToHexString (B000, Local0) CH04 (__METHOD__, 0x00, 0x3D, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_STRING_LIMIT */ } 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 4de3405b3..c0e06c271 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0061/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0061/DECL.asl @@ -37,7 +37,7 @@ { If (SLCK) { - CH03 ("", 0x00, Arg0, 0x29, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } Else { 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 719130eed..5dfa76aca 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0063/File0.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0063/File0.asl @@ -32,7 +32,7 @@ { /* Hex: 0x - dec */ - CH03 ("", 0x00, 0x0100, 0x25, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) ToInteger ("0x0", Local0) If ((Local0 != 0x00)) { @@ -136,7 +136,7 @@ } } - CH03 ("", 0x00, 0x0219, 0x7D, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } /* @@ -144,7 +144,7 @@ */ Method (MF93, 0, NotSerialized) { - CH03 ("", 0x00, 0x010F, 0x85, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) ToInteger ("0", Local0) If ((Local0 != 0x00)) { @@ -203,7 +203,7 @@ } } - CH03 ("", 0x00, 0x0119, 0xB7, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } /* @@ -212,7 +212,7 @@ */ Method (MF94, 0, NotSerialized) { - CH03 ("", 0x00, 0x011A, 0xC0, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) ToInteger (" 0x0", Local0) If ((Local0 != 0x00)) { @@ -388,7 +388,7 @@ } } - CH03 ("", 0x00, 0x0135, 0x0153, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } /* @@ -396,7 +396,7 @@ */ Method (MF95, 0, NotSerialized) { - CH03 ("", 0x00, 0x0136, 0x015B, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) ToInteger (" 0", Local0) If ((Local0 != 0x00)) { @@ -499,7 +499,7 @@ } } - CH03 ("", 0x00, 0x0219, 0x01B2, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } /* @@ -509,53 +509,53 @@ { /* 5. "1234cd" (non-decimal character in dec-image) */ - CH03 ("", 0x00, 0x0147, 0x01BB, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = "1234cd" ToInteger (Local1, Local0) CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) /* 6. "000x1234" (non-decimal character in dec-image) */ - CH03 ("", 0x00, 0x0149, 0x01C1, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = "000x1234" ToInteger (Local1, Local0) CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) /* 7. "0x1234cdQ" (non-hex character in '0x'-image) */ - CH03 ("", 0x00, 0x014B, 0x01C7, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = "0x1234cdQ" ToInteger (Local1, Local0) CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) - CH03 ("", 0x00, 0x014D, 0x01CC, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = "0x0x12345" ToInteger (Local1, Local0) CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) /* 8. "1234 " (white space in dec image) */ - CH03 ("", 0x00, 0x014F, 0x01D2, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = "1234 " ToInteger (Local1, Local0) CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) /* 9. "0x1234cd " (white space in '0x'-image) */ - CH03 ("", 0x00, 0x0151, 0x01D8, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = "0x1234cd " ToInteger (Local1, Local0) CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) /* 10. "0x 1234cdQ" (white space after '0x') */ - CH03 ("", 0x00, 0x0153, 0x01DE, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = "0x 1234" ToInteger (Local1, Local0) CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) - CH03 ("", 0x00, 0x0155, 0x01E3, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = "0x0x 1234" ToInteger (Local1, Local0) CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) - CH03 ("", 0x00, 0x0157, 0x01E8, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = "0x0x 0x 1234" ToInteger (Local1, Local0) CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) - CH03 ("", 0x00, 0x0159, 0x01ED, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = "0x 0x 1234" ToInteger (Local1, Local0) CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) @@ -563,31 +563,31 @@ /* 32-bit mode – the value exceeding "4294967295" */ If (!F64) { - CH03 ("", 0x00, 0x015B, 0x01F5, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = "4294967296" ToInteger (Local1, Local0) CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) - CH03 ("", 0x00, 0x015D, 0x01FA, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = "123456789012345678904294967296" ToInteger (Local1, Local0) CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) - CH03 ("", 0x00, 0x015F, 0x01FF, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = " \t \t\t00004294967296" ToInteger (Local1, Local0) CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) - CH03 ("", 0x00, 0x0161, 0x0204, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = "\t0123456789012345678904294967296" ToInteger (Local1, Local0) CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) - CH03 ("", 0x00, 0x0163, 0x0209, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = "0123456789012345678904294967296" ToInteger (Local1, Local0) CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) - CH03 ("", 0x00, 0x0165, 0x020E, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = " 123456789012345678904294967296" ToInteger (Local1, Local0) CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) - CH03 ("", 0x00, 0x0167, 0x0213, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = "\t123456789012345678904294967296" ToInteger (Local1, Local0) CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) @@ -595,39 +595,39 @@ /* 64-bit mode – the value exceeding "18446744073709551615" */ - CH03 ("", 0x00, 0x0169, 0x021A, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = "18446744073709551616" ToInteger (Local1, Local0) CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) - CH03 ("", 0x00, 0x016B, 0x021F, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = "\t18446744073709551616" ToInteger (Local1, Local0) CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) - CH03 ("", 0x00, 0x016D, 0x0224, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = " 18446744073709551616" ToInteger (Local1, Local0) CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) - CH03 ("", 0x00, 0x016F, 0x0229, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = "018446744073709551616" ToInteger (Local1, Local0) CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) - CH03 ("", 0x00, 0x0171, 0x022E, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = " \t000000000018446744073709551616" ToInteger (Local1, Local0) CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) /* 12. "0x12345678901234567" (hex image exceeding maximal) */ - CH03 ("", 0x00, 0x0173, 0x0234, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = "0x12345678901234567" ToInteger (Local1, Local0) CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) /* 13. "0x00000000000001234" (hex image exceeding maximal; no matter that zeros) */ - CH03 ("", 0x00, 0x0175, 0x023A, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = "0x00000000000001234" ToInteger (Local1, Local0) CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) - CH03 ("", 0x00, 0x0178, 0x023F, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = "0x0000000000000000000001234" ToInteger (Local1, Local0) CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) @@ -635,7 +635,7 @@ If (!F64) { - CH03 ("", 0x00, 0x017A, 0x0246, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = "0x123456789" ToInteger (Local1, Local0) CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) @@ -643,29 +643,29 @@ /* 15. "0x" (incomplete '0x' image) */ - CH03 ("", 0x00, 0x017C, 0x024D, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = "0x" ToInteger (Local1, Local0) CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) - CH03 ("", 0x00, 0x017E, 0x0252, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = "0x " ToInteger (Local1, Local0) CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) - CH03 ("", 0x00, 0x0180, 0x0257, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = "0x\t" ToInteger (Local1, Local0) CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) - CH03 ("", 0x00, 0x0182, 0x025C, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = "0x 1234" ToInteger (Local1, Local0) CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) - CH03 ("", 0x00, 0x0184, 0x0261, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = "0x\t1234" ToInteger (Local1, Local0) CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) /* 16. Empty string */ - CH03 ("", 0x00, 0x0186, 0x0267, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = "" ToInteger (Local1, Local0) CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) 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 7690b94c0..9a802cd67 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0063/File1.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0063/File1.asl @@ -32,7 +32,7 @@ { /* Hex: 0x - dec */ - CH03 ("", 0x00, 0x0200, 0x25, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("" + 0x00) If ((Local0 != 0x00)) { @@ -85,15 +85,15 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x0208, 0x53, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("0x1ab2cd340fe0567823456789123456789987" + 0x00) - CH03 ("", 0x00, 0x0209, 0x55, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) If ((Local0 != 0x00)) { ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x020B, 0x5B, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } /* @@ -101,42 +101,42 @@ */ Method (MF98, 0, NotSerialized) { - CH03 ("", 0x00, 0x0200, 0x63, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("0" + 0x00) If ((Local0 != 0x00)) { ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x0201, 0x6A, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("0000000" + 0x00) If ((Local0 != 0x00)) { ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x0202, 0x71, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("000000000000000000000000000000" + 0x00) If ((Local0 != 0x00)) { ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x0203, 0x78, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("1" + 0x00) If ((Local0 != 0x01)) { ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x01) } - CH03 ("", 0x00, 0x0204, 0x7F, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("12345678" + 0x00) If ((Local0 != 0x12345678)) { ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } - CH03 ("", 0x00, 0x0205, 0x86, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } /* @@ -144,7 +144,7 @@ */ Method (MF99, 0, NotSerialized) { - CH03 ("", 0x00, 0x0213, 0x8E, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) /* Hex: 0x - dec */ Local0 = ("1234567890123456" + 0x00) @@ -221,7 +221,7 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1A) } - CH03 ("", 0x00, 0x0219, 0xD1, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } /* @@ -231,7 +231,7 @@ { /* 5. "1234cd" (non-decimal character in dec-image) */ - CH03 ("", 0x00, 0x0220, 0xDA, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("1234cd" + 0x00) If ((Local0 != 0x001234CD)) { @@ -240,7 +240,7 @@ /* 6. "000x1234" (non-decimal character in dec-image) */ - CH03 ("", 0x00, 0x0223, 0xE1, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("000x1234" + 0x00) If ((Local0 != 0x00)) { @@ -249,21 +249,21 @@ /* 7. "0x1234cdQ" (non-hex character in '0x'-image) */ - CH03 ("", 0x00, 0x0225, 0xE8, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("0x1234cdQ" + 0x00) If ((Local0 != 0x00)) { ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x0227, 0xED, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("1234cdQ" + 0x00) If ((Local0 != 0x001234CD)) { ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x001234CD) } - CH03 ("", 0x00, 0x0229, 0xF3, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("0x0x12345" + 0x00) If ((Local0 != 0x00)) { @@ -272,7 +272,7 @@ /* 8. "1234 " (white space in dec image) */ - CH03 ("", 0x00, 0x022B, 0xFA, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("1234 " + 0x00) If ((Local0 != 0x1234)) { @@ -281,7 +281,7 @@ /* 9. "0x1234cd " (white space in '0x'-image) */ - CH03 ("", 0x00, 0x022D, 0x0101, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("1234cd " + 0x00) If ((Local0 != 0x001234CD)) { @@ -290,28 +290,28 @@ /* 10. "0x 1234cdQ" (white space after '0x') */ - CH03 ("", 0x00, 0x022F, 0x0108, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("0x 1234" + 0x00) If ((Local0 != 0x00)) { ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x0231, 0x010E, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("0x0x 1234" + 0x00) If ((Local0 != 0x00)) { ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x0233, 0x0114, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("0x0x 0x 1234" + 0x00) If ((Local0 != 0x00)) { ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x0235, 0x011A, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("0x 0x 1234" + 0x00) If ((Local0 != 0x00)) { @@ -322,7 +322,7 @@ /* 32-bit mode – the value exceeding "4294967295" */ If (0x01) { - CH03 ("", 0x00, 0x0237, 0x0123, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("4294967296" + 0x00) If (F64) { @@ -336,7 +336,7 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x42949672) } - CH03 ("", 0x00, 0x023A, 0x012F, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("123456789012345678904294967296" + 0x00) If (F64) { @@ -350,7 +350,7 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } - CH03 ("", 0x00, 0x023D, 0x013B, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" \t \t\t00004294967296" + 0x00) If (F64) { @@ -364,7 +364,7 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x42949672) } - CH03 ("", 0x00, 0x0240, 0x0147, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("\t0123456789012345678904294967296" + 0x00) If (F64) { @@ -378,7 +378,7 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } - CH03 ("", 0x00, 0x0243, 0x0153, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("0123456789012345678904294967296" + 0x00) If (F64) { @@ -392,7 +392,7 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } - CH03 ("", 0x00, 0x0246, 0x015F, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" 123456789012345678904294967296" + 0x00) If (F64) { @@ -406,7 +406,7 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } - CH03 ("", 0x00, 0x0249, 0x016B, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("\t123456789012345678904294967296" + 0x00) If (F64) { @@ -423,7 +423,7 @@ /* 64-bit mode – the value exceeding "18446744073709551615" */ - CH03 ("", 0x00, 0x024C, 0x0179, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("18446744073709551616" + 0x00) If (F64) { @@ -437,7 +437,7 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x18446744) } - CH03 ("", 0x00, 0x024F, 0x0185, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("\t18446744073709551616" + 0x00) If (F64) { @@ -451,7 +451,7 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x18446744) } - CH03 ("", 0x00, 0x0252, 0x0191, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" 18446744073709551616" + 0x00) If (F64) { @@ -465,7 +465,7 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x18446744) } - CH03 ("", 0x00, 0x0255, 0x019D, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("018446744073709551616" + 0x00) If (F64) { @@ -479,7 +479,7 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x18446744) } - CH03 ("", 0x00, 0x0258, 0x01A9, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" \t000000000018446744073709551616" + 0x00) If (F64) { @@ -495,7 +495,7 @@ /* 12. "0x12345678901234567" (hex image exceeding maximal) */ - CH03 ("", 0x00, 0x025B, 0x01B6, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("0x12345678901234567" + 0x00) If ((Local0 != 0x00)) { @@ -504,14 +504,14 @@ /* 13. "0x00000000000001234" (hex image exceeding maximal; no matter that zeros) */ - CH03 ("", 0x00, 0x025E, 0x01BD, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("0x00000000000001234" + 0x00) If ((Local0 != 0x00)) { ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x0260, 0x01C3, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("0x0000000000000000000001234" + 0x00) If ((Local0 != 0x00)) { @@ -522,7 +522,7 @@ If (0x01) { - CH03 ("", 0x00, 0x0262, 0x01CB, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("0x123456789" + 0x00) If ((Local0 != 0x00)) { @@ -532,14 +532,14 @@ /* 15. "0x" (incomplete '0x' image) */ - CH03 ("", 0x00, 0x0264, 0x01D3, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("0x" + 0x00) If ((Local0 != 0x00)) { ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x0266, 0x01D8, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } /* @@ -551,7 +551,7 @@ { /* Hex: 0x - dec */ - CH03 ("", 0x00, 0x0267, 0x01E4, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" 0x0" + 0x00) If ((Local0 != 0x00)) { @@ -598,69 +598,69 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x026F, 0x020D, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("\t \t \t \t \t \t0x1ab2cd340fe0567823456789123456789987" + 0x00) - CH03 ("", 0x00, 0x0270, 0x020F, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) If ((Local0 != 0x00)) { ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x0272, 0x0215, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) /* * Implicit String to Integer (<dec>) * * Method(mf98) */ - CH03 ("", 0x00, 0x0273, 0x021D, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" 0" + 0x00) If ((Local0 != 0x00)) { ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x0275, 0x0224, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("\t\t\t\t\t\t0000000" + 0x00) If ((Local0 != 0x00)) { ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x0277, 0x022B, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" 000000000000000000000000000000" + 0x00) If ((Local0 != 0x00)) { ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x0279, 0x0232, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("\t\t\t\t\t\t\t000000000000000000000000000000" + 0x00) If ((Local0 != 0x00)) { ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x027B, 0x0239, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" \t\t 1" + 0x00) If ((Local0 != 0x01)) { ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x01) } - CH03 ("", 0x00, 0x027D, 0x0240, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" \t \t \t12345678" + 0x00) If ((Local0 != 0x12345678)) { ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } - CH03 ("", 0x00, 0x027F, 0x0247, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) /* * Implicit String to Integer (<hex-dec>) * * Method(mf99) */ - CH03 ("", 0x00, 0x0280, 0x024F, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) /* Hex: 0x - dec */ Local0 = ("\t\t\t\t1234567890123456" + 0x00) @@ -737,14 +737,14 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1A) } - CH03 ("", 0x00, 0x028D, 0x0292, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) /* * No exceptions in special cases which force exceptions on ToInteger * * Method(mf9a) */ /* 5. "1234cd" (non-decimal character in dec-image) */ - CH03 ("", 0x00, 0x028E, 0x029B, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("\t1234cd" + 0x00) If ((Local0 != 0x001234CD)) { @@ -753,7 +753,7 @@ /* 6. "000x1234" (non-decimal character in dec-image) */ - CH03 ("", 0x00, 0x0290, 0x02A2, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" \t \t\t\t 000x1234" + 0x00) If ((Local0 != 0x00)) { @@ -762,21 +762,21 @@ /* 7. "0x1234cdQ" (non-hex character in '0x'-image) */ - CH03 ("", 0x00, 0x0292, 0x02A9, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" \t \t\t\t\t 0x1234cdQ" + 0x00) If ((Local0 != 0x00)) { ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x0294, 0x02AE, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" 1234cdQ" + 0x00) If ((Local0 != 0x001234CD)) { ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x001234CD) } - CH03 ("", 0x00, 0x0296, 0x02B4, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" \t\t0x0x12345" + 0x00) If ((Local0 != 0x00)) { @@ -785,7 +785,7 @@ /* 8. "1234 " (white space in dec image) */ - CH03 ("", 0x00, 0x0298, 0x02BB, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" \t\t1234 " + 0x00) If ((Local0 != 0x1234)) { @@ -794,7 +794,7 @@ /* 9. "0x1234cd " (white space in '0x'-image) */ - CH03 ("", 0x00, 0x029A, 0x02C2, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("\t\t\t 1234cd " + 0x00) If ((Local0 != 0x001234CD)) { @@ -803,28 +803,28 @@ /* 10. "0x 1234cdQ" (white space after '0x') */ - CH03 ("", 0x00, 0x029C, 0x02C9, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("\t\t\t\t \t \t \t\t0x 1234" + 0x00) If ((Local0 != 0x00)) { ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x029E, 0x02CF, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" \t \t \t\t \t0x0x 1234" + 0x00) If ((Local0 != 0x00)) { ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x02A0, 0x02D5, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" \t \t \t \t\t0x0x 0x 1234" + 0x00) If ((Local0 != 0x00)) { ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x02A2, 0x02DB, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("\t \t \t \t\t 0x 0x 1234" + 0x00) If ((Local0 != 0x00)) { @@ -835,7 +835,7 @@ /* 32-bit mode – the value exceeding "4294967295" */ If (0x01) { - CH03 ("", 0x00, 0x02A4, 0x02E4, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("\t\t4294967296" + 0x00) If (F64) { @@ -849,7 +849,7 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x42949672) } - CH03 ("", 0x00, 0x02A7, 0x02F0, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" \t\t \t\t\t123456789012345678904294967296" + 0x00) If (F64) { @@ -863,7 +863,7 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } - CH03 ("", 0x00, 0x02AA, 0x02FC, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" \t \t\t00004294967296" + 0x00) If (F64) { @@ -877,7 +877,7 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x42949672) } - CH03 ("", 0x00, 0x02AD, 0x0308, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("\t0123456789012345678904294967296" + 0x00) If (F64) { @@ -891,7 +891,7 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } - CH03 ("", 0x00, 0x02B0, 0x0314, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("\t0123456789012345678904294967296" + 0x00) If (F64) { @@ -905,7 +905,7 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } - CH03 ("", 0x00, 0x02B3, 0x0320, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" 123456789012345678904294967296" + 0x00) If (F64) { @@ -919,7 +919,7 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } - CH03 ("", 0x00, 0x02B6, 0x032C, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("\t123456789012345678904294967296" + 0x00) If (F64) { @@ -936,7 +936,7 @@ /* 64-bit mode – the value exceeding "18446744073709551615" */ - CH03 ("", 0x00, 0x02B8, 0x033A, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("\t\t\t18446744073709551616" + 0x00) If (F64) { @@ -950,7 +950,7 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x18446744) } - CH03 ("", 0x00, 0x02BB, 0x0346, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("\t18446744073709551616" + 0x00) If (F64) { @@ -964,7 +964,7 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x18446744) } - CH03 ("", 0x00, 0x02BE, 0x0352, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" 18446744073709551616" + 0x00) If (F64) { @@ -978,7 +978,7 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x18446744) } - CH03 ("", 0x00, 0x02C1, 0x035E, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" \t018446744073709551616" + 0x00) If (F64) { @@ -992,7 +992,7 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x18446744) } - CH03 ("", 0x00, 0x02C4, 0x036A, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" \t000000000018446744073709551616" + 0x00) If (F64) { @@ -1008,7 +1008,7 @@ /* 12. "0x12345678901234567" (hex image exceeding maximal) */ - CH03 ("", 0x00, 0x02C7, 0x0377, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("\t\t0x12345678901234567" + 0x00) If ((Local0 != 0x00)) { @@ -1017,14 +1017,14 @@ /* 13. "0x00000000000001234" (hex image exceeding maximal; no matter that zeros) */ - CH03 ("", 0x00, 0x02CA, 0x037E, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" 0x00000000000001234" + 0x00) If ((Local0 != 0x00)) { ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x02CC, 0x0384, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" \t\t0x0000000000000000000001234" + 0x00) If ((Local0 != 0x00)) { @@ -1035,7 +1035,7 @@ If (0x01) { - CH03 ("", 0x00, 0x02CE, 0x038C, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("0x123456789" + 0x00) If ((Local0 != 0x00)) { @@ -1045,21 +1045,21 @@ /* 15. "0x" (incomplete '0x' image) */ - CH03 ("", 0x00, 0x02D0, 0x0394, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("\t0x" + 0x00) If ((Local0 != 0x00)) { ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x02D2, 0x0399, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" 0x" + 0x00) If ((Local0 != 0x00)) { ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x02D4, 0x039F, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } /* @@ -1077,7 +1077,7 @@ { /* Hex: 0x - dec */ - CH03 ("", 0x00, 0x0367, 0x03B1, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" 0000000000x0" + 0x00) If ((Local0 != 0x00)) { @@ -1124,69 +1124,69 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x036F, 0x03DA, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("\t \t \t \t \t \t0000000000x1ab2cd340fe0567823456789123456789987" + 0x00) - CH03 ("", 0x00, 0x0370, 0x03DC, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) If ((Local0 != 0x00)) { ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x0372, 0x03E2, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) /* * Implicit String to Integer (<dec>) * * Method(mf98) */ - CH03 ("", 0x00, 0x0373, 0x03EA, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" 0000000000" + 0x00) If ((Local0 != 0x00)) { ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x0375, 0x03F1, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("\t\t\t\t\t\t0000000000000000" + 0x00) If ((Local0 != 0x00)) { ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x0377, 0x03F8, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" 000000000000000000000000000000000000000" + 0x00) If ((Local0 != 0x00)) { ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x0379, 0x03FF, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("\t\t\t\t\t\t\t000000000000000000000000000000000000000" + 0x00) If ((Local0 != 0x00)) { ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x037B, 0x0406, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" \t\t 0000000001" + 0x00) If ((Local0 != 0x01)) { ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x01) } - CH03 ("", 0x00, 0x037D, 0x040D, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" \t \t \t00000000012345678" + 0x00) If ((Local0 != 0x12345678)) { ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } - CH03 ("", 0x00, 0x037F, 0x0414, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) /* * Implicit String to Integer (<hex-dec>) * * Method(mf99) */ - CH03 ("", 0x00, 0x0380, 0x041C, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) /* Hex: 0x - dec */ Local0 = ("\t\t\t\t0000000001234567890123456" + 0x00) @@ -1263,14 +1263,14 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x1A) } - CH03 ("", 0x00, 0x038D, 0x045F, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) /* * No exceptions in special cases which force exceptions on ToInteger * * Method(mf9a) */ /* 5. "1234cd" (non-decimal character in dec-image) */ - CH03 ("", 0x00, 0x038E, 0x0468, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("\t0000000001234cd" + 0x00) If ((Local0 != 0x001234CD)) { @@ -1279,7 +1279,7 @@ /* 6. "000x1234" (non-decimal character in dec-image) */ - CH03 ("", 0x00, 0x0390, 0x046F, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" \t \t\t\t 000000000000x1234" + 0x00) If ((Local0 != 0x00)) { @@ -1288,21 +1288,21 @@ /* 7. "0x1234cdQ" (non-hex character in '0x'-image) */ - CH03 ("", 0x00, 0x0392, 0x0476, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" \t \t\t\t\t 0000000000x1234cdQ" + 0x00) If ((Local0 != 0x00)) { ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x0394, 0x047B, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" 0000000001234cdQ" + 0x00) If ((Local0 != 0x001234CD)) { ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x001234CD) } - CH03 ("", 0x00, 0x0396, 0x0481, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" \t\t0000000000x0x12345" + 0x00) If ((Local0 != 0x00)) { @@ -1311,7 +1311,7 @@ /* 8. "1234 " (white space in dec image) */ - CH03 ("", 0x00, 0x0398, 0x0488, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" \t\t0000000001234 " + 0x00) If ((Local0 != 0x1234)) { @@ -1320,7 +1320,7 @@ /* 9. "0x1234cd " (white space in '0x'-image) */ - CH03 ("", 0x00, 0x039A, 0x048F, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("\t\t\t 0000000001234cd " + 0x00) If ((Local0 != 0x001234CD)) { @@ -1329,28 +1329,28 @@ /* 10. "0x 1234cdQ" (white space after '0x') */ - CH03 ("", 0x00, 0x039C, 0x0496, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("\t\t\t\t \t \t \t\t0000000000x 1234" + 0x00) If ((Local0 != 0x00)) { ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x039E, 0x049C, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" \t \t \t\t \t0000000000x0x 1234" + 0x00) If ((Local0 != 0x00)) { ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x03A0, 0x04A2, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" \t \t \t \t\t0000000000x0x 0x 1234" + 0x00) If ((Local0 != 0x00)) { ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x03A2, 0x04A8, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("\t \t \t \t\t 0000000000x 0x 1234" + 0x00) If ((Local0 != 0x00)) { @@ -1361,7 +1361,7 @@ /* 32-bit mode – the value exceeding "4294967295" */ If (0x01) { - CH03 ("", 0x00, 0x03A4, 0x04B1, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("\t\t0000000004294967296" + 0x00) If (F64) { @@ -1375,7 +1375,7 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x42949672) } - CH03 ("", 0x00, 0x03A7, 0x04BD, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" \t\t \t\t\t000000000123456789012345678904294967296" + 0x00) If (F64) { @@ -1389,7 +1389,7 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } - CH03 ("", 0x00, 0x03AA, 0x04C9, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" \t \t\t00000000000004294967296" + 0x00) If (F64) { @@ -1403,7 +1403,7 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x42949672) } - CH03 ("", 0x00, 0x03AD, 0x04D5, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("\t0000000000123456789012345678904294967296" + 0x00) If (F64) { @@ -1417,7 +1417,7 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } - CH03 ("", 0x00, 0x03B0, 0x04E1, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("\t0000000000123456789012345678904294967296" + 0x00) If (F64) { @@ -1431,7 +1431,7 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } - CH03 ("", 0x00, 0x03B3, 0x04ED, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" 000000000123456789012345678904294967296" + 0x00) If (F64) { @@ -1445,7 +1445,7 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } - CH03 ("", 0x00, 0x03B6, 0x04F9, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("\t000000000123456789012345678904294967296" + 0x00) If (F64) { @@ -1462,7 +1462,7 @@ /* 64-bit mode – the value exceeding "18446744073709551615" */ - CH03 ("", 0x00, 0x03B8, 0x0507, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("\t\t\t00000000018446744073709551616" + 0x00) If (F64) { @@ -1476,7 +1476,7 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x18446744) } - CH03 ("", 0x00, 0x03BB, 0x0513, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("\t00000000018446744073709551616" + 0x00) If (F64) { @@ -1490,7 +1490,7 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x18446744) } - CH03 ("", 0x00, 0x03BE, 0x051F, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" 00000000018446744073709551616" + 0x00) If (F64) { @@ -1504,7 +1504,7 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x18446744) } - CH03 ("", 0x00, 0x03C1, 0x052B, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" \t000000000018446744073709551616" + 0x00) If (F64) { @@ -1518,7 +1518,7 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x18446744) } - CH03 ("", 0x00, 0x03C4, 0x0537, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" \t000000000000000000018446744073709551616" + 0x00) If (F64) { @@ -1534,7 +1534,7 @@ /* 12. "0x12345678901234567" (hex image exceeding maximal) */ - CH03 ("", 0x00, 0x03C7, 0x0544, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("\t\t0000000000x12345678901234567" + 0x00) If ((Local0 != 0x00)) { @@ -1543,14 +1543,14 @@ /* 13. "0x00000000000001234" (hex image exceeding maximal; no matter that zeros) */ - CH03 ("", 0x00, 0x03CA, 0x054B, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" 0000000000x00000000000001234" + 0x00) If ((Local0 != 0x00)) { ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x03CC, 0x0551, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" \t\t0000000000x0000000000000000000001234" + 0x00) If ((Local0 != 0x00)) { @@ -1561,7 +1561,7 @@ If (0x01) { - CH03 ("", 0x00, 0x03CE, 0x0559, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("0x123456789" + 0x00) If ((Local0 != 0x00)) { @@ -1571,19 +1571,19 @@ /* 15. "0x" (incomplete '0x' image) */ - CH03 ("", 0x00, 0x03D0, 0x0561, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("\t0000000000x" + 0x00) If ((Local0 != 0x00)) { ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x03D2, 0x0566, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" 0000000000x" + 0x00) If ((Local0 != 0x00)) { ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 ("", 0x00, 0x03D4, 0x056C, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 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 6b8c27ad3..8bc878386 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0063/Misc.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0063/Misc.asl @@ -186,7 +186,7 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x00013456) } - CH03 (__METHOD__, ZFFF, 0x0100, 0xAC, 0x00) + CH03 (__METHOD__, ZFFF, __LINE__, 0x00, 0x00) /* Too large, all hex, should be trancated */ Local0 = ("abcdef0123456789112233445566778890" + 0x00) @@ -202,7 +202,7 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xABCDEF01) } - CH03 (__METHOD__, ZFFF, 0x0101, 0xBA, 0x00) + CH03 (__METHOD__, ZFFF, __LINE__, 0x00, 0x00) /* Large, all hex, looks like octal, should be trancated */ Local0 = ("0abcdef0123456789112233445566778890" + 0x1234) @@ -218,7 +218,7 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xABCDEF01) } - CH03 (__METHOD__, ZFFF, 0x0102, 0xC8, 0x00) + CH03 (__METHOD__, ZFFF, __LINE__, 0x00, 0x00) /* Looks like usual hex, but 'x' terminates conversion */ Local0 = ("0x1111" + 0x2222) @@ -227,7 +227,7 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x2222) } - CH03 (__METHOD__, ZFFF, 0x0103, 0xD0, 0x00) + CH03 (__METHOD__, ZFFF, __LINE__, 0x00, 0x00) /* Empty string, no action - the relevant parameter of Add remains zero */ Local0 = ("" + 0xDE) @@ -236,7 +236,7 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xDE) } - CH03 (__METHOD__, ZFFF, 0x0104, 0xD8, 0x00) + CH03 (__METHOD__, ZFFF, __LINE__, 0x00, 0x00) /* Blank string, no action - the relevant parameter of Add remains zero */ Local0 = (" " + 0x0333) @@ -245,7 +245,7 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x0333) } - CH03 (__METHOD__, ZFFF, 0x0105, 0xE0, 0x00) + CH03 (__METHOD__, ZFFF, __LINE__, 0x00, 0x00) /* Blank string, no action - the relevant parameter of Add remains zero */ Local0 = (" " + 0x92) @@ -254,7 +254,7 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x92) } - CH03 (__METHOD__, ZFFF, 0x0106, 0xE8, 0x00) + CH03 (__METHOD__, ZFFF, __LINE__, 0x00, 0x00) /* Conversion is terminated just by the first symbol (non-hex) though followed by hex-es, remains zero */ Local0 = ("k1234567" + 0x01E9) @@ -271,7 +271,7 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x000000ABCDEF0000) } - CH03 (__METHOD__, ZFFF, 0x0107, 0xF6, 0x00) + CH03 (__METHOD__, ZFFF, __LINE__, 0x00, 0x00) /* Looks like designation of hex (terminated by x) */ Local0 = ("0x" + 0x12345678) @@ -280,7 +280,7 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } - CH03 (__METHOD__, ZFFF, 0x0108, 0xFE, 0x00) + CH03 (__METHOD__, ZFFF, __LINE__, 0x00, 0x00) /* Special symbol in the hex designation (terminated by x) */ Local0 = ("x" + 0x00BC614E) @@ -377,7 +377,7 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x3021) } - CH03 (__METHOD__, ZFFF, 0x0109, 0x0148, 0x00) + CH03 (__METHOD__, ZFFF, __LINE__, 0x00, 0x00) /* Only decimal, much more than 16 */ Store (("123456789012345601112223334446667788990087654" + 0x00), Local1) @@ -393,7 +393,7 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } - CH03 (__METHOD__, ZFFF, 0x010A, 0x0156, 0x00) + CH03 (__METHOD__, ZFFF, __LINE__, 0x00, 0x00) /* Only hex, much more than 16 */ Store (("abcdefabcdefabcdefabcdefabcdefabcdefabcdefabc" + 0x00), Local1) @@ -409,7 +409,7 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xABCDEFAB) } - CH03 (__METHOD__, ZFFF, 0x010B, 0x0164, 0x00) + CH03 (__METHOD__, ZFFF, __LINE__, 0x00, 0x00) /* Only decimal, much more than 16, non-hex at the end */ Store (("123456789012345601112223334446667788990087654ZZZZ" + 0x00), Local1) @@ -425,7 +425,7 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x12345678) } - CH03 (__METHOD__, ZFFF, 0x010C, 0x0172, 0x00) + CH03 (__METHOD__, ZFFF, __LINE__, 0x00, 0x00) /* Only hex, much more than 16, non-hex at the end */ Store (("abcdefabcdefabcdefabcdefabcdefabcdefabcdefabcZZZZ" + 0x00), Local1) @@ -441,7 +441,7 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xABCDEFAB) } - CH03 (__METHOD__, ZFFF, 0x010D, 0x0180, 0x00) + CH03 (__METHOD__, ZFFF, __LINE__, 0x00, 0x00) } Method (MD75, 0, NotSerialized) @@ -451,9 +451,9 @@ Method (MD76, 0, Serialized) { - CH03 (__METHOD__, ZFFF, 0x010E, 0x018B, 0x00) + CH03 (__METHOD__, ZFFF, __LINE__, 0x00, 0x00) MD74 () - CH03 (__METHOD__, ZFFF, 0x010F, 0x018D, 0x00) + CH03 (__METHOD__, ZFFF, __LINE__, 0x00, 0x00) MD75 () - CH03 (__METHOD__, ZFFF, 0x0110, 0x018F, 0x00) + CH03 (__METHOD__, ZFFF, __LINE__, 0x00, 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 a653c5d32..1e31f2d5c 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0064/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0064/DECL.asl @@ -32,51 +32,51 @@ */ Method (MF61, 1, NotSerialized) { - CH03 ("", 0x00, 0x00, 0x26, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("" + 0xABCD0000) If ((Local0 != 0xABCD0000)) { ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xABCD0000) } - CH03 ("", 0x00, 0x02, 0x2B, 0x00) - CH03 ("", 0x00, 0x03, 0x2D, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (" " + 0xABCD0001) If ((Local0 != 0xABCD0001)) { ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xABCD0001) } - CH03 ("", 0x00, 0x05, 0x32, 0x00) - CH03 ("", 0x00, 0x06, 0x34, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = "" ToInteger (Local1, Local0) CH04 (__METHOD__, 0x00, 0x24, 0x00, __LINE__, 0x00, 0x00) /* AE_BAD_DECIMAL_CONSTANT */ - CH03 ("", 0x00, 0x08, 0x39, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = " " ToInteger (Local1, Local0) CH04 (__METHOD__, 0x00, 0x24, 0x00, __LINE__, 0x00, 0x00) /* AE_BAD_DECIMAL_CONSTANT */ - CH03 ("", 0x00, 0x0A, 0x3E, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("q" + 0xABCD0002) If ((Local0 != 0xABCD0002)) { ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xABCD0002) } - CH03 ("", 0x00, 0x0C, 0x43, 0x00) - CH03 ("", 0x00, 0x0D, 0x45, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ("q " + 0xABCD0003) If ((Local0 != 0xABCD0003)) { ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0xABCD0003) } - CH03 ("", 0x00, 0x0F, 0x4A, 0x00) - CH03 ("", 0x00, 0x10, 0x4C, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = "q" ToInteger (Local1, Local0) CH04 (__METHOD__, 0x00, 0x24, 0x00, __LINE__, 0x00, 0x00) /* AE_BAD_DECIMAL_CONSTANT */ - CH03 ("", 0x00, 0x12, 0x51, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = "q " ToInteger (Local1, Local0) CH04 (__METHOD__, 0x00, 0x24, 0x00, __LINE__, 0x00, 0x00) /* AE_BAD_DECIMAL_CONSTANT */ diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0076/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0076/DECL.asl index f5f649d80..5f5968a3d 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0076/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0076/DECL.asl @@ -36,7 +36,7 @@ Debug = Local0 Store (PD01 [0x00], Local1) Debug = Local1 - CH03 ("", 0x00, 0x00, 0x2B, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local7 = (Local1 + 0x00) CH04 (__METHOD__, 0x00, 0x2F, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local2 = RefOf (ID0A) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0077/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0077/DECL.asl index 814b0caef..fc2fdac62 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0077/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0077/DECL.asl @@ -33,10 +33,10 @@ Method (ME2A, 0, Serialized) { Name (I000, 0x89ABCDEF) - CH03 ("", 0x00, 0x00, 0x27, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = ToInteger ("0") /* AE_BAD_DECIMAL_CONSTANT */ Local0 = ToInteger ("0x0") /* AE_BAD_HEX_CONSTANT */ Store (("0" + 0x01), Local0) /* AE_BAD_HEX_CONSTANT */ I000 = "0" /* AE_BAD_HEX_CONSTANT */ - CH03 ("", 0x00, 0x00, 0x31, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } 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 00710dbed..be02750bb 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0092/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0092/DECL.asl @@ -46,19 +46,19 @@ If ((Arg0 == 0x00)) { Debug = "Package as a named object:" - CH03 ("", 0x00, 0x00, 0x2B, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = DerefOf (P000 [0x05]) If ((Local0 != 0x06)) { ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x06) } - CH03 ("", 0x00, 0x02, 0x30, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } ElseIf ((Arg0 == 0x01)) { Debug = "The same Package but substituted immediately:" - CH03 ("", 0x00, 0x03, 0x35, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Store (Index (Package (0x08) { 0x01, @@ -78,7 +78,7 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x06) } - CH03 ("", 0x00, 0x05, 0x3C, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } Else { @@ -87,7 +87,7 @@ } Else { - CH03 ("", 0x00, 0x07, 0x42, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = DerefOf (Index (Package (0x08) { 0x01, @@ -106,7 +106,7 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x06) } - CH03 ("", 0x00, 0x09, 0x48, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } Else { 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 ce82c54ed..a325cd237 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0093/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0093/DECL.asl @@ -39,19 +39,19 @@ If ((Arg0 == 0x00)) { Debug = "Buffer as a named object:" - CH03 ("", 0x00, 0x00, 0x2B, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = DerefOf (B000 [0x05]) If ((Local0 != 0x42)) { ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x42) } - CH03 ("", 0x00, 0x02, 0x30, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } ElseIf ((Arg0 == 0x01)) { Debug = "The same Buffer but substituted immediately:" - CH03 ("", 0x00, 0x03, 0x36, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Store (Index (Buffer (0x08) { 0x0B, 0x16, 0x21, 0x2C, 0x37, 0x42, 0x4D, 0x58 // ..!,7BMX @@ -64,7 +64,7 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x42) } - CH03 ("", 0x00, 0x05, 0x3D, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } Else { @@ -73,7 +73,7 @@ } Else { - CH03 ("", 0x00, 0x07, 0x44, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = DerefOf (Index (Buffer (0x08) { 0x0B, 0x16, 0x21, 0x2C, 0x37, 0x42, 0x4D, 0x58 // ..!,7BMX @@ -85,7 +85,7 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x42) } - CH03 ("", 0x00, 0x09, 0x4A, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } Else { 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 317d900dd..91d68d1b7 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0094/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0094/DECL.asl @@ -36,19 +36,19 @@ If ((Arg0 == 0x00)) { Debug = "String as a named object:" - CH03 ("", 0x00, 0x00, 0x2B, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = DerefOf (S000 [0x05]) If ((Local0 != 0x75)) { ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x75) } - CH03 ("", 0x00, 0x02, 0x30, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } ElseIf ((Arg0 == 0x01)) { Debug = "The same String but substituted immediately:" - CH03 ("", 0x00, 0x03, 0x36, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Store (Index ("qwrtyuiop", 0x05), Local1) If (Y900) { @@ -58,7 +58,7 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x75) } - CH03 ("", 0x00, 0x05, 0x3D, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } Else { @@ -67,7 +67,7 @@ } Else { - CH03 ("", 0x00, 0x07, 0x44, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = DerefOf (Index ("qwrtyuiop", 0x05)) If (Y900) { @@ -76,7 +76,7 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x75) } - CH03 ("", 0x00, 0x09, 0x4A, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } Else { diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0113/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0113/DECL.asl index f0bfec21c..80522e516 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0113/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0113/DECL.asl @@ -39,27 +39,27 @@ Debug = Arg4 Debug = Arg5 Debug = "Test 0" - CH03 ("", 0x00, 0x00, 0x2E, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Store ((Arg0 + 0x01), Local5) CH04 (__METHOD__, 0x01, 0x2F, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Debug = "Test 1" - CH03 ("", 0x00, 0x02, 0x33, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Store ((Arg1 + 0x01), Local5) CH04 (__METHOD__, 0x01, 0x2F, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Debug = "Test 2" - CH03 ("", 0x00, 0x04, 0x38, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Store ((Arg2 + 0x01), Local5) CH04 (__METHOD__, 0x01, 0x2F, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Debug = "Test 3" - CH03 ("", 0x00, 0x06, 0x3D, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Store ((Arg3 + 0x01), Local5) CH04 (__METHOD__, 0x01, 0x2F, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Debug = "Test 4" - CH03 ("", 0x00, 0x08, 0x42, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Store ((Arg4 + 0x01), Local5) CH04 (__METHOD__, 0x01, 0x2F, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Debug = "Test 5" - CH03 ("", 0x00, 0x0A, 0x47, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Store ((Arg5 + 0x01), Local5) CH04 (__METHOD__, 0x01, 0x2F, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ } 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 dfea69e1e..aa31557bf 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0118/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0118/DECL.asl @@ -77,7 +77,7 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local3, C009) } - CH03 ("", 0x00, 0x05, 0x52, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local5 = (Local0 + 0x79) CH04 (__METHOD__, 0x00, 0x2F, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ } @@ -130,7 +130,7 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, II03, C009) } - CH03 ("", 0x00, 0x0C, 0x87, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) II05 = (Local0 + 0x79) CH04 (__METHOD__, 0x00, 0x2F, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ } @@ -181,7 +181,7 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, II03, C009) } - CH03 ("", 0x00, 0x13, 0xBA, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) II05 = (II00 + 0x79) CH04 (__METHOD__, 0x00, 0x2F, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ } 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 ff3bdddec..eefeba5bb 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0120/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0120/DECL.asl @@ -117,11 +117,11 @@ DD0D }) Local0 = PP00 [0x00] - CH03 ("", 0x00, 0x05, 0x6A, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Debug = ObjectType (Local0) - CH03 ("", 0x00, 0x06, 0x6C, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Debug = DerefOf (Local0) - CH03 ("", 0x00, 0x07, 0x6E, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = ObjectType (Local0) If ((Local1 != C00E)) { @@ -136,11 +136,11 @@ TZD2 }) Local0 = PP00 [0x00] - CH03 ("", 0x00, 0x09, 0x7C, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Debug = ObjectType (Local0) - CH03 ("", 0x00, 0x0A, 0x7E, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Debug = DerefOf (Local0) - CH03 ("", 0x00, 0x0B, 0x80, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = ObjectType (Local0) If ((Local1 != C015)) { diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0121/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0121/DECL.asl index 1a7baa72f..d1ce594d2 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0121/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0121/DECL.asl @@ -39,28 +39,28 @@ 0xFF, 0xFF // .. }) Name (I000, 0x00) - CH03 ("", 0x00, 0x00, 0x2A, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) CreateField (B000, 0x00, 0x10, BF00) - CH03 ("", 0x00, 0x00, 0x2C, 0x00) - CH03 ("", 0x00, 0x02, 0x2E, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) CreateField (B000, 0x00, I000, BF01) CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) - CH03 ("", 0x00, 0x04, 0x32, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) CreateField (B000, 0x01, I000, BF02) CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) - CH03 ("", 0x00, 0x06, 0x36, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) CreateField (B000, 0x07, I000, BF03) CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) - CH03 ("", 0x00, 0x08, 0x3A, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) CreateField (B000, 0x08, I000, BF04) CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) - CH03 ("", 0x00, 0x0A, 0x3E, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) CreateField (B000, 0x0F, I000, BF05) CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) - CH03 ("", 0x00, 0x0C, 0x42, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) CreateField (B000, 0x10, I000, BF06) CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) - CH03 ("", 0x00, 0x0E, 0x46, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Debug = "All CreateField-s finished" Debug = BF00 /* \MF03.BF00 */ Debug = BF01 /* \MF03.BF01 */ diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0123/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0123/DECL.asl index 99b8ab7ba..8a27fc23b 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0123/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0123/DECL.asl @@ -39,7 +39,7 @@ }) /* a) StartIndex > 0xffffffff */ /* c) Modulo(StartIndex, 0x100000000) < Size. */ - CH03 ("", 0x00, 0x00, 0x2A, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = Match (P000, MEQ, 0x01, MEQ, 0x01, 0x0000000100000001) CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_PACKAGE_LIMIT */ } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0124/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0124/DECL.asl index cbb0a5849..8afc8c81b 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0124/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0124/DECL.asl @@ -44,13 +44,13 @@ Name (S000, "5678") /* a) Index > 0xffffffff */ /* c) Modulo(Index, 0x100000000) < Size. */ - CH03 ("", 0x00, 0x00, 0x2C, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Store (P000 [0x0000000100000001], Local0) CH04 (__METHOD__, 0x01, 0x37, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_PACKAGE_LIMIT */ - CH03 ("", 0x00, 0x02, 0x30, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Store (B000 [0x0000000100000002], Local0) CH04 (__METHOD__, 0x01, 0x36, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ - CH03 ("", 0x00, 0x04, 0x34, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Store (S000 [0x0000000100000003], Local0) CH04 (__METHOD__, 0x01, 0x3D, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_STRING_LIMIT */ } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0127/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0127/DECL.asl index 090c46601..7741b1725 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0127/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0127/DECL.asl @@ -34,17 +34,17 @@ Method (MF13, 0, NotSerialized) { Local1 = Local0 = PD11 [0x00] - CH03 ("", 0x00, 0x00, 0x2A, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Store ((Local0 + 0x00), Local2) CH04 (__METHOD__, 0x01, 0x2F, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ - CH03 ("", 0x00, 0x02, 0x2E, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Store ((Local1 + 0x00), Local2) CH04 (__METHOD__, 0x01, 0x2F, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local1 = Local0 = PD11 [0x01] - CH03 ("", 0x00, 0x04, 0x34, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Store ((Local0 + 0x00), Local2) CH04 (__METHOD__, 0x01, 0x2F, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ - CH03 ("", 0x00, 0x06, 0x38, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Store ((Local1 + 0x00), Local2) CH04 (__METHOD__, 0x01, 0x2F, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ } @@ -54,22 +54,22 @@ Method (MF14, 0, NotSerialized) { CopyObject (Local0 = PD11 [0x00], Local1) - CH03 ("", 0x00, 0x08, 0x43, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Store ((Local0 + 0x00), Local2) CH04 (__METHOD__, 0x01, 0x2F, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ - CH03 ("", 0x00, 0x0A, 0x47, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Store ((Local1 + 0x00), Local2) CH04 (__METHOD__, 0x01, 0x2F, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ } Method (MF15, 0, NotSerialized) { - CH03 ("", 0x00, 0x0C, 0x4E, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) CopyObject (Local0 = PD11 [0x01], Local1) - CH03 ("", 0x00, 0x0D, 0x52, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Store ((Local0 + 0x00), Local2) CH04 (__METHOD__, 0x01, 0x2F, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ - CH03 ("", 0x00, 0x0F, 0x56, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Store ((Local1 + 0x00), Local2) CH04 (__METHOD__, 0x01, 0x2F, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ } 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 6f8fdc95d..00623da0e 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0128/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0128/DECL.asl @@ -47,7 +47,7 @@ { Name (REF0, 0x00) Name (I000, 0x1234) - CH03 ("", 0x00, 0x00, 0x35, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) CopyObject (RefOf (I000), REF0) /* \MF18.REF0 */ Debug = "Before printing ref0" Debug = REF0 /* \MF18.REF0 */ @@ -61,7 +61,7 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local1, 0x1234) } - CH03 ("", 0x00, 0x02, 0x44, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } Method (MF9E, 0, Serialized) @@ -86,7 +86,7 @@ 0x04 }) Name (REF0, 0x00) - CH03 ("", 0x00, 0x00, 0x54, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) CopyObject (RefOf (I000), REF0) /* \MF9E.REF0 */ MF88 (DerefOf (REF0), C009, II00, 0x01, 0x02, 0x01) CopyObject (RefOf (B000), REF0) /* \MF9E.REF0 */ @@ -95,7 +95,7 @@ MF88 (DerefOf (REF0), C00A, SS00, 0x03, 0x04, 0x01) CopyObject (RefOf (P000), REF0) /* \MF9E.REF0 */ MF88 (DerefOf (REF0), C00C, SS00, 0x05, 0x06, 0x00) - CH03 ("", 0x00, 0x07, 0x62, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } Method (MF9F, 0, Serialized) @@ -124,33 +124,33 @@ /* Checkings */ - CH03 ("", 0x00, 0x26, 0x73, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) CopyObject (RefOf (E000), REF0) /* \MF9F.REF0 */ MF88 (DerefOf (REF0), C00F, 0x00, 0x27, 0x28, 0x00) - CH03 ("", 0x00, 0x29, 0x77, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) CopyObject (RefOf (MX00), REF0) /* \MF9F.REF0 */ MF88 (DerefOf (REF0), C011, 0x00, 0x2A, 0x2B, 0x00) If (Y511) { - CH03 ("", 0x00, 0x2C, 0x7C, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) CopyObject (RefOf (D000), REF0) /* \MF9F.REF0 */ MF88 (DerefOf (REF0), C00E, 0x00, 0x2D, 0x2E, 0x00) } If (Y508) { - CH03 ("", 0x00, 0x2F, 0x82, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) CopyObject (RefOf (TZ00), REF0) /* \MF9F.REF0 */ MF88 (DerefOf (REF0), C015, 0x00, 0x30, 0x31, 0x00) } - CH03 ("", 0x00, 0x32, 0x87, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) CopyObject (RefOf (PR00), REF0) /* \MF9F.REF0 */ MF88 (DerefOf (REF0), C014, 0x00, 0x33, 0x34, 0x00) - CH03 ("", 0x00, 0x35, 0x8B, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) CopyObject (RefOf (R000), REF0) /* \MF9F.REF0 */ MF88 (DerefOf (REF0), C012, 0x00, 0x36, 0x37, 0x00) - CH03 ("", 0x00, 0x38, 0x8F, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) CopyObject (RefOf (PW00), REF0) /* \MF9F.REF0 */ MF88 (DerefOf (REF0), C013, 0x00, 0x39, 0x3A, 0x00) } 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 57c659cd7..fbba46606 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0132/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0132/DECL.asl @@ -33,9 +33,9 @@ Method (MF1F, 2, NotSerialized) { Debug = Arg0 - CH03 ("", 0x00, 0x00, 0x27, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local7 = (Arg0 + 0x01) - CH03 ("", 0x00, 0x01, 0x29, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) If ((Local7 != 0x78)) { ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, ID12, 0x05) 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 d5e6c5bed..4160293f9 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0150/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0150/DECL.asl @@ -101,7 +101,7 @@ Else { Local0 = 0x01 - CH03 ("", 0x00, 0x03, 0x63, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Acquire (MX01, 0x0001) CH04 (__METHOD__, 0x00, 0x40, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_ORDER */ } @@ -135,9 +135,9 @@ Else { Local0 = 0x01 - CH03 ("", 0x00, 0x06, 0x81, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) MX01 () - CH03 ("", 0x00, 0x07, 0x83, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } If (Local0) @@ -169,7 +169,7 @@ Else { Local0 = 0x01 - CH03 ("", 0x00, 0x09, 0xA0, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) MX01 () CH04 (__METHOD__, 0x00, 0x40, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_ORDER */ } 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 3e9fae864..6a319a6d8 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0157/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0157/DECL.asl @@ -71,7 +71,7 @@ Local0 = "Local0" Local0 = M000 () MMM0 () - CH03 ("", 0x00, 0x00, 0x44, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) If (("md00.m000" != Local0)) { ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, "md00.m000") @@ -82,11 +82,11 @@ Local0 = "Local0" Local0 = MM00 () MMM1 () - CH03 ("", 0x00, 0x02, 0x53, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) If (("md00.mm00" != Local0)) { ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, "md00.mm00") } - CH03 ("", 0x00, 0x04, 0x59, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0160/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0160/DECL.asl index 79a33394d..2d20f8258 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0160/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0160/DECL.asl @@ -34,7 +34,7 @@ */ Method (MF48, 0, Serialized) { - CH03 ("", 0x00, 0x00, 0x27, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Debug = "mf48 started" Field (RD05, ByteAcc, NoLock, Preserve) { @@ -42,12 +42,12 @@ } Debug = "mf48 finished" - CH03 ("", 0x00, 0x01, 0x2B, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } Method (MF49, 0, Serialized) { - CH03 ("", 0x00, 0x02, 0x30, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Debug = "mf49 started" If (0x01) { @@ -58,5 +58,5 @@ } Debug = "mf49 finished" - CH03 ("", 0x00, 0x03, 0x36, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0175/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0175/DECL.asl index 570f69ce8..26430f663 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0175/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0175/DECL.asl @@ -32,7 +32,7 @@ */ Method (MF5D, 0, NotSerialized) { - CH03 ("", 0x00, 0x00, 0x25, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Debug = PRD1 /* \PRD1 */ Debug = RD06 /* \RD06 */ Debug = PWD1 /* \PWD1 */ @@ -43,5 +43,5 @@ Debug = "Printing ThermalZone:" Debug = TZD1 /* \TZD1 */ - CH03 ("", 0x00, 0x01, 0x34, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0177/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0177/DECL.asl index a04f446e5..3bcc0db39 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0177/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0177/DECL.asl @@ -68,18 +68,18 @@ /* Named */ - CH03 ("", 0x00, 0x00, 0x35, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Store (P000 [0x02], Local1) CH04 (__METHOD__, 0x01, 0x37, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_PACKAGE_LIMIT */ - CH03 ("", 0x00, 0x02, 0x39, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Store (B000 [0x03], Local1) CH04 (__METHOD__, 0x01, 0x36, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ - CH03 ("", 0x00, 0x04, 0x3D, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Store (S000 [0x04], Local1) CH04 (__METHOD__, 0x01, 0x3D, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_STRING_LIMIT */ /* Immediate */ - CH03 ("", 0x00, 0x06, 0x43, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Store (Index (Package (0x02) { 0x00, @@ -94,7 +94,7 @@ CH04 (__METHOD__, 0x00, 0x55, 0x00, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } - CH03 ("", 0x00, 0x09, 0x4B, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Store (Index (Buffer (0x03) { 0x02, 0x03, 0x04 // ... @@ -108,7 +108,7 @@ CH04 (__METHOD__, 0x00, 0x55, 0x00, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } - CH03 ("", 0x00, 0x0C, 0x53, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Store (Index ("5678", 0x04), Local1) If (Y900) { @@ -121,10 +121,10 @@ /* Fields */ - CH03 ("", 0x00, 0x0F, 0x5D, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = F000 /* \MF07.F000 */ - CH03 ("", 0x00, 0x10, 0x5F, 0x00) - CH03 ("", 0x00, 0x11, 0x61, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = F001 /* \MF07.F001 */ If (Y263) { @@ -142,7 +142,7 @@ CH04 (__METHOD__, 0x00, 0x35, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_REGION_LIMIT */ } - CH03 ("", 0x00, 0x14, 0x70, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = BKF0 /* \MF07.BKF0 */ If (Y263) { diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0178/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0178/DECL.asl index 5db678120..c12953cf3 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0178/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0178/DECL.asl @@ -43,7 +43,7 @@ BKF0, 9 } - CH03 ("", 0x00, 0x00, 0x2A, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = BKF0 /* \MF0A.BKF0 */ If (Y263) { @@ -76,7 +76,7 @@ BKF0, 9 } - CH03 ("", 0x00, 0x02, 0x43, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = BKF0 /* \MF0B.BKF0 */ CH04 (__METHOD__, 0x00, 0x44, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_REGISTER_LIMIT */ } @@ -94,9 +94,9 @@ BKF0, 9 } - CH03 ("", 0x00, 0x04, 0x4F, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = BKF0 /* \MF0C.BKF0 */ - CH03 ("", 0x00, 0x05, 0x51, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } Method (MF0D, 0, Serialized) @@ -113,9 +113,9 @@ BKF0, 9 } - CH03 ("", 0x00, 0x06, 0x5C, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = BKF0 /* \MF0D.BKF0 */ - CH03 ("", 0x00, 0x07, 0x5E, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } Method (MF0E, 0, Serialized) @@ -132,7 +132,7 @@ BKF0, 9 } - CH03 ("", 0x00, 0x08, 0x69, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = BKF0 /* \MF0E.BKF0 */ - CH03 ("", 0x00, 0x09, 0x6B, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } 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 c6bed31ac..91c623fa7 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0182/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0182/DECL.asl @@ -36,7 +36,7 @@ Name (ID23, 0xABCD0000) Method (MF78, 0, Serialized) { - CH03 ("", 0x00, 0x00, 0x2A, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) If ((ID23 != 0xABCD0000)) { ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, ID23, 0xABCD0000) @@ -48,7 +48,7 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, ID23, 0xABCD0001) } - CH03 ("", 0x00, 0x03, 0x36, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } /* @@ -57,7 +57,7 @@ */ Method (MF85, 0, Serialized) { - CH03 ("", 0x00, 0x04, 0x3F, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) If ((I9Z8 != 0xABCD0001)) { ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I9Z8, 0xABCD0001) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0183/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0183/DECL.asl index 849e7eb0d..bab864e71 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0183/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0183/DECL.asl @@ -44,16 +44,16 @@ Method (MF7A, 0, NotSerialized) { - CH03 ("", 0x00, 0x00, 0x2E, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Debug = "mf79(250):" Debug = MF79 (0xFA) - CH03 ("", 0x00, 0x01, 0x33, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } Method (M27E, 0, NotSerialized) { - CH03 ("", 0x00, 0x02, 0x38, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Debug = "mf79(248):" Debug = MF79 (0xF8) - CH03 ("", 0x00, 0x03, 0x3D, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0184/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0184/DECL.asl index 86f789333..98707598a 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0184/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0184/DECL.asl @@ -38,7 +38,7 @@ } Debug = "mf7b" - CH03 ("", 0x00, 0x00, 0x2C, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) M000 () - CH03 ("", 0x00, 0x01, 0x2E, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } 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 3cfa44260..525313def 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0185/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0185/DECL.asl @@ -60,11 +60,11 @@ /* m000 */ I000 = 0xDDDD9000 - CH03 ("", 0x00, 0x00, 0x43, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) I000 = M000 () If (SLCK) { - CH03 ("", 0x00, 0x01, 0x48, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) If ((I000 != 0x00)) { ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, 0x00) @@ -78,11 +78,11 @@ /* m009 */ I000 = 0xDDDD9000 - CH03 ("", 0x00, 0x04, 0x54, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) I000 = M009 () If (SLCK) { - CH03 ("", 0x00, 0x05, 0x59, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) If ((I000 != 0x00)) { ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, 0x00) 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 05be13b56..362f19bed 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0186/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0186/DECL.asl @@ -77,11 +77,11 @@ /* m000 */ I000 = 0xDDDD0000 - CH03 ("", 0x00, 0x00, 0x4D, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) I000 = M000 () If (SLCK) { - CH03 ("", 0x00, 0x01, 0x52, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) /*y901: Predicate generates Implicit Return since ACPICA release 20080926 */ If (Y901) @@ -106,11 +106,11 @@ /* m001 */ I000 = 0xDDDD0001 - CH03 ("", 0x00, 0x04, 0x65, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) I000 = M001 () If (SLCK) { - CH03 ("", 0x00, 0x05, 0x6A, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) /*y901: Predicate generates Implicit Return since ACPICA release 20080926 */ If (Y901) @@ -135,11 +135,11 @@ /* m002 */ I000 = 0xDDDD0002 - CH03 ("", 0x00, 0x08, 0x7D, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) I000 = M001 () If (SLCK) { - CH03 ("", 0x00, 0x09, 0x82, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) /*y901: Predicate generates Implicit Return since ACPICA release 20080926 */ If (Y901) 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 544f91c9d..10150bb23 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0187/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0187/DECL.asl @@ -41,11 +41,11 @@ /* m000 */ I000 = 0xDDDD9000 - CH03 ("", 0x00, 0x00, 0x30, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) I000 = M000 () If (SLCK) { - CH03 ("", 0x00, 0x01, 0x35, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) If ((I000 != 0x00)) { ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, I000, 0x00) 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 916917f1d..640844927 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0188/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0188/DECL.asl @@ -44,7 +44,7 @@ }) /* Empty buffer */ - CH03 ("", 0x00, 0x00, 0x2A, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = 0x00 Local1 = Buffer (Local0){} Local2 = ConcatenateResTemplate (RT00, Local1) @@ -58,5 +58,5 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, RT00, B000) } - CH03 ("", 0x00, 0x03, 0x39, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0189/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0189/DECL.asl index dba7be184..c82929d33 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0189/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0189/DECL.asl @@ -41,7 +41,7 @@ { 0x79 // y } - CH03 ("", 0x00, 0x00, 0x29, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = ConcatenateResTemplate (RT00, Local0) CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) Local0 = Buffer (0x01) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0190/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0190/DECL.asl index b4949970f..65c3a42d3 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0190/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0190/DECL.asl @@ -43,7 +43,7 @@ { 0x2A, 0x10, 0x05, 0x79 // *..y } - CH03 ("", 0x00, 0x00, 0x2B, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = ConcatenateResTemplate (RT00, Local0) CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0196/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0196/DECL.asl index 9310e7c13..d42831628 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0196/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0196/DECL.asl @@ -32,7 +32,7 @@ */ Method (MFB0, 0, NotSerialized) { - CH03 ("", 0x00, 0x00, 0x25, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = "0x0x12345678" ToInteger (Local1, Local0) CH04 (__METHOD__, 0x00, 0x22, 0x00, __LINE__, 0x00, 0x00) /* AE_BAD_HEX_CONSTANT */ diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0197/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0197/DECL.asl index 96ff92348..779b8a3e7 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0197/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0197/DECL.asl @@ -32,7 +32,7 @@ */ Method (MFB1, 0, NotSerialized) { - CH03 ("", 0x00, 0x00, 0x25, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = "0x 12345678" ToInteger (Local1, Local0) CH04 (__METHOD__, 0x00, 0x22, 0x00, __LINE__, 0x00, 0x00) /* AE_BAD_HEX_CONSTANT */ diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0200/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0200/DECL.asl index bfe47ad56..726cc7128 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0200/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0200/DECL.asl @@ -162,7 +162,7 @@ SRMT ("mfb5") If (Y200) { - CH03 ("", 0x00, 0x00, 0x9C, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) MFB5 () CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) } @@ -174,7 +174,7 @@ SRMT ("mfbd") If (Y200) { - CH03 ("", 0x00, 0x02, 0xA5, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) MFBD () CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) } @@ -186,7 +186,7 @@ SRMT ("mfbe") If (Y200) { - CH03 ("", 0x00, 0x04, 0xAE, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) MFBE () CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) } @@ -199,31 +199,31 @@ * These work Ok: */ SRMT ("mfb6") - CH03 ("", 0x00, 0x06, 0xBA, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) MFB6 () CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) SRMT ("mfb7") - CH03 ("", 0x00, 0x08, 0xBF, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) MFB7 () CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) SRMT ("mfb8") - CH03 ("", 0x00, 0x0A, 0xC4, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) MFB8 () CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) SRMT ("mfb9") - CH03 ("", 0x00, 0x0C, 0xC9, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) MFB9 () CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) SRMT ("mfba") - CH03 ("", 0x00, 0x0E, 0xCE, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) MFBA () CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) SRMT ("mfbb") - CH03 ("", 0x00, 0x10, 0xD3, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) MFBB () CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) SRMT ("mfbf") - CH03 ("", 0x00, 0x12, 0xD8, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) MFBF () CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) Debug = "mfc0 ==== successfully returned to mfc0; finished !!!!!" 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 e01c93325..52665eb86 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0210/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0210/DECL.asl @@ -46,7 +46,7 @@ Method (M000, 1, NotSerialized) { Local0 = 0x02 - CH03 ("", 0x00, 0x00, 0x33, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Divide (0x01, Arg0, Local0) CH04 (__METHOD__, 0x00, 0x38, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_DIVIDE_BY_ZERO */ } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0213/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0213/DECL.asl index 2a6e1d621..c2fe146da 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0213/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0213/DECL.asl @@ -50,7 +50,7 @@ Return (Local0) } - CH03 ("", 0x00, 0x00, 0x34, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = M000 () CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) Debug = DerefOf (Local0) 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 f7de996f0..98c456efb 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0214/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0214/DECL.asl @@ -79,7 +79,7 @@ } } - CH03 ("", 0x00, 0x00, 0x51, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) M001 () - CH03 ("", 0x00, 0x01, 0x53, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } 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 a262553c9..f3941ac15 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0215/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0215/DECL.asl @@ -96,7 +96,7 @@ } } - CH03 ("", 0x00, 0x00, 0x59, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) M000 () - CH03 ("", 0x00, 0x01, 0x5B, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0216/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0216/DECL.asl index 4567bfa60..f2096c132 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0216/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0216/DECL.asl @@ -1065,7 +1065,7 @@ Method (M831, 0, NotSerialized) { - CH03 ("", 0x00, 0x00, 0x02CF, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) SRMT ("m831-0") If (0x01) { @@ -1075,23 +1075,23 @@ M821 () } - CH03 ("", 0x00, 0x01, 0x02D9, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) SRMT ("m831-1") If (0x01) { M822 () - CH03 ("", 0x00, 0x02, 0x02DE, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) M823 () - CH03 ("", 0x00, 0x03, 0x02E0, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) M824 () - CH03 ("", 0x00, 0x04, 0x02E2, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) M825 () - CH03 ("", 0x00, 0x05, 0x02E4, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) M826 () - CH03 ("", 0x00, 0x06, 0x02E6, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } - CH03 ("", 0x00, 0x07, 0x02E9, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) SRMT ("m831-2") If (0x01) { @@ -1102,7 +1102,7 @@ M82B () } - CH03 ("", 0x00, 0x08, 0x02F4, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) SRMT ("m831-3") If (0x01) { @@ -1113,7 +1113,7 @@ M830 () } - CH03 ("", 0x00, 0x09, 0x02FF, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) SRMT ("m831-4") If (0x01) { @@ -1124,5 +1124,5 @@ M836 () } - CH03 ("", 0x00, 0x0A, 0x030A, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } 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 f9fe82585..255170343 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0218/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0218/DECL.asl @@ -84,7 +84,7 @@ Method (M038, 0, NotSerialized) { - CH03 ("", 0x00, 0x00, 0x5B, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) M037 () - CH03 ("", 0x00, 0x01, 0x5D, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0229/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0229/DECL.asl index d5c9f76ce..a1aa79f9c 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0229/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0229/DECL.asl @@ -33,10 +33,10 @@ Method (M10F, 1, Serialized) { Name (B000, Buffer (Arg0){}) - CH03 ("", 0x00, 0x00, 0x27, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = (B000 + 0x00) - CH03 ("", 0x00, 0x01, 0x29, 0x00) - CH03 ("", 0x00, 0x02, 0x2B, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) ToInteger (B000, Local0) CH04 (__METHOD__, 0x00, 0x36, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0230/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0230/DECL.asl index 97983b964..c31394d72 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0230/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0230/DECL.asl @@ -235,7 +235,7 @@ Debug = "Finish of test" } - CH03 ("", 0x00, 0x00, 0x70, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) M100 () /* Expect either ASL compiler error or any AML interpreter exception */ diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0231/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0231/DECL.asl index 6affa35a4..aa1f82734 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0231/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0231/DECL.asl @@ -140,7 +140,7 @@ Debug = "Finish of test" } - CH03 ("", 0x00, 0x00, 0x5F, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) M100 () /* Expect either ASL compiler error or any AML interpreter exception */ diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0238/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0238/DECL.asl index 070b087ed..daaff9287 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0238/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0238/DECL.asl @@ -40,7 +40,7 @@ Acquire (MX07, 0xFFFF) Acquire (MX08, 0xFFFF) Acquire (MX09, 0xFFFF) - CH03 ("", 0x00, 0x00, 0x2F, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Release (MX08) /* * Release(MX08) above doesn't cause exception @@ -63,7 +63,7 @@ Release (MX09) Release (MX08) Release (MX07) - CH03 ("", 0x00, 0x03, 0x47, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } M000 () diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0241/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0241/DECL.asl index 562dba1f3..a33c2236f 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0241/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0241/DECL.asl @@ -45,7 +45,7 @@ } Local2 = RefOf (FU01) - If (CH03 ("", 0x00, 0x00, 0x32, 0x00)) + If (CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00)) { Return (Zero) } 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 4b0c438ae..35fd5de1a 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0242/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0242/DECL.asl @@ -95,21 +95,21 @@ Debug = "Releasing mutexes of level 0:" Debug = "Release T000 (Level 0, index 0)" - CH03 ("", 0x00, 0x04, 0x5F, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Release (T000) - CH03 ("", 0x00, 0x05, 0x61, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Debug = "Release T001 (Level 0, index 1)" - CH03 ("", 0x00, 0x06, 0x64, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Release (T001) - CH03 ("", 0x00, 0x07, 0x66, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Debug = "Release T002 (Level 0, index 2)" - CH03 ("", 0x00, 0x08, 0x69, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Release (T002) - CH03 ("", 0x00, 0x09, 0x6B, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Debug = "Release T003 (Level 0, index 3)" - CH03 ("", 0x00, 0x0A, 0x6E, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Release (T003) - CH03 ("", 0x00, 0x0B, 0x70, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } /* @@ -167,21 +167,21 @@ Debug = "Releasing mutexes of Level 1:" Debug = "Release T100 (Level 1, index 0)" - CH03 ("", 0x00, 0x10, 0xA2, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Release (T100) - CH03 ("", 0x00, 0x11, 0xA4, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Debug = "Release T101 (Level 1, index 1)" - CH03 ("", 0x00, 0x12, 0xA7, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Release (T101) - CH03 ("", 0x00, 0x13, 0xA9, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Debug = "Release T102 (Level 1, index 2)" - CH03 ("", 0x00, 0x14, 0xAC, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Release (T102) - CH03 ("", 0x00, 0x15, 0xAE, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Debug = "Release T103 (Level 1, index 3)" - CH03 ("", 0x00, 0x16, 0xB1, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Release (T103) - CH03 ("", 0x00, 0x17, 0xB3, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } /* @@ -240,21 +240,21 @@ Debug = "Releasing mutexes of Level 1:" Debug = "Release T101 (Level 1, index 1)" - CH03 ("", 0x00, 0x1C, 0xE6, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Release (T101) - CH03 ("", 0x00, 0x1D, 0xE8, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Debug = "Release T102 (Level 1, index 2)" - CH03 ("", 0x00, 0x1E, 0xEB, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Release (T102) - CH03 ("", 0x00, 0x1F, 0xED, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Debug = "Release T103 (Level 1, index 3)" - CH03 ("", 0x00, 0x20, 0xF0, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Release (T103) - CH03 ("", 0x00, 0x21, 0xF2, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Debug = "Release T100 (Level 1, index 0)" - CH03 ("", 0x00, 0x22, 0xF5, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Release (T100) - CH03 ("", 0x00, 0x23, 0xF7, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } Method (MM00, 0, NotSerialized) @@ -264,7 +264,7 @@ M002 () } - CH03 ("", 0x00, 0x24, 0x0101, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) MM00 () - CH03 ("", 0x00, 0x25, 0x0103, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } 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 b836edb08..a4372d0fb 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0243/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0243/DECL.asl @@ -91,12 +91,12 @@ Debug = "Current level is equal to 7!" } - CH03 ("", 0x00, 0x04, 0x55, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) /* (5) */ Debug = "Releasing the mutex of the current level: T700 (Level 7, index 0)" Release (T700) - CH03 ("", 0x00, 0x05, 0x5A, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) /* * (6) * @@ -105,12 +105,12 @@ */ Debug = "Releasing mutex of level 6: T600 (Level 6, index 0)" Release (T600) - CH03 ("", 0x00, 0x06, 0x64, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) /* (7) */ Debug = "Releasing mutex of level 5: T500 (Level 5, index 0)" Release (T500) - CH03 ("", 0x00, 0x07, 0x69, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } Method (MM00, 0, NotSerialized) 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 cbaa0609c..27692c65d 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0244/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0244/DECL.asl @@ -265,7 +265,7 @@ } Debug = "******** Test started" - CH03 ("", 0x00, 0x01, 0x013F, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) If (I104) { Debug = "!!!!!!!! ERROR 1: Acquire(T804, 0xffff) failed" @@ -302,7 +302,7 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } - CH03 ("", 0x00, 0x07, 0x015E, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) /* Release T806 */ If (!I106) @@ -315,7 +315,7 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } - CH03 ("", 0x00, 0x09, 0x0168, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Debug = "******** Test finished" } 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 fac49e9bd..a3458cd53 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0246/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0246/DECL.asl @@ -38,7 +38,7 @@ Local2 = 0x00 While (Local0) { - If (CH03 ("", 0x00, Local2, 0x2B, 0x00)) + If (CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00)) { Return (Zero) } @@ -59,7 +59,7 @@ } - If (CH03 ("", 0x00, Local2, 0x39, 0x00)) + If (CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00)) { Return (Zero) } 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 864fee521..ec6afcd22 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0247/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0247/DECL.asl @@ -43,7 +43,7 @@ Local0 = 0x02 While (Local0) { - If (CH03 ("", 0x00, ERRN, 0x32, 0x00)) + If (CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00)) { Return (Zero) } @@ -74,7 +74,7 @@ } - If (CH03 ("", 0x00, ERRN, 0x46, 0x00)) + If (CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00)) { Return (Zero) } 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 318d905ad..bdf11f83a 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0248/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0248/DECL.asl @@ -136,7 +136,7 @@ M1A9 () } - CH03 ("", 0x00, 0x02, 0x8A, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) MM00 () /* Check opcode of the last exception */ @@ -158,13 +158,13 @@ Name (HG00, 0x01) /* if non-zero - the test hangs */ Name (HG01, 0x01) /* if non-zero - the test hangs */ Name (HG02, 0x01) /* if non-zero - the test hangs */ - CH03 ("", 0x00, 0xB8, 0x9F, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) CopyObject (Local0 = P000 [0x01], I001) /* \M03D.I001 */ - CH03 ("", 0x00, 0xB9, 0xA3, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) /* Type of i001 should be already IRef here, */ /* so, don't expect exception. */ I001 = Local0 = P000 [0x00] - CH03 ("", 0x00, 0xBA, 0xAA, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local7 = (Local0 + 0x01) If (Y248) { 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 4f2416faf..f9c5b0bc3 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0257/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0257/DECL.asl @@ -72,13 +72,13 @@ Return (Zero) } - If (CH03 ("", 0x00, 0x01, 0x53, 0x00)) + If (CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00)) { Return (Zero) } Load (F257, H257) /* \H257 */ - If (CH03 ("", 0x00, 0x02, 0x59, 0x00)) + If (CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00)) { Return (Zero) } 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 42277215b..c68befcdf 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0258/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0258/DECL.asl @@ -72,7 +72,7 @@ Return (Zero) } - If (CH03 ("", 0x00, 0x01, 0x52, 0x00)) + If (CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00)) { Return (Zero) } 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 bfb0abb24..b19623949 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0259/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0259/DECL.asl @@ -77,13 +77,13 @@ Return (Zero) } - If (CH03 ("", 0x00, 0x01, 0x55, 0x00)) + If (CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00)) { Return (Zero) } Load (R259, H259) /* \H259 */ - If (CH03 ("", 0x00, 0x02, 0x5B, 0x00)) + If (CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00)) { Return (Zero) } 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 1bef9a0ec..cbb543fb8 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0260/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0260/DECL.asl @@ -52,7 +52,7 @@ Method (M000, 0, NotSerialized) { - CH03 ("", 0x00, 0x00, 0x3B, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) RFU0 = BUF0 /* \M029.BUF0 */ If (CondRefOf (\AUXD, Local0)) { @@ -84,7 +84,7 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, 0x00, 0x00) } - CH03 ("", 0x00, 0x05, 0x5D, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Return (Zero) } 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 9f9ab3195..6fb1a02d6 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0261/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0261/DECL.asl @@ -55,7 +55,7 @@ Method (M000, 0, Serialized) { Name (PAC0, Package (0x01){}) - CH03 ("", 0x00, 0x00, 0x3F, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) RFU0 = BUF0 /* \M028.BUF0 */ If (CondRefOf (\AUXZ, Local0)) { @@ -87,7 +87,7 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, 0x01777777) } - CH03 ("", 0x00, 0x05, 0x61, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Return (Zero) } 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 f6d8f9728..6d73ec206 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0262/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0262/DECL.asl @@ -67,7 +67,7 @@ } } - CH03 ("", 0x00, 0x01, 0x42, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) M000 () - CH03 ("", 0x00, 0x02, 0x44, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0264/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0264/DECL.asl index a0fc195cb..099c5ef03 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0264/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0264/DECL.asl @@ -49,7 +49,7 @@ { I000 }) - CH03 ("", 0x00, 0x00, 0x35, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) DerefOf (P000 [0x00]) = 0xABCD0001 /* Specify then what should be there the result of Store operation above? @@ -58,7 +58,7 @@ err("", zFFF, __LINE__, 0, 0, Local0, 0xabcd0000) } */ - CH03 ("", 0x00, 0x01, 0x42, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } Method (M001, 0, Serialized) @@ -68,9 +68,9 @@ { I000 }) - CH03 ("", 0x00, 0x02, 0x4A, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) DerefOf (Local0 = P000 [0x00]) = 0xABCD0001 - CH03 ("", 0x00, 0x03, 0x4C, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } Method (M002, 0, Serialized) @@ -80,10 +80,10 @@ { I000 }) - CH03 ("", 0x00, 0x04, 0x54, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = P000 [0x00] DerefOf (Local0) = 0xABCD0001 - CH03 ("", 0x00, 0x05, 0x57, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } Method (M003, 0, Serialized) @@ -93,10 +93,10 @@ { I000 }) - CH03 ("", 0x00, 0x06, 0x5F, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Store (P000 [0x00], Local0) DerefOf (Local0) = 0xABCD0001 - CH03 ("", 0x00, 0x07, 0x62, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } Method (M004, 0, Serialized) @@ -106,10 +106,10 @@ { I000 }) - CH03 ("", 0x00, 0x08, 0x6A, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = Local0 = P000 [0x00] DerefOf (Local0) = 0xABCD0001 - CH03 ("", 0x00, 0x09, 0x6D, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } Method (M005, 0, Serialized) @@ -119,10 +119,10 @@ { I000 }) - CH03 ("", 0x00, 0x0A, 0x75, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = Local0 = P000 [0x00] DerefOf (Local1) = 0xABCD0001 - CH03 ("", 0x00, 0x0B, 0x78, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } Method (M006, 0, NotSerialized) 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 bd3212817..3c4ef0f1b 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0269/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0269/DECL.asl @@ -100,7 +100,7 @@ Return (MADD (I000, M002 ())) } - CH03 ("", 0x00, 0x00, 0x5D, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = MADD (I000, M001 ()) If ((Local0 != 0x87654321)) { @@ -116,5 +116,5 @@ Debug = Local0 Debug = "i000:" Debug = I000 /* \M022.I000 */ - CH03 ("", 0x00, 0x00, 0x6F, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } 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 16db4414e..6b3e15691 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0271/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0271/DECL.asl @@ -52,7 +52,7 @@ Debug = "-------------------------." } - CH03 ("", 0x00, 0x00, 0x36, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) M123 (I000) Local0 = ObjectType (I001) If ((Local0 != C00E)) @@ -60,7 +60,7 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, C00E) } - CH03 ("", 0x00, 0x02, 0x3E, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) CopyObject (I002, I001) /* \M021.I001 */ Local0 = ObjectType (I001) If ((Local0 != C009)) @@ -68,5 +68,5 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, C009) } - CH03 ("", 0x00, 0x04, 0x46, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 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 cb313fe30..00a2021c7 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0272/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0272/DECL.asl @@ -52,7 +52,7 @@ Debug = "-------------------------." } - CH03 ("", 0x00, 0x00, 0x36, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) M123 (I000) Local0 = ObjectType (I001) If ((Local0 != C015)) @@ -60,7 +60,7 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, C015) } - CH03 ("", 0x00, 0x02, 0x3E, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) CopyObject (I002, I001) /* \M020.I001 */ Local0 = ObjectType (I001) If ((Local0 != C009)) @@ -68,5 +68,5 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, C009) } - CH03 ("", 0x00, 0x04, 0x46, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } 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 ffbc65493..ac8880af7 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0275/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0275/DECL.asl @@ -53,13 +53,13 @@ Method (M002, 2, NotSerialized) { Local0 = Arg0 [0x01] - If (CH03 ("", 0x00, 0x01, 0x36, 0x01)) + If (CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x01)) { Return (Zero) } Local1 = DerefOf (Local0) - If (CH03 ("", 0x00, 0x02, 0x3B, 0x01)) + If (CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x01)) { Return (Zero) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0282/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0282/DECL.asl index 92286a308..54ad1099d 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0282/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0282/DECL.asl @@ -42,7 +42,7 @@ Debug = BUF0 /* \D282.BUF0 */ Load (BUF0, Local0) Debug = BUF0 /* \D282.BUF0 */ - CH03 ("", 0x00, 0x01, 0x2F, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0283/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0283/DECL.asl index c5d246e48..4ea637cce 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0283/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0283/DECL.asl @@ -67,9 +67,9 @@ /* "Incorrect checksum" ACPI warning is expected */ Load (RFU0, HI0) /* \D283.TST0.HI0_ */ - CH03 ("", 0x00, 0x01, 0x49, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Unload (HI0) - CH03 ("", 0x00, 0x02, 0x4D, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0284/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0284/DECL.asl index 2778407ad..9219440c9 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0284/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0284/DECL.asl @@ -70,7 +70,7 @@ If (CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00)) { Unload (HI0) - CH03 ("", 0x00, 0x02, 0x4B, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0285/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0285/DECL.asl index c3518a45e..0f3b2e667 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0285/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0285/DECL.asl @@ -60,10 +60,10 @@ RFU0 = BUF0 /* \D285.BUF0 */ Load (RFU0, HI0) /* \D285.TST0.HI0_ */ Unload (M000 ()) - If (CH03 ("", 0x00, 0x01, 0x42, 0x00)) + If (CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00)) { Unload (HI0) - CH03 ("", 0x00, 0x02, 0x44, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0286/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0286/DECL.asl index 5b01ca00f..033ba44f7 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0286/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0286/DECL.asl @@ -67,9 +67,9 @@ M000 (RefOf (\AUXD.PAC0)) CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) Debug = DerefOf (\AUXD.PAC0 [0x00]) - CH03 ("", 0x00, 0x02, 0x4D, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Unload (DDB0) - CH03 ("", 0x00, 0x03, 0x50, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } } 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 c544525cc..e19901142 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0290/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0290/DECL.asl @@ -61,7 +61,7 @@ } Load (IST0, Local1) - If (CH03 ("", 0x00, 0x01, 0x44, 0x00)) + If (CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00)) { Return (Zero) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0292/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0292/DECL.asl index d27718c5b..7f6ab1e3e 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0292/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0292/DECL.asl @@ -57,7 +57,7 @@ Load (RFU4, DDB0) /* \D292.TST0.DDB0 */ Debug = "SSDT loaded" Unload (DDB0) - CH03 ("", 0x00, 0x01, 0x40, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Debug = "SSDT unloaded" Unload (DDB0) CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) 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 e3a22d5df..67b91923d 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0296/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0296/DECL.asl @@ -37,7 +37,7 @@ Method (TST0, 0, NotSerialized) { Local0 = LoadTable ("OEM1", "", "", "", "\\PLDT", "1") - If (CH03 ("", 0x00, 0x01, 0x2C, 0x00)) + If (CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00)) { Return (Zero) } @@ -53,7 +53,7 @@ } Unload (Local0) - CH03 ("", 0x00, 0x04, 0x39, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } } 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 a77f8995c..22cf08799 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 @@ -35,7 +35,7 @@ */ Method (M1E4, 1, Serialized) { - CH03 ("", 0x00, 0x00, 0x28, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Mutex (MT00, 0x00) Mutex (MT10, 0x01) Mutex (MT20, 0x02) @@ -504,7 +504,7 @@ } Else { - CH03 ("", 0x00, 0x23, 0x0198, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } } @@ -515,7 +515,7 @@ * * Event(E000) */ - CH03 ("", 0x00, 0x24, 0x01A4, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) /* * This causes messages (but no exceptions): * @@ -525,7 +525,7 @@ * ACPI Error (exutils-0180): Could not acquire AML Interpreter mutex [20061215] */ Sleep (0x64) - CH03 ("", 0x00, 0x25, 0x01B0, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } Method (M1E6, 0, NotSerialized) @@ -536,7 +536,7 @@ M1E4 (0x00) SRMT ("m1e5") M1E5 () - CH03 ("", 0x00, 0x26, 0x01BB, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) /* * m1e5 shows appearance of bug but doesn't cause exceptions * (so it is not detected automatically), so actions are required 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 d61c50e59..122498f8e 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 @@ -47,7 +47,7 @@ { Local0 = 0x0123 Acquire (MX03, 0x0100) - CH03 ("", 0x00, 0x00, 0x34, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Acquire (MX02, 0x0100) CH04 (__METHOD__, 0x00, 0x40, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_ORDER */ Local2 = RefOf (P000) /* L0(0x004d5ec8, 0x123), L2 (0x004d5dc8, res of RefOf) */ @@ -68,7 +68,7 @@ } Debug = "============================== 3" - CH03 ("", 0x00, 0x02, 0x4A, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) /* * The problem is not automatically detected, * so remove this error report after the problem has been resolved. 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 8fd3307b6..6e28f36c4 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 @@ -127,7 +127,7 @@ MM00 (0x00, I000, I001) } - CH03 ("", 0x00, 0x00, 0x66, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) M306 (0x09, 0x00) M306 (0x09, 0x00) M306 (0x09, 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 ec0161085..0df7cddf6 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0300/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0300/DECL.asl @@ -82,7 +82,7 @@ M100 (0x00) } - CH03 ("", 0x00, 0x02, 0x55, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) M000 () - CH03 ("", 0x00, 0x03, 0x57, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0301/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0301/DECL.asl index bfa00833b..538d69b97 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0301/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0301/DECL.asl @@ -145,7 +145,7 @@ M100 () } - CH03 ("", 0x00, 0x00, 0x88, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) M19C () - CH03 ("", 0x00, 0x01, 0x8A, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } 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 3778c9d15..f63d530b3 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0302/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0302/DECL.asl @@ -84,7 +84,7 @@ M202 () } - CH03 ("", 0x00, 0x02, 0x50, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) SRMT ("m1eb-m100") M100 () SRMT ("m1eb-m101") @@ -97,5 +97,5 @@ BLCK () } - CH03 ("", 0x00, 0x03, 0x5C, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } 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 020ef89ef..099c35c2e 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0303/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0303/DECL.asl @@ -112,11 +112,11 @@ Debug = "---------------- Completed" } - CH03 ("", 0x00, 0x08, 0x65, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) SRMT ("m1ec-m000") M000 () - CH03 ("", 0x00, 0x09, 0x68, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) SRMT ("m1ec-m001") M001 () - CH03 ("", 0x00, 0x0A, 0x6B, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } 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 1ceb4b506..5ab5b5a5f 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0304/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0304/DECL.asl @@ -327,15 +327,15 @@ } Else { - CH03 ("", 0x00, 0x0A, 0x011B, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } } - CH03 ("", 0x00, 0x0B, 0x011F, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) SRMT ("m18a-0") M18A (0x00) - CH03 ("", 0x00, 0x0C, 0x0122, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) SRMT ("m18a-1") M18A (0x01) - CH03 ("", 0x00, 0x0D, 0x0125, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } 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 e0d55b931..2ef212700 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0305/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0305/DECL.asl @@ -57,7 +57,7 @@ } } - CH03 ("", 0x00, 0x00, 0x39, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) M000 (0x00) - CH03 ("", 0x00, 0x01, 0x3B, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } 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 dc2c054c8..36e6ee987 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0306/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0306/DECL.asl @@ -38,7 +38,7 @@ Arg0 = "87654321" } - CH03 ("", 0x00, 0x00, 0x2C, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = 0x12345678 Local0 = "87654321" If ((ObjectType (Local0) != 0x02)) @@ -61,5 +61,5 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, ObjectType (Local2), 0x02) } - CH03 ("", 0x00, 0x04, 0x45, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 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 b4707dbed..f6775ff6c 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/common/proc.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/common/proc.asl @@ -186,7 +186,7 @@ TRC1 (Arg0, Arg2, 0xF0F0F0F0) Store (Arg0 [Arg2], Local0) - CH03 ("", 0x00, 0x0100, 0xA6, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = DerefOf (Local0) CH04 (__METHOD__, 0x01, 0x33, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_UNINITIALIZED_ELEMENT */ /* Just before written area */ @@ -194,7 +194,7 @@ Local1 = (Arg3 - 0x01) TRC1 (Arg0, Local1, 0xF0F0F0F0) Store (Arg0 [Local1], Local0) - CH03 ("", 0x00, 0x0102, 0xAF, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = DerefOf (Local0) CH04 (__METHOD__, 0x01, 0x33, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_UNINITIALIZED_ELEMENT */ } @@ -211,7 +211,7 @@ { TRC1 (Arg0, Local7, 0xF0F0F0F0) Store (Arg0 [Local7], Local0) - CH03 ("", 0x00, 0x0104, 0xBE, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = DerefOf (Local0) CH04 (__METHOD__, 0x01, 0x33, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_UNINITIALIZED_ELEMENT */ /* Last element of Package */ @@ -219,7 +219,7 @@ Local1 = (Arg1 - 0x01) TRC1 (Arg0, Local1, 0xF0F0F0F0) Store (Arg0 [Local1], Local0) - CH03 ("", 0x00, 0x0106, 0xC7, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = DerefOf (Local0) CH04 (__METHOD__, 0x01, 0x33, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_UNINITIALIZED_ELEMENT */ } @@ -230,7 +230,7 @@ TRC1 (Arg0, Arg2, 0xF0F0F0F0) Store (Arg0 [Arg2], Local0) - CH03 ("", 0x00, 0x0108, 0xD0, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = DerefOf (Local0) CH04 (__METHOD__, 0x01, 0x33, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_UNINITIALIZED_ELEMENT */ /* Last element of Package */ @@ -238,7 +238,7 @@ Local1 = (Arg1 - 0x01) TRC1 (Arg0, Local1, 0xF0F0F0F0) Store (Arg0 [Local1], Local0) - CH03 ("", 0x00, 0x010A, 0xD9, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = DerefOf (Local0) CH04 (__METHOD__, 0x01, 0x33, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_UNINITIALIZED_ELEMENT */ } @@ -247,14 +247,14 @@ /* Check exception on out of Package access */ TRC1 (Arg0, Arg1, 0xF0F0F0F0) - CH03 ("", 0x00, 0x010C, 0xE2, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = Arg0 [Arg1] CH04 (__METHOD__, 0x00, 0x37, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_PACKAGE_LIMIT */ Local7 = (Arg1 + 0x01) If ((Local7 >= Arg1)) { TRC1 (Arg0, Local7, 0xF0F0F0F0) - CH03 ("", 0x00, 0x010E, 0xE9, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = Arg0 [Local7] CH04 (__METHOD__, 0x00, 0x37, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_PACKAGE_LIMIT */ } @@ -262,7 +262,7 @@ If ((0xFFFFFFFFFFFFFFFF >= Arg1)) { TRC1 (Arg0, 0xFFFFFFFFFFFFFFFF, 0xF0F0F0F0) - CH03 ("", 0x00, 0x0110, 0xF0, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = Arg0 [0xFFFFFFFFFFFFFFFF] CH04 (__METHOD__, 0x00, 0x37, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_PACKAGE_LIMIT */ } @@ -306,7 +306,7 @@ { /* Was initialized */ - CH03 ("", 0x00, 0x0112, 0x011B, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = DerefOf (Arg0 [Arg5]) TRC1 (Arg0, Arg5, Local0) If ((Local0 != Arg5)) @@ -314,7 +314,7 @@ ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, Local0, Arg5) } - CH03 ("", 0x00, 0x0113, 0x0121, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } ElseIf ((Arg5 < Arg1)) { @@ -322,7 +322,7 @@ TRC1 (Arg0, Arg5, 0xF0F0F0F0) Store (Arg0 [Arg5], Local0) - CH03 ("", 0x00, 0x0114, 0x0129, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local1 = DerefOf (Local0) CH04 (__METHOD__, 0x01, 0x33, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_UNINITIALIZED_ELEMENT */ } @@ -331,7 +331,7 @@ /* Check exception on out of Package access */ TRC1 (Arg0, Arg5, 0xF0F0F0F0) - CH03 ("", 0x00, 0x0116, 0x0132, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local0 = Arg0 [Arg5] CH04 (__METHOD__, 0x00, 0x37, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_PACKAGE_LIMIT */ } @@ -369,7 +369,7 @@ ID01 = 0x01 } - CH03 ("", 0x00, 0x0119, 0x0159, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Return (0x01) } diff --git a/tests/aslts/src/runtime/collections/complex/misc/misc.asl b/tests/aslts/src/runtime/collections/complex/misc/misc.asl index 4c910a12c..854898db4 100644 --- a/tests/aslts/src/runtime/collections/complex/misc/misc.asl +++ b/tests/aslts/src/runtime/collections/complex/misc/misc.asl @@ -208,14 +208,14 @@ Local0 = 0x00 } - CH03 (__METHOD__, Z054, 0x0100, 0xC4, 0x00) + CH03 (__METHOD__, Z054, __LINE__, 0x00, 0x00) Local1 = ObjectType (Local0) If ((Local1 != 0x00)) { ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local1, 0x00) } - CH03 (__METHOD__, Z054, 0x0101, 0xCC, 0x00) + CH03 (__METHOD__, Z054, __LINE__, 0x00, 0x00) } Method (M118, 1, NotSerialized) @@ -248,7 +248,7 @@ Debug = "================ 2:" Debug = Local1 Debug = Local2 - CH03 (Arg0, Z054, 0x0102, 0xF1, 0x00) + CH03 (Arg0, Z054, __LINE__, 0x00, 0x00) Return (0x00) } @@ -321,7 +321,7 @@ /* are passed immediately */ Method (M11C, 1, Serialized) { - CH03 (__METHOD__, Z054, 0x0103, 0x0154, 0x00) + CH03 (__METHOD__, Z054, __LINE__, 0x00, 0x00) Store ((Buffer (0x01) { 0x79 // y @@ -329,7 +329,7 @@ { 0x79 // y }), Local5) - CH03 (__METHOD__, Z054, 0x0104, 0x0158, 0x00) + CH03 (__METHOD__, Z054, __LINE__, 0x00, 0x00) } /* Bug 57: The empty Return operator (without specifying the returning value) */ @@ -855,7 +855,7 @@ Zero) Return (0x12345678) } - CH03 (Arg0, Z054, 0x0105, 0x031A, 0x00) + CH03 (Arg0, Z054, __LINE__, 0x00, 0x00) Local0 = ObjectType (M000) If ((Local0 != C010)) { @@ -1116,21 +1116,21 @@ Zero) } } - CH03 (Arg0, Z054, 0x0107, 0x03CE, 0x00) + CH03 (Arg0, Z054, __LINE__, 0x00, 0x00) MF74 () - CH03 (Arg0, Z054, 0x0108, 0x03D0, 0x00) - CH03 (Arg0, Z054, 0x0109, 0x03D2, 0x00) + CH03 (Arg0, Z054, __LINE__, 0x00, 0x00) + CH03 (Arg0, Z054, __LINE__, 0x00, 0x00) MM00 () - CH03 (Arg0, Z054, 0x010A, 0x03D4, 0x00) - CH03 (Arg0, Z054, 0x010B, 0x03D6, 0x00) + CH03 (Arg0, Z054, __LINE__, 0x00, 0x00) + CH03 (Arg0, Z054, __LINE__, 0x00, 0x00) MM01 () - CH03 (Arg0, Z054, 0x010C, 0x03D8, 0x00) - CH03 (Arg0, Z054, 0x010D, 0x03DA, 0x00) + CH03 (Arg0, Z054, __LINE__, 0x00, 0x00) + CH03 (Arg0, Z054, __LINE__, 0x00, 0x00) MM02 () - CH03 (Arg0, Z054, 0x010E, 0x03DC, 0x00) - CH03 (Arg0, Z054, 0x010F, 0x03DE, 0x00) + CH03 (Arg0, Z054, __LINE__, 0x00, 0x00) + CH03 (Arg0, Z054, __LINE__, 0x00, 0x00) MM03 () - CH03 (Arg0, Z054, 0x0110, 0x03E0, 0x00) + CH03 (Arg0, Z054, __LINE__, 0x00, 0x00) } /* @@ -1167,7 +1167,7 @@ Zero) /* Bug 196 */ Method (MF86, 1, NotSerialized) { - CH03 ("mf86", Z054, 0x4A, 0x0407, 0x00) + CH03 ("mf86", Z054, __LINE__, 0x00, 0x00) Local1 = "0x0x12345678" ToInteger (Local1, Local0) If ((Local0 != 0x00)) @@ -1180,21 +1180,21 @@ Zero) Method (MF87, 1, NotSerialized) { - CH03 ("mf87", Z054, 0x00, 0x0414, 0x00) + CH03 ("mf87", Z054, __LINE__, 0x00, 0x00) Local0 = ("0x0xabcdef" + 0x00010234) If ((Local0 != 0x00010234)) { ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local0, 0x00010234) } - CH03 ("mf87", Z054, 0x01, 0x041B, 0x00) + CH03 ("mf87", Z054, __LINE__, 0x00, 0x00) Local0 = (0x00010234 + "0x0xabcdef") If ((Local0 != 0x00010234)) { ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local0, 0x00010234) } - CH03 ("mf87", Z054, 0x02, 0x0422, 0x00) + CH03 ("mf87", Z054, __LINE__, 0x00, 0x00) } Method (M15B, 0, Serialized) @@ -1225,11 +1225,11 @@ Zero) Method (M001, 0, NotSerialized) { - CH03 (__METHOD__, Z054, 0x01, 0x0440, 0x00) + CH03 (__METHOD__, Z054, __LINE__, 0x00, 0x00) Local0 = DerefOf (RefOf (MM00)) If (SLCK) { - CH03 (__METHOD__, Z054, 0x02, 0x0443, 0x00) + CH03 (__METHOD__, Z054, __LINE__, 0x00, 0x00) Local1 = ObjectType (Local0) If ((Local1 != C010)) { @@ -1244,11 +1244,11 @@ Zero) Method (M002, 0, NotSerialized) { - CH03 (__METHOD__, Z054, 0x05, 0x044F, 0x00) + CH03 (__METHOD__, Z054, __LINE__, 0x00, 0x00) Local0 = DerefOf (P000 [0x01]) If (SLCK) { - CH03 (__METHOD__, Z054, 0x06, 0x0452, 0x00) + CH03 (__METHOD__, Z054, __LINE__, 0x00, 0x00) Local1 = ObjectType (Local0) If ((Local1 != C010)) { @@ -1290,9 +1290,9 @@ Zero) Method (M005, 0, NotSerialized) { - CH03 (__METHOD__, Z054, 0x0E, 0x0478, 0x00) + CH03 (__METHOD__, Z054, __LINE__, 0x00, 0x00) CopyObject (DerefOf (RefOf (MM00)), Local0) - CH03 (__METHOD__, Z054, 0x0F, 0x047A, 0x00) + CH03 (__METHOD__, Z054, __LINE__, 0x00, 0x00) Local1 = ObjectType (Local0) If ((Local1 != C010)) { @@ -1302,9 +1302,9 @@ Zero) Method (M006, 0, NotSerialized) { - CH03 (__METHOD__, Z054, 0x11, 0x0484, 0x00) + CH03 (__METHOD__, Z054, __LINE__, 0x00, 0x00) CopyObject (DerefOf (P000 [0x01]), Local0) - CH03 (__METHOD__, Z054, 0x12, 0x0486, 0x00) + CH03 (__METHOD__, Z054, __LINE__, 0x00, 0x00) Local1 = ObjectType (Local0) If ((Local1 != C010)) { @@ -1338,14 +1338,14 @@ Zero) Method (M009, 0, NotSerialized) { - CH03 (__METHOD__, Z054, 0x18, 0x04A8, 0x00) + CH03 (__METHOD__, Z054, __LINE__, 0x00, 0x00) Local0 = (DerefOf (RefOf (MM00)) + 0x02) CH04 (__METHOD__, 0x00, 0x2F, Z054, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ } Method (M00A, 0, NotSerialized) { - CH03 (__METHOD__, Z054, 0x1A, 0x04AF, 0x00) + CH03 (__METHOD__, Z054, __LINE__, 0x00, 0x00) Local0 = (DerefOf (P000 [0x01]) + 0x03) CH04 (__METHOD__, 0x00, 0x2F, Z054, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ } diff --git a/tests/aslts/src/runtime/collections/complex/namespace/fullpath.asl b/tests/aslts/src/runtime/collections/complex/namespace/fullpath.asl index 947c8f1bf..ba4dde93b 100644 --- a/tests/aslts/src/runtime/collections/complex/namespace/fullpath.asl +++ b/tests/aslts/src/runtime/collections/complex/namespace/fullpath.asl @@ -63,9 +63,9 @@ } } - CH03 (__METHOD__, Z179, 0x44, 0x42, 0x00) + CH03 (__METHOD__, Z179, __LINE__, 0x00, 0x00) M000 () - CH03 (__METHOD__, Z179, 0x45, 0x44, 0x00) + CH03 (__METHOD__, Z179, __LINE__, 0x00, 0x00) } Method (FP01, 0, Serialized) @@ -103,9 +103,9 @@ } } - CH03 (__METHOD__, Z179, 0x44, 0x64, 0x00) + CH03 (__METHOD__, Z179, __LINE__, 0x00, 0x00) M000 (0x00) - CH03 (__METHOD__, Z179, 0x45, 0x66, 0x00) + CH03 (__METHOD__, Z179, __LINE__, 0x00, 0x00) } Method (FPD0, 0, NotSerialized) diff --git a/tests/aslts/src/runtime/collections/complex/namespace/ns0.asl b/tests/aslts/src/runtime/collections/complex/namespace/ns0.asl index 7bae3e062..785b4c9a2 100644 --- a/tests/aslts/src/runtime/collections/complex/namespace/ns0.asl +++ b/tests/aslts/src/runtime/collections/complex/namespace/ns0.asl @@ -53,7 +53,7 @@ 0x04 }) Name (I001, 0x00) - CH03 (__METHOD__, Z154, 0x00, 0x38, 0x00) + CH03 (__METHOD__, Z154, __LINE__, 0x00, 0x00) I001 = Arg0 Method (M001, 0, NotSerialized) { @@ -82,7 +82,7 @@ } Debug = Local0 - CH03 (__METHOD__, Z154, 0x02, 0x51, 0x00) + CH03 (__METHOD__, Z154, __LINE__, 0x00, 0x00) } Method (M001, 1, Serialized) @@ -160,7 +160,7 @@ ERR (__METHOD__, Z154, __LINE__, 0x00, 0x00, I000, 0x80000000) } - CH03 (__METHOD__, Z154, 0x05, 0x92, 0x00) + CH03 (__METHOD__, Z154, __LINE__, 0x00, 0x00) } Method (M002, 0, Serialized) @@ -191,7 +191,7 @@ ERR (__METHOD__, Z154, __LINE__, 0x00, 0x00, I000, 0x00100064) } - CH03 (__METHOD__, Z154, 0x08, 0xAF, 0x00) + CH03 (__METHOD__, Z154, __LINE__, 0x00, 0x00) } Method (M003, 0, Serialized) @@ -221,7 +221,7 @@ ERR (__METHOD__, Z154, __LINE__, 0x00, 0x00, I000, 0x00100064) } - CH03 (__METHOD__, Z154, 0x0B, 0xCB, 0x00) + CH03 (__METHOD__, Z154, __LINE__, 0x00, 0x00) } /* @@ -302,7 +302,7 @@ ERR (__METHOD__, Z154, __LINE__, 0x00, 0x00, Local7, 0x01) } - CH03 (__METHOD__, Z154, 0x0E, 0x0110, 0x00) + CH03 (__METHOD__, Z154, __LINE__, 0x00, 0x00) } /* @@ -383,7 +383,7 @@ ERR (__METHOD__, Z154, __LINE__, 0x00, 0x00, Arg1, 0x01) } - CH03 (__METHOD__, Z154, 0x11, 0x0155, 0x00) + CH03 (__METHOD__, Z154, __LINE__, 0x00, 0x00) } Method (N000, 0, NotSerialized) 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 285054441..a8beac4a3 100644 --- a/tests/aslts/src/runtime/collections/complex/namespace/ns0_root.asl +++ b/tests/aslts/src/runtime/collections/complex/namespace/ns0_root.asl @@ -47,7 +47,7 @@ 0x04 }) I001 = Arg0 - CH03 (__METHOD__, Z154, 0x14, 0x30, 0x00) + CH03 (__METHOD__, Z154, __LINE__, 0x00, 0x00) Method (M001, 0, NotSerialized) { Method (M002, 0, NotSerialized) @@ -103,7 +103,7 @@ Store ((D000.I000 + M001 ()), Local0) If (FLG9) { - CH03 (__METHOD__, Z154, 0x14, 0x61, 0x00) + CH03 (__METHOD__, Z154, __LINE__, 0x00, 0x00) If ((Local0 != 0x87654321)) { ERR (__METHOD__, Z154, __LINE__, 0x00, 0x00, Local0, 0x87654321) @@ -139,7 +139,7 @@ 0x04 }) I001 = Arg0 - CH03 (__METHOD__, Z154, 0x14, 0x7C, 0x00) + CH03 (__METHOD__, Z154, __LINE__, 0x00, 0x00) Method (M001, 0, NotSerialized) { Method (M002, 0, NotSerialized) @@ -195,7 +195,7 @@ Store ((TZ00.I000 + M001 ()), Local0) If (FLG9) { - CH03 (__METHOD__, Z154, 0x14, 0xAC, 0x00) + CH03 (__METHOD__, Z154, __LINE__, 0x00, 0x00) If ((Local0 != 0x87654321)) { ERR (__METHOD__, Z154, __LINE__, 0x00, 0x00, Local0, 0x87654321) @@ -231,7 +231,7 @@ 0x04 }) I001 = Arg0 - CH03 (__METHOD__, Z154, 0x14, 0xC7, 0x00) + CH03 (__METHOD__, Z154, __LINE__, 0x00, 0x00) Method (M001, 0, NotSerialized) { Method (M002, 0, NotSerialized) @@ -287,7 +287,7 @@ Store ((PR00.I000 + M001 ()), Local0) If (FLG9) { - CH03 (__METHOD__, Z154, 0x14, 0xF8, 0x00) + CH03 (__METHOD__, Z154, __LINE__, 0x00, 0x00) If ((Local0 != 0x87654321)) { ERR (__METHOD__, Z154, __LINE__, 0x00, 0x00, Local0, 0x87654321) @@ -323,7 +323,7 @@ 0x04 }) I001 = Arg0 - CH03 (__METHOD__, Z154, 0x1D, 0x0113, 0x00) + CH03 (__METHOD__, Z154, __LINE__, 0x00, 0x00) Method (M001, 0, NotSerialized) { Method (M002, 0, NotSerialized) @@ -379,7 +379,7 @@ Store ((PW00.I000 + M001 ()), Local0) If (FLG9) { - CH03 (__METHOD__, Z154, 0x14, 0x0144, 0x00) + CH03 (__METHOD__, Z154, __LINE__, 0x00, 0x00) If ((Local0 != 0x87654321)) { ERR (__METHOD__, Z154, __LINE__, 0x00, 0x00, Local0, 0x87654321) diff --git a/tests/aslts/src/runtime/collections/complex/namespace/ns1.asl b/tests/aslts/src/runtime/collections/complex/namespace/ns1.asl index 08d244048..467a5fd4e 100644 --- a/tests/aslts/src/runtime/collections/complex/namespace/ns1.asl +++ b/tests/aslts/src/runtime/collections/complex/namespace/ns1.asl @@ -52,7 +52,7 @@ ERR (__METHOD__, Z155, __LINE__, 0x00, 0x00, Local0, 0x11112222) } - CH03 (__METHOD__, Z155, 0x01, 0x37, 0x00) + CH03 (__METHOD__, Z155, __LINE__, 0x00, 0x00) } Method (M101, 0, Serialized) @@ -73,7 +73,7 @@ ERR (__METHOD__, Z155, __LINE__, 0x00, 0x00, Local0, 0x67) } - CH03 (__METHOD__, Z155, 0x03, 0x4B, 0x00) + CH03 (__METHOD__, Z155, __LINE__, 0x00, 0x00) } Method (M102, 0, Serialized) @@ -91,7 +91,7 @@ ERR (__METHOD__, Z155, __LINE__, 0x00, 0x00, Local0, 0x38) } - CH03 (__METHOD__, Z155, 0x05, 0x5F, 0x00) + CH03 (__METHOD__, Z155, __LINE__, 0x00, 0x00) } /* @@ -113,7 +113,7 @@ 0x01, 0x22223333 }) - CH03 (__METHOD__, Z155, 0x06, 0x6C, 0x00) + CH03 (__METHOD__, Z155, __LINE__, 0x00, 0x00) I001 = Arg0 Method (M001, 0, NotSerialized) { @@ -179,7 +179,7 @@ ERR (__METHOD__, Z155, __LINE__, 0x00, 0x00, Local0, 0x80000000) } - CH03 (__METHOD__, Z155, 0x09, 0xA7, 0x00) + CH03 (__METHOD__, Z155, __LINE__, 0x00, 0x00) } /* @@ -221,7 +221,7 @@ ERR (__METHOD__, Z155, __LINE__, 0x00, 0x00, Local0, 0x00100064) } - CH03 (__METHOD__, Z155, 0x0C, 0xCC, 0x00) + CH03 (__METHOD__, Z155, __LINE__, 0x00, 0x00) } /* @@ -232,7 +232,7 @@ Name (I001, 0x00) Name (B000, Buffer (0x10){}) CreateField (B000, 0x05, 0x20, BF00) - CH03 (__METHOD__, Z155, 0x0D, 0xD9, 0x00) + CH03 (__METHOD__, Z155, __LINE__, 0x00, 0x00) I001 = Arg0 Method (M001, 0, NotSerialized) { @@ -307,7 +307,7 @@ ERR (__METHOD__, Z155, __LINE__, 0x00, 0x00, BF00, Local1) } - CH03 (__METHOD__, Z155, 0x10, 0x011B, 0x00) + CH03 (__METHOD__, Z155, __LINE__, 0x00, 0x00) } /* @@ -323,7 +323,7 @@ F001, 32 } - CH03 (__METHOD__, Z155, 0x11, 0x0128, 0x00) + CH03 (__METHOD__, Z155, __LINE__, 0x00, 0x00) I001 = Arg0 Method (M001, 0, NotSerialized) { @@ -398,7 +398,7 @@ ERR (__METHOD__, Z155, __LINE__, 0x00, 0x00, F001, Local1) } - CH03 (__METHOD__, Z155, 0x14, 0x016A, 0x00) + CH03 (__METHOD__, Z155, __LINE__, 0x00, 0x00) } /* @@ -421,7 +421,7 @@ BNK0, 32 } - CH03 (__METHOD__, Z155, 0x15, 0x017A, 0x00) + CH03 (__METHOD__, Z155, __LINE__, 0x00, 0x00) I001 = Arg0 Method (M001, 0, NotSerialized) { @@ -496,7 +496,7 @@ ERR (__METHOD__, Z155, __LINE__, 0x00, 0x00, BNK0, Local1) } - CH03 (__METHOD__, Z155, 0x18, 0x01BC, 0x00) + CH03 (__METHOD__, Z155, __LINE__, 0x00, 0x00) } /* @@ -519,7 +519,7 @@ IF00, 32 } - CH03 (__METHOD__, Z155, 0x19, 0x01CC, 0x00) + CH03 (__METHOD__, Z155, __LINE__, 0x00, 0x00) I001 = Arg0 Method (M001, 0, NotSerialized) { @@ -594,7 +594,7 @@ ERR (__METHOD__, Z155, __LINE__, 0x00, 0x00, IF00, Local1) } - CH03 (__METHOD__, Z155, 0x1C, 0x020E, 0x00) + CH03 (__METHOD__, Z155, __LINE__, 0x00, 0x00) } /* @@ -607,7 +607,7 @@ { 0x11, 0x01, 0x22 // .." }) - CH03 (__METHOD__, Z155, 0x1D, 0x021A, 0x00) + CH03 (__METHOD__, Z155, __LINE__, 0x00, 0x00) I001 = Arg0 Method (M001, 0, NotSerialized) { @@ -682,7 +682,7 @@ ERR (__METHOD__, Z155, __LINE__, 0x00, 0x00, Local0, Local1) } - CH03 (__METHOD__, Z155, 0x20, 0x025B, 0x00) + CH03 (__METHOD__, Z155, __LINE__, 0x00, 0x00) } /* @@ -692,7 +692,7 @@ { Name (I001, 0x00) Name (S000, "q\x01ertyuiop") - CH03 (__METHOD__, Z155, 0x21, 0x0267, 0x00) + CH03 (__METHOD__, Z155, __LINE__, 0x00, 0x00) I001 = Arg0 Method (M001, 0, NotSerialized) { @@ -767,7 +767,7 @@ ERR (__METHOD__, Z155, __LINE__, 0x00, 0x00, Local0, Local1) } - CH03 (__METHOD__, Z155, 0x24, 0x02A8, 0x00) + CH03 (__METHOD__, Z155, __LINE__, 0x00, 0x00) } Method (N001, 0, NotSerialized) diff --git a/tests/aslts/src/runtime/collections/complex/namespace/ns2.asl b/tests/aslts/src/runtime/collections/complex/namespace/ns2.asl index b2a51de21..726458701 100644 --- a/tests/aslts/src/runtime/collections/complex/namespace/ns2.asl +++ b/tests/aslts/src/runtime/collections/complex/namespace/ns2.asl @@ -54,7 +54,7 @@ ERR (__METHOD__, Z156, __LINE__, 0x00, 0x00, Local0, 0x11112222) } - CH03 (__METHOD__, Z156, 0x01, 0x39, 0x00) + CH03 (__METHOD__, Z156, __LINE__, 0x00, 0x00) } Method (M201, 0, Serialized) @@ -79,7 +79,7 @@ ERR (__METHOD__, Z156, __LINE__, 0x00, 0x00, Local0, 0x67) } - CH03 (__METHOD__, Z156, 0x03, 0x50, 0x00) + CH03 (__METHOD__, Z156, __LINE__, 0x00, 0x00) } Method (M202, 0, Serialized) @@ -101,7 +101,7 @@ ERR (__METHOD__, Z156, __LINE__, 0x00, 0x00, Local0, 0x38) } - CH03 (__METHOD__, Z156, 0x05, 0x67, 0x00) + CH03 (__METHOD__, Z156, __LINE__, 0x00, 0x00) } /* @@ -147,7 +147,7 @@ ERR (__METHOD__, Z156, __LINE__, 0x00, 0x00, Local0, 0x00100064) } - CH03 (__METHOD__, Z156, 0x0C, 0x8F, 0x00) + CH03 (__METHOD__, Z156, __LINE__, 0x00, 0x00) } Method (N002, 0, NotSerialized) 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 aa1e84eb5..bd5a58136 100644 --- a/tests/aslts/src/runtime/collections/complex/namespace/ns2_root.asl +++ b/tests/aslts/src/runtime/collections/complex/namespace/ns2_root.asl @@ -51,7 +51,7 @@ }) } - CH03 (__METHOD__, Z156, 0x06, 0x2E, 0x00) + CH03 (__METHOD__, Z156, __LINE__, 0x00, 0x00) I001 = Arg0 Method (M001, 0, NotSerialized) { @@ -117,7 +117,7 @@ ERR (__METHOD__, Z156, __LINE__, 0x00, 0x00, Local0, 0x80000000) } - CH03 (__METHOD__, Z156, 0x09, 0x69, 0x00) + CH03 (__METHOD__, Z156, __LINE__, 0x00, 0x00) } /* @@ -133,14 +133,14 @@ 0x03, 0x04 }) - CH03 (__METHOD__, Z156, 0x0D, 0x75, 0x00) + CH03 (__METHOD__, Z156, __LINE__, 0x00, 0x00) Device (D000) { Name (B000, Buffer (0x10){}) CreateField (B000, 0x05, 0x20, BF00) } - CH03 (__METHOD__, Z156, 0x0E, 0x7D, 0x00) + CH03 (__METHOD__, Z156, __LINE__, 0x00, 0x00) If (0x00) { CreateField (D000.B000, 0x05, 0x20, BF00) @@ -211,7 +211,7 @@ ERR (__METHOD__, Z156, __LINE__, 0x00, 0x00, Local0, 0x80000000) } - CH03 (__METHOD__, Z156, 0x11, 0xBC, 0x00) + CH03 (__METHOD__, Z156, __LINE__, 0x00, 0x00) } Method (N102, 0, NotSerialized) diff --git a/tests/aslts/src/runtime/collections/complex/namespace/ns3.asl b/tests/aslts/src/runtime/collections/complex/namespace/ns3.asl index 052580b09..f0df5bdd6 100644 --- a/tests/aslts/src/runtime/collections/complex/namespace/ns3.asl +++ b/tests/aslts/src/runtime/collections/complex/namespace/ns3.asl @@ -60,7 +60,7 @@ ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local0, 0x11112222) } - CH03 (__METHOD__, Z157, 0x02, 0x3F, 0x00) + CH03 (__METHOD__, Z157, __LINE__, 0x00, 0x00) } Method (M301, 0, Serialized) @@ -91,7 +91,7 @@ ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local0, 0x67) } - CH03 (__METHOD__, Z157, 0x05, 0x5F, 0x00) + CH03 (__METHOD__, Z157, __LINE__, 0x00, 0x00) } Method (M302, 0, Serialized) @@ -119,7 +119,7 @@ ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local0, 0x38) } - CH03 (__METHOD__, Z157, 0x08, 0x7E, 0x00) + CH03 (__METHOD__, Z157, __LINE__, 0x00, 0x00) } /* @@ -143,7 +143,7 @@ 0x03, 0x04 }) - CH03 (__METHOD__, Z157, 0x09, 0x8E, 0x00) + CH03 (__METHOD__, Z157, __LINE__, 0x00, 0x00) I001 = Arg1 Method (M001, 1, NotSerialized) { @@ -209,7 +209,7 @@ ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local1, 0x80000000) } - CH03 (__METHOD__, Z157, 0x0C, 0xC9, 0x00) + CH03 (__METHOD__, Z157, __LINE__, 0x00, 0x00) Return (Local0) } @@ -225,7 +225,7 @@ ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local0, 0x80000000) } - CH03 (__METHOD__, Z157, 0x0F, 0xDA, 0x00) + CH03 (__METHOD__, Z157, __LINE__, 0x00, 0x00) } /* @@ -284,7 +284,7 @@ ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local1, 0x00100064) } - CH03 (__METHOD__, Z157, 0x14, 0x010E, 0x00) + CH03 (__METHOD__, Z157, __LINE__, 0x00, 0x00) } /* @@ -293,7 +293,7 @@ Method (M305, 0, Serialized) { Name (B000, Buffer (0x10){}) - CH03 (__METHOD__, Z157, 0x15, 0x0119, 0x00) + CH03 (__METHOD__, Z157, __LINE__, 0x00, 0x00) CreateField (B000, 0x05, 0x20, BF00) BF00 = 0xABCDEF70 Method (M000, 1, NotSerialized) @@ -358,7 +358,7 @@ ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Arg0, Local1) } - CH03 (__METHOD__, Z157, 0x18, 0x0156, 0x00) + CH03 (__METHOD__, Z157, __LINE__, 0x00, 0x00) Return (Local0) } @@ -374,7 +374,7 @@ ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, BF00, Local1) } - CH03 (__METHOD__, Z157, 0x1B, 0x0167, 0x00) + CH03 (__METHOD__, Z157, __LINE__, 0x00, 0x00) } /* @@ -390,7 +390,7 @@ F001, 32 } - CH03 (__METHOD__, Z157, 0x1C, 0x0174, 0x00) + CH03 (__METHOD__, Z157, __LINE__, 0x00, 0x00) F000 = 0xABCDEF70 Method (M000, 1, NotSerialized) { @@ -454,7 +454,7 @@ ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Arg0, Local1) } - CH03 (__METHOD__, Z157, 0x1F, 0x01B0, 0x00) + CH03 (__METHOD__, Z157, __LINE__, 0x00, 0x00) Return (Local0) } @@ -470,7 +470,7 @@ ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, F000, Local1) } - CH03 (__METHOD__, Z157, 0x22, 0x01C1, 0x00) + CH03 (__METHOD__, Z157, __LINE__, 0x00, 0x00) } /* @@ -491,7 +491,7 @@ BNK0, 32 } - CH03 (__METHOD__, Z157, 0x23, 0x01CF, 0x00) + CH03 (__METHOD__, Z157, __LINE__, 0x00, 0x00) BNK0 = 0xABCDEF70 Method (M000, 1, NotSerialized) { @@ -555,7 +555,7 @@ ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Arg0, Local1) } - CH03 (__METHOD__, Z157, 0x26, 0x020B, 0x00) + CH03 (__METHOD__, Z157, __LINE__, 0x00, 0x00) Return (Local0) } @@ -571,7 +571,7 @@ ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, BNK0, Local1) } - CH03 (__METHOD__, Z157, 0x29, 0x021C, 0x00) + CH03 (__METHOD__, Z157, __LINE__, 0x00, 0x00) } /* @@ -592,7 +592,7 @@ IF00, 32 } - CH03 (__METHOD__, Z157, 0x2A, 0x022A, 0x00) + CH03 (__METHOD__, Z157, __LINE__, 0x00, 0x00) IF00 = 0xABCDEF70 Method (M000, 1, NotSerialized) { @@ -656,7 +656,7 @@ ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Arg0, Local1) } - CH03 (__METHOD__, Z157, 0x2D, 0x0266, 0x00) + CH03 (__METHOD__, Z157, __LINE__, 0x00, 0x00) Return (Local0) } @@ -672,7 +672,7 @@ ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, IF00, Local1) } - CH03 (__METHOD__, Z157, 0x30, 0x0277, 0x00) + CH03 (__METHOD__, Z157, __LINE__, 0x00, 0x00) } /* @@ -685,7 +685,7 @@ { 0x11, 0x01, 0x22 // .." }) - CH03 (__METHOD__, Z157, 0x31, 0x0283, 0x00) + CH03 (__METHOD__, Z157, __LINE__, 0x00, 0x00) I001 = Arg0 Method (M000, 2, NotSerialized) { @@ -762,7 +762,7 @@ ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local1, Local2) } - CH03 (__METHOD__, Z157, 0x34, 0x02C6, 0x00) + CH03 (__METHOD__, Z157, __LINE__, 0x00, 0x00) Return (Local0) } @@ -787,7 +787,7 @@ ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local1, Local2) } - CH03 (__METHOD__, Z157, 0x37, 0x02DD, 0x00) + CH03 (__METHOD__, Z157, __LINE__, 0x00, 0x00) } /* @@ -797,7 +797,7 @@ { Name (I001, 0x00) Name (S000, "q\x01ertyuiop") - CH03 (__METHOD__, Z157, 0x38, 0x02E9, 0x00) + CH03 (__METHOD__, Z157, __LINE__, 0x00, 0x00) I001 = Arg0 Method (M000, 2, NotSerialized) { @@ -874,7 +874,7 @@ ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local1, Local2) } - CH03 (__METHOD__, Z157, 0x3B, 0x032C, 0x00) + CH03 (__METHOD__, Z157, __LINE__, 0x00, 0x00) Return (Local0) } @@ -899,7 +899,7 @@ ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local1, Local2) } - CH03 (__METHOD__, Z157, 0x3E, 0x0343, 0x00) + CH03 (__METHOD__, Z157, __LINE__, 0x00, 0x00) } /* @@ -912,7 +912,7 @@ Name (I001, 0x00) Name (B000, Buffer (0x10){}) I001 = Arg0 - CH03 (__METHOD__, Z157, 0x3F, 0x0353, 0x00) + CH03 (__METHOD__, Z157, __LINE__, 0x00, 0x00) Method (M000, 2, NotSerialized) { CreateField (B000, 0x05, 0x20, BF00) @@ -989,7 +989,7 @@ ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, BF00, Local1) } - CH03 (__METHOD__, Z157, 0x42, 0x0397, 0x00) + CH03 (__METHOD__, Z157, __LINE__, 0x00, 0x00) Return (Local0) } @@ -999,7 +999,7 @@ ERR (__METHOD__, Z157, __LINE__, 0x00, 0x00, Local0, 0x87654321) } - CH03 (__METHOD__, Z157, 0x44, 0x03A2, 0x00) + CH03 (__METHOD__, Z157, __LINE__, 0x00, 0x00) } Method (N003, 0, NotSerialized) diff --git a/tests/aslts/src/runtime/collections/complex/namespace/ns4.asl b/tests/aslts/src/runtime/collections/complex/namespace/ns4.asl index 9ac438fbf..d4d28bdbb 100644 --- a/tests/aslts/src/runtime/collections/complex/namespace/ns4.asl +++ b/tests/aslts/src/runtime/collections/complex/namespace/ns4.asl @@ -44,7 +44,7 @@ 0x03, 0x04 }) - CH03 (__METHOD__, Z158, 0x00, 0x2F, 0x00) + CH03 (__METHOD__, Z158, __LINE__, 0x00, 0x00) I001 = Arg0 Method (MADD, 2, NotSerialized) { @@ -115,7 +115,7 @@ ERR (__METHOD__, Z158, __LINE__, 0x00, 0x00, I000, 0x80000000) } - CH03 (__METHOD__, Z158, 0x03, 0x6E, 0x00) + CH03 (__METHOD__, Z158, __LINE__, 0x00, 0x00) } Method (N004, 0, NotSerialized) diff --git a/tests/aslts/src/runtime/collections/complex/namespace/scope.asl b/tests/aslts/src/runtime/collections/complex/namespace/scope.asl index 333e02b80..e2e8dc52a 100644 --- a/tests/aslts/src/runtime/collections/complex/namespace/scope.asl +++ b/tests/aslts/src/runtime/collections/complex/namespace/scope.asl @@ -39,9 +39,9 @@ } } - CH03 (__METHOD__, Z178, 0x44, 0x2C, 0x00) + CH03 (__METHOD__, Z178, __LINE__, 0x00, 0x00) M000 (0x00) - CH03 (__METHOD__, Z178, 0x45, 0x2E, 0x00) + CH03 (__METHOD__, Z178, __LINE__, 0x00, 0x00) } Method (SCP0, 0, NotSerialized) 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 76efbae9a..fd9b5f34d 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 @@ -9983,7 +9983,7 @@ } Else { - CH03 (Arg0, Z121, 0x00, 0x2E2A, 0x00) + CH03 (Arg0, Z121, __LINE__, 0x00, 0x00) Store (M601 (0x02, 0x06) [Arg1], Local3) CH04 (Arg0, 0x00, 0x55, Z121, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x03, 0x06) [Arg1], Local3) @@ -10039,7 +10039,7 @@ } Else { - CH03 (Arg0, Z121, 0x00, 0x2E6E, 0x00) + CH03 (Arg0, Z121, __LINE__, 0x00, 0x00) Local0 = M601 (0x02, 0x06) [Arg1] CH04 (Arg0, 0x00, 0x55, Z121, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x03, 0x06) [Arg1] @@ -10120,7 +10120,7 @@ /* (it can only be checked an exception does not occur) */ Method (M02E, 4, NotSerialized) { - CH03 (Arg0, Z121, 0x00, 0x2EC8, 0x00) + CH03 (Arg0, Z121, __LINE__, 0x00, 0x00) Fatal (0xFF, 0xFFFFFFFF, Arg1) If (F64) { @@ -10131,7 +10131,7 @@ Fatal (0xFF, 0xFFFFFFFF, Arg3) } - CH03 (Arg0, Z121, 0x01, 0x2ECF, 0x00) + CH03 (Arg0, Z121, __LINE__, 0x00, 0x00) } /* String to Integer conversion of the String Index and Length */ @@ -10711,12 +10711,12 @@ /* of the Method execution control operators (Sleep, Stall) */ Method (M031, 3, NotSerialized) { - CH03 (Arg0, Z121, 0x02, 0x3143, 0x00) + CH03 (Arg0, Z121, __LINE__, 0x00, 0x00) /* Sleep */ Local0 = Timer Sleep (Arg1) - CH03 (Arg0, Z121, 0x03, 0x314A, 0x00) + CH03 (Arg0, Z121, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) @@ -10728,7 +10728,7 @@ Local0 = Timer Stall (Arg2) - CH03 (Arg0, Z121, 0x04, 0x3157, 0x00) + CH03 (Arg0, Z121, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < 0x03DE)) @@ -10743,12 +10743,12 @@ { Mutex (MTX0, 0x00) Acquire (MTX0, 0x0000) - CH03 (Arg0, Z121, 0x05, 0x3167, 0x00) + CH03 (Arg0, Z121, __LINE__, 0x00, 0x00) Local0 = Timer /* Compiler allows only Integer constant as TimeoutValue (Bug 1) Acquire(MTX0, arg1) */ - CH03 (Arg0, Z121, 0x06, 0x316E, 0x00) + CH03 (Arg0, Z121, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) @@ -10762,10 +10762,10 @@ Method (M033, 2, Serialized) { Event (EVT0) - CH03 (Arg0, Z121, 0x07, 0x317D, 0x00) + CH03 (Arg0, Z121, __LINE__, 0x00, 0x00) Local0 = Timer Wait (EVT0, Arg1) - CH03 (Arg0, Z121, 0x08, 0x3182, 0x00) + CH03 (Arg0, Z121, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) @@ -20151,7 +20151,7 @@ /* (it can only be checked an exception does not occur) */ Method (M068, 3, NotSerialized) { - CH03 (Arg0, Z121, 0x09, 0x5B70, 0x00) + CH03 (Arg0, Z121, __LINE__, 0x00, 0x00) Fatal (0xFF, 0xFFFFFFFF, Arg1) If (F64) { @@ -20162,7 +20162,7 @@ Fatal (0xFF, 0xFFFFFFFF, Arg2) } - CH03 (Arg0, Z121, 0x0A, 0x5B77, 0x00) + CH03 (Arg0, Z121, __LINE__, 0x00, 0x00) } /* Buffer to Integer conversion of the Buffer Index and Length */ @@ -20742,12 +20742,12 @@ /* of the Method execution control operators (Sleep, Stall) */ Method (M06B, 3, NotSerialized) { - CH03 (Arg0, Z121, 0x0B, 0x5DEB, 0x00) + CH03 (Arg0, Z121, __LINE__, 0x00, 0x00) /* Sleep */ Local0 = Timer Sleep (Arg1) - CH03 (Arg0, Z121, 0x0C, 0x5DF2, 0x00) + CH03 (Arg0, Z121, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) @@ -20759,7 +20759,7 @@ Local0 = Timer Stall (Arg2) - CH03 (Arg0, Z121, 0x0D, 0x5DFF, 0x00) + CH03 (Arg0, Z121, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < 0x03DE)) @@ -20774,12 +20774,12 @@ { Mutex (MTX0, 0x00) Acquire (MTX0, 0x0000) - CH03 (Arg0, Z121, 0x0E, 0x5E10, 0x00) + CH03 (Arg0, Z121, __LINE__, 0x00, 0x00) Local0 = Timer /* Compiler allows only Integer constant as TimeoutValue (Bug 1) Acquire(MTX0, arg1) */ - CH03 (Arg0, Z121, 0x0F, 0x5E17, 0x00) + CH03 (Arg0, Z121, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) @@ -20793,10 +20793,10 @@ Method (M06D, 2, Serialized) { Event (EVT0) - CH03 (Arg0, Z121, 0x10, 0x5E26, 0x00) + CH03 (Arg0, Z121, __LINE__, 0x00, 0x00) Local0 = Timer Wait (EVT0, Arg1) - CH03 (Arg0, Z121, 0x11, 0x5E2B, 0x00) + CH03 (Arg0, Z121, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((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 618f2f3a3..91d6cc9d0 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 @@ -10869,7 +10869,7 @@ } Else { - CH03 (Arg0, Z085, 0x00, 0x2FE8, 0x00) + CH03 (Arg0, Z085, __LINE__, 0x00, 0x00) Store (M601 (0x02, 0x06) ["B"], Local3) CH04 (Arg0, 0x00, 0x55, Z085, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x03, 0x06) ["B"], Local3) @@ -10925,7 +10925,7 @@ } Else { - CH03 (Arg0, Z085, 0x00, 0x302D, 0x00) + CH03 (Arg0, Z085, __LINE__, 0x00, 0x00) Local0 = M601 (0x02, 0x06) ["B"] CH04 (Arg0, 0x00, 0x55, Z085, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x03, 0x06) ["B"] @@ -11006,7 +11006,7 @@ /* (it can only be checked an exception does not occur) */ Method (M02E, 1, NotSerialized) { - CH03 (Arg0, Z085, 0x00, 0x3088, 0x00) + CH03 (Arg0, Z085, __LINE__, 0x00, 0x00) Fatal (0xFF, 0xFFFFFFFF, "0321") If (F64) { @@ -11017,7 +11017,7 @@ Fatal (0xFF, 0xFFFFFFFF, "C179B3FE") } - CH03 (Arg0, Z085, 0x01, 0x308F, 0x00) + CH03 (Arg0, Z085, __LINE__, 0x00, 0x00) } /* String to Integer conversion of the String Index and Length */ @@ -11686,12 +11686,12 @@ /* of the Method execution control operators (Sleep, Stall) */ Method (M031, 1, NotSerialized) { - CH03 (Arg0, Z085, 0x02, 0x3349, 0x00) + CH03 (Arg0, Z085, __LINE__, 0x00, 0x00) /* Sleep */ Local0 = Timer Sleep ("0321") - CH03 (Arg0, Z085, 0x03, 0x3350, 0x00) + CH03 (Arg0, Z085, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) @@ -11703,7 +11703,7 @@ Local0 = Timer Stall ("63") - CH03 (Arg0, Z085, 0x04, 0x335D, 0x00) + CH03 (Arg0, Z085, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < 0x03DE)) @@ -11718,12 +11718,12 @@ { Mutex (MTX0, 0x00) Acquire (MTX0, 0x0000) - CH03 (Arg0, Z085, 0x05, 0x336D, 0x00) + CH03 (Arg0, Z085, __LINE__, 0x00, 0x00) Local0 = Timer /* Compiler allows only Integer constant as TimeoutValue (Bug 1) Acquire(MTX0, "0321") */ - CH03 (Arg0, Z085, 0x06, 0x3374, 0x00) + CH03 (Arg0, Z085, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) @@ -11737,10 +11737,10 @@ Method (M033, 1, Serialized) { Event (EVT0) - CH03 (Arg0, Z085, 0x07, 0x3383, 0x00) + CH03 (Arg0, Z085, __LINE__, 0x00, 0x00) Local0 = Timer Wait (EVT0, "0321") - CH03 (Arg0, Z085, 0x08, 0x3388, 0x00) + CH03 (Arg0, Z085, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) @@ -30669,7 +30669,7 @@ } Else { - CH03 (Arg0, Z085, 0x00, 0x5E8A, 0x00) + CH03 (Arg0, Z085, __LINE__, 0x00, 0x00) Store (M601 (0x02, 0x06) [Buffer (0x01) { 0x0B // . @@ -30779,7 +30779,7 @@ } Else { - CH03 (Arg0, Z085, 0x00, 0x5ECE, 0x00) + CH03 (Arg0, Z085, __LINE__, 0x00, 0x00) Local0 = M601 (0x02, 0x06) [Buffer (0x01) { 0x0B // . @@ -30923,7 +30923,7 @@ /* (it can only be checked an exception does not occur) */ Method (M068, 1, NotSerialized) { - CH03 (Arg0, Z085, 0x09, 0x5F28, 0x00) + CH03 (Arg0, Z085, __LINE__, 0x00, 0x00) Fatal (0xFF, 0xFFFFFFFF, Buffer (0x03) { 0x21, 0x03, 0x00 // !.. @@ -30945,7 +30945,7 @@ }) } - CH03 (Arg0, Z085, 0x0A, 0x5F2F, 0x00) + CH03 (Arg0, Z085, __LINE__, 0x00, 0x00) } /* Buffer to Integer conversion of the Buffer Index and Length */ @@ -32360,7 +32360,7 @@ /* of the Method execution control operators (Sleep, Stall) */ Method (M06B, 1, NotSerialized) { - CH03 (Arg0, Z085, 0x0B, 0x61C9, 0x00) + CH03 (Arg0, Z085, __LINE__, 0x00, 0x00) /* Sleep */ Local0 = Timer @@ -32368,7 +32368,7 @@ { 0x21, 0x03, 0x00 // !.. }) - CH03 (Arg0, Z085, 0x0C, 0x61D0, 0x00) + CH03 (Arg0, Z085, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) @@ -32383,7 +32383,7 @@ { 0x3F // ? }) - CH03 (Arg0, Z085, 0x0D, 0x61DD, 0x00) + CH03 (Arg0, Z085, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < 0x03DE)) @@ -32398,12 +32398,12 @@ { Mutex (MTX0, 0x00) Acquire (MTX0, 0x0000) - CH03 (Arg0, Z085, 0x0E, 0x61EE, 0x00) + CH03 (Arg0, Z085, __LINE__, 0x00, 0x00) Local0 = Timer /* Compiler allows only Integer constant as TimeoutValue (Bug 1) Acquire(MTX0, Buffer(3){0x21, 0x03, 0x00}) */ - CH03 (Arg0, Z085, 0x0F, 0x61F5, 0x00) + CH03 (Arg0, Z085, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) @@ -32417,13 +32417,13 @@ Method (M06D, 1, Serialized) { Event (EVT0) - CH03 (Arg0, Z085, 0x10, 0x6204, 0x00) + CH03 (Arg0, Z085, __LINE__, 0x00, 0x00) Local0 = Timer Wait (EVT0, Buffer (0x03) { 0x21, 0x03, 0x00 // !.. }) - CH03 (Arg0, Z085, 0x11, 0x6209, 0x00) + CH03 (Arg0, Z085, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((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 ad3086c57..3dbb4d085 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 @@ -10108,7 +10108,7 @@ } Else { - CH03 (Arg0, Z117, 0x00, 0x2EED, 0x00) + CH03 (Arg0, Z117, __LINE__, 0x00, 0x00) Store (M601 (0x02, 0x06) [Local1], Local5) CH04 (Arg0, 0x00, 0x55, Z117, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x03, 0x06) [Local1], Local5) @@ -10164,7 +10164,7 @@ } Else { - CH03 (Arg0, Z117, 0x00, 0x2F31, 0x00) + CH03 (Arg0, Z117, __LINE__, 0x00, 0x00) Local0 = M601 (0x02, 0x06) [Local1] CH04 (Arg0, 0x00, 0x55, Z117, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x03, 0x06) [Local1] @@ -10248,7 +10248,7 @@ Local1 = "0321" Local2 = "FE7CB391D650A284" Local3 = "C179B3FE" - CH03 (Arg0, Z117, 0x00, 0x2F8F, 0x00) + CH03 (Arg0, Z117, __LINE__, 0x00, 0x00) Fatal (0xFF, 0xFFFFFFFF, Local1) If (F64) { @@ -10259,7 +10259,7 @@ Fatal (0xFF, 0xFFFFFFFF, Local3) } - CH03 (Arg0, Z117, 0x01, 0x2F96, 0x00) + CH03 (Arg0, Z117, __LINE__, 0x00, 0x00) } /* String to Integer conversion of the String Index and Length */ @@ -10847,12 +10847,12 @@ { Local3 = "0321" Local4 = "63" - CH03 (Arg0, Z117, 0x02, 0x3217, 0x00) + CH03 (Arg0, Z117, __LINE__, 0x00, 0x00) /* Sleep */ Local0 = Timer Sleep (Local3) - CH03 (Arg0, Z117, 0x03, 0x321E, 0x00) + CH03 (Arg0, Z117, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) @@ -10864,7 +10864,7 @@ Local0 = Timer Stall (Local4) - CH03 (Arg0, Z117, 0x04, 0x322B, 0x00) + CH03 (Arg0, Z117, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < 0x03DE)) @@ -10880,12 +10880,12 @@ Local3 = "0321" Mutex (MTX0, 0x00) Acquire (MTX0, 0x0000) - CH03 (Arg0, Z117, 0x05, 0x323D, 0x00) + CH03 (Arg0, Z117, __LINE__, 0x00, 0x00) Local0 = Timer /* Compiler allows only Integer constant as TimeoutValue (Bug 1) Acquire(MTX0, Local3) */ - CH03 (Arg0, Z117, 0x06, 0x3244, 0x00) + CH03 (Arg0, Z117, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) @@ -10900,10 +10900,10 @@ { Local1 = "0321" Event (EVT0) - CH03 (Arg0, Z117, 0x07, 0x3255, 0x00) + CH03 (Arg0, Z117, __LINE__, 0x00, 0x00) Local0 = Timer Wait (EVT0, Local1) - CH03 (Arg0, Z117, 0x08, 0x325A, 0x00) + CH03 (Arg0, Z117, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) @@ -20453,7 +20453,7 @@ /* 0000 */ 0x84, 0xA2, 0x50, 0xD6, 0x91, 0xB3, 0x7C, 0xFE, // ..P...|. /* 0008 */ 0xA5 // . } - CH03 (Arg0, Z117, 0x09, 0x5CD9, 0x00) + CH03 (Arg0, Z117, __LINE__, 0x00, 0x00) Fatal (0xFF, 0xFFFFFFFF, Local1) If (F64) { @@ -20464,7 +20464,7 @@ Fatal (0xFF, 0xFFFFFFFF, Local2) } - CH03 (Arg0, Z117, 0x0A, 0x5CE0, 0x00) + CH03 (Arg0, Z117, __LINE__, 0x00, 0x00) } /* Buffer to Integer conversion of the Buffer Index and Length */ @@ -21078,12 +21078,12 @@ { 0x3F // ? } - CH03 (Arg0, Z117, 0x0B, 0x5F61, 0x00) + CH03 (Arg0, Z117, __LINE__, 0x00, 0x00) /* Sleep */ Local0 = Timer Sleep (Local3) - CH03 (Arg0, Z117, 0x0C, 0x5F68, 0x00) + CH03 (Arg0, Z117, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) @@ -21095,7 +21095,7 @@ Local0 = Timer Stall (Local4) - CH03 (Arg0, Z117, 0x0D, 0x5F75, 0x00) + CH03 (Arg0, Z117, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < 0x03DE)) @@ -21114,12 +21114,12 @@ } Mutex (MTX0, 0x00) Acquire (MTX0, 0x0000) - CH03 (Arg0, Z117, 0x0E, 0x5F88, 0x00) + CH03 (Arg0, Z117, __LINE__, 0x00, 0x00) Local0 = Timer /* Compiler allows only Integer constant as TimeoutValue (Bug 1) Acquire(MTX0, Local3) */ - CH03 (Arg0, Z117, 0x0F, 0x5F8F, 0x00) + CH03 (Arg0, Z117, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) @@ -21137,10 +21137,10 @@ 0x21, 0x03, 0x00 // !.. } Event (EVT0) - CH03 (Arg0, Z117, 0x10, 0x5FA0, 0x00) + CH03 (Arg0, Z117, __LINE__, 0x00, 0x00) Local0 = Timer Wait (EVT0, Local1) - CH03 (Arg0, Z117, 0x11, 0x5FA5, 0x00) + CH03 (Arg0, Z117, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((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 738c753b2..6c751267f 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 @@ -9984,7 +9984,7 @@ } Else { - CH03 (Arg0, Z086, 0x00, 0x2E2C, 0x00) + CH03 (Arg0, Z086, __LINE__, 0x00, 0x00) Store (M601 (0x02, 0x06) [S614], Local3) CH04 (Arg0, 0x00, 0x55, Z086, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x03, 0x06) [S614], Local3) @@ -10040,7 +10040,7 @@ } Else { - CH03 (Arg0, Z086, 0x00, 0x2E70, 0x00) + CH03 (Arg0, Z086, __LINE__, 0x00, 0x00) Local0 = M601 (0x02, 0x06) [S614] /* \S614 */ CH04 (Arg0, 0x00, 0x55, Z086, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x03, 0x06) [S614] /* \S614 */ @@ -10121,7 +10121,7 @@ /* (it can only be checked an exception does not occur) */ Method (M02E, 1, NotSerialized) { - CH03 (Arg0, Z086, 0x00, 0x2ECA, 0x00) + CH03 (Arg0, Z086, __LINE__, 0x00, 0x00) Fatal (0xFF, 0xFFFFFFFF, S601) If (F64) { @@ -10132,7 +10132,7 @@ Fatal (0xFF, 0xFFFFFFFF, S604) } - CH03 (Arg0, Z086, 0x01, 0x2ED1, 0x00) + CH03 (Arg0, Z086, __LINE__, 0x00, 0x00) } /* String to Integer conversion of the String Index and Length */ @@ -10712,12 +10712,12 @@ /* of the Method execution control operators (Sleep, Stall) */ Method (M031, 1, NotSerialized) { - CH03 (Arg0, Z086, 0x02, 0x3145, 0x00) + CH03 (Arg0, Z086, __LINE__, 0x00, 0x00) /* Sleep */ Local0 = Timer Sleep (S601) - CH03 (Arg0, Z086, 0x03, 0x314C, 0x00) + CH03 (Arg0, Z086, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) @@ -10729,7 +10729,7 @@ Local0 = Timer Stall (S61B) - CH03 (Arg0, Z086, 0x04, 0x3159, 0x00) + CH03 (Arg0, Z086, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < 0x03DE)) @@ -10744,12 +10744,12 @@ { Mutex (MTX0, 0x00) Acquire (MTX0, 0x0000) - CH03 (Arg0, Z086, 0x05, 0x3169, 0x00) + CH03 (Arg0, Z086, __LINE__, 0x00, 0x00) Local0 = Timer /* Compiler allows only Integer constant as TimeoutValue (Bug 1) Acquire(MTX0, s601) */ - CH03 (Arg0, Z086, 0x06, 0x3170, 0x00) + CH03 (Arg0, Z086, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) @@ -10763,10 +10763,10 @@ Method (M033, 1, Serialized) { Event (EVT0) - CH03 (Arg0, Z086, 0x07, 0x317F, 0x00) + CH03 (Arg0, Z086, __LINE__, 0x00, 0x00) Local0 = Timer Wait (EVT0, S601) - CH03 (Arg0, Z086, 0x08, 0x3184, 0x00) + CH03 (Arg0, Z086, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) @@ -19730,7 +19730,7 @@ } Else { - CH03 (Arg0, Z086, 0x00, 0x5AC9, 0x00) + CH03 (Arg0, Z086, __LINE__, 0x00, 0x00) Store (M601 (0x02, 0x06) [B60E], Local3) CH04 (Arg0, 0x00, 0x55, Z086, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x03, 0x06) [B60E], Local3) @@ -19786,7 +19786,7 @@ } Else { - CH03 (Arg0, Z086, 0x00, 0x5B0D, 0x00) + CH03 (Arg0, Z086, __LINE__, 0x00, 0x00) Local0 = M601 (0x02, 0x06) [B60E] /* \B60E */ CH04 (Arg0, 0x00, 0x55, Z086, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x03, 0x06) [B60E] /* \B60E */ @@ -19867,7 +19867,7 @@ /* (it can only be checked an exception does not occur) */ Method (M068, 1, NotSerialized) { - CH03 (Arg0, Z086, 0x09, 0x5B67, 0x00) + CH03 (Arg0, Z086, __LINE__, 0x00, 0x00) Fatal (0xFF, 0xFFFFFFFF, B606) If (F64) { @@ -19878,7 +19878,7 @@ Fatal (0xFF, 0xFFFFFFFF, B60A) } - CH03 (Arg0, Z086, 0x0A, 0x5B6E, 0x00) + CH03 (Arg0, Z086, __LINE__, 0x00, 0x00) } /* Buffer to Integer conversion of the Buffer Index and Length */ @@ -20458,12 +20458,12 @@ /* of the Method execution control operators (Sleep, Stall) */ Method (M06B, 1, NotSerialized) { - CH03 (Arg0, Z086, 0x0B, 0x5DE2, 0x00) + CH03 (Arg0, Z086, __LINE__, 0x00, 0x00) /* Sleep */ Local0 = Timer Sleep (B606) - CH03 (Arg0, Z086, 0x0C, 0x5DE9, 0x00) + CH03 (Arg0, Z086, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) @@ -20475,7 +20475,7 @@ Local0 = Timer Stall (B613) - CH03 (Arg0, Z086, 0x0D, 0x5DF6, 0x00) + CH03 (Arg0, Z086, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < 0x03DE)) @@ -20490,12 +20490,12 @@ { Mutex (MTX0, 0x00) Acquire (MTX0, 0x0000) - CH03 (Arg0, Z086, 0x0E, 0x5E07, 0x00) + CH03 (Arg0, Z086, __LINE__, 0x00, 0x00) Local0 = Timer /* Compiler allows only Integer constant as TimeoutValue (Bug 1) Acquire(MTX0, b606) */ - CH03 (Arg0, Z086, 0x0F, 0x5E0E, 0x00) + CH03 (Arg0, Z086, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) @@ -20509,10 +20509,10 @@ Method (M06D, 1, Serialized) { Event (EVT0) - CH03 (Arg0, Z086, 0x10, 0x5E1D, 0x00) + CH03 (Arg0, Z086, __LINE__, 0x00, 0x00) Local0 = Timer Wait (EVT0, B606) - CH03 (Arg0, Z086, 0x11, 0x5E22, 0x00) + CH03 (Arg0, Z086, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((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 d9b0f8b44..1416b35ed 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 @@ -9365,7 +9365,7 @@ } Else { - CH03 (Arg0, Z087, 0x00, 0x2B41, 0x00) + CH03 (Arg0, Z087, __LINE__, 0x00, 0x00) Store (M601 (0x02, 0x06) [BF74], Local3) CH04 (Arg0, 0x00, 0x55, Z087, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x03, 0x06) [BF74], Local3) @@ -9421,7 +9421,7 @@ } Else { - CH03 (Arg0, Z087, 0x00, 0x2B85, 0x00) + CH03 (Arg0, Z087, __LINE__, 0x00, 0x00) Local0 = M601 (0x02, 0x06) [BF74] /* \BF74 */ CH04 (Arg0, 0x00, 0x55, Z087, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x03, 0x06) [BF74] /* \BF74 */ @@ -9502,7 +9502,7 @@ /* (it can only be checked an exception does not occur) */ Method (M068, 1, NotSerialized) { - CH03 (Arg0, Z087, 0x00, 0x2BDF, 0x00) + CH03 (Arg0, Z087, __LINE__, 0x00, 0x00) Fatal (0xFF, 0xFFFFFFFF, BF61) If (F64) { @@ -9513,7 +9513,7 @@ Fatal (0xFF, 0xFFFFFFFF, BF65) } - CH03 (Arg0, Z087, 0x01, 0x2BE6, 0x00) + CH03 (Arg0, Z087, __LINE__, 0x00, 0x00) } /* Buffer Field to Integer conversion of the Buffer Field Index */ @@ -10091,12 +10091,12 @@ /* of the Method execution control operators (Sleep, Stall) */ Method (M06B, 1, NotSerialized) { - CH03 (Arg0, Z087, 0x02, 0x2E56, 0x00) + CH03 (Arg0, Z087, __LINE__, 0x00, 0x00) /* Sleep */ Local0 = Timer Sleep (BF61) - CH03 (Arg0, Z087, 0x03, 0x2E5D, 0x00) + CH03 (Arg0, Z087, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) @@ -10108,7 +10108,7 @@ Local0 = Timer Stall (BF75) - CH03 (Arg0, Z087, 0x04, 0x2E6A, 0x00) + CH03 (Arg0, Z087, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < 0x03DE)) @@ -10123,12 +10123,12 @@ { Mutex (MTX0, 0x00) Acquire (MTX0, 0x0000) - CH03 (Arg0, Z087, 0x05, 0x2E7B, 0x00) + CH03 (Arg0, Z087, __LINE__, 0x00, 0x00) Local0 = Timer /* Compiler allows only Integer constant as TimeoutValue (Bug 1) Acquire(MTX0, bf61) */ - CH03 (Arg0, Z087, 0x06, 0x2E82, 0x00) + CH03 (Arg0, Z087, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) @@ -10142,10 +10142,10 @@ Method (M06D, 1, Serialized) { Event (EVT0) - CH03 (Arg0, Z087, 0x07, 0x2E91, 0x00) + CH03 (Arg0, Z087, __LINE__, 0x00, 0x00) Local0 = Timer Wait (EVT0, BF61) - CH03 (Arg0, Z087, 0x08, 0x2E96, 0x00) + CH03 (Arg0, Z087, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((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 b3f5d1e46..5c701068e 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 @@ -10110,7 +10110,7 @@ } Else { - CH03 (Arg0, Z088, 0x00, 0x2EEF, 0x00) + CH03 (Arg0, Z088, __LINE__, 0x00, 0x00) Store (M601 (0x02, 0x06) [S614], Local3) CH04 (Arg0, 0x00, 0x55, Z088, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x03, 0x06) [S614], Local3) @@ -10166,7 +10166,7 @@ } Else { - CH03 (Arg0, Z088, 0x00, 0x2F33, 0x00) + CH03 (Arg0, Z088, __LINE__, 0x00, 0x00) Local0 = M601 (0x02, 0x06) [S614] /* \M613.M02D.S614 */ CH04 (Arg0, 0x00, 0x55, Z088, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x03, 0x06) [S614] /* \M613.M02D.S614 */ @@ -10250,7 +10250,7 @@ Name (S601, "0321") Name (S604, "C179B3FE") Name (S605, "FE7CB391D650A284") - CH03 (Arg0, Z088, 0x00, 0x2F91, 0x00) + CH03 (Arg0, Z088, __LINE__, 0x00, 0x00) Fatal (0xFF, 0xFFFFFFFF, S601) If (F64) { @@ -10261,7 +10261,7 @@ Fatal (0xFF, 0xFFFFFFFF, S604) } - CH03 (Arg0, Z088, 0x01, 0x2F98, 0x00) + CH03 (Arg0, Z088, __LINE__, 0x00, 0x00) } /* String to Integer conversion of the String Index and Length */ @@ -10849,12 +10849,12 @@ { Name (S601, "0321") Name (S61B, "63") - CH03 (Arg0, Z088, 0x02, 0x3219, 0x00) + CH03 (Arg0, Z088, __LINE__, 0x00, 0x00) /* Sleep */ Local0 = Timer Sleep (S601) - CH03 (Arg0, Z088, 0x03, 0x3220, 0x00) + CH03 (Arg0, Z088, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) @@ -10866,7 +10866,7 @@ Local0 = Timer Stall (S61B) - CH03 (Arg0, Z088, 0x04, 0x322D, 0x00) + CH03 (Arg0, Z088, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < 0x03DE)) @@ -10882,12 +10882,12 @@ Name (S601, "0321") Mutex (MTX0, 0x00) Acquire (MTX0, 0x0000) - CH03 (Arg0, Z088, 0x05, 0x323F, 0x00) + CH03 (Arg0, Z088, __LINE__, 0x00, 0x00) Local0 = Timer /* Compiler allows only Integer constant as TimeoutValue (Bug 1) Acquire(MTX0, s601) */ - CH03 (Arg0, Z088, 0x06, 0x3246, 0x00) + CH03 (Arg0, Z088, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) @@ -10902,10 +10902,10 @@ { Name (S601, "0321") Event (EVT0) - CH03 (Arg0, Z088, 0x07, 0x3257, 0x00) + CH03 (Arg0, Z088, __LINE__, 0x00, 0x00) Local0 = Timer Wait (EVT0, S601) - CH03 (Arg0, Z088, 0x08, 0x325C, 0x00) + CH03 (Arg0, Z088, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) @@ -20323,7 +20323,7 @@ } Else { - CH03 (Arg0, Z088, 0x00, 0x5C4F, 0x00) + CH03 (Arg0, Z088, __LINE__, 0x00, 0x00) Store (M601 (0x02, 0x06) [B60E], Local3) CH04 (Arg0, 0x00, 0x55, Z088, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x03, 0x06) [B60E], Local3) @@ -20379,7 +20379,7 @@ } Else { - CH03 (Arg0, Z088, 0x00, 0x5C93, 0x00) + CH03 (Arg0, Z088, __LINE__, 0x00, 0x00) Local0 = M601 (0x02, 0x06) [B60E] /* \M613.M067.B60E */ CH04 (Arg0, 0x00, 0x55, Z088, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x03, 0x06) [B60E] /* \M613.M067.B60E */ @@ -20469,7 +20469,7 @@ /* 0000 */ 0x84, 0xA2, 0x50, 0xD6, 0x91, 0xB3, 0x7C, 0xFE, // ..P...|. /* 0008 */ 0xA5 // . }) - CH03 (Arg0, Z088, 0x09, 0x5CF0, 0x00) + CH03 (Arg0, Z088, __LINE__, 0x00, 0x00) Fatal (0xFF, 0xFFFFFFFF, B606) If (F64) { @@ -20480,7 +20480,7 @@ Fatal (0xFF, 0xFFFFFFFF, B60A) } - CH03 (Arg0, Z088, 0x0A, 0x5CF7, 0x00) + CH03 (Arg0, Z088, __LINE__, 0x00, 0x00) } /* Buffer to Integer conversion of the Buffer Index and Length */ @@ -21094,12 +21094,12 @@ { 0x3F // ? }) - CH03 (Arg0, Z088, 0x0B, 0x5F78, 0x00) + CH03 (Arg0, Z088, __LINE__, 0x00, 0x00) /* Sleep */ Local0 = Timer Sleep (B606) - CH03 (Arg0, Z088, 0x0C, 0x5F7F, 0x00) + CH03 (Arg0, Z088, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) @@ -21111,7 +21111,7 @@ Local0 = Timer Stall (B613) - CH03 (Arg0, Z088, 0x0D, 0x5F8C, 0x00) + CH03 (Arg0, Z088, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < 0x03DE)) @@ -21130,12 +21130,12 @@ }) Mutex (MTX0, 0x00) Acquire (MTX0, 0x0000) - CH03 (Arg0, Z088, 0x0E, 0x5F9F, 0x00) + CH03 (Arg0, Z088, __LINE__, 0x00, 0x00) Local0 = Timer /* Compiler allows only Integer constant as TimeoutValue (Bug 1) Acquire(MTX0, b606) */ - CH03 (Arg0, Z088, 0x0F, 0x5FA6, 0x00) + CH03 (Arg0, Z088, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) @@ -21153,10 +21153,10 @@ 0x21, 0x03, 0x00 // !.. }) Event (EVT0) - CH03 (Arg0, Z088, 0x10, 0x5FB7, 0x00) + CH03 (Arg0, Z088, __LINE__, 0x00, 0x00) Local0 = Timer Wait (EVT0, B606) - CH03 (Arg0, Z088, 0x11, 0x5FBC, 0x00) + CH03 (Arg0, Z088, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((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 b7e475a76..596fc4a6e 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 @@ -9952,7 +9952,7 @@ } Else { - CH03 (Arg0, Z089, 0x00, 0x2CBE, 0x00) + CH03 (Arg0, Z089, __LINE__, 0x00, 0x00) Store (M601 (0x02, 0x06) [BF74], Local3) CH04 (Arg0, 0x00, 0x55, Z089, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x03, 0x06) [BF74], Local3) @@ -10008,7 +10008,7 @@ } Else { - CH03 (Arg0, Z088, 0x00, 0x2D02, 0x00) + CH03 (Arg0, Z088, __LINE__, 0x00, 0x00) Local0 = M601 (0x02, 0x06) [BF74] /* \M614.M067.BF74 */ CH04 (Arg0, 0x00, 0x55, Z088, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x03, 0x06) [BF74] /* \M614.M067.BF74 */ @@ -10099,7 +10099,7 @@ { 0x84, 0xA2, 0x50, 0xD6, 0x91, 0xB3, 0x7C, 0xFE // ..P...|. } - CH03 (Arg0, Z089, 0x00, 0x2D62, 0x00) + CH03 (Arg0, Z089, __LINE__, 0x00, 0x00) Fatal (0xFF, 0xFFFFFFFF, BF61) If (F64) { @@ -10110,7 +10110,7 @@ Fatal (0xFF, 0xFFFFFFFF, BF65) } - CH03 (Arg0, Z089, 0x01, 0x2D69, 0x00) + CH03 (Arg0, Z089, __LINE__, 0x00, 0x00) } /* Buffer Field to Integer conversion of the Buffer Field Index */ @@ -10713,12 +10713,12 @@ 0x21, 0x03, 0x00 // !.. } BF75 = 0x3F - CH03 (Arg0, Z089, 0x02, 0x2FF3, 0x00) + CH03 (Arg0, Z089, __LINE__, 0x00, 0x00) /* Sleep */ Local0 = Timer Sleep (BF61) - CH03 (Arg0, Z089, 0x03, 0x2FFA, 0x00) + CH03 (Arg0, Z089, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) @@ -10730,7 +10730,7 @@ Local0 = Timer Stall (BF75) - CH03 (Arg0, Z089, 0x04, 0x3007, 0x00) + CH03 (Arg0, Z089, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < 0x03DE)) @@ -10750,12 +10750,12 @@ } Mutex (MTX0, 0x00) Acquire (MTX0, 0x0000) - CH03 (Arg0, Z089, 0x05, 0x301C, 0x00) + CH03 (Arg0, Z089, __LINE__, 0x00, 0x00) Local0 = Timer /* Compiler allows only Integer constant as TimeoutValue (Bug 1) Acquire(MTX0, bf61) */ - CH03 (Arg0, Z089, 0x06, 0x3023, 0x00) + CH03 (Arg0, Z089, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) @@ -10774,10 +10774,10 @@ 0x21, 0x03, 0x00 // !.. } Event (EVT0) - CH03 (Arg0, Z089, 0x07, 0x3036, 0x00) + CH03 (Arg0, Z089, __LINE__, 0x00, 0x00) Local0 = Timer Wait (EVT0, BF61) - CH03 (Arg0, Z089, 0x08, 0x303B, 0x00) + CH03 (Arg0, Z089, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((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 e52d846bd..98ddef5dd 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 @@ -10677,7 +10677,7 @@ } Else { - CH03 (Arg0, Z090, 0x00, 0x2E2C, 0x00) + CH03 (Arg0, Z090, __LINE__, 0x00, 0x00) Store (M601 (0x02, 0x06) [DerefOf (PS60 [0x14])], Local3) CH04 (Arg0, 0x00, 0x55, Z090, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x03, 0x06) [DerefOf (PS60 [0x14])], Local3) @@ -10736,7 +10736,7 @@ } Else { - CH03 (Arg0, Z090, 0x00, 0x2E70, 0x00) + CH03 (Arg0, Z090, __LINE__, 0x00, 0x00) Local0 = M601 (0x02, 0x06) [DerefOf (PS60 [0x14])] CH04 (Arg0, 0x00, 0x55, Z090, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x03, 0x06) [DerefOf (PS60 [0x14])] @@ -10823,7 +10823,7 @@ /* (it can only be checked an exception does not occur) */ Method (M02E, 1, NotSerialized) { - CH03 (Arg0, Z090, 0x00, 0x2ECA, 0x00) + CH03 (Arg0, Z090, __LINE__, 0x00, 0x00) Fatal (0xFF, 0xFFFFFFFF, DerefOf (PS60 [0x01])) If (F64) { @@ -10834,7 +10834,7 @@ Fatal (0xFF, 0xFFFFFFFF, DerefOf (PS60 [0x04])) } - CH03 (Arg0, Z090, 0x01, 0x2ED1, 0x00) + CH03 (Arg0, Z090, __LINE__, 0x00, 0x00) } /* String to Integer conversion of the String Index and Length */ @@ -11520,12 +11520,12 @@ /* of the Method execution control operators (Sleep, Stall) */ Method (M031, 1, NotSerialized) { - CH03 (Arg0, Z090, 0x02, 0x3145, 0x00) + CH03 (Arg0, Z090, __LINE__, 0x00, 0x00) /* Sleep */ Local0 = Timer Sleep (DerefOf (PS60 [0x01])) - CH03 (Arg0, Z090, 0x03, 0x314C, 0x00) + CH03 (Arg0, Z090, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) @@ -11537,7 +11537,7 @@ Local0 = Timer Stall (DerefOf (PS60 [0x1B])) - CH03 (Arg0, Z090, 0x04, 0x3159, 0x00) + CH03 (Arg0, Z090, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < 0x03DE)) @@ -11552,12 +11552,12 @@ { Mutex (MTX0, 0x00) Acquire (MTX0, 0x0000) - CH03 (Arg0, Z090, 0x05, 0x3169, 0x00) + CH03 (Arg0, Z090, __LINE__, 0x00, 0x00) Local0 = Timer /* Compiler allows only Integer constant as TimeoutValue (Bug 1) Acquire(MTX0, Derefof(Index(ps60, 1))) */ - CH03 (Arg0, Z090, 0x06, 0x3170, 0x00) + CH03 (Arg0, Z090, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) @@ -11571,10 +11571,10 @@ Method (M033, 1, Serialized) { Event (EVT0) - CH03 (Arg0, Z090, 0x07, 0x317F, 0x00) + CH03 (Arg0, Z090, __LINE__, 0x00, 0x00) Local0 = Timer Wait (EVT0, DerefOf (PS60 [0x01])) - CH03 (Arg0, Z090, 0x08, 0x3184, 0x00) + CH03 (Arg0, Z090, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) @@ -21117,7 +21117,7 @@ } Else { - CH03 (Arg0, Z090, 0x00, 0x5AC9, 0x00) + CH03 (Arg0, Z090, __LINE__, 0x00, 0x00) Store (M601 (0x02, 0x06) [DerefOf (PB60 [0x0E])], Local3) CH04 (Arg0, 0x00, 0x55, Z090, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x03, 0x06) [DerefOf (PB60 [0x0E])], Local3) @@ -21176,7 +21176,7 @@ } Else { - CH03 (Arg0, Z090, 0x00, 0x5B0D, 0x00) + CH03 (Arg0, Z090, __LINE__, 0x00, 0x00) Local0 = M601 (0x02, 0x06) [DerefOf (PB60 [0x0E])] CH04 (Arg0, 0x00, 0x55, Z090, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x03, 0x06) [DerefOf (PB60 [0x0E])] @@ -21263,7 +21263,7 @@ /* (it can only be checked an exception does not occur) */ Method (M068, 1, NotSerialized) { - CH03 (Arg0, Z090, 0x09, 0x5B67, 0x00) + CH03 (Arg0, Z090, __LINE__, 0x00, 0x00) Fatal (0xFF, 0xFFFFFFFF, DerefOf (PB60 [0x06])) If (F64) { @@ -21274,7 +21274,7 @@ Fatal (0xFF, 0xFFFFFFFF, DerefOf (PB60 [0x0A])) } - CH03 (Arg0, Z090, 0x0A, 0x5B6E, 0x00) + CH03 (Arg0, Z090, __LINE__, 0x00, 0x00) } /* Buffer to Integer conversion of the Buffer Index and Length */ @@ -21960,12 +21960,12 @@ /* of the Method execution control operators (Sleep, Stall) */ Method (M06B, 1, NotSerialized) { - CH03 (Arg0, Z090, 0x0B, 0x5DE2, 0x00) + CH03 (Arg0, Z090, __LINE__, 0x00, 0x00) /* Sleep */ Local0 = Timer Sleep (DerefOf (PB60 [0x06])) - CH03 (Arg0, Z090, 0x0C, 0x5DE9, 0x00) + CH03 (Arg0, Z090, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) @@ -21977,7 +21977,7 @@ Local0 = Timer Stall (DerefOf (PB60 [0x13])) - CH03 (Arg0, Z090, 0x0D, 0x5DF6, 0x00) + CH03 (Arg0, Z090, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < 0x03DE)) @@ -21992,12 +21992,12 @@ { Mutex (MTX0, 0x00) Acquire (MTX0, 0x0000) - CH03 (Arg0, Z090, 0x0E, 0x5E07, 0x00) + CH03 (Arg0, Z090, __LINE__, 0x00, 0x00) Local0 = Timer /* Compiler allows only Integer constant as TimeoutValue (Bug 1) Acquire(MTX0, Derefof(Index(pb60, 6))) */ - CH03 (Arg0, Z090, 0x0F, 0x5E0E, 0x00) + CH03 (Arg0, Z090, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) @@ -22011,10 +22011,10 @@ Method (M06D, 1, Serialized) { Event (EVT0) - CH03 (Arg0, Z090, 0x10, 0x5E1D, 0x00) + CH03 (Arg0, Z090, __LINE__, 0x00, 0x00) Local0 = Timer Wait (EVT0, DerefOf (PB60 [0x06])) - CH03 (Arg0, Z090, 0x11, 0x5E22, 0x00) + CH03 (Arg0, Z090, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((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 eb2d37a54..4fd60f3a0 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 @@ -9996,7 +9996,7 @@ } Else { - CH03 (Arg0, Z091, 0x00, 0x2E2C, 0x00) + CH03 (Arg0, Z091, __LINE__, 0x00, 0x00) Store (M601 (0x02, 0x06) [DerefOf (RefOf (S614))], Local3) CH04 (Arg0, 0x00, 0x55, Z091, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x03, 0x06) [DerefOf (RefOf (S614))], Local3) @@ -10052,7 +10052,7 @@ } Else { - CH03 (Arg0, Z091, 0x00, 0x2E70, 0x00) + CH03 (Arg0, Z091, __LINE__, 0x00, 0x00) Local0 = M601 (0x02, 0x06) [DerefOf (RefOf (S614))] CH04 (Arg0, 0x00, 0x55, Z091, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x03, 0x06) [DerefOf (RefOf (S614))] @@ -10133,7 +10133,7 @@ /* (it can only be checked an exception does not occur) */ Method (M02E, 1, NotSerialized) { - CH03 (Arg0, Z091, 0x00, 0x2ECA, 0x00) + CH03 (Arg0, Z091, __LINE__, 0x00, 0x00) Fatal (0xFF, 0xFFFFFFFF, DerefOf (RefOf (S601))) If (F64) { @@ -10144,7 +10144,7 @@ Fatal (0xFF, 0xFFFFFFFF, DerefOf (RefOf (S604))) } - CH03 (Arg0, Z091, 0x01, 0x2ED1, 0x00) + CH03 (Arg0, Z091, __LINE__, 0x00, 0x00) } /* String to Integer conversion of the String Index and Length */ @@ -10770,12 +10770,12 @@ /* of the Method execution control operators (Sleep, Stall) */ Method (M031, 1, NotSerialized) { - CH03 (Arg0, Z091, 0x02, 0x3145, 0x00) + CH03 (Arg0, Z091, __LINE__, 0x00, 0x00) /* Sleep */ Local0 = Timer Sleep (DerefOf (RefOf (S601))) - CH03 (Arg0, Z091, 0x03, 0x314C, 0x00) + CH03 (Arg0, Z091, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) @@ -10787,7 +10787,7 @@ Local0 = Timer Stall (DerefOf (RefOf (S61B))) - CH03 (Arg0, Z091, 0x04, 0x3159, 0x00) + CH03 (Arg0, Z091, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < 0x03DE)) @@ -10802,12 +10802,12 @@ { Mutex (MTX0, 0x00) Acquire (MTX0, 0x0000) - CH03 (Arg0, Z091, 0x05, 0x3169, 0x00) + CH03 (Arg0, Z091, __LINE__, 0x00, 0x00) Local0 = Timer /* Compiler allows only Integer constant as TimeoutValue (Bug 1) Acquire(MTX0, Derefof(Refof(s601))) */ - CH03 (Arg0, Z091, 0x06, 0x3170, 0x00) + CH03 (Arg0, Z091, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) @@ -10821,10 +10821,10 @@ Method (M033, 1, Serialized) { Event (EVT0) - CH03 (Arg0, Z091, 0x07, 0x317F, 0x00) + CH03 (Arg0, Z091, __LINE__, 0x00, 0x00) Local0 = Timer Wait (EVT0, DerefOf (RefOf (S601))) - CH03 (Arg0, Z091, 0x08, 0x3184, 0x00) + CH03 (Arg0, Z091, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) @@ -19788,7 +19788,7 @@ } Else { - CH03 (Arg0, Z091, 0x00, 0x5AC9, 0x00) + CH03 (Arg0, Z091, __LINE__, 0x00, 0x00) Store (M601 (0x02, 0x06) [DerefOf (RefOf (B60E))], Local3) CH04 (Arg0, 0x00, 0x55, Z091, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x03, 0x06) [DerefOf (RefOf (B60E))], Local3) @@ -19844,7 +19844,7 @@ } Else { - CH03 (Arg0, Z091, 0x00, 0x5B0D, 0x00) + CH03 (Arg0, Z091, __LINE__, 0x00, 0x00) Local0 = M601 (0x02, 0x06) [DerefOf (RefOf (B60E))] CH04 (Arg0, 0x00, 0x55, Z091, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x03, 0x06) [DerefOf (RefOf (B60E))] @@ -19925,7 +19925,7 @@ /* (it can only be checked an exception does not occur) */ Method (M068, 1, NotSerialized) { - CH03 (Arg0, Z091, 0x09, 0x5B67, 0x00) + CH03 (Arg0, Z091, __LINE__, 0x00, 0x00) Fatal (0xFF, 0xFFFFFFFF, DerefOf (RefOf (B606))) If (F64) { @@ -19936,7 +19936,7 @@ Fatal (0xFF, 0xFFFFFFFF, DerefOf (RefOf (B60A))) } - CH03 (Arg0, Z091, 0x0A, 0x5B6E, 0x00) + CH03 (Arg0, Z091, __LINE__, 0x00, 0x00) } /* Buffer to Integer conversion of the Buffer Index and Length */ @@ -20562,12 +20562,12 @@ /* of the Method execution control operators (Sleep, Stall) */ Method (M06B, 1, NotSerialized) { - CH03 (Arg0, Z091, 0x0B, 0x5DE2, 0x00) + CH03 (Arg0, Z091, __LINE__, 0x00, 0x00) /* Sleep */ Local0 = Timer Sleep (DerefOf (RefOf (B606))) - CH03 (Arg0, Z091, 0x0C, 0x5DE9, 0x00) + CH03 (Arg0, Z091, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) @@ -20579,7 +20579,7 @@ Local0 = Timer Stall (DerefOf (RefOf (B613))) - CH03 (Arg0, Z091, 0x0D, 0x5DF6, 0x00) + CH03 (Arg0, Z091, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < 0x03DE)) @@ -20594,12 +20594,12 @@ { Mutex (MTX0, 0x00) Acquire (MTX0, 0x0000) - CH03 (Arg0, Z091, 0x0E, 0x5E07, 0x00) + CH03 (Arg0, Z091, __LINE__, 0x00, 0x00) Local0 = Timer /* Compiler allows only Integer constant as TimeoutValue (Bug 1) Acquire(MTX0, Derefof(Refof(b606))) */ - CH03 (Arg0, Z091, 0x0F, 0x5E0E, 0x00) + CH03 (Arg0, Z091, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) @@ -20613,10 +20613,10 @@ Method (M06D, 1, Serialized) { Event (EVT0) - CH03 (Arg0, Z091, 0x10, 0x5E1D, 0x00) + CH03 (Arg0, Z091, __LINE__, 0x00, 0x00) Local0 = Timer Wait (EVT0, DerefOf (RefOf (B606))) - CH03 (Arg0, Z091, 0x11, 0x5E22, 0x00) + CH03 (Arg0, Z091, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((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 46a7c2084..53cf45765 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 @@ -9373,7 +9373,7 @@ } Else { - CH03 (Arg0, Z120, 0x00, 0x2B33, 0x00) + CH03 (Arg0, Z120, __LINE__, 0x00, 0x00) Store (M601 (0x02, 0x06) [DerefOf (RefOf (BF74))], Local3) CH04 (Arg0, 0x00, 0x55, Z120, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x03, 0x06) [DerefOf (RefOf (BF74))], Local3) @@ -9429,7 +9429,7 @@ } Else { - CH03 (Arg0, Z120, 0x00, 0x2B77, 0x00) + CH03 (Arg0, Z120, __LINE__, 0x00, 0x00) Local0 = M601 (0x02, 0x06) [DerefOf (RefOf (BF74))] CH04 (Arg0, 0x00, 0x55, Z120, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x03, 0x06) [DerefOf (RefOf (BF74))] @@ -9510,7 +9510,7 @@ /* (it can only be checked an exception does not occur) */ Method (M068, 1, NotSerialized) { - CH03 (Arg0, Z120, 0x00, 0x2BD1, 0x00) + CH03 (Arg0, Z120, __LINE__, 0x00, 0x00) Fatal (0xFF, 0xFFFFFFFF, DerefOf (RefOf (BF61))) If (F64) { @@ -9521,7 +9521,7 @@ Fatal (0xFF, 0xFFFFFFFF, DerefOf (RefOf (BF65))) } - CH03 (Arg0, Z120, 0x01, 0x2BD8, 0x00) + CH03 (Arg0, Z120, __LINE__, 0x00, 0x00) } /* Buffer Field to Integer conversion of the Buffer Field Index */ @@ -10145,12 +10145,12 @@ /* of the Method execution control operators (Sleep, Stall) */ Method (M06B, 1, NotSerialized) { - CH03 (Arg0, Z120, 0x02, 0x2E48, 0x00) + CH03 (Arg0, Z120, __LINE__, 0x00, 0x00) /* Sleep */ Local0 = Timer Sleep (DerefOf (RefOf (BF61))) - CH03 (Arg0, Z120, 0x03, 0x2E4F, 0x00) + CH03 (Arg0, Z120, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) @@ -10162,7 +10162,7 @@ Local0 = Timer Stall (DerefOf (RefOf (BF75))) - CH03 (Arg0, Z120, 0x04, 0x2E5C, 0x00) + CH03 (Arg0, Z120, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < 0x03DE)) @@ -10177,12 +10177,12 @@ { Mutex (MTX0, 0x00) Acquire (MTX0, 0x0000) - CH03 (Arg0, Z120, 0x05, 0x2E6D, 0x00) + CH03 (Arg0, Z120, __LINE__, 0x00, 0x00) Local0 = Timer /* Compiler allows only Integer constant as TimeoutValue (Bug 1) Acquire(MTX0, Derefof(Refof(bf61))) */ - CH03 (Arg0, Z120, 0x06, 0x2E74, 0x00) + CH03 (Arg0, Z120, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) @@ -10196,10 +10196,10 @@ Method (M06D, 1, Serialized) { Event (EVT0) - CH03 (Arg0, Z120, 0x07, 0x2E83, 0x00) + CH03 (Arg0, Z120, __LINE__, 0x00, 0x00) Local0 = Timer Wait (EVT0, DerefOf (RefOf (BF61))) - CH03 (Arg0, Z120, 0x08, 0x2E88, 0x00) + CH03 (Arg0, Z120, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((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 fdc528f74..e8ced6978 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 @@ -11500,7 +11500,7 @@ } Else { - CH03 (Arg0, Z119, 0x00, 0x2E2D, 0x00) + CH03 (Arg0, Z119, __LINE__, 0x00, 0x00) Store (M601 (0x02, 0x06) [DerefOf (M604 (0x02, 0x02, 0x14, 0x01))], Local3) CH04 (Arg0, 0x00, 0x55, Z119, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ @@ -11565,7 +11565,7 @@ } Else { - CH03 (Arg0, Z119, 0x00, 0x2E71, 0x00) + CH03 (Arg0, Z119, __LINE__, 0x00, 0x00) Local0 = M601 (0x02, 0x06) [DerefOf (M604 (0x02, 0x02, 0x14, 0x01))] CH04 (Arg0, 0x00, 0x55, Z119, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x03, 0x06) [DerefOf (M604 (0x02, 0x02, 0x14, 0x01))] @@ -11661,7 +11661,7 @@ /* (it can only be checked an exception does not occur) */ Method (M02E, 1, NotSerialized) { - CH03 (Arg0, Z119, 0x00, 0x2ECB, 0x00) + CH03 (Arg0, Z119, __LINE__, 0x00, 0x00) Fatal (0xFF, 0xFFFFFFFF, DerefOf (M604 (0x02, 0x02, 0x01, 0x01))) If (F64) { @@ -11672,7 +11672,7 @@ Fatal (0xFF, 0xFFFFFFFF, DerefOf (M604 (0x02, 0x02, 0x04, 0x01))) } - CH03 (Arg0, Z119, 0x01, 0x2ED2, 0x00) + CH03 (Arg0, Z119, __LINE__, 0x00, 0x00) } /* String to Integer conversion of the String Index and Length */ @@ -12358,12 +12358,12 @@ /* of the Method execution control operators (Sleep, Stall) */ Method (M031, 1, NotSerialized) { - CH03 (Arg0, Z119, 0x02, 0x3146, 0x00) + CH03 (Arg0, Z119, __LINE__, 0x00, 0x00) /* Sleep */ Local0 = Timer Sleep (DerefOf (M604 (0x02, 0x02, 0x01, 0x01))) - CH03 (Arg0, Z119, 0x03, 0x314D, 0x00) + CH03 (Arg0, Z119, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) @@ -12375,7 +12375,7 @@ Local0 = Timer Stall (DerefOf (M604 (0x02, 0x02, 0x1B, 0x01))) - CH03 (Arg0, Z119, 0x04, 0x315A, 0x00) + CH03 (Arg0, Z119, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < 0x03DE)) @@ -12390,12 +12390,12 @@ { Mutex (MTX0, 0x00) Acquire (MTX0, 0x0000) - CH03 (Arg0, Z119, 0x05, 0x316A, 0x00) + CH03 (Arg0, Z119, __LINE__, 0x00, 0x00) Local0 = Timer /* Compiler allows only Integer constant as TimeoutValue (Bug 1) Acquire(MTX0, Derefof(m604(2, 2, 1, 1))) */ - CH03 (Arg0, Z119, 0x06, 0x3171, 0x00) + CH03 (Arg0, Z119, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) @@ -12409,10 +12409,10 @@ Method (M033, 1, Serialized) { Event (EVT0) - CH03 (Arg0, Z119, 0x07, 0x3180, 0x00) + CH03 (Arg0, Z119, __LINE__, 0x00, 0x00) Local0 = Timer Wait (EVT0, DerefOf (M604 (0x02, 0x02, 0x01, 0x01))) - CH03 (Arg0, Z119, 0x08, 0x3185, 0x00) + CH03 (Arg0, Z119, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) @@ -22700,7 +22700,7 @@ } Else { - CH03 (Arg0, Z119, 0x00, 0x5ACB, 0x00) + CH03 (Arg0, Z119, __LINE__, 0x00, 0x00) Store (M601 (0x02, 0x06) [DerefOf (M604 (0x02, 0x03, 0x0E, 0x01))], Local3) CH04 (Arg0, 0x00, 0x55, Z119, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ @@ -22765,7 +22765,7 @@ } Else { - CH03 (Arg0, Z119, 0x00, 0x5B0F, 0x00) + CH03 (Arg0, Z119, __LINE__, 0x00, 0x00) Local0 = M601 (0x02, 0x06) [DerefOf (M604 (0x02, 0x03, 0x0E, 0x01))] CH04 (Arg0, 0x00, 0x55, Z119, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x03, 0x06) [DerefOf (M604 (0x02, 0x03, 0x0E, 0x01))] @@ -22861,7 +22861,7 @@ /* (it can only be checked an exception does not occur) */ Method (M068, 1, NotSerialized) { - CH03 (Arg0, Z119, 0x09, 0x5B69, 0x00) + CH03 (Arg0, Z119, __LINE__, 0x00, 0x00) Fatal (0xFF, 0xFFFFFFFF, DerefOf (M604 (0x02, 0x03, 0x06, 0x01))) If (F64) { @@ -22872,7 +22872,7 @@ Fatal (0xFF, 0xFFFFFFFF, DerefOf (M604 (0x02, 0x03, 0x0A, 0x01))) } - CH03 (Arg0, Z119, 0x0A, 0x5B70, 0x00) + CH03 (Arg0, Z119, __LINE__, 0x00, 0x00) } /* Buffer to Integer conversion of the Buffer Index and Length */ @@ -23558,12 +23558,12 @@ /* of the Method execution control operators (Sleep, Stall) */ Method (M06B, 1, NotSerialized) { - CH03 (Arg0, Z119, 0x0B, 0x5DE4, 0x00) + CH03 (Arg0, Z119, __LINE__, 0x00, 0x00) /* Sleep */ Local0 = Timer Sleep (DerefOf (M604 (0x02, 0x03, 0x06, 0x01))) - CH03 (Arg0, Z119, 0x0C, 0x5DEB, 0x00) + CH03 (Arg0, Z119, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) @@ -23575,7 +23575,7 @@ Local0 = Timer Stall (DerefOf (M604 (0x02, 0x03, 0x13, 0x01))) - CH03 (Arg0, Z119, 0x0D, 0x5DF8, 0x00) + CH03 (Arg0, Z119, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < 0x03DE)) @@ -23590,12 +23590,12 @@ { Mutex (MTX0, 0x00) Acquire (MTX0, 0x0000) - CH03 (Arg0, Z119, 0x0E, 0x5E09, 0x00) + CH03 (Arg0, Z119, __LINE__, 0x00, 0x00) Local0 = Timer /* Compiler allows only Integer constant as TimeoutValue (Bug 1) Acquire(MTX0, Derefof(m604(2, 3, 6, 1))) */ - CH03 (Arg0, Z119, 0x0F, 0x5E10, 0x00) + CH03 (Arg0, Z119, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) @@ -23609,10 +23609,10 @@ Method (M06D, 1, Serialized) { Event (EVT0) - CH03 (Arg0, Z119, 0x10, 0x5E1F, 0x00) + CH03 (Arg0, Z119, __LINE__, 0x00, 0x00) Local0 = Timer Wait (EVT0, DerefOf (M604 (0x02, 0x03, 0x06, 0x01))) - CH03 (Arg0, Z119, 0x11, 0x5E24, 0x00) + CH03 (Arg0, Z119, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((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 477c51610..69d56bad5 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 @@ -10677,7 +10677,7 @@ } Else { - CH03 (Arg0, Z118, 0x00, 0x2E2C, 0x00) + CH03 (Arg0, Z118, __LINE__, 0x00, 0x00) Store (M601 (0x02, 0x06) [M604 (0x00, 0x02, 0x14, 0x00)], Local3) CH04 (Arg0, 0x00, 0x55, Z118, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x03, 0x06) [M604 (0x00, 0x02, 0x14, 0x00)], Local3) @@ -10736,7 +10736,7 @@ } Else { - CH03 (Arg0, Z118, 0x00, 0x2E70, 0x00) + CH03 (Arg0, Z118, __LINE__, 0x00, 0x00) Local0 = M601 (0x02, 0x06) [M604 (0x00, 0x02, 0x14, 0x00)] CH04 (Arg0, 0x00, 0x55, Z118, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x03, 0x06) [M604 (0x00, 0x02, 0x14, 0x00)] @@ -10823,7 +10823,7 @@ /* (it can only be checked an exception does not occur) */ Method (M02E, 1, NotSerialized) { - CH03 (Arg0, Z118, 0x00, 0x2ECA, 0x00) + CH03 (Arg0, Z118, __LINE__, 0x00, 0x00) Fatal (0xFF, 0xFFFFFFFF, M604 (0x00, 0x02, 0x01, 0x00)) If (F64) { @@ -10834,7 +10834,7 @@ Fatal (0xFF, 0xFFFFFFFF, M604 (0x00, 0x02, 0x04, 0x00)) } - CH03 (Arg0, Z118, 0x01, 0x2ED1, 0x00) + CH03 (Arg0, Z118, __LINE__, 0x00, 0x00) } /* String to Integer conversion of the String Index and Length */ @@ -11520,12 +11520,12 @@ /* of the Method execution control operators (Sleep, Stall) */ Method (M031, 1, NotSerialized) { - CH03 (Arg0, Z118, 0x02, 0x3145, 0x00) + CH03 (Arg0, Z118, __LINE__, 0x00, 0x00) /* Sleep */ Local0 = Timer Sleep (M604 (0x00, 0x02, 0x01, 0x00)) - CH03 (Arg0, Z118, 0x03, 0x314C, 0x00) + CH03 (Arg0, Z118, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) @@ -11537,7 +11537,7 @@ Local0 = Timer Stall (M604 (0x00, 0x02, 0x1B, 0x00)) - CH03 (Arg0, Z118, 0x04, 0x3159, 0x00) + CH03 (Arg0, Z118, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < 0x03DE)) @@ -11552,12 +11552,12 @@ { Mutex (MTX0, 0x00) Acquire (MTX0, 0x0000) - CH03 (Arg0, Z118, 0x05, 0x3169, 0x00) + CH03 (Arg0, Z118, __LINE__, 0x00, 0x00) Local0 = Timer /* Compiler allows only Integer constant as TimeoutValue (Bug 1) Acquire(MTX0, m604(0, 2, 1, 0)) */ - CH03 (Arg0, Z118, 0x06, 0x3170, 0x00) + CH03 (Arg0, Z118, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) @@ -11571,10 +11571,10 @@ Method (M033, 1, Serialized) { Event (EVT0) - CH03 (Arg0, Z118, 0x07, 0x317F, 0x00) + CH03 (Arg0, Z118, __LINE__, 0x00, 0x00) Local0 = Timer Wait (EVT0, M604 (0x00, 0x02, 0x01, 0x00)) - CH03 (Arg0, Z118, 0x08, 0x3184, 0x00) + CH03 (Arg0, Z118, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) @@ -21118,7 +21118,7 @@ } Else { - CH03 (Arg0, Z118, 0x00, 0x5AC9, 0x00) + CH03 (Arg0, Z118, __LINE__, 0x00, 0x00) Store (M601 (0x02, 0x06) [M604 (0x00, 0x03, 0x0E, 0x00)], Local3) CH04 (Arg0, 0x00, 0x55, Z118, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x03, 0x06) [M604 (0x00, 0x03, 0x0E, 0x00)], Local3) @@ -21177,7 +21177,7 @@ } Else { - CH03 (Arg0, Z118, 0x00, 0x5B0D, 0x00) + CH03 (Arg0, Z118, __LINE__, 0x00, 0x00) Local0 = M601 (0x02, 0x06) [M604 (0x00, 0x03, 0x0E, 0x00)] CH04 (Arg0, 0x00, 0x55, Z118, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x03, 0x06) [M604 (0x00, 0x03, 0x0E, 0x00)] @@ -21264,7 +21264,7 @@ /* (it can only be checked an exception does not occur) */ Method (M068, 1, NotSerialized) { - CH03 (Arg0, Z118, 0x09, 0x5B67, 0x00) + CH03 (Arg0, Z118, __LINE__, 0x00, 0x00) Fatal (0xFF, 0xFFFFFFFF, M604 (0x00, 0x03, 0x06, 0x00)) If (F64) { @@ -21275,7 +21275,7 @@ Fatal (0xFF, 0xFFFFFFFF, M604 (0x00, 0x03, 0x0A, 0x00)) } - CH03 (Arg0, Z118, 0x0A, 0x5B6E, 0x00) + CH03 (Arg0, Z118, __LINE__, 0x00, 0x00) } /* Buffer to Integer conversion of the Buffer Index and Length */ @@ -21961,12 +21961,12 @@ /* of the Method execution control operators (Sleep, Stall) */ Method (M06B, 1, NotSerialized) { - CH03 (Arg0, Z118, 0x0B, 0x5DE2, 0x00) + CH03 (Arg0, Z118, __LINE__, 0x00, 0x00) /* Sleep */ Local0 = Timer Sleep (M604 (0x00, 0x03, 0x06, 0x00)) - CH03 (Arg0, Z118, 0x0C, 0x5DE9, 0x00) + CH03 (Arg0, Z118, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) @@ -21978,7 +21978,7 @@ Local0 = Timer Stall (M604 (0x00, 0x03, 0x13, 0x00)) - CH03 (Arg0, Z118, 0x0D, 0x5DF6, 0x00) + CH03 (Arg0, Z118, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < 0x03DE)) @@ -21993,12 +21993,12 @@ { Mutex (MTX0, 0x00) Acquire (MTX0, 0x0000) - CH03 (Arg0, Z118, 0x0E, 0x5E07, 0x00) + CH03 (Arg0, Z118, __LINE__, 0x00, 0x00) Local0 = Timer /* Compiler allows only Integer constant as TimeoutValue (Bug 1) Acquire(MTX0, m604(0, 3, 6, 0)) */ - CH03 (Arg0, Z118, 0x0F, 0x5E0E, 0x00) + CH03 (Arg0, Z118, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((Local2 < C08C)) @@ -22012,10 +22012,10 @@ Method (M06D, 1, Serialized) { Event (EVT0) - CH03 (Arg0, Z118, 0x10, 0x5E1D, 0x00) + CH03 (Arg0, Z118, __LINE__, 0x00, 0x00) Local0 = Timer Wait (EVT0, M604 (0x00, 0x03, 0x06, 0x00)) - CH03 (Arg0, Z118, 0x11, 0x5E22, 0x00) + CH03 (Arg0, Z118, __LINE__, 0x00, 0x00) Local1 = Timer Local2 = (Local1 - Local0) If ((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 6927f064b..9d4d1f946 100644 --- a/tests/aslts/src/runtime/collections/complex/provoke/provoke.asl +++ b/tests/aslts/src/runtime/collections/complex/provoke/provoke.asl @@ -49,7 +49,7 @@ ERR (Arg0, Z055, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH03 (Arg0, Z055, 0x01, 0x36, 0x00) + CH03 (Arg0, Z055, __LINE__, 0x00, 0x00) } /* Store-like actions affect the source objects passed as parameter */ @@ -71,7 +71,7 @@ ERR (Arg0, Z055, __LINE__, 0x00, 0x00, Local0, 0x0A) } - CH03 (Arg0, Z055, 0x03, 0x4B, 0x00) + CH03 (Arg0, Z055, __LINE__, 0x00, 0x00) } /* Operator doesn't update the source object passed to method as a REFERENCE */ @@ -86,7 +86,7 @@ ERR (Arg0, Z055, __LINE__, 0x00, 0x00, Local0, 0x09) } - CH03 (Arg0, Z055, 0x05, 0x59, 0x00) + CH03 (Arg0, Z055, __LINE__, 0x00, 0x00) } Method (M134, 1, NotSerialized) @@ -98,7 +98,7 @@ ERR (Arg0, Z055, __LINE__, 0x00, 0x00, Local0, 0x09) } - CH03 (Arg0, Z055, 0x07, 0x64, 0x00) + CH03 (Arg0, Z055, __LINE__, 0x00, 0x00) } Method (M135, 1, NotSerialized) @@ -115,7 +115,7 @@ ERR (Arg0, Z055, __LINE__, 0x00, 0x00, Local0, 0x05) } - CH03 (Arg0, Z055, 0x09, 0x74, 0x00) + CH03 (Arg0, Z055, __LINE__, 0x00, 0x00) } /* Run-method */ 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 48129df31..fb6a25179 100644 --- a/tests/aslts/src/runtime/collections/complex/result/common/rcommon.asl +++ b/tests/aslts/src/runtime/collections/complex/result/common/rcommon.asl @@ -1121,7 +1121,7 @@ Method (M003, 1, NotSerialized) { - If (CH03 (Arg0, Z122, 0x01, 0x026F, 0x00)) + If (CH03 (Arg0, Z122, __LINE__, 0x00, 0x00)) { If (STCS) { @@ -1680,7 +1680,7 @@ } - If (CH03 (Arg0, Z122, 0x05, 0x0456, 0x00)) + If (CH03 (Arg0, Z122, __LINE__, 0x00, 0x00)) { /*Exception during preparing of Target Object */ @@ -1829,7 +1829,7 @@ } - If (CH03 (Arg0, Z122, 0x08, 0x04C0, 0x00)) + If (CH03 (Arg0, Z122, __LINE__, 0x00, 0x00)) { /* Exception during preparing of Source Object */ @@ -1867,7 +1867,7 @@ /* Check that it can be used as reference */ Local0 = DerefOf (Arg2) Local3 = DerefOf (Local0) - If (CH03 (Arg0, Z122, 0x0A, 0x04E0, Local0)) + If (CH03 (Arg0, Z122, __LINE__, 0x00, Local0)) { /* Derefof caused unexpected exception */ @@ -2280,7 +2280,7 @@ /* Check that Target can be used as reference */ Local0 = DerefOf (Arg1) Local3 = DerefOf (Local0) - If (CH03 (Arg0, Z122, 0x28, 0x05FF, Arg3)) + If (CH03 (Arg0, Z122, __LINE__, 0x00, Arg3)) { /* Derefof caused unexpected exception */ @@ -2430,7 +2430,7 @@ Else { DerefOf (Local3) = Ones - If (CH03 (Arg0, Z122, 0x30, 0x0665, Arg1)) + If (CH03 (Arg0, Z122, __LINE__, 0x00, Arg1)) { /* Store caused unexpected exception */ @@ -2453,7 +2453,7 @@ Else { DerefOf (Local3) = Ones - If (CH03 (Arg0, Z122, 0x31, 0x0673, Arg1)) + If (CH03 (Arg0, Z122, __LINE__, 0x00, Arg1)) { /* Store caused unexpected exception */ @@ -2489,7 +2489,7 @@ Store (~ToInteger (DerefOf (Arg1)), Arg1) } - If (CH03 (Arg0, Z122, 0x32, 0x0687, Arg1)) + If (CH03 (Arg0, Z122, __LINE__, 0x00, Arg1)) { /* Update caused unexpected exception */ @@ -2651,7 +2651,7 @@ Return (0x01) } - If (CH03 (Arg0, Z122, 0x35, 0x06E6, Arg2)) + If (CH03 (Arg0, Z122, __LINE__, 0x00, Arg2)) { /* Unexpected exception during preparation */ @@ -2981,7 +2981,7 @@ } Else { - CH03 (Arg0, Z122, 0x39, 0x078E, Arg2) + CH03 (Arg0, Z122, __LINE__, 0x00, Arg2) } } ElseIf (!CH06 (Arg0, 0x39, 0xFF)) @@ -2996,7 +2996,7 @@ Return (0x00) } - ElseIf (CH03 (Arg0, Z122, 0x3A, 0x0797, Arg2)) + ElseIf (CH03 (Arg0, Z122, __LINE__, 0x00, Arg2)) { /* Storing caused unexpected exception */ @@ -3257,7 +3257,7 @@ DerefOf (Index (Buffer (0x12) Return (0x01) } - If (CH03 (Arg0, Z122, 0x3D, 0x0845, Arg2)) + If (CH03 (Arg0, Z122, __LINE__, 0x00, Arg2)) { /* Unexpected exception during preparation */ @@ -3377,7 +3377,7 @@ DerefOf (Index (Buffer (0x12) } } } - ElseIf (CH03 (Arg0, Z122, 0x3F, 0x0883, Arg2)) + ElseIf (CH03 (Arg0, Z122, __LINE__, 0x00, Arg2)) { /* Storing caused unexpected exception */ @@ -3532,7 +3532,7 @@ DerefOf (Index (Buffer (0x12) Return (0x01) } - If (CH03 (Arg0, Z122, 0x42, 0x08E6, Arg2)) + If (CH03 (Arg0, Z122, __LINE__, 0x00, Arg2)) { /* Unexpected exception during preparation */ @@ -3628,7 +3628,7 @@ DerefOf (Index (Buffer (0x12) } Else { - CH03 (Arg0, Z122, 0x46, 0x0915, Arg2) + CH03 (Arg0, Z122, __LINE__, 0x00, Arg2) } } ElseIf (!CH06 (Arg0, 0x46, 0xFF)) @@ -3643,7 +3643,7 @@ DerefOf (Index (Buffer (0x12) Return (0x00) } - ElseIf (CH03 (Arg0, Z122, 0x47, 0x091E, Arg2)) + ElseIf (CH03 (Arg0, Z122, __LINE__, 0x00, Arg2)) { /* Storing caused unexpected exception */ @@ -3827,7 +3827,7 @@ DerefOf (Index (Buffer (0x12) Return (0x01) } - If (CH03 (Arg0, Z122, 0x4A, 0x09A1, Arg2)) + If (CH03 (Arg0, Z122, __LINE__, 0x00, Arg2)) { /* Unexpected exception during preparation */ @@ -3868,7 +3868,7 @@ DerefOf (Index (Buffer (0x12) } } } - ElseIf (CH03 (Arg0, Z122, 0x4C, 0x09B6, Arg2)) + ElseIf (CH03 (Arg0, Z122, __LINE__, 0x00, Arg2)) { /* Storing caused unexpected exception */ @@ -4047,7 +4047,7 @@ DerefOf (Index (Buffer (0x12) } Local1 = RefOf (Arg1) - If (CH03 (Arg0, Z122, 0x4E, 0x0A32, Arg2)) + If (CH03 (Arg0, Z122, __LINE__, 0x00, Arg2)) { /* Unexpected exception during preparation */ @@ -4174,7 +4174,7 @@ DerefOf (Index (Buffer (0x12) } Else { - CH03 (Arg0, Z122, 0x50, 0x0A77, Arg2) + CH03 (Arg0, Z122, __LINE__, 0x00, Arg2) } } ElseIf (!CH06 (Arg0, 0x50, 0xFF)) @@ -4185,7 +4185,7 @@ DerefOf (Index (Buffer (0x12) } } } - ElseIf (CH03 (Arg0, Z122, 0x51, 0x0A7E, Arg2)) + ElseIf (CH03 (Arg0, Z122, __LINE__, 0x00, Arg2)) { /* Storing caused unexpected exception */ @@ -4315,7 +4315,7 @@ DerefOf (Index (Buffer (0x12) Return (0x01) } - If (CH03 (Arg0, Z122, 0x53, 0x0AD2, Arg2)) + If (CH03 (Arg0, Z122, __LINE__, 0x00, Arg2)) { /* Unexpected exception during preparation */ @@ -4455,7 +4455,7 @@ DerefOf (Index (Buffer (0x12) Return (0x01) } - If (CH03 (Arg0, Z122, 0x55, 0x0B31, Arg2)) + If (CH03 (Arg0, Z122, __LINE__, 0x00, Arg2)) { /* Unexpected exception during preparation */ @@ -4581,7 +4581,7 @@ DerefOf (Index (Buffer (0x12) } Else { - CH03 (Arg0, Z122, 0x57, 0x0B74, Arg2) + CH03 (Arg0, Z122, __LINE__, 0x00, Arg2) } } ElseIf (!CH06 (Arg0, 0x57, 0xFF)) @@ -4592,7 +4592,7 @@ DerefOf (Index (Buffer (0x12) } } } - ElseIf (CH03 (Arg0, Z122, 0x58, 0x0B7B, Arg2)) + ElseIf (CH03 (Arg0, Z122, __LINE__, 0x00, Arg2)) { /* Storing caused unexpected exception */ @@ -4731,7 +4731,7 @@ DerefOf (Index (Buffer (0x12) Return (0x01) } - If (CH03 (Arg0, Z122, 0x5A, 0x0BD4, Arg2)) + If (CH03 (Arg0, Z122, __LINE__, 0x00, Arg2)) { /* Unexpected exception during preparation */ @@ -4794,7 +4794,7 @@ DerefOf (Index (Buffer (0x12) Return (0x01) } - If (CH03 (Arg0, Z122, 0x5D, 0x0C03, Arg2)) + If (CH03 (Arg0, Z122, __LINE__, 0x00, Arg2)) { /* Unexpected exception during preparation */ @@ -4841,7 +4841,7 @@ DerefOf (Index (Buffer (0x12) } } } - ElseIf (CH03 (Arg0, Z122, 0x61, 0x0C1F, Arg2)) + ElseIf (CH03 (Arg0, Z122, __LINE__, 0x00, Arg2)) { /* Storing caused unexpected exception */ @@ -4979,7 +4979,7 @@ DerefOf (Index (Buffer (0x12) } - If (CH03 (Arg0, Z122, 0x63, 0x0C80, 0x00)) + If (CH03 (Arg0, Z122, __LINE__, 0x00, 0x00)) { /*Exception during preparing of Target Object */ @@ -5017,7 +5017,7 @@ DerefOf (Index (Buffer (0x12) /* Check that it can be used as reference */ Local0 = DerefOf (Arg2) Local3 = DerefOf (Local0) - If (CH03 (Arg0, Z122, 0x65, 0x0CA0, Local0)) + If (CH03 (Arg0, Z122, __LINE__, 0x00, Local0)) { /* Derefof caused unexpected exception */ @@ -5103,7 +5103,7 @@ DerefOf (Index (Buffer (0x12) /*Store(Derefof(REF1), Local3) */ Local3 = REF1 /* \M689.REF1 */ - If (CH03 (Arg0, Z122, 0x67, 0x0CDE, Local0)) + If (CH03 (Arg0, Z122, __LINE__, 0x00, Local0)) { /* Derefof caused unexpected exception */ @@ -5358,7 +5358,7 @@ DerefOf (Index (Buffer (0x12) /*Store(Derefof(REF1), Local3) */ Local3 = REF1 /* \M689.REF1 */ - If (CH03 (Arg0, Z122, 0x79, 0x0D95, 0x00)) + If (CH03 (Arg0, Z122, __LINE__, 0x00, 0x00)) { /* Derefof caused unexpected exception */ @@ -5490,7 +5490,7 @@ DerefOf (Index (Buffer (0x12) Else { DerefOf (Local3) = Ones - If (CH03 (Arg0, Z122, 0x82, 0x0DF2, Arg1 [0x00])) + If (CH03 (Arg0, Z122, __LINE__, 0x00, Arg1 [0x00])) { /* Store caused unexpected exception */ @@ -5513,7 +5513,7 @@ DerefOf (Index (Buffer (0x12) Else { DerefOf (Local3) = Ones - If (CH03 (Arg0, Z122, 0x83, 0x0E00, Arg1 [0x00])) + If (CH03 (Arg0, Z122, __LINE__, 0x00, Arg1 [0x00])) { /* Store caused unexpected exception */ @@ -5550,7 +5550,7 @@ DerefOf (Index (Buffer (0x12) 0x00]) } - If (CH03 (Arg0, Z122, 0x84, 0x0E14, Arg1 [0x00])) + If (CH03 (Arg0, Z122, __LINE__, 0x00, Arg1 [0x00])) { /* Update caused unexpected exception */ 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 269f8560b..303f9c285 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 @@ -349,7 +349,7 @@ } - If (CH03 (Arg0, Z126, 0x03, 0x0137, 0x00)) + If (CH03 (Arg0, Z126, __LINE__, 0x00, 0x00)) { /*Exception during preparing of Target Object */ @@ -407,7 +407,7 @@ } - If (CH03 (Arg0, Z126, 0x06, 0x0160, 0x00)) + If (CH03 (Arg0, Z126, __LINE__, 0x00, 0x00)) { /* Exception during preparing of Source Object */ @@ -1081,7 +1081,7 @@ } } } - ElseIf (CH03 (Arg0, Z126, 0x1B, 0x029A, Arg2)) + ElseIf (CH03 (Arg0, Z126, __LINE__, 0x00, Arg2)) { /* Storing caused unexpected exception */ @@ -1296,7 +1296,7 @@ } } } - ElseIf (CH03 (Arg0, Z126, 0x20, 0x0300, Arg2)) + ElseIf (CH03 (Arg0, Z126, __LINE__, 0x00, Arg2)) { /* Storing caused unexpected exception */ 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 65c5147b5..4063ce4ba 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 @@ -327,7 +327,7 @@ } - If (CH03 (Arg0, Z125, 0x02, 0x0116, 0x00)) + If (CH03 (Arg0, Z125, __LINE__, 0x00, 0x00)) { /* Exception during preparing of Source Object */ @@ -742,7 +742,7 @@ } } } - ElseIf (CH03 (Arg0, Z125, 0x17, 0x0214, Arg2)) + ElseIf (CH03 (Arg0, Z125, __LINE__, 0x00, Arg2)) { /* Processing caused unexpected exception */ @@ -817,7 +817,7 @@ /* will be converted to Integer 0, thus no */ /* exception caused by implicit source */ /* conversion. */ - If (CH03 (Arg0, Z125, 0x1A, 0x0245, Arg2)) + If (CH03 (Arg0, Z125, __LINE__, 0x00, Arg2)) { If (STCS) { @@ -835,7 +835,7 @@ } } } - ElseIf (CH03 (Arg0, Z125, 0x1B, 0x024E, Arg2)) + ElseIf (CH03 (Arg0, Z125, __LINE__, 0x00, Arg2)) { /* Processing caused unexpected exception */ @@ -923,7 +923,7 @@ /* will be converted to Integer 0, thus no */ /* exception caused by implicit source */ /* conversion. */ - If (CH03 (Arg0, Z125, 0x1E, 0x028C, Arg2)) + If (CH03 (Arg0, Z125, __LINE__, 0x00, Arg2)) { If (STCS) { @@ -941,7 +941,7 @@ } } } - ElseIf (CH03 (Arg0, Z125, 0x1F, 0x0295, Arg2)) + ElseIf (CH03 (Arg0, Z125, __LINE__, 0x00, Arg2)) { /* Processing caused unexpected exception */ @@ -1053,7 +1053,7 @@ } } } - ElseIf (CH03 (Arg0, Z125, 0x23, 0x02DB, Arg2)) + ElseIf (CH03 (Arg0, Z125, __LINE__, 0x00, Arg2)) { /* Processing caused unexpected exception */ 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 7116d30de..1e33b6695 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 @@ -391,7 +391,7 @@ } - If (CH03 (Arg0, Z127, 0x03, 0x0154, 0x00)) + If (CH03 (Arg0, Z127, __LINE__, 0x00, 0x00)) { /*Exception during preparing of Target Object */ @@ -461,7 +461,7 @@ } - If (CH03 (Arg0, Z127, 0x06, 0x0186, 0x00)) + If (CH03 (Arg0, Z127, __LINE__, 0x00, 0x00)) { /* Exception during preparing of Source Object */ @@ -640,7 +640,7 @@ /* Check that Target can be used as reference */ Local0 = DerefOf (Arg1) Local3 = DerefOf (Local0) - If (CH03 (Arg0, Z127, 0x12, 0x0204, Arg3)) + If (CH03 (Arg0, Z127, __LINE__, 0x00, Arg3)) { /* Derefof caused unexpected exception */ @@ -1623,7 +1623,7 @@ } } } - ElseIf (CH03 (Arg0, Z127, 0x1C, 0x0341, Arg2)) + ElseIf (CH03 (Arg0, Z127, __LINE__, 0x00, Arg2)) { /* Storing caused unexpected exception */ @@ -1985,7 +1985,7 @@ } } } - ElseIf (CH03 (Arg0, Z127, 0x21, 0x03C8, Arg2)) + ElseIf (CH03 (Arg0, Z127, __LINE__, 0x00, Arg2)) { /* Storing caused unexpected exception */ diff --git a/tests/aslts/src/runtime/collections/exceptions/exc/exc.asl b/tests/aslts/src/runtime/collections/exceptions/exc/exc.asl index a8861389d..00a7568fb 100644 --- a/tests/aslts/src/runtime/collections/exceptions/exc/exc.asl +++ b/tests/aslts/src/runtime/collections/exceptions/exc/exc.asl @@ -36,34 +36,34 @@ Method (M140, 0, Serialized) { - CH03 (__METHOD__, Z058, 0x00, 0x2B, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Local1 = 0x01 Local0 = 0x02 Divide (Local1, Local0, Local2) - CH03 (__METHOD__, Z058, 0x01, 0x31, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Local0 = 0x00 Divide (Local1, Local0, Local2) CH04 (__METHOD__, 0x00, 0x38, Z058, __LINE__, 0x00, 0x00) /* AE_AML_DIVIDE_BY_ZERO */ Local0 = 0x02 Divide (Local1, Local0, Local2) - CH03 (__METHOD__, Z058, 0x03, 0x3B, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) } /* Modulo divide by zero */ Method (M141, 0, Serialized) { - CH03 (__METHOD__, Z058, 0x04, 0x43, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Local1 = 0x01 Local0 = 0x02 Local2 = (Local1 % Local0) - CH03 (__METHOD__, Z058, 0x05, 0x49, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Local0 = 0x00 Local2 = (Local1 % Local0) CH04 (__METHOD__, 0x00, 0x38, Z058, __LINE__, 0x00, 0x00) /* AE_AML_DIVIDE_BY_ZERO */ Local0 = 0x02 Local2 = (Local1 % Local0) - CH03 (__METHOD__, Z058, 0x07, 0x53, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) } /* Release ownership on a Mutex that is not currently owned */ @@ -71,7 +71,7 @@ Method (M142, 0, Serialized) { Mutex (MTX0, 0x00) - CH03 (__METHOD__, Z058, 0x08, 0x5D, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Release (MTX0) CH04 (__METHOD__, 0x00, 0x41, Z058, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ } @@ -131,12 +131,12 @@ /* Buffer Field */ Local0 = BUF0 [0x00] - CH03 (__METHOD__, Z058, 0x0A, 0x93, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Local5 = SizeOf (STR0) Local5 = SizeOf (BUF0) Local5 = SizeOf (PAC0) Local5 = SizeOf (INT0) - CH03 (__METHOD__, Z058, 0x0B, 0x9A, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) If (INT0) { Local1 = 0x00 @@ -179,9 +179,9 @@ Local0++ } - CH03 (__METHOD__, Z058, 0x14, 0xC6, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) ToString (B000, Ones, Local5) - CH03 (__METHOD__, Z058, 0x15, 0xCA, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Name (B001, Buffer (0xC9){}) Local0 = 0x00 While ((Local0 < 0xC9)) @@ -197,7 +197,7 @@ * 20.12.2005. * No more limit of string size. */ - CH03 (__METHOD__, Z058, 0x16, 0xDC, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) } /* Access out of Package */ @@ -216,25 +216,25 @@ 0x01, 0x02 }) - CH03 (__METHOD__, Z058, 0x17, 0xE7, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) /* Package() */ Store (P000 [0x02], Local5) - CH03 (__METHOD__, Z058, 0x18, 0xED, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Store (P000 [0x03], Local5) CH04 (__METHOD__, 0x01, 0x37, Z058, __LINE__, 0x00, 0x00) /* AE_AML_PACKAGE_LIMIT */ Local0 = P000 [0x02] - CH03 (__METHOD__, Z058, 0x1A, 0xF5, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Local0 = P000 [0x03] CH04 (__METHOD__, 0x00, 0x37, Z058, __LINE__, 0x00, 0x00) /* AE_AML_PACKAGE_LIMIT */ /* Package(3) */ Store (P001 [0x02], Local5) - CH03 (__METHOD__, Z058, 0x1C, 0xFF, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Local5 = P001 [0x03] CH04 (__METHOD__, 0x00, 0x37, Z058, __LINE__, 0x00, 0x00) /* AE_AML_PACKAGE_LIMIT */ Local0 = P001 [0x02] - CH03 (__METHOD__, Z058, 0x1E, 0x0107, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Local0 = P001 [0x03] CH04 (__METHOD__, 0x00, 0x37, Z058, __LINE__, 0x00, 0x00) /* AE_AML_PACKAGE_LIMIT */ } @@ -244,15 +244,15 @@ Method (M085, 0, Serialized) { Name (S000, "123") - CH03 (__METHOD__, Z058, 0x20, 0x0115, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Local5 = S000 [0x02] - CH03 (__METHOD__, Z058, 0x21, 0x0119, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Local5 = S000 [0x03] /* Bug 177, Bugzilla 5480. */ CH04 (__METHOD__, 0x00, 0x3D, Z058, __LINE__, 0x00, 0x00) /* AE_AML_STRING_LIMIT */ Local0 = S000 [0x02] - CH03 (__METHOD__, Z058, 0x23, 0x0122, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Local0 = S000 [0x03] CH04 (__METHOD__, 0x00, 0x3D, Z058, __LINE__, 0x00, 0x00) /* AE_AML_STRING_LIMIT */ } @@ -269,25 +269,25 @@ { 0x00, 0x01, 0x02 // ... }) - CH03 (__METHOD__, Z058, 0x25, 0x0131, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) /* Buffer() */ Local5 = B000 [0x02] - CH03 (__METHOD__, Z058, 0x26, 0x0137, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Local5 = B000 [0x03] CH04 (__METHOD__, 0x00, 0x36, Z058, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ Local0 = B000 [0x02] - CH03 (__METHOD__, Z058, 0x28, 0x013F, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Local0 = B000 [0x03] CH04 (__METHOD__, 0x00, 0x36, Z058, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ /* Buffer(3) */ Local5 = B001 [0x02] - CH03 (__METHOD__, Z058, 0x2A, 0x0149, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Local5 = B001 [0x03] CH04 (__METHOD__, 0x00, 0x36, Z058, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ Local0 = B001 [0x02] - CH03 (__METHOD__, Z058, 0x2C, 0x0151, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Local0 = B001 [0x03] CH04 (__METHOD__, 0x00, 0x36, Z058, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ } @@ -296,7 +296,7 @@ /* exceeds the maximum of an integer for the current mode. */ Method (M146, 0, Serialized) { - CH03 (__METHOD__, Z058, 0x2E, 0x015E, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) If ((F64 == 0x01)) { Local0 = "0xffffffffffffffff" @@ -307,7 +307,7 @@ } ToInteger (Local0, Local5) - CH03 (__METHOD__, Z058, 0x2F, 0x0167, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) If ((F64 == 0x01)) { Local0 = "0x11111111111111111" @@ -331,7 +331,7 @@ Local0 = 0x00 } - CH03 (__METHOD__, Z058, 0x31, 0x017E, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Local0++ CH04 (__METHOD__, 0x00, 0x31, Z058, __LINE__, 0x00, 0x00) /* AE_AML_UNINITIALIZED_LOCAL */ } @@ -345,14 +345,14 @@ Method (M149, 1, Serialized) { - CH03 (__METHOD__, Z058, 0x33, 0x0190, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Stall (Arg0) - CH03 (__METHOD__, Z058, 0x34, 0x0194, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) } Method (M14A, 1, Serialized) { - CH03 (__METHOD__, Z058, 0x35, 0x019B, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Stall (Arg0) /* It is now bug 14. */ @@ -388,9 +388,9 @@ /* 101 characters */ Local1 = "01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890" - CH03 (__METHOD__, Z058, 0x37, 0x01C0, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Concatenate (Local0, Local0, Local5) - CH03 (__METHOD__, Z058, 0x38, 0x01C4, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Concatenate (Local0, Local1, Local5) /* * CH04(ts, 0, 61, z058, __LINE__, 0, 0) // AE_AML_STRING_LIMIT @@ -398,7 +398,7 @@ * 20.12.2005. * No more limit of string size. */ - CH03 (__METHOD__, Z058, 0x39, 0x01CF, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) } /* ToDecimalString() when the number of result characters in string exceeds 200 */ @@ -441,9 +441,9 @@ /* 0058 */ 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, // ........ /* 0060 */ 0x01, 0x01, 0x01, 0x01, 0x01 // ..... }) - CH03 (__METHOD__, Z058, 0x3A, 0x01EB, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) ToDecimalString (B000, Local5) - CH03 (__METHOD__, Z058, 0x3B, 0x01EF, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) ToDecimalString (B001, Local5) /* * CH04(ts, 0, 61, z058, __LINE__, 0, 0) // AE_AML_STRING_LIMIT @@ -451,14 +451,14 @@ * 20.12.2005. * No more limit of string size. */ - CH03 (__METHOD__, Z058, 0x3C, 0x01FA, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) } /* ToBCD() when a specified integer overflows a number of the BCD format */ Method (M14E, 0, Serialized) { - CH03 (__METHOD__, Z058, 0x3D, 0x0202, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) If ((F64 == 0x01)) { Local4 = 0x002386F26FC0FFFF @@ -469,7 +469,7 @@ ToBCD (0x05F5E0FF, Local5) } - CH03 (__METHOD__, Z058, 0x3E, 0x020B, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) If ((F64 == 0x01)) { Local4 = 0x002386F26FC10000 @@ -489,39 +489,39 @@ Method (M14F, 0, Serialized) { Name (B001, Buffer (0x10){}) - CH03 (__METHOD__, Z058, 0x40, 0x021F, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) CreateBitField (B001, 0x7F, F000) - CH03 (__METHOD__, Z058, 0x41, 0x0221, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) CreateBitField (B001, 0x80, F001) CH04 (__METHOD__, 0x00, 0x36, Z058, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ - CH03 (__METHOD__, Z058, 0x43, 0x0225, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) CreateByteField (B001, 0x0F, F002) - CH03 (__METHOD__, Z058, 0x44, 0x0227, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) CreateByteField (B001, 0x10, F003) CH04 (__METHOD__, 0x00, 0x36, Z058, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ - CH03 (__METHOD__, Z058, 0x46, 0x022B, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) CreateWordField (B001, 0x0E, F004) - CH03 (__METHOD__, Z058, 0x47, 0x022D, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) CreateWordField (B001, 0x0F, F005) CH04 (__METHOD__, 0x00, 0x36, Z058, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ - CH03 (__METHOD__, Z058, 0x49, 0x0231, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) CreateDWordField (B001, 0x0C, F006) - CH03 (__METHOD__, Z058, 0x4A, 0x0233, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) CreateDWordField (B001, 0x0D, F007) CH04 (__METHOD__, 0x00, 0x36, Z058, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ - CH03 (__METHOD__, Z058, 0x4C, 0x0237, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) CreateQWordField (B001, 0x08, F008) - CH03 (__METHOD__, Z058, 0x4D, 0x0239, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) CreateQWordField (B001, 0x09, F009) CH04 (__METHOD__, 0x00, 0x36, Z058, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ - CH03 (__METHOD__, Z058, 0x4F, 0x023D, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) CreateField (B001, 0x7F, 0x01, F00A) - CH03 (__METHOD__, Z058, 0x50, 0x023F, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) CreateField (B001, 0x80, 0x01, F00B) CH04 (__METHOD__, 0x00, 0x36, Z058, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ - CH03 (__METHOD__, Z058, 0x52, 0x0243, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) CreateField (B001, 0x78, 0x08, F00C) - CH03 (__METHOD__, Z058, 0x53, 0x0245, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) CreateField (B001, 0x78, 0x09, F00D) CH04 (__METHOD__, 0x00, 0x36, Z058, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ } @@ -535,7 +535,7 @@ Local0 = 0x00 } - CH03 (__METHOD__, Z058, 0x55, 0x0253, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Local5 = Local0 [0x00] CH04 (__METHOD__, 0x00, 0x31, Z058, __LINE__, 0x00, 0x00) /* AE_AML_UNINITIALIZED_LOCAL */ } @@ -550,9 +550,9 @@ 0x01, 0x02 }) - CH03 (__METHOD__, Z058, 0x57, 0x0261, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Local5 = DerefOf (P000 [0x02]) - CH03 (__METHOD__, Z058, 0x58, 0x0265, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Local5 = DerefOf (P000 [0x03]) /* * Obsolete: @@ -611,9 +611,9 @@ /* 0038 */ 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, // ........ /* 0040 */ 0x01, 0x01, 0x01, 0x01 // .... }) - CH03 (__METHOD__, Z058, 0x5A, 0x0296, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) ToHexString (B000, Local5) - CH03 (__METHOD__, Z058, 0x5B, 0x029A, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) ToHexString (B001, Local5) /* * CH04(ts, 0, 61, z058, __LINE__, 0, 0) // AE_AML_STRING_LIMIT @@ -621,7 +621,7 @@ * 20.12.2005. * No more limit of string size. */ - CH03 (__METHOD__, Z058, 0x5C, 0x02A5, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) } /* StartIndex in Match greater than the package size */ @@ -632,9 +632,9 @@ { 0x00 }) - CH03 (__METHOD__, Z058, 0x5D, 0x02AF, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Local5 = Match (PAC0, MTR, 0x00, MTR, 0x00, 0x00) - CH03 (__METHOD__, Z058, 0x5E, 0x02B3, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Local5 = Match (PAC0, MTR, 0x00, MTR, 0x00, 0x01) CH04 (__METHOD__, 0x01, 0x37, Z058, __LINE__, 0x00, 0x00) /* AE_AML_PACKAGE_LIMIT */ } @@ -652,13 +652,13 @@ Local0 = 0x00 Local2 = Buffer (Local0){} - CH03 (__METHOD__, Z058, 0x60, 0x02C7, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) ConcatenateResTemplate (RT00, RT00, Local5) - CH03 (__METHOD__, Z058, 0x61, 0x02CB, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) ConcatenateResTemplate (RT00, Local2, Local5) /* Bug 188. */ - CH03 (__METHOD__, Z058, 0x62, 0x02D0, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) /* CH04(ts, 0, 71, z058, __LINE__, 0, 0) // AE_AML_NO_RESOURCE_END_TAG */ /* One-element buffer */ Local2 = Buffer (0x01) @@ -733,7 +733,7 @@ CH04 (__METHOD__, 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) } - CH03 (__METHOD__, Z058, 0xAB, 0x030F, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) } /* @@ -753,7 +753,7 @@ */ Method (M155, 0, Serialized) { - CH03 (__METHOD__, Z058, 0x69, 0x0325, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Local0 = ("0x1111" + 0x00) /* * Obsolete: @@ -761,7 +761,7 @@ * * New: */ - CH03 (__METHOD__, Z058, 0x6A, 0x032F, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) If ((Local0 != 0x1111)) { /* Bug 63, Bugzilla 5329. */ @@ -781,19 +781,19 @@ { Local0 = 0x00 Name (B000, Buffer (Local0){}) - CH03 (__METHOD__, Z058, 0x6B, 0x0344, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) /* Add, empty String */ Local5 = ("" + 0x00) /* CH04(ts, 0, 34, z058, __LINE__, 0, 0) // AE_BAD_HEX_CONSTANT */ - CH03 (__METHOD__, Z058, 0x6C, 0x034A, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) /* Add, String filled with blanks */ Local5 = (" " + 0x00) /* CH04(ts, 0, 34, z058, __LINE__, 0, 0) // AE_BAD_HEX_CONSTANT */ - CH03 (__METHOD__, Z058, 0x6D, 0x0350, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) /* ToInteger, empty String */ Local4 = "" @@ -829,7 +829,7 @@ Method (M157, 0, Serialized) { Name (I000, 0xAAAAAAAA) - CH03 (__METHOD__, Z058, 0x72, 0x0379, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Store (I000 [0x00], Local5) CH04 (__METHOD__, 0x01, 0x2F, Z058, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = I000 [0x00] @@ -845,7 +845,7 @@ Method (M158, 0, Serialized) { Name (I000, 0xAAAAAAAA) - CH03 (__METHOD__, Z058, 0x77, 0x0394, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) /* Bug 83, Bugzilla 5387. */ Local5 = DerefOf (I000) @@ -862,7 +862,7 @@ { Name (I000, 0xAAAAAAAA) Local7 = I000 /* \M087.I000 */ - CH03 (__METHOD__, Z058, 0x7A, 0x03AB, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) /* Index(Integer) */ Store (Local7 [0x00], Local5) @@ -891,7 +891,7 @@ /* 0008 */ 0x09 // . }) CreateField (B000, 0x00, 0x08, BF00) - CH03 (__METHOD__, Z058, 0x81, 0x03D2, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Store (BF00 [0x00], Local5) CH04 (__METHOD__, 0x01, 0x2F, Z058, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = BF00 [0x00] @@ -914,7 +914,7 @@ /* 0008 */ 0x09 // . }) CreateField (B000, 0x00, 0x08, BF00) - CH03 (__METHOD__, Z058, 0x87, 0x03F2, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Local5 = DerefOf (BF00) /* Bug 83, Bugzilla 5387. */ @@ -953,7 +953,7 @@ IF01, 1 } - CH03 (__METHOD__, Z058, 0x8A, 0x040A, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) /* Field */ Store (F000 [0x00], Local5) @@ -1020,7 +1020,7 @@ IF01, 1 } - CH03 (__METHOD__, Z058, 0x9A, 0x045B, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) /* Field */ Local5 = DerefOf (F000) @@ -1072,7 +1072,7 @@ }) } - CH03 (__METHOD__, Z058, 0xA1, 0x0490, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) /* Discuss: now the ObjectType doesnt cause exception! Is it correct? Understand and discuss it. @@ -1092,10 +1092,10 @@ } Else { - CH03 (__METHOD__, Z058, 0xA7, 0x04A7, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) } - CH03 (__METHOD__, Z058, 0xA8, 0x04AA, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) } Method (MF9D, 0, NotSerialized) @@ -1123,10 +1123,10 @@ { } - CH03 ("mf9d", Z058, 0xAB, 0x04C4, 0x00) + CH03 ("mf9d", Z058, __LINE__, 0x00, 0x00) M000 () CH04 ("mf9d", 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) - CH03 ("mf9d", Z058, 0xAD, 0x04CA, 0x00) + CH03 ("mf9d", Z058, __LINE__, 0x00, 0x00) M001 () CH04 ("mf9d", 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) } @@ -1191,7 +1191,7 @@ } Local3 = RefOf (Local2) - CH03 (__METHOD__, Z058, 0x04F6, 0x00, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) /* Write: except DataTableRegion */ If ((Local1 < 0x03)) @@ -1274,7 +1274,7 @@ FU01, 8 } - CH03 (__METHOD__, Z058, 0xBF, 0x053F, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) FU00 = 0x12 CH04 (__METHOD__, 0x00, 0x35, Z058, __LINE__, 0x00, 0x00) /* AE_AML_REGION_LIMIT */ FU01 = 0x12 @@ -1292,7 +1292,7 @@ } Local0 = FU00 /* \M70B.FU00 */ - CH03 (__METHOD__, Z058, 0xC2, 0x0556, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) FU00 = 0x00 CH04 (__METHOD__, 0x00, 0x10, Z058, __LINE__, 0x00, 0x00) /* AE_SUPPORT */ } @@ -1310,7 +1310,7 @@ { 0x12 }) - CH03 (__METHOD__, Z058, 0xC1, 0x0566, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) DataTableRegion (DR00, B000, "", "") CH04 (__METHOD__, 0x00, 0x05, Z058, __LINE__, 0x00, 0x00) /* AE_NOT_FOUND */ DataTableRegion (DR01, "SSDT", B000, "") @@ -1349,7 +1349,7 @@ /* Create improper SMBus data buffer */ Name (BUFF, Buffer (0x21){}) - CH03 (__METHOD__, Z058, 0xCD, 0x0595, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) /* Invoke Write Quick transaction */ FLD0 = BUFF /* \M7F6.BUFF */ @@ -1392,7 +1392,7 @@ Return (0xABCD0002) } - CH03 (__METHOD__, Z058, 0xD0, 0x05C2, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) M004 () CH04 (__METHOD__, 0x00, 0x05, Z058, __LINE__, 0x00, 0x00) /* AE_NOT_FOUND */ } @@ -1401,7 +1401,7 @@ { /* Recursion */ - CH03 (__METHOD__, Z058, 0xD0, 0x05CA, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) M003 () CH04 (__METHOD__, 0x00, 0x54, Z058, __LINE__, 0x00, 0x00) /* AE_AML_METHOD_LIMIT */ Method (M003, 0, NotSerialized) 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 008d73745..c13037f0e 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 @@ -52,7 +52,7 @@ /* CondRefOf */ CondRefOf (Local0, Local1) - CH03 (__METHOD__, Z092, 0x01, 0x3B, 0x00) + CH03 (__METHOD__, Z092, __LINE__, 0x00, 0x00) /* CopyObject */ CopyObject (Local0, Local1) @@ -92,11 +92,11 @@ /* ObjectType */ Local1 = ObjectType (Local0) - CH03 (__METHOD__, Z092, 0x02, 0x6D, 0x00) + CH03 (__METHOD__, Z092, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (Local0) - CH03 (__METHOD__, Z092, 0x03, 0x72, 0x00) + CH03 (__METHOD__, Z092, __LINE__, 0x00, 0x00) /* Release */ Release (Local0) @@ -390,7 +390,7 @@ If (X104) { Local1 = ObjectType (DerefOf (P000 [0x00])) - CH03 (__METHOD__, Z092, 0x05, 0x01DA, 0x00) + CH03 (__METHOD__, Z092, __LINE__, 0x00, 0x00) } /* RefOf */ @@ -998,7 +998,7 @@ If (X104) { Local1 = ObjectType (DerefOf (Arg1)) - CH03 (__METHOD__, Z092, 0x0B, 0x0531, 0x00) + CH03 (__METHOD__, Z092, __LINE__, 0x00, 0x00) } /* RefOf */ @@ -1417,7 +1417,7 @@ } } - CH03 (__METHOD__, Z092, 0x0C, 0x0716, 0x00) + CH03 (__METHOD__, Z092, __LINE__, 0x00, 0x00) /* Uninitialized Local */ M000 (Concatenate (__METHOD__, "-m000"), 0x00) 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 d1cc39345..376691dde 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 @@ -248,7 +248,7 @@ } Local1 = DerefOf (Arg1) - CH03 (__METHOD__, Z093, 0x00, 0xFC, 0x00) + CH03 (__METHOD__, Z093, __LINE__, 0x00, 0x00) Local1 = DerefOf (DerefOf (Arg1)) CH06 (Arg0, 0x2F, 0x2F) Store (DerefOf (Arg1) [0x00], Local1) @@ -360,7 +360,7 @@ Local0 = (0x03 * LPC0) /* \M4B1.M007.LPC0 */ I001 = 0x00 Local1 = DerefOf (M000 (0x01, LPC0)) - CH03 (__METHOD__, Z093, 0x016A, 0x00, 0x00) + CH03 (__METHOD__, Z093, __LINE__, 0x00, 0x00) CH00 (Arg0, 0x01) Local1 = DerefOf (DerefOf (M000 (0x02, LPC0))) CH06 (Arg0, (0x3C + Local0), 0x2F) @@ -376,7 +376,7 @@ } } - CH03 (__METHOD__, Z093, 0x03, 0x017E, 0x00) + CH03 (__METHOD__, Z093, __LINE__, 0x00, 0x00) /* Local Named Object */ M000 (__METHOD__) 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 952276308..0ce3cca01 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 @@ -57,7 +57,7 @@ /* Index */ Local1 = S000 [0x00] - CH03 (__METHOD__, Z094, 0x01, 0x42, 0x00) + CH03 (__METHOD__, Z094, __LINE__, 0x00, 0x00) /* ConcatenateResTemplate */ ConcatenateResTemplate (S000, Buffer (0x02) @@ -85,7 +85,7 @@ /* Index */ Local1 = S100 [0x00] - CH03 (__METHOD__, Z094, 0x03, 0x59, 0x00) + CH03 (__METHOD__, Z094, __LINE__, 0x00, 0x00) /* ConcatenateResTemplate */ ConcatenateResTemplate (S100, Buffer (0x02) @@ -139,7 +139,7 @@ /* Index */ Local1 = Arg1 [0x00] - CH03 (__METHOD__, Z094, 0x05, 0x8C, 0x00) + CH03 (__METHOD__, Z094, __LINE__, 0x00, 0x00) /* Wait */ Local1 = Wait (Arg1, 0x00) @@ -190,7 +190,7 @@ /* Index */ Local1 = Local0 [0x00] - CH03 (__METHOD__, Z094, 0x07, 0xC2, 0x00) + CH03 (__METHOD__, Z094, __LINE__, 0x00, 0x00) /* Wait */ Local1 = Wait (Local0, 0x00) @@ -214,7 +214,7 @@ Local1 = DerefOf (DerefOf (P000 [0x00])) CH06 (Arg0, 0x20, 0x05) Store (DerefOf (P000 [0x00]) [0x00], Local1) - CH03 (__METHOD__, Z094, 0x08, 0xDA, 0x00) + CH03 (__METHOD__, Z094, __LINE__, 0x00, 0x00) Local1 = Match (DerefOf (P000 [0x00]), MTR, 0x00, MTR, 0x00, 0x00) CH06 (Arg0, 0x21, 0x2F) @@ -223,7 +223,7 @@ Local1 = DerefOf (DerefOf (Local0 = P000 [0x00])) CH06 (Arg0, 0x22, 0x05) Store (DerefOf (Local0 = P000 [0x00]) [0x00], Local1) - CH03 (__METHOD__, Z094, 0x09, 0xE5, 0x00) + CH03 (__METHOD__, Z094, __LINE__, 0x00, 0x00) Local1 = Match (DerefOf (Local0 = P000 [0x00]), MTR, 0x00, MTR, 0x00, 0x00) CH06 (Arg0, 0x23, 0x2F) @@ -243,11 +243,11 @@ } Local1 = DerefOf (Arg1) - CH03 (__METHOD__, Z094, 0x0A, 0xF8, 0x00) + CH03 (__METHOD__, Z094, __LINE__, 0x00, 0x00) Local1 = DerefOf (DerefOf (Arg1)) CH06 (Arg0, 0x25, 0x05) Store (DerefOf (Arg1) [0x00], Local1) - CH03 (__METHOD__, Z094, 0x0B, 0xFE, 0x00) + CH03 (__METHOD__, Z094, __LINE__, 0x00, 0x00) Local1 = Match (DerefOf (Arg1), MTR, 0x00, MTR, 0x00, 0x00) CH06 (Arg0, 0x26, 0x2F) Return (0x00) @@ -304,11 +304,11 @@ CH00 (Arg0, 0x05) } - CH03 (__METHOD__, Z094, 0x0C, 0x0135, 0x00) + CH03 (__METHOD__, Z094, __LINE__, 0x00, 0x00) Store (M000 (0x06) [0x00], Local1) If (Y900) { - CH03 (__METHOD__, Z094, 0x0C, 0x0138, 0x00) + CH03 (__METHOD__, Z094, __LINE__, 0x00, 0x00) CH00 (Arg0, 0x06) } Else @@ -364,7 +364,7 @@ Local0 = (0x03 * LPC0) /* \M4B2.M007.LPC0 */ I000 = 0x00 Local1 = DerefOf (M000 (0x01, LPC0)) - CH03 (__METHOD__, Z094, 0x016B, 0x00, 0x00) + CH03 (__METHOD__, Z094, __LINE__, 0x00, 0x00) CH00 (Arg0, 0x01) Local1 = DerefOf (DerefOf (M000 (0x02, LPC0))) CH06 (Arg0, (0x30 + Local0), 0x2F) @@ -380,7 +380,7 @@ } } - CH03 (__METHOD__, Z094, 0x0F, 0x017F, 0x00) + CH03 (__METHOD__, Z094, __LINE__, 0x00, 0x00) /* Local Named Object */ M000 (__METHOD__) 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 b59afdc20..490712d8d 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 @@ -60,7 +60,7 @@ } Store (B000 [0x00], Local1) - CH03 (__METHOD__, Z095, 0x00, 0x3C, 0x00) + CH03 (__METHOD__, Z095, __LINE__, 0x00, 0x00) } /* Global Named Object */ @@ -74,7 +74,7 @@ } Store (B100 [0x00], Local1) - CH03 (__METHOD__, Z095, 0x01, 0x48, 0x00) + CH03 (__METHOD__, Z095, __LINE__, 0x00, 0x00) } /* Argument */ @@ -92,7 +92,7 @@ Local1 = Acquire (Arg1, 0x0000) CH06 (Arg0, 0x06, 0x2F) Store (Arg1 [0x00], Local1) - CH03 (__METHOD__, Z095, 0x02, 0x5E, 0x00) + CH03 (__METHOD__, Z095, __LINE__, 0x00, 0x00) Local1 = Wait (Arg1, 0x00) CH06 (Arg0, 0x07, 0x2F) Local1 = Match (Arg1, MTR, 0x00, MTR, 0x00, 0x00) @@ -118,7 +118,7 @@ Local1 = Acquire (Local0, 0x0000) CH06 (Arg0, 0x0D, 0x2F) Store (Local0 [0x00], Local1) - CH03 (__METHOD__, Z095, 0x03, 0x7C, 0x00) + CH03 (__METHOD__, Z095, __LINE__, 0x00, 0x00) Local1 = Wait (Local0, 0x00) CH06 (Arg0, 0x0E, 0x2F) Local1 = Match (Local0, MTR, 0x00, MTR, 0x00, 0x00) @@ -141,7 +141,7 @@ Local1 = DerefOf (DerefOf (Local0 = P000 [0x00])) CH06 (Arg0, 0x12, 0x2F) Store (DerefOf (Local0 = P000 [0x00]) [0x00], Local1) - CH03 (__METHOD__, Z095, 0x05, 0x90, 0x00) + CH03 (__METHOD__, Z095, __LINE__, 0x00, 0x00) Local1 = Match (DerefOf (Local0 = P000 [0x00]), MTR, 0x00, MTR, 0x00, 0x00) CH06 (Arg0, 0x13, 0x2F) @@ -161,11 +161,11 @@ } Local1 = DerefOf (Arg1) - CH03 (__METHOD__, Z095, 0x06, 0xA3, 0x00) + CH03 (__METHOD__, Z095, __LINE__, 0x00, 0x00) Local1 = DerefOf (DerefOf (Arg1)) CH06 (Arg0, 0x15, 0x2F) Store (DerefOf (Arg1) [0x00], Local1) - CH03 (__METHOD__, Z095, 0x07, 0xA9, 0x00) + CH03 (__METHOD__, Z095, __LINE__, 0x00, 0x00) Local1 = Match (DerefOf (Arg1), MTR, 0x00, MTR, 0x00, 0x00) CH06 (Arg0, 0x16, 0x2F) Return (0x00) @@ -225,11 +225,11 @@ CH00 (Arg0, 0x05) } - CH03 (__METHOD__, Z095, 0x0C, 0xE0, 0x00) + CH03 (__METHOD__, Z095, __LINE__, 0x00, 0x00) Store (M000 (0x06) [0x00], Local1) If (Y900) { - CH03 (__METHOD__, Z095, 0x08, 0xE3, 0x00) + CH03 (__METHOD__, Z095, __LINE__, 0x00, 0x00) CH00 (Arg0, 0x06) } Else @@ -288,7 +288,7 @@ Local0 = (0x03 * LPC0) /* \M4B3.M007.LPC0 */ I000 = 0x00 Local1 = DerefOf (M000 (0x01, LPC0)) - CH03 (__METHOD__, Z095, 0x0116, 0x00, 0x00) + CH03 (__METHOD__, Z095, __LINE__, 0x00, 0x00) CH00 (Arg0, 0x01) Local1 = DerefOf (DerefOf (M000 (0x02, LPC0))) CH06 (Arg0, (0x20 + Local0), 0x2F) @@ -304,7 +304,7 @@ } } - CH03 (__METHOD__, Z095, 0x0B, 0x012A, 0x00) + CH03 (__METHOD__, Z095, __LINE__, 0x00, 0x00) /* Local Named Object */ M000 (__METHOD__) 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 80ada5e38..342d42b26 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 @@ -59,13 +59,13 @@ /* CondRefOf */ Local1 = CondRefOf (P000) - CH03 (__METHOD__, Z096, 0x00, 0x3F, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) CondRefOf (P000, Local1) - CH03 (__METHOD__, Z096, 0x01, 0x42, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* CopyObject */ CopyObject (P000, Local1) - CH03 (__METHOD__, Z096, 0x02, 0x47, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* Decrement */ /* DerefOf */ /* These are now caught by the compiler - Aug 2015 @@ -82,22 +82,22 @@ /* Not */ /* ObjectType */ Local1 = ObjectType (P000) - CH03 (__METHOD__, Z096, 0x03, 0x63, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (P000) - CH03 (__METHOD__, Z096, 0x04, 0x68, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* Release */ /* Reset */ /* Signal */ /* SizeOf */ Local1 = SizeOf (P000) - CH03 (__METHOD__, Z096, 0x05, 0x73, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* Sleep */ /* Stall */ /* Store */ Local1 = P000 /* \M4B4.M000.P000 */ - CH03 (__METHOD__, Z096, 0x06, 0x7C, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* ToBCD */ /* ToBuffer */ /* ToDecimalString */ @@ -112,9 +112,9 @@ /* Fatal */ /* Index */ Local1 = P000 [0x00] - CH03 (__METHOD__, Z096, 0x07, 0x99, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) Store (P000 [0x00], Local1) - CH03 (__METHOD__, Z096, 0x08, 0x9C, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* LEqual */ /* LGreater */ /* LGreaterEqual */ @@ -136,7 +136,7 @@ /* Mid */ /* Match */ Local1 = Match (P000, MTR, 0x00, MTR, 0x00, 0x00) - CH03 (__METHOD__, Z096, 0x09, 0xC7, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) } /* Global Named Object */ @@ -146,11 +146,11 @@ /* CondRefOf */ CondRefOf (P100, Local1) - CH03 (__METHOD__, Z096, 0x0B, 0xD0, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* CopyObject */ CopyObject (P100, Local1) - CH03 (__METHOD__, Z096, 0x0C, 0xD5, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* Decrement */ /* DerefOf */ /* These are now caught by the compiler - Aug 2015 @@ -167,22 +167,22 @@ /* Not */ /* ObjectType */ Local1 = ObjectType (P100) - CH03 (__METHOD__, Z096, 0x0D, 0xF0, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (P100) - CH03 (__METHOD__, Z096, 0x0E, 0xF5, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* Release */ /* Reset */ /* Signal */ /* SizeOf */ Local1 = SizeOf (P100) - CH03 (__METHOD__, Z096, 0x0F, 0x0100, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* Sleep */ /* Stall */ /* Store */ Local1 = P100 /* \P100 */ - CH03 (__METHOD__, Z096, 0x10, 0x0109, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* ToBCD */ /* ToBuffer */ /* ToDecimalString */ @@ -197,7 +197,7 @@ /* Fatal */ /* Index */ Store (P100 [0x00], Local1) - CH03 (__METHOD__, Z096, 0x12, 0x0126, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* LEqual */ /* LGreater */ /* LGreaterEqual */ @@ -219,7 +219,7 @@ /* Mid */ /* Match */ Local1 = Match (P100, MTR, 0x00, MTR, 0x00, 0x00) - CH03 (__METHOD__, Z096, 0x13, 0x0151, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) } /* Argument */ @@ -230,11 +230,11 @@ /* CondRefOf */ CondRefOf (Arg1, Local1) - CH03 (__METHOD__, Z096, 0x15, 0x015C, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* CopyObject */ CopyObject (Arg1, Local1) - CH03 (__METHOD__, Z096, 0x16, 0x0161, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* Decrement */ Arg1-- @@ -270,11 +270,11 @@ /* ObjectType */ Local1 = ObjectType (Arg1) - CH03 (__METHOD__, Z096, 0x17, 0x018E, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (Arg1) - CH03 (__METHOD__, Z096, 0x18, 0x0193, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* Release */ Release (Arg1) @@ -290,7 +290,7 @@ /* SizeOf */ Local1 = SizeOf (Arg1) - CH03 (__METHOD__, Z096, 0x19, 0x01A7, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* Sleep */ Sleep (Arg1) @@ -302,7 +302,7 @@ /* Store */ Local1 = Arg1 - CH03 (__METHOD__, Z096, 0x1A, 0x01B6, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* ToBCD */ ToBCD (Arg1, Local1) @@ -374,7 +374,7 @@ /* Index */ Local1 = Arg1 [0x00] - CH03 (__METHOD__, Z096, 0x1C, 0x020C, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) Index ("0", Arg1, Local1) CH06 (Arg0, 0x39, 0x2F) /* LEqual */ @@ -496,7 +496,7 @@ /* Match */ Local1 = Match (Arg1, MTR, 0x00, MTR, 0x00, 0x00) - CH03 (__METHOD__, Z096, 0x1D, 0x02AF, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) Local1 = Match (Package (0x01) { 0x01 @@ -525,11 +525,11 @@ /* CondRefOf */ CondRefOf (Local0, Local1) - CH03 (__METHOD__, Z096, 0x1F, 0x02C3, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* CopyObject */ CopyObject (Local0, Local1) - CH03 (__METHOD__, Z096, 0x20, 0x02C8, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* Decrement */ Local0-- @@ -565,11 +565,11 @@ /* ObjectType */ Local1 = ObjectType (Local0) - CH03 (__METHOD__, Z096, 0x21, 0x02F5, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (Local0) - CH03 (__METHOD__, Z096, 0x22, 0x02FA, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* Release */ Release (Local0) @@ -585,7 +585,7 @@ /* SizeOf */ Local1 = SizeOf (Local0) - CH03 (__METHOD__, Z096, 0x23, 0x030E, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* Sleep */ Sleep (Local0) @@ -597,7 +597,7 @@ /* Store */ Local1 = Local0 - CH03 (__METHOD__, Z096, 0x24, 0x031D, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* ToBCD */ ToBCD (Local0, Local1) @@ -667,7 +667,7 @@ /* Index */ Local1 = Local0 [0x00] - CH03 (__METHOD__, Z096, 0x26, 0x0370, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) Index ("0", Local0, Local1) CH06 (Arg0, 0x39, 0x2F) /* LEqual */ @@ -789,7 +789,7 @@ /* Match */ Local1 = Match (Local0, MTR, 0x00, MTR, 0x00, 0x00) - CH03 (__METHOD__, Z096, 0x27, 0x0413, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) Local1 = Match (Package (0x01) { 0x01 @@ -825,7 +825,7 @@ /* CopyObject */ CopyObject (DerefOf (P000 [0x00]), Local1) - CH03 (__METHOD__, Z096, 0x28, 0x042E, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* Decrement */ DerefOf (P000 [0x00])-- @@ -861,7 +861,7 @@ /* ObjectType */ Local1 = ObjectType (DerefOf (P000 [0x00])) - CH03 (__METHOD__, Z096, 0x29, 0x045B, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (DerefOf (P000 [0x00])) @@ -871,7 +871,7 @@ /* Signal */ /* SizeOf */ Local1 = SizeOf (DerefOf (P000 [0x00])) - CH03 (__METHOD__, Z096, 0x2A, 0x046B, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* Sleep */ Sleep (DerefOf (P000 [0x00])) @@ -883,7 +883,7 @@ /* Store */ Local1 = DerefOf (P000 [0x00]) - CH03 (__METHOD__, Z096, 0x2B, 0x047A, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* ToBCD */ ToBCD (DerefOf (P000 [0x00]), Local1) @@ -951,7 +951,7 @@ /* Index */ Local1 = DerefOf (P000 [0x00]) [0x00] - CH03 (__METHOD__, Z096, 0x2D, 0x04CD, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) Index ("0", DerefOf (P000 [0x00]), Local1) CH06 (Arg0, 0x39, 0x2F) /* LEqual */ @@ -1072,7 +1072,7 @@ Local1 = Match (DerefOf (P000 [0x00]), MTR, 0x00, MTR, 0x00, 0x00) - CH03 (__METHOD__, Z096, 0x2E, 0x056D, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) Local1 = Match (Package (0x01) { 0x01 @@ -1095,7 +1095,7 @@ /* CopyObject */ CopyObject (DerefOf (Local0 = P000 [0x00]), Local1) - CH03 (__METHOD__, Z096, 0x2F, 0x0583, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* Decrement */ DerefOf (Local0 = P000 [0x00])-- @@ -1131,7 +1131,7 @@ /* ObjectType */ Local1 = ObjectType (DerefOf (Local0 = P000 [0x00])) - CH03 (__METHOD__, Z096, 0x30, 0x05B0, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (DerefOf (Local0 = P000 [0x00])) @@ -1141,7 +1141,7 @@ /* Signal */ /* SizeOf */ Local1 = SizeOf (DerefOf (Local0 = P000 [0x00])) - CH03 (__METHOD__, Z096, 0x31, 0x05C0, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* Sleep */ Sleep (DerefOf (Local0 = P000 [0x00])) @@ -1153,7 +1153,7 @@ /* Store */ Local1 = DerefOf (Local0 = P000 [0x00]) - CH03 (__METHOD__, Z096, 0x32, 0x05CF, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* ToBCD */ ToBCD (DerefOf (Local0 = P000 [0x00]), Local1) @@ -1221,7 +1221,7 @@ /* Index */ Local1 = DerefOf (Local0 = P000 [0x00]) [0x00] - CH03 (__METHOD__, Z096, 0x34, 0x0622, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) Index ("0", DerefOf (Local0 = P000 [0x00]), Local1) CH06 (Arg0, 0x39, 0x2F) /* LEqual */ @@ -1342,7 +1342,7 @@ Local1 = Match (DerefOf (Local0 = P000 [0x00]), MTR, 0x00, MTR, 0x00, 0x00) - CH03 (__METHOD__, Z096, 0x35, 0x06C2, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) Local1 = Match (Package (0x01) { 0x01 @@ -1374,7 +1374,7 @@ } Local1 = DerefOf (Arg1) - CH03 (__METHOD__, Z096, 0x36, 0x06DB, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* CondRefOf */ Local1 = CondRefOf (DerefOf (Arg1)) @@ -1384,7 +1384,7 @@ /* CopyObject */ CopyObject (DerefOf (Arg1), Local1) - CH03 (__METHOD__, Z096, 0x37, 0x06E8, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* Decrement */ DerefOf (Arg1)-- @@ -1420,7 +1420,7 @@ /* ObjectType */ Local1 = ObjectType (DerefOf (Arg1)) - CH03 (__METHOD__, Z096, 0x38, 0x0715, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (DerefOf (Arg1)) @@ -1430,7 +1430,7 @@ /* Signal */ /* SizeOf */ Local1 = SizeOf (DerefOf (Arg1)) - CH03 (__METHOD__, Z096, 0x39, 0x0725, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* Sleep */ Sleep (DerefOf (Arg1)) @@ -1442,7 +1442,7 @@ /* Store */ Local1 = DerefOf (Arg1) - CH03 (__METHOD__, Z096, 0x3A, 0x0734, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* ToBCD */ ToBCD (DerefOf (Arg1), Local1) @@ -1510,7 +1510,7 @@ /* Index */ Local1 = DerefOf (Arg1) [0x00] - CH03 (__METHOD__, Z096, 0x3C, 0x0787, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) Index ("0", DerefOf (Arg1), Local1) CH06 (Arg0, 0x39, 0x2F) /* LEqual */ @@ -1630,7 +1630,7 @@ /* Match */ Local1 = Match (DerefOf (Arg1), MTR, 0x00, MTR, 0x00, 0x00) - CH03 (__METHOD__, Z096, 0x3D, 0x0827, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) Local1 = Match (Package (0x01) { 0x01 @@ -1679,7 +1679,7 @@ /* CopyObject */ CopyObject (M000 (), Local1) - CH03 (__METHOD__, Z096, 0x3E, 0x0852, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* Decrement */ M000 ()-- @@ -1715,7 +1715,7 @@ /* **** ObjectType */ /* Nov. 2012: Method invocation as arg to ObjectType is now illegal */ Local0 = ObjectType (M000) - CH03 (__METHOD__, Z096, 0x3F, 0x0880, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* RefOf */ /* **** Oct. 2016: Method invocation as arg to RefOf is now illegal */ /* if (y601) { */ @@ -1818,20 +1818,20 @@ If (Y900) { Local1 = M000 () [0x00] - CH03 (__METHOD__, Z096, 0x41, 0x08FF, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) Index ("0", M000 (), Local1) CH06 (Arg0, 0x39, 0x2F) } Else { - CH03 (__METHOD__, Z096, 0x0123, 0x0904, 0x00) - CH03 (__METHOD__, Z096, 0x0127, 0x0905, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) Local1 = M000 () [0x00] CH04 (__METHOD__, 0x00, 0x55, Z094, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ - CH03 (__METHOD__, Z096, 0x0129, 0x0909, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) Index ("0", M000 (), Local1) CH04 (__METHOD__, 0x00, 0xFF, Z094, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ - CH03 (__METHOD__, Z096, 0x0129, 0x090D, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) Local1 = SS00 [M000 ()] CH04 (__METHOD__, 0x00, 0x2F, Z094, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } @@ -1955,7 +1955,7 @@ /* Match */ Local1 = Match (M000 (), MTR, 0x00, MTR, 0x00, 0x00) - CH03 (__METHOD__, Z096, 0x42, 0x09B0, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) Local1 = Match (Package (0x01) { 0x01 @@ -2012,7 +2012,7 @@ Local0 = (0x03 * LPC0) /* \M4B4.M007.LPC0 */ I000 = 0x00 Local1 = DerefOf (M000 (0x01, LPC0)) - CH03 (__METHOD__, Z096, 0x09DE, 0x00, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) CH00 (Arg0, 0x01) Local1 = DerefOf (DerefOf (M000 (0x02, LPC0))) CH06 (Arg0, (0x01 + Local0), 0x2F) @@ -2117,11 +2117,11 @@ /* Index */ - CH03 (__METHOD__, Z094, 0x0123, 0x0A48, 0x00) + CH03 (__METHOD__, Z094, __LINE__, 0x00, 0x00) Store (M000 (0x09) [0x00], Local1) If (Y900) { - CH03 (__METHOD__, Z096, 0x45, 0x0A4B, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) CH00 (Arg0, 0x09) } Else @@ -2141,12 +2141,12 @@ /* Match */ Local1 = Match (M000 (0x0B), MTR, 0x00, MTR, 0x00, 0x00) - CH03 (__METHOD__, Z096, 0x46, 0x0A5C, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) CH00 (Arg0, 0x0B) } SET0 (Z096, __METHOD__, 0x00) - CH03 (__METHOD__, Z096, 0x46, 0x0A62, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* Local Named Object */ M000 (__METHOD__) 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 c0c8ebbf5..4b866bc02 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 @@ -92,7 +92,7 @@ Store (FU03 [0x00], Local1) If (Y900) { - CH03 (__METHOD__, Z097, 0x00, 0x5A, 0x00) + CH03 (__METHOD__, Z097, __LINE__, 0x00, 0x00) } Else { @@ -127,7 +127,7 @@ Store (FU01 [0x00], Local1) If (Y900) { - CH03 (__METHOD__, Z097, 0x01, 0x79, 0x00) + CH03 (__METHOD__, Z097, __LINE__, 0x00, 0x00) } Else { @@ -149,7 +149,7 @@ } Local1 = DerefOf (Arg1) - CH03 (__METHOD__, Z097, 0x02, 0x8C, 0x00) + CH03 (__METHOD__, Z097, __LINE__, 0x00, 0x00) Local1 = DerefOf (DerefOf (Arg1)) CH06 (Arg0, 0x07, 0x2F) Store (DerefOf (Arg1) [0x00], Local1) @@ -159,7 +159,7 @@ If (Y900) { - CH03 (__METHOD__, Z097, 0x03, 0x96, 0x00) + CH03 (__METHOD__, Z097, __LINE__, 0x00, 0x00) } Else { @@ -232,7 +232,7 @@ Local0 = (0x03 * LPC0) /* \M4B5.M003.LPC0 */ I000 = 0x00 Local1 = DerefOf (M000 (0x01, LPC0)) - CH03 (__METHOD__, Z097, 0xD3, 0x00, 0x00) + CH03 (__METHOD__, Z097, __LINE__, 0x00, 0x00) CH00 (Arg0, 0x01) Local1 = DerefOf (DerefOf (M000 (0x02, LPC0))) CH06 (Arg0, (0x0B + Local0), 0x2F) @@ -244,7 +244,7 @@ If (Y900) { - CH03 (__METHOD__, Z097, 0xDF, 0x00, 0x00) + CH03 (__METHOD__, Z097, __LINE__, 0x00, 0x00) } Else { @@ -267,7 +267,7 @@ } } - CH03 (__METHOD__, Z097, 0x0C, 0xF2, 0x00) + CH03 (__METHOD__, Z097, __LINE__, 0x00, 0x00) /* Local Named Object */ M000 (__METHOD__) 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 956a439e8..7e77aca38 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 @@ -78,11 +78,11 @@ /* CondRefOf */ CondRefOf (Local0, Local1) - CH03 (__METHOD__, Z098, 0x01, 0x56, 0x00) + CH03 (__METHOD__, Z098, __LINE__, 0x00, 0x00) /* CopyObject */ CopyObject (Local0, Local1) - CH03 (__METHOD__, Z098, 0x02, 0x5B, 0x00) + CH03 (__METHOD__, Z098, __LINE__, 0x00, 0x00) /* Decrement */ Local0-- @@ -118,11 +118,11 @@ /* ObjectType */ Local1 = ObjectType (Local0) - CH03 (__METHOD__, Z098, 0x03, 0x88, 0x00) + CH03 (__METHOD__, Z098, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (Local0) - CH03 (__METHOD__, Z098, 0x04, 0x8D, 0x00) + CH03 (__METHOD__, Z098, __LINE__, 0x00, 0x00) /* Release */ Release (Local0) @@ -383,7 +383,7 @@ } Local1 = DerefOf (Arg1) - CH03 (__METHOD__, Z098, 0x05, 0x01C7, 0x00) + CH03 (__METHOD__, Z098, __LINE__, 0x00, 0x00) /* CondRefOf */ CondRefOf (DerefOf (Arg1), Local1) @@ -427,7 +427,7 @@ /* ObjectType */ Local1 = ObjectType (DerefOf (Arg1)) - CH03 (__METHOD__, Z098, 0x06, 0x01FE, 0x00) + CH03 (__METHOD__, Z098, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (DerefOf (Arg1)) @@ -675,7 +675,7 @@ /* CopyObject */ CopyObject (M000 (), Local1) - CH03 (__METHOD__, Z098, 0x07, 0x0334, 0x00) + CH03 (__METHOD__, Z098, __LINE__, 0x00, 0x00) /* Decrement */ M000 ()-- @@ -711,7 +711,7 @@ /* **** ObjectType */ /* Nov. 2016: Method invocation as arg to ObjectType is now illegal */ Local0 = ObjectType (M000) - CH03 (__METHOD__, Z098, 0x08, 0x0362, 0x00) + CH03 (__METHOD__, Z098, __LINE__, 0x00, 0x00) /* RefOf */ /* **** Oct. 2016: Method invocation as arg to RefOf is now illegal */ /* Store (RefOf(m000()), Local1) */ @@ -993,7 +993,7 @@ Local0 = (0x03 * LPC0) /* \M4B6.M005.LPC0 */ I000 = 0x00 Local1 = DerefOf (M000 (0x01, LPC0)) - CH03 (__METHOD__, Z098, 0x04B2, 0x00, 0x00) + CH03 (__METHOD__, Z098, __LINE__, 0x00, 0x00) CH00 (Arg0, 0x01) Local1 = DerefOf (DerefOf (M000 (0x02, LPC0))) CH06 (Arg0, (0x01 + Local0), 0x2F) @@ -1009,7 +1009,7 @@ } } - CH03 (__METHOD__, Z098, 0x0B, 0x04C6, 0x00) + CH03 (__METHOD__, Z098, __LINE__, 0x00, 0x00) /* Local Named Object */ /* m000(ts) */ /* Global Named Object */ 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 bec1585f2..cfac31b97 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 @@ -69,11 +69,11 @@ /* CondRefOf */ CondRefOf (Local0, Local1) - CH03 (__METHOD__, Z099, 0x01, 0x57, 0x00) + CH03 (__METHOD__, Z099, __LINE__, 0x00, 0x00) /* CopyObject */ CopyObject (Local0, Local1) - CH03 (__METHOD__, Z099, 0x02, 0x5C, 0x00) + CH03 (__METHOD__, Z099, __LINE__, 0x00, 0x00) /* Decrement */ Local0-- @@ -109,11 +109,11 @@ /* ObjectType */ Local1 = ObjectType (Local0) - CH03 (__METHOD__, Z099, 0x03, 0x89, 0x00) + CH03 (__METHOD__, Z099, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (Local0) - CH03 (__METHOD__, Z099, 0x04, 0x8E, 0x00) + CH03 (__METHOD__, Z099, __LINE__, 0x00, 0x00) /* Release */ Release (Local0) @@ -121,11 +121,11 @@ /* Reset */ Reset (Local0) - CH03 (__METHOD__, Z099, 0x0E, 0x98, 0x00) + CH03 (__METHOD__, Z099, __LINE__, 0x00, 0x00) /* Signal */ Signal (Local0) - CH03 (__METHOD__, Z099, 0x0F, 0x9D, 0x00) + CH03 (__METHOD__, Z099, __LINE__, 0x00, 0x00) /* SizeOf */ Local1 = SizeOf (Local0) @@ -315,7 +315,7 @@ /* Wait */ Local1 = Wait (Local0, I000) - CH03 (__METHOD__, Z099, 0x6C, 0x018F, 0x00) + CH03 (__METHOD__, Z099, __LINE__, 0x00, 0x00) Local1 = Wait (E000, Local0) CH06 (Arg0, 0x6D, 0x2F) /* XOr */ @@ -377,7 +377,7 @@ /* CopyObject */ CopyObject (DerefOf (Arg1), Local1) - CH03 (__METHOD__, Z099, 0x02, 0x01CC, 0x00) + CH03 (__METHOD__, Z099, __LINE__, 0x00, 0x00) /* Decrement */ DerefOf (Arg1)-- @@ -413,7 +413,7 @@ /* ObjectType */ Local1 = ObjectType (DerefOf (Arg1)) - CH03 (__METHOD__, Z099, 0x06, 0x01F9, 0x00) + CH03 (__METHOD__, Z099, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (DerefOf (Arg1)) @@ -667,7 +667,7 @@ /* CopyObject */ CopyObject (M000 (), Local1) - CH03 (__METHOD__, Z099, 0x07, 0x0334, 0x00) + CH03 (__METHOD__, Z099, __LINE__, 0x00, 0x00) /* Decrement */ M000 ()-- @@ -703,7 +703,7 @@ /* ObjectType */ /* **** Nov. 2016: Method invocation as arg to ObjectType is now illegal */ Local0 = ObjectType (M000) - CH03 (__METHOD__, Z099, 0x08, 0x0362, 0x00) + CH03 (__METHOD__, Z099, __LINE__, 0x00, 0x00) /* RefOf */ /* **** Oct. 2016: Method invocation as arg to RefOf is now illegal */ /* if (y601) { */ @@ -1009,7 +1009,7 @@ } SET0 (Z099, __METHOD__, 0x00) - CH03 (__METHOD__, Z099, 0x0B, 0x04CE, 0x00) + CH03 (__METHOD__, Z099, __LINE__, 0x00, 0x00) /* Local Named Object */ /* m000(ts) */ /* Global Named Object */ 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 f188faf30..a838961c4 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 @@ -90,11 +90,11 @@ /* CondRefOf */ CondRefOf (Local0, Local1) - CH03 (__METHOD__, Z100, 0x01, 0x55, 0x00) + CH03 (__METHOD__, Z100, __LINE__, 0x00, 0x00) /* CopyObject */ CopyObject (Local0, Local1) - CH03 (__METHOD__, Z100, 0x02, 0x5A, 0x00) + CH03 (__METHOD__, Z100, __LINE__, 0x00, 0x00) /* Decrement */ Local0-- @@ -130,11 +130,11 @@ /* ObjectType */ Local1 = ObjectType (Local0) - CH03 (__METHOD__, Z100, 0x03, 0x87, 0x00) + CH03 (__METHOD__, Z100, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (Local0) - CH03 (__METHOD__, Z100, 0x04, 0x8C, 0x00) + CH03 (__METHOD__, Z100, __LINE__, 0x00, 0x00) /* Release */ Release (Local0) @@ -398,7 +398,7 @@ /* CopyObject */ CopyObject (DerefOf (Arg1), Local1) - CH03 (__METHOD__, Z100, 0x02, 0x01CA, 0x00) + CH03 (__METHOD__, Z100, __LINE__, 0x00, 0x00) /* Decrement */ DerefOf (Arg1)-- @@ -434,7 +434,7 @@ /* ObjectType */ Local1 = ObjectType (DerefOf (Arg1)) - CH03 (__METHOD__, Z100, 0x06, 0x01F7, 0x00) + CH03 (__METHOD__, Z100, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (DerefOf (Arg1)) @@ -688,7 +688,7 @@ /* CopyObject */ CopyObject (M000 (), Local1) - CH03 (__METHOD__, Z100, 0x07, 0x0331, 0x00) + CH03 (__METHOD__, Z100, __LINE__, 0x00, 0x00) /* Decrement */ M000 ()-- @@ -724,7 +724,7 @@ /* ObjectType */ /* **** Nov. 2016: Method invocation as arg to ObjectType is now illegal */ Local0 = ObjectType (M000) - CH03 (__METHOD__, Z100, 0x08, 0x035F, 0x00) + CH03 (__METHOD__, Z100, __LINE__, 0x00, 0x00) /* RefOf */ /* **** Oct. 2016: Method invocation as arg to RefOf is now illegal */ /* if (y601) { */ @@ -1034,7 +1034,7 @@ } SET0 (Z100, __METHOD__, 0x00) - CH03 (__METHOD__, Z100, 0x0B, 0x04CB, 0x00) + CH03 (__METHOD__, Z100, __LINE__, 0x00, 0x00) /* Local Named Object */ M000 (__METHOD__) 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 9a726e6b3..6092f995b 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 @@ -76,11 +76,11 @@ /* CondRefOf */ CondRefOf (Local0, Local1) - CH03 (__METHOD__, Z101, 0x01, 0x5A, 0x00) + CH03 (__METHOD__, Z101, __LINE__, 0x00, 0x00) /* CopyObject */ CopyObject (Local0, Local1) - CH03 (__METHOD__, Z101, 0x02, 0x5F, 0x00) + CH03 (__METHOD__, Z101, __LINE__, 0x00, 0x00) /* Decrement */ Local0-- @@ -116,11 +116,11 @@ /* ObjectType */ Local1 = ObjectType (Local0) - CH03 (__METHOD__, Z101, 0x03, 0x8C, 0x00) + CH03 (__METHOD__, Z101, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (Local0) - CH03 (__METHOD__, Z101, 0x04, 0x91, 0x00) + CH03 (__METHOD__, Z101, __LINE__, 0x00, 0x00) /* Release */ Release (Local0) @@ -172,7 +172,7 @@ /* Acquire */ Local1 = Acquire (Local0, 0x0064) - CH03 (__METHOD__, Z101, 0x1E, 0xD2, 0x00) + CH03 (__METHOD__, Z101, __LINE__, 0x00, 0x00) /* Add */ Local1 = (Local0 + I000) /* \M4B9.I000 */ @@ -384,7 +384,7 @@ /* CopyObject */ CopyObject (DerefOf (Arg1), Local1) - CH03 (__METHOD__, Z101, 0x02, 0x01CE, 0x00) + CH03 (__METHOD__, Z101, __LINE__, 0x00, 0x00) /* Decrement */ DerefOf (Arg1)-- @@ -420,7 +420,7 @@ /* ObjectType */ Local1 = ObjectType (DerefOf (Arg1)) - CH03 (__METHOD__, Z101, 0x06, 0x01FB, 0x00) + CH03 (__METHOD__, Z101, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (DerefOf (Arg1)) @@ -674,7 +674,7 @@ /* CopyObject */ CopyObject (M000 (), Local1) - CH03 (__METHOD__, Z101, 0x07, 0x0335, 0x00) + CH03 (__METHOD__, Z101, __LINE__, 0x00, 0x00) /* Decrement */ M000 ()-- @@ -710,7 +710,7 @@ /* ObjectType */ /* **** Nov. 2016: Method invocation as arg to ObjectType is now illegal */ Local0 = ObjectType (M000) - CH03 (__METHOD__, Z101, 0x08, 0x0363, 0x00) + CH03 (__METHOD__, Z101, __LINE__, 0x00, 0x00) /* RefOf */ /* **** Oct. 2016: Method invocation as arg to RefOf is now illegal */ /* if (y601) { */ @@ -1016,7 +1016,7 @@ } SET0 (Z101, __METHOD__, 0x00) - CH03 (__METHOD__, Z101, 0x0B, 0x04CF, 0x00) + CH03 (__METHOD__, Z101, __LINE__, 0x00, 0x00) /* Local Named Object */ M000 (__METHOD__) 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 8f9adf9fe..c825f44cb 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 @@ -74,13 +74,13 @@ /* CondRefOf */ Local1 = CondRefOf (Local0) - CH03 (__METHOD__, Z102, 0x00, 0x58, 0x00) + CH03 (__METHOD__, Z102, __LINE__, 0x00, 0x00) CondRefOf (Local0, Local1) - CH03 (__METHOD__, Z102, 0x01, 0x5B, 0x00) + CH03 (__METHOD__, Z102, __LINE__, 0x00, 0x00) /* CopyObject */ CopyObject (Local0, Local1) - CH03 (__METHOD__, Z102, 0x02, 0x60, 0x00) + CH03 (__METHOD__, Z102, __LINE__, 0x00, 0x00) /* Decrement */ Local0-- @@ -116,11 +116,11 @@ /* ObjectType */ Local1 = ObjectType (Local0) - CH03 (__METHOD__, Z102, 0x03, 0x8D, 0x00) + CH03 (__METHOD__, Z102, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (Local0) - CH03 (__METHOD__, Z102, 0x04, 0x92, 0x00) + CH03 (__METHOD__, Z102, __LINE__, 0x00, 0x00) /* Release */ Release (Local0) @@ -372,7 +372,7 @@ } Local1 = DerefOf (Arg1) - CH03 (__METHOD__, Z102, 0x05, 0x01C4, 0x00) + CH03 (__METHOD__, Z102, __LINE__, 0x00, 0x00) /* CondRefOf */ CondRefOf (DerefOf (Arg1), Local1) @@ -416,7 +416,7 @@ /* ObjectType */ Local1 = ObjectType (DerefOf (Arg1)) - CH03 (__METHOD__, Z102, 0x06, 0x01FB, 0x00) + CH03 (__METHOD__, Z102, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (DerefOf (Arg1)) @@ -664,7 +664,7 @@ /* CopyObject */ CopyObject (M000 (), Local1) - CH03 (__METHOD__, Z102, 0x07, 0x0330, 0x00) + CH03 (__METHOD__, Z102, __LINE__, 0x00, 0x00) /* Decrement */ M000 ()-- @@ -700,7 +700,7 @@ /* ObjectType */ /* **** Nov. 2016: Method invocation as arg to ObjectType is now illegal */ Local0 = ObjectType (M000) - CH03 (__METHOD__, Z102, 0x08, 0x035E, 0x00) + CH03 (__METHOD__, Z102, __LINE__, 0x00, 0x00) /* RefOf */ /* **** Oct. 2016: Method invocation as arg to RefOf is now illegal */ /* Store (RefOf(m000()), Local1) */ @@ -995,7 +995,7 @@ } } - CH03 (__METHOD__, Z102, 0x0B, 0x04C2, 0x00) + CH03 (__METHOD__, Z102, __LINE__, 0x00, 0x00) /* Local Named Object */ M000 (__METHOD__) 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 79ec57861..4c0a602f3 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 @@ -97,11 +97,11 @@ /* CondRefOf */ CondRefOf (Local0, Local1) - CH03 (__METHOD__, Z103, 0x01, 0x59, 0x00) + CH03 (__METHOD__, Z103, __LINE__, 0x00, 0x00) /* CopyObject */ CopyObject (Local0, Local1) - CH03 (__METHOD__, Z103, 0x02, 0x5E, 0x00) + CH03 (__METHOD__, Z103, __LINE__, 0x00, 0x00) /* Decrement */ Local0-- @@ -137,11 +137,11 @@ /* ObjectType */ Local1 = ObjectType (Local0) - CH03 (__METHOD__, Z103, 0x03, 0x8B, 0x00) + CH03 (__METHOD__, Z103, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (Local0) - CH03 (__METHOD__, Z103, 0x04, 0x90, 0x00) + CH03 (__METHOD__, Z103, __LINE__, 0x00, 0x00) /* Release */ Release (Local0) @@ -405,7 +405,7 @@ /* CopyObject */ CopyObject (DerefOf (Arg1), Local1) - CH03 (__METHOD__, Z103, 0x02, 0x01CE, 0x00) + CH03 (__METHOD__, Z103, __LINE__, 0x00, 0x00) /* Decrement */ DerefOf (Arg1)-- @@ -441,7 +441,7 @@ /* ObjectType */ Local1 = ObjectType (DerefOf (Arg1)) - CH03 (__METHOD__, Z103, 0x06, 0x01FB, 0x00) + CH03 (__METHOD__, Z103, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (DerefOf (Arg1)) @@ -695,7 +695,7 @@ /* CopyObject */ CopyObject (M000 (), Local1) - CH03 (__METHOD__, Z103, 0x07, 0x0335, 0x00) + CH03 (__METHOD__, Z103, __LINE__, 0x00, 0x00) /* Decrement */ M000 ()-- @@ -731,7 +731,7 @@ /* ObjectType */ /* **** Nov. 2016: Method invocation as arg to ObjectType is now illegal */ Local0 = ObjectType (M000) - CH03 (__METHOD__, Z103, 0x08, 0x0363, 0x00) + CH03 (__METHOD__, Z103, __LINE__, 0x00, 0x00) /* RefOf */ /* **** Oct. 2016: Method invocation as arg to RefOf is now illegal */ /* if (y601) { */ @@ -1044,7 +1044,7 @@ } SET0 (Z103, __METHOD__, 0x00) - CH03 (__METHOD__, Z103, 0x0B, 0x04CF, 0x00) + CH03 (__METHOD__, Z103, __LINE__, 0x00, 0x00) /* Local Named Object */ M000 (__METHOD__) 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 3d9a6d05a..c8c3760c2 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 @@ -76,11 +76,11 @@ /* CondRefOf */ CondRefOf (Local0, Local1) - CH03 (__METHOD__, Z104, 0x01, 0x5B, 0x00) + CH03 (__METHOD__, Z104, __LINE__, 0x00, 0x00) /* CopyObject */ CopyObject (Local0, Local1) - CH03 (__METHOD__, Z104, 0x02, 0x60, 0x00) + CH03 (__METHOD__, Z104, __LINE__, 0x00, 0x00) /* Decrement */ Local0-- @@ -116,11 +116,11 @@ /* ObjectType */ Local1 = ObjectType (Local0) - CH03 (__METHOD__, Z104, 0x03, 0x8D, 0x00) + CH03 (__METHOD__, Z104, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (Local0) - CH03 (__METHOD__, Z104, 0x04, 0x92, 0x00) + CH03 (__METHOD__, Z104, __LINE__, 0x00, 0x00) /* Release */ Release (Local0) @@ -384,7 +384,7 @@ /* CopyObject */ CopyObject (DerefOf (Arg1), Local1) - CH03 (__METHOD__, Z104, 0x02, 0x01D0, 0x00) + CH03 (__METHOD__, Z104, __LINE__, 0x00, 0x00) /* Decrement */ DerefOf (Arg1)-- @@ -420,7 +420,7 @@ /* ObjectType */ Local1 = ObjectType (DerefOf (Arg1)) - CH03 (__METHOD__, Z104, 0x06, 0x01FD, 0x00) + CH03 (__METHOD__, Z104, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (DerefOf (Arg1)) @@ -674,7 +674,7 @@ /* CopyObject */ CopyObject (M000 (), Local1) - CH03 (__METHOD__, Z104, 0x07, 0x0337, 0x00) + CH03 (__METHOD__, Z104, __LINE__, 0x00, 0x00) /* Decrement */ M000 ()-- @@ -710,7 +710,7 @@ /* ObjectType */ /* **** Nov. 2016: Method invocation as arg to ObjectType is now illegal */ Local0 = ObjectType (M000) - CH03 (__METHOD__, Z104, 0x08, 0x0365, 0x00) + CH03 (__METHOD__, Z104, __LINE__, 0x00, 0x00) /* RefOf */ /* **** Oct. 2016: Method invocation as arg to RefOf is now illegal */ /* if (y601) { */ @@ -1016,7 +1016,7 @@ } SET0 (Z104, __METHOD__, 0x00) - CH03 (__METHOD__, Z104, 0x0B, 0x04D1, 0x00) + CH03 (__METHOD__, Z104, __LINE__, 0x00, 0x00) /* Local Named Object */ M000 (__METHOD__) 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 f653cffb9..ee49c4a59 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 @@ -86,11 +86,11 @@ /* CondRefOf */ CondRefOf (Local0, Local1) - CH03 (__METHOD__, Z105, 0x01, 0x59, 0x00) + CH03 (__METHOD__, Z105, __LINE__, 0x00, 0x00) /* CopyObject */ CopyObject (Local0, Local1) - CH03 (__METHOD__, Z105, 0x02, 0x5E, 0x00) + CH03 (__METHOD__, Z105, __LINE__, 0x00, 0x00) /* Decrement */ Local0-- @@ -126,11 +126,11 @@ /* ObjectType */ Local1 = ObjectType (Local0) - CH03 (__METHOD__, Z105, 0x03, 0x8B, 0x00) + CH03 (__METHOD__, Z105, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (Local0) - CH03 (__METHOD__, Z105, 0x04, 0x90, 0x00) + CH03 (__METHOD__, Z105, __LINE__, 0x00, 0x00) /* Release */ Release (Local0) @@ -391,7 +391,7 @@ } Local1 = DerefOf (Arg1) - CH03 (__METHOD__, Z105, 0x05, 0x01CA, 0x00) + CH03 (__METHOD__, Z105, __LINE__, 0x00, 0x00) /* CondRefOf */ CondRefOf (DerefOf (Arg1), Local1) @@ -435,7 +435,7 @@ /* ObjectType */ Local1 = ObjectType (DerefOf (Arg1)) - CH03 (__METHOD__, Z105, 0x06, 0x0201, 0x00) + CH03 (__METHOD__, Z105, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (DerefOf (Arg1)) @@ -683,7 +683,7 @@ /* CopyObject */ CopyObject (M000 (), Local1) - CH03 (__METHOD__, Z105, 0x07, 0x0336, 0x00) + CH03 (__METHOD__, Z105, __LINE__, 0x00, 0x00) /* Decrement */ M000 ()-- @@ -719,7 +719,7 @@ /* ObjectType */ /* **** Nov. 2016: Method invocation as arg to ObjectType is now illegal */ Local0 = ObjectType (M000) - CH03 (__METHOD__, Z105, 0x08, 0x0364, 0x00) + CH03 (__METHOD__, Z105, __LINE__, 0x00, 0x00) /* RefOf */ /* **** Oct. 2016: Method invocation as arg to RefOf is now illegal */ /* Store (RefOf(m000()), Local1) */ @@ -1002,7 +1002,7 @@ Local0 = (0x03 * LPC0) /* \M4BD.M005.LPC0 */ I000 = 0x00 Local1 = DerefOf (M000 (0x01, LPC0)) - CH03 (__METHOD__, Z105, 0x04B4, 0x00, 0x00) + CH03 (__METHOD__, Z105, __LINE__, 0x00, 0x00) CH00 (Arg0, 0x01) Local1 = DerefOf (DerefOf (M000 (0x02, LPC0))) CH06 (Arg0, (0x01 + Local0), 0x2F) @@ -1018,7 +1018,7 @@ } } - CH03 (__METHOD__, Z105, 0x0B, 0x04C8, 0x00) + CH03 (__METHOD__, Z105, __LINE__, 0x00, 0x00) /* Local Named Object */ M000 (__METHOD__) 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 7d2b648bb..5ec938ce4 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 @@ -80,7 +80,7 @@ Store (BF03 [0x00], Local1) If (Y900) { - CH03 (__METHOD__, Z106, 0x00, 0x56, 0x00) + CH03 (__METHOD__, Z106, __LINE__, 0x00, 0x00) } Else { @@ -115,7 +115,7 @@ Store (BF21 [0x00], Local1) If (Y900) { - CH03 (__METHOD__, Z106, 0x01, 0x75, 0x00) + CH03 (__METHOD__, Z106, __LINE__, 0x00, 0x00) } Else { @@ -137,7 +137,7 @@ } Local1 = DerefOf (Arg1) - CH03 (__METHOD__, Z106, 0x02, 0x89, 0x00) + CH03 (__METHOD__, Z106, __LINE__, 0x00, 0x00) Local1 = DerefOf (DerefOf (Arg1)) CH06 (Arg0, 0x07, 0x2F) Store (DerefOf (Arg1) [0x00], Local1) @@ -147,7 +147,7 @@ If (Y900) { - CH03 (__METHOD__, Z106, 0x03, 0x93, 0x00) + CH03 (__METHOD__, Z106, __LINE__, 0x00, 0x00) } Else { @@ -251,7 +251,7 @@ } } - CH03 (__METHOD__, Z106, 0x0C, 0xEE, 0x00) + CH03 (__METHOD__, Z106, __LINE__, 0x00, 0x00) /* Local Named Object */ M000 (__METHOD__) diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/concatenaterestemplate.asl b/tests/aslts/src/runtime/collections/functional/descriptor/concatenaterestemplate.asl index e750d2097..a28477f7f 100644 --- a/tests/aslts/src/runtime/collections/functional/descriptor/concatenaterestemplate.asl +++ b/tests/aslts/src/runtime/collections/functional/descriptor/concatenaterestemplate.asl @@ -2162,5 +2162,5 @@ /* Store(Local1, Index(p441, 1)) */ M332 (__METHOD__, 0x01, "p443", P441, P442, P443) M332 (__METHOD__, 0x01, "p444", P442, P441, P444) - CH03 (__METHOD__, Z007, 0x0123, 0x03EC, 0x00) + CH03 (__METHOD__, Z007, __LINE__, 0x00, 0x00) } diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/interrupt.asl b/tests/aslts/src/runtime/collections/functional/descriptor/interrupt.asl index 3f9389f86..00c9e9291 100644 --- a/tests/aslts/src/runtime/collections/functional/descriptor/interrupt.asl +++ b/tests/aslts/src/runtime/collections/functional/descriptor/interrupt.asl @@ -1736,5 +1736,5 @@ M331 (__METHOD__, 0x02, 0x1A, 0x1A, 0x62, 0x62, "_LL") M331 (__METHOD__, 0x03, 0x1B, 0x1B, 0x63, 0x63, "_SHR") M331 (__METHOD__, 0x04, 0x28, 0x28, 0x70, 0x70, "_INT") - CH03 (__METHOD__, Z017, 0x0123, 0x023E, 0x00) + CH03 (__METHOD__, Z017, __LINE__, 0x00, 0x00) } diff --git a/tests/aslts/src/runtime/collections/functional/manipulation/tointeger.asl b/tests/aslts/src/runtime/collections/functional/manipulation/tointeger.asl index 6e4991cd5..d0ac4cb1e 100644 --- a/tests/aslts/src/runtime/collections/functional/manipulation/tointeger.asl +++ b/tests/aslts/src/runtime/collections/functional/manipulation/tointeger.asl @@ -433,11 +433,11 @@ If (Y602) { - CH03 (__METHOD__, Z047, 0x00, 0x018D, 0x00) + CH03 (__METHOD__, Z047, __LINE__, 0x00, 0x00) Local0 = "0x0123456789abcdefa" ToInteger (Local0, Local2) CH04 (__METHOD__, 0x00, 0x22, Z047, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z047, 0x02, 0x0192, 0x00) + CH03 (__METHOD__, Z047, __LINE__, 0x00, 0x00) Local0 = "0x000123456789abcdefa" ToInteger (Local0, Local2) CH04 (__METHOD__, 0x00, 0x22, Z047, __LINE__, 0x00, 0x00) diff --git a/tests/aslts/src/runtime/collections/functional/name/function.asl b/tests/aslts/src/runtime/collections/functional/name/function.asl index fa059ec79..04dc664c9 100644 --- a/tests/aslts/src/runtime/collections/functional/name/function.asl +++ b/tests/aslts/src/runtime/collections/functional/name/function.asl @@ -725,5 +725,5 @@ { Debug = "TEST: NM02, Declare Function Control Method Named Object" M20E () - CH03 ("NM02", Z134, 0x74, 0x0231, 0x00) + CH03 ("NM02", Z134, __LINE__, 0x00, 0x00) } diff --git a/tests/aslts/src/runtime/collections/functional/name/method.asl b/tests/aslts/src/runtime/collections/functional/name/method.asl index e2f30e0e5..e10dd0036 100644 --- a/tests/aslts/src/runtime/collections/functional/name/method.asl +++ b/tests/aslts/src/runtime/collections/functional/name/method.asl @@ -1386,5 +1386,5 @@ { Debug = "TEST: NM01, Declare Control Method Named Object" M207 () - CH03 ("NM01", Z133, 0xD1, 0x0441, 0x00) + CH03 ("NM01", Z133, __LINE__, 0x00, 0x00) } diff --git a/tests/aslts/src/runtime/collections/functional/reference/ref07.asl b/tests/aslts/src/runtime/collections/functional/reference/ref07.asl index 8a50ee8a7..0e48458c2 100644 --- a/tests/aslts/src/runtime/collections/functional/reference/ref07.asl +++ b/tests/aslts/src/runtime/collections/functional/reference/ref07.asl @@ -218,41 +218,41 @@ If (FL00) { Store (P000 [0x00], Local5) - CH03 (__METHOD__, Z116, 0x00, 0xE2, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Local6 = (Local5 + 0x01) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x02, 0xE6, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Local6 = (DerefOf (Local5) + 0x01) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x04, 0xEA, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) M390 (Local5, V000, 0x00, __LINE__) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x06, 0xEE, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) M390 (DerefOf (Local5), V000, 0x00, __LINE__) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) Local5 = Local2 = P000 [0x00] - CH03 (__METHOD__, Z116, 0x08, 0xF4, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Local6 = (Local5 + 0x01) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x0A, 0xF8, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Local6 = (DerefOf (Local5) + 0x01) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x0C, 0xFC, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) M390 (Local5, V000, 0x00, __LINE__) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x0E, 0x0100, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) M390 (DerefOf (Local5), V000, 0x00, __LINE__) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x10, 0x0104, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Local6 = (Local2 + 0x01) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x12, 0x0108, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Local6 = (DerefOf (Local2) + 0x01) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x14, 0x010C, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) M390 (Local2, V000, 0x00, __LINE__) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x16, 0x0110, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) M390 (DerefOf (Local2), V000, 0x00, __LINE__) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) } @@ -280,41 +280,41 @@ If (FL00) { Store (P000 [0x01], Local5) - CH03 (__METHOD__, Z116, 0x18, 0x0131, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Local6 = (Local5 + 0x01) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x1A, 0x0135, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Local6 = (DerefOf (Local5) + 0x01) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x1C, 0x0139, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) M390 (Local5, V000, 0x00, __LINE__) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x1E, 0x013D, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) M390 (DerefOf (Local5), V000, 0x00, __LINE__) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) Local5 = Local2 = P000 [0x01] - CH03 (__METHOD__, Z116, 0x20, 0x0143, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Local6 = (Local5 + 0x01) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x22, 0x0147, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Local6 = (DerefOf (Local5) + 0x01) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x24, 0x014B, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) M390 (Local5, V000, 0x00, __LINE__) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x26, 0x014F, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) M390 (DerefOf (Local5), V000, 0x00, __LINE__) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x28, 0x0153, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Local6 = (Local2 + 0x01) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x2A, 0x0157, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Local6 = (DerefOf (Local2) + 0x01) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x2C, 0x015B, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) M390 (Local2, V000, 0x00, __LINE__) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x2E, 0x015F, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) M390 (DerefOf (Local2), V000, 0x00, __LINE__) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) } @@ -342,41 +342,41 @@ If (FL00) { Store (P000 [0x00], Arg5) - CH03 (__METHOD__, Z116, 0x30, 0x0180, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Arg6 = (Arg5 + 0x01) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x32, 0x0184, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Arg6 = (DerefOf (Arg5) + 0x01) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x34, 0x0188, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) M390 (Arg5, V000, 0x00, __LINE__) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x36, 0x018C, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) M390 (DerefOf (Arg5), V000, 0x00, __LINE__) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) Arg5 = Arg2 = P000 [0x00] - CH03 (__METHOD__, Z116, 0x38, 0x0192, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Arg6 = (Arg5 + 0x01) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x3A, 0x0196, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Arg6 = (DerefOf (Arg5) + 0x01) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x3C, 0x019A, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) M390 (Arg5, V000, 0x00, __LINE__) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x3E, 0x019E, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) M390 (DerefOf (Arg5), V000, 0x00, __LINE__) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x40, 0x01A2, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Arg6 = (Arg2 + 0x01) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x42, 0x01A6, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Arg6 = (DerefOf (Arg2) + 0x01) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x44, 0x01AA, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) M390 (Arg2, V000, 0x00, __LINE__) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x46, 0x01AE, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) M390 (DerefOf (Arg2), V000, 0x00, __LINE__) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) } @@ -404,41 +404,41 @@ If (FL00) { Store (P000 [0x01], Arg5) - CH03 (__METHOD__, Z116, 0x48, 0x01CF, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Arg6 = (Arg5 + 0x01) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x4A, 0x01D3, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Arg6 = (DerefOf (Arg5) + 0x01) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x4C, 0x01D7, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) M390 (Arg5, V000, 0x00, __LINE__) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x4E, 0x01DB, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) M390 (DerefOf (Arg5), V000, 0x00, __LINE__) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) Arg5 = Arg2 = P000 [0x01] - CH03 (__METHOD__, Z116, 0x50, 0x01E1, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Arg6 = (Arg5 + 0x01) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x52, 0x01E5, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Arg6 = (DerefOf (Arg5) + 0x01) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x54, 0x01E9, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) M390 (Arg5, V000, 0x00, __LINE__) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x56, 0x01ED, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) M390 (DerefOf (Arg5), V000, 0x00, __LINE__) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x58, 0x01F1, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Arg6 = (Arg2 + 0x01) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x5A, 0x01F5, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Arg6 = (DerefOf (Arg2) + 0x01) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x5C, 0x01F9, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) M390 (Arg2, V000, 0x00, __LINE__) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x5E, 0x01FD, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) M390 (DerefOf (Arg2), V000, 0x00, __LINE__) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) } @@ -471,41 +471,41 @@ { CopyObject (PPP0 [0x00], I005) /* \M1C3.I005 */ Store (P000 [0x00], I005) /* \M1C3.I005 */ - CH03 (__METHOD__, Z116, 0x60, 0x0221, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) I006 = (I005 + 0x01) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x62, 0x0225, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) I006 = (DerefOf (I005) + 0x01) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x64, 0x0229, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) M390 (I005, V000, 0x00, __LINE__) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x66, 0x022D, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) M390 (DerefOf (I005), V000, 0x00, __LINE__) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) I005 = I002 = P000 [0x00] - CH03 (__METHOD__, Z116, 0x68, 0x0233, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) I006 = (I005 + 0x01) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x6A, 0x0237, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) I006 = (DerefOf (I005) + 0x01) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x6C, 0x023B, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) M390 (I005, V000, 0x00, __LINE__) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x6E, 0x023F, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) M390 (DerefOf (I005), V000, 0x00, __LINE__) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x70, 0x0243, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) I006 = (I002 + 0x01) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x72, 0x0247, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) I006 = (DerefOf (I002) + 0x01) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x74, 0x024B, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) M390 (I002, V000, 0x00, __LINE__) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x76, 0x024F, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) M390 (DerefOf (I002), V000, 0x00, __LINE__) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) } @@ -533,41 +533,41 @@ If (FL00) { Store (P000 [0x01], I005) /* \M1C3.I005 */ - CH03 (__METHOD__, Z116, 0x78, 0x0270, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) I006 = (I005 + 0x01) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x7A, 0x0274, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) I006 = (DerefOf (I005) + 0x01) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x7C, 0x0278, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) M390 (I005, V000, 0x00, __LINE__) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x7E, 0x027C, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) M390 (DerefOf (I005), V000, 0x00, __LINE__) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) I005 = I002 = P000 [0x01] - CH03 (__METHOD__, Z116, 0x80, 0x0282, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) I006 = (I005 + 0x01) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x82, 0x0286, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) I006 = (DerefOf (I005) + 0x01) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x84, 0x028A, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) M390 (I005, V000, 0x00, __LINE__) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x86, 0x028E, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) M390 (DerefOf (I005), V000, 0x00, __LINE__) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x88, 0x0292, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) I006 = (I002 + 0x01) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x8A, 0x0296, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) I006 = (DerefOf (I002) + 0x01) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x8C, 0x029A, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) M390 (I002, V000, 0x00, __LINE__) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z116, 0x8E, 0x029E, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) M390 (DerefOf (I002), V000, 0x00, __LINE__) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) } @@ -852,42 +852,42 @@ }) Store (P000 [0x00], Local0) M1A3 (Local0, C010, Z116, __METHOD__, 0x83) - CH03 (__METHOD__, Z116, 0x90, 0x03A8, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Local1 = DerefOf (Local0) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) Store (P000 [0x01], Local0) M1A3 (Local0, C010, Z116, __METHOD__, 0x84) - CH03 (__METHOD__, Z116, 0x92, 0x03AE, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Local1 = DerefOf (Local0) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) Store (P000 [0x02], Local0) M1A3 (Local0, C010, Z116, __METHOD__, 0x85) - CH03 (__METHOD__, Z116, 0x94, 0x03B4, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Local1 = DerefOf (Local0) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) Store (P000 [0x03], Local0) M1A3 (Local0, C010, Z116, __METHOD__, 0x86) - CH03 (__METHOD__, Z116, 0x96, 0x03BA, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Local1 = DerefOf (Local0) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) Store (P000 [0x04], Local0) M1A3 (Local0, C010, Z116, __METHOD__, 0x87) - CH03 (__METHOD__, Z116, 0x98, 0x03C0, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Local1 = DerefOf (Local0) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) Store (P000 [0x05], Local0) M1A3 (Local0, C010, Z116, __METHOD__, 0x88) - CH03 (__METHOD__, Z116, 0x9A, 0x03C6, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Local1 = DerefOf (Local0) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) Store (P000 [0x06], Local0) M1A3 (Local0, C010, Z116, __METHOD__, 0x89) - CH03 (__METHOD__, Z116, 0x9C, 0x03CC, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Local1 = DerefOf (Local0) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) Store (P000 [0x07], Local0) M1A3 (Local0, C010, Z116, __METHOD__, 0x8A) - CH03 (__METHOD__, Z116, 0x9E, 0x03D2, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Local1 = DerefOf (Local0) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) M380 (__METHOD__, I000, 0x00, __LINE__) @@ -900,7 +900,7 @@ Method (M000, 1, Serialized) { Name (P000, Package (Arg0){}) - CH03 (__METHOD__, Z116, 0xA0, 0x03E2, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Store (P000 [Arg0], Local0) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) } @@ -943,7 +943,7 @@ Method (M003, 0, Serialized) { Name (P000, Package (0x02){}) - CH03 (__METHOD__, Z116, 0xA2, 0x040E, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Store (P000 [0x02], Local0) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) } @@ -951,7 +951,7 @@ Method (M004, 0, Serialized) { Name (P000, Package (0xFF){}) - CH03 (__METHOD__, Z116, 0xA4, 0x0417, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Store (P000 [0xFF], Local0) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) } @@ -996,7 +996,7 @@ /* arg3 - exception is expected */ Method (M1CC, 4, NotSerialized) { - CH03 (Arg0, Z116, 0xA6, 0x0440, 0x00) + CH03 (Arg0, Z116, __LINE__, 0x00, 0x00) Local0 = Arg1 Local7 = (Local0 + 0x01) If ((Local7 != Arg2)) @@ -1004,7 +1004,7 @@ ERR (Arg0, Z116, __LINE__, 0x00, 0x00, Local7, Arg2) } - CH03 (Arg0, Z116, 0xA7, 0x0449, 0x00) + CH03 (Arg0, Z116, __LINE__, 0x00, 0x00) } /* Check the read automatic dereference */ @@ -1014,14 +1014,14 @@ /* arg3 - exception is expected */ Method (M1CD, 4, NotSerialized) { - CH03 (Arg0, Z116, 0xA8, 0x0453, 0x00) + CH03 (Arg0, Z116, __LINE__, 0x00, 0x00) Local7 = (Arg1 + 0x01) If ((Local7 != Arg2)) { ERR (Arg0, Z116, __LINE__, 0x00, 0x00, Local7, Arg2) } - CH03 (Arg0, Z116, 0xA9, 0x045B, 0x00) + CH03 (Arg0, Z116, __LINE__, 0x00, 0x00) } /* Check the read automatic dereference */ @@ -1086,7 +1086,7 @@ 0x77 }) Local1 = Local0 = P000 [0x00] - CH03 (__METHOD__, Z116, 0xAC, 0x04A6, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Local7 = (Local0 + 0x01) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) Local7 = (Local1 + 0x01) @@ -1100,7 +1100,7 @@ 0x77 }) CopyObject (Local0 = P000 [0x00], Local1) - CH03 (__METHOD__, Z116, 0xAF, 0x04B9, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Local7 = (Local0 + 0x01) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) Local7 = (Local1 + 0x01) @@ -1116,7 +1116,7 @@ 0x77 }) Arg1 = Arg0 = P000 [0x00] - CH03 (__METHOD__, Z116, 0xB2, 0x04CE, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Local7 = (Arg0 + 0x01) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) Local7 = (Arg1 + 0x01) @@ -1130,7 +1130,7 @@ 0x77 }) CopyObject (Arg0 = P000 [0x00], Arg1) - CH03 (__METHOD__, Z116, 0xB5, 0x04E1, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Local7 = (Arg0 + 0x01) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) /* Type of Arg1 should be IRef here, */ @@ -1153,13 +1153,13 @@ Name (HG00, 0x00) /* if non-zero - the test hangs */ Name (HG01, 0x00) /* if non-zero - the test hangs */ Name (HG02, 0x00) /* if non-zero - the test hangs */ - CH03 (__METHOD__, Z116, 0xB8, 0x04FD, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) CopyObject (Local0 = P000 [0x01], I001) /* \M1D5.I001 */ - CH03 (__METHOD__, Z116, 0xB9, 0x0501, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) /* Type of i001 should be already IRef here, */ /* so, don't expect exception. */ I001 = Local0 = P000 [0x00] - CH03 (__METHOD__, Z116, 0xBA, 0x0508, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Local7 = (Local0 + 0x01) If (Y248) { @@ -1223,9 +1223,9 @@ { 0x77 }) - CH03 (__METHOD__, Z116, 0xBD, 0x0548, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) CopyObject (Local0 = P000 [0x00], I001) /* \M1D6.I001 */ - CH03 (__METHOD__, Z116, 0xBE, 0x054C, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Local7 = (I001 + 0x01) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) } @@ -1238,7 +1238,7 @@ { 0x77 }) - CH03 (__METHOD__, Z116, 0xC1, 0x055B, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Store (P000 [0x01], Local0) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) Local1 = Local0 = P000 [0x01] @@ -1251,7 +1251,7 @@ { 0x77 }) - CH03 (__METHOD__, Z116, 0xC4, 0x056C, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) CopyObject (P000 [0x01], Local0) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) CopyObject (Local0 = P000 [0x01], Local1) @@ -1266,14 +1266,14 @@ 0x77, 0x88 }) - CH03 (__METHOD__, Z116, 0xC7, 0x057F, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) CopyObject (P000 [0x01], I001) /* \M1DB.I001 */ - CH03 (__METHOD__, Z116, 0xC8, 0x0583, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) /* Type of i001 should be already IRef here, */ /* so, don't expect exception. Writing to i001 */ /* is here identical to Store into it. */ I001 = P000 [0x00] - CH03 (__METHOD__, Z116, 0xC9, 0x058B, 0x00) + CH03 (__METHOD__, Z116, __LINE__, 0x00, 0x00) Local7 = (I001 + 0x01) CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) } diff --git a/tests/aslts/src/runtime/collections/functional/reference/ref50.asl b/tests/aslts/src/runtime/collections/functional/reference/ref50.asl index 6a318f6e7..fa949d93b 100644 --- a/tests/aslts/src/runtime/collections/functional/reference/ref50.asl +++ b/tests/aslts/src/runtime/collections/functional/reference/ref50.asl @@ -1702,7 +1702,7 @@ { /* This is a reference */ - CH03 (__METHOD__, 0x00, 0x00, 0x06F1, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local7 = (Local0 + 0x01) CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) } @@ -1763,7 +1763,7 @@ { /* This is a reference */ - CH03 (__METHOD__, 0x00, 0x02, 0x0729, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local7 = (Local0 + 0x01) CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) } @@ -1860,7 +1860,7 @@ { /* This is a reference */ - CH03 (__METHOD__, 0x00, 0x04, 0x0784, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local7 = (Arg0 + 0x01) CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) } @@ -1921,7 +1921,7 @@ { /* This is a reference */ - CH03 (__METHOD__, 0x00, 0x06, 0x07BC, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local7 = (Arg0 + 0x01) CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) } @@ -2012,7 +2012,7 @@ { /* This is a reference */ - CH03 (__METHOD__, 0x00, 0x08, 0x0810, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local7 = (III0 + 0x01) CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) } @@ -2074,7 +2074,7 @@ { /* This is a reference */ - CH03 (__METHOD__, 0x00, 0x0A, 0x084A, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) Local7 = (III0 + 0x01) CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) } @@ -2754,9 +2754,9 @@ */ Method (M26D, 0, NotSerialized) { - CH03 ("m26d", 0x00, 0x00, 0x0BB5, 0x00) + CH03 ("m26d", 0x00, __LINE__, 0x00, 0x00) M1AE ("m26d", "Buffer total", "Not implemented yet") - CH03 ("m26d", 0x00, 0x01, 0x0BB7, 0x00) + CH03 ("m26d", 0x00, __LINE__, 0x00, 0x00) } /* @@ -2773,14 +2773,14 @@ Debug = __METHOD__ /* \M26E.TS__ */ } - CH03 (__METHOD__, 0x00, 0x00, 0x0BC7, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) /* Store */ M365 () /* CopyObject */ M366 () - CH03 (__METHOD__, 0x00, 0x01, 0x0BCF, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } Method (M365, 0, Serialized) @@ -3127,9 +3127,9 @@ */ Method (M26F, 0, NotSerialized) { - CH03 ("m26f", 0x00, 0x00, 0x0D1E, 0x00) + CH03 ("m26f", 0x00, __LINE__, 0x00, 0x00) M1AE ("m26f", "All the legal ways of writing IRef reference to some target location", "Not implemented yet") - CH03 ("m26f", 0x00, 0x01, 0x0D23, 0x00) + CH03 ("m26f", 0x00, __LINE__, 0x00, 0x00) } /* @@ -3137,7 +3137,7 @@ */ Method (M270, 0, Serialized) { - CH03 (__METHOD__, 0x00, 0x00, 0x0D2D, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) If (Y100) { TS00 (__METHOD__) @@ -3147,17 +3147,17 @@ Debug = __METHOD__ /* \M270.TS__ */ } - CH03 (__METHOD__, 0x00, 0x01, 0x0D35, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) /* Store */ M367 () - CH03 (__METHOD__, 0x00, 0x02, 0x0D3A, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) /* CopyObject */ M368 () - CH03 (__METHOD__, 0x00, 0x03, 0x0D3F, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) M1AE ("m270", "All the legal sources of references (ORef and IRef)", "Started, but not implemented yet") - CH03 (__METHOD__, 0x00, 0x04, 0x0D44, 0x00) + CH03 (__METHOD__, 0x00, __LINE__, 0x00, 0x00) } Method (M367, 0, Serialized) diff --git a/tests/aslts/src/runtime/collections/functional/reference/ref70.asl b/tests/aslts/src/runtime/collections/functional/reference/ref70.asl index fe121f024..6c3bd3fb9 100644 --- a/tests/aslts/src/runtime/collections/functional/reference/ref70.asl +++ b/tests/aslts/src/runtime/collections/functional/reference/ref70.asl @@ -53,7 +53,7 @@ } } - CH03 (__METHOD__, Z081, 0x0200, 0x3A, Arg6) + CH03 (__METHOD__, Z081, __LINE__, 0x00, Arg6) /* // FILE BUG: hangs without printing error Store(CH03(ts, z081, 0x200, __LINE__, arg6), Local0) @@ -98,7 +98,7 @@ */ Method (M167, 1, Serialized) { - CH03 ("m167", Z081, 0x0206, 0x66, 0x38) + CH03 ("m167", Z081, __LINE__, 0x00, 0x38) Switch (ToInteger (Arg0)) { Case (0x00) @@ -132,7 +132,7 @@ Method (M001, 1, NotSerialized) { - CH03 (__METHOD__, Z081, 0x0202, 0x83, 0x36) + CH03 (__METHOD__, Z081, __LINE__, 0x00, 0x36) If (Arg0) { Local7 = 0x00 @@ -145,7 +145,7 @@ Method (M002, 1, NotSerialized) { - CH03 (__METHOD__, Z081, 0x0204, 0x8D, 0x37) + CH03 (__METHOD__, Z081, __LINE__, 0x00, 0x37) If (0x00) { Local7 = 0x00 @@ -162,7 +162,7 @@ Method (M004, 1, NotSerialized) { - CH03 (__METHOD__, Z081, 0x0208, 0x99, 0x3A) + CH03 (__METHOD__, Z081, __LINE__, 0x00, 0x3A) While (Arg0) { Local7 = 0x00 @@ -228,36 +228,36 @@ { /* CondRefOf */ - CH03 (__METHOD__, Z081, 0x020A, 0xC8, 0x00) + CH03 (__METHOD__, Z081, __LINE__, 0x00, 0x00) M480 (Arg0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05) - CH03 (__METHOD__, Z081, 0x020B, 0xCA, 0x00) + CH03 (__METHOD__, Z081, __LINE__, 0x00, 0x00) } If (RN01) { /* DerefOf */ - CH03 (__METHOD__, Z081, 0x020C, 0xD0, 0x00) + CH03 (__METHOD__, Z081, __LINE__, 0x00, 0x00) M480 (Arg0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08) - CH03 (__METHOD__, Z081, 0x020D, 0xD2, 0x00) + CH03 (__METHOD__, Z081, __LINE__, 0x00, 0x00) } If (RN02) { /* ObjectType */ - CH03 (__METHOD__, Z081, 0x020E, 0xD8, 0x00) + CH03 (__METHOD__, Z081, __LINE__, 0x00, 0x00) M480 (Arg0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20) - CH03 (__METHOD__, Z081, 0x020F, 0xDA, 0x00) + CH03 (__METHOD__, Z081, __LINE__, 0x00, 0x00) } If (RN03) { /* RefOf */ - CH03 (__METHOD__, Z081, 0x0210, 0xE0, 0x00) + CH03 (__METHOD__, Z081, __LINE__, 0x00, 0x00) M480 (Arg0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x22) - CH03 (__METHOD__, Z081, 0x0211, 0xE2, 0x00) + CH03 (__METHOD__, Z081, __LINE__, 0x00, 0x00) } If (RN04) @@ -319,9 +319,9 @@ If (Local0) { - CH03 (__METHOD__, Z081, 0x0212, 0x010A, 0x00) + CH03 (__METHOD__, Z081, __LINE__, 0x00, 0x00) M480 (Arg0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x29) - CH03 (__METHOD__, Z081, 0x0213, 0x010C, 0x00) + CH03 (__METHOD__, Z081, __LINE__, 0x00, 0x00) } Else { @@ -335,18 +335,18 @@ { /* CopyObject */ - CH03 (__METHOD__, Z081, 0x0214, 0x0117, 0x00) + CH03 (__METHOD__, Z081, __LINE__, 0x00, 0x00) CopyObject (Arg0, Local7) - CH03 (__METHOD__, Z081, 0x0215, 0x0119, 0x00) + CH03 (__METHOD__, Z081, __LINE__, 0x00, 0x00) } If (RN06) { /* Return */ - CH03 (__METHOD__, Z081, 0x0216, 0x0120, 0x00) + CH03 (__METHOD__, Z081, __LINE__, 0x00, 0x00) M000 (Arg0) - CH03 (__METHOD__, Z081, 0x0217, 0x0122, 0x00) + CH03 (__METHOD__, Z081, __LINE__, 0x00, 0x00) } If (RN07) @@ -513,9 +513,9 @@ M1A7 (Arg0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2B) /* Store */ - CH03 (__METHOD__, Z081, 0x0218, 0x01ED, 0x00) + CH03 (__METHOD__, Z081, __LINE__, 0x00, 0x00) Local7 = Arg0 - CH03 (__METHOD__, Z081, 0x0219, 0x01EF, 0x00) + CH03 (__METHOD__, Z081, __LINE__, 0x00, 0x00) /* Subtract */ M1A7 (Arg0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x2D) @@ -806,7 +806,7 @@ Name (I000, 0xABCD0000) Method (M000, 1, NotSerialized) { - CH03 (__METHOD__, Z081, 0x48, 0x0334, 0x00) + CH03 (__METHOD__, Z081, __LINE__, 0x00, 0x00) Debug = DerefOf (RefOf (DerefOf (RefOf (Arg0)))) CH04 (C080, 0x00, 0xFF, Z081, __LINE__, 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 180eb0105..bb6dbcb23 100644 --- a/tests/aslts/src/runtime/collections/functional/reference/ref71.asl +++ b/tests/aslts/src/runtime/collections/functional/reference/ref71.asl @@ -44,7 +44,7 @@ Local7 = 0x00 } - CH03 (__METHOD__, Z109, 0x00, 0x33, 0x00) + CH03 (__METHOD__, Z109, __LINE__, 0x00, 0x00) Local0 = Local7 If (!SLCK) { @@ -116,7 +116,7 @@ */ If (X114) { - CH03 (__METHOD__, Z109, 0x0B, 0x75, 0x00) + CH03 (__METHOD__, Z109, __LINE__, 0x00, 0x00) Local0 = M901 () /*CH04(ts, 0, 0xff, z109, __LINE__, 0, 0) */ } diff --git a/tests/aslts/src/runtime/collections/functional/region/dtregions.asl b/tests/aslts/src/runtime/collections/functional/region/dtregions.asl index 35cf2ca91..fea7dfa66 100644 --- a/tests/aslts/src/runtime/collections/functional/region/dtregions.asl +++ b/tests/aslts/src/runtime/collections/functional/region/dtregions.asl @@ -243,7 +243,7 @@ Local0 = RefOf (FU01) Local1 = RefOf (Local0) Local2 = DerefOf (Local0) - CH03 (Arg0, Z142, 0x10, 0xE0, 0x00) + CH03 (Arg0, Z142, __LINE__, 0x00, 0x00) Local3 = \DTR0.SSDT If ((Local2 != Local3)) { diff --git a/tests/aslts/src/runtime/collections/functional/region/opregions.asl b/tests/aslts/src/runtime/collections/functional/region/opregions.asl index 68d090082..923647a37 100644 --- a/tests/aslts/src/runtime/collections/functional/region/opregions.asl +++ b/tests/aslts/src/runtime/collections/functional/region/opregions.asl @@ -753,7 +753,7 @@ Package (NRSK) Else { DerefOf (Local5) = B000 /* \M70C.B000 */ - CH03 (Arg0, Z141, 0x18, 0x024F, Local3) + CH03 (Arg0, Z141, __LINE__, 0x00, Local3) Local0 = ObjectType (DerefOf (Local6)) Local1 = C00B /* \C00B */ If ((Local0 != Local1)) diff --git a/tests/aslts/src/runtime/collections/functional/synchronization/mutex.asl b/tests/aslts/src/runtime/collections/functional/synchronization/mutex.asl index b086c36dd..86f1f6357 100644 --- a/tests/aslts/src/runtime/collections/functional/synchronization/mutex.asl +++ b/tests/aslts/src/runtime/collections/functional/synchronization/mutex.asl @@ -1431,7 +1431,7 @@ Arg1-- } - CH03 ("MUX0", Z150, 0x00, 0x02CD, 0x00) + CH03 ("MUX0", Z150, __LINE__, 0x00, 0x00) } Method (M033, 0, Serialized) diff --git a/tests/aslts/src/runtime/collections/functional/synchronization/mutex2.asl b/tests/aslts/src/runtime/collections/functional/synchronization/mutex2.asl index 2f65e5658..26fbf8714 100644 --- a/tests/aslts/src/runtime/collections/functional/synchronization/mutex2.asl +++ b/tests/aslts/src/runtime/collections/functional/synchronization/mutex2.asl @@ -67,7 +67,7 @@ Mutex (MTD0, 0x0D) Mutex (MTE0, 0x0E) Mutex (MTF0, 0x0F) - CH03 (__METHOD__, Z150, 0x00, 0x4F, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Local0 = Acquire (MT00, 0xFFFF) If (Local0) { @@ -224,7 +224,7 @@ } } - CH03 (__METHOD__, Z150, 0x11, 0xB8, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) } /* @@ -239,7 +239,7 @@ */ Method (M369, 1, Serialized) { - CH03 (__METHOD__, Z150, 0x22, 0xC9, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Mutex (MT00, 0x00) Mutex (MT10, 0x01) Mutex (MT20, 0x02) @@ -601,7 +601,7 @@ } Else { - CH03 (__METHOD__, Z150, 0x0123, 0x01C4, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) } } @@ -797,9 +797,9 @@ Release (MT00) } - CH03 (__METHOD__, Z150, 0x12, 0x0257, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) M000 () - CH03 (__METHOD__, Z150, 0x13, 0x0259, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) } /* @@ -990,11 +990,11 @@ Release (MT00) } - CH03 (__METHOD__, Z150, 0x12, 0x02E9, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) M000 () - CH03 (__METHOD__, Z150, 0x13, 0x02EB, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) M001 () - CH03 (__METHOD__, Z150, 0x14, 0x02ED, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) } /* @@ -1020,9 +1020,9 @@ { /* Acquire the first mutex */ - CH03 (__METHOD__, Z150, 0x00, 0x0309, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) M36F (Arg0, 0x00, 0x00, 0x00) /* Acquire N-level mutex */ - CH03 (__METHOD__, Z150, 0x01, 0x030B, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) /* * Attempt to Acquire the second mutex (exception is expected). * @@ -1048,7 +1048,7 @@ CH04 (__METHOD__, 0x00, 0x40, Z150, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_ORDER */ M388 (Arg0, 0x00, 0x00) /* Release */ - CH03 (__METHOD__, Z150, 0x03, 0x0322, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) } /* @@ -1104,18 +1104,18 @@ Method (M000, 1, NotSerialized) { - CH03 (__METHOD__, Z150, 0x00, 0x0358, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) M36F (Arg0, 0x00, 0x00, 0x00) /* Acquire */ M388 (Arg0, 0x00, 0x00) /* Release */ - CH03 (__METHOD__, Z150, 0x01, 0x035B, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) /* Attempt to Release free mutex */ M388 (Arg0, 0x00, 0x00) /* Release */ CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ - CH03 (__METHOD__, Z150, 0x03, 0x0361, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) M36F (Arg0, 0x00, 0x00, 0x00) /* Acquire */ M388 (Arg0, 0x00, 0x00) /* Release */ - CH03 (__METHOD__, Z150, 0x04, 0x0364, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) } LPN0 = MAX0 /* \MAX0 */ @@ -1129,18 +1129,18 @@ /* Separately for GL */ - CH03 (__METHOD__, Z150, 0x05, 0x0371, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) M36F (GLLL, GLIX, 0x00, 0x00) /* Acquire */ M388 (GLLL, GLIX, 0x00) /* Release */ - CH03 (__METHOD__, Z150, 0x06, 0x0374, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) /* Attempt to Release free mutex */ M388 (GLLL, GLIX, 0x00) /* Release */ CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ - CH03 (__METHOD__, Z150, 0x08, 0x037A, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) M36F (GLLL, GLIX, 0x00, 0x00) /* Acquire */ M388 (GLLL, GLIX, 0x00) /* Release */ - CH03 (__METHOD__, Z150, 0x09, 0x037D, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) } /* @@ -1167,105 +1167,105 @@ Mutex (TF00, 0x0F) /* First time */ - CH03 (__METHOD__, Z150, 0x00, 0x039B, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (T000) CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ - CH03 (__METHOD__, Z150, 0x02, 0x039F, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (\_GL) CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z150, 0x04, 0x03A3, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (T100) CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z150, 0x06, 0x03A7, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (T200) CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z150, 0x08, 0x03AB, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (T300) CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z150, 0x0A, 0x03AF, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (T400) CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z150, 0x0C, 0x03B3, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (T500) CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z150, 0x0E, 0x03B7, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (T600) CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z150, 0x10, 0x03BB, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (T700) CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z150, 0x12, 0x03BF, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (T800) CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z150, 0x14, 0x03C3, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (T900) CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z150, 0x16, 0x03C7, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (TA00) CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z150, 0x18, 0x03CB, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (TB00) CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z150, 0x1A, 0x03CF, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (TC00) CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z150, 0x1C, 0x03D3, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (TD00) CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z150, 0x1E, 0x03D7, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (TE00) CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z150, 0x20, 0x03DB, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (TF00) CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) /* Second time */ - CH03 (__METHOD__, Z150, 0x22, 0x03E2, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (T000) CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ - CH03 (__METHOD__, Z150, 0x24, 0x03E6, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (T100) CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z150, 0x26, 0x03EA, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (T200) CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z150, 0x28, 0x03EE, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (T300) CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z150, 0x2A, 0x03F2, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (T400) CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z150, 0x2C, 0x03F6, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (T500) CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z150, 0x2E, 0x03FA, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (T600) CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z150, 0x30, 0x03FE, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (T700) CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z150, 0x32, 0x0402, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (T800) CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z150, 0x34, 0x0406, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (T900) CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z150, 0x36, 0x040A, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (TA00) CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z150, 0x38, 0x040E, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (TB00) CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z150, 0x3A, 0x0412, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (TC00) CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z150, 0x3C, 0x0416, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (TD00) CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z150, 0x3E, 0x041A, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (TE00) CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) - CH03 (__METHOD__, Z150, 0x40, 0x041E, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (TF00) CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) } @@ -1339,7 +1339,7 @@ LPC0++ } - CH03 ("m38a", Z150, 0x00, 0x046B, 0x00) + CH03 ("m38a", Z150, __LINE__, 0x00, 0x00) } /* @@ -1485,7 +1485,7 @@ /* Release */ - CH03 (__METHOD__, Z150, 0x00, 0x04FA, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) LPN0 = MAX0 /* \MAX0 */ LPC0 = (MAX0 - 0x01) While (LPN0) @@ -1511,7 +1511,7 @@ LPC0 = (MAX0 - 0x01) While (LPN0) { - CH03 (__METHOD__, Z150, 0x01, 0x0510, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) M388 (LPC0, IX00, 0x00) CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ LPN0-- @@ -1549,7 +1549,7 @@ Return (Zero) } - CH03 (__METHOD__, Z150, 0x00, 0x0537, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) } /* @@ -1558,7 +1558,7 @@ */ Method (M0BB, 0, Serialized) { - CH03 (__METHOD__, Z150, 0x00, 0x0543, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Method (M137, 0, NotSerialized) { Debug = "m137 started" @@ -1626,7 +1626,7 @@ ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, I103) } - CH03 (__METHOD__, Z150, 0x04, 0x057D, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) } /* @@ -1643,7 +1643,7 @@ Method (M000, 0, NotSerialized) { - CH03 (__METHOD__, Z150, 0x00, 0x058F, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) /* Acquire all */ Local0 = Acquire (\_GL, 0xFFFF) @@ -1748,7 +1748,7 @@ ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } - CH03 (__METHOD__, Z150, 0x00, 0x05E8, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) /* Release all */ Release (TF00) @@ -1768,7 +1768,7 @@ Release (T100) Release (T000) Release (\_GL) - CH03 (__METHOD__, Z150, 0x00, 0x05FE, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) } /* Acquire and Release operations are in different methods */ @@ -1777,7 +1777,7 @@ { Method (MM00, 0, NotSerialized) { - CH03 (__METHOD__, Z150, 0x00, 0x0606, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Local0 = Acquire (\_GL, 0xFFFF) If (Local0) { @@ -1880,12 +1880,12 @@ ERR (__METHOD__, Z150, __LINE__, 0x00, 0x00, 0x00, Local0) } - CH03 (__METHOD__, Z150, 0x00, 0x065D, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) } Method (MM01, 0, NotSerialized) { - CH03 (__METHOD__, Z150, 0x00, 0x0662, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (TF00) Release (TE00) Release (TD00) @@ -1903,60 +1903,60 @@ Release (T100) Release (T000) Release (\_GL) - CH03 (__METHOD__, Z150, 0x00, 0x0676, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) } Method (MM02, 0, NotSerialized) { - CH03 (__METHOD__, Z150, 0x00, 0x067B, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (TF00) CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ - CH03 (__METHOD__, Z150, 0x02, 0x067E, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (TE00) CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ - CH03 (__METHOD__, Z150, 0x04, 0x0681, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (TD00) CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ - CH03 (__METHOD__, Z150, 0x06, 0x0684, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (TC00) CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ - CH03 (__METHOD__, Z150, 0x08, 0x0687, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (TB00) CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ - CH03 (__METHOD__, Z150, 0x0A, 0x068A, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (TA00) CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ - CH03 (__METHOD__, Z150, 0x0C, 0x068D, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (T900) CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ - CH03 (__METHOD__, Z150, 0x0E, 0x0690, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (T800) CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ - CH03 (__METHOD__, Z150, 0x10, 0x0693, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (T700) CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ - CH03 (__METHOD__, Z150, 0x12, 0x0696, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (T600) CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ - CH03 (__METHOD__, Z150, 0x14, 0x0699, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (T500) CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ - CH03 (__METHOD__, Z150, 0x16, 0x069C, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (T400) CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ - CH03 (__METHOD__, Z150, 0x18, 0x069F, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (T300) CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ - CH03 (__METHOD__, Z150, 0x1A, 0x06A2, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (T200) CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ - CH03 (__METHOD__, Z150, 0x1C, 0x06A5, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (T100) CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ - CH03 (__METHOD__, Z150, 0x1E, 0x06A8, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (T000) CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ - CH03 (__METHOD__, Z150, 0x20, 0x06AB, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) Release (\_GL) CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ } @@ -1979,7 +1979,7 @@ */ Method (M0BA, 0, Serialized) { - CH03 (__METHOD__, Z150, 0x00, 0x06C3, 0x00) + CH03 (__METHOD__, Z150, __LINE__, 0x00, 0x00) /* Add */ Local0 = (Acquire (\_GL, 0xFFFF) + 0x01) @@ -2496,5 +2496,5 @@ M08A () } - CH03 ("m300", Z150, 0x00, 0x08CA, 0x00) + CH03 ("m300", Z150, __LINE__, 0x00, 0x00) } 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 4eb5a3633..9d7c70ad1 100644 --- a/tests/aslts/src/runtime/collections/functional/synchronization/mutex_proc.asl +++ b/tests/aslts/src/runtime/collections/functional/synchronization/mutex_proc.asl @@ -617,7 +617,7 @@ Zero) { If (Arg3) { - CH03 ("m38b", Z151, 0x00, 0x01C3, 0x00) + CH03 ("m38b", Z151, __LINE__, 0x00, 0x00) } M36F (GLLL, GLIX, Arg3, 0x00) /* Acquire GL */ @@ -633,7 +633,7 @@ Zero) { If (Arg3) { - CH03 ("m38b", Z151, 0x00, 0x01D0, 0x00) + CH03 ("m38b", Z151, __LINE__, 0x00, 0x00) } M36F (LPC0, 0x00, Arg3, 0x00) /* Acquire */ @@ -667,7 +667,7 @@ Zero) { If (Arg3) { - Local7 = (CH03 ("m38b", Z151, 0x00, 0x01F1, 0x00) || Local7) + Local7 = (CH03 ("m38b", Z151, __LINE__, 0x00, 0x00) || Local7) } M388 (LPC0, 0x00, 0x00) /* Release */ @@ -684,7 +684,7 @@ Zero) { If (Arg3) { - Local7 = (CH03 ("m38b", Z151, 0x00, 0x01FE, 0x00) || Local7) + Local7 = (CH03 ("m38b", Z151, __LINE__, 0x00, 0x00) || Local7) } M388 (GLLL, GLIX, 0x00) /* Release GL */ @@ -748,7 +748,7 @@ Zero) { If (EXC1) { - CH03 ("m088", Z151, 0x00, 0x0236, 0x00) + CH03 ("m088", Z151, __LINE__, 0x00, 0x00) } M36F (LPC0, LPC1, EXC0, Arg6) /* Acquire */ @@ -875,7 +875,7 @@ Zero) { If (EXC1) { - CH03 ("m088", Z151, 0x00, 0x02AD, 0x00) + CH03 ("m088", Z151, __LINE__, 0x00, 0x00) } M388 (LPC0, Local0, EXC0) /* Release */ @@ -919,7 +919,7 @@ Zero) { If (EXC1) { - CH03 ("m088", Z151, 0x00, 0x02D1, 0x00) + CH03 ("m088", Z151, __LINE__, 0x00, 0x00) } M388 (LPC0, Local0, EXC0) /* Release */ diff --git a/tests/aslts/src/runtime/collections/functional/synchronization/serialized.asl b/tests/aslts/src/runtime/collections/functional/synchronization/serialized.asl index b70643632..902a137d4 100644 --- a/tests/aslts/src/runtime/collections/functional/synchronization/serialized.asl +++ b/tests/aslts/src/runtime/collections/functional/synchronization/serialized.asl @@ -141,9 +141,9 @@ } } - CH03 (__METHOD__, Z173, 0x01, 0x43, 0x00) + CH03 (__METHOD__, Z173, __LINE__, 0x00, 0x00) M000 () - CH03 (__METHOD__, Z173, 0x02, 0x45, 0x00) + CH03 (__METHOD__, Z173, __LINE__, 0x00, 0x00) } /* @@ -259,9 +259,9 @@ } } - CH03 (__METHOD__, Z173, 0x04, 0x69, 0x00) + CH03 (__METHOD__, Z173, __LINE__, 0x00, 0x00) M000 () - CH03 (__METHOD__, Z173, 0x05, 0x6B, 0x00) + CH03 (__METHOD__, Z173, __LINE__, 0x00, 0x00) } /* @@ -446,14 +446,14 @@ I001 = 0xABCD0000 } - CH03 (__METHOD__, Z173, 0x07, 0xAB, 0x00) + CH03 (__METHOD__, Z173, __LINE__, 0x00, 0x00) M000 () If ((I001 != 0xABCD0000)) { ERR (__METHOD__, Z173, __LINE__, 0x00, 0x00, I001, 0xABCD0000) } - CH03 (__METHOD__, Z173, 0x09, 0xB1, 0x00) + CH03 (__METHOD__, Z173, __LINE__, 0x00, 0x00) } /* @@ -798,7 +798,7 @@ } } - CH03 (__METHOD__, Z173, 0x0A, 0x012B, 0x00) + CH03 (__METHOD__, Z173, __LINE__, 0x00, 0x00) I000 = Arg0 I001 = Arg1 I005 = Arg2 @@ -820,7 +820,7 @@ } } - CH03 (__METHOD__, Z173, 0x0E, 0x013E, 0x00) + CH03 (__METHOD__, Z173, __LINE__, 0x00, 0x00) } Method (M3B4, 0, Serialized) @@ -1168,7 +1168,7 @@ } } - CH03 (__METHOD__, Z173, 0x0F, 0x01B0, 0x00) + CH03 (__METHOD__, Z173, __LINE__, 0x00, 0x00) I000 = Arg0 I001 = Arg1 MM00 (0x00, I000, I001) @@ -1189,7 +1189,7 @@ } } - CH03 (__METHOD__, Z173, 0x13, 0x01C2, 0x00) + CH03 (__METHOD__, Z173, __LINE__, 0x00, 0x00) } Method (M3B6, 0, Serialized) @@ -1577,7 +1577,7 @@ } } - CH03 (__METHOD__, Z173, 0x14, 0x025C, 0x00) + CH03 (__METHOD__, Z173, __LINE__, 0x00, 0x00) I000 = Arg0 I001 = Arg1 I005 = Arg2 @@ -1599,7 +1599,7 @@ } } - CH03 (__METHOD__, Z173, 0x18, 0x026F, 0x00) + CH03 (__METHOD__, Z173, __LINE__, 0x00, 0x00) } Method (M3B8, 0, Serialized) @@ -2594,7 +2594,7 @@ } } - CH03 (__METHOD__, Z173, 0x0A, 0x04BE, 0x00) + CH03 (__METHOD__, Z173, __LINE__, 0x00, 0x00) I000 = Arg0 I001 = Arg1 I005 = Arg2 @@ -2643,7 +2643,7 @@ } } - CH03 (__METHOD__, Z173, 0x0E, 0x04E1, 0x00) + CH03 (__METHOD__, Z173, __LINE__, 0x00, 0x00) } Method (M3BC, 0, Serialized) diff --git a/tests/aslts/src/runtime/collections/functional/table/load.asl b/tests/aslts/src/runtime/collections/functional/table/load.asl index 24328326e..6d335dc12 100644 --- a/tests/aslts/src/runtime/collections/functional/table/load.asl +++ b/tests/aslts/src/runtime/collections/functional/table/load.asl @@ -327,7 +327,7 @@ Local0 = RFU0 /* \DTM0.RFU0 */ Store ((SUM + CHSM (Local0, SizeOf (Local0))), SUM) /* \DTM0.SUM_ */ - If (CH03 (Arg0, Z174, 0x01, 0x0146, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (Zero) } @@ -361,7 +361,7 @@ } - If (CH03 (Arg0, Z174, 0x03, 0x0157, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (Zero) } @@ -415,7 +415,7 @@ Else { Local0 = \SSS0 () - If (CH03 (Arg0, Z174, 0x07, 0x0174, 0x01)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x01)) { Return (Zero) } @@ -449,7 +449,7 @@ } - If (CH03 (Arg0, Z174, 0x09, 0x0184, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (Zero) } @@ -482,7 +482,7 @@ Local0 = RFU0 /* \DTM0.RFU0 */ Store ((SUM + CHSM (Local0, SizeOf (Local0))), SUM) /* \DTM0.SUM_ */ - If (CH03 (Arg0, Z174, 0x0C, 0x01A5, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -490,7 +490,7 @@ /* Load operator execution */ Load (RFU0, Arg1) - If (CH03 (Arg0, Z174, 0x0D, 0x01AC, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -532,7 +532,7 @@ Else { Local0 = \SSS0 () - If (CH03 (Arg0, Z174, 0x11, 0x01CD, 0x01)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x01)) { Return (Zero) } @@ -544,7 +544,7 @@ } Unload (Arg1) - If (CH03 (Arg0, Z174, 0x13, 0x01D7, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (Zero) } @@ -704,7 +704,7 @@ Local0 = RFU0 /* \DTM0.M003.M000.RFU0 */ Store ((SUM + CHSM (Local0, SizeOf (Local0))), SUM) /* \DTM0.M003.M000.SUM_ */ - If (CH03 (Arg0, Z174, 0x16, 0x026F, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (Zero) } @@ -738,7 +738,7 @@ } - If (CH03 (Arg0, Z174, 0x18, 0x0280, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (Zero) } @@ -792,7 +792,7 @@ Else { Local0 = \SSS0 () - If (CH03 (Arg0, Z174, 0x1C, 0x029D, 0x01)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x01)) { Return (Zero) } @@ -826,7 +826,7 @@ } - If (CH03 (Arg0, Z174, 0x1E, 0x02AD, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (Zero) } @@ -882,7 +882,7 @@ Local0 = RFU0 /* \DTM0.M003.M001.RFU0 */ Store ((SUM + CHSM (Local0, SizeOf (Local0))), SUM) /* \DTM0.M003.M001.SUM_ */ - If (CH03 (Arg0, Z174, 0x21, 0x02E5, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -890,7 +890,7 @@ /* Load operator execution */ Load (RFU0, Arg1) - If (CH03 (Arg0, Z174, 0x22, 0x02EC, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -1176,13 +1176,13 @@ Local2 = Buffer (0x0A) Return (Zero) } - If (CH03 (Arg0, 0x00, 0x31, 0x03F4, 0x00)) + If (CH03 (Arg0, 0x00, __LINE__, 0x00, 0x00)) { Return (Zero) } Load (RFU2, DDBH) /* \DTM0.TST9.DDBH */ - If (CH03 (Arg0, 0x00, 0x32, 0x03FA, 0x00)) + If (CH03 (Arg0, 0x00, __LINE__, 0x00, 0x00)) { Return (Zero) } @@ -1259,7 +1259,7 @@ Local2 = Buffer (0x0A) } Concatenate (Arg0, "-LDCH", Arg0) - If (CH03 (Arg0, Z174, 0x40, 0x043D, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -1301,13 +1301,13 @@ Local2 = Buffer (0x0A) CopyObject (DerefOf (Local5), MAUX) /* \DTM0.LDCH.MAUX */ If ((Local1 < HI0N)) { - If (CH03 (Arg0, Z174, 0x41, 0x045E, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x02) } Local2 = MAUX () - If (CH03 (Arg0, Z174, 0x42, 0x0462, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x03) } @@ -1342,7 +1342,7 @@ Local2 = Buffer (0x0A) Return (0x01) } - If (CH03 (Arg0, Z174, 0x46, 0x047E, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -1356,7 +1356,7 @@ Local2 = Buffer (0x0A) Return (0x01) } - If (CH03 (Arg0, Z174, 0x48, 0x0488, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -1378,7 +1378,7 @@ Local2 = Buffer (0x0A) Return (0x01) } - If (CH03 (Arg0, Z174, 0x4B, 0x0499, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -1449,7 +1449,7 @@ Local2 = Buffer (0x0A) Concatenate (Arg0, "-tstb", Arg0) RFU3 = BUF3 /* \DTM0.BUF3 */ Load (RFU3, DDB0) /* \DTM0.TSTB.DDB0 */ - If (CH03 (Arg0, Z174, 0x50, 0x04E2, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -1616,7 +1616,7 @@ Local2 = Buffer (0x0A) OperationRegion (RGN7, 0x80, 0x0D80, 0x0137) OperationRegion (RGN8, 0xCF, 0x0E80, 0x0138) OperationRegion (RGN9, 0xFF, 0x0F80, 0x0139) - If (CH03 (Arg0, Z174, 0x6F, 0x0574, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -1736,7 +1736,7 @@ Local2 = Buffer (0x0A) Local0 = RFU0 /* \DTM0.RFU0 */ Store ((SUM + CHSM (Local0, SizeOf (Local0))), SUM) /* \DTM0.SUM_ */ - If (CH03 (Arg0, Z174, 0x83, 0x05DB, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -1803,7 +1803,7 @@ Local2 = Buffer (0x0A) Local0 = RFU0 /* \DTM0.RFU0 */ Store ((SUM + CHSM (Local0, SizeOf (Local0))), SUM) /* \DTM0.SUM_ */ - If (CH03 (Arg0, Z174, 0x91, 0x0617, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -1820,7 +1820,7 @@ Local2 = Buffer (0x0A) /* CleanUp */ Unload (HI0) - If (CH03 (Arg0, Z174, 0x94, 0x0625, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -1853,7 +1853,7 @@ Local2 = Buffer (0x0A) { ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x01) Unload (HI0) - If (CH03 (Arg0, Z174, 0x98, 0x063C, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -1888,7 +1888,7 @@ Local2 = Buffer (0x0A) /* Spoil the CheckSum */ Store ((SUM + 0x01), SUM) /* \DTM0.SUM_ */ - If (CH03 (Arg0, Z174, 0xA1, 0x065D, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -1905,7 +1905,7 @@ Local2 = Buffer (0x0A) /*Cleanup */ Unload (HI0) - If (CH03 (Arg0, Z174, 0xA4, 0x066B, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -1924,12 +1924,12 @@ Local2 = Buffer (0x0A) /*Cleanup */ Unload (HI0) - If (CH03 (Arg0, Z174, 0xA7, 0x067B, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x01) } - If (CH03 (Arg0, Z174, 0xA8, 0x067E, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -1963,7 +1963,7 @@ Local2 = Buffer (0x0A) } Load (RFU0, Arg2) - If (CH03 (Arg0, Z174, 0xB2, 0x069F, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -1982,7 +1982,7 @@ Local2 = Buffer (0x0A) } Unload (DerefOf (Arg2)) - If (CH03 (Arg0, Z174, 0xB5, 0x06AD, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -2006,7 +2006,7 @@ Local2 = Buffer (0x0A) Local0 = RFU0 /* \DTM0.RFU0 */ Store ((SUM + CHSM (Local0, SizeOf (Local0))), SUM) /* \DTM0.SUM_ */ - If (CH03 (Arg0, Z174, 0xB7, 0x06C3, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -2068,7 +2068,7 @@ Local2 = Buffer (0x0A) } Unload (DDB0) - CH03 (Arg0, Z174, 0xB8, 0x06FF, 0x00) + CH03 (Arg0, Z174, __LINE__, 0x00, 0x00) Return (0x00) } @@ -2086,7 +2086,7 @@ Local2 = Buffer (0x0A) Return (0x01) } - If (CH03 (Arg0, Z174, 0xC1, 0x0712, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -2103,7 +2103,7 @@ Local2 = Buffer (0x0A) Return (0x01) } - If (CH03 (Arg0, Z174, 0xC3, 0x071F, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -2138,7 +2138,7 @@ Local2 = Buffer (0x0A) Return (0x01) } - If (CH03 (Arg0, Z174, 0xC6, 0x073B, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -2173,7 +2173,7 @@ Local2 = Buffer (0x0A) Local0 = RFU0 /* \DTM0.RFU0 */ Store ((SUM + CHSM (Local0, SizeOf (Local0))), SUM) /* \DTM0.SUM_ */ - If (CH03 (Arg0, Z174, 0xD1, 0x075D, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -2181,7 +2181,7 @@ Local2 = Buffer (0x0A) /* Load operator execution */ Load (RFU0, HI0) /* \DTM0.TSTI.HI0_ */ - If (CH03 (Arg0, Z174, 0xD2, 0x0763, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -2216,7 +2216,7 @@ Local2 = Buffer (0x0A) } Unload (HI0) - If (CH03 (Arg0, Z174, 0xD7, 0x0783, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -2247,7 +2247,7 @@ Local2 = Buffer (0x0A) Local0 = ^RFU0 /* \DTM0.RFU0 */ Store ((^SUM + CHSM (Local0, SizeOf (Local0))), ^SUM) /* \DTM0.SUM_ */ - If (CH03 (Arg0, Z174, 0xE1, 0x07A2, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -2255,7 +2255,7 @@ Local2 = Buffer (0x0A) /* Load operator execution */ Load (^RFU0, HI0) /* \DTM0.TSTJ.HI0_ */ - If (CH03 (Arg0, Z174, 0xE2, 0x07A8, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -2323,7 +2323,7 @@ Local2 = Buffer (0x0A) } Unload (HI0) - If (CH03 (Arg0, Z174, 0xE7, 0x07E9, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -2389,7 +2389,7 @@ Local2 = Buffer (0x0A) RFU5 = BUF5 /* \DTM0.BUF5 */ Load (RFU5, DDBH) /* \DTM0.TSTK.DDBH */ - If (CH03 (Arg0, Z174, 0xF2, 0x0823, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -2409,7 +2409,7 @@ Local2 = Buffer (0x0A) } Unload (DDBX) - If (CH03 (Arg0, Z174, 0xF5, 0x0833, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -2421,7 +2421,7 @@ Local2 = Buffer (0x0A) } Unload (DDBH) - If (CH03 (Arg0, Z174, 0xF7, 0x083D, 0x00)) + If (CH03 (Arg0, Z174, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -2438,65 +2438,65 @@ Local2 = Buffer (0x0A) { /* Loading SSDT from a SystemMemory OpRegion, */ /* different targets for DDBHandle */ - CH03 (__METHOD__, Z174, 0x0200, 0x084F, 0x00) + CH03 (__METHOD__, Z174, __LINE__, 0x00, 0x00) /* Named Objects */ SRMT ("TLD0.tst0") \DTM0.TST0 (__METHOD__) - CH03 (__METHOD__, Z174, 0x0201, 0x0855, 0x00) + CH03 (__METHOD__, Z174, __LINE__, 0x00, 0x00) /* LocalX Object */ SRMT ("TLD0.tst1") \DTM0.TST1 (__METHOD__) - CH03 (__METHOD__, Z174, 0x0202, 0x085B, 0x00) + CH03 (__METHOD__, Z174, __LINE__, 0x00, 0x00) /* Package element */ SRMT ("TLD0.tst2") \DTM0.TST2 (__METHOD__) - CH03 (__METHOD__, Z174, 0x0203, 0x0861, 0x00) + CH03 (__METHOD__, Z174, __LINE__, 0x00, 0x00) /* By Reference in ArgX */ SRMT ("TLD0.tst3") \DTM0.TST3 (__METHOD__) /* Loading SSDT from a Field of an OpRegion of any type, */ /* different targets for DDBHandle */ - CH03 (__METHOD__, Z174, 0x0204, 0x086A, 0x00) + CH03 (__METHOD__, Z174, __LINE__, 0x00, 0x00) /* SystemMemory Region */ SRMT ("TLD0.tst4") \DTM0.TST4 (__METHOD__) - CH03 (__METHOD__, Z174, 0x0205, 0x0870, 0x00) + CH03 (__METHOD__, Z174, __LINE__, 0x00, 0x00) /* SystemIO Region */ SRMT ("TLD0.tst5") \DTM0.TST5 (__METHOD__) - CH03 (__METHOD__, Z174, 0x0206, 0x0876, 0x00) + CH03 (__METHOD__, Z174, __LINE__, 0x00, 0x00) /* EmbeddedControl Region */ SRMT ("TLD0.tst6") \DTM0.TST6 (__METHOD__) - CH03 (__METHOD__, Z174, 0x0207, 0x087C, 0x00) + CH03 (__METHOD__, Z174, __LINE__, 0x00, 0x00) /* User defined Region */ SRMT ("TLD0.tst7") \DTM0.TST7 (__METHOD__) - CH03 (__METHOD__, Z174, 0x0208, 0x0882, 0x00) + CH03 (__METHOD__, Z174, __LINE__, 0x00, 0x00) /* Check that "namespace location to load the Definition Block */ /* is relative to the current namespace" scope, */ SRMT ("TLD0.tst8") \DTM0.TST8 (__METHOD__) - CH03 (__METHOD__, Z174, 0x0209, 0x0889, 0x00) + CH03 (__METHOD__, Z174, __LINE__, 0x00, 0x00) /* Check global and dynamic declarations of OpRegions */ /* and the appropriate _REG Methods invocation for the */ /* loaded SSDT */ SRMT ("TLD0.tst9") \DTM0.TST9 (__METHOD__) - CH03 (__METHOD__, Z174, 0x020A, 0x0891, 0x00) + CH03 (__METHOD__, Z174, __LINE__, 0x00, 0x00) /* Object of any type can be used as the DDBHandle argument */ SRMT ("TLD0.tstg") \DTM0.TSTG (__METHOD__) - CH03 (__METHOD__, Z174, 0x020B, 0x0897, 0x00) + CH03 (__METHOD__, Z174, __LINE__, 0x00, 0x00) /* Loading a number of different SSDTs */ SRMT ("TLD0.tsta") @@ -2509,12 +2509,12 @@ Local2 = Buffer (0x0A) BLCK () } - CH03 (__METHOD__, Z174, 0x020C, 0x08A1, 0x00) + CH03 (__METHOD__, Z174, __LINE__, 0x00, 0x00) /* Recursive Load in module level */ SRMT ("TLD0.tstk") \DTM0.TSTK (__METHOD__) - CH03 (__METHOD__, Z174, 0x020D, 0x08A7, 0x00) + CH03 (__METHOD__, Z174, __LINE__, 0x00, 0x00) } /* Exceptional conditions */ diff --git a/tests/aslts/src/runtime/collections/functional/table/loadtable.asl b/tests/aslts/src/runtime/collections/functional/table/loadtable.asl index 5b5943366..45b872757 100644 --- a/tests/aslts/src/runtime/collections/functional/table/loadtable.asl +++ b/tests/aslts/src/runtime/collections/functional/table/loadtable.asl @@ -186,7 +186,7 @@ \DTM2.PLDT = 0x00 DDBH = LoadTable ("OEM1", "", "", "\\", PPST, 0x01) - If (CH03 (Arg0, Z176, 0x03, 0xBA, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -213,7 +213,7 @@ Unload (DDBH) Debug = "OEM1 unloaded" - If (CH03 (Arg0, Z176, 0x08, 0xD0, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -250,7 +250,7 @@ DDBH = LoadTable ("OEM1", "", "", "\\", PPST, 0x01) } - If (CH03 (Arg0, Z176, 0x11, 0xF2, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -277,7 +277,7 @@ Unload (DDBH) Debug = "OEM1 unloaded" - If (CH03 (Arg0, Z176, 0x15, 0x0108, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -301,7 +301,7 @@ { /* No exception */ - If (CH03 (Arg0, Z176, 0x18, 0x011C, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -351,7 +351,7 @@ } Local3 = LoadTable ("OEM1", "InteL", "Many", "\\", PPST, 0x01) - If (CH03 (Arg0, Z176, 0x20, 0x0146, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -387,7 +387,7 @@ } Local4 = LoadTable ("OEM1", "Intel", "many", "\\", PPST, 0x01) - If (CH03 (Arg0, Z176, 0x26, 0x0166, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -435,7 +435,7 @@ \DTM2.PLDT = 0x00 DDB0 = LoadTable ("OEM1", "", "", "", PPST, 0x01) - If (CH03 (Arg0, Z176, 0x31, 0x0194, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -462,7 +462,7 @@ Unload (DDB0) Debug = "OEM1 unloaded" - If (CH03 (Arg0, Z176, 0x35, 0x01AA, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -476,7 +476,7 @@ \DTM2.PLDT = 0x00 DDB1 = LoadTable ("OEM1", "", "", "\\", "", 0x01) - If (CH03 (Arg0, Z176, 0x37, 0x01B8, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -503,7 +503,7 @@ Unload (DDB1) Debug = "OEM1 unloaded" - If (CH03 (Arg0, Z176, 0x3B, 0x01CE, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -517,7 +517,7 @@ \DTM2.PLDT = 0x00 DDB2 = LoadTable ("OEM1", "", "", "\\", PPST, Zero) - If (CH03 (Arg0, Z176, 0x3D, 0x01DC, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -544,7 +544,7 @@ Unload (DDB2) Debug = "OEM1 unloaded" - If (CH03 (Arg0, Z176, 0x41, 0x01F2, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -558,7 +558,7 @@ \DTM2.PLDT = 0x00 DDB3 = LoadTable ("OEM1", "", "", "", "", Zero) - If (CH03 (Arg0, Z176, 0x43, 0x0200, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -585,7 +585,7 @@ Unload (DDB3) Debug = "OEM1 unloaded" - If (CH03 (Arg0, Z176, 0x47, 0x0216, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -625,7 +625,7 @@ Method (M001, 3, NotSerialized) { Concatenate (Arg0, Arg2, Arg0) - If (CH03 (Arg0, Z176, 0x51, 0x0238, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -652,7 +652,7 @@ Unload (Arg1) Debug = "OEM1 unloaded" - If (CH03 (Arg0, Z176, 0x55, 0x024E, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -804,7 +804,7 @@ Method (M001, 3, NotSerialized) { Concatenate (Arg0, Arg2, Arg0) - If (CH03 (Arg0, Z176, 0x61, 0x02F1, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -831,7 +831,7 @@ Unload (Arg1) Debug = "OEM1 unloaded" - If (CH03 (Arg0, Z176, 0x65, 0x0307, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -985,7 +985,7 @@ \DTM2.PLDT = 0x00 DDBH = LoadTable ("OEM1", "", "", Arg1, PPST, 0x01) - If (CH03 (Arg0, Z176, 0x72, 0x03B4, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -1017,7 +1017,7 @@ Unload (DDBH) Debug = "OEM1 unloaded" - If (CH03 (Arg0, Z176, 0x77, 0x03CE, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -1049,7 +1049,7 @@ \DTM2.PLDT = 0x00 DDBH = LoadTable ("OEM1", "", "", "", PPST, 0x01) - If (CH03 (Arg0, Z176, 0x81, 0x03EE, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -1076,7 +1076,7 @@ Unload (DDBH) Debug = "OEM1 unloaded" - If (CH03 (Arg0, Z176, 0x85, 0x0404, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -1099,7 +1099,7 @@ Name (PLDT, 0x00) Concatenate (Arg0, "-tst7", Arg0) DDBH = LoadTable ("OEM1", "", "", RPST, "^TST7.PLDT", 0x01) - If (CH03 (Arg0, Z176, 0x91, 0x041C, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -1119,7 +1119,7 @@ } Unload (DDBH) - If (CH03 (Arg0, Z176, 0x94, 0x042C, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -1127,7 +1127,7 @@ PLDT = 0x00 \DTM2.PLDT = 0x00 DDBH = LoadTable ("OEM1", "", "", RPST, "PLDT", 0x01) - If (CH03 (Arg0, Z176, 0x95, 0x0435, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -1152,7 +1152,7 @@ } Unload (DDBH) - If (CH03 (Arg0, Z176, 0x99, 0x0449, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -1260,7 +1260,7 @@ \DTM2.PLDT = 0x00 DDBH = LoadTable ("OEM1", "", "", "\\", PPST, 0x01) - If (CH03 (Arg0, Z176, 0xB1, 0x04B4, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -1306,7 +1306,7 @@ Unload (DDBH) Debug = "OEM1 unloaded" - If (CH03 (Arg0, Z176, 0xB9, 0x04DD, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -1353,7 +1353,7 @@ RFU4 = BUF4 /* \DTM2.BUF4 */ Load (RFU4, DDBH) /* \DTM2.TSTB.DDBH */ - If (CH03 (Arg0, Z176, 0xC1, 0x050B, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -1389,7 +1389,7 @@ Unload (DDBH) Debug = "SSDT unloaded" - If (CH03 (Arg0, Z176, 0xC7, 0x052C, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -1477,7 +1477,7 @@ } - If (CH03 (Arg0, Z176, 0xD3, 0x0583, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -1489,7 +1489,7 @@ } Local5 = ObjectType (DDBH) - If (CH03 (Arg0, Z176, 0xD5, 0x058E, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -1617,7 +1617,7 @@ Local1 = Buffer (Local0){} \DTM2.PLDT = 0x00 DDBH = LoadTable (SOEM, Local1, Local1, RPST, PPST, 0x01) - If (CH03 (Arg0, Z176, 0xE1, 0x05EE, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -1636,7 +1636,7 @@ } Unload (DDBH) - If (CH03 (Arg0, Z176, 0xE4, 0x05FF, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -1839,7 +1839,7 @@ \DTM0.RFU3 = \DTM0.BUF3 Load (\DTM0.RFU3, DDB0) /* \DTM2.TSTH.DDB0 */ - If (CH03 (Arg0, Z176, 0x010C, 0x06D4, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -1885,7 +1885,7 @@ /* The size of the "Integer" converted from "Any" is ISZ0*2. */ If ((ISZ0 <= 0x04)) { - CH03 (Arg0, Z176, 0x0110, 0x06F1, 0x00) /* No exception */ + CH03 (Arg0, Z176, __LINE__, 0x00, 0x00) /* No exception */ } Else { @@ -2044,7 +2044,7 @@ M003 (Arg0, "bfl", RefOf (\AUXD.BFL0), C016) M004 (Arg0, "bfl", RefOf (\AUXD.BFL0), C016) Unload (DDB0) - CH03 (Arg0, Z176, 0x0126, 0x077D, 0x00) + CH03 (Arg0, Z176, __LINE__, 0x00, 0x00) Return (0x00) } @@ -2059,7 +2059,7 @@ \DTM0.RFU3 = \DTM0.BUF3 Load (\DTM0.RFU3, DDB0) /* \DTM2.TSTI.DDB0 */ - If (CH03 (Arg0, Z176, 0x0130, 0x078F, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -2099,7 +2099,7 @@ } DDB1 = LoadTable ("OEM1", "", "", "\\", "\\DTM2.PLDT", \AUXD.INT0) - If (CH03 (Arg0, Z176, 0x0134, 0x07AD, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -2118,7 +2118,7 @@ } Unload (DDB1) - If (CH03 (Arg0, Z176, 0x0137, 0x07BA, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -2141,7 +2141,7 @@ } DDB1 = LoadTable ("OEM1", "", "", "\\", "\\DTM2.PLDT", \AUXD.STR0) - If (CH03 (Arg0, Z176, 0x013A, 0x07CA, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -2160,7 +2160,7 @@ } Unload (DDB1) - If (CH03 (Arg0, Z176, 0x013D, 0x07D7, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -2184,7 +2184,7 @@ } DDB1 = LoadTable ("OEM1", "", "", "\\", "\\DTM2.PLDT", \AUXD.BUF0) - If (CH03 (Arg0, Z176, 0x0140, 0x07E8, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -2203,7 +2203,7 @@ } Unload (DDB1) - If (CH03 (Arg0, Z176, 0x0143, 0x07F5, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -2237,7 +2237,7 @@ } DDB1 = LoadTable ("OEM1", "", "", "\\", "\\DTM2.PLDT", \AUXD.FLU0) - If (CH03 (Arg0, Z176, 0x0148, 0x080E, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -2256,7 +2256,7 @@ } Unload (DDB1) - If (CH03 (Arg0, Z176, 0x014B, 0x081B, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -2363,7 +2363,7 @@ } DDB1 = LoadTable ("OEM1", "", "", "\\", "\\DTM2.PLDT", \AUXD.BFL0) - If (CH03 (Arg0, Z176, 0x015E, 0x086E, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -2382,7 +2382,7 @@ } Unload (DDB1) - If (CH03 (Arg0, Z176, 0x0161, 0x087B, 0x00)) + If (CH03 (Arg0, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -2395,73 +2395,73 @@ } Unload (DDB0) - CH03 (Arg0, Z176, 0x0163, 0x0886, 0x00) + CH03 (Arg0, Z176, __LINE__, 0x00, 0x00) Return (0x00) } } Method (TLT0, 0, Serialized) { - CH03 (__METHOD__, Z176, 0x0200, 0x0890, 0x00) + CH03 (__METHOD__, Z176, __LINE__, 0x00, 0x00) /* Simple Loadtable test */ SRMT ("TLT0.tst0") \DTM2.TST0 (__METHOD__) - CH03 (__METHOD__, Z176, 0x0201, 0x0896, 0x00) + CH03 (__METHOD__, Z176, __LINE__, 0x00, 0x00) /* All comparisons of Loadtable parameters are case sensitive, */ /* if no table matches the specified parameters, then 0 is returned */ SRMT ("TLT0.tst1") \DTM2.TST1 (__METHOD__) - CH03 (__METHOD__, Z176, 0x0202, 0x089D, 0x00) + CH03 (__METHOD__, Z176, __LINE__, 0x00, 0x00) /* Any of the RootPathString, ParameterPathString, and ParameterData */ /* parameters in LoadTable expression can be omitted */ SRMT ("TLT0.tst2") \DTM2.TST2 (__METHOD__) - CH03 (__METHOD__, Z176, 0x0203, 0x08A4, 0x00) + CH03 (__METHOD__, Z176, __LINE__, 0x00, 0x00) /* Different sources of the String parameters: Named Objects, LocalX, */ /* ArgX, elements of Packages, results of functions, any TermArg */ SRMT ("TLT0.tst3") \DTM2.TST3 (__METHOD__) - CH03 (__METHOD__, Z176, 0x0204, 0x08AB, 0x00) + CH03 (__METHOD__, Z176, __LINE__, 0x00, 0x00) /* Different sources of the optional parameters (RootPathString, */ /* ParameterPathString, and ParameterData): Named Objects, LocalX, */ /* ArgX, elements of Packages, results of functions, any TermArg */ SRMT ("TLT0.tst4") \DTM2.TST4 (__METHOD__) - CH03 (__METHOD__, Z176, 0x0205, 0x08B3, 0x00) + CH03 (__METHOD__, Z176, __LINE__, 0x00, 0x00) /* Namespace location to load the Definition Block is determined */ /* by the RootPathString parameter of Loadtable */ SRMT ("TLT0.tst5.0") \DTM2.TST5 (__METHOD__, "\\DTM2.DEVR") - CH03 (__METHOD__, Z176, 0x0206, 0x08BA, 0x00) + CH03 (__METHOD__, Z176, __LINE__, 0x00, 0x00) /* The RootPathString value is evaluated using normal scoping rules, */ /* assuming that the scope of the LoadTable operator is the current */ /* scope */ SRMT ("TLT0.tst5.1") \DTM2.TST5 (__METHOD__, "^DEVR") - CH03 (__METHOD__, Z176, 0x0207, 0x08C2, 0x00) + CH03 (__METHOD__, Z176, __LINE__, 0x00, 0x00) /* "\" is assumed to be Namespace location to load the Definition */ /* Block if RootPathString parameter is not specified */ SRMT ("TLT0.tst6") \DTM2.TST6 (__METHOD__) - CH03 (__METHOD__, Z176, 0x0208, 0x08C9, 0x00) + CH03 (__METHOD__, Z176, __LINE__, 0x00, 0x00) /* If the first character of ParameterPathString is a backslash */ /* or caret character, then the path of the object set up on success */ /* is ParameterPathString. It is RootPathString.ParameterPathString */ /* in any case. */ SRMT ("TLT0.tst7") \DTM2.TST7 (__METHOD__) - CH03 (__METHOD__, Z176, 0x0209, 0x08D2, 0x00) + CH03 (__METHOD__, Z176, __LINE__, 0x00, 0x00) /* Implicit operand conversion of the parameters specified to be strings */ SRMT ("TLT0.tste") \DTM2.TSTE (__METHOD__) - CH03 (__METHOD__, Z176, 0x020A, 0x08D8, 0x00) + CH03 (__METHOD__, Z176, __LINE__, 0x00, 0x00) /* LoadTable returns 0 if some SSDT matching the LoadTable */ /* parameters is originally not listed in XSDT */ /*SRMT("TLT0.tstf") */ /*\DTM2.tstf(ts) */ - CH03 (__METHOD__, Z176, 0x020B, 0x08DF, 0x00) + CH03 (__METHOD__, Z176, __LINE__, 0x00, 0x00) } /* Exceptional conditions */ diff --git a/tests/aslts/src/runtime/collections/functional/table/unload.asl b/tests/aslts/src/runtime/collections/functional/table/unload.asl index 6bf862df9..a2f0a3ee1 100644 --- a/tests/aslts/src/runtime/collections/functional/table/unload.asl +++ b/tests/aslts/src/runtime/collections/functional/table/unload.asl @@ -102,13 +102,13 @@ Local0 = \DTM0.RFU0 Store ((\DTM0.SUM + \DTM0.CHSM (Local0, SizeOf (Local0))), \DTM0.SUM) - If (CH03 (Arg0, Z175, 0x01, 0x6D, 0x00)) + If (CH03 (Arg0, Z175, __LINE__, 0x00, 0x00)) { Return (Zero) } Load (\DTM0.RFU0, HI0) /* \DTM1.TST0.HI0_ */ - If (CH03 (Arg0, Z175, 0x02, 0x73, 0x00)) + If (CH03 (Arg0, Z175, __LINE__, 0x00, 0x00)) { Return (Zero) } @@ -140,7 +140,7 @@ Else { Local0 = \SSS0 () - If (CH03 (Arg0, Z175, 0x06, 0x8A, 0x01)) + If (CH03 (Arg0, Z175, __LINE__, 0x00, 0x01)) { Return (Zero) } @@ -154,7 +154,7 @@ /* UnLoad operator execution */ Unload (M000 ()) - If (CH03 (Arg0, Z175, 0x08, 0x95, 0x00)) + If (CH03 (Arg0, Z175, __LINE__, 0x00, 0x00)) { Return (Zero) } @@ -318,7 +318,7 @@ \DTM0.RFU3 = \DTM0.BUF3 Load (\DTM0.RFU3, DDB0) /* \DTM1.TST1.DDB0 */ - If (CH03 (Arg0, Z175, 0x1F, 0x011C, 0x00)) + If (CH03 (Arg0, Z175, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -481,7 +481,7 @@ } Unload (DDB0) - CH03 (Arg0, Z175, 0x2F, 0x0186, 0x00) + CH03 (Arg0, Z175, __LINE__, 0x00, 0x00) /* Check absence of the auxiliary table Objects after UnLoad */ If (M001 (Concatenate (Arg0, ".after"))) @@ -538,7 +538,7 @@ \DTM0.RFU3 = \DTM0.BUF3 Load (\DTM0.RFU3, DDB0) /* \DTM1.TST3.DDB0 */ - If (CH03 (Arg0, Z175, 0x33, 0x01BF, 0x00)) + If (CH03 (Arg0, Z175, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -646,7 +646,7 @@ M000 (Arg0, "bfl", RefOf (\AUXD.BFL0), C016) Unload (DDB0) - CH03 (Arg0, Z175, 0x3C, 0x0216, 0x00) + CH03 (Arg0, Z175, __LINE__, 0x00, 0x00) Return (0x00) } @@ -661,7 +661,7 @@ \DTM0.RFU3 = \DTM0.BUF3 Load (\DTM0.RFU3, DDB0) /* \DTM1.TST4.DDB0 */ - If (CH03 (Arg0, Z175, 0x3D, 0x0227, 0x00)) + If (CH03 (Arg0, Z175, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -669,7 +669,7 @@ /* First Unload */ Unload (DDB0) - If (CH03 (Arg0, Z175, 0x3E, 0x022E, 0x00)) + If (CH03 (Arg0, Z175, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -688,7 +688,7 @@ \DTM0.RFU3 = \DTM0.BUF3 Load (\DTM0.RFU3, DDB1) /* \DTM1.TST4.DDB1 */ - If (CH03 (Arg0, Z175, 0x40, 0x0241, 0x00)) + If (CH03 (Arg0, Z175, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -704,7 +704,7 @@ } Unload (DDB1) - If (CH03 (Arg0, Z175, 0x42, 0x0252, 0x00)) + If (CH03 (Arg0, Z175, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -732,7 +732,7 @@ \DTM0.RFU3 = \DTM0.BUF3 Load (\DTM0.RFU3, DDB0) /* \DTM1.TST5.DDB0 */ - If (CH03 (Arg0, Z175, 0x43, 0x0267, 0x00)) + If (CH03 (Arg0, Z175, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -759,7 +759,7 @@ } Unload (DDB0) - If (CH03 (Arg0, Z175, 0x48, 0x027F, 0x00)) + If (CH03 (Arg0, Z175, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -770,24 +770,24 @@ Method (TUL0, 0, Serialized) { - CH03 (__METHOD__, Z175, 0x0200, 0x028B, 0x00) + CH03 (__METHOD__, Z175, __LINE__, 0x00, 0x00) /* Different Sources to specify DDBHandle for UnLoad. */ /* Most of them (Named Object, LocalX, ArgX, Derefof) */ /* are checked in load.asl */ /* DDBHandle returned by Method call */ SRMT ("TUL0.tst0") \DTM1.TST0 (__METHOD__) - CH03 (__METHOD__, Z175, 0x0201, 0x0294, 0x00) + CH03 (__METHOD__, Z175, __LINE__, 0x00, 0x00) /* All namespace objects created as a result of the corresponding */ /* Load operation are absent in the namespace after UnLoad */ SRMT ("TUL0.tst1") \DTM1.TST1 (__METHOD__) - CH03 (__METHOD__, Z175, 0x0202, 0x029B, 0x00) + CH03 (__METHOD__, Z175, __LINE__, 0x00, 0x00) /* Load/UnLoad processing can be done with the same table many times */ SRMT ("TUL0.tst2") \DTM1.TST2 (__METHOD__) - CH03 (__METHOD__, Z175, 0x0203, 0x02A1, 0x00) + CH03 (__METHOD__, Z175, __LINE__, 0x00, 0x00) } /* Exceptional conditions */ |