diff options
| author | Erik Schmauss <erik.schmauss@intel.com> | 2018-02-26 15:32:23 -0800 |
|---|---|---|
| committer | Erik Schmauss <erik.schmauss@intel.com> | 2018-02-26 15:32:23 -0800 |
| commit | f39e31e5d7d01f001bf56513127fc591b792f99c (patch) | |
| tree | fbcc99a78a341aef90e6058a0d91bbc545cefb01 /tests/aslts/src/runtime/collections/exceptions | |
| parent | 12799888ae9b43fb8ae7921a9dbc53030fade21d (diff) | |
| download | acpica-f39e31e5d7d01f001bf56513127fc591b792f99c.tar.gz | |
ASLTS: Change CH03 to use __LINE__ and __METHOD__ macros
This changes hard-coded digits to macros.
Signed-off-by: Erik Schmauss <erik.schmauss@intel.com>
Diffstat (limited to 'tests/aslts/src/runtime/collections/exceptions')
16 files changed, 278 insertions, 278 deletions
diff --git a/tests/aslts/src/runtime/collections/exceptions/exc/exc.asl b/tests/aslts/src/runtime/collections/exceptions/exc/exc.asl index a8861389d..00a7568fb 100644 --- a/tests/aslts/src/runtime/collections/exceptions/exc/exc.asl +++ b/tests/aslts/src/runtime/collections/exceptions/exc/exc.asl @@ -36,34 +36,34 @@ Method (M140, 0, Serialized) { - CH03 (__METHOD__, Z058, 0x00, 0x2B, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Local1 = 0x01 Local0 = 0x02 Divide (Local1, Local0, Local2) - CH03 (__METHOD__, Z058, 0x01, 0x31, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Local0 = 0x00 Divide (Local1, Local0, Local2) CH04 (__METHOD__, 0x00, 0x38, Z058, __LINE__, 0x00, 0x00) /* AE_AML_DIVIDE_BY_ZERO */ Local0 = 0x02 Divide (Local1, Local0, Local2) - CH03 (__METHOD__, Z058, 0x03, 0x3B, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) } /* Modulo divide by zero */ Method (M141, 0, Serialized) { - CH03 (__METHOD__, Z058, 0x04, 0x43, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Local1 = 0x01 Local0 = 0x02 Local2 = (Local1 % Local0) - CH03 (__METHOD__, Z058, 0x05, 0x49, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Local0 = 0x00 Local2 = (Local1 % Local0) CH04 (__METHOD__, 0x00, 0x38, Z058, __LINE__, 0x00, 0x00) /* AE_AML_DIVIDE_BY_ZERO */ Local0 = 0x02 Local2 = (Local1 % Local0) - CH03 (__METHOD__, Z058, 0x07, 0x53, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) } /* Release ownership on a Mutex that is not currently owned */ @@ -71,7 +71,7 @@ Method (M142, 0, Serialized) { Mutex (MTX0, 0x00) - CH03 (__METHOD__, Z058, 0x08, 0x5D, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Release (MTX0) CH04 (__METHOD__, 0x00, 0x41, Z058, __LINE__, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */ } @@ -131,12 +131,12 @@ /* Buffer Field */ Local0 = BUF0 [0x00] - CH03 (__METHOD__, Z058, 0x0A, 0x93, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Local5 = SizeOf (STR0) Local5 = SizeOf (BUF0) Local5 = SizeOf (PAC0) Local5 = SizeOf (INT0) - CH03 (__METHOD__, Z058, 0x0B, 0x9A, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) If (INT0) { Local1 = 0x00 @@ -179,9 +179,9 @@ Local0++ } - CH03 (__METHOD__, Z058, 0x14, 0xC6, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) ToString (B000, Ones, Local5) - CH03 (__METHOD__, Z058, 0x15, 0xCA, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Name (B001, Buffer (0xC9){}) Local0 = 0x00 While ((Local0 < 0xC9)) @@ -197,7 +197,7 @@ * 20.12.2005. * No more limit of string size. */ - CH03 (__METHOD__, Z058, 0x16, 0xDC, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) } /* Access out of Package */ @@ -216,25 +216,25 @@ 0x01, 0x02 }) - CH03 (__METHOD__, Z058, 0x17, 0xE7, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) /* Package() */ Store (P000 [0x02], Local5) - CH03 (__METHOD__, Z058, 0x18, 0xED, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Store (P000 [0x03], Local5) CH04 (__METHOD__, 0x01, 0x37, Z058, __LINE__, 0x00, 0x00) /* AE_AML_PACKAGE_LIMIT */ Local0 = P000 [0x02] - CH03 (__METHOD__, Z058, 0x1A, 0xF5, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Local0 = P000 [0x03] CH04 (__METHOD__, 0x00, 0x37, Z058, __LINE__, 0x00, 0x00) /* AE_AML_PACKAGE_LIMIT */ /* Package(3) */ Store (P001 [0x02], Local5) - CH03 (__METHOD__, Z058, 0x1C, 0xFF, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Local5 = P001 [0x03] CH04 (__METHOD__, 0x00, 0x37, Z058, __LINE__, 0x00, 0x00) /* AE_AML_PACKAGE_LIMIT */ Local0 = P001 [0x02] - CH03 (__METHOD__, Z058, 0x1E, 0x0107, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Local0 = P001 [0x03] CH04 (__METHOD__, 0x00, 0x37, Z058, __LINE__, 0x00, 0x00) /* AE_AML_PACKAGE_LIMIT */ } @@ -244,15 +244,15 @@ Method (M085, 0, Serialized) { Name (S000, "123") - CH03 (__METHOD__, Z058, 0x20, 0x0115, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Local5 = S000 [0x02] - CH03 (__METHOD__, Z058, 0x21, 0x0119, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Local5 = S000 [0x03] /* Bug 177, Bugzilla 5480. */ CH04 (__METHOD__, 0x00, 0x3D, Z058, __LINE__, 0x00, 0x00) /* AE_AML_STRING_LIMIT */ Local0 = S000 [0x02] - CH03 (__METHOD__, Z058, 0x23, 0x0122, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Local0 = S000 [0x03] CH04 (__METHOD__, 0x00, 0x3D, Z058, __LINE__, 0x00, 0x00) /* AE_AML_STRING_LIMIT */ } @@ -269,25 +269,25 @@ { 0x00, 0x01, 0x02 // ... }) - CH03 (__METHOD__, Z058, 0x25, 0x0131, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) /* Buffer() */ Local5 = B000 [0x02] - CH03 (__METHOD__, Z058, 0x26, 0x0137, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Local5 = B000 [0x03] CH04 (__METHOD__, 0x00, 0x36, Z058, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ Local0 = B000 [0x02] - CH03 (__METHOD__, Z058, 0x28, 0x013F, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Local0 = B000 [0x03] CH04 (__METHOD__, 0x00, 0x36, Z058, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ /* Buffer(3) */ Local5 = B001 [0x02] - CH03 (__METHOD__, Z058, 0x2A, 0x0149, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Local5 = B001 [0x03] CH04 (__METHOD__, 0x00, 0x36, Z058, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ Local0 = B001 [0x02] - CH03 (__METHOD__, Z058, 0x2C, 0x0151, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Local0 = B001 [0x03] CH04 (__METHOD__, 0x00, 0x36, Z058, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ } @@ -296,7 +296,7 @@ /* exceeds the maximum of an integer for the current mode. */ Method (M146, 0, Serialized) { - CH03 (__METHOD__, Z058, 0x2E, 0x015E, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) If ((F64 == 0x01)) { Local0 = "0xffffffffffffffff" @@ -307,7 +307,7 @@ } ToInteger (Local0, Local5) - CH03 (__METHOD__, Z058, 0x2F, 0x0167, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) If ((F64 == 0x01)) { Local0 = "0x11111111111111111" @@ -331,7 +331,7 @@ Local0 = 0x00 } - CH03 (__METHOD__, Z058, 0x31, 0x017E, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Local0++ CH04 (__METHOD__, 0x00, 0x31, Z058, __LINE__, 0x00, 0x00) /* AE_AML_UNINITIALIZED_LOCAL */ } @@ -345,14 +345,14 @@ Method (M149, 1, Serialized) { - CH03 (__METHOD__, Z058, 0x33, 0x0190, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Stall (Arg0) - CH03 (__METHOD__, Z058, 0x34, 0x0194, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) } Method (M14A, 1, Serialized) { - CH03 (__METHOD__, Z058, 0x35, 0x019B, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Stall (Arg0) /* It is now bug 14. */ @@ -388,9 +388,9 @@ /* 101 characters */ Local1 = "01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890" - CH03 (__METHOD__, Z058, 0x37, 0x01C0, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Concatenate (Local0, Local0, Local5) - CH03 (__METHOD__, Z058, 0x38, 0x01C4, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Concatenate (Local0, Local1, Local5) /* * CH04(ts, 0, 61, z058, __LINE__, 0, 0) // AE_AML_STRING_LIMIT @@ -398,7 +398,7 @@ * 20.12.2005. * No more limit of string size. */ - CH03 (__METHOD__, Z058, 0x39, 0x01CF, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) } /* ToDecimalString() when the number of result characters in string exceeds 200 */ @@ -441,9 +441,9 @@ /* 0058 */ 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, // ........ /* 0060 */ 0x01, 0x01, 0x01, 0x01, 0x01 // ..... }) - CH03 (__METHOD__, Z058, 0x3A, 0x01EB, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) ToDecimalString (B000, Local5) - CH03 (__METHOD__, Z058, 0x3B, 0x01EF, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) ToDecimalString (B001, Local5) /* * CH04(ts, 0, 61, z058, __LINE__, 0, 0) // AE_AML_STRING_LIMIT @@ -451,14 +451,14 @@ * 20.12.2005. * No more limit of string size. */ - CH03 (__METHOD__, Z058, 0x3C, 0x01FA, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) } /* ToBCD() when a specified integer overflows a number of the BCD format */ Method (M14E, 0, Serialized) { - CH03 (__METHOD__, Z058, 0x3D, 0x0202, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) If ((F64 == 0x01)) { Local4 = 0x002386F26FC0FFFF @@ -469,7 +469,7 @@ ToBCD (0x05F5E0FF, Local5) } - CH03 (__METHOD__, Z058, 0x3E, 0x020B, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) If ((F64 == 0x01)) { Local4 = 0x002386F26FC10000 @@ -489,39 +489,39 @@ Method (M14F, 0, Serialized) { Name (B001, Buffer (0x10){}) - CH03 (__METHOD__, Z058, 0x40, 0x021F, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) CreateBitField (B001, 0x7F, F000) - CH03 (__METHOD__, Z058, 0x41, 0x0221, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) CreateBitField (B001, 0x80, F001) CH04 (__METHOD__, 0x00, 0x36, Z058, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ - CH03 (__METHOD__, Z058, 0x43, 0x0225, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) CreateByteField (B001, 0x0F, F002) - CH03 (__METHOD__, Z058, 0x44, 0x0227, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) CreateByteField (B001, 0x10, F003) CH04 (__METHOD__, 0x00, 0x36, Z058, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ - CH03 (__METHOD__, Z058, 0x46, 0x022B, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) CreateWordField (B001, 0x0E, F004) - CH03 (__METHOD__, Z058, 0x47, 0x022D, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) CreateWordField (B001, 0x0F, F005) CH04 (__METHOD__, 0x00, 0x36, Z058, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ - CH03 (__METHOD__, Z058, 0x49, 0x0231, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) CreateDWordField (B001, 0x0C, F006) - CH03 (__METHOD__, Z058, 0x4A, 0x0233, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) CreateDWordField (B001, 0x0D, F007) CH04 (__METHOD__, 0x00, 0x36, Z058, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ - CH03 (__METHOD__, Z058, 0x4C, 0x0237, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) CreateQWordField (B001, 0x08, F008) - CH03 (__METHOD__, Z058, 0x4D, 0x0239, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) CreateQWordField (B001, 0x09, F009) CH04 (__METHOD__, 0x00, 0x36, Z058, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ - CH03 (__METHOD__, Z058, 0x4F, 0x023D, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) CreateField (B001, 0x7F, 0x01, F00A) - CH03 (__METHOD__, Z058, 0x50, 0x023F, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) CreateField (B001, 0x80, 0x01, F00B) CH04 (__METHOD__, 0x00, 0x36, Z058, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ - CH03 (__METHOD__, Z058, 0x52, 0x0243, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) CreateField (B001, 0x78, 0x08, F00C) - CH03 (__METHOD__, Z058, 0x53, 0x0245, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) CreateField (B001, 0x78, 0x09, F00D) CH04 (__METHOD__, 0x00, 0x36, Z058, __LINE__, 0x00, 0x00) /* AE_AML_BUFFER_LIMIT */ } @@ -535,7 +535,7 @@ Local0 = 0x00 } - CH03 (__METHOD__, Z058, 0x55, 0x0253, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Local5 = Local0 [0x00] CH04 (__METHOD__, 0x00, 0x31, Z058, __LINE__, 0x00, 0x00) /* AE_AML_UNINITIALIZED_LOCAL */ } @@ -550,9 +550,9 @@ 0x01, 0x02 }) - CH03 (__METHOD__, Z058, 0x57, 0x0261, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Local5 = DerefOf (P000 [0x02]) - CH03 (__METHOD__, Z058, 0x58, 0x0265, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Local5 = DerefOf (P000 [0x03]) /* * Obsolete: @@ -611,9 +611,9 @@ /* 0038 */ 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, // ........ /* 0040 */ 0x01, 0x01, 0x01, 0x01 // .... }) - CH03 (__METHOD__, Z058, 0x5A, 0x0296, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) ToHexString (B000, Local5) - CH03 (__METHOD__, Z058, 0x5B, 0x029A, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) ToHexString (B001, Local5) /* * CH04(ts, 0, 61, z058, __LINE__, 0, 0) // AE_AML_STRING_LIMIT @@ -621,7 +621,7 @@ * 20.12.2005. * No more limit of string size. */ - CH03 (__METHOD__, Z058, 0x5C, 0x02A5, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) } /* StartIndex in Match greater than the package size */ @@ -632,9 +632,9 @@ { 0x00 }) - CH03 (__METHOD__, Z058, 0x5D, 0x02AF, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Local5 = Match (PAC0, MTR, 0x00, MTR, 0x00, 0x00) - CH03 (__METHOD__, Z058, 0x5E, 0x02B3, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Local5 = Match (PAC0, MTR, 0x00, MTR, 0x00, 0x01) CH04 (__METHOD__, 0x01, 0x37, Z058, __LINE__, 0x00, 0x00) /* AE_AML_PACKAGE_LIMIT */ } @@ -652,13 +652,13 @@ Local0 = 0x00 Local2 = Buffer (Local0){} - CH03 (__METHOD__, Z058, 0x60, 0x02C7, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) ConcatenateResTemplate (RT00, RT00, Local5) - CH03 (__METHOD__, Z058, 0x61, 0x02CB, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) ConcatenateResTemplate (RT00, Local2, Local5) /* Bug 188. */ - CH03 (__METHOD__, Z058, 0x62, 0x02D0, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) /* CH04(ts, 0, 71, z058, __LINE__, 0, 0) // AE_AML_NO_RESOURCE_END_TAG */ /* One-element buffer */ Local2 = Buffer (0x01) @@ -733,7 +733,7 @@ CH04 (__METHOD__, 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) } - CH03 (__METHOD__, Z058, 0xAB, 0x030F, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) } /* @@ -753,7 +753,7 @@ */ Method (M155, 0, Serialized) { - CH03 (__METHOD__, Z058, 0x69, 0x0325, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Local0 = ("0x1111" + 0x00) /* * Obsolete: @@ -761,7 +761,7 @@ * * New: */ - CH03 (__METHOD__, Z058, 0x6A, 0x032F, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) If ((Local0 != 0x1111)) { /* Bug 63, Bugzilla 5329. */ @@ -781,19 +781,19 @@ { Local0 = 0x00 Name (B000, Buffer (Local0){}) - CH03 (__METHOD__, Z058, 0x6B, 0x0344, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) /* Add, empty String */ Local5 = ("" + 0x00) /* CH04(ts, 0, 34, z058, __LINE__, 0, 0) // AE_BAD_HEX_CONSTANT */ - CH03 (__METHOD__, Z058, 0x6C, 0x034A, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) /* Add, String filled with blanks */ Local5 = (" " + 0x00) /* CH04(ts, 0, 34, z058, __LINE__, 0, 0) // AE_BAD_HEX_CONSTANT */ - CH03 (__METHOD__, Z058, 0x6D, 0x0350, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) /* ToInteger, empty String */ Local4 = "" @@ -829,7 +829,7 @@ Method (M157, 0, Serialized) { Name (I000, 0xAAAAAAAA) - CH03 (__METHOD__, Z058, 0x72, 0x0379, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Store (I000 [0x00], Local5) CH04 (__METHOD__, 0x01, 0x2F, Z058, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = I000 [0x00] @@ -845,7 +845,7 @@ Method (M158, 0, Serialized) { Name (I000, 0xAAAAAAAA) - CH03 (__METHOD__, Z058, 0x77, 0x0394, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) /* Bug 83, Bugzilla 5387. */ Local5 = DerefOf (I000) @@ -862,7 +862,7 @@ { Name (I000, 0xAAAAAAAA) Local7 = I000 /* \M087.I000 */ - CH03 (__METHOD__, Z058, 0x7A, 0x03AB, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) /* Index(Integer) */ Store (Local7 [0x00], Local5) @@ -891,7 +891,7 @@ /* 0008 */ 0x09 // . }) CreateField (B000, 0x00, 0x08, BF00) - CH03 (__METHOD__, Z058, 0x81, 0x03D2, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Store (BF00 [0x00], Local5) CH04 (__METHOD__, 0x01, 0x2F, Z058, __LINE__, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */ Local0 = BF00 [0x00] @@ -914,7 +914,7 @@ /* 0008 */ 0x09 // . }) CreateField (B000, 0x00, 0x08, BF00) - CH03 (__METHOD__, Z058, 0x87, 0x03F2, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) Local5 = DerefOf (BF00) /* Bug 83, Bugzilla 5387. */ @@ -953,7 +953,7 @@ IF01, 1 } - CH03 (__METHOD__, Z058, 0x8A, 0x040A, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) /* Field */ Store (F000 [0x00], Local5) @@ -1020,7 +1020,7 @@ IF01, 1 } - CH03 (__METHOD__, Z058, 0x9A, 0x045B, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) /* Field */ Local5 = DerefOf (F000) @@ -1072,7 +1072,7 @@ }) } - CH03 (__METHOD__, Z058, 0xA1, 0x0490, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) /* Discuss: now the ObjectType doesnt cause exception! Is it correct? Understand and discuss it. @@ -1092,10 +1092,10 @@ } Else { - CH03 (__METHOD__, Z058, 0xA7, 0x04A7, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) } - CH03 (__METHOD__, Z058, 0xA8, 0x04AA, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) } Method (MF9D, 0, NotSerialized) @@ -1123,10 +1123,10 @@ { } - CH03 ("mf9d", Z058, 0xAB, 0x04C4, 0x00) + CH03 ("mf9d", Z058, __LINE__, 0x00, 0x00) M000 () CH04 ("mf9d", 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) - CH03 ("mf9d", Z058, 0xAD, 0x04CA, 0x00) + CH03 ("mf9d", Z058, __LINE__, 0x00, 0x00) M001 () CH04 ("mf9d", 0x00, 0xFF, Z058, __LINE__, 0x00, 0x00) } @@ -1191,7 +1191,7 @@ } Local3 = RefOf (Local2) - CH03 (__METHOD__, Z058, 0x04F6, 0x00, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) /* Write: except DataTableRegion */ If ((Local1 < 0x03)) @@ -1274,7 +1274,7 @@ FU01, 8 } - CH03 (__METHOD__, Z058, 0xBF, 0x053F, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) FU00 = 0x12 CH04 (__METHOD__, 0x00, 0x35, Z058, __LINE__, 0x00, 0x00) /* AE_AML_REGION_LIMIT */ FU01 = 0x12 @@ -1292,7 +1292,7 @@ } Local0 = FU00 /* \M70B.FU00 */ - CH03 (__METHOD__, Z058, 0xC2, 0x0556, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) FU00 = 0x00 CH04 (__METHOD__, 0x00, 0x10, Z058, __LINE__, 0x00, 0x00) /* AE_SUPPORT */ } @@ -1310,7 +1310,7 @@ { 0x12 }) - CH03 (__METHOD__, Z058, 0xC1, 0x0566, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) DataTableRegion (DR00, B000, "", "") CH04 (__METHOD__, 0x00, 0x05, Z058, __LINE__, 0x00, 0x00) /* AE_NOT_FOUND */ DataTableRegion (DR01, "SSDT", B000, "") @@ -1349,7 +1349,7 @@ /* Create improper SMBus data buffer */ Name (BUFF, Buffer (0x21){}) - CH03 (__METHOD__, Z058, 0xCD, 0x0595, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) /* Invoke Write Quick transaction */ FLD0 = BUFF /* \M7F6.BUFF */ @@ -1392,7 +1392,7 @@ Return (0xABCD0002) } - CH03 (__METHOD__, Z058, 0xD0, 0x05C2, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) M004 () CH04 (__METHOD__, 0x00, 0x05, Z058, __LINE__, 0x00, 0x00) /* AE_NOT_FOUND */ } @@ -1401,7 +1401,7 @@ { /* Recursion */ - CH03 (__METHOD__, Z058, 0xD0, 0x05CA, 0x00) + CH03 (__METHOD__, Z058, __LINE__, 0x00, 0x00) M003 () CH04 (__METHOD__, 0x00, 0x54, Z058, __LINE__, 0x00, 0x00) /* AE_AML_METHOD_LIMIT */ Method (M003, 0, NotSerialized) diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_00_undef.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_00_undef.asl index 008d73745..c13037f0e 100644 --- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_00_undef.asl +++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_00_undef.asl @@ -52,7 +52,7 @@ /* CondRefOf */ CondRefOf (Local0, Local1) - CH03 (__METHOD__, Z092, 0x01, 0x3B, 0x00) + CH03 (__METHOD__, Z092, __LINE__, 0x00, 0x00) /* CopyObject */ CopyObject (Local0, Local1) @@ -92,11 +92,11 @@ /* ObjectType */ Local1 = ObjectType (Local0) - CH03 (__METHOD__, Z092, 0x02, 0x6D, 0x00) + CH03 (__METHOD__, Z092, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (Local0) - CH03 (__METHOD__, Z092, 0x03, 0x72, 0x00) + CH03 (__METHOD__, Z092, __LINE__, 0x00, 0x00) /* Release */ Release (Local0) @@ -390,7 +390,7 @@ If (X104) { Local1 = ObjectType (DerefOf (P000 [0x00])) - CH03 (__METHOD__, Z092, 0x05, 0x01DA, 0x00) + CH03 (__METHOD__, Z092, __LINE__, 0x00, 0x00) } /* RefOf */ @@ -998,7 +998,7 @@ If (X104) { Local1 = ObjectType (DerefOf (Arg1)) - CH03 (__METHOD__, Z092, 0x0B, 0x0531, 0x00) + CH03 (__METHOD__, Z092, __LINE__, 0x00, 0x00) } /* RefOf */ @@ -1417,7 +1417,7 @@ } } - CH03 (__METHOD__, Z092, 0x0C, 0x0716, 0x00) + CH03 (__METHOD__, Z092, __LINE__, 0x00, 0x00) /* Uninitialized Local */ M000 (Concatenate (__METHOD__, "-m000"), 0x00) diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_01_int.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_01_int.asl index d1cc39345..376691dde 100644 --- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_01_int.asl +++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_01_int.asl @@ -248,7 +248,7 @@ } Local1 = DerefOf (Arg1) - CH03 (__METHOD__, Z093, 0x00, 0xFC, 0x00) + CH03 (__METHOD__, Z093, __LINE__, 0x00, 0x00) Local1 = DerefOf (DerefOf (Arg1)) CH06 (Arg0, 0x2F, 0x2F) Store (DerefOf (Arg1) [0x00], Local1) @@ -360,7 +360,7 @@ Local0 = (0x03 * LPC0) /* \M4B1.M007.LPC0 */ I001 = 0x00 Local1 = DerefOf (M000 (0x01, LPC0)) - CH03 (__METHOD__, Z093, 0x016A, 0x00, 0x00) + CH03 (__METHOD__, Z093, __LINE__, 0x00, 0x00) CH00 (Arg0, 0x01) Local1 = DerefOf (DerefOf (M000 (0x02, LPC0))) CH06 (Arg0, (0x3C + Local0), 0x2F) @@ -376,7 +376,7 @@ } } - CH03 (__METHOD__, Z093, 0x03, 0x017E, 0x00) + CH03 (__METHOD__, Z093, __LINE__, 0x00, 0x00) /* Local Named Object */ M000 (__METHOD__) diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_02_str.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_02_str.asl index 952276308..0ce3cca01 100644 --- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_02_str.asl +++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_02_str.asl @@ -57,7 +57,7 @@ /* Index */ Local1 = S000 [0x00] - CH03 (__METHOD__, Z094, 0x01, 0x42, 0x00) + CH03 (__METHOD__, Z094, __LINE__, 0x00, 0x00) /* ConcatenateResTemplate */ ConcatenateResTemplate (S000, Buffer (0x02) @@ -85,7 +85,7 @@ /* Index */ Local1 = S100 [0x00] - CH03 (__METHOD__, Z094, 0x03, 0x59, 0x00) + CH03 (__METHOD__, Z094, __LINE__, 0x00, 0x00) /* ConcatenateResTemplate */ ConcatenateResTemplate (S100, Buffer (0x02) @@ -139,7 +139,7 @@ /* Index */ Local1 = Arg1 [0x00] - CH03 (__METHOD__, Z094, 0x05, 0x8C, 0x00) + CH03 (__METHOD__, Z094, __LINE__, 0x00, 0x00) /* Wait */ Local1 = Wait (Arg1, 0x00) @@ -190,7 +190,7 @@ /* Index */ Local1 = Local0 [0x00] - CH03 (__METHOD__, Z094, 0x07, 0xC2, 0x00) + CH03 (__METHOD__, Z094, __LINE__, 0x00, 0x00) /* Wait */ Local1 = Wait (Local0, 0x00) @@ -214,7 +214,7 @@ Local1 = DerefOf (DerefOf (P000 [0x00])) CH06 (Arg0, 0x20, 0x05) Store (DerefOf (P000 [0x00]) [0x00], Local1) - CH03 (__METHOD__, Z094, 0x08, 0xDA, 0x00) + CH03 (__METHOD__, Z094, __LINE__, 0x00, 0x00) Local1 = Match (DerefOf (P000 [0x00]), MTR, 0x00, MTR, 0x00, 0x00) CH06 (Arg0, 0x21, 0x2F) @@ -223,7 +223,7 @@ Local1 = DerefOf (DerefOf (Local0 = P000 [0x00])) CH06 (Arg0, 0x22, 0x05) Store (DerefOf (Local0 = P000 [0x00]) [0x00], Local1) - CH03 (__METHOD__, Z094, 0x09, 0xE5, 0x00) + CH03 (__METHOD__, Z094, __LINE__, 0x00, 0x00) Local1 = Match (DerefOf (Local0 = P000 [0x00]), MTR, 0x00, MTR, 0x00, 0x00) CH06 (Arg0, 0x23, 0x2F) @@ -243,11 +243,11 @@ } Local1 = DerefOf (Arg1) - CH03 (__METHOD__, Z094, 0x0A, 0xF8, 0x00) + CH03 (__METHOD__, Z094, __LINE__, 0x00, 0x00) Local1 = DerefOf (DerefOf (Arg1)) CH06 (Arg0, 0x25, 0x05) Store (DerefOf (Arg1) [0x00], Local1) - CH03 (__METHOD__, Z094, 0x0B, 0xFE, 0x00) + CH03 (__METHOD__, Z094, __LINE__, 0x00, 0x00) Local1 = Match (DerefOf (Arg1), MTR, 0x00, MTR, 0x00, 0x00) CH06 (Arg0, 0x26, 0x2F) Return (0x00) @@ -304,11 +304,11 @@ CH00 (Arg0, 0x05) } - CH03 (__METHOD__, Z094, 0x0C, 0x0135, 0x00) + CH03 (__METHOD__, Z094, __LINE__, 0x00, 0x00) Store (M000 (0x06) [0x00], Local1) If (Y900) { - CH03 (__METHOD__, Z094, 0x0C, 0x0138, 0x00) + CH03 (__METHOD__, Z094, __LINE__, 0x00, 0x00) CH00 (Arg0, 0x06) } Else @@ -364,7 +364,7 @@ Local0 = (0x03 * LPC0) /* \M4B2.M007.LPC0 */ I000 = 0x00 Local1 = DerefOf (M000 (0x01, LPC0)) - CH03 (__METHOD__, Z094, 0x016B, 0x00, 0x00) + CH03 (__METHOD__, Z094, __LINE__, 0x00, 0x00) CH00 (Arg0, 0x01) Local1 = DerefOf (DerefOf (M000 (0x02, LPC0))) CH06 (Arg0, (0x30 + Local0), 0x2F) @@ -380,7 +380,7 @@ } } - CH03 (__METHOD__, Z094, 0x0F, 0x017F, 0x00) + CH03 (__METHOD__, Z094, __LINE__, 0x00, 0x00) /* Local Named Object */ M000 (__METHOD__) diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_03_buf.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_03_buf.asl index b59afdc20..490712d8d 100644 --- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_03_buf.asl +++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_03_buf.asl @@ -60,7 +60,7 @@ } Store (B000 [0x00], Local1) - CH03 (__METHOD__, Z095, 0x00, 0x3C, 0x00) + CH03 (__METHOD__, Z095, __LINE__, 0x00, 0x00) } /* Global Named Object */ @@ -74,7 +74,7 @@ } Store (B100 [0x00], Local1) - CH03 (__METHOD__, Z095, 0x01, 0x48, 0x00) + CH03 (__METHOD__, Z095, __LINE__, 0x00, 0x00) } /* Argument */ @@ -92,7 +92,7 @@ Local1 = Acquire (Arg1, 0x0000) CH06 (Arg0, 0x06, 0x2F) Store (Arg1 [0x00], Local1) - CH03 (__METHOD__, Z095, 0x02, 0x5E, 0x00) + CH03 (__METHOD__, Z095, __LINE__, 0x00, 0x00) Local1 = Wait (Arg1, 0x00) CH06 (Arg0, 0x07, 0x2F) Local1 = Match (Arg1, MTR, 0x00, MTR, 0x00, 0x00) @@ -118,7 +118,7 @@ Local1 = Acquire (Local0, 0x0000) CH06 (Arg0, 0x0D, 0x2F) Store (Local0 [0x00], Local1) - CH03 (__METHOD__, Z095, 0x03, 0x7C, 0x00) + CH03 (__METHOD__, Z095, __LINE__, 0x00, 0x00) Local1 = Wait (Local0, 0x00) CH06 (Arg0, 0x0E, 0x2F) Local1 = Match (Local0, MTR, 0x00, MTR, 0x00, 0x00) @@ -141,7 +141,7 @@ Local1 = DerefOf (DerefOf (Local0 = P000 [0x00])) CH06 (Arg0, 0x12, 0x2F) Store (DerefOf (Local0 = P000 [0x00]) [0x00], Local1) - CH03 (__METHOD__, Z095, 0x05, 0x90, 0x00) + CH03 (__METHOD__, Z095, __LINE__, 0x00, 0x00) Local1 = Match (DerefOf (Local0 = P000 [0x00]), MTR, 0x00, MTR, 0x00, 0x00) CH06 (Arg0, 0x13, 0x2F) @@ -161,11 +161,11 @@ } Local1 = DerefOf (Arg1) - CH03 (__METHOD__, Z095, 0x06, 0xA3, 0x00) + CH03 (__METHOD__, Z095, __LINE__, 0x00, 0x00) Local1 = DerefOf (DerefOf (Arg1)) CH06 (Arg0, 0x15, 0x2F) Store (DerefOf (Arg1) [0x00], Local1) - CH03 (__METHOD__, Z095, 0x07, 0xA9, 0x00) + CH03 (__METHOD__, Z095, __LINE__, 0x00, 0x00) Local1 = Match (DerefOf (Arg1), MTR, 0x00, MTR, 0x00, 0x00) CH06 (Arg0, 0x16, 0x2F) Return (0x00) @@ -225,11 +225,11 @@ CH00 (Arg0, 0x05) } - CH03 (__METHOD__, Z095, 0x0C, 0xE0, 0x00) + CH03 (__METHOD__, Z095, __LINE__, 0x00, 0x00) Store (M000 (0x06) [0x00], Local1) If (Y900) { - CH03 (__METHOD__, Z095, 0x08, 0xE3, 0x00) + CH03 (__METHOD__, Z095, __LINE__, 0x00, 0x00) CH00 (Arg0, 0x06) } Else @@ -288,7 +288,7 @@ Local0 = (0x03 * LPC0) /* \M4B3.M007.LPC0 */ I000 = 0x00 Local1 = DerefOf (M000 (0x01, LPC0)) - CH03 (__METHOD__, Z095, 0x0116, 0x00, 0x00) + CH03 (__METHOD__, Z095, __LINE__, 0x00, 0x00) CH00 (Arg0, 0x01) Local1 = DerefOf (DerefOf (M000 (0x02, LPC0))) CH06 (Arg0, (0x20 + Local0), 0x2F) @@ -304,7 +304,7 @@ } } - CH03 (__METHOD__, Z095, 0x0B, 0x012A, 0x00) + CH03 (__METHOD__, Z095, __LINE__, 0x00, 0x00) /* Local Named Object */ M000 (__METHOD__) diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_04_pckg.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_04_pckg.asl index 80ada5e38..342d42b26 100644 --- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_04_pckg.asl +++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_04_pckg.asl @@ -59,13 +59,13 @@ /* CondRefOf */ Local1 = CondRefOf (P000) - CH03 (__METHOD__, Z096, 0x00, 0x3F, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) CondRefOf (P000, Local1) - CH03 (__METHOD__, Z096, 0x01, 0x42, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* CopyObject */ CopyObject (P000, Local1) - CH03 (__METHOD__, Z096, 0x02, 0x47, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* Decrement */ /* DerefOf */ /* These are now caught by the compiler - Aug 2015 @@ -82,22 +82,22 @@ /* Not */ /* ObjectType */ Local1 = ObjectType (P000) - CH03 (__METHOD__, Z096, 0x03, 0x63, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (P000) - CH03 (__METHOD__, Z096, 0x04, 0x68, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* Release */ /* Reset */ /* Signal */ /* SizeOf */ Local1 = SizeOf (P000) - CH03 (__METHOD__, Z096, 0x05, 0x73, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* Sleep */ /* Stall */ /* Store */ Local1 = P000 /* \M4B4.M000.P000 */ - CH03 (__METHOD__, Z096, 0x06, 0x7C, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* ToBCD */ /* ToBuffer */ /* ToDecimalString */ @@ -112,9 +112,9 @@ /* Fatal */ /* Index */ Local1 = P000 [0x00] - CH03 (__METHOD__, Z096, 0x07, 0x99, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) Store (P000 [0x00], Local1) - CH03 (__METHOD__, Z096, 0x08, 0x9C, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* LEqual */ /* LGreater */ /* LGreaterEqual */ @@ -136,7 +136,7 @@ /* Mid */ /* Match */ Local1 = Match (P000, MTR, 0x00, MTR, 0x00, 0x00) - CH03 (__METHOD__, Z096, 0x09, 0xC7, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) } /* Global Named Object */ @@ -146,11 +146,11 @@ /* CondRefOf */ CondRefOf (P100, Local1) - CH03 (__METHOD__, Z096, 0x0B, 0xD0, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* CopyObject */ CopyObject (P100, Local1) - CH03 (__METHOD__, Z096, 0x0C, 0xD5, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* Decrement */ /* DerefOf */ /* These are now caught by the compiler - Aug 2015 @@ -167,22 +167,22 @@ /* Not */ /* ObjectType */ Local1 = ObjectType (P100) - CH03 (__METHOD__, Z096, 0x0D, 0xF0, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (P100) - CH03 (__METHOD__, Z096, 0x0E, 0xF5, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* Release */ /* Reset */ /* Signal */ /* SizeOf */ Local1 = SizeOf (P100) - CH03 (__METHOD__, Z096, 0x0F, 0x0100, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* Sleep */ /* Stall */ /* Store */ Local1 = P100 /* \P100 */ - CH03 (__METHOD__, Z096, 0x10, 0x0109, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* ToBCD */ /* ToBuffer */ /* ToDecimalString */ @@ -197,7 +197,7 @@ /* Fatal */ /* Index */ Store (P100 [0x00], Local1) - CH03 (__METHOD__, Z096, 0x12, 0x0126, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* LEqual */ /* LGreater */ /* LGreaterEqual */ @@ -219,7 +219,7 @@ /* Mid */ /* Match */ Local1 = Match (P100, MTR, 0x00, MTR, 0x00, 0x00) - CH03 (__METHOD__, Z096, 0x13, 0x0151, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) } /* Argument */ @@ -230,11 +230,11 @@ /* CondRefOf */ CondRefOf (Arg1, Local1) - CH03 (__METHOD__, Z096, 0x15, 0x015C, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* CopyObject */ CopyObject (Arg1, Local1) - CH03 (__METHOD__, Z096, 0x16, 0x0161, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* Decrement */ Arg1-- @@ -270,11 +270,11 @@ /* ObjectType */ Local1 = ObjectType (Arg1) - CH03 (__METHOD__, Z096, 0x17, 0x018E, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (Arg1) - CH03 (__METHOD__, Z096, 0x18, 0x0193, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* Release */ Release (Arg1) @@ -290,7 +290,7 @@ /* SizeOf */ Local1 = SizeOf (Arg1) - CH03 (__METHOD__, Z096, 0x19, 0x01A7, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* Sleep */ Sleep (Arg1) @@ -302,7 +302,7 @@ /* Store */ Local1 = Arg1 - CH03 (__METHOD__, Z096, 0x1A, 0x01B6, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* ToBCD */ ToBCD (Arg1, Local1) @@ -374,7 +374,7 @@ /* Index */ Local1 = Arg1 [0x00] - CH03 (__METHOD__, Z096, 0x1C, 0x020C, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) Index ("0", Arg1, Local1) CH06 (Arg0, 0x39, 0x2F) /* LEqual */ @@ -496,7 +496,7 @@ /* Match */ Local1 = Match (Arg1, MTR, 0x00, MTR, 0x00, 0x00) - CH03 (__METHOD__, Z096, 0x1D, 0x02AF, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) Local1 = Match (Package (0x01) { 0x01 @@ -525,11 +525,11 @@ /* CondRefOf */ CondRefOf (Local0, Local1) - CH03 (__METHOD__, Z096, 0x1F, 0x02C3, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* CopyObject */ CopyObject (Local0, Local1) - CH03 (__METHOD__, Z096, 0x20, 0x02C8, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* Decrement */ Local0-- @@ -565,11 +565,11 @@ /* ObjectType */ Local1 = ObjectType (Local0) - CH03 (__METHOD__, Z096, 0x21, 0x02F5, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (Local0) - CH03 (__METHOD__, Z096, 0x22, 0x02FA, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* Release */ Release (Local0) @@ -585,7 +585,7 @@ /* SizeOf */ Local1 = SizeOf (Local0) - CH03 (__METHOD__, Z096, 0x23, 0x030E, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* Sleep */ Sleep (Local0) @@ -597,7 +597,7 @@ /* Store */ Local1 = Local0 - CH03 (__METHOD__, Z096, 0x24, 0x031D, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* ToBCD */ ToBCD (Local0, Local1) @@ -667,7 +667,7 @@ /* Index */ Local1 = Local0 [0x00] - CH03 (__METHOD__, Z096, 0x26, 0x0370, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) Index ("0", Local0, Local1) CH06 (Arg0, 0x39, 0x2F) /* LEqual */ @@ -789,7 +789,7 @@ /* Match */ Local1 = Match (Local0, MTR, 0x00, MTR, 0x00, 0x00) - CH03 (__METHOD__, Z096, 0x27, 0x0413, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) Local1 = Match (Package (0x01) { 0x01 @@ -825,7 +825,7 @@ /* CopyObject */ CopyObject (DerefOf (P000 [0x00]), Local1) - CH03 (__METHOD__, Z096, 0x28, 0x042E, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* Decrement */ DerefOf (P000 [0x00])-- @@ -861,7 +861,7 @@ /* ObjectType */ Local1 = ObjectType (DerefOf (P000 [0x00])) - CH03 (__METHOD__, Z096, 0x29, 0x045B, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (DerefOf (P000 [0x00])) @@ -871,7 +871,7 @@ /* Signal */ /* SizeOf */ Local1 = SizeOf (DerefOf (P000 [0x00])) - CH03 (__METHOD__, Z096, 0x2A, 0x046B, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* Sleep */ Sleep (DerefOf (P000 [0x00])) @@ -883,7 +883,7 @@ /* Store */ Local1 = DerefOf (P000 [0x00]) - CH03 (__METHOD__, Z096, 0x2B, 0x047A, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* ToBCD */ ToBCD (DerefOf (P000 [0x00]), Local1) @@ -951,7 +951,7 @@ /* Index */ Local1 = DerefOf (P000 [0x00]) [0x00] - CH03 (__METHOD__, Z096, 0x2D, 0x04CD, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) Index ("0", DerefOf (P000 [0x00]), Local1) CH06 (Arg0, 0x39, 0x2F) /* LEqual */ @@ -1072,7 +1072,7 @@ Local1 = Match (DerefOf (P000 [0x00]), MTR, 0x00, MTR, 0x00, 0x00) - CH03 (__METHOD__, Z096, 0x2E, 0x056D, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) Local1 = Match (Package (0x01) { 0x01 @@ -1095,7 +1095,7 @@ /* CopyObject */ CopyObject (DerefOf (Local0 = P000 [0x00]), Local1) - CH03 (__METHOD__, Z096, 0x2F, 0x0583, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* Decrement */ DerefOf (Local0 = P000 [0x00])-- @@ -1131,7 +1131,7 @@ /* ObjectType */ Local1 = ObjectType (DerefOf (Local0 = P000 [0x00])) - CH03 (__METHOD__, Z096, 0x30, 0x05B0, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (DerefOf (Local0 = P000 [0x00])) @@ -1141,7 +1141,7 @@ /* Signal */ /* SizeOf */ Local1 = SizeOf (DerefOf (Local0 = P000 [0x00])) - CH03 (__METHOD__, Z096, 0x31, 0x05C0, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* Sleep */ Sleep (DerefOf (Local0 = P000 [0x00])) @@ -1153,7 +1153,7 @@ /* Store */ Local1 = DerefOf (Local0 = P000 [0x00]) - CH03 (__METHOD__, Z096, 0x32, 0x05CF, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* ToBCD */ ToBCD (DerefOf (Local0 = P000 [0x00]), Local1) @@ -1221,7 +1221,7 @@ /* Index */ Local1 = DerefOf (Local0 = P000 [0x00]) [0x00] - CH03 (__METHOD__, Z096, 0x34, 0x0622, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) Index ("0", DerefOf (Local0 = P000 [0x00]), Local1) CH06 (Arg0, 0x39, 0x2F) /* LEqual */ @@ -1342,7 +1342,7 @@ Local1 = Match (DerefOf (Local0 = P000 [0x00]), MTR, 0x00, MTR, 0x00, 0x00) - CH03 (__METHOD__, Z096, 0x35, 0x06C2, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) Local1 = Match (Package (0x01) { 0x01 @@ -1374,7 +1374,7 @@ } Local1 = DerefOf (Arg1) - CH03 (__METHOD__, Z096, 0x36, 0x06DB, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* CondRefOf */ Local1 = CondRefOf (DerefOf (Arg1)) @@ -1384,7 +1384,7 @@ /* CopyObject */ CopyObject (DerefOf (Arg1), Local1) - CH03 (__METHOD__, Z096, 0x37, 0x06E8, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* Decrement */ DerefOf (Arg1)-- @@ -1420,7 +1420,7 @@ /* ObjectType */ Local1 = ObjectType (DerefOf (Arg1)) - CH03 (__METHOD__, Z096, 0x38, 0x0715, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (DerefOf (Arg1)) @@ -1430,7 +1430,7 @@ /* Signal */ /* SizeOf */ Local1 = SizeOf (DerefOf (Arg1)) - CH03 (__METHOD__, Z096, 0x39, 0x0725, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* Sleep */ Sleep (DerefOf (Arg1)) @@ -1442,7 +1442,7 @@ /* Store */ Local1 = DerefOf (Arg1) - CH03 (__METHOD__, Z096, 0x3A, 0x0734, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* ToBCD */ ToBCD (DerefOf (Arg1), Local1) @@ -1510,7 +1510,7 @@ /* Index */ Local1 = DerefOf (Arg1) [0x00] - CH03 (__METHOD__, Z096, 0x3C, 0x0787, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) Index ("0", DerefOf (Arg1), Local1) CH06 (Arg0, 0x39, 0x2F) /* LEqual */ @@ -1630,7 +1630,7 @@ /* Match */ Local1 = Match (DerefOf (Arg1), MTR, 0x00, MTR, 0x00, 0x00) - CH03 (__METHOD__, Z096, 0x3D, 0x0827, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) Local1 = Match (Package (0x01) { 0x01 @@ -1679,7 +1679,7 @@ /* CopyObject */ CopyObject (M000 (), Local1) - CH03 (__METHOD__, Z096, 0x3E, 0x0852, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* Decrement */ M000 ()-- @@ -1715,7 +1715,7 @@ /* **** ObjectType */ /* Nov. 2012: Method invocation as arg to ObjectType is now illegal */ Local0 = ObjectType (M000) - CH03 (__METHOD__, Z096, 0x3F, 0x0880, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* RefOf */ /* **** Oct. 2016: Method invocation as arg to RefOf is now illegal */ /* if (y601) { */ @@ -1818,20 +1818,20 @@ If (Y900) { Local1 = M000 () [0x00] - CH03 (__METHOD__, Z096, 0x41, 0x08FF, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) Index ("0", M000 (), Local1) CH06 (Arg0, 0x39, 0x2F) } Else { - CH03 (__METHOD__, Z096, 0x0123, 0x0904, 0x00) - CH03 (__METHOD__, Z096, 0x0127, 0x0905, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) Local1 = M000 () [0x00] CH04 (__METHOD__, 0x00, 0x55, Z094, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ - CH03 (__METHOD__, Z096, 0x0129, 0x0909, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) Index ("0", M000 (), Local1) CH04 (__METHOD__, 0x00, 0xFF, Z094, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ - CH03 (__METHOD__, Z096, 0x0129, 0x090D, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) Local1 = SS00 [M000 ()] CH04 (__METHOD__, 0x00, 0x2F, Z094, __LINE__, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */ } @@ -1955,7 +1955,7 @@ /* Match */ Local1 = Match (M000 (), MTR, 0x00, MTR, 0x00, 0x00) - CH03 (__METHOD__, Z096, 0x42, 0x09B0, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) Local1 = Match (Package (0x01) { 0x01 @@ -2012,7 +2012,7 @@ Local0 = (0x03 * LPC0) /* \M4B4.M007.LPC0 */ I000 = 0x00 Local1 = DerefOf (M000 (0x01, LPC0)) - CH03 (__METHOD__, Z096, 0x09DE, 0x00, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) CH00 (Arg0, 0x01) Local1 = DerefOf (DerefOf (M000 (0x02, LPC0))) CH06 (Arg0, (0x01 + Local0), 0x2F) @@ -2117,11 +2117,11 @@ /* Index */ - CH03 (__METHOD__, Z094, 0x0123, 0x0A48, 0x00) + CH03 (__METHOD__, Z094, __LINE__, 0x00, 0x00) Store (M000 (0x09) [0x00], Local1) If (Y900) { - CH03 (__METHOD__, Z096, 0x45, 0x0A4B, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) CH00 (Arg0, 0x09) } Else @@ -2141,12 +2141,12 @@ /* Match */ Local1 = Match (M000 (0x0B), MTR, 0x00, MTR, 0x00, 0x00) - CH03 (__METHOD__, Z096, 0x46, 0x0A5C, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) CH00 (Arg0, 0x0B) } SET0 (Z096, __METHOD__, 0x00) - CH03 (__METHOD__, Z096, 0x46, 0x0A62, 0x00) + CH03 (__METHOD__, Z096, __LINE__, 0x00, 0x00) /* Local Named Object */ M000 (__METHOD__) diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_05_funit.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_05_funit.asl index c0c8ebbf5..4b866bc02 100644 --- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_05_funit.asl +++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_05_funit.asl @@ -92,7 +92,7 @@ Store (FU03 [0x00], Local1) If (Y900) { - CH03 (__METHOD__, Z097, 0x00, 0x5A, 0x00) + CH03 (__METHOD__, Z097, __LINE__, 0x00, 0x00) } Else { @@ -127,7 +127,7 @@ Store (FU01 [0x00], Local1) If (Y900) { - CH03 (__METHOD__, Z097, 0x01, 0x79, 0x00) + CH03 (__METHOD__, Z097, __LINE__, 0x00, 0x00) } Else { @@ -149,7 +149,7 @@ } Local1 = DerefOf (Arg1) - CH03 (__METHOD__, Z097, 0x02, 0x8C, 0x00) + CH03 (__METHOD__, Z097, __LINE__, 0x00, 0x00) Local1 = DerefOf (DerefOf (Arg1)) CH06 (Arg0, 0x07, 0x2F) Store (DerefOf (Arg1) [0x00], Local1) @@ -159,7 +159,7 @@ If (Y900) { - CH03 (__METHOD__, Z097, 0x03, 0x96, 0x00) + CH03 (__METHOD__, Z097, __LINE__, 0x00, 0x00) } Else { @@ -232,7 +232,7 @@ Local0 = (0x03 * LPC0) /* \M4B5.M003.LPC0 */ I000 = 0x00 Local1 = DerefOf (M000 (0x01, LPC0)) - CH03 (__METHOD__, Z097, 0xD3, 0x00, 0x00) + CH03 (__METHOD__, Z097, __LINE__, 0x00, 0x00) CH00 (Arg0, 0x01) Local1 = DerefOf (DerefOf (M000 (0x02, LPC0))) CH06 (Arg0, (0x0B + Local0), 0x2F) @@ -244,7 +244,7 @@ If (Y900) { - CH03 (__METHOD__, Z097, 0xDF, 0x00, 0x00) + CH03 (__METHOD__, Z097, __LINE__, 0x00, 0x00) } Else { @@ -267,7 +267,7 @@ } } - CH03 (__METHOD__, Z097, 0x0C, 0xF2, 0x00) + CH03 (__METHOD__, Z097, __LINE__, 0x00, 0x00) /* Local Named Object */ M000 (__METHOD__) diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_06_dev.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_06_dev.asl index 956a439e8..7e77aca38 100644 --- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_06_dev.asl +++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_06_dev.asl @@ -78,11 +78,11 @@ /* CondRefOf */ CondRefOf (Local0, Local1) - CH03 (__METHOD__, Z098, 0x01, 0x56, 0x00) + CH03 (__METHOD__, Z098, __LINE__, 0x00, 0x00) /* CopyObject */ CopyObject (Local0, Local1) - CH03 (__METHOD__, Z098, 0x02, 0x5B, 0x00) + CH03 (__METHOD__, Z098, __LINE__, 0x00, 0x00) /* Decrement */ Local0-- @@ -118,11 +118,11 @@ /* ObjectType */ Local1 = ObjectType (Local0) - CH03 (__METHOD__, Z098, 0x03, 0x88, 0x00) + CH03 (__METHOD__, Z098, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (Local0) - CH03 (__METHOD__, Z098, 0x04, 0x8D, 0x00) + CH03 (__METHOD__, Z098, __LINE__, 0x00, 0x00) /* Release */ Release (Local0) @@ -383,7 +383,7 @@ } Local1 = DerefOf (Arg1) - CH03 (__METHOD__, Z098, 0x05, 0x01C7, 0x00) + CH03 (__METHOD__, Z098, __LINE__, 0x00, 0x00) /* CondRefOf */ CondRefOf (DerefOf (Arg1), Local1) @@ -427,7 +427,7 @@ /* ObjectType */ Local1 = ObjectType (DerefOf (Arg1)) - CH03 (__METHOD__, Z098, 0x06, 0x01FE, 0x00) + CH03 (__METHOD__, Z098, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (DerefOf (Arg1)) @@ -675,7 +675,7 @@ /* CopyObject */ CopyObject (M000 (), Local1) - CH03 (__METHOD__, Z098, 0x07, 0x0334, 0x00) + CH03 (__METHOD__, Z098, __LINE__, 0x00, 0x00) /* Decrement */ M000 ()-- @@ -711,7 +711,7 @@ /* **** ObjectType */ /* Nov. 2016: Method invocation as arg to ObjectType is now illegal */ Local0 = ObjectType (M000) - CH03 (__METHOD__, Z098, 0x08, 0x0362, 0x00) + CH03 (__METHOD__, Z098, __LINE__, 0x00, 0x00) /* RefOf */ /* **** Oct. 2016: Method invocation as arg to RefOf is now illegal */ /* Store (RefOf(m000()), Local1) */ @@ -993,7 +993,7 @@ Local0 = (0x03 * LPC0) /* \M4B6.M005.LPC0 */ I000 = 0x00 Local1 = DerefOf (M000 (0x01, LPC0)) - CH03 (__METHOD__, Z098, 0x04B2, 0x00, 0x00) + CH03 (__METHOD__, Z098, __LINE__, 0x00, 0x00) CH00 (Arg0, 0x01) Local1 = DerefOf (DerefOf (M000 (0x02, LPC0))) CH06 (Arg0, (0x01 + Local0), 0x2F) @@ -1009,7 +1009,7 @@ } } - CH03 (__METHOD__, Z098, 0x0B, 0x04C6, 0x00) + CH03 (__METHOD__, Z098, __LINE__, 0x00, 0x00) /* Local Named Object */ /* m000(ts) */ /* Global Named Object */ diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_07_event.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_07_event.asl index bec1585f2..cfac31b97 100644 --- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_07_event.asl +++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_07_event.asl @@ -69,11 +69,11 @@ /* CondRefOf */ CondRefOf (Local0, Local1) - CH03 (__METHOD__, Z099, 0x01, 0x57, 0x00) + CH03 (__METHOD__, Z099, __LINE__, 0x00, 0x00) /* CopyObject */ CopyObject (Local0, Local1) - CH03 (__METHOD__, Z099, 0x02, 0x5C, 0x00) + CH03 (__METHOD__, Z099, __LINE__, 0x00, 0x00) /* Decrement */ Local0-- @@ -109,11 +109,11 @@ /* ObjectType */ Local1 = ObjectType (Local0) - CH03 (__METHOD__, Z099, 0x03, 0x89, 0x00) + CH03 (__METHOD__, Z099, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (Local0) - CH03 (__METHOD__, Z099, 0x04, 0x8E, 0x00) + CH03 (__METHOD__, Z099, __LINE__, 0x00, 0x00) /* Release */ Release (Local0) @@ -121,11 +121,11 @@ /* Reset */ Reset (Local0) - CH03 (__METHOD__, Z099, 0x0E, 0x98, 0x00) + CH03 (__METHOD__, Z099, __LINE__, 0x00, 0x00) /* Signal */ Signal (Local0) - CH03 (__METHOD__, Z099, 0x0F, 0x9D, 0x00) + CH03 (__METHOD__, Z099, __LINE__, 0x00, 0x00) /* SizeOf */ Local1 = SizeOf (Local0) @@ -315,7 +315,7 @@ /* Wait */ Local1 = Wait (Local0, I000) - CH03 (__METHOD__, Z099, 0x6C, 0x018F, 0x00) + CH03 (__METHOD__, Z099, __LINE__, 0x00, 0x00) Local1 = Wait (E000, Local0) CH06 (Arg0, 0x6D, 0x2F) /* XOr */ @@ -377,7 +377,7 @@ /* CopyObject */ CopyObject (DerefOf (Arg1), Local1) - CH03 (__METHOD__, Z099, 0x02, 0x01CC, 0x00) + CH03 (__METHOD__, Z099, __LINE__, 0x00, 0x00) /* Decrement */ DerefOf (Arg1)-- @@ -413,7 +413,7 @@ /* ObjectType */ Local1 = ObjectType (DerefOf (Arg1)) - CH03 (__METHOD__, Z099, 0x06, 0x01F9, 0x00) + CH03 (__METHOD__, Z099, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (DerefOf (Arg1)) @@ -667,7 +667,7 @@ /* CopyObject */ CopyObject (M000 (), Local1) - CH03 (__METHOD__, Z099, 0x07, 0x0334, 0x00) + CH03 (__METHOD__, Z099, __LINE__, 0x00, 0x00) /* Decrement */ M000 ()-- @@ -703,7 +703,7 @@ /* ObjectType */ /* **** Nov. 2016: Method invocation as arg to ObjectType is now illegal */ Local0 = ObjectType (M000) - CH03 (__METHOD__, Z099, 0x08, 0x0362, 0x00) + CH03 (__METHOD__, Z099, __LINE__, 0x00, 0x00) /* RefOf */ /* **** Oct. 2016: Method invocation as arg to RefOf is now illegal */ /* if (y601) { */ @@ -1009,7 +1009,7 @@ } SET0 (Z099, __METHOD__, 0x00) - CH03 (__METHOD__, Z099, 0x0B, 0x04CE, 0x00) + CH03 (__METHOD__, Z099, __LINE__, 0x00, 0x00) /* Local Named Object */ /* m000(ts) */ /* Global Named Object */ diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_08_method.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_08_method.asl index f188faf30..a838961c4 100644 --- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_08_method.asl +++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_08_method.asl @@ -90,11 +90,11 @@ /* CondRefOf */ CondRefOf (Local0, Local1) - CH03 (__METHOD__, Z100, 0x01, 0x55, 0x00) + CH03 (__METHOD__, Z100, __LINE__, 0x00, 0x00) /* CopyObject */ CopyObject (Local0, Local1) - CH03 (__METHOD__, Z100, 0x02, 0x5A, 0x00) + CH03 (__METHOD__, Z100, __LINE__, 0x00, 0x00) /* Decrement */ Local0-- @@ -130,11 +130,11 @@ /* ObjectType */ Local1 = ObjectType (Local0) - CH03 (__METHOD__, Z100, 0x03, 0x87, 0x00) + CH03 (__METHOD__, Z100, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (Local0) - CH03 (__METHOD__, Z100, 0x04, 0x8C, 0x00) + CH03 (__METHOD__, Z100, __LINE__, 0x00, 0x00) /* Release */ Release (Local0) @@ -398,7 +398,7 @@ /* CopyObject */ CopyObject (DerefOf (Arg1), Local1) - CH03 (__METHOD__, Z100, 0x02, 0x01CA, 0x00) + CH03 (__METHOD__, Z100, __LINE__, 0x00, 0x00) /* Decrement */ DerefOf (Arg1)-- @@ -434,7 +434,7 @@ /* ObjectType */ Local1 = ObjectType (DerefOf (Arg1)) - CH03 (__METHOD__, Z100, 0x06, 0x01F7, 0x00) + CH03 (__METHOD__, Z100, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (DerefOf (Arg1)) @@ -688,7 +688,7 @@ /* CopyObject */ CopyObject (M000 (), Local1) - CH03 (__METHOD__, Z100, 0x07, 0x0331, 0x00) + CH03 (__METHOD__, Z100, __LINE__, 0x00, 0x00) /* Decrement */ M000 ()-- @@ -724,7 +724,7 @@ /* ObjectType */ /* **** Nov. 2016: Method invocation as arg to ObjectType is now illegal */ Local0 = ObjectType (M000) - CH03 (__METHOD__, Z100, 0x08, 0x035F, 0x00) + CH03 (__METHOD__, Z100, __LINE__, 0x00, 0x00) /* RefOf */ /* **** Oct. 2016: Method invocation as arg to RefOf is now illegal */ /* if (y601) { */ @@ -1034,7 +1034,7 @@ } SET0 (Z100, __METHOD__, 0x00) - CH03 (__METHOD__, Z100, 0x0B, 0x04CB, 0x00) + CH03 (__METHOD__, Z100, __LINE__, 0x00, 0x00) /* Local Named Object */ M000 (__METHOD__) diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_09_mux.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_09_mux.asl index 9a726e6b3..6092f995b 100644 --- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_09_mux.asl +++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_09_mux.asl @@ -76,11 +76,11 @@ /* CondRefOf */ CondRefOf (Local0, Local1) - CH03 (__METHOD__, Z101, 0x01, 0x5A, 0x00) + CH03 (__METHOD__, Z101, __LINE__, 0x00, 0x00) /* CopyObject */ CopyObject (Local0, Local1) - CH03 (__METHOD__, Z101, 0x02, 0x5F, 0x00) + CH03 (__METHOD__, Z101, __LINE__, 0x00, 0x00) /* Decrement */ Local0-- @@ -116,11 +116,11 @@ /* ObjectType */ Local1 = ObjectType (Local0) - CH03 (__METHOD__, Z101, 0x03, 0x8C, 0x00) + CH03 (__METHOD__, Z101, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (Local0) - CH03 (__METHOD__, Z101, 0x04, 0x91, 0x00) + CH03 (__METHOD__, Z101, __LINE__, 0x00, 0x00) /* Release */ Release (Local0) @@ -172,7 +172,7 @@ /* Acquire */ Local1 = Acquire (Local0, 0x0064) - CH03 (__METHOD__, Z101, 0x1E, 0xD2, 0x00) + CH03 (__METHOD__, Z101, __LINE__, 0x00, 0x00) /* Add */ Local1 = (Local0 + I000) /* \M4B9.I000 */ @@ -384,7 +384,7 @@ /* CopyObject */ CopyObject (DerefOf (Arg1), Local1) - CH03 (__METHOD__, Z101, 0x02, 0x01CE, 0x00) + CH03 (__METHOD__, Z101, __LINE__, 0x00, 0x00) /* Decrement */ DerefOf (Arg1)-- @@ -420,7 +420,7 @@ /* ObjectType */ Local1 = ObjectType (DerefOf (Arg1)) - CH03 (__METHOD__, Z101, 0x06, 0x01FB, 0x00) + CH03 (__METHOD__, Z101, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (DerefOf (Arg1)) @@ -674,7 +674,7 @@ /* CopyObject */ CopyObject (M000 (), Local1) - CH03 (__METHOD__, Z101, 0x07, 0x0335, 0x00) + CH03 (__METHOD__, Z101, __LINE__, 0x00, 0x00) /* Decrement */ M000 ()-- @@ -710,7 +710,7 @@ /* ObjectType */ /* **** Nov. 2016: Method invocation as arg to ObjectType is now illegal */ Local0 = ObjectType (M000) - CH03 (__METHOD__, Z101, 0x08, 0x0363, 0x00) + CH03 (__METHOD__, Z101, __LINE__, 0x00, 0x00) /* RefOf */ /* **** Oct. 2016: Method invocation as arg to RefOf is now illegal */ /* if (y601) { */ @@ -1016,7 +1016,7 @@ } SET0 (Z101, __METHOD__, 0x00) - CH03 (__METHOD__, Z101, 0x0B, 0x04CF, 0x00) + CH03 (__METHOD__, Z101, __LINE__, 0x00, 0x00) /* Local Named Object */ M000 (__METHOD__) diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_10_oreg.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_10_oreg.asl index 8f9adf9fe..c825f44cb 100644 --- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_10_oreg.asl +++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_10_oreg.asl @@ -74,13 +74,13 @@ /* CondRefOf */ Local1 = CondRefOf (Local0) - CH03 (__METHOD__, Z102, 0x00, 0x58, 0x00) + CH03 (__METHOD__, Z102, __LINE__, 0x00, 0x00) CondRefOf (Local0, Local1) - CH03 (__METHOD__, Z102, 0x01, 0x5B, 0x00) + CH03 (__METHOD__, Z102, __LINE__, 0x00, 0x00) /* CopyObject */ CopyObject (Local0, Local1) - CH03 (__METHOD__, Z102, 0x02, 0x60, 0x00) + CH03 (__METHOD__, Z102, __LINE__, 0x00, 0x00) /* Decrement */ Local0-- @@ -116,11 +116,11 @@ /* ObjectType */ Local1 = ObjectType (Local0) - CH03 (__METHOD__, Z102, 0x03, 0x8D, 0x00) + CH03 (__METHOD__, Z102, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (Local0) - CH03 (__METHOD__, Z102, 0x04, 0x92, 0x00) + CH03 (__METHOD__, Z102, __LINE__, 0x00, 0x00) /* Release */ Release (Local0) @@ -372,7 +372,7 @@ } Local1 = DerefOf (Arg1) - CH03 (__METHOD__, Z102, 0x05, 0x01C4, 0x00) + CH03 (__METHOD__, Z102, __LINE__, 0x00, 0x00) /* CondRefOf */ CondRefOf (DerefOf (Arg1), Local1) @@ -416,7 +416,7 @@ /* ObjectType */ Local1 = ObjectType (DerefOf (Arg1)) - CH03 (__METHOD__, Z102, 0x06, 0x01FB, 0x00) + CH03 (__METHOD__, Z102, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (DerefOf (Arg1)) @@ -664,7 +664,7 @@ /* CopyObject */ CopyObject (M000 (), Local1) - CH03 (__METHOD__, Z102, 0x07, 0x0330, 0x00) + CH03 (__METHOD__, Z102, __LINE__, 0x00, 0x00) /* Decrement */ M000 ()-- @@ -700,7 +700,7 @@ /* ObjectType */ /* **** Nov. 2016: Method invocation as arg to ObjectType is now illegal */ Local0 = ObjectType (M000) - CH03 (__METHOD__, Z102, 0x08, 0x035E, 0x00) + CH03 (__METHOD__, Z102, __LINE__, 0x00, 0x00) /* RefOf */ /* **** Oct. 2016: Method invocation as arg to RefOf is now illegal */ /* Store (RefOf(m000()), Local1) */ @@ -995,7 +995,7 @@ } } - CH03 (__METHOD__, Z102, 0x0B, 0x04C2, 0x00) + CH03 (__METHOD__, Z102, __LINE__, 0x00, 0x00) /* Local Named Object */ M000 (__METHOD__) diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_11_pwr.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_11_pwr.asl index 79ec57861..4c0a602f3 100644 --- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_11_pwr.asl +++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_11_pwr.asl @@ -97,11 +97,11 @@ /* CondRefOf */ CondRefOf (Local0, Local1) - CH03 (__METHOD__, Z103, 0x01, 0x59, 0x00) + CH03 (__METHOD__, Z103, __LINE__, 0x00, 0x00) /* CopyObject */ CopyObject (Local0, Local1) - CH03 (__METHOD__, Z103, 0x02, 0x5E, 0x00) + CH03 (__METHOD__, Z103, __LINE__, 0x00, 0x00) /* Decrement */ Local0-- @@ -137,11 +137,11 @@ /* ObjectType */ Local1 = ObjectType (Local0) - CH03 (__METHOD__, Z103, 0x03, 0x8B, 0x00) + CH03 (__METHOD__, Z103, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (Local0) - CH03 (__METHOD__, Z103, 0x04, 0x90, 0x00) + CH03 (__METHOD__, Z103, __LINE__, 0x00, 0x00) /* Release */ Release (Local0) @@ -405,7 +405,7 @@ /* CopyObject */ CopyObject (DerefOf (Arg1), Local1) - CH03 (__METHOD__, Z103, 0x02, 0x01CE, 0x00) + CH03 (__METHOD__, Z103, __LINE__, 0x00, 0x00) /* Decrement */ DerefOf (Arg1)-- @@ -441,7 +441,7 @@ /* ObjectType */ Local1 = ObjectType (DerefOf (Arg1)) - CH03 (__METHOD__, Z103, 0x06, 0x01FB, 0x00) + CH03 (__METHOD__, Z103, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (DerefOf (Arg1)) @@ -695,7 +695,7 @@ /* CopyObject */ CopyObject (M000 (), Local1) - CH03 (__METHOD__, Z103, 0x07, 0x0335, 0x00) + CH03 (__METHOD__, Z103, __LINE__, 0x00, 0x00) /* Decrement */ M000 ()-- @@ -731,7 +731,7 @@ /* ObjectType */ /* **** Nov. 2016: Method invocation as arg to ObjectType is now illegal */ Local0 = ObjectType (M000) - CH03 (__METHOD__, Z103, 0x08, 0x0363, 0x00) + CH03 (__METHOD__, Z103, __LINE__, 0x00, 0x00) /* RefOf */ /* **** Oct. 2016: Method invocation as arg to RefOf is now illegal */ /* if (y601) { */ @@ -1044,7 +1044,7 @@ } SET0 (Z103, __METHOD__, 0x00) - CH03 (__METHOD__, Z103, 0x0B, 0x04CF, 0x00) + CH03 (__METHOD__, Z103, __LINE__, 0x00, 0x00) /* Local Named Object */ M000 (__METHOD__) diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_12_proc.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_12_proc.asl index 3d9a6d05a..c8c3760c2 100644 --- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_12_proc.asl +++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_12_proc.asl @@ -76,11 +76,11 @@ /* CondRefOf */ CondRefOf (Local0, Local1) - CH03 (__METHOD__, Z104, 0x01, 0x5B, 0x00) + CH03 (__METHOD__, Z104, __LINE__, 0x00, 0x00) /* CopyObject */ CopyObject (Local0, Local1) - CH03 (__METHOD__, Z104, 0x02, 0x60, 0x00) + CH03 (__METHOD__, Z104, __LINE__, 0x00, 0x00) /* Decrement */ Local0-- @@ -116,11 +116,11 @@ /* ObjectType */ Local1 = ObjectType (Local0) - CH03 (__METHOD__, Z104, 0x03, 0x8D, 0x00) + CH03 (__METHOD__, Z104, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (Local0) - CH03 (__METHOD__, Z104, 0x04, 0x92, 0x00) + CH03 (__METHOD__, Z104, __LINE__, 0x00, 0x00) /* Release */ Release (Local0) @@ -384,7 +384,7 @@ /* CopyObject */ CopyObject (DerefOf (Arg1), Local1) - CH03 (__METHOD__, Z104, 0x02, 0x01D0, 0x00) + CH03 (__METHOD__, Z104, __LINE__, 0x00, 0x00) /* Decrement */ DerefOf (Arg1)-- @@ -420,7 +420,7 @@ /* ObjectType */ Local1 = ObjectType (DerefOf (Arg1)) - CH03 (__METHOD__, Z104, 0x06, 0x01FD, 0x00) + CH03 (__METHOD__, Z104, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (DerefOf (Arg1)) @@ -674,7 +674,7 @@ /* CopyObject */ CopyObject (M000 (), Local1) - CH03 (__METHOD__, Z104, 0x07, 0x0337, 0x00) + CH03 (__METHOD__, Z104, __LINE__, 0x00, 0x00) /* Decrement */ M000 ()-- @@ -710,7 +710,7 @@ /* ObjectType */ /* **** Nov. 2016: Method invocation as arg to ObjectType is now illegal */ Local0 = ObjectType (M000) - CH03 (__METHOD__, Z104, 0x08, 0x0365, 0x00) + CH03 (__METHOD__, Z104, __LINE__, 0x00, 0x00) /* RefOf */ /* **** Oct. 2016: Method invocation as arg to RefOf is now illegal */ /* if (y601) { */ @@ -1016,7 +1016,7 @@ } SET0 (Z104, __METHOD__, 0x00) - CH03 (__METHOD__, Z104, 0x0B, 0x04D1, 0x00) + CH03 (__METHOD__, Z104, __LINE__, 0x00, 0x00) /* Local Named Object */ M000 (__METHOD__) diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_13_tzone.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_13_tzone.asl index f653cffb9..ee49c4a59 100644 --- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_13_tzone.asl +++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_13_tzone.asl @@ -86,11 +86,11 @@ /* CondRefOf */ CondRefOf (Local0, Local1) - CH03 (__METHOD__, Z105, 0x01, 0x59, 0x00) + CH03 (__METHOD__, Z105, __LINE__, 0x00, 0x00) /* CopyObject */ CopyObject (Local0, Local1) - CH03 (__METHOD__, Z105, 0x02, 0x5E, 0x00) + CH03 (__METHOD__, Z105, __LINE__, 0x00, 0x00) /* Decrement */ Local0-- @@ -126,11 +126,11 @@ /* ObjectType */ Local1 = ObjectType (Local0) - CH03 (__METHOD__, Z105, 0x03, 0x8B, 0x00) + CH03 (__METHOD__, Z105, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (Local0) - CH03 (__METHOD__, Z105, 0x04, 0x90, 0x00) + CH03 (__METHOD__, Z105, __LINE__, 0x00, 0x00) /* Release */ Release (Local0) @@ -391,7 +391,7 @@ } Local1 = DerefOf (Arg1) - CH03 (__METHOD__, Z105, 0x05, 0x01CA, 0x00) + CH03 (__METHOD__, Z105, __LINE__, 0x00, 0x00) /* CondRefOf */ CondRefOf (DerefOf (Arg1), Local1) @@ -435,7 +435,7 @@ /* ObjectType */ Local1 = ObjectType (DerefOf (Arg1)) - CH03 (__METHOD__, Z105, 0x06, 0x0201, 0x00) + CH03 (__METHOD__, Z105, __LINE__, 0x00, 0x00) /* RefOf */ Local1 = RefOf (DerefOf (Arg1)) @@ -683,7 +683,7 @@ /* CopyObject */ CopyObject (M000 (), Local1) - CH03 (__METHOD__, Z105, 0x07, 0x0336, 0x00) + CH03 (__METHOD__, Z105, __LINE__, 0x00, 0x00) /* Decrement */ M000 ()-- @@ -719,7 +719,7 @@ /* ObjectType */ /* **** Nov. 2016: Method invocation as arg to ObjectType is now illegal */ Local0 = ObjectType (M000) - CH03 (__METHOD__, Z105, 0x08, 0x0364, 0x00) + CH03 (__METHOD__, Z105, __LINE__, 0x00, 0x00) /* RefOf */ /* **** Oct. 2016: Method invocation as arg to RefOf is now illegal */ /* Store (RefOf(m000()), Local1) */ @@ -1002,7 +1002,7 @@ Local0 = (0x03 * LPC0) /* \M4BD.M005.LPC0 */ I000 = 0x00 Local1 = DerefOf (M000 (0x01, LPC0)) - CH03 (__METHOD__, Z105, 0x04B4, 0x00, 0x00) + CH03 (__METHOD__, Z105, __LINE__, 0x00, 0x00) CH00 (Arg0, 0x01) Local1 = DerefOf (DerefOf (M000 (0x02, LPC0))) CH06 (Arg0, (0x01 + Local0), 0x2F) @@ -1018,7 +1018,7 @@ } } - CH03 (__METHOD__, Z105, 0x0B, 0x04C8, 0x00) + CH03 (__METHOD__, Z105, __LINE__, 0x00, 0x00) /* Local Named Object */ M000 (__METHOD__) diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_14_bfield.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_14_bfield.asl index 7d2b648bb..5ec938ce4 100644 --- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_14_bfield.asl +++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_14_bfield.asl @@ -80,7 +80,7 @@ Store (BF03 [0x00], Local1) If (Y900) { - CH03 (__METHOD__, Z106, 0x00, 0x56, 0x00) + CH03 (__METHOD__, Z106, __LINE__, 0x00, 0x00) } Else { @@ -115,7 +115,7 @@ Store (BF21 [0x00], Local1) If (Y900) { - CH03 (__METHOD__, Z106, 0x01, 0x75, 0x00) + CH03 (__METHOD__, Z106, __LINE__, 0x00, 0x00) } Else { @@ -137,7 +137,7 @@ } Local1 = DerefOf (Arg1) - CH03 (__METHOD__, Z106, 0x02, 0x89, 0x00) + CH03 (__METHOD__, Z106, __LINE__, 0x00, 0x00) Local1 = DerefOf (DerefOf (Arg1)) CH06 (Arg0, 0x07, 0x2F) Store (DerefOf (Arg1) [0x00], Local1) @@ -147,7 +147,7 @@ If (Y900) { - CH03 (__METHOD__, Z106, 0x03, 0x93, 0x00) + CH03 (__METHOD__, Z106, __LINE__, 0x00, 0x00) } Else { @@ -251,7 +251,7 @@ } } - CH03 (__METHOD__, Z106, 0x0C, 0xEE, 0x00) + CH03 (__METHOD__, Z106, __LINE__, 0x00, 0x00) /* Local Named Object */ M000 (__METHOD__) |