diff options
Diffstat (limited to 'tests/aslts/src/runtime/collections')
86 files changed, 691 insertions, 691 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 74ca8352c..47fa4d8d4 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 @@ -53,7 +53,7 @@ _TCI (C200, Local1) M000 (0x00) _TCI (C201, PP0A) - CH04 (__METHOD__, 0x00, 0xFF, Z132, 0x41, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z132, __LINE__, 0x00, 0x00) M3A3 (Local1, PP0A, Local3) M3A4 (Local1, PP0A, Local3, 0x00, 0x00, 0x00, 0x00) } 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 76614b4a9..d7e40116a 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0014/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0014/DECL.asl @@ -41,9 +41,9 @@ MDAE (0x64) CH03 ("", 0x00, 0x01, 0x2C, 0x00) MDAE (0x65) - CH04 ("", 0x00, 0x30, 0x00, 0x2E, 0x00, 0x00) /* AE_AML_OPERAND_VALUE */ + CH04 (__METHOD__, 0x00, 0x30, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_VALUE */ MDAE (0xFF) - CH04 ("", 0x00, 0x30, 0x00, 0x30, 0x00, 0x00) /* AE_AML_OPERAND_VALUE */ + CH04 (__METHOD__, 0x00, 0x30, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_VALUE */ MDAE (0x0100) - CH04 ("", 0x00, 0x30, 0x00, 0x32, 0x00, 0x00) /* AE_AML_OPERAND_VALUE */ + CH04 (__METHOD__, 0x00, 0x30, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_VALUE */ } 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 ee21b2c02..896818842 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0028/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0028/DECL.asl @@ -47,31 +47,31 @@ Name (B000, Buffer (0x10){}) CH03 ("", 0x00, 0x00, 0x34, 0x00) CreateBitField (B000, 0x80, F000) - CH04 ("", 0x00, 0x36, 0x00, 0x36, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ + CH04 (__METHOD__, 0x00, 0x36, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ CH03 ("", 0x00, 0x02, 0x38, 0x00) CreateByteField (B000, 0x10, F001) - CH04 ("", 0x00, 0x36, 0x00, 0x3A, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ + CH04 (__METHOD__, 0x00, 0x36, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ CH03 ("", 0x00, 0x04, 0x3C, 0x00) CreateWordField (B000, 0x0F, F002) - CH04 ("", 0x00, 0x36, 0x00, 0x3E, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ + CH04 (__METHOD__, 0x00, 0x36, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ CH03 ("", 0x00, 0x06, 0x40, 0x00) CreateDWordField (B000, 0x0D, F003) - CH04 ("", 0x00, 0x36, 0x00, 0x42, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ + CH04 (__METHOD__, 0x00, 0x36, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ CH03 ("", 0x00, 0x08, 0x44, 0x00) CreateQWordField (B000, 0x09, F004) - CH04 ("", 0x00, 0x36, 0x00, 0x46, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ + CH04 (__METHOD__, 0x00, 0x36, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ CH03 ("", 0x00, 0x0A, 0x48, 0x00) CreateField (B000, 0x7F, 0x02, F005) - CH04 ("", 0x00, 0x36, 0x00, 0x4A, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ + CH04 (__METHOD__, 0x00, 0x36, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ CH03 ("", 0x00, 0x0C, 0x4C, 0x00) CreateField (B000, 0x78, 0x09, F006) - CH04 ("", 0x00, 0x36, 0x00, 0x4E, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ + CH04 (__METHOD__, 0x00, 0x36, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ CH03 ("", 0x00, 0x0E, 0x50, 0x00) CreateField (B000, 0x80, 0x01, F007) - CH04 ("", 0x00, 0x36, 0x00, 0x52, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ + CH04 (__METHOD__, 0x00, 0x36, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ CH03 ("", 0x00, 0x10, 0x54, 0x00) CreateField (B000, 0x79, 0x08, F008) - CH04 ("", 0x00, 0x36, 0x00, 0x56, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ + CH04 (__METHOD__, 0x00, 0x36, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ } Method (MDBE, 0, NotSerialized) 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 97dd8cc98..5af4a1431 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 @@ -52,7 +52,7 @@ CH03 ("", 0x00, 0x00, 0x37, 0x00) I000 = 0x12345678 Name (I000, 0x00) - CH04 ("", 0x00, 0xFF, 0x00, 0x3A, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) } Method (M800, 0, Serialized) @@ -171,7 +171,7 @@ CH03 ("", 0x00, 0x12, 0xAD, 0x00) II99 = 0xABCD0009 Name (II99, 0x00) - CH04 ("", 0x00, 0xFF, 0x00, 0xB2, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) } Method (M1DC, 0, NotSerialized) 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 bb078fa17..f83963796 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0050/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0050/DECL.asl @@ -51,5 +51,5 @@ /* result in AE_AML_STRING_LIMIT exception. */ CH03 ("", 0x00, 0x00, 0x33, 0x00) ToHexString (B000, Local0) - CH04 ("", 0x00, 0x3D, 0x00, 0x35, 0x00, 0x00) /* AE_AML_STRING_LIMIT */ + 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 8ac67728f..4de3405b3 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0061/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0061/DECL.asl @@ -41,7 +41,7 @@ } Else { - CH04 ("", 0x00, 0x2F, 0x00, 0x2B, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0x2F, 0x00, __LINE__, 0x00, 0x00) } } 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 91902fcda..719130eed 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0063/File0.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0063/File0.asl @@ -512,53 +512,53 @@ CH03 ("", 0x00, 0x0147, 0x01BB, 0x00) Local1 = "1234cd" ToInteger (Local1, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x01BE, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) /* 6. "000x1234" (non-decimal character in dec-image) */ CH03 ("", 0x00, 0x0149, 0x01C1, 0x00) Local1 = "000x1234" ToInteger (Local1, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x01C4, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) /* 7. "0x1234cdQ" (non-hex character in '0x'-image) */ CH03 ("", 0x00, 0x014B, 0x01C7, 0x00) Local1 = "0x1234cdQ" ToInteger (Local1, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x01CA, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) CH03 ("", 0x00, 0x014D, 0x01CC, 0x00) Local1 = "0x0x12345" ToInteger (Local1, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x01CF, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) /* 8. "1234 " (white space in dec image) */ CH03 ("", 0x00, 0x014F, 0x01D2, 0x00) Local1 = "1234 " ToInteger (Local1, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x01D5, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) /* 9. "0x1234cd " (white space in '0x'-image) */ CH03 ("", 0x00, 0x0151, 0x01D8, 0x00) Local1 = "0x1234cd " ToInteger (Local1, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x01DB, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) /* 10. "0x 1234cdQ" (white space after '0x') */ CH03 ("", 0x00, 0x0153, 0x01DE, 0x00) Local1 = "0x 1234" ToInteger (Local1, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x01E1, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) CH03 ("", 0x00, 0x0155, 0x01E3, 0x00) Local1 = "0x0x 1234" ToInteger (Local1, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x01E6, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) CH03 ("", 0x00, 0x0157, 0x01E8, 0x00) Local1 = "0x0x 0x 1234" ToInteger (Local1, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x01EB, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) CH03 ("", 0x00, 0x0159, 0x01ED, 0x00) Local1 = "0x 0x 1234" ToInteger (Local1, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x01F0, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) /* 11. (decimal image exceeding maximal) */ /* 32-bit mode – the value exceeding "4294967295" */ If (!F64) @@ -566,31 +566,31 @@ CH03 ("", 0x00, 0x015B, 0x01F5, 0x00) Local1 = "4294967296" ToInteger (Local1, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x01F8, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) CH03 ("", 0x00, 0x015D, 0x01FA, 0x00) Local1 = "123456789012345678904294967296" ToInteger (Local1, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x01FD, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) CH03 ("", 0x00, 0x015F, 0x01FF, 0x00) Local1 = " \t \t\t00004294967296" ToInteger (Local1, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x0202, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) CH03 ("", 0x00, 0x0161, 0x0204, 0x00) Local1 = "\t0123456789012345678904294967296" ToInteger (Local1, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x0207, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) CH03 ("", 0x00, 0x0163, 0x0209, 0x00) Local1 = "0123456789012345678904294967296" ToInteger (Local1, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x020C, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) CH03 ("", 0x00, 0x0165, 0x020E, 0x00) Local1 = " 123456789012345678904294967296" ToInteger (Local1, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x0211, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) CH03 ("", 0x00, 0x0167, 0x0213, 0x00) Local1 = "\t123456789012345678904294967296" ToInteger (Local1, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x0216, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) } /* 64-bit mode – the value exceeding "18446744073709551615" */ @@ -598,39 +598,39 @@ CH03 ("", 0x00, 0x0169, 0x021A, 0x00) Local1 = "18446744073709551616" ToInteger (Local1, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x021D, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) CH03 ("", 0x00, 0x016B, 0x021F, 0x00) Local1 = "\t18446744073709551616" ToInteger (Local1, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x0222, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) CH03 ("", 0x00, 0x016D, 0x0224, 0x00) Local1 = " 18446744073709551616" ToInteger (Local1, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x0227, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) CH03 ("", 0x00, 0x016F, 0x0229, 0x00) Local1 = "018446744073709551616" ToInteger (Local1, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x022C, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) CH03 ("", 0x00, 0x0171, 0x022E, 0x00) Local1 = " \t000000000018446744073709551616" ToInteger (Local1, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x0231, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) /* 12. "0x12345678901234567" (hex image exceeding maximal) */ CH03 ("", 0x00, 0x0173, 0x0234, 0x00) Local1 = "0x12345678901234567" ToInteger (Local1, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x0237, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) /* 13. "0x00000000000001234" (hex image exceeding maximal; no matter that zeros) */ CH03 ("", 0x00, 0x0175, 0x023A, 0x00) Local1 = "0x00000000000001234" ToInteger (Local1, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x023D, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) CH03 ("", 0x00, 0x0178, 0x023F, 0x00) Local1 = "0x0000000000000000000001234" ToInteger (Local1, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x0242, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) /* 14. "0x123456789" (hex image exceeding maximal; for 32-bit mode only) */ If (!F64) @@ -638,7 +638,7 @@ CH03 ("", 0x00, 0x017A, 0x0246, 0x00) Local1 = "0x123456789" ToInteger (Local1, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x0249, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) } /* 15. "0x" (incomplete '0x' image) */ @@ -646,27 +646,27 @@ CH03 ("", 0x00, 0x017C, 0x024D, 0x00) Local1 = "0x" ToInteger (Local1, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x0250, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) CH03 ("", 0x00, 0x017E, 0x0252, 0x00) Local1 = "0x " ToInteger (Local1, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x0255, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) CH03 ("", 0x00, 0x0180, 0x0257, 0x00) Local1 = "0x\t" ToInteger (Local1, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x025A, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) CH03 ("", 0x00, 0x0182, 0x025C, 0x00) Local1 = "0x 1234" ToInteger (Local1, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x025F, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) CH03 ("", 0x00, 0x0184, 0x0261, 0x00) Local1 = "0x\t1234" ToInteger (Local1, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x0264, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) /* 16. Empty string */ CH03 ("", 0x00, 0x0186, 0x0267, 0x00) Local1 = "" ToInteger (Local1, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x026A, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __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 b464b5c77..a653c5d32 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0064/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0064/DECL.asl @@ -51,11 +51,11 @@ CH03 ("", 0x00, 0x06, 0x34, 0x00) Local1 = "" ToInteger (Local1, Local0) - CH04 ("", 0x00, 0x24, 0x00, 0x37, 0x00, 0x00) /* AE_BAD_DECIMAL_CONSTANT */ + CH04 (__METHOD__, 0x00, 0x24, 0x00, __LINE__, 0x00, 0x00) /* AE_BAD_DECIMAL_CONSTANT */ CH03 ("", 0x00, 0x08, 0x39, 0x00) Local1 = " " ToInteger (Local1, Local0) - CH04 ("", 0x00, 0x24, 0x00, 0x3C, 0x00, 0x00) /* AE_BAD_DECIMAL_CONSTANT */ + CH04 (__METHOD__, 0x00, 0x24, 0x00, __LINE__, 0x00, 0x00) /* AE_BAD_DECIMAL_CONSTANT */ CH03 ("", 0x00, 0x0A, 0x3E, 0x00) Local0 = ("q" + 0xABCD0002) If ((Local0 != 0xABCD0002)) @@ -75,9 +75,9 @@ CH03 ("", 0x00, 0x10, 0x4C, 0x00) Local1 = "q" ToInteger (Local1, Local0) - CH04 ("", 0x00, 0x24, 0x00, 0x4F, 0x00, 0x00) /* AE_BAD_DECIMAL_CONSTANT */ + CH04 (__METHOD__, 0x00, 0x24, 0x00, __LINE__, 0x00, 0x00) /* AE_BAD_DECIMAL_CONSTANT */ CH03 ("", 0x00, 0x12, 0x51, 0x00) Local1 = "q " ToInteger (Local1, Local0) - CH04 ("", 0x00, 0x24, 0x00, 0x54, 0x00, 0x00) /* AE_BAD_DECIMAL_CONSTANT */ + 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 350023080..f5f649d80 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0076/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0076/DECL.asl @@ -38,7 +38,7 @@ Debug = Local1 CH03 ("", 0x00, 0x00, 0x2B, 0x00) Local7 = (Local1 + 0x00) - CH04 ("", 0x00, 0x2F, 0x00, 0x2D, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (__METHOD__, 0x00, 0x2F, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local2 = RefOf (ID0A) Debug = Local2 } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0085/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0085/DECL.asl index b1582e037..a132a09c1 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0085/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0085/DECL.asl @@ -54,7 +54,7 @@ Debug = Arg0 Local1 = DerefOf (Arg0) - CH04 ("", 0x02, 0x3E, 0x01, 0x00, 0x00, 0x00) + CH04 (__METHOD__, 0x02, 0x3E, 0x01, __LINE__, 0x00, 0x00) } Else { 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 6b8ddcfe9..00710dbed 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0092/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0092/DECL.asl @@ -82,7 +82,7 @@ } Else { - CH04 ("", 0x00, 0xFF, 0x00, 0x3E, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } } Else @@ -110,7 +110,7 @@ } Else { - CH04 ("", 0x00, 0xFF, 0x00, 0x4A, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } } } 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 e495c84dd..ce82c54ed 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0093/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0093/DECL.asl @@ -68,7 +68,7 @@ } Else { - CH04 ("", 0x00, 0xFF, 0x00, 0x3F, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } } Else @@ -89,7 +89,7 @@ } Else { - CH04 ("", 0x00, 0xFF, 0x00, 0x4C, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } } } 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 15448d12b..317d900dd 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0094/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0094/DECL.asl @@ -62,7 +62,7 @@ } Else { - CH04 ("", 0x00, 0xFF, 0x00, 0x3F, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } } Else @@ -80,7 +80,7 @@ } Else { - CH04 ("", 0x00, 0xFF, 0x00, 0x4C, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } } } 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 c19b7aeff..f0bfec21c 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0113/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0113/DECL.asl @@ -41,27 +41,27 @@ Debug = "Test 0" CH03 ("", 0x00, 0x00, 0x2E, 0x00) Store ((Arg0 + 0x01), Local5) - CH04 ("", 0x01, 0x2F, 0x00, 0x30, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (__METHOD__, 0x01, 0x2F, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Debug = "Test 1" CH03 ("", 0x00, 0x02, 0x33, 0x00) Store ((Arg1 + 0x01), Local5) - CH04 ("", 0x01, 0x2F, 0x00, 0x35, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (__METHOD__, 0x01, 0x2F, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Debug = "Test 2" CH03 ("", 0x00, 0x04, 0x38, 0x00) Store ((Arg2 + 0x01), Local5) - CH04 ("", 0x01, 0x2F, 0x00, 0x3A, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (__METHOD__, 0x01, 0x2F, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Debug = "Test 3" CH03 ("", 0x00, 0x06, 0x3D, 0x00) Store ((Arg3 + 0x01), Local5) - CH04 ("", 0x01, 0x2F, 0x00, 0x3F, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (__METHOD__, 0x01, 0x2F, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Debug = "Test 4" CH03 ("", 0x00, 0x08, 0x42, 0x00) Store ((Arg4 + 0x01), Local5) - CH04 ("", 0x01, 0x2F, 0x00, 0x44, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (__METHOD__, 0x01, 0x2F, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Debug = "Test 5" CH03 ("", 0x00, 0x0A, 0x47, 0x00) Store ((Arg5 + 0x01), Local5) - CH04 ("", 0x01, 0x2F, 0x00, 0x49, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (__METHOD__, 0x01, 0x2F, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ } Method (ME7A, 0, Serialized) 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 0aee035f4..dfea69e1e 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0118/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0118/DECL.asl @@ -79,7 +79,7 @@ CH03 ("", 0x00, 0x05, 0x52, 0x00) Local5 = (Local0 + 0x79) - CH04 ("", 0x00, 0x2F, 0x00, 0x54, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (__METHOD__, 0x00, 0x2F, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ } Method (MF81, 0, Serialized) @@ -132,7 +132,7 @@ CH03 ("", 0x00, 0x0C, 0x87, 0x00) II05 = (Local0 + 0x79) - CH04 ("", 0x00, 0x2F, 0x00, 0x89, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (__METHOD__, 0x00, 0x2F, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ } Method (MF82, 0, Serialized) @@ -183,7 +183,7 @@ CH03 ("", 0x00, 0x13, 0xBA, 0x00) II05 = (II00 + 0x79) - CH04 ("", 0x00, 0x2F, 0x00, 0xBC, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (__METHOD__, 0x00, 0x2F, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ } Method (MD79, 0, NotSerialized) 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 605f29ebe..1a7baa72f 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0121/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0121/DECL.asl @@ -44,22 +44,22 @@ CH03 ("", 0x00, 0x00, 0x2C, 0x00) CH03 ("", 0x00, 0x02, 0x2E, 0x00) CreateField (B000, 0x00, I000, BF01) - CH04 ("", 0x00, 0xFF, 0x00, 0x30, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) CH03 ("", 0x00, 0x04, 0x32, 0x00) CreateField (B000, 0x01, I000, BF02) - CH04 ("", 0x00, 0xFF, 0x00, 0x34, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) CH03 ("", 0x00, 0x06, 0x36, 0x00) CreateField (B000, 0x07, I000, BF03) - CH04 ("", 0x00, 0xFF, 0x00, 0x38, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) CH03 ("", 0x00, 0x08, 0x3A, 0x00) CreateField (B000, 0x08, I000, BF04) - CH04 ("", 0x00, 0xFF, 0x00, 0x3C, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) CH03 ("", 0x00, 0x0A, 0x3E, 0x00) CreateField (B000, 0x0F, I000, BF05) - CH04 ("", 0x00, 0xFF, 0x00, 0x40, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) CH03 ("", 0x00, 0x0C, 0x42, 0x00) CreateField (B000, 0x10, I000, BF06) - CH04 ("", 0x00, 0xFF, 0x00, 0x44, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) CH03 ("", 0x00, 0x0E, 0x46, 0x00) Debug = "All CreateField-s finished" Debug = BF00 /* \MF03.BF00 */ @@ -69,6 +69,6 @@ Debug = BF04 /* \MF03.BF04 */ Debug = BF05 /* \MF03.BF05 */ Debug = BF06 /* \MF03.BF06 */ - CH04 ("", 0x00, 0xFF, 0x00, 0x52, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) Debug = "All Store-to-Debug-s finished" } 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 039e68654..99b8ab7ba 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0123/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0123/DECL.asl @@ -41,5 +41,5 @@ /* c) Modulo(StartIndex, 0x100000000) < Size. */ CH03 ("", 0x00, 0x00, 0x2A, 0x00) Local0 = Match (P000, MEQ, 0x01, MEQ, 0x01, 0x0000000100000001) - CH04 ("", 0x00, 0xFF, 0x00, 0x2C, 0x00, 0x00) /* AE_AML_PACKAGE_LIMIT */ + 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 97a35c3e6..cbb0a5849 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0124/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0124/DECL.asl @@ -46,11 +46,11 @@ /* c) Modulo(Index, 0x100000000) < Size. */ CH03 ("", 0x00, 0x00, 0x2C, 0x00) Store (P000 [0x0000000100000001], Local0) - CH04 ("", 0x01, 0x37, 0x00, 0x2E, 0x00, 0x00) /* AE_AML_PACKAGE_LIMIT */ + CH04 (__METHOD__, 0x01, 0x37, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_PACKAGE_LIMIT */ CH03 ("", 0x00, 0x02, 0x30, 0x00) Store (B000 [0x0000000100000002], Local0) - CH04 ("", 0x01, 0x36, 0x00, 0x32, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ + CH04 (__METHOD__, 0x01, 0x36, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ CH03 ("", 0x00, 0x04, 0x34, 0x00) Store (S000 [0x0000000100000003], Local0) - CH04 ("", 0x01, 0x3D, 0x00, 0x36, 0x00, 0x00) /* AE_AML_STRING_LIMIT */ + 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 d519bf207..090c46601 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0127/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0127/DECL.asl @@ -36,17 +36,17 @@ Local1 = Local0 = PD11 [0x00] CH03 ("", 0x00, 0x00, 0x2A, 0x00) Store ((Local0 + 0x00), Local2) - CH04 ("", 0x01, 0x2F, 0x00, 0x2C, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (__METHOD__, 0x01, 0x2F, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ CH03 ("", 0x00, 0x02, 0x2E, 0x00) Store ((Local1 + 0x00), Local2) - CH04 ("", 0x01, 0x2F, 0x00, 0x30, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (__METHOD__, 0x01, 0x2F, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local1 = Local0 = PD11 [0x01] CH03 ("", 0x00, 0x04, 0x34, 0x00) Store ((Local0 + 0x00), Local2) - CH04 ("", 0x01, 0x2F, 0x00, 0x36, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (__METHOD__, 0x01, 0x2F, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ CH03 ("", 0x00, 0x06, 0x38, 0x00) Store ((Local1 + 0x00), Local2) - CH04 ("", 0x01, 0x2F, 0x00, 0x3A, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (__METHOD__, 0x01, 0x2F, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ } /* CopyObject */ @@ -56,10 +56,10 @@ CopyObject (Local0 = PD11 [0x00], Local1) CH03 ("", 0x00, 0x08, 0x43, 0x00) Store ((Local0 + 0x00), Local2) - CH04 ("", 0x01, 0x2F, 0x00, 0x45, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (__METHOD__, 0x01, 0x2F, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ CH03 ("", 0x00, 0x0A, 0x47, 0x00) Store ((Local1 + 0x00), Local2) - CH04 ("", 0x01, 0x2F, 0x00, 0x49, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (__METHOD__, 0x01, 0x2F, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ } Method (MF15, 0, NotSerialized) @@ -68,10 +68,10 @@ CopyObject (Local0 = PD11 [0x01], Local1) CH03 ("", 0x00, 0x0D, 0x52, 0x00) Store ((Local0 + 0x00), Local2) - CH04 ("", 0x01, 0x2F, 0x00, 0x54, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (__METHOD__, 0x01, 0x2F, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ CH03 ("", 0x00, 0x0F, 0x56, 0x00) Store ((Local1 + 0x00), Local2) - CH04 ("", 0x01, 0x2F, 0x00, 0x58, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (__METHOD__, 0x01, 0x2F, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ } Method (MF16, 0, NotSerialized) 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 2cfd4a646..d5e6c5bed 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0150/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0150/DECL.asl @@ -103,7 +103,7 @@ Local0 = 0x01 CH03 ("", 0x00, 0x03, 0x63, 0x00) Acquire (MX01, 0x0001) - CH04 ("", 0x00, 0x40, 0x00, 0x65, 0x00, 0x00) /* AE_AML_MUTEX_ORDER */ + CH04 (__METHOD__, 0x00, 0x40, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_ORDER */ } If (Local0) @@ -171,7 +171,7 @@ Local0 = 0x01 CH03 ("", 0x00, 0x09, 0xA0, 0x00) MX01 () - CH04 ("", 0x00, 0x40, 0x00, 0xA2, 0x00, 0x00) /* AE_AML_MUTEX_ORDER */ + CH04 (__METHOD__, 0x00, 0x40, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_ORDER */ } If (Local0) 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 044a0b3e3..a04f446e5 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0177/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0177/DECL.asl @@ -70,13 +70,13 @@ CH03 ("", 0x00, 0x00, 0x35, 0x00) Store (P000 [0x02], Local1) - CH04 ("", 0x01, 0x37, 0x00, 0x37, 0x00, 0x00) /* AE_AML_PACKAGE_LIMIT */ + CH04 (__METHOD__, 0x01, 0x37, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_PACKAGE_LIMIT */ CH03 ("", 0x00, 0x02, 0x39, 0x00) Store (B000 [0x03], Local1) - CH04 ("", 0x01, 0x36, 0x00, 0x3B, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ + CH04 (__METHOD__, 0x01, 0x36, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ CH03 ("", 0x00, 0x04, 0x3D, 0x00) Store (S000 [0x04], Local1) - CH04 ("", 0x01, 0x3D, 0x00, 0x3F, 0x00, 0x00) /* AE_AML_STRING_LIMIT */ + CH04 (__METHOD__, 0x01, 0x3D, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_STRING_LIMIT */ /* Immediate */ CH03 ("", 0x00, 0x06, 0x43, 0x00) @@ -87,11 +87,11 @@ }, 0x02), Local1) If (Y900) { - CH04 ("", 0x01, 0x37, 0x00, 0x46, 0x00, 0x00) /* AE_AML_PACKAGE_LIMIT */ + CH04 (__METHOD__, 0x01, 0x37, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_PACKAGE_LIMIT */ } Else { - CH04 ("", 0x00, 0x55, 0x00, 0x48, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (__METHOD__, 0x00, 0x55, 0x00, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } CH03 ("", 0x00, 0x09, 0x4B, 0x00) @@ -101,22 +101,22 @@ }, 0x03), Local1) If (Y900) { - CH04 ("", 0x01, 0x36, 0x00, 0x4E, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ + CH04 (__METHOD__, 0x01, 0x36, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ } Else { - CH04 ("", 0x00, 0x55, 0x00, 0x50, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (__METHOD__, 0x00, 0x55, 0x00, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } CH03 ("", 0x00, 0x0C, 0x53, 0x00) Store (Index ("5678", 0x04), Local1) If (Y900) { - CH04 ("", 0x01, 0x3D, 0x00, 0x56, 0x00, 0x00) /* AE_AML_STRING_LIMIT */ + CH04 (__METHOD__, 0x01, 0x3D, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_STRING_LIMIT */ } Else { - CH04 ("", 0x00, 0x55, 0x00, 0x58, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (__METHOD__, 0x00, 0x55, 0x00, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Fields */ @@ -135,11 +135,11 @@ * - and on Store-to-debug stage * Check opcode of the last exception. */ - CH04 ("", 0x02, 0x35, 0x00, 0x6B, 0x00, 0x00) /* AE_AML_REGION_LIMIT */ + CH04 (__METHOD__, 0x02, 0x35, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_REGION_LIMIT */ } Else { - CH04 ("", 0x00, 0x35, 0x00, 0x6D, 0x00, 0x00) /* AE_AML_REGION_LIMIT */ + CH04 (__METHOD__, 0x00, 0x35, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_REGION_LIMIT */ } CH03 ("", 0x00, 0x14, 0x70, 0x00) @@ -148,10 +148,10 @@ { /* See comment to sub-test above */ - CH04 ("", 0x02, 0x44, 0x00, 0x74, 0x00, 0x00) /* AE_AML_REGISTER_LIMIT */ + CH04 (__METHOD__, 0x02, 0x44, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_REGISTER_LIMIT */ } Else { - CH04 ("", 0x00, 0x44, 0x00, 0x76, 0x00, 0x00) /* AE_AML_REGISTER_LIMIT */ + CH04 (__METHOD__, 0x00, 0x44, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_REGISTER_LIMIT */ } } 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 bbcad733c..5db678120 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0178/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0178/DECL.asl @@ -54,11 +54,11 @@ * - and on Store-to-debug stage * Check opcode of the last exception. */ - CH04 ("", 0x02, 0x44, 0x00, 0x35, 0x00, 0x00) /* AE_AML_REGISTER_LIMIT */ + CH04 (__METHOD__, 0x02, 0x44, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_REGISTER_LIMIT */ } Else { - CH04 ("", 0x00, 0x44, 0x00, 0x37, 0x00, 0x00) /* AE_AML_REGISTER_LIMIT */ + CH04 (__METHOD__, 0x00, 0x44, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_REGISTER_LIMIT */ } } @@ -78,7 +78,7 @@ CH03 ("", 0x00, 0x02, 0x43, 0x00) Local0 = BKF0 /* \MF0B.BKF0 */ - CH04 ("", 0x00, 0x44, 0x00, 0x45, 0x00, 0x00) /* AE_AML_REGISTER_LIMIT */ + CH04 (__METHOD__, 0x00, 0x44, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_REGISTER_LIMIT */ } Method (MF0C, 0, Serialized) 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 d395ed6b6..c6bed31ac 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0182/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0182/DECL.asl @@ -64,5 +64,5 @@ } Name (I9Z8, 0xABCD0001) - CH04 ("", 0x00, 0xFF, 0x00, 0x47, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 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 32a49128a..dba7be184 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0189/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0189/DECL.asl @@ -43,11 +43,11 @@ } CH03 ("", 0x00, 0x00, 0x29, 0x00) Local1 = ConcatenateResTemplate (RT00, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x2D, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) Local0 = Buffer (0x01) { 0x78 // x } Local1 = ConcatenateResTemplate (RT00, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x33, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) } 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 0bcd46b59..b4949970f 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0190/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0190/DECL.asl @@ -45,5 +45,5 @@ } CH03 ("", 0x00, 0x00, 0x2B, 0x00) Local1 = ConcatenateResTemplate (RT00, Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x2F, 0x00, 0x00) + 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 509b685da..9310e7c13 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0196/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0196/DECL.asl @@ -35,5 +35,5 @@ CH03 ("", 0x00, 0x00, 0x25, 0x00) Local1 = "0x0x12345678" ToInteger (Local1, Local0) - CH04 ("", 0x00, 0x22, 0x00, 0x28, 0x00, 0x00) /* AE_BAD_HEX_CONSTANT */ + 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 55feb3d68..96ff92348 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0197/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0197/DECL.asl @@ -35,5 +35,5 @@ CH03 ("", 0x00, 0x00, 0x25, 0x00) Local1 = "0x 12345678" ToInteger (Local1, Local0) - CH04 ("", 0x00, 0x22, 0x00, 0x28, 0x00, 0x00) /* AE_BAD_HEX_CONSTANT */ + 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 cd98128bb..bfe47ad56 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0200/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0200/DECL.asl @@ -164,7 +164,7 @@ { CH03 ("", 0x00, 0x00, 0x9C, 0x00) MFB5 () - CH04 ("", 0x00, 0xFF, 0x00, 0x9E, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) } Else { @@ -176,7 +176,7 @@ { CH03 ("", 0x00, 0x02, 0xA5, 0x00) MFBD () - CH04 ("", 0x00, 0xFF, 0x00, 0xA7, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) } Else { @@ -188,7 +188,7 @@ { CH03 ("", 0x00, 0x04, 0xAE, 0x00) MFBE () - CH04 ("", 0x00, 0xFF, 0x00, 0xB0, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) } Else { @@ -201,30 +201,30 @@ SRMT ("mfb6") CH03 ("", 0x00, 0x06, 0xBA, 0x00) MFB6 () - CH04 ("", 0x00, 0xFF, 0x00, 0xBC, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) SRMT ("mfb7") CH03 ("", 0x00, 0x08, 0xBF, 0x00) MFB7 () - CH04 ("", 0x00, 0xFF, 0x00, 0xC1, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) SRMT ("mfb8") CH03 ("", 0x00, 0x0A, 0xC4, 0x00) MFB8 () - CH04 ("", 0x00, 0xFF, 0x00, 0xC6, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) SRMT ("mfb9") CH03 ("", 0x00, 0x0C, 0xC9, 0x00) MFB9 () - CH04 ("", 0x00, 0xFF, 0x00, 0xCB, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) SRMT ("mfba") CH03 ("", 0x00, 0x0E, 0xCE, 0x00) MFBA () - CH04 ("", 0x00, 0xFF, 0x00, 0xD0, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) SRMT ("mfbb") CH03 ("", 0x00, 0x10, 0xD3, 0x00) MFBB () - CH04 ("", 0x00, 0xFF, 0x00, 0xD5, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) SRMT ("mfbf") CH03 ("", 0x00, 0x12, 0xD8, 0x00) MFBF () - CH04 ("", 0x00, 0xFF, 0x00, 0xDA, 0x00, 0x00) + 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 268710fd7..e01c93325 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0210/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0210/DECL.asl @@ -48,7 +48,7 @@ Local0 = 0x02 CH03 ("", 0x00, 0x00, 0x33, 0x00) Divide (0x01, Arg0, Local0) - CH04 ("", 0x00, 0x38, 0x00, 0x35, 0x00, 0x00) /* AE_AML_DIVIDE_BY_ZERO */ + CH04 (__METHOD__, 0x00, 0x38, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_DIVIDE_BY_ZERO */ } Method (M001, 0, NotSerialized) 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 560d0a7b4..2a6e1d621 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0213/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0213/DECL.asl @@ -52,7 +52,7 @@ CH03 ("", 0x00, 0x00, 0x34, 0x00) Local0 = M000 () - CH04 ("", 0x00, 0xFF, 0x00, 0x36, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) Debug = DerefOf (Local0) - CH04 ("", 0x00, 0xFF, 0x00, 0x38, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 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 f292cf947..d5c9f76ce 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0229/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0229/DECL.asl @@ -38,5 +38,5 @@ CH03 ("", 0x00, 0x01, 0x29, 0x00) CH03 ("", 0x00, 0x02, 0x2B, 0x00) ToInteger (B000, Local0) - CH04 ("", 0x00, 0x36, 0x00, 0x2D, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ + 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 b37b95845..97983b964 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0230/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0230/DECL.asl @@ -239,5 +239,5 @@ M100 () /* Expect either ASL compiler error or any AML interpreter exception */ - CH04 ("", 0x00, 0xFF, 0x00, 0x75, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) } 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 e30da58bf..6affa35a4 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0231/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0231/DECL.asl @@ -144,5 +144,5 @@ M100 () /* Expect either ASL compiler error or any AML interpreter exception */ - CH04 ("", 0x00, 0xFF, 0x00, 0x64, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) } 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 feb6db1de..070b087ed 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0238/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0238/DECL.asl @@ -46,11 +46,11 @@ * Release(MX08) above doesn't cause exception * but, seems, it should. */ - CH04 ("", 0x00, 0x40, 0x00, 0x35, 0x00, 0x00) /* AE_AML_MUTEX_ORDER */ + CH04 (__METHOD__, 0x00, 0x40, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_ORDER */ /* Also this */ Release (MX07) - CH04 ("", 0x00, 0x40, 0x00, 0x39, 0x00, 0x00) /* AE_AML_MUTEX_ORDER */ + CH04 (__METHOD__, 0x00, 0x40, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_ORDER */ /* * Now, the Release(MX09) below causes exception, * so we have no way to release MX09. 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 2180212af..562dba1f3 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0241/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0241/DECL.asl @@ -62,7 +62,7 @@ EXC0 = 0x01 } - CH04 ("", 0x00, 0x3E, 0x00, 0x41, 0x00, 0x00) /* AE_AML_NO_RETURN_VALUE */ + CH04 (__METHOD__, 0x00, 0x3E, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_NO_RETURN_VALUE */ } M000 (0x0100) 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 f0c9a2d2f..b836edb08 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0243/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0243/DECL.asl @@ -75,7 +75,7 @@ * If no exception there: * ERROR: NO exception though expected! (it is the contents of bug 238) */ - CH04 ("", 0x00, 0x40, 0x00, 0x49, 0x00, 0x00) /* AE_AML_MUTEX_ORDER */ + CH04 (__METHOD__, 0x00, 0x40, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_ORDER */ /* (4) */ Debug = "Acquiring mutex of level 7:" 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 fff512553..cbaa0609c 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0244/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0244/DECL.asl @@ -287,9 +287,9 @@ } Release (T804) - CH04 ("", 0x00, 0x41, 0x00, 0x0151, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ + CH04 (__METHOD__, 0x00, 0x41, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ Release (T805) - CH04 ("", 0x00, 0x41, 0x00, 0x0154, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ + CH04 (__METHOD__, 0x00, 0x41, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ /* Release T807 */ If (!I107) 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 fa9b23acc..318d905ad 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0248/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0248/DECL.asl @@ -140,7 +140,7 @@ MM00 () /* Check opcode of the last exception */ - CH04 ("", 0x02, 0x2F, 0x00, 0x8E, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (__METHOD__, 0x02, 0x2F, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ } /* @@ -201,9 +201,9 @@ Debug = Local7 } - CH04 ("", 0x00, 0xFF, 0x00, 0xCB, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) Local7 = (I001 + 0x01) - CH04 ("", 0x00, 0xFF, 0x00, 0xCF, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) /* * Looks identical to b248: "Incorrect ReferenceCount on Switch operation" * (though there is no Switch operation) 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 e00b9c7a0..42277215b 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0258/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0258/DECL.asl @@ -78,7 +78,7 @@ } Load (R258, H258) /* \H258 */ - If (CH04 ("", 0x00, 0x08, 0x00, 0x58, 0x00, 0x00)) + If (CH04 (__METHOD__, 0x00, 0x08, 0x00, __LINE__, 0x00, 0x00)) { Return ( /* AE_TYPE */ 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 308aa7cb6..2778407ad 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0284/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0284/DECL.asl @@ -67,7 +67,7 @@ /* An exception is expected */ Load (RFU0, HI0) /* \D284.TST0.HI0_ */ - If (CH04 ("", 0x00, 0xFF, 0x00, 0x49, 0x00, 0x00)) + If (CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00)) { Unload (HI0) CH03 ("", 0x00, 0x02, 0x4B, 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 b27401c30..5b01ca00f 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0286/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0286/DECL.asl @@ -65,7 +65,7 @@ RFU3 = BUF3 /* \D286.BUF3 */ Load (RFU3, DDB0) /* \D286.TST0.DDB0 */ M000 (RefOf (\AUXD.PAC0)) - CH04 ("", 0x00, 0xFF, 0x00, 0x4A, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) Debug = DerefOf (\AUXD.PAC0 [0x00]) CH03 ("", 0x00, 0x02, 0x4D, 0x00) Unload (DDB0) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0287/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0287/DECL.asl index 815fe9fe4..3b6a618a4 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0287/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0287/DECL.asl @@ -39,7 +39,7 @@ /* SignatureString is greater than four characters */ LoadTable ("OEMXX", "", "", "", "\\D287.PLDT", 0x01) - CH04 ("", 0x00, 0xFF, 0x00, 0x2D, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) If ((PLDT != 0x00)) { ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, PLDT, 0x00) @@ -49,7 +49,7 @@ /* OEMIDString is greater than six characters */ LoadTable ("OEM1", "IntelXX", "", "", "\\D287.PLDT", 0x01) - CH04 ("", 0x00, 0xFF, 0x00, 0x36, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) If ((PLDT != 0x00)) { ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, PLDT, 0x00) @@ -59,7 +59,7 @@ /* OEMTableID is greater than eight characters */ LoadTable ("OEM1", "", "ManyXXXXX", "", "\\D287.PLDT", 0x01) - CH04 ("", 0x00, 0xFF, 0x00, 0x3F, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) If ((PLDT != 0x00)) { ERR (__METHOD__, ZFFF, __LINE__, 0x00, 0x00, PLDT, 0x00) 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 afc2e54a9..d27718c5b 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0292/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0292/DECL.asl @@ -60,9 +60,9 @@ CH03 ("", 0x00, 0x01, 0x40, 0x00) Debug = "SSDT unloaded" Unload (DDB0) - CH04 ("", 0x00, 0xFF, 0x00, 0x44, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) Unload (DDB0) - CH04 ("", 0x00, 0xFF, 0x00, 0x47, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0294/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0294/DECL.asl index cd6cf3416..1e6fa5b58 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0294/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0294/DECL.asl @@ -261,7 +261,7 @@ /* The following Load should cause AE_OWNER_ID_LIMIT */ Load (RFU3, DDB3) /* \D294.TST0.DDB3 */ - CH04 ("", 0x00, 0xFF, 0x00, 0x010A, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) Return (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 094fef394..a77f8995c 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 @@ -500,7 +500,7 @@ If (Arg0) { - CH04 ("", 0x01, 0x12, 0x00, 0x0196, 0x00, 0x00) /* AE_LIMIT */ + CH04 (__METHOD__, 0x01, 0x12, 0x00, __LINE__, 0x00, 0x00) /* AE_LIMIT */ } Else { 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 11051afc0..d61c50e59 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 @@ -49,7 +49,7 @@ Acquire (MX03, 0x0100) CH03 ("", 0x00, 0x00, 0x34, 0x00) Acquire (MX02, 0x0100) - CH04 ("", 0x00, 0x40, 0x00, 0x37, 0x00, 0x00) /* AE_AML_MUTEX_ORDER */ + CH04 (__METHOD__, 0x00, 0x40, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_ORDER */ Local2 = RefOf (P000) /* L0(0x004d5ec8, 0x123), L2 (0x004d5dc8, res of RefOf) */ Local3 = DerefOf (Local2) Debug = "Sit 1: Local2 contains bad object there!!!!!" 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 ac3e66caf..8fd3307b6 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 @@ -144,7 +144,7 @@ M306 (0x09, 0x00) M306 (0x09, 0x00) M306 (0x09, 0x00) - CH04 ("", 0x01, 0x40, 0x00, 0x77, 0x00, 0x00) /* AE_AML_MUTEX_ORDER */ + CH04 (__METHOD__, 0x01, 0x40, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_ORDER */ /* * 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/0304/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0304/DECL.asl index f221b6d3d..1ceb4b506 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0304/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0304/DECL.asl @@ -323,7 +323,7 @@ If (Arg0) { - CH04 ("", 0x00, 0x54, 0x00, 0x0119, 0x00, 0x00) /* AE_AML_METHOD_LIMIT */ + CH04 (__METHOD__, 0x00, 0x54, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_METHOD_LIMIT */ } Else { 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 30dda3cae..b4707dbed 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/common/proc.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/common/proc.asl @@ -188,7 +188,7 @@ Store (Arg0 [Arg2], Local0) CH03 ("", 0x00, 0x0100, 0xA6, 0x00) Local1 = DerefOf (Local0) - CH04 ("", 0x01, 0x33, 0x00, 0xA8, 0x00, 0x00) /* AE_AML_UNINITIALIZED_ELEMENT */ + CH04 (__METHOD__, 0x01, 0x33, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_UNINITIALIZED_ELEMENT */ /* Just before written area */ Local1 = (Arg3 - 0x01) @@ -196,7 +196,7 @@ Store (Arg0 [Local1], Local0) CH03 ("", 0x00, 0x0102, 0xAF, 0x00) Local1 = DerefOf (Local0) - CH04 ("", 0x01, 0x33, 0x00, 0xB1, 0x00, 0x00) /* AE_AML_UNINITIALIZED_ELEMENT */ + CH04 (__METHOD__, 0x01, 0x33, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_UNINITIALIZED_ELEMENT */ } /* Just after pre-initialized and written areas */ @@ -213,7 +213,7 @@ Store (Arg0 [Local7], Local0) CH03 ("", 0x00, 0x0104, 0xBE, 0x00) Local1 = DerefOf (Local0) - CH04 ("", 0x01, 0x33, 0x00, 0xC0, 0x00, 0x00) /* AE_AML_UNINITIALIZED_ELEMENT */ + CH04 (__METHOD__, 0x01, 0x33, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_UNINITIALIZED_ELEMENT */ /* Last element of Package */ Local1 = (Arg1 - 0x01) @@ -221,7 +221,7 @@ Store (Arg0 [Local1], Local0) CH03 ("", 0x00, 0x0106, 0xC7, 0x00) Local1 = DerefOf (Local0) - CH04 ("", 0x01, 0x33, 0x00, 0xC9, 0x00, 0x00) /* AE_AML_UNINITIALIZED_ELEMENT */ + CH04 (__METHOD__, 0x01, 0x33, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_UNINITIALIZED_ELEMENT */ } } Else @@ -232,7 +232,7 @@ Store (Arg0 [Arg2], Local0) CH03 ("", 0x00, 0x0108, 0xD0, 0x00) Local1 = DerefOf (Local0) - CH04 ("", 0x01, 0x33, 0x00, 0xD2, 0x00, 0x00) /* AE_AML_UNINITIALIZED_ELEMENT */ + CH04 (__METHOD__, 0x01, 0x33, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_UNINITIALIZED_ELEMENT */ /* Last element of Package */ Local1 = (Arg1 - 0x01) @@ -240,7 +240,7 @@ Store (Arg0 [Local1], Local0) CH03 ("", 0x00, 0x010A, 0xD9, 0x00) Local1 = DerefOf (Local0) - CH04 ("", 0x01, 0x33, 0x00, 0xDB, 0x00, 0x00) /* AE_AML_UNINITIALIZED_ELEMENT */ + CH04 (__METHOD__, 0x01, 0x33, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_UNINITIALIZED_ELEMENT */ } } @@ -249,14 +249,14 @@ TRC1 (Arg0, Arg1, 0xF0F0F0F0) CH03 ("", 0x00, 0x010C, 0xE2, 0x00) Local0 = Arg0 [Arg1] - CH04 ("", 0x00, 0x37, 0x00, 0xE4, 0x00, 0x00) /* AE_AML_PACKAGE_LIMIT */ + 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) Local0 = Arg0 [Local7] - CH04 ("", 0x00, 0x37, 0x00, 0xEB, 0x00, 0x00) /* AE_AML_PACKAGE_LIMIT */ + CH04 (__METHOD__, 0x00, 0x37, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_PACKAGE_LIMIT */ } If ((0xFFFFFFFFFFFFFFFF >= Arg1)) @@ -264,7 +264,7 @@ TRC1 (Arg0, 0xFFFFFFFFFFFFFFFF, 0xF0F0F0F0) CH03 ("", 0x00, 0x0110, 0xF0, 0x00) Local0 = Arg0 [0xFFFFFFFFFFFFFFFF] - CH04 ("", 0x00, 0x37, 0x00, 0xF2, 0x00, 0x00) /* AE_AML_PACKAGE_LIMIT */ + CH04 (__METHOD__, 0x00, 0x37, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_PACKAGE_LIMIT */ } /* Check near the maximal bound of a simple Package */ @@ -324,7 +324,7 @@ Store (Arg0 [Arg5], Local0) CH03 ("", 0x00, 0x0114, 0x0129, 0x00) Local1 = DerefOf (Local0) - CH04 ("", 0x01, 0x33, 0x00, 0x012B, 0x00, 0x00) /* AE_AML_UNINITIALIZED_ELEMENT */ + CH04 (__METHOD__, 0x01, 0x33, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_UNINITIALIZED_ELEMENT */ } Else { @@ -333,7 +333,7 @@ TRC1 (Arg0, Arg5, 0xF0F0F0F0) CH03 ("", 0x00, 0x0116, 0x0132, 0x00) Local0 = Arg0 [Arg5] - CH04 ("", 0x00, 0x37, 0x00, 0x0134, 0x00, 0x00) /* AE_AML_PACKAGE_LIMIT */ + CH04 (__METHOD__, 0x00, 0x37, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_PACKAGE_LIMIT */ } } @@ -353,7 +353,7 @@ * - number of exceptions NOT GREATER than two */ /* Check opcode of the first exception */ - CH04 ("", 0x01, 0x38, 0x00, 0x014B, 0x00, 0x00) /* AE_AML_DIVIDE_BY_ZERO */ + CH04 (__METHOD__, 0x01, 0x38, 0x00, __LINE__, 0x00, 0x00) /* AE_AML_DIVIDE_BY_ZERO */ /* Number of exceptions not greater than two */ If ((EXC1 > 0x02)) diff --git a/tests/aslts/src/runtime/collections/complex/misc/misc.asl b/tests/aslts/src/runtime/collections/complex/misc/misc.asl index a31fd9e30..4c910a12c 100644 --- a/tests/aslts/src/runtime/collections/complex/misc/misc.asl +++ b/tests/aslts/src/runtime/collections/complex/misc/misc.asl @@ -1175,7 +1175,7 @@ Zero) ERR (Arg0, Z054, __LINE__, 0x00, 0x00, Local0, 0x00) } - CH04 ("mf86", 0x00, 0xFF, Z054, 0x040F, 0x00, 0x00) + CH04 ("mf86", 0x00, 0xFF, Z054, __LINE__, 0x00, 0x00) } Method (MF87, 1, NotSerialized) @@ -1238,7 +1238,7 @@ Zero) } Else { - CH04 (__METHOD__, 0x00, 0x2F, Z054, 0x0449, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (__METHOD__, 0x00, 0x2F, Z054, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ } } @@ -1257,7 +1257,7 @@ Zero) } Else { - CH04 (__METHOD__, 0x00, 0x2F, Z054, 0x0458, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (__METHOD__, 0x00, 0x2F, Z054, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ } } @@ -1340,14 +1340,14 @@ Zero) { CH03 (__METHOD__, Z054, 0x18, 0x04A8, 0x00) Local0 = (DerefOf (RefOf (MM00)) + 0x02) - CH04 (__METHOD__, 0x00, 0x2F, Z054, 0x04AA, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (__METHOD__, 0x00, 0x2F, Z054, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ } Method (M00A, 0, NotSerialized) { CH03 (__METHOD__, Z054, 0x1A, 0x04AF, 0x00) Local0 = (DerefOf (P000 [0x01]) + 0x03) - CH04 (__METHOD__, 0x00, 0x2F, Z054, 0x04B1, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (__METHOD__, 0x00, 0x2F, Z054, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ } Method (M00B, 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 1f29e49a1..285054441 100644 --- a/tests/aslts/src/runtime/collections/complex/namespace/ns0_root.asl +++ b/tests/aslts/src/runtime/collections/complex/namespace/ns0_root.asl @@ -116,7 +116,7 @@ } Else { - CH04 (__METHOD__, 0x01, 0x05, Z154, 0x69, 0x00, 0x00) /* AE_NOT_FOUND */ + CH04 (__METHOD__, 0x01, 0x05, Z154, __LINE__, 0x00, 0x00) /* AE_NOT_FOUND */ } } @@ -208,7 +208,7 @@ } Else { - CH04 (__METHOD__, 0x01, 0x05, Z154, 0xB4, 0x00, 0x00) /* AE_NOT_FOUND */ + CH04 (__METHOD__, 0x01, 0x05, Z154, __LINE__, 0x00, 0x00) /* AE_NOT_FOUND */ } } @@ -300,7 +300,7 @@ } Else { - CH04 (__METHOD__, 0x01, 0x05, Z154, 0x0100, 0x00, 0x00) /* AE_NOT_FOUND */ + CH04 (__METHOD__, 0x01, 0x05, Z154, __LINE__, 0x00, 0x00) /* AE_NOT_FOUND */ } } @@ -392,7 +392,7 @@ } Else { - CH04 (__METHOD__, 0x01, 0x05, Z154, 0x014C, 0x00, 0x00) /* AE_NOT_FOUND */ + CH04 (__METHOD__, 0x01, 0x05, Z154, __LINE__, 0x00, 0x00) /* AE_NOT_FOUND */ } } 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 98adb2a20..76efbae9a 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 @@ -9985,11 +9985,11 @@ { CH03 (Arg0, Z121, 0x00, 0x2E2A, 0x00) Store (M601 (0x02, 0x06) [Arg1], Local3) - CH04 (Arg0, 0x00, 0x55, Z121, 0x2E2D, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z121, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x03, 0x06) [Arg1], Local3) - CH04 (Arg0, 0x00, 0x55, Z121, 0x2E30, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z121, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x04, 0x00) [Arg1], Local3) - CH04 (Arg0, 0x00, 0x55, Z121, 0x2E33, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z121, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ @@ -10041,11 +10041,11 @@ { CH03 (Arg0, Z121, 0x00, 0x2E6E, 0x00) Local0 = M601 (0x02, 0x06) [Arg1] - CH04 (Arg0, 0x00, 0x55, Z121, 0x2E71, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z121, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x03, 0x06) [Arg1] - CH04 (Arg0, 0x00, 0x55, Z121, 0x2E74, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z121, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x04, 0x00) [Arg1] - CH04 (Arg0, 0x00, 0x55, Z121, 0x2E77, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z121, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ 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 3e3b0780f..618f2f3a3 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 @@ -10871,11 +10871,11 @@ { CH03 (Arg0, Z085, 0x00, 0x2FE8, 0x00) Store (M601 (0x02, 0x06) ["B"], Local3) - CH04 (Arg0, 0x00, 0x55, Z085, 0x2FEB, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z085, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x03, 0x06) ["B"], Local3) - CH04 (Arg0, 0x00, 0x55, Z085, 0x2FEE, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z085, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x04, 0x00) ["B"], Local3) - CH04 (Arg0, 0x00, 0x55, Z085, 0x2FF1, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z085, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ @@ -10927,11 +10927,11 @@ { CH03 (Arg0, Z085, 0x00, 0x302D, 0x00) Local0 = M601 (0x02, 0x06) ["B"] - CH04 (Arg0, 0x00, 0x55, Z085, 0x3030, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z085, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x03, 0x06) ["B"] - CH04 (Arg0, 0x00, 0x55, Z085, 0x3033, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z085, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x04, 0x00) ["B"] - CH04 (Arg0, 0x00, 0x55, Z085, 0x3036, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z085, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ @@ -30674,17 +30674,17 @@ { 0x0B // . }], Local3) - CH04 (Arg0, 0x00, 0x55, Z085, 0x5E8D, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z085, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x03, 0x06) [Buffer (0x01) { 0x0B // . }], Local3) - CH04 (Arg0, 0x00, 0x55, Z085, 0x5E90, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z085, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x04, 0x00) [Buffer (0x01) { 0x0B // . }], Local3) - CH04 (Arg0, 0x00, 0x55, Z085, 0x5E93, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z085, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ @@ -30784,17 +30784,17 @@ { 0x0B // . }] - CH04 (Arg0, 0x00, 0x55, Z085, 0x5ED1, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z085, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x03, 0x06) [Buffer (0x01) { 0x0B // . }] - CH04 (Arg0, 0x00, 0x55, Z085, 0x5ED4, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z085, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x04, 0x00) [Buffer (0x01) { 0x0B // . }] - CH04 (Arg0, 0x00, 0x55, Z085, 0x5ED7, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z085, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ 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 819ac0347..ad3086c57 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 @@ -10110,11 +10110,11 @@ { CH03 (Arg0, Z117, 0x00, 0x2EED, 0x00) Store (M601 (0x02, 0x06) [Local1], Local5) - CH04 (Arg0, 0x00, 0x55, Z117, 0x2EF0, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z117, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x03, 0x06) [Local1], Local5) - CH04 (Arg0, 0x00, 0x55, Z117, 0x2EF3, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z117, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x04, 0x00) [Local1], Local5) - CH04 (Arg0, 0x00, 0x55, Z117, 0x2EF6, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z117, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ @@ -10166,11 +10166,11 @@ { CH03 (Arg0, Z117, 0x00, 0x2F31, 0x00) Local0 = M601 (0x02, 0x06) [Local1] - CH04 (Arg0, 0x00, 0x55, Z117, 0x2F34, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z117, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x03, 0x06) [Local1] - CH04 (Arg0, 0x00, 0x55, Z117, 0x2F37, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z117, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x04, 0x00) [Local1] - CH04 (Arg0, 0x00, 0x55, Z117, 0x2F3A, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z117, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ 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 3e8eafb49..738c753b2 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 @@ -9986,11 +9986,11 @@ { CH03 (Arg0, Z086, 0x00, 0x2E2C, 0x00) Store (M601 (0x02, 0x06) [S614], Local3) - CH04 (Arg0, 0x00, 0x55, Z086, 0x2E2F, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z086, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x03, 0x06) [S614], Local3) - CH04 (Arg0, 0x00, 0x55, Z086, 0x2E32, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z086, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x04, 0x00) [S614], Local3) - CH04 (Arg0, 0x00, 0x55, Z086, 0x2E35, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z086, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ @@ -10042,11 +10042,11 @@ { CH03 (Arg0, Z086, 0x00, 0x2E70, 0x00) Local0 = M601 (0x02, 0x06) [S614] /* \S614 */ - CH04 (Arg0, 0x00, 0x55, Z086, 0x2E73, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z086, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x03, 0x06) [S614] /* \S614 */ - CH04 (Arg0, 0x00, 0x55, Z086, 0x2E76, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z086, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x04, 0x00) [S614] /* \S614 */ - CH04 (Arg0, 0x00, 0x55, Z086, 0x2E79, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z086, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ @@ -19732,11 +19732,11 @@ { CH03 (Arg0, Z086, 0x00, 0x5AC9, 0x00) Store (M601 (0x02, 0x06) [B60E], Local3) - CH04 (Arg0, 0x00, 0x55, Z086, 0x5ACC, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z086, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x03, 0x06) [B60E], Local3) - CH04 (Arg0, 0x00, 0x55, Z086, 0x5ACF, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z086, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x04, 0x00) [B60E], Local3) - CH04 (Arg0, 0x00, 0x55, Z086, 0x5AD2, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z086, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ @@ -19788,11 +19788,11 @@ { CH03 (Arg0, Z086, 0x00, 0x5B0D, 0x00) Local0 = M601 (0x02, 0x06) [B60E] /* \B60E */ - CH04 (Arg0, 0x00, 0x55, Z086, 0x5B10, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z086, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x03, 0x06) [B60E] /* \B60E */ - CH04 (Arg0, 0x00, 0x55, Z086, 0x5B13, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z086, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x04, 0x00) [B60E] /* \B60E */ - CH04 (Arg0, 0x00, 0x55, Z086, 0x5B16, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z086, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ 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 c39224558..d9b0f8b44 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 @@ -9367,11 +9367,11 @@ { CH03 (Arg0, Z087, 0x00, 0x2B41, 0x00) Store (M601 (0x02, 0x06) [BF74], Local3) - CH04 (Arg0, 0x00, 0x55, Z087, 0x2B44, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z087, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x03, 0x06) [BF74], Local3) - CH04 (Arg0, 0x00, 0x55, Z087, 0x2B47, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z087, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x04, 0x00) [BF74], Local3) - CH04 (Arg0, 0x00, 0x55, Z087, 0x2B4A, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z087, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ @@ -9423,11 +9423,11 @@ { CH03 (Arg0, Z087, 0x00, 0x2B85, 0x00) Local0 = M601 (0x02, 0x06) [BF74] /* \BF74 */ - CH04 (Arg0, 0x00, 0x55, Z087, 0x2B88, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z087, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x03, 0x06) [BF74] /* \BF74 */ - CH04 (Arg0, 0x00, 0x55, Z087, 0x2B8B, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z087, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x04, 0x00) [BF74] /* \BF74 */ - CH04 (Arg0, 0x00, 0x55, Z087, 0x2B8E, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z087, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ 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 14a248aed..b3f5d1e46 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 @@ -10112,11 +10112,11 @@ { CH03 (Arg0, Z088, 0x00, 0x2EEF, 0x00) Store (M601 (0x02, 0x06) [S614], Local3) - CH04 (Arg0, 0x00, 0x55, Z088, 0x2EF2, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z088, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x03, 0x06) [S614], Local3) - CH04 (Arg0, 0x00, 0x55, Z088, 0x2EF5, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z088, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x04, 0x00) [S614], Local3) - CH04 (Arg0, 0x00, 0x55, Z088, 0x2EF8, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z088, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ @@ -10168,11 +10168,11 @@ { CH03 (Arg0, Z088, 0x00, 0x2F33, 0x00) Local0 = M601 (0x02, 0x06) [S614] /* \M613.M02D.S614 */ - CH04 (Arg0, 0x00, 0x55, Z088, 0x2F36, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z088, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x03, 0x06) [S614] /* \M613.M02D.S614 */ - CH04 (Arg0, 0x00, 0x55, Z088, 0x2F39, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z088, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x04, 0x00) [S614] /* \M613.M02D.S614 */ - CH04 (Arg0, 0x00, 0x55, Z088, 0x2F3C, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z088, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ @@ -20325,11 +20325,11 @@ { CH03 (Arg0, Z088, 0x00, 0x5C4F, 0x00) Store (M601 (0x02, 0x06) [B60E], Local3) - CH04 (Arg0, 0x00, 0x55, Z088, 0x5C52, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z088, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x03, 0x06) [B60E], Local3) - CH04 (Arg0, 0x00, 0x55, Z088, 0x5C55, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z088, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x04, 0x00) [B60E], Local3) - CH04 (Arg0, 0x00, 0x55, Z088, 0x5C58, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z088, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ @@ -20381,11 +20381,11 @@ { CH03 (Arg0, Z088, 0x00, 0x5C93, 0x00) Local0 = M601 (0x02, 0x06) [B60E] /* \M613.M067.B60E */ - CH04 (Arg0, 0x00, 0x55, Z088, 0x5C96, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z088, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x03, 0x06) [B60E] /* \M613.M067.B60E */ - CH04 (Arg0, 0x00, 0x55, Z088, 0x5C99, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z088, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x04, 0x00) [B60E] /* \M613.M067.B60E */ - CH04 (Arg0, 0x00, 0x55, Z088, 0x5C9C, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z088, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ 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 399bc5953..b7e475a76 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 @@ -9954,11 +9954,11 @@ { CH03 (Arg0, Z089, 0x00, 0x2CBE, 0x00) Store (M601 (0x02, 0x06) [BF74], Local3) - CH04 (Arg0, 0x00, 0x55, Z089, 0x2CC1, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z089, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x03, 0x06) [BF74], Local3) - CH04 (Arg0, 0x00, 0x55, Z089, 0x2CC4, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z089, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x04, 0x00) [BF74], Local3) - CH04 (Arg0, 0x00, 0x55, Z089, 0x2CC7, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z089, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ @@ -10010,11 +10010,11 @@ { CH03 (Arg0, Z088, 0x00, 0x2D02, 0x00) Local0 = M601 (0x02, 0x06) [BF74] /* \M614.M067.BF74 */ - CH04 (Arg0, 0x00, 0x55, Z088, 0x2D05, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z088, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x03, 0x06) [BF74] /* \M614.M067.BF74 */ - CH04 (Arg0, 0x00, 0x55, Z088, 0x2D08, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z088, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x04, 0x00) [BF74] /* \M614.M067.BF74 */ - CH04 (Arg0, 0x00, 0x55, Z088, 0x2D0B, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z088, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ 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 f5e0d54ad..e52d846bd 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 @@ -10679,11 +10679,11 @@ { CH03 (Arg0, Z090, 0x00, 0x2E2C, 0x00) Store (M601 (0x02, 0x06) [DerefOf (PS60 [0x14])], Local3) - CH04 (Arg0, 0x00, 0x55, Z090, 0x2E2F, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z090, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x03, 0x06) [DerefOf (PS60 [0x14])], Local3) - CH04 (Arg0, 0x00, 0x55, Z090, 0x2E32, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z090, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x04, 0x00) [DerefOf (PS60 [0x14])], Local3) - CH04 (Arg0, 0x00, 0x55, Z090, 0x2E35, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z090, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ @@ -10738,11 +10738,11 @@ { CH03 (Arg0, Z090, 0x00, 0x2E70, 0x00) Local0 = M601 (0x02, 0x06) [DerefOf (PS60 [0x14])] - CH04 (Arg0, 0x00, 0x55, Z090, 0x2E73, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z090, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x03, 0x06) [DerefOf (PS60 [0x14])] - CH04 (Arg0, 0x00, 0x55, Z090, 0x2E76, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z090, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x04, 0x00) [DerefOf (PS60 [0x14])] - CH04 (Arg0, 0x00, 0x55, Z090, 0x2E79, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z090, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ @@ -21119,11 +21119,11 @@ { CH03 (Arg0, Z090, 0x00, 0x5AC9, 0x00) Store (M601 (0x02, 0x06) [DerefOf (PB60 [0x0E])], Local3) - CH04 (Arg0, 0x00, 0x55, Z090, 0x5ACC, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z090, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x03, 0x06) [DerefOf (PB60 [0x0E])], Local3) - CH04 (Arg0, 0x00, 0x55, Z090, 0x5ACF, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z090, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x04, 0x00) [DerefOf (PB60 [0x0E])], Local3) - CH04 (Arg0, 0x00, 0x55, Z090, 0x5AD2, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z090, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ @@ -21178,11 +21178,11 @@ { CH03 (Arg0, Z090, 0x00, 0x5B0D, 0x00) Local0 = M601 (0x02, 0x06) [DerefOf (PB60 [0x0E])] - CH04 (Arg0, 0x00, 0x55, Z090, 0x5B10, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z090, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x03, 0x06) [DerefOf (PB60 [0x0E])] - CH04 (Arg0, 0x00, 0x55, Z090, 0x5B13, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z090, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x04, 0x00) [DerefOf (PB60 [0x0E])] - CH04 (Arg0, 0x00, 0x55, Z090, 0x5B16, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z090, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ 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 c8b969699..eb2d37a54 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 @@ -9998,11 +9998,11 @@ { CH03 (Arg0, Z091, 0x00, 0x2E2C, 0x00) Store (M601 (0x02, 0x06) [DerefOf (RefOf (S614))], Local3) - CH04 (Arg0, 0x00, 0x55, Z091, 0x2E2F, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z091, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x03, 0x06) [DerefOf (RefOf (S614))], Local3) - CH04 (Arg0, 0x00, 0x55, Z091, 0x2E32, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z091, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x04, 0x00) [DerefOf (RefOf (S614))], Local3) - CH04 (Arg0, 0x00, 0x55, Z091, 0x2E35, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z091, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ @@ -10054,11 +10054,11 @@ { CH03 (Arg0, Z091, 0x00, 0x2E70, 0x00) Local0 = M601 (0x02, 0x06) [DerefOf (RefOf (S614))] - CH04 (Arg0, 0x00, 0x55, Z091, 0x2E73, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z091, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x03, 0x06) [DerefOf (RefOf (S614))] - CH04 (Arg0, 0x00, 0x55, Z091, 0x2E76, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z091, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x04, 0x00) [DerefOf (RefOf (S614))] - CH04 (Arg0, 0x00, 0x55, Z091, 0x2E79, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z091, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ @@ -19790,11 +19790,11 @@ { CH03 (Arg0, Z091, 0x00, 0x5AC9, 0x00) Store (M601 (0x02, 0x06) [DerefOf (RefOf (B60E))], Local3) - CH04 (Arg0, 0x00, 0x55, Z091, 0x5ACC, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z091, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x03, 0x06) [DerefOf (RefOf (B60E))], Local3) - CH04 (Arg0, 0x00, 0x55, Z091, 0x5ACF, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z091, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x04, 0x00) [DerefOf (RefOf (B60E))], Local3) - CH04 (Arg0, 0x00, 0x55, Z091, 0x5AD2, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z091, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ @@ -19846,11 +19846,11 @@ { CH03 (Arg0, Z091, 0x00, 0x5B0D, 0x00) Local0 = M601 (0x02, 0x06) [DerefOf (RefOf (B60E))] - CH04 (Arg0, 0x00, 0x55, Z091, 0x5B10, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z091, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x03, 0x06) [DerefOf (RefOf (B60E))] - CH04 (Arg0, 0x00, 0x55, Z091, 0x5B13, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z091, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x04, 0x00) [DerefOf (RefOf (B60E))] - CH04 (Arg0, 0x00, 0x55, Z091, 0x5B16, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z091, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ 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 b4e7ec1d8..46a7c2084 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 @@ -9375,11 +9375,11 @@ { CH03 (Arg0, Z120, 0x00, 0x2B33, 0x00) Store (M601 (0x02, 0x06) [DerefOf (RefOf (BF74))], Local3) - CH04 (Arg0, 0x00, 0x55, Z120, 0x2B36, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z120, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x03, 0x06) [DerefOf (RefOf (BF74))], Local3) - CH04 (Arg0, 0x00, 0x55, Z120, 0x2B39, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z120, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x04, 0x00) [DerefOf (RefOf (BF74))], Local3) - CH04 (Arg0, 0x00, 0x55, Z120, 0x2B3C, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z120, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ @@ -9431,11 +9431,11 @@ { CH03 (Arg0, Z120, 0x00, 0x2B77, 0x00) Local0 = M601 (0x02, 0x06) [DerefOf (RefOf (BF74))] - CH04 (Arg0, 0x00, 0x55, Z120, 0x2B7A, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z120, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x03, 0x06) [DerefOf (RefOf (BF74))] - CH04 (Arg0, 0x00, 0x55, Z120, 0x2B7D, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z120, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x04, 0x00) [DerefOf (RefOf (BF74))] - CH04 (Arg0, 0x00, 0x55, Z120, 0x2B80, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z120, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ 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 5bc701e6e..fdc528f74 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 @@ -11503,13 +11503,13 @@ CH03 (Arg0, Z119, 0x00, 0x2E2D, 0x00) Store (M601 (0x02, 0x06) [DerefOf (M604 (0x02, 0x02, 0x14, 0x01))], Local3) - CH04 (Arg0, 0x00, 0x55, Z119, 0x2E30, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z119, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x03, 0x06) [DerefOf (M604 (0x02, 0x02, 0x14, 0x01))], Local3) - CH04 (Arg0, 0x00, 0x55, Z119, 0x2E33, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z119, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x04, 0x00) [DerefOf (M604 (0x02, 0x02, 0x14, 0x01))], Local3) - CH04 (Arg0, 0x00, 0x55, Z119, 0x2E36, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z119, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ @@ -11567,11 +11567,11 @@ { CH03 (Arg0, Z119, 0x00, 0x2E71, 0x00) Local0 = M601 (0x02, 0x06) [DerefOf (M604 (0x02, 0x02, 0x14, 0x01))] - CH04 (Arg0, 0x00, 0x55, Z119, 0x2E74, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z119, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x03, 0x06) [DerefOf (M604 (0x02, 0x02, 0x14, 0x01))] - CH04 (Arg0, 0x00, 0x55, Z119, 0x2E77, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z119, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x04, 0x00) [DerefOf (M604 (0x02, 0x02, 0x14, 0x01))] - CH04 (Arg0, 0x00, 0x55, Z119, 0x2E7A, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z119, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ @@ -22703,13 +22703,13 @@ CH03 (Arg0, Z119, 0x00, 0x5ACB, 0x00) Store (M601 (0x02, 0x06) [DerefOf (M604 (0x02, 0x03, 0x0E, 0x01))], Local3) - CH04 (Arg0, 0x00, 0x55, Z119, 0x5ACE, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z119, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x03, 0x06) [DerefOf (M604 (0x02, 0x03, 0x0E, 0x01))], Local3) - CH04 (Arg0, 0x00, 0x55, Z119, 0x5AD1, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z119, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x04, 0x00) [DerefOf (M604 (0x02, 0x03, 0x0E, 0x01))], Local3) - CH04 (Arg0, 0x00, 0x55, Z119, 0x5AD4, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z119, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ @@ -22767,11 +22767,11 @@ { CH03 (Arg0, Z119, 0x00, 0x5B0F, 0x00) Local0 = M601 (0x02, 0x06) [DerefOf (M604 (0x02, 0x03, 0x0E, 0x01))] - CH04 (Arg0, 0x00, 0x55, Z119, 0x5B12, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z119, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x03, 0x06) [DerefOf (M604 (0x02, 0x03, 0x0E, 0x01))] - CH04 (Arg0, 0x00, 0x55, Z119, 0x5B15, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z119, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x04, 0x00) [DerefOf (M604 (0x02, 0x03, 0x0E, 0x01))] - CH04 (Arg0, 0x00, 0x55, Z119, 0x5B18, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z119, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ 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 babd67f98..477c51610 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 @@ -10679,11 +10679,11 @@ { CH03 (Arg0, Z118, 0x00, 0x2E2C, 0x00) Store (M601 (0x02, 0x06) [M604 (0x00, 0x02, 0x14, 0x00)], Local3) - CH04 (Arg0, 0x00, 0x55, Z118, 0x2E2F, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z118, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x03, 0x06) [M604 (0x00, 0x02, 0x14, 0x00)], Local3) - CH04 (Arg0, 0x00, 0x55, Z118, 0x2E32, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z118, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x04, 0x00) [M604 (0x00, 0x02, 0x14, 0x00)], Local3) - CH04 (Arg0, 0x00, 0x55, Z118, 0x2E35, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z118, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ @@ -10738,11 +10738,11 @@ { CH03 (Arg0, Z118, 0x00, 0x2E70, 0x00) Local0 = M601 (0x02, 0x06) [M604 (0x00, 0x02, 0x14, 0x00)] - CH04 (Arg0, 0x00, 0x55, Z118, 0x2E73, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z118, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x03, 0x06) [M604 (0x00, 0x02, 0x14, 0x00)] - CH04 (Arg0, 0x00, 0x55, Z118, 0x2E76, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z118, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x04, 0x00) [M604 (0x00, 0x02, 0x14, 0x00)] - CH04 (Arg0, 0x00, 0x55, Z118, 0x2E79, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z118, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ @@ -21120,11 +21120,11 @@ { CH03 (Arg0, Z118, 0x00, 0x5AC9, 0x00) Store (M601 (0x02, 0x06) [M604 (0x00, 0x03, 0x0E, 0x00)], Local3) - CH04 (Arg0, 0x00, 0x55, Z118, 0x5ACC, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z118, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x03, 0x06) [M604 (0x00, 0x03, 0x0E, 0x00)], Local3) - CH04 (Arg0, 0x00, 0x55, Z118, 0x5ACF, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z118, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Store (M601 (0x04, 0x00) [M604 (0x00, 0x03, 0x0E, 0x00)], Local3) - CH04 (Arg0, 0x00, 0x55, Z118, 0x5AD2, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z118, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ @@ -21179,11 +21179,11 @@ { CH03 (Arg0, Z118, 0x00, 0x5B0D, 0x00) Local0 = M601 (0x02, 0x06) [M604 (0x00, 0x03, 0x0E, 0x00)] - CH04 (Arg0, 0x00, 0x55, Z118, 0x5B10, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z118, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x03, 0x06) [M604 (0x00, 0x03, 0x0E, 0x00)] - CH04 (Arg0, 0x00, 0x55, Z118, 0x5B13, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z118, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ Local0 = M601 (0x04, 0x00) [M604 (0x00, 0x03, 0x0E, 0x00)] - CH04 (Arg0, 0x00, 0x55, Z118, 0x5B16, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (Arg0, 0x00, 0x55, Z118, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Method returns Reference */ diff --git a/tests/aslts/src/runtime/collections/exceptions/exc/exc.asl b/tests/aslts/src/runtime/collections/exceptions/exc/exc.asl index 8b856ef63..a8861389d 100644 --- a/tests/aslts/src/runtime/collections/exceptions/exc/exc.asl +++ b/tests/aslts/src/runtime/collections/exceptions/exc/exc.asl @@ -43,7 +43,7 @@ CH03 (__METHOD__, Z058, 0x01, 0x31, 0x00) Local0 = 0x00 Divide (Local1, Local0, Local2) - CH04 (__METHOD__, 0x00, 0x38, Z058, 0x36, 0x00, 0x00) /* AE_AML_DIVIDE_BY_ZERO */ + 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) @@ -60,7 +60,7 @@ CH03 (__METHOD__, Z058, 0x05, 0x49, 0x00) Local0 = 0x00 Local2 = (Local1 % Local0) - CH04 (__METHOD__, 0x00, 0x38, Z058, 0x4E, 0x00, 0x00) /* AE_AML_DIVIDE_BY_ZERO */ + CH04 (__METHOD__, 0x00, 0x38, Z058, __LINE__, 0x00, 0x00) /* AE_AML_DIVIDE_BY_ZERO */ Local0 = 0x02 Local2 = (Local1 % Local0) CH03 (__METHOD__, Z058, 0x07, 0x53, 0x00) @@ -73,7 +73,7 @@ Mutex (MTX0, 0x00) CH03 (__METHOD__, Z058, 0x08, 0x5D, 0x00) Release (MTX0) - CH04 (__METHOD__, 0x00, 0x41, Z058, 0x61, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ + CH04 (__METHOD__, 0x00, 0x41, Z058, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ } /* SizeOf for data types not an Integer, Buffer, String or Package object */ @@ -143,7 +143,7 @@ } Local5 = SizeOf (Local1) - CH04 (__METHOD__, 0x01, 0x31, Z058, 0xA0, 0x00, 0x00) /* AE_AML_UNINITIALIZED_LOCAL */ + CH04 (__METHOD__, 0x01, 0x31, Z058, __LINE__, 0x00, 0x00) /* AE_AML_UNINITIALIZED_LOCAL */ /* These are now caught by the compiler - Aug 2015 */ /* Store(SizeOf(DEV0), Local5) */ /* CH04(ts, 1, 47, z058, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE */ @@ -222,21 +222,21 @@ Store (P000 [0x02], Local5) CH03 (__METHOD__, Z058, 0x18, 0xED, 0x00) Store (P000 [0x03], Local5) - CH04 (__METHOD__, 0x01, 0x37, Z058, 0xF1, 0x00, 0x00) /* AE_AML_PACKAGE_LIMIT */ + CH04 (__METHOD__, 0x01, 0x37, Z058, __LINE__, 0x00, 0x00) /* AE_AML_PACKAGE_LIMIT */ Local0 = P000 [0x02] CH03 (__METHOD__, Z058, 0x1A, 0xF5, 0x00) Local0 = P000 [0x03] - CH04 (__METHOD__, 0x00, 0x37, Z058, 0xF9, 0x00, 0x00) /* AE_AML_PACKAGE_LIMIT */ + CH04 (__METHOD__, 0x00, 0x37, Z058, __LINE__, 0x00, 0x00) /* AE_AML_PACKAGE_LIMIT */ /* Package(3) */ Store (P001 [0x02], Local5) CH03 (__METHOD__, Z058, 0x1C, 0xFF, 0x00) Local5 = P001 [0x03] - CH04 (__METHOD__, 0x00, 0x37, Z058, 0x0103, 0x00, 0x00) /* AE_AML_PACKAGE_LIMIT */ + CH04 (__METHOD__, 0x00, 0x37, Z058, __LINE__, 0x00, 0x00) /* AE_AML_PACKAGE_LIMIT */ Local0 = P001 [0x02] CH03 (__METHOD__, Z058, 0x1E, 0x0107, 0x00) Local0 = P001 [0x03] - CH04 (__METHOD__, 0x00, 0x37, Z058, 0x010B, 0x00, 0x00) /* AE_AML_PACKAGE_LIMIT */ + CH04 (__METHOD__, 0x00, 0x37, Z058, __LINE__, 0x00, 0x00) /* AE_AML_PACKAGE_LIMIT */ } /* Access out of String */ @@ -250,11 +250,11 @@ Local5 = S000 [0x03] /* Bug 177, Bugzilla 5480. */ - CH04 (__METHOD__, 0x00, 0x3D, Z058, 0x011E, 0x00, 0x00) /* AE_AML_STRING_LIMIT */ + CH04 (__METHOD__, 0x00, 0x3D, Z058, __LINE__, 0x00, 0x00) /* AE_AML_STRING_LIMIT */ Local0 = S000 [0x02] CH03 (__METHOD__, Z058, 0x23, 0x0122, 0x00) Local0 = S000 [0x03] - CH04 (__METHOD__, 0x00, 0x3D, Z058, 0x0126, 0x00, 0x00) /* AE_AML_STRING_LIMIT */ + CH04 (__METHOD__, 0x00, 0x3D, Z058, __LINE__, 0x00, 0x00) /* AE_AML_STRING_LIMIT */ } /* Access out of Buffer */ @@ -275,21 +275,21 @@ Local5 = B000 [0x02] CH03 (__METHOD__, Z058, 0x26, 0x0137, 0x00) Local5 = B000 [0x03] - CH04 (__METHOD__, 0x00, 0x36, Z058, 0x013B, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ + CH04 (__METHOD__, 0x00, 0x36, Z058, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ Local0 = B000 [0x02] CH03 (__METHOD__, Z058, 0x28, 0x013F, 0x00) Local0 = B000 [0x03] - CH04 (__METHOD__, 0x00, 0x36, Z058, 0x0143, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ + CH04 (__METHOD__, 0x00, 0x36, Z058, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ /* Buffer(3) */ Local5 = B001 [0x02] CH03 (__METHOD__, Z058, 0x2A, 0x0149, 0x00) Local5 = B001 [0x03] - CH04 (__METHOD__, 0x00, 0x36, Z058, 0x014D, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ + CH04 (__METHOD__, 0x00, 0x36, Z058, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ Local0 = B001 [0x02] CH03 (__METHOD__, Z058, 0x2C, 0x0151, 0x00) Local0 = B001 [0x03] - CH04 (__METHOD__, 0x00, 0x36, Z058, 0x0155, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ + CH04 (__METHOD__, 0x00, 0x36, Z058, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ } /* ToInteger() passed with an image of a number which value */ @@ -318,7 +318,7 @@ } ToInteger (Local0, Local5) - CH04 (__METHOD__, 0x00, 0x2E, Z058, 0x0170, 0x00, 0x00) /* AE_AML_NO_OPERAND */ + CH04 (__METHOD__, 0x00, 0x2E, Z058, __LINE__, 0x00, 0x00) /* AE_AML_NO_OPERAND */ } /* [Uninitialized] None. */ @@ -333,7 +333,7 @@ CH03 (__METHOD__, Z058, 0x31, 0x017E, 0x00) Local0++ - CH04 (__METHOD__, 0x00, 0x31, Z058, 0x0182, 0x00, 0x00) /* AE_AML_UNINITIALIZED_LOCAL */ + CH04 (__METHOD__, 0x00, 0x31, Z058, __LINE__, 0x00, 0x00) /* AE_AML_UNINITIALIZED_LOCAL */ } Method (M148, 0, NotSerialized) @@ -356,7 +356,7 @@ Stall (Arg0) /* It is now bug 14. */ - CH04 (__METHOD__, 0x00, 0x30, Z058, 0x01A0, 0x00, 0x00) /* AE_AML_OPERAND_VALUE */ + CH04 (__METHOD__, 0x00, 0x30, Z058, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_VALUE */ } /* Bug 14. */ @@ -481,7 +481,7 @@ ToBCD (Local4, Local5) } - CH04 (__METHOD__, 0x00, 0x34, Z058, 0x0215, 0x00, 0x00) /* AE_AML_NUMERIC_OVERFLOW */ + CH04 (__METHOD__, 0x00, 0x34, Z058, __LINE__, 0x00, 0x00) /* AE_AML_NUMERIC_OVERFLOW */ } /* Create field out of buffer */ @@ -493,37 +493,37 @@ CreateBitField (B001, 0x7F, F000) CH03 (__METHOD__, Z058, 0x41, 0x0221, 0x00) CreateBitField (B001, 0x80, F001) - CH04 (__METHOD__, 0x00, 0x36, Z058, 0x0223, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ + CH04 (__METHOD__, 0x00, 0x36, Z058, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ CH03 (__METHOD__, Z058, 0x43, 0x0225, 0x00) CreateByteField (B001, 0x0F, F002) CH03 (__METHOD__, Z058, 0x44, 0x0227, 0x00) CreateByteField (B001, 0x10, F003) - CH04 (__METHOD__, 0x00, 0x36, Z058, 0x0229, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ + CH04 (__METHOD__, 0x00, 0x36, Z058, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ CH03 (__METHOD__, Z058, 0x46, 0x022B, 0x00) CreateWordField (B001, 0x0E, F004) CH03 (__METHOD__, Z058, 0x47, 0x022D, 0x00) CreateWordField (B001, 0x0F, F005) - CH04 (__METHOD__, 0x00, 0x36, Z058, 0x022F, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ + CH04 (__METHOD__, 0x00, 0x36, Z058, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ CH03 (__METHOD__, Z058, 0x49, 0x0231, 0x00) CreateDWordField (B001, 0x0C, F006) CH03 (__METHOD__, Z058, 0x4A, 0x0233, 0x00) CreateDWordField (B001, 0x0D, F007) - CH04 (__METHOD__, 0x00, 0x36, Z058, 0x0235, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ + CH04 (__METHOD__, 0x00, 0x36, Z058, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ CH03 (__METHOD__, Z058, 0x4C, 0x0237, 0x00) CreateQWordField (B001, 0x08, F008) CH03 (__METHOD__, Z058, 0x4D, 0x0239, 0x00) CreateQWordField (B001, 0x09, F009) - CH04 (__METHOD__, 0x00, 0x36, Z058, 0x023B, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ + CH04 (__METHOD__, 0x00, 0x36, Z058, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ CH03 (__METHOD__, Z058, 0x4F, 0x023D, 0x00) CreateField (B001, 0x7F, 0x01, F00A) CH03 (__METHOD__, Z058, 0x50, 0x023F, 0x00) CreateField (B001, 0x80, 0x01, F00B) - CH04 (__METHOD__, 0x00, 0x36, Z058, 0x0241, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ + CH04 (__METHOD__, 0x00, 0x36, Z058, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ CH03 (__METHOD__, Z058, 0x52, 0x0243, 0x00) CreateField (B001, 0x78, 0x08, F00C) CH03 (__METHOD__, Z058, 0x53, 0x0245, 0x00) CreateField (B001, 0x78, 0x09, F00D) - CH04 (__METHOD__, 0x00, 0x36, Z058, 0x0247, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ + CH04 (__METHOD__, 0x00, 0x36, Z058, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ } /* Access to uninitialized local */ @@ -537,7 +537,7 @@ CH03 (__METHOD__, Z058, 0x55, 0x0253, 0x00) Local5 = Local0 [0x00] - CH04 (__METHOD__, 0x00, 0x31, Z058, 0x0257, 0x00, 0x00) /* AE_AML_UNINITIALIZED_LOCAL */ + CH04 (__METHOD__, 0x00, 0x31, Z058, __LINE__, 0x00, 0x00) /* AE_AML_UNINITIALIZED_LOCAL */ } /* Access to an uninitialized element of package */ @@ -565,15 +565,15 @@ * OBSOLETE July 2013. DerefOf on an empty package element now causes error * CH04(ts, 0, 62, z058, __LINE__, 0, 0) */ - CH04 (__METHOD__, 0x01, 0x33, Z058, 0x0274, 0x00, 0x00) /* AE_AML_UNINITIALIZED_ELEMENT */ + CH04 (__METHOD__, 0x01, 0x33, Z058, __LINE__, 0x00, 0x00) /* AE_AML_UNINITIALIZED_ELEMENT */ Local5 = (DerefOf (P000 [0x03]) + 0x01) If (EXCV) { - CH04 (__METHOD__, 0x00, 0x33, Z058, 0x0279, 0x00, 0x00) /* AE_AML_UNINITIALIZED_ELEMENT */ + CH04 (__METHOD__, 0x00, 0x33, Z058, __LINE__, 0x00, 0x00) /* AE_AML_UNINITIALIZED_ELEMENT */ } Else { - CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x027B, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) } Return (0x00) @@ -636,7 +636,7 @@ Local5 = Match (PAC0, MTR, 0x00, MTR, 0x00, 0x00) CH03 (__METHOD__, Z058, 0x5E, 0x02B3, 0x00) Local5 = Match (PAC0, MTR, 0x00, MTR, 0x00, 0x01) - CH04 (__METHOD__, 0x01, 0x37, Z058, 0x02B7, 0x00, 0x00) /* AE_AML_PACKAGE_LIMIT */ + CH04 (__METHOD__, 0x01, 0x37, Z058, __LINE__, 0x00, 0x00) /* AE_AML_PACKAGE_LIMIT */ } /* Exeptional conditions of ConcatenateResTemplate */ @@ -674,11 +674,11 @@ */ If (EXCV) { - CH04 (__METHOD__, 0x00, 0x47, Z058, 0x02E0, 0x00, 0x00) /* AE_AML_NO_RESOURCE_END_TAG */ + CH04 (__METHOD__, 0x00, 0x47, Z058, __LINE__, 0x00, 0x00) /* AE_AML_NO_RESOURCE_END_TAG */ } Else { - CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x02E2, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) } /* One-element 0x79 buffer */ @@ -690,7 +690,7 @@ ConcatenateResTemplate (RT00, Local2, Local5) /* Bug 189. */ - CH04 (__METHOD__, 0x00, 0x47, Z058, 0x02EC, 0x00, 0x00) /* AE_AML_NO_RESOURCE_END_TAG */ + CH04 (__METHOD__, 0x00, 0x47, Z058, __LINE__, 0x00, 0x00) /* AE_AML_NO_RESOURCE_END_TAG */ /* Not resource template buffer */ Local2 = Buffer (0x03) @@ -700,11 +700,11 @@ ConcatenateResTemplate (RT00, Local2, Local5) If (EXCV) { - CH04 (__METHOD__, 0x00, 0x47, Z058, 0x02F5, 0x00, 0x00) /* AE_AML_NO_RESOURCE_END_TAG */ + CH04 (__METHOD__, 0x00, 0x47, Z058, __LINE__, 0x00, 0x00) /* AE_AML_NO_RESOURCE_END_TAG */ } Else { - CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x02F7, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) } /* Nearly resource template buffer */ @@ -716,7 +716,7 @@ ConcatenateResTemplate (RT00, Local2, Local5) /* Bug 190. */ - CH04 (__METHOD__, 0x00, 0x47, Z058, 0x0301, 0x00, 0x00) /* AE_AML_NO_RESOURCE_END_TAG */ + CH04 (__METHOD__, 0x00, 0x47, Z058, __LINE__, 0x00, 0x00) /* AE_AML_NO_RESOURCE_END_TAG */ /* Like resource template buffer */ Local2 = Buffer (0x05) @@ -726,11 +726,11 @@ ConcatenateResTemplate (RT00, Local2, Local5) If (EXCV) { - CH04 (__METHOD__, 0x00, 0x47, Z058, 0x030A, 0x00, 0x00) /* AE_AML_NO_RESOURCE_END_TAG */ + CH04 (__METHOD__, 0x00, 0x47, Z058, __LINE__, 0x00, 0x00) /* AE_AML_NO_RESOURCE_END_TAG */ } Else { - CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x030C, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) } CH03 (__METHOD__, Z058, 0xAB, 0x030F, 0x00) @@ -798,26 +798,26 @@ Local4 = "" ToInteger (Local4, Local5) - CH04 (__METHOD__, 0x00, 0x24, Z058, 0x0356, 0x00, 0x00) /* AE_BAD_DECIMAL_CONSTANT */ + CH04 (__METHOD__, 0x00, 0x24, Z058, __LINE__, 0x00, 0x00) /* AE_BAD_DECIMAL_CONSTANT */ /* ToInteger, String filled with blanks */ Local4 = " " ToInteger (Local4, Local5) /* CH04(ts, 0, 34, z058, __LINE__, 0, 0) // AE_BAD_HEX_CONSTANT */ - CH04 (__METHOD__, 0x00, 0x24, Z058, 0x035D, 0x00, 0x00) /* AE_BAD_DECIMAL_CONSTANT */ + CH04 (__METHOD__, 0x00, 0x24, Z058, __LINE__, 0x00, 0x00) /* AE_BAD_DECIMAL_CONSTANT */ /* Add, zero-length Buffer */ Local5 = (B000 + 0x00) /* CH04(ts, 0, 34, z058, __LINE__, 0, 0) // AE_BAD_HEX_CONSTANT */ - CH04 (__METHOD__, 0x00, 0x36, Z058, 0x0363, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ + CH04 (__METHOD__, 0x00, 0x36, Z058, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ /* ToInteger, zero-length Buffer */ ToInteger (B000, Local5) /* CH04(ts, 0, 34, z058, __LINE__, 0, 0) // AE_BAD_HEX_CONSTANT */ - CH04 (__METHOD__, 0x00, 0x36, Z058, 0x0369, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ + CH04 (__METHOD__, 0x00, 0x36, Z058, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ } /* ////////////////////////////////////////////////////////// */ @@ -831,13 +831,13 @@ Name (I000, 0xAAAAAAAA) CH03 (__METHOD__, Z058, 0x72, 0x0379, 0x00) Store (I000 [0x00], Local5) - CH04 (__METHOD__, 0x01, 0x2F, Z058, 0x037D, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (__METHOD__, 0x01, 0x2F, Z058, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = I000 [0x00] - CH04 (__METHOD__, 0x00, 0x2F, Z058, 0x0381, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (__METHOD__, 0x00, 0x2F, Z058, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Store (I000 [0x00], Local0) - CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x0385, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) Local1 = Local0 = I000 [0x00] - CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x0389, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) } /* Bug 83 */ @@ -849,11 +849,11 @@ /* Bug 83, Bugzilla 5387. */ Local5 = DerefOf (I000) - CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x0399, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) Local0 = DerefOf (I000) /* Bug 83, Bugzilla 5387. */ - CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x039E, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) } /* Index(Local7-Integer) */ @@ -866,19 +866,19 @@ /* Index(Integer) */ Store (Local7 [0x00], Local5) - CH04 (__METHOD__, 0x01, 0x2F, Z058, 0x03B1, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (__METHOD__, 0x01, 0x2F, Z058, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = Local7 [0x00] - CH04 (__METHOD__, 0x00, 0x2F, Z058, 0x03B5, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (__METHOD__, 0x00, 0x2F, Z058, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Store (Local7 [0x00], Local0) - CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x03B9, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) Local1 = Local0 = Local7 [0x00] - CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x03BD, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) /* DerefOf(Integer) */ Local5 = DerefOf (Local7) - CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x03C3, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) Local0 = DerefOf (Local7) - CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x03C7, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) } /* Index(Buffer Field) */ @@ -893,15 +893,15 @@ CreateField (B000, 0x00, 0x08, BF00) CH03 (__METHOD__, Z058, 0x81, 0x03D2, 0x00) Store (BF00 [0x00], Local5) - CH04 (__METHOD__, 0x01, 0x2F, Z058, 0x03D6, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (__METHOD__, 0x01, 0x2F, Z058, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = BF00 [0x00] - CH04 (__METHOD__, 0x00, 0x2F, Z058, 0x03DA, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (__METHOD__, 0x00, 0x2F, Z058, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Store (BF00 [0x00], Local0) - CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x03DE, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) Store (BF00 [0x00], Local0) - CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x03E2, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) Local1 = Local0 = BF00 [0x00] - CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x03E6, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) } /* Bug 83 */ @@ -918,11 +918,11 @@ Local5 = DerefOf (BF00) /* Bug 83, Bugzilla 5387. */ - CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x03F7, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) Local0 = DerefOf (BF00) /* Bug 83, Bugzilla 5387. */ - CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x03FC, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) } /* Index(Field Unit) */ @@ -957,39 +957,39 @@ /* Field */ Store (F000 [0x00], Local5) - CH04 (__METHOD__, 0x01, 0x2F, Z058, 0x0410, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (__METHOD__, 0x01, 0x2F, Z058, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = F000 [0x00] - CH04 (__METHOD__, 0x00, 0x2F, Z058, 0x0414, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (__METHOD__, 0x00, 0x2F, Z058, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Store (F000 [0x00], Local0) - CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x0418, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) Store (F000 [0x00], Local0) - CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x041C, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) Local1 = Local0 = F000 [0x00] - CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x0420, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) /* BankField */ Store (BKF0 [0x00], Local5) - CH04 (__METHOD__, 0x01, 0x2F, Z058, 0x0426, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (__METHOD__, 0x01, 0x2F, Z058, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = BKF0 [0x00] - CH04 (__METHOD__, 0x00, 0x2F, Z058, 0x042A, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (__METHOD__, 0x00, 0x2F, Z058, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Store (BKF0 [0x00], Local0) - CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x042E, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) Store (BKF0 [0x00], Local0) - CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x0432, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) Local1 = Local0 = BKF0 [0x00] - CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x0436, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) /* IndexField */ Store (IF00 [0x00], Local5) - CH04 (__METHOD__, 0x01, 0x2F, Z058, 0x043C, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (__METHOD__, 0x01, 0x2F, Z058, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = IF00 [0x00] - CH04 (__METHOD__, 0x00, 0x2F, Z058, 0x0440, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (__METHOD__, 0x00, 0x2F, Z058, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Store (IF00 [0x00], Local0) - CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x0444, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) Store (IF00 [0x00], Local0) - CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x0448, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) Local1 = Local0 = IF00 [0x00] - CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x044C, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) } /* Bug 83 */ @@ -1026,31 +1026,31 @@ Local5 = DerefOf (F000) /* Bug 83, Bugzilla 5387. */ - CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x0462, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) Local0 = DerefOf (F000) /* Bug 83, Bugzilla 5387. */ - CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x0467, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) /* BankField */ Local5 = DerefOf (BKF0) /* Bug 83, Bugzilla 5387. */ - CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x046E, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) Local0 = DerefOf (BKF0) /* Bug 83, Bugzilla 5387. */ - CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x0473, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) /* IndexField */ Local5 = DerefOf (IF00) /* Bug 83, Bugzilla 5387. */ - CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x047A, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) Local0 = DerefOf (IF00) /* Bug 83, Bugzilla 5387. */ - CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x047F, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) } /* UPDATE exc.m084: Implement this test for all the types of objects */ @@ -1088,7 +1088,7 @@ Store (P000 [0x00], Local0) If (!Arg0) { - CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x04A5, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) } Else { @@ -1125,10 +1125,10 @@ CH03 ("mf9d", Z058, 0xAB, 0x04C4, 0x00) M000 () - CH04 ("mf9d", 0x00, 0xFF, Z058, 0x04C8, 0x00, 0x00) + CH04 ("mf9d", 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) CH03 ("mf9d", Z058, 0xAD, 0x04CA, 0x00) M001 () - CH04 ("mf9d", 0x00, 0xFF, Z058, 0x04CE, 0x00, 0x00) + CH04 ("mf9d", 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) } /* Access out of OpRegion and DataTableRegion */ @@ -1197,7 +1197,7 @@ If ((Local1 < 0x03)) { DerefOf (Local3) = 0x12345678 - CH04 (__METHOD__, 0x00, 0x35, Z058, 0x04FB, 0x00, 0x00)/* AE_AML_REGION_LIMIT */ + CH04 (__METHOD__, 0x00, 0x35, Z058, __LINE__, 0x00, 0x00)/* AE_AML_REGION_LIMIT */ } /* Read */ @@ -1212,7 +1212,7 @@ * Indicate we only care about the first by placing a 1 * in the second argument */ - CH04 (__METHOD__, 0x01, 0x35, Z058, 0x050A, 0x00, 0x00) /* AE_AML_REGION_LIMIT */ + CH04 (__METHOD__, 0x01, 0x35, Z058, __LINE__, 0x00, 0x00) /* AE_AML_REGION_LIMIT */ Local0-- Local1++ } @@ -1276,9 +1276,9 @@ CH03 (__METHOD__, Z058, 0xBF, 0x053F, 0x00) FU00 = 0x12 - CH04 (__METHOD__, 0x00, 0x35, Z058, 0x0543, 0x00, 0x00) /* AE_AML_REGION_LIMIT */ + CH04 (__METHOD__, 0x00, 0x35, Z058, __LINE__, 0x00, 0x00) /* AE_AML_REGION_LIMIT */ FU01 = 0x12 - CH04 (__METHOD__, 0x00, 0x35, Z058, 0x0547, 0x00, 0x00) /* AE_AML_REGION_LIMIT */ + CH04 (__METHOD__, 0x00, 0x35, Z058, __LINE__, 0x00, 0x00) /* AE_AML_REGION_LIMIT */ } /* Attempt to write into DataTableRegion */ @@ -1294,7 +1294,7 @@ Local0 = FU00 /* \M70B.FU00 */ CH03 (__METHOD__, Z058, 0xC2, 0x0556, 0x00) FU00 = 0x00 - CH04 (__METHOD__, 0x00, 0x10, Z058, 0x055A, 0x00, 0x00) /* AE_SUPPORT */ + CH04 (__METHOD__, 0x00, 0x10, Z058, __LINE__, 0x00, 0x00) /* AE_SUPPORT */ } /* Check non-String DataTableRegion *String arguments */ @@ -1312,17 +1312,17 @@ }) CH03 (__METHOD__, Z058, 0xC1, 0x0566, 0x00) DataTableRegion (DR00, B000, "", "") - CH04 (__METHOD__, 0x00, 0x05, Z058, 0x0569, 0x00, 0x00) /* AE_NOT_FOUND */ + CH04 (__METHOD__, 0x00, 0x05, Z058, __LINE__, 0x00, 0x00) /* AE_NOT_FOUND */ DataTableRegion (DR01, "SSDT", B000, "") - CH04 (__METHOD__, 0x00, 0x05, Z058, 0x056C, 0x00, 0x00) /* AE_NOT_FOUND */ + CH04 (__METHOD__, 0x00, 0x05, Z058, __LINE__, 0x00, 0x00) /* AE_NOT_FOUND */ DataTableRegion (DR02, "SSDT", "", B000) - CH04 (__METHOD__, 0x00, 0x05, Z058, 0x056F, 0x00, 0x00) /* AE_NOT_FOUND */ + CH04 (__METHOD__, 0x00, 0x05, Z058, __LINE__, 0x00, 0x00) /* AE_NOT_FOUND */ DataTableRegion (DR03, I000, "", "") - CH04 (__METHOD__, 0x00, 0x05, Z058, 0x0572, 0x00, 0x00) /* AE_NOT_FOUND */ + CH04 (__METHOD__, 0x00, 0x05, Z058, __LINE__, 0x00, 0x00) /* AE_NOT_FOUND */ DataTableRegion (DR04, "SSDT", I000, "") - CH04 (__METHOD__, 0x00, 0x05, Z058, 0x0575, 0x00, 0x00) /* AE_NOT_FOUND */ + CH04 (__METHOD__, 0x00, 0x05, Z058, __LINE__, 0x00, 0x00) /* AE_NOT_FOUND */ DataTableRegion (DR05, "SSDT", "", I000) - CH04 (__METHOD__, 0x00, 0x05, Z058, 0x0578, 0x00, 0x00) /* AE_NOT_FOUND */ + CH04 (__METHOD__, 0x00, 0x05, Z058, __LINE__, 0x00, 0x00) /* AE_NOT_FOUND */ /* These are now caught by the compiler - Aug 2015 */ /* */ /* DataTableRegion (DR06, p000, "", i000) */ @@ -1353,7 +1353,7 @@ /* Invoke Write Quick transaction */ FLD0 = BUFF /* \M7F6.BUFF */ - CH04 (__METHOD__, 0x00, 0x36, Z058, 0x059A, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ + CH04 (__METHOD__, 0x00, 0x36, Z058, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ } /* Name space issues */ @@ -1394,7 +1394,7 @@ CH03 (__METHOD__, Z058, 0xD0, 0x05C2, 0x00) M004 () - CH04 (__METHOD__, 0x00, 0x05, Z058, 0x05C4, 0x00, 0x00) /* AE_NOT_FOUND */ + CH04 (__METHOD__, 0x00, 0x05, Z058, __LINE__, 0x00, 0x00) /* AE_NOT_FOUND */ } Method (M003, 0, NotSerialized) @@ -1403,7 +1403,7 @@ CH03 (__METHOD__, Z058, 0xD0, 0x05CA, 0x00) M003 () - CH04 (__METHOD__, 0x00, 0x54, Z058, 0x05CC, 0x00, 0x00) /* AE_AML_METHOD_LIMIT */ + CH04 (__METHOD__, 0x00, 0x54, Z058, __LINE__, 0x00, 0x00) /* AE_AML_METHOD_LIMIT */ Method (M003, 0, NotSerialized) { Return (0xABCD0002) 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 38c1fa0ed..008d73745 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 @@ -344,7 +344,7 @@ /* DeRefOf(Index(Package, Ind)) */ Local1 = DerefOf (P000 [0x00]) - CH04 (__METHOD__, 0x01, 0x33, Z092, 0x01A2, 0x00, 0x00) + CH04 (__METHOD__, 0x01, 0x33, Z092, __LINE__, 0x00, 0x00) /* CondRefOf */ CondRefOf (DerefOf (P000 [0x00]), Local1) @@ -952,7 +952,7 @@ } Local1 = DerefOf (Arg1) - CH04 (__METHOD__, 0x00, 0x3E, Z092, 0x04F9, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0x3E, Z092, __LINE__, 0x00, 0x00) /* CondRefOf */ CondRefOf (DerefOf (Arg1), Local1) 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 977ebec77..952276308 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 @@ -313,7 +313,7 @@ } Else { - CH04 (__METHOD__, 0x00, 0x55, Z094, 0x013B, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (__METHOD__, 0x00, 0x55, Z094, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } Local1 = Wait (M000 (0x07), 0x00) 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 727d00f0c..b59afdc20 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 @@ -234,7 +234,7 @@ } Else { - CH04 (__METHOD__, 0x00, 0x55, Z095, 0xE6, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (__METHOD__, 0x00, 0x55, Z095, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } Local1 = Wait (M000 (0x07), 0x00) 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 0c38fbdb6..80ada5e38 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 @@ -1827,13 +1827,13 @@ CH03 (__METHOD__, Z096, 0x0123, 0x0904, 0x00) CH03 (__METHOD__, Z096, 0x0127, 0x0905, 0x00) Local1 = M000 () [0x00] - CH04 (__METHOD__, 0x00, 0x55, Z094, 0x0907, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (__METHOD__, 0x00, 0x55, Z094, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ CH03 (__METHOD__, Z096, 0x0129, 0x0909, 0x00) Index ("0", M000 (), Local1) - CH04 (__METHOD__, 0x00, 0xFF, Z094, 0x090B, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (__METHOD__, 0x00, 0xFF, Z094, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ CH03 (__METHOD__, Z096, 0x0129, 0x090D, 0x00) Local1 = SS00 [M000 ()] - CH04 (__METHOD__, 0x00, 0x2F, Z094, 0x090F, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (__METHOD__, 0x00, 0x2F, Z094, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* LEqual */ @@ -2126,7 +2126,7 @@ } Else { - CH04 (__METHOD__, 0x00, 0x55, Z094, 0x0A4E, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (__METHOD__, 0x00, 0x55, Z094, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } /* Wait */ 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 8411e8027..c0c8ebbf5 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 @@ -96,7 +96,7 @@ } Else { - CH04 (__METHOD__, 0x00, 0x55, Z094, 0x5C, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (__METHOD__, 0x00, 0x55, Z094, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } } @@ -131,7 +131,7 @@ } Else { - CH04 (__METHOD__, 0x00, 0x55, Z094, 0x7B, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (__METHOD__, 0x00, 0x55, Z094, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } } @@ -163,7 +163,7 @@ } Else { - CH04 (__METHOD__, 0x00, 0x55, Z097, 0x98, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (__METHOD__, 0x00, 0x55, Z097, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } } Else @@ -248,7 +248,7 @@ } Else { - CH04 (__METHOD__, 0x00, 0x55, Z097, 0xE1, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (__METHOD__, 0x00, 0x55, Z097, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } } Else 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 1bcb32e43..bec1585f2 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 @@ -367,7 +367,7 @@ Local1 = DerefOf (Arg1) If (!SLCK) { - CH04 (__METHOD__, 0x00, 0x2F, Z099, 0x01C1, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0x2F, Z099, __LINE__, 0x00, 0x00) } /* CondRefOf */ @@ -986,7 +986,7 @@ Local1 = DerefOf (M000 (0x01, LPC0)) If (!SLCK) { - CH04 (__METHOD__, 0x00, 0x2F, Z099, 0x04B5, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0x2F, Z099, __LINE__, 0x00, 0x00) } CH00 (Arg0, 0x01) 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 497741b7e..f188faf30 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 @@ -388,7 +388,7 @@ Local1 = DerefOf (Arg1) If (!SLCK) { - CH04 (__METHOD__, 0x00, 0x2F, Z100, 0x01BF, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0x2F, Z100, __LINE__, 0x00, 0x00) } /* CondRefOf */ @@ -1011,7 +1011,7 @@ Local1 = DerefOf (M000 (0x01, LPC0)) If (!SLCK) { - CH04 (__METHOD__, 0x00, 0x2F, Z100, 0x04B2, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0x2F, Z100, __LINE__, 0x00, 0x00) } CH00 (Arg0, 0x01) 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 16a5ead86..9a726e6b3 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 @@ -374,7 +374,7 @@ Local1 = DerefOf (Arg1) If (!SLCK) { - CH04 (__METHOD__, 0x00, 0x2F, Z101, 0x01C4, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0x2F, Z101, __LINE__, 0x00, 0x00) } /* CondRefOf */ @@ -993,7 +993,7 @@ Local1 = DerefOf (M000 (0x01, LPC0)) If (!SLCK) { - CH04 (__METHOD__, 0x00, 0x2F, Z101, 0x04B6, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0x2F, Z101, __LINE__, 0x00, 0x00) } CH00 (Arg0, 0x01) 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 543f335ce..79ec57861 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 @@ -395,7 +395,7 @@ Local1 = DerefOf (Arg1) If (!SLCK) { - CH04 (__METHOD__, 0x00, 0x2F, Z103, 0x01C3, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0x2F, Z103, __LINE__, 0x00, 0x00) } /* CondRefOf */ @@ -1021,7 +1021,7 @@ Local1 = DerefOf (M000 (0x01, LPC0)) If (!SLCK) { - CH04 (__METHOD__, 0x00, 0x2F, Z103, 0x04B6, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0x2F, Z103, __LINE__, 0x00, 0x00) } CH00 (Arg0, 0x01) 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 53b652a5f..3d9a6d05a 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 @@ -374,7 +374,7 @@ Local1 = DerefOf (Arg1) If (!SLCK) { - CH04 (__METHOD__, 0x00, 0x2F, Z104, 0x01C5, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0x2F, Z104, __LINE__, 0x00, 0x00) } /* CondRefOf */ @@ -993,7 +993,7 @@ Local1 = DerefOf (M000 (0x01, LPC0)) If (!SLCK) { - CH04 (__METHOD__, 0x00, 0x2F, Z104, 0x04B8, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0x2F, Z104, __LINE__, 0x00, 0x00) } CH00 (Arg0, 0x01) 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 27065be92..7d2b648bb 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 @@ -84,7 +84,7 @@ } Else { - CH04 (__METHOD__, 0x00, 0x55, Z106, 0x58, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (__METHOD__, 0x00, 0x55, Z106, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } } @@ -119,7 +119,7 @@ } Else { - CH04 (__METHOD__, 0x00, 0x55, Z106, 0x77, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (__METHOD__, 0x00, 0x55, Z106, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } } @@ -151,7 +151,7 @@ } Else { - CH04 (__METHOD__, 0x00, 0x55, Z106, 0x95, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (__METHOD__, 0x00, 0x55, Z106, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } } Else @@ -232,7 +232,7 @@ } Else { - CH04 (__METHOD__, 0x00, 0x55, Z106, 0xDD, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ + CH04 (__METHOD__, 0x00, 0x55, Z106, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } } Else diff --git a/tests/aslts/src/runtime/collections/functional/manipulation/tointeger.asl b/tests/aslts/src/runtime/collections/functional/manipulation/tointeger.asl index 4da337ac6..6e4991cd5 100644 --- a/tests/aslts/src/runtime/collections/functional/manipulation/tointeger.asl +++ b/tests/aslts/src/runtime/collections/functional/manipulation/tointeger.asl @@ -436,11 +436,11 @@ CH03 (__METHOD__, Z047, 0x00, 0x018D, 0x00) Local0 = "0x0123456789abcdefa" ToInteger (Local0, Local2) - CH04 (__METHOD__, 0x00, 0x22, Z047, 0x0190, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0x22, Z047, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z047, 0x02, 0x0192, 0x00) Local0 = "0x000123456789abcdefa" ToInteger (Local0, Local2) - CH04 (__METHOD__, 0x00, 0x22, Z047, 0x0195, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0x22, Z047, __LINE__, 0x00, 0x00) } Else { diff --git a/tests/aslts/src/runtime/collections/functional/reference/ref07.asl b/tests/aslts/src/runtime/collections/functional/reference/ref07.asl index 456a86d8c..e47f237e2 100644 --- a/tests/aslts/src/runtime/collections/functional/reference/ref07.asl +++ b/tests/aslts/src/runtime/collections/functional/reference/ref07.asl @@ -220,41 +220,41 @@ Store (P000 [0x00], Local5) CH03 (__METHOD__, Z116, 0x00, 0xE2, 0x00) Local6 = (Local5 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0xE4, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z116, 0x02, 0xE6, 0x00) Local6 = (DerefOf (Local5) + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0xE8, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z116, 0x04, 0xEA, 0x00) M390 (Local5, V000, 0x00, 0x00) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0xEC, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z116, 0x06, 0xEE, 0x00) M390 (DerefOf (Local5), V000, 0x00, 0x00) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0xF0, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) Local5 = Local2 = P000 [0x00] CH03 (__METHOD__, Z116, 0x08, 0xF4, 0x00) Local6 = (Local5 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0xF6, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z116, 0x0A, 0xF8, 0x00) Local6 = (DerefOf (Local5) + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0xFA, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z116, 0x0C, 0xFC, 0x00) M390 (Local5, V000, 0x00, 0x00) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0xFE, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z116, 0x0E, 0x0100, 0x00) M390 (DerefOf (Local5), V000, 0x00, 0x00) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0102, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z116, 0x10, 0x0104, 0x00) Local6 = (Local2 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0106, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z116, 0x12, 0x0108, 0x00) Local6 = (DerefOf (Local2) + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x010A, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z116, 0x14, 0x010C, 0x00) M390 (Local2, V000, 0x00, 0x00) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x010E, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z116, 0x16, 0x0110, 0x00) M390 (DerefOf (Local2), V000, 0x00, 0x00) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0112, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) } If (Q001) @@ -282,41 +282,41 @@ Store (P000 [0x01], Local5) CH03 (__METHOD__, Z116, 0x18, 0x0131, 0x00) Local6 = (Local5 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0133, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z116, 0x1A, 0x0135, 0x00) Local6 = (DerefOf (Local5) + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0137, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z116, 0x1C, 0x0139, 0x00) M390 (Local5, V000, 0x00, 0x21) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x013B, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z116, 0x1E, 0x013D, 0x00) M390 (DerefOf (Local5), V000, 0x00, 0x22) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x013F, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) Local5 = Local2 = P000 [0x01] CH03 (__METHOD__, Z116, 0x20, 0x0143, 0x00) Local6 = (Local5 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0145, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z116, 0x22, 0x0147, 0x00) Local6 = (DerefOf (Local5) + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0149, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z116, 0x24, 0x014B, 0x00) M390 (Local5, V000, 0x00, 0x23) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x014D, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z116, 0x26, 0x014F, 0x00) M390 (DerefOf (Local5), V000, 0x00, 0x24) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0151, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z116, 0x28, 0x0153, 0x00) Local6 = (Local2 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0155, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z116, 0x2A, 0x0157, 0x00) Local6 = (DerefOf (Local2) + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0159, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z116, 0x2C, 0x015B, 0x00) M390 (Local2, V000, 0x00, 0x25) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x015D, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z116, 0x2E, 0x015F, 0x00) M390 (DerefOf (Local2), V000, 0x00, 0x26) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0161, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) } If (Q001) @@ -344,41 +344,41 @@ Store (P000 [0x00], Arg5) CH03 (__METHOD__, Z116, 0x30, 0x0180, 0x00) Arg6 = (Arg5 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0182, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z116, 0x32, 0x0184, 0x00) Arg6 = (DerefOf (Arg5) + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0186, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z116, 0x34, 0x0188, 0x00) M390 (Arg5, V000, 0x00, 0x2D) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x018A, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z116, 0x36, 0x018C, 0x00) M390 (DerefOf (Arg5), V000, 0x00, 0x2E) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x018E, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) Arg5 = Arg2 = P000 [0x00] CH03 (__METHOD__, Z116, 0x38, 0x0192, 0x00) Arg6 = (Arg5 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0194, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z116, 0x3A, 0x0196, 0x00) Arg6 = (DerefOf (Arg5) + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0198, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z116, 0x3C, 0x019A, 0x00) M390 (Arg5, V000, 0x00, 0x2F) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x019C, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z116, 0x3E, 0x019E, 0x00) M390 (DerefOf (Arg5), V000, 0x00, 0x30) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x01A0, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z116, 0x40, 0x01A2, 0x00) Arg6 = (Arg2 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x01A4, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z116, 0x42, 0x01A6, 0x00) Arg6 = (DerefOf (Arg2) + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x01A8, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z116, 0x44, 0x01AA, 0x00) M390 (Arg2, V000, 0x00, 0x31) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x01AC, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z116, 0x46, 0x01AE, 0x00) M390 (DerefOf (Arg2), V000, 0x00, 0x32) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x01B0, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) } If (Q001) @@ -406,41 +406,41 @@ Store (P000 [0x01], Arg5) CH03 (__METHOD__, Z116, 0x48, 0x01CF, 0x00) Arg6 = (Arg5 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x01D1, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z116, 0x4A, 0x01D3, 0x00) Arg6 = (DerefOf (Arg5) + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x01D5, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z116, 0x4C, 0x01D7, 0x00) M390 (Arg5, V000, 0x00, 0x39) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x01D9, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z116, 0x4E, 0x01DB, 0x00) M390 (DerefOf (Arg5), V000, 0x00, 0x3A) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x01DD, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) Arg5 = Arg2 = P000 [0x01] CH03 (__METHOD__, Z116, 0x50, 0x01E1, 0x00) Arg6 = (Arg5 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x01E3, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z116, 0x52, 0x01E5, 0x00) Arg6 = (DerefOf (Arg5) + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x01E7, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z116, 0x54, 0x01E9, 0x00) M390 (Arg5, V000, 0x00, 0x3B) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x01EB, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z116, 0x56, 0x01ED, 0x00) M390 (DerefOf (Arg5), V000, 0x00, 0x3C) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x01EF, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z116, 0x58, 0x01F1, 0x00) Arg6 = (Arg2 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x01F3, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z116, 0x5A, 0x01F5, 0x00) Arg6 = (DerefOf (Arg2) + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x01F7, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z116, 0x5C, 0x01F9, 0x00) M390 (Arg2, V000, 0x00, 0x3D) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x01FB, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z116, 0x5E, 0x01FD, 0x00) M390 (DerefOf (Arg2), V000, 0x00, 0x3E) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x01FF, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) } If (Q001) @@ -473,41 +473,41 @@ Store (P000 [0x00], I005) /* \M1C3.I005 */ CH03 (__METHOD__, Z116, 0x60, 0x0221, 0x00) I006 = (I005 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0223, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z116, 0x62, 0x0225, 0x00) I006 = (DerefOf (I005) + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0227, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z116, 0x64, 0x0229, 0x00) M390 (I005, V000, 0x00, 0x45) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x022B, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z116, 0x66, 0x022D, 0x00) M390 (DerefOf (I005), V000, 0x00, 0x46) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x022F, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) I005 = I002 = P000 [0x00] CH03 (__METHOD__, Z116, 0x68, 0x0233, 0x00) I006 = (I005 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0235, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z116, 0x6A, 0x0237, 0x00) I006 = (DerefOf (I005) + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0239, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z116, 0x6C, 0x023B, 0x00) M390 (I005, V000, 0x00, 0x47) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x023D, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z116, 0x6E, 0x023F, 0x00) M390 (DerefOf (I005), V000, 0x00, 0x48) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0241, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z116, 0x70, 0x0243, 0x00) I006 = (I002 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0245, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z116, 0x72, 0x0247, 0x00) I006 = (DerefOf (I002) + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0249, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z116, 0x74, 0x024B, 0x00) M390 (I002, V000, 0x00, 0x49) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x024D, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z116, 0x76, 0x024F, 0x00) M390 (DerefOf (I002), V000, 0x00, 0x4A) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0251, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) } If (Q001) @@ -535,41 +535,41 @@ Store (P000 [0x01], I005) /* \M1C3.I005 */ CH03 (__METHOD__, Z116, 0x78, 0x0270, 0x00) I006 = (I005 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0272, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z116, 0x7A, 0x0274, 0x00) I006 = (DerefOf (I005) + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0276, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z116, 0x7C, 0x0278, 0x00) M390 (I005, V000, 0x00, 0x51) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x027A, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z116, 0x7E, 0x027C, 0x00) M390 (DerefOf (I005), V000, 0x00, 0x52) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x027E, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) I005 = I002 = P000 [0x01] CH03 (__METHOD__, Z116, 0x80, 0x0282, 0x00) I006 = (I005 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0284, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z116, 0x82, 0x0286, 0x00) I006 = (DerefOf (I005) + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0288, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z116, 0x84, 0x028A, 0x00) M390 (I005, V000, 0x00, 0x53) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x028C, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z116, 0x86, 0x028E, 0x00) M390 (DerefOf (I005), V000, 0x00, 0x54) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0290, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z116, 0x88, 0x0292, 0x00) I006 = (I002 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0294, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z116, 0x8A, 0x0296, 0x00) I006 = (DerefOf (I002) + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0298, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z116, 0x8C, 0x029A, 0x00) M390 (I002, V000, 0x00, 0x55) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x029C, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z116, 0x8E, 0x029E, 0x00) M390 (DerefOf (I002), V000, 0x00, 0x56) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x02A0, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) } If (Q001) @@ -854,42 +854,42 @@ M1A3 (Local0, C010, Z116, __METHOD__, 0x83) CH03 (__METHOD__, Z116, 0x90, 0x03A8, 0x00) Local1 = DerefOf (Local0) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x03AA, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) Store (P000 [0x01], Local0) M1A3 (Local0, C010, Z116, __METHOD__, 0x84) CH03 (__METHOD__, Z116, 0x92, 0x03AE, 0x00) Local1 = DerefOf (Local0) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x03B0, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) Store (P000 [0x02], Local0) M1A3 (Local0, C010, Z116, __METHOD__, 0x85) CH03 (__METHOD__, Z116, 0x94, 0x03B4, 0x00) Local1 = DerefOf (Local0) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x03B6, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) Store (P000 [0x03], Local0) M1A3 (Local0, C010, Z116, __METHOD__, 0x86) CH03 (__METHOD__, Z116, 0x96, 0x03BA, 0x00) Local1 = DerefOf (Local0) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x03BC, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) Store (P000 [0x04], Local0) M1A3 (Local0, C010, Z116, __METHOD__, 0x87) CH03 (__METHOD__, Z116, 0x98, 0x03C0, 0x00) Local1 = DerefOf (Local0) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x03C2, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) Store (P000 [0x05], Local0) M1A3 (Local0, C010, Z116, __METHOD__, 0x88) CH03 (__METHOD__, Z116, 0x9A, 0x03C6, 0x00) Local1 = DerefOf (Local0) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x03C8, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) Store (P000 [0x06], Local0) M1A3 (Local0, C010, Z116, __METHOD__, 0x89) CH03 (__METHOD__, Z116, 0x9C, 0x03CC, 0x00) Local1 = DerefOf (Local0) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x03CE, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) Store (P000 [0x07], Local0) M1A3 (Local0, C010, Z116, __METHOD__, 0x8A) CH03 (__METHOD__, Z116, 0x9E, 0x03D2, 0x00) Local1 = DerefOf (Local0) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x03D4, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) M380 (__METHOD__, I000, 0x00, 0x8B) } @@ -902,7 +902,7 @@ Name (P000, Package (Arg0){}) CH03 (__METHOD__, Z116, 0xA0, 0x03E2, 0x00) Store (P000 [Arg0], Local0) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x03E4, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) } Method (M001, 1, Serialized) @@ -945,7 +945,7 @@ Name (P000, Package (0x02){}) CH03 (__METHOD__, Z116, 0xA2, 0x040E, 0x00) Store (P000 [0x02], Local0) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0410, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) } Method (M004, 0, Serialized) @@ -953,7 +953,7 @@ Name (P000, Package (0xFF){}) CH03 (__METHOD__, Z116, 0xA4, 0x0417, 0x00) Store (P000 [0xFF], Local0) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0419, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) } /* Size not greater than 255 */ @@ -1088,9 +1088,9 @@ Local1 = Local0 = P000 [0x00] CH03 (__METHOD__, Z116, 0xAC, 0x04A6, 0x00) Local7 = (Local0 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x04AA, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) Local7 = (Local1 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x04AE, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) } Method (M1D2, 0, Serialized) @@ -1102,9 +1102,9 @@ CopyObject (Local0 = P000 [0x00], Local1) CH03 (__METHOD__, Z116, 0xAF, 0x04B9, 0x00) Local7 = (Local0 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x04BD, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) Local7 = (Local1 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x04C1, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) } /* ArgX */ @@ -1118,9 +1118,9 @@ Arg1 = Arg0 = P000 [0x00] CH03 (__METHOD__, Z116, 0xB2, 0x04CE, 0x00) Local7 = (Arg0 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x04D2, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) Local7 = (Arg1 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x04D6, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) } Method (M1D4, 2, Serialized) @@ -1132,11 +1132,11 @@ CopyObject (Arg0 = P000 [0x00], Arg1) CH03 (__METHOD__, Z116, 0xB5, 0x04E1, 0x00) Local7 = (Arg0 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x04E5, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) /* Type of Arg1 should be IRef here, */ /* so, exception is expected. */ Local7 = (Arg1 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x04EC, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) } /* NamedX */ @@ -1196,9 +1196,9 @@ Debug = Local7 } - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0529, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) Local7 = (I001 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x052D, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) /* * Looks identical to b248: "Incorrect ReferenceCount on Switch operation": * @@ -1227,7 +1227,7 @@ CopyObject (Local0 = P000 [0x00], I001) /* \M1D6.I001 */ CH03 (__METHOD__, Z116, 0xBE, 0x054C, 0x00) Local7 = (I001 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0550, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) } /* Out of Package */ @@ -1240,9 +1240,9 @@ }) CH03 (__METHOD__, Z116, 0xC1, 0x055B, 0x00) Store (P000 [0x01], Local0) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x055F, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) Local1 = Local0 = P000 [0x01] - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0563, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) } Method (M1D8, 0, Serialized) @@ -1253,9 +1253,9 @@ }) CH03 (__METHOD__, Z116, 0xC4, 0x056C, 0x00) CopyObject (P000 [0x01], Local0) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0570, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) CopyObject (Local0 = P000 [0x01], Local1) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0574, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) } Method (M1DB, 0, Serialized) @@ -1275,7 +1275,7 @@ I001 = P000 [0x00] CH03 (__METHOD__, Z116, 0xC9, 0x058B, 0x00) Local7 = (I001 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x058F, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z116, __LINE__, 0x00, 0x00) } /* WRITE */ diff --git a/tests/aslts/src/runtime/collections/functional/reference/ref50.asl b/tests/aslts/src/runtime/collections/functional/reference/ref50.asl index 68a82e626..8b35f2c23 100644 --- a/tests/aslts/src/runtime/collections/functional/reference/ref50.asl +++ b/tests/aslts/src/runtime/collections/functional/reference/ref50.asl @@ -1704,7 +1704,7 @@ CH03 (__METHOD__, 0x00, 0x00, 0x06F1, 0x00) Local7 = (Local0 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, 0x00, 0x06F3, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) } M1A3 (Local0, C009, 0x00, 0x00, 0x02) @@ -1765,7 +1765,7 @@ CH03 (__METHOD__, 0x00, 0x02, 0x0729, 0x00) Local7 = (Local0 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, 0x00, 0x072B, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) } M1A3 (Local0, C009, 0x00, 0x00, 0x00) @@ -1862,7 +1862,7 @@ CH03 (__METHOD__, 0x00, 0x04, 0x0784, 0x00) Local7 = (Arg0 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, 0x00, 0x0786, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) } M1A3 (Arg0, C009, 0x00, 0x00, 0x00) @@ -1923,7 +1923,7 @@ CH03 (__METHOD__, 0x00, 0x06, 0x07BC, 0x00) Local7 = (Arg0 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, 0x00, 0x07BE, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) } M1A3 (Arg0, C009, 0x00, 0x00, 0x00) @@ -2014,7 +2014,7 @@ CH03 (__METHOD__, 0x00, 0x08, 0x0810, 0x00) Local7 = (III0 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, 0x00, 0x0812, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) } M1A3 (III0, C009, 0x00, 0x00, 0x00) @@ -2076,7 +2076,7 @@ CH03 (__METHOD__, 0x00, 0x0A, 0x084A, 0x00) Local7 = (III0 + 0x01) - CH04 (__METHOD__, 0x00, 0xFF, 0x00, 0x084C, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, 0x00, __LINE__, 0x00, 0x00) } M1A3 (III0, C009, 0x00, 0x00, 0x00) diff --git a/tests/aslts/src/runtime/collections/functional/reference/ref70.asl b/tests/aslts/src/runtime/collections/functional/reference/ref70.asl index 58f2eff44..fe121f024 100644 --- a/tests/aslts/src/runtime/collections/functional/reference/ref70.asl +++ b/tests/aslts/src/runtime/collections/functional/reference/ref70.asl @@ -75,7 +75,7 @@ } - CH04 (C080, 0x00, 0xFF, Z081, 0x4D, Arg6, Arg6) + CH04 (C080, 0x00, 0xFF, Z081, __LINE__, Arg6, Arg6) /* // FILE BUG: hangs without printing error Store(CH04(c080, 0, 0xff, z081, __LINE__, arg6, arg6), Local0) @@ -112,7 +112,7 @@ } - CH04 (C080, 0x00, 0xFF, Z081, 0x6F, 0x38, 0x38) + CH04 (C080, 0x00, 0xFF, Z081, __LINE__, 0x38, 0x38) } /* Check reaction on OPERAND-REFERENCE (exceptions are expected in most cases) */ @@ -138,7 +138,7 @@ Local7 = 0x00 } - CH04 (C080, 0x00, 0xFF, Z081, 0x87, 0x36, 0x36) + CH04 (C080, 0x00, 0xFF, Z081, __LINE__, 0x36, 0x36) } /* ElseIf */ @@ -155,7 +155,7 @@ Local7 = 0x01 } - CH04 (C080, 0x00, 0xFF, Z081, 0x93, 0x37, 0x37) + CH04 (C080, 0x00, 0xFF, Z081, __LINE__, 0x37, 0x37) } /* While */ @@ -169,7 +169,7 @@ Break } - CH04 (C080, 0x00, 0xFF, Z081, 0x9E, 0x3A, 0x3A) + CH04 (C080, 0x00, 0xFF, Z081, __LINE__, 0x3A, 0x3A) } /* Set parameters of current checking */ @@ -808,7 +808,7 @@ { CH03 (__METHOD__, Z081, 0x48, 0x0334, 0x00) Debug = DerefOf (RefOf (DerefOf (RefOf (Arg0)))) - CH04 (C080, 0x00, 0xFF, Z081, 0x0338, 0x00, 0x00) + CH04 (C080, 0x00, 0xFF, Z081, __LINE__, 0x00, 0x00) } M000 (I000) diff --git a/tests/aslts/src/runtime/collections/functional/reference/ref71.asl b/tests/aslts/src/runtime/collections/functional/reference/ref71.asl index dab3abce6..180eb0105 100644 --- a/tests/aslts/src/runtime/collections/functional/reference/ref71.asl +++ b/tests/aslts/src/runtime/collections/functional/reference/ref71.asl @@ -48,7 +48,7 @@ Local0 = Local7 If (!SLCK) { - CH04 (__METHOD__, 0x00, 0xFF, Z109, 0x37, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0xFF, Z109, __LINE__, 0x00, 0x00) } } diff --git a/tests/aslts/src/runtime/collections/functional/synchronization/mutex2.asl b/tests/aslts/src/runtime/collections/functional/synchronization/mutex2.asl index 51de8ca63..2f65e5658 100644 --- a/tests/aslts/src/runtime/collections/functional/synchronization/mutex2.asl +++ b/tests/aslts/src/runtime/collections/functional/synchronization/mutex2.asl @@ -597,7 +597,7 @@ If (Arg0) { - CH04 (__METHOD__, 0x01, 0x12, Z150, 0x01C2, 0x00, 0x00) /* AE_LIMIT */ + CH04 (__METHOD__, 0x01, 0x12, Z150, __LINE__, 0x00, 0x00) /* AE_LIMIT */ } Else { @@ -1046,7 +1046,7 @@ } - CH04 (__METHOD__, 0x00, 0x40, Z150, 0x031E, 0x00, 0x00) /* AE_AML_MUTEX_ORDER */ + CH04 (__METHOD__, 0x00, 0x40, Z150, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_ORDER */ M388 (Arg0, 0x00, 0x00) /* Release */ CH03 (__METHOD__, Z150, 0x03, 0x0322, 0x00) } @@ -1111,7 +1111,7 @@ /* Attempt to Release free mutex */ M388 (Arg0, 0x00, 0x00) /* Release */ - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x035F, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ CH03 (__METHOD__, Z150, 0x03, 0x0361, 0x00) M36F (Arg0, 0x00, 0x00, 0x00) /* Acquire */ M388 (Arg0, 0x00, 0x00) /* Release */ @@ -1136,7 +1136,7 @@ /* Attempt to Release free mutex */ M388 (GLLL, GLIX, 0x00) /* Release */ - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x0378, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ CH03 (__METHOD__, Z150, 0x08, 0x037A, 0x00) M36F (GLLL, GLIX, 0x00, 0x00) /* Acquire */ M388 (GLLL, GLIX, 0x00) /* Release */ @@ -1169,105 +1169,105 @@ CH03 (__METHOD__, Z150, 0x00, 0x039B, 0x00) Release (T000) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x039D, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ CH03 (__METHOD__, Z150, 0x02, 0x039F, 0x00) Release (\_GL) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x03A1, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z150, 0x04, 0x03A3, 0x00) Release (T100) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x03A5, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z150, 0x06, 0x03A7, 0x00) Release (T200) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x03A9, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z150, 0x08, 0x03AB, 0x00) Release (T300) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x03AD, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z150, 0x0A, 0x03AF, 0x00) Release (T400) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x03B1, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z150, 0x0C, 0x03B3, 0x00) Release (T500) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x03B5, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z150, 0x0E, 0x03B7, 0x00) Release (T600) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x03B9, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z150, 0x10, 0x03BB, 0x00) Release (T700) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x03BD, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z150, 0x12, 0x03BF, 0x00) Release (T800) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x03C1, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z150, 0x14, 0x03C3, 0x00) Release (T900) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x03C5, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z150, 0x16, 0x03C7, 0x00) Release (TA00) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x03C9, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z150, 0x18, 0x03CB, 0x00) Release (TB00) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x03CD, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z150, 0x1A, 0x03CF, 0x00) Release (TC00) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x03D1, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z150, 0x1C, 0x03D3, 0x00) Release (TD00) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x03D5, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z150, 0x1E, 0x03D7, 0x00) Release (TE00) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x03D9, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z150, 0x20, 0x03DB, 0x00) Release (TF00) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x03DD, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) /* Second time */ CH03 (__METHOD__, Z150, 0x22, 0x03E2, 0x00) Release (T000) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x03E4, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ CH03 (__METHOD__, Z150, 0x24, 0x03E6, 0x00) Release (T100) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x03E8, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z150, 0x26, 0x03EA, 0x00) Release (T200) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x03EC, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z150, 0x28, 0x03EE, 0x00) Release (T300) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x03F0, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z150, 0x2A, 0x03F2, 0x00) Release (T400) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x03F4, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z150, 0x2C, 0x03F6, 0x00) Release (T500) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x03F8, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z150, 0x2E, 0x03FA, 0x00) Release (T600) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x03FC, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z150, 0x30, 0x03FE, 0x00) Release (T700) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x0400, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z150, 0x32, 0x0402, 0x00) Release (T800) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x0404, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z150, 0x34, 0x0406, 0x00) Release (T900) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x0408, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z150, 0x36, 0x040A, 0x00) Release (TA00) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x040C, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z150, 0x38, 0x040E, 0x00) Release (TB00) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x0410, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z150, 0x3A, 0x0412, 0x00) Release (TC00) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x0414, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z150, 0x3C, 0x0416, 0x00) Release (TD00) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x0418, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z150, 0x3E, 0x041A, 0x00) Release (TE00) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x041C, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) CH03 (__METHOD__, Z150, 0x40, 0x041E, 0x00) Release (TF00) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x0420, 0x00, 0x00) + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) } /* @@ -1513,7 +1513,7 @@ { CH03 (__METHOD__, Z150, 0x01, 0x0510, 0x00) M388 (LPC0, IX00, 0x00) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x0512, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ LPN0-- LPC0-- } @@ -1910,55 +1910,55 @@ { CH03 (__METHOD__, Z150, 0x00, 0x067B, 0x00) Release (TF00) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x067D, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ CH03 (__METHOD__, Z150, 0x02, 0x067E, 0x00) Release (TE00) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x0680, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ CH03 (__METHOD__, Z150, 0x04, 0x0681, 0x00) Release (TD00) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x0683, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ CH03 (__METHOD__, Z150, 0x06, 0x0684, 0x00) Release (TC00) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x0686, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ CH03 (__METHOD__, Z150, 0x08, 0x0687, 0x00) Release (TB00) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x0689, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ CH03 (__METHOD__, Z150, 0x0A, 0x068A, 0x00) Release (TA00) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x068C, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ CH03 (__METHOD__, Z150, 0x0C, 0x068D, 0x00) Release (T900) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x068F, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ CH03 (__METHOD__, Z150, 0x0E, 0x0690, 0x00) Release (T800) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x0692, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ CH03 (__METHOD__, Z150, 0x10, 0x0693, 0x00) Release (T700) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x0695, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ CH03 (__METHOD__, Z150, 0x12, 0x0696, 0x00) Release (T600) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x0698, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ CH03 (__METHOD__, Z150, 0x14, 0x0699, 0x00) Release (T500) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x069B, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ CH03 (__METHOD__, Z150, 0x16, 0x069C, 0x00) Release (T400) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x069E, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ CH03 (__METHOD__, Z150, 0x18, 0x069F, 0x00) Release (T300) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x06A1, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ CH03 (__METHOD__, Z150, 0x1A, 0x06A2, 0x00) Release (T200) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x06A4, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ CH03 (__METHOD__, Z150, 0x1C, 0x06A5, 0x00) Release (T100) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x06A7, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ CH03 (__METHOD__, Z150, 0x1E, 0x06A8, 0x00) Release (T000) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x06AA, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ CH03 (__METHOD__, Z150, 0x20, 0x06AB, 0x00) Release (\_GL) - CH04 (__METHOD__, 0x00, 0x41, Z150, 0x06AD, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ + CH04 (__METHOD__, 0x00, 0x41, Z150, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ } MM00 () @@ -2027,7 +2027,7 @@ M08A () } - CH04 (__METHOD__, 0x01, 0x40, Z150, 0x01, 0x00, 0x00) + CH04 (__METHOD__, 0x01, 0x40, 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 880d96322..4eb5a3633 100644 --- a/tests/aslts/src/runtime/collections/functional/synchronization/mutex_proc.asl +++ b/tests/aslts/src/runtime/collections/functional/synchronization/mutex_proc.asl @@ -623,7 +623,7 @@ Zero) M36F (GLLL, GLIX, Arg3, 0x00) /* Acquire GL */ If (Arg3) { - CH04 ("m38b", 0x00, Arg3, Z151, 0x01C7, 0x00, 0x00) + CH04 ("m38b", 0x00, Arg3, Z151, __LINE__, 0x00, 0x00) } } @@ -639,7 +639,7 @@ Zero) M36F (LPC0, 0x00, Arg3, 0x00) /* Acquire */ If (Arg3) { - CH04 ("m38b", 0x00, Arg3, Z151, 0x01D4, 0x00, 0x00) + CH04 ("m38b", 0x00, Arg3, Z151, __LINE__, 0x00, 0x00) } LPN0-- @@ -673,7 +673,7 @@ Zero) M388 (LPC0, 0x00, 0x00) /* Release */ If (Arg3) { - Local7 = (CH04 ("m38b", 0x00, Arg3, Z151, 0x01F5, 0x00, 0x00) || Local7) + Local7 = (CH04 ("m38b", 0x00, Arg3, Z151, __LINE__, 0x00, 0x00) || Local7) } LPN0-- @@ -690,7 +690,7 @@ Zero) M388 (GLLL, GLIX, 0x00) /* Release GL */ If (Arg3) { - Local7 = (CH04 ("m38b", 0x00, Arg3, Z151, 0x0202, 0x00, 0x00) || Local7) + Local7 = (CH04 ("m38b", 0x00, Arg3, Z151, __LINE__, 0x00, 0x00) || Local7) } } @@ -754,7 +754,7 @@ Zero) M36F (LPC0, LPC1, EXC0, Arg6) /* Acquire */ If (EXC1) { - CH04 ("m088", 0x00, EXC0, Z151, 0x023A, 0x00, 0x00) + CH04 ("m088", 0x00, EXC0, Z151, __LINE__, 0x00, 0x00) } LPN2-- @@ -881,7 +881,7 @@ Zero) M388 (LPC0, Local0, EXC0) /* Release */ If (EXC1) { - CH04 ("m088", 0x00, EXC0, Z151, 0x02B1, 0x00, 0x00) + CH04 ("m088", 0x00, EXC0, Z151, __LINE__, 0x00, 0x00) } LPN2-- @@ -925,7 +925,7 @@ Zero) M388 (LPC0, Local0, EXC0) /* Release */ If (EXC1) { - CH04 ("m088", 0x00, EXC0, Z151, 0x02D5, 0x00, 0x00) + CH04 ("m088", 0x00, EXC0, Z151, __LINE__, 0x00, 0x00) } LPN2-- diff --git a/tests/aslts/src/runtime/collections/functional/synchronization/serialized.asl b/tests/aslts/src/runtime/collections/functional/synchronization/serialized.asl index 2f981395b..b70643632 100644 --- a/tests/aslts/src/runtime/collections/functional/synchronization/serialized.asl +++ b/tests/aslts/src/runtime/collections/functional/synchronization/serialized.asl @@ -805,7 +805,7 @@ MM00 (0x00, I000, I001) If ((Arg0 > Arg1)) { - CH04 (__METHOD__, 0x00, 0x40, Z173, 0x0134, 0x00, 0x00) /* AE_AML_MUTEX_ORDER */ + CH04 (__METHOD__, 0x00, 0x40, Z173, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_ORDER */ } Else { @@ -1174,7 +1174,7 @@ MM00 (0x00, I000, I001) If ((Arg0 > Arg1)) { - CH04 (__METHOD__, 0x00, 0x40, Z173, 0x01B8, 0x00, 0x00) /* AE_AML_MUTEX_ORDER */ + CH04 (__METHOD__, 0x00, 0x40, Z173, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_ORDER */ } Else { @@ -1584,7 +1584,7 @@ MM00 (0x00, I000, I001) If ((Arg0 > Arg1)) { - CH04 (__METHOD__, 0x00, 0x40, Z173, 0x0265, 0x00, 0x00) /* AE_AML_MUTEX_ORDER */ + CH04 (__METHOD__, 0x00, 0x40, Z173, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_ORDER */ } Else { @@ -2628,7 +2628,7 @@ If (!Local4) { - CH04 (__METHOD__, 0x01, 0x40, Z173, 0x04D7, 0x00, 0x00) /* AE_AML_MUTEX_ORDER */ + CH04 (__METHOD__, 0x01, 0x40, Z173, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_ORDER */ } Else { diff --git a/tests/aslts/src/runtime/collections/functional/table/load.asl b/tests/aslts/src/runtime/collections/functional/table/load.asl index d7729655c..24328326e 100644 --- a/tests/aslts/src/runtime/collections/functional/table/load.asl +++ b/tests/aslts/src/runtime/collections/functional/table/load.asl @@ -1317,7 +1317,7 @@ Local2 = Buffer (0x0A) ERR (Arg0, Z174, __LINE__, 0x00, 0x00, Local2, Local5) } } - ElseIf (CH04 (Arg0, 0x00, 0xFF, Z174, 0x0469, 0x00, 0x00)) + ElseIf (CH04 (Arg0, 0x00, 0xFF, Z174, __LINE__, 0x00, 0x00)) { /* AE_NOT_FOUND */ @@ -1458,7 +1458,7 @@ Local2 = Buffer (0x0A) /* allows NameString only to be used as Object parameter */ /* Integer */ Load (\AUXD.INT0, DDBH) /* \DTM0.TSTB.DDBH */ - CH04 (Arg0, 0x00, 0x2F, Z174, 0x04EB, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z174, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = ObjectType (\AUXD.INT0) If ((C009 != Local0)) { @@ -1468,7 +1468,7 @@ Local2 = Buffer (0x0A) /* String */ Load (\AUXD.STR0, DDBH) /* \DTM0.TSTB.DDBH */ - CH04 (Arg0, 0x00, 0x2F, Z174, 0x04F3, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z174, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = ObjectType (\AUXD.STR0) If ((C00A != Local0)) { @@ -1482,7 +1482,7 @@ Local2 = Buffer (0x0A) /* TBD: LBZ480 update allows Buffer to be Source of Load */ Load (\AUXD.BUF0, DDBH) /* \DTM0.TSTB.DDBH */ - CH04 (Arg0, 0x00, 0x2F, Z174, 0x04FD, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z174, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = ObjectType (\AUXD.BUF0) If ((C00B != Local0)) { @@ -1493,7 +1493,7 @@ Local2 = Buffer (0x0A) /* Package */ Load (\AUXD.PAC0, DDBH) /* \DTM0.TSTB.DDBH */ - CH04 (Arg0, 0x00, 0x2F, Z174, 0x0506, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z174, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = ObjectType (\AUXD.PAC0) If ((C00C != Local0)) { @@ -1503,7 +1503,7 @@ Local2 = Buffer (0x0A) /* Field Unit */ /* Device */ Load (\AUXD.DEV0, DDBH) /* \DTM0.TSTB.DDBH */ - CH04 (Arg0, 0x00, 0x2F, Z174, 0x0510, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z174, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = ObjectType (\AUXD.DEV0) If ((C00E != Local0)) { @@ -1513,7 +1513,7 @@ Local2 = Buffer (0x0A) /* Event */ Load (\AUXD.EVE0, DDBH) /* \DTM0.TSTB.DDBH */ - CH04 (Arg0, 0x00, 0x2F, Z174, 0x0518, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z174, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = ObjectType (\AUXD.EVE0) If ((C00F != Local0)) { @@ -1523,7 +1523,7 @@ Local2 = Buffer (0x0A) /* Method */ Load (\AUXD.MMM0, DDBH) /* \DTM0.TSTB.DDBH */ - CH04 (Arg0, 0x00, 0x2F, Z174, 0x0520, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z174, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = ObjectType (\AUXD.MMM0) If ((C010 != Local0)) { @@ -1533,7 +1533,7 @@ Local2 = Buffer (0x0A) /* Mutex */ Load (\AUXD.MTX0, DDBH) /* \DTM0.TSTB.DDBH */ - CH04 (Arg0, 0x00, 0x2F, Z174, 0x0528, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z174, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = ObjectType (\AUXD.MTX0) If ((C011 != Local0)) { @@ -1543,7 +1543,7 @@ Local2 = Buffer (0x0A) /* OpRegion */ /* Power Resource */ Load (\AUXD.PWR0, DDBH) /* \DTM0.TSTB.DDBH */ - CH04 (Arg0, 0x00, 0x2F, Z174, 0x0532, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z174, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = ObjectType (\AUXD.PWR0) If ((C013 != Local0)) { @@ -1553,7 +1553,7 @@ Local2 = Buffer (0x0A) /* Processor */ Load (\AUXD.CPU0, DDBH) /* \DTM0.TSTB.DDBH */ - CH04 (Arg0, 0x00, 0x2F, Z174, 0x053A, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z174, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = ObjectType (\AUXD.CPU0) If ((C014 != Local0)) { @@ -1563,7 +1563,7 @@ Local2 = Buffer (0x0A) /* Thermal Zone */ Load (\AUXD.TZN0, DDBH) /* \DTM0.TSTB.DDBH */ - CH04 (Arg0, 0x00, 0x2F, Z174, 0x0542, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z174, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = ObjectType (\AUXD.TZN0) If ((C015 != Local0)) { @@ -1577,7 +1577,7 @@ Local2 = Buffer (0x0A) /* TBD: LBZ480 update allows Buffer Field to be Source of Load */ Load (\AUXD.BFL0, DDBH) /* \DTM0.TSTB.DDBH */ - CH04 (Arg0, 0x00, 0x2F, Z174, 0x054C, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z174, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = ObjectType (\AUXD.BFL0) If ((C016 != Local0)) { @@ -1588,7 +1588,7 @@ Local2 = Buffer (0x0A) /* DDB Handle */ Load (DDB0, DDBH) /* \DTM0.TSTB.DDBH */ - CH04 (Arg0, 0x00, 0x2F, Z174, 0x0555, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z174, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = ObjectType (DDB0) If ((C017 != Local0)) { @@ -1624,7 +1624,7 @@ Local2 = Buffer (0x0A) /* SystemIO */ Load (RGN1, DDBH) /* \DTM0.TSTC.DDBH */ - CH04 (Arg0, 0x00, 0x2F, Z174, 0x057A, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z174, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = ObjectType (RGN1) If ((C012 != Local0)) { @@ -1634,7 +1634,7 @@ Local2 = Buffer (0x0A) /* PCI_Config */ Load (RGN2, DDBH) /* \DTM0.TSTC.DDBH */ - CH04 (Arg0, 0x00, 0x2F, Z174, 0x0582, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z174, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = ObjectType (RGN2) If ((C012 != Local0)) { @@ -1644,7 +1644,7 @@ Local2 = Buffer (0x0A) /* EmbeddedControl */ Load (RGN3, DDBH) /* \DTM0.TSTC.DDBH */ - CH04 (Arg0, 0x00, 0x2F, Z174, 0x058A, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z174, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = ObjectType (RGN3) If ((C012 != Local0)) { @@ -1654,7 +1654,7 @@ Local2 = Buffer (0x0A) /* SMBus */ Load (RGN4, DDBH) /* \DTM0.TSTC.DDBH */ - CH04 (Arg0, 0x00, 0x2F, Z174, 0x0592, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z174, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = ObjectType (RGN4) If ((C012 != Local0)) { @@ -1664,7 +1664,7 @@ Local2 = Buffer (0x0A) /* SystemCMOS */ Load (RGN5, DDBH) /* \DTM0.TSTC.DDBH */ - CH04 (Arg0, 0x00, 0x2F, Z174, 0x059A, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z174, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = ObjectType (RGN5) If ((C012 != Local0)) { @@ -1674,7 +1674,7 @@ Local2 = Buffer (0x0A) /* PciBarTarget */ Load (RGN6, DDBH) /* \DTM0.TSTC.DDBH */ - CH04 (Arg0, 0x00, 0x2F, Z174, 0x05A2, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z174, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = ObjectType (RGN6) If ((C012 != Local0)) { @@ -1684,7 +1684,7 @@ Local2 = Buffer (0x0A) /* UserDefRegionSpace 0x80 */ Load (RGN7, DDBH) /* \DTM0.TSTC.DDBH */ - CH04 (Arg0, 0x00, 0x2F, Z174, 0x05AA, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z174, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = ObjectType (RGN7) If ((C012 != Local0)) { @@ -1694,7 +1694,7 @@ Local2 = Buffer (0x0A) /* UserDefRegionSpace 0xcf */ Load (RGN8, DDBH) /* \DTM0.TSTC.DDBH */ - CH04 (Arg0, 0x00, 0x2F, Z174, 0x05B2, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z174, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = ObjectType (RGN8) If ((C012 != Local0)) { @@ -1704,7 +1704,7 @@ Local2 = Buffer (0x0A) /* UserDefRegionSpace 0xff */ Load (RGN9, DDBH) /* \DTM0.TSTC.DDBH */ - CH04 (Arg0, 0x00, 0x2F, Z174, 0x05BA, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z174, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = ObjectType (RGN9) If ((C012 != Local0)) { @@ -1746,7 +1746,7 @@ Local2 = Buffer (0x0A) If (Y290) { Load (IST0, HI0) /* \DTM0.TSTD.HI0_ */ - CH04 (Arg0, 0x00, 0x25, Z174, 0x05E2, 0x00, 0x00) /* AE_BAD_SIGNATURE */ + CH04 (Arg0, 0x00, 0x25, Z174, __LINE__, 0x00, 0x00) /* AE_BAD_SIGNATURE */ If (CondRefOf (\SSS0, Local0)) { ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x01) @@ -1757,7 +1757,7 @@ Local2 = Buffer (0x0A) /* Load operator execution, OpRegion Field case */ Load (RFU0, HI0) /* \DTM0.TSTD.HI0_ */ - CH04 (Arg0, 0x00, 0x25, Z174, 0x05EC, 0x00, 0x00) /* AE_BAD_SIGNATURE */ + CH04 (Arg0, 0x00, 0x25, Z174, __LINE__, 0x00, 0x00) /* AE_BAD_SIGNATURE */ If (CondRefOf (\SSS0, Local0)) { ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x01) @@ -1813,7 +1813,7 @@ Local2 = Buffer (0x0A) If (Y290) { Load (IST0, HI0) /* \DTM0.TSTE.HI0_ */ - CH04 (Arg0, 0x00, 0x2A, Z174, 0x061E, 0x00, 0x00) /* AE_INVALID_TABLE_LENGTH */ + CH04 (Arg0, 0x00, 0x2A, Z174, __LINE__, 0x00, 0x00) /* AE_INVALID_TABLE_LENGTH */ If (CondRefOf (\SSS0, Local0)) { ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x01) @@ -1840,13 +1840,13 @@ Local2 = Buffer (0x0A) { /* If the table length in the header is larger than the buffer. */ - CH04 (Arg0, 0x00, 0x36, Z174, 0x0633, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ + CH04 (Arg0, 0x00, 0x36, Z174, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ } Else { /* If the table length is smaller than an ACPI table header. */ - CH04 (Arg0, 0x00, 0x2A, Z174, 0x0636, 0x00, 0x00) /* AE_INVALID_TABLE_LENGTH */ + CH04 (Arg0, 0x00, 0x2A, Z174, __LINE__, 0x00, 0x00) /* AE_INVALID_TABLE_LENGTH */ } If (CondRefOf (\SSS0, Local0)) @@ -1898,7 +1898,7 @@ Local2 = Buffer (0x0A) If (Y290) { Load (IST0, HI0) /* \DTM0.TSTF.HI0_ */ - CH04 (Arg0, 0x00, 0x27, Z174, 0x0664, 0x00, 0x00) /* AE_BAD_CHECKSUM */ + CH04 (Arg0, 0x00, 0x27, Z174, __LINE__, 0x00, 0x00) /* AE_BAD_CHECKSUM */ If (CondRefOf (\SSS0, Local0)) { ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x01) @@ -1917,7 +1917,7 @@ Local2 = Buffer (0x0A) /* Load operator execution, OpRegion Field case */ Load (RFU0, HI0) /* \DTM0.TSTF.HI0_ */ - CH04 (Arg0, 0x00, 0x27, Z174, 0x0674, 0x00, 0x00) /* AE_BAD_CHECKSUM */ + CH04 (Arg0, 0x00, 0x27, Z174, __LINE__, 0x00, 0x00) /* AE_BAD_CHECKSUM */ If (CondRefOf (\SSS0, Local0)) { ERR (Arg0, Z174, __LINE__, 0x00, 0x00, "\\SSS0", 0x01) @@ -2128,7 +2128,7 @@ Local2 = Buffer (0x0A) /* Futher 1 Method can be called */ Unload (DDB1) - CH04 (Arg0, 0x00, 0x56, Z174, 0x0733, 0x00, 0x00) /* AE_OWNER_ID_LIMIT */ + CH04 (Arg0, 0x00, 0x56, Z174, __LINE__, 0x00, 0x00) /* AE_OWNER_ID_LIMIT */ Local0 = MAXT /* \DTM0.TSTH.MAXT */ While (Local0) { @@ -2205,7 +2205,7 @@ Local2 = Buffer (0x0A) /* Repeated Load operator execution */ Load (RFU0, HI1) /* \DTM0.TSTI.HI1_ */ - CH04 (Arg0, 0x00, 0x07, Z174, 0x0777, 0x05, Local1) /* AE_ALREADY_EXISTS */ + CH04 (Arg0, 0x00, 0x07, Z174, __LINE__, 0x05, Local1) /* AE_ALREADY_EXISTS */ Local0 = ObjectType (HI1) If ((C009 != Local0)) { @@ -2312,7 +2312,7 @@ Local2 = Buffer (0x0A) /* Any next Load */ Load (RFU0, HI1) /* \DTM0.TSTJ.HI1_ */ - CH04 (Arg0, 0x00, 0x07, Z174, 0x07DD, 0x05, Local1) /* AE_ALREADY_EXISTS */ + CH04 (Arg0, 0x00, 0x07, Z174, __LINE__, 0x05, Local1) /* AE_ALREADY_EXISTS */ Local0 = ObjectType (HI1) If ((C009 != Local0)) { diff --git a/tests/aslts/src/runtime/collections/functional/table/loadtable.asl b/tests/aslts/src/runtime/collections/functional/table/loadtable.asl index f7dfc5226..5b5943366 100644 --- a/tests/aslts/src/runtime/collections/functional/table/loadtable.asl +++ b/tests/aslts/src/runtime/collections/functional/table/loadtable.asl @@ -308,7 +308,7 @@ } ElseIf /* Exception: AE_BAD_SIGNATURE */ - (CH04 (Arg0, 0x01, 0x25, Z176, 0x0121, 0x00, 0x00)) + (CH04 (Arg0, 0x01, 0x25, Z176, __LINE__, 0x00, 0x00)) { Return (0x01) } @@ -1179,7 +1179,7 @@ LoadTable ("OEM1X", "", "", RPST, PPST, 0x01) } - CH04 (Arg0, 0x00, 0x3D, Z176, 0x0462, 0x00, 0x00) /* AE_AML_STRING_LIMIT */ + CH04 (Arg0, 0x00, 0x3D, Z176, __LINE__, 0x00, 0x00) /* AE_AML_STRING_LIMIT */ If ((0x00 != \DTM2.PLDT)) { ERR (Arg0, Z176, __LINE__, 0x00, 0x00, \DTM2.PLDT, 0x01) @@ -1199,7 +1199,7 @@ /* OEMIDString is greater than six characters */ LoadTable ("OEM1", "IntelXX", "", RPST, PPST, 0x01) - CH04 (Arg0, 0x00, 0x3D, Z176, 0x0473, 0x00, 0x00) /* AE_AML_STRING_LIMIT */ + CH04 (Arg0, 0x00, 0x3D, Z176, __LINE__, 0x00, 0x00) /* AE_AML_STRING_LIMIT */ If ((0x00 != \DTM2.PLDT)) { ERR (Arg0, Z176, __LINE__, 0x00, 0x00, \DTM2.PLDT, 0x01) @@ -1209,7 +1209,7 @@ /* OEMTableID is greater than eight characters */ LoadTable ("OEM1", "", "ManyXXXXX", RPST, PPST, 0x01) - CH04 (Arg0, 0x00, 0x3D, Z176, 0x047D, 0x00, 0x00) /* AE_AML_STRING_LIMIT */ + CH04 (Arg0, 0x00, 0x3D, Z176, __LINE__, 0x00, 0x00) /* AE_AML_STRING_LIMIT */ If ((0x00 != \DTM2.PLDT)) { ERR (Arg0, Z176, __LINE__, 0x00, 0x00, \DTM2.PLDT, 0x01) @@ -1228,7 +1228,7 @@ /* SignatureString is "DSDT" */ LoadTable ("DSDT", "", "", RPST, PPST, 0x01) - CH04 (Arg0, 0x00, 0x07, Z176, 0x0492, 0x00, 0x00) /* AE_ALREADY_EXISTS */ + CH04 (Arg0, 0x00, 0x07, Z176, __LINE__, 0x00, 0x00) /* AE_ALREADY_EXISTS */ If ((0x00 != \DTM2.PLDT)) { ERR (Arg0, Z176, __LINE__, 0x00, 0x00, \DTM2.PLDT, 0x01) @@ -1237,7 +1237,7 @@ /* SignatureString is "SSDT" */ LoadTable ("SSDT", "", "", RPST, PPST, 0x01) - CH04 (Arg0, 0x00, 0x07, Z176, 0x049B, 0x00, 0x00) /* AE_ALREADY_EXISTS */ + CH04 (Arg0, 0x00, 0x07, Z176, __LINE__, 0x00, 0x00) /* AE_ALREADY_EXISTS */ If ((0x00 != \DTM2.PLDT)) { ERR (Arg0, Z176, __LINE__, 0x00, 0x00, \DTM2.PLDT, 0x01) @@ -1287,7 +1287,7 @@ \DTM2.PLDT = 0x00 LoadTable ("OEM1", "", "", "\\DTM2", PPST, 0x01) - CH04 (Arg0, 0x00, 0x07, Z176, 0x04CB, 0x00, 0x00) /* AE_ALREADY_EXISTS */ + CH04 (Arg0, 0x00, 0x07, Z176, __LINE__, 0x00, 0x00) /* AE_ALREADY_EXISTS */ If ((0x00 != \DTM2.PLDT)) { ERR (Arg0, Z176, __LINE__, 0x00, 0x00, \DTM2.PLDT, 0x00) @@ -1375,7 +1375,7 @@ \DTM2.PLDT = 0x00 LoadTable ("OEM1", "", "", "\\", PPST, 0x01) - CH04 (Arg0, 0x00, 0x07, Z176, 0x051E, 0x00, 0x00) /* AE_ALREADY_EXISTS */ + CH04 (Arg0, 0x00, 0x07, Z176, __LINE__, 0x00, 0x00) /* AE_ALREADY_EXISTS */ If ((0x00 != \DTM2.PLDT)) { ERR (Arg0, Z176, __LINE__, 0x00, 0x00, \DTM2.PLDT, 0x00) @@ -1408,7 +1408,7 @@ { Concatenate (Arg0, "-tstc", Arg0) LoadTable ("DSDT", "", "", RPST, "\\DTM2.NULL", 0x01) - CH04 (Arg0, 0x00, 0x05, Z176, 0x053F, 0x00, 0x00) /* AE_NOT_FOUND */ + CH04 (Arg0, 0x00, 0x05, Z176, __LINE__, 0x00, 0x00) /* AE_NOT_FOUND */ Return (0x00) } @@ -1419,7 +1419,7 @@ Concatenate (Arg0, "-tstd", Arg0) \DTM2.PLDT = 0x00 LoadTable ("OEM1", "", "", "\\", "\\DTM2.PLDT", \DTM2.DEVR) - CH04 (Arg0, 0x00, 0x2F, Z176, 0x054E, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z176, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ If ((0x00 != \DTM2.PLDT)) { ERR (Arg0, Z176, __LINE__, 0x00, 0x00, \DTM2.PLDT, 0x00) @@ -1454,7 +1454,7 @@ Case (0x00) { LoadTable (Arg1, SOID, STID, RPST, PPST, 0x01) - Return (CH04 (Arg0, 0x00, 0x25, Z176, 0x0571, 0x00, 0x00))/* AE_BAD_SIGNATURE */ + Return (CH04 (Arg0, 0x00, 0x25, Z176, __LINE__, 0x00, 0x00))/* AE_BAD_SIGNATURE */ } Case (0x01) { @@ -1467,12 +1467,12 @@ Case (0x03) { LoadTable (SOEM, SOID, STID, Arg1, PPST, 0x01) - Return (CH04 (Arg0, 0x00, 0x1E, Z176, 0x057B, 0x00, 0x00)) /* AE_BAD_PATHNAME */ + Return (CH04 (Arg0, 0x00, 0x1E, Z176, __LINE__, 0x00, 0x00)) /* AE_BAD_PATHNAME */ } Case (0x04) { LoadTable (SOEM, SOID, STID, RPST, Arg1, 0x01) - Return (CH04 (Arg0, 0x00, 0x1E, Z176, 0x057F, 0x00, 0x00)) /* AE_BAD_PATHNAME */ + Return (CH04 (Arg0, 0x00, 0x1E, Z176, __LINE__, 0x00, 0x00)) /* AE_BAD_PATHNAME */ } } @@ -1750,7 +1750,7 @@ } LoadTable (DerefOf (Arg2), "", "", "\\", "\\DTM2.PLDT", 0x01) - CH04 (Arg0, 0x00, 0x2F, Z176, 0x067D, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z176, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Return (0x00) } @@ -1766,7 +1766,7 @@ } LoadTable ("OEM1", DerefOf (Arg2), "", "\\", "\\DTM2.PLDT", 0x01) - CH04 (Arg0, 0x00, 0x2F, Z176, 0x068E, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z176, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Return (0x00) } @@ -1782,7 +1782,7 @@ } LoadTable ("OEM1", "", DerefOf (Arg2), "\\", "\\DTM2.PLDT", 0x01) - CH04 (Arg0, 0x00, 0x2F, Z176, 0x069F, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z176, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Return (0x00) } @@ -1800,11 +1800,11 @@ LoadTable ("OEM1", "", "", DerefOf (Arg2), "\\DTM2.PLDT", 0x01) If (DerefOf (BTYP [Arg3])) { - CH04 (Arg0, 0x00, 0x1E, Z176, 0x06B1, 0x00, 0x00) /* AE_BAD_PATHNAME */ + CH04 (Arg0, 0x00, 0x1E, Z176, __LINE__, 0x00, 0x00) /* AE_BAD_PATHNAME */ } Else { - CH04 (Arg0, 0x00, 0x2F, Z176, 0x06B3, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z176, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ } Return (0x00) @@ -1824,11 +1824,11 @@ LoadTable ("OEM1", "", "", "\\", DerefOf (Arg2), 0x01) If (DerefOf (BTYP [Arg3])) { - CH04 (Arg0, 0x00, 0x1E, Z176, 0x06C6, 0x00, 0x00) /* AE_BAD_PATHNAME */ + CH04 (Arg0, 0x00, 0x1E, Z176, __LINE__, 0x00, 0x00) /* AE_BAD_PATHNAME */ } Else { - CH04 (Arg0, 0x00, 0x2F, Z176, 0x06C8, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z176, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ } Return (0x00) @@ -1861,21 +1861,21 @@ LoadTable (Local1, "", "", "\\", "\\DTM2.PLDT", 0x01) If (SLCK) { - CH04 (Arg0, 0x00, 0x3D, Z176, 0x06E2, 0x00, 0x00) /* AE_AML_STRING_LIMIT */ + CH04 (Arg0, 0x00, 0x3D, Z176, __LINE__, 0x00, 0x00) /* AE_AML_STRING_LIMIT */ } Else { - CH04 (Arg0, 0x00, 0x31, Z176, 0x06E4, 0x00, 0x00) /* AE_AML_UNINITIALIZED_LOCAL */ + CH04 (Arg0, 0x00, 0x31, Z176, __LINE__, 0x00, 0x00) /* AE_AML_UNINITIALIZED_LOCAL */ } LoadTable ("OEM1", Local1, "", "\\", "\\DTM2.PLDT", 0x01) If (SLCK) { - CH04 (Arg0, 0x00, 0x3D, Z176, 0x06E8, 0x00, 0x00) /* AE_AML_STRING_LIMIT */ + CH04 (Arg0, 0x00, 0x3D, Z176, __LINE__, 0x00, 0x00) /* AE_AML_STRING_LIMIT */ } Else { - CH04 (Arg0, 0x00, 0x31, Z176, 0x06EA, 0x00, 0x00) /* AE_AML_UNINITIALIZED_LOCAL */ + CH04 (Arg0, 0x00, 0x31, Z176, __LINE__, 0x00, 0x00) /* AE_AML_UNINITIALIZED_LOCAL */ } LoadTable ("OEM1", "", Local1, "\\", "\\DTM2.PLDT", 0x01) @@ -1889,32 +1889,32 @@ } Else { - CH04 (Arg0, 0x00, 0x3D, Z176, 0x06F3, 0x00, 0x00) /* AE_AML_STRING_LIMIT */ + CH04 (Arg0, 0x00, 0x3D, Z176, __LINE__, 0x00, 0x00) /* AE_AML_STRING_LIMIT */ } } Else { - CH04 (Arg0, 0x00, 0x31, Z176, 0x06F6, 0x00, 0x00) /* AE_AML_UNINITIALIZED_LOCAL */ + CH04 (Arg0, 0x00, 0x31, Z176, __LINE__, 0x00, 0x00) /* AE_AML_UNINITIALIZED_LOCAL */ } LoadTable ("OEM1", "", "", Local1, "\\DTM2.PLDT", 0x01) If (SLCK) { - CH04 (Arg0, 0x00, 0x1E, Z176, 0x06FA, 0x00, 0x00) /* AE_BAD_PATHNAME */ + CH04 (Arg0, 0x00, 0x1E, Z176, __LINE__, 0x00, 0x00) /* AE_BAD_PATHNAME */ } Else { - CH04 (Arg0, 0x00, 0x31, Z176, 0x06FC, 0x00, 0x00) /* AE_AML_UNINITIALIZED_LOCAL */ + CH04 (Arg0, 0x00, 0x31, Z176, __LINE__, 0x00, 0x00) /* AE_AML_UNINITIALIZED_LOCAL */ } LoadTable ("OEM1", "", "", "\\", Local1, 0x01) If (SLCK) { - CH04 (Arg0, 0x00, 0x1E, Z176, 0x0700, 0x00, 0x00) /* AE_BAD_PATHNAME */ + CH04 (Arg0, 0x00, 0x1E, Z176, __LINE__, 0x00, 0x00) /* AE_BAD_PATHNAME */ } Else { - CH04 (Arg0, 0x00, 0x31, Z176, 0x0702, 0x00, 0x00) /* AE_AML_UNINITIALIZED_LOCAL */ + CH04 (Arg0, 0x00, 0x31, Z176, __LINE__, 0x00, 0x00) /* AE_AML_UNINITIALIZED_LOCAL */ } } @@ -1942,15 +1942,15 @@ } LoadTable (\AUXD.PAC0, "", "", "\\", "\\DTM2.PLDT", 0x01) - CH04 (Arg0, 0x00, 0x2F, Z176, 0x071B, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z176, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ LoadTable ("OEM1", \AUXD.PAC0, "", "\\", "\\DTM2.PLDT", 0x01) - CH04 (Arg0, 0x00, 0x2F, Z176, 0x071D, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z176, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ LoadTable ("OEM1", "", \AUXD.PAC0, "\\", "\\DTM2.PLDT", 0x01) - CH04 (Arg0, 0x00, 0x2F, Z176, 0x071F, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z176, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ LoadTable ("OEM1", "", "", \AUXD.PAC0, "\\DTM2.PLDT", 0x01) - CH04 (Arg0, 0x00, 0x2F, Z176, 0x0721, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z176, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ LoadTable ("OEM1", "", "", "\\", \AUXD.PAC0, 0x01) - CH04 (Arg0, 0x00, 0x2F, Z176, 0x0723, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z176, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = ObjectType (\AUXD.PAC0) If ((C00C != Local0)) { @@ -1964,15 +1964,15 @@ /* Device */ LoadTable (\AUXD.DEV0, "", "", "\\", "\\DTM2.PLDT", 0x01) - CH04 (Arg0, 0x00, 0x2F, Z176, 0x072F, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z176, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ LoadTable ("OEM1", \AUXD.DEV0, "", "\\", "\\DTM2.PLDT", 0x01) - CH04 (Arg0, 0x00, 0x2F, Z176, 0x0731, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z176, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ LoadTable ("OEM1", "", \AUXD.DEV0, "\\", "\\DTM2.PLDT", 0x01) - CH04 (Arg0, 0x00, 0x2F, Z176, 0x0733, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z176, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ LoadTable ("OEM1", "", "", \AUXD.DEV0, "\\DTM2.PLDT", 0x01) - CH04 (Arg0, 0x00, 0x2F, Z176, 0x0735, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z176, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ LoadTable ("OEM1", "", "", "\\", \AUXD.DEV0, 0x01) - CH04 (Arg0, 0x00, 0x2F, Z176, 0x0737, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z176, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = ObjectType (\AUXD.DEV0) If ((C00E != Local0)) { @@ -2024,15 +2024,15 @@ /* Thermal Zone */ LoadTable (\AUXD.TZN0, "", "", "\\", "\\DTM2.PLDT", 0x01) - CH04 (Arg0, 0x00, 0x2F, Z176, 0x0769, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z176, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ LoadTable ("OEM1", \AUXD.TZN0, "", "\\", "\\DTM2.PLDT", 0x01) - CH04 (Arg0, 0x00, 0x2F, Z176, 0x076B, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z176, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ LoadTable ("OEM1", "", \AUXD.TZN0, "\\", "\\DTM2.PLDT", 0x01) - CH04 (Arg0, 0x00, 0x2F, Z176, 0x076D, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z176, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ LoadTable ("OEM1", "", "", \AUXD.TZN0, "\\DTM2.PLDT", 0x01) - CH04 (Arg0, 0x00, 0x2F, Z176, 0x076F, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z176, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ LoadTable ("OEM1", "", "", "\\", \AUXD.TZN0, 0x01) - CH04 (Arg0, 0x00, 0x2F, Z176, 0x0771, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z176, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = ObjectType (\AUXD.TZN0) If ((C015 != Local0)) { @@ -2218,7 +2218,7 @@ /* Package */ LoadTable ("OEM1", "", "", "\\", "\\DTM2.PLDT", \AUXD.PAC0) - CH04 (Arg0, 0x00, 0x2F, Z176, 0x0800, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z176, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = ObjectType (\AUXD.PAC0) If ((C00C != Local0)) { @@ -2271,7 +2271,7 @@ /* Device */ LoadTable ("OEM1", "", "", "\\", "\\DTM2.PLDT", \AUXD.DEV0) - CH04 (Arg0, 0x00, 0x2F, Z176, 0x0826, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z176, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = ObjectType (\AUXD.DEV0) If ((C00E != Local0)) { @@ -2281,7 +2281,7 @@ /* Event */ LoadTable ("OEM1", "", "", "\\", "\\DTM2.PLDT", \AUXD.EVE0) - CH04 (Arg0, 0x00, 0x2F, Z176, 0x082E, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z176, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = ObjectType (\AUXD.EVE0) If ((C00F != Local0)) { @@ -2293,7 +2293,7 @@ If (Y288) { LoadTable ("OEM1", "", "", "\\", "\\DTM2.PLDT", \AUXD.MMM0) - CH04 (Arg0, 0x00, 0x2F, Z176, 0x0837, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z176, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = ObjectType (\AUXD.MMM0) If ((C010 != Local0)) { @@ -2304,7 +2304,7 @@ /* Mutex */ LoadTable ("OEM1", "", "", "\\", "\\DTM2.PLDT", \AUXD.MTX0) - CH04 (Arg0, 0x00, 0x2F, Z176, 0x0840, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z176, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = ObjectType (\AUXD.MTX0) If ((C011 != Local0)) { @@ -2314,7 +2314,7 @@ /* OpRegion */ LoadTable ("OEM1", "", "", "\\", "\\DTM2.PLDT", \AUXD.OPR0) - CH04 (Arg0, 0x00, 0x2F, Z176, 0x0848, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z176, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = ObjectType (\AUXD.OPR0) If ((C012 != Local0)) { @@ -2324,7 +2324,7 @@ /* Power Resource */ LoadTable ("OEM1", "", "", "\\", "\\DTM2.PLDT", \AUXD.PWR0) - CH04 (Arg0, 0x00, 0x2F, Z176, 0x0850, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z176, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = ObjectType (\AUXD.PWR0) If ((C013 != Local0)) { @@ -2334,7 +2334,7 @@ /* Processor */ LoadTable ("OEM1", "", "", "\\", "\\DTM2.PLDT", \AUXD.CPU0) - CH04 (Arg0, 0x00, 0x2F, Z176, 0x0858, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z176, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = ObjectType (\AUXD.CPU0) If ((C014 != Local0)) { @@ -2344,7 +2344,7 @@ /* Thermal Zone */ LoadTable ("OEM1", "", "", "\\", "\\DTM2.PLDT", \AUXD.TZN0) - CH04 (Arg0, 0x00, 0x2F, Z176, 0x0860, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z176, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = ObjectType (\AUXD.TZN0) If ((C015 != Local0)) { diff --git a/tests/aslts/src/runtime/collections/functional/table/unload.asl b/tests/aslts/src/runtime/collections/functional/table/unload.asl index b0f2bb7c4..6bf862df9 100644 --- a/tests/aslts/src/runtime/collections/functional/table/unload.asl +++ b/tests/aslts/src/runtime/collections/functional/table/unload.asl @@ -529,7 +529,7 @@ } Unload (DerefOf (Arg2)) - CH04 (Arg0, 0x00, 0x2F, Z175, 0x01B4, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z175, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Return (0x00) } @@ -560,11 +560,11 @@ Unload (Local1) If (SLCK) { - CH04 (Arg0, 0x00, 0x2F, Z175, 0x01CD, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z175, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ } Else { - CH04 (Arg0, 0x00, 0x31, Z175, 0x01CF, 0x00, 0x00) /* AE_AML_UNINITIALIZED_LOCAL */ + CH04 (Arg0, 0x00, 0x31, Z175, __LINE__, 0x00, 0x00) /* AE_AML_UNINITIALIZED_LOCAL */ } } @@ -592,7 +592,7 @@ Else { Unload (\AUXD.PAC0) - CH04 (Arg0, 0x00, 0x2F, Z175, 0x01E7, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z175, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ } /* Field Unit */ @@ -608,7 +608,7 @@ Else { Unload (\AUXD.DEV0) - CH04 (Arg0, 0x00, 0x2F, Z175, 0x01F3, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z175, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ } /* Event */ @@ -639,7 +639,7 @@ Else { Unload (\AUXD.TZN0) - CH04 (Arg0, 0x00, 0x2F, Z175, 0x020E, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z175, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ } /* Buffer Field */ @@ -680,7 +680,7 @@ /* Any next */ Unload (DDB0) - CH04 (Arg0, 0x00, 0x1C, Z175, 0x0238, 0x05, Local0) /* AE_BAD_PARAMETER */ + CH04 (Arg0, 0x00, 0x1C, Z175, __LINE__, 0x05, Local0) /* AE_BAD_PARAMETER */ Local0-- } @@ -699,7 +699,7 @@ /* Any next */ Unload (DDB0) - CH04 (Arg0, 0x00, 0x1C, Z175, 0x024B, 0x05, Local0) /* AE_BAD_PARAMETER */ + CH04 (Arg0, 0x00, 0x1C, Z175, __LINE__, 0x05, Local0) /* AE_BAD_PARAMETER */ Local0-- } @@ -740,22 +740,22 @@ /* Device */ Unload (DerefOf (RefOf (\AUXD.DEV0))) - CH04 (Arg0, 0x00, 0x3E, Z175, 0x026D, 0x00, 0x00) /* AE_AML_NO_RETURN_VALUE */ + CH04 (Arg0, 0x00, 0x3E, Z175, __LINE__, 0x00, 0x00) /* AE_AML_NO_RETURN_VALUE */ /* Thermal Zone */ Unload (DerefOf (RefOf (\AUXD.TZN0))) - CH04 (Arg0, 0x00, 0x3E, Z175, 0x0271, 0x00, 0x00) /* AE_AML_NO_RETURN_VALUE */ + CH04 (Arg0, 0x00, 0x3E, Z175, __LINE__, 0x00, 0x00) /* AE_AML_NO_RETURN_VALUE */ /* Method execution */ CopyObject (M000 (), M001) /* \DTM1.TST5.M001 */ Unload (M001 ()) If (SLCK) { - CH04 (Arg0, 0x00, 0x2F, Z175, 0x0278, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z175, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ } Else { - CH04 (Arg0, 0x00, 0x2F, Z175, 0x027A, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ + CH04 (Arg0, 0x00, 0x2F, Z175, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ } Unload (DDB0) |