diff options
| author | Erik Schmauss <erik.schmauss@intel.com> | 2017-03-22 14:30:19 -0700 |
|---|---|---|
| committer | Erik Schmauss <erik.schmauss@intel.com> | 2017-07-21 16:54:23 -0700 |
| commit | a73816a2a2b116d9e9ab4bc2136be9cd0c1b6c96 (patch) | |
| tree | d72668db998b7e8e97ae089a4244620576653369 /tests/aslts/src | |
| parent | 6f3586d458cfc2cefa4602e3423b017ecef6492d (diff) | |
| download | acpica-a73816a2a2b116d9e9ab4bc2136be9cd0c1b6c96.tar.gz | |
ASLTS: changing the third argument of ERR to __LINE__ to print line numbers instead of indices.
Signed-off-by: Erik Schmauss <erik.schmauss@intel.com>
Diffstat (limited to 'tests/aslts/src')
335 files changed, 6337 insertions, 6337 deletions
diff --git a/tests/aslts/src/runtime/cntl/common.asl b/tests/aslts/src/runtime/cntl/common.asl index d70b39d24..ff1a648b0 100644 --- a/tests/aslts/src/runtime/cntl/common.asl +++ b/tests/aslts/src/runtime/cntl/common.asl @@ -273,7 +273,7 @@ Name(FNAM, 0) // Test filename */ Method(SET0, 3) { if (ERR0) { - err("SET0", z062, 0, 0, 0, ERR0, 0) + err("SET0", z062, __LINE__, 0, 0, ERR0, 0) } else { CopyObject(arg0, ERR0) CopyObject(arg1, ERR1) @@ -912,7 +912,7 @@ Method(prn0, 1, Serialized) { Method(CH00, 4) { if (LNotEqual(arg3, Zero)) { - err(arg0, z062, 1, 0, 0, arg1, arg2) + err(arg0, z062, __LINE__, 0, 0, arg1, arg2) } } @@ -926,7 +926,7 @@ Method(CH00, 4) Method(CH01, 4) { if (LNotEqual(arg3, Ones)) { - err(arg0, z062, 2, 0, 0, arg1, arg2) + err(arg0, z062, __LINE__, 0, 0, arg1, arg2) } } @@ -963,84 +963,84 @@ Name(ALL0, "`1234567890-=qwertyuiop[]\\asdfghjkl;'zxcvbnm,./~!@#$%^&*()_+QWERTYU Method(CST0) { if (LNotEqual(c000, 10)) { - err("c000 corrupted", z062, 3, 0, 0, 0, 0) + err("c000 corrupted", z062, __LINE__, 0, 0, 0, 0) } if (LNotEqual(c001, 5)) { - err("c001 corrupted", z062, 4, 0, 0, 0, 0) + err("c001 corrupted", z062, __LINE__, 0, 0, 0, 0) } if (LNotEqual(c002, 13)) { - err("c002 corrupted", z062, 5, 0, 0, 0, 0) + err("c002 corrupted", z062, __LINE__, 0, 0, 0, 0) } if (LNotEqual(c003, 12)) { - err("c003 corrupted", z062, 6, 0, 0, 0, 0) + err("c003 corrupted", z062, __LINE__, 0, 0, 0, 0) } if (LNotEqual(c004, 6)) { - err("c004 corrupted", z062, 7, 0, 0, 0, 0) + err("c004 corrupted", z062, __LINE__, 0, 0, 0, 0) } if (LNotEqual(c005, 4)) { - err("c005 corrupted", z062, 8, 0, 0, 0, 0) + err("c005 corrupted", z062, __LINE__, 0, 0, 0, 0) } if (LNotEqual(c006, 31)) { - err("c006 corrupted", z062, 9, 0, 0, 0, 0) + err("c006 corrupted", z062, __LINE__, 0, 0, 0, 0) } if (LNotEqual(c007, 51)) { - err("c007 corrupted", z062, 10, 0, 0, 0, 0) + err("c007 corrupted", z062, __LINE__, 0, 0, 0, 0) } if (LNotEqual(c008, 0)) { - err("c008 corrupted", z062, 11, 0, 0, 0, 0) + err("c008 corrupted", z062, __LINE__, 0, 0, 0, 0) } if (LNotEqual(c009, 1)) { - err("c009 corrupted", z062, 12, 0, 0, 0, 0) + err("c009 corrupted", z062, __LINE__, 0, 0, 0, 0) } if (LNotEqual(c00a, 2)) { - err("c00a corrupted", z062, 13, 0, 0, 0, 0) + err("c00a corrupted", z062, __LINE__, 0, 0, 0, 0) } if (LNotEqual(c00b, 3)) { - err("c00b corrupted", z062, 14, 0, 0, 0, 0) + err("c00b corrupted", z062, __LINE__, 0, 0, 0, 0) } if (LNotEqual(c00c, 4)) { - err("c00c corrupted", z062, 15, 0, 0, 0, 0) + err("c00c corrupted", z062, __LINE__, 0, 0, 0, 0) } if (LNotEqual(c00d, 5)) { - err("c00d corrupted", z062, 16, 0, 0, 0, 0) + err("c00d corrupted", z062, __LINE__, 0, 0, 0, 0) } if (LNotEqual(c00e, 6)) { - err("c00e corrupted", z062, 17, 0, 0, 0, 0) + err("c00e corrupted", z062, __LINE__, 0, 0, 0, 0) } if (LNotEqual(c00f, 7)) { - err("c00f corrupted", z062, 18, 0, 0, 0, 0) + err("c00f corrupted", z062, __LINE__, 0, 0, 0, 0) } if (LNotEqual(c010, 8)) { - err("c010 corrupted", z062, 19, 0, 0, 0, 0) + err("c010 corrupted", z062, __LINE__, 0, 0, 0, 0) } if (LNotEqual(c011, 9)) { - err("c011 corrupted", z062, 20, 0, 0, 0, 0) + err("c011 corrupted", z062, __LINE__, 0, 0, 0, 0) } if (LNotEqual(c012, 10)) { - err("c012 corrupted", z062, 21, 0, 0, 0, 0) + err("c012 corrupted", z062, __LINE__, 0, 0, 0, 0) } if (LNotEqual(c013, 11)) { - err("c013 corrupted", z062, 22, 0, 0, 0, 0) + err("c013 corrupted", z062, __LINE__, 0, 0, 0, 0) } if (LNotEqual(c014, 12)) { - err("c014 corrupted", z062, 23, 0, 0, 0, 0) + err("c014 corrupted", z062, __LINE__, 0, 0, 0, 0) } if (LNotEqual(c015, 13)) { - err("c015 corrupted", z062, 24, 0, 0, 0, 0) + err("c015 corrupted", z062, __LINE__, 0, 0, 0, 0) } if (LNotEqual(c016, 14)) { - err("c016 corrupted", z062, 25, 0, 0, 0, 0) + err("c016 corrupted", z062, __LINE__, 0, 0, 0, 0) } if (LNotEqual(c017, 15)) { - err("c017 corrupted", z062, 26, 0, 0, 0, 0) + err("c017 corrupted", z062, __LINE__, 0, 0, 0, 0) } if (LNotEqual(c018, 16)) { - err("c018 corrupted", z062, 27, 0, 0, 0, 0) + err("c018 corrupted", z062, __LINE__, 0, 0, 0, 0) } if (LNotEqual(c019, 17)) { - err("c019 corrupted", z062, 28, 0, 0, 0, 0) + err("c019 corrupted", z062, __LINE__, 0, 0, 0, 0) } } @@ -1146,12 +1146,12 @@ Method(sft1, 5, Serialized) Name(rest, 0) if (LLess(arg2, 1)) { - err("sft", z062, 29, 0, 0, arg2, 1) + err("sft", z062, __LINE__, 0, 0, arg2, 1) return (Ones) } if (LGreater(arg1, 7)) { - err("sft", z062, 30, 0, 0, arg1, 7) + err("sft", z062, __LINE__, 0, 0, arg1, 7) return (Ones) } @@ -1287,19 +1287,19 @@ Method(m4c0, 4, Serialized) if (F64) { Store(ObjectType(arg2), tmp1) if (LNotEqual(tmp0, tmp1)) { - err(arg0, z062, 31, 0, 0, tmp0, tmp1) + err(arg0, z062, __LINE__, 0, 0, tmp0, tmp1) Store(1, Local7) } elseif (LNotEqual(arg1, arg2)) { - err(arg0, z062, 32, 0, 0, arg1, arg2) + err(arg0, z062, __LINE__, 0, 0, arg1, arg2) Store(1, Local7) } } else { Store(ObjectType(arg3), tmp1) if (LNotEqual(tmp0, tmp1)) { - err(arg0, z062, 33, 0, 0, tmp0, tmp1) + err(arg0, z062, __LINE__, 0, 0, tmp0, tmp1) Store(1, Local7) } elseif (LNotEqual(arg1, arg3)) { - err(arg0, z062, 34, 0, 0, arg1, arg3) + err(arg0, z062, __LINE__, 0, 0, arg1, arg3) Store(1, Local7) } } diff --git a/tests/aslts/src/runtime/cntl/ehandle.asl b/tests/aslts/src/runtime/cntl/ehandle.asl index 4d34d0635..10a0eb516 100644 --- a/tests/aslts/src/runtime/cntl/ehandle.asl +++ b/tests/aslts/src/runtime/cntl/ehandle.asl @@ -194,7 +194,7 @@ Method(_ERR, 3) Store(arg0, Index(EX03, EXC0)) } else { Store("Maximal number of exceptions exceeded", Debug) - err("_ERR", z063, 0, 0, 0, EXC0, EXC2) + err("_ERR", z063, __LINE__, 0, 0, EXC0, EXC2) } } @@ -214,7 +214,7 @@ Method(CH02) { if (EXC1) { Concatenate("Some unexpected exceptions were handled, 0x", EXC1, Local0) - err("CH02", z063, 1, 0, 0, Local0, 0) + err("CH02", z063, __LINE__, 0, 0, Local0, 0) } Return(EXC1) } @@ -237,7 +237,7 @@ Method(CH03, 5) Concatenate(Local1, EX01, Local0) Concatenate(Local0, ", ", Local1) Concatenate(Local1, EX00, Debug) - err(arg0, z063, 2, arg1, arg2, arg3, arg4) + err(arg0, z063, __LINE__, arg1, arg2, arg3, arg4) Store(EXC0, Local7) } Store(0, EXC0) @@ -355,7 +355,7 @@ Method(CH04, 7) Store(0, EX04) if (Local5) { - err(arg0, z063, 3, arg3, arg4, arg5, arg6) + err(arg0, z063, __LINE__, arg3, arg4, arg5, arg6) } return (Local5) @@ -475,7 +475,7 @@ Method(CH08, 6) Concatenate(Local0, ", number of exceptions 0x", Local1) Concatenate(Local1, Local4, Local0) MSG0(arg1, Local0) - err(arg0, z063, 4, arg2, arg3, arg4, arg5) + err(arg0, z063, __LINE__, arg2, arg3, arg4, arg5) Store(1, Local7) } @@ -555,7 +555,7 @@ Method(CH09, 6) */ if (Local5) { - err("", z063, 5, arg3, arg4, 0, 0) + err("", z063, __LINE__, arg3, arg4, 0, 0) } Store(Local7, arg5) diff --git a/tests/aslts/src/runtime/collections/Identity2MS/abbu/MsFail/msfail.asl b/tests/aslts/src/runtime/collections/Identity2MS/abbu/MsFail/msfail.asl index 95a094ea9..e10b492d3 100644 --- a/tests/aslts/src/runtime/collections/Identity2MS/abbu/MsFail/msfail.asl +++ b/tests/aslts/src/runtime/collections/Identity2MS/abbu/MsFail/msfail.asl @@ -87,7 +87,7 @@ Method(mf00,, Serialized) if (chk0) { if (LNotEqual(i001, 0xabcd0000)) { - err(ts, z161, 0x001, 0, 0, i001, 0xabcd0000) + err(ts, z161, __LINE__, 0, 0, i001, 0xabcd0000) } } @@ -113,7 +113,7 @@ Method(mf01,, Serialized) if (chk0) { /* This LNotEqual breaks */ if (LNotEqual(Local0, "qwertyuiop_sdfghjkl")) { - err(ts, z161, 0x004, 0, 0, Local0, "qwertyuiop_sdfghjkl") + err(ts, z161, __LINE__, 0, 0, Local0, "qwertyuiop_sdfghjkl") } } @@ -136,7 +136,7 @@ Method(mf02,, Serialized) if (chk0) { /* This LNotEqual breaks */ if (LEqual("qwerty", "sdfghj")) { - err(ts, z161, 0x004, 0, 0, "qwerty", "sdfghj") + err(ts, z161, __LINE__, 0, 0, "qwerty", "sdfghj") } } @@ -171,7 +171,7 @@ Method(mf03,, Serialized) if (chk1) { Store(m000(), Local0) if (LNotEqual(Local0, 0x24680003)) { - err(ts, z161, 0x007, 0, 0, Local0, 0x24680003) + err(ts, z161, __LINE__, 0, 0, Local0, 0x24680003) } } @@ -214,7 +214,7 @@ Method(mf04,, Serialized) if (chk0) { Store(m000(), Local0) if (LNotEqual(Local0, 0x1006)) { - err(ts, z161, 0x00a, 0, 0, Local0, 0x1006) + err(ts, z161, __LINE__, 0, 0, Local0, 0x1006) } CH03(ts, z161, 0x00b, 0, 0) } @@ -245,7 +245,7 @@ Method(mf05,, Serialized) if (chk1) { Store(m000(0xabcd0000), Local0) if (LNotEqual(Local0, 0x1006)) { - err(ts, z161, 0x00a, 0, 0, Local0, 0x1006) + err(ts, z161, __LINE__, 0, 0, Local0, 0x1006) } } @@ -275,10 +275,10 @@ Method(mf06,, Serialized) if (chk1) { if (LNotEqual(Local0, 0x1006)) { - err(ts, z161, 0x00a, 0, 0, Local0, 0x1006) + err(ts, z161, __LINE__, 0, 0, Local0, 0x1006) } if (LNotEqual(i000, 0xabcd0000)) { - err(ts, z161, 0x00a, 0, 0, i000, 0xabcd0000) + err(ts, z161, __LINE__, 0, 0, i000, 0xabcd0000) } } @@ -308,10 +308,10 @@ Method(mf07,, Serialized) if (chk1) { if (LNotEqual(Local0, 0x1006)) { - err(ts, z161, 0x00a, 0, 0, Local0, 0x1006) + err(ts, z161, __LINE__, 0, 0, Local0, 0x1006) } if (LNotEqual(Local7, 0xabcd0000)) { - err(ts, z161, 0x00a, 0, 0, Local7, 0xabcd0000) + err(ts, z161, __LINE__, 0, 0, Local7, 0xabcd0000) } } @@ -365,7 +365,7 @@ Method(mf08,, Serialized) Store(0x80, bf00) if (LNotEqual(bf00, 0x80)) { - err(ts, z161, 0x00d, 0, 0, bf00, 0x80) + err(ts, z161, __LINE__, 0, 0, bf00, 0x80) } } /* if(chk0) */ @@ -388,7 +388,7 @@ Method(mf09,, Serialized) if (chk0) { Store(DerefOf(Index(s000, 0)), Local0) if (LNotEqual(Local0, 0x38)) { - err(ts, z161, 0x010, 0, 0, Local0, 0x38) + err(ts, z161, __LINE__, 0, 0, Local0, 0x38) } } @@ -438,10 +438,10 @@ Method(mf0a,, Serialized) Store(m000(f000), Local0) if (chk1) { if (LNotEqual(Local0, 0x1234569e)) { - err(ts, z161, 0x010, 0, 0, Local0, 0x1234569e) + err(ts, z161, __LINE__, 0, 0, Local0, 0x1234569e) } if (LNotEqual(f000, 0x12345678)) { - err(ts, z161, 0x010, 0, 0, f000, 0x12345678) + err(ts, z161, __LINE__, 0, 0, f000, 0x12345678) } } @@ -449,10 +449,10 @@ Method(mf0a,, Serialized) Store(m001(f000), Local0) if (chk1) { if (LNotEqual(Local0, 0x2468acef)) { - err(ts, z161, 0x010, 0, 0, Local0, 0x2468acef) + err(ts, z161, __LINE__, 0, 0, Local0, 0x2468acef) } if (LNotEqual(f000, 0x12345675)) { - err(ts, z161, 0x010, 0, 0, f000, 0x12345675) + err(ts, z161, __LINE__, 0, 0, f000, 0x12345675) } } @@ -503,10 +503,10 @@ Method(mf0b,, Serialized) Store(m000(bnk0), Local0) if (chk1) { if (LNotEqual(Local0, 0x1234569e)) { - err(ts, z161, 0x010, 0, 0, Local0, 0x1234569e) + err(ts, z161, __LINE__, 0, 0, Local0, 0x1234569e) } if (LNotEqual(bnk0, 0x12345678)) { - err(ts, z161, 0x010, 0, 0, bnk0, 0x12345678) + err(ts, z161, __LINE__, 0, 0, bnk0, 0x12345678) } } @@ -514,10 +514,10 @@ Method(mf0b,, Serialized) Store(m001(bnk0), Local0) if (chk1) { if (LNotEqual(Local0, 0x2468acef)) { - err(ts, z161, 0x010, 0, 0, Local0, 0x2468acef) + err(ts, z161, __LINE__, 0, 0, Local0, 0x2468acef) } if (LNotEqual(bnk0, 0x12345675)) { - err(ts, z161, 0x010, 0, 0, bnk0, 0x12345675) + err(ts, z161, __LINE__, 0, 0, bnk0, 0x12345675) } } @@ -568,10 +568,10 @@ Method(mf0c,, Serialized) Store(m000(if00), Local0) if (chk1) { if (LNotEqual(Local0, 0x12121238)) { - err(ts, z161, 0x010, 0, 0, Local0, 0x12121238) + err(ts, z161, __LINE__, 0, 0, Local0, 0x12121238) } if (LNotEqual(if00, 0x12121212)) { - err(ts, z161, 0x010, 0, 0, if00, 0x12121212) + err(ts, z161, __LINE__, 0, 0, if00, 0x12121212) } } @@ -579,10 +579,10 @@ Method(mf0c,, Serialized) Store(m001(if00), Local0) if (chk1) { if (LNotEqual(Local0, 0x24242429)) { - err(ts, z161, 0x010, 0, 0, Local0, 0x24242429) + err(ts, z161, __LINE__, 0, 0, Local0, 0x24242429) } if (LNotEqual(if00, 0x12121212)) { - err(ts, z161, 0x010, 0, 0, if00, 0x12121212) + err(ts, z161, __LINE__, 0, 0, if00, 0x12121212) } } @@ -620,10 +620,10 @@ Method(mf0d,, Serialized) Store(m000(bf00), Local0) if (chk0) { if (LNotEqual(Local0, 0x1234569e)) { - err(ts, z161, 0x010, 0, 0, Local0, 0x1234569e) + err(ts, z161, __LINE__, 0, 0, Local0, 0x1234569e) } if (LNotEqual(bf00, 0x12345678)) { - err(ts, z161, 0x010, 0, 0, bf00, 0x12345678) + err(ts, z161, __LINE__, 0, 0, bf00, 0x12345678) } } @@ -657,10 +657,10 @@ Method(mf0e,, Serialized) Store(m001(bf00), Local0) if (chk0) { if (LNotEqual(Local0, 0x2468acef)) { - err(ts, z161, 0x010, 0, 0, Local0, 0x2468acef) + err(ts, z161, __LINE__, 0, 0, Local0, 0x2468acef) } if (LNotEqual(bf00, 0x12345675)) { - err(ts, z161, 0x010, 0, 0, bf00, 0x12345675) + err(ts, z161, __LINE__, 0, 0, bf00, 0x12345675) } } @@ -710,10 +710,10 @@ Method(mf0f,, Serialized) Store(m000(bf00), Local0) if (chk0) { if (LNotEqual(Local0, 0x1234569e)) { - err(ts, z161, 0x010, 0, 0, Local0, 0x1234569e) + err(ts, z161, __LINE__, 0, 0, Local0, 0x1234569e) } if (LNotEqual(bf00, 0x12345678)) { - err(ts, z161, 0x010, 0, 0, bf00, 0x12345678) + err(ts, z161, __LINE__, 0, 0, bf00, 0x12345678) } } @@ -721,10 +721,10 @@ Method(mf0f,, Serialized) Store(m001(bf00), Local0) if (chk0) { if (LNotEqual(Local0, 0x2468acef)) { - err(ts, z161, 0x010, 0, 0, Local0, 0x2468acef) + err(ts, z161, __LINE__, 0, 0, Local0, 0x2468acef) } if (LNotEqual(bf00, 0x12345675)) { - err(ts, z161, 0x010, 0, 0, bf00, 0x12345675) + err(ts, z161, __LINE__, 0, 0, bf00, 0x12345675) } } @@ -769,10 +769,10 @@ Method(mf10,, Serialized) OUTP(b000) if (LNotEqual(Local0, 0x12345678)) { - err(ts, z161, 0x010, 0, 0, Local0, 0x12345678) + err(ts, z161, __LINE__, 0, 0, Local0, 0x12345678) } if (LNotEqual(bf00, 0x12345678)) { - err(ts, z161, 0x010, 0, 0, bf00, 0x12345678) + err(ts, z161, __LINE__, 0, 0, bf00, 0x12345678) } Return(POUT) @@ -890,43 +890,43 @@ Method(mf12,, Serialized) m000() if (LNotEqual(i000, 0xabcd0000)) { - err(ts, z161, 0x012, 0, 0, i000, 0xabcd0000) + err(ts, z161, __LINE__, 0, 0, i000, 0xabcd0000) } if (LNotEqual(i001, 0xabcd0001)) { - err(ts, z161, 0x013, 0, 0, i001, 0xabcd0001) + err(ts, z161, __LINE__, 0, 0, i001, 0xabcd0001) } if (LNotEqual(i002, 0xabcd0002)) { - err(ts, z161, 0x014, 0, 0, i002, 0xabcd0002) + err(ts, z161, __LINE__, 0, 0, i002, 0xabcd0002) } if (LNotEqual(i003, 0xabcd0003)) { - err(ts, z161, 0x015, 0, 0, i003, 0xabcd0003) + err(ts, z161, __LINE__, 0, 0, i003, 0xabcd0003) } if (LNotEqual(i004, 0xabcd0004)) { - err(ts, z161, 0x016, 0, 0, i004, 0xabcd0004) + err(ts, z161, __LINE__, 0, 0, i004, 0xabcd0004) } if (LNotEqual(i005, 0xabcd0005)) { - err(ts, z161, 0x017, 0, 0, i005, 0xabcd0005) + err(ts, z161, __LINE__, 0, 0, i005, 0xabcd0005) } if (LNotEqual(i006, 0xabcd0006)) { - err(ts, z161, 0x018, 0, 0, i006, 0xabcd0006) + err(ts, z161, __LINE__, 0, 0, i006, 0xabcd0006) } if (LNotEqual(i007, 0xabcd0007)) { - err(ts, z161, 0x019, 0, 0, i007, 0xabcd0007) + err(ts, z161, __LINE__, 0, 0, i007, 0xabcd0007) } if (LNotEqual(i008, 0xabcd0008)) { - err(ts, z161, 0x01a, 0, 0, i008, 0xabcd0008) + err(ts, z161, __LINE__, 0, 0, i008, 0xabcd0008) } if (LNotEqual(i009, 0xabcd0009)) { - err(ts, z161, 0x01b, 0, 0, i009, 0xabcd0009) + err(ts, z161, __LINE__, 0, 0, i009, 0xabcd0009) } if (LNotEqual(i00a, 0xabcd000a)) { - err(ts, z161, 0x01c, 0, 0, i00a, 0xabcd000a) + err(ts, z161, __LINE__, 0, 0, i00a, 0xabcd000a) } if (LNotEqual(i00b, 0xabcd000b)) { - err(ts, z161, 0x01d, 0, 0, i00b, 0xabcd000b) + err(ts, z161, __LINE__, 0, 0, i00b, 0xabcd000b) } if (LNotEqual(i00c, 0xabcd000c)) { - err(ts, z161, 0x01d, 0, 0, i00c, 0xabcd000c) + err(ts, z161, __LINE__, 0, 0, i00c, 0xabcd000c) } Return(POUT) @@ -1055,55 +1055,55 @@ Method(mf13,, Serialized) if (LNotEqual(i000, 0xabcd0000)) { - err(ts, z161, 0x012, 0, 0, i000, 0xabcd0000) + err(ts, z161, __LINE__, 0, 0, i000, 0xabcd0000) } if (LNotEqual(i001, 0xabcd0001)) { - err(ts, z161, 0x013, 0, 0, i001, 0xabcd0001) + err(ts, z161, __LINE__, 0, 0, i001, 0xabcd0001) } if (LNotEqual(i002, 0xabcd0002)) { - err(ts, z161, 0x014, 0, 0, i002, 0xabcd0002) + err(ts, z161, __LINE__, 0, 0, i002, 0xabcd0002) } if (LNotEqual(i003, 0xabcd0003)) { - err(ts, z161, 0x015, 0, 0, i003, 0xabcd0003) + err(ts, z161, __LINE__, 0, 0, i003, 0xabcd0003) } if (LNotEqual(i004, 0xabcd0004)) { - err(ts, z161, 0x016, 0, 0, i004, 0xabcd0004) + err(ts, z161, __LINE__, 0, 0, i004, 0xabcd0004) } if (LNotEqual(i005, 0xabcd0005)) { - err(ts, z161, 0x017, 0, 0, i005, 0xabcd0005) + err(ts, z161, __LINE__, 0, 0, i005, 0xabcd0005) } if (LNotEqual(i006, 0xabcd0006)) { - err(ts, z161, 0x018, 0, 0, i006, 0xabcd0006) + err(ts, z161, __LINE__, 0, 0, i006, 0xabcd0006) } if (LNotEqual(i007, 0xabcd0007)) { - err(ts, z161, 0x019, 0, 0, i007, 0xabcd0007) + err(ts, z161, __LINE__, 0, 0, i007, 0xabcd0007) } if (LNotEqual(i008, 0xabcd0008)) { - err(ts, z161, 0x01a, 0, 0, i008, 0xabcd0008) + err(ts, z161, __LINE__, 0, 0, i008, 0xabcd0008) } if (LNotEqual(i009, 0xabcd0009)) { - err(ts, z161, 0x01b, 0, 0, i009, 0xabcd0009) + err(ts, z161, __LINE__, 0, 0, i009, 0xabcd0009) } if (LNotEqual(i00a, 0xabcd000a)) { - err(ts, z161, 0x01c, 0, 0, i00a, 0xabcd000a) + err(ts, z161, __LINE__, 0, 0, i00a, 0xabcd000a) } if (LNotEqual(i00b, 0xabcd000b)) { - err(ts, z161, 0x01d, 0, 0, i00b, 0xabcd000b) + err(ts, z161, __LINE__, 0, 0, i00b, 0xabcd000b) } if (LNotEqual(i00c, 0xabcd000c)) { - err(ts, z161, 0x01d, 0, 0, i00c, 0xabcd000c) + err(ts, z161, __LINE__, 0, 0, i00c, 0xabcd000c) } if (LNotEqual(i00d, 0xabcd000d)) { - err(ts, z161, 0x01d, 0, 0, i00d, 0xabcd000d) + err(ts, z161, __LINE__, 0, 0, i00d, 0xabcd000d) } if (LNotEqual(i00e, 0xabcd000e)) { - err(ts, z161, 0x01d, 0, 0, i00e, 0xabcd000e) + err(ts, z161, __LINE__, 0, 0, i00e, 0xabcd000e) } if (LNotEqual(i00f, 0xabcd000f)) { - err(ts, z161, 0x01d, 0, 0, i00f, 0xabcd000f) + err(ts, z161, __LINE__, 0, 0, i00f, 0xabcd000f) } if (LNotEqual(i010, 0xabcd0010)) { - err(ts, z161, 0x01d, 0, 0, i010, 0xabcd0010) + err(ts, z161, __LINE__, 0, 0, i010, 0xabcd0010) } Return(POUT) @@ -1144,7 +1144,7 @@ Method(mf15,, Serialized) if (chk0) { if (LNotEqual(Local0, 5)) { - err(ts, z161, 0x004, 0, 0, Local0, 5) + err(ts, z161, __LINE__, 0, 0, Local0, 5) } } @@ -1170,7 +1170,7 @@ Method(mf16,, Serialized) Store(m000(p000), Local0) Store(DerefOf(Index(Local0, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z161, 0x006, 0, 0, Local0, 0xabcd0001) + err(ts, z161, __LINE__, 0, 0, Local0, 0xabcd0001) } Return(POUT) @@ -1196,7 +1196,7 @@ Method(mf17,, Serialized) Store(m000(), Local0) Store(DerefOf(Index(Local0, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z161, 0x006, 0, 0, Local0, 0xabcd0001) + err(ts, z161, __LINE__, 0, 0, Local0, 0xabcd0001) } Return(POUT) @@ -1218,7 +1218,7 @@ Method(mf18,, Serialized) if (chk0) { Store(LEqual(s000, s001), Local0) if (LNot(Local0)) { - err(ts, z161, 0x006, 0, 0, Local0, Ones) + err(ts, z161, __LINE__, 0, 0, Local0, Ones) } } @@ -1241,7 +1241,7 @@ Method(mf19,, Serialized) if (chk0) { Store(LEqual(b000, b001), Local0) if (LNot(Local0)) { - err(ts, z161, 0x006, 0, 0, Local0, Ones) + err(ts, z161, __LINE__, 0, 0, Local0, Ones) } } @@ -1265,7 +1265,7 @@ Method(mf1a,, Serialized) if (chk0) { Store(DerefOf(Index(pp00, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z161, 0x006, 0, 0, Local0, 0xabcd0001) + err(ts, z161, __LINE__, 0, 0, Local0, 0xabcd0001) } } @@ -1288,7 +1288,7 @@ Method(mf1b,, Serialized) if (chk0) { Store(Add(s000, s001), Local0) if (LNotEqual(Local0, 0x68ACE68A)) { - err(ts, z161, 0x006, 0, 0, Local0, 0x68ACE68A) + err(ts, z161, __LINE__, 0, 0, Local0, 0x68ACE68A) } } @@ -1311,7 +1311,7 @@ Method(mf1c,, Serialized) if (chk0) { Store(Add(b000, b001), Local0) if (LNotEqual(Local0, 0x6A584634)) { - err(ts, z161, 0x006, 0, 0, Local0, 0x6A584634) + err(ts, z161, __LINE__, 0, 0, Local0, 0x6A584634) } } @@ -1335,7 +1335,7 @@ Method(mf1d,, Serialized) Store(LEqual(f000, 0xabcd0000), Local0) if (LNot(Local0)) { - err(ts, z161, 0x006, 0, 0, Local0, Ones) + err(ts, z161, __LINE__, 0, 0, Local0, Ones) } Return(POUT) @@ -1364,7 +1364,7 @@ Method(mf1e,, Serialized) Store(m000(f000), Local0) if (LNot(Local0)) { - err(ts, z161, 0x006, 0, 0, Local0, Ones) + err(ts, z161, __LINE__, 0, 0, Local0, Ones) } Return(POUT) @@ -1386,7 +1386,7 @@ Method(mf1f,, Serialized) Method(m000, 1) { if (LNotEqual(arg0, 0xabcd0000)) { - err(ts, z161, 0x007, 0, 0, arg0, 0xabcd0000) + err(ts, z161, __LINE__, 0, 0, arg0, 0xabcd0000) } } @@ -1412,7 +1412,7 @@ Method(mf20,, Serialized) Store(Add(f000, 0x12), Local0) if (LNotEqual(Local0, 0xabcd0012)) { - err(ts, z161, 0x006, 0, 0, Local0, 0xabcd0012) + err(ts, z161, __LINE__, 0, 0, Local0, 0xabcd0012) } Return(POUT) @@ -1441,7 +1441,7 @@ Method(mf21,, Serialized) Store(m000(f000), Local0) if (LNotEqual(Local0, 0xabcd0012)) { - err(ts, z161, 0x006, 0, 0, Local0, 0xabcd0012) + err(ts, z161, __LINE__, 0, 0, Local0, 0xabcd0012) } Return(POUT) @@ -1464,7 +1464,7 @@ Method(mf22,, Serialized) Method(m000, 1) { if (LNotEqual(arg0, 0xabababab)) { - err(ts, z161, 0x007, 0, 0, arg0, 0xabababab) + err(ts, z161, __LINE__, 0, 0, arg0, 0xabababab) } } @@ -1490,10 +1490,10 @@ Method(mf23,, Serialized) Method(m000, 2) { if (LNotEqual(arg0, 0xabababab)) { - err(ts, z161, 0x007, 0, 0, arg0, 0xabababab) + err(ts, z161, __LINE__, 0, 0, arg0, 0xabababab) } if (LNotEqual(arg1, 0xabababab)) { - err(ts, z161, 0x007, 0, 0, arg1, 0xabababab) + err(ts, z161, __LINE__, 0, 0, arg1, 0xabababab) } } @@ -1519,17 +1519,17 @@ Method(mf24,, Serialized) Method(m001, 1) { if (LNotEqual(arg0, 0xabababab)) { - err(ts, z161, 0x007, 0, 0, arg0, 0xabababab) + err(ts, z161, __LINE__, 0, 0, arg0, 0xabababab) } Return (arg0) } Method(m002, 2) { if (LNotEqual(arg0, 0xabababab)) { - err(ts, z161, 0x007, 0, 0, arg0, 0xabababab) + err(ts, z161, __LINE__, 0, 0, arg0, 0xabababab) } if (LNotEqual(arg1, 0xabababab)) { - err(ts, z161, 0x007, 0, 0, arg1, 0xabababab) + err(ts, z161, __LINE__, 0, 0, arg1, 0xabababab) } Return (arg1) } @@ -1556,7 +1556,7 @@ Method(mf25,, Serialized) Store(ObjectType(Local1), Local0) if (LNotEqual(Local0, c00e)) { - err(ts, z161, 0x000, 0, 0, Local0, c00e) + err(ts, z161, __LINE__, 0, 0, Local0, c00e) } */ Return(POUT) @@ -1578,7 +1578,7 @@ Method(mf27,, Serialized) Store(ObjectType(Local1), Local0) if (LNotEqual(Local0, c00f)) { - err(ts, z161, 0x000, 0, 0, Local0, c00f) + err(ts, z161, __LINE__, 0, 0, Local0, c00f) } */ Return(POUT) @@ -1601,7 +1601,7 @@ Method(mf28,, Serialized) Store(ObjectType(Local1), Local0) if (LNotEqual(Local0, c011)) { - err(ts, z161, 0x000, 0, 0, Local0, c011) + err(ts, z161, __LINE__, 0, 0, Local0, c011) } */ Return(POUT) @@ -1624,7 +1624,7 @@ Method(mf29, 1, Serialized) Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, c00f)) { - err(ts, z161, 0x000, 0, 0, Local0, c00f) + err(ts, z161, __LINE__, 0, 0, Local0, c00f) } */ Return(POUT) @@ -1647,7 +1647,7 @@ Method(mf2a, 1, Serialized) Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, c011)) { - err(ts, z161, 0x000, 0, 0, Local0, c011) + err(ts, z161, __LINE__, 0, 0, Local0, c011) } */ Return(POUT) @@ -1674,7 +1674,7 @@ Method(mf2b,, Serialized) Store(d000, Local1) Store(ObjectType(Local1), Local0) if (LNotEqual(Local0, c00e)) { - err(ts, z161, 0x000, 0, 0, Local0, c00e) + err(ts, z161, __LINE__, 0, 0, Local0, c00e) } } */ @@ -1702,7 +1702,7 @@ Method(mf2c, 1, Serialized) Store(d000, arg0) Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, c00e)) { - err(ts, z161, 0x000, 0, 0, Local0, c00e) + err(ts, z161, __LINE__, 0, 0, Local0, c00e) } } */ diff --git a/tests/aslts/src/runtime/collections/Identity2MS/abbu/device/device.asl b/tests/aslts/src/runtime/collections/Identity2MS/abbu/device/device.asl index 26d13d22c..57484484e 100644 --- a/tests/aslts/src/runtime/collections/Identity2MS/abbu/device/device.asl +++ b/tests/aslts/src/runtime/collections/Identity2MS/abbu/device/device.asl @@ -47,17 +47,17 @@ Method(md00,, Serialized) } if (LNotEqual(d000.i000, 0xabcd0000)) { - err(ts, z174, 0x000, 0, 0, d000.i000, 0xabcd0000) + err(ts, z174, __LINE__, 0, 0, d000.i000, 0xabcd0000) } CopyObject(d001, d000) if (LNotEqual(d000.i000, 0xabcd0001)) { - err(ts, z174, 0x001, 0, 0, d000.i000, 0xabcd0001) + err(ts, z174, __LINE__, 0, 0, d000.i000, 0xabcd0001) } CopyObject(tz00, d000) if (LNotEqual(d000.i000, 0xabcd0002)) { - err(ts, z174, 0x002, 0, 0, d000.i000, 0xabcd0002) + err(ts, z174, __LINE__, 0, 0, d000.i000, 0xabcd0002) } CH03(ts, z174, 0x003, 0, 0) @@ -66,7 +66,7 @@ Method(md00,, Serialized) // Rejected by ASL compiler // if (LNotEqual(d000.i002, 0x22222222)) { -// err(ts, z174, 0x005, 0, 0, d000.i002, 0x22222222) +// err(ts, z174, __LINE__, 0, 0, d000.i002, 0x22222222) // } } diff --git a/tests/aslts/src/runtime/collections/Identity2MS/abbu/device/device_abbu.asl b/tests/aslts/src/runtime/collections/Identity2MS/abbu/device/device_abbu.asl index 8d33ea374..11d31b50c 100644 --- a/tests/aslts/src/runtime/collections/Identity2MS/abbu/device/device_abbu.asl +++ b/tests/aslts/src/runtime/collections/Identity2MS/abbu/device/device_abbu.asl @@ -54,7 +54,7 @@ Method(dvf2,, Serialized) Store(Add(\_SB_.ABBU.dvf2.d000.i000, m001()), Local0) if (LNotEqual(Local0, 0xabcd0003)) { - err(ts, z172, 0x001, 0, 0, Local0, 0xabcd0003) + err(ts, z172, __LINE__, 0, 0, Local0, 0xabcd0003) } } @@ -89,34 +89,34 @@ Method(mf26,, Serialized) { Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0xabcd0000)) { - err(ts, z164, 0x000, 0, 0, Local0, 0xabcd0000) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0000) } Store(DerefOf(Index(arg0, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z164, 0x001, 0, 0, Local0, 0xabcd0001) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0001) } Store(DerefOf(Index(arg0, 2)), Local0) if (LNotEqual(Local0, 0xabcd0002)) { - err(ts, z164, 0x002, 0, 0, Local0, 0xabcd0002) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0002) } Store(DerefOf(Index(arg0, 3)), Local0) if (LNotEqual(Local0, "i000")) { - err(ts, z164, 0x003, 0, 0, Local0, "i000") + err(ts, z164, __LINE__, 0, 0, Local0, "i000") } Store(DerefOf(Index(arg0, 4)), Local0) if (LNotEqual(Local0, 0xabcd0003)) { - err(ts, z164, 0x004, 0, 0, Local0, 0xabcd0003) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0003) } Store(DerefOf(Index(arg0, 5)), Local0) if (LNotEqual(Local0, 0xabcd0004)) { - err(ts, z164, 0x004, 0, 0, Local0, 0xabcd0004) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0004) } Store(ii00, Index(arg0, 0)) Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z164, 0x005, 0, 0, Local0, 0x11112222) + err(ts, z164, __LINE__, 0, 0, Local0, 0x11112222) } } @@ -139,30 +139,30 @@ Method(mf26,, Serialized) Store(DerefOf(Index(p000, 0)), Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z164, 0x006, 0, 0, Local0, 0x11112222) + err(ts, z164, __LINE__, 0, 0, Local0, 0x11112222) } Store(DerefOf(Index(p000, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z164, 0x007, 0, 0, Local0, 0xabcd0001) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0001) } Store(DerefOf(Index(p000, 2)), Local0) if (LNotEqual(Local0, 0xabcd0002)) { - err(ts, z164, 0x008, 0, 0, Local0, 0xabcd0002) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0002) } Store(DerefOf(Index(p000, 3)), Local0) if (LNotEqual(Local0, "i000")) { - err(ts, z164, 0x009, 0, 0, Local0, "i000") + err(ts, z164, __LINE__, 0, 0, Local0, "i000") } Store(DerefOf(Index(p000, 4)), Local0) if (LNotEqual(Local0, 0xabcd0003)) { - err(ts, z164, 0x00a, 0, 0, Local0, 0xabcd0003) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0003) } Store(DerefOf(Index(p000, 5)), Local0) if (LNotEqual(Local0, 0xabcd0004)) { - err(ts, z164, 0x004, 0, 0, Local0, 0xabcd0004) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0004) } } diff --git a/tests/aslts/src/runtime/collections/Identity2MS/abbu/device/device_aslts.asl b/tests/aslts/src/runtime/collections/Identity2MS/abbu/device/device_aslts.asl index c69f322ea..2c4123609 100644 --- a/tests/aslts/src/runtime/collections/Identity2MS/abbu/device/device_aslts.asl +++ b/tests/aslts/src/runtime/collections/Identity2MS/abbu/device/device_aslts.asl @@ -54,7 +54,7 @@ Method(dvf2,, Serialized) Store(Add(\dvf2.d000.i000, m001()), Local0) if (LNotEqual(Local0, 0xabcd0003)) { - err(ts, z173, 0x001, 0, 0, Local0, 0xabcd0003) + err(ts, z173, __LINE__, 0, 0, Local0, 0xabcd0003) } } @@ -87,34 +87,34 @@ Method(mf26,, Serialized) { Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0xabcd0000)) { - err(ts, z164, 0x000, 0, 0, Local0, 0xabcd0000) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0000) } Store(DerefOf(Index(arg0, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z164, 0x001, 0, 0, Local0, 0xabcd0001) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0001) } Store(DerefOf(Index(arg0, 2)), Local0) if (LNotEqual(Local0, 0xabcd0002)) { - err(ts, z164, 0x002, 0, 0, Local0, 0xabcd0002) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0002) } Store(DerefOf(Index(arg0, 3)), Local0) if (LNotEqual(Local0, "i000")) { - err(ts, z164, 0x003, 0, 0, Local0, "i000") + err(ts, z164, __LINE__, 0, 0, Local0, "i000") } Store(DerefOf(Index(arg0, 4)), Local0) if (LNotEqual(Local0, 0xabcd0003)) { - err(ts, z164, 0x004, 0, 0, Local0, 0xabcd0003) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0003) } Store(DerefOf(Index(arg0, 5)), Local0) if (LNotEqual(Local0, 0xabcd0004)) { - err(ts, z164, 0x004, 0, 0, Local0, 0xabcd0004) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0004) } Store(ii00, Index(arg0, 0)) Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z164, 0x005, 0, 0, Local0, 0x11112222) + err(ts, z164, __LINE__, 0, 0, Local0, 0x11112222) } } @@ -122,31 +122,31 @@ Method(mf26,, Serialized) Store(DerefOf(Index(p000, 0)), Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z164, 0x006, 0, 0, Local0, 0x11112222) + err(ts, z164, __LINE__, 0, 0, Local0, 0x11112222) } Store(DerefOf(Index(p000, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z164, 0x007, 0, 0, Local0, 0xabcd0001) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0001) } Store(DerefOf(Index(p000, 2)), Local0) if (LNotEqual(Local0, 0xabcd0002)) { - err(ts, z164, 0x008, 0, 0, Local0, 0xabcd0002) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0002) } Store(DerefOf(Index(p000, 3)), Local0) if (LNotEqual(Local0, "i000")) { - err(ts, z164, 0x009, 0, 0, Local0, "i000") + err(ts, z164, __LINE__, 0, 0, Local0, "i000") } Store(DerefOf(Index(p000, 4)), Local0) if (LNotEqual(Local0, 0xabcd0003)) { - err(ts, z164, 0x00a, 0, 0, Local0, 0xabcd0003) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0003) } Store(DerefOf(Index(p000, 5)), Local0) if (LNotEqual(Local0, 0xabcd0004)) { - err(ts, z164, 0x004, 0, 0, Local0, 0xabcd0004) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0004) } } diff --git a/tests/aslts/src/runtime/collections/Identity2MS/abbu/device/ns_dv00.asl b/tests/aslts/src/runtime/collections/Identity2MS/abbu/device/ns_dv00.asl index c10c81fad..c2bb21dbb 100644 --- a/tests/aslts/src/runtime/collections/Identity2MS/abbu/device/ns_dv00.asl +++ b/tests/aslts/src/runtime/collections/Identity2MS/abbu/device/ns_dv00.asl @@ -32,7 +32,7 @@ Method(dv00) } Store(Add(d000.i000, m001(d000.i000)), Local0) if (LNotEqual(Local0, 0xabcd0003)) { - err(ts, z167, 0x001, 0, 0, Local0, 0xabcd0003) + err(ts, z167, __LINE__, 0, 0, Local0, 0xabcd0003) } } @@ -58,7 +58,7 @@ Method(dvf0) Store(Add(d000.i000, m001()), Local0) if (LNotEqual(Local0, 0xabcd0003)) { - err(ts, z163, 0x001, 0, 0, Local0, 0xabcd0003) + err(ts, z163, __LINE__, 0, 0, Local0, 0xabcd0003) } } @@ -84,7 +84,7 @@ Method(dvf1) Store(Add(^dvf1.d000.i000, m001()), Local0) if (LNotEqual(Local0, 0xabcd0003)) { - err(ts, z163, 0x001, 0, 0, Local0, 0xabcd0003) + err(ts, z163, __LINE__, 0, 0, Local0, 0xabcd0003) } } @@ -148,11 +148,11 @@ Method(dv01, 1) Store(Add(i000, m001()), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z167, 0x003, 0, 0, Local0, 0x87654321) + err(ts, z167, __LINE__, 0, 0, Local0, 0x87654321) } if (LNotEqual(i000, 0x80000000)) { - err(ts, z167, 0x004, 0, 0, i000, 0x80000000) + err(ts, z167, __LINE__, 0, 0, i000, 0x80000000) } } @@ -183,11 +183,11 @@ Method(dv02) Store(Add(i000, m001()), Local0) if (LNotEqual(Local0, 0x00c00042)) { - err(ts, z167, 0x006, 0, 0, Local0, 0x00c00042) + err(ts, z167, __LINE__, 0, 0, Local0, 0x00c00042) } if (LNotEqual(i000, 0x0010000b)) { - err(ts, z167, 0x007, 0, 0, i000, 0x0010000b) + err(ts, z167, __LINE__, 0, 0, i000, 0x0010000b) } } @@ -250,11 +250,11 @@ Method(dv03, 1) Store(Add(Local7, m001()), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z167, 0x00c, 0, 0, Local0, 0x87654321) + err(ts, z167, __LINE__, 0, 0, Local0, 0x87654321) } if (LNotEqual(Local7, 1)) { - err(ts, z167, 0x00d, 0, 0, Local7, 1) + err(ts, z167, __LINE__, 0, 0, Local7, 1) } } @@ -343,64 +343,64 @@ Method(dv04) Return (Add(i000, m005(i000, arg0))) } if (LNotEqual(arg0, 0x00000300)) { - err(ts, z167, 0x004, 0, 0, arg0, 0x00000300) + err(ts, z167, __LINE__, 0, 0, arg0, 0x00000300) } if (LNotEqual(arg1, 0x10000001)) { - err(ts, z167, 0x004, 0, 0, arg1, 0x10000001) + err(ts, z167, __LINE__, 0, 0, arg1, 0x10000001) } Store(0x00004000, i000) Store(0x10000003, arg0) Return (Add(i000, m004(i000, arg0))) } if (LNotEqual(arg0, 0x00000020)) { - err(ts, z167, 0x004, 0, 0, arg0, 0x00000020) + err(ts, z167, __LINE__, 0, 0, arg0, 0x00000020) } if (LNotEqual(i000, 0x00000020)) { - err(ts, z167, 0x004, 0, 0, i000, 0x00000020) + err(ts, z167, __LINE__, 0, 0, i000, 0x00000020) } Store(0x10000002, arg0) if (LNotEqual(i000, 0x00000020)) { - err(ts, z167, 0x004, 0, 0, i000, 0x00000020) + err(ts, z167, __LINE__, 0, 0, i000, 0x00000020) } if (LNotEqual(arg0, 0x10000002)) { - err(ts, z167, 0x004, 0, 0, arg0, 0x10000002) + err(ts, z167, __LINE__, 0, 0, arg0, 0x10000002) } Store(0x00000300, i000) if (LNotEqual(i000, 0x00000300)) { - err(ts, z167, 0x004, 0, 0, i000, 0x00000300) + err(ts, z167, __LINE__, 0, 0, i000, 0x00000300) } if (LNotEqual(arg0, 0x10000002)) { - err(ts, z167, 0x004, 0, 0, arg0, 0x10000002) + err(ts, z167, __LINE__, 0, 0, arg0, 0x10000002) } if (LNotEqual(arg1, 0x10000001)) { - err(ts, z167, 0x004, 0, 0, arg1, 0x10000001) + err(ts, z167, __LINE__, 0, 0, arg1, 0x10000001) } Store(0x10000002, arg0) Store(0x00000300, i000) Return (Add(i000, m003(i000, arg1))) } if (LNotEqual(arg0, 0x00000001)) { - err(ts, z167, 0x004, 0, 0, arg0, 0x00000001) + err(ts, z167, __LINE__, 0, 0, arg0, 0x00000001) } if (LNotEqual(i000, 0x00000001)) { - err(ts, z167, 0x004, 0, 0, i000, 0x00000001) + err(ts, z167, __LINE__, 0, 0, i000, 0x00000001) } Store(0x10000001, arg0) if (LNotEqual(i000, 0x00000001)) { - err(ts, z167, 0x004, 0, 0, i000, 0x00000001) + err(ts, z167, __LINE__, 0, 0, i000, 0x00000001) } if (LNotEqual(arg0, 0x10000001)) { - err(ts, z167, 0x004, 0, 0, arg0, 0x10000001) + err(ts, z167, __LINE__, 0, 0, arg0, 0x10000001) } Store(0x00000020, i000) if (LNotEqual(i000, 0x00000020)) { - err(ts, z167, 0x004, 0, 0, i000, 0x00000020) + err(ts, z167, __LINE__, 0, 0, i000, 0x00000020) } if (LNotEqual(arg0, 0x10000001)) { - err(ts, z167, 0x004, 0, 0, arg0, 0x10000001) + err(ts, z167, __LINE__, 0, 0, arg0, 0x10000001) } if (LNotEqual(arg1, 0x10000000)) { - err(ts, z167, 0x004, 0, 0, arg1, 0x10000000) + err(ts, z167, __LINE__, 0, 0, arg1, 0x10000000) } Store(0x10000001, arg0) Store(0x00000020, i000) @@ -409,11 +409,11 @@ Method(dv04) Store(Add(i000, m001(i000, 0x10000000)), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z167, 0x003, 0, 0, Local0, 0x87654321) + err(ts, z167, __LINE__, 0, 0, Local0, 0x87654321) } if (LNotEqual(i000, 0x80000000)) { - err(ts, z167, 0x004, 0, 0, i000, 0x80000000) + err(ts, z167, __LINE__, 0, 0, i000, 0x80000000) } } @@ -459,7 +459,7 @@ Method(dv05) { Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, arg1)) { - err(ts, z167, 0x003, 0, 0, Local0, arg1) + err(ts, z167, __LINE__, 0, 0, Local0, arg1) } Return (5) } @@ -468,71 +468,71 @@ Method(dv05) Store(Add(DerefOf(Index(p000, 0)), m001(i000, c009)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err(ts, z167, 0x003, 0, 0, Local0, 0xabcd0006) + err(ts, z167, __LINE__, 0, 0, Local0, 0xabcd0006) } Store(Add(DerefOf(Index(p000, 0)), m001(s000, c00a)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err(ts, z167, 0x003, 0, 0, Local0, 0xabcd0006) + err(ts, z167, __LINE__, 0, 0, Local0, 0xabcd0006) } Store(Add(DerefOf(Index(p000, 0)), m001(b000, c00b)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err(ts, z167, 0x003, 0, 0, Local0, 0xabcd0006) + err(ts, z167, __LINE__, 0, 0, Local0, 0xabcd0006) } Store(Add(DerefOf(Index(p000, 0)), m001(p000, c00c)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err(ts, z167, 0x003, 0, 0, Local0, 0xabcd0006) + err(ts, z167, __LINE__, 0, 0, Local0, 0xabcd0006) } Store(Add(DerefOf(Index(p000, 0)), m001(e000, c00f)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err(ts, z167, 0x003, 0, 0, Local0, 0xabcd0006) + err(ts, z167, __LINE__, 0, 0, Local0, 0xabcd0006) } Store(Add(DerefOf(Index(p000, 0)), m001(mx00, c011)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err(ts, z167, 0x003, 0, 0, Local0, 0xabcd0006) + err(ts, z167, __LINE__, 0, 0, Local0, 0xabcd0006) } Store(Add(DerefOf(Index(p000, 0)), m001(mmm0, c008)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err(ts, z167, 0x003, 0, 0, Local0, 0xabcd0006) + err(ts, z167, __LINE__, 0, 0, Local0, 0xabcd0006) } Store(Add(DerefOf(Index(p000, 0)), m001(mmm1, c00a)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err(ts, z167, 0x003, 0, 0, Local0, 0xabcd0006) + err(ts, z167, __LINE__, 0, 0, Local0, 0xabcd0006) } Store(Add(DerefOf(Index(p000, 0)), m001(d000, c00e)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err(ts, z167, 0x003, 0, 0, Local0, 0xabcd0006) + err(ts, z167, __LINE__, 0, 0, Local0, 0xabcd0006) } Store(Add(DerefOf(Index(p000, 0)), m001(tz00, c015)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err(ts, z167, 0x003, 0, 0, Local0, 0xabcd0006) + err(ts, z167, __LINE__, 0, 0, Local0, 0xabcd0006) } Store(Add(DerefOf(Index(p000, 0)), m001(pr00, c014)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err(ts, z167, 0x003, 0, 0, Local0, 0xabcd0006) + err(ts, z167, __LINE__, 0, 0, Local0, 0xabcd0006) } Store(Add(DerefOf(Index(p000, 0)), m001(pw00, c013)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err(ts, z167, 0x003, 0, 0, Local0, 0xabcd0006) + err(ts, z167, __LINE__, 0, 0, Local0, 0xabcd0006) } Store(Add(DerefOf(Index(p000, 0)), m001(r000, c012)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err(ts, z167, 0x003, 0, 0, Local0, 0xabcd0006) + err(ts, z167, __LINE__, 0, 0, Local0, 0xabcd0006) } Store(Add(DerefOf(Index(p000, 0)), m001(bf00, c00b)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err(ts, z167, 0x003, 0, 0, Local0, 0xabcd0006) + err(ts, z167, __LINE__, 0, 0, Local0, 0xabcd0006) } Store(Add(DerefOf(Index(p000, 0)), m001(f000, c009)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err(ts, z167, 0x003, 0, 0, Local0, 0xabcd0006) + err(ts, z167, __LINE__, 0, 0, Local0, 0xabcd0006) } Store(Add(DerefOf(Index(p000, 0)), m001(bnk0, c009)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err(ts, z167, 0x003, 0, 0, Local0, 0xabcd0006) + err(ts, z167, __LINE__, 0, 0, Local0, 0xabcd0006) } Store(Add(DerefOf(Index(p000, 0)), m001(if00, c009)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err(ts, z167, 0x003, 0, 0, Local0, 0xabcd0006) + err(ts, z167, __LINE__, 0, 0, Local0, 0xabcd0006) } CH03(ts, z167, 0x000, 0, 0) @@ -545,7 +545,7 @@ Method(dv06) Store(ObjectType(i000), Local0) if (LNotEqual(Local0, c009)) { - err(ts, z167, 0x003, 0, 0, Local0, c009) + err(ts, z167, __LINE__, 0, 0, Local0, c009) } } diff --git a/tests/aslts/src/runtime/collections/Identity2MS/abbu/device/ns_dv10.asl b/tests/aslts/src/runtime/collections/Identity2MS/abbu/device/ns_dv10.asl index cb78b5aa5..da819fc38 100644 --- a/tests/aslts/src/runtime/collections/Identity2MS/abbu/device/ns_dv10.asl +++ b/tests/aslts/src/runtime/collections/Identity2MS/abbu/device/ns_dv10.asl @@ -37,14 +37,14 @@ Method(in10) { Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0xabcd0000)) { - err(ts, z164, 0x000, 0, 0, Local0, 0xabcd0000) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0000) } Store(0x11112222, Index(arg0, 0)) Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z164, 0x000, 0, 0, Local0, 0x11112222) + err(ts, z164, __LINE__, 0, 0, Local0, 0x11112222) } } @@ -52,12 +52,12 @@ Method(in10) Store(DerefOf(Index(p000, 0)), Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z164, 0x000, 0, 0, Local0, 0x11112222) + err(ts, z164, __LINE__, 0, 0, Local0, 0x11112222) } Store(DerefOf(Index(p000, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z164, 0x000, 0, 0, Local0, 0xabcd0001) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0001) } } @@ -75,14 +75,14 @@ Method(in11) Store(DerefOf(Index(Local7, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z164, 0x000, 0, 0, Local0, 0xabcd0001) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0001) } Store(0x33334444, Index(Local7, 1)) Store(DerefOf(Index(Local7, 1)), Local0) if (LNotEqual(Local0, 0x33334444)) { - err(ts, z164, 0x000, 0, 0, Local0, 0x33334444) + err(ts, z164, __LINE__, 0, 0, Local0, 0x33334444) } } @@ -90,12 +90,12 @@ Method(in11) Store(DerefOf(Index(p000, 0)), Local0) if (LNotEqual(Local0, 0xabcd0000)) { - err(ts, z164, 0x000, 0, 0, Local0, 0xabcd0000) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0000) } Store(DerefOf(Index(p000, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z164, 0x000, 0, 0, Local0, 0xabcd0001) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0001) } } @@ -114,7 +114,7 @@ Method(in12) Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z164, 0x000, 0, 0, Local0, 0x11112222) + err(ts, z164, __LINE__, 0, 0, Local0, 0x11112222) } Store(DerefOf(arg1), Local7) @@ -122,7 +122,7 @@ Method(in12) Store(DerefOf(Index(Local7, 1)), Local0) if (LNotEqual(Local0, 0x33334444)) { - err(ts, z164, 0x000, 0, 0, Local0, 0x33334444) + err(ts, z164, __LINE__, 0, 0, Local0, 0x33334444) } } @@ -130,12 +130,12 @@ Method(in12) Store(DerefOf(Index(p000, 0)), Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z164, 0x000, 0, 0, Local0, 0x11112222) + err(ts, z164, __LINE__, 0, 0, Local0, 0x11112222) } Store(DerefOf(Index(p000, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z164, 0x000, 0, 0, Local0, 0xabcd0001) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0001) } } @@ -155,14 +155,14 @@ Method(in13) Store(DerefOf(Index(Local7, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z164, 0x000, 0, 0, Local0, 0xabcd0001) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0001) } Store(0x33334444, Index(Local7, 1)) Store(DerefOf(Index(Local7, 1)), Local0) if (LNotEqual(Local0, 0x33334444)) { - err(ts, z164, 0x000, 0, 0, Local0, 0x33334444) + err(ts, z164, __LINE__, 0, 0, Local0, 0x33334444) } } @@ -170,15 +170,15 @@ Method(in13) Store(DerefOf(Index(p000, 0)), Local0) if (LNotEqual(Local0, 0xabcd0000)) { - err(ts, z164, 0x000, 0, 0, Local0, 0xabcd0000) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0000) } Store(DerefOf(Index(p000, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z164, 0x000, 0, 0, Local0, 0xabcd0001) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0001) } Store(DerefOf(Index(p000, 2)), Local0) if (LNotEqual(Local0, 0xabcd0002)) { - err(ts, z164, 0x000, 0, 0, Local0, 0xabcd0002) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0002) } } @@ -211,26 +211,26 @@ Method(in14) { Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0xabcd0000)) { - err(ts, z164, 0x000, 0, 0, Local0, 0xabcd0000) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0000) } Store(DerefOf(Index(arg0, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z164, 0x000, 0, 0, Local0, 0xabcd0001) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0001) } Store(DerefOf(Index(arg0, 2)), Local0) if (LNotEqual(Local0, 0xabcd0002)) { - err(ts, z164, 0x000, 0, 0, Local0, 0xabcd0002) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0002) } Store(DerefOf(Index(arg0, 3)), Local0) if (LNotEqual(Local0, "i000")) { - err(ts, z164, 0x000, 0, 0, Local0, "i000") + err(ts, z164, __LINE__, 0, 0, Local0, "i000") } Store(ii00, Index(arg0, 0)) Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z164, 0x000, 0, 0, Local0, 0x11112222) + err(ts, z164, __LINE__, 0, 0, Local0, 0x11112222) } } @@ -238,22 +238,22 @@ Method(in14) Store(DerefOf(Index(p000, 0)), Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z164, 0x000, 0, 0, Local0, 0x11112222) + err(ts, z164, __LINE__, 0, 0, Local0, 0x11112222) } Store(DerefOf(Index(p000, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z164, 0x000, 0, 0, Local0, 0xabcd0001) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0001) } Store(DerefOf(Index(p000, 2)), Local0) if (LNotEqual(Local0, 0xabcd0002)) { - err(ts, z164, 0x000, 0, 0, Local0, 0xabcd0002) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0002) } Store(DerefOf(Index(p000, 3)), Local0) if (LNotEqual(Local0, "i000")) { - err(ts, z164, 0x000, 0, 0, Local0, "i000") + err(ts, z164, __LINE__, 0, 0, Local0, "i000") } } @@ -313,14 +313,14 @@ Method(in16) // arg0 - b000 Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0x10)) { - err(ts, z164, 0x000, 0, 0, Local0, 0x10) + err(ts, z164, __LINE__, 0, 0, Local0, 0x10) } Store(0x67, Index(arg0, 0)) Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0x67)) { - err(ts, z164, 0x000, 0, 0, Local0, 0x67) + err(ts, z164, __LINE__, 0, 0, Local0, 0x67) } // arg1 - RefOf(b000) @@ -330,7 +330,7 @@ Method(in16) Store(DerefOf(Index(Local7, 1)), Local0) if (LNotEqual(Local0, 0x55)) { - err(ts, z164, 0x000, 0, 0, Local0, 0x55) + err(ts, z164, __LINE__, 0, 0, Local0, 0x55) } } @@ -338,17 +338,17 @@ Method(in16) Store(DerefOf(Index(b000, 0)), Local0) if (LNotEqual(Local0, 0x67)) { - err(ts, z164, 0x002, 0, 0, Local0, 0x67) + err(ts, z164, __LINE__, 0, 0, Local0, 0x67) } Store(DerefOf(Index(b000, 1)), Local0) if (LNotEqual(Local0, 0x11)) { - err(ts, z164, 0x002, 0, 0, Local0, 0x11) + err(ts, z164, __LINE__, 0, 0, Local0, 0x11) } Store(DerefOf(Index(b000, 2)), Local0) if (LNotEqual(Local0, 0x12)) { - err(ts, z164, 0x002, 0, 0, Local0, 0x12) + err(ts, z164, __LINE__, 0, 0, Local0, 0x12) } } @@ -383,13 +383,13 @@ Method(in17) Store(Add(DerefOf(Index(pp00, 1)), m001()), Local0) if (LNotEqual(Local0, 0x00c00042)) { - err(ts, z164, 0x00a, 0, 0, Local0, 0x00c00042) + err(ts, z164, __LINE__, 0, 0, Local0, 0x00c00042) } Store(DerefOf(Index(pp00, 1)), Local0) if (LNotEqual(Local0, 0x0010000b)) { - err(ts, z164, 0x00b, 0, 0, Local0, 0x0010000b) + err(ts, z164, __LINE__, 0, 0, Local0, 0x0010000b) } CH03(ts, z164, 0x00c, 0, 0) @@ -467,7 +467,7 @@ Method(in18, 1) Store(Add(f001, m001()), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z164, 0x012, 0, 0, Local0, 0x87654321) + err(ts, z164, __LINE__, 0, 0, Local0, 0x87654321) } if (arg0) { @@ -477,7 +477,7 @@ Method(in18, 1) } if (LNotEqual(f001, Local1)) { - err(ts, z164, 0x013, 0, 0, f001, Local1) + err(ts, z164, __LINE__, 0, 0, f001, Local1) } CH03(ts, z164, 0x014, 0, 0) @@ -549,7 +549,7 @@ Method(in19, 1) Store(Add(bnk0, m001()), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z164, 0x016, 0, 0, Local0, 0x87654321) + err(ts, z164, __LINE__, 0, 0, Local0, 0x87654321) } if (arg0) { @@ -559,7 +559,7 @@ Method(in19, 1) } if (LNotEqual(bnk0, Local1)) { - err(ts, z164, 0x017, 0, 0, bnk0, Local1) + err(ts, z164, __LINE__, 0, 0, bnk0, Local1) } CH03(ts, z164, 0x018, 0, 0) @@ -636,7 +636,7 @@ Method(in1a, 1) */ if (LNotEqual(Local0, 0x87878787)) { - err(ts, z164, 0x01a, 0, 0, Local0, 0x87878787) + err(ts, z164, __LINE__, 0, 0, Local0, 0x87878787) } if (arg0) { @@ -646,7 +646,7 @@ Method(in1a, 1) } if (LNotEqual(if00, Local1)) { - err(ts, z164, 0x01b, 0, 0, if00, Local1) + err(ts, z164, __LINE__, 0, 0, if00, Local1) } CH03(ts, z164, 0x01c, 0, 0) @@ -702,7 +702,7 @@ Method(in1b, 1) Store(Add(DerefOf(Index(b000, 1)), m001()), Local0) if (LNotEqual(Local0, 0x1c)) { - err(ts, z164, 0x01e, 0, 0, Local0, 0x1c) + err(ts, z164, __LINE__, 0, 0, Local0, 0x1c) } Store(DerefOf(Index(b000, 1)), Local0) @@ -714,7 +714,7 @@ Method(in1b, 1) } if (LNotEqual(Local0, Local1)) { - err(ts, z164, 0x01f, 0, 0, Local0, Local1) + err(ts, z164, __LINE__, 0, 0, Local0, Local1) } CH03(ts, z164, 0x020, 0, 0) @@ -783,7 +783,7 @@ Method(in1c, 1) Store(m000(b000), Local0) if (LNotEqual(Local0, 0x1c)) { - err(ts, z164, 0x01e, 0, 0, Local0, 0x1c) + err(ts, z164, __LINE__, 0, 0, Local0, 0x1c) } Store(DerefOf(Index(b000, 1)), Local0) @@ -795,7 +795,7 @@ Method(in1c, 1) } if (LNotEqual(Local0, Local1)) { - err(ts, z164, 0x01f, 0, 0, Local0, Local1) + err(ts, z164, __LINE__, 0, 0, Local0, Local1) } CH03(ts, z164, 0x020, 0, 0) @@ -851,13 +851,13 @@ Method(in1d) Store(Add(DerefOf(Index(pp00, 1)), m001()), Local0) if (LNotEqual(Local0, 0x07654321)) { - err(ts, z164, 0x007, 0, 0, Local0, 0x07654321) + err(ts, z164, __LINE__, 0, 0, Local0, 0x07654321) } Store(DerefOf(Index(pp00, 1)), Local0) if (LNotEqual(Local0, 0x07000000)) { - err(ts, z164, 0x008, 0, 0, Local0, 0x07000000) + err(ts, z164, __LINE__, 0, 0, Local0, 0x07000000) } CH03(ts, z164, 0x009, 0, 0) @@ -925,13 +925,13 @@ Method(in1e) Store(m000(pp00), Local0) if (LNotEqual(Local0, 0x07654321)) { - err(ts, z164, 0x007, 0, 0, Local0, 0x07654321) + err(ts, z164, __LINE__, 0, 0, Local0, 0x07654321) } Store(DerefOf(Index(pp00, 1)), Local0) if (LNotEqual(Local0, 0x07000000)) { - err(ts, z164, 0x008, 0, 0, Local0, 0x07000000) + err(ts, z164, __LINE__, 0, 0, Local0, 0x07000000) } CH03(ts, z164, 0x009, 0, 0) diff --git a/tests/aslts/src/runtime/collections/Identity2MS/abbu/device/ns_dv20.asl b/tests/aslts/src/runtime/collections/Identity2MS/abbu/device/ns_dv20.asl index 1b0c10670..7228b8a52 100644 --- a/tests/aslts/src/runtime/collections/Identity2MS/abbu/device/ns_dv20.asl +++ b/tests/aslts/src/runtime/collections/Identity2MS/abbu/device/ns_dv20.asl @@ -51,7 +51,7 @@ Method(in20, 1) Store(m000(i000), Local0) if (LNotEqual(Local0, 0xabcd0003)) { - err(ts, z165, 0x001, 0, 0, Local0, 0xabcd0003) + err(ts, z165, __LINE__, 0, 0, Local0, 0xabcd0003) } } @@ -116,11 +116,11 @@ Method(in21, 1) Store(Add(i000, m001(i000)), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z165, 0x003, 0, 0, Local0, 0x87654321) + err(ts, z165, __LINE__, 0, 0, Local0, 0x87654321) } if (LNotEqual(i000, 0x00000001)) { - err(ts, z165, 0x004, 0, 0, i000, 0x00000001) + err(ts, z165, __LINE__, 0, 0, i000, 0x00000001) } } @@ -157,11 +157,11 @@ Method(in22) Store(Add(i000, m000(i000)), Local0) if (LNotEqual(Local0, 0x00b0002d)) { - err(ts, z165, 0x006, 0, 0, Local0, 0x00b0002d) + err(ts, z165, __LINE__, 0, 0, Local0, 0x00b0002d) } if (LNotEqual(i000, 0x00100000)) { - err(ts, z165, 0x007, 0, 0, i000, 0x00100000) + err(ts, z165, __LINE__, 0, 0, i000, 0x00100000) } } @@ -224,11 +224,11 @@ Method(in23, 2) Store(Add(arg1, m001(1)), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z165, 0x00f, 0, 0, Local0, 0x87654321) + err(ts, z165, __LINE__, 0, 0, Local0, 0x87654321) } if (LNotEqual(arg1, 1)) { - err(ts, z165, 0x010, 0, 0, arg1, 1) + err(ts, z165, __LINE__, 0, 0, arg1, 1) } CH03(ts, z165, 0x011, 0, 0) diff --git a/tests/aslts/src/runtime/collections/Identity2MS/abbu/device/ns_dv30.asl b/tests/aslts/src/runtime/collections/Identity2MS/abbu/device/ns_dv30.asl index 0b2dd5bb1..ae82fb94e 100644 --- a/tests/aslts/src/runtime/collections/Identity2MS/abbu/device/ns_dv30.asl +++ b/tests/aslts/src/runtime/collections/Identity2MS/abbu/device/ns_dv30.asl @@ -34,14 +34,14 @@ Method(in30) { Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0xabcd0000)) { - err(ts, z166, 0x000, 0, 0, Local0, 0xabcd0000) + err(ts, z166, __LINE__, 0, 0, Local0, 0xabcd0000) } Store(0x11112222, Index(arg0, 0)) Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z166, 0x000, 0, 0, Local0, 0x11112222) + err(ts, z166, __LINE__, 0, 0, Local0, 0x11112222) } } m001(arg0, arg1) @@ -51,12 +51,12 @@ Method(in30) Store(DerefOf(Index(p000, 0)), Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z166, 0x000, 0, 0, Local0, 0x11112222) + err(ts, z166, __LINE__, 0, 0, Local0, 0x11112222) } Store(DerefOf(Index(p000, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z166, 0x000, 0, 0, Local0, 0xabcd0001) + err(ts, z166, __LINE__, 0, 0, Local0, 0xabcd0001) } } @@ -77,14 +77,14 @@ Method(in31) Store(DerefOf(Index(Local7, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z166, 0x000, 0, 0, Local0, 0xabcd0001) + err(ts, z166, __LINE__, 0, 0, Local0, 0xabcd0001) } Store(0x33334444, Index(Local7, 1)) Store(DerefOf(Index(Local7, 1)), Local0) if (LNotEqual(Local0, 0x33334444)) { - err(ts, z166, 0x000, 0, 0, Local0, 0x33334444) + err(ts, z166, __LINE__, 0, 0, Local0, 0x33334444) } } m001(arg0, arg1) @@ -94,12 +94,12 @@ Method(in31) Store(DerefOf(Index(p000, 0)), Local0) if (LNotEqual(Local0, 0xabcd0000)) { - err(ts, z166, 0x000, 0, 0, Local0, 0xabcd0000) + err(ts, z166, __LINE__, 0, 0, Local0, 0xabcd0000) } Store(DerefOf(Index(p000, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z166, 0x000, 0, 0, Local0, 0xabcd0001) + err(ts, z166, __LINE__, 0, 0, Local0, 0xabcd0001) } } @@ -121,7 +121,7 @@ Method(in32) Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z166, 0x000, 0, 0, Local0, 0x11112222) + err(ts, z166, __LINE__, 0, 0, Local0, 0x11112222) } Store(DerefOf(arg1), Local7) @@ -129,7 +129,7 @@ Method(in32) Store(DerefOf(Index(Local7, 1)), Local0) if (LNotEqual(Local0, 0x33334444)) { - err(ts, z166, 0x000, 0, 0, Local0, 0x33334444) + err(ts, z166, __LINE__, 0, 0, Local0, 0x33334444) } } m001(arg0, arg1) @@ -139,12 +139,12 @@ Method(in32) Store(DerefOf(Index(p000, 0)), Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z166, 0x000, 0, 0, Local0, 0x11112222) + err(ts, z166, __LINE__, 0, 0, Local0, 0x11112222) } Store(DerefOf(Index(p000, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z166, 0x000, 0, 0, Local0, 0xabcd0001) + err(ts, z166, __LINE__, 0, 0, Local0, 0xabcd0001) } } @@ -167,14 +167,14 @@ Method(in33) Store(DerefOf(Index(Local7, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z166, 0x000, 0, 0, Local0, 0xabcd0001) + err(ts, z166, __LINE__, 0, 0, Local0, 0xabcd0001) } Store(0x33334444, Index(Local7, 1)) Store(DerefOf(Index(Local7, 1)), Local0) if (LNotEqual(Local0, 0x33334444)) { - err(ts, z166, 0x000, 0, 0, Local0, 0x33334444) + err(ts, z166, __LINE__, 0, 0, Local0, 0x33334444) } } m001(arg0, arg1) @@ -184,15 +184,15 @@ Method(in33) Store(DerefOf(Index(p000, 0)), Local0) if (LNotEqual(Local0, 0xabcd0000)) { - err(ts, z166, 0x000, 0, 0, Local0, 0xabcd0000) + err(ts, z166, __LINE__, 0, 0, Local0, 0xabcd0000) } Store(DerefOf(Index(p000, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z166, 0x000, 0, 0, Local0, 0xabcd0001) + err(ts, z166, __LINE__, 0, 0, Local0, 0xabcd0001) } Store(DerefOf(Index(p000, 2)), Local0) if (LNotEqual(Local0, 0xabcd0002)) { - err(ts, z166, 0x000, 0, 0, Local0, 0xabcd0002) + err(ts, z166, __LINE__, 0, 0, Local0, 0xabcd0002) } } @@ -226,26 +226,26 @@ Method(in34) { Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0xabcd0000)) { - err(ts, z162, 0x000, 0, 0, Local0, 0xabcd0000) + err(ts, z162, __LINE__, 0, 0, Local0, 0xabcd0000) } Store(DerefOf(Index(arg0, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z162, 0x000, 0, 0, Local0, 0xabcd0001) + err(ts, z162, __LINE__, 0, 0, Local0, 0xabcd0001) } Store(DerefOf(Index(arg0, 2)), Local0) if (LNotEqual(Local0, 0xabcd0002)) { - err(ts, z162, 0x000, 0, 0, Local0, 0xabcd0002) + err(ts, z162, __LINE__, 0, 0, Local0, 0xabcd0002) } Store(DerefOf(Index(arg0, 3)), Local0) if (LNotEqual(Local0, "i000")) { - err(ts, z162, 0x000, 0, 0, Local0, "i000") + err(ts, z162, __LINE__, 0, 0, Local0, "i000") } Store(ii00, Index(arg0, 0)) Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z162, 0x000, 0, 0, Local0, 0x11112222) + err(ts, z162, __LINE__, 0, 0, Local0, 0x11112222) } } m001(arg0, arg1) @@ -255,22 +255,22 @@ Method(in34) Store(DerefOf(Index(p000, 0)), Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z162, 0x000, 0, 0, Local0, 0x11112222) + err(ts, z162, __LINE__, 0, 0, Local0, 0x11112222) } Store(DerefOf(Index(p000, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z162, 0x000, 0, 0, Local0, 0xabcd0001) + err(ts, z162, __LINE__, 0, 0, Local0, 0xabcd0001) } Store(DerefOf(Index(p000, 2)), Local0) if (LNotEqual(Local0, 0xabcd0002)) { - err(ts, z162, 0x000, 0, 0, Local0, 0xabcd0002) + err(ts, z162, __LINE__, 0, 0, Local0, 0xabcd0002) } Store(DerefOf(Index(p000, 3)), Local0) if (LNotEqual(Local0, "i000")) { - err(ts, z162, 0x000, 0, 0, Local0, "i000") + err(ts, z162, __LINE__, 0, 0, Local0, "i000") } } @@ -290,14 +290,14 @@ Method(in36) // arg0 - b000 Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0x10)) { - err(ts, z166, 0x000, 0, 0, Local0, 0x10) + err(ts, z166, __LINE__, 0, 0, Local0, 0x10) } Store(0x67, Index(arg0, 0)) Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0x67)) { - err(ts, z166, 0x000, 0, 0, Local0, 0x67) + err(ts, z166, __LINE__, 0, 0, Local0, 0x67) } // arg1 - RefOf(b000) @@ -307,7 +307,7 @@ Method(in36) Store(DerefOf(Index(Local7, 1)), Local0) if (LNotEqual(Local0, 0x55)) { - err(ts, z166, 0x000, 0, 0, Local0, 0x55) + err(ts, z166, __LINE__, 0, 0, Local0, 0x55) } } m001(arg0, arg1) @@ -317,17 +317,17 @@ Method(in36) Store(DerefOf(Index(b000, 0)), Local0) if (LNotEqual(Local0, 0x67)) { - err(ts, z166, 0x002, 0, 0, Local0, 0x67) + err(ts, z166, __LINE__, 0, 0, Local0, 0x67) } Store(DerefOf(Index(b000, 1)), Local0) if (LNotEqual(Local0, 0x11)) { - err(ts, z166, 0x002, 0, 0, Local0, 0x11) + err(ts, z166, __LINE__, 0, 0, Local0, 0x11) } Store(DerefOf(Index(b000, 2)), Local0) if (LNotEqual(Local0, 0x12)) { - err(ts, z166, 0x002, 0, 0, Local0, 0x12) + err(ts, z166, __LINE__, 0, 0, Local0, 0x12) } } @@ -368,13 +368,13 @@ Method(in37) Store(m000(pp00), Local0) if (LNotEqual(Local0, 0x00a0002d)) { - err(ts, z166, 0x00a, 0, 0, Local0, 0x00a0002d) + err(ts, z166, __LINE__, 0, 0, Local0, 0x00a0002d) } Store(DerefOf(Index(pp00, 1)), Local0) if (LNotEqual(Local0, 0x00100009)) { - err(ts, z166, 0x00b, 0, 0, Local0, 0x00100009) + err(ts, z166, __LINE__, 0, 0, Local0, 0x00100009) } CH03(ts, z166, 0x00c, 0, 0) @@ -466,7 +466,7 @@ Method(in38, 1) Store(m000(f001), Local0) if (LNotEqual(Local0, 0x07654321)) { - err(ts, z166, 0x012, 0, 0, Local0, 0x07654321) + err(ts, z166, __LINE__, 0, 0, Local0, 0x07654321) } if (arg0) { @@ -476,7 +476,7 @@ Method(in38, 1) } if (LNotEqual(f001, Local1)) { - err(ts, z166, 0x013, 0, 0, f001, Local1) + err(ts, z166, __LINE__, 0, 0, f001, Local1) } CH03(ts, z166, 0x014, 0, 0) @@ -561,7 +561,7 @@ Method(in39, 1) Store(m000(bnk0), Local0) if (LNotEqual(Local0, 0x07654321)) { - err(ts, z166, 0x016, 0, 0, Local0, 0x07654321) + err(ts, z166, __LINE__, 0, 0, Local0, 0x07654321) } if (arg0) { @@ -571,7 +571,7 @@ Method(in39, 1) } if (LNotEqual(bnk0, Local1)) { - err(ts, z166, 0x017, 0, 0, bnk0, Local1) + err(ts, z166, __LINE__, 0, 0, bnk0, Local1) } CH03(ts, z166, 0x018, 0, 0) @@ -661,7 +661,7 @@ Method(in3a, 1) */ if (LNotEqual(Local0, 0x07070707)) { - err(ts, z166, 0x01a, 0, 0, Local0, 0x07070707) + err(ts, z166, __LINE__, 0, 0, Local0, 0x07070707) } if (arg0) { @@ -671,7 +671,7 @@ Method(in3a, 1) } if (LNotEqual(if00, Local1)) { - err(ts, z166, 0x01b, 0, 0, if00, Local1) + err(ts, z166, __LINE__, 0, 0, if00, Local1) } CH03(ts, z166, 0x01c, 0, 0) @@ -748,7 +748,7 @@ Method(in3c, 1) Store(m000(b000), Local0) if (LNotEqual(Local0, 0x1c)) { - err(ts, z162, 0x01e, 0, 0, Local0, 0x1c) + err(ts, z162, __LINE__, 0, 0, Local0, 0x1c) } Store(DerefOf(Index(b000, 1)), Local0) @@ -760,7 +760,7 @@ Method(in3c, 1) } if (LNotEqual(Local0, Local1)) { - err(ts, z162, 0x01f, 0, 0, Local0, Local1) + err(ts, z162, __LINE__, 0, 0, Local0, Local1) } CH03(ts, z162, 0x020, 0, 0) @@ -836,13 +836,13 @@ Method(in3e) Store(m000(pp00), Local0) if (LNotEqual(Local0, 0x07654321)) { - err(ts, z162, 0x007, 0, 0, Local0, 0x07654321) + err(ts, z162, __LINE__, 0, 0, Local0, 0x07654321) } Store(DerefOf(Index(pp00, 1)), Local0) if (LNotEqual(Local0, 0x07000000)) { - err(ts, z162, 0x008, 0, 0, Local0, 0x07000000) + err(ts, z162, __LINE__, 0, 0, Local0, 0x07000000) } CH03(ts, z162, 0x009, 0, 0) diff --git a/tests/aslts/src/runtime/collections/Identity2MS/abbu/initial/ns_in00.asl b/tests/aslts/src/runtime/collections/Identity2MS/abbu/initial/ns_in00.asl index ab82f8151..138580c79 100644 --- a/tests/aslts/src/runtime/collections/Identity2MS/abbu/initial/ns_in00.asl +++ b/tests/aslts/src/runtime/collections/Identity2MS/abbu/initial/ns_in00.asl @@ -82,7 +82,7 @@ Method(in00, 1, Serialized) } Store(Add(i000, m001()), Local0) if (LNotEqual(Local0, 0xabcd0003)) { - err(ts, z163, 0x001, 0, 0, Local0, 0xabcd0003) + err(ts, z163, __LINE__, 0, 0, Local0, 0xabcd0003) } } @@ -146,11 +146,11 @@ Method(in01, 1, Serialized) Store(Add(i000, m001()), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z163, 0x003, 0, 0, Local0, 0x87654321) + err(ts, z163, __LINE__, 0, 0, Local0, 0x87654321) } if (LNotEqual(i000, 0x80000000)) { - err(ts, z163, 0x004, 0, 0, i000, 0x80000000) + err(ts, z163, __LINE__, 0, 0, i000, 0x80000000) } } @@ -181,11 +181,11 @@ Method(in02,, Serialized) Store(Add(i000, m001()), Local0) if (LNotEqual(Local0, 0x00c00042)) { - err(ts, z163, 0x006, 0, 0, Local0, 0x00c00042) + err(ts, z163, __LINE__, 0, 0, Local0, 0x00c00042) } if (LNotEqual(i000, 0x0010000b)) { - err(ts, z163, 0x007, 0, 0, i000, 0x0010000b) + err(ts, z163, __LINE__, 0, 0, i000, 0x0010000b) } } @@ -248,11 +248,11 @@ Method(in03, 1, Serialized) Store(Add(Local7, m001()), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z163, 0x00c, 0, 0, Local0, 0x87654321) + err(ts, z163, __LINE__, 0, 0, Local0, 0x87654321) } if (LNotEqual(Local7, 1)) { - err(ts, z163, 0x00d, 0, 0, Local7, 1) + err(ts, z163, __LINE__, 0, 0, Local7, 1) } } @@ -341,64 +341,64 @@ Method(in04,, Serialized) Return (Add(i000, m005(i000, arg0))) } if (LNotEqual(arg0, 0x00000300)) { - err(ts, z163, 0x004, 0, 0, arg0, 0x00000300) + err(ts, z163, __LINE__, 0, 0, arg0, 0x00000300) } if (LNotEqual(arg1, 0x10000001)) { - err(ts, z163, 0x004, 0, 0, arg1, 0x10000001) + err(ts, z163, __LINE__, 0, 0, arg1, 0x10000001) } Store(0x00004000, i000) Store(0x10000003, arg0) Return (Add(i000, m004(i000, arg0))) } if (LNotEqual(arg0, 0x00000020)) { - err(ts, z163, 0x004, 0, 0, arg0, 0x00000020) + err(ts, z163, __LINE__, 0, 0, arg0, 0x00000020) } if (LNotEqual(i000, 0x00000020)) { - err(ts, z163, 0x004, 0, 0, i000, 0x00000020) + err(ts, z163, __LINE__, 0, 0, i000, 0x00000020) } Store(0x10000002, arg0) if (LNotEqual(i000, 0x00000020)) { - err(ts, z163, 0x004, 0, 0, i000, 0x00000020) + err(ts, z163, __LINE__, 0, 0, i000, 0x00000020) } if (LNotEqual(arg0, 0x10000002)) { - err(ts, z163, 0x004, 0, 0, arg0, 0x10000002) + err(ts, z163, __LINE__, 0, 0, arg0, 0x10000002) } Store(0x00000300, i000) if (LNotEqual(i000, 0x00000300)) { - err(ts, z163, 0x004, 0, 0, i000, 0x00000300) + err(ts, z163, __LINE__, 0, 0, i000, 0x00000300) } if (LNotEqual(arg0, 0x10000002)) { - err(ts, z163, 0x004, 0, 0, arg0, 0x10000002) + err(ts, z163, __LINE__, 0, 0, arg0, 0x10000002) } if (LNotEqual(arg1, 0x10000001)) { - err(ts, z163, 0x004, 0, 0, arg1, 0x10000001) + err(ts, z163, __LINE__, 0, 0, arg1, 0x10000001) } Store(0x10000002, arg0) Store(0x00000300, i000) Return (Add(i000, m003(i000, arg1))) } if (LNotEqual(arg0, 0x00000001)) { - err(ts, z163, 0x004, 0, 0, arg0, 0x00000001) + err(ts, z163, __LINE__, 0, 0, arg0, 0x00000001) } if (LNotEqual(i000, 0x00000001)) { - err(ts, z163, 0x004, 0, 0, i000, 0x00000001) + err(ts, z163, __LINE__, 0, 0, i000, 0x00000001) } Store(0x10000001, arg0) if (LNotEqual(i000, 0x00000001)) { - err(ts, z163, 0x004, 0, 0, i000, 0x00000001) + err(ts, z163, __LINE__, 0, 0, i000, 0x00000001) } if (LNotEqual(arg0, 0x10000001)) { - err(ts, z163, 0x004, 0, 0, arg0, 0x10000001) + err(ts, z163, __LINE__, 0, 0, arg0, 0x10000001) } Store(0x00000020, i000) if (LNotEqual(i000, 0x00000020)) { - err(ts, z163, 0x004, 0, 0, i000, 0x00000020) + err(ts, z163, __LINE__, 0, 0, i000, 0x00000020) } if (LNotEqual(arg0, 0x10000001)) { - err(ts, z163, 0x004, 0, 0, arg0, 0x10000001) + err(ts, z163, __LINE__, 0, 0, arg0, 0x10000001) } if (LNotEqual(arg1, 0x10000000)) { - err(ts, z163, 0x004, 0, 0, arg1, 0x10000000) + err(ts, z163, __LINE__, 0, 0, arg1, 0x10000000) } Store(0x10000001, arg0) Store(0x00000020, i000) @@ -407,11 +407,11 @@ Method(in04,, Serialized) Store(Add(i000, m001(i000, 0x10000000)), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z163, 0x003, 0, 0, Local0, 0x87654321) + err(ts, z163, __LINE__, 0, 0, Local0, 0x87654321) } if (LNotEqual(i000, 0x80000000)) { - err(ts, z163, 0x004, 0, 0, i000, 0x80000000) + err(ts, z163, __LINE__, 0, 0, i000, 0x80000000) } } @@ -457,7 +457,7 @@ Method(in05,, Serialized) { Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, arg1)) { - err(ts, z163, 0x003, 0, 0, Local0, arg1) + err(ts, z163, __LINE__, 0, 0, Local0, arg1) } Return (5) } @@ -466,89 +466,89 @@ Method(in05,, Serialized) Store(Add(DerefOf(Index(p000, 0)), m001(i000, c009)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err(ts, z163, 0x003, 0, 0, Local0, 0xabcd0006) + err(ts, z163, __LINE__, 0, 0, Local0, 0xabcd0006) } Store(Add(DerefOf(Index(p000, 0)), m001(s000, c00a)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err(ts, z163, 0x003, 0, 0, Local0, 0xabcd0006) + err(ts, z163, __LINE__, 0, 0, Local0, 0xabcd0006) } Store(Add(DerefOf(Index(p000, 0)), m001(b000, c00b)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err(ts, z163, 0x003, 0, 0, Local0, 0xabcd0006) + err(ts, z163, __LINE__, 0, 0, Local0, 0xabcd0006) } Store(Add(DerefOf(Index(p000, 0)), m001(p000, c00c)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err(ts, z163, 0x003, 0, 0, Local0, 0xabcd0006) + err(ts, z163, __LINE__, 0, 0, Local0, 0xabcd0006) } Store(Add(DerefOf(Index(p000, 0)), m001(e000, c00f)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err(ts, z163, 0x003, 0, 0, Local0, 0xabcd0006) + err(ts, z163, __LINE__, 0, 0, Local0, 0xabcd0006) } Store(Add(DerefOf(Index(p000, 0)), m001(mx00, c011)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err(ts, z163, 0x003, 0, 0, Local0, 0xabcd0006) + err(ts, z163, __LINE__, 0, 0, Local0, 0xabcd0006) } Store(Add(DerefOf(Index(p000, 0)), m001(mmm0, c008)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err(ts, z163, 0x003, 0, 0, Local0, 0xabcd0006) + err(ts, z163, __LINE__, 0, 0, Local0, 0xabcd0006) } Store(Add(DerefOf(Index(p000, 0)), m001(mmm1, c00a)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err(ts, z163, 0x003, 0, 0, Local0, 0xabcd0006) + err(ts, z163, __LINE__, 0, 0, Local0, 0xabcd0006) } Store(Add(DerefOf(Index(p000, 0)), m001(d000, c00e)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err(ts, z163, 0x003, 0, 0, Local0, 0xabcd0006) + err(ts, z163, __LINE__, 0, 0, Local0, 0xabcd0006) } Store(Add(DerefOf(Index(p000, 0)), m001(tz00, c015)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err(ts, z163, 0x003, 0, 0, Local0, 0xabcd0006) + err(ts, z163, __LINE__, 0, 0, Local0, 0xabcd0006) } Store(Add(DerefOf(Index(p000, 0)), m001(pr00, c014)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err(ts, z163, 0x003, 0, 0, Local0, 0xabcd0006) + err(ts, z163, __LINE__, 0, 0, Local0, 0xabcd0006) } Store(Add(DerefOf(Index(p000, 0)), m001(pw00, c013)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err(ts, z163, 0x003, 0, 0, Local0, 0xabcd0006) + err(ts, z163, __LINE__, 0, 0, Local0, 0xabcd0006) } Store(Add(DerefOf(Index(p000, 0)), m001(r000, c012)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err(ts, z163, 0x003, 0, 0, Local0, 0xabcd0006) + err(ts, z163, __LINE__, 0, 0, Local0, 0xabcd0006) } Store(Add(DerefOf(Index(p000, 0)), m001(bf00, c00b)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err(ts, z163, 0x003, 0, 0, Local0, 0xabcd0006) + err(ts, z163, __LINE__, 0, 0, Local0, 0xabcd0006) } Store(Add(DerefOf(Index(p000, 0)), m001(f000, c009)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err(ts, z163, 0x003, 0, 0, Local0, 0xabcd0006) + err(ts, z163, __LINE__, 0, 0, Local0, 0xabcd0006) } Store(Add(DerefOf(Index(p000, 0)), m001(bnk0, c009)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err(ts, z163, 0x003, 0, 0, Local0, 0xabcd0006) + err(ts, z163, __LINE__, 0, 0, Local0, 0xabcd0006) } Store(Add(DerefOf(Index(p000, 0)), m001(if00, c009)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err(ts, z163, 0x003, 0, 0, Local0, 0xabcd0006) + err(ts, z163, __LINE__, 0, 0, Local0, 0xabcd0006) } Store(ObjectType(f000), Local0) if (LNotEqual(Local0, c00d)) { - err(ts, z163, 0x003, 0, 0, Local0, c00d) + err(ts, z163, __LINE__, 0, 0, Local0, c00d) } Store(ObjectType(if00), Local0) if (LNotEqual(Local0, c00d)) { - err(ts, z163, 0x003, 0, 0, Local0, c00d) + err(ts, z163, __LINE__, 0, 0, Local0, c00d) } Store(ObjectType(bnk0), Local0) if (LNotEqual(Local0, c00d)) { - err(ts, z163, 0x003, 0, 0, Local0, c00d) + err(ts, z163, __LINE__, 0, 0, Local0, c00d) } Store(ObjectType(bf00), Local0) if (LNotEqual(Local0, c016)) { - err(ts, z163, 0x003, 0, 0, Local0, c016) + err(ts, z163, __LINE__, 0, 0, Local0, c016) } CH03(ts, z163, 0x000, 0, 0) @@ -561,7 +561,7 @@ Method(in06,, Serialized) Store(ObjectType(i000), Local0) if (LNotEqual(Local0, c009)) { - err(ts, z163, 0x003, 0, 0, Local0, c009) + err(ts, z163, __LINE__, 0, 0, Local0, c009) } } diff --git a/tests/aslts/src/runtime/collections/Identity2MS/abbu/initial/ns_in10.asl b/tests/aslts/src/runtime/collections/Identity2MS/abbu/initial/ns_in10.asl index 0cf6a8385..053dd149c 100644 --- a/tests/aslts/src/runtime/collections/Identity2MS/abbu/initial/ns_in10.asl +++ b/tests/aslts/src/runtime/collections/Identity2MS/abbu/initial/ns_in10.asl @@ -65,14 +65,14 @@ Method(in10,, Serialized) { Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0xabcd0000)) { - err(ts, z164, 0x000, 0, 0, Local0, 0xabcd0000) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0000) } Store(0x11112222, Index(arg0, 0)) Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z164, 0x000, 0, 0, Local0, 0x11112222) + err(ts, z164, __LINE__, 0, 0, Local0, 0x11112222) } } @@ -80,12 +80,12 @@ Method(in10,, Serialized) Store(DerefOf(Index(p000, 0)), Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z164, 0x000, 0, 0, Local0, 0x11112222) + err(ts, z164, __LINE__, 0, 0, Local0, 0x11112222) } Store(DerefOf(Index(p000, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z164, 0x000, 0, 0, Local0, 0xabcd0001) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0001) } } @@ -103,14 +103,14 @@ Method(in11,, Serialized) Store(DerefOf(Index(Local7, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z164, 0x000, 0, 0, Local0, 0xabcd0001) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0001) } Store(0x33334444, Index(Local7, 1)) Store(DerefOf(Index(Local7, 1)), Local0) if (LNotEqual(Local0, 0x33334444)) { - err(ts, z164, 0x000, 0, 0, Local0, 0x33334444) + err(ts, z164, __LINE__, 0, 0, Local0, 0x33334444) } } @@ -118,12 +118,12 @@ Method(in11,, Serialized) Store(DerefOf(Index(p000, 0)), Local0) if (LNotEqual(Local0, 0xabcd0000)) { - err(ts, z164, 0x000, 0, 0, Local0, 0xabcd0000) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0000) } Store(DerefOf(Index(p000, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z164, 0x000, 0, 0, Local0, 0xabcd0001) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0001) } } @@ -142,7 +142,7 @@ Method(in12,, Serialized) Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z164, 0x000, 0, 0, Local0, 0x11112222) + err(ts, z164, __LINE__, 0, 0, Local0, 0x11112222) } Store(DerefOf(arg1), Local7) @@ -150,7 +150,7 @@ Method(in12,, Serialized) Store(DerefOf(Index(Local7, 1)), Local0) if (LNotEqual(Local0, 0x33334444)) { - err(ts, z164, 0x000, 0, 0, Local0, 0x33334444) + err(ts, z164, __LINE__, 0, 0, Local0, 0x33334444) } } @@ -158,12 +158,12 @@ Method(in12,, Serialized) Store(DerefOf(Index(p000, 0)), Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z164, 0x000, 0, 0, Local0, 0x11112222) + err(ts, z164, __LINE__, 0, 0, Local0, 0x11112222) } Store(DerefOf(Index(p000, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z164, 0x000, 0, 0, Local0, 0xabcd0001) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0001) } } @@ -183,14 +183,14 @@ Method(in13,, Serialized) Store(DerefOf(Index(Local7, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z164, 0x000, 0, 0, Local0, 0xabcd0001) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0001) } Store(0x33334444, Index(Local7, 1)) Store(DerefOf(Index(Local7, 1)), Local0) if (LNotEqual(Local0, 0x33334444)) { - err(ts, z164, 0x000, 0, 0, Local0, 0x33334444) + err(ts, z164, __LINE__, 0, 0, Local0, 0x33334444) } } @@ -198,15 +198,15 @@ Method(in13,, Serialized) Store(DerefOf(Index(p000, 0)), Local0) if (LNotEqual(Local0, 0xabcd0000)) { - err(ts, z164, 0x000, 0, 0, Local0, 0xabcd0000) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0000) } Store(DerefOf(Index(p000, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z164, 0x000, 0, 0, Local0, 0xabcd0001) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0001) } Store(DerefOf(Index(p000, 2)), Local0) if (LNotEqual(Local0, 0xabcd0002)) { - err(ts, z164, 0x000, 0, 0, Local0, 0xabcd0002) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0002) } } @@ -239,26 +239,26 @@ Method(in14,, Serialized) { Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0xabcd0000)) { - err(ts, z164, 0x000, 0, 0, Local0, 0xabcd0000) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0000) } Store(DerefOf(Index(arg0, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z164, 0x000, 0, 0, Local0, 0xabcd0001) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0001) } Store(DerefOf(Index(arg0, 2)), Local0) if (LNotEqual(Local0, 0xabcd0002)) { - err(ts, z164, 0x000, 0, 0, Local0, 0xabcd0002) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0002) } Store(DerefOf(Index(arg0, 3)), Local0) if (LNotEqual(Local0, "i000")) { - err(ts, z164, 0x000, 0, 0, Local0, "i000") + err(ts, z164, __LINE__, 0, 0, Local0, "i000") } Store(ii00, Index(arg0, 0)) Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z164, 0x000, 0, 0, Local0, 0x11112222) + err(ts, z164, __LINE__, 0, 0, Local0, 0x11112222) } } @@ -266,22 +266,22 @@ Method(in14,, Serialized) Store(DerefOf(Index(p000, 0)), Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z164, 0x000, 0, 0, Local0, 0x11112222) + err(ts, z164, __LINE__, 0, 0, Local0, 0x11112222) } Store(DerefOf(Index(p000, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z164, 0x000, 0, 0, Local0, 0xabcd0001) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0001) } Store(DerefOf(Index(p000, 2)), Local0) if (LNotEqual(Local0, 0xabcd0002)) { - err(ts, z164, 0x000, 0, 0, Local0, 0xabcd0002) + err(ts, z164, __LINE__, 0, 0, Local0, 0xabcd0002) } Store(DerefOf(Index(p000, 3)), Local0) if (LNotEqual(Local0, "i000")) { - err(ts, z164, 0x000, 0, 0, Local0, "i000") + err(ts, z164, __LINE__, 0, 0, Local0, "i000") } } @@ -341,14 +341,14 @@ Method(in16,, Serialized) // arg0 - b000 Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0x10)) { - err(ts, z164, 0x000, 0, 0, Local0, 0x10) + err(ts, z164, __LINE__, 0, 0, Local0, 0x10) } Store(0x67, Index(arg0, 0)) Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0x67)) { - err(ts, z164, 0x000, 0, 0, Local0, 0x67) + err(ts, z164, __LINE__, 0, 0, Local0, 0x67) } // arg1 - RefOf(b000) @@ -358,7 +358,7 @@ Method(in16,, Serialized) Store(DerefOf(Index(Local7, 1)), Local0) if (LNotEqual(Local0, 0x55)) { - err(ts, z164, 0x000, 0, 0, Local0, 0x55) + err(ts, z164, __LINE__, 0, 0, Local0, 0x55) } } @@ -366,17 +366,17 @@ Method(in16,, Serialized) Store(DerefOf(Index(b000, 0)), Local0) if (LNotEqual(Local0, 0x67)) { - err(ts, z164, 0x002, 0, 0, Local0, 0x67) + err(ts, z164, __LINE__, 0, 0, Local0, 0x67) } Store(DerefOf(Index(b000, 1)), Local0) if (LNotEqual(Local0, 0x11)) { - err(ts, z164, 0x002, 0, 0, Local0, 0x11) + err(ts, z164, __LINE__, 0, 0, Local0, 0x11) } Store(DerefOf(Index(b000, 2)), Local0) if (LNotEqual(Local0, 0x12)) { - err(ts, z164, 0x002, 0, 0, Local0, 0x12) + err(ts, z164, __LINE__, 0, 0, Local0, 0x12) } } @@ -411,13 +411,13 @@ Method(in17,, Serialized) Store(Add(DerefOf(Index(pp00, 1)), m001()), Local0) if (LNotEqual(Local0, 0x00c00042)) { - err(ts, z164, 0x00a, 0, 0, Local0, 0x00c00042) + err(ts, z164, __LINE__, 0, 0, Local0, 0x00c00042) } Store(DerefOf(Index(pp00, 1)), Local0) if (LNotEqual(Local0, 0x0010000b)) { - err(ts, z164, 0x00b, 0, 0, Local0, 0x0010000b) + err(ts, z164, __LINE__, 0, 0, Local0, 0x0010000b) } CH03(ts, z164, 0x00c, 0, 0) @@ -495,7 +495,7 @@ Method(in18, 1, Serialized) Store(Add(f001, m001()), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z164, 0x012, 0, 0, Local0, 0x87654321) + err(ts, z164, __LINE__, 0, 0, Local0, 0x87654321) } if (arg0) { @@ -505,7 +505,7 @@ Method(in18, 1, Serialized) } if (LNotEqual(f001, Local1)) { - err(ts, z164, 0x013, 0, 0, f001, Local1) + err(ts, z164, __LINE__, 0, 0, f001, Local1) } CH03(ts, z164, 0x014, 0, 0) @@ -577,7 +577,7 @@ Method(in19, 1, Serialized) Store(Add(bnk0, m001()), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z164, 0x016, 0, 0, Local0, 0x87654321) + err(ts, z164, __LINE__, 0, 0, Local0, 0x87654321) } if (arg0) { @@ -587,7 +587,7 @@ Method(in19, 1, Serialized) } if (LNotEqual(bnk0, Local1)) { - err(ts, z164, 0x017, 0, 0, bnk0, Local1) + err(ts, z164, __LINE__, 0, 0, bnk0, Local1) } CH03(ts, z164, 0x018, 0, 0) @@ -664,7 +664,7 @@ Method(in1a, 1, Serialized) */ if (LNotEqual(Local0, 0x87878787)) { - err(ts, z164, 0x01a, 0, 0, Local0, 0x87878787) + err(ts, z164, __LINE__, 0, 0, Local0, 0x87878787) } if (arg0) { @@ -674,7 +674,7 @@ Method(in1a, 1, Serialized) } if (LNotEqual(if00, Local1)) { - err(ts, z164, 0x01b, 0, 0, if00, Local1) + err(ts, z164, __LINE__, 0, 0, if00, Local1) } CH03(ts, z164, 0x01c, 0, 0) @@ -730,7 +730,7 @@ Method(in1b, 1, Serialized) Store(Add(DerefOf(Index(b000, 1)), m001()), Local0) if (LNotEqual(Local0, 0x1c)) { - err(ts, z164, 0x01e, 0, 0, Local0, 0x1c) + err(ts, z164, __LINE__, 0, 0, Local0, 0x1c) } Store(DerefOf(Index(b000, 1)), Local0) @@ -742,7 +742,7 @@ Method(in1b, 1, Serialized) } if (LNotEqual(Local0, Local1)) { - err(ts, z164, 0x01f, 0, 0, Local0, Local1) + err(ts, z164, __LINE__, 0, 0, Local0, Local1) } CH03(ts, z164, 0x020, 0, 0) @@ -811,7 +811,7 @@ Method(in1c, 1, Serialized) Store(m000(b000), Local0) if (LNotEqual(Local0, 0x1c)) { - err(ts, z164, 0x01e, 0, 0, Local0, 0x1c) + err(ts, z164, __LINE__, 0, 0, Local0, 0x1c) } Store(DerefOf(Index(b000, 1)), Local0) @@ -823,7 +823,7 @@ Method(in1c, 1, Serialized) } if (LNotEqual(Local0, Local1)) { - err(ts, z164, 0x01f, 0, 0, Local0, Local1) + err(ts, z164, __LINE__, 0, 0, Local0, Local1) } CH03(ts, z164, 0x020, 0, 0) @@ -879,13 +879,13 @@ Method(in1d,, Serialized) Store(Add(DerefOf(Index(pp00, 1)), m001()), Local0) if (LNotEqual(Local0, 0x07654321)) { - err(ts, z164, 0x007, 0, 0, Local0, 0x07654321) + err(ts, z164, __LINE__, 0, 0, Local0, 0x07654321) } Store(DerefOf(Index(pp00, 1)), Local0) if (LNotEqual(Local0, 0x07000000)) { - err(ts, z164, 0x008, 0, 0, Local0, 0x07000000) + err(ts, z164, __LINE__, 0, 0, Local0, 0x07000000) } CH03(ts, z164, 0x009, 0, 0) @@ -953,13 +953,13 @@ Method(in1e,, Serialized) Store(m000(pp00), Local0) if (LNotEqual(Local0, 0x07654321)) { - err(ts, z164, 0x007, 0, 0, Local0, 0x07654321) + err(ts, z164, __LINE__, 0, 0, Local0, 0x07654321) } Store(DerefOf(Index(pp00, 1)), Local0) if (LNotEqual(Local0, 0x07000000)) { - err(ts, z164, 0x008, 0, 0, Local0, 0x07000000) + err(ts, z164, __LINE__, 0, 0, Local0, 0x07000000) } CH03(ts, z164, 0x009, 0, 0) diff --git a/tests/aslts/src/runtime/collections/Identity2MS/abbu/initial/ns_in20.asl b/tests/aslts/src/runtime/collections/Identity2MS/abbu/initial/ns_in20.asl index d0474e71a..fba14e3a8 100644 --- a/tests/aslts/src/runtime/collections/Identity2MS/abbu/initial/ns_in20.asl +++ b/tests/aslts/src/runtime/collections/Identity2MS/abbu/initial/ns_in20.asl @@ -79,7 +79,7 @@ Method(in20, 1, Serialized) Store(m000(i000), Local0) if (LNotEqual(Local0, 0xabcd0003)) { - err(ts, z165, 0x001, 0, 0, Local0, 0xabcd0003) + err(ts, z165, __LINE__, 0, 0, Local0, 0xabcd0003) } } @@ -144,11 +144,11 @@ Method(in21, 1, Serialized) Store(Add(i000, m001(i000)), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z165, 0x003, 0, 0, Local0, 0x87654321) + err(ts, z165, __LINE__, 0, 0, Local0, 0x87654321) } if (LNotEqual(i000, 0x00000001)) { - err(ts, z165, 0x004, 0, 0, i000, 0x00000001) + err(ts, z165, __LINE__, 0, 0, i000, 0x00000001) } } @@ -185,11 +185,11 @@ Method(in22,, Serialized) Store(Add(i000, m000(i000)), Local0) if (LNotEqual(Local0, 0x00b0002d)) { - err(ts, z165, 0x006, 0, 0, Local0, 0x00b0002d) + err(ts, z165, __LINE__, 0, 0, Local0, 0x00b0002d) } if (LNotEqual(i000, 0x00100000)) { - err(ts, z165, 0x007, 0, 0, i000, 0x00100000) + err(ts, z165, __LINE__, 0, 0, i000, 0x00100000) } } @@ -252,11 +252,11 @@ Method(in23, 2, Serialized) Store(Add(arg1, m001(1)), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z165, 0x00f, 0, 0, Local0, 0x87654321) + err(ts, z165, __LINE__, 0, 0, Local0, 0x87654321) } if (LNotEqual(arg1, 1)) { - err(ts, z165, 0x010, 0, 0, arg1, 1) + err(ts, z165, __LINE__, 0, 0, arg1, 1) } CH03(ts, z165, 0x011, 0, 0) diff --git a/tests/aslts/src/runtime/collections/Identity2MS/abbu/initial/ns_in30.asl b/tests/aslts/src/runtime/collections/Identity2MS/abbu/initial/ns_in30.asl index 43217d349..d035ec771 100644 --- a/tests/aslts/src/runtime/collections/Identity2MS/abbu/initial/ns_in30.asl +++ b/tests/aslts/src/runtime/collections/Identity2MS/abbu/initial/ns_in30.asl @@ -62,14 +62,14 @@ Method(in30,, Serialized) { Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0xabcd0000)) { - err(ts, z166, 0x000, 0, 0, Local0, 0xabcd0000) + err(ts, z166, __LINE__, 0, 0, Local0, 0xabcd0000) } Store(0x11112222, Index(arg0, 0)) Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z166, 0x000, 0, 0, Local0, 0x11112222) + err(ts, z166, __LINE__, 0, 0, Local0, 0x11112222) } } m001(arg0, arg1) @@ -79,12 +79,12 @@ Method(in30,, Serialized) Store(DerefOf(Index(p000, 0)), Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z166, 0x000, 0, 0, Local0, 0x11112222) + err(ts, z166, __LINE__, 0, 0, Local0, 0x11112222) } Store(DerefOf(Index(p000, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z166, 0x000, 0, 0, Local0, 0xabcd0001) + err(ts, z166, __LINE__, 0, 0, Local0, 0xabcd0001) } } @@ -105,14 +105,14 @@ Method(in31,, Serialized) Store(DerefOf(Index(Local7, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z166, 0x000, 0, 0, Local0, 0xabcd0001) + err(ts, z166, __LINE__, 0, 0, Local0, 0xabcd0001) } Store(0x33334444, Index(Local7, 1)) Store(DerefOf(Index(Local7, 1)), Local0) if (LNotEqual(Local0, 0x33334444)) { - err(ts, z166, 0x000, 0, 0, Local0, 0x33334444) + err(ts, z166, __LINE__, 0, 0, Local0, 0x33334444) } } m001(arg0, arg1) @@ -122,12 +122,12 @@ Method(in31,, Serialized) Store(DerefOf(Index(p000, 0)), Local0) if (LNotEqual(Local0, 0xabcd0000)) { - err(ts, z166, 0x000, 0, 0, Local0, 0xabcd0000) + err(ts, z166, __LINE__, 0, 0, Local0, 0xabcd0000) } Store(DerefOf(Index(p000, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z166, 0x000, 0, 0, Local0, 0xabcd0001) + err(ts, z166, __LINE__, 0, 0, Local0, 0xabcd0001) } } @@ -149,7 +149,7 @@ Method(in32,, Serialized) Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z166, 0x000, 0, 0, Local0, 0x11112222) + err(ts, z166, __LINE__, 0, 0, Local0, 0x11112222) } Store(DerefOf(arg1), Local7) @@ -157,7 +157,7 @@ Method(in32,, Serialized) Store(DerefOf(Index(Local7, 1)), Local0) if (LNotEqual(Local0, 0x33334444)) { - err(ts, z166, 0x000, 0, 0, Local0, 0x33334444) + err(ts, z166, __LINE__, 0, 0, Local0, 0x33334444) } } m001(arg0, arg1) @@ -167,12 +167,12 @@ Method(in32,, Serialized) Store(DerefOf(Index(p000, 0)), Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z166, 0x000, 0, 0, Local0, 0x11112222) + err(ts, z166, __LINE__, 0, 0, Local0, 0x11112222) } Store(DerefOf(Index(p000, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z166, 0x000, 0, 0, Local0, 0xabcd0001) + err(ts, z166, __LINE__, 0, 0, Local0, 0xabcd0001) } } @@ -195,14 +195,14 @@ Method(in33,, Serialized) Store(DerefOf(Index(Local7, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z166, 0x000, 0, 0, Local0, 0xabcd0001) + err(ts, z166, __LINE__, 0, 0, Local0, 0xabcd0001) } Store(0x33334444, Index(Local7, 1)) Store(DerefOf(Index(Local7, 1)), Local0) if (LNotEqual(Local0, 0x33334444)) { - err(ts, z166, 0x000, 0, 0, Local0, 0x33334444) + err(ts, z166, __LINE__, 0, 0, Local0, 0x33334444) } } m001(arg0, arg1) @@ -212,15 +212,15 @@ Method(in33,, Serialized) Store(DerefOf(Index(p000, 0)), Local0) if (LNotEqual(Local0, 0xabcd0000)) { - err(ts, z166, 0x000, 0, 0, Local0, 0xabcd0000) + err(ts, z166, __LINE__, 0, 0, Local0, 0xabcd0000) } Store(DerefOf(Index(p000, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z166, 0x000, 0, 0, Local0, 0xabcd0001) + err(ts, z166, __LINE__, 0, 0, Local0, 0xabcd0001) } Store(DerefOf(Index(p000, 2)), Local0) if (LNotEqual(Local0, 0xabcd0002)) { - err(ts, z166, 0x000, 0, 0, Local0, 0xabcd0002) + err(ts, z166, __LINE__, 0, 0, Local0, 0xabcd0002) } } @@ -254,26 +254,26 @@ Method(in34,, Serialized) { Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0xabcd0000)) { - err(ts, z166, 0x000, 0, 0, Local0, 0xabcd0000) + err(ts, z166, __LINE__, 0, 0, Local0, 0xabcd0000) } Store(DerefOf(Index(arg0, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z166, 0x000, 0, 0, Local0, 0xabcd0001) + err(ts, z166, __LINE__, 0, 0, Local0, 0xabcd0001) } Store(DerefOf(Index(arg0, 2)), Local0) if (LNotEqual(Local0, 0xabcd0002)) { - err(ts, z166, 0x000, 0, 0, Local0, 0xabcd0002) + err(ts, z166, __LINE__, 0, 0, Local0, 0xabcd0002) } Store(DerefOf(Index(arg0, 3)), Local0) if (LNotEqual(Local0, "i000")) { - err(ts, z166, 0x000, 0, 0, Local0, "i000") + err(ts, z166, __LINE__, 0, 0, Local0, "i000") } Store(ii00, Index(arg0, 0)) Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z166, 0x000, 0, 0, Local0, 0x11112222) + err(ts, z166, __LINE__, 0, 0, Local0, 0x11112222) } } m001(arg0, arg1) @@ -283,22 +283,22 @@ Method(in34,, Serialized) Store(DerefOf(Index(p000, 0)), Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z166, 0x000, 0, 0, Local0, 0x11112222) + err(ts, z166, __LINE__, 0, 0, Local0, 0x11112222) } Store(DerefOf(Index(p000, 1)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z166, 0x000, 0, 0, Local0, 0xabcd0001) + err(ts, z166, __LINE__, 0, 0, Local0, 0xabcd0001) } Store(DerefOf(Index(p000, 2)), Local0) if (LNotEqual(Local0, 0xabcd0002)) { - err(ts, z166, 0x000, 0, 0, Local0, 0xabcd0002) + err(ts, z166, __LINE__, 0, 0, Local0, 0xabcd0002) } Store(DerefOf(Index(p000, 3)), Local0) if (LNotEqual(Local0, "i000")) { - err(ts, z166, 0x000, 0, 0, Local0, "i000") + err(ts, z166, __LINE__, 0, 0, Local0, "i000") } } @@ -318,14 +318,14 @@ Method(in36,, Serialized) // arg0 - b000 Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0x10)) { - err(ts, z166, 0x000, 0, 0, Local0, 0x10) + err(ts, z166, __LINE__, 0, 0, Local0, 0x10) } Store(0x67, Index(arg0, 0)) Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0x67)) { - err(ts, z166, 0x000, 0, 0, Local0, 0x67) + err(ts, z166, __LINE__, 0, 0, Local0, 0x67) } // arg1 - RefOf(b000) @@ -335,7 +335,7 @@ Method(in36,, Serialized) Store(DerefOf(Index(Local7, 1)), Local0) if (LNotEqual(Local0, 0x55)) { - err(ts, z166, 0x000, 0, 0, Local0, 0x55) + err(ts, z166, __LINE__, 0, 0, Local0, 0x55) } } m001(arg0, arg1) @@ -345,17 +345,17 @@ Method(in36,, Serialized) Store(DerefOf(Index(b000, 0)), Local0) if (LNotEqual(Local0, 0x67)) { - err(ts, z166, 0x002, 0, 0, Local0, 0x67) + err(ts, z166, __LINE__, 0, 0, Local0, 0x67) } Store(DerefOf(Index(b000, 1)), Local0) if (LNotEqual(Local0, 0x11)) { - err(ts, z166, 0x002, 0, 0, Local0, 0x11) + err(ts, z166, __LINE__, 0, 0, Local0, 0x11) } Store(DerefOf(Index(b000, 2)), Local0) if (LNotEqual(Local0, 0x12)) { - err(ts, z166, 0x002, 0, 0, Local0, 0x12) + err(ts, z166, __LINE__, 0, 0, Local0, 0x12) } } @@ -396,13 +396,13 @@ Method(in37,, Serialized) Store(m000(pp00), Local0) if (LNotEqual(Local0, 0x00a0002d)) { - err(ts, z166, 0x00a, 0, 0, Local0, 0x00a0002d) + err(ts, z166, __LINE__, 0, 0, Local0, 0x00a0002d) } Store(DerefOf(Index(pp00, 1)), Local0) if (LNotEqual(Local0, 0x00100009)) { - err(ts, z166, 0x00b, 0, 0, Local0, 0x00100009) + err(ts, z166, __LINE__, 0, 0, Local0, 0x00100009) } CH03(ts, z166, 0x00c, 0, 0) @@ -494,7 +494,7 @@ Method(in38, 1, Serialized) Store(m000(f001), Local0) if (LNotEqual(Local0, 0x07654321)) { - err(ts, z166, 0x012, 0, 0, Local0, 0x07654321) + err(ts, z166, __LINE__, 0, 0, Local0, 0x07654321) } if (arg0) { @@ -504,7 +504,7 @@ Method(in38, 1, Serialized) } if (LNotEqual(f001, Local1)) { - err(ts, z166, 0x013, 0, 0, f001, Local1) + err(ts, z166, __LINE__, 0, 0, f001, Local1) } CH03(ts, z166, 0x014, 0, 0) @@ -589,7 +589,7 @@ Method(in39, 1, Serialized) Store(m000(bnk0), Local0) if (LNotEqual(Local0, 0x07654321)) { - err(ts, z166, 0x016, 0, 0, Local0, 0x07654321) + err(ts, z166, __LINE__, 0, 0, Local0, 0x07654321) } if (arg0) { @@ -599,7 +599,7 @@ Method(in39, 1, Serialized) } if (LNotEqual(bnk0, Local1)) { - err(ts, z166, 0x017, 0, 0, bnk0, Local1) + err(ts, z166, __LINE__, 0, 0, bnk0, Local1) } CH03(ts, z166, 0x018, 0, 0) @@ -689,7 +689,7 @@ Method(in3a, 1, Serialized) */ if (LNotEqual(Local0, 0x07070707)) { - err(ts, z166, 0x01a, 0, 0, Local0, 0x07070707) + err(ts, z166, __LINE__, 0, 0, Local0, 0x07070707) } if (arg0) { @@ -699,7 +699,7 @@ Method(in3a, 1, Serialized) } if (LNotEqual(if00, Local1)) { - err(ts, z166, 0x01b, 0, 0, if00, Local1) + err(ts, z166, __LINE__, 0, 0, if00, Local1) } CH03(ts, z166, 0x01c, 0, 0) @@ -776,7 +776,7 @@ Method(in3c, 1, Serialized) Store(m000(b000), Local0) if (LNotEqual(Local0, 0x1c)) { - err(ts, z166, 0x01e, 0, 0, Local0, 0x1c) + err(ts, z166, __LINE__, 0, 0, Local0, 0x1c) } Store(DerefOf(Index(b000, 1)), Local0) @@ -788,7 +788,7 @@ Method(in3c, 1, Serialized) } if (LNotEqual(Local0, Local1)) { - err(ts, z166, 0x01f, 0, 0, Local0, Local1) + err(ts, z166, __LINE__, 0, 0, Local0, Local1) } CH03(ts, z166, 0x020, 0, 0) @@ -864,13 +864,13 @@ Method(in3e,, Serialized) Store(m000(pp00), Local0) if (LNotEqual(Local0, 0x07654321)) { - err(ts, z166, 0x007, 0, 0, Local0, 0x07654321) + err(ts, z166, __LINE__, 0, 0, Local0, 0x07654321) } Store(DerefOf(Index(pp00, 1)), Local0) if (LNotEqual(Local0, 0x07000000)) { - err(ts, z166, 0x008, 0, 0, Local0, 0x07000000) + err(ts, z166, __LINE__, 0, 0, Local0, 0x07000000) } CH03(ts, z166, 0x009, 0, 0) diff --git a/tests/aslts/src/runtime/collections/Identity2MS/abbu/initial/ns_in40.asl b/tests/aslts/src/runtime/collections/Identity2MS/abbu/initial/ns_in40.asl index 0090729cf..233196c3a 100644 --- a/tests/aslts/src/runtime/collections/Identity2MS/abbu/initial/ns_in40.asl +++ b/tests/aslts/src/runtime/collections/Identity2MS/abbu/initial/ns_in40.asl @@ -65,7 +65,7 @@ Method(obt0, 2) { Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, arg1)) { - err("obt0", z167, 0x000, 0, 0, Local0, arg1) + err("obt0", z167, __LINE__, 0, 0, Local0, arg1) } Return (5) } @@ -85,65 +85,65 @@ Method(act0, 4, Serialized) Case (0) { // ObjectType Store(ObjectType(arg1), Local0) if (LNotEqual(Local0, arg2)) { - err(ts, z167, 0x000, 0, 0, Local0, arg2) + err(ts, z167, __LINE__, 0, 0, Local0, arg2) } } Case (1) { // Add Add(arg1, arg2, Local0) if (LNotEqual(Local0, arg3)) { - err(ts, z167, 0x001, 0, 0, Local0, arg3) + err(ts, z167, __LINE__, 0, 0, Local0, arg3) } } Case (2) { // LNotEqual if (LNotEqual(arg1, 0xabcd0000)) { - err(ts, z167, 0x002, 0, 0, arg1, 0xabcd0000) + err(ts, z167, __LINE__, 0, 0, arg1, 0xabcd0000) } } Case (3) { // LNotEqual // if (chk0) { if (LNotEqual(arg1, "qwrtyu0003")) { - err(ts, z167, 0x003, 0, 0, arg1, "qwrtyu0003") + err(ts, z167, __LINE__, 0, 0, arg1, "qwrtyu0003") } // } } Case (4) { // LNotEqual // if (chk0) { if (LNotEqual(arg1, "abcd0800")) { - err(ts, z167, 0x004, 0, 0, arg1, "abcd0800") + err(ts, z167, __LINE__, 0, 0, arg1, "abcd0800") } // } } Case (5) { // LNotEqual // if (chk0) { if (LNotEqual(arg1, Buffer() {0xb0,0xb1,0xb2,0xb3,0xb4})) { - err(ts, z167, 0x005, 0, 0, arg1, Buffer() {0xb0,0xb1,0xb2,0xb3,0xb4}) + err(ts, z167, __LINE__, 0, 0, arg1, Buffer() {0xb0,0xb1,0xb2,0xb3,0xb4}) } // } } Case (6) { // LNotEqual Store(DerefOf(Index(arg1, 1)), Local0) if (LNotEqual(Local0, 0xabcd0902)) { - err(ts, z167, 0x006, 0, 0, Local0, 0xabcd0902) + err(ts, z167, __LINE__, 0, 0, Local0, 0xabcd0902) } } Case (7) { // LNotEqual if (LNotEqual(arg1, 0xabcd0a00)) { - err(ts, z167, 0x007, 0, 0, arg1, 0xabcd0a00) + err(ts, z167, __LINE__, 0, 0, arg1, 0xabcd0a00) } } Case (8) { // LNotEqual if (LNotEqual(arg1, 0xabababab)) { - err(ts, z167, 0x008, 0, 0, arg1, 0xabababab) + err(ts, z167, __LINE__, 0, 0, arg1, 0xabababab) } } Case (9) { // LNotEqual if (LNotEqual(arg1, 0)) { - err(ts, z167, 0x009, 0, 0, arg1, 0) + err(ts, z167, __LINE__, 0, 0, arg1, 0) } } Case (10) { // LNotEqual if (LNotEqual(arg1, 0xabcd0d08)) { - err(ts, z167, 0x00a, 0, 0, arg1, 0xabcd0d08) + err(ts, z167, __LINE__, 0, 0, arg1, 0xabcd0d08) } } } // Switch (arg0) @@ -170,14 +170,14 @@ Method(mI01, 1, Serialized) if (LEqual(cmd0, 1)) { // Integer Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, c009)) { - err("mI01", z167, 0x000, 0, 0, Local0, c009) + err("mI01", z167, __LINE__, 0, 0, Local0, c009) } Add(arg0, 1, Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err("mI01", z167, 0x001, 0, 0, Local0, 0xabcd0001) + err("mI01", z167, __LINE__, 0, 0, Local0, 0xabcd0001) } if (LNotEqual(arg0, 0xabcd0000)) { - err("mI01", z167, 0x007, 0, 0, arg0, 0xabcd0000) + err("mI01", z167, __LINE__, 0, 0, arg0, 0xabcd0000) } Return (arg0) @@ -186,12 +186,12 @@ Method(mI01, 1, Serialized) if (LEqual(cmd0, 2)) { // String Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, c00a)) { - err("mI01", z167, 0x000, 0, 0, Local0, c00a) + err("mI01", z167, __LINE__, 0, 0, Local0, c00a) } if (LNot(run4)) { // Run on ACPICA only if (LNotEqual(arg0, "qwrtyu0003")) { - err("mI01", z167, 0x007, 0, 0, arg0, "qwrtyu0003") + err("mI01", z167, __LINE__, 0, 0, arg0, "qwrtyu0003") } } Return (arg0) @@ -200,16 +200,16 @@ Method(mI01, 1, Serialized) if (LEqual(cmd0, 3)) { // String applicable to the Implicit Conversion Rules ("abcd0800") Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, c00a)) { - err("mI01", z167, 0x000, 0, 0, Local0, c00a) + err("mI01", z167, __LINE__, 0, 0, Local0, c00a) } if (LNot(run4)) { // Run on ACPICA only Add(arg0, 5, Local0) if (LNotEqual(Local0, 0xabcd0805)) { - err("mI01", z167, 0x001, 0, 0, Local0, 0xabcd0805) + err("mI01", z167, __LINE__, 0, 0, Local0, 0xabcd0805) } if (LNotEqual(arg0, "abcd0800")) { - err("mI01", z167, 0x007, 0, 0, arg0, "abcd0800") + err("mI01", z167, __LINE__, 0, 0, arg0, "abcd0800") } } @@ -219,16 +219,16 @@ Method(mI01, 1, Serialized) if (LEqual(cmd0, 4)) { // Buffer Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, c00b)) { - err("mI01", z167, 0x000, 0, 0, Local0, c00b) + err("mI01", z167, __LINE__, 0, 0, Local0, c00b) } if (LNot(run4)) { // Run on ACPICA only Add(arg0, 7, Local0) if (LNotEqual(Local0, 0xb4b3b2b1b7)) { - err("mI01", z167, 0x001, 0, 0, Local0, 0xb4b3b2b1b7) + err("mI01", z167, __LINE__, 0, 0, Local0, 0xb4b3b2b1b7) } if (LNotEqual(arg0, Buffer() {0xb0,0xb1,0xb2,0xb3,0xb4})) { - err("mI01", z167, 0x007, 0, 0, arg0, Buffer() {0xb0,0xb1,0xb2,0xb3,0xb4}) + err("mI01", z167, __LINE__, 0, 0, arg0, Buffer() {0xb0,0xb1,0xb2,0xb3,0xb4}) } } @@ -238,11 +238,11 @@ Method(mI01, 1, Serialized) if (LEqual(cmd0, 5)) { // Package Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, c00c)) { - err("mI01", z167, 0x000, 0, 0, Local0, c00c) + err("mI01", z167, __LINE__, 0, 0, Local0, c00c) } Store(DerefOf(Index(arg0, 1)), Local0) if (LNotEqual(Local0, 0xabcd0902)) { - err("mI01", z167, 0x006, 0, 0, Local0, 0xabcd0902) + err("mI01", z167, __LINE__, 0, 0, Local0, 0xabcd0902) } Return (arg0) } @@ -250,14 +250,14 @@ Method(mI01, 1, Serialized) if (LEqual(cmd0, 6)) { // Field Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, c009)) { - err("mI01", z167, 0x000, 0, 0, Local0, c009) + err("mI01", z167, __LINE__, 0, 0, Local0, c009) } Add(arg0, 9, Local0) if (LNotEqual(Local0, 0xabcd0a09)) { - err("mI01", z167, 0x001, 0, 0, Local0, 0xabcd0a09) + err("mI01", z167, __LINE__, 0, 0, Local0, 0xabcd0a09) } if (LNotEqual(arg0, 0xabcd0a00)) { - err("mI01", z167, 0x007, 0, 0, arg0, 0xabcd0a00) + err("mI01", z167, __LINE__, 0, 0, arg0, 0xabcd0a00) } Return (arg0) @@ -266,7 +266,7 @@ Method(mI01, 1, Serialized) if (LEqual(cmd0, 7)) { // Device Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, c00e)) { - err("mI01", z167, 0x000, 0, 0, Local0, c00e) + err("mI01", z167, __LINE__, 0, 0, Local0, c00e) } Return (arg0) } @@ -274,7 +274,7 @@ Method(mI01, 1, Serialized) if (LEqual(cmd0, 8)) { // Event Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, c00f)) { - err("mI01", z167, 0x000, 0, 0, Local0, c00f) + err("mI01", z167, __LINE__, 0, 0, Local0, c00f) } Return (arg0) } @@ -282,7 +282,7 @@ Method(mI01, 1, Serialized) if (LEqual(cmd0, 9)) { // Mutex Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, c011)) { - err("mI01", z167, 0x000, 0, 0, Local0, c011) + err("mI01", z167, __LINE__, 0, 0, Local0, c011) } Return (arg0) } @@ -290,7 +290,7 @@ Method(mI01, 1, Serialized) if (LEqual(cmd0, 10)) { // Operation Region Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, c012)) { - err("mI01", z167, 0x000, 0, 0, Local0, c012) + err("mI01", z167, __LINE__, 0, 0, Local0, c012) } Return (arg0) } @@ -298,7 +298,7 @@ Method(mI01, 1, Serialized) if (LEqual(cmd0, 11)) { // Power Resource Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, c013)) { - err("mI01", z167, 0x000, 0, 0, Local0, c013) + err("mI01", z167, __LINE__, 0, 0, Local0, c013) } Return (arg0) } @@ -306,7 +306,7 @@ Method(mI01, 1, Serialized) if (LEqual(cmd0, 12)) { // Processor Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, c014)) { - err("mI01", z167, 0x000, 0, 0, Local0, c014) + err("mI01", z167, __LINE__, 0, 0, Local0, c014) } Return (arg0) } @@ -314,7 +314,7 @@ Method(mI01, 1, Serialized) if (LEqual(cmd0, 13)) { // Thermal Zone Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, c015)) { - err("mI01", z167, 0x000, 0, 0, Local0, c015) + err("mI01", z167, __LINE__, 0, 0, Local0, c015) } Return (arg0) } @@ -322,14 +322,14 @@ Method(mI01, 1, Serialized) if (LEqual(cmd0, 14)) { // Index Field Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, c009)) { - err("mI01", z167, 0x000, 0, 0, Local0, c009) + err("mI01", z167, __LINE__, 0, 0, Local0, c009) } Add(arg0, 9, Local0) if (LNotEqual(Local0, 0xabababb4)) { - err("mI01", z167, 0x001, 0, 0, Local0, 0xabababb4) + err("mI01", z167, __LINE__, 0, 0, Local0, 0xabababb4) } if (LNotEqual(arg0, 0xabababab)) { - err("mI01", z167, 0x008, 0, 0, arg0, 0xabababab) + err("mI01", z167, __LINE__, 0, 0, arg0, 0xabababab) } Return (arg0) } @@ -337,14 +337,14 @@ Method(mI01, 1, Serialized) if (LEqual(cmd0, 15)) { // Bank Field Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, c009)) { - err("mI01", z167, 0x000, 0, 0, Local0, c009) + err("mI01", z167, __LINE__, 0, 0, Local0, c009) } Add(arg0, 9, Local0) if (LNotEqual(Local0, 9)) { - err("mI01", z167, 0x001, 0, 0, Local0, 9) + err("mI01", z167, __LINE__, 0, 0, Local0, 9) } if (LNotEqual(arg0, 0)) { - err("mI01", z167, 0x009, 0, 0, arg0, 0) + err("mI01", z167, __LINE__, 0, 0, arg0, 0) } Return (arg0) @@ -356,16 +356,16 @@ Method(mI01, 1, Serialized) Store(ObjectType(arg0), Local0) if (LAnd(LNotEqual(Local0, c009), LNotEqual(Local0, c00b))) { - err("mI01", z167, 0x000, 0, 0, Local0, c00b) + err("mI01", z167, __LINE__, 0, 0, Local0, c00b) } if (chk0) { Add(arg0, 2, Local0) if (LNotEqual(Local0, 0xabcd0d0a)) { - err("mI01", z167, 0x001, 0, 0, Local0, 0xabcd0d0a) + err("mI01", z167, __LINE__, 0, 0, Local0, 0xabcd0d0a) } if (LNotEqual(arg0, 0xabcd0d08)) { - err("mI01", z167, 0x00a, 0, 0, arg0, 0xabcd0d08) + err("mI01", z167, __LINE__, 0, 0, arg0, 0xabcd0d08) } } Return (arg0) diff --git a/tests/aslts/src/runtime/collections/Identity2MS/abbu/initial/ns_in50.asl b/tests/aslts/src/runtime/collections/Identity2MS/abbu/initial/ns_in50.asl index 9346231e6..a517ed7ea 100644 --- a/tests/aslts/src/runtime/collections/Identity2MS/abbu/initial/ns_in50.asl +++ b/tests/aslts/src/runtime/collections/Identity2MS/abbu/initial/ns_in50.asl @@ -398,256 +398,256 @@ Method(in51, 7, Serialized) if (LNotEqual(Local0, 0x0006000C)) { - err(ts, z168, 0x000, 0, 0, Local0, 0x0006000C) + err(ts, z168, __LINE__, 0, 0, Local0, 0x0006000C) } if (LNotEqual(Local1, 0x0018002A)) { - err(ts, z168, 0x001, 0, 0, Local1, 0x0018002A) + err(ts, z168, __LINE__, 0, 0, Local1, 0x0018002A) } if (LNotEqual(Local2, 0x006000A6)) { - err(ts, z168, 0x002, 0, 0, Local2, 0x006000A6) + err(ts, z168, __LINE__, 0, 0, Local2, 0x006000A6) } if (LNotEqual(arg0, 0x001E0036)) { - err(ts, z168, 0x003, 0, 0, arg0, 0x001E0036) + err(ts, z168, __LINE__, 0, 0, arg0, 0x001E0036) } if (LNotEqual(arg1, 0x007E00DC)) { - err(ts, z168, 0x004, 0, 0, arg1, 0x007E00DC) + err(ts, z168, __LINE__, 0, 0, arg1, 0x007E00DC) } if (LNotEqual(ii00, 0x00000006)) { - err(ts, z168, 0x005, 0, 0, ii00, 0x00000006) + err(ts, z168, __LINE__, 0, 0, ii00, 0x00000006) } if (LNotEqual(Local3, 0x00076976)) { - err(ts, z168, 0x006, 0, 0, Local3, 0x00076976) + err(ts, z168, __LINE__, 0, 0, Local3, 0x00076976) } if (LNotEqual(ii01, 0x003B4BB0)) { - err(ts, z168, 0x007, 0, 0, ii01, 0x003B4BB0) + err(ts, z168, __LINE__, 0, 0, ii01, 0x003B4BB0) } if (LNotEqual(arg2, 0x00769760)) { - err(ts, z168, 0x008, 0, 0, arg2, 0x00769760) + err(ts, z168, __LINE__, 0, 0, arg2, 0x00769760) } if (LNotEqual(Local5, 0x1F710810)) { - err(ts, z168, 0x009, 0, 0, Local5, 0x1F710810) + err(ts, z168, __LINE__, 0, 0, Local5, 0x1F710810) } if (LNotEqual(ii02, 0x03EE2102)) { - err(ts, z168, 0x00a, 0, 0, ii02, 0x03EE2102) + err(ts, z168, __LINE__, 0, 0, ii02, 0x03EE2102) } if (LNotEqual(Local6, 0x034E2102)) { - err(ts, z168, 0x00b, 0, 0, Local6, 0x034E2102) + err(ts, z168, __LINE__, 0, 0, Local6, 0x034E2102) } if (LNotEqual(ii03, 0x00000007)) { - err(ts, z168, 0x00c, 0, 0, ii03, 0x00000007) + err(ts, z168, __LINE__, 0, 0, ii03, 0x00000007) } if (LNotEqual(ii04, 0x034E2109)) { - err(ts, z168, 0x00d, 0, 0, ii04, 0x034E2109) + err(ts, z168, __LINE__, 0, 0, ii04, 0x034E2109) } if (LNotEqual(ii05, 0x0000001F)) { - err(ts, z168, 0x00e, 0, 0, ii05, 0x0000001F) + err(ts, z168, __LINE__, 0, 0, ii05, 0x0000001F) } if (LNotEqual(arg3, 0x034E2128)) { - err(ts, z168, 0x00f, 0, 0, arg3, 0x034E2128) + err(ts, z168, __LINE__, 0, 0, arg3, 0x034E2128) } if (LNotEqual(ii06, 0x00000011)) { - err(ts, z168, 0x010, 0, 0, ii06, 0x00000011) + err(ts, z168, __LINE__, 0, 0, ii06, 0x00000011) } if (LNotEqual(arg4, 0x034E2139)) { - err(ts, z168, 0x011, 0, 0, arg4, 0x034E2139) + err(ts, z168, __LINE__, 0, 0, arg4, 0x034E2139) } if (LNotEqual(arg5, 0x12FAB246)) { - err(ts, z168, 0x012, 0, 0, arg5, 0x12FAB246) + err(ts, z168, __LINE__, 0, 0, arg5, 0x12FAB246) } if (LNotEqual(ii07, 0xFFFFFFFF01543726)) { - err(ts, z168, 0x013, 0, 0, ii07, 0xFFFFFFFF01543726) + err(ts, z168, __LINE__, 0, 0, ii07, 0xFFFFFFFF01543726) } if (LNotEqual(arg6, 0xFFFFFFFF144EE96C)) { - err(ts, z168, 0x014, 0, 0, arg6, 0xFFFFFFFF144EE96C) + err(ts, z168, __LINE__, 0, 0, arg6, 0xFFFFFFFF144EE96C) } if (LNotEqual(ii08, 0xFFFFFFFF050B0301)) { - err(ts, z168, 0x015, 0, 0, ii08, 0xFFFFFFFF050B0301) + err(ts, z168, __LINE__, 0, 0, ii08, 0xFFFFFFFF050B0301) } if (LNotEqual(Local7, 0xFFFFFFFE1959EC6D)) { - err(ts, z168, 0x016, 0, 0, Local7, 0xFFFFFFFE1959EC6D) + err(ts, z168, __LINE__, 0, 0, Local7, 0xFFFFFFFE1959EC6D) } if (LNotEqual(ii09, 0xFFFFFFFF01FB4321)) { - err(ts, z168, 0x017, 0, 0, ii09, 0xFFFFFFFF01FB4321) + err(ts, z168, __LINE__, 0, 0, ii09, 0xFFFFFFFF01FB4321) } if (LNotEqual(ii0a, 0xFFFFFFFD1B552F8E)) { - err(ts, z168, 0x018, 0, 0, ii0a, 0xFFFFFFFD1B552F8E) + err(ts, z168, __LINE__, 0, 0, ii0a, 0xFFFFFFFD1B552F8E) } if (LNotEqual(ii0b, 0x1B552F8E)) { - err(ts, z168, 0x019, 0, 0, ii0b, 0x1B552F8E) + err(ts, z168, __LINE__, 0, 0, ii0b, 0x1B552F8E) } if (LNotEqual(ii0c, 0x00769760)) { - err(ts, z168, 0x01a, 0, 0, ii0c, 0x00769760) + err(ts, z168, __LINE__, 0, 0, ii0c, 0x00769760) } if (LNotEqual(ii0d, 0x20769760)) { - err(ts, z168, 0x01b, 0, 0, ii0d, 0x20769760) + err(ts, z168, __LINE__, 0, 0, ii0d, 0x20769760) } if (LNotEqual(ii0e, 0)) { - err(ts, z168, 0x01c, 0, 0, ii0e, 0) + err(ts, z168, __LINE__, 0, 0, ii0e, 0) } if (LNotEqual(ii0f, 0xFFFFFFFFFFFFFFFF)) { - err(ts, z168, 0x01d, 0, 0, ii0f, 0xFFFFFFFFFFFFFFFF) + err(ts, z168, __LINE__, 0, 0, ii0f, 0xFFFFFFFFFFFFFFFF) } if (LNotEqual(Local4, 0x052167D2)) { - err(ts, z168, 0x01e, 0, 0, Local4, 0x052167D2) + err(ts, z168, __LINE__, 0, 0, Local4, 0x052167D2) } if (LNotEqual(ii10, 0x052167D1)) { - err(ts, z168, 0x01f, 0, 0, ii10, 0x052167D1) + err(ts, z168, __LINE__, 0, 0, ii10, 0x052167D1) } if (LNotEqual(ii11, 0)) { - err(ts, z168, 0x020, 0, 0, ii11, 0) + err(ts, z168, __LINE__, 0, 0, ii11, 0) } if (LNotEqual(ii12, 0xFFFFFFFFFFFFFFFF)) { - err(ts, z168, 0x021, 0, 0, ii12, 0xFFFFFFFFFFFFFFFF) + err(ts, z168, __LINE__, 0, 0, ii12, 0xFFFFFFFFFFFFFFFF) } if (LNotEqual(ii13, 0x00000000052167D1)) { - err(ts, z168, 0x022, 0, 0, ii13, 0x00000000052167D1) + err(ts, z168, __LINE__, 0, 0, ii13, 0x00000000052167D1) } if (LNotEqual(ii14, 0xFFFFFFFFFFFFFFFF)) { - err(ts, z168, 0x023, 0, 0, ii14, 0xFFFFFFFFFFFFFFFF) + err(ts, z168, __LINE__, 0, 0, ii14, 0xFFFFFFFFFFFFFFFF) } if (LNotEqual(ii15, 0)) { - err(ts, z168, 0x024, 0, 0, ii15, 0) + err(ts, z168, __LINE__, 0, 0, ii15, 0) } if (LNotEqual(ii16, 0xFFFFFFFFFFFFFFFF)) { - err(ts, z168, 0x025, 0, 0, ii16, 0xFFFFFFFFFFFFFFFF) + err(ts, z168, __LINE__, 0, 0, ii16, 0xFFFFFFFFFFFFFFFF) } if (LNotEqual(ii17, 0)) { - err(ts, z168, 0x026, 0, 0, ii17, 0) + err(ts, z168, __LINE__, 0, 0, ii17, 0) } if (LNotEqual(ii18, 0x052167D1)) { - err(ts, z168, 0x027, 0, 0, ii18, 0x052167D1) + err(ts, z168, __LINE__, 0, 0, ii18, 0x052167D1) } if (LNotEqual(ii19, 0xFFFFFFFFFFFFFFFF)) { - err(ts, z168, 0x028, 0, 0, ii19, 0xFFFFFFFFFFFFFFFF) + err(ts, z168, __LINE__, 0, 0, ii19, 0xFFFFFFFFFFFFFFFF) } if (LNotEqual(ii1a, 0)) { - err(ts, z168, 0x029, 0, 0, ii1a, 0) + err(ts, z168, __LINE__, 0, 0, ii1a, 0) } if (LNotEqual(ii1b, 0xFFFFFFFFFFFFFFFF)) { - err(ts, z168, 0x02a, 0, 0, ii1c, 0xFFFFFFFFFFFFFFFF) + err(ts, z168, __LINE__, 0, 0, ii1c, 0xFFFFFFFFFFFFFFFF) } if (LNotEqual(ii1c, 0x052167D0)) { - err(ts, z168, 0x02b, 0, 0, ii1d, 0x052167D0) + err(ts, z168, __LINE__, 0, 0, ii1d, 0x052167D0) } if (LNotEqual(ii1d, 0)) { - err(ts, z168, 0x02c, 0, 0, ii1d, 0) + err(ts, z168, __LINE__, 0, 0, ii1d, 0) } if (LNotEqual(ii1e, 0)) { - err(ts, z168, 0x02d, 0, 0, ii1e, 0) + err(ts, z168, __LINE__, 0, 0, ii1e, 0) } if (LNotEqual(ii1f, 0)) { - err(ts, z168, 0x02e, 0, 0, ii1f, 0) + err(ts, z168, __LINE__, 0, 0, ii1f, 0) } if (LNotEqual(ii20, 0xFFFFFFFFFFFFFFFF)) { - err(ts, z168, 0x02f, 0, 0, ii20, 0xFFFFFFFFFFFFFFFF) + err(ts, z168, __LINE__, 0, 0, ii20, 0xFFFFFFFFFFFFFFFF) } if (LNotEqual(ii21, 0xFFFFFFFFFFFFFFFF)) { - err(ts, z168, 0x30, 0, 0, ii21, 0xFFFFFFFFFFFFFFFF) + err(ts, z168, __LINE__, 0, 0, ii21, 0xFFFFFFFFFFFFFFFF) } if (LNotEqual(ii22, 0xFFFFFFFFFFFFFFFE)) { - err(ts, z168, 0x031, 0, 0, ii22, 0xFFFFFFFFFFFFFFFE) + err(ts, z168, __LINE__, 0, 0, ii22, 0xFFFFFFFFFFFFFFFE) } if (LNotEqual(ii23, 0xFFFFFFFFFFFFFFFE)) { - err(ts, z168, 0x032, 0, 0, ii23, 0xFFFFFFFFFFFFFFFE) + err(ts, z168, __LINE__, 0, 0, ii23, 0xFFFFFFFFFFFFFFFE) } if (LNotEqual(ii24, 0x052167CE)) { - err(ts, z168, 0x033, 0, 0, ii24, 0x052167CE) + err(ts, z168, __LINE__, 0, 0, ii24, 0x052167CE) } if (LNotEqual(ii25, 0xFFFFFFFFFFFFFFFF)) { - err(ts, z168, 0x034, 0, 0, ii25, 0xFFFFFFFFFFFFFFFF) + err(ts, z168, __LINE__, 0, 0, ii25, 0xFFFFFFFFFFFFFFFF) } if (LNotEqual(ii26, 0)) { - err(ts, z168, 0x035, 0, 0, ii26, 0) + err(ts, z168, __LINE__, 0, 0, ii26, 0) } if (LNotEqual(ii27, 0xFFFFFFFFFFFFFFFF)) { - err(ts, z168, 0x036, 0, 0, ii27, 0xFFFFFFFFFFFFFFFF) + err(ts, z168, __LINE__, 0, 0, ii27, 0xFFFFFFFFFFFFFFFF) } if (LNotEqual(ii28, 0xFFFFFFFFFFFFFFFF)) { - err(ts, z168, 0x037, 0, 0, ii28, 0xFFFFFFFFFFFFFFFF) + err(ts, z168, __LINE__, 0, 0, ii28, 0xFFFFFFFFFFFFFFFF) } if (LNotEqual(ii29, 0xFFFFFFFFFFFFFFFF)) { - err(ts, z168, 0x038, 0, 0, ii29, 0xFFFFFFFFFFFFFFFF) + err(ts, z168, __LINE__, 0, 0, ii29, 0xFFFFFFFFFFFFFFFF) } if (LNotEqual(ii2a, 0xFFFFFFFFFFFFFFFE)) { - err(ts, z168, 0x039, 0, 0, ii2a, 0xFFFFFFFFFFFFFFFE) + err(ts, z168, __LINE__, 0, 0, ii2a, 0xFFFFFFFFFFFFFFFE) } if (LNotEqual(ii2b, 0xFFFFFFFFFFFFFFFD)) { - err(ts, z168, 0x03a, 0, 0, ii2b, 0xFFFFFFFFFFFFFFFD) + err(ts, z168, __LINE__, 0, 0, ii2b, 0xFFFFFFFFFFFFFFFD) } if (LNotEqual(ii2c, 0x052167CB)) { - err(ts, z168, 0x03b, 0, 0, ii2c, 0x052167CB) + err(ts, z168, __LINE__, 0, 0, ii2c, 0x052167CB) } if (LNotEqual(ii2d, 0)) { - err(ts, z168, 0x03c, 0, 0, ii2d, 0) + err(ts, z168, __LINE__, 0, 0, ii2d, 0) } if (LNotEqual(ii2e, 0xFFFFFFFFFFFFFFFF)) { - err(ts, z168, 0x03d, 0, 0, ii2e, 0xFFFFFFFFFFFFFFFF) + err(ts, z168, __LINE__, 0, 0, ii2e, 0xFFFFFFFFFFFFFFFF) } if (LNotEqual(ii2f, 0xFFFFFFFFFFFFFFFF)) { - err(ts, z168, 0x03e, 0, 0, ii2f, 0xFFFFFFFFFFFFFFFF) + err(ts, z168, __LINE__, 0, 0, ii2f, 0xFFFFFFFFFFFFFFFF) } if (LNotEqual(ii30, 0)) { - err(ts, z168, 0x03f, 0, 0, ii30, 0) + err(ts, z168, __LINE__, 0, 0, ii30, 0) } if (LNotEqual(ii31, 0)) { - err(ts, z168, 0x040, 0, 0, ii31, 0) + err(ts, z168, __LINE__, 0, 0, ii31, 0) } if (LNotEqual(ii32, 0)) { - err(ts, z168, 0x041, 0, 0, ii32, 0) + err(ts, z168, __LINE__, 0, 0, ii32, 0) } if (LNotEqual(ii33, 0xFFFFFFFFFFFFFFFF)) { - err(ts, z168, 0x042, 0, 0, ii33, 0xFFFFFFFFFFFFFFFF) + err(ts, z168, __LINE__, 0, 0, ii33, 0xFFFFFFFFFFFFFFFF) } if (LNotEqual(ii34, 0x052167CA)) { - err(ts, z168, 0x043, 0, 0, ii34, 0x052167CA) + err(ts, z168, __LINE__, 0, 0, ii34, 0x052167CA) } if (LNotEqual(ii35, 0xFFFFFFFFFFFFFFFF)) { - err(ts, z168, 0x044, 0, 0, ii35, 0xFFFFFFFFFFFFFFFF) + err(ts, z168, __LINE__, 0, 0, ii35, 0xFFFFFFFFFFFFFFFF) } if (LNotEqual(ii36, 0xFFFFFFFFFFFFFFFF)) { - err(ts, z168, 0x045, 0, 0, ii36, 0xFFFFFFFFFFFFFFFF) + err(ts, z168, __LINE__, 0, 0, ii36, 0xFFFFFFFFFFFFFFFF) } if (LNotEqual(ii37, 0xFFFFFFFFFFFFFFFE)) { - err(ts, z168, 0x046, 0, 0, ii37, 0xFFFFFFFFFFFFFFFE) + err(ts, z168, __LINE__, 0, 0, ii37, 0xFFFFFFFFFFFFFFFE) } if (LNotEqual(ii38, 0)) { - err(ts, z168, 0x047, 0, 0, ii38, 0) + err(ts, z168, __LINE__, 0, 0, ii38, 0) } if (LNotEqual(ii39, 0)) { - err(ts, z168, 0x048, 0, 0, ii39, 0) + err(ts, z168, __LINE__, 0, 0, ii39, 0) } if (LNotEqual(ii3a, 0)) { - err(ts, z168, 0x049, 0, 0, ii3a, 0) + err(ts, z168, __LINE__, 0, 0, ii3a, 0) } if (LNotEqual(ii3b, 0xFFFFFFFFFFFFFFFE)) { - err(ts, z168, 0x04a, 0, 0, ii3b, 0xFFFFFFFFFFFFFFFE) + err(ts, z168, __LINE__, 0, 0, ii3b, 0xFFFFFFFFFFFFFFFE) } if (LNotEqual(ii3c, 0x052167C8)) { - err(ts, z168, 0x04b, 0, 0, ii3c, 0x052167C8) + err(ts, z168, __LINE__, 0, 0, ii3c, 0x052167C8) } if (LNotEqual(ii3d, 0)) { - err(ts, z168, 0x04c, 0, 0, ii3d, 0) + err(ts, z168, __LINE__, 0, 0, ii3d, 0) } if (LNotEqual(ii3e, 0xFFFFFFFFFFFFFFFF)) { - err(ts, z168, 0x04d, 0, 0, ii3e, 0xFFFFFFFFFFFFFFFF) + err(ts, z168, __LINE__, 0, 0, ii3e, 0xFFFFFFFFFFFFFFFF) } if (LNotEqual(ii3f, 0xFFFFFFFFFFFFFFFF)) { - err(ts, z168, 0x04e, 0, 0, ii3f, 0xFFFFFFFFFFFFFFFF) + err(ts, z168, __LINE__, 0, 0, ii3f, 0xFFFFFFFFFFFFFFFF) } if (LNotEqual(ii40, 0xFFFFFFFFFFFFFFFF)) { - err(ts, z168, 0x04f, 0, 0, ii40, 0xFFFFFFFFFFFFFFFF) + err(ts, z168, __LINE__, 0, 0, ii40, 0xFFFFFFFFFFFFFFFF) } if (LNotEqual(ii41, 0xFFFFFFFFFFFFFFFF)) { - err(ts, z168, 0x050, 0, 0, ii41, 0xFFFFFFFFFFFFFFFF) + err(ts, z168, __LINE__, 0, 0, ii41, 0xFFFFFFFFFFFFFFFF) } if (LNotEqual(ii42, 0xFFFFFFFFFFFFFFFE)) { - err(ts, z168, 0x051, 0, 0, ii42, 0xFFFFFFFFFFFFFFFE) + err(ts, z168, __LINE__, 0, 0, ii42, 0xFFFFFFFFFFFFFFFE) } if (LNotEqual(ii43, 0xFFFFFFFFFFFFFFFD)) { - err(ts, z168, 0x052, 0, 0, ii43, 0xFFFFFFFFFFFFFFFD) + err(ts, z168, __LINE__, 0, 0, ii43, 0xFFFFFFFFFFFFFFFD) } if (LNotEqual(ii44, 0x052167C5)) { - err(ts, z168, 0x053, 0, 0, ii44, 0x052167C5) + err(ts, z168, __LINE__, 0, 0, ii44, 0x052167C5) } } diff --git a/tests/aslts/src/runtime/collections/Identity2MS/abbu/method/mt0_abbu.asl b/tests/aslts/src/runtime/collections/Identity2MS/abbu/method/mt0_abbu.asl index 787ebf552..f2fce876c 100644 --- a/tests/aslts/src/runtime/collections/Identity2MS/abbu/method/mt0_abbu.asl +++ b/tests/aslts/src/runtime/collections/Identity2MS/abbu/method/mt0_abbu.asl @@ -103,7 +103,7 @@ Method(mt00,, Serialized) mm00() if (LNotEqual(i000, 0xabcd0000)) { - err(ts, z169, 0x000, 0, 0, i000, 0xabcd0000) + err(ts, z169, __LINE__, 0, 0, i000, 0xabcd0000) } CH03(ts, z169, 0x101, 0, 0) @@ -254,7 +254,7 @@ Method(mt01,, Serialized) mm00() if (LNotEqual(i000, 0xabcd0000)) { - err(ts, z169, 0x001, 0, 0, i000, 0xabcd0000) + err(ts, z169, __LINE__, 0, 0, i000, 0xabcd0000) } CH03(ts, z169, 0x103, 0, 0) @@ -340,7 +340,7 @@ Method(mt02,, Serialized) mm00() if (LNotEqual(i000, 0xabcd0000)) { - err(ts, z169, 0x002, 0, 0, i000, 0xabcd0000) + err(ts, z169, __LINE__, 0, 0, i000, 0xabcd0000) } CH03(ts, z169, 0x105, 0, 0) @@ -491,7 +491,7 @@ Method(mt03,, Serialized) mm00() if (LNotEqual(i000, 0xabcd0000)) { - err(ts, z169, 0x003, 0, 0, i000, 0xabcd0000) + err(ts, z169, __LINE__, 0, 0, i000, 0xabcd0000) } CH03(ts, z169, 0x107, 0, 0) @@ -530,10 +530,10 @@ Method(mt04,, Serialized) OUTC("mt04, \\_SB_.ABBU.mt04.dz05.iy07:") OUTC(Local0) if (LNotEqual(Local0, 0xabcd0909)) { - err(ts, z169, 0x004, 0, 0, Local0, 0xabcd0909) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd0909) } if (LNotEqual(\_SB_.ABBU.mt04.dz05.iy07, 0xabcd0909)) { - err(ts, z169, 0x005, 0, 0, \_SB_.ABBU.mt04.dz05.iy07, 0xabcd0909) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt04.dz05.iy07, 0xabcd0909) } } Increment(\_SB_.ABBU.mt04.dz05.iy07) @@ -564,7 +564,7 @@ Method(mt04,, Serialized) mm00() if (LNotEqual(\_SB_.ABBU.mt04.dz05.iy07, 0xabcd0909)) { - err(ts, z169, 0x007, 0, 0, \_SB_.ABBU.mt04.dz05.iy07, 0xabcd0909) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt04.dz05.iy07, 0xabcd0909) } CH03(ts, z169, 0x008, 0, 0) @@ -651,10 +651,10 @@ Method(mt05,, Serialized) OUTC("mt05, \\_SB_.ABBU.mt05.dz05.iy07:") OUTC(Local0) if (LNotEqual(Local0, 0xabcd0921)) { - err(ts, z169, 0x009, 0, 0, Local0, 0xabcd0921) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd0921) } if (LNotEqual(\_SB_.ABBU.mt05.dz05.iy07, 0xabcd0921)) { - err(ts, z169, 0x00a, 0, 0, \_SB_.ABBU.mt05.dz05.iy07, 0xabcd0921) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt05.dz05.iy07, 0xabcd0921) } } Increment(\_SB_.ABBU.mt05.dz05.iy07) @@ -757,7 +757,7 @@ Method(mt05,, Serialized) mm00() if (LNotEqual(\_SB_.ABBU.mt05.dz05.iy07, 0xabcd0909)) { - err(ts, z169, 0x00b, 0, 0, \_SB_.ABBU.mt05.dz05.iy07, 0xabcd0909) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt05.dz05.iy07, 0xabcd0909) } CH03(ts, z169, 0x109, 0, 0) @@ -816,10 +816,10 @@ Method(mt06,, Serialized) OUTC("mt06, \\_SB_.ABBU.mt06.dz05.iy07:") OUTC(Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z169, 0x00c, 0, 0, Local0, 0x11112222) + err(ts, z169, __LINE__, 0, 0, Local0, 0x11112222) } if (LNotEqual(\_SB_.ABBU.mt06.dz05.iy07, 0x11112222)) { - err(ts, z169, 0x00d, 0, 0, \_SB_.ABBU.mt06.dz05.iy07, 0x11112222) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt06.dz05.iy07, 0x11112222) } } mm04() @@ -838,7 +838,7 @@ Method(mt06,, Serialized) mt07() // succeeds here if (LNotEqual(\_SB_.ABBU.mt06.dz05.iy07, 0x11112222)) { - err(ts, z169, 0x00e, 0, 0, \_SB_.ABBU.mt06.dz05.iy07, 0x11112222) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt06.dz05.iy07, 0x11112222) } CH03(ts, z169, 0x10b, 0, 0) @@ -875,10 +875,10 @@ Method(mt07,, Serialized) OUTC("0 mt07, \\_SB_.ABBU.mt06.dz05.iy07:") OUTC(Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z169, 0x00f, 0, 0, Local0, 0x11112222) + err(ts, z169, __LINE__, 0, 0, Local0, 0x11112222) } if (LNotEqual(\_SB_.ABBU.mt06.dz05.iy07, 0x11112222)) { - err(ts, z169, 0x010, 0, 0, \_SB_.ABBU.mt06.dz05.iy07, 0x11112222) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt06.dz05.iy07, 0x11112222) } } mm07() @@ -904,10 +904,10 @@ Method(mt07,, Serialized) OUTC("1 mt07, \\_SB_.ABBU.mt06.dz05.iy07:") OUTC(Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z169, 0x011, 0, 0, Local0, 0x11112222) + err(ts, z169, __LINE__, 0, 0, Local0, 0x11112222) } if (LNotEqual(\_SB_.ABBU.mt06.dz05.iy07, 0x11112222)) { - err(ts, z169, 0x012, 0, 0, \_SB_.ABBU.mt06.dz05.iy07, 0x11112222) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt06.dz05.iy07, 0x11112222) } CH03(ts, z169, 0x10d, 0, 0) @@ -979,10 +979,10 @@ Method(mt08,, Serialized) OUTC("mt08, \\_SB_.ABBU.mt08.dz05.iy07:") OUTC(Local0) if (LNotEqual(Local0, 0x22223333)) { - err(ts, z169, 0x013, 0, 0, Local0, 0x22223333) + err(ts, z169, __LINE__, 0, 0, Local0, 0x22223333) } if (LNotEqual(\_SB_.ABBU.mt08.dz05.iy07, 0x22223333)) { - err(ts, z169, 0x014, 0, 0, \_SB_.ABBU.mt08.dz05.iy07, 0x22223333) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt08.dz05.iy07, 0x22223333) } } mm07() @@ -1007,7 +1007,7 @@ Method(mt08,, Serialized) mt09() // succeeds here if (LNotEqual(\_SB_.ABBU.mt08.dz05.iy07, 0x22223333)) { - err(ts, z169, 0x015, 0, 0, \_SB_.ABBU.mt08.dz05.iy07, 0x22223333) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt08.dz05.iy07, 0x22223333) } CH03(ts, z169, 0x10f, 0, 0) @@ -1058,10 +1058,10 @@ Method(mt09,, Serialized) OUTC("0 mt09, \\_SB_.ABBU.mt08.dz05.iy07:") OUTC(Local0) if (LNotEqual(Local0, 0x22223333)) { - err(ts, z169, 0x016, 0, 0, Local0, 0x22223333) + err(ts, z169, __LINE__, 0, 0, Local0, 0x22223333) } if (LNotEqual(\_SB_.ABBU.mt08.dz05.iy07, 0x22223333)) { - err(ts, z169, 0x017, 0, 0, \_SB_.ABBU.mt08.dz05.iy07, 0x22223333) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt08.dz05.iy07, 0x22223333) } } mm0f() @@ -1103,10 +1103,10 @@ Method(mt09,, Serialized) OUTC("1 mt09, \\_SB_.ABBU.mt08.dz05.iy07:") OUTC(Local0) if (LNotEqual(Local0, 0x22223333)) { - err(ts, z169, 0x018, 0, 0, Local0, 0x22223333) + err(ts, z169, __LINE__, 0, 0, Local0, 0x22223333) } if (LNotEqual(\_SB_.ABBU.mt08.dz05.iy07, 0x22223333)) { - err(ts, z169, 0x019, 0, 0, \_SB_.ABBU.mt08.dz05.iy07, 0x22223333) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt08.dz05.iy07, 0x22223333) } CH03(ts, z169, 0x111, 0, 0) @@ -1126,7 +1126,7 @@ Method(mt0a,, Serialized) OUTC("mt0a, \\_SB_.ABBU.pr7d.iy07:") OUTC(Local0) if (LNotEqual(\_SB_.ABBU.pr7d.iy07, 0xabcd0120)) { - err(ts, z169, 0x01a, 0, 0, \_SB_.ABBU.pr7d.iy07, 0xabcd0120) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.pr7d.iy07, 0xabcd0120) } CH03(ts, z169, 0x113, 0, 0) @@ -1147,7 +1147,7 @@ Method(mt0b,, Serialized) OUTC(Local0) if (LNotEqual(\_SB_.ABBU.pr7d.iy07, 0xabcd0121)) { - err(ts, z169, 0x01b, 0, 0, \_SB_.ABBU.pr7d.iy07, 0xabcd0121) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.pr7d.iy07, 0xabcd0121) } CH03(ts, z169, 0x115, 0, 0) @@ -1174,7 +1174,7 @@ Method(mt0c,, Serialized) OUTC(Local0) if (LNotEqual(\_SB_.ABBU.mt0c.pr7d.iy07, 0xabcd0661)) { - err(ts, z169, 0x01d, 0, 0, \_SB_.ABBU.mt0c.pr7d.iy07, 0xabcd0661) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt0c.pr7d.iy07, 0xabcd0661) } CH03(ts, z169, 0x01e, 0, 0) @@ -1225,7 +1225,7 @@ Method(mt0e,, Serialized) OUTC(Local0) if (LNotEqual(\_SB_.ABBU.mt0d.i000, 0xabcd1234)) { - err(ts, z169, 0x01f, 0, 0, \_SB_.ABBU.mt0d.i000, 0xabcd1234) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt0d.i000, 0xabcd1234) } CH03(ts, z169, 0x11a, 0, 0) @@ -1265,10 +1265,10 @@ Method(mt0f,, Serialized) OUTC("mt0f, \\_SB_.ABBU.mt0f.dz05.iy07:") OUTC(Local0) if (LNotEqual(Local0, 0xabcd0909)) { - err(ts, z169, 0x020, 0, 0, Local0, 0xabcd0909) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd0909) } if (LNotEqual(\_SB_.ABBU.mt0f.dz05.iy07, 0xabcd0909)) { - err(ts, z169, 0x021, 0, 0, \_SB_.ABBU.mt0f.dz05.iy07, 0xabcd0909) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt0f.dz05.iy07, 0xabcd0909) } } Add(\_SB_.ABBU.mt0f.dz05.iy07, 1, \_SB_.ABBU.mt0f.dz05.iy07) @@ -1299,7 +1299,7 @@ Method(mt0f,, Serialized) mm00() if (LNotEqual(\_SB_.ABBU.mt0f.dz05.iy07, 0xabcd0909)) { - err(ts, z169, 0x023, 0, 0, \_SB_.ABBU.mt0f.dz05.iy07, 0xabcd0909) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt0f.dz05.iy07, 0xabcd0909) } CH03(ts, z169, 0x024, 0, 0) @@ -1354,10 +1354,10 @@ Method(mt10,, Serialized) OUTC("mt10, \\_SB_.ABBU.mt10.dz05.iy07:") OUTC(Local0) if (LNotEqual(Local0, 0xabcd0909)) { - err(ts, z169, 0x025, 0, 0, Local0, 0xabcd0909) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd0909) } if (LNotEqual(\_SB_.ABBU.mt10.dz05.iy07, 0xabcd0909)) { - err(ts, z169, 0x026, 0, 0, \_SB_.ABBU.mt10.dz05.iy07, 0xabcd0909) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt10.dz05.iy07, 0xabcd0909) } } Add(\_SB_.ABBU.mt10.dz05.iy07, 1, \_SB_.ABBU.mt10.dz05.iy07) @@ -1412,7 +1412,7 @@ Method(mt10,, Serialized) mm00() if (LNotEqual(\_SB_.ABBU.mt10.dz05.iy07, 0xabcd0909)) { - err(ts, z169, 0x028, 0, 0, \_SB_.ABBU.mt10.dz05.iy07, 0xabcd0909) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt10.dz05.iy07, 0xabcd0909) } CH03(ts, z169, 0x029, 0, 0) @@ -1451,10 +1451,10 @@ Method(mt11,, Serialized) OUTC("mt11, ^^^^^^^^dz05.iy07:") OUTC(Local0) if (LNotEqual(Local0, 0xabcd0909)) { - err(ts, z169, 0x02a, 0, 0, Local0, 0xabcd0909) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd0909) } if (LNotEqual(^^^^^^^^dz05.iy07, 0xabcd0909)) { - err(ts, z169, 0x02b, 0, 0, ^^^^^^^^dz05.iy07, 0xabcd0909) + err(ts, z169, __LINE__, 0, 0, ^^^^^^^^dz05.iy07, 0xabcd0909) } } Increment(^^^^^^^dz05.iy07) @@ -1485,7 +1485,7 @@ Method(mt11,, Serialized) mm00() if (LNotEqual(dz05.iy07, 0xabcd0909)) { - err(ts, z169, 0x02d, 0, 0, dz05.iy07, 0xabcd0909) + err(ts, z169, __LINE__, 0, 0, dz05.iy07, 0xabcd0909) } CH03(ts, z169, 0x02e, 0, 0) @@ -1572,10 +1572,10 @@ Method(mt12,, Serialized) OUTC("mt12, ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07:") OUTC(Local0) if (LNotEqual(Local0, 0xabcd0921)) { - err(ts, z169, 0x02f, 0, 0, Local0, 0xabcd0921) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd0921) } if (LNotEqual(^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd0921)) { - err(ts, z169, 0x030, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd0921) + err(ts, z169, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd0921) } } Increment(^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07) @@ -1678,7 +1678,7 @@ Method(mt12,, Serialized) mm00() if (LNotEqual(dz05.iy07, 0xabcd0909)) { - err(ts, z169, 0x031, 0, 0, dz05.iy07, 0xabcd0909) + err(ts, z169, __LINE__, 0, 0, dz05.iy07, 0xabcd0909) } CH03(ts, z169, 0x11c, 0, 0) @@ -1714,46 +1714,46 @@ Method(mt13,, Serialized) OUTC("mt13, \\_SB_.ABBU.mt13.dz05.iy07:") OUTC(Local0) if (LNotEqual(Local0, 0xabcd0500)) { - err(ts, z169, 0x032, 0, 0, Local0, 0xabcd0500) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd0500) } if (LNotEqual(\_SB_.ABBU.mt13.dz05.iy07, 0xabcd0500)) { - err(ts, z169, 0x033, 0, 0, \_SB_.ABBU.mt13.dz05.iy07, 0xabcd0500) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt13.dz05.iy07, 0xabcd0500) } } Store (\_SB_.ABBU.mt13.dz05.iy07, Local0) mm06() if (LNotEqual(\_SB_.ABBU.mt13.dz05.iy07, 0xabcd0500)) { - err(ts, z169, 0x034, 0, 0, \_SB_.ABBU.mt13.dz05.iy07, 0xabcd0500) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt13.dz05.iy07, 0xabcd0500) } } Store (\_SB_.ABBU.mt13.dz05.iy07, Local0) mm05() if (LNotEqual(\_SB_.ABBU.mt13.dz05.iy07, 0xabcd0500)) { - err(ts, z169, 0x035, 0, 0, \_SB_.ABBU.mt13.dz05.iy07, 0xabcd0500) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt13.dz05.iy07, 0xabcd0500) } } Store (\_SB_.ABBU.mt13.dz05.iy07, Local0) mm04() if (LNotEqual(\_SB_.ABBU.mt13.dz05.iy07, 0xabcd0500)) { - err(ts, z169, 0x036, 0, 0, \_SB_.ABBU.mt13.dz05.iy07, 0xabcd0500) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt13.dz05.iy07, 0xabcd0500) } } Store (\_SB_.ABBU.mt13.dz05.iy07, Local0) mm03() if (LNotEqual(\_SB_.ABBU.mt13.dz05.iy07, 0xabcd0500)) { - err(ts, z169, 0x037, 0, 0, \_SB_.ABBU.mt13.dz05.iy07, 0xabcd0500) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt13.dz05.iy07, 0xabcd0500) } } Store (\_SB_.ABBU.mt13.dz05.iy07, Local0) mm02() if (LNotEqual(\_SB_.ABBU.mt13.dz05.iy07, 0xabcd0500)) { - err(ts, z169, 0x038, 0, 0, \_SB_.ABBU.mt13.dz05.iy07, 0xabcd0500) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt13.dz05.iy07, 0xabcd0500) } } Store (\_SB_.ABBU.mt13.dz05.iy07, Local0) mm01() if (LNotEqual(\_SB_.ABBU.mt13.dz05.iy07, 0xabcd0500)) { - err(ts, z169, 0x039, 0, 0, \_SB_.ABBU.mt13.dz05.iy07, 0xabcd0500) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt13.dz05.iy07, 0xabcd0500) } } @@ -1763,7 +1763,7 @@ Method(mt13,, Serialized) mm00() if (LNotEqual(\_SB_.ABBU.mt13.dz05.iy07, 0xabcd0500)) { - err(ts, z169, 0x03b, 0, 0, \_SB_.ABBU.mt13.dz05.iy07, 0xabcd0500) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt13.dz05.iy07, 0xabcd0500) } CH03(ts, z169, 0x03c, 0, 0) @@ -1849,289 +1849,289 @@ Method(mt14,, Serialized) OUTC("mt14, \\_SB_.ABBU.mt14.dz05.iy07:") OUTC(Local0) if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z169, 0x03d, 0, 0, Local0, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z169, 0x03e, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) } } Store (\_SB_.ABBU.mt14.dz05.iy07, Local0) mm1f() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z169, 0x03f, 0, 0, Local0, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z169, 0x040, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) } } Store (\_SB_.ABBU.mt14.dz05.iy07, Local0) mm1e() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z169, 0x041, 0, 0, Local0, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z169, 0x042, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) } } Store (\_SB_.ABBU.mt14.dz05.iy07, Local0) mm1d() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z169, 0x043, 0, 0, Local0, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z169, 0x044, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) } } Store (\_SB_.ABBU.mt14.dz05.iy07, Local0) mm1c() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z169, 0x045, 0, 0, Local0, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z169, 0x046, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) } } Store (\_SB_.ABBU.mt14.dz05.iy07, Local0) mm1b() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z169, 0x047, 0, 0, Local0, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z169, 0x048, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) } } Store (\_SB_.ABBU.mt14.dz05.iy07, Local0) mm1a() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z169, 0x049, 0, 0, Local0, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z169, 0x04a, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) } } Store (\_SB_.ABBU.mt14.dz05.iy07, Local0) mm19() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z169, 0x04b, 0, 0, Local0, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z169, 0x04c, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) } } Store (\_SB_.ABBU.mt14.dz05.iy07, Local0) mm18() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z169, 0x04d, 0, 0, Local0, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z169, 0x04e, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) } } Store (\_SB_.ABBU.mt14.dz05.iy07, Local0) mm17() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z169, 0x04f, 0, 0, Local0, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z169, 0x050, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) } } Store (\_SB_.ABBU.mt14.dz05.iy07, Local0) mm16() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z169, 0x051, 0, 0, Local0, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z169, 0x052, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) } } Store (\_SB_.ABBU.mt14.dz05.iy07, Local0) mm15() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z169, 0x053, 0, 0, Local0, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z169, 0x054, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) } } Store (\_SB_.ABBU.mt14.dz05.iy07, Local0) mm14() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z169, 0x055, 0, 0, Local0, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z169, 0x056, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) } } Store (\_SB_.ABBU.mt14.dz05.iy07, Local0) mm13() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z169, 0x057, 0, 0, Local0, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z169, 0x058, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) } } Store (\_SB_.ABBU.mt14.dz05.iy07, Local0) mm12() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z169, 0x059, 0, 0, Local0, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z169, 0x05a, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) } } Store (\_SB_.ABBU.mt14.dz05.iy07, Local0) mm11() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z169, 0x05b, 0, 0, Local0, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z169, 0x05c, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) } } Store (\_SB_.ABBU.mt14.dz05.iy07, Local0) mm10() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z169, 0x05d, 0, 0, Local0, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z169, 0x05e, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) } } Store (\_SB_.ABBU.mt14.dz05.iy07, Local0) mm0f() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z169, 0x05f, 0, 0, Local0, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z169, 0x060, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) } } Store (\_SB_.ABBU.mt14.dz05.iy07, Local0) mm0e() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z169, 0x061, 0, 0, Local0, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z169, 0x062, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) } } Store (\_SB_.ABBU.mt14.dz05.iy07, Local0) mm0d() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z169, 0x063, 0, 0, Local0, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z169, 0x064, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) } } Store (\_SB_.ABBU.mt14.dz05.iy07, Local0) mm0c() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z169, 0x065, 0, 0, Local0, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z169, 0x066, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) } } Store (\_SB_.ABBU.mt14.dz05.iy07, Local0) mm0b() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z169, 0x067, 0, 0, Local0, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z169, 0x068, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) } } Store (\_SB_.ABBU.mt14.dz05.iy07, Local0) mm0a() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z169, 0x069, 0, 0, Local0, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z169, 0x06a, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) } } Store (\_SB_.ABBU.mt14.dz05.iy07, Local0) mm09() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z169, 0x06b, 0, 0, Local0, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z169, 0x06c, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) } } Store (\_SB_.ABBU.mt14.dz05.iy07, Local0) mm08() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z169, 0x06d, 0, 0, Local0, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z169, 0x06e, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) } } Store (\_SB_.ABBU.mt14.dz05.iy07, Local0) mm07() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z169, 0x06f, 0, 0, Local0, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z169, 0x070, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) } } Store (\_SB_.ABBU.mt14.dz05.iy07, Local0) mm06() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z169, 0x071, 0, 0, Local0, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z169, 0x072, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) } } Store (\_SB_.ABBU.mt14.dz05.iy07, Local0) mm05() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z169, 0x073, 0, 0, Local0, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z169, 0x074, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) } } Store (\_SB_.ABBU.mt14.dz05.iy07, Local0) mm04() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z169, 0x075, 0, 0, Local0, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z169, 0x076, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) } } Store (\_SB_.ABBU.mt14.dz05.iy07, Local0) mm03() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z169, 0x077, 0, 0, Local0, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z169, 0x078, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) } } Store (\_SB_.ABBU.mt14.dz05.iy07, Local0) mm02() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z169, 0x079, 0, 0, Local0, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z169, 0x07a, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) } } Store (\_SB_.ABBU.mt14.dz05.iy07, Local0) mm01() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z169, 0x07b, 0, 0, Local0, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z169, 0x07c, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) } } @@ -2140,10 +2140,10 @@ Method(mt14,, Serialized) Store (\_SB_.ABBU.mt14.dz05.iy07, Local0) mm00() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z169, 0x07d, 0, 0, Local0, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z169, 0x07e, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt14.dz05.iy07, 0xabcd2900) } CH03(ts, z169, 0x11e, 0, 0) @@ -2229,289 +2229,289 @@ Method(mt15,, Serialized) OUTC("mt15, ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07:") OUTC(Local0) if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z169, 0x07f, 0, 0, Local0, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z169, 0x080, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, Local0) mm1f() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z169, 0x081, 0, 0, Local0, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z169, 0x082, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, Local0) mm1e() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z169, 0x083, 0, 0, Local0, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z169, 0x084, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, Local0) mm1d() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z169, 0x085, 0, 0, Local0, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z169, 0x086, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, Local0) mm1c() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z169, 0x087, 0, 0, Local0, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z169, 0x088, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, Local0) mm1b() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z169, 0x089, 0, 0, Local0, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z169, 0x08a, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, Local0) mm1a() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z169, 0x08b, 0, 0, Local0, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z169, 0x08c, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, Local0) mm19() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z169, 0x08d, 0, 0, Local0, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z169, 0x08e, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, Local0) mm18() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z169, 0x08f, 0, 0, Local0, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z169, 0x090, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, Local0) mm17() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z169, 0x091, 0, 0, Local0, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z169, 0x092, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, Local0) mm16() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z169, 0x093, 0, 0, Local0, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z169, 0x094, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^^^^^^^^dz05.iy07, Local0) mm15() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z169, 0x095, 0, 0, Local0, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z169, 0x096, 0, 0, ^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^^^^^^^dz05.iy07, Local0) mm14() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z169, 0x097, 0, 0, Local0, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z169, 0x098, 0, 0, ^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^^^^^^dz05.iy07, Local0) mm13() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z169, 0x099, 0, 0, Local0, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z169, 0x09a, 0, 0, ^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^^^^^dz05.iy07, Local0) mm12() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z169, 0x09b, 0, 0, Local0, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z169, 0x09c, 0, 0, ^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^^^^dz05.iy07, Local0) mm11() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z169, 0x09d, 0, 0, Local0, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z169, 0x09e, 0, 0, ^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^^^dz05.iy07, Local0) mm10() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z169, 0x09f, 0, 0, Local0, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z169, 0x0a0, 0, 0, ^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^^dz05.iy07, Local0) mm0f() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z169, 0x0a1, 0, 0, Local0, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z169, 0x0a2, 0, 0, ^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, ^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^dz05.iy07, Local0) mm0e() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z169, 0x0a3, 0, 0, Local0, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z169, 0x0a4, 0, 0, ^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, ^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^dz05.iy07, Local0) mm0d() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z169, 0x0a5, 0, 0, Local0, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z169, 0x0a6, 0, 0, ^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, ^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^dz05.iy07, Local0) mm0c() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z169, 0x0a7, 0, 0, Local0, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z169, 0x0a8, 0, 0, ^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, ^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^dz05.iy07, Local0) mm0b() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z169, 0x0a9, 0, 0, Local0, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z169, 0x0aa, 0, 0, ^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, ^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^dz05.iy07, Local0) mm0a() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z169, 0x0ab, 0, 0, Local0, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z169, 0x0ac, 0, 0, ^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, ^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^dz05.iy07, Local0) mm09() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z169, 0x0ad, 0, 0, Local0, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z169, 0x0ae, 0, 0, ^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, ^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^dz05.iy07, Local0) mm08() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z169, 0x0af, 0, 0, Local0, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z169, 0x0b0, 0, 0, ^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, ^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^dz05.iy07, Local0) mm07() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z169, 0x0b1, 0, 0, Local0, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z169, 0x0b2, 0, 0, ^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, ^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^dz05.iy07, Local0) mm06() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z169, 0x0b3, 0, 0, Local0, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z169, 0x0b4, 0, 0, ^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, ^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^dz05.iy07, Local0) mm05() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z169, 0x0b5, 0, 0, Local0, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z169, 0x0b6, 0, 0, ^^^^^dz05.iy07, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, ^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^dz05.iy07, Local0) mm04() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z169, 0x0b7, 0, 0, Local0, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z169, 0x0b8, 0, 0, ^^^^dz05.iy07, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, ^^^^dz05.iy07, 0xabcd3900) } } Store (^^^dz05.iy07, Local0) mm03() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z169, 0x0b9, 0, 0, Local0, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^dz05.iy07, 0xabcd3900)) { - err(ts, z169, 0x0ba, 0, 0, ^^^dz05.iy07, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, ^^^dz05.iy07, 0xabcd3900) } } Store (^^dz05.iy07, Local0) mm02() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z169, 0x0bb, 0, 0, Local0, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^dz05.iy07, 0xabcd3900)) { - err(ts, z169, 0x0bc, 0, 0, ^^dz05.iy07, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, ^^dz05.iy07, 0xabcd3900) } } Store (^dz05.iy07, Local0) mm01() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z169, 0x0bd, 0, 0, Local0, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^dz05.iy07, 0xabcd3900)) { - err(ts, z169, 0x0be, 0, 0, ^dz05.iy07, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, ^dz05.iy07, 0xabcd3900) } } @@ -2520,10 +2520,10 @@ Method(mt15,, Serialized) Store (dz05.iy07, Local0) mm00() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z169, 0x0bf, 0, 0, Local0, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(dz05.iy07, 0xabcd3900)) { - err(ts, z169, 0x0c0, 0, 0, dz05.iy07, 0xabcd3900) + err(ts, z169, __LINE__, 0, 0, dz05.iy07, 0xabcd3900) } CH03(ts, z169, 0x120, 0, 0) @@ -2614,7 +2614,7 @@ Method(mt16, 1, Serialized) Store(1, i001) mm00() if (LNotEqual(i000, 0xabcd4904)) { - err(ts, z169, 0x0c3, 0, 0, i000, 0xabcd4904) + err(ts, z169, __LINE__, 0, 0, i000, 0xabcd4904) } } elseif (LEqual(arg0, 2)) { @@ -2624,7 +2624,7 @@ Method(mt16, 1, Serialized) Store(2, i001) mm00() if (LNotEqual(i000, 0xabcd4905)) { - err(ts, z169, 0x0c4, 0, 0, i000, 0xabcd4905) + err(ts, z169, __LINE__, 0, 0, i000, 0xabcd4905) } } elseif (LEqual(arg0, 3)) { @@ -2635,7 +2635,7 @@ Method(mt16, 1, Serialized) Store(3, i001) mm00() if (LNotEqual(i000, 0xabcd6900)) { - err(ts, z169, 0x0c4, 0, 0, i000, 0xabcd6900) + err(ts, z169, __LINE__, 0, 0, i000, 0xabcd6900) } } @@ -2976,7 +2976,7 @@ if (LEqual(arg0, 1)) { Store(1, i001) mm00() if (LNotEqual(i000, 0xabcd4906)) { - err(ts, z169, 0x0c8, 0, 0, i000, 0xabcd4906) + err(ts, z169, __LINE__, 0, 0, i000, 0xabcd4906) } } elseif (LEqual(arg0, 2)) { @@ -2986,7 +2986,7 @@ if (LEqual(arg0, 1)) { Store(2, i001) mm00() if (LNotEqual(i000, 0xabcd4907)) { - err(ts, z169, 0x0c9, 0, 0, i000, 0xabcd4907) + err(ts, z169, __LINE__, 0, 0, i000, 0xabcd4907) } } elseif (LEqual(arg0, 3)) { @@ -2997,7 +2997,7 @@ if (LEqual(arg0, 1)) { Store(3, i001) mm00() if (LNotEqual(i000, 0xabcd4908)) { - err(ts, z169, 0x0ca, 0, 0, i000, 0xabcd4908) + err(ts, z169, __LINE__, 0, 0, i000, 0xabcd4908) } } @@ -3018,12 +3018,12 @@ Method(mt18, 1, Serialized) if (arg0) { Store(0xabcd9000, \_SB_.ABBU.mt18.dz05.iy07) if (LNotEqual(\_SB_.ABBU.mt18.dz05.iy07, 0xabcd9000)) { - err(ts, z169, 0x0ca, 0, 0, \_SB_.ABBU.mt18.dz05.iy07, 0xabcd9000) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt18.dz05.iy07, 0xabcd9000) } } else { Store(0xabcd9001, dz05.iy07) if (LNotEqual(dz05.iy07, 0xabcd9001)) { - err(ts, z169, 0x0ca, 0, 0, dz05.iy07, 0xabcd9001) + err(ts, z169, __LINE__, 0, 0, dz05.iy07, 0xabcd9001) } } @@ -3044,12 +3044,12 @@ Method(mt19, 1, Serialized) if (arg0) { Store(0xabcd9002, \_SB_.ABBU.mt19.pr7d.iy07) if (LNotEqual(\_SB_.ABBU.mt19.pr7d.iy07, 0xabcd9002)) { - err(ts, z169, 0x0ca, 0, 0, \_SB_.ABBU.mt19.pr7d.iy07, 0xabcd9002) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.mt19.pr7d.iy07, 0xabcd9002) } } else { Store(0xabcd9003, pr7d.iy07) if (LNotEqual(pr7d.iy07, 0xabcd9003)) { - err(ts, z169, 0x0ca, 0, 0, pr7d.iy07, 0xabcd9003) + err(ts, z169, __LINE__, 0, 0, pr7d.iy07, 0xabcd9003) } } @@ -3064,12 +3064,12 @@ Method(mt1a, 1, Serialized) if (arg0) { Store(0xabcd9004, \_SB_.ABBU.pr7d.iy07) if (LNotEqual(\_SB_.ABBU.pr7d.iy07, 0xabcd9004)) { - err(ts, z169, 0x0ca, 0, 0, \_SB_.ABBU.pr7d.iy07, 0xabcd9004) + err(ts, z169, __LINE__, 0, 0, \_SB_.ABBU.pr7d.iy07, 0xabcd9004) } } else { Store(0xabcd9005, ^pr7d.iy07) if (LNotEqual(^pr7d.iy07, 0xabcd9005)) { - err(ts, z169, 0x0ca, 0, 0, ^pr7d.iy07, 0xabcd9005) + err(ts, z169, __LINE__, 0, 0, ^pr7d.iy07, 0xabcd9005) } } CH03(ts, z169, 0x0d1, 0, 0) diff --git a/tests/aslts/src/runtime/collections/Identity2MS/abbu/method/mt0_aslts.asl b/tests/aslts/src/runtime/collections/Identity2MS/abbu/method/mt0_aslts.asl index 27ad1faf3..a10a4236d 100644 --- a/tests/aslts/src/runtime/collections/Identity2MS/abbu/method/mt0_aslts.asl +++ b/tests/aslts/src/runtime/collections/Identity2MS/abbu/method/mt0_aslts.asl @@ -103,7 +103,7 @@ Method(mt00,, Serialized) mm00() if (LNotEqual(i000, 0xabcd0000)) { - err(ts, z170, 0x000, 0, 0, i000, 0xabcd0000) + err(ts, z170, __LINE__, 0, 0, i000, 0xabcd0000) } CH03(ts, z170, 0x101, 0, 0) @@ -254,7 +254,7 @@ Method(mt01,, Serialized) mm00() if (LNotEqual(i000, 0xabcd0000)) { - err(ts, z170, 0x001, 0, 0, i000, 0xabcd0000) + err(ts, z170, __LINE__, 0, 0, i000, 0xabcd0000) } CH03(ts, z170, 0x103, 0, 0) @@ -340,7 +340,7 @@ Method(mt02,, Serialized) mm00() if (LNotEqual(i000, 0xabcd0000)) { - err(ts, z170, 0x002, 0, 0, i000, 0xabcd0000) + err(ts, z170, __LINE__, 0, 0, i000, 0xabcd0000) } CH03(ts, z170, 0x105, 0, 0) @@ -491,7 +491,7 @@ Method(mt03,, Serialized) mm00() if (LNotEqual(i000, 0xabcd0000)) { - err(ts, z170, 0x003, 0, 0, i000, 0xabcd0000) + err(ts, z170, __LINE__, 0, 0, i000, 0xabcd0000) } CH03(ts, z170, 0x107, 0, 0) @@ -530,10 +530,10 @@ Method(mt04,, Serialized) OUTC("mt04, \\mt04.dz05.iy07:") OUTC(Local0) if (LNotEqual(Local0, 0xabcd0109)) { - err(ts, z170, 0x004, 0, 0, Local0, 0xabcd0109) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd0109) } if (LNotEqual(\mt04.dz05.iy07, 0xabcd0109)) { - err(ts, z170, 0x005, 0, 0, \mt04.dz05.iy07, 0xabcd0109) + err(ts, z170, __LINE__, 0, 0, \mt04.dz05.iy07, 0xabcd0109) } } Increment(\mt04.dz05.iy07) @@ -565,7 +565,7 @@ Method(mt04,, Serialized) mm00() if (LNotEqual(\mt04.dz05.iy07, 0xabcd0109)) { - err(ts, z170, 0x007, 0, 0, \mt04.dz05.iy07, 0xabcd0109) + err(ts, z170, __LINE__, 0, 0, \mt04.dz05.iy07, 0xabcd0109) } CH03(ts, z170, 0x008, 0, 0) @@ -620,10 +620,10 @@ Method(mt05,, Serialized) OUTC("mt05, \\mt05.dz05.iy07:") OUTC(Local0) if (LNotEqual(Local0, 0xabcd0211)) { - err(ts, z170, 0x009, 0, 0, Local0, 0xabcd0211) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd0211) } if (LNotEqual(\mt05.dz05.iy07, 0xabcd0211)) { - err(ts, z170, 0x00a, 0, 0, \mt05.dz05.iy07, 0xabcd0211) + err(ts, z170, __LINE__, 0, 0, \mt05.dz05.iy07, 0xabcd0211) } } Increment(\mt05.dz05.iy07) @@ -678,7 +678,7 @@ Method(mt05,, Serialized) mm00() if (LNotEqual(\mt05.dz05.iy07, 0xabcd0211)) { - err(ts, z170, 0x00b, 0, 0, \mt05.dz05.iy07, 0xabcd0211) + err(ts, z170, __LINE__, 0, 0, \mt05.dz05.iy07, 0xabcd0211) } CH03(ts, z170, 0x109, 0, 0) @@ -737,10 +737,10 @@ Method(mt06,, Serialized) OUTC("mt06, \\mt06.dz05.iy07:") OUTC(Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z170, 0x00c, 0, 0, Local0, 0x11112222) + err(ts, z170, __LINE__, 0, 0, Local0, 0x11112222) } if (LNotEqual(\mt06.dz05.iy07, 0x11112222)) { - err(ts, z170, 0x00d, 0, 0, \mt06.dz05.iy07, 0x11112222) + err(ts, z170, __LINE__, 0, 0, \mt06.dz05.iy07, 0x11112222) } } mm04() @@ -759,7 +759,7 @@ Method(mt06,, Serialized) mt07() if (LNotEqual(\mt06.dz05.iy07, 0x11112222)) { - err(ts, z170, 0x00e, 0, 0, \mt06.dz05.iy07, 0x11112222) + err(ts, z170, __LINE__, 0, 0, \mt06.dz05.iy07, 0x11112222) } CH03(ts, z170, 0x10b, 0, 0) @@ -796,10 +796,10 @@ Method(mt07,, Serialized) OUTC("0 mt07, \\mt06.dz05.iy07:") OUTC(Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z170, 0x00f, 0, 0, Local0, 0x11112222) + err(ts, z170, __LINE__, 0, 0, Local0, 0x11112222) } if (LNotEqual(\mt06.dz05.iy07, 0x11112222)) { - err(ts, z170, 0x010, 0, 0, \mt06.dz05.iy07, 0x11112222) + err(ts, z170, __LINE__, 0, 0, \mt06.dz05.iy07, 0x11112222) } } mm07() @@ -825,10 +825,10 @@ Method(mt07,, Serialized) OUTC("1 mt07, \\mt06.dz05.iy07:") OUTC(Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z170, 0x011, 0, 0, Local0, 0x11112222) + err(ts, z170, __LINE__, 0, 0, Local0, 0x11112222) } if (LNotEqual(\mt06.dz05.iy07, 0x11112222)) { - err(ts, z170, 0x012, 0, 0, \mt06.dz05.iy07, 0x11112222) + err(ts, z170, __LINE__, 0, 0, \mt06.dz05.iy07, 0x11112222) } CH03(ts, z170, 0x10d, 0, 0) @@ -900,10 +900,10 @@ Method(mt08,, Serialized) OUTC("mt08, \\mt08.dz05.iy07:") OUTC(Local0) if (LNotEqual(Local0, 0x22223333)) { - err(ts, z170, 0x013, 0, 0, Local0, 0x22223333) + err(ts, z170, __LINE__, 0, 0, Local0, 0x22223333) } if (LNotEqual(\mt08.dz05.iy07, 0x22223333)) { - err(ts, z170, 0x014, 0, 0, \mt08.dz05.iy07, 0x22223333) + err(ts, z170, __LINE__, 0, 0, \mt08.dz05.iy07, 0x22223333) } } mm07() @@ -928,7 +928,7 @@ Method(mt08,, Serialized) mt09() if (LNotEqual(\mt08.dz05.iy07, 0x22223333)) { - err(ts, z170, 0x015, 0, 0, \mt08.dz05.iy07, 0x22223333) + err(ts, z170, __LINE__, 0, 0, \mt08.dz05.iy07, 0x22223333) } CH03(ts, z170, 0x10f, 0, 0) @@ -979,10 +979,10 @@ Method(mt09,, Serialized) OUTC("0 mt09, \\mt08.dz05.iy07:") OUTC(Local0) if (LNotEqual(Local0, 0x22223333)) { - err(ts, z170, 0x016, 0, 0, Local0, 0x22223333) + err(ts, z170, __LINE__, 0, 0, Local0, 0x22223333) } if (LNotEqual(\mt08.dz05.iy07, 0x22223333)) { - err(ts, z170, 0x017, 0, 0, \mt08.dz05.iy07, 0x22223333) + err(ts, z170, __LINE__, 0, 0, \mt08.dz05.iy07, 0x22223333) } } mm0f() @@ -1024,10 +1024,10 @@ Method(mt09,, Serialized) OUTC("1 mt09, \\mt08.dz05.iy07:") OUTC(Local0) if (LNotEqual(Local0, 0x22223333)) { - err(ts, z170, 0x018, 0, 0, Local0, 0x22223333) + err(ts, z170, __LINE__, 0, 0, Local0, 0x22223333) } if (LNotEqual(\mt08.dz05.iy07, 0x22223333)) { - err(ts, z170, 0x019, 0, 0, \mt08.dz05.iy07, 0x22223333) + err(ts, z170, __LINE__, 0, 0, \mt08.dz05.iy07, 0x22223333) } CH03(ts, z170, 0x111, 0, 0) @@ -1047,7 +1047,7 @@ Method(mt0a,, Serialized) OUTC("mt0a, \\pr7d.iy07:") OUTC(Local0) if (LNotEqual(\pr7d.iy07, 0xabcd0120)) { - err(ts, z170, 0x01a, 0, 0, \pr7d.iy07, 0xabcd0120) + err(ts, z170, __LINE__, 0, 0, \pr7d.iy07, 0xabcd0120) } CH03(ts, z170, 0x113, 0, 0) @@ -1068,7 +1068,7 @@ Method(mt0b,, Serialized) OUTC(Local0) if (LNotEqual(\pr7d.iy07, 0xabcd0121)) { - err(ts, z170, 0x01b, 0, 0, \pr7d.iy07, 0xabcd0121) + err(ts, z170, __LINE__, 0, 0, \pr7d.iy07, 0xabcd0121) } CH03(ts, z170, 0x115, 0, 0) @@ -1095,7 +1095,7 @@ Method(mt0c,, Serialized) OUTC(Local0) if (LNotEqual(\mt0c.pr7d.iy07, 0xabcd0661)) { - err(ts, z170, 0x01d, 0, 0, \mt0c.pr7d.iy07, 0xabcd0661) + err(ts, z170, __LINE__, 0, 0, \mt0c.pr7d.iy07, 0xabcd0661) } CH03(ts, z170, 0x117, 0, 0) @@ -1146,7 +1146,7 @@ Method(mt0e,, Serialized) OUTC(Local0) if (LNotEqual(\mt0d.i000, 0xabcd1234)) { - err(ts, z170, 0x01f, 0, 0, \mt0d.i000, 0xabcd1234) + err(ts, z170, __LINE__, 0, 0, \mt0d.i000, 0xabcd1234) } CH03(ts, z170, 0x11c, 0, 0) @@ -1186,10 +1186,10 @@ Method(mt0f,, Serialized) OUTC("mt0f, \\mt0f.dz05.iy07:") OUTC(Local0) if (LNotEqual(Local0, 0xabcd0509)) { - err(ts, z170, 0x020, 0, 0, Local0, 0xabcd0509) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd0509) } if (LNotEqual(\mt0f.dz05.iy07, 0xabcd0509)) { - err(ts, z170, 0x021, 0, 0, \mt0f.dz05.iy07, 0xabcd0509) + err(ts, z170, __LINE__, 0, 0, \mt0f.dz05.iy07, 0xabcd0509) } } Add(\mt0f.dz05.iy07, 1, \mt0f.dz05.iy07) @@ -1220,7 +1220,7 @@ Method(mt0f,, Serialized) mm00() if (LNotEqual(\mt0f.dz05.iy07, 0xabcd0509)) { - err(ts, z170, 0x023, 0, 0, \mt0f.dz05.iy07, 0xabcd0509) + err(ts, z170, __LINE__, 0, 0, \mt0f.dz05.iy07, 0xabcd0509) } CH03(ts, z170, 0x024, 0, 0) @@ -1275,10 +1275,10 @@ Method(mt10,, Serialized) OUTC("mt10, \\mt10.dz05.iy07:") OUTC(Local0) if (LNotEqual(Local0, 0xabcd0611)) { - err(ts, z170, 0x025, 0, 0, Local0, 0xabcd0611) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd0611) } if (LNotEqual(\mt10.dz05.iy07, 0xabcd0611)) { - err(ts, z170, 0x026, 0, 0, \mt10.dz05.iy07, 0xabcd0611) + err(ts, z170, __LINE__, 0, 0, \mt10.dz05.iy07, 0xabcd0611) } } Add(\mt10.dz05.iy07, 1, \mt10.dz05.iy07) @@ -1333,7 +1333,7 @@ Method(mt10,, Serialized) mm00() if (LNotEqual(\mt10.dz05.iy07, 0xabcd0611)) { - err(ts, z170, 0x028, 0, 0, \mt10.dz05.iy07, 0xabcd0611) + err(ts, z170, __LINE__, 0, 0, \mt10.dz05.iy07, 0xabcd0611) } CH03(ts, z170, 0x029, 0, 0) @@ -1372,10 +1372,10 @@ Method(mt11,, Serialized) OUTC("mt11, ^^^^^^^^dz05.iy07:") OUTC(Local0) if (LNotEqual(Local0, 0xabcd0709)) { - err(ts, z170, 0x02a, 0, 0, Local0, 0xabcd0709) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd0709) } if (LNotEqual(^^^^^^^^dz05.iy07, 0xabcd0709)) { - err(ts, z170, 0x02b, 0, 0, ^^^^^^^^dz05.iy07, 0xabcd0709) + err(ts, z170, __LINE__, 0, 0, ^^^^^^^^dz05.iy07, 0xabcd0709) } } Increment(^^^^^^^dz05.iy07) @@ -1406,7 +1406,7 @@ Method(mt11,, Serialized) mm00() if (LNotEqual(dz05.iy07, 0xabcd0709)) { - err(ts, z170, 0x02d, 0, 0, dz05.iy07, 0xabcd0709) + err(ts, z170, __LINE__, 0, 0, dz05.iy07, 0xabcd0709) } CH03(ts, z170, 0x02e, 0, 0) @@ -1493,10 +1493,10 @@ Method(mt12,, Serialized) OUTC("mt12, ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07:") OUTC(Local0) if (LNotEqual(Local0, 0xabcd0821)) { - err(ts, z170, 0x02f, 0, 0, Local0, 0xabcd0821) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd0821) } if (LNotEqual(^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd0821)) { - err(ts, z170, 0x030, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd0821) + err(ts, z170, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd0821) } } Increment(^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07) @@ -1599,7 +1599,7 @@ Method(mt12,, Serialized) mm00() if (LNotEqual(dz05.iy07, 0xabcd0821)) { - err(ts, z170, 0x031, 0, 0, dz05.iy07, 0xabcd0821) + err(ts, z170, __LINE__, 0, 0, dz05.iy07, 0xabcd0821) } CH03(ts, z170, 0x11e, 0, 0) @@ -1635,46 +1635,46 @@ Method(mt13,, Serialized) OUTC("mt13, \\mt13.dz05.iy07:") OUTC(Local0) if (LNotEqual(Local0, 0xabcd0500)) { - err(ts, z170, 0x032, 0, 0, Local0, 0xabcd0500) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd0500) } if (LNotEqual(\mt13.dz05.iy07, 0xabcd0500)) { - err(ts, z170, 0x033, 0, 0, \mt13.dz05.iy07, 0xabcd0500) + err(ts, z170, __LINE__, 0, 0, \mt13.dz05.iy07, 0xabcd0500) } } Store (\mt13.dz05.iy07, Local0) mm06() if (LNotEqual(\mt13.dz05.iy07, 0xabcd0500)) { - err(ts, z170, 0x034, 0, 0, \mt13.dz05.iy07, 0xabcd0500) + err(ts, z170, __LINE__, 0, 0, \mt13.dz05.iy07, 0xabcd0500) } } Store (\mt13.dz05.iy07, Local0) mm05() if (LNotEqual(\mt13.dz05.iy07, 0xabcd0500)) { - err(ts, z170, 0x035, 0, 0, \mt13.dz05.iy07, 0xabcd0500) + err(ts, z170, __LINE__, 0, 0, \mt13.dz05.iy07, 0xabcd0500) } } Store (\mt13.dz05.iy07, Local0) mm04() if (LNotEqual(\mt13.dz05.iy07, 0xabcd0500)) { - err(ts, z170, 0x036, 0, 0, \mt13.dz05.iy07, 0xabcd0500) + err(ts, z170, __LINE__, 0, 0, \mt13.dz05.iy07, 0xabcd0500) } } Store (\mt13.dz05.iy07, Local0) mm03() if (LNotEqual(\mt13.dz05.iy07, 0xabcd0500)) { - err(ts, z170, 0x037, 0, 0, \mt13.dz05.iy07, 0xabcd0500) + err(ts, z170, __LINE__, 0, 0, \mt13.dz05.iy07, 0xabcd0500) } } Store (\mt13.dz05.iy07, Local0) mm02() if (LNotEqual(\mt13.dz05.iy07, 0xabcd0500)) { - err(ts, z170, 0x038, 0, 0, \mt13.dz05.iy07, 0xabcd0500) + err(ts, z170, __LINE__, 0, 0, \mt13.dz05.iy07, 0xabcd0500) } } Store (\mt13.dz05.iy07, Local0) mm01() if (LNotEqual(\mt13.dz05.iy07, 0xabcd0500)) { - err(ts, z170, 0x039, 0, 0, \mt13.dz05.iy07, 0xabcd0500) + err(ts, z170, __LINE__, 0, 0, \mt13.dz05.iy07, 0xabcd0500) } } @@ -1684,7 +1684,7 @@ Method(mt13,, Serialized) mm00() if (LNotEqual(\mt13.dz05.iy07, 0xabcd0500)) { - err(ts, z170, 0x03b, 0, 0, \mt13.dz05.iy07, 0xabcd0500) + err(ts, z170, __LINE__, 0, 0, \mt13.dz05.iy07, 0xabcd0500) } CH03(ts, z170, 0x03c, 0, 0) @@ -1770,289 +1770,289 @@ Method(mt14,, Serialized) OUTC("mt14, \\mt14.dz05.iy07:") OUTC(Local0) if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z170, 0x03d, 0, 0, Local0, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z170, 0x03e, 0, 0, \mt14.dz05.iy07, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, \mt14.dz05.iy07, 0xabcd2900) } } Store (\mt14.dz05.iy07, Local0) mm1f() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z170, 0x03f, 0, 0, Local0, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z170, 0x040, 0, 0, \mt14.dz05.iy07, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, \mt14.dz05.iy07, 0xabcd2900) } } Store (\mt14.dz05.iy07, Local0) mm1e() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z170, 0x041, 0, 0, Local0, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z170, 0x042, 0, 0, \mt14.dz05.iy07, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, \mt14.dz05.iy07, 0xabcd2900) } } Store (\mt14.dz05.iy07, Local0) mm1d() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z170, 0x043, 0, 0, Local0, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z170, 0x044, 0, 0, \mt14.dz05.iy07, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, \mt14.dz05.iy07, 0xabcd2900) } } Store (\mt14.dz05.iy07, Local0) mm1c() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z170, 0x045, 0, 0, Local0, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z170, 0x046, 0, 0, \mt14.dz05.iy07, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, \mt14.dz05.iy07, 0xabcd2900) } } Store (\mt14.dz05.iy07, Local0) mm1b() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z170, 0x047, 0, 0, Local0, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z170, 0x048, 0, 0, \mt14.dz05.iy07, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, \mt14.dz05.iy07, 0xabcd2900) } } Store (\mt14.dz05.iy07, Local0) mm1a() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z170, 0x049, 0, 0, Local0, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z170, 0x04a, 0, 0, \mt14.dz05.iy07, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, \mt14.dz05.iy07, 0xabcd2900) } } Store (\mt14.dz05.iy07, Local0) mm19() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z170, 0x04b, 0, 0, Local0, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z170, 0x04c, 0, 0, \mt14.dz05.iy07, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, \mt14.dz05.iy07, 0xabcd2900) } } Store (\mt14.dz05.iy07, Local0) mm18() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z170, 0x04d, 0, 0, Local0, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z170, 0x04e, 0, 0, \mt14.dz05.iy07, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, \mt14.dz05.iy07, 0xabcd2900) } } Store (\mt14.dz05.iy07, Local0) mm17() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z170, 0x04f, 0, 0, Local0, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z170, 0x050, 0, 0, \mt14.dz05.iy07, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, \mt14.dz05.iy07, 0xabcd2900) } } Store (\mt14.dz05.iy07, Local0) mm16() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z170, 0x051, 0, 0, Local0, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z170, 0x052, 0, 0, \mt14.dz05.iy07, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, \mt14.dz05.iy07, 0xabcd2900) } } Store (\mt14.dz05.iy07, Local0) mm15() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z170, 0x053, 0, 0, Local0, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z170, 0x054, 0, 0, \mt14.dz05.iy07, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, \mt14.dz05.iy07, 0xabcd2900) } } Store (\mt14.dz05.iy07, Local0) mm14() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z170, 0x055, 0, 0, Local0, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z170, 0x056, 0, 0, \mt14.dz05.iy07, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, \mt14.dz05.iy07, 0xabcd2900) } } Store (\mt14.dz05.iy07, Local0) mm13() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z170, 0x057, 0, 0, Local0, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z170, 0x058, 0, 0, \mt14.dz05.iy07, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, \mt14.dz05.iy07, 0xabcd2900) } } Store (\mt14.dz05.iy07, Local0) mm12() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z170, 0x059, 0, 0, Local0, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z170, 0x05a, 0, 0, \mt14.dz05.iy07, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, \mt14.dz05.iy07, 0xabcd2900) } } Store (\mt14.dz05.iy07, Local0) mm11() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z170, 0x05b, 0, 0, Local0, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z170, 0x05c, 0, 0, \mt14.dz05.iy07, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, \mt14.dz05.iy07, 0xabcd2900) } } Store (\mt14.dz05.iy07, Local0) mm10() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z170, 0x05d, 0, 0, Local0, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z170, 0x05e, 0, 0, \mt14.dz05.iy07, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, \mt14.dz05.iy07, 0xabcd2900) } } Store (\mt14.dz05.iy07, Local0) mm0f() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z170, 0x05f, 0, 0, Local0, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z170, 0x060, 0, 0, \mt14.dz05.iy07, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, \mt14.dz05.iy07, 0xabcd2900) } } Store (\mt14.dz05.iy07, Local0) mm0e() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z170, 0x061, 0, 0, Local0, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z170, 0x062, 0, 0, \mt14.dz05.iy07, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, \mt14.dz05.iy07, 0xabcd2900) } } Store (\mt14.dz05.iy07, Local0) mm0d() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z170, 0x063, 0, 0, Local0, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z170, 0x064, 0, 0, \mt14.dz05.iy07, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, \mt14.dz05.iy07, 0xabcd2900) } } Store (\mt14.dz05.iy07, Local0) mm0c() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z170, 0x065, 0, 0, Local0, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z170, 0x066, 0, 0, \mt14.dz05.iy07, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, \mt14.dz05.iy07, 0xabcd2900) } } Store (\mt14.dz05.iy07, Local0) mm0b() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z170, 0x067, 0, 0, Local0, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z170, 0x068, 0, 0, \mt14.dz05.iy07, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, \mt14.dz05.iy07, 0xabcd2900) } } Store (\mt14.dz05.iy07, Local0) mm0a() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z170, 0x069, 0, 0, Local0, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z170, 0x06a, 0, 0, \mt14.dz05.iy07, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, \mt14.dz05.iy07, 0xabcd2900) } } Store (\mt14.dz05.iy07, Local0) mm09() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z170, 0x06b, 0, 0, Local0, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z170, 0x06c, 0, 0, \mt14.dz05.iy07, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, \mt14.dz05.iy07, 0xabcd2900) } } Store (\mt14.dz05.iy07, Local0) mm08() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z170, 0x06d, 0, 0, Local0, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z170, 0x06e, 0, 0, \mt14.dz05.iy07, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, \mt14.dz05.iy07, 0xabcd2900) } } Store (\mt14.dz05.iy07, Local0) mm07() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z170, 0x06f, 0, 0, Local0, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z170, 0x070, 0, 0, \mt14.dz05.iy07, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, \mt14.dz05.iy07, 0xabcd2900) } } Store (\mt14.dz05.iy07, Local0) mm06() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z170, 0x071, 0, 0, Local0, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z170, 0x072, 0, 0, \mt14.dz05.iy07, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, \mt14.dz05.iy07, 0xabcd2900) } } Store (\mt14.dz05.iy07, Local0) mm05() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z170, 0x073, 0, 0, Local0, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z170, 0x074, 0, 0, \mt14.dz05.iy07, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, \mt14.dz05.iy07, 0xabcd2900) } } Store (\mt14.dz05.iy07, Local0) mm04() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z170, 0x075, 0, 0, Local0, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z170, 0x076, 0, 0, \mt14.dz05.iy07, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, \mt14.dz05.iy07, 0xabcd2900) } } Store (\mt14.dz05.iy07, Local0) mm03() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z170, 0x077, 0, 0, Local0, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z170, 0x078, 0, 0, \mt14.dz05.iy07, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, \mt14.dz05.iy07, 0xabcd2900) } } Store (\mt14.dz05.iy07, Local0) mm02() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z170, 0x079, 0, 0, Local0, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z170, 0x07a, 0, 0, \mt14.dz05.iy07, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, \mt14.dz05.iy07, 0xabcd2900) } } Store (\mt14.dz05.iy07, Local0) mm01() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z170, 0x07b, 0, 0, Local0, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z170, 0x07c, 0, 0, \mt14.dz05.iy07, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, \mt14.dz05.iy07, 0xabcd2900) } } @@ -2061,10 +2061,10 @@ Method(mt14,, Serialized) Store (\mt14.dz05.iy07, Local0) mm00() if (LNotEqual(Local0, 0xabcd2900)) { - err(ts, z170, 0x07d, 0, 0, Local0, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd2900) } if (LNotEqual(\mt14.dz05.iy07, 0xabcd2900)) { - err(ts, z170, 0x07e, 0, 0, \mt14.dz05.iy07, 0xabcd2900) + err(ts, z170, __LINE__, 0, 0, \mt14.dz05.iy07, 0xabcd2900) } CH03(ts, z170, 0x120, 0, 0) @@ -2150,289 +2150,289 @@ Method(mt15,, Serialized) OUTC("mt15, ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07:") OUTC(Local0) if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z170, 0x07f, 0, 0, Local0, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z170, 0x080, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, Local0) mm1f() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z170, 0x081, 0, 0, Local0, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z170, 0x082, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, Local0) mm1e() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z170, 0x083, 0, 0, Local0, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z170, 0x084, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, Local0) mm1d() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z170, 0x085, 0, 0, Local0, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z170, 0x086, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, Local0) mm1c() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z170, 0x087, 0, 0, Local0, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z170, 0x088, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, Local0) mm1b() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z170, 0x089, 0, 0, Local0, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z170, 0x08a, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, Local0) mm1a() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z170, 0x08b, 0, 0, Local0, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z170, 0x08c, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, Local0) mm19() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z170, 0x08d, 0, 0, Local0, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z170, 0x08e, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, Local0) mm18() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z170, 0x08f, 0, 0, Local0, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z170, 0x090, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, Local0) mm17() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z170, 0x091, 0, 0, Local0, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z170, 0x092, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, Local0) mm16() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z170, 0x093, 0, 0, Local0, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z170, 0x094, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^^^^^^^^dz05.iy07, Local0) mm15() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z170, 0x095, 0, 0, Local0, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z170, 0x096, 0, 0, ^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^^^^^^^dz05.iy07, Local0) mm14() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z170, 0x097, 0, 0, Local0, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z170, 0x098, 0, 0, ^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^^^^^^dz05.iy07, Local0) mm13() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z170, 0x099, 0, 0, Local0, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z170, 0x09a, 0, 0, ^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^^^^^dz05.iy07, Local0) mm12() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z170, 0x09b, 0, 0, Local0, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z170, 0x09c, 0, 0, ^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^^^^dz05.iy07, Local0) mm11() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z170, 0x09d, 0, 0, Local0, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z170, 0x09e, 0, 0, ^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^^^dz05.iy07, Local0) mm10() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z170, 0x09f, 0, 0, Local0, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z170, 0x0a0, 0, 0, ^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, ^^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^^dz05.iy07, Local0) mm0f() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z170, 0x0a1, 0, 0, Local0, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z170, 0x0a2, 0, 0, ^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, ^^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^^dz05.iy07, Local0) mm0e() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z170, 0x0a3, 0, 0, Local0, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z170, 0x0a4, 0, 0, ^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, ^^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^^dz05.iy07, Local0) mm0d() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z170, 0x0a5, 0, 0, Local0, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z170, 0x0a6, 0, 0, ^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, ^^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^^dz05.iy07, Local0) mm0c() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z170, 0x0a7, 0, 0, Local0, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z170, 0x0a8, 0, 0, ^^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, ^^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^^dz05.iy07, Local0) mm0b() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z170, 0x0a9, 0, 0, Local0, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z170, 0x0aa, 0, 0, ^^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, ^^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^^dz05.iy07, Local0) mm0a() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z170, 0x0ab, 0, 0, Local0, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z170, 0x0ac, 0, 0, ^^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, ^^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^^dz05.iy07, Local0) mm09() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z170, 0x0ad, 0, 0, Local0, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z170, 0x0ae, 0, 0, ^^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, ^^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^^dz05.iy07, Local0) mm08() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z170, 0x0af, 0, 0, Local0, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z170, 0x0b0, 0, 0, ^^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, ^^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^^dz05.iy07, Local0) mm07() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z170, 0x0b1, 0, 0, Local0, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z170, 0x0b2, 0, 0, ^^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, ^^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^^dz05.iy07, Local0) mm06() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z170, 0x0b3, 0, 0, Local0, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z170, 0x0b4, 0, 0, ^^^^^^dz05.iy07, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, ^^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^^dz05.iy07, Local0) mm05() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z170, 0x0b5, 0, 0, Local0, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z170, 0x0b6, 0, 0, ^^^^^dz05.iy07, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, ^^^^^dz05.iy07, 0xabcd3900) } } Store (^^^^dz05.iy07, Local0) mm04() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z170, 0x0b7, 0, 0, Local0, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^^dz05.iy07, 0xabcd3900)) { - err(ts, z170, 0x0b8, 0, 0, ^^^^dz05.iy07, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, ^^^^dz05.iy07, 0xabcd3900) } } Store (^^^dz05.iy07, Local0) mm03() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z170, 0x0b9, 0, 0, Local0, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^^dz05.iy07, 0xabcd3900)) { - err(ts, z170, 0x0ba, 0, 0, ^^^dz05.iy07, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, ^^^dz05.iy07, 0xabcd3900) } } Store (^^dz05.iy07, Local0) mm02() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z170, 0x0bb, 0, 0, Local0, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^^dz05.iy07, 0xabcd3900)) { - err(ts, z170, 0x0bc, 0, 0, ^^dz05.iy07, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, ^^dz05.iy07, 0xabcd3900) } } Store (^dz05.iy07, Local0) mm01() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z170, 0x0bd, 0, 0, Local0, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(^dz05.iy07, 0xabcd3900)) { - err(ts, z170, 0x0be, 0, 0, ^dz05.iy07, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, ^dz05.iy07, 0xabcd3900) } } @@ -2441,10 +2441,10 @@ Method(mt15,, Serialized) Store (dz05.iy07, Local0) mm00() if (LNotEqual(Local0, 0xabcd3900)) { - err(ts, z170, 0x0bf, 0, 0, Local0, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, Local0, 0xabcd3900) } if (LNotEqual(dz05.iy07, 0xabcd3900)) { - err(ts, z170, 0x0c0, 0, 0, dz05.iy07, 0xabcd3900) + err(ts, z170, __LINE__, 0, 0, dz05.iy07, 0xabcd3900) } CH03(ts, z170, 0x122, 0, 0) @@ -2536,7 +2536,7 @@ Method(mt16, 1, Serialized) Store(1, i001) mm00() if (LNotEqual(i000, 0xabcd4904)) { - err(ts, z170, 0x0c3, 0, 0, i000, 0xabcd4904) + err(ts, z170, __LINE__, 0, 0, i000, 0xabcd4904) } } elseif (LEqual(arg0, 2)) { @@ -2546,7 +2546,7 @@ Method(mt16, 1, Serialized) Store(2, i001) mm00() if (LNotEqual(i000, 0xabcd4905)) { - err(ts, z170, 0x0c4, 0, 0, i000, 0xabcd4905) + err(ts, z170, __LINE__, 0, 0, i000, 0xabcd4905) } } elseif (LEqual(arg0, 3)) { @@ -2557,7 +2557,7 @@ Method(mt16, 1, Serialized) Store(3, i001) mm00() if (LNotEqual(i000, 0xabcd6900)) { - err(ts, z170, 0x1c4, 0, 0, i000, 0xabcd6900) + err(ts, z170, __LINE__, 0, 0, i000, 0xabcd6900) } } @@ -2898,7 +2898,7 @@ if (LEqual(arg0, 1)) { Store(1, i001) mm00() if (LNotEqual(i000, 0xabcd4906)) { - err(ts, z170, 0x0c8, 0, 0, i000, 0xabcd4906) + err(ts, z170, __LINE__, 0, 0, i000, 0xabcd4906) } } elseif (LEqual(arg0, 2)) { @@ -2908,7 +2908,7 @@ if (LEqual(arg0, 1)) { Store(2, i001) mm00() if (LNotEqual(i000, 0xabcd4907)) { - err(ts, z170, 0x0c9, 0, 0, i000, 0xabcd4907) + err(ts, z170, __LINE__, 0, 0, i000, 0xabcd4907) } } elseif (LEqual(arg0, 3)) { @@ -2919,7 +2919,7 @@ if (LEqual(arg0, 1)) { Store(3, i001) mm00() if (LNotEqual(i000, 0xabcd4908)) { - err(ts, z170, 0x0ca, 0, 0, i000, 0xabcd4908) + err(ts, z170, __LINE__, 0, 0, i000, 0xabcd4908) } } @@ -2940,12 +2940,12 @@ Method(mt18, 1, Serialized) if (arg0) { Store(0xabcd9000, \mt18.dz05.iy07) if (LNotEqual(\mt18.dz05.iy07, 0xabcd9000)) { - err(ts, z170, 0x0ca, 0, 0, \mt18.dz05.iy07, 0xabcd9000) + err(ts, z170, __LINE__, 0, 0, \mt18.dz05.iy07, 0xabcd9000) } } else { Store(0xabcd9001, dz05.iy07) if (LNotEqual(dz05.iy07, 0xabcd9001)) { - err(ts, z170, 0x0ca, 0, 0, dz05.iy07, 0xabcd9001) + err(ts, z170, __LINE__, 0, 0, dz05.iy07, 0xabcd9001) } } @@ -2966,12 +2966,12 @@ Method(mt19, 1, Serialized) if (arg0) { Store(0xabcd9002, \mt19.pr7d.iy07) if (LNotEqual(\mt19.pr7d.iy07, 0xabcd9002)) { - err(ts, z170, 0x0ca, 0, 0, \mt19.pr7d.iy07, 0xabcd9002) + err(ts, z170, __LINE__, 0, 0, \mt19.pr7d.iy07, 0xabcd9002) } } else { Store(0xabcd9003, pr7d.iy07) if (LNotEqual(pr7d.iy07, 0xabcd9003)) { - err(ts, z170, 0x0ca, 0, 0, pr7d.iy07, 0xabcd9003) + err(ts, z170, __LINE__, 0, 0, pr7d.iy07, 0xabcd9003) } } @@ -2986,12 +2986,12 @@ Method(mt1a, 1, Serialized) if (arg0) { Store(0xabcd9004, \pr7d.iy07) if (LNotEqual(\pr7d.iy07, 0xabcd9004)) { - err(ts, z170, 0x0ca, 0, 0, \pr7d.iy07, 0xabcd9004) + err(ts, z170, __LINE__, 0, 0, \pr7d.iy07, 0xabcd9004) } } else { Store(0xabcd9005, ^pr7d.iy07) if (LNotEqual(^pr7d.iy07, 0xabcd9005)) { - err(ts, z170, 0x0ca, 0, 0, ^pr7d.iy07, 0xabcd9005) + err(ts, z170, __LINE__, 0, 0, ^pr7d.iy07, 0xabcd9005) } } CH03(ts, z170, 0x0d1, 0, 0) diff --git a/tests/aslts/src/runtime/collections/Identity2MS/abbu/misc/ms0.asl b/tests/aslts/src/runtime/collections/Identity2MS/abbu/misc/ms0.asl index 473e9b021..22ffee3d7 100644 --- a/tests/aslts/src/runtime/collections/Identity2MS/abbu/misc/ms0.asl +++ b/tests/aslts/src/runtime/collections/Identity2MS/abbu/misc/ms0.asl @@ -66,7 +66,7 @@ Method(ms00,, Serialized) Store (Local0, Debug) if (LNotEqual(Local0, 0x1777777)) { - err(ts, z162, 0x000, 0, 0, Local0, 0x1777777) + err(ts, z162, __LINE__, 0, 0, Local0, 0x1777777) } } @@ -91,7 +91,7 @@ Method(ms01, 1, Serialized) { Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, tp00)) { - err(ts, z162, 0x003, 0, 0, Local0, tp00) + err(ts, z162, __LINE__, 0, 0, Local0, tp00) } } @@ -104,7 +104,7 @@ Method(ms01, 1, Serialized) Store(ObjectType(bf00), Local0) if (LNotEqual(Local0, c016)) { - err(ts, z162, 0x004, 0, 0, Local0, c016) + err(ts, z162, __LINE__, 0, 0, Local0, c016) } m000(bf00) @@ -112,19 +112,19 @@ Method(ms01, 1, Serialized) Store(bf00, i000) Store(ObjectType(i000), Local0) if (LNotEqual(Local0, c009)) { - err(ts, z162, 0x005, 0, 0, Local0, c009) + err(ts, z162, __LINE__, 0, 0, Local0, c009) } Store(bf00, Local1) Store(ObjectType(Local1), Local0) if (LNotEqual(Local0, tp00)) { - err(ts, z162, 0x006, 0, 0, Local0, tp00) + err(ts, z162, __LINE__, 0, 0, Local0, tp00) } Store(bf00, arg0) Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, tp00)) { - err(ts, z162, 0x007, 0, 0, Local0, tp00) + err(ts, z162, __LINE__, 0, 0, Local0, tp00) } } @@ -144,7 +144,7 @@ Method(ms02, 1, Serialized) { Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, tp00)) { - err(ts, z162, 0x008, 0, 0, Local0, tp00) + err(ts, z162, __LINE__, 0, 0, Local0, tp00) } } @@ -152,7 +152,7 @@ Method(ms02, 1, Serialized) Store(ObjectType(f000), Local0) if (LNotEqual(Local0, c00d)) { - err(ts, z162, 0x009, 0, 0, Local0, c00d) + err(ts, z162, __LINE__, 0, 0, Local0, c00d) } m000(f000) @@ -160,19 +160,19 @@ Method(ms02, 1, Serialized) Store(f000, i000) Store(ObjectType(i000), Local0) if (LNotEqual(Local0, c009)) { - err(ts, z162, 0x00a, 0, 0, Local0, c009) + err(ts, z162, __LINE__, 0, 0, Local0, c009) } Store(f000, Local1) Store(ObjectType(Local1), Local0) if (LNotEqual(Local0, tp00)) { - err(ts, z162, 0x00b, 0, 0, Local0, tp00) + err(ts, z162, __LINE__, 0, 0, Local0, tp00) } Store(f000, arg0) Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, tp00)) { - err(ts, z162, 0x00c, 0, 0, Local0, tp00) + err(ts, z162, __LINE__, 0, 0, Local0, tp00) } } @@ -203,7 +203,7 @@ Method(ms03,, Serialized) Store(DerefOf(Local0), Local1) if (LNotEqual(Local1, 0xabcd0001)) { - err("ms03", z162, 0x00d, 0, 0, Local0, c00d) + err("ms03", z162, __LINE__, 0, 0, Local0, c00d) } } diff --git a/tests/aslts/src/runtime/collections/Identity2MS/abbu/misc/ms1.asl b/tests/aslts/src/runtime/collections/Identity2MS/abbu/misc/ms1.asl index c173ddbd4..3c0af561f 100644 --- a/tests/aslts/src/runtime/collections/Identity2MS/abbu/misc/ms1.asl +++ b/tests/aslts/src/runtime/collections/Identity2MS/abbu/misc/ms1.asl @@ -108,7 +108,7 @@ Method(ms10, 1, Serialized) OUTP(Local0) if (LNotEqual(arg1, Local0)) { - err(ts, z179, 0x000, 0, 0, Local0, arg1) + err(ts, z179, __LINE__, 0, 0, Local0, arg1) } } @@ -129,11 +129,11 @@ Method(ms10, 1, Serialized) if (LAnd(ABUU, LNot(q004))) { // Implicit Operand conversion on MS contradicts ACPI Spec if (LNotEqual(arg2, INT0)) { - err(ts, z179, 0x001, 0, 0, INT0, arg2) + err(ts, z179, __LINE__, 0, 0, INT0, arg2) } } else { if (LNotEqual(arg1, INT0)) { - err(ts, z179, 0x001, 0, 0, INT0, arg1) + err(ts, z179, __LINE__, 0, 0, INT0, arg1) } } } @@ -324,7 +324,7 @@ Method(ms13, 1, Serialized) Store(Derefof(arg0), Local0) if (CH03(ts, z179, 0x00c, 0, 0)) { } elseif (LNotEqual(Local0, arg1)) { - err(ts, z179, 0x00d, 0, 0, Local0, arg1) + err(ts, z179, __LINE__, 0, 0, Local0, arg1) } } @@ -340,7 +340,7 @@ Method(ms13, 1, Serialized) Store(Derefof(arg0), Local0) if (CH03(ts, z179, 0x00e, 0, 0)) { } elseif (LNotEqual(Local0, arg1)) { - err(ts, z179, 0x00f, 0, 0, Local0, arg1) + err(ts, z179, __LINE__, 0, 0, Local0, arg1) } } @@ -432,7 +432,7 @@ Method(ms14, 1, Serialized) Index(m001, 0, Local0) if (LAnd(ABUU, LNot(q005))) { } elseif (LNot(i001)) { - err(ts, z179, 0x01a, 0, 0, i001, 0) + err(ts, z179, __LINE__, 0, 0, i001, 0) } } elseif (LEqual(arg0, 1)) { OUTP("Start of test: Method returns (Package(){10,2,3,4,5})") @@ -440,7 +440,7 @@ Method(ms14, 1, Serialized) Index(m001, 0, Local0) if (LAnd(ABUU, LNot(q005))) { } elseif (LNot(i001)) { - err(ts, z179, 0x01c, 0, 0, i001, 0) + err(ts, z179, __LINE__, 0, 0, i001, 0) } } elseif (LEqual(arg0, 2)) { OUTP("Start of test: Name(b001, Buffer(){10,2,3,4,5})") @@ -516,7 +516,7 @@ Method(ms15, 1, Serialized) Store(Derefof(arg0), Local0) if (CH03(ts, z179, 0x020, 0, 0)) { } elseif (LNotEqual(Local0, arg1)) { - err(ts, z179, 0x021, 0, 0, Local0, arg1) + err(ts, z179, __LINE__, 0, 0, Local0, arg1) } } @@ -533,7 +533,7 @@ Method(ms15, 1, Serialized) Store(Derefof(arg0), Local0) if (CH03(ts, z179, 0x022, 0, 0)) { } elseif (LNotEqual(Local0, arg1)) { - err(ts, z179, 0x023, 0, 0, Local0, arg1) + err(ts, z179, __LINE__, 0, 0, Local0, arg1) } } @@ -550,7 +550,7 @@ Method(ms15, 1, Serialized) Store(Derefof(arg0), Local0) if (CH03(ts, z179, 0x024, 0, 0)) { } elseif (LNotEqual(Local0, arg1)) { - err(ts, z179, 0x025, 0, 0, Local0, arg1) + err(ts, z179, __LINE__, 0, 0, Local0, arg1) } } @@ -567,7 +567,7 @@ Method(ms15, 1, Serialized) Store(Derefof(arg0), Local0) if (CH03(ts, z179, 0x026, 0, 0)) { } elseif (LNotEqual(Local0, arg1)) { - err(ts, z179, 0x027, 0, 0, Local0, arg1) + err(ts, z179, __LINE__, 0, 0, Local0, arg1) } } @@ -584,7 +584,7 @@ Method(ms15, 1, Serialized) Store(Derefof(arg0), Local0) if (CH03(ts, z179, 0x028, 0, 0)) { } elseif (LNotEqual(Local0, arg1)) { - err(ts, z179, 0x029, 0, 0, Local0, arg1) + err(ts, z179, __LINE__, 0, 0, Local0, arg1) } } @@ -601,7 +601,7 @@ Method(ms15, 1, Serialized) Store(Derefof(arg0), Local0) if (CH03(ts, z179, 0x02a, 0, 0)) { } elseif (LNotEqual(Local0, arg1)) { - err(ts, z179, 0x02b, 0, 0, Local0, arg1) + err(ts, z179, __LINE__, 0, 0, Local0, arg1) } } @@ -654,7 +654,7 @@ Method(ms16, 1, Serialized) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, 1)) { - err(ts, z179, 0x02e, 0, 0, Local2, 1) + err(ts, z179, __LINE__, 0, 0, Local2, 1) if (LEqual(Local2, 2)) { OUTP(Local1) } else { @@ -663,7 +663,7 @@ Method(ms16, 1, Serialized) } else { OUTP(Local1) if (LNotEqual(Local1, 0xd650a284)) { - err(ts, z179, 0x02f, 0, 0, Local1, 0xd650a284) + err(ts, z179, __LINE__, 0, 0, Local1, 0xd650a284) } else { OUTP("Ok") } @@ -694,14 +694,14 @@ Method(ms16, 1, Serialized) if (LAnd(ABUU, LNot(q006))) { if (LNotEqual(Local2, 2)) { - err(ts, z179, 0x030, 0, 0, Local2, 2) + err(ts, z179, __LINE__, 0, 0, Local2, 2) } } elseif (LNotEqual(Local2, 1)) { - err(ts, z179, 0x030, 0, 0, Local2, 1) + err(ts, z179, __LINE__, 0, 0, Local2, 1) } else { OUTP(Local1) if (LNotEqual(Local1, 0xd650a284)) { - err(ts, z179, 0x031, 0, 0, Local1, 0xd650a284) + err(ts, z179, __LINE__, 0, 0, Local1, 0xd650a284) } else { OUTP("Ok") } @@ -734,14 +734,14 @@ Method(ms16, 1, Serialized) if (LAnd(ABUU, LNot(q006))) { if (LNotEqual(Local2, 2)) { - err(ts, z179, 0x032, 0, 0, Local2, 2) + err(ts, z179, __LINE__, 0, 0, Local2, 2) } } elseif (LNotEqual(Local2, 0xE)) { - err(ts, z179, 0x032, 0, 0, Local2, 0xE) + err(ts, z179, __LINE__, 0, 0, Local2, 0xE) } elseif (y118) { OUTP(Local1) if (LNotEqual(Local1, 10)) { - err(ts, z179, 0x033, 0, 0, Local1, 10) + err(ts, z179, __LINE__, 0, 0, Local1, 10) } else { OUTP("Ok") } @@ -771,14 +771,14 @@ Method(ms16, 1, Serialized) if (LAnd(ABUU, LNot(q007))) { if (LNotEqual(Local2, 3)) { - err(ts, z179, 0x034, 0, 0, Local2, 3) + err(ts, z179, __LINE__, 0, 0, Local2, 3) } } elseif (LNotEqual(Local2, 1)) { - err(ts, z179, 0x034, 0, 0, Local2, 1) + err(ts, z179, __LINE__, 0, 0, Local2, 1) } else { OUTP(Local1) if (LNotEqual(Local1, 10)) { - err(ts, z179, 0x035, 0, 0, Local1, 10) + err(ts, z179, __LINE__, 0, 0, Local1, 10) } else { OUTP("Ok") } @@ -809,14 +809,14 @@ Method(ms16, 1, Serialized) if (LAnd(ABUU, LNot(q007))) { if (LNotEqual(Local2, 3)) { - err(ts, z179, 0x036, 0, 0, Local2, 3) + err(ts, z179, __LINE__, 0, 0, Local2, 3) } } elseif (LNotEqual(Local2, 1)) { - err(ts, z179, 0x036, 0, 0, Local2, 1) + err(ts, z179, __LINE__, 0, 0, Local2, 1) } else { OUTP(Local1) if (LNotEqual(Local1, 10)) { - err(ts, z179, 0x037, 0, 0, Local1, 10) + err(ts, z179, __LINE__, 0, 0, Local1, 10) } else { OUTP("Ok") } @@ -850,11 +850,11 @@ Method(ms16, 1, Serialized) Store(ObjectType(p915), Local2) if (LNotEqual(Local2, 1)) { - err(ts, z179, 0x038, 0, 0, Local2, 1) + err(ts, z179, __LINE__, 0, 0, Local2, 1) } else { OUTP(p915) if (LNotEqual(m000(p915), 10)) { - err(ts, z179, 0x039, 0, 0, p915, 10) + err(ts, z179, __LINE__, 0, 0, p915, 10) } else { OUTP("Ok") } @@ -885,14 +885,14 @@ Method(ms16, 1, Serialized) if (LAnd(ABUU, LNot(q006))) { if (LNotEqual(Local2, 2)) { - err(ts, z179, 0x03a, 0, 0, Local2, 2) + err(ts, z179, __LINE__, 0, 0, Local2, 2) } } elseif (LNotEqual(Local2, 1)) { - err(ts, z179, 0x03a, 0, 0, Local2, 1) + err(ts, z179, __LINE__, 0, 0, Local2, 1) } else { OUTP(Local1) if (LNotEqual(Local1, 0xd650a284)) { - err(ts, z179, 0x03b, 0, 0, Local1, 0xd650a284) + err(ts, z179, __LINE__, 0, 0, Local1, 0xd650a284) } else { OUTP("Ok") } @@ -972,7 +972,7 @@ Method(ms17, 1, Serialized) OUTP(Local7) if (LNotEqual(Local6, Local7)) { - err(ts, z179, 0x040, 0, 0, Local6, Local7) + err(ts, z179, __LINE__, 0, 0, Local6, Local7) } OUTP("m000 finished") @@ -1000,7 +1000,7 @@ Method(ms17, 1, Serialized) Add(i001, 1, Local7) CH03(ts, z179, 0x043, 0, 0) if (LNotEqual(Local6, Local7)) { - err(ts, z179, 0x044, 0, 0, Local6, Local7) + err(ts, z179, __LINE__, 0, 0, Local6, Local7) } OUTP("m001 finished") @@ -1015,7 +1015,7 @@ Method(ms17, 1, Serialized) CH03(ts, z179, 0x045, 0, 0) OUTP("After Add") if (LNotEqual(8, Local7)) { - err(ts, z179, 0x046, 0, 0, Local7, 8) + err(ts, z179, __LINE__, 0, 0, Local7, 8) } OUTP("m002 finished") @@ -1030,7 +1030,7 @@ Method(ms17, 1, Serialized) CH03(ts, z179, 0x047, 0, 0) OUTP("After Add") if (LNotEqual(8, Local7)) { - err(ts, z179, 0x048, 0, 0, Local7, 8) + err(ts, z179, __LINE__, 0, 0, Local7, 8) } OUTP("m003 finished") @@ -1150,7 +1150,7 @@ Method(ms19, 1, Serialized) Store(DerefOf(Local0), Local1) if (LNotEqual(Local1, 0x1234)) { - err(ts, z179, 0x051, 0, 0, Local1, 0x1234) + err(ts, z179, __LINE__, 0, 0, Local1, 0x1234) } OUTP("a128 finished") @@ -1194,7 +1194,7 @@ Method(ms19, 1, Serialized) Store(DerefOf(ref0), Local1) if (LNotEqual(Local1, 0x1234)) { - err(ts, z179, 0x054, 0, 0, Local1, 0x1234) + err(ts, z179, __LINE__, 0, 0, Local1, 0x1234) } OUTP("c128 finished") @@ -1215,7 +1215,7 @@ Method(ms19, 1, Serialized) Store(DerefOf(DerefOf(Index(p000, 0))), Local1) if (LNotEqual(Local1, 0x1234)) { - err(ts, z179, 0x055, 0, 0, Local1, 0x1234) + err(ts, z179, __LINE__, 0, 0, Local1, 0x1234) } OUTP("d128 finished") @@ -1236,7 +1236,7 @@ Method(ms19, 1, Serialized) Store(DerefOf(DerefOf(Index(p000, 0))), Local1) if (LNotEqual(Local1, 0x1234)) { - err(ts, z179, 0x056, 0, 0, Local1, 0x1234) + err(ts, z179, __LINE__, 0, 0, Local1, 0x1234) } OUTP("d128 finished") @@ -1323,9 +1323,9 @@ Method(ms1a, 1, Serialized) */ if (LEqual(i001, 0)) { - err(ts, z179, 0x059, 0, 0, i001, 0) + err(ts, z179, __LINE__, 0, 0, i001, 0) } elseif (LNotEqual(i000, 5)) { - err(ts, z179, 0x05a, 0, 0, i000, 5) + err(ts, z179, __LINE__, 0, 0, i000, 5) } else { OUTP("Ok a131") } @@ -1358,9 +1358,9 @@ Method(ms1a, 1, Serialized) */ if (LEqual(i001, 0)) { - err(ts, z179, 0x05b, 0, 0, i001, 0) + err(ts, z179, __LINE__, 0, 0, i001, 0) } elseif (LNotEqual(i000, 0x15)) { - err(ts, z179, 0x05c, 0, 0, i000, 0x15) + err(ts, z179, __LINE__, 0, 0, i000, 0x15) } else { OUTP("Ok b131") } @@ -1393,9 +1393,9 @@ Method(ms1a, 1, Serialized) Store(0x25, Derefof(Local1)) if (LEqual(i001, 0)) { - err(ts, z179, 0x05d, 0, 0, i001, 0) + err(ts, z179, __LINE__, 0, 0, i001, 0) } elseif (LNotEqual(i000, 0x25)) { - err(ts, z179, 0x05e, 0, 0, i000, 0x25) + err(ts, z179, __LINE__, 0, 0, i000, 0x25) } else { OUTP("Ok c131") } @@ -1424,9 +1424,9 @@ Method(ms1a, 1, Serialized) RSTO(0x35, m000()) if (LEqual(i001, 0)) { - err(ts, z179, 0x05f, 0, 0, i001, 0) + err(ts, z179, __LINE__, 0, 0, i001, 0) } elseif (LNotEqual(i000, 0x35)) { - err(ts, z179, 0x050, 0, 0, i000, 0x35) + err(ts, z179, __LINE__, 0, 0, i000, 0x35) } else { OUTP("Ok d131") } @@ -1448,7 +1448,7 @@ Method(ms1a, 1, Serialized) Store(m000(), Local0) if (LEqual(i001, 0)) { - err(ts, z179, 0x061, 0, 0, i001, 0) + err(ts, z179, __LINE__, 0, 0, i001, 0) } else { OUTP("Ok e131") } @@ -1524,7 +1524,7 @@ Method(ms1b, 1, Serialized) OUTP("After Add") if (LNotEqual(Local7, 0x78)) { - err(ts, z179, 0x065, 0, 0, Local7, 0x78) + err(ts, z179, __LINE__, 0, 0, Local7, 0x78) } else { OUTP("Ok 0") } @@ -1611,7 +1611,7 @@ Method(ms1c, 1, Serialized) Store(RefOf(i000), Local0) m000(Local0) if (LNotEqual(i000, 0x77)) { - err(ts, z179, 0x068, 0, 0, i000, 0x77) + err(ts, z179, __LINE__, 0, 0, i000, 0x77) } else { OUTP("Ok 0") } @@ -1624,7 +1624,7 @@ Method(ms1c, 1, Serialized) m000(Local0) Store(Derefof(Local0), Local1) if (LNotEqual(Local1, 0x77)) { - err(ts, z179, 0x069, 0, 0, Local1, 0x77) + err(ts, z179, __LINE__, 0, 0, Local1, 0x77) } else { OUTP("Ok 1") } @@ -1638,7 +1638,7 @@ Method(ms1c, 1, Serialized) Store(Derefof(Local0), Local1) if (LNotEqual(Local1, 0x77)) { - err(ts, z179, 0x06a, 0, 0, Local1, 0x77) + err(ts, z179, __LINE__, 0, 0, Local1, 0x77) } else { OUTP("Ok 2") } @@ -1651,7 +1651,7 @@ Method(ms1c, 1, Serialized) Store(DerefOf(Local0), Local1) if (LNotEqual(Local1, 0)) { - err(ts, z179, 0x06b, 0, 0, Local1, 0) + err(ts, z179, __LINE__, 0, 0, Local1, 0) } else { OUTP("Ok 3") } @@ -1666,7 +1666,7 @@ Method(ms1c, 1, Serialized) Store(DerefOf(Local0), Local1) if (LNotEqual(Local1, 0x77)) { - err(ts, z179, 0x06c, 0, 0, Local1, 0x77) + err(ts, z179, __LINE__, 0, 0, Local1, 0x77) } else { OUTP("Ok 4") } @@ -1742,13 +1742,13 @@ Method(ms1d, 1, Serialized) if (LAnd(ABUU, LNot(q008))) { if (LNotEqual(i000, 0x88)) { - err(ts, z179, 0x06f, 0, 0, i000, 0x88) + err(ts, z179, __LINE__, 0, 0, i000, 0x88) } } elseif (LNotEqual(i000, 0x11)) { - err(ts, z179, 0x06f, 0, 0, i000, 0x11) + err(ts, z179, __LINE__, 0, 0, i000, 0x11) } else { if (LNotEqual(Local6, 0x88)) { - err(ts, z179, 0x070, 0, 0, Local6, 0x88) + err(ts, z179, __LINE__, 0, 0, Local6, 0x88) } else { OUTP("Ok 0:") } @@ -1774,13 +1774,13 @@ Method(ms1d, 1, Serialized) if (LAnd(ABUU, LNot(q008))) { if (LNotEqual(i000, 0x88)) { - err(ts, z179, 0x071, 0, 0, i000, 0x88) + err(ts, z179, __LINE__, 0, 0, i000, 0x88) } } elseif (LNotEqual(i000, 0x11)) { - err(ts, z179, 0x071, 0, 0, i000, 0x11) + err(ts, z179, __LINE__, 0, 0, i000, 0x11) } else { if (LNotEqual(arg6, 0x88)) { - err(ts, z179, 0x072, 0, 0, arg6, 0x88) + err(ts, z179, __LINE__, 0, 0, arg6, 0x88) } else { OUTP("Ok 1:") } @@ -1806,15 +1806,15 @@ Method(ms1d, 1, Serialized) if (LAnd(ABUU, LNot(q008))) { if (LNotEqual(i000, 0x88)) { - err(ts, z179, 0x073, 0, 0, i000, 0x88) + err(ts, z179, __LINE__, 0, 0, i000, 0x88) } } elseif (LNotEqual(i000, 0x11)) { - err(ts, z179, 0x073, 0, 0, i000, 0x11) + err(ts, z179, __LINE__, 0, 0, i000, 0x11) OUTP(i000) } else { Store(DerefOf(arg6), Local1) if (LNotEqual(Local1, 0x88)) { - err(ts, z179, 0x074, 0, 0, Local1, 0x88) + err(ts, z179, __LINE__, 0, 0, Local1, 0x88) } else { OUTP("Ok 1:") } @@ -1879,7 +1879,7 @@ Method(ms1e,, Serialized) if (LEqual(b000, b001)) { OUTP("Ok") } else { - err(ts, z179, 0x077, 0, 0, b000, b001) + err(ts, z179, __LINE__, 0, 0, b000, b001) } OUTP(b000) OUTP(b001) @@ -1912,7 +1912,7 @@ Method(ms1f, 1, Serialized) CH03(ts, z179, 0x07a, 0, 0) Store(ObjectType(Index(PREF, Arg1)), Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x07b, 0, 0, Local1, Local0) + err(ts, z179, __LINE__, 0, 0, Local1, Local0) } } @@ -1995,14 +1995,14 @@ Method(ms20, 1, Serialized) Store (Y, Local0) if (LNotEqual(Local0, 2)) { - err(ts, z179, 0x07e, 0, 0, Local0, 2) + err(ts, z179, __LINE__, 0, 0, Local0, 2) } Name (Y, 1) Store (Y, Local0) if (LNotEqual(Local0, 1)) { - err(ts, z179, 0x07f, 0, 0, Local0, 1) + err(ts, z179, __LINE__, 0, 0, Local0, 1) } } Method(mfr1,, Serialized) @@ -2014,12 +2014,12 @@ Method(ms20, 1, Serialized) Store (^Y, Local0) if (LNotEqual(Local0, 2)) { - err(ts, z179, 0x080, 0, 0, Local0, 2) + err(ts, z179, __LINE__, 0, 0, Local0, 2) } Store (Y, Local0) if (LNotEqual(Local0, 1)) { - err(ts, z179, 0x081, 0, 0, Local0, 1) + err(ts, z179, __LINE__, 0, 0, Local0, 1) } } @@ -2034,7 +2034,7 @@ Method(ms20, 1, Serialized) Store (^mfr2.Y, Local0) if (LNotEqual(Local0, 1)) { - err(ts, z179, 0x083, 0, 0, Local0, 1) + err(ts, z179, __LINE__, 0, 0, Local0, 1) } } @@ -2046,7 +2046,7 @@ Method(ms20, 1, Serialized) Store (^mfr3.Y, Local0) if (LNotEqual(Local0, 1)) { - err(ts, z179, 0x084, 0, 0, Local0, 1) + err(ts, z179, __LINE__, 0, 0, Local0, 1) } } @@ -2188,7 +2188,7 @@ Method(ms22, 1, Serialized) Store(cact(0), Local0) if (LNotEqual(Local0, 0)) { - err(ts, z179, 0x08a, 0, 0, Local0, 0) + err(ts, z179, __LINE__, 0, 0, Local0, 0) } } @@ -2200,7 +2200,7 @@ Method(ms22, 1, Serialized) Store(cact(1), Local0) if (LNotEqual(Local0, 0xffffffff)) { - err(ts, z179, 0x08b, 0, 0, Local0, 0xffffffff) + err(ts, z179, __LINE__, 0, 0, Local0, 0xffffffff) } } @@ -2268,7 +2268,7 @@ Method(ms23, 1, Serialized) if (SLCK) { if (CH03(ts, z179, 0x08f, 0, 0)) {return} if (LNotEqual(Local0, 0xabcd)) { - err(ts, z179, 0x090, 0, 0, Local0, 0xabcd) + err(ts, z179, __LINE__, 0, 0, Local0, 0xabcd) } } else { CH04(ts, 0, 0xff, z179, 0x091, 0, 0) @@ -2316,7 +2316,7 @@ Method(ms23, 1, Serialized) if (SLCK) { if (CH03(ts, z179, 0x093, 0, 0)) {return} if (LNotEqual(Local0, 0xabce)) { - err(ts, z179, 0x094, 0, 0, Local0, 0xabce) + err(ts, z179, __LINE__, 0, 0, Local0, 0xabce) } } else { CH04(ts, 0, 0xff, z179, 0x095, 0, 0) @@ -2356,7 +2356,7 @@ Method(ms23, 1, Serialized) Store(0xabcd000f, Local0) } if (LNotEqual(i000, Local0)) { - err(ts, z179, 0x097, 0, 0, i000, Local0) + err(ts, z179, __LINE__, 0, 0, i000, Local0) } } else { CH04(ts, 0, 0xff, z179, 0x098, 0, 0) @@ -2394,7 +2394,7 @@ Method(ms23, 1, Serialized) Store(0xabcd000d, Local0) } if (LNotEqual(i000, Local0)) { - err(ts, z179, 0x09a, 0, 0, i000, Local0) + err(ts, z179, __LINE__, 0, 0, i000, Local0) } } else { CH04(ts, 0, 0xff, z179, 0x09b, 0, 0) @@ -2433,7 +2433,7 @@ Method(ms23, 1, Serialized) Store(0xabcd000e, Local0) } if (LNotEqual(i000, Local0)) { - err(ts, z179, 0x09d, 0, 0, i000, Local0) + err(ts, z179, __LINE__, 0, 0, i000, Local0) } } else { CH04(ts, 0, 0xff, z179, 0x09e, 0, 0) @@ -2513,9 +2513,9 @@ Method(ms24,, Serialized) Store(ObjectType(s001), Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0a1, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } elseif (LNotEqual(s000, s001)) { - err(ts, z179, 0x0a2, 0, 0, s000, s001) + err(ts, z179, __LINE__, 0, 0, s000, s001) } else { OUTP("Ok Subtract/Decrement for String") } @@ -2531,9 +2531,9 @@ Method(ms24,, Serialized) Store(ObjectType(b001), Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0a3, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } elseif (LNotEqual(b000, b001)) { - err(ts, z179, 0x0a4, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } else { OUTP("Ok Add/Increment for Buffer") } @@ -2567,7 +2567,7 @@ Method(ms25, 1, Serialized) Store(i001, Refof(i000)) CH03(ts, z179, 0x0a7, 0, 0) if (LNotEqual(i000, 0x12345678)) { - err(ts, z179, 0x0a8, 0, 0, i000, 0x12345678) + err(ts, z179, __LINE__, 0, 0, i000, 0x12345678) } } @@ -2581,7 +2581,7 @@ Method(ms25, 1, Serialized) Store(i001, DeRefof(Refof(i000))) CH03(ts, z179, 0x0a9, 0, 0) if (LNotEqual(i000, 0x12345678)) { - err(ts, z179, 0x0aa, 0, 0, i000, 0x12345678) + err(ts, z179, __LINE__, 0, 0, i000, 0x12345678) } } @@ -2597,7 +2597,7 @@ Method(ms25, 1, Serialized) Store(i001, DeRefof(Local2)) CH03(ts, z179, 0x0ab, 0, 0) if (LNotEqual(i000, 0x12345678)) { - err(ts, z179, 0x0ac, 0, 0, i000, 0x12345678) + err(ts, z179, __LINE__, 0, 0, i000, 0x12345678) } } @@ -2615,13 +2615,13 @@ Method(ms25, 1, Serialized) CH03(ts, z179, 0x0ad, 0, 0) if (LNotEqual(i000, 0xffffffff)) { - err(ts, z179, 0x0ae, 0, 0, i000, 0xffffffff) + err(ts, z179, __LINE__, 0, 0, i000, 0xffffffff) } Store(Derefof(Local1), Local4) if (CH04(ts, 0, 0xff, z179, 0x0af, 0, 0)) { } elseif (LNotEqual(Local1, 0x12345678)) { - err(ts, z179, 0x0b0, 0, 0, Local1, 0x12345678) + err(ts, z179, __LINE__, 0, 0, Local1, 0x12345678) } } @@ -2679,21 +2679,21 @@ Method(ms26, 1, Serialized) Store(FU01, Local0) Store(0, Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0b3, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } Store(0x5a, FU01) Store(FU01, Local0) Store(0x5a, Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0b4, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } Store(0x3c69, FU01) Store(FU01, Local0) Store(0x69, Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0b5, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } } @@ -2714,14 +2714,14 @@ Method(ms26, 1, Serialized) Store(FU01, Local0) Store(0, Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0b6, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } Store(0x5a, FU01) Store(FU01, Local0) Store(0x5a, Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0b7, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } Store(Buffer(){0x3c, 0x69}, FU01) @@ -2730,10 +2730,10 @@ Method(ms26, 1, Serialized) if (LAnd(ABUU, LNot(q009))) { Store(0x69, Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0b8, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } } elseif (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0b8, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } } @@ -2754,14 +2754,14 @@ Method(ms26, 1, Serialized) Store(FU01, Local0) Store(0, Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0b9, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } Store(0x5a, FU01) Store(FU01, Local0) Store(0x5a, Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0ba, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } Store("79", FU01) @@ -2770,10 +2770,10 @@ Method(ms26, 1, Serialized) if (LAnd(ABUU, LNot(q009))) { Store(0x39, Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0bb, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } } elseif (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0bb, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } } @@ -2794,14 +2794,14 @@ Method(ms26, 1, Serialized) Store(FU01, Local0) Store(0, Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0bc, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } Store(0x5a, FU01) Store(FU01, Local0) Store(0x1a, Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0bd, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } Store(Buffer(){0x7c, 0x69}, FU01) @@ -2810,10 +2810,10 @@ Method(ms26, 1, Serialized) if (LAnd(ABUU, LNot(q009))) { Store(0x29, Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0be, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } } elseif (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0be, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } Store(FU02, Local0) @@ -2821,10 +2821,10 @@ Method(ms26, 1, Serialized) if (LAnd(ABUU, LNot(q009))) { Store(0x01, Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0bf, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } } elseif (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0bf, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } } @@ -2845,14 +2845,14 @@ Method(ms26, 1, Serialized) Store(FU01, Local0) Store(0, Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0c0, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } Store(0x5a, FU01) Store(FU01, Local0) Store(0x1a, Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0c1, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } Store("79", FU01) @@ -2861,10 +2861,10 @@ Method(ms26, 1, Serialized) if (LAnd(ABUU, LNot(q009))) { Store(0x39, Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0c2, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } } elseif (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0c2, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } Store(FU02, Local0) @@ -2872,10 +2872,10 @@ Method(ms26, 1, Serialized) if (LAnd(ABUU, LNot(q009))) { Store(0x01, Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0c3, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } } elseif (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0c3, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } } @@ -2896,21 +2896,21 @@ Method(ms26, 1, Serialized) Store(FU01, Local0) Store(0, Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0c4, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } Store(0x5a, FU01) Store(FU01, Local0) Store(0x5a, Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0c5, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } Store(Buffer(){0x3c, 0x69}, FU01) Store(FU01, Local0) Store(0x13c, Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0c6, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } Store(FU02, Local0) @@ -2918,10 +2918,10 @@ Method(ms26, 1, Serialized) if (LAnd(ABUU, LNot(q009))) { Store(0x1a, Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0c7, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } } elseif (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0c7, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } } @@ -2942,21 +2942,21 @@ Method(ms26, 1, Serialized) Store(FU01, Local0) Store(0, Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0c8, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } Store(0x5a, FU01) Store(FU01, Local0) Store(0x5a, Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0c9, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } Store("79", FU01) Store(FU01, Local0) Store(0x137, Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0ca, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } Store(FU02, Local0) @@ -2964,10 +2964,10 @@ Method(ms26, 1, Serialized) if (LAnd(ABUU, LNot(q009))) { Store(0x0e, Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0cb, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } } elseif (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0cb, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } } @@ -2988,14 +2988,14 @@ Method(ms26, 1, Serialized) Store(FU01, Local0) Store(0, Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0cc, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } Store(0x5a, FU01) Store(FU01, Local0) Store(0x5a, Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0cd, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } Store(Buffer(){0x3c, 0x69, 0xa5}, FU01) @@ -3004,10 +3004,10 @@ Method(ms26, 1, Serialized) if (LAnd(ABUU, LNot(q009))) { Store(0xa5, Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0ce, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } } elseif (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0ce, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } Store(FU02, Local0) @@ -3015,10 +3015,10 @@ Method(ms26, 1, Serialized) if (LAnd(ABUU, LNot(q009))) { Store(0x1a, Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0cf, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } } elseif (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0cf, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } } @@ -3039,14 +3039,14 @@ Method(ms26, 1, Serialized) Store(FU01, Local0) Store(0, Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0d0, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } Store(0x5a, FU01) Store(FU01, Local0) Store(0x5a, Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0d1, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } Store("795", FU01) @@ -3055,10 +3055,10 @@ Method(ms26, 1, Serialized) if (LAnd(ABUU, LNot(q009))) { Store(0x35, Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0d2, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } } elseif (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0d2, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } Store(FU02, Local0) @@ -3066,10 +3066,10 @@ Method(ms26, 1, Serialized) if (LAnd(ABUU, LNot(q009))) { Store(0x0e, Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0d3, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } } elseif (LNotEqual(Local0, Local1)) { - err(ts, z179, 0x0d3, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } } @@ -3159,10 +3159,10 @@ Method(ms27, 1, Serialized) Multiply(arg0, 2, Local2) if (LNotEqual(Local0, arg1)) { - err(ts, z179, Add(0x0d6, Local2), 0, 0, Local0, arg1) + err(ts, z179, __LINE__, 0, 0, Local0, arg1) } if (LNotEqual(Local1, arg2)) { - err(ts, z179, Add(0x0d7, Local2), 0, 0, Local1, arg2) + err(ts, z179, __LINE__, 0, 0, Local1, arg2) } } @@ -3209,10 +3209,10 @@ Method(ms27, 1, Serialized) Multiply(arg0, 2, Local2) if (LNotEqual(Local0, arg1)) { - err(ts, z179, Add(0x0de, Local2), 0, 0, Local0, arg1) + err(ts, z179, __LINE__, 0, 0, Local0, arg1) } if (LNotEqual(Local1, arg2)) { - err(ts, z179, Add(0x0df, Local2), 0, 0, Local1, arg2) + err(ts, z179, __LINE__, 0, 0, Local1, arg2) } } @@ -3255,10 +3255,10 @@ Method(ms27, 1, Serialized) Multiply(arg0, 2, Local2) if (LNotEqual(Local0, arg1)) { - err(ts, z179, Add(0x0e6, Local2), 0, 0, Local0, arg1) + err(ts, z179, __LINE__, 0, 0, Local0, arg1) } if (LNotEqual(Local1, arg2)) { - err(ts, z179, Add(0x0e7, Local2), 0, 0, Local1, arg2) + err(ts, z179, __LINE__, 0, 0, Local1, arg2) } } @@ -3314,10 +3314,10 @@ Method(ms27, 1, Serialized) Multiply(arg0, 2, Local2) if (LNotEqual(Local0, arg1)) { - err(ts, z179, Add(0x0ee, Local2), 0, 0, Local0, arg1) + err(ts, z179, __LINE__, 0, 0, Local0, arg1) } if (LNotEqual(Local1, arg2)) { - err(ts, z179, Add(0x0ef, Local2), 0, 0, Local1, arg2) + err(ts, z179, __LINE__, 0, 0, Local1, arg2) } } @@ -3385,10 +3385,10 @@ Method(mt27, 1, Serialized) Multiply(arg0, 2, Local2) if (LNotEqual(Local0, arg1)) { - err(ts, z179, Add(0x0f0, Local2), 0, 0, Local0, arg1) + err(ts, z179, __LINE__, 0, 0, Local0, arg1) } if (LNotEqual(Local1, arg2)) { - err(ts, z179, Add(0x0f1, Local2), 0, 0, Local1, arg2) + err(ts, z179, __LINE__, 0, 0, Local1, arg2) } } @@ -3444,10 +3444,10 @@ Method(mt27, 1, Serialized) Multiply(arg0, 2, Local2) if (LNotEqual(Local0, arg1)) { - err(ts, z179, Add(0x0f8, Local2), 0, 0, Local0, arg1) + err(ts, z179, __LINE__, 0, 0, Local0, arg1) } if (LNotEqual(Local1, arg2)) { - err(ts, z179, Add(0x0f9, Local2), 0, 0, Local1, arg2) + err(ts, z179, __LINE__, 0, 0, Local1, arg2) } } @@ -3489,10 +3489,10 @@ Method(mt27, 1, Serialized) Multiply(arg0, 2, Local2) if (LNotEqual(Local0, arg1)) { - err(ts, z179, Add(0x100, Local2), 0, 0, Local0, arg1) + err(ts, z179, __LINE__, 0, 0, Local0, arg1) } if (LNotEqual(Local1, arg2)) { - err(ts, z179, Add(0x101, Local2), 0, 0, Local1, arg2) + err(ts, z179, __LINE__, 0, 0, Local1, arg2) } } @@ -3552,10 +3552,10 @@ Method(mt27, 1, Serialized) Multiply(arg0, 2, Local2) if (LNotEqual(Local0, arg1)) { - err(ts, z179, Add(0x108, Local2), 0, 0, Local0, arg1) + err(ts, z179, __LINE__, 0, 0, Local0, arg1) } if (LNotEqual(Local1, arg2)) { - err(ts, z179, Add(0x109, Local2), 0, 0, Local1, arg2) + err(ts, z179, __LINE__, 0, 0, Local1, arg2) } } @@ -3647,10 +3647,10 @@ Method(mu27, 1, Serialized) Multiply(arg0, 2, Local2) if (LNotEqual(Local0, arg1)) { - err(ts, z179, Add(0x118, Local2), 0, 0, Local0, arg1) + err(ts, z179, __LINE__, 0, 0, Local0, arg1) } if (LNotEqual(Local1, arg2)) { - err(ts, z179, Add(0x119, Local2), 0, 0, Local1, arg2) + err(ts, z179, __LINE__, 0, 0, Local1, arg2) } } @@ -3714,10 +3714,10 @@ Method(mu27, 1, Serialized) Multiply(arg0, 2, Local2) if (LNotEqual(Local0, arg1)) { - err(ts, z179, Add(0x120, Local2), 0, 0, Local0, arg1) + err(ts, z179, __LINE__, 0, 0, Local0, arg1) } if (LNotEqual(Local1, arg2)) { - err(ts, z179, Add(0x121, Local2), 0, 0, Local1, arg2) + err(ts, z179, __LINE__, 0, 0, Local1, arg2) } } @@ -3773,10 +3773,10 @@ Method(mu27, 1, Serialized) Multiply(arg0, 2, Local2) if (LNotEqual(Local0, arg1)) { - err(ts, z179, Add(0x128, Local2), 0, 0, Local0, arg1) + err(ts, z179, __LINE__, 0, 0, Local0, arg1) } if (LNotEqual(Local1, arg2)) { - err(ts, z179, Add(0x129, Local2), 0, 0, Local1, arg2) + err(ts, z179, __LINE__, 0, 0, Local1, arg2) } } @@ -3821,10 +3821,10 @@ Method(mu27, 1, Serialized) Multiply(arg0, 2, Local2) if (LNotEqual(Local0, arg1)) { - err(ts, z179, Add(0x130, Local2), 0, 0, Local0, arg1) + err(ts, z179, __LINE__, 0, 0, Local0, arg1) } if (LNotEqual(Local1, arg2)) { - err(ts, z179, Add(0x131, Local2), 0, 0, Local1, arg2) + err(ts, z179, __LINE__, 0, 0, Local1, arg2) } } @@ -3886,10 +3886,10 @@ Method(mv27, 1, Serialized) Multiply(arg0, 2, Local2) if (LNotEqual(Local0, arg1)) { - err(ts, z179, Add(0x138, Local2), 0, 0, Local0, arg1) + err(ts, z179, __LINE__, 0, 0, Local0, arg1) } if (LNotEqual(Local1, arg2)) { - err(ts, z179, Add(0x139, Local2), 0, 0, Local1, arg2) + err(ts, z179, __LINE__, 0, 0, Local1, arg2) } } @@ -3921,10 +3921,10 @@ Method(mv27, 1, Serialized) Add(0x140, Multiply(Local2, 2), Local2) if (LNotEqual(Local0, Local3)) { - err(ts, z179, Local2, 0, 0, Local0, Local3) + err(ts, z179, __LINE__, 0, 0, Local0, Local3) } if (LNotEqual(Local1, Local4)) { - err(ts, z179, Add(Local2, 1), 0, 0, Local1, Local4) + err(ts, z179, __LINE__, 0, 0, Local1, Local4) } } @@ -4097,10 +4097,10 @@ Method(mw27, 1, Serialized) Store(tot0, Local1) if (LNotEqual(Local0, arg3)) { - err(ts, z179, arg2, 0, 0, Local0, arg3) + err(ts, z179, __LINE__, 0, 0, Local0, arg3) } if (LNotEqual(Local1, arg4)) { - err(ts, z179, Add(arg2, 1), 0, 0, Local1, arg4) + err(ts, z179, __LINE__, 0, 0, Local1, arg4) } } @@ -4135,10 +4135,10 @@ Method(mw27, 1, Serialized) Store(tot0, Local1) if (LNotEqual(Local0, arg3)) { - err(ts, z179, arg2, 0, 0, Local0, arg3) + err(ts, z179, __LINE__, 0, 0, Local0, arg3) } if (LNotEqual(Local1, arg4)) { - err(ts, z179, Add(arg2, 1), 0, 0, Local1, arg4) + err(ts, z179, __LINE__, 0, 0, Local1, arg4) } } @@ -4173,10 +4173,10 @@ Method(mw27, 1, Serialized) Store(tot0, Local1) if (LNotEqual(Local0, arg3)) { - err(ts, z179, arg2, 0, 0, Local0, arg3) + err(ts, z179, __LINE__, 0, 0, Local0, arg3) } if (LNotEqual(Local1, arg4)) { - err(ts, z179, Add(arg2, 1), 0, 0, Local1, arg4) + err(ts, z179, __LINE__, 0, 0, Local1, arg4) } } @@ -4211,10 +4211,10 @@ Method(mw27, 1, Serialized) Store(tot0, Local1) if (LNotEqual(Local0, arg3)) { - err(ts, z179, arg2, 0, 0, Local0, arg3) + err(ts, z179, __LINE__, 0, 0, Local0, arg3) } if (LNotEqual(Local1, arg4)) { - err(ts, z179, Add(arg2, 1), 0, 0, Local1, arg4) + err(ts, z179, __LINE__, 0, 0, Local1, arg4) } } @@ -4277,10 +4277,10 @@ Method(mx27, 1, Serialized) Store(tot0, Local1) if (LNotEqual(Local0, arg3)) { - err(ts, z179, arg2, 0, 0, Local0, arg3) + err(ts, z179, __LINE__, 0, 0, Local0, arg3) } if (LNotEqual(Local1, arg4)) { - err(ts, z179, Add(arg2, 1), 0, 0, Local1, arg4) + err(ts, z179, __LINE__, 0, 0, Local1, arg4) } } @@ -4315,10 +4315,10 @@ Method(mx27, 1, Serialized) Store(tot0, Local1) if (LNotEqual(Local0, arg3)) { - err(ts, z179, arg2, 0, 0, Local0, arg3) + err(ts, z179, __LINE__, 0, 0, Local0, arg3) } if (LNotEqual(Local1, arg4)) { - err(ts, z179, Add(arg2, 1), 0, 0, Local1, arg4) + err(ts, z179, __LINE__, 0, 0, Local1, arg4) } } @@ -4355,13 +4355,13 @@ Method(mx27, 1, Serialized) Store(tot0, Local2) if (LNotEqual(Local0, arg3)) { - err(ts, z179, arg2, 0, 0, Local0, arg3) + err(ts, z179, __LINE__, 0, 0, Local0, arg3) } if (LNotEqual(Local1, arg4)) { - err(ts, z179, Add(arg2, 1), 0, 0, Local1, arg4) + err(ts, z179, __LINE__, 0, 0, Local1, arg4) } if (LNotEqual(Local2, arg5)) { - err(ts, z179, Add(arg2, 2), 0, 0, Local2, arg5) + err(ts, z179, __LINE__, 0, 0, Local2, arg5) } } @@ -4398,13 +4398,13 @@ Method(mx27, 1, Serialized) Store(tot0, Local2) if (LNotEqual(Local0, arg3)) { - err(ts, z179, arg2, 0, 0, Local0, arg3) + err(ts, z179, __LINE__, 0, 0, Local0, arg3) } if (LNotEqual(Local1, arg4)) { - err(ts, z179, Add(arg2, 1), 0, 0, Local1, arg4) + err(ts, z179, __LINE__, 0, 0, Local1, arg4) } if (LNotEqual(Local2, arg5)) { - err(ts, z179, Add(arg2, 2), 0, 0, Local2, arg5) + err(ts, z179, __LINE__, 0, 0, Local2, arg5) } } @@ -4468,13 +4468,13 @@ Method(my27, 1, Serialized) Store(tot0, Local2) if (LNotEqual(Local0, arg3)) { - err(ts, z179, arg2, 0, 0, Local0, arg3) + err(ts, z179, __LINE__, 0, 0, Local0, arg3) } if (LNotEqual(Local1, arg4)) { - err(ts, z179, Add(arg2, 1), 0, 0, Local1, arg4) + err(ts, z179, __LINE__, 0, 0, Local1, arg4) } if (LNotEqual(Local2, arg5)) { - err(ts, z179, Add(arg2, 2), 0, 0, Local2, arg5) + err(ts, z179, __LINE__, 0, 0, Local2, arg5) } } @@ -4511,13 +4511,13 @@ Method(my27, 1, Serialized) Store(tot0, Local2) if (LNotEqual(Local0, arg3)) { - err(ts, z179, arg2, 0, 0, Local0, arg3) + err(ts, z179, __LINE__, 0, 0, Local0, arg3) } if (LNotEqual(Local1, arg4)) { - err(ts, z179, Add(arg2, 1), 0, 0, Local1, arg4) + err(ts, z179, __LINE__, 0, 0, Local1, arg4) } if (LNotEqual(Local2, arg5)) { - err(ts, z179, Add(arg2, 2), 0, 0, Local2, arg5) + err(ts, z179, __LINE__, 0, 0, Local2, arg5) } } @@ -4561,7 +4561,7 @@ Method(my27, 1, Serialized) Store(tot0, Local0) if (LNotEqual(Local0, arg3)) { - err(ts, z179, arg2, 0, 0, Local0, arg3) + err(ts, z179, __LINE__, 0, 0, Local0, arg3) } } @@ -4605,7 +4605,7 @@ Method(my27, 1, Serialized) Store(tot0, Local0) if (LNotEqual(Local0, arg3)) { - err(ts, z179, arg2, 0, 0, Local0, arg3) + err(ts, z179, __LINE__, 0, 0, Local0, arg3) } } @@ -4690,10 +4690,10 @@ Method(mz27, 1, Serialized) Store(tot0, Local1) if (LNotEqual(Local0, arg3)) { - err(ts, z179, arg2, 0, 0, Local0, arg3) + err(ts, z179, __LINE__, 0, 0, Local0, arg3) } if (LNotEqual(Local1, arg4)) { - err(ts, z179, Add(arg2, 1), 0, 0, Local1, arg4) + err(ts, z179, __LINE__, 0, 0, Local1, arg4) } } @@ -4726,7 +4726,7 @@ Method(mz27, 1, Serialized) Store(tot0, Local0) if (LNotEqual(Local0, 0x8001)) { - err(ts, z179, 0x260, 0, 0, Local0, 0x8001) + err(ts, z179, __LINE__, 0, 0, Local0, 0x8001) } } @@ -4747,7 +4747,7 @@ Method(mz27, 1, Serialized) Store(tot0, Local0) if (LNotEqual(Local0, 0x8000)) { - err(ts, z179, 0x261, 0, 0, Local0, 0x8000) + err(ts, z179, __LINE__, 0, 0, Local0, 0x8000) } } @@ -4784,10 +4784,10 @@ Method(mz27, 1, Serialized) Multiply(arg0, 2, Local2) if (LNotEqual(Local0, arg1)) { - err(ts, z179, Add(0x262, Local2), 0, 0, Local0, arg1) + err(ts, z179, __LINE__, 0, 0, Local0, arg1) } if (LNotEqual(Local1, arg2)) { - err(ts, z179, Add(0x263, Local2), 0, 0, Local1, arg2) + err(ts, z179, __LINE__, 0, 0, Local1, arg2) } } @@ -4898,33 +4898,33 @@ Method(ms28,, Serialized) Store(0, bnk0) if (LNotEqual(bnk0, 0)) { - err(ts, z179, 0x270, 0, 0, bnk0, 0) + err(ts, z179, __LINE__, 0, 0, bnk0, 0) } Store(0x87, bf00) if (LNotEqual(bnk0, 0)) { - err(ts, z179, 0x271, 0, 0, bnk0, 0) + err(ts, z179, __LINE__, 0, 0, bnk0, 0) } if (LNotEqual(bf00, 0x87)) { - err(ts, z179, 0x272, 0, 0, bf00, 0x87) + err(ts, z179, __LINE__, 0, 0, bf00, 0x87) } // Deal with 1-th bank layout: Store(1, bnk0) if (LNotEqual(bnk0, 1)) { - err(ts, z179, 0x273, 0, 0, bnk0, 1) + err(ts, z179, __LINE__, 0, 0, bnk0, 1) } Store(0x96, bf01) if (LNotEqual(bnk0, 1)) { - err(ts, z179, 0x274, 0, 0, bnk0, 1) + err(ts, z179, __LINE__, 0, 0, bnk0, 1) } if (LNotEqual(bf01, 0x96)) { - err(ts, z179, 0x275, 0, 0, bf01, 0x96) + err(ts, z179, __LINE__, 0, 0, bf01, 0x96) } } @@ -4987,7 +4987,7 @@ Method(ms29, 1, Serialized) Store(C157(1), Local0) if (LNotEqual(Local0, 0)) { - err(ts, z179, 0x279, 0, 0, Local0, 0) + err(ts, z179, __LINE__, 0, 0, Local0, 0) } OUTP("Release") @@ -5002,14 +5002,14 @@ Method(ms29, 1, Serialized) Store(C157(1), Local0) if (LNotEqual(Local0, 0)) { - err(ts, z179, 0x27a, 0, 0, Local0, 0) + err(ts, z179, __LINE__, 0, 0, Local0, 0) } OUTP("Acquire 2") Store(C157(1), Local0) if (LNotEqual(Local0, 0)) { - err(ts, z179, 0x27b, 0, 0, Local0, 0) + err(ts, z179, __LINE__, 0, 0, Local0, 0) } } @@ -5021,7 +5021,7 @@ Method(ms29, 1, Serialized) Store(Acquire (C155, 0xFFFF), Local0) if (LNotEqual(Local0, 0)) { - err(ts, z179, 0x27c, 0, 0, Local0, 0) + err(ts, z179, __LINE__, 0, 0, Local0, 0) } OUTP("Acquire 2") @@ -5029,7 +5029,7 @@ Method(ms29, 1, Serialized) if (LNotEqual(Local0, 0)) { - err(ts, z179, 0x27d, 0, 0, Local0, 0) + err(ts, z179, __LINE__, 0, 0, Local0, 0) } } @@ -5041,7 +5041,7 @@ Method(ms29, 1, Serialized) Store(C157(1), Local0) if (LNotEqual(Local0, 0)) { - err(ts, z179, 0x27e, 0, 0, Local0, 0) + err(ts, z179, __LINE__, 0, 0, Local0, 0) } OUTP("Release 1") @@ -5061,14 +5061,14 @@ Method(ms29, 1, Serialized) Store(Acquire (C156, 0xFFFF), Local0) if (LNotEqual(Local0, 0)) { - err(ts, z179, 0x280, 0, 0, Local0, 0) + err(ts, z179, __LINE__, 0, 0, Local0, 0) } OUTP("Acquire( , 0) 2") Store(Acquire (C156, 0), Local0) if (LNotEqual(Local0, 0)) { - err(ts, z179, 0x281, 0, 0, Local0, 0) + err(ts, z179, __LINE__, 0, 0, Local0, 0) } } @@ -5080,7 +5080,7 @@ Method(ms29, 1, Serialized) Store(Acquire (C153, 0xFFFF), Local0) if (LNotEqual(Local0, 0)) { - err(ts, z179, 0x282, 0, 0, Local0, 0) + err(ts, z179, __LINE__, 0, 0, Local0, 0) } OUTP("Acquire 2") @@ -5088,7 +5088,7 @@ Method(ms29, 1, Serialized) if (LNotEqual(Local0, 0)) { - err(ts, z179, 0x283, 0, 0, Local0, 0) + err(ts, z179, __LINE__, 0, 0, Local0, 0) } OUTP("Release 1") @@ -5106,7 +5106,7 @@ Method(ms29, 1, Serialized) Store(Acquire (C159, 0xFFFF), Local0) if (LNotEqual(Local0, 0)) { - err(ts, z179, 0x284, 0, 0, Local0, 0) + err(ts, z179, __LINE__, 0, 0, Local0, 0) } OUTP("Acquire 2") @@ -5114,7 +5114,7 @@ Method(ms29, 1, Serialized) if (LNotEqual(Local0, 0)) { - err(ts, z179, 0x285, 0, 0, Local0, 0) + err(ts, z179, __LINE__, 0, 0, Local0, 0) } OUTP("Release 1") @@ -5136,7 +5136,7 @@ Method(ms29, 1, Serialized) Store(Acquire (C153, 0xFFFF), Local0) if (LNotEqual(Local0, 0)) { - err(ts, z179, 0x287, 0, 0, Local0, 0) + err(ts, z179, __LINE__, 0, 0, Local0, 0) } OUTP("Acquire 2") @@ -5144,7 +5144,7 @@ Method(ms29, 1, Serialized) if (LNotEqual(Local0, 0)) { - err(ts, z179, 0x288, 0, 0, Local0, 0) + err(ts, z179, __LINE__, 0, 0, Local0, 0) } OUTP("Release 1") @@ -5164,7 +5164,7 @@ Method(ms29, 1, Serialized) Store(Acquire (C159, 0xFFFF), Local0) if (LNotEqual(Local0, 0)) { - err(ts, z179, 0x289, 0, 0, Local0, 0) + err(ts, z179, __LINE__, 0, 0, Local0, 0) } OUTP("Acquire 2") @@ -5172,7 +5172,7 @@ Method(ms29, 1, Serialized) if (LNotEqual(Local0, 0)) { - err(ts, z179, 0x290, 0, 0, Local0, 0) + err(ts, z179, __LINE__, 0, 0, Local0, 0) } OUTP("Release 1") @@ -5304,7 +5304,7 @@ Method(ms2a, 1, Serialized) } if (LNot(BCMP(b000, b001))) { - err(ts, z179, Add(0x294, arg0), 0, 0, b000, b001) + err(ts, z179, __LINE__, 0, 0, b000, b001) } } @@ -5324,7 +5324,7 @@ Method(ms2a, 1, Serialized) Store(Buffer(4){0xab, 0x89, 0x67, 0x45}, Local1) } if (LNot(BCMP(Local1, Local0))) { - err(ts, z179, 0x296, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } } @@ -5334,7 +5334,7 @@ Method(ms2a, 1, Serialized) Store(ToBuffer("456789ab"), Local0) Store(Buffer(){"456789ab"}, Local1) if (LNot(BCMP(Local1, Local0))) { - err(ts, z179, 0x297, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } } @@ -5344,7 +5344,7 @@ Method(ms2a, 1, Serialized) Store(ToBuffer(Buffer(4){0x45, 0x67, 0x89, 0xab}), Local0) Store(Buffer(4){0x45, 0x67, 0x89, 0xab}, Local1) if (LNot(BCMP(Local1, Local0))) { - err(ts, z179, 0x298, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } } @@ -5358,7 +5358,7 @@ Method(ms2a, 1, Serialized) Store(Buffer(4){0xab, 0x89, 0x67, 0x45}, Local1) } if (LNot(BCMP(Local1, Local0))) { - err(ts, z179, 0x299, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } } @@ -5368,7 +5368,7 @@ Method(ms2a, 1, Serialized) ToBuffer("456789ab", Local0) Store(Buffer(){"456789ab"}, Local1) if (LNot(BCMP(Local1, Local0))) { - err(ts, z179, 0x29a, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } } @@ -5378,7 +5378,7 @@ Method(ms2a, 1, Serialized) ToBuffer(Buffer(4){0x45, 0x67, 0x89, 0xab}, Local0) Store(Buffer(4){0x45, 0x67, 0x89, 0xab}, Local1) if (LNot(BCMP(Local1, Local0))) { - err(ts, z179, 0x29b, 0, 0, Local0, Local1) + err(ts, z179, __LINE__, 0, 0, Local0, Local1) } } @@ -5395,9 +5395,9 @@ Method(ms2a, 1, Serialized) } Store(ObjectType(i000), Local2) if (LNotEqual(Local2, 3)) { - err(ts, z179, 0x29c, 0, 0, Local2, 3) + err(ts, z179, __LINE__, 0, 0, Local2, 3) } elseif (LNot(BCMP(Local1, i000))) { - err(ts, z179, 0x29d, 0, 0, i000, Local1) + err(ts, z179, __LINE__, 0, 0, i000, Local1) } } @@ -5410,9 +5410,9 @@ Method(ms2a, 1, Serialized) Store(Buffer(){"456789ab"}, Local1) Store(ObjectType(s000), Local2) if (LNotEqual(Local2, 3)) { - err(ts, z179, 0x29e, 0, 0, Local2, 3) + err(ts, z179, __LINE__, 0, 0, Local2, 3) } elseif (LNot(BCMP(Local1, s000))) { - err(ts, z179, 0x29f, 0, 0, s000, Local1) + err(ts, z179, __LINE__, 0, 0, s000, Local1) } } @@ -5425,9 +5425,9 @@ Method(ms2a, 1, Serialized) Store(Buffer(4){0x45, 0x67, 0x89, 0xab}, Local1) Store(ObjectType(b000), Local2) if (LNotEqual(Local2, 3)) { - err(ts, z179, 0x2a0, 0, 0, Local2, 3) + err(ts, z179, __LINE__, 0, 0, Local2, 3) } elseif (LNot(BCMP(Local1, b000))) { - err(ts, z179, 0x2a1, 0, 0, b000, Local1) + err(ts, z179, __LINE__, 0, 0, b000, Local1) } } @@ -5445,7 +5445,7 @@ Method(ms2a, 1, Serialized) Store(Buffer(1){0x01}, Local0) if (LNot(BCMP(b000, Local0))) { - err(ts, z179, Add(0x2a2, arg0), 0, 0, b000, Local0) + err(ts, z179, __LINE__, 0, 0, b000, Local0) } } else { OUTP("Store(b000, b001)") @@ -5453,7 +5453,7 @@ Method(ms2a, 1, Serialized) Store(Buffer(3){0x3c}, Local0) if (LNot(BCMP(b001, Local0))) { - err(ts, z179, Add(0x2a2, arg0), 0, 0, b001, Local0) + err(ts, z179, __LINE__, 0, 0, b001, Local0) } } } @@ -5536,7 +5536,7 @@ Method(ms2b, 1, Serialized) Store(SizeOf(p000), Local0) if (LNotEqual(Local0, 5)) { - err(ts, z179, 0x2a6, 0, 0, Local0, 5) + err(ts, z179, __LINE__, 0, 0, Local0, 5) } } @@ -5549,12 +5549,12 @@ Method(ms2b, 1, Serialized) Store(ObjectType(Index(p000, 2)), Local0) if (Local0) { } else { - err(ts, z179, 0x2a7, 0, 0, Local0, 1) + err(ts, z179, __LINE__, 0, 0, Local0, 1) } Store(ObjectType(Index(p000, 3)), Local0) if (Local0) { - err(ts, z179, 0x2a8, 0, 0, Local0, 0) + err(ts, z179, __LINE__, 0, 0, Local0, 0) } } @@ -5575,7 +5575,7 @@ Method(ms2b, 1, Serialized) Store(5, Local0) } if (LNotEqual(Local0, 5)) { - err(ts, z179, 0x2a9, 0, 0, Local0, 5) + err(ts, z179, __LINE__, 0, 0, Local0, 5) } } @@ -5630,13 +5630,13 @@ Method(ms2c, 1, Serialized) } if (LNotEqual(Local1, 2)) { - err(ts, z179, 0x2ad, 0, 0, Local1, 2) + err(ts, z179, __LINE__, 0, 0, Local1, 2) } Store(m000(1), Local1) if (LNotEqual(Local1, 1)) { - err(ts, z179, 0x2ae, 0, 0, Local1, 1) + err(ts, z179, __LINE__, 0, 0, Local1, 1) } } @@ -5656,7 +5656,7 @@ Method(ms2c, 1, Serialized) Decrement(Local0) } if (LNotEqual(Local1, 2)) { - err(ts, z179, 0x2af, 0, 0, Local1, 2) + err(ts, z179, __LINE__, 0, 0, Local1, 2) } } @@ -5676,10 +5676,10 @@ Method(ms2c, 1, Serialized) Decrement(Local0) } if (LNotEqual(Local1, 1)) { - err(ts, z179, 0x2b0, 0, 0, Local1, 1) + err(ts, z179, __LINE__, 0, 0, Local1, 1) } if (LNotEqual(Local2, 0)) { - err(ts, z179, 0x2b1, 0, 0, Local2, 0) + err(ts, z179, __LINE__, 0, 0, Local2, 0) } } @@ -5699,10 +5699,10 @@ Method(ms2c, 1, Serialized) Decrement(Local0) } if (LNotEqual(Local1, 1)) { - err(ts, z179, 0x2b2, 0, 0, Local1, 1) + err(ts, z179, __LINE__, 0, 0, Local1, 1) } if (LNotEqual(Local2, 1)) { - err(ts, z179, 0x2b3, 0, 0, Local2, 1) + err(ts, z179, __LINE__, 0, 0, Local2, 1) } } @@ -5728,13 +5728,13 @@ Method(ms2c, 1, Serialized) Decrement(Local0) } if (LNotEqual(Local0, 0)) { - err(ts, z179, 0x2b4, 0, 0, Local0, 0) + err(ts, z179, __LINE__, 0, 0, Local0, 0) } if (LNotEqual(Local1, 1)) { - err(ts, z179, 0x2b5, 0, 0, Local1, 1) + err(ts, z179, __LINE__, 0, 0, Local1, 1) } if (LNotEqual(Local2, 1)) { - err(ts, z179, 0x2b6, 0, 0, Local2, 1) + err(ts, z179, __LINE__, 0, 0, Local2, 1) } } @@ -5760,13 +5760,13 @@ Method(ms2c, 1, Serialized) Decrement(Local0) } if (LNotEqual(Local0, 0)) { - err(ts, z179, 0x2b7, 0, 0, Local0, 0) + err(ts, z179, __LINE__, 0, 0, Local0, 0) } if (LNotEqual(Local1, 1)) { - err(ts, z179, 0x2b8, 0, 0, Local1, 1) + err(ts, z179, __LINE__, 0, 0, Local1, 1) } if (LNotEqual(Local2, 0)) { - err(ts, z179, 0x2b9, 0, 0, Local2, 0) + err(ts, z179, __LINE__, 0, 0, Local2, 0) } } @@ -5792,13 +5792,13 @@ Method(ms2c, 1, Serialized) Decrement(Local0) } if (LNotEqual(Local0, 0)) { - err(ts, z179, 0x2ba, 0, 0, Local0, 0) + err(ts, z179, __LINE__, 0, 0, Local0, 0) } if (LNotEqual(Local1, 1)) { - err(ts, z179, 0x2bb, 0, 0, Local1, 1) + err(ts, z179, __LINE__, 0, 0, Local1, 1) } if (LNotEqual(Local2, 1)) { - err(ts, z179, 0x2bc, 0, 0, Local2, 1) + err(ts, z179, __LINE__, 0, 0, Local2, 1) } } @@ -6071,7 +6071,7 @@ Method(ms2e,, Serialized) Store(SizeOf (BUF0), Local0) if (LNotEqual(Local0, 12)) { - err(ts, z179, 0x2c8, 0, 0, Local0, 12) + err(ts, z179, __LINE__, 0, 0, Local0, 12) } CH03(ts, z179, 0x2c9, 0, 0) @@ -6111,7 +6111,7 @@ Method(ms2f, 1, Serialized) } if (LNotEqual(Local1, 3)) { - err(ts, z179, 0x2ca, 0, 0, Local1, 3) + err(ts, z179, __LINE__, 0, 0, Local1, 3) } } @@ -6136,7 +6136,7 @@ Method(ms2f, 1, Serialized) } if (LNotEqual(Local1, 1)) { - err(ts, z179, 0x2cb, 0, 0, Local1, 1) + err(ts, z179, __LINE__, 0, 0, Local1, 1) } } @@ -6199,18 +6199,18 @@ Break } if (LEqual(Arg3, 1)) { if (LNotEqual(CH10, Arg1)) { - err(ts, z179, 0x2ce, 0, 0, CH10, Arg1) + err(ts, z179, __LINE__, 0, 0, CH10, Arg1) } if (LEqual(CH11, Arg1)) { - err(ts, z179, 0x2cf, 0, 0, CH11, Arg1) + err(ts, z179, __LINE__, 0, 0, CH11, Arg1) } } if (LEqual(Arg3, 2)) { if (LNotEqual(CH20, Arg2)) { - err(ts, z179, 0x2d0, 0, 0, CH20, Arg2) + err(ts, z179, __LINE__, 0, 0, CH20, Arg2) } if (LEqual(CH21, Arg2)) { - err(ts, z179, 0x2d1, 0, 0, CH21, Arg2) + err(ts, z179, __LINE__, 0, 0, CH21, Arg2) } } } @@ -6319,7 +6319,7 @@ Method(ms31, 1, Serialized) Store(ObjectType(Local0), Local1) if (LNotEqual(15, Local1)) { - err(ts, z179, 0x2da, 0, 0, Local1, 15) + err(ts, z179, __LINE__, 0, 0, Local1, 15) } Unload(DDBH) @@ -6340,7 +6340,7 @@ Method(ms31, 1, Serialized) Store(ObjectType(Local0), Local1) if (LNotEqual(15, Local1)) { - err(ts, z179, 0x2dd, 0, 0, Local1, 15) + err(ts, z179, __LINE__, 0, 0, Local1, 15) } } @@ -6358,7 +6358,7 @@ Method(ms31, 1, Serialized) Store(ObjectType(DDBH), Local1) if (LNotEqual(15, Local1)) { - err(ts, z179, 0x2df, 0, 0, Local1, 15) + err(ts, z179, __LINE__, 0, 0, Local1, 15) } UnLoad(DDBH) @@ -6381,7 +6381,7 @@ Method(ms31, 1, Serialized) Store(ObjectType(DDBH), Local1) if (LNotEqual(15, Local1)) { - err(ts, z179, 0x2e2, 0, 0, Local1, 15) + err(ts, z179, __LINE__, 0, 0, Local1, 15) } } @@ -6427,7 +6427,7 @@ Method(ms31, 1, Serialized) Store(CondRefof(\SS00, Local1), Local2) OUTP("CondRefof before Load") if (Local2) { - err(ts, z179, 0x2e6, 0, 0, Local2, 0) + err(ts, z179, __LINE__, 0, 0, Local2, 0) } Load(IST0, Local0) @@ -6437,7 +6437,7 @@ Method(ms31, 1, Serialized) OUTP("CondRefof after Load") if (Local4) { } else { - err(ts, z179, 0x2e8, 0, 0, Local4, 1) + err(ts, z179, __LINE__, 0, 0, Local4, 1) } UnLoad(Local0) @@ -6446,7 +6446,7 @@ Method(ms31, 1, Serialized) Store(CondRefof(\SS00, Local5), Local6) OUTP("CondRefof after UnLoad") if (Local6) { - err(ts, z179, 0x2ea, 0, 0, Local6, 0) + err(ts, z179, __LINE__, 0, 0, Local6, 0) } } @@ -6460,7 +6460,7 @@ Method(ms31, 1, Serialized) Store(CondRefof(\SS00, Local1), Local2) OUTP("CondRefof before Load") if (Local2) { - err(ts, z179, 0x2eb, 0, 0, Local2, 0) + err(ts, z179, __LINE__, 0, 0, Local2, 0) } Load(IST0, Local0) @@ -6470,7 +6470,7 @@ Method(ms31, 1, Serialized) OUTP("CondRefof after Load") if (Local4) { } else { - err(ts, z179, 0x2ed, 0, 0, Local4, 1) + err(ts, z179, __LINE__, 0, 0, Local4, 1) } } @@ -6550,7 +6550,7 @@ Method(ms32, 1, Serialized) if (Local0) { } else { - err(ts, z179, 0x2f2, 0, 0, Local0, 1) + err(ts, z179, __LINE__, 0, 0, Local0, 1) } } @@ -6564,10 +6564,10 @@ Method(ms32, 1, Serialized) if (Local0) { Store(Derefof(Local1), Local2) if (LNotEqual(0x76543210, Local2)) { - err(ts, z179, 0x2f3, 0, 0, Local2, 0x76543210) + err(ts, z179, __LINE__, 0, 0, Local2, 0x76543210) } } else { - err(ts, z179, 0x2f4, 0, 0, Local0, 1) + err(ts, z179, __LINE__, 0, 0, Local0, 1) } } @@ -6577,7 +6577,7 @@ Method(ms32, 1, Serialized) Store(CondRefof(^M003.I000, Local1), Local0) if (Local0) { - err(ts, z179, 0x2f5, 0, 0, Local0, 1) + err(ts, z179, __LINE__, 0, 0, Local0, 1) } Name(I000, 1) @@ -6585,7 +6585,7 @@ Method(ms32, 1, Serialized) Store(CondRefof(^M003.I000, Local1), Local0) if (Local0) { } else { - err(ts, z179, 0x2f6, 0, 0, Local0, 0) + err(ts, z179, __LINE__, 0, 0, Local0, 0) } } @@ -6676,7 +6676,7 @@ Method(ms33, 1, Serialized) if (LOr(ABUU, SLCK)) { Store(ObjectType(Local0), Local1) if (LNotEqual(6, Local1)) { - err(ts, z179, 0x2fc, 0, 0, Local1, 6) + err(ts, z179, __LINE__, 0, 0, Local1, 6) } } else { CH04(ts, 0, 0xff, z179, 0x2fd, 0, 0) @@ -6698,7 +6698,7 @@ Method(ms33, 1, Serialized) if (LOr(ABUU, SLCK)) { Store(ObjectType(Local0), Local1) if (LNotEqual(6, Local1)) { - err(ts, z179, 0x2fe, 0, 0, Local1, 6) + err(ts, z179, __LINE__, 0, 0, Local1, 6) } else { OUTP("Ok: ObjectType succeeded") } @@ -6724,7 +6724,7 @@ Method(ms33, 1, Serialized) if (LOr(ABUU, SLCK)) { Store(ObjectType(Local0), Local1) if (LNotEqual(6, Local1)) { - err(ts, z179, 0x2a0, 0, 0, Local1, 6) + err(ts, z179, __LINE__, 0, 0, Local1, 6) } } else { CH04(ts, 0, 0xff, z179, 0x2a1, 0, 0) diff --git a/tests/aslts/src/runtime/collections/Identity2MS/abbu/ns4.asl b/tests/aslts/src/runtime/collections/Identity2MS/abbu/ns4.asl index ad98fe75d..17e6cfca6 100644 --- a/tests/aslts/src/runtime/collections/Identity2MS/abbu/ns4.asl +++ b/tests/aslts/src/runtime/collections/Identity2MS/abbu/ns4.asl @@ -71,11 +71,11 @@ Method(m401, 1, Serialized) Store(MAdd(i000, m001()), Local0) if (LNotEqual(Local0, 0x07654321)) { - err(ts, z100, 0x001, 0, 0, Local0, 0x07654321) + err(ts, z100, __LINE__, 0, 0, Local0, 0x07654321) } if (LNotEqual(i000, 0x07000000)) { - err(ts, z100, 0x002, 0, 0, i000, 0x07000000) + err(ts, z100, __LINE__, 0, 0, i000, 0x07000000) } CH03(ts, z100, 0x003, 0, 0) diff --git a/tests/aslts/src/runtime/collections/Identity2MS/abbu/ns6.asl b/tests/aslts/src/runtime/collections/Identity2MS/abbu/ns6.asl index 8b85e864e..d1a20cd55 100644 --- a/tests/aslts/src/runtime/collections/Identity2MS/abbu/ns6.asl +++ b/tests/aslts/src/runtime/collections/Identity2MS/abbu/ns6.asl @@ -26,14 +26,14 @@ Method(m600,, Serialized) { Store(0x11223344, i000) if (LNotEqual(arg0, 0xabcd0000)) { - err(ts, z101, 0x000, 0, 0, arg0, 0xabcd0000) + err(ts, z101, __LINE__, 0, 0, arg0, 0xabcd0000) } } m000(i000) if (LNotEqual(i000, 0x11223344)) { - err(ts, z101, 0x001, 0, 0, i000, 0x11223344) + err(ts, z101, __LINE__, 0, 0, i000, 0x11223344) } } diff --git a/tests/aslts/src/runtime/collections/Identity2MS/abbu/recursion/rec_abbu.asl b/tests/aslts/src/runtime/collections/Identity2MS/abbu/recursion/rec_abbu.asl index 6c87b3744..d82bdfdea 100644 --- a/tests/aslts/src/runtime/collections/Identity2MS/abbu/recursion/rec_abbu.asl +++ b/tests/aslts/src/runtime/collections/Identity2MS/abbu/recursion/rec_abbu.asl @@ -84,7 +84,7 @@ Method(mr01) mm00() if (LNotEqual(i000, 0xabcd0000)) { - err(ts, z169, 0x000, 0, 0, i000, 0xabcd0000) + err(ts, z169, __LINE__, 0, 0, i000, 0xabcd0000) } CH03(ts, z169, 0x101, 0, 0) diff --git a/tests/aslts/src/runtime/collections/Identity2MS/abbu/recursion/rec_aslts.asl b/tests/aslts/src/runtime/collections/Identity2MS/abbu/recursion/rec_aslts.asl index 6dc0f9fd6..9c848d247 100644 --- a/tests/aslts/src/runtime/collections/Identity2MS/abbu/recursion/rec_aslts.asl +++ b/tests/aslts/src/runtime/collections/Identity2MS/abbu/recursion/rec_aslts.asl @@ -85,13 +85,13 @@ Method(mr00) Decrement(IG00) if (LNotEqual(Local0, IG00)) { - err(ts, z172, 0x000, 0, 0, Local0, IG00) + err(ts, z172, __LINE__, 0, 0, Local0, IG00) } if (LNotEqual(IG02, RC00)) { if (LNot(IG03)) { Store(1, IG03) - err(ts, z172, 0x000, 0, 0, IG02, RC00) + err(ts, z172, __LINE__, 0, 0, IG02, RC00) } } } @@ -117,10 +117,10 @@ Method(mr01, 1) Decrement(IG00) if (LNotEqual(Local1, IG00)) { - err(ts, z172, 0x000, 0, 0, Local1, IG00) + err(ts, z172, __LINE__, 0, 0, Local1, IG00) } if (LNotEqual(Local2, arg0)) { - err(ts, z172, 0x000, 0, 0, Local2, arg0) + err(ts, z172, __LINE__, 0, 0, Local2, arg0) } Multiply(RC00, 2, Local0) @@ -128,7 +128,7 @@ Method(mr01, 1) if (LNotEqual(IG02, Local0)) { if (LNot(IG03)) { Store(1, IG03) - err(ts, z172, 0x000, 0, 0, IG02, Local0) + err(ts, z172, __LINE__, 0, 0, IG02, Local0) } } } @@ -149,10 +149,10 @@ Method(mr02, 1) Decrement(IG01) if (LNotEqual(Local1, IG01)) { - err(ts, z172, 0x000, 0, 0, Local1, IG01) + err(ts, z172, __LINE__, 0, 0, Local1, IG01) } if (LNotEqual(Local2, arg0)) { - err(ts, z172, 0x000, 0, 0, Local2, arg0) + err(ts, z172, __LINE__, 0, 0, Local2, arg0) } Multiply(RC00, 2, Local0) @@ -160,7 +160,7 @@ Method(mr02, 1) if (LNotEqual(IG02, Local0)) { if (LNot(IG03)) { Store(1, IG03) - err(ts, z172, 0x000, 0, 0, IG02, Local0) + err(ts, z172, __LINE__, 0, 0, IG02, Local0) } } } @@ -195,7 +195,7 @@ Method(mr03,, Serialized) Decrement(IG00) if (LNotEqual(Local0, IG00)) { - err(ts, z172, 0x000, 0, 0, Local0, IG00) + err(ts, z172, __LINE__, 0, 0, Local0, IG00) } } @@ -212,7 +212,7 @@ Method(mr03,, Serialized) if (LNotEqual(IG02, RC00)) { if (LNot(IG03)) { Store(1, IG03) - err(ts, z172, 0x000, 0, 0, IG02, RC00) + err(ts, z172, __LINE__, 0, 0, IG02, RC00) } } } @@ -252,7 +252,7 @@ Method(mr04,, Serialized) Decrement(IG00) if (LNotEqual(Local0, IG00)) { - err(ts, z172, 0x000, 0, 0, Local0, IG00) + err(ts, z172, __LINE__, 0, 0, Local0, IG00) } } @@ -271,7 +271,7 @@ Method(mr04,, Serialized) if (LNotEqual(IG02, Local0)) { if (LNot(IG03)) { Store(1, IG03) - err(ts, z172, 0x000, 0, 0, IG02, Local0) + err(ts, z172, __LINE__, 0, 0, IG02, Local0) } } } @@ -292,10 +292,10 @@ Method(mr05, 1) Decrement(IG01) if (LNotEqual(Local1, IG01)) { - err(ts, z172, 0x000, 0, 0, Local1, IG01) + err(ts, z172, __LINE__, 0, 0, Local1, IG01) } if (LNotEqual(Local2, arg0)) { - err(ts, z172, 0x000, 0, 0, Local2, arg0) + err(ts, z172, __LINE__, 0, 0, Local2, arg0) } Multiply(RC00, 2, Local0) @@ -303,7 +303,7 @@ Method(mr05, 1) if (LNotEqual(IG02, Local0)) { if (LNot(IG03)) { Store(1, IG03) - err(ts, z172, 0x000, 0, 0, IG02, Local0) + err(ts, z172, __LINE__, 0, 0, IG02, Local0) } } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0000/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0000/DECL.asl index 0ae5560e5..e4f20334d 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0000/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0000/DECL.asl @@ -46,46 +46,46 @@ Method(md9a,, Serialized) Store(LAnd(1, 1), Local0) if (LNotEqual(Local0, ON00)) { - err("", zFFF, 0x000, 0, 0, Local0, ON00) + err("", zFFF, __LINE__, 0, 0, Local0, ON00) } Store(LEqual(0, 0), Local0) if (LNotEqual(Local0, ON00)) { - err("", zFFF, 0x001, 0, 0, Local0, ON00) + err("", zFFF, __LINE__, 0, 0, Local0, ON00) } Store(LGreater(1, 0), Local0) if (LNotEqual(Local0, ON00)) { - err("", zFFF, 0x002, 0, 0, Local0, ON00) + err("", zFFF, __LINE__, 0, 0, Local0, ON00) } Store(LGreaterEqual(1, 1), Local0) if (LNotEqual(Local0, ON00)) { - err("", zFFF, 0x003, 0, 0, Local0, ON00) + err("", zFFF, __LINE__, 0, 0, Local0, ON00) } Store(LLess(0, 1), Local0) if (LNotEqual(Local0, ON00)) { - err("", zFFF, 0x004, 0, 0, Local0, ON00) + err("", zFFF, __LINE__, 0, 0, Local0, ON00) } Store(LLessEqual(1, 1), Local0) if (LNotEqual(Local0, ON00)) { - err("", zFFF, 0x005, 0, 0, Local0, ON00) + err("", zFFF, __LINE__, 0, 0, Local0, ON00) } Store(LNot(0), Local0) if (LNotEqual(Local0, ON00)) { - err("", zFFF, 0x006, 0, 0, Local0, ON00) + err("", zFFF, __LINE__, 0, 0, Local0, ON00) } Store(LNotEqual(1, 0), Local0) if (LNotEqual(Local0, ON00)) { - err("", zFFF, 0x007, 0, 0, Local0, ON00) + err("", zFFF, __LINE__, 0, 0, Local0, ON00) } Store(LOr(0, 1), Local0) if (LNotEqual(Local0, ON00)) { - err("", zFFF, 0x008, 0, 0, Local0, ON00) + err("", zFFF, __LINE__, 0, 0, Local0, ON00) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0001_ASL/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0001_ASL/DECL.asl index 2a9d69223..db71d4f45 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0001_ASL/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0001_ASL/DECL.asl @@ -40,23 +40,23 @@ Method(md9b) Store(Acquire(mxd0, 0), Local0) if (Local0) { - err("", zFFF, 0x000, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } Store(Acquire(mxd0, 0x1000), Local0) if (Local0) { - err("", zFFF, 0x001, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } Store(0x1000, Local1) Store(Acquire(mxd0, Local1), Local0) if (Local0) { - err("", zFFF, 0x002, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } Store(Acquire(mxd0, TOUT), Local0) if (Local0) { - err("", zFFF, 0x003, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0002/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0002/DECL.asl index 5d85a8a73..42573fcf5 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0002/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0002/DECL.asl @@ -49,6 +49,6 @@ Method(md9c) } if (LNotEqual(Local0, 0x55555555)){ - err("", zFFF, 0x000, 0, 0, Local0, 0x55555555) + err("", zFFF, __LINE__, 0, 0, Local0, 0x55555555) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0004/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0004/DECL.asl index 13cf25a58..5abff7ae2 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0004/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0004/DECL.asl @@ -46,12 +46,12 @@ Method(mda0) Store(ObjectType(Local5), Local0) if (LNotEqual(Local0, c009)){ - err("", zFFF, 0x000, 0, 0, Local0, c009) + err("", zFFF, __LINE__, 0, 0, Local0, c009) } Increment(Local5) if (LNotEqual(Local5, 1)){ - err("", zFFF, 0x001, 0, 0, Local5, 1) + err("", zFFF, __LINE__, 0, 0, Local5, 1) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0005/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0005/DECL.asl index 72cf5717a..c02ad9a67 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0005/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0005/DECL.asl @@ -49,11 +49,11 @@ Method(mda1, 1, Serialized) if (LEqual(Arg0, 5)) { if (LNotEqual(Local7, 0x1234)) { - err("", zFFF, 0x000, 0, 0, Local7, 0x1234) + err("", zFFF, __LINE__, 0, 0, Local7, 0x1234) } } else { if (LNotEqual(Local7, 0x5678)) { - err("", zFFF, 0x001, 0, 0, Local7, 0x5678) + err("", zFFF, __LINE__, 0, 0, Local7, 0x5678) } } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0006/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0006/DECL.asl index 696d038b5..f596e7dec 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0006/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0006/DECL.asl @@ -36,11 +36,11 @@ Method(mda3) { ToInteger("0x12345678", Local0) if (LNotEqual(Local0, 0x12345678)) { - err("", zFFF, 0x000, 0, 0, Local0, 0x12345678) + err("", zFFF, __LINE__, 0, 0, Local0, 0x12345678) } ToInteger("12345678", Local0) if (LNotEqual(Local0, 12345678)) { - err("", zFFF, 0x001, 0, 0, Local0, 12345678) + err("", zFFF, __LINE__, 0, 0, Local0, 12345678) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0007/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0007/DECL.asl index fdc713d39..eaf1044f3 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0007/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0007/DECL.asl @@ -41,6 +41,6 @@ Method(mda4,, Serialized) ToString(B000, Local0, Local1) if (LNotequal(Local0, 0)) { - err("", zFFF, 0x000, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0008/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0008/DECL.asl index 856d3ed9a..78d79a25e 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0008/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0008/DECL.asl @@ -40,6 +40,6 @@ Method(mda5,, Serialized) Store(ObjectType(f000), Local0) if (LNotequal(Local0, c00d)) { - err("", zFFF, 0x000, 0, 0, Local0, c00d) + err("", zFFF, __LINE__, 0, 0, Local0, c00d) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0009/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0009/DECL.asl index a4e162522..e807e2f65 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0009/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0009/DECL.asl @@ -36,7 +36,7 @@ Method(mda6) { Store(ObjectType(Local0), Local7) if (LNotequal(Local7, c008)) { - err("", zFFF, 0x000, 0, 0, Local7, c008) + err("", zFFF, __LINE__, 0, 0, Local7, c008) } } @@ -47,7 +47,7 @@ Method(mda7, 1) } Store(ObjectType(Local0), Local7) if (LNotequal(Local7, c008)) { - err("", zFFF, 0x001, 0, 0, Local7, c008) + err("", zFFF, __LINE__, 0, 0, Local7, c008) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0010/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0010/DECL.asl index abdf9bcdd..c4ab6fcbc 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0010/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0010/DECL.asl @@ -40,17 +40,17 @@ Method(mda9) Store(ObjectType(Local1), Local2) if (LNotequal(Local2, c00b)) { - err("", zFFF, 0x000, 0, 0, Local2, c00b) + err("", zFFF, __LINE__, 0, 0, Local2, c00b) } if (LNotequal(Local1, Buffer(4){10, 11, 12, 13})) { - err("", zFFF, 0x001, 0, 0, Local1, Buffer(4){10, 11, 12, 13}) + err("", zFFF, __LINE__, 0, 0, Local1, Buffer(4){10, 11, 12, 13}) } Store(ObjectType(Local0), Local2) if (LNotequal(Local2, c00b)) { - err("", zFFF, 0x002, 0, 0, Local2, c00b) + err("", zFFF, __LINE__, 0, 0, Local2, c00b) } if (LNotequal(Local0, Buffer(4){10, 11, 12, 13})) { - err("", zFFF, 0x003, 0, 0, Local0, Buffer(4){10, 11, 12, 13}) + err("", zFFF, __LINE__, 0, 0, Local0, Buffer(4){10, 11, 12, 13}) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0012/Method.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0012/Method.asl index 8e7226a54..897c099bd 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0012/Method.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0012/Method.asl @@ -53,7 +53,7 @@ Method(m138) CH03("", 0, 0x099, 0, 0) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c010)) { - err("", zFFF, 0x09a, 0, 0, Local1, c010) + err("", zFFF, __LINE__, 0, 0, Local1, c010) } } else { CH04("", 0, 47, 0, 0x09b, 0, 0) // AE_AML_OPERAND_TYPE @@ -70,7 +70,7 @@ Method(m12c) CH03("", 0, 0x09d, 0, 0) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c010)) { - err("", zFFF, 0x09e, 0, 0, Local1, c010) + err("", zFFF, __LINE__, 0, 0, Local1, c010) } } else { CH04("", 0, 47, 0, 0x09f, 0, 0) // AE_AML_OPERAND_TYPE @@ -92,7 +92,7 @@ Method(m139) CH03("", 0, 0x0a1, 0, 0) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c010)) { - err("", zFFF, 0x0a2, 0, 0, Local1, c010) + err("", zFFF, __LINE__, 0, 0, Local1, c010) } } else { CH04("", 0, 47, 0, 0x0a3, 0, 0) // AE_AML_OPERAND_TYPE @@ -115,7 +115,7 @@ Method(m13a) CH03("", 0, 0x0a5, 0, 0) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c010)) { - err("", zFFF, 0x0a6, 0, 0, Local1, c010) + err("", zFFF, __LINE__, 0, 0, Local1, c010) } } else { CH04("", 0, 47, 0, 0x0a7, 0, 0) // AE_AML_OPERAND_TYPE diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0013/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0013/DECL.asl index 8084d0b61..58ded83a4 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0013/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0013/DECL.asl @@ -47,41 +47,41 @@ Method(mdad) Store(ObjectType(bf00), Local7) if (LNotEqual(Local7, c016)) { - err("", zFFF, 0x000, 0, 0, Local7, c016) + err("", zFFF, __LINE__, 0, 0, Local7, c016) } Store(ObjectType(bf01), Local7) if (LNotEqual(Local7, c016)) { - err("", zFFF, 0x001, 0, 0, Local7, c016) + err("", zFFF, __LINE__, 0, 0, Local7, c016) } Store(ObjectType(bf02), Local7) if (LNotEqual(Local7, c016)) { - err("", zFFF, 0x002, 0, 0, Local7, c016) + err("", zFFF, __LINE__, 0, 0, Local7, c016) } Store(ObjectType(bf03), Local7) if (LNotEqual(Local7, c016)) { - err("", zFFF, 0x003, 0, 0, Local7, c016) + err("", zFFF, __LINE__, 0, 0, Local7, c016) } Store(ObjectType(bf04), Local7) if (LNotEqual(Local7, c016)) { - err("", zFFF, 0x004, 0, 0, Local7, c016) + err("", zFFF, __LINE__, 0, 0, Local7, c016) } Store(ObjectType(bf05), Local7) if (LNotEqual(Local7, c016)) { - err("", zFFF, 0x005, 0, 0, Local7, c016) + err("", zFFF, __LINE__, 0, 0, Local7, c016) } Store(ObjectType(bf06), Local7) if (LNotEqual(Local7, c016)) { - err("", zFFF, 0x006, 0, 0, Local7, c016) + err("", zFFF, __LINE__, 0, 0, Local7, c016) } Store(ObjectType(bf07), Local7) if (LNotEqual(Local7, c016)) { - err("", zFFF, 0x007, 0, 0, Local7, c016) + err("", zFFF, __LINE__, 0, 0, Local7, c016) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0015/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0015/DECL.asl index 09a9e00bb..6c184ff5b 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0015/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0015/DECL.asl @@ -39,11 +39,11 @@ Method(mdb0,, Serialized) ToDecimalString(b000, Local0) if (LNotEqual(Local0, "1,1")) { - err("", zFFF, 0x000, 0, 0, Local0, "1,1") + err("", zFFF, __LINE__, 0, 0, Local0, "1,1") } Store(Sizeof(Local0), Local1) if (LNotEqual(Local1, 3)) { - err("", zFFF, 0x001, 0, 0, Local1, 3) + err("", zFFF, __LINE__, 0, 0, Local1, 3) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0017/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0017/DECL.asl index 538c3e5a1..a3637adbe 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0017/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0017/DECL.asl @@ -38,15 +38,15 @@ Method(mdb2) Store(Buffer(){ 0x20, 0x21, 0x22, 0, 0x26 }, Local1) if (LEqual(Local0, Local1)) { - err("", zFFF, 0x000, 0, 0, Local0, Local1) + err("", zFFF, __LINE__, 0, 0, Local0, Local1) } if (LNotEqual(Local0, Buffer(){ 0x20, 0x21, 0x22, 0, 0x25 })) { - err("", zFFF, 0x001, 0, 0, Local0, Buffer(){ 0x20, 0x21, 0x22, 0, 0x25 }) + err("", zFFF, __LINE__, 0, 0, Local0, Buffer(){ 0x20, 0x21, 0x22, 0, 0x25 }) } if (LNotEqual(Local1, Buffer(){ 0x20, 0x21, 0x22, 0, 0x26 })) { - err("", zFFF, 0x002, 0, 0, Local1, Buffer(){ 0x20, 0x21, 0x22, 0, 0x26 }) + err("", zFFF, __LINE__, 0, 0, Local1, Buffer(){ 0x20, 0x21, 0x22, 0, 0x26 }) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0018/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0018/DECL.asl index 064ff4ef0..1cd703d6b 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0018/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0018/DECL.asl @@ -42,7 +42,7 @@ Method(mdb3) if (LGreater(Local0, Local1)) { Store(1, Local7) } else { - err("", zFFF, 0x000, 0, 0, Local0, Local1) + err("", zFFF, __LINE__, 0, 0, Local0, Local1) } Return(Local7) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0019/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0019/DECL.asl index fcd6837b2..c5e93d5df 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0019/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0019/DECL.asl @@ -38,7 +38,7 @@ Method(mdb4) Store(Buffer(){ 0x20, 0x21, 0x22, 0, 0x26 }, Local1) if (LGreaterEqual(Local0, Local1)) { - err("", zFFF, 0x000, 0, 0, Local0, Local1) + err("", zFFF, __LINE__, 0, 0, Local0, Local1) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0020/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0020/DECL.asl index 008481720..02d0a37b1 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0020/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0020/DECL.asl @@ -42,7 +42,7 @@ Method(mdb5) if (LLess(Local0, Local1)) { Store(1, Local7) } else { - err("", zFFF, 0x000, 0, 0, Local0, Local1) + err("", zFFF, __LINE__, 0, 0, Local0, Local1) } Return(Local7) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0021/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0021/DECL.asl index 71f969ecb..5b3a32c3a 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0021/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0021/DECL.asl @@ -38,7 +38,7 @@ Method(mdb6) Store(Buffer(){ 0x20, 0x21, 0x22, 0, 0x25 }, Local1) if (LLessEqual(Local0, Local1)) { - err("", zFFF, 0x000, 0, 0, Local0, Local1) + err("", zFFF, __LINE__, 0, 0, Local0, Local1) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0022/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0022/DECL.asl index 5f7cab43b..d8f6374fd 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0022/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0022/DECL.asl @@ -42,7 +42,7 @@ Method(mdb7) if (LNotEqual(Local0, Local1)) { Store(1, Local7) } else { - err("", zFFF, 0x000, 0, 0, Local0, Local1) + err("", zFFF, __LINE__, 0, 0, Local0, Local1) } Return(Local7) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0023/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0023/DECL.asl index 8d70d3833..e2d8c0cbb 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0023/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0023/DECL.asl @@ -42,7 +42,7 @@ Method(mdb8) CH03("", 0, 0x000, 0, 0) FromBCD(Local0, Local2) if (LNotEqual(Local2, Local1)) { - err("", zFFF, 0x001, 0, 0, Local2, Local1) + err("", zFFF, __LINE__, 0, 0, Local2, Local1) } // Bug, FromBCD(0x10000000000) @@ -53,7 +53,7 @@ Method(mdb8) CH03("", 0, 0x003, 0, 0) FromBCD(Local0, Local2) if (LNotEqual(Local2, Local1)) { - err("", zFFF, 0x004, 0, 0, Local2, Local1) + err("", zFFF, __LINE__, 0, 0, Local2, Local1) } // Ok, ToBCD(10000000000) @@ -64,7 +64,7 @@ Method(mdb8) CH03("", 0, 0x006, 0, 0) ToBCD(Local0, Local2) if (LNotEqual(Local2, Local1)) { - err("", zFFF, 0x007, 0, 0, Local2, Local1) + err("", zFFF, __LINE__, 0, 0, Local2, Local1) } CH03("", 0, 0x000, 0, 0) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0029/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0029/DECL.asl index 5d33da74a..9c1f24c90 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0029/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0029/DECL.asl @@ -42,7 +42,7 @@ Method(mdbf, 2, Serialized) Subtract(Local2, Local1, Local6) Multiply(arg1, 10000, Local4) if (LLess(Local6, Local4)) { - err("", zFFF, 0x000, 0, 0, Local6, Local4) + err("", zFFF, __LINE__, 0, 0, Local6, Local4) } } case (1) { @@ -52,7 +52,7 @@ Method(mdbf, 2, Serialized) Subtract(Local2, Local1, Local6) Multiply(arg1, 10, Local4) if (LLess(Local6, Local4)) { - err("", zFFF, 0x001, 0, 0, Local6, Local4) + err("", zFFF, __LINE__, 0, 0, Local6, Local4) } } case (2) { @@ -62,7 +62,7 @@ Method(mdbf, 2, Serialized) Subtract(Local2, Local1, Local6) Multiply(arg1, 10000, Local4) if (LLess(Local6, Local4)) { - err("", zFFF, 0x002, 0, 0, Local6, Local4) + err("", zFFF, __LINE__, 0, 0, Local6, Local4) } } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0031_ASL_RUNTIME/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0031_ASL_RUNTIME/DECL.asl index a2135829f..ad6c6063f 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 @@ -101,7 +101,7 @@ Method(m802,, Serialized) { Name(i000, 0xabcd0003) if (LNotEqual(i000, 0xabcd0003)) { - err("", zFFF, 0x006, 0, 0, i000, 0xabcd0003) + err("", zFFF, __LINE__, 0, 0, i000, 0xabcd0003) } } @@ -112,7 +112,7 @@ Method(m802,, Serialized) Name(i000, 0xabcd0004) Store(0xabcd0005, i000) if (LNotEqual(i000, 0xabcd0005)) { - err("", zFFF, 0x006, 0, 0, i000, 0xabcd0005) + err("", zFFF, __LINE__, 0, 0, i000, 0xabcd0005) } } @@ -124,7 +124,7 @@ Method(m802,, Serialized) Name(i000, 0xabcd0006) Store(0xabcd0007, i000) if (LNotEqual(i000, 0xabcd0007)) { - err("", zFFF, 0x006, 0, 0, i000, 0xabcd0007) + err("", zFFF, __LINE__, 0, 0, i000, 0xabcd0007) } } @@ -136,7 +136,7 @@ Method(m802,, Serialized) Store(id28, Debug) Name(id28, 0xabcd0008) if (LNotEqual(id28, 0xabcd0008)) { - err("", zFFF, 0x006, 0, 0, id28, 0xabcd0008) + err("", zFFF, __LINE__, 0, 0, id28, 0xabcd0008) } } @@ -146,13 +146,13 @@ Method(m802,, Serialized) CH03("", 0, 0x009, 0, 0) if (LNotEqual(i000, 0xabcd0000)) { - err("", zFFF, 0x00a, 0, 0, i000, 0xabcd0000) + err("", zFFF, __LINE__, 0, 0, i000, 0xabcd0000) } if (LNotEqual(i001, 0xabcd0001)) { - err("", zFFF, 0x00b, 0, 0, i001, 0xabcd0001) + err("", zFFF, __LINE__, 0, 0, i001, 0xabcd0001) } if (LNotEqual(i002, 0xabcd0002)) { - err("", zFFF, 0x00c, 0, 0, i002, 0xabcd0002) + err("", zFFF, __LINE__, 0, 0, i002, 0xabcd0002) } if (y084) { @@ -181,7 +181,7 @@ Method(m802,, Serialized) Method(m1dc) { /* Successful compilation itself of this test is error */ - err("", zFFF, 0x014, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } Method(mdc6) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0037/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0037/DECL.asl index f2e5d2b2f..4b9eed28c 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0037/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0037/DECL.asl @@ -43,10 +43,10 @@ }) if (LNotEqual(M241, M242)) { - err("", zFFF, 0x000, 0, 0, M241, M242) + err("", zFFF, __LINE__, 0, 0, M241, M242) } if (LNotEqual(M240._RW, 0x18)) { - err("", zFFF, 0x000, 0, 0, M240._RW, 0x18) + err("", zFFF, __LINE__, 0, 0, M240._RW, 0x18) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0038/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0038/DECL.asl index a546ee149..1567236d2 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0038/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0038/DECL.asl @@ -44,7 +44,7 @@ Method(mdce,, Serialized) Store(n000, Debug) if (LNotEqual(n000, 0xfdeacb01)) { - err("", zFFF, 0x000, 0, 0, n000, 0xfdeacb01) + err("", zFFF, __LINE__, 0, 0, n000, 0xfdeacb01) } // Show that LGreater operator indicates correctly @@ -53,7 +53,7 @@ Method(mdce,, Serialized) if (LGreater(0x42345678, 0x32547698)) { Store(1, Local7) } else { - err("", zFFF, 0x001, 0, 0, 0x42345678, 0x32547698) + err("", zFFF, __LINE__, 0, 0, 0x42345678, 0x32547698) } // Show that (in 32-bit mode) "FdeAcb0132547698" passed to Name operator @@ -63,7 +63,7 @@ Method(mdce,, Serialized) if (LGreater(n000, 0x42345678)) { Store(1, Local7) } else { - err("", zFFF, 0x002, 0, 0, n000, 0x42345678) + err("", zFFF, __LINE__, 0, 0, n000, 0x42345678) } // Show that, nevertheless, (in 32-bit mode) "FdeAcb01Fdeacb03" passed @@ -73,7 +73,7 @@ Method(mdce,, Serialized) if (LGreater(0xfdeacb02, "FdeAcb01Fdeacb03")) { Store(1, Local7) } else { - err("", zFFF, 0x003, 0, 0, 0xfdeacb02, "FdeAcb01Fdeacb03") + err("", zFFF, __LINE__, 0, 0, 0xfdeacb02, "FdeAcb01Fdeacb03") } return (Local7) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0039_ASL_RUNTIME/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0039_ASL_RUNTIME/DECL.asl index 9a19a54e9..4e5c230c6 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0039_ASL_RUNTIME/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0039_ASL_RUNTIME/DECL.asl @@ -41,7 +41,7 @@ Method(mdcf,, Serialized) Store(ObjectType(Debug), Local0) if (LNotEqual(Local0, c018)) { - err("", zFFF, 0x000, 0, 0, Local0, c018) + err("", zFFF, __LINE__, 0, 0, Local0, c018) } // Method @@ -49,6 +49,6 @@ Method(mdcf,, Serialized) Method(m0f2) { return (0x1234) } Store(ObjectType(m0f2), Local0) if (LNotEqual(Local0, c010)) { - err("", zFFF, 0x001, 0, 0, Local0, c010) + err("", zFFF, __LINE__, 0, 0, Local0, c010) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0041/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0041/DECL.asl index ffa98e12b..8578f880d 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0041/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0041/DECL.asl @@ -40,6 +40,6 @@ Method(mdd2) Store(Local0, Debug) Add(Local0, 1, Local7) if (LNotEqual(Local7, 1)){ - err("", zFFF, 0x000, 0, 0, Local7, 1) + err("", zFFF, __LINE__, 0, 0, Local7, 1) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0042/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0042/DECL.asl index 871f1e755..190d209ef 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0042/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0042/DECL.asl @@ -40,6 +40,6 @@ Method(mdd3) Store(Local0, Debug) Add(Local0, 1, Local7) if (LNotEqual(Local7, 1)){ - err("", zFFF, 0x000, 0, 0, Local7, 1) + err("", zFFF, __LINE__, 0, 0, Local7, 1) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0043/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0043/DECL.asl index 8ac0a0719..3990c0968 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0043/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0043/DECL.asl @@ -41,6 +41,6 @@ Method(mdd4) Add(Local0, 1, Local7) if (LNotEqual(Local7, 11)){ - err("", zFFF, 0x000, 0, 0, Local7, 11) + err("", zFFF, __LINE__, 0, 0, Local7, 11) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0044/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0044/DECL.asl index e43f4464d..0f08a594a 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0044/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0044/DECL.asl @@ -40,6 +40,6 @@ Method(mdd5) Store(ToUUID("0a1b2c3d-4e5f-6071-8293-a4b5c6d7e8f9"), Local1) if (LNotEqual(Local0, Local1)) { - err("", zFFF, 0x000, 0, 0, Local0, Local1) + err("", zFFF, __LINE__, 0, 0, Local0, Local1) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0045/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0045/DECL.asl index 45851eac6..15ab3660a 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0045/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0045/DECL.asl @@ -51,22 +51,22 @@ Method(mdd6,, Serialized) ToDecimalString(b001, Local0) if (LNotEqual(Local0, "1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1")) { - err("", zFFF, 0x000, 0, 0, Local0, + err("", zFFF, __LINE__, 0, 0, Local0, "1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1") } Store(SizeOf(Local0), Local1) if (LNotEqual(Local1, 99)) { - err("", zFFF, 0x001, 0, 0, Local1, 99) + err("", zFFF, __LINE__, 0, 0, Local1, 99) } ToDecimalString(b000, Local0) if (LNotEqual(Local0, "1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1")) { - err("", zFFF, 0x002, 0, 0, Local0, + err("", zFFF, __LINE__, 0, 0, Local0, "1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1") } Store(SizeOf(Local0), Local1) if (LNotEqual(Local1, 101)) { - err("", zFFF, 0x003, 0, 0, Local1, 101) + err("", zFFF, __LINE__, 0, 0, Local1, 101) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0046/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0046/DECL.asl index f43e8c2cd..c74b62b7d 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0046/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0046/DECL.asl @@ -51,25 +51,25 @@ Method(mdd7,, Serialized) ToHexString(b001, Local0) if (LNotEqual(Local0, "01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01")) { - err("", zFFF, 0x000, 0, 0, Local0, + err("", zFFF, __LINE__, 0, 0, Local0, "01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01") } Store(SizeOf(Local0), Local1) if (LNotEqual(Local1, 197)) { - err("", zFFF, 0x001, 0, 0, Local1, 197) + err("", zFFF, __LINE__, 0, 0, Local1, 197) } ToHexString(b000, Local0) if (LNotEqual(Local0, "01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01")) { - err("", zFFF, 0x002, 0, 0, Local0, + err("", zFFF, __LINE__, 0, 0, Local0, "01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01,01") } Store(SizeOf(Local0), Local1) if (LNotEqual(Local1, 200)) { - err("", zFFF, 0x003, 0, 0, Local1, 200) + err("", zFFF, __LINE__, 0, 0, Local1, 200) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0047/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0047/DECL.asl index 3e9724f52..f56092a9b 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0047/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0047/DECL.asl @@ -83,7 +83,7 @@ Method(md77,, Serialized) if (LGreater(Local0, Local7)) { // if (Local5) { - err("", zFFF, 0x000, 0, 0, Local0, Local7) + err("", zFFF, __LINE__, 0, 0, Local0, Local7) Store(Concatenate("Cur timer : 0x", Local7), Debug) Store(Concatenate("Start timer : 0x", Local0), Debug) Store(Concatenate("Step of cycle : 0x", TSLP), Debug) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0051_ASL_RUNTIME/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0051_ASL_RUNTIME/DECL.asl index 2d56b1964..5e7b9fc27 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0051_ASL_RUNTIME/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0051_ASL_RUNTIME/DECL.asl @@ -38,10 +38,10 @@ Method(mddb, 5) { if (LNotEqual(arg0, arg1)) { - err("", zFFF, 0x000, 0, 0, arg0, arg1) + err("", zFFF, __LINE__, 0, 0, arg0, arg1) } if (LNotEqual(arg2, arg3)) { - err("", zFFF, 0x001, 0, 0, arg0, arg1) + err("", zFFF, __LINE__, 0, 0, arg0, arg1) } } @@ -73,6 +73,6 @@ Method(mddc,, Serialized) mddb(REG0._ADR, 7, REG1._ADR, 22, "_ADR") if (LNotEqual(RT00, BUF0)) { - err("", zFFF, 0x002, 0, 0, RT00, BUF0) + err("", zFFF, __LINE__, 0, 0, RT00, BUF0) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0052/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0052/DECL.asl index c4ef09a78..0cab99fc4 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0052/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0052/DECL.asl @@ -42,16 +42,16 @@ Method(mddd,, Serialized) Store(DN00._HE, Local0) if (LNotEqual(Local0, 0x19)){ - err("", zFFF, 0x000, 0, 0, Local0, 0x19) + err("", zFFF, __LINE__, 0, 0, Local0, 0x19) } Store(DN00._LL, Local0) if (LNotEqual(Local0, 0x1a)){ - err("", zFFF, 0x000, 0, 0, Local0, 0x1a) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1a) } Store(DN00._SHR, Local0) if (LNotEqual(Local0, 0x1b)){ - err("", zFFF, 0x000, 0, 0, Local0, 0x1b) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1b) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0054/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0054/DECL.asl index 7a989ccd1..ae5ca2034 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0054/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0054/DECL.asl @@ -44,7 +44,7 @@ Method(mddf,, Serialized) Store(ConcatenateResTemplate( b000, b001 ), Local0) if (LNotEqual(Local0, Buffer() {0x79, 0x00})) { - err("", zFFF, 0x000, 0, 0, Local0, Buffer() {0x79, 0x00}) + err("", zFFF, __LINE__, 0, 0, Local0, Buffer() {0x79, 0x00}) } } @@ -56,12 +56,12 @@ Method(mde0,, Serialized) Store(ConcatenateResTemplate( b000, Buffer() {0x79, 0x00} ), Local0) if (LNotEqual(Local0, Buffer() {0x79, 0x00})) { - err("", zFFF, 0x001, 0, 0, Local0, Buffer() {0x79, 0x00}) + err("", zFFF, __LINE__, 0, 0, Local0, Buffer() {0x79, 0x00}) } Store(ConcatenateResTemplate( Buffer() {0x79, 0x00}, b000 ), Local0) if (LNotEqual(Local0, Buffer() {0x79, 0x00})) { - err("", zFFF, 0x002, 0, 0, Local0, Buffer() {0x79, 0x00}) + err("", zFFF, __LINE__, 0, 0, Local0, Buffer() {0x79, 0x00}) } } @@ -69,7 +69,7 @@ Method(mde1) { Store(ConcatenateResTemplate( Buffer() {0x79, 0x00}, Buffer() {0x79, 0x00} ), Local0) if (LNotEqual(Local0, Buffer() {0x79, 0x00})) { - err("", zFFF, 0x003, 0, 0, Local0, Buffer() {0x79, 0x00}) + err("", zFFF, __LINE__, 0, 0, Local0, Buffer() {0x79, 0x00}) } } @@ -81,12 +81,12 @@ Method(mde2,, Serialized) Store(LEqual( b000, Buffer(1) {0x79} ), Local0) if (LNotEqual(Local0, Ones)) { - err("", zFFF, 0x004, 0, 0, Local0, Ones) + err("", zFFF, __LINE__, 0, 0, Local0, Ones) } Store(LEqual( Buffer(1) {0x79}, b000 ), Local0) if (LNotEqual(Local0, Ones)) { - err("", zFFF, 0x005, 0, 0, Local0, Ones) + err("", zFFF, __LINE__, 0, 0, Local0, Ones) } } @@ -94,7 +94,7 @@ Method(mde3) { Store(LEqual( Buffer(1) {0x79}, Buffer(1) {0x79} ), Local0) if (LNotEqual(Local0, Ones)) { - err("", zFFF, 0x006, 0, 0, Local0, Ones) + err("", zFFF, __LINE__, 0, 0, Local0, Ones) } } @@ -106,12 +106,12 @@ Method(mde4,, Serialized) Store(LGreater( b000, Buffer(1) {0x79} ), Local0) if (LNotEqual(Local0, Zero)) { - err("", zFFF, 0x007, 0, 0, Local0, Zero) + err("", zFFF, __LINE__, 0, 0, Local0, Zero) } Store(LGreater( Buffer(1) {0x79}, b000 ), Local0) if (LNotEqual(Local0, Zero)) { - err("", zFFF, 0x008, 0, 0, Local0, Zero) + err("", zFFF, __LINE__, 0, 0, Local0, Zero) } } @@ -119,7 +119,7 @@ Method(mde5) { Store(LGreater( Buffer(1) {0x79}, Buffer(1) {0x79} ), Local0) if (LNotEqual(Local0, Zero)) { - err("", zFFF, 0x009, 0, 0, Local0, Zero) + err("", zFFF, __LINE__, 0, 0, Local0, Zero) } } @@ -133,12 +133,12 @@ Method(mde6,, Serialized) Store(Concatenate( b000, Buffer() {0x79} ), Local0) if (LNotEqual(Local0, Buffer() {0x79, 0x79})) { - err("", zFFF, 0x00a, 0, 0, Local0, Buffer() {0x79, 0x79}) + err("", zFFF, __LINE__, 0, 0, Local0, Buffer() {0x79, 0x79}) } Store(Concatenate( Buffer() {0x79}, b000 ), Local0) if (LNotEqual(Local0, Buffer() {0x79, 0x79})) { - err("", zFFF, 0x00b, 0, 0, Local0, Buffer() {0x79, 0x79}) + err("", zFFF, __LINE__, 0, 0, Local0, Buffer() {0x79, 0x79}) } } @@ -146,7 +146,7 @@ Method(mde7) { Store(Concatenate( Buffer() {0x79}, Buffer() {0x79} ), Local0) if (LNotEqual(Local0, Buffer() {0x79, 0x79})) { - err("", zFFF, 0x00c, 0, 0, Local0, Buffer() {0x79, 0x79}) + err("", zFFF, __LINE__, 0, 0, Local0, Buffer() {0x79, 0x79}) } } @@ -158,12 +158,12 @@ Method(mde8,, Serialized) Add( b000, Buffer() {0x79}, Local0) if (LNotEqual(Local0, 0xf2)) { - err("", zFFF, 0x00d, 0, 0, Local0, 0xf2) + err("", zFFF, __LINE__, 0, 0, Local0, 0xf2) } Add( Buffer() {0x79}, b000, Local0) if (LNotEqual(Local0, 0xf2)) { - err("", zFFF, 0x00e, 0, 0, Local0, 0xf2) + err("", zFFF, __LINE__, 0, 0, Local0, 0xf2) } } @@ -171,7 +171,7 @@ Method(mde9) { Add( Buffer() {0x79}, Buffer() {0x79}, Local0) if (LNotEqual(Local0, 0xf2)) { - err("", zFFF, 0x00f, 0, 0, Local0, 0xf2) + err("", zFFF, __LINE__, 0, 0, Local0, 0xf2) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0057/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0057/DECL.asl index cddc29919..6fa89fe1c 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0057/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0057/DECL.asl @@ -57,7 +57,7 @@ Method(mdf2, 1) { // Store("ERROR 0: mdf2, after Return !!!", Debug) } - err("", zFFF, 0x000, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) mdf0() mdf1() @@ -79,10 +79,10 @@ Method(mdf3, 1) { // ASL-compiler DOESN'T report Warning in this case!!! // And the Store operator below is actually processed!!! - err("", zFFF, 0x001, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } - err("", zFFF, 0x002, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) mdf0() mdf1() diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0058/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0058/DECL.asl index 1511fdcd0..634c93622 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0058/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0058/DECL.asl @@ -46,11 +46,11 @@ Method(mdf5, 1) Store(Concatenate(1, 2), Local0) if (F64) { if (LNotEqual(Local0, Buffer() {1,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0})){ - err("", zFFF, 0x000, 0, 0, Local0, Buffer() {1,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0}) + err("", zFFF, __LINE__, 0, 0, Local0, Buffer() {1,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0}) } } else { if (LNotEqual(Local0, Buffer() {1,0,0,0,2,0,0,0})){ - err("", zFFF, 0x001, 0, 0, Local0, Buffer() {1,0,0,0,2,0,0,0}) + err("", zFFF, __LINE__, 0, 0, Local0, Buffer() {1,0,0,0,2,0,0,0}) } } } else { @@ -67,11 +67,11 @@ Method(mdf6, 1) Store(Concatenate(0x1234, 0x7890), Local0) if (F64) { if (LNotEqual(Local0, Buffer() {0x34,0x12,0,0,0,0,0,0,0x90,0x78,0,0,0,0,0,0})){ - err("", zFFF, 0x002, 0, 0, Local0, Buffer() {0x34,0x12,0,0,0,0,0,0,0x90,0x78,0,0,0,0,0,0}) + err("", zFFF, __LINE__, 0, 0, Local0, Buffer() {0x34,0x12,0,0,0,0,0,0,0x90,0x78,0,0,0,0,0,0}) } } else { if (LNotEqual(Local0, Buffer() {0x34,0x12,0,0,0x90,0x78,0,0})){ - err("", zFFF, 0x003, 0, 0, Local0, Buffer() {0x34,0x12,0,0,0x90,0x78,0,0}) + err("", zFFF, __LINE__, 0, 0, Local0, Buffer() {0x34,0x12,0,0,0x90,0x78,0,0}) } } } else { @@ -85,11 +85,11 @@ Method(mdf7) Store(Concatenate(1, 2), Local0) if (F64) { if (LNotEqual(Local0, Buffer() {1,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0})){ - err("", zFFF, 0x004, 0, 0, Local0, Buffer() {1,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0}) + err("", zFFF, __LINE__, 0, 0, Local0, Buffer() {1,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0}) } } else { if (LNotEqual(Local0, Buffer() {1,0,0,0,2,0,0,0})){ - err("", zFFF, 0x005, 0, 0, Local0, Buffer() {1,0,0,0,2,0,0,0}) + err("", zFFF, __LINE__, 0, 0, Local0, Buffer() {1,0,0,0,2,0,0,0}) } } Store(Local0, Debug) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0059/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0059/DECL.asl index 056024f7c..8beb7568c 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0059/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0059/DECL.asl @@ -67,11 +67,11 @@ Method(mdf9,, Serialized) Store(SizeOf(b000), Local1) if (LNotEqual(Local0, 3)) { - err("", zFFF, 0x000, 0, 0, Local0, 3) + err("", zFFF, __LINE__, 0, 0, Local0, 3) } elseif (LNotEqual(Local1, 202)) { - err("", zFFF, 0x001, 0, 0, Local0, 202) + err("", zFFF, __LINE__, 0, 0, Local0, 202) } elseif (LNotEqual(b000, b001)) { - err("", zFFF, 0x002, 0, 0, b000, b001) + err("", zFFF, __LINE__, 0, 0, b000, b001) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0061/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0061/DECL.asl index 9d279e4e3..006a4951a 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0061/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0061/DECL.asl @@ -116,6 +116,6 @@ Method(me07) me03() me06() if (LNotEqual(id09, 1)) { - err("", zFFF, 0x002, 0, 0, id09, 1) + err("", zFFF, __LINE__, 0, 0, id09, 1) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0062_ASL_RUNTIME/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0062_ASL_RUNTIME/DECL.asl index c05ae57a2..1e3bca19c 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0062_ASL_RUNTIME/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0062_ASL_RUNTIME/DECL.asl @@ -141,6 +141,6 @@ Method(mb62,, Serialized) // Check the original long String Literal if (LNotEqual(Local0, s000)) { - err("", zFFF, 0x000, 0, 0, s000, Local0) + err("", zFFF, __LINE__, 0, 0, s000, Local0) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0063/File0.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0063/File0.asl index 23b772c91..725d5c70b 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0063/File0.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0063/File0.asl @@ -38,40 +38,40 @@ Method(mf92) { ToInteger("0x0", Local0) if (LNotEqual(Local0, 0x0)) { - err("", zFFF, 0x101, 0, 0, Local0, 0x0) + err("", zFFF, __LINE__, 0, 0, Local0, 0x0) } ToInteger("0x0000000", Local0) if (LNotEqual(Local0, 0x0)) { - err("", zFFF, 0x102, 0, 0, Local0, 0x0) + err("", zFFF, __LINE__, 0, 0, Local0, 0x0) } ToInteger("0x1", Local0) if (LNotEqual(Local0, 0x1)) { - err("", zFFF, 0x103, 0, 0, Local0, 0x1) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1) } ToInteger("0x12345678", Local0) if (LNotEqual(Local0, 0x12345678)) { - err("", zFFF, 0x104, 0, 0, Local0, 0x12345678) + err("", zFFF, __LINE__, 0, 0, Local0, 0x12345678) } ToInteger("0x12345", Local0) if (LNotEqual(Local0, 0x12345)) { - err("", zFFF, 0x105, 0, 0, Local0, 0x12345) + err("", zFFF, __LINE__, 0, 0, Local0, 0x12345) } if (F64) { Store("0x1234567890123456", Local1) ToInteger(Local1, Local0) if (LNotEqual(Local0, 0x1234567890123456)) { - err("", zFFF, 0x106, 0, 0, Local0, 0x1234567890123456) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1234567890123456) } Store("0x123456789012345", Local1) ToInteger(Local1, Local0) if (LNotEqual(Local0, 0x123456789012345)) { - err("", zFFF, 0x107, 0, 0, Local0, 0x123456789012345) + err("", zFFF, __LINE__, 0, 0, Local0, 0x123456789012345) } } @@ -79,25 +79,25 @@ Method(mf92) { ToInteger("0xabcdefef", Local0) if (LNotEqual(Local0, 0xabcdefef)) { - err("", zFFF, 0x108, 0, 0, Local0, 0xabcdefef) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcdefef) } ToInteger("0xabcdef", Local0) if (LNotEqual(Local0, 0xabcdef)) { - err("", zFFF, 0x109, 0, 0, Local0, 0xabcdef) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcdef) } if (F64) { Store("0xabcdefefadefbcdf", Local1) ToInteger(Local1, Local0) if (LNotEqual(Local0, 0xabcdefefadefbcdf)) { - err("", zFFF, 0x10a, 0, 0, Local0, 0xabcdefefadefbcdf) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcdefefadefbcdf) } Store("0xabcdefefadefbcd", Local1) ToInteger(Local1, Local0) if (LNotEqual(Local0, 0xabcdefefadefbcd)) { - err("", zFFF, 0x10b, 0, 0, Local0, 0xabcdefefadefbcd) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcdefefadefbcd) } } @@ -105,20 +105,20 @@ Method(mf92) { ToInteger("0x1ab2cd34", Local0) if (LNotEqual(Local0, 0x1ab2cd34)) { - err("", zFFF, 0x10c, 0, 0, Local0, 0x1ab2cd34) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1ab2cd34) } if (F64) { Store("0x1ab2cd340fe05678", Local1) ToInteger(Local1, Local0) if (LNotEqual(Local0, 0x1ab2cd340fe05678)) { - err("", zFFF, 0x10d, 0, 0, Local0, 0x1ab2cd340fe05678) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1ab2cd340fe05678) } Store("0x1ab2cd340fe0", Local1) ToInteger(Local1, Local0) if (LNotEqual(Local0, 0x1ab2cd340fe0)) { - err("", zFFF, 0x10e, 0, 0, Local0, 0x1ab2cd340fe0) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1ab2cd340fe0) } } @@ -134,49 +134,49 @@ Method(mf93) { ToInteger("0", Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x110, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } ToInteger("0000000", Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x111, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } ToInteger("000000000000000", Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x112, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } ToInteger("000000000000000000000000000000000000000000", Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x113, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } ToInteger("1", Local0) if (LNotEqual(Local0, 1)) { - err("", zFFF, 0x114, 0, 0, Local0, 1) + err("", zFFF, __LINE__, 0, 0, Local0, 1) } ToInteger("1234567890", Local0) if (LNotEqual(Local0, 1234567890)) { - err("", zFFF, 0x115, 0, 0, Local0, 1234567890) + err("", zFFF, __LINE__, 0, 0, Local0, 1234567890) } ToInteger("1234567", Local0) if (LNotEqual(Local0, 1234567)) { - err("", zFFF, 0x116, 0, 0, Local0, 1234567) + err("", zFFF, __LINE__, 0, 0, Local0, 1234567) } ToInteger("4294967295", Local0) if (LNotEqual(Local0, 4294967295)) { - err("", zFFF, 0x117, 0, 0, Local0, 4294967295) + err("", zFFF, __LINE__, 0, 0, Local0, 4294967295) } if (F64) { Store("18446744073709551615", Local1) ToInteger(Local1, Local0) if (LNotEqual(Local0, 18446744073709551615)) { - err("", zFFF, 0x118, 0, 0, Local0, 18446744073709551615) + err("", zFFF, __LINE__, 0, 0, Local0, 18446744073709551615) } } @@ -193,146 +193,146 @@ Method(mf94) { ToInteger(" 0x0", Local0) if (LNotEqual(Local0, 0x0)) { - err("", zFFF, 0x11b, 0, 0, Local0, 0x0) + err("", zFFF, __LINE__, 0, 0, Local0, 0x0) } ToInteger(" 0x00000", Local0) if (LNotEqual(Local0, 0x0)) { - err("", zFFF, 0x11c, 0, 0, Local0, 0x0) + err("", zFFF, __LINE__, 0, 0, Local0, 0x0) } ToInteger(" 0x1", Local0) if (LNotEqual(Local0, 0x1)) { - err("", zFFF, 0x11d, 0, 0, Local0, 0x1) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1) } ToInteger(" 0x12345678", Local0) if (LNotEqual(Local0, 0x12345678)) { - err("", zFFF, 0x11e, 0, 0, Local0, 0x12345678) + err("", zFFF, __LINE__, 0, 0, Local0, 0x12345678) } ToInteger(" 0x12345", Local0) if (LNotEqual(Local0, 0x12345)) { - err("", zFFF, 0x11f, 0, 0, Local0, 0x12345) + err("", zFFF, __LINE__, 0, 0, Local0, 0x12345) } if (F64) { Store(" 0x1234567890123456", Local1) ToInteger(Local1, Local0) if (LNotEqual(Local0, 0x1234567890123456)) { - err("", zFFF, 0x120, 0, 0, Local0, 0x1234567890123456) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1234567890123456) } Store(" 0x123456789012345", Local1) ToInteger(Local1, Local0) if (LNotEqual(Local0, 0x123456789012345)) { - err("", zFFF, 0x121, 0, 0, Local0, 0x123456789012345) + err("", zFFF, __LINE__, 0, 0, Local0, 0x123456789012345) } } ToInteger(" 0xabcdefef", Local0) if (LNotEqual(Local0, 0xabcdefef)) { - err("", zFFF, 0x122, 0, 0, Local0, 0xabcdefef) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcdefef) } ToInteger(" 0xabcdef", Local0) if (LNotEqual(Local0, 0xabcdef)) { - err("", zFFF, 0x123, 0, 0, Local0, 0xabcdef) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcdef) } ToInteger(" 0xabcdef", Local0) if (LNotEqual(Local0, 0xabcdef)) { - err("", zFFF, 0x124, 0, 0, Local0, 0xabcdef) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcdef) } if (F64) { Store(" 0xabcdefefadefbcdf", Local1) ToInteger(Local1, Local0) if (LNotEqual(Local0, 0xabcdefefadefbcdf)) { - err("", zFFF, 0x125, 0, 0, Local0, 0xabcdefefadefbcdf) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcdefefadefbcdf) } Store(" 0xabcdefefadefbcd", Local1) ToInteger(Local1, Local0) if (LNotEqual(Local0, 0xabcdefefadefbcd)) { - err("", zFFF, 0x126, 0, 0, Local0, 0xabcdefefadefbcd) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcdefefadefbcd) } } ToInteger(" 0x1ab2cd34", Local0) if (LNotEqual(Local0, 0x1ab2cd34)) { - err("", zFFF, 0x127, 0, 0, Local0, 0x1ab2cd34) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1ab2cd34) } if (F64) { Store(" 0x1ab2cd340fe05678", Local1) ToInteger(Local1, Local0) if (LNotEqual(Local0, 0x1ab2cd340fe05678)) { - err("", zFFF, 0x128, 0, 0, Local0, 0x1ab2cd340fe05678) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1ab2cd340fe05678) } Store(" 0x1ab2cd340fe0", Local1) ToInteger(Local1, Local0) if (LNotEqual(Local0, 0x1ab2cd340fe0)) { - err("", zFFF, 0x129, 0, 0, Local0, 0x1ab2cd340fe0) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1ab2cd340fe0) } } ToInteger(" 0", Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x12a, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } ToInteger(" 0000000", Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x12b, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } ToInteger(" 000000000000000", Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x12c, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } ToInteger(" 000000000000000000000000000000000000000000", Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x12d, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } ToInteger(" 1", Local0) if (LNotEqual(Local0, 1)) { - err("", zFFF, 0x12e, 0, 0, Local0, 1) + err("", zFFF, __LINE__, 0, 0, Local0, 1) } ToInteger(" 1234567890", Local0) if (LNotEqual(Local0, 1234567890)) { - err("", zFFF, 0x12f, 0, 0, Local0, 1234567890) + err("", zFFF, __LINE__, 0, 0, Local0, 1234567890) } ToInteger(" 1234567890", Local0) if (LNotEqual(Local0, 1234567890)) { - err("", zFFF, 0x130, 0, 0, Local0, 1234567890) + err("", zFFF, __LINE__, 0, 0, Local0, 1234567890) } ToInteger(" 1234567890", Local0) if (LNotEqual(Local0, 1234567890)) { - err("", zFFF, 0x131, 0, 0, Local0, 1234567890) + err("", zFFF, __LINE__, 0, 0, Local0, 1234567890) } ToInteger(" 1234567", Local0) if (LNotEqual(Local0, 1234567)) { - err("", zFFF, 0x132, 0, 0, Local0, 1234567) + err("", zFFF, __LINE__, 0, 0, Local0, 1234567) } ToInteger(" 4294967295", Local0) if (LNotEqual(Local0, 4294967295)) { - err("", zFFF, 0x133, 0, 0, Local0, 4294967295) + err("", zFFF, __LINE__, 0, 0, Local0, 4294967295) } if (F64) { Store(" 18446744073709551615", Local1) ToInteger(Local1, Local0) if (LNotEqual(Local0, 18446744073709551615)) { - err("", zFFF, 0x134, 0, 0, Local0, 18446744073709551615) + err("", zFFF, __LINE__, 0, 0, Local0, 18446744073709551615) } } @@ -348,86 +348,86 @@ Method(mf95) { ToInteger(" 0", Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x137, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } ToInteger(" 2", Local0) if (LNotEqual(Local0, 2)) { - err("", zFFF, 0x138, 0, 0, Local0, 2) + err("", zFFF, __LINE__, 0, 0, Local0, 2) } ToInteger(" 0xa", Local0) if (LNotEqual(Local0, 0xa)) { - err("", zFFF, 0x139, 0, 0, Local0, 0xa) + err("", zFFF, __LINE__, 0, 0, Local0, 0xa) } ToInteger(" 04294967295", Local0) if (LNotEqual(Local0, 4294967295)) { - err("", zFFF, 0x13a, 0, 0, Local0, 4294967295) + err("", zFFF, __LINE__, 0, 0, Local0, 4294967295) } ToInteger("04294967295", Local0) if (LNotEqual(Local0, 4294967295)) { - err("", zFFF, 0x13b, 0, 0, Local0, 4294967295) + err("", zFFF, __LINE__, 0, 0, Local0, 4294967295) } ToInteger("000000000000000000004294967295", Local0) if (LNotEqual(Local0, 4294967295)) { - err("", zFFF, 0x13c, 0, 0, Local0, 4294967295) + err("", zFFF, __LINE__, 0, 0, Local0, 4294967295) } ToInteger(" 000000000000000000004294967295", Local0) if (LNotEqual(Local0, 4294967295)) { - err("", zFFF, 0x13d, 0, 0, Local0, 4294967295) + err("", zFFF, __LINE__, 0, 0, Local0, 4294967295) } ToInteger(" 000000000000000000004294967295", Local0) if (LNotEqual(Local0, 4294967295)) { - err("", zFFF, 0x13e, 0, 0, Local0, 4294967295) + err("", zFFF, __LINE__, 0, 0, Local0, 4294967295) } ToInteger(" 000000000000000000004294967295", Local0) if (LNotEqual(Local0, 4294967295)) { - err("", zFFF, 0x13f, 0, 0, Local0, 4294967295) + err("", zFFF, __LINE__, 0, 0, Local0, 4294967295) } ToInteger(" 04294967295", Local0) if (LNotEqual(Local0, 4294967295)) { - err("", zFFF, 0x140, 0, 0, Local0, 4294967295) + err("", zFFF, __LINE__, 0, 0, Local0, 4294967295) } ToInteger(" 0123456789", Local0) if (LNotEqual(Local0, 123456789)) { - err("", zFFF, 0x141, 0, 0, Local0, 123456789) + err("", zFFF, __LINE__, 0, 0, Local0, 123456789) } ToInteger("0123456789", Local0) if (LNotEqual(Local0, 123456789)) { - err("", zFFF, 0x142, 0, 0, Local0, 123456789) + err("", zFFF, __LINE__, 0, 0, Local0, 123456789) } ToInteger("00123456789", Local0) if (LNotEqual(Local0, 123456789)) { - err("", zFFF, 0x143, 0, 0, Local0, 123456789) + err("", zFFF, __LINE__, 0, 0, Local0, 123456789) } if (F64) { Store(" 018446744073709551615", Local1) ToInteger(Local1, Local0) if (LNotEqual(Local0, 18446744073709551615)) { - err("", zFFF, 0x144, 0, 0, Local0, 18446744073709551615) + err("", zFFF, __LINE__, 0, 0, Local0, 18446744073709551615) } Store("018446744073709551615", Local1) ToInteger(Local1, Local0) if (LNotEqual(Local0, 18446744073709551615)) { - err("", zFFF, 0x145, 0, 0, Local0, 18446744073709551615) + err("", zFFF, __LINE__, 0, 0, Local0, 18446744073709551615) } Store("000000000000000000000000000000000000000018446744073709551615", Local1) ToInteger(Local1, Local0) if (LNotEqual(Local0, 18446744073709551615)) { - err("", zFFF, 0x146, 0, 0, Local0, 18446744073709551615) + err("", zFFF, __LINE__, 0, 0, Local0, 18446744073709551615) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0063/File1.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0063/File1.asl index dab4ef61c..65ab323da 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0063/File1.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0063/File1.asl @@ -38,46 +38,46 @@ Method(mf97) { Add("", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x201, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } Add("0x0", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x201, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } Add("0x1", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x202, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } Add("0x12345678", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x203, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } Add("0x1234567890123456", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x204, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } // Hex: 0x - hex Add("0xabcdefef", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x205, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } Add("0xabcdefefadefbcdf", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x206, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } // Hex: 0x - dec/hex Add("0x1ab2cd340fe05678", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x207, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } CH03("", 0, 0x208, 0, 0) @@ -85,7 +85,7 @@ Method(mf97) { CH03("", 0, 0x209, 0, 0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x20a, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } CH03("", 0, 0x20b, 0, 0) @@ -100,35 +100,35 @@ Method(mf98) { Add("0", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x20d, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } CH03("", 0, 0x201, 0, 0) Add("0000000", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x20e, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } CH03("", 0, 0x202, 0, 0) Add("000000000000000000000000000000", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x20f, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } CH03("", 0, 0x203, 0, 0) Add("1", 0, Local0) if (LNotEqual(Local0, 1)) { - err("", zFFF, 0x210, 0, 0, Local0, 1) + err("", zFFF, __LINE__, 0, 0, Local0, 1) } CH03("", 0, 0x204, 0, 0) Add("12345678", 0, Local0) if (LNotEqual(Local0, 0x12345678)) { - err("", zFFF, 0x211, 0, 0, Local0, 0x12345678) + err("", zFFF, __LINE__, 0, 0, Local0, 0x12345678) } CH03("", 0, 0x205, 0, 0) @@ -146,11 +146,11 @@ Method(mf99) { Add("1234567890123456", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1234567890123456)) { - err("", zFFF, 0x214, 0, 0, Local0, 0x1234567890123456) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1234567890123456) } } else { if (LNotEqual(Local0, 0x12345678)) { - err("", zFFF, 0x215, 0, 0, Local0, 0x12345678) + err("", zFFF, __LINE__, 0, 0, Local0, 0x12345678) } } @@ -158,22 +158,22 @@ Method(mf99) { Add("abcdefef", 0, Local0) if (LNotEqual(Local0, 0xabcdefef)) { - err("", zFFF, 0x216, 0, 0, Local0, 0xabcdefef) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcdefef) } Add("abcdefe", 0, Local0) if (LNotEqual(Local0, 0xabcdefe)) { - err("", zFFF, 0x217, 0, 0, Local0, 0xabcdefe) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcdefe) } Add("abcdefefadefbcdf", 0, Local0) if (F64) { if (LNotEqual(Local0, 0xabcdefefadefbcdf)) { - err("", zFFF, 0x218, 0, 0, Local0, 0xabcdefefadefbcdf) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcdefefadefbcdf) } } else { if (LNotEqual(Local0, 0xabcdefef)) { - err("", zFFF, 0x219, 0, 0, Local0, 0xabcdefef) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcdefef) } } @@ -182,28 +182,28 @@ Method(mf99) { Add("1ab2cd340fe05678", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1ab2cd340fe05678)) { - err("", zFFF, 0x21a, 0, 0, Local0, 0x1ab2cd340fe05678) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1ab2cd340fe05678) } } else { if (LNotEqual(Local0, 0x1ab2cd34)) { - err("", zFFF, 0x21b, 0, 0, Local0, 0x1ab2cd34) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1ab2cd34) } } Add("1ab2cd340fe05", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1ab2cd340fe05)) { - err("", zFFF, 0x21c, 0, 0, Local0, 0x1ab2cd340fe05) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1ab2cd340fe05) } } else { if (LNotEqual(Local0, 0x1ab2cd34)) { - err("", zFFF, 0x21d, 0, 0, Local0, 0x1ab2cd34) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1ab2cd34) } } Add("1a", 0, Local0) if (LNotEqual(Local0, 0x1a)) { - err("", zFFF, 0x21e, 0, 0, Local0, 0x1a) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1a) } CH03("", 0, 0x219, 0, 0) @@ -218,71 +218,71 @@ Method(mf9a) { CH03("", 0, 0x220, 0, 0) Add("1234cd", 0, Local0) if (LNotEqual(Local0, 0x1234cd)) { - err("", zFFF, 0x221, 0, 0, Local0, 0x1234cd) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1234cd) } // 6. "000x1234" (non-decimal character in dec-image) CH03("", 0, 0x223, 0, 0) Add("000x1234", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x224, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } // 7. "0x1234cdQ" (non-hex character in '0x'-image) CH03("", 0, 0x225, 0, 0) Add("0x1234cdQ", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x226, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } CH03("", 0, 0x227, 0, 0) Add("1234cdQ", 0, Local0) if (LNotEqual(Local0, 0x1234cd)) { - err("", zFFF, 0x228, 0, 0, Local0, 0x1234cd) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1234cd) } CH03("", 0, 0x229, 0, 0) Add("0x0x12345", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x22a, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } // 8. "1234 " (white space in dec image) CH03("", 0, 0x22b, 0, 0) Add("1234 ", 0, Local0) if (LNotEqual(Local0, 0x1234)) { - err("", zFFF, 0x22c, 0, 0, Local0, 0x1234) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1234) } // 9. "0x1234cd " (white space in '0x'-image) CH03("", 0, 0x22d, 0, 0) Add("1234cd ", 0, Local0) if (LNotEqual(Local0, 0x1234cd)) { - err("", zFFF, 0x22e, 0, 0, Local0, 0x1234cd) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1234cd) } // 10. "0x 1234cdQ" (white space after '0x') CH03("", 0, 0x22f, 0, 0) Add("0x 1234", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x230, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } CH03("", 0, 0x231, 0, 0) Add("0x0x 1234", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x232, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } CH03("", 0, 0x233, 0, 0) Add("0x0x 0x 1234", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x234, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } CH03("", 0, 0x235, 0, 0) Add("0x 0x 1234", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x236, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } // 11. (decimal image exceeding maximal) @@ -292,11 +292,11 @@ Method(mf9a) { Add("4294967296", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x4294967296)) { - err("", zFFF, 0x238, 0, 0, Local0, 0x4294967296) + err("", zFFF, __LINE__, 0, 0, Local0, 0x4294967296) } } else { if (LNotEqual(Local0, 0x42949672)) { - err("", zFFF, 0x239, 0, 0, Local0, 0x42949672) + err("", zFFF, __LINE__, 0, 0, Local0, 0x42949672) } } @@ -304,11 +304,11 @@ Method(mf9a) { Add("123456789012345678904294967296", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1234567890123456)) { - err("", zFFF, 0x23b, 0, 0, Local0, 0x1234567890123456) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1234567890123456) } } else { if (LNotEqual(Local0, 0x12345678)) { - err("", zFFF, 0x23c, 0, 0, Local0, 0x12345678) + err("", zFFF, __LINE__, 0, 0, Local0, 0x12345678) } } @@ -316,11 +316,11 @@ Method(mf9a) { Add(" 00004294967296", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x4294967296)) { - err("", zFFF, 0x23e, 0, 0, Local0, 0x4294967296) + err("", zFFF, __LINE__, 0, 0, Local0, 0x4294967296) } } else { if (LNotEqual(Local0, 0x42949672)) { - err("", zFFF, 0x23f, 0, 0, Local0, 0x42949672) + err("", zFFF, __LINE__, 0, 0, Local0, 0x42949672) } } @@ -328,11 +328,11 @@ Method(mf9a) { Add(" 0123456789012345678904294967296", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1234567890123456)) { - err("", zFFF, 0x241, 0, 0, Local0, 0x1234567890123456) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1234567890123456) } } else { if (LNotEqual(Local0, 0x12345678)) { - err("", zFFF, 0x242, 0, 0, Local0, 0x12345678) + err("", zFFF, __LINE__, 0, 0, Local0, 0x12345678) } } @@ -340,11 +340,11 @@ Method(mf9a) { Add("0123456789012345678904294967296", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1234567890123456)) { - err("", zFFF, 0x244, 0, 0, Local0, 0x1234567890123456) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1234567890123456) } } else { if (LNotEqual(Local0, 0x12345678)) { - err("", zFFF, 0x245, 0, 0, Local0, 0x12345678) + err("", zFFF, __LINE__, 0, 0, Local0, 0x12345678) } } @@ -352,11 +352,11 @@ Method(mf9a) { Add(" 123456789012345678904294967296", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1234567890123456)) { - err("", zFFF, 0x247, 0, 0, Local0, 0x1234567890123456) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1234567890123456) } } else { if (LNotEqual(Local0, 0x12345678)) { - err("", zFFF, 0x248, 0, 0, Local0, 0x12345678) + err("", zFFF, __LINE__, 0, 0, Local0, 0x12345678) } } @@ -364,11 +364,11 @@ Method(mf9a) { Add(" 123456789012345678904294967296", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1234567890123456)) { - err("", zFFF, 0x24a, 0, 0, Local0, 0x1234567890123456) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1234567890123456) } } else { if (LNotEqual(Local0, 0x12345678)) { - err("", zFFF, 0x24b, 0, 0, Local0, 0x12345678) + err("", zFFF, __LINE__, 0, 0, Local0, 0x12345678) } } } @@ -378,11 +378,11 @@ Method(mf9a) { Add("18446744073709551616", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1844674407370955)) { - err("", zFFF, 0x24d, 0, 0, Local0, 0x1844674407370955) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1844674407370955) } } else { if (LNotEqual(Local0, 0x18446744)) { - err("", zFFF, 0x24e, 0, 0, Local0, 0x18446744) + err("", zFFF, __LINE__, 0, 0, Local0, 0x18446744) } } @@ -390,11 +390,11 @@ Method(mf9a) { Add(" 18446744073709551616", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1844674407370955)) { - err("", zFFF, 0x250, 0, 0, Local0, 0x1844674407370955) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1844674407370955) } } else { if (LNotEqual(Local0, 0x18446744)) { - err("", zFFF, 0x251, 0, 0, Local0, 0x18446744) + err("", zFFF, __LINE__, 0, 0, Local0, 0x18446744) } } @@ -402,11 +402,11 @@ Method(mf9a) { Add(" 18446744073709551616", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1844674407370955)) { - err("", zFFF, 0x253, 0, 0, Local0, 0x1844674407370955) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1844674407370955) } } else { if (LNotEqual(Local0, 0x18446744)) { - err("", zFFF, 0x254, 0, 0, Local0, 0x18446744) + err("", zFFF, __LINE__, 0, 0, Local0, 0x18446744) } } @@ -414,11 +414,11 @@ Method(mf9a) { Add("018446744073709551616", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1844674407370955)) { - err("", zFFF, 0x256, 0, 0, Local0, 0x1844674407370955) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1844674407370955) } } else { if (LNotEqual(Local0, 0x18446744)) { - err("", zFFF, 0x257, 0, 0, Local0, 0x18446744) + err("", zFFF, __LINE__, 0, 0, Local0, 0x18446744) } } @@ -426,11 +426,11 @@ Method(mf9a) { Add(" 000000000018446744073709551616", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1844674407370955)) { - err("", zFFF, 0x259, 0, 0, Local0, 0x1844674407370955) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1844674407370955) } } else { if (LNotEqual(Local0, 0x18446744)) { - err("", zFFF, 0x25a, 0, 0, Local0, 0x18446744) + err("", zFFF, __LINE__, 0, 0, Local0, 0x18446744) } } @@ -438,20 +438,20 @@ Method(mf9a) { CH03("", 0, 0x25b, 0, 0) Add("0x12345678901234567", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x25c, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } // 13. "0x00000000000001234" (hex image exceeding maximal; no matter that zeros) CH03("", 0, 0x25e, 0, 0) Add("0x00000000000001234", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x25f, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } CH03("", 0, 0x260, 0, 0) Add("0x0000000000000000000001234", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x261, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } // 14. "0x123456789" (hex image exceeding maximal; for 32-bit mode only) @@ -459,7 +459,7 @@ Method(mf9a) { CH03("", 0, 0x262, 0, 0) Add("0x123456789", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x263, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } } @@ -467,7 +467,7 @@ Method(mf9a) { CH03("", 0, 0x264, 0, 0) Add("0x", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x265, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } CH03("", 0, 0x266, 0, 0) } @@ -485,41 +485,41 @@ Method(mf9b) { Add(" 0x0", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x268, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } Add(" 0x1", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x269, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } Add(" 0x12345678", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x26a, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } Add(" 0x1234567890123456", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x26b, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } // Hex: 0x - hex Add(" 0xabcdefef", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x26c, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } Add(" 0xabcdefefadefbcdf", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x26d, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } // Hex: 0x - dec/hex Add(" 0x1ab2cd340fe05678", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x26e, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } CH03("", 0, 0x26f, 0, 0) @@ -527,7 +527,7 @@ Method(mf9b) { CH03("", 0, 0x270, 0, 0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x271, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } CH03("", 0, 0x272, 0, 0) @@ -542,42 +542,42 @@ Method(mf9b) { Add(" 0", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x274, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } CH03("", 0, 0x275, 0, 0) Add(" 0000000", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x276, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } CH03("", 0, 0x277, 0, 0) Add(" 000000000000000000000000000000", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x278, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } CH03("", 0, 0x279, 0, 0) Add(" 000000000000000000000000000000", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x27a, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } CH03("", 0, 0x27b, 0, 0) Add(" 1", 0, Local0) if (LNotEqual(Local0, 1)) { - err("", zFFF, 0x27c, 0, 0, Local0, 1) + err("", zFFF, __LINE__, 0, 0, Local0, 1) } CH03("", 0, 0x27d, 0, 0) Add(" 12345678", 0, Local0) if (LNotEqual(Local0, 0x12345678)) { - err("", zFFF, 0x27e, 0, 0, Local0, 0x12345678) + err("", zFFF, __LINE__, 0, 0, Local0, 0x12345678) } CH03("", 0, 0x27f, 0, 0) @@ -595,11 +595,11 @@ Method(mf9b) { Add(" 1234567890123456", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1234567890123456)) { - err("", zFFF, 0x281, 0, 0, Local0, 0x1234567890123456) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1234567890123456) } } else { if (LNotEqual(Local0, 0x12345678)) { - err("", zFFF, 0x282, 0, 0, Local0, 0x12345678) + err("", zFFF, __LINE__, 0, 0, Local0, 0x12345678) } } @@ -607,22 +607,22 @@ Method(mf9b) { Add(" abcdefef", 0, Local0) if (LNotEqual(Local0, 0xabcdefef)) { - err("", zFFF, 0x283, 0, 0, Local0, 0xabcdefef) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcdefef) } Add(" abcdefe", 0, Local0) if (LNotEqual(Local0, 0xabcdefe)) { - err("", zFFF, 0x284, 0, 0, Local0, 0xabcdefe) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcdefe) } Add(" abcdefefadefbcdf", 0, Local0) if (F64) { if (LNotEqual(Local0, 0xabcdefefadefbcdf)) { - err("", zFFF, 0x285, 0, 0, Local0, 0xabcdefefadefbcdf) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcdefefadefbcdf) } } else { if (LNotEqual(Local0, 0xabcdefef)) { - err("", zFFF, 0x286, 0, 0, Local0, 0xabcdefef) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcdefef) } } @@ -631,28 +631,28 @@ Method(mf9b) { Add(" 1ab2cd340fe05678", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1ab2cd340fe05678)) { - err("", zFFF, 0x287, 0, 0, Local0, 0x1ab2cd340fe05678) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1ab2cd340fe05678) } } else { if (LNotEqual(Local0, 0x1ab2cd34)) { - err("", zFFF, 0x288, 0, 0, Local0, 0x1ab2cd34) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1ab2cd34) } } Add(" 1ab2cd340fe05", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1ab2cd340fe05)) { - err("", zFFF, 0x289, 0, 0, Local0, 0x1ab2cd340fe05) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1ab2cd340fe05) } } else { if (LNotEqual(Local0, 0x1ab2cd34)) { - err("", zFFF, 0x28a, 0, 0, Local0, 0x1ab2cd34) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1ab2cd34) } } Add(" 1a", 0, Local0) if (LNotEqual(Local0, 0x1a)) { - err("", zFFF, 0x28b, 0, 0, Local0, 0x1a) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1a) } CH03("", 0, 0x28d, 0, 0) @@ -667,71 +667,71 @@ Method(mf9b) { CH03("", 0, 0x28e, 0, 0) Add(" 1234cd", 0, Local0) if (LNotEqual(Local0, 0x1234cd)) { - err("", zFFF, 0x28f, 0, 0, Local0, 0x1234cd) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1234cd) } // 6. "000x1234" (non-decimal character in dec-image) CH03("", 0, 0x290, 0, 0) Add(" 000x1234", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x291, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } // 7. "0x1234cdQ" (non-hex character in '0x'-image) CH03("", 0, 0x292, 0, 0) Add(" 0x1234cdQ", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x293, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } CH03("", 0, 0x294, 0, 0) Add(" 1234cdQ", 0, Local0) if (LNotEqual(Local0, 0x1234cd)) { - err("", zFFF, 0x295, 0, 0, Local0, 0x1234cd) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1234cd) } CH03("", 0, 0x296, 0, 0) Add(" 0x0x12345", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x297, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } // 8. "1234 " (white space in dec image) CH03("", 0, 0x298, 0, 0) Add(" 1234 ", 0, Local0) if (LNotEqual(Local0, 0x1234)) { - err("", zFFF, 0x299, 0, 0, Local0, 0x1234) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1234) } // 9. "0x1234cd " (white space in '0x'-image) CH03("", 0, 0x29a, 0, 0) Add(" 1234cd ", 0, Local0) if (LNotEqual(Local0, 0x1234cd)) { - err("", zFFF, 0x29b, 0, 0, Local0, 0x1234cd) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1234cd) } // 10. "0x 1234cdQ" (white space after '0x') CH03("", 0, 0x29c, 0, 0) Add(" 0x 1234", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x29d, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } CH03("", 0, 0x29e, 0, 0) Add(" 0x0x 1234", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x29f, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } CH03("", 0, 0x2a0, 0, 0) Add(" 0x0x 0x 1234", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x2a1, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } CH03("", 0, 0x2a2, 0, 0) Add(" 0x 0x 1234", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x2a3, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } // 11. (decimal image exceeding maximal) @@ -741,11 +741,11 @@ Method(mf9b) { Add(" 4294967296", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x4294967296)) { - err("", zFFF, 0x2a5, 0, 0, Local0, 0x4294967296) + err("", zFFF, __LINE__, 0, 0, Local0, 0x4294967296) } } else { if (LNotEqual(Local0, 0x42949672)) { - err("", zFFF, 0x2a6, 0, 0, Local0, 0x42949672) + err("", zFFF, __LINE__, 0, 0, Local0, 0x42949672) } } @@ -753,11 +753,11 @@ Method(mf9b) { Add(" 123456789012345678904294967296", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1234567890123456)) { - err("", zFFF, 0x2a8, 0, 0, Local0, 0x1234567890123456) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1234567890123456) } } else { if (LNotEqual(Local0, 0x12345678)) { - err("", zFFF, 0x2a9, 0, 0, Local0, 0x12345678) + err("", zFFF, __LINE__, 0, 0, Local0, 0x12345678) } } @@ -765,11 +765,11 @@ Method(mf9b) { Add(" 00004294967296", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x4294967296)) { - err("", zFFF, 0x2ab, 0, 0, Local0, 0x4294967296) + err("", zFFF, __LINE__, 0, 0, Local0, 0x4294967296) } } else { if (LNotEqual(Local0, 0x42949672)) { - err("", zFFF, 0x2ac, 0, 0, Local0, 0x42949672) + err("", zFFF, __LINE__, 0, 0, Local0, 0x42949672) } } @@ -777,11 +777,11 @@ Method(mf9b) { Add(" 0123456789012345678904294967296", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1234567890123456)) { - err("", zFFF, 0x2ae, 0, 0, Local0, 0x1234567890123456) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1234567890123456) } } else { if (LNotEqual(Local0, 0x12345678)) { - err("", zFFF, 0x2af, 0, 0, Local0, 0x12345678) + err("", zFFF, __LINE__, 0, 0, Local0, 0x12345678) } } @@ -789,11 +789,11 @@ Method(mf9b) { Add(" 0123456789012345678904294967296", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1234567890123456)) { - err("", zFFF, 0x2b1, 0, 0, Local0, 0x1234567890123456) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1234567890123456) } } else { if (LNotEqual(Local0, 0x12345678)) { - err("", zFFF, 0x2b2, 0, 0, Local0, 0x12345678) + err("", zFFF, __LINE__, 0, 0, Local0, 0x12345678) } } @@ -801,11 +801,11 @@ Method(mf9b) { Add(" 123456789012345678904294967296", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1234567890123456)) { - err("", zFFF, 0x2b4, 0, 0, Local0, 0x1234567890123456) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1234567890123456) } } else { if (LNotEqual(Local0, 0x12345678)) { - err("", zFFF, 0x2b5, 0, 0, Local0, 0x12345678) + err("", zFFF, __LINE__, 0, 0, Local0, 0x12345678) } } @@ -813,11 +813,11 @@ Method(mf9b) { Add(" 123456789012345678904294967296", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1234567890123456)) { - err("", zFFF, 0x2b7, 0, 0, Local0, 0x1234567890123456) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1234567890123456) } } else { if (LNotEqual(Local0, 0x12345678)) { - err("", zFFF, 0x2b8, 0, 0, Local0, 0x12345678) + err("", zFFF, __LINE__, 0, 0, Local0, 0x12345678) } } } @@ -827,11 +827,11 @@ Method(mf9b) { Add(" 18446744073709551616", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1844674407370955)) { - err("", zFFF, 0x2b9, 0, 0, Local0, 0x1844674407370955) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1844674407370955) } } else { if (LNotEqual(Local0, 0x18446744)) { - err("", zFFF, 0x2ba, 0, 0, Local0, 0x18446744) + err("", zFFF, __LINE__, 0, 0, Local0, 0x18446744) } } @@ -839,11 +839,11 @@ Method(mf9b) { Add(" 18446744073709551616", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1844674407370955)) { - err("", zFFF, 0x2bc, 0, 0, Local0, 0x1844674407370955) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1844674407370955) } } else { if (LNotEqual(Local0, 0x18446744)) { - err("", zFFF, 0x2bd, 0, 0, Local0, 0x18446744) + err("", zFFF, __LINE__, 0, 0, Local0, 0x18446744) } } @@ -851,11 +851,11 @@ Method(mf9b) { Add(" 18446744073709551616", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1844674407370955)) { - err("", zFFF, 0x2bf, 0, 0, Local0, 0x1844674407370955) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1844674407370955) } } else { if (LNotEqual(Local0, 0x18446744)) { - err("", zFFF, 0x2c0, 0, 0, Local0, 0x18446744) + err("", zFFF, __LINE__, 0, 0, Local0, 0x18446744) } } @@ -863,11 +863,11 @@ Method(mf9b) { Add(" 018446744073709551616", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1844674407370955)) { - err("", zFFF, 0x2c2, 0, 0, Local0, 0x1844674407370955) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1844674407370955) } } else { if (LNotEqual(Local0, 0x18446744)) { - err("", zFFF, 0x2c3, 0, 0, Local0, 0x18446744) + err("", zFFF, __LINE__, 0, 0, Local0, 0x18446744) } } @@ -875,11 +875,11 @@ Method(mf9b) { Add(" 000000000018446744073709551616", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1844674407370955)) { - err("", zFFF, 0x2c5, 0, 0, Local0, 0x1844674407370955) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1844674407370955) } } else { if (LNotEqual(Local0, 0x18446744)) { - err("", zFFF, 0x2c6, 0, 0, Local0, 0x18446744) + err("", zFFF, __LINE__, 0, 0, Local0, 0x18446744) } } @@ -887,20 +887,20 @@ Method(mf9b) { CH03("", 0, 0x2c7, 0, 0) Add(" 0x12345678901234567", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x2c8, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } // 13. "0x00000000000001234" (hex image exceeding maximal; no matter that zeros) CH03("", 0, 0x2ca, 0, 0) Add(" 0x00000000000001234", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x2cb, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } CH03("", 0, 0x2cc, 0, 0) Add(" 0x0000000000000000000001234", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x2cd, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } // 14. "0x123456789" (hex image exceeding maximal; for 32-bit mode only) @@ -908,7 +908,7 @@ Method(mf9b) { CH03("", 0, 0x2ce, 0, 0) Add("0x123456789", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x2cf, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } } @@ -916,13 +916,13 @@ Method(mf9b) { CH03("", 0, 0x2d0, 0, 0) Add(" 0x", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x2d1, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } CH03("", 0, 0x2d2, 0, 0) Add(" 0x", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x2d3, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } CH03("", 0, 0x2d4, 0, 0) } @@ -946,41 +946,41 @@ Method(mf9c) { Add(" 0000000000x0", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x368, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } Add(" 0000000000x1", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x369, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } Add(" 0000000000x12345678", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x36a, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } Add(" 0000000000x1234567890123456", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x36b, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } // Hex: 0x - hex Add(" 0000000000xabcdefef", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x36c, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } Add(" 0000000000xabcdefefadefbcdf", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x36d, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } // Hex: 0x - dec/hex Add(" 0000000000x1ab2cd340fe05678", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x36e, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } CH03("", 0, 0x36f, 0, 0) @@ -988,7 +988,7 @@ Method(mf9c) { CH03("", 0, 0x370, 0, 0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x371, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } CH03("", 0, 0x372, 0, 0) @@ -1003,42 +1003,42 @@ Method(mf9c) { Add(" 0000000000", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x374, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } CH03("", 0, 0x375, 0, 0) Add(" 0000000000000000", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x376, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } CH03("", 0, 0x377, 0, 0) Add(" 000000000000000000000000000000000000000", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x378, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } CH03("", 0, 0x379, 0, 0) Add(" 000000000000000000000000000000000000000", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x37a, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } CH03("", 0, 0x37b, 0, 0) Add(" 0000000001", 0, Local0) if (LNotEqual(Local0, 1)) { - err("", zFFF, 0x37c, 0, 0, Local0, 1) + err("", zFFF, __LINE__, 0, 0, Local0, 1) } CH03("", 0, 0x37d, 0, 0) Add(" 00000000012345678", 0, Local0) if (LNotEqual(Local0, 0x12345678)) { - err("", zFFF, 0x37e, 0, 0, Local0, 0x12345678) + err("", zFFF, __LINE__, 0, 0, Local0, 0x12345678) } CH03("", 0, 0x37f, 0, 0) @@ -1056,11 +1056,11 @@ Method(mf9c) { Add(" 0000000001234567890123456", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1234567890123456)) { - err("", zFFF, 0x381, 0, 0, Local0, 0x1234567890123456) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1234567890123456) } } else { if (LNotEqual(Local0, 0x12345678)) { - err("", zFFF, 0x382, 0, 0, Local0, 0x12345678) + err("", zFFF, __LINE__, 0, 0, Local0, 0x12345678) } } @@ -1068,22 +1068,22 @@ Method(mf9c) { Add(" 000000000abcdefef", 0, Local0) if (LNotEqual(Local0, 0xabcdefef)) { - err("", zFFF, 0x383, 0, 0, Local0, 0xabcdefef) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcdefef) } Add(" 000000000abcdefe", 0, Local0) if (LNotEqual(Local0, 0xabcdefe)) { - err("", zFFF, 0x384, 0, 0, Local0, 0xabcdefe) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcdefe) } Add(" 000000000abcdefefadefbcdf", 0, Local0) if (F64) { if (LNotEqual(Local0, 0xabcdefefadefbcdf)) { - err("", zFFF, 0x385, 0, 0, Local0, 0xabcdefefadefbcdf) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcdefefadefbcdf) } } else { if (LNotEqual(Local0, 0xabcdefef)) { - err("", zFFF, 0x386, 0, 0, Local0, 0xabcdefef) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcdefef) } } @@ -1092,28 +1092,28 @@ Method(mf9c) { Add(" 0000000001ab2cd340fe05678", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1ab2cd340fe05678)) { - err("", zFFF, 0x387, 0, 0, Local0, 0x1ab2cd340fe05678) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1ab2cd340fe05678) } } else { if (LNotEqual(Local0, 0x1ab2cd34)) { - err("", zFFF, 0x388, 0, 0, Local0, 0x1ab2cd34) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1ab2cd34) } } Add(" 0000000001ab2cd340fe05", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1ab2cd340fe05)) { - err("", zFFF, 0x389, 0, 0, Local0, 0x1ab2cd340fe05) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1ab2cd340fe05) } } else { if (LNotEqual(Local0, 0x1ab2cd34)) { - err("", zFFF, 0x38a, 0, 0, Local0, 0x1ab2cd34) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1ab2cd34) } } Add(" 0000000001a", 0, Local0) if (LNotEqual(Local0, 0x1a)) { - err("", zFFF, 0x38b, 0, 0, Local0, 0x1a) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1a) } CH03("", 0, 0x38d, 0, 0) @@ -1128,71 +1128,71 @@ Method(mf9c) { CH03("", 0, 0x38e, 0, 0) Add(" 0000000001234cd", 0, Local0) if (LNotEqual(Local0, 0x1234cd)) { - err("", zFFF, 0x38f, 0, 0, Local0, 0x1234cd) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1234cd) } // 6. "000x1234" (non-decimal character in dec-image) CH03("", 0, 0x390, 0, 0) Add(" 000000000000x1234", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x391, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } // 7. "0x1234cdQ" (non-hex character in '0x'-image) CH03("", 0, 0x392, 0, 0) Add(" 0000000000x1234cdQ", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x393, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } CH03("", 0, 0x394, 0, 0) Add(" 0000000001234cdQ", 0, Local0) if (LNotEqual(Local0, 0x1234cd)) { - err("", zFFF, 0x395, 0, 0, Local0, 0x1234cd) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1234cd) } CH03("", 0, 0x396, 0, 0) Add(" 0000000000x0x12345", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x397, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } // 8. "1234 " (white space in dec image) CH03("", 0, 0x398, 0, 0) Add(" 0000000001234 ", 0, Local0) if (LNotEqual(Local0, 0x1234)) { - err("", zFFF, 0x399, 0, 0, Local0, 0x1234) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1234) } // 9. "0x1234cd " (white space in '0x'-image) CH03("", 0, 0x39a, 0, 0) Add(" 0000000001234cd ", 0, Local0) if (LNotEqual(Local0, 0x1234cd)) { - err("", zFFF, 0x39b, 0, 0, Local0, 0x1234cd) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1234cd) } // 10. "0x 1234cdQ" (white space after '0x') CH03("", 0, 0x39c, 0, 0) Add(" 0000000000x 1234", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x39d, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } CH03("", 0, 0x39e, 0, 0) Add(" 0000000000x0x 1234", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x39f, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } CH03("", 0, 0x3a0, 0, 0) Add(" 0000000000x0x 0x 1234", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x3a1, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } CH03("", 0, 0x3a2, 0, 0) Add(" 0000000000x 0x 1234", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x3a3, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } // 11. (decimal image exceeding maximal) @@ -1202,11 +1202,11 @@ Method(mf9c) { Add(" 0000000004294967296", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x4294967296)) { - err("", zFFF, 0x3a5, 0, 0, Local0, 0x4294967296) + err("", zFFF, __LINE__, 0, 0, Local0, 0x4294967296) } } else { if (LNotEqual(Local0, 0x42949672)) { - err("", zFFF, 0x3a6, 0, 0, Local0, 0x42949672) + err("", zFFF, __LINE__, 0, 0, Local0, 0x42949672) } } @@ -1214,11 +1214,11 @@ Method(mf9c) { Add(" 000000000123456789012345678904294967296", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1234567890123456)) { - err("", zFFF, 0x3a8, 0, 0, Local0, 0x1234567890123456) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1234567890123456) } } else { if (LNotEqual(Local0, 0x12345678)) { - err("", zFFF, 0x3a9, 0, 0, Local0, 0x12345678) + err("", zFFF, __LINE__, 0, 0, Local0, 0x12345678) } } @@ -1226,11 +1226,11 @@ Method(mf9c) { Add(" 00000000000004294967296", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x4294967296)) { - err("", zFFF, 0x3ab, 0, 0, Local0, 0x4294967296) + err("", zFFF, __LINE__, 0, 0, Local0, 0x4294967296) } } else { if (LNotEqual(Local0, 0x42949672)) { - err("", zFFF, 0x3ac, 0, 0, Local0, 0x42949672) + err("", zFFF, __LINE__, 0, 0, Local0, 0x42949672) } } @@ -1238,11 +1238,11 @@ Method(mf9c) { Add(" 0000000000123456789012345678904294967296", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1234567890123456)) { - err("", zFFF, 0x3ae, 0, 0, Local0, 0x1234567890123456) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1234567890123456) } } else { if (LNotEqual(Local0, 0x12345678)) { - err("", zFFF, 0x3af, 0, 0, Local0, 0x12345678) + err("", zFFF, __LINE__, 0, 0, Local0, 0x12345678) } } @@ -1250,11 +1250,11 @@ Method(mf9c) { Add(" 0000000000123456789012345678904294967296", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1234567890123456)) { - err("", zFFF, 0x3b1, 0, 0, Local0, 0x1234567890123456) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1234567890123456) } } else { if (LNotEqual(Local0, 0x12345678)) { - err("", zFFF, 0x3b2, 0, 0, Local0, 0x12345678) + err("", zFFF, __LINE__, 0, 0, Local0, 0x12345678) } } @@ -1262,11 +1262,11 @@ Method(mf9c) { Add(" 000000000123456789012345678904294967296", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1234567890123456)) { - err("", zFFF, 0x3b4, 0, 0, Local0, 0x1234567890123456) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1234567890123456) } } else { if (LNotEqual(Local0, 0x12345678)) { - err("", zFFF, 0x3b5, 0, 0, Local0, 0x12345678) + err("", zFFF, __LINE__, 0, 0, Local0, 0x12345678) } } @@ -1274,11 +1274,11 @@ Method(mf9c) { Add(" 000000000123456789012345678904294967296", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1234567890123456)) { - err("", zFFF, 0x3b7, 0, 0, Local0, 0x1234567890123456) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1234567890123456) } } else { if (LNotEqual(Local0, 0x12345678)) { - err("", zFFF, 0x3b8, 0, 0, Local0, 0x12345678) + err("", zFFF, __LINE__, 0, 0, Local0, 0x12345678) } } } @@ -1288,11 +1288,11 @@ Method(mf9c) { Add(" 00000000018446744073709551616", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1844674407370955)) { - err("", zFFF, 0x3b9, 0, 0, Local0, 0x1844674407370955) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1844674407370955) } } else { if (LNotEqual(Local0, 0x18446744)) { - err("", zFFF, 0x3ba, 0, 0, Local0, 0x18446744) + err("", zFFF, __LINE__, 0, 0, Local0, 0x18446744) } } @@ -1300,11 +1300,11 @@ Method(mf9c) { Add(" 00000000018446744073709551616", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1844674407370955)) { - err("", zFFF, 0x3bc, 0, 0, Local0, 0x1844674407370955) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1844674407370955) } } else { if (LNotEqual(Local0, 0x18446744)) { - err("", zFFF, 0x3bd, 0, 0, Local0, 0x18446744) + err("", zFFF, __LINE__, 0, 0, Local0, 0x18446744) } } @@ -1312,11 +1312,11 @@ Method(mf9c) { Add(" 00000000018446744073709551616", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1844674407370955)) { - err("", zFFF, 0x3bf, 0, 0, Local0, 0x1844674407370955) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1844674407370955) } } else { if (LNotEqual(Local0, 0x18446744)) { - err("", zFFF, 0x3c0, 0, 0, Local0, 0x18446744) + err("", zFFF, __LINE__, 0, 0, Local0, 0x18446744) } } @@ -1324,11 +1324,11 @@ Method(mf9c) { Add(" 000000000018446744073709551616", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1844674407370955)) { - err("", zFFF, 0x3c2, 0, 0, Local0, 0x1844674407370955) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1844674407370955) } } else { if (LNotEqual(Local0, 0x18446744)) { - err("", zFFF, 0x3c3, 0, 0, Local0, 0x18446744) + err("", zFFF, __LINE__, 0, 0, Local0, 0x18446744) } } @@ -1336,11 +1336,11 @@ Method(mf9c) { Add(" 000000000000000000018446744073709551616", 0, Local0) if (F64) { if (LNotEqual(Local0, 0x1844674407370955)) { - err("", zFFF, 0x3c5, 0, 0, Local0, 0x1844674407370955) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1844674407370955) } } else { if (LNotEqual(Local0, 0x18446744)) { - err("", zFFF, 0x3c6, 0, 0, Local0, 0x18446744) + err("", zFFF, __LINE__, 0, 0, Local0, 0x18446744) } } @@ -1348,20 +1348,20 @@ Method(mf9c) { CH03("", 0, 0x3c7, 0, 0) Add(" 0000000000x12345678901234567", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x3c8, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } // 13. "0x00000000000001234" (hex image exceeding maximal; no matter that zeros) CH03("", 0, 0x3ca, 0, 0) Add(" 0000000000x00000000000001234", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x3cb, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } CH03("", 0, 0x3cc, 0, 0) Add(" 0000000000x0000000000000000000001234", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x3cd, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } // 14. "0x123456789" (hex image exceeding maximal; for 32-bit mode only) @@ -1369,7 +1369,7 @@ Method(mf9c) { CH03("", 0, 0x3ce, 0, 0) Add("0x123456789", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x3cf, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } } @@ -1377,13 +1377,13 @@ Method(mf9c) { CH03("", 0, 0x3d0, 0, 0) Add(" 0000000000x", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x3d1, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } CH03("", 0, 0x3d2, 0, 0) Add(" 0000000000x", 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x3d3, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } CH03("", 0, 0x3d4, 0, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0063/Misc.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0063/Misc.asl index 68b9fae4b..53c2be555 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0063/Misc.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0063/Misc.asl @@ -91,82 +91,82 @@ Method(md74,, Serialized) { // 8 decimal Add("12345678", 0x11111111, Local0) if (LNotEqual(Local0, 0x23456789)) { - err("", zFFF, 0x000, 0, 0, Local0, 0x23456789) + err("", zFFF, __LINE__, 0, 0, Local0, 0x23456789) } // 8 hex Add("abcdefab", 0x11111111, Local0) if (LNotEqual(Local0, 0xbcdf00bc)) { - err("", zFFF, 0x001, 0, 0, Local0, 0xbcdf00bc) + err("", zFFF, __LINE__, 0, 0, Local0, 0xbcdf00bc) } // 16 decimal Add("1234567890876543", 0x1111111111111111, Local0) if (LNotEqual(Local0, 0x23456789a1987654)) { - err("", zFFF, 0x002, 0, 0, Local0, 0x23456789a1987654) + err("", zFFF, __LINE__, 0, 0, Local0, 0x23456789a1987654) } // 16 hex Add("abcdefababcdfead", 0x1111111111111111, Local0) if (LNotEqual(Local0, 0xbcdf00bcbcdf0fbe)) { - err("", zFFF, 0x003, 0, 0, Local0, 0xbcdf00bcbcdf0fbe) + err("", zFFF, __LINE__, 0, 0, Local0, 0xbcdf00bcbcdf0fbe) } // 17 hex Add("1234567890123456z", 0x1111111111111111, Local0) if (LNotEqual(Local0, 0x23456789a1234567)) { - err("", zFFF, 0x004, 0, 0, Local0, 0x23456789a1234567) + err("", zFFF, __LINE__, 0, 0, Local0, 0x23456789a1234567) } // 17 hex (caused AE_BAD_HEX_CONSTANT, 28.09.2005) Add("12345678901234560", 0x1111111111111111, Local0) if (LNotEqual(Local0, 0x23456789a1234567)) { - err("", zFFF, 0x005, 0, 0, Local0, 0x23456789a1234567) + err("", zFFF, __LINE__, 0, 0, Local0, 0x23456789a1234567) } // Looks like octal, but should be treated as hex Add("01111", 0x2222, Local0) if (LNotEqual(Local0, 0x3333)) { - err("", zFFF, 0x006, 0, 0, Local0, 0x3333) + err("", zFFF, __LINE__, 0, 0, Local0, 0x3333) } // The first zeros each must be put into value Add("000010234", 0, Local0) if (LNotEqual(Local0, 0x10234)) { - err("", zFFF, 0x007, 0, 0, Local0, 0x10234) + err("", zFFF, __LINE__, 0, 0, Local0, 0x10234) } Add("000000000000000010234", 0, Local0) if (LNotEqual(Local0, 0x10234)) { - err("", zFFF, 0x008, 0, 0, Local0, 0x10234) + err("", zFFF, __LINE__, 0, 0, Local0, 0x10234) } Add("00000000000000010234", 0, Local0) if (LNotEqual(Local0, 0x10234)) { - err("", zFFF, 0x009, 0, 0, Local0, 0x10234) + err("", zFFF, __LINE__, 0, 0, Local0, 0x10234) } Add("0000000010234", 0, Local0) if (LNotEqual(Local0, 0x10234)) { - err("", zFFF, 0x00a, 0, 0, Local0, 0x10234) + err("", zFFF, __LINE__, 0, 0, Local0, 0x10234) } Add("000000010234", 0, Local0) if (LNotEqual(Local0, 0x10234)) { - err("", zFFF, 0x00b, 0, 0, Local0, 0x10234) + err("", zFFF, __LINE__, 0, 0, Local0, 0x10234) } // Non-complete 4 hex, should be extended with zeros Add("abcd", 0x1111, Local0) if (LNotEqual(Local0, 0xbcde)) { - err("", zFFF, 0x00c, 0, 0, Local0, 0xbcde) + err("", zFFF, __LINE__, 0, 0, Local0, 0xbcde) } // Non-complete 5 decimal, should be extended with zeros Add("12345", 0x1111, Local0) if (LNotEqual(Local0, 0x13456)) { - err("", zFFF, 0x00d, 0, 0, Local0, 0x13456) + err("", zFFF, __LINE__, 0, 0, Local0, 0x13456) } CH03(ts, zFFF, 0x100, 0, 0) @@ -175,11 +175,11 @@ Method(md74,, Serialized) { Add("abcdef0123456789112233445566778890", 0, Local0) if (F64) { if (LNotEqual(Local0, 0xabcdef0123456789)) { - err("", zFFF, 0x00e, 0, 0, Local0, 0xabcdef0123456789) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcdef0123456789) } } else { if (LNotEqual(Local0, 0xabcdef01)) { - err("", zFFF, 0x00f, 0, 0, Local0, 0xabcdef01) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcdef01) } } @@ -189,11 +189,11 @@ Method(md74,, Serialized) { Add("0abcdef0123456789112233445566778890", 0x1234, Local0) if (F64) { if (LNotEqual(Local0, 0xabcdef0123456789)) { - err("", zFFF, 0x010, 0, 0, Local0, 0xabcdef0123456789) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcdef0123456789) } } else { if (LNotEqual(Local0, 0xabcdef01)) { - err("", zFFF, 0x011, 0, 0, Local0, 0xabcdef01) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcdef01) } } @@ -202,7 +202,7 @@ Method(md74,, Serialized) { // Looks like usual hex, but 'x' terminates conversion Add("0x1111", 0x2222, Local0) if (LNotEqual(Local0, 0x2222)) { - err("", zFFF, 0x012, 0, 0, Local0, 0x2222) + err("", zFFF, __LINE__, 0, 0, Local0, 0x2222) } CH03(ts, zFFF, 0x103, 0, 0) @@ -210,7 +210,7 @@ Method(md74,, Serialized) { // Empty string, no action - the relevant parameter of Add remains zero Add("", 222, Local0) if (LNotEqual(Local0, 222)) { - err("", zFFF, 0x013, 0, 0, Local0, 222) + err("", zFFF, __LINE__, 0, 0, Local0, 222) } CH03(ts, zFFF, 0x104, 0, 0) @@ -218,7 +218,7 @@ Method(md74,, Serialized) { // Blank string, no action - the relevant parameter of Add remains zero Add(" ", 0x333, Local0) if (LNotEqual(Local0, 0x333)) { - err("", zFFF, 0x014, 0, 0, Local0, 0x333) + err("", zFFF, __LINE__, 0, 0, Local0, 0x333) } CH03(ts, zFFF, 0x105, 0, 0) @@ -226,7 +226,7 @@ Method(md74,, Serialized) { // Blank string, no action - the relevant parameter of Add remains zero Add(" ", 0222, Local0) if (LNotEqual(Local0, 0222)) { - err("", zFFF, 0x015, 0, 0, Local0, 0222) + err("", zFFF, __LINE__, 0, 0, Local0, 0222) } CH03(ts, zFFF, 0x106, 0, 0) @@ -234,13 +234,13 @@ Method(md74,, Serialized) { // Conversion is terminated just by the first symbol (non-hex) though followed by hex-es, remains zero Add("k1234567", 489, Local0) if (LNotEqual(Local0, 489)) { - err("", zFFF, 0x016, 0, 0, Local0, 489) + err("", zFFF, __LINE__, 0, 0, Local0, 489) } // Conversion is terminated just by the first symbol (non-hex), single Add("k", 0xabcdef0000, Local0) if (LNotEqual(Local0, 0xabcdef0000)) { - err("", zFFF, 0x017, 0, 0, Local0, 0xabcdef0000) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcdef0000) } CH03(ts, zFFF, 0x107, 0, 0) @@ -248,7 +248,7 @@ Method(md74,, Serialized) { // Looks like designation of hex (terminated by x) Add("0x", 0x12345678, Local0) if (LNotEqual(Local0, 0x12345678)) { - err("", zFFF, 0x018, 0, 0, Local0, 0x12345678) + err("", zFFF, __LINE__, 0, 0, Local0, 0x12345678) } CH03(ts, zFFF, 0x108, 0, 0) @@ -256,73 +256,73 @@ Method(md74,, Serialized) { // Special symbol in the hex designation (terminated by x) Add("x", 12345678, Local0) if (LNotEqual(Local0, 12345678)) { - err("", zFFF, 0x019, 0, 0, Local0, 12345678) + err("", zFFF, __LINE__, 0, 0, Local0, 12345678) } // Starts with the special symbol in the hex designation (terminated by x) Add("x12345", 111, Local0) if (LNotEqual(Local0, 111)) { - err("", zFFF, 0x01a, 0, 0, Local0, 111) + err("", zFFF, __LINE__, 0, 0, Local0, 111) } // No one hex, conversion is terminated just by the first symbol Z Add("ZZZZ", 123456, Local0) if (LNotEqual(Local0, 123456)) { - err("", zFFF, 0x01b, 0, 0, Local0, 123456) + err("", zFFF, __LINE__, 0, 0, Local0, 123456) } // Short <= 8, conversion is terminated by non-hex symbol Z Add("abcdZZZZ", 0x11, Local0) if (LNotEqual(Local0, 0xabde)) { - err("", zFFF, 0x01c, 0, 0, Local0, 0xabde) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabde) } // Short <= 8, hex in the middle (terminated by Z) Add("ZQ123MMM", 123456, Local0) if (LNotEqual(Local0, 123456)) { - err("", zFFF, 0x01d, 0, 0, Local0, 123456) + err("", zFFF, __LINE__, 0, 0, Local0, 123456) } // Short <= 8, hex at the end (terminated by Z) Add("ZQMMM123", 123456, Local0) if (LNotEqual(Local0, 123456)) { - err("", zFFF, 0x01e, 0, 0, Local0, 123456) + err("", zFFF, __LINE__, 0, 0, Local0, 123456) } // Long exceeding 16, no one hex Add("zxswqrrrrrrrrrrrrrrtttttttttttttttttttttttttyyyyyyyyyyyyyyyyyyuuuuuuuuuuuuuuuuuuuuuuu", 123, Local0) if (LNotEqual(Local0, 123)) { - err("", zFFF, 0x01f, 0, 0, Local0, 123) + err("", zFFF, __LINE__, 0, 0, Local0, 123) } // Long exceeding 16, hex at the beginning Add("1234zxswqrrrrrrrrrrrrrrtttttttttttttttttttttttttyyyyyyyyyyyyyyyyyyuuuuuuuuuuuuuuuuuuuuuuu", 0123, Local0) if (LNotEqual(Local0, 0x1287)) { - err("", zFFF, 0x020, 0, 0, Local0, 0x1287) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1287) } // Long exceeding 16, hex everywhere Add("123z4s5qr6rr7rrrrrrrrr8ttttttt9ttttttattttbttttcyyyydyyeyyyyyyyyuuuuuuuuuuuuuuuuuuuuf", 0123, Local0) if (LNotEqual(Local0, 0x176)) { - err("", zFFF, 0x021, 0, 0, Local0, 0x176) + err("", zFFF, __LINE__, 0, 0, Local0, 0x176) } // Long exceeding 16, hex at the end Add("zxswqrrrrrrrrrrrrrrtttttttttttttttttttttttttyyyyyyyyyyyyyyyyyyuuuuuuuuuuuuuuuuuuuuuuu1234", 012321, Local0) if (LNotEqual(Local0, 012321)) { - err("", zFFF, 0x022, 0, 0, Local0, 012321) + err("", zFFF, __LINE__, 0, 0, Local0, 012321) } // Long exceeding 16, hex in the middle inside the possible Integer Add("zx1234swqrrrrrrrrrrrrrrtttttttttttttttttttttttttyyyyyyyyyyyyyyyyyyuuuuuuuuuuuuuuuuuuuuuuu", 0x12321, Local0) if (LNotEqual(Local0, 0x12321)) { - err("", zFFF, 0x023, 0, 0, Local0, 0x12321) + err("", zFFF, __LINE__, 0, 0, Local0, 0x12321) } // Long exceeding 16, hex in the middle beyond the bounds of the possible Integer Add("zxswqrrrrrrrrrrrrrrtttttttttttttttttttttttttyyyyyyyyyyyyyyyyyyuuuuuuuuuuuuuuuuuuuuu1234uu", 12321, Local0) if (LNotEqual(Local0, 12321)) { - err("", zFFF, 0x024, 0, 0, Local0, 12321) + err("", zFFF, __LINE__, 0, 0, Local0, 12321) } CH03(ts, zFFF, 0x109, 0, 0) @@ -331,11 +331,11 @@ Method(md74,, Serialized) { Store(Add("123456789012345601112223334446667788990087654", 0), Local1) if (F64) { if (LNotEqual(Local0, 0x1234567890123456)) { - err("", zFFF, 0x025, 0, 0, Local0, 0x1234567890123456) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1234567890123456) } } else { if (LNotEqual(Local0, 0x12345678)) { - err("", zFFF, 0x026, 0, 0, Local0, 0x12345678) + err("", zFFF, __LINE__, 0, 0, Local0, 0x12345678) } } @@ -345,11 +345,11 @@ Method(md74,, Serialized) { Store(Add("abcdefabcdefabcdefabcdefabcdefabcdefabcdefabc", 0), Local1) if (F64) { if (LNotEqual(Local0, 0xabcdefabcdefabcd)) { - err("", zFFF, 0x027, 0, 0, Local0, 0xabcdefabcdefabcd) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcdefabcdefabcd) } } else { if (LNotEqual(Local0, 0xabcdefab)) { - err("", zFFF, 0x028, 0, 0, Local0, 0xabcdefab) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcdefab) } } @@ -359,11 +359,11 @@ Method(md74,, Serialized) { Store(Add("123456789012345601112223334446667788990087654ZZZZ", 0), Local1) if (F64) { if (LNotEqual(Local0, 0x1234567890123456)) { - err("", zFFF, 0x029, 0, 0, Local0, 0x1234567890123456) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1234567890123456) } } else { if (LNotEqual(Local0, 0x12345678)) { - err("", zFFF, 0x02a, 0, 0, Local0, 0x12345678) + err("", zFFF, __LINE__, 0, 0, Local0, 0x12345678) } } @@ -373,11 +373,11 @@ Method(md74,, Serialized) { Store(Add("abcdefabcdefabcdefabcdefabcdefabcdefabcdefabcZZZZ", 0), Local1) if (F64) { if (LNotEqual(Local0, 0xabcdefabcdefabcd)) { - err("", zFFF, 0x02b, 0, 0, Local0, 0xabcdefabcdefabcd) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcdefabcdefabcd) } } else { if (LNotEqual(Local0, 0xabcdefab)) { - err("", zFFF, 0x02c, 0, 0, Local0, 0xabcdefab) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcdefab) } } 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 462728892..333c55a3f 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0064/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0064/DECL.asl @@ -38,14 +38,14 @@ CH03("", 0, 0x000, 0, 0) Add("", 0xabcd0000, Local0) if (LNotEqual(Local0, 0xabcd0000)) { - err("", zFFF, 0x001, 0, 0, Local0, 0xabcd0000) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcd0000) } CH03("", 0, 0x002, 0, 0) CH03("", 0, 0x003, 0, 0) Add(" ", 0xabcd0001, Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err("", zFFF, 0x004, 0, 0, Local0, 0xabcd0001) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcd0001) } CH03("", 0, 0x005, 0, 0) @@ -62,14 +62,14 @@ CH03("", 0, 0x00a, 0, 0) Add("q", 0xabcd0002, Local0) if (LNotEqual(Local0, 0xabcd0002)) { - err("", zFFF, 0x00b, 0, 0, Local0, 0xabcd0002) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcd0002) } CH03("", 0, 0x00c, 0, 0) CH03("", 0, 0x00d, 0, 0) Add("q ", 0xabcd0003, Local0) if (LNotEqual(Local0, 0xabcd0003)) { - err("", zFFF, 0x00e, 0, 0, Local0, 0xabcd0003) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcd0003) } CH03("", 0, 0x00f, 0, 0) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0065/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0065/DECL.asl index 61d03de76..fa2862bb1 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0065/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0065/DECL.asl @@ -45,7 +45,7 @@ Method(md7e, 1) // (BufferField is converted to Integer). Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, c009)) { - err("", zFFF, 0x000, 0, 0, Local0, c009) + err("", zFFF, __LINE__, 0, 0, Local0, c009) } } @@ -55,7 +55,7 @@ Method(md7f, 1) // (BufferField is converted to Buffer). Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, c00b)) { - err("", zFFF, 0x001, 0, 0, Local0, c00b) + err("", zFFF, __LINE__, 0, 0, Local0, c00b) } } @@ -65,12 +65,12 @@ Method(md80) Store(ObjectType(bf30), Local0) if (LNotEqual(Local0, c016)) { - err("", zFFF, 0x002, 0, 0, Local0, c016) + err("", zFFF, __LINE__, 0, 0, Local0, c016) } Store(ObjectType(bf31), Local0) if (LNotEqual(Local0, c016)) { - err("", zFFF, 0x003, 0, 0, Local0, c016) + err("", zFFF, __LINE__, 0, 0, Local0, c016) } md7e(bf30) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0066/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0066/DECL.asl index 308a6b82f..f5849023e 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0066/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0066/DECL.asl @@ -45,7 +45,7 @@ Method(md81, 1) // (FieldUnit is converted to Integer). Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, c009)) { - err("", zFFF, 0x000, 0, 0, Local0, c009) + err("", zFFF, __LINE__, 0, 0, Local0, c009) } } @@ -55,7 +55,7 @@ Method(md82, 1) // (FieldUnit is converted to Buffer). Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, c00b)) { - err("", zFFF, 0x001, 0, 0, Local0, c00b) + err("", zFFF, __LINE__, 0, 0, Local0, c00b) } } @@ -65,12 +65,12 @@ Method(md83) Store(ObjectType(fd00), Local0) if (LNotEqual(Local0, c00d)) { - err("", zFFF, 0x002, 0, 0, Local0, c00d) + err("", zFFF, __LINE__, 0, 0, Local0, c00d) } Store(ObjectType(fd01), Local0) if (LNotEqual(Local0, c00d)) { - err("", zFFF, 0x003, 0, 0, Local0, c00d) + err("", zFFF, __LINE__, 0, 0, Local0, c00d) } md81(fd00) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0067/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0067/DECL.asl index 9df6a11a7..c28488ff6 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0067/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0067/DECL.asl @@ -56,7 +56,7 @@ Method(md86) Store(md84(), Local7) Store(ObjectType(Local7), Local0) if (LNotEqual(Local0, c009)) { - err("", zFFF, 0x000, 0, 0, Local0, c009) + err("", zFFF, __LINE__, 0, 0, Local0, c009) } // BufferField converted to Buffer before return @@ -64,6 +64,6 @@ Method(md86) Store(md85(), Local7) Store(ObjectType(Local7), Local0) if (LNotEqual(Local0, c00b)) { - err("", zFFF, 0x001, 0, 0, Local0, c00b) + err("", zFFF, __LINE__, 0, 0, Local0, c00b) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0068/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0068/DECL.asl index 6b1c2974a..239c1b0ac 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0068/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0068/DECL.asl @@ -56,7 +56,7 @@ Method(md89) Store(md87(), Local7) Store(ObjectType(Local7), Local0) if (LNotEqual(Local0, c009)) { - err("", zFFF, 0x000, 0, 0, Local0, c009) + err("", zFFF, __LINE__, 0, 0, Local0, c009) } // FiledUnit converted to Buffer before return @@ -64,6 +64,6 @@ Method(md89) Store(md88(), Local7) Store(ObjectType(Local7), Local0) if (LNotEqual(Local0, c00b)) { - err("", zFFF, 0x001, 0, 0, Local0, c00b) + err("", zFFF, __LINE__, 0, 0, Local0, c00b) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0069/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0069/DECL.asl index 8d5ba3c08..556e978cb 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0069/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0069/DECL.asl @@ -41,7 +41,7 @@ Method(me08,, Serialized) Store(Mid(b000, 1, 1), Local0) if (LNotEqual(Local0, Buffer() {2})){ - err("", zFFF, 0x001, 0, 0, Local0, Buffer() {2}) + err("", zFFF, __LINE__, 0, 0, Local0, Buffer() {2}) } Store("Finish of test", Debug) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0073_ASL/misc.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0073_ASL/misc.asl index 30adad2a6..31d06a5ce 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0073_ASL/misc.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0073_ASL/misc.asl @@ -55,7 +55,7 @@ Method(mZ00, 1) } if (LNotEqual(Local0, 1)) { - err(arg0, z054, 0, 0, 0, Local0, 0) + err(arg0, z054, __LINE__, 0, 0, Local0, 0) } } @@ -70,13 +70,13 @@ Method(mZ02, 1) Store(0, Local0) mZ01(Local0) if (LNotequal(Local0, 0)) { - err(arg0, z054, 1, 0, 0, Local0, 0) + err(arg0, z054, __LINE__, 0, 0, Local0, 0) } Store(0, Local0) Concatenate("qwertyuiop", Local0) if (LNotequal(Local0, 0)) { - err(arg0, z054, 2, 0, 0, Local0, 0) + err(arg0, z054, __LINE__, 0, 0, Local0, 0) } } @@ -92,7 +92,7 @@ Method(mZ05, 1) Store(ObjectType(RefOf(f000)), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z054, 3, 0, 0, Local0, 0) + err(arg0, z054, __LINE__, 0, 0, Local0, 0) } } @@ -117,25 +117,25 @@ Method(mZ06, 1) Store(1, bnk0) if (LNotEqual(bnk0, 1)) { - err(arg0, z054, 4, 0, 0, bnk0, 0) + err(arg0, z054, __LINE__, 0, 0, bnk0, 0) } Store(0x96, bf01) if (LNotEqual(bnk0, 1)) { - err(arg0, z054, 5, 0, 0, bnk0, 0) + err(arg0, z054, __LINE__, 0, 0, bnk0, 0) } Store(0x87, bf00) if (LNotEqual(bnk0, 1)) { - err(arg0, z054, 6, 0, 0, bnk0, 0) + err(arg0, z054, __LINE__, 0, 0, bnk0, 0) } if (LNotEqual(bf00, 0x87)) { - err(arg0, z054, 7, 0, 0, bf00, 0) + err(arg0, z054, __LINE__, 0, 0, bf00, 0) } if (LNotEqual(bf01, 0x96)) { - err(arg0, z054, 8, 0, 0, bf01, 0) + err(arg0, z054, __LINE__, 0, 0, bf01, 0) } } @@ -146,7 +146,7 @@ Method(mZ07, 1) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c00b)) { - err(arg0, z054, 9, 0, 0, Local1, 0) + err(arg0, z054, __LINE__, 0, 0, Local1, 0) } ToBuffer(Local0, Local2) @@ -156,7 +156,7 @@ Method(mZ07, 1) Store(ObjectType(Local0), Local3) if (LNotEqual(Local3, c00b)) { - err(arg0, z054, 10, 0, 0, Local3, 0) + err(arg0, z054, __LINE__, 0, 0, Local3, 0) } } @@ -183,7 +183,7 @@ Method(mZ09, 2) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, 0)) { - err(arg0, z054, 11, 0, 0, Local1, 0) + err(arg0, z054, __LINE__, 0, 0, Local1, 0) } CH03("", 0, 0, 0, 0) @@ -212,7 +212,7 @@ Method(mZ0b, 1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, 3)) { - err(arg0, z054, 12, 0, 0, Local2, 0) + err(arg0, z054, __LINE__, 0, 0, Local2, 0) } Store("================ 2:", Debug) @@ -253,7 +253,7 @@ Method(mZ0c, 1) Store(Local3, Debug) if (LNotEqual(Local3, 3)) { - err(arg0, z054, 13, 0, 0, Local3, 3) + err(arg0, z054, __LINE__, 0, 0, Local3, 3) } // 1 @@ -263,7 +263,7 @@ Method(mZ0c, 1) Store(Local3, Debug) if (LNotEqual(Local3, 9)) { - err(arg0, z054, 14, 0, 0, Local3, 9) + err(arg0, z054, __LINE__, 0, 0, Local3, 9) } // 2 @@ -273,7 +273,7 @@ Method(mZ0c, 1) Store(Local3, Debug) if (LNotEqual(Local3, 6)) { - err(arg0, z054, 15, 0, 0, Local3, 6) + err(arg0, z054, __LINE__, 0, 0, Local3, 6) } Store(SizeOf(p000), Local0) @@ -281,7 +281,7 @@ Method(mZ0c, 1) Store(Local0, Debug) if (LNotEqual(Local0, 3)) { - err(arg0, z054, 16, 0, 0, Local0, 3) + err(arg0, z054, __LINE__, 0, 0, Local0, 3) } } */ @@ -298,11 +298,11 @@ Method(mZ0d, 1) Store(DeRefOf(Index(p000, 0)), Local7) if (LEqual(b000, Local7)) { - err(arg0, z054, 17, 0, 0, b000, Local7) + err(arg0, z054, __LINE__, 0, 0, b000, Local7) } if (LEqual(Local7, b000)) { - err(arg0, z054, 18, 0, 0, Local7, b000) + err(arg0, z054, __LINE__, 0, 0, Local7, b000) } return (0) @@ -334,7 +334,7 @@ Method(mZ0f, 1) { // ASL-compiler report Warning in this case // Store("ERROR 0: mZ13, after Return !!!", Debug) } - err(arg0, z054, 19, 0, 0, 0, 0) + err(arg0, z054, __LINE__, 0, 0, 0, 0) return (0x5678) } @@ -348,10 +348,10 @@ Method(mZ0f, 1) { // ASL-compiler DOESN'T report Warning in this case!!! // And the Store operator below is actually processed!!! - err(arg0, z054, 20, 0, 0, 0, 0) + err(arg0, z054, __LINE__, 0, 0, 0, 0) } - err(arg0, z054, 21, 0, 0, 0, 0) + err(arg0, z054, __LINE__, 0, 0, 0, 0) return } @@ -374,7 +374,7 @@ Method(mZ10, 1) { if (LNotEqual(Sizeof(buf0), 2)) { // Error: length of the buffer not reduced to the stored string - err(arg0, z054, 22, 0, 0, 0, 0) + err(arg0, z054, __LINE__, 0, 0, 0, 0) } return (0) } @@ -392,7 +392,7 @@ Method(mZ11, 1) { { Store(ObjectType(arg1), Local0) if (LNotEqual(Local0, 14)) { - err(arg0, z054, 23, 0, 0, Local0, 14) + err(arg0, z054, __LINE__, 0, 0, Local0, 14) } } @@ -400,7 +400,7 @@ Method(mZ11, 1) { { Store(ObjectType(bf00), Local0) if (LNotEqual(Local0, 14)) { - err(arg0, z054, 24, 0, 0, Local0, 14) + err(arg0, z054, __LINE__, 0, 0, Local0, 14) } else { m000(arg0, bf00) } @@ -422,7 +422,7 @@ Method(mZ12, 1) { { Store(ObjectType(arg1), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z054, 25, 0, 0, Local0, 5) + err(arg0, z054, __LINE__, 0, 0, Local0, 5) } } @@ -430,7 +430,7 @@ Method(mZ12, 1) { { Store(ObjectType(f000), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z054, 26, 0, 0, Local0, 5) + err(arg0, z054, __LINE__, 0, 0, Local0, 5) } else { m000(arg0, f000) } @@ -457,12 +457,12 @@ Method(mZ13, 1) { { Store(ObjectType(bf00), Local0) if (LNotEqual(Local0, 14)) { - err(arg0, z054, 27, 0, 0, Local0, 14) + err(arg0, z054, __LINE__, 0, 0, Local0, 14) } else { Store(m000(), Local7) Store(ObjectType(Local7), Local0) if (LNotEqual(Local0, 14)) { - err(arg0, z054, 28, 0, 0, Local0, 14) + err(arg0, z054, __LINE__, 0, 0, Local0, 14) } } } @@ -488,12 +488,12 @@ Method(mZ14, 1) { { Store(ObjectType(f000), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z054, 29, 0, 0, Local0, 5) + err(arg0, z054, __LINE__, 0, 0, Local0, 5) } else { Store(m000(), Local7) Store(ObjectType(Local7), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z054, 30, 0, 0, Local0, 5) + err(arg0, z054, __LINE__, 0, 0, Local0, 5) } } } @@ -575,19 +575,19 @@ Method(mZ16, 1) Store(ObjectType(m000), Local0) if (LNotEqual(Local0, c010)) { - err(arg0, z054, 31, 0, 0, Local0, c010) + err(arg0, z054, __LINE__, 0, 0, Local0, c010) } /* Nov. 2012: Method invocation as arg to ObjectType is now illegal */ // // Store(ObjectType(m000()), Local0) // if (LNotEqual(Local0, c009)) { -// err(arg0, z054, 32, 0, 0, Local0, c009) +// err(arg0, z054, __LINE__, 0, 0, Local0, c009) // } // // Store(ObjectType(m001(123)), Local1) // if (LNotEqual(Local1, c009)) { -// err(arg0, z054, 33, 0, 0, Local1, c009) +// err(arg0, z054, __LINE__, 0, 0, Local1, c009) // } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0073_ASL/misc.old.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0073_ASL/misc.old.asl index c7401154e..2e736be96 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0073_ASL/misc.old.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0073_ASL/misc.old.asl @@ -55,7 +55,7 @@ Method(m100, 1) } if (LNotEqual(Local0, 1)) { - err(arg0, z054, 0, Local0, 0) + err(arg0, z054, __LINE__, Local0, 0) } } @@ -70,13 +70,13 @@ Method(m102, 1) Store(0, Local0) m101(Local0) if (LNotequal(Local0, 0)) { - err(arg0, z054, 1, Local0, 0) + err(arg0, z054, __LINE__, Local0, 0) } Store(0, Local0) Concatenate("qwertyuiop", Local0) if (LNotequal(Local0, 0)) { - err(arg0, z054, 2, Local0, 0) + err(arg0, z054, __LINE__, Local0, 0) } } @@ -92,7 +92,7 @@ Method(m105, 1) Store(ObjectType(RefOf(f000)), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z054, 3, Local0, 0) + err(arg0, z054, __LINE__, Local0, 0) } } @@ -117,25 +117,25 @@ Method(m106, 1) Store(1, bnk0) if (LNotEqual(bnk0, 1)) { - err(arg0, z054, 4, bnk0, 0) + err(arg0, z054, __LINE__, bnk0, 0) } Store(0x96, bf01) if (LNotEqual(bnk0, 1)) { - err(arg0, z054, 5, bnk0, 0) + err(arg0, z054, __LINE__, bnk0, 0) } Store(0x87, bf00) if (LNotEqual(bnk0, 1)) { - err(arg0, z054, 6, bnk0, 0) + err(arg0, z054, __LINE__, bnk0, 0) } if (LNotEqual(bf00, 0x87)) { - err(arg0, z054, 7, bf00, 0) + err(arg0, z054, __LINE__, bf00, 0) } if (LNotEqual(bf01, 0x96)) { - err(arg0, z054, 8, bf01, 0) + err(arg0, z054, __LINE__, bf01, 0) } } @@ -146,7 +146,7 @@ Method(m107, 1) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c00b)) { - err(arg0, z054, 9, Local1, 0) + err(arg0, z054, __LINE__, Local1, 0) } ToBuffer(Local0, Local2) @@ -156,7 +156,7 @@ Method(m107, 1) Store(ObjectType(Local0), Local3) if (LNotEqual(Local3, c00b)) { - err(arg0, z054, 10, Local3, 0) + err(arg0, z054, __LINE__, Local3, 0) } } @@ -183,7 +183,7 @@ Method(m109, 2) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, 0)) { - err(arg0, z054, 11, Local1, 0) + err(arg0, z054, __LINE__, Local1, 0) } CH03() @@ -212,7 +212,7 @@ Method(m10b, 1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, 3)) { - err(arg0, z054, 12, Local2, 0) + err(arg0, z054, __LINE__, Local2, 0) } Store("================ 2:", Debug) @@ -253,7 +253,7 @@ Method(m10c, 1) Store(Local3, Debug) if (LNotEqual(Local3, 3)) { - err(arg0, z054, 13, Local3, 3) + err(arg0, z054, __LINE__, Local3, 3) } // 1 @@ -263,7 +263,7 @@ Method(m10c, 1) Store(Local3, Debug) if (LNotEqual(Local3, 9)) { - err(arg0, z054, 14, Local3, 9) + err(arg0, z054, __LINE__, Local3, 9) } // 2 @@ -273,7 +273,7 @@ Method(m10c, 1) Store(Local3, Debug) if (LNotEqual(Local3, 6)) { - err(arg0, z054, 15, Local3, 6) + err(arg0, z054, __LINE__, Local3, 6) } Store(SizeOf(p000), Local0) @@ -281,7 +281,7 @@ Method(m10c, 1) Store(Local0, Debug) if (LNotEqual(Local0, 3)) { - err(arg0, z054, 16, Local0, 3) + err(arg0, z054, __LINE__, Local0, 3) } } */ @@ -298,11 +298,11 @@ Method(m10d, 1) Store(DeRefOf(Index(p000, 0)), Local7) if (LEqual(b000, Local7)) { - err(arg0, z054, 17, b000, Local7) + err(arg0, z054, __LINE__, b000, Local7) } if (LEqual(Local7, b000)) { - err(arg0, z054, 18, Local7, b000) + err(arg0, z054, __LINE__, Local7, b000) } return (0) @@ -334,7 +334,7 @@ Method(m10f, 1) { // ASL-compiler report Warning in this case // Store("ERROR 0: m113, after Return !!!", Debug) } - err(arg0, z054, 19, 0, 0) + err(arg0, z054, __LINE__, 0, 0) return (0x5678) } @@ -348,10 +348,10 @@ Method(m10f, 1) { // ASL-compiler DOESN'T report Warning in this case!!! // And the Store operator below is actually processed!!! - err(arg0, z054, 20, 0, 0) + err(arg0, z054, __LINE__, 0, 0) } - err(arg0, z054, 21, 0, 0) + err(arg0, z054, __LINE__, 0, 0) return } @@ -374,7 +374,7 @@ Method(m110, 1) { if (LNotEqual(Sizeof(buf0), 2)) { // Error: length of the buffer not reduced to the stored string - err(arg0, z054, 22, 0, 0) + err(arg0, z054, __LINE__, 0, 0) } return (0) } @@ -392,7 +392,7 @@ Method(m111, 1) { { Store(ObjectType(arg1), Local0) if (LNotEqual(Local0, 14)) { - err(arg0, z054, 23, Local0, 14) + err(arg0, z054, __LINE__, Local0, 14) } } @@ -400,7 +400,7 @@ Method(m111, 1) { { Store(ObjectType(bf00), Local0) if (LNotEqual(Local0, 14)) { - err(arg0, z054, 24, Local0, 14) + err(arg0, z054, __LINE__, Local0, 14) } else { m000(arg0, bf00) } @@ -422,7 +422,7 @@ Method(m112, 1) { { Store(ObjectType(arg1), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z054, 25, Local0, 5) + err(arg0, z054, __LINE__, Local0, 5) } } @@ -430,7 +430,7 @@ Method(m112, 1) { { Store(ObjectType(f000), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z054, 26, Local0, 5) + err(arg0, z054, __LINE__, Local0, 5) } else { m000(arg0, f000) } @@ -457,12 +457,12 @@ Method(m113, 1) { { Store(ObjectType(bf00), Local0) if (LNotEqual(Local0, 14)) { - err(arg0, z054, 27, Local0, 14) + err(arg0, z054, __LINE__, Local0, 14) } else { Store(m000(), Local7) Store(ObjectType(Local7), Local0) if (LNotEqual(Local0, 14)) { - err(arg0, z054, 28, Local0, 14) + err(arg0, z054, __LINE__, Local0, 14) } } } @@ -488,12 +488,12 @@ Method(m114, 1) { { Store(ObjectType(f000), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z054, 29, Local0, 5) + err(arg0, z054, __LINE__, Local0, 5) } else { Store(m000(), Local7) Store(ObjectType(Local7), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z054, 30, Local0, 5) + err(arg0, z054, __LINE__, Local0, 5) } } } @@ -575,19 +575,19 @@ Method(m116, 1) Store(ObjectType(m000), Local0) if (LNotEqual(Local0, c010)) { - err(arg0, z054, 31, Local0, c010) + err(arg0, z054, __LINE__, Local0, c010) } /* Nov. 2012: Method invocation as arg to ObjectType is now illegal */ // // Store(ObjectType(m000()), Local0) // if (LNotEqual(Local0, c009)) { -// err(arg0, z054, 32, Local0, c009) +// err(arg0, z054, __LINE__, Local0, c009) // } // // Store(ObjectType(m001(123)), Local1) // if (LNotEqual(Local1, c009)) { -// err(arg0, z054, 33, Local1, c009) +// err(arg0, z054, __LINE__, Local1, c009) // } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0074/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0074/DECL.asl index 985427a8c..404359f25 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0074/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0074/DECL.asl @@ -45,7 +45,7 @@ Method(me0b) SKIP() } else { if (LNotEqual(Ones, 0xffffffff)){ - err("", zFFF, 0x000, 0, 0, Ones, 0xffffffff) + err("", zFFF, __LINE__, 0, 0, Ones, 0xffffffff) } } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0081/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0081/DECL.asl index 920479daa..60ba98ae4 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0081/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0081/DECL.asl @@ -52,18 +52,18 @@ Store(ObjectType(me31), Local0) if (LNotEqual(Local0, c010)) { - err("", zFFF, 0x000, 0, 0, Local0, c010) + err("", zFFF, __LINE__, 0, 0, Local0, c010) } /* Nov. 2012: Method invocation as arg to ObjectType is now illegal */ // // Store(ObjectType(me31()), Local0) // if (LNotEqual(Local0, c009)) { -// err("", zFFF, 0x001, 0, 0, Local0, c009) +// err("", zFFF, __LINE__, 0, 0, Local0, c009) // } // // Store(ObjectType(me32("String")), Local0) // if (LNotEqual(Local0, c00a)) { -// err("", zFFF, 0x002, 0, 0, Local0, c00a) +// err("", zFFF, __LINE__, 0, 0, Local0, c00a) // } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0084/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0084/DECL.asl index 7875081fb..39fb5475d 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0084/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0084/DECL.asl @@ -82,7 +82,7 @@ Method(m803,, Serialized) Method(m000) { if (LNotEqual(i000, 0xabcd0000)) { - err("", zFFF, 0x000, 0, 0, i000, 0xabcd0000) + err("", zFFF, __LINE__, 0, 0, i000, 0xabcd0000) } Store(0xabcd0001, i000) return (0xabcd0002) @@ -93,7 +93,7 @@ Method(m803,, Serialized) Method(m001) { if (LNotEqual(i000, 0xabcd0001)) { - err("", zFFF, 0x001, 0, 0, i000, 0xabcd0001) + err("", zFFF, __LINE__, 0, 0, i000, 0xabcd0001) } Store(0xabcd0003, i000) return (0xabcd0004) @@ -104,7 +104,7 @@ Method(m803,, Serialized) Method(m002) { if (LNotEqual(i000, 0xabcd0003)) { - err("", zFFF, 0x002, 0, 0, i000, 0xabcd0003) + err("", zFFF, __LINE__, 0, 0, i000, 0xabcd0003) } Store(0xabcd0005, i000) return (0xabcd0006) @@ -115,7 +115,7 @@ Method(m803,, Serialized) Method(m003) { if (LNotEqual(i000, 0xabcd0005)) { - err("", zFFF, 0x003, 0, 0, i000, 0xabcd0005) + err("", zFFF, __LINE__, 0, 0, i000, 0xabcd0005) } Store(0xabcd0007, i000) return (0xabcd0008) @@ -133,7 +133,7 @@ Method(m804,, Serialized) Method(m000) { if (LNotEqual(i000, 0xabcd0000)) { - err("", zFFF, 0x004, 0, 0, i000, 0xabcd0000) + err("", zFFF, __LINE__, 0, 0, i000, 0xabcd0000) } Store(0xabcd0001, i000) return (0xabcd0002) @@ -144,7 +144,7 @@ Method(m804,, Serialized) Method(m001) { if (LNotEqual(i000, 0xabcd0001)) { - err("", zFFF, 0x005, 0, 0, i000, 0xabcd0001) + err("", zFFF, __LINE__, 0, 0, i000, 0xabcd0001) } Store(0xabcd0003, i000) return (0xabcd0004) @@ -155,7 +155,7 @@ Method(m804,, Serialized) Method(m002) { if (LNotEqual(i000, 0xabcd0003)) { - err("", zFFF, 0x006, 0, 0, i000, 0xabcd0003) + err("", zFFF, __LINE__, 0, 0, i000, 0xabcd0003) } Store(0xabcd0005, i000) return (0xabcd0006) @@ -166,7 +166,7 @@ Method(m804,, Serialized) Method(m003) { if (LNotEqual(i000, 0xabcd0005)) { - err("", zFFF, 0x007, 0, 0, i000, 0xabcd0005) + err("", zFFF, __LINE__, 0, 0, i000, 0xabcd0005) } Store(0xabcd0007, i000) return (0xabcd0008) @@ -182,7 +182,7 @@ Method(m804,, Serialized) Method(m000) { if (LNotEqual(i000, 0xabcd0007)) { - err("", zFFF, 0x008, 0, 0, i000, 0xabcd0007) + err("", zFFF, __LINE__, 0, 0, i000, 0xabcd0007) } Store(0xabcd0008, i000) return (0xabcd0009) @@ -193,7 +193,7 @@ Method(m804,, Serialized) Method(m001) { if (LNotEqual(i000, 0xabcd0008)) { - err("", zFFF, 0x009, 0, 0, i000, 0xabcd0008) + err("", zFFF, __LINE__, 0, 0, i000, 0xabcd0008) } Store(0xabcd000a, i000) return (0xabcd000b) @@ -204,7 +204,7 @@ Method(m804,, Serialized) Method(m002) { if (LNotEqual(i000, 0xabcd000a)) { - err("", zFFF, 0x00a, 0, 0, i000, 0xabcd000a) + err("", zFFF, __LINE__, 0, 0, i000, 0xabcd000a) } Store(0xabcd000c, i000) return (0xabcd000d) @@ -215,7 +215,7 @@ Method(m804,, Serialized) Method(m003) { if (LNotEqual(i000, 0xabcd000c)) { - err("", zFFF, 0x00b, 0, 0, i000, 0xabcd000c) + err("", zFFF, __LINE__, 0, 0, i000, 0xabcd000c) } Store(0xabcd000e, i000) return (0xabcd000f) @@ -231,7 +231,7 @@ Method(m804,, Serialized) Method(m000) { if (LNotEqual(i000, 0xabcd000e)) { - err("", zFFF, 0x00c, 0, 0, i000, 0xabcd000e) + err("", zFFF, __LINE__, 0, 0, i000, 0xabcd000e) } Store(0xabcd0010, i000) return (0xabcd0011) @@ -242,7 +242,7 @@ Method(m804,, Serialized) Method(m001) { if (LNotEqual(i000, 0xabcd0010)) { - err("", zFFF, 0x00d, 0, 0, i000, 0xabcd0010) + err("", zFFF, __LINE__, 0, 0, i000, 0xabcd0010) } Store(0xabcd0012, i000) return (0xabcd0013) @@ -253,7 +253,7 @@ Method(m804,, Serialized) Method(m002) { if (LNotEqual(i000, 0xabcd0012)) { - err("", zFFF, 0x00e, 0, 0, i000, 0xabcd0012) + err("", zFFF, __LINE__, 0, 0, i000, 0xabcd0012) } Store(0xabcd0014, i000) return (0xabcd0015) @@ -264,7 +264,7 @@ Method(m804,, Serialized) Method(m003) { if (LNotEqual(i000, 0xabcd0014)) { - err("", zFFF, 0x00f, 0, 0, i000, 0xabcd0014) + err("", zFFF, __LINE__, 0, 0, i000, 0xabcd0014) } Store(0xabcd0016, i000) return (0xabcd0017) @@ -276,7 +276,7 @@ Method(m804,, Serialized) m002() if (LNotEqual(i000, 0xabcd0016)) { - err("", zFFF, 0x010, 0, 0, i000, 0xabcd0016) + err("", zFFF, __LINE__, 0, 0, i000, 0xabcd0016) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0088/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0088/DECL.asl index 766f584ee..187a66868 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0088/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0088/DECL.asl @@ -46,7 +46,7 @@ } if (LNotEqual(Local0, 1)) { - err("", zFFF, 0x000, 0, 0, Local0, 1) + err("", zFFF, __LINE__, 0, 0, Local0, 1) } } @@ -64,7 +64,7 @@ } if (LNotEqual(Local0, 1)) { - err("", zFFF, 0x001, 0, 0, Local0, 1) + err("", zFFF, __LINE__, 0, 0, Local0, 1) } } 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 1f1c20da5..d72c8a950 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0092/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0092/DECL.asl @@ -43,7 +43,7 @@ CH03("", 0, 0x000, 0, 0) Store(DerefOf(Index(p000, 5)), Local0) if (LNotEqual(Local0, 6)) { - err("", zFFF, 0x001, 0, 0, Local0, 6) + err("", zFFF, __LINE__, 0, 0, Local0, 6) } CH03("", 0, 0x002, 0, 0) } elseif (LEqual(Arg0, 1)) { @@ -55,7 +55,7 @@ if (y900) { Store(DerefOf(Local1), Local0) if (LNotEqual(Local0, 6)) { - err("", zFFF, 0x004, 0, 0, Local0, 6) + err("", zFFF, __LINE__, 0, 0, Local0, 6) } CH03("", 0, 0x005, 0, 0) } else { @@ -67,7 +67,7 @@ Store(DerefOf(Index(Package() {1,2,3,4,5,6,7,8}, 5)), Local0) if (y900) { if (LNotEqual(Local0, 6)) { - err("", zFFF, 0x008, 0, 0, Local0, 6) + err("", zFFF, __LINE__, 0, 0, Local0, 6) } CH03("", 0, 0x009, 0, 0) } else { diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0093/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0093/DECL.asl index 18a6e00c8..e34f73d14 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0093/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0093/DECL.asl @@ -43,7 +43,7 @@ CH03("", 0, 0x000, 0, 0) Store(DerefOf(Index(b000, 5)), Local0) if (LNotEqual(Local0, 66)) { - err("", zFFF, 0x001, 0, 0, Local0, 66) + err("", zFFF, __LINE__, 0, 0, Local0, 66) } CH03("", 0, 0x002, 0, 0) @@ -56,7 +56,7 @@ if (y900) { Store(DerefOf(Local1), Local0) if (LNotEqual(Local0, 66)) { - err("", zFFF, 0x004, 0, 0, Local0, 66) + err("", zFFF, __LINE__, 0, 0, Local0, 66) } CH03("", 0, 0x005, 0, 0) } else { @@ -69,7 +69,7 @@ Store(DerefOf(Index(Buffer() {11,22,33,44,55,66,77,88}, 5)), Local0) if (y900) { if (LNotEqual(Local0, 66)) { - err("", zFFF, 0x008, 0, 0, Local0, 66) + err("", zFFF, __LINE__, 0, 0, Local0, 66) } CH03("", 0, 0x009, 0, 0) } else { diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0094/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0094/DECL.asl index 68d26d963..e5014e5cc 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0094/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0094/DECL.asl @@ -43,7 +43,7 @@ CH03("", 0, 0x000, 0, 0) Store(DerefOf(Index(s000, 5)), Local0) if (LNotEqual(Local0, 0x75)) { - err("", zFFF, 0x001, 0, 0, Local0, 0x75) + err("", zFFF, __LINE__, 0, 0, Local0, 0x75) } CH03("", 0, 0x002, 0, 0) @@ -56,7 +56,7 @@ if (y900) { Store(DerefOf(Local1), Local0) if (LNotEqual(Local0, 0x75)) { - err("", zFFF, 0x004, 0, 0, Local0, 0x75) + err("", zFFF, __LINE__, 0, 0, Local0, 0x75) } CH03("", 0, 0x005, 0, 0) } else { @@ -69,7 +69,7 @@ Store(DerefOf(Index("qwrtyuiop", 5)), Local0) if (y900) { if (LNotEqual(Local0, 0x75)) { - err("", zFFF, 0x008, 0, 0, Local0, 0x75) + err("", zFFF, __LINE__, 0, 0, Local0, 0x75) } CH03("", 0, 0x009, 0, 0) } else { diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0101/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0101/DECL.asl index 52715e43e..81be5017e 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0101/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0101/DECL.asl @@ -44,7 +44,7 @@ Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c010)) { - err("", zFFF, 0x000, 0, 0, Local1, c010) + err("", zFFF, __LINE__, 0, 0, Local1, c010) } return (0) @@ -67,7 +67,7 @@ Store(Local1, Debug) if (LNotEqual(Local1, c010)) { - err("", zFFF, 0x001, 0, 0, Local1, c010) + err("", zFFF, __LINE__, 0, 0, Local1, c010) } Store("Finish of test", Debug) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0103/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0103/DECL.asl index 775c9e1c2..0b37adfdb 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0103/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0103/DECL.asl @@ -62,10 +62,10 @@ me66() if (id0d) { - err("", zFFF, 0x000, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } if (id0e) { - err("", zFFF, 0x001, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0104/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0104/DECL.asl index 0830049dc..25c51f1fa 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0104/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0104/DECL.asl @@ -48,7 +48,7 @@ Store(Local1, Debug) if (LNotEqual(Local1, c008)) { - err("", zFFF, 0x000, 0, 0, Local1, c008) + err("", zFFF, __LINE__, 0, 0, Local1, c008) } Store("Finish of test", Debug) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0105/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0105/DECL.asl index 0a199fc34..f3b947504 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0105/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0105/DECL.asl @@ -46,7 +46,7 @@ Store(Local1, Debug) if (LNotEqual(Local1, c010)) { - err("", zFFF, 0x000, 0, 0, Local1, c010) + err("", zFFF, __LINE__, 0, 0, Local1, c010) } Store("Finish of test", Debug) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0106/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0106/DECL.asl index b41329437..16bd96567 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0106/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0106/DECL.asl @@ -45,6 +45,6 @@ Store(Local2, Debug) if (LNotEqual(Local2, c018)) { - err("", zFFF, 0x000, 0, 0, Local2, c018) + err("", zFFF, __LINE__, 0, 0, Local2, c018) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0107/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0107/DECL.asl index 6cb893902..26e0e0be8 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0107/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0107/DECL.asl @@ -38,7 +38,7 @@ Store(Local0, Debug) if (LNotEqual(Local0, Ones)) { - err("", zFFF, 0x000, 0, 0, Local0, Ones) + err("", zFFF, __LINE__, 0, 0, Local0, Ones) } } @@ -48,7 +48,7 @@ Store(Local0, Debug) if (LNotEqual(Local0, 0x1235)) { - err("", zFFF, 0x001, 0, 0, Local0, 0x1235) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1235) } } Method(me6e) @@ -57,7 +57,7 @@ Store(Local0, Debug) if (LNotEqual(Local0, 0xffffffffffffedcb)) { - err("", zFFF, 0x002, 0, 0, Local0, 0xffffffffffffedcb) + err("", zFFF, __LINE__, 0, 0, Local0, 0xffffffffffffedcb) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0108_ASL/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0108_ASL/DECL.asl index 88ce99f20..27573b5be 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0108_ASL/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0108_ASL/DECL.asl @@ -38,18 +38,18 @@ { Store(ToBCD(0x5F5E0FF), Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x000, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } Store(ToBCD(0x5F5E100), Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x001, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } Store(ToBCD(0x2386F26FC0FFFF), Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x002, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } Store(ToBCD(0x2386F26FC10000), Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x003, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0111/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0111/DECL.asl index 98eebdadd..dad4c0703 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0111/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0111/DECL.asl @@ -64,25 +64,25 @@ Store(0, id0f) me73("1") if (LNot(id0f)) { - err("", zFFF, 0x000, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } Store(0, id0f) me73(Buffer(){1}) if (LNot(id0f)) { - err("", zFFF, 0x001, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } Store(0, id0f) me73("0") if (id0f) { - err("", zFFF, 0x002, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } Store(0, id0f) me73(Buffer(){0}) if (id0f) { - err("", zFFF, 0x003, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } // ////////// @@ -90,61 +90,61 @@ Store(0, id0f) me74("1", 0) if (LNotEqual(id0f, 2)) { - err("", zFFF, 0x004, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } Store(0, id0f) me74(Buffer(){0,0,1,0}, 0) if (LNotEqual(id0f, 2)) { - err("", zFFF, 0x005, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } Store(0, id0f) me74("0", 0) if (id0f) { - err("", zFFF, 0x006, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } Store(0, id0f) me74(Buffer(){0,0,0,0}, 0) if (id0f) { - err("", zFFF, 0x007, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } Store(0, id0f) me74("1", 1) if (LNotEqual(id0f, 1)) { - err("", zFFF, 0x008, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } Store(0, id0f) me74(Buffer(){0,0,1,0}, 1) if (LNotEqual(id0f, 1)) { - err("", zFFF, 0x009, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } Store(0, id0f) me75("0") if (id0f) { - err("", zFFF, 0x00a, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } Store(0, id0f) me75(Buffer(){0}) if (id0f) { - err("", zFFF, 0x00b, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } Store(0, id0f) me75("01") if (LNot(id0f)) { - err("", zFFF, 0x00c, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } Store(0, id0f) me75(Buffer(){0,0,1,0}) if (LNot(id0f)) { - err("", zFFF, 0x00d, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0115/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0115/DECL.asl index 8131935ba..633abf814 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0115/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0115/DECL.asl @@ -82,7 +82,7 @@ Store(0xabcd0000, Local0) me7e(me85(), Local0) if (LNotEqual(id10, Local0)) { - err("", zFFF, 0x000, 0, 0, id10, Local0) + err("", zFFF, __LINE__, 0, 0, id10, Local0) } // To show: all methods return Index references (Ok) @@ -103,42 +103,42 @@ me7e(me7f(), Local0) Store(DerefOf(Index(pd04, 0)), Local1) if (LNotEqual(Local1, Local0)) { - err("", zFFF, 0x001, 0, 0, Local1, Local0) + err("", zFFF, __LINE__, 0, 0, Local1, Local0) } Store(0xabcd0002, Local0) me7e(me80(), Local0) Store(DerefOf(Index(pd05, 0)), Local1) if (LNotEqual(Local1, Local0)) { - err("", zFFF, 0x001, 0, 0, Local1, Local0) + err("", zFFF, __LINE__, 0, 0, Local1, Local0) } Store(0xabcd0003, Local0) me7e(me81(), Local0) Store(DerefOf(Index(pd06, 0)), Local1) if (LNotEqual(Local1, Local0)) { - err("", zFFF, 0x001, 0, 0, Local1, Local0) + err("", zFFF, __LINE__, 0, 0, Local1, Local0) } Store(0xabcd0004, Local0) me7e(me82(), Local0) Store(DerefOf(Index(pd07, 0)), Local1) if (LNotEqual(Local1, Local0)) { - err("", zFFF, 0x001, 0, 0, Local1, Local0) + err("", zFFF, __LINE__, 0, 0, Local1, Local0) } Store(0xabcd0005, Local0) me7e(me83(), Local0) Store(DerefOf(Index(pd08, 0)), Local1) if (LNotEqual(Local1, Local0)) { - err("", zFFF, 0x001, 0, 0, Local1, Local0) + err("", zFFF, __LINE__, 0, 0, Local1, Local0) } Store(0xabcd0006, Local0) me7e(me84(), Local0) Store(DerefOf(Index(pd09, 0)), Local1) if (LNotEqual(Local1, Local0)) { - err("", zFFF, 0x001, 0, 0, Local1, Local0) + err("", zFFF, __LINE__, 0, 0, Local1, Local0) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0117/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0117/DECL.asl index f9747e6ae..9e6de295f 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0117/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0117/DECL.asl @@ -45,9 +45,9 @@ Store("Modification of the copied string", Debug) if (LNotEqual(Local0, "Strang")) { - err("", zFFF, 0x000, 0, 0, Local0, "Strang") + err("", zFFF, __LINE__, 0, 0, Local0, "Strang") } if (LNotEqual(s000, "String")) { - err("", zFFF, 0x001, 0, 0, s000, "String") + err("", zFFF, __LINE__, 0, 0, s000, "String") } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0118/DECL.0000.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0118/DECL.0000.asl index 97b6a268b..7ed329d59 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0118/DECL.0000.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0118/DECL.0000.asl @@ -46,10 +46,10 @@ Method(md79) Store(ObjectType(Local1), Local0) if (LNotEqual(Local0, c009)) { - err("", zFFF, 0x000, 0, 0, Local0, c009) + err("", zFFF, __LINE__, 0, 0, Local0, c009) } else { if (LNotEqual(Local1, 0xfe7cb391d650a284)) { - err("", zFFF, 0x001, 0, 0, Local1, 0xfe7cb391d650a284) + err("", zFFF, __LINE__, 0, 0, Local1, 0xfe7cb391d650a284) } } } @@ -62,7 +62,7 @@ Method(md7a) Store(ObjectType(Local1), Local0) if (LNotEqual(Local0, c016)) { - err("", zFFF, 0x002, 0, 0, Local0, c016) + err("", zFFF, __LINE__, 0, 0, Local0, c016) } else { Store("=======================================", Debug) Store(Local1, Debug) @@ -72,7 +72,7 @@ Store(Local0, Debug) Store("=======================================", Debug) if (1) { if (LNotEqual(Local1, 0x59)) { - err("", zFFF, 0x003, 0, 0, Local1, 0x59) + err("", zFFF, __LINE__, 0, 0, Local1, 0x59) } } } @@ -86,7 +86,7 @@ Method(md7b) Store(ObjectType(Local1), Local0) if (LNotEqual(Local0, c00d)) { - err("", zFFF, 0x004, 0, 0, Local0, c00d) + err("", zFFF, __LINE__, 0, 0, Local0, c00d) } else { Store("=======================================", Debug) @@ -97,7 +97,7 @@ Store(Local0, Debug) Store("=======================================", Debug) if (1) { if (LNotEqual(Local1, 0)) { - err("", zFFF, 0x005, 0, 0, Local1, 0) + err("", zFFF, __LINE__, 0, 0, Local1, 0) } } } 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 033d1b540..58098210d 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0118/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0118/DECL.asl @@ -62,21 +62,21 @@ Method(mf80,, Serialized) Add(Local1, 0x079, Local5) if (LNotEqual(Local4, c009)) { - err("", zFFF, 0x000, 0, 0, Local4, c009) + err("", zFFF, __LINE__, 0, 0, Local4, c009) } elseif (LNotEqual(Local5, 0xaaaa0279)) { - err("", zFFF, 0x001, 0, 0, Local5, 0xaaaa0279) + err("", zFFF, __LINE__, 0, 0, Local5, 0xaaaa0279) } if (LNotEqual(i000, 0xaaaa0300)) { - err("", zFFF, 0x002, 0, 0, i000, 0xaaaa0300) + err("", zFFF, __LINE__, 0, 0, i000, 0xaaaa0300) } if (LNotEqual(Local2, c009)) { - err("", zFFF, 0x003, 0, 0, Local2, c009) + err("", zFFF, __LINE__, 0, 0, Local2, c009) } if (LNotEqual(Local3, c009)) { - err("", zFFF, 0x004, 0, 0, Local3, c009) + err("", zFFF, __LINE__, 0, 0, Local3, c009) } CH03("", 0, 0x005, 0, 0) @@ -115,21 +115,21 @@ Method(mf81,, Serialized) Add(ii01, 0x079, ii05) if (LNotEqual(ii04, c009)) { - err("", zFFF, 0x007, 0, 0, ii04, c009) + err("", zFFF, __LINE__, 0, 0, ii04, c009) } elseif (LNotEqual(ii05, 0xaaaa0279)) { - err("", zFFF, 0x008, 0, 0, ii05, 0xaaaa0279) + err("", zFFF, __LINE__, 0, 0, ii05, 0xaaaa0279) } if (LNotEqual(i000, 0xaaaa0300)) { - err("", zFFF, 0x009, 0, 0, i000, 0xaaaa0300) + err("", zFFF, __LINE__, 0, 0, i000, 0xaaaa0300) } if (LNotEqual(ii02, c009)) { - err("", zFFF, 0x00a, 0, 0, ii02, c009) + err("", zFFF, __LINE__, 0, 0, ii02, c009) } if (LNotEqual(ii03, c009)) { - err("", zFFF, 0x00b, 0, 0, ii03, c009) + err("", zFFF, __LINE__, 0, 0, ii03, c009) } CH03("", 0, 0x00c, 0, 0) @@ -166,21 +166,21 @@ Method(mf82,, Serialized) Add(ii01, 0x079, ii05) if (LNotEqual(ii04, c009)) { - err("", zFFF, 0x00e, 0, 0, ii04, c009) + err("", zFFF, __LINE__, 0, 0, ii04, c009) } elseif (LNotEqual(ii05, 0xaaaa0279)) { - err("", zFFF, 0x00f, 0, 0, ii05, 0xaaaa0279) + err("", zFFF, __LINE__, 0, 0, ii05, 0xaaaa0279) } if (LNotEqual(i000, 0xaaaa0300)) { - err("", zFFF, 0x010, 0, 0, i000, 0xaaaa0300) + err("", zFFF, __LINE__, 0, 0, i000, 0xaaaa0300) } if (LNotEqual(ii02, c009)) { - err("", zFFF, 0x011, 0, 0, ii02, c009) + err("", zFFF, __LINE__, 0, 0, ii02, c009) } if (LNotEqual(ii03, c009)) { - err("", zFFF, 0x012, 0, 0, ii03, c009) + err("", zFFF, __LINE__, 0, 0, ii03, c009) } CH03("", 0, 0x013, 0, 0) @@ -195,10 +195,10 @@ Method(md79) Store(ObjectType(Local1), Local0) if (LNotEqual(Local0, c009)) { - err("", zFFF, 0x000, 0, 0, Local0, c009) + err("", zFFF, __LINE__, 0, 0, Local0, c009) } else { if (LNotEqual(Local1, 0xfe7cb391d650a284)) { - err("", zFFF, 0x001, 0, 0, Local1, 0xfe7cb391d650a284) + err("", zFFF, __LINE__, 0, 0, Local1, 0xfe7cb391d650a284) } } } @@ -212,7 +212,7 @@ Method(md7a) Store(ObjectType(Local1), Local0) if (LNotEqual(Local0, c016)) { - err("", zFFF, 0x002, 0, 0, Local0, c016) + err("", zFFF, __LINE__, 0, 0, Local0, c016) } else { Store("=======================================", Debug) Store(Local1, Debug) @@ -222,7 +222,7 @@ Store(Local0, Debug) Store("=======================================", Debug) if (1) { if (LNotEqual(Local1, 0x59)) { - err("", zFFF, 0x003, 0, 0, Local1, 0x59) + err("", zFFF, __LINE__, 0, 0, Local1, 0x59) } } } @@ -237,7 +237,7 @@ Method(md7b) Store(ObjectType(Local1), Local0) if (LNotEqual(Local0, c00d)) { - err("", zFFF, 0x004, 0, 0, Local0, c00d) + err("", zFFF, __LINE__, 0, 0, Local0, c00d) } else { Store("=======================================", Debug) @@ -248,7 +248,7 @@ Store(Local0, Debug) Store("=======================================", Debug) if (1) { if (LNotEqual(Local1, 0)) { - err("", zFFF, 0x005, 0, 0, Local1, 0) + err("", zFFF, __LINE__, 0, 0, Local1, 0) } } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0119/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0119/DECL.asl index b89b51cbf..8a5aade2d 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0119/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0119/DECL.asl @@ -38,12 +38,12 @@ if (Local0) { Store ("Ok: LEqual", Debug) } else { - err("", zFFF, 0x000, 0, 0, Local0, Ones) + err("", zFFF, __LINE__, 0, 0, Local0, Ones) } Store (LLess(0xffffffff, 0x100000000), Local1) if (Local1) { - err("", zFFF, 0x001, 0, 0, Local1, Zero) + err("", zFFF, __LINE__, 0, 0, Local1, Zero) } else { Store ("Ok: LLess", Debug) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0120/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0120/DECL.asl index 15fc26eea..71aa52288 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0120/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0120/DECL.asl @@ -41,7 +41,7 @@ Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c014)) { - err("", zFFF, 0x000, 0, 0, Local1, c014) + err("", zFFF, __LINE__, 0, 0, Local1, c014) } } @@ -54,7 +54,7 @@ Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c012)) { - err("", zFFF, 0x001, 0, 0, Local1, c012) + err("", zFFF, __LINE__, 0, 0, Local1, c012) } } @@ -67,7 +67,7 @@ Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c013)) { - err("", zFFF, 0x002, 0, 0, Local1, c013) + err("", zFFF, __LINE__, 0, 0, Local1, c013) } } @@ -80,7 +80,7 @@ Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c00f)) { - err("", zFFF, 0x003, 0, 0, Local1, c00f) + err("", zFFF, __LINE__, 0, 0, Local1, c00f) } } @@ -93,7 +93,7 @@ Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c011)) { - err("", zFFF, 0x004, 0, 0, Local1, c011) + err("", zFFF, __LINE__, 0, 0, Local1, c011) } } @@ -111,7 +111,7 @@ Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c00e)) { - err("", zFFF, 0x008, 0, 0, Local1, c00e) + err("", zFFF, __LINE__, 0, 0, Local1, c00e) } } @@ -129,7 +129,7 @@ Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c015)) { - err("", zFFF, 0x00c, 0, 0, Local1, c015) + err("", zFFF, __LINE__, 0, 0, Local1, c015) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0125/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0125/DECL.asl index 61dd8128d..053cc21ca 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0125/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0125/DECL.asl @@ -45,7 +45,7 @@ Mid(arg1, arg2, arg3, Local0) if (LNotEqual(arg4, Local0)) { - err("", zFFF, 0x000, 0, 0, arg4, Local0) + err("", zFFF, __LINE__, 0, 0, arg4, Local0) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0126/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0126/DECL.asl index 924cbe1fa..07b0a7ccf 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0126/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0126/DECL.asl @@ -41,10 +41,10 @@ Add(Local0, 1, Local7) if (LNotEqual(Local0, 7)) { - err("", zFFF, 0x000, 0, 0, Local0, 7) + err("", zFFF, __LINE__, 0, 0, Local0, 7) } if (LNotEqual(Local7, 8)) { - err("", zFFF, 0x000, 0, 0, Local7, 8) + err("", zFFF, __LINE__, 0, 0, Local7, 8) } Store("m000 finished", Debug) @@ -59,10 +59,10 @@ Add(arg0, 1, Local7) if (LNotEqual(arg0, 7)) { - err("", zFFF, 0x000, 0, 0, arg0, 7) + err("", zFFF, __LINE__, 0, 0, arg0, 7) } if (LNotEqual(Local7, 8)) { - err("", zFFF, 0x000, 0, 0, arg0, 8) + err("", zFFF, __LINE__, 0, 0, arg0, 8) } Store("m001 finished", Debug) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0128/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0128/DECL.asl index fab4f498d..ea75583db 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0128/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0128/DECL.asl @@ -41,7 +41,7 @@ Method(mf17,, Serialized) Store(DerefOf(Local0), Local1) Store(Local1, Debug) if (LNotEqual(Local1, 0x1234)) { - err("", zFFF, 0x000, 0, 0, Local1, 0x1234) + err("", zFFF, __LINE__, 0, 0, Local1, 0x1234) } } @@ -62,7 +62,7 @@ Method(mf18,, Serialized) Store("Before LNotEqual", Debug) if (LNotEqual(Local1, 0x1234)) { - err("", zFFF, 0x001, 0, 0, Local1, 0x1234) + err("", zFFF, __LINE__, 0, 0, Local1, 0x1234) } CH03("", 0, 0x002, 0, 0) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0130/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0130/DECL.asl index 258531109..b7a600606 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0130/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0130/DECL.asl @@ -51,14 +51,14 @@ mf1a(sd04) if (LNotEqual(sd04, "qwer0000")) { - err("", zFFF, 0x000, 0, 0, sd04, "qwer0000") + err("", zFFF, __LINE__, 0, 0, sd04, "qwer0000") } // Index of Buffer mf1a(bd08) if (LNotEqual(bd08, Buffer(4) {1,0x77,3,4})) { - err("", zFFF, 0x001, 0, 0, bd08, Buffer(4) {1,0x77,3,4}) + err("", zFFF, __LINE__, 0, 0, bd08, Buffer(4) {1,0x77,3,4}) } // Index of Package @@ -69,6 +69,6 @@ Store(DerefOf(Local0), Local1) if (LNotEqual(Local1, 0x77)) { - err("", zFFF, 0x002, 0, 0, Local1, 0x77) + err("", zFFF, __LINE__, 0, 0, Local1, 0x77) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0131/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0131/DECL.asl index 2ecd8e4cb..20e1699b5 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0131/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0131/DECL.asl @@ -61,7 +61,7 @@ Method(m126,, Serialized) Store(0xabcd0001, Index(p000, 0)) Store(DerefOf(Index(p000, 0)), Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err("", zFFF, 0x000, 0, 0, Local0, 0xabcd0001) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcd0001) } /* @@ -71,19 +71,19 @@ Store to method invocation is not supported Store(0xabcd0004, m002()) Store(DerefOf(Index(p000, 1)), Local0) if (LNotEqual(Local0, 0xabcd0004)) { - err("", zFFF, 0x000, 0, 0, Local0, 0xabcd0004) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcd0004) } Store(0xabcd0005, m003()) Store(DerefOf(Index(p000, 1)), Local0) if (LNotEqual(Local0, 0xabcd0005)) { - err("", zFFF, 0x000, 0, 0, Local0, 0xabcd0005) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcd0005) } Store(0xabcd0006, m004(1)) Store(DerefOf(Index(p000, 1)), Local0) if (LNotEqual(Local0, 0xabcd0006)) { - err("", zFFF, 0x000, 0, 0, Local0, 0xabcd0006) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcd0006) } */ } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0132/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0132/DECL.asl index 96faf8ef4..7f99f9c59 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0132/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0132/DECL.asl @@ -41,7 +41,7 @@ CH03("", 0, 0x001, 0, 0) if (LNotEqual(Local7, 0x78)) { - err("", zFFF, 0x000, 0, 0, id12, 5) + err("", zFFF, __LINE__, 0, 0, id12, 5) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0133/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0133/DECL.asl index 4c22a0971..2071ed505 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0133/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0133/DECL.asl @@ -44,7 +44,7 @@ Store(RefOf(id13), Local0) mf21(Local0) if (LNotEqual(id13, 0x77)) { - err("", zFFF, 0x000, 0, 0, id13, 0x77) + err("", zFFF, __LINE__, 0, 0, id13, 0x77) } // Writing by Index to String @@ -52,7 +52,7 @@ Index(sd05, 1, Local0) mf21(Local0) if (LNotEqual(sd05, "qwer0000")) { - err("", zFFF, 0x001, 0, 0, sd05, "qwer0000") + err("", zFFF, __LINE__, 0, 0, sd05, "qwer0000") } // Writing by Index to Buffer @@ -60,7 +60,7 @@ Index(bd09, 1, Local0) mf21(Local0) if (LNotEqual(bd09, Buffer(4) {1,0x77,3,4})) { - err("", zFFF, 0x002, 0, 0, bd09, Buffer(4) {1,0x77,3,4}) + err("", zFFF, __LINE__, 0, 0, bd09, Buffer(4) {1,0x77,3,4}) } // Writing by Index to Package @@ -72,6 +72,6 @@ Store(DerefOf(Local0), Local1) if (LNotEqual(Local1, 0x77)) { - err("", zFFF, 0x003, 0, 0, Local1, 0x77) + err("", zFFF, __LINE__, 0, 0, Local1, 0x77) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0134/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0134/DECL.asl index 527a33ed8..6b117a650 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0134/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0134/DECL.asl @@ -49,7 +49,7 @@ Store(Local6, Debug) if (LNotEqual(Local6, 0x11)) { - err("", zFFF, 0x000, 0, 0, Local6, 0x11) + err("", zFFF, __LINE__, 0, 0, Local6, 0x11) } Store("LocalX case of Method finished", Debug) @@ -72,7 +72,7 @@ Store(arg6, Debug) if (LNotEqual(arg6, 0x11)) { - err("", zFFF, 0x000, 0, 0, arg6, 0x11) + err("", zFFF, __LINE__, 0, 0, arg6, 0x11) } Store("ArgX case (1) of Method finished", Debug) @@ -95,7 +95,7 @@ Store(arg6, Debug) if (LNotEqual(arg6, 0x11)) { - err("", zFFF, 0x000, 0, 0, arg6, 0x11) + err("", zFFF, __LINE__, 0, 0, arg6, 0x11) } Store("ArgX case (2) of Method finished", Debug) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0135/Common.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0135/Common.asl index 9d7620d36..9f1fc43d9 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0135/Common.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0135/Common.asl @@ -4088,7 +4088,7 @@ Method(mfcc, 6, Serialized) } if (LNotEqual(Local2, i000)) { - err("", zFFF, arg5, 0, 0, Local2, i000) + err("", zFFF, __LINE__, 0, 0, Local2, i000) } Increment(i000) @@ -4135,7 +4135,7 @@ Method(mfce, 6, Serialized) } if (LNotEqual(Local2, arg3)) { - err("", zFFF, arg5, 0, 0, Local2, arg3) + err("", zFFF, __LINE__, 0, 0, Local2, arg3) } Increment(targ) @@ -4157,6 +4157,6 @@ Method(mfd8, 3) Store(DerefOf(arg0), Local0) if (LNotEqual(Local0, arg1)) { - err("", zFFF, arg2, 0, 0, Local0, arg1) + err("", zFFF, __LINE__, 0, 0, Local0, arg1) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0135/Misc1.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0135/Misc1.asl index d7fea135f..ab055fd0d 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0135/Misc1.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0135/Misc1.asl @@ -115,7 +115,7 @@ Method(mfcf,, Serialized) Store(DerefOf(Local1), Local0) if (LNotEqual(Local0, 0xabcd0000)) { - err("", zFFF, 0x300, 0, 0, Local0, 0xabcd0000) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcd0000) } } @@ -1671,43 +1671,43 @@ Method(mfeb,, Serialized) Store(DerefOf(Index(arg0, 3)), Local0) if (LNotEqual(Local0, 3)) { - err("", zFFF, 0x301, 0, 0, Local0, 3) + err("", zFFF, __LINE__, 0, 0, Local0, 3) } Store(DerefOf(Index(arg1, 3)), Local0) if (LNotEqual(Local0, 0x13)) { - err("", zFFF, 0x302, 0, 0, Local0, 0x13) + err("", zFFF, __LINE__, 0, 0, Local0, 0x13) } Store(DerefOf(Index(arg2, 3)), Local0) if (LNotEqual(Local0, 0x23)) { - err("", zFFF, 0x303, 0, 0, Local0, 0x23) + err("", zFFF, __LINE__, 0, 0, Local0, 0x23) } Store(DerefOf(Index(arg3, 3)), Local0) if (LNotEqual(Local0, 0x33)) { - err("", zFFF, 0x304, 0, 0, Local0, 0x33) + err("", zFFF, __LINE__, 0, 0, Local0, 0x33) } Store(DerefOf(Index(arg4, 3)), Local0) if (LNotEqual(Local0, 0x43)) { - err("", zFFF, 0x305, 0, 0, Local0, 0x43) + err("", zFFF, __LINE__, 0, 0, Local0, 0x43) } Store(DerefOf(Index(arg5, 3)), Local0) if (LNotEqual(Local0, 0x53)) { - err("", zFFF, 0x306, 0, 0, Local0, 0x53) + err("", zFFF, __LINE__, 0, 0, Local0, 0x53) } Store(DerefOf(Index(arg6, 3)), Local0) if (LNotEqual(Local0, 0x63)) { - err("", zFFF, 0x307, 0, 0, Local0, 0x63) + err("", zFFF, __LINE__, 0, 0, Local0, 0x63) } Store(DerefOf(Index(p000, 14)), Local0) Store(DerefOf(Local0), Local1) if (LNotEqual(Local1, 0x66)) { - err("", zFFF, 0x308, 0, 0, Local1, 0x66) + err("", zFFF, __LINE__, 0, 0, Local1, 0x66) } if (LEqual(cmd0, 1)) { @@ -1794,37 +1794,37 @@ Method(mfeb,, Serialized) Store(DerefOf(Index(arg0, 3)), Local0) if (LNotEqual(Local0, 0xd3)) { - err("", zFFF, 0x309, 0, 0, Local0, 0xd3) + err("", zFFF, __LINE__, 0, 0, Local0, 0xd3) } Store(DerefOf(Index(arg1, 3)), Local0) if (LNotEqual(Local0, 0x73)) { - err("", zFFF, 0x30a, 0, 0, Local0, 0x73) + err("", zFFF, __LINE__, 0, 0, Local0, 0x73) } Store(DerefOf(Index(arg2, 3)), Local0) if (LNotEqual(Local0, 0x83)) { - err("", zFFF, 0x30b, 0, 0, Local0, 0x83) + err("", zFFF, __LINE__, 0, 0, Local0, 0x83) } Store(DerefOf(Index(arg3, 3)), Local0) if (LNotEqual(Local0, 0x93)) { - err("", zFFF, 0x30c, 0, 0, Local0, 0x93) + err("", zFFF, __LINE__, 0, 0, Local0, 0x93) } Store(DerefOf(Index(arg4, 3)), Local0) if (LNotEqual(Local0, 0xa3)) { - err("", zFFF, 0x30d, 0, 0, Local0, 0xa3) + err("", zFFF, __LINE__, 0, 0, Local0, 0xa3) } Store(DerefOf(Index(arg5, 3)), Local0) if (LNotEqual(Local0, 0xb3)) { - err("", zFFF, 0x30e, 0, 0, Local0, 0xb3) + err("", zFFF, __LINE__, 0, 0, Local0, 0xb3) } Store(DerefOf(Index(arg6, 3)), Local0) if (LNotEqual(Local0, 0xc3)) { - err("", zFFF, 0x30f, 0, 0, Local0, 0xc3) + err("", zFFF, __LINE__, 0, 0, Local0, 0xc3) } Store(DerefOf(Index(p000, 14)), Local0) Store(DerefOf(Local0), Local1) if (LNotEqual(Local1, 0xc6)) { - err("", zFFF, 0x310, 0, 0, Local1, 0xc6) + err("", zFFF, __LINE__, 0, 0, Local1, 0xc6) } } } @@ -1920,37 +1920,37 @@ Method(mfeb,, Serialized) Store(DerefOf(Index(arg0, 3)), Local0) if (LNotEqual(Local0, 0xd3)) { - err("", zFFF, 0x311, 0, 0, Local0, 0xd3) + err("", zFFF, __LINE__, 0, 0, Local0, 0xd3) } Store(DerefOf(Index(arg1, 3)), Local0) if (LNotEqual(Local0, 0x73)) { - err("", zFFF, 0x312, 0, 0, Local0, 0x73) + err("", zFFF, __LINE__, 0, 0, Local0, 0x73) } Store(DerefOf(Index(arg2, 3)), Local0) if (LNotEqual(Local0, 0x83)) { - err("", zFFF, 0x313, 0, 0, Local0, 0x83) + err("", zFFF, __LINE__, 0, 0, Local0, 0x83) } Store(DerefOf(Index(arg3, 3)), Local0) if (LNotEqual(Local0, 0x93)) { - err("", zFFF, 0x314, 0, 0, Local0, 0x93) + err("", zFFF, __LINE__, 0, 0, Local0, 0x93) } Store(DerefOf(Index(arg4, 3)), Local0) if (LNotEqual(Local0, 0xa3)) { - err("", zFFF, 0x315, 0, 0, Local0, 0xa3) + err("", zFFF, __LINE__, 0, 0, Local0, 0xa3) } Store(DerefOf(Index(arg5, 3)), Local0) if (LNotEqual(Local0, 0xb3)) { - err("", zFFF, 0x316, 0, 0, Local0, 0xb3) + err("", zFFF, __LINE__, 0, 0, Local0, 0xb3) } Store(DerefOf(Index(arg6, 3)), Local0) if (LNotEqual(Local0, 0xc3)) { - err("", zFFF, 0x317, 0, 0, Local0, 0xc3) + err("", zFFF, __LINE__, 0, 0, Local0, 0xc3) } Store(DerefOf(Index(p000, 14)), Local0) Store(DerefOf(Local0), Local1) if (LNotEqual(Local1, 0xc6)) { - err("", zFFF, 0x318, 0, 0, Local1, 0xc6) + err("", zFFF, __LINE__, 0, 0, Local1, 0xc6) } } } @@ -2124,7 +2124,7 @@ Method(mf01,, Serialized) { Store(DerefOf(arg0), Local0) if (LNotEqual(Local0, arg1)) { - err("", zFFF, 0x319, 0, 0, Local0, arg1) + err("", zFFF, __LINE__, 0, 0, Local0, arg1) } } @@ -2235,7 +2235,7 @@ Method(mf01,, Serialized) { Store(DerefOf(Index(DerefOf(Index(DerefOf(Index(arg0, arg1)), 4)), 0)), Local0) if (LNotEqual(Local0, arg2)) { - err("", zFFF, 0x31a, 0, 0, Local0, arg2) + err("", zFFF, __LINE__, 0, 0, Local0, arg2) } } @@ -2248,7 +2248,7 @@ Method(mf01,, Serialized) { Store(DerefOf(DerefOf(Index(DerefOf(Index(DerefOf(Index(arg0, arg1)), 4)), 0))), Local0) if (LNotEqual(Local0, arg2)) { - err("", zFFF, 0x31b, 0, 0, Local0, arg2) + err("", zFFF, __LINE__, 0, 0, Local0, arg2) } } @@ -2256,7 +2256,7 @@ Method(mf01,, Serialized) { Store(DerefOf(DerefOf(Index(arg0, arg1))), Local0) if (LNotEqual(Local0, arg2)) { - err("", zFFF, 0x31c, 0, 0, Local0, arg2) + err("", zFFF, __LINE__, 0, 0, Local0, arg2) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0135/Misc2.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0135/Misc2.asl index 839c5e641..dd6ef7c67 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0135/Misc2.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0135/Misc2.asl @@ -65,7 +65,7 @@ Method(mf02, 6, Serialized) Store(Index(DerefOf(Index(DerefOf(Index(DerefOf(Index(arg0, i001)), i002)), i003)), i004), Local7) } else { - err("", zFFF, 0x400, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) return } @@ -89,7 +89,7 @@ Method(mf02, 6, Serialized) Store(Local7, Index(DerefOf(Index(DerefOf(Index(DerefOf(Index(arg3, ii01)), ii02)), ii03)), ii04)) } else { - err("", zFFF, 0x401, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) return } } @@ -123,12 +123,12 @@ Method(mfec, 4, Serialized) Store(DerefOf(DerefOf(Index(DerefOf(Index(DerefOf(Index(DerefOf(Index(arg0, i001)), i002)), i003)), i004))), Local7) } else { - err("", zFFF, 0x402, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) return } if (LNotEqual(Local7, arg3)) { - err("", zFFF, 0x403, 0, 0, Local7, arg3) + err("", zFFF, __LINE__, 0, 0, Local7, arg3) } } @@ -161,14 +161,14 @@ Method(mfed, 5, Serialized) Store(DerefOf(DerefOf(Index(DerefOf(Index(DerefOf(Index(DerefOf(Index(arg0, i001)), i002)), i003)), i004))), Local7) } else { - err("", zFFF, 0x404, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) return } Store(DerefOf(Index(Local7, arg3)), Local0) if (LNotEqual(Local0, arg4)) { - err("", zFFF, 0x405, 0, 0, Local0, arg4) + err("", zFFF, __LINE__, 0, 0, Local0, arg4) } } @@ -292,7 +292,7 @@ Method(mfee,, Serialized) Store(DerefOf(Index(DerefOf(Index(DerefOf(Index(DerefOf(Index(arg0, arg1)), arg2)), arg3)), arg4)), Local0) if (LNotEqual(Local0, arg5)) { - err("", zFFF, 0x406, 0, 0, Local0, arg5) + err("", zFFF, __LINE__, 0, 0, Local0, arg5) } } @@ -301,7 +301,7 @@ Method(mfee,, Serialized) Store(DerefOf(Index(DerefOf(Index(DerefOf(Index(arg0, arg1)), arg2)), arg3)), Local0) if (LNotEqual(Local0, arg4)) { - err("", zFFF, 0x407, 0, 0, Local0, arg4) + err("", zFFF, __LINE__, 0, 0, Local0, arg4) } } @@ -309,7 +309,7 @@ Method(mfee,, Serialized) { Store(DerefOf(Index(DerefOf(Index(arg0, arg1)), arg2)), Local0) if (LNotEqual(Local0, arg3)) { - err("", zFFF, 0x408, 0, 0, Local0, arg3) + err("", zFFF, __LINE__, 0, 0, Local0, arg3) } } @@ -317,7 +317,7 @@ Method(mfee,, Serialized) { Store(DerefOf(Index(arg0, arg1)), Local0) if (LNotEqual(Local0, arg2)) { - err("", zFFF, 0x409, 0, 0, Local0, arg2) + err("", zFFF, __LINE__, 0, 0, Local0, arg2) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0135/Mix.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0135/Mix.asl index 5b8b0aeca..3b8fa2a1f 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0135/Mix.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0135/Mix.asl @@ -37,7 +37,7 @@ Method(m80a, 4) { Store(DerefOf(DerefOf(Index(arg0, arg1))), Local0) if (LNotEqual(Local0, arg2)) { - err("", zFFF, arg3, 0, 0, Local0, arg2) + err("", zFFF, __LINE__, 0, 0, Local0, arg2) } } @@ -355,7 +355,7 @@ Method(m80b,, Serialized) Store(DerefOf(DerefOf(Local0)), Local1) if (LNotEqual(Local1, 0x10)) { - err("", zFFF, 0x534, 0, 0, Local1, 0x10) + err("", zFFF, __LINE__, 0, 0, Local1, 0x10) } /* @@ -366,7 +366,7 @@ Method(m80b,, Serialized) Store(DerefOf(DerefOf(Local0)), Local1) if (LNotEqual(Local1, 0x10)) { - err("", zFFF, 0x534, 0, 0, Local1, 0x10) + err("", zFFF, __LINE__, 0, 0, Local1, 0x10) } Store(5, rd00) @@ -377,7 +377,7 @@ Method(m80b,, Serialized) Store(DerefOf(DerefOf(Local0)), Local1) if (LNotEqual(Local1, 0x15)) { - err("", zFFF, 0x536, 0, 0, Local1, 0x15) + err("", zFFF, __LINE__, 0, 0, Local1, 0x15) } /* @@ -396,7 +396,7 @@ Method(m80b,, Serialized) Store(DerefOf(DerefOf(Local0)), Local1) if (LNotEqual(Local1, 0x10)) { - err("", zFFF, 0x538, 0, 0, Local1, 0x10) + err("", zFFF, __LINE__, 0, 0, Local1, 0x10) } /* @@ -407,7 +407,7 @@ Method(m80b,, Serialized) Store(DerefOf(DerefOf(Local0)), Local1) if (LNotEqual(Local1, 0x10)) { - err("", zFFF, 0x539, 0, 0, Local1, 0x10) + err("", zFFF, __LINE__, 0, 0, Local1, 0x10) } Store(5, rd00) @@ -418,7 +418,7 @@ Method(m80b,, Serialized) Store(DerefOf(DerefOf(Local0)), Local1) if (LNotEqual(Local1, 0x15)) { - err("", zFFF, 0x53b, 0, 0, Local1, 0x15) + err("", zFFF, __LINE__, 0, 0, Local1, 0x15) } /* @@ -436,7 +436,7 @@ Method(m80b,, Serialized) Store(Index(p002, wr00), Index(p003, wr00)) Store(DerefOf(DerefOf(DerefOf(Index(p003, wr00)))), Local1) if (LNotEqual(Local1, 0x17)) { - err("", zFFF, 0x53d, 0, 0, Local1, 0x17) + err("", zFFF, __LINE__, 0, 0, Local1, 0x17) } /* @@ -447,7 +447,7 @@ Method(m80b,, Serialized) Store(DerefOf(DerefOf(DerefOf(Index(p003, wr00)))), Local1) if (LNotEqual(Local1, 0x17)) { - err("", zFFF, 0x53e, 0, 0, Local1, 0x17) + err("", zFFF, __LINE__, 0, 0, Local1, 0x17) } Store(6, rd00) @@ -458,7 +458,7 @@ Method(m80b,, Serialized) Store(DerefOf(DerefOf(DerefOf(Index(p003, wr00)))), Local1) if (LNotEqual(Local1, 0x16)) { - err("", zFFF, 0x540, 0, 0, Local1, 0x16) + err("", zFFF, __LINE__, 0, 0, Local1, 0x16) } /* @@ -476,7 +476,7 @@ Method(m80b,, Serialized) Store(Index(p001, wr00), Index(p003, wr00)) Store(DerefOf(DerefOf(DerefOf(Index(p003, wr00)))), Local1) if (LNotEqual(Local1, 0x17)) { - err("", zFFF, 0x542, 0, 0, Local1, 0x17) + err("", zFFF, __LINE__, 0, 0, Local1, 0x17) } /* @@ -487,7 +487,7 @@ Method(m80b,, Serialized) Store(DerefOf(DerefOf(DerefOf(Index(p003, wr00)))), Local1) if (LNotEqual(Local1, 0x17)) { - err("", zFFF, 0x543, 0, 0, Local1, 0x17) + err("", zFFF, __LINE__, 0, 0, Local1, 0x17) } Store(6, rd00) @@ -498,7 +498,7 @@ Method(m80b,, Serialized) Store(DerefOf(DerefOf(DerefOf(Index(p003, wr00)))), Local1) if (LNotEqual(Local1, 0x16)) { - err("", zFFF, 0x545, 0, 0, Local1, 0x16) + err("", zFFF, __LINE__, 0, 0, Local1, 0x16) } /* @@ -517,7 +517,7 @@ Method(m80b,, Serialized) Store(Index(p001, wr00), Index(p001, wr01)) Store(DerefOf(DerefOf(DerefOf(Index(p001, wr01)))), Local1) if (LNotEqual(Local1, 0x17)) { - err("", zFFF, 0x547, 0, 0, Local1, 0x17) + err("", zFFF, __LINE__, 0, 0, Local1, 0x17) } /* @@ -528,7 +528,7 @@ Method(m80b,, Serialized) Store(DerefOf(DerefOf(DerefOf(Index(p001, wr01)))), Local1) if (LNotEqual(Local1, 0x17)) { - err("", zFFF, 0x548, 0, 0, Local1, 0x17) + err("", zFFF, __LINE__, 0, 0, Local1, 0x17) } Store(6, rd00) @@ -539,7 +539,7 @@ Method(m80b,, Serialized) Store(DerefOf(DerefOf(DerefOf(Index(p001, wr01)))), Local1) if (LNotEqual(Local1, 0x16)) { - err("", zFFF, 0x54a, 0, 0, Local1, 0x16) + err("", zFFF, __LINE__, 0, 0, Local1, 0x16) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0135/PkgsHierarchy.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0135/PkgsHierarchy.asl index 47984cc20..94164dccf 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0135/PkgsHierarchy.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0135/PkgsHierarchy.asl @@ -363,7 +363,7 @@ Method(mfe2, 6, Serialized) if (LNotEqual(arg4, Local1)) { Store(1, Local7) - err("", zFFF, 0x201, 0, 0, arg4, Local1) + err("", zFFF, __LINE__, 0, 0, arg4, Local1) Store("================= Params:", debug) Store(arg0, Debug) Store(arg1, Debug) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0136/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0136/DECL.asl index c8fe35d34..69a8e8f2c 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0136/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0136/DECL.asl @@ -42,6 +42,6 @@ CopyObject(b000, b001) if (LNotEqual(b000, b001)) { - err("", zFFF, 0x000, 0, 0, b000, b001) + err("", zFFF, __LINE__, 0, 0, b000, b001) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0137/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0137/DECL.asl index bc99554ea..1ba674d29 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0137/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0137/DECL.asl @@ -42,12 +42,12 @@ ToBCD(12345678, STR0) Store(ObjectType(STR0), Local0) if (LNotEqual(Local0, c009)) { - err("", zFFF, 0x000, 0, 0, Local0, c009) + err("", zFFF, __LINE__, 0, 0, Local0, c009) } FromBCD(0x12345678, STR1) Store(ObjectType(STR1), Local0) if (LNotEqual(Local0, c009)) { - err("", zFFF, 0x001, 0, 0, Local0, c009) + err("", zFFF, __LINE__, 0, 0, Local0, c009) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0138/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0138/DECL.asl index 6882cad6e..ca69ce9e6 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0138/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0138/DECL.asl @@ -42,6 +42,6 @@ Store(0xfedcba9876543210, bf00) if (LNotEqual(bf00, Buffer(9){0x10, 0x32, 0x54, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00})) { - err("", zFFF, 0x000, 0, 0, bf00, Buffer(9){0x10, 0x32, 0x54, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00}) + err("", zFFF, __LINE__, 0, 0, bf00, Buffer(9){0x10, 0x32, 0x54, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00}) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0139/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0139/DECL.asl index f0ef7b868..ac327b42a 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0139/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0139/DECL.asl @@ -37,7 +37,7 @@ Method(mf2a) { if (LNotEqual(id1b, 0xfedcba9876543210)) { - err("", zFFF, 0x000, 0, 0, id1b, 0xfedcba9876543210) + err("", zFFF, __LINE__, 0, 0, id1b, 0xfedcba9876543210) } else { Store("Ok, initially id1b = 0xfedcba9876543210", Debug) @@ -46,7 +46,7 @@ Store(id1b, Local0) if (LNotEqual(id1b, 0xfedcba9876543210)) { - err("", zFFF, 0x001, 0, 0, id1b, 0xfedcba9876543210) + err("", zFFF, __LINE__, 0, 0, id1b, 0xfedcba9876543210) } } } @@ -57,7 +57,7 @@ Store(Refof(id1c), Local0) if (LNotEqual(id1c, 0xfedcba9876543211)) { - err("", zFFF, 0x002, 0, 0, id1c, 0xfedcba9876543211) + err("", zFFF, __LINE__, 0, 0, id1c, 0xfedcba9876543211) } else { Store("Ok, initially id1c = 0xfedcba9876543211", Debug) @@ -66,7 +66,7 @@ Store(DeRefof(Local0), Local1) if (LNotEqual(id1c, 0xfedcba9876543211)) { - err("", zFFF, 0x003, 0, 0, id1c, 0xfedcba9876543211) + err("", zFFF, __LINE__, 0, 0, id1c, 0xfedcba9876543211) } } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0143/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0143/DECL.asl index 9909b8822..7fa2fe872 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0143/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0143/DECL.asl @@ -51,16 +51,16 @@ Store(mf30(1, 2), Local0) if (LNotEqual(Local0, 3)) { - err("", zFFF, 0x000, 0, 0, Local0, 3) + err("", zFFF, __LINE__, 0, 0, Local0, 3) } Store(mf31("FFFF"), Local0) if (LNotEqual(Local0, "FFFF")) { - err("", zFFF, 0x001, 0, 0, Local0, "FFFF") + err("", zFFF, __LINE__, 0, 0, Local0, "FFFF") } Store(mf32(3, "F", Buffer(1){0xff}), Local0) if (LNotEqual(Local0, 0x111)) { - err("", zFFF, 0x002, 0, 0, Local0, 0x111) + err("", zFFF, __LINE__, 0, 0, Local0, 0x111) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0144/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0144/DECL.asl index 9566e6bdf..1bdac18db 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0144/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0144/DECL.asl @@ -55,21 +55,21 @@ Method(mf38) { Store(mf34(0), Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x000, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } Store(mf35(1), Local0) if (LNotEqual(Local0, 1)) { - err("", zFFF, 0x000, 0, 0, Local0, 1) + err("", zFFF, __LINE__, 0, 0, Local0, 1) } Store(mf36(2), Local0) if (LNotEqual(Local0, 2)) { - err("", zFFF, 0x000, 0, 0, Local0, 2) + err("", zFFF, __LINE__, 0, 0, Local0, 2) } Store(mf37("3"), Local0) if (LNotEqual(Local0, "3")) { - err("", zFFF, 0x000, 0, 0, Local0, "3") + err("", zFFF, __LINE__, 0, 0, Local0, "3") } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0146/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0146/DECL.asl index 6133de342..ecf6260f4 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0146/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0146/DECL.asl @@ -48,6 +48,6 @@ { Store(mf3a(Buffer(1) {10}), Local0) if (LNotEqual(Local0, 0x12389)) { - err("", zFFF, 0x000, 0, 0, Local0, 0x12389) + err("", zFFF, __LINE__, 0, 0, Local0, 0x12389) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0147/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0147/DECL.asl index 40ff10f31..772aa4636 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0147/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0147/DECL.asl @@ -47,6 +47,6 @@ Method(mf3d) { Store(mf3c(), Local0) if (LNotEqual(Local0, "mf3czxcvbnm")) { - err("", zFFF, 0x000, 0, 0, Local0, "mf3czxcvbnm") + err("", zFFF, __LINE__, 0, 0, Local0, "mf3czxcvbnm") } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0150/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0150/DECL.asl index 96c1f2ec6..7775f04ff 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0150/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0150/DECL.asl @@ -60,11 +60,11 @@ Method(md8a,, Serialized) Store(0, Local1) if (Acquire(mx00, 1)) { - err("", zFFF, 0x000, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } else { Store(1, Local0) if (Acquire(mx01, 1)) { - err("", zFFF, 0x001, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } else { Store(1, Local1) } @@ -93,7 +93,7 @@ Method(md8b,, Serialized) Store(0, Local1) if (Acquire(mx00, 1)) { - err("", zFFF, 0x002, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } else { Store(1, Local0) CH03("", 0, 0x003, 0, 0) @@ -123,7 +123,7 @@ Method(md8c,, Serialized) Store(0, Local1) if (Acquire(mx00, 1)) { - err("", zFFF, 0x005, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } else { Store(1, Local0) CH03("", 0, 0x006, 0, 0) @@ -154,7 +154,7 @@ Method(md8d,, Serialized) Store(0, Local1) if (Acquire(mx00, 1)) { - err("", zFFF, 0x008, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } else { Store(1, Local0) CH03("", 0, 0x009, 0, 0) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0151/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0151/DECL.asl index c9596c59b..0e135cee5 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0151/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0151/DECL.asl @@ -52,7 +52,7 @@ Concatenate(b000, b001, Local0) if (LNotEqual(Local0, Buffer(7){1,2,3,4,5,6,7})) { - err("", zFFF, 0x000, 0, 0, Local0, Buffer(7){1,2,3,4,5,6,7}) + err("", zFFF, __LINE__, 0, 0, Local0, Buffer(7){1,2,3,4,5,6,7}) } // 2. @@ -67,7 +67,7 @@ Concatenate(Local0, b001, Local0) if (LNotEqual(Local0, Buffer(7){1,2,3,4,5,6,7})) { - err("", zFFF, 0x001, 0, 0, Local0, Buffer(7){1,2,3,4,5,6,7}) + err("", zFFF, __LINE__, 0, 0, Local0, Buffer(7){1,2,3,4,5,6,7}) } } @@ -89,7 +89,7 @@ Concatenate(s000, s001, Local0) if (LNotEqual(Local0, "String1")) { - err("", zFFF, 0x002, 0, 0, Local0, "String1") + err("", zFFF, __LINE__, 0, 0, Local0, "String1") } // 4. @@ -104,7 +104,7 @@ Concatenate(Local0, s001, Local0) if (LNotEqual(Local0, "String1")) { - err("", zFFF, 0x003, 0, 0, Local0, "String1") + err("", zFFF, __LINE__, 0, 0, Local0, "String1") } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/Mix.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/Mix.asl index 7f2134431..6e4beb538 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/Mix.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/Mix.asl @@ -48,69 +48,69 @@ Method(md05,, Serialized) Store(Store(Store(Store(Store(Store(Store(Store(0x1a2b3c4d, i000), i001), i002), i003), i004), i005), d000), r000) if (LNotEqual(i000, 0x1a2b3c4d)) { - err("", zFFF, 0x100, 0, 0, i000, 0x1a2b3c4d) + err("", zFFF, __LINE__, 0, 0, i000, 0x1a2b3c4d) } if (LNotEqual(i001, 0x1a2b3c4d)) { - err("", zFFF, 0x101, 0, 0, i001, 0x1a2b3c4d) + err("", zFFF, __LINE__, 0, 0, i001, 0x1a2b3c4d) } if (LNotEqual(i002, 0x1a2b3c4d)) { - err("", zFFF, 0x102, 0, 0, i002, 0x1a2b3c4d) + err("", zFFF, __LINE__, 0, 0, i002, 0x1a2b3c4d) } if (LNotEqual(i003, 0x1a2b3c4d)) { - err("", zFFF, 0x103, 0, 0, i003, 0x1a2b3c4d) + err("", zFFF, __LINE__, 0, 0, i003, 0x1a2b3c4d) } if (LNotEqual(i004, 0x1a2b3c4d)) { - err("", zFFF, 0x104, 0, 0, i004, 0x1a2b3c4d) + err("", zFFF, __LINE__, 0, 0, i004, 0x1a2b3c4d) } if (LNotEqual(i005, 0x1a2b3c4d)) { - err("", zFFF, 0x105, 0, 0, i005, 0x1a2b3c4d) + err("", zFFF, __LINE__, 0, 0, i005, 0x1a2b3c4d) } Store(Refof(d000), Local0) if (LNotEqual(DerefOf(Local0), 0x1a2b3c4d)) { - err("", zFFF, 0x106, 0, 0, d000, 0x1a2b3c4d) + err("", zFFF, __LINE__, 0, 0, d000, 0x1a2b3c4d) } Store(Refof(r000), Local0) if (LNotEqual(DerefOf(Local0), 0x1a2b3c4d)) { - err("", zFFF, 0x107, 0, 0, r000, 0x1a2b3c4d) + err("", zFFF, __LINE__, 0, 0, r000, 0x1a2b3c4d) } Store(Store(Store(Store(Store(Store(Store(Store(Store(0x91827364, e000), mx00), tz00), pr00), pw00), m000), i000), d000), r000) Store(Refof(e000), Local0) if (LNotEqual(DerefOf(Local0), 0x91827364)) { - err("", zFFF, 0x108, 0, 0, e000, 0x91827364) + err("", zFFF, __LINE__, 0, 0, e000, 0x91827364) } Store(Refof(mx00), Local0) if (LNotEqual(DerefOf(Local0), 0x91827364)) { - err("", zFFF, 0x109, 0, 0, mx00, 0x91827364) + err("", zFFF, __LINE__, 0, 0, mx00, 0x91827364) } Store(Refof(tz00), Local0) if (LNotEqual(DerefOf(Local0), 0x91827364)) { - err("", zFFF, 0x10a, 0, 0, tz00, 0x91827364) + err("", zFFF, __LINE__, 0, 0, tz00, 0x91827364) } Store(Refof(pr00), Local0) if (LNotEqual(DerefOf(Local0), 0x91827364)) { - err("", zFFF, 0x10b, 0, 0, pr00, 0x91827364) + err("", zFFF, __LINE__, 0, 0, pr00, 0x91827364) } Store(Refof(pw00), Local0) if (LNotEqual(DerefOf(Local0), 0x91827364)) { - err("", zFFF, 0x10c, 0, 0, pw00, 0x91827364) + err("", zFFF, __LINE__, 0, 0, pw00, 0x91827364) } Store(Refof(m000), Local0) if (LNotEqual(DerefOf(Local0), 0x91827364)) { - err("", zFFF, 0x10d, 0, 0, m000, 0x91827364) + err("", zFFF, __LINE__, 0, 0, m000, 0x91827364) } Store(Refof(i000), Local0) if (LNotEqual(DerefOf(Local0), 0x91827364)) { - err("", zFFF, 0x10e, 0, 0, i000, 0x91827364) + err("", zFFF, __LINE__, 0, 0, i000, 0x91827364) } Store(Refof(d000), Local0) if (LNotEqual(DerefOf(Local0), 0x91827364)) { - err("", zFFF, 0x10f, 0, 0, d000, 0x91827364) + err("", zFFF, __LINE__, 0, 0, d000, 0x91827364) } Store(Refof(r000), Local0) if (LNotEqual(DerefOf(Local0), 0x91827364)) { - err("", zFFF, 0x110, 0, 0, r000, 0x91827364) + err("", zFFF, __LINE__, 0, 0, r000, 0x91827364) } } @@ -136,55 +136,55 @@ Method(md06,, Serialized) Store(Store(Store(Store(Store(Store(i006, i000), i001), i002), i003), i004), i005) if (LNotEqual(i006, i000)) { - err("", zFFF, 0x111, 0, 0, i006, i000) + err("", zFFF, __LINE__, 0, 0, i006, i000) } if (LNotEqual(i006, i001)) { - err("", zFFF, 0x112, 0, 0, i006, i001) + err("", zFFF, __LINE__, 0, 0, i006, i001) } if (LNotEqual(i006, i002)) { - err("", zFFF, 0x113, 0, 0, i006, i002) + err("", zFFF, __LINE__, 0, 0, i006, i002) } if (LNotEqual(i006, i003)) { - err("", zFFF, 0x114, 0, 0, i006, i003) + err("", zFFF, __LINE__, 0, 0, i006, i003) } if (LNotEqual(i006, i004)) { - err("", zFFF, 0x115, 0, 0, i006, i004) + err("", zFFF, __LINE__, 0, 0, i006, i004) } if (LNotEqual(i006, i005)) { - err("", zFFF, 0x116, 0, 0, i006, i005) + err("", zFFF, __LINE__, 0, 0, i006, i005) } if (LNotEqual(i006, i006)) { - err("", zFFF, 0x117, 0, 0, i006, i006) + err("", zFFF, __LINE__, 0, 0, i006, i006) } Store(Store(Store(Store(Store(Store(Store(i006, e000), mx00), tz00), pr00), pw00), m000), i000) Store(Refof(e000), Local0) if (LNotEqual(DerefOf(Local0), i006)) { - err("", zFFF, 0x118, 0, 0, e000, i006) + err("", zFFF, __LINE__, 0, 0, e000, i006) } Store(Refof(mx00), Local0) if (LNotEqual(DerefOf(Local0), i006)) { - err("", zFFF, 0x119, 0, 0, mx00, i006) + err("", zFFF, __LINE__, 0, 0, mx00, i006) } Store(Refof(tz00), Local0) if (LNotEqual(DerefOf(Local0), i006)) { - err("", zFFF, 0x11a, 0, 0, tz00, i006) + err("", zFFF, __LINE__, 0, 0, tz00, i006) } Store(Refof(pr00), Local0) if (LNotEqual(DerefOf(Local0), i006)) { - err("", zFFF, 0x11b, 0, 0, pr00, i006) + err("", zFFF, __LINE__, 0, 0, pr00, i006) } Store(Refof(pw00), Local0) if (LNotEqual(DerefOf(Local0), i006)) { - err("", zFFF, 0x11c, 0, 0, pw00, i006) + err("", zFFF, __LINE__, 0, 0, pw00, i006) } Store(Refof(m000), Local0) if (LNotEqual(DerefOf(Local0), i006)) { - err("", zFFF, 0x11d, 0, 0, m000, i006) + err("", zFFF, __LINE__, 0, 0, m000, i006) } Store(Refof(i000), Local0) if (LNotEqual(DerefOf(Local0), i006)) { - err("", zFFF, 0x11e, 0, 0, i000, i006) + err("", zFFF, __LINE__, 0, 0, i000, i006) } } @@ -200,12 +200,12 @@ Method(md68,, Serialized) Store(ObjectType(DeRefof(Local7)), Local0) if (LNotEqual(Local0, c00f)) { - err("", zFFF, 0x11f, 0, 0, Local0, c00f) + err("", zFFF, __LINE__, 0, 0, Local0, c00f) } Store(Derefof(Index(p000, 0)), Local6) Store(ObjectType(DeRefof(Local6)), Local0) if (LNotEqual(Local0, c00f)) { - err("", zFFF, 0x120, 0, 0, Local0, c00f) + err("", zFFF, __LINE__, 0, 0, Local0, c00f) } Store(i000, OOO2) @@ -214,32 +214,32 @@ Method(md68,, Serialized) Store(DeRefof(Refof(OOO2)), Local0) if (LNotEqual(Local0, 0x61)) { - err("", zFFF, 0x121, 0, 0, Local0, 0x61) + err("", zFFF, __LINE__, 0, 0, Local0, 0x61) } if (LNotEqual(i000, 0xe0385bcd)) { - err("", zFFF, 0x122, 0, 0, i000, 0xe0385bcd) + err("", zFFF, __LINE__, 0, 0, i000, 0xe0385bcd) } Store(ObjectType(DeRefof(Local7)), Local0) if (LNotEqual(Local0, c009)) { - err("", zFFF, 0x123, 0, 0, Local0, c009) + err("", zFFF, __LINE__, 0, 0, Local0, c009) } Store(Refof(OOO2), Local7) Store(ObjectType(DeRefof(Local7)), Local0) if (LNotEqual(Local0, c009)) { - err("", zFFF, 0x124, 0, 0, Local0, c009) + err("", zFFF, __LINE__, 0, 0, Local0, c009) } Store(ObjectType(OOO2), Local0) if (LNotEqual(Local0, c009)) { - err("", zFFF, 0x125, 0, 0, Local0, c009) + err("", zFFF, __LINE__, 0, 0, Local0, c009) } Store(Derefof(Index(p000, 0)), Local7) Store(ObjectType(DeRefof(Local7)), Local0) if (LNotEqual(Local0, c009)) { - err("", zFFF, 0x126, 0, 0, Local0, c009) + err("", zFFF, __LINE__, 0, 0, Local0, c009) } } @@ -270,41 +270,41 @@ Method(md69,, Serialized) Store(DeRefof(Refof(OOO2)), Local0) if (LNotEqual(Local0, 0x61)) { - err("", zFFF, 0x127, 0, 0, Local0, 0x61) + err("", zFFF, __LINE__, 0, 0, Local0, 0x61) } if (LNotEqual(i000, 0xe0385bcd)) { - err("", zFFF, 0x128, 0, 0, i000, 0xe0385bcd) + err("", zFFF, __LINE__, 0, 0, i000, 0xe0385bcd) } // Are the locals save? Store(DerefOf(Local1), Local0) if (LNotEqual(Local0, 0xabcd0011)) { - err("", zFFF, 0x129, 0, 0, Local0, 0xabcd0011) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcd0011) } Store(DerefOf(Local2), Local0) if (LNotEqual(Local0, 0xabcd0012)) { - err("", zFFF, 0x12a, 0, 0, Local0, 0xabcd0012) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcd0012) } Store(DerefOf(Local3), Local0) if (LNotEqual(Local0, 0xabcd0013)) { - err("", zFFF, 0x12b, 0, 0, Local0, 0xabcd0013) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcd0013) } Store(DerefOf(Local4), Local0) if (LNotEqual(Local0, 0xabcd0014)) { - err("", zFFF, 0x12c, 0, 0, Local0, 0xabcd0014) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcd0014) } Store(DerefOf(Local5), Local0) if (LNotEqual(Local0, 0xabcd0015)) { - err("", zFFF, 0x12d, 0, 0, Local0, 0xabcd0015) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcd0015) } Store(DerefOf(Local6), Local0) if (LNotEqual(Local0, 0xabcd0016)) { - err("", zFFF, 0x12e, 0, 0, Local0, 0xabcd0016) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcd0016) } Store(DerefOf(Local7), Local0) if (LNotEqual(Local0, 0xabcd0017)) { - err("", zFFF, 0x12f, 0, 0, Local0, 0xabcd0017) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcd0017) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToBuffer.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToBuffer.asl index 40f6b351f..b36f6b511 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToBuffer.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToBuffer.asl @@ -42,10 +42,10 @@ Method(md08,, Serialized) Store (0x61, b000) if (LNotEqual(b000, Buffer() {0x61,0,0,0})) { - err("", zFFF, 0x200, 0, 0, b000, Buffer() {0x61,0,0,0}) + err("", zFFF, __LINE__, 0, 0, b000, Buffer() {0x61,0,0,0}) } if (LNotEqual(i000, 0xabcd)) { - err("", zFFF, 0x201, 0, 0, i000, 0xabcd) + err("", zFFF, __LINE__, 0, 0, i000, 0xabcd) } } @@ -60,10 +60,10 @@ Method(md09,, Serialized) Store("ADb", b000) if (LNotEqual(b000, Buffer() {0x41,0x44,0x62,0})) { - err("", zFFF, 0x202, 0, 0, b000, Buffer() {0x41,0x44,0x62,0}) + err("", zFFF, __LINE__, 0, 0, b000, Buffer() {0x41,0x44,0x62,0}) } if (LNotEqual(s000, "zxcvbqwertynm")) { - err("", zFFF, 0x203, 0, 0, s000, "zxcvbqwertynm") + err("", zFFF, __LINE__, 0, 0, s000, "zxcvbqwertynm") } } @@ -78,10 +78,10 @@ Method(md0a,, Serialized) Store (Buffer() {5,6}, b001) if (LNotEqual(b001, Buffer() {5,6,0,0})) { - err("", zFFF, 0x204, 0, 0, b001, Buffer() {5,6,0,0}) + err("", zFFF, __LINE__, 0, 0, b001, Buffer() {5,6,0,0}) } if (LNotEqual(b000, Buffer() {1,2,3,4})) { - err("", zFFF, 0x205, 0, 0, b000, Buffer() {1,2,3,4}) + err("", zFFF, __LINE__, 0, 0, b000, Buffer() {1,2,3,4}) } } @@ -97,7 +97,7 @@ Method(md0b,, Serialized) Store (0x61, b000) if (LNotEqual(b000, Buffer() {0x61,0,0,0})) { - err("", zFFF, 0x206, 0, 0, b000, Buffer() {0x61,0,0,0}) + err("", zFFF, __LINE__, 0, 0, b000, Buffer() {0x61,0,0,0}) } } @@ -111,7 +111,7 @@ Method(md0c,, Serialized) Store("ADb", b000) if (LNotEqual(b000, Buffer() {0x41,0x44,0x62,0})) { - err("", zFFF, 0x207, 0, 0, b000, Buffer() {0x41,0x44,0x62,0}) + err("", zFFF, __LINE__, 0, 0, b000, Buffer() {0x41,0x44,0x62,0}) } } @@ -125,7 +125,7 @@ Method(md0d,, Serialized) Store (Buffer() {5,6}, b001) if (LNotEqual(b001, Buffer() {5,6,0,0})) { - err("", zFFF, 0x208, 0, 0, b001, Buffer() {5,6,0,0}) + err("", zFFF, __LINE__, 0, 0, b001, Buffer() {5,6,0,0}) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToDevice.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToDevice.asl index 7799e1f79..d6094e0ab 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToDevice.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToDevice.asl @@ -44,10 +44,10 @@ Method(md0f,, Serialized) Store(DeRefof(Refof(OOO2)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0x300, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } if (LNotEqual(i000, 0xe0385bcd)) { - err("", zFFF, 0x301, 0, 0, i000, 0xe0385bcd) + err("", zFFF, __LINE__, 0, 0, i000, 0xe0385bcd) } } @@ -66,10 +66,10 @@ Method(md10,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, "Strang")) { - err("", zFFF, 0x302, 0, 0, Local1, "Strang") + err("", zFFF, __LINE__, 0, 0, Local1, "Strang") } if (LNotEqual(s000, "String")) { - err("", zFFF, 0x303, 0, 0, s000, "String") + err("", zFFF, __LINE__, 0, 0, s000, "String") } } @@ -87,10 +87,10 @@ Method(md11,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, Buffer() {1,2,3,0x61})) { - err("", zFFF, 0x304, 0, 0, Local1, Buffer() {1,2,3,0x61}) + err("", zFFF, __LINE__, 0, 0, Local1, Buffer() {1,2,3,0x61}) } if (LNotEqual(b000, Buffer() {1,2,3,4})) { - err("", zFFF, 0x305, 0, 0, b000, Buffer() {1,2,3,4}) + err("", zFFF, __LINE__, 0, 0, b000, Buffer() {1,2,3,4}) } } @@ -109,38 +109,38 @@ Method(md12,, Serialized) Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 0)), Local1) if (LNotEqual(Local1, 1)) { - err("", zFFF, 0x306, 0, 0, Local1, 1) + err("", zFFF, __LINE__, 0, 0, Local1, 1) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 1)), Local1) if (LNotEqual(Local1, 2)) { - err("", zFFF, 0x307, 0, 0, Local1, 2) + err("", zFFF, __LINE__, 0, 0, Local1, 2) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 2)), Local1) if (LNotEqual(Local1, 3)) { - err("", zFFF, 0x308, 0, 0, Local1, 3) + err("", zFFF, __LINE__, 0, 0, Local1, 3) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 3)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0x309, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } // pppp Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 0)), Local0) if (LNotEqual(Local0, 1)) { - err("", zFFF, 0x30a, 0, 0, Local0, 1) + err("", zFFF, __LINE__, 0, 0, Local0, 1) } Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 1)), Local0) if (LNotEqual(Local0, 2)) { - err("", zFFF, 0x30b, 0, 0, Local0, 2) + err("", zFFF, __LINE__, 0, 0, Local0, 2) } Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 2)), Local0) if (LNotEqual(Local0, 3)) { - err("", zFFF, 0x30c, 0, 0, Local0, 3) + err("", zFFF, __LINE__, 0, 0, Local0, 3) } Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 3)), Local0) if (LNotEqual(Local0, 4)) { - err("", zFFF, 0x30d, 0, 0, Local0, 4) + err("", zFFF, __LINE__, 0, 0, Local0, 4) } } @@ -158,7 +158,7 @@ Method(md13,, Serialized) Store(DeRefof(Refof(OOO2)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0x30e, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } } @@ -176,7 +176,7 @@ Method(md14,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, "Strang")) { - err("", zFFF, 0x30f, 0, 0, Local1, "Strang") + err("", zFFF, __LINE__, 0, 0, Local1, "Strang") } } @@ -193,7 +193,7 @@ Method(md15,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, Buffer() {1,2,3,0x61})) { - err("", zFFF, 0x310, 0, 0, Local1, Buffer() {1,2,3,0x61}) + err("", zFFF, __LINE__, 0, 0, Local1, Buffer() {1,2,3,0x61}) } } @@ -211,19 +211,19 @@ Method(md16,, Serialized) Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 0)), Local1) if (LNotEqual(Local1, 1)) { - err("", zFFF, 0x311, 0, 0, Local1, 1) + err("", zFFF, __LINE__, 0, 0, Local1, 1) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 1)), Local1) if (LNotEqual(Local1, 2)) { - err("", zFFF, 0x312, 0, 0, Local1, 2) + err("", zFFF, __LINE__, 0, 0, Local1, 2) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 2)), Local1) if (LNotEqual(Local1, 3)) { - err("", zFFF, 0x313, 0, 0, Local1, 3) + err("", zFFF, __LINE__, 0, 0, Local1, 3) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 3)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0x314, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToDeviceGlob.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToDeviceGlob.asl index b8ac9710c..922675be9 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToDeviceGlob.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToDeviceGlob.asl @@ -45,10 +45,10 @@ Method(md5b,, Serialized) Store(DeRefof(Refof(OOO2)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0xd00, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } if (LNotEqual(id00, 0xe0385bcd)) { - err("", zFFF, 0xd01, 0, 0, id00, 0xe0385bcd) + err("", zFFF, __LINE__, 0, 0, id00, 0xe0385bcd) } } @@ -66,10 +66,10 @@ Method(md5c,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, "Strang")) { - err("", zFFF, 0xd02, 0, 0, Local1, "Strang") + err("", zFFF, __LINE__, 0, 0, Local1, "Strang") } if (LNotEqual(sd00, "String")) { - err("", zFFF, 0xd03, 0, 0, sd00, "String") + err("", zFFF, __LINE__, 0, 0, sd00, "String") } } @@ -86,10 +86,10 @@ Method(md5d,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, Buffer(32) {1,2,3,0x61})) { - err("", zFFF, 0xd04, 0, 0, Local1, Buffer() {1,2,3,0x61}) + err("", zFFF, __LINE__, 0, 0, Local1, Buffer() {1,2,3,0x61}) } if (LNotEqual(bd00, Buffer(32) {1,2,3,4})) { - err("", zFFF, 0xd05, 0, 0, bd00, Buffer() {1,2,3,4}) + err("", zFFF, __LINE__, 0, 0, bd00, Buffer() {1,2,3,4}) } } @@ -107,38 +107,38 @@ Method(md5e,, Serialized) Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 0)), Local1) if (LNotEqual(Local1, 1)) { - err("", zFFF, 0xd06, 0, 0, Local1, 1) + err("", zFFF, __LINE__, 0, 0, Local1, 1) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 1)), Local1) if (LNotEqual(Local1, 2)) { - err("", zFFF, 0xd07, 0, 0, Local1, 2) + err("", zFFF, __LINE__, 0, 0, Local1, 2) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 2)), Local1) if (LNotEqual(Local1, 3)) { - err("", zFFF, 0xd08, 0, 0, Local1, 3) + err("", zFFF, __LINE__, 0, 0, Local1, 3) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 3)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0xd09, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } // pd00 Store(DeRefof(Index(DerefOf(Index(pd00, 0)), 0)), Local0) if (LNotEqual(Local0, 1)) { - err("", zFFF, 0xd0a, 0, 0, Local0, 1) + err("", zFFF, __LINE__, 0, 0, Local0, 1) } Store(DeRefof(Index(DerefOf(Index(pd00, 0)), 1)), Local0) if (LNotEqual(Local0, 2)) { - err("", zFFF, 0xd0b, 0, 0, Local0, 2) + err("", zFFF, __LINE__, 0, 0, Local0, 2) } Store(DeRefof(Index(DerefOf(Index(pd00, 0)), 2)), Local0) if (LNotEqual(Local0, 3)) { - err("", zFFF, 0xd0c, 0, 0, Local0, 3) + err("", zFFF, __LINE__, 0, 0, Local0, 3) } Store(DeRefof(Index(DerefOf(Index(pd00, 0)), 3)), Local0) if (LNotEqual(Local0, 4)) { - err("", zFFF, 0xd0d, 0, 0, Local0, 4) + err("", zFFF, __LINE__, 0, 0, Local0, 4) } } @@ -154,10 +154,10 @@ Method(md5f) Store(DeRefof(Refof(dd00)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0xd0e, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } if (LNotEqual(id00, 0xe0385bcd)) { - err("", zFFF, 0xd0f, 0, 0, id00, 0xe0385bcd) + err("", zFFF, __LINE__, 0, 0, id00, 0xe0385bcd) } } @@ -175,10 +175,10 @@ Method(md60,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, "Strang")) { - err("", zFFF, 0xd10, 0, 0, Local1, "Strang") + err("", zFFF, __LINE__, 0, 0, Local1, "Strang") } if (LNotEqual(sd00, "String")) { - err("", zFFF, 0xd11, 0, 0, sd00, "String") + err("", zFFF, __LINE__, 0, 0, sd00, "String") } } @@ -195,10 +195,10 @@ Method(md61,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, Buffer(32) {1,2,3,0x61})) { - err("", zFFF, 0xd12, 0, 0, Local1, Buffer() {1,2,3,0x61}) + err("", zFFF, __LINE__, 0, 0, Local1, Buffer() {1,2,3,0x61}) } if (LNotEqual(bd00, Buffer(32) {1,2,3,4})) { - err("", zFFF, 0xd13, 0, 0, bd00, Buffer() {1,2,3,4}) + err("", zFFF, __LINE__, 0, 0, bd00, Buffer() {1,2,3,4}) } } @@ -216,38 +216,38 @@ Method(md62,, Serialized) Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 0)), Local1) if (LNotEqual(Local1, 1)) { - err("", zFFF, 0xd14, 0, 0, Local1, 1) + err("", zFFF, __LINE__, 0, 0, Local1, 1) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 1)), Local1) if (LNotEqual(Local1, 2)) { - err("", zFFF, 0xd15, 0, 0, Local1, 2) + err("", zFFF, __LINE__, 0, 0, Local1, 2) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 2)), Local1) if (LNotEqual(Local1, 3)) { - err("", zFFF, 0xd16, 0, 0, Local1, 3) + err("", zFFF, __LINE__, 0, 0, Local1, 3) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 3)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0xd17, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } // pd00 Store(DeRefof(Index(DerefOf(Index(pd00, 0)), 0)), Local0) if (LNotEqual(Local0, 1)) { - err("", zFFF, 0xd18, 0, 0, Local0, 1) + err("", zFFF, __LINE__, 0, 0, Local0, 1) } Store(DeRefof(Index(DerefOf(Index(pd00, 0)), 1)), Local0) if (LNotEqual(Local0, 2)) { - err("", zFFF, 0xd19, 0, 0, Local0, 2) + err("", zFFF, __LINE__, 0, 0, Local0, 2) } Store(DeRefof(Index(DerefOf(Index(pd00, 0)), 2)), Local0) if (LNotEqual(Local0, 3)) { - err("", zFFF, 0xd1a, 0, 0, Local0, 3) + err("", zFFF, __LINE__, 0, 0, Local0, 3) } Store(DeRefof(Index(DerefOf(Index(pd00, 0)), 3)), Local0) if (LNotEqual(Local0, 4)) { - err("", zFFF, 0xd1b, 0, 0, Local0, 4) + err("", zFFF, __LINE__, 0, 0, Local0, 4) } } @@ -265,10 +265,10 @@ Method(md63,, Serialized) Store(DeRefof(Refof(dd04)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0xd1c, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } if (LNotEqual(i000, 0xe0385bcd)) { - err("", zFFF, 0xd1d, 0, 0, i000, 0xe0385bcd) + err("", zFFF, __LINE__, 0, 0, i000, 0xe0385bcd) } } @@ -286,10 +286,10 @@ Method(md64,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, "Strang")) { - err("", zFFF, 0xd1e, 0, 0, Local1, "Strang") + err("", zFFF, __LINE__, 0, 0, Local1, "Strang") } if (LNotEqual(s000, "String")) { - err("", zFFF, 0xd1f, 0, 0, s000, "String") + err("", zFFF, __LINE__, 0, 0, s000, "String") } } @@ -306,10 +306,10 @@ Method(md65,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, Buffer() {1,2,3,0x61})) { - err("", zFFF, 0xd20, 0, 0, Local1, Buffer() {1,2,3,0x61}) + err("", zFFF, __LINE__, 0, 0, Local1, Buffer() {1,2,3,0x61}) } if (LNotEqual(b000, Buffer() {1,2,3,4})) { - err("", zFFF, 0xd21, 0, 0, b000, Buffer() {1,2,3,4}) + err("", zFFF, __LINE__, 0, 0, b000, Buffer() {1,2,3,4}) } } @@ -327,38 +327,38 @@ Method(md66,, Serialized) Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 0)), Local1) if (LNotEqual(Local1, 1)) { - err("", zFFF, 0xd22, 0, 0, Local1, 1) + err("", zFFF, __LINE__, 0, 0, Local1, 1) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 1)), Local1) if (LNotEqual(Local1, 2)) { - err("", zFFF, 0xd23, 0, 0, Local1, 2) + err("", zFFF, __LINE__, 0, 0, Local1, 2) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 2)), Local1) if (LNotEqual(Local1, 3)) { - err("", zFFF, 0xd24, 0, 0, Local1, 3) + err("", zFFF, __LINE__, 0, 0, Local1, 3) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 3)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0xd25, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } // pppp Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 0)), Local0) if (LNotEqual(Local0, 1)) { - err("", zFFF, 0xd26, 0, 0, Local0, 1) + err("", zFFF, __LINE__, 0, 0, Local0, 1) } Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 1)), Local0) if (LNotEqual(Local0, 2)) { - err("", zFFF, 0xd27, 0, 0, Local0, 2) + err("", zFFF, __LINE__, 0, 0, Local0, 2) } Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 2)), Local0) if (LNotEqual(Local0, 3)) { - err("", zFFF, 0xd28, 0, 0, Local0, 3) + err("", zFFF, __LINE__, 0, 0, Local0, 3) } Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 3)), Local0) if (LNotEqual(Local0, 4)) { - err("", zFFF, 0xd29, 0, 0, Local0, 4) + err("", zFFF, __LINE__, 0, 0, Local0, 4) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToEvent.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToEvent.asl index 7b09b4199..6a32f4ed3 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToEvent.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToEvent.asl @@ -44,10 +44,10 @@ Method(md18,, Serialized) Store(DeRefof(Refof(OOO2)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0x400, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } if (LNotEqual(i000, 0xe0385bcd)) { - err("", zFFF, 0x401, 0, 0, i000, 0xe0385bcd) + err("", zFFF, __LINE__, 0, 0, i000, 0xe0385bcd) } } @@ -66,10 +66,10 @@ Method(md19,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, "Strang")) { - err("", zFFF, 0x402, 0, 0, Local1, "Strang") + err("", zFFF, __LINE__, 0, 0, Local1, "Strang") } if (LNotEqual(s000, "String")) { - err("", zFFF, 0x403, 0, 0, s000, "String") + err("", zFFF, __LINE__, 0, 0, s000, "String") } } @@ -87,10 +87,10 @@ Method(md1a,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, Buffer() {1,2,3,0x61})) { - err("", zFFF, 0x404, 0, 0, Local1, Buffer() {1,2,3,0x61}) + err("", zFFF, __LINE__, 0, 0, Local1, Buffer() {1,2,3,0x61}) } if (LNotEqual(b000, Buffer() {1,2,3,4})) { - err("", zFFF, 0x405, 0, 0, b000, Buffer() {1,2,3,4}) + err("", zFFF, __LINE__, 0, 0, b000, Buffer() {1,2,3,4}) } } @@ -109,38 +109,38 @@ Method(md1b,, Serialized) Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 0)), Local1) if (LNotEqual(Local1, 1)) { - err("", zFFF, 0x406, 0, 0, Local1, 1) + err("", zFFF, __LINE__, 0, 0, Local1, 1) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 1)), Local1) if (LNotEqual(Local1, 2)) { - err("", zFFF, 0x407, 0, 0, Local1, 2) + err("", zFFF, __LINE__, 0, 0, Local1, 2) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 2)), Local1) if (LNotEqual(Local1, 3)) { - err("", zFFF, 0x408, 0, 0, Local1, 3) + err("", zFFF, __LINE__, 0, 0, Local1, 3) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 3)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0x409, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } // pppp Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 0)), Local0) if (LNotEqual(Local0, 1)) { - err("", zFFF, 0x40a, 0, 0, Local0, 1) + err("", zFFF, __LINE__, 0, 0, Local0, 1) } Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 1)), Local0) if (LNotEqual(Local0, 2)) { - err("", zFFF, 0x40b, 0, 0, Local0, 2) + err("", zFFF, __LINE__, 0, 0, Local0, 2) } Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 2)), Local0) if (LNotEqual(Local0, 3)) { - err("", zFFF, 0x40c, 0, 0, Local0, 3) + err("", zFFF, __LINE__, 0, 0, Local0, 3) } Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 3)), Local0) if (LNotEqual(Local0, 4)) { - err("", zFFF, 0x40d, 0, 0, Local0, 4) + err("", zFFF, __LINE__, 0, 0, Local0, 4) } } @@ -158,7 +158,7 @@ Method(md1c,, Serialized) Store(DeRefof(Refof(OOO2)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0x40e, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } } @@ -176,7 +176,7 @@ Method(md1d,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, "Strang")) { - err("", zFFF, 0x40f, 0, 0, Local1, "Strang") + err("", zFFF, __LINE__, 0, 0, Local1, "Strang") } } @@ -193,7 +193,7 @@ Method(md1e,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, Buffer() {1,2,3,0x61})) { - err("", zFFF, 0x410, 0, 0, Local1, Buffer() {1,2,3,0x61}) + err("", zFFF, __LINE__, 0, 0, Local1, Buffer() {1,2,3,0x61}) } } @@ -211,19 +211,19 @@ Method(md1f,, Serialized) Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 0)), Local1) if (LNotEqual(Local1, 1)) { - err("", zFFF, 0x411, 0, 0, Local1, 1) + err("", zFFF, __LINE__, 0, 0, Local1, 1) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 1)), Local1) if (LNotEqual(Local1, 2)) { - err("", zFFF, 0x412, 0, 0, Local1, 2) + err("", zFFF, __LINE__, 0, 0, Local1, 2) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 2)), Local1) if (LNotEqual(Local1, 3)) { - err("", zFFF, 0x413, 0, 0, Local1, 3) + err("", zFFF, __LINE__, 0, 0, Local1, 3) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 3)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0x414, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToInteger.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToInteger.asl index 3a435cf4d..a266e2a21 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToInteger.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToInteger.asl @@ -42,10 +42,10 @@ Method(md59,, Serialized) Store (0x61, i001) if (LNotEqual(i001, 0x61)) { - err("", zFFF, 0x500, 0, 0, i001, 0x61) + err("", zFFF, __LINE__, 0, 0, i001, 0x61) } if (LNotEqual(i000, 0)) { - err("", zFFF, 0x501, 0, 0, i000, 0) + err("", zFFF, __LINE__, 0, 0, i000, 0) } } @@ -60,10 +60,10 @@ Method(md21,, Serialized) Store(0x61, i000) if (LNotEqual(i000, 0x61)) { - err("", zFFF, 0x502, 0, 0, i000, 0x61) + err("", zFFF, __LINE__, 0, 0, i000, 0x61) } if (LNotEqual(s000, "String")) { - err("", zFFF, 0x503, 0, 0, s000, "String") + err("", zFFF, __LINE__, 0, 0, s000, "String") } } @@ -78,10 +78,10 @@ Method(md22,, Serialized) Store (0x61, i000) if (LNotEqual(i000, 0x61)) { - err("", zFFF, 0x504, 0, 0, i000, 0x61) + err("", zFFF, __LINE__, 0, 0, i000, 0x61) } if (LNotEqual(b000, Buffer() {1,2,3,4})) { - err("", zFFF, 0x505, 0, 0, b000, Buffer() {1,2,3,4}) + err("", zFFF, __LINE__, 0, 0, b000, Buffer() {1,2,3,4}) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToMutex.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToMutex.asl index 1953e87b5..a151ef635 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToMutex.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToMutex.asl @@ -44,10 +44,10 @@ Method(md24,, Serialized) Store(DeRefof(Refof(OOO2)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0x600, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } if (LNotEqual(i000, 0xe0385bcd)) { - err("", zFFF, 0x601, 0, 0, i000, 0xe0385bcd) + err("", zFFF, __LINE__, 0, 0, i000, 0xe0385bcd) } } @@ -66,10 +66,10 @@ Method(md25,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, "Strang")) { - err("", zFFF, 0x602, 0, 0, Local1, "Strang") + err("", zFFF, __LINE__, 0, 0, Local1, "Strang") } if (LNotEqual(s000, "String")) { - err("", zFFF, 0x603, 0, 0, s000, "String") + err("", zFFF, __LINE__, 0, 0, s000, "String") } } @@ -87,10 +87,10 @@ Method(md26,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, Buffer() {1,2,3,0x61})) { - err("", zFFF, 0x604, 0, 0, Local1, Buffer() {1,2,3,0x61}) + err("", zFFF, __LINE__, 0, 0, Local1, Buffer() {1,2,3,0x61}) } if (LNotEqual(b000, Buffer() {1,2,3,4})) { - err("", zFFF, 0x605, 0, 0, b000, Buffer() {1,2,3,4}) + err("", zFFF, __LINE__, 0, 0, b000, Buffer() {1,2,3,4}) } } @@ -109,38 +109,38 @@ Method(md27,, Serialized) Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 0)), Local1) if (LNotEqual(Local1, 1)) { - err("", zFFF, 0x606, 0, 0, Local1, 1) + err("", zFFF, __LINE__, 0, 0, Local1, 1) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 1)), Local1) if (LNotEqual(Local1, 2)) { - err("", zFFF, 0x607, 0, 0, Local1, 2) + err("", zFFF, __LINE__, 0, 0, Local1, 2) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 2)), Local1) if (LNotEqual(Local1, 3)) { - err("", zFFF, 0x608, 0, 0, Local1, 3) + err("", zFFF, __LINE__, 0, 0, Local1, 3) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 3)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0x609, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } // pppp Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 0)), Local0) if (LNotEqual(Local0, 1)) { - err("", zFFF, 0x60a, 0, 0, Local0, 1) + err("", zFFF, __LINE__, 0, 0, Local0, 1) } Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 1)), Local0) if (LNotEqual(Local0, 2)) { - err("", zFFF, 0x60b, 0, 0, Local0, 2) + err("", zFFF, __LINE__, 0, 0, Local0, 2) } Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 2)), Local0) if (LNotEqual(Local0, 3)) { - err("", zFFF, 0x60c, 0, 0, Local0, 3) + err("", zFFF, __LINE__, 0, 0, Local0, 3) } Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 3)), Local0) if (LNotEqual(Local0, 4)) { - err("", zFFF, 0x60d, 0, 0, Local0, 4) + err("", zFFF, __LINE__, 0, 0, Local0, 4) } } @@ -158,7 +158,7 @@ Method(md28,, Serialized) Store(DeRefof(Refof(OOO2)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0x60e, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } } @@ -176,7 +176,7 @@ Method(md29,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, "Strang")) { - err("", zFFF, 0x60f, 0, 0, Local1, "Strang") + err("", zFFF, __LINE__, 0, 0, Local1, "Strang") } } @@ -193,7 +193,7 @@ Method(md2a,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, Buffer() {1,2,3,0x61})) { - err("", zFFF, 0x610, 0, 0, Local1, Buffer() {1,2,3,0x61}) + err("", zFFF, __LINE__, 0, 0, Local1, Buffer() {1,2,3,0x61}) } } @@ -211,19 +211,19 @@ Method(md2b,, Serialized) Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 0)), Local1) if (LNotEqual(Local1, 1)) { - err("", zFFF, 0x611, 0, 0, Local1, 1) + err("", zFFF, __LINE__, 0, 0, Local1, 1) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 1)), Local1) if (LNotEqual(Local1, 2)) { - err("", zFFF, 0x612, 0, 0, Local1, 2) + err("", zFFF, __LINE__, 0, 0, Local1, 2) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 2)), Local1) if (LNotEqual(Local1, 3)) { - err("", zFFF, 0x613, 0, 0, Local1, 3) + err("", zFFF, __LINE__, 0, 0, Local1, 3) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 3)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0x614, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToPackage.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToPackage.asl index a1e61f136..719955253 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToPackage.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToPackage.asl @@ -44,10 +44,10 @@ Method(md2d,, Serialized) Store(DeRefof(Refof(OOO2)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0x700, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } if (LNotEqual(i000, 0xe0385bcd)) { - err("", zFFF, 0x701, 0, 0, i000, 0xe0385bcd) + err("", zFFF, __LINE__, 0, 0, i000, 0xe0385bcd) } } @@ -65,10 +65,10 @@ Method(md2e,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, "Strang")) { - err("", zFFF, 0x702, 0, 0, Local1, "Strang") + err("", zFFF, __LINE__, 0, 0, Local1, "Strang") } if (LNotEqual(s000, "String")) { - err("", zFFF, 0x703, 0, 0, s000, "String") + err("", zFFF, __LINE__, 0, 0, s000, "String") } } @@ -86,10 +86,10 @@ Method(md2f,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, Buffer() {1,2,3,0x61})) { - err("", zFFF, 0x704, 0, 0, Local1, Buffer() {1,2,3,0x61}) + err("", zFFF, __LINE__, 0, 0, Local1, Buffer() {1,2,3,0x61}) } if (LNotEqual(b000, Buffer() {1,2,3,4})) { - err("", zFFF, 0x705, 0, 0, b000, Buffer() {1,2,3,4}) + err("", zFFF, __LINE__, 0, 0, b000, Buffer() {1,2,3,4}) } } @@ -107,38 +107,38 @@ Method(md30,, Serialized) Store(DeRefof(Index(DerefOf(Index(OOO2, 0)), 0)), Local0) if (LNotEqual(Local0, 1)) { - err("", zFFF, 0x706, 0, 0, Local0, 1) + err("", zFFF, __LINE__, 0, 0, Local0, 1) } Store(DeRefof(Index(DerefOf(Index(OOO2, 0)), 1)), Local0) if (LNotEqual(Local0, 2)) { - err("", zFFF, 0x707, 0, 0, Local0, 2) + err("", zFFF, __LINE__, 0, 0, Local0, 2) } Store(DeRefof(Index(DerefOf(Index(OOO2, 0)), 2)), Local0) if (LNotEqual(Local0, 3)) { - err("", zFFF, 0x708, 0, 0, Local0, 3) + err("", zFFF, __LINE__, 0, 0, Local0, 3) } Store(DeRefof(Index(DerefOf(Index(OOO2, 0)), 3)), Local0) if (LNotEqual(Local0, 0x61)) { - err("", zFFF, 0x709, 0, 0, Local0, 0x61) + err("", zFFF, __LINE__, 0, 0, Local0, 0x61) } // pppp Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 0)), Local0) if (LNotEqual(Local0, 1)) { - err("", zFFF, 0x70a, 0, 0, Local0, 1) + err("", zFFF, __LINE__, 0, 0, Local0, 1) } Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 1)), Local0) if (LNotEqual(Local0, 2)) { - err("", zFFF, 0x70b, 0, 0, Local0, 2) + err("", zFFF, __LINE__, 0, 0, Local0, 2) } Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 2)), Local0) if (LNotEqual(Local0, 3)) { - err("", zFFF, 0x70c, 0, 0, Local0, 3) + err("", zFFF, __LINE__, 0, 0, Local0, 3) } Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 3)), Local0) if (LNotEqual(Local0, 4)) { - err("", zFFF, 0x70d, 0, 0, Local0, 4) + err("", zFFF, __LINE__, 0, 0, Local0, 4) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToPowerRes.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToPowerRes.asl index 9b50e385b..ffdad0cbf 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToPowerRes.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToPowerRes.asl @@ -44,10 +44,10 @@ Method(md32,, Serialized) Store(DeRefof(Refof(OOO2)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0x800, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } if (LNotEqual(i000, 0xe0385bcd)) { - err("", zFFF, 0x801, 0, 0, i000, 0xe0385bcd) + err("", zFFF, __LINE__, 0, 0, i000, 0xe0385bcd) } } @@ -66,10 +66,10 @@ Method(md33,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, "Strang")) { - err("", zFFF, 0x802, 0, 0, Local1, "Strang") + err("", zFFF, __LINE__, 0, 0, Local1, "Strang") } if (LNotEqual(s000, "String")) { - err("", zFFF, 0x803, 0, 0, s000, "String") + err("", zFFF, __LINE__, 0, 0, s000, "String") } } @@ -87,10 +87,10 @@ Method(md34,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, Buffer() {1,2,3,0x61})) { - err("", zFFF, 0x804, 0, 0, Local1, Buffer() {1,2,3,0x61}) + err("", zFFF, __LINE__, 0, 0, Local1, Buffer() {1,2,3,0x61}) } if (LNotEqual(b000, Buffer() {1,2,3,4})) { - err("", zFFF, 0x805, 0, 0, b000, Buffer() {1,2,3,4}) + err("", zFFF, __LINE__, 0, 0, b000, Buffer() {1,2,3,4}) } } @@ -109,38 +109,38 @@ Method(md35,, Serialized) Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 0)), Local1) if (LNotEqual(Local1, 1)) { - err("", zFFF, 0x806, 0, 0, Local1, 1) + err("", zFFF, __LINE__, 0, 0, Local1, 1) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 1)), Local1) if (LNotEqual(Local1, 2)) { - err("", zFFF, 0x807, 0, 0, Local1, 2) + err("", zFFF, __LINE__, 0, 0, Local1, 2) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 2)), Local1) if (LNotEqual(Local1, 3)) { - err("", zFFF, 0x808, 0, 0, Local1, 3) + err("", zFFF, __LINE__, 0, 0, Local1, 3) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 3)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0x809, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } // pppp Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 0)), Local0) if (LNotEqual(Local0, 1)) { - err("", zFFF, 0x80a, 0, 0, Local0, 1) + err("", zFFF, __LINE__, 0, 0, Local0, 1) } Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 1)), Local0) if (LNotEqual(Local0, 2)) { - err("", zFFF, 0x80b, 0, 0, Local0, 2) + err("", zFFF, __LINE__, 0, 0, Local0, 2) } Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 2)), Local0) if (LNotEqual(Local0, 3)) { - err("", zFFF, 0x80c, 0, 0, Local0, 3) + err("", zFFF, __LINE__, 0, 0, Local0, 3) } Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 3)), Local0) if (LNotEqual(Local0, 4)) { - err("", zFFF, 0x80d, 0, 0, Local0, 4) + err("", zFFF, __LINE__, 0, 0, Local0, 4) } } @@ -158,7 +158,7 @@ Method(md36,, Serialized) Store(DeRefof(Refof(OOO2)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0x80e, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } } @@ -176,7 +176,7 @@ Method(md37,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, "Strang")) { - err("", zFFF, 0x80f, 0, 0, Local1, "Strang") + err("", zFFF, __LINE__, 0, 0, Local1, "Strang") } } @@ -193,7 +193,7 @@ Method(md38,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, Buffer() {1,2,3,0x61})) { - err("", zFFF, 0x810, 0, 0, Local1, Buffer() {1,2,3,0x61}) + err("", zFFF, __LINE__, 0, 0, Local1, Buffer() {1,2,3,0x61}) } } @@ -211,19 +211,19 @@ Method(md39,, Serialized) Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 0)), Local1) if (LNotEqual(Local1, 1)) { - err("", zFFF, 0x811, 0, 0, Local1, 1) + err("", zFFF, __LINE__, 0, 0, Local1, 1) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 1)), Local1) if (LNotEqual(Local1, 2)) { - err("", zFFF, 0x812, 0, 0, Local1, 2) + err("", zFFF, __LINE__, 0, 0, Local1, 2) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 2)), Local1) if (LNotEqual(Local1, 3)) { - err("", zFFF, 0x813, 0, 0, Local1, 3) + err("", zFFF, __LINE__, 0, 0, Local1, 3) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 3)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0x814, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToProcessor.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToProcessor.asl index c2cf68c69..5aec68ecf 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToProcessor.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToProcessor.asl @@ -44,10 +44,10 @@ Method(md3b,, Serialized) Store(DeRefof(Refof(OOO2)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0x900, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } if (LNotEqual(i000, 0xe0385bcd)) { - err("", zFFF, 0x901, 0, 0, i000, 0xe0385bcd) + err("", zFFF, __LINE__, 0, 0, i000, 0xe0385bcd) } } @@ -66,10 +66,10 @@ Method(md3c,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, "Strang")) { - err("", zFFF, 0x902, 0, 0, Local1, "Strang") + err("", zFFF, __LINE__, 0, 0, Local1, "Strang") } if (LNotEqual(s000, "String")) { - err("", zFFF, 0x903, 0, 0, s000, "String") + err("", zFFF, __LINE__, 0, 0, s000, "String") } } @@ -87,10 +87,10 @@ Method(md3d,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, Buffer() {1,2,3,0x61})) { - err("", zFFF, 0x904, 0, 0, Local1, Buffer() {1,2,3,0x61}) + err("", zFFF, __LINE__, 0, 0, Local1, Buffer() {1,2,3,0x61}) } if (LNotEqual(b000, Buffer() {1,2,3,4})) { - err("", zFFF, 0x905, 0, 0, b000, Buffer() {1,2,3,4}) + err("", zFFF, __LINE__, 0, 0, b000, Buffer() {1,2,3,4}) } } @@ -109,38 +109,38 @@ Method(md3e,, Serialized) Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 0)), Local1) if (LNotEqual(Local1, 1)) { - err("", zFFF, 0x906, 0, 0, Local1, 1) + err("", zFFF, __LINE__, 0, 0, Local1, 1) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 1)), Local1) if (LNotEqual(Local1, 2)) { - err("", zFFF, 0x907, 0, 0, Local1, 2) + err("", zFFF, __LINE__, 0, 0, Local1, 2) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 2)), Local1) if (LNotEqual(Local1, 3)) { - err("", zFFF, 0x908, 0, 0, Local1, 3) + err("", zFFF, __LINE__, 0, 0, Local1, 3) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 3)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0x909, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } // pppp Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 0)), Local0) if (LNotEqual(Local0, 1)) { - err("", zFFF, 0x90a, 0, 0, Local0, 1) + err("", zFFF, __LINE__, 0, 0, Local0, 1) } Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 1)), Local0) if (LNotEqual(Local0, 2)) { - err("", zFFF, 0x90b, 0, 0, Local0, 2) + err("", zFFF, __LINE__, 0, 0, Local0, 2) } Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 2)), Local0) if (LNotEqual(Local0, 3)) { - err("", zFFF, 0x90c, 0, 0, Local0, 3) + err("", zFFF, __LINE__, 0, 0, Local0, 3) } Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 3)), Local0) if (LNotEqual(Local0, 4)) { - err("", zFFF, 0x90d, 0, 0, Local0, 4) + err("", zFFF, __LINE__, 0, 0, Local0, 4) } } @@ -158,7 +158,7 @@ Method(md3f,, Serialized) Store(DeRefof(Refof(OOO2)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0x90e, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } } @@ -176,7 +176,7 @@ Method(md40,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, "Strang")) { - err("", zFFF, 0x90f, 0, 0, Local1, "Strang") + err("", zFFF, __LINE__, 0, 0, Local1, "Strang") } } @@ -193,7 +193,7 @@ Method(md41,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, Buffer() {1,2,3,0x61})) { - err("", zFFF, 0x910, 0, 0, Local1, Buffer() {1,2,3,0x61}) + err("", zFFF, __LINE__, 0, 0, Local1, Buffer() {1,2,3,0x61}) } } @@ -211,19 +211,19 @@ Method(md42,, Serialized) Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 0)), Local1) if (LNotEqual(Local1, 1)) { - err("", zFFF, 0x911, 0, 0, Local1, 1) + err("", zFFF, __LINE__, 0, 0, Local1, 1) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 1)), Local1) if (LNotEqual(Local1, 2)) { - err("", zFFF, 0x912, 0, 0, Local1, 2) + err("", zFFF, __LINE__, 0, 0, Local1, 2) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 2)), Local1) if (LNotEqual(Local1, 3)) { - err("", zFFF, 0x913, 0, 0, Local1, 3) + err("", zFFF, __LINE__, 0, 0, Local1, 3) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 3)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0x914, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToRegion.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToRegion.asl index a80155548..806e25f08 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToRegion.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToRegion.asl @@ -44,10 +44,10 @@ Method(md44,, Serialized) Store(DeRefof(Refof(OOO2)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0xa00, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } if (LNotEqual(i000, 0xe0385bcd)) { - err("", zFFF, 0xa01, 0, 0, i000, 0xe0385bcd) + err("", zFFF, __LINE__, 0, 0, i000, 0xe0385bcd) } } @@ -66,10 +66,10 @@ Method(md45,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, "Strang")) { - err("", zFFF, 0xa02, 0, 0, Local1, "Strang") + err("", zFFF, __LINE__, 0, 0, Local1, "Strang") } if (LNotEqual(s000, "String")) { - err("", zFFF, 0xa03, 0, 0, s000, "String") + err("", zFFF, __LINE__, 0, 0, s000, "String") } } @@ -87,10 +87,10 @@ Method(md46,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, Buffer() {1,2,3,0x61})) { - err("", zFFF, 0xa04, 0, 0, Local1, Buffer() {1,2,3,0x61}) + err("", zFFF, __LINE__, 0, 0, Local1, Buffer() {1,2,3,0x61}) } if (LNotEqual(b000, Buffer() {1,2,3,4})) { - err("", zFFF, 0xa05, 0, 0, b000, Buffer() {1,2,3,4}) + err("", zFFF, __LINE__, 0, 0, b000, Buffer() {1,2,3,4}) } } @@ -109,38 +109,38 @@ Method(md47,, Serialized) Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 0)), Local1) if (LNotEqual(Local1, 1)) { - err("", zFFF, 0xa06, 0, 0, Local1, 1) + err("", zFFF, __LINE__, 0, 0, Local1, 1) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 1)), Local1) if (LNotEqual(Local1, 2)) { - err("", zFFF, 0xa07, 0, 0, Local1, 2) + err("", zFFF, __LINE__, 0, 0, Local1, 2) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 2)), Local1) if (LNotEqual(Local1, 3)) { - err("", zFFF, 0xa08, 0, 0, Local1, 3) + err("", zFFF, __LINE__, 0, 0, Local1, 3) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 3)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0xa09, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } // pppp Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 0)), Local0) if (LNotEqual(Local0, 1)) { - err("", zFFF, 0xa0a, 0, 0, Local0, 1) + err("", zFFF, __LINE__, 0, 0, Local0, 1) } Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 1)), Local0) if (LNotEqual(Local0, 2)) { - err("", zFFF, 0xa0b, 0, 0, Local0, 2) + err("", zFFF, __LINE__, 0, 0, Local0, 2) } Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 2)), Local0) if (LNotEqual(Local0, 3)) { - err("", zFFF, 0xa0c, 0, 0, Local0, 3) + err("", zFFF, __LINE__, 0, 0, Local0, 3) } Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 3)), Local0) if (LNotEqual(Local0, 4)) { - err("", zFFF, 0xa0d, 0, 0, Local0, 4) + err("", zFFF, __LINE__, 0, 0, Local0, 4) } } @@ -158,7 +158,7 @@ Method(md48,, Serialized) Store(DeRefof(Refof(OOO2)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0xa0e, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } } @@ -176,7 +176,7 @@ Method(md49,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, "Strang")) { - err("", zFFF, 0xa0f, 0, 0, Local1, "Strang") + err("", zFFF, __LINE__, 0, 0, Local1, "Strang") } } @@ -193,7 +193,7 @@ Method(md4a,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, Buffer() {1,2,3,0x61})) { - err("", zFFF, 0xa10, 0, 0, Local1, Buffer() {1,2,3,0x61}) + err("", zFFF, __LINE__, 0, 0, Local1, Buffer() {1,2,3,0x61}) } } @@ -211,19 +211,19 @@ Method(md4b,, Serialized) Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 0)), Local1) if (LNotEqual(Local1, 1)) { - err("", zFFF, 0xa11, 0, 0, Local1, 1) + err("", zFFF, __LINE__, 0, 0, Local1, 1) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 1)), Local1) if (LNotEqual(Local1, 2)) { - err("", zFFF, 0xa12, 0, 0, Local1, 2) + err("", zFFF, __LINE__, 0, 0, Local1, 2) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 2)), Local1) if (LNotEqual(Local1, 3)) { - err("", zFFF, 0xa13, 0, 0, Local1, 3) + err("", zFFF, __LINE__, 0, 0, Local1, 3) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 3)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0xa14, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToString.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToString.asl index e1c4a0ead..f9671134d 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToString.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToString.asl @@ -42,10 +42,10 @@ Method(md4d,, Serialized) Store (0x61, s000) if (LNotEqual(s000, 0x61)) { - err("", zFFF, 0xb00, 0, 0, s000, 0x61) + err("", zFFF, __LINE__, 0, 0, s000, 0x61) } if (LNotEqual(i000, 0xabcd)) { - err("", zFFF, 0xb01, 0, 0, i000, 0xabcd) + err("", zFFF, __LINE__, 0, 0, i000, 0xabcd) } } @@ -60,10 +60,10 @@ Method(md4e,, Serialized) Store("ADb", s001) if (LNotEqual(s001, "ADb")) { - err("", zFFF, 0xb02, 0, 0, s001, "ADb") + err("", zFFF, __LINE__, 0, 0, s001, "ADb") } if (LNotEqual(s000, "zxcvbqwertynm")) { - err("", zFFF, 0xb03, 0, 0, s000, "zxcvbqwertynm") + err("", zFFF, __LINE__, 0, 0, s000, "zxcvbqwertynm") } } @@ -78,10 +78,10 @@ Method(md4f,, Serialized) Store (Buffer() {5,6}, s000) if (LNotEqual(s000, Buffer() {5,6})) { - err("", zFFF, 0xb04, 0, 0, s000, Buffer() {5,6}) + err("", zFFF, __LINE__, 0, 0, s000, Buffer() {5,6}) } if (LNotEqual(b000, Buffer() {1,2,3,4})) { - err("", zFFF, 0xb05, 0, 0, b000, Buffer() {1,2,3,4}) + err("", zFFF, __LINE__, 0, 0, b000, Buffer() {1,2,3,4}) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToThermalZone.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToThermalZone.asl index 41681b05e..ca0eb56fd 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToThermalZone.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/ToThermalZone.asl @@ -44,10 +44,10 @@ Method(md5a,, Serialized) Store(DeRefof(Refof(OOO2)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0xc00, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } if (LNotEqual(i000, 0xe0385bcd)) { - err("", zFFF, 0xc01, 0, 0, i000, 0xe0385bcd) + err("", zFFF, __LINE__, 0, 0, i000, 0xe0385bcd) } } @@ -66,10 +66,10 @@ Method(md51,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, "Strang")) { - err("", zFFF, 0xc02, 0, 0, Local1, "Strang") + err("", zFFF, __LINE__, 0, 0, Local1, "Strang") } if (LNotEqual(s000, "String")) { - err("", zFFF, 0xc03, 0, 0, s000, "String") + err("", zFFF, __LINE__, 0, 0, s000, "String") } } @@ -87,10 +87,10 @@ Method(md52,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, Buffer() {1,2,3,0x61})) { - err("", zFFF, 0xc04, 0, 0, Local1, Buffer() {1,2,3,0x61}) + err("", zFFF, __LINE__, 0, 0, Local1, Buffer() {1,2,3,0x61}) } if (LNotEqual(b000, Buffer() {1,2,3,4})) { - err("", zFFF, 0xc05, 0, 0, b000, Buffer() {1,2,3,4}) + err("", zFFF, __LINE__, 0, 0, b000, Buffer() {1,2,3,4}) } } @@ -109,38 +109,38 @@ Method(md53,, Serialized) Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 0)), Local1) if (LNotEqual(Local1, 1)) { - err("", zFFF, 0xc06, 0, 0, Local1, 1) + err("", zFFF, __LINE__, 0, 0, Local1, 1) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 1)), Local1) if (LNotEqual(Local1, 2)) { - err("", zFFF, 0xc07, 0, 0, Local1, 2) + err("", zFFF, __LINE__, 0, 0, Local1, 2) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 2)), Local1) if (LNotEqual(Local1, 3)) { - err("", zFFF, 0xc08, 0, 0, Local1, 3) + err("", zFFF, __LINE__, 0, 0, Local1, 3) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 3)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0xc09, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } // pppp Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 0)), Local0) if (LNotEqual(Local0, 1)) { - err("", zFFF, 0xc0a, 0, 0, Local0, 1) + err("", zFFF, __LINE__, 0, 0, Local0, 1) } Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 1)), Local0) if (LNotEqual(Local0, 2)) { - err("", zFFF, 0xc0b, 0, 0, Local0, 2) + err("", zFFF, __LINE__, 0, 0, Local0, 2) } Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 2)), Local0) if (LNotEqual(Local0, 3)) { - err("", zFFF, 0xc0c, 0, 0, Local0, 3) + err("", zFFF, __LINE__, 0, 0, Local0, 3) } Store(DeRefof(Index(DerefOf(Index(pppp, 0)), 3)), Local0) if (LNotEqual(Local0, 4)) { - err("", zFFF, 0xc0d, 0, 0, Local0, 4) + err("", zFFF, __LINE__, 0, 0, Local0, 4) } } @@ -158,7 +158,7 @@ Method(md54,, Serialized) Store(DeRefof(Refof(OOO2)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0xc0e, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } } @@ -176,7 +176,7 @@ Method(md55,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, "Strang")) { - err("", zFFF, 0xc0f, 0, 0, Local1, "Strang") + err("", zFFF, __LINE__, 0, 0, Local1, "Strang") } } @@ -193,7 +193,7 @@ Method(md56,, Serialized) Store(DeRefof(Local0), Local1) if (LNotEqual(Local1, Buffer() {1,2,3,0x61})) { - err("", zFFF, 0xc10, 0, 0, Local1, Buffer() {1,2,3,0x61}) + err("", zFFF, __LINE__, 0, 0, Local1, Buffer() {1,2,3,0x61}) } } @@ -211,19 +211,19 @@ Method(md57,, Serialized) Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 0)), Local1) if (LNotEqual(Local1, 1)) { - err("", zFFF, 0xc11, 0, 0, Local1, 1) + err("", zFFF, __LINE__, 0, 0, Local1, 1) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 1)), Local1) if (LNotEqual(Local1, 2)) { - err("", zFFF, 0xc12, 0, 0, Local1, 2) + err("", zFFF, __LINE__, 0, 0, Local1, 2) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 2)), Local1) if (LNotEqual(Local1, 3)) { - err("", zFFF, 0xc13, 0, 0, Local1, 3) + err("", zFFF, __LINE__, 0, 0, Local1, 3) } Store(DeRefof(Index(DerefOf(Index(DeRefof(Local0), 0)), 3)), Local1) if (LNotEqual(Local1, 0x61)) { - err("", zFFF, 0xc14, 0, 0, Local1, 0x61) + err("", zFFF, __LINE__, 0, 0, Local1, 0x61) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0154/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0154/DECL.asl index 9ecd57654..60dbbf7fd 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0154/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0154/DECL.asl @@ -47,21 +47,21 @@ mf43(id1d) Store(ObjectType(id1d), Local0) if (LNotEqual(Local0, c009)) { - err("", zFFF, 0x000, 0, 0, Local0, c009) + err("", zFFF, __LINE__, 0, 0, Local0, c009) } if (LNotEqual(id1d, 0xfedcba9876543210)) { - err("", zFFF, 0x001, 0, 0, id1d, 0xfedcba9876543210) + err("", zFFF, __LINE__, 0, 0, id1d, 0xfedcba9876543210) } mf43(ed02) Store(ObjectType(ed02), Local0) if (LNotEqual(Local0, c00f)) { - err("", zFFF, 0x002, 0, 0, Local0, c00f) + err("", zFFF, __LINE__, 0, 0, Local0, c00f) } mf43(dd0b) Store(ObjectType(dd0b), Local0) if (LNotEqual(Local0, c00e)) { - err("", zFFF, 0x003, 0, 0, Local0, c00e) + err("", zFFF, __LINE__, 0, 0, Local0, c00e) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0155/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0155/DECL.asl index 6e54518ed..334368b62 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0155/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0155/DECL.asl @@ -43,14 +43,14 @@ not only Operregion and Buffield Method(mf6b) { if (LNotEqual(id1f, 50)) { - err("", zFFF, 0x000, 0, 0, id1f, 50) + err("", zFFF, __LINE__, 0, 0, id1f, 50) } if (LNotEqual(id20, 8)) { - err("", zFFF, 0x001, 0, 0, id20, 8) + err("", zFFF, __LINE__, 0, 0, id20, 8) } if (LNotEqual(bfd3, 0x99)) { - err("", zFFF, 0x002, 0, 0, bfd3, 0x99) + err("", zFFF, __LINE__, 0, 0, bfd3, 0x99) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0157/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0157/DECL.asl index 7057f3c14..a37ba82eb 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0157/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0157/DECL.asl @@ -68,7 +68,7 @@ Method(md00) { CH03("", 0, 0x000, 0, 0) if (LNotEqual("md00.m000", Local0)) { - err("", zFFF, 0x001, 0, 0, Local0, "md00.m000") + err("", zFFF, __LINE__, 0, 0, Local0, "md00.m000") } @@ -83,7 +83,7 @@ Method(md00) { CH03("", 0, 0x002, 0, 0) if (LNotEqual("md00.mm00", Local0)) { - err("", zFFF, 0x003, 0, 0, Local0, "md00.mm00") + err("", zFFF, __LINE__, 0, 0, Local0, "md00.mm00") } CH03("", 0, 0x004, 0, 0) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0161/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0161/DECL.asl index 80972a540..b3ca99510 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0161/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0161/DECL.asl @@ -39,30 +39,30 @@ Method(md8f) { if (LNotEqual(bf32, 0x14)) { - err("", zFFF, 0x000, 0, 0, bf32, 0x14) + err("", zFFF, __LINE__, 0, 0, bf32, 0x14) } if (LNotEqual(bf33, 0x1615)) { - err("", zFFF, 0x001, 0, 0, bf33, 0x1615) + err("", zFFF, __LINE__, 0, 0, bf33, 0x1615) } } Method(md90) { if (LNotEqual(bf34, 0x18)) { - err("", zFFF, 0x002, 0, 0, bf34, 0x18) + err("", zFFF, __LINE__, 0, 0, bf34, 0x18) } if (LNotEqual(bf35, 0x19)) { - err("", zFFF, 0x003, 0, 0, bf35, 0x19) + err("", zFFF, __LINE__, 0, 0, bf35, 0x19) } } Method(md91) { if (LNotEqual(bf36, 0x1a)) { - err("", zFFF, 0x004, 0, 0, bf36, 0x1a) + err("", zFFF, __LINE__, 0, 0, bf36, 0x1a) } if (LNotEqual(bf37, 0x1c1b)) { - err("", zFFF, 0x005, 0, 0, bf37, 0x1c1b) + err("", zFFF, __LINE__, 0, 0, bf37, 0x1c1b) } } @@ -74,10 +74,10 @@ Method(md92) CreateField(bd02, 40, Add(id03, 8), bf33) if (LNotEqual(bf32, 0x14)) { - err("", zFFF, 0x006, 0, 0, bf32, 0x14) + err("", zFFF, __LINE__, 0, 0, bf32, 0x14) } if (LNotEqual(bf33, 0x1615)) { - err("", zFFF, 0x007, 0, 0, bf33, 0x1615) + err("", zFFF, __LINE__, 0, 0, bf33, 0x1615) } } @@ -87,10 +87,10 @@ Method(md93) CreateField(bd02, Add(id04, 8), 8, bf35) if (LNotEqual(bf34, 0x18)) { - err("", zFFF, 0x008, 0, 0, bf34, 0x18) + err("", zFFF, __LINE__, 0, 0, bf34, 0x18) } if (LNotEqual(bf35, 0x19)) { - err("", zFFF, 0x009, 0, 0, bf35, 0x19) + err("", zFFF, __LINE__, 0, 0, bf35, 0x19) } } @@ -100,10 +100,10 @@ Method(md94) CreateField(bd02, Add(id07, 8), Add(id08, 8), bf37) if (LNotEqual(bf36, 0x1a)) { - err("", zFFF, 0x00a, 0, 0, bf36, 0x1a) + err("", zFFF, __LINE__, 0, 0, bf36, 0x1a) } if (LNotEqual(bf37, 0x1c1b)) { - err("", zFFF, 0x00b, 0, 0, bf37, 0x1c1b) + err("", zFFF, __LINE__, 0, 0, bf37, 0x1c1b) } } @@ -115,10 +115,10 @@ Method(md95) CreateField(bd03, 40, Add(id03, 8), bf33) if (LNotEqual(bf32, 0x14)) { - err("", zFFF, 0x00c, 0, 0, bf32, 0x14) + err("", zFFF, __LINE__, 0, 0, bf32, 0x14) } if (LNotEqual(bf33, 0x1615)) { - err("", zFFF, 0x00d, 0, 0, bf33, 0x1615) + err("", zFFF, __LINE__, 0, 0, bf33, 0x1615) } } @@ -128,10 +128,10 @@ Method(md96) CreateField(bd03, Add(id04, 8), 8, bf35) if (LNotEqual(bf34, 0x18)) { - err("", zFFF, 0x00e, 0, 0, bf34, 0x18) + err("", zFFF, __LINE__, 0, 0, bf34, 0x18) } if (LNotEqual(bf35, 0x19)) { - err("", zFFF, 0x00f, 0, 0, bf35, 0x19) + err("", zFFF, __LINE__, 0, 0, bf35, 0x19) } } @@ -141,10 +141,10 @@ Method(md97) CreateField(bd03, Add(id07, 8), Add(id08, 8), bf37) if (LNotEqual(bf36, 0x1a)) { - err("", zFFF, 0x010, 0, 0, bf36, 0x1a) + err("", zFFF, __LINE__, 0, 0, bf36, 0x1a) } if (LNotEqual(bf37, 0x1c1b)) { - err("", zFFF, 0x011, 0, 0, bf37, 0x1c1b) + err("", zFFF, __LINE__, 0, 0, bf37, 0x1c1b) } } @@ -153,40 +153,40 @@ Method(m075, 6, Serialized) Name(b000, Buffer() {0x5D, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18}) if (LNotEqual(arg0, 1)) { - err("", zFFF, 0x012, 0, 0, arg0, 1) + err("", zFFF, __LINE__, 0, 0, arg0, 1) } if (LNotEqual(arg1, 0x5d)) { - err("", zFFF, 0x013, 0, 0, arg1, 0x5d) + err("", zFFF, __LINE__, 0, 0, arg1, 0x5d) } if (LNotEqual(arg2, 0x125D)) { - err("", zFFF, 0x014, 0, 0, arg2, 0x125D) + err("", zFFF, __LINE__, 0, 0, arg2, 0x125D) } if (LNotEqual(arg3, 0x1413125D)) { - err("", zFFF, 0x015, 0, 0, arg3, 0x1413125D) + err("", zFFF, __LINE__, 0, 0, arg3, 0x1413125D) } if (F64) { if (LNotEqual(arg4, 0x181716151413125D)) { - err("", zFFF, 0x016, 0, 0, arg4, 0x181716151413125D) + err("", zFFF, __LINE__, 0, 0, arg4, 0x181716151413125D) } } else { if (LNotEqual(arg4, b000)) { - err("", zFFF, 0x016, 0, 0, arg4, b000) + err("", zFFF, __LINE__, 0, 0, arg4, b000) } } if (LNotEqual(arg5, 0x5d)) { - err("", zFFF, 0x017, 0, 0, arg5, 0x5d) + err("", zFFF, __LINE__, 0, 0, arg5, 0x5d) } } Method(m076, 2) { if (LNotEqual(arg0, 0x5d)) { - err("", zFFF, 0x018, 0, 0, arg0, 0x5d) + err("", zFFF, __LINE__, 0, 0, arg0, 0x5d) } if (LNotEqual(arg1, 0x5d)) { - err("", zFFF, 0x019, 0, 0, arg1, 0x5d) + err("", zFFF, __LINE__, 0, 0, arg1, 0x5d) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0162/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0162/DECL.asl index 05b464023..2971079b1 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0162/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0162/DECL.asl @@ -68,6 +68,6 @@ Method(md78) * have to initiate err here, to log the error in a usual way. */ if (id01) { - err("", zFFF, 0x123, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0167/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0167/DECL.asl index 47fb3ecb1..e66431c2b 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0167/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0167/DECL.asl @@ -74,14 +74,14 @@ Store(Sizeof (p000), Local0) if (LNotEqual(Local0, 256)) { - err("", zFFF, 0x000, 0, 0, Local0, 256) + err("", zFFF, __LINE__, 0, 0, Local0, 256) } else { Store(1, Local1) Store(0, Local2) while (Local0) { Store(DeRefOf(Index(p000, Local2)), Local3) if (LNotEqual(Local3, Local1)) { - err("", zFFF, 0x001, 0, 0, Local3, Local1) + err("", zFFF, __LINE__, 0, 0, Local3, Local1) Break } Decrement(Local0) @@ -132,12 +132,12 @@ Store(0, i000) mm00(0) if (LNotEqual(i000, 1)) { - err("", zFFF, 0x002, 0, 0, i000, 1) + err("", zFFF, __LINE__, 0, 0, i000, 1) } Store(0, i000) mm00(1) if (LNotEqual(i000, 2)) { - err("", zFFF, 0x003, 0, 0, i000, 2) + err("", zFFF, __LINE__, 0, 0, i000, 2) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0168_ACT_REQ_NOPT/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0168_ACT_REQ_NOPT/DECL.asl index 5fb7833b2..074f9286a 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0168_ACT_REQ_NOPT/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0168_ACT_REQ_NOPT/DECL.asl @@ -59,7 +59,7 @@ Store(mf59(0), Local0) Store(DerefOf(Local0), Local1) if (LNotEqual(Local1, 2)){ - err("", zFFF, 0x000, 0, 0, Local1, 2) + err("", zFFF, __LINE__, 0, 0, Local1, 2) } Store(mf59(1), Debug) @@ -67,6 +67,6 @@ Store(mf59(1), Local0) Store(DerefOf(Local0), Local1) if (LNotEqual(Local1, 12)){ - err("", zFFF, 0x001, 0, 0, Local1, 12) + err("", zFFF, __LINE__, 0, 0, Local1, 12) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0169/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0169/DECL.asl index 4a94ba536..250286a04 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0169/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0169/DECL.asl @@ -36,18 +36,18 @@ { ShiftLeft(0xffffffffffffffff, 64, Local0) if (LNotEqual(Local0, 0)){ - err("", zFFF, 0x000, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } ShiftLeft(0xffffffffffffffff, 65, Local0) if (LNotEqual(Local0, 0)){ - err("", zFFF, 0x001, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } ShiftRight(0xffffffffffffffff, 64, Local0) if (LNotEqual(Local0, 0)){ - err("", zFFF, 0x002, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } ShiftRight(0xffffffffffffffff, 65, Local0) if (LNotEqual(Local0, 0)){ - err("", zFFF, 0x003, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0170/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0170/DECL.asl index cb323ccfe..8e20ffcb2 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0170/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0170/DECL.asl @@ -42,7 +42,7 @@ Store(ObjectType(bf90), Local0) if (LNotEqual(Local0, 14)) { - err("", zFFF, 0x000, 0, 0, Local0, 14) + err("", zFFF, __LINE__, 0, 0, Local0, 14) } else { Store(0x9999992b, bf90) @@ -50,9 +50,9 @@ Store(ObjectType(bf90), Local1) if (LNotEqual(Local1, Local0)) { - err("", zFFF, 0x001, 0, 0, Local1, Local0) + err("", zFFF, __LINE__, 0, 0, Local1, Local0) } elseif (LNotEqual(bf90, 0x2b)) { - err("", zFFF, 0x002, 0, 0, bf90, 0x2b) + err("", zFFF, __LINE__, 0, 0, bf90, 0x2b) } } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0171_ACTION_REQUIRED/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0171_ACTION_REQUIRED/DECL.asl index ff584f421..9906a6901 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0171_ACTION_REQUIRED/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0171_ACTION_REQUIRED/DECL.asl @@ -47,11 +47,11 @@ { Store(LEqual("C179B3FE", 0xc179b3fe), Local0) if (LNotEqual(Local0, Ones)) { - err("", zFFF, 0x000, 0, 0, Local0, Ones) + err("", zFFF, __LINE__, 0, 0, Local0, Ones) } Store(LEqual(0xc179b3fe, "C179B3FE"), Local0) if (LNotEqual(Local0, Ones)) { - err("", zFFF, 0x001, 0, 0, Local0, Ones) + err("", zFFF, __LINE__, 0, 0, Local0, Ones) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0172_OUTSTAND_ALLOC/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0172_OUTSTAND_ALLOC/DECL.asl index 6262f2fa5..b83a99a9c 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0172_OUTSTAND_ALLOC/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0172_OUTSTAND_ALLOC/DECL.asl @@ -45,5 +45,5 @@ Store(id1e, pd10) // Store("Outstanding allocations to be investigated!", Debug) -// err("", zFFF, 0x000, 0, 0, 0, 0) +// err("", zFFF, __LINE__, 0, 0, 0, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0174/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0174/DECL.asl index 2ea242be2..d5ce78831 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0174/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0174/DECL.asl @@ -35,6 +35,6 @@ Method(mf60) { if (LNotEqual(rtd1, bd0c)) { - err("", zFFF, 0x000, 0, 0, rtd1, bd0c) + err("", zFFF, __LINE__, 0, 0, rtd1, bd0c) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0179/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0179/DECL.asl index c90825139..fa2ea2e05 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0179/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0179/DECL.asl @@ -37,6 +37,6 @@ Store(ConcatenateResTemplate(rtd0, rtd0), Local0) if (LNotEqual(Local0, bd0b)) { - err("", zFFF, 0x000, 0, 0, Local0, 256) + err("", zFFF, __LINE__, 0, 0, Local0, 256) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0180_ASL_RUNTIME/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0180_ASL_RUNTIME/DECL.asl index 153b94c0d..201fc2833 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0180_ASL_RUNTIME/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0180_ASL_RUNTIME/DECL.asl @@ -50,17 +50,17 @@ Method(me89, 1, Serialized) if (LEqual(arg0, 0)) { if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x000, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } } if (LEqual(arg0, 1)) { if (LNotEqual(Local0, 1)) { - err("", zFFF, 0x000, 0, 0, Local0, 1) + err("", zFFF, __LINE__, 0, 0, Local0, 1) } } if (LEqual(arg0, 2)) { if (LNotEqual(Local0, 2)) { - err("", zFFF, 0x000, 0, 0, Local0, 2) + err("", zFFF, __LINE__, 0, 0, Local0, 2) } } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0181_ASL_RUNTIME/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0181_ASL_RUNTIME/DECL.asl index 986b13584..955c7658c 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0181_ASL_RUNTIME/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0181_ASL_RUNTIME/DECL.asl @@ -39,6 +39,6 @@ Method(me8b,, Serialized) mm20(1) if (LNotEqual(i000, 32)) { - err("", zFFF, 0x000, 0, 0, i000, 32) + err("", zFFF, __LINE__, 0, 0, i000, 32) } } 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 a31b2b6de..249389916 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0182/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0182/DECL.asl @@ -42,13 +42,13 @@ Method (mf78,, Serialized) CH03("", 0, 0x000, 0, 0) if (LNotEqual(id23, 0xabcd0000)) { - err("", zFFF, 0x001, 0, 0, id23, 0xabcd0000) + err("", zFFF, __LINE__, 0, 0, id23, 0xabcd0000) } Name (id23, 0xabcd0001) if (LNotEqual(id23, 0xabcd0001)) { - err("", zFFF, 0x002, 0, 0, id23, 0xabcd0001) + err("", zFFF, __LINE__, 0, 0, id23, 0xabcd0001) } CH03("", 0, 0x003, 0, 0) @@ -63,7 +63,7 @@ Method (mf85,, Serialized) CH03("", 0, 0x004, 0, 0) if (LNotEqual(i9z8, 0xabcd0001)) { - err("", zFFF, 0x005, 0, 0, i9z8, 0xabcd0001) + err("", zFFF, __LINE__, 0, 0, i9z8, 0xabcd0001) } Name (i9z8, 0xabcd0001) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0185/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0185/DECL.asl index 4ebe3772d..6cc3ed7c9 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0185/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0185/DECL.asl @@ -71,7 +71,7 @@ Method(mfc2,, Serialized) if (SLCK) { CH03("", 0, 0x001, 0, 0) if (LNotEqual(i000, 0)) { - err("", zFFF, 0x002, 0, 0, i000, 0) + err("", zFFF, __LINE__, 0, 0, i000, 0) } } else { CH07("", 0, 0xff, 0, 0x003, 0, 0) @@ -88,7 +88,7 @@ Method(mfc2,, Serialized) if (SLCK) { CH03("", 0, 0x005, 0, 0) if (LNotEqual(i000, 0)) { - err("", zFFF, 0x006, 0, 0, i000, 0) + err("", zFFF, __LINE__, 0, 0, i000, 0) } } else { CH07("", 0, 0xff, 0, 0x007, 0, 0) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0186/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0186/DECL.asl index 6c9d26985..5a7574203 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0186/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0186/DECL.asl @@ -88,7 +88,7 @@ Method(mf6d, 0, Serialized) Store(0xabcd0000, Local0) } if (LNotEqual(i000, Local0)) { - err("", zFFF, 0x002, 0, 0, i000, Local0) + err("", zFFF, __LINE__, 0, 0, i000, Local0) } } else { CH07("", 0, 0xff, 0, 0x003, 0, 0) @@ -112,7 +112,7 @@ Method(mf6d, 0, Serialized) Store(0xabcd0001, Local0) } if (LNotEqual(i000, Local0)) { - err("", zFFF, 0x006, 0, 0, i000, Local0) + err("", zFFF, __LINE__, 0, 0, i000, Local0) } } else { CH07("", 0, 0xff, 0, 0x007, 0, 0) @@ -136,7 +136,7 @@ Method(mf6d, 0, Serialized) Store(0xabcd0002, Local0) } if (LNotEqual(i000, Local0)) { - err("", zFFF, 0x00a, 0, 0, i000, Local0) + err("", zFFF, __LINE__, 0, 0, i000, Local0) } } else { CH07("", 0, 0xff, 0, 0x00b, 0, 0) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0187/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0187/DECL.asl index deca1f76e..c27f75c55 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0187/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0187/DECL.asl @@ -52,7 +52,7 @@ Method(mf70,, Serialized) if (SLCK) { CH03("", 0, 0x001, 0, 0) if (LNotEqual(i000, 0)) { - err("", zFFF, 0x002, 0, 0, i000, 0) + err("", zFFF, __LINE__, 0, 0, i000, 0) } } else { CH07("", 0, 0xff, 0, 0x003, 0, 0) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0188/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0188/DECL.asl index 6ea85edcf..f7abf030a 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0188/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0188/DECL.asl @@ -47,11 +47,11 @@ Method(mf7c,, Serialized) Store(ConcatenateResTemplate(RT00, Local1), Local2) if (LNotEqual(Local2, b000)) { - err("", zFFF, 0x001, 0, 0, Local2, b000) + err("", zFFF, __LINE__, 0, 0, Local2, b000) } if (LNotEqual(RT00, b000)) { - err("", zFFF, 0x002, 0, 0, RT00, b000) + err("", zFFF, __LINE__, 0, 0, RT00, b000) } CH03("", 0, 0x003, 0, 0) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0191/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0191/DECL.asl index 87f647ce6..16dd652a5 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0191/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0191/DECL.asl @@ -38,22 +38,22 @@ Method(mfa3) Store(ObjectType(bf90), Local0) if (LNotEqual(Local0, 14)) { - err("", zFFF, 0x000, 0, 0, Local0, 14) + err("", zFFF, __LINE__, 0, 0, Local0, 14) } if (LNotEqual(bf90, 0x77)) { - err("", zFFF, 0x001, 0, 0, bf90, 0x77) + err("", zFFF, __LINE__, 0, 0, bf90, 0x77) } CopyObject(0x9999992b, bf90) Store(ObjectType(bf90), Local0) if (LNotEqual(Local0, 14)) { - err("", zFFF, 0x002, 0, 0, Local0, 14) + err("", zFFF, __LINE__, 0, 0, Local0, 14) } if (LNotEqual(bf90, 0x2b)) { - err("", zFFF, 0x003, 0, 0, bf90, 0x2b) + err("", zFFF, __LINE__, 0, 0, bf90, 0x2b) Store(bf90, Debug) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0192/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0192/DECL.asl index b4cd048db..d33dc3e5f 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0192/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0192/DECL.asl @@ -38,7 +38,7 @@ Method(mfa4,, Serialized) Method(CHK0, 3) { if (LNotEqual(arg0, arg1)) { - err("", zFFF, arg2, 0, 0, arg0, arg1) + err("", zFFF, __LINE__, 0, 0, arg0, arg1) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0193/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0193/DECL.asl index a3a686904..fb1a14c95 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0193/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0193/DECL.asl @@ -57,7 +57,7 @@ Method(mfa5, 1, Serialized) if (LEqual(BFL1, bd10)) { Store("Ok 1", Debug) } else { - err("", zFFF, 0x000, 0, 0, BFL1, bd10) + err("", zFFF, __LINE__, 0, 0, BFL1, bd10) } // Optional storing @@ -72,7 +72,7 @@ Method(mfa5, 1, Serialized) if (LEqual(BFL1, bd10)) { Store("Ok 2", Debug) } else { - err("", zFFF, 0x001, 0, 0, BFL1, bd10) + err("", zFFF, __LINE__, 0, 0, BFL1, bd10) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0194/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0194/DECL.asl index 37f6f6719..4a767bde4 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0194/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0194/DECL.asl @@ -65,13 +65,13 @@ Method(mfa7, 1, Serialized) Store("ToBuffer(b001, b000)", Debug) ToBuffer(b001, b000) if (LNot(bcmp(b000, bb01))) { - err("", zFFF, 0x000, 0, 0, b000, bb01) + err("", zFFF, __LINE__, 0, 0, b000, bb01) } } else { Store("ToBuffer(b000, b001)", Debug) ToBuffer(b000, b001) if (Lnot(bcmp(b001, bb00))) { - err("", zFFF, 0x000, 0, 0, b001, bb00) + err("", zFFF, __LINE__, 0, 0, b001, bb00) } } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0195/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0195/DECL.asl index b20fe2b81..ff11d2fd6 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0195/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0195/DECL.asl @@ -60,17 +60,17 @@ Method(mfaf,, Serialized) Store(ObjectType(s001), Local1) if (LNotEqual(Local0, Local1)) { - err("", zFFF, 0x000, 0, 0, Local0, Local1) + err("", zFFF, __LINE__, 0, 0, Local0, Local1) } elseif (LNotEqual(s000, s001)) { - err("", zFFF, 0x001, 0, 0, s000, s001) + err("", zFFF, __LINE__, 0, 0, s000, s001) } if (LNotEqual(Local0, 2)) { - err("", zFFF, 0x002, 0, 0, Local0, 2) + err("", zFFF, __LINE__, 0, 0, Local0, 2) } if (LNotEqual(Local1, 2)) { - err("", zFFF, 0x003, 0, 0, Local1, 2) + err("", zFFF, __LINE__, 0, 0, Local1, 2) } Increment(b000) @@ -85,16 +85,16 @@ Method(mfaf,, Serialized) Store(ObjectType(b001), Local1) if (LNotEqual(Local0, Local1)) { - err("", zFFF, 0x004, 0, 0, Local0, Local1) + err("", zFFF, __LINE__, 0, 0, Local0, Local1) } elseif (LNotEqual(b000, b001)) { - err("", zFFF, 0x005, 0, 0, b000, b001) + err("", zFFF, __LINE__, 0, 0, b000, b001) } if (LNotEqual(Local0, 3)) { - err("", zFFF, 0x006, 0, 0, Local0, 3) + err("", zFFF, __LINE__, 0, 0, Local0, 3) } if (LNotEqual(Local1, 3)) { - err("", zFFF, 0x007, 0, 0, Local1, 3) + err("", zFFF, __LINE__, 0, 0, Local1, 3) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0198/DECL.0000.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0198/DECL.0000.asl index e2b5a3586..e61a678fc 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0198/DECL.0000.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0198/DECL.0000.asl @@ -71,11 +71,11 @@ Method(mfa9) { if (LNotEqual(Local0, s000)) { // Store("Error 0", Debug) - err("", zFFF, 0x000, 0, 0, Local0, s000) + err("", zFFF, __LINE__, 0, 0, Local0, s000) } if (LNotEqual(Local1, s000)) { // Store("Error 1", Debug) - err("", zFFF, 0x001, 0, 0, Local0, s000) + err("", zFFF, __LINE__, 0, 0, Local0, s000) } Store("========================================.", Debug) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0198/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0198/DECL.asl index f4eae89d6..9488076e3 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0198/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0198/DECL.asl @@ -73,11 +73,11 @@ Method(mfa9,, Serialized) { if (LNotEqual(Local0, s000)) { // Store("Error 0", Debug) - err("", zFFF, 0x000, 0, 0, Local0, s000) + err("", zFFF, __LINE__, 0, 0, Local0, s000) } if (LNotEqual(Local1, s000)) { // Store("Error 1", Debug) - err("", zFFF, 0x001, 0, 0, Local0, s000) + err("", zFFF, __LINE__, 0, 0, Local0, s000) } Store("========================================.", Debug) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0201_OUTSTAND_ALLOC/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0201_OUTSTAND_ALLOC/DECL.asl index a34918078..6df6845b6 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0201_OUTSTAND_ALLOC/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0201_OUTSTAND_ALLOC/DECL.asl @@ -41,7 +41,7 @@ Method(mfc1) Store("To be investigated:", Debug) Store("many Outstanding allocations on Reference ASLTS test run and other ASLTS tests.", Debug) - err("", zFFF, 0x000, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } /* diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0203/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0203/DECL.asl index 3bbb72245..5602e9afb 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0203/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0203/DECL.asl @@ -46,7 +46,7 @@ Method(m813) /* ? */ if (LNotEqual(Local7, c008)) { - err("", zFFF, 0x100, 0, 0, Local7, c008) + err("", zFFF, __LINE__, 0, 0, Local7, c008) } /* or RING_OF_REFS_EXCEPTION? */ diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0210/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0210/DECL.asl index 69574889e..1c7622f90 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0210/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0210/DECL.asl @@ -62,5 +62,5 @@ Method(m819) m001() Store("Fight Outstanding allocations here", Debug) - err("", zFFF, 0x000, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0211/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0211/DECL.asl index e701727e9..2e1f26682 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0211/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0211/DECL.asl @@ -56,6 +56,6 @@ Method(m81a) * ------- Additional Comment #8 From Len Brown 2006-06-25 21:49 ------- * ACPICA 20060608 shipped in 2.6.17-git9, closed. * - * err("", zFFF, 0x000, 0, 0, 0, 0) + * err("", zFFF, __LINE__, 0, 0, 0, 0) */ } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0212/Misc.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0212/Misc.asl index fc650dac0..f45915c8f 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0212/Misc.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0212/Misc.asl @@ -375,7 +375,7 @@ Method(m80f,, Serialized) CopyObject(DerefOf(ir00), Local0) if (LNotEqual(Local0, arg0)) { - err("", zFFF, 0x534, 0, 0, Local0, arg0) + err("", zFFF, __LINE__, 0, 0, Local0, arg0) } } m000() diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0214/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0214/DECL.asl index a039638c7..c577219ce 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0214/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0214/DECL.asl @@ -57,24 +57,24 @@ Method(m81c,, Serialized) Store(0x01, rfu0) m000(OPR1) if (LNotEqual(rfu0, 0x01)) { - err("", zFFF, 0x000, 0, 0, rfu0, 0x01) + err("", zFFF, __LINE__, 0, 0, rfu0, 0x01) } Store(0x02, rfu0) m000(OPR1) if (LNotEqual(rfu0, 0x02)) { - err("", zFFF, 0x001, 0, 0, rfu0, 0x02) + err("", zFFF, __LINE__, 0, 0, rfu0, 0x02) } Store(0x03, rfu0) m000(OPR1) if (LNotEqual(rfu0, 0x03)) { - err("", zFFF, 0x002, 0, 0, rfu0, 0x03) + err("", zFFF, __LINE__, 0, 0, rfu0, 0x03) } Store(0x04, rfu0) if (LNotEqual(rfu0, 0x04)) { - err("", zFFF, 0x003, 0, 0, rfu0, 0x04) + err("", zFFF, __LINE__, 0, 0, rfu0, 0x04) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0215/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0215/DECL.asl index f94cb93cf..1ae9a6fdb 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0215/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0215/DECL.asl @@ -72,17 +72,17 @@ Method(m81d) Store(1, idf0) if (LNotEqual(idf0, 1)) { - err("", zFFF, 0x000, 0, 0, idf0, 1) + err("", zFFF, __LINE__, 0, 0, idf0, 1) } Store(1, idf1) if (LNotEqual(idf1, 1)) { - err("", zFFF, 0x001, 0, 0, idf1, 1) + err("", zFFF, __LINE__, 0, 0, idf1, 1) } Store(1, idf2) if (LNotEqual(idf2, 1)) { - err("", zFFF, 0x002, 0, 0, idf2, 1) + err("", zFFF, __LINE__, 0, 0, idf2, 1) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0217/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0217/DECL.asl index f79754cc0..1f8972109 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0217/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0217/DECL.asl @@ -45,14 +45,14 @@ Method(m035,, Serialized) OperationRegion(OPR0, SystemMemory, 0x2000, 0x100) if (LNotEqual(id2a, 1)) { - err("", zFFF, 0x000, 0, 0, id2a, 1) + err("", zFFF, __LINE__, 0, 0, id2a, 1) } } Method(m036) { if (LNotEqual(id2a, 0)) { - err("", zFFF, 0x001, 0, 0, id2a, 0) + err("", zFFF, __LINE__, 0, 0, id2a, 0) } m035() } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0218/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0218/DECL.asl index a49e14c8c..875bf9ad7 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0218/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0218/DECL.asl @@ -79,11 +79,11 @@ Method(m037,, Serialized) Store(Local0, Debug) if (LNotEqual(i000, id29)) { - err("", zFFF, 0x000, 0, 0, i000, id29) + err("", zFFF, __LINE__, 0, 0, i000, id29) } if (LNotEqual(Local0, id29)) { - err("", zFFF, 0x001, 0, 0, Local0, id29) + err("", zFFF, __LINE__, 0, 0, Local0, id29) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0219/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0219/DECL.asl index 8a1157aa5..2297dd09c 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0219/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0219/DECL.asl @@ -43,6 +43,6 @@ Method(m107,, Serialized) 0x0f, 0x79, 0x00}) if (LNotEqual(RT00, BUF0)) { - err("", zFFF, 0x000, 0, 0, RT00, BUF0) + err("", zFFF, __LINE__, 0, 0, RT00, BUF0) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0220/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0220/DECL.asl index 9953dd573..e00eaf737 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0220/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0220/DECL.asl @@ -60,12 +60,12 @@ Device(D220) { Method(m108) { if (\D220.NERR) { - err("", zFFF, 0x000, 0, 0, \D220.NERR, 0) + err("", zFFF, __LINE__, 0, 0, \D220.NERR, 0) } Subtract(\D220.ACTV, \D220.DACT, Local0) if (LNotEqual(Local0, 1)) { - err("", zFFF, 0x001, 0, 0, Local0, 1) + err("", zFFF, __LINE__, 0, 0, Local0, 1) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0221/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0221/DECL.asl index 99eafd5cf..6d418341d 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0221/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0221/DECL.asl @@ -38,7 +38,7 @@ Method(m109,, Serialized) Method(CHCK, 3) { if (LNotEqual(arg0, arg1)) { - err("", zFFF, arg2, 0, 0, arg0, arg1) + err("", zFFF, __LINE__, 0, 0, arg0, arg1) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0222/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0222/DECL.asl index 289eae6aa..228748cbb 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0222/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0222/DECL.asl @@ -37,7 +37,7 @@ Method(m10a,, Serialized) Method(CHCK, 3) { if (LNotEqual(arg0, arg1)) { - err("", zFFF, arg2, 0, 0, arg0, arg1) + err("", zFFF, __LINE__, 0, 0, arg0, arg1) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0223/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0223/DECL.asl index 60ed77aa7..0cde60070 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0223/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0223/DECL.asl @@ -57,7 +57,7 @@ Method(m10b,, Serialized) Method(CHCK, 3) { if (LNotEqual(arg0, arg1)) { - err("", zFFF, arg2, 0, 0, arg0, arg1) + err("", zFFF, __LINE__, 0, 0, arg0, arg1) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0224/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0224/DECL.asl index 4c24d6f01..eda03b5e5 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0224/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0224/DECL.asl @@ -39,7 +39,7 @@ Method(m10c,, Serialized) Method(CHCK, 3) { if (LNotEqual(arg0, arg1)) { - err("", zFFF, arg2, 0, 0, arg0, arg1) + err("", zFFF, __LINE__, 0, 0, arg0, arg1) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0226/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0226/DECL.asl index f52f310c3..938940394 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0226/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0226/DECL.asl @@ -56,7 +56,7 @@ Method(m10e,, Serialized) Store(tot0, Local0) if (LNotEqual(Local0, 0x8001)) { - err("", zFFF, 0x000, 0, 0, Local0, 0x8001) + err("", zFFF, __LINE__, 0, 0, Local0, 0x8001) } } @@ -70,11 +70,11 @@ Method(m17a,, Serialized) if (F64) { if (LNotEqual(bf00, 0x123456789abcdef0)) { - err("", zFFF, 0x001, 0, 0, bf00, 0x123456789abcdef0) + err("", zFFF, __LINE__, 0, 0, bf00, 0x123456789abcdef0) } } else { if (LNotEqual(bf00, b001)) { - err("", zFFF, 0x002, 0, 0, bf00, b001) + err("", zFFF, __LINE__, 0, 0, bf00, b001) } } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0228/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0228/DECL.asl index 9db0b1e16..15ae7648b 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0228/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0228/DECL.asl @@ -54,7 +54,7 @@ Store to method invocation is not supported Store(5, mf1c()) if (LNotEqual(id12, 5)) { - err("", zFFF, 0x000, 0, 0, id12, 5) + err("", zFFF, __LINE__, 0, 0, id12, 5) } // Case mf1d @@ -62,7 +62,7 @@ Store to method invocation is not supported Store(6, mf1d()) if (LNotEqual(id12, 6)) { - err("", zFFF, 0x001, 0, 0, id12, 6) + err("", zFFF, __LINE__, 0, 0, id12, 6) } */ } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0240_ACTION_REQUIRED/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0240_ACTION_REQUIRED/DECL.asl index b76e24aba..d20de8bb6 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0240_ACTION_REQUIRED/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0240_ACTION_REQUIRED/DECL.asl @@ -68,7 +68,7 @@ Method(m032, 1) Store(Acquire(\_GL, 0xffff), Local0) if (Local0) { Store("Thread 0: failed to Acquire GL", Debug) - err("", zFFF, 0x000, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } else { Store("Thread 0: succeeded to Acquire GL", Debug) Store(1, i000) @@ -119,7 +119,7 @@ Method(m033, 1) Store(Acquire(MX00, 0xffff), Local0) if (Local0) { Store("Thread 0: failed to Acquire MX00", Debug) - err("", zFFF, 0x002, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } else { Store("Thread 0: succeeded to Acquire MX00", Debug) Store(1, i000) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0242/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0242/DECL.asl index fcbee63d5..6ef4b4427 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0242/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0242/DECL.asl @@ -59,7 +59,7 @@ Method(m031,, Serialized) Store(Acquire(T000, 0xffff), Local0) if (Local0) { Store("ERROR: Acquire T000 (Level 0, index 0)", Debug) - err("", zFFF, 0x000, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } else { Store("Ok: Acquire T000 (Level 0, index 0)", Debug) } @@ -67,7 +67,7 @@ Method(m031,, Serialized) Store(Acquire(T001, 0xffff), Local0) if (Local0) { Store("ERROR: Acquire T001 (Level 0, index 1)", Debug) - err("", zFFF, 0x001, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } else { Store("Ok: Acquire T001 (Level 0, index 1)", Debug) } @@ -75,7 +75,7 @@ Method(m031,, Serialized) Store(Acquire(T002, 0xffff), Local0) if (Local0) { Store("ERROR: Acquire T002 (Level 0, index 2)", Debug) - err("", zFFF, 0x002, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } else { Store("Ok: Acquire T002 (Level 0, index 2)", Debug) } @@ -83,7 +83,7 @@ Method(m031,, Serialized) Store(Acquire(T003, 0xffff), Local0) if (Local0) { Store("ERROR: Acquire T003 (Level 0, index 3)", Debug) - err("", zFFF, 0x003, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } else { Store("Ok: Acquire T003 (Level 0, index 3)", Debug) } @@ -126,7 +126,7 @@ Method(m031,, Serialized) Store(Acquire(T100, 0xffff), Local0) if (Local0) { Store("ERROR: Acquire T100 (Level 1, index 0)", Debug) - err("", zFFF, 0x00c, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } else { Store("Ok: Acquire T100 (Level 1, index 0)", Debug) } @@ -134,7 +134,7 @@ Method(m031,, Serialized) Store(Acquire(T101, 0xffff), Local0) if (Local0) { Store("ERROR: Acquire T101 (Level 1, index 1)", Debug) - err("", zFFF, 0x00d, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } else { Store("Ok: Acquire T101 (Level 1, index 1)", Debug) } @@ -142,7 +142,7 @@ Method(m031,, Serialized) Store(Acquire(T102, 0xffff), Local0) if (Local0) { Store("ERROR: Acquire T102 (Level 1, index 2)", Debug) - err("", zFFF, 0x00e, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } else { Store("Ok: Acquire T102 (Level 1, index 2)", Debug) } @@ -150,7 +150,7 @@ Method(m031,, Serialized) Store(Acquire(T103, 0xffff), Local0) if (Local0) { Store("ERROR: Acquire T103 (Level 1, index 3)", Debug) - err("", zFFF, 0x00f, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } else { Store("Ok: Acquire T103 (Level 1, index 3)", Debug) } @@ -194,7 +194,7 @@ Method(m031,, Serialized) Store(Acquire(T100, 0xffff), Local0) if (Local0) { Store("ERROR: Acquire T100 (Level 1, index 0)", Debug) - err("", zFFF, 0x018, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } else { Store("Ok: Acquire T100 (Level 1, index 0)", Debug) } @@ -202,7 +202,7 @@ Method(m031,, Serialized) Store(Acquire(T101, 0xffff), Local0) if (Local0) { Store("ERROR: Acquire T101 (Level 1, index 1)", Debug) - err("", zFFF, 0x019, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } else { Store("Ok: Acquire T101 (Level 1, index 1)", Debug) } @@ -210,7 +210,7 @@ Method(m031,, Serialized) Store(Acquire(T102, 0xffff), Local0) if (Local0) { Store("ERROR: Acquire T102 (Level 1, index 2)", Debug) - err("", zFFF, 0x01a, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } else { Store("Ok: Acquire T102 (Level 1, index 2)", Debug) } @@ -218,7 +218,7 @@ Method(m031,, Serialized) Store(Acquire(T103, 0xffff), Local0) if (Local0) { Store("ERROR: Acquire T103 (Level 1, index 3)", Debug) - err("", zFFF, 0x01b, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } else { Store("Ok: Acquire T103 (Level 1, index 3)", Debug) } 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 6dc14e170..f430f91b1 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0243/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0243/DECL.asl @@ -47,7 +47,7 @@ Method(m02f,, Serialized) Store(Acquire(T500, 0xffff), Local0) if (Local0) { Store("!!!!!!!! ERROR 0: Acquire T500 (Level 5, index 0)", Debug) - err("", zFFF, 0x000, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } else { Store("Ok: Acquired T500 (Level 5, index 0)", Debug) } @@ -57,7 +57,7 @@ Method(m02f,, Serialized) Store(Acquire(T600, 0xffff), Local0) if (Local0) { Store("!!!!!!!! ERROR 1: Acquire T600 (Level 6, index 0)", Debug) - err("", zFFF, 0x001, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } else { Store("Ok: Acquired T600 (Level 6, index 0)", Debug) } @@ -77,7 +77,7 @@ Method(m02f,, Serialized) Store(Acquire(T700, 0xffff), Local0) if (Local0) { Store("!!!!!!!! ERROR 3: Acquire T700 (Level 7, index 0)", Debug) - err("", zFFF, 0x003, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } else { Store("Ok: Acquired T700 (Level 7, index 0)", Debug) Store("Current level is equal to 7!", Debug) 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 043f486e0..9c930f58c 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0244/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0244/DECL.asl @@ -146,12 +146,12 @@ Method(m02e) Method(m0b9) { if (i108) { - err("", zFFF, 0x126, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } if (LNot(i101)) { Store("******** Test was not run !!!!!!!!!!!!!", Debug) - err("", zFFF, 0x002, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) return } @@ -162,14 +162,14 @@ Method(m02e) if (i104) { Store("!!!!!!!! ERROR 1: Acquire(T804, 0xffff) failed", Debug) - err("", zFFF, 0x004, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } else { Store("Ok: Acquire(T804, 0xffff)", Debug) } if (i105) { Store("!!!!!!!! ERROR 2: Acquire(T805, 0xffff) failed", Debug) - err("", zFFF, 0x005, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } else { Store("Ok: Acquire(T805, 0xffff)", Debug) } @@ -186,7 +186,7 @@ Method(m02e) Release(T807) } else { Store("!!!!!!!! ERROR 7: Acquire(T807, 0xffff) failed", Debug) - err("", zFFF, 0x008, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } CH03("", 0, 0x009, 0, 0) @@ -196,7 +196,7 @@ Method(m02e) Release(T806) } else { Store("!!!!!!!! ERROR 5: Acquire(T806, 0xffff) failed", Debug) - err("", zFFF, 0x00a, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } CH03("", 0, 0x00b, 0, 0) @@ -310,7 +310,7 @@ Method(m030,, Serialized) { if (LNot(i101)) { Store("******** Test was not run !!!!!!!!!!!!!", Debug) - err("", zFFF, 0x000, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) return } @@ -321,14 +321,14 @@ Method(m030,, Serialized) if (i104) { Store("!!!!!!!! ERROR 1: Acquire(T804, 0xffff) failed", Debug) - err("", zFFF, 0x002, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } else { Store("Ok: Acquire(T804, 0xffff)", Debug) } if (i105) { Store("!!!!!!!! ERROR 2: Acquire(T805, 0xffff) failed", Debug) - err("", zFFF, 0x003, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } else { Store("Ok: Acquire(T805, 0xffff)", Debug) } @@ -345,7 +345,7 @@ Method(m030,, Serialized) Release(T807) } else { Store("!!!!!!!! ERROR 7: Acquire(T807, 0xffff) failed", Debug) - err("", zFFF, 0x006, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } CH03("", 0, 0x007, 0, 0) @@ -355,7 +355,7 @@ Method(m030,, Serialized) Release(T806) } else { Store("!!!!!!!! ERROR 5: Acquire(T806, 0xffff) failed", Debug) - err("", zFFF, 0x008, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } CH03("", 0, 0x009, 0, 0) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0246/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0246/DECL.asl index d479f1bbc..0fbbcc9b6 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0246/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0246/DECL.asl @@ -62,6 +62,6 @@ Method(m17b, 0, Serialized) } if (LNotEqual(Local1, 3)) { - err("", zFFF, Local2, 0, 0, Local1, 3) + err("", zFFF, __LINE__, 0, 0, Local1, 3) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0247/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0247/DECL.asl index bb6863552..315159908 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0247/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0247/DECL.asl @@ -75,19 +75,19 @@ Method(m17c,, Serialized) } if (LNotEqual(CH10, Arg1)) { - err("", zFFF, ERRN, 0, 0, CH10, Arg1) + err("", zFFF, __LINE__, 0, 0, CH10, Arg1) } Increment(ERRN) if (LEqual(CH11, Arg1)) { - err("", zFFF, ERRN, 0, 0, CH11, Arg1) + err("", zFFF, __LINE__, 0, 0, CH11, Arg1) } Increment(ERRN) if (LNotEqual(CH20, Arg2)) { - err("", zFFF, ERRN, 0, 0, CH20, Arg2) + err("", zFFF, __LINE__, 0, 0, CH20, Arg2) } Increment(ERRN) if (LEqual(CH21, Arg2)) { - err("", zFFF, ERRN, 0, 0, CH21, Arg2) + err("", zFFF, __LINE__, 0, 0, CH21, Arg2) } Increment(ERRN) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0248/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0248/DECL.asl index 7e3f80717..e3af53de6 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0248/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0248/DECL.asl @@ -87,7 +87,7 @@ Method(m02d) } if (LNotEqual(DerefOf(Local0), 0xabcd0000)) { - err("", zFFF, 0x000, 0, 0, DerefOf(Local0), 0xabcd0000) + err("", zFFF, __LINE__, 0, 0, DerefOf(Local0), 0xabcd0000) } Store("============== sit 0 (Local0):", debug) @@ -125,7 +125,7 @@ Method(m02d) Store("============== before checking:", debug) if (LNotEqual(DerefOf(Local0), 0xabcd0000)) { - err("", zFFF, 0x001, 0, 0, DerefOf(Local0), 0xabcd0000) + err("", zFFF, __LINE__, 0, 0, DerefOf(Local0), 0xabcd0000) } Store("============== end of test", debug) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0257/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0257/DECL.asl index c24e7cf8d..98cbaa8f1 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0257/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0257/DECL.asl @@ -76,7 +76,7 @@ Method(m17d) Store(B257, F257) if (CondRefof(\AUXD, Local0)) { - err("", zFFF, 0x000, 0, 0, "\\AUXD", 1) + err("", zFFF, __LINE__, 0, 0, "\\AUXD", 1) return } @@ -92,26 +92,26 @@ Method(m17d) if (CondRefof(\AUXD, Local0)) { } else { - err("", zFFF, 0x003, 0, 0, "\\AUXD", 0) + err("", zFFF, __LINE__, 0, 0, "\\AUXD", 0) return } Store (ObjectType(Local0), Local1) if (LNotEqual(Local1, 6)) { - err("", zFFF, 0x004, 0, 0, Local1, 6) + err("", zFFF, __LINE__, 0, 0, Local1, 6) return } Store(ObjectType(\AUXD.M000), Local0) if (LNotEqual(Local0, 8)) { - err("", zFFF, 0x005, 0, 0, Local0, 8) + err("", zFFF, __LINE__, 0, 0, Local0, 8) return } UnLoad(H257) if (CondRefof(\AUXD, Local0)) { - err("", zFFF, 0x006, 0, 0, "\\AUXD", 1) + err("", zFFF, __LINE__, 0, 0, "\\AUXD", 1) } } 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 aff409ac5..e991b27af 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0258/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0258/DECL.asl @@ -75,7 +75,7 @@ Method(m17e) Store(B258, F258) if (CondRefof(\AUXD, Local0)) { - err("", zFFF, 0x000, 0, 0, "\\AUXD", 1) + err("", zFFF, __LINE__, 0, 0, "\\AUXD", 1) return } @@ -91,26 +91,26 @@ Method(m17e) if (CondRefof(\AUXD, Local0)) { } else { - err("", zFFF, 0x003, 0, 0, "\\AUXD", 0) + err("", zFFF, __LINE__, 0, 0, "\\AUXD", 0) return } Store (ObjectType(Local0), Local1) if (LNotEqual(Local1, 6)) { - err("", zFFF, 0x004, 0, 0, Local1, 6) + err("", zFFF, __LINE__, 0, 0, Local1, 6) return } Store(ObjectType(\AUXD.M000), Local0) if (LNotEqual(Local0, 8)) { - err("", zFFF, 0x005, 0, 0, Local0, 8) + err("", zFFF, __LINE__, 0, 0, Local0, 8) return } UnLoad(H258) if (CondRefof(\AUXD, Local0)) { - err("", zFFF, 0x006, 0, 0, "\\AUXD", 1) + err("", zFFF, __LINE__, 0, 0, "\\AUXD", 1) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0259/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0259/DECL.asl index 79f88a129..b420012fd 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0259/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0259/DECL.asl @@ -78,7 +78,7 @@ Method(m17f) Store(B259, F259) if (CondRefof(\AUXD, Local0)) { - err("", zFFF, 0x000, 0, 0, "\\AUXD", 1) + err("", zFFF, __LINE__, 0, 0, "\\AUXD", 1) return } @@ -94,26 +94,26 @@ Method(m17f) if (CondRefof(\AUXD, Local0)) { } else { - err("", zFFF, 0x003, 0, 0, "\\AUXD", 0) + err("", zFFF, __LINE__, 0, 0, "\\AUXD", 0) return } Store (ObjectType(Local0), Local1) if (LNotEqual(Local1, 6)) { - err("", zFFF, 0x004, 0, 0, Local1, 6) + err("", zFFF, __LINE__, 0, 0, Local1, 6) return } Store(\AUXD.REGC, Local0) if (LNotEqual(Local0, 1)) { - err("", zFFF, 0x005, 0, 0, Local0, 1) + err("", zFFF, __LINE__, 0, 0, Local0, 1) return } UnLoad(H259) if (CondRefof(\AUXD, Local0)) { - err("", zFFF, 0x006, 0, 0, "\\AUXD", 1) + err("", zFFF, __LINE__, 0, 0, "\\AUXD", 1) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0260/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0260/DECL.asl index d8feadbf1..f7d281ee7 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0260/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0260/DECL.asl @@ -61,7 +61,7 @@ Method(m029,, Serialized) Store(BUF0, RFU0) if (CondRefof(\AUXD, Local0)) { - err("", zFFF, 0x001, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) return } @@ -71,14 +71,14 @@ Method(m029,, Serialized) if (CondRefof(\AUXD, Local0)) { } else { - err("", zFFF, 0x002, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) return } Store(ObjectType(Local2), Local1) if (LNotEqual(Local1, 15)) { Store(Local1, Debug) - err("", zFFF, 0x003, 0, 0, Local1, 15) + err("", zFFF, __LINE__, 0, 0, Local1, 15) return } @@ -87,7 +87,7 @@ Method(m029,, Serialized) Store("SSDT unloaded", Debug) if (CondRefof(\AUXD, Local0)) { - err("", zFFF, 0x004, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } CH03("", 0, 0x005, 0, 0) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0261/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0261/DECL.asl index 7fda25865..a1ff0bdb7 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0261/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0261/DECL.asl @@ -65,7 +65,7 @@ Method(m028,, Serialized) Store(BUF0, RFU0) if (CondRefof(\AUXZ, Local0)) { - err("", zFFF, 0x001, 0, 0, Local0, 0x1777777) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1777777) return } @@ -75,14 +75,14 @@ Method(m028,, Serialized) if (CondRefof(\AUXZ, Local0)) { } else { - err("", zFFF, 0x002, 0, 0, Local0, 0x1777777) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1777777) return } Store(ObjectType(Index(PAC0, 0)), Local1) if (LNotEqual(Local1, 15)) { Store(Local1, Debug) - err("", zFFF, 0x003, 0, 0, Local0, 0x1777777) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1777777) return } @@ -91,7 +91,7 @@ Method(m028,, Serialized) Store("SSDT unloaded", Debug) if (CondRefof(\AUXZ, Local0)) { - err("", zFFF, 0x004, 0, 0, Local0, 0x1777777) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1777777) } CH03("", 0, 0x005, 0, 0) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0262/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0262/DECL.asl index cfa07a998..1bd252532 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0262/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0262/DECL.asl @@ -59,7 +59,7 @@ Method(m027,, Serialized) Store (Local0, Debug) if (LNotEqual(Local0, 0x1777777)) { - err("", zFFF, 0x000, 0, 0, Local0, 0x1777777) + err("", zFFF, __LINE__, 0, 0, Local0, 0x1777777) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0263/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0263/DECL.asl index c87af5b38..818230811 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0263/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0263/DECL.asl @@ -49,11 +49,11 @@ Method(m026) Store(i000, Debug) if (LNotEqual(Local0, 0x50000001)) { - err("", zFFF, 0x000, 0, 0, Local0, 0x50000001) + err("", zFFF, __LINE__, 0, 0, Local0, 0x50000001) } if (LNotEqual(i000, 0x50000000)) { - err("", zFFF, 0x001, 0, 0, i000, 0x50000000) + err("", zFFF, __LINE__, 0, 0, i000, 0x50000000) } } @@ -111,11 +111,11 @@ Method(m026) Store(Add(i000, m001()), Local0) if (LNotEqual(Local0, 0x87654321)) { - err("", zFFF, 0x002, 0, 0, Local0, 0x87654321) + err("", zFFF, __LINE__, 0, 0, Local0, 0x87654321) } if (LNotEqual(i000, 0x80000000)) { - err("", zFFF, 0x003, 0, 0, i000, 0x80000000) + err("", zFFF, __LINE__, 0, 0, i000, 0x80000000) } } mm00() diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0264/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0264/DECL.asl index 1201e943b..40ca9e188 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0264/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0264/DECL.asl @@ -59,7 +59,7 @@ Specify then what should be there the result of Store operation above? Store(DerefOf(Index(p000, 0)), Local0) if (LNotEqual(Local0, 0xabcd0000)) { - err("", zFFF, 0x000, 0, 0, Local0, 0xabcd0000) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcd0000) } */ diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0265/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0265/DECL.asl index edbdba728..ff7d31d50 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0265/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0265/DECL.asl @@ -81,7 +81,7 @@ Method(m024) Store(Add(DerefOf(Index(s000, 1)), m001()), Local0) if (LNotEqual(Local0, 0x24)) { - err("", zFFF, 0x000, 0, 0, Local0, 0x24) + err("", zFFF, __LINE__, 0, 0, Local0, 0x24) } Store(DerefOf(Index(s000, 1)), Local0) @@ -89,7 +89,7 @@ Method(m024) Store(0x08, Local1) if (LNotEqual(Local0, Local1)) { - err("", zFFF, 0x000, 0, 0, Local0, Local1) + err("", zFFF, __LINE__, 0, 0, Local0, Local1) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0268/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0268/DECL.asl index 331422ccc..747fa1653 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0268/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0268/DECL.asl @@ -49,7 +49,7 @@ Method(m023,, Serialized) Store(i000, Debug) if (LNotEqual(arg0, 0xabcd0000)) { - err("", zFFF, 0x000, 0, 0, arg0, 0xabcd0000) + err("", zFFF, __LINE__, 0, 0, arg0, 0xabcd0000) } } @@ -64,6 +64,6 @@ Method(m023,, Serialized) Store(i000, Debug) if (LNotEqual(i000, 0x11223344)) { - err("", zFFF, 0x001, 0, 0, i000, 0x11223344) + err("", zFFF, __LINE__, 0, 0, i000, 0x11223344) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0269/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0269/DECL.asl index 377b3e62e..3a926cf45 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0269/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0269/DECL.asl @@ -95,11 +95,11 @@ Method(m022,, Serialized) Store(MAdd(i000, m001()), Local0) if (LNotEqual(Local0, 0x87654321)) { - err("", zFFF, 0x001, 0, 0, Local0, c00e) + err("", zFFF, __LINE__, 0, 0, Local0, c00e) } if (LNotEqual(i000, 0x80000000)) { - err("", zFFF, 0x002, 0, 0, Local0, c00e) + err("", zFFF, __LINE__, 0, 0, Local0, c00e) } Store("Result:", Debug) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0271/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0271/DECL.asl index a90997c93..ef1058399 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0271/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0271/DECL.asl @@ -57,7 +57,7 @@ Method(m021,, Serialized) Store(ObjectType(i001), Local0) if (LNotEqual(Local0, c00e)) { - err("", zFFF, 0x001, 0, 0, Local0, c00e) + err("", zFFF, __LINE__, 0, 0, Local0, c00e) } CH03("", 0, 0x002, 0, 0) @@ -65,7 +65,7 @@ Method(m021,, Serialized) Store(ObjectType(i001), Local0) if (LNotEqual(Local0, c009)) { - err("", zFFF, 0x003, 0, 0, Local0, c009) + err("", zFFF, __LINE__, 0, 0, Local0, c009) } CH03("", 0, 0x004, 0, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0272/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0272/DECL.asl index 2a36c9460..ec60e424e 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0272/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0272/DECL.asl @@ -57,7 +57,7 @@ Method(m020,, Serialized) Store(ObjectType(i001), Local0) if (LNotEqual(Local0, c015)) { - err("", zFFF, 0x001, 0, 0, Local0, c015) + err("", zFFF, __LINE__, 0, 0, Local0, c015) } CH03("", 0, 0x002, 0, 0) @@ -65,7 +65,7 @@ Method(m020,, Serialized) Store(ObjectType(i001), Local0) if (LNotEqual(Local0, c009)) { - err("", zFFF, 0x003, 0, 0, Local0, c009) + err("", zFFF, __LINE__, 0, 0, Local0, c009) } CH03("", 0, 0x004, 0, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0273/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0273/DECL.asl index 622133afe..ecb828c9a 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0273/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0273/DECL.asl @@ -75,35 +75,35 @@ Method(mc73,, Serialized) } if (LNotEqual(F273, SSDT)) { - err("", zFFF, 0x001, 0, 0, F273, SSDT) + err("", zFFF, __LINE__, 0, 0, F273, SSDT) } if (CondRefof(\_XT2, Local0)) { - err("", zFFF, 0x002, 0, 0, "\\_XT2", 1) + err("", zFFF, __LINE__, 0, 0, "\\_XT2", 1) } if (CondRefof(\D273._XT2, Local0)) { - err("", zFFF, 0x003, 0, 0, "\\D273._XT2", 1) + err("", zFFF, __LINE__, 0, 0, "\\D273._XT2", 1) } LD() if (CondRefof(\_XT2, Local0)) { - err("", zFFF, 0x004, 0, 0, "\\_XT2", 1) + err("", zFFF, __LINE__, 0, 0, "\\_XT2", 1) } if (CondRefof(\D273._XT2, Local0)) { } else { - err("", zFFF, 0x005, 0, 0, "\\D273._XT2", 0) + err("", zFFF, __LINE__, 0, 0, "\\D273._XT2", 0) } UNLD() if (CondRefof(\_XT2, Local0)) { - err("", zFFF, 0x006, 0, 0, "\\_XT2", 1) + err("", zFFF, __LINE__, 0, 0, "\\_XT2", 1) } if (CondRefof(\D273._XT2, Local0)) { - err("", zFFF, 0x007, 0, 0, "\\D273._XT2", 1) + err("", zFFF, __LINE__, 0, 0, "\\D273._XT2", 1) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0274/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0274/DECL.asl index 55abbbbfc..b8820d8ce 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0274/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0274/DECL.asl @@ -54,7 +54,7 @@ Method(mc74,, Serialized) { Store(DerefOf(Index(Arg1, Arg2)), Local0) if (LNotEqual(Local0, Arg0)) { - err("", zFFF, Arg3, 0, 0, Arg0, Local0) + err("", zFFF, __LINE__, 0, 0, Arg0, Local0) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0275/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0275/DECL.asl index 7ef926a26..997fd818a 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0275/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0275/DECL.asl @@ -61,7 +61,7 @@ Method(mc75,, Serialized) } if (LNotEqual(Local1, 0xabcd0001)) { - err("", zFFF, 0x003, 0, 0, Local1, 0xabcd0001) + err("", zFFF, __LINE__, 0, 0, Local1, 0xabcd0001) } return } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0278/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0278/DECL.asl index 2036fe732..cb7c19d47 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0278/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0278/DECL.asl @@ -60,10 +60,10 @@ Device (D278) { { // Check absence if (CondRefof(NABS, Local0)) { - err("", zFFF, 0x001, 0, 0, "NABS", 1) + err("", zFFF, __LINE__, 0, 0, "NABS", 1) } if (CondRefof(NCRR, Local0)) { - err("", zFFF, 0x002, 0, 0, "NCRR", 1) + err("", zFFF, __LINE__, 0, 0, "NCRR", 1) } Store(SSDT, RFU0) @@ -73,33 +73,33 @@ Device (D278) { // Check existence if (CondRefof(NABS, Local0)) { if (LNotEqual("absolute location obj", Derefof(Local0))) { - err("", zFFF, 0x003, 0, 0, "absolute location NABS", 1) + err("", zFFF, __LINE__, 0, 0, "absolute location NABS", 1) } } else { - err("", zFFF, 0x004, 0, 0, "NABS", 0) + err("", zFFF, __LINE__, 0, 0, "NABS", 0) } if (CondRefof(NCRR, Local0)) { if (LNotEqual("current location obj", Derefof(Local0))) { - err("", zFFF, 0x005, 0, 0, "current location NCRR", 1) + err("", zFFF, __LINE__, 0, 0, "current location NCRR", 1) } } else { - err("", zFFF, 0x006, 0, 0, "NCRR", 0) + err("", zFFF, __LINE__, 0, 0, "NCRR", 0) } // Check location if (CondRefof(\NABS, Local0)) { } else { - err("", zFFF, 0x007, 0, 0, "\\NABS", 0) + err("", zFFF, __LINE__, 0, 0, "\\NABS", 0) } if (CondRefof(\NCRR, Local0)) { - err("", zFFF, 0x008, 0, 0, "\\NCRR", 1) + err("", zFFF, __LINE__, 0, 0, "\\NCRR", 1) } if (CondRefof(\D278.NCRR, Local0)) { - err("", zFFF, 0x009, 0, 0, "\\D278.NCRR", 1) + err("", zFFF, __LINE__, 0, 0, "\\D278.NCRR", 1) } if (CondRefof(\D278.TST0.NCRR, Local0)) { } else { - err("", zFFF, 0x00a, 0, 0, "\\D278.TST0.NCRR", 0) + err("", zFFF, __LINE__, 0, 0, "\\D278.TST0.NCRR", 0) } UnLoad(DDBH) @@ -107,10 +107,10 @@ Device (D278) { // Check absence if (CondRefof(NABS, Local0)) { - err("", zFFF, 0x00b, 0, 0, "NABS", 1) + err("", zFFF, __LINE__, 0, 0, "NABS", 1) } if (CondRefof(NCRR, Local0)) { - err("", zFFF, 0x00c, 0, 0, "NCRR", 1) + err("", zFFF, __LINE__, 0, 0, "NCRR", 1) } } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0279_ASL_RUNTIME/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0279_ASL_RUNTIME/DECL.asl index 307f8b7ec..5c0cc064f 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0279_ASL_RUNTIME/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0279_ASL_RUNTIME/DECL.asl @@ -41,6 +41,6 @@ External(\SS00) Method(m279) { if (CondRefof(\SS00, Local0)) { - err("", zFFF, 0x001, 0, 0, "\\SS00", 1) + err("", zFFF, __LINE__, 0, 0, "\\SS00", 1) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0280_ASL_RUNTIME/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0280_ASL_RUNTIME/DECL.asl index 1582891a7..3aaf2e36d 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0280_ASL_RUNTIME/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0280_ASL_RUNTIME/DECL.asl @@ -36,7 +36,7 @@ Device (D280) { Method(T280) { if (CondRefof(NABS, Local0)) { - err("", zFFF, 0x001, 0, 0, "NABS", 1) + err("", zFFF, __LINE__, 0, 0, "NABS", 1) } } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0281/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0281/DECL.asl index 75228c0e0..56fef959f 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0281/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0281/DECL.asl @@ -53,12 +53,12 @@ Device (D281) { if (LNotEqual(PLDT, 0)) { Store(PLDT, Debug) - err("", zFFF, 0x000, 0, 0, PLDT, 0) + err("", zFFF, __LINE__, 0, 0, PLDT, 0) return (1) } if (CondRefof(\_XT2, Local0)) { - err("", zFFF, 0x001, 0, 0, "\\_XT2", 1) + err("", zFFF, __LINE__, 0, 0, "\\_XT2", 1) } // Successful case: spaces is replaced with zeroes @@ -76,21 +76,21 @@ Device (D281) { if (LNotEqual(PLDT, 1)) { Store(PLDT, Debug) - err("", zFFF, 0x003, 0, 0, PLDT, 1) + err("", zFFF, __LINE__, 0, 0, PLDT, 1) return (1) } Store("OEM1 loaded", Debug) if (CondRefof(\_XT2, Local0)) { } else { - err("", zFFF, 0x004, 0, 0, "\\_XT2", 0) + err("", zFFF, __LINE__, 0, 0, "\\_XT2", 0) } UnLoad(DDB0) Store("OEM1 unloaded", Debug) if (CondRefof(\_XT2, Local0)) { - err("", zFFF, 0x005, 0, 0, "\\_XT2", 1) + err("", zFFF, __LINE__, 0, 0, "\\_XT2", 1) } // Unhappy case: normal strings @@ -101,21 +101,21 @@ Device (D281) { if (LNotEqual(PLDT, 1)) { Store(PLDT, Debug) - err("", zFFF, 0x007, 0, 0, PLDT, 1) + err("", zFFF, __LINE__, 0, 0, PLDT, 1) return (1) } Store("OEM1 loaded", Debug) if (CondRefof(\_XT2, Local0)) { } else { - err("", zFFF, 0x008, 0, 0, "\\_XT2", 0) + err("", zFFF, __LINE__, 0, 0, "\\_XT2", 0) } UnLoad(DDB1) Store("OEM1 unloaded", Debug) if (CondRefof(\_XT2, Local0)) { - err("", zFFF, 0x009, 0, 0, "\\_XT2", 1) + err("", zFFF, __LINE__, 0, 0, "\\_XT2", 1) } return (0) 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 b4e56af7b..e5ae11184 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0287/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0287/DECL.asl @@ -44,7 +44,7 @@ Device (D287) { CH04("", 0, 0xff, 0, 0x001, 0, 0) if (LNotEqual(PLDT, 0)) { - err("", zFFF, 0x002, 0, 0, PLDT, 0) + err("", zFFF, __LINE__, 0, 0, PLDT, 0) Return (1) } @@ -53,7 +53,7 @@ Device (D287) { CH04("", 0, 0xff, 0, 0x003, 0, 0) if (LNotEqual(PLDT, 0)) { - err("", zFFF, 0x004, 0, 0, PLDT, 0) + err("", zFFF, __LINE__, 0, 0, PLDT, 0) Return (1) } @@ -62,7 +62,7 @@ Device (D287) { CH04("", 0, 0xff, 0, 0x005, 0, 0) if (LNotEqual(PLDT, 0)) { - err("", zFFF, 0x006, 0, 0, PLDT, 0) + err("", zFFF, __LINE__, 0, 0, PLDT, 0) Return (1) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0288_ASL_RUNTIME/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0288_ASL_RUNTIME/DECL.asl index 770f4dba9..6ba833799 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0288_ASL_RUNTIME/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0288_ASL_RUNTIME/DECL.asl @@ -44,7 +44,7 @@ Device (D288) { Store(LoadTable("OEM1", "", "", , "\\D288.PLDT", Local0), Local1) if (LNotEqual(PLDT, 1)) { - err("", zFFF, 0x001, 0, 0, PLDT, 1) + err("", zFFF, __LINE__, 0, 0, PLDT, 1) } UnLoad(Local1) @@ -52,7 +52,7 @@ Device (D288) { Store(LoadTable("OEM1", "", "", , "\\PLDT", m000(2)), Local1) if (LNotEqual(PLDT, 2)) { - err("", zFFF, 0x002, 0, 0, PLDT, 2) + err("", zFFF, __LINE__, 0, 0, PLDT, 2) } UnLoad(Local1) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0289/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0289/DECL.asl index f0440133d..9e50d2b1c 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0289/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0289/DECL.asl @@ -67,7 +67,7 @@ Device (D289) { Store(LoadTable("SSDT", "iASLTS", "LTBL0001", "\\", "\\D289.PLDT", 1), DDBH) if (LEqual(PLDT, 1)) { - err("", zFFF, 0x001, 0, 0, "PLDT", 1) + err("", zFFF, __LINE__, 0, 0, "PLDT", 1) UnLoad(DDBH) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0290/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0290/DECL.asl index 7f8f486bb..3e17051d7 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0290/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0290/DECL.asl @@ -59,7 +59,7 @@ Device (D290) { Store(BUF0, RFU0) if (CondRefof(\AUXD, Local0)) { - err("", zFFF, 0x000, 0, 0, "\\AUXD", 1) + err("", zFFF, __LINE__, 0, 0, "\\AUXD", 1) return } @@ -69,7 +69,7 @@ Device (D290) { return } elseif (CondRefof(\AUXD, Local0)) { } else { - err("", zFFF, 0x002, 0, 0, "\\AUXD", 0) + err("", zFFF, __LINE__, 0, 0, "\\AUXD", 0) return } @@ -80,7 +80,7 @@ Device (D290) { Store("SSDT unloaded", Debug) if (CondRefof(\AUXD, Local0)) { - err("", zFFF, 0x003, 0, 0, "\\AUXD", 1) + err("", zFFF, __LINE__, 0, 0, "\\AUXD", 1) } return diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0291_ASL_RUNTIME/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0291_ASL_RUNTIME/DECL.asl index 3fe8f4186..9fd360cb9 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0291_ASL_RUNTIME/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0291_ASL_RUNTIME/DECL.asl @@ -45,7 +45,7 @@ Device (D291) { Store(LoadTable("OEM1", "", "", "\\", "\\D291.PLDT", Subtract(M000(3), 1)), DDBH) if (LNotEqual(PLDT, 2)) { - err("", zFFF, 0x001, 0, 0, PLDT, 2) + err("", zFFF, __LINE__, 0, 0, PLDT, 2) return } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0293/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0293/DECL.asl index afa07199b..7fa628b32 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0293/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0293/DECL.asl @@ -47,34 +47,34 @@ Method(m293) Store(Sizeof(Local3), Debug) If (LNotEqual(Sizeof(Local2), 0)) { - err("", zFFF, 0x001, 0, 0, Sizeof(Local2), 0) + err("", zFFF, __LINE__, 0, 0, Sizeof(Local2), 0) } If (LNotEqual(Sizeof(Local3), 0)) { - err("", zFFF, 0x001, 0, 0, Sizeof(Local3), 0) + err("", zFFF, __LINE__, 0, 0, Sizeof(Local3), 0) } If (LNotEqual("", Local1)) { - err("", zFFF, 0x001, 0, 0, "", Local1) + err("", zFFF, __LINE__, 0, 0, "", Local1) } If (LNotEqual("", Local2)) { - err("", zFFF, 0x001, 0, 0, "", Local2) + err("", zFFF, __LINE__, 0, 0, "", Local2) } If (LNotEqual("", Local3)) { - err("", zFFF, 0x001, 0, 0, "", Local3) + err("", zFFF, __LINE__, 0, 0, "", Local3) } If (LNotEqual(Local2, Local3)) { - err("", zFFF, 0x001, 0, 0, Local2, Local3) + err("", zFFF, __LINE__, 0, 0, Local2, Local3) } If (LNotEqual(Local2, Local1)) { - err("", zFFF, 0x001, 0, 0, Local2, Local1) + err("", zFFF, __LINE__, 0, 0, Local2, Local1) } If (LNotEqual(Local3, Local1)) { - err("", zFFF, 0x001, 0, 0, Local3, Local1) + err("", zFFF, __LINE__, 0, 0, Local3, Local1) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0294/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0294/DECL.asl index 347755a00..efc13af5e 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0294/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0294/DECL.asl @@ -238,7 +238,7 @@ Device (D294) { Name(DDB3, 0) if (INIT()) { - err("", zFFF, 0x001, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) return (1) } @@ -249,7 +249,7 @@ Device (D294) { while (Local0) { // Store(HI0N, Debug) if (LD()) { - err("", zFFF, 0x002, 0, 0, Local0, HI0N) + err("", zFFF, __LINE__, 0, 0, Local0, HI0N) return (1) } Decrement(Local0) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0296/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0296/DECL.asl index 9845e6023..29ba4be26 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0296/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0296/DECL.asl @@ -48,9 +48,9 @@ Device (D296) { Store(ObjectType(PLDT), Local1) if (LNotEqual(Local1, 1)) { - err("", zFFF, 0x002, 0, 0, Local1, 1) + err("", zFFF, __LINE__, 0, 0, Local1, 1) } elseif (LNotEqual(1, PLDT)) { - err("", zFFF, 0x003, 0, 0, 1, PLDT) + err("", zFFF, __LINE__, 0, 0, 1, PLDT) } UnLoad(Local0) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0297_ACTIONS_REQUIRED/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0297_ACTIONS_REQUIRED/DECL.asl index fc9bce8bb..2fef08a43 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 @@ -199,131 +199,131 @@ Method(m1e4, 1, Serialized) Store(Acquire(MT00, 0xffff), Local0) if (Local0) { - err("", zFFF, 1, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT01, 0xffff), Local0) /* the same level */ if (Local0) { - err("", zFFF, 2, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(\_GL, 0xffff), Local0) /* GL */ if (Local0) { - err("", zFFF, 3, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT10, 0xffff), Local0) if (Local0) { - err("", zFFF, 4, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT11, 0xffff), Local0) if (Local0) { - err("", zFFF, 5, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT20, 0xffff), Local0) if (Local0) { - err("", zFFF, 6, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT21, 0xffff), Local0) if (Local0) { - err("", zFFF, 7, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT30, 0xffff), Local0) if (Local0) { - err("", zFFF, 8, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT31, 0xffff), Local0) if (Local0) { - err("", zFFF, 9, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT40, 0xffff), Local0) if (Local0) { - err("", zFFF, 0x00a, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT41, 0xffff), Local0) if (Local0) { - err("", zFFF, 0x00b, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT50, 0xffff), Local0) if (Local0) { - err("", zFFF, 0x00c, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT51, 0xffff), Local0) if (Local0) { - err("", zFFF, 0x00d, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT60, 0xffff), Local0) if (Local0) { - err("", zFFF, 0x00e, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT61, 0xffff), Local0) if (Local0) { - err("", zFFF, 0x00f, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT70, 0xffff), Local0) if (Local0) { - err("", zFFF, 0x010, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT71, 0xffff), Local0) if (Local0) { - err("", zFFF, 0x011, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT80, 0xffff), Local0) if (Local0) { - err("", zFFF, 0x012, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT81, 0xffff), Local0) if (Local0) { - err("", zFFF, 0x013, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT90, 0xffff), Local0) if (Local0) { - err("", zFFF, 0x014, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT91, 0xffff), Local0) if (Local0) { - err("", zFFF, 0x015, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTa0, 0xffff), Local0) if (Local0) { - err("", zFFF, 0x016, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTa1, 0xffff), Local0) if (Local0) { - err("", zFFF, 0x017, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTb0, 0xffff), Local0) if (Local0) { - err("", zFFF, 0x018, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTb1, 0xffff), Local0) if (Local0) { - err("", zFFF, 0x019, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTc0, 0xffff), Local0) if (Local0) { - err("", zFFF, 0x01a, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTc1, 0xffff), Local0) if (Local0) { - err("", zFFF, 0x01b, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTd0, 0xffff), Local0) if (Local0) { - err("", zFFF, 0x01c, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTd1, 0xffff), Local0) if (Local0) { - err("", zFFF, 0x01d, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTe0, 0xffff), Local0) if (Local0) { - err("", zFFF, 0x01e, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTe1, 0xffff), Local0) if (Local0) { - err("", zFFF, 0x01f, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTf0, 0xffff), Local0) if (Local0) { - err("", zFFF, 0x020, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } else { if (arg0) { Store(Acquire(MTf1, 0xffff), Local0) @@ -331,7 +331,7 @@ Method(m1e4, 1, Serialized) Store(0, Local0) } if (Local0) { - err("", zFFF, 0x021, 0, 0, 0, Local0) + err("", zFFF, __LINE__, 0, 0, 0, Local0) } else { if (arg0) { Release(MTF1) @@ -450,5 +450,5 @@ Method(m1e6) * report below (or try to find how to detect this situation * automatically now (for not fixed yet)): */ - err("", zFFF, 0x027, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } 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 3d4edbdd2..0106595eb 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 @@ -67,7 +67,7 @@ Method(m1e7) Add(Local0, 0x11111111, Local4) Store(Local4, Debug) if (LNotEqual(Local4, 0x11111233)) { - err("", zFFF, 0x001, 0, 0, Local4, 0x11111233) + err("", zFFF, __LINE__, 0, 0, Local4, 0x11111233) } Store("============================== 3", Debug) @@ -77,6 +77,6 @@ Method(m1e7) * The problem is not automatically detected, * so remove this error report after the problem has been resolved. */ - err("", zFFF, 0x123, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } 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 69a5d1a31..7e90f7770 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 @@ -122,7 +122,7 @@ Method(m1e8) * The problem is not automatically detected, * so remove this error report after the problem has been resolved. */ - err("", zFFF, 0x123, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0300/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0300/DECL.asl index 8873abc61..13390ea35 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0300/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0300/DECL.asl @@ -73,10 +73,10 @@ Method(m1e9) } if (LNotEqual(arg0, ii00)) { - err("", zFFF, 0x000, 0, 0, arg0, ii00) + err("", zFFF, __LINE__, 0, 0, arg0, ii00) } if (LNotEqual(arg0, Local5)) { - err("", zFFF, 0x001, 0, 0, arg0, Local5) + err("", zFFF, __LINE__, 0, 0, arg0, Local5) } } m100(0) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0302/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0302/DECL.asl index 410579379..96f0905dc 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0302/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0302/DECL.asl @@ -48,7 +48,7 @@ Method(m1eb) Method(m201) { if (LNotEqual(\_SB.i2z7, 0xabcd0007)) { - err("", zFFF, 0x000, 0, 0, \_SB.i2z7, 0xabcd0007) + err("", zFFF, __LINE__, 0, 0, \_SB.i2z7, 0xabcd0007) } } @@ -69,7 +69,7 @@ Method(m1eb) Method(m203) { if (LNotEqual(\i2z4, 0xabcd0004)) { - err("", zFFF, 0x001, 0, 0, \i2z4, 0xabcd0004) + err("", zFFF, __LINE__, 0, 0, \i2z4, 0xabcd0004) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0303/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0303/DECL.asl index 2cc1dde60..3d15d42a2 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0303/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0303/DECL.asl @@ -42,10 +42,10 @@ Method(m1ec) Name(\i4z0, 0xabcd0000) if (LNotEqual(i4z0, 0xabcd0000)) { - err("", zFFF, 0x000, 0, 0, i4z0, 0xabcd0000) + err("", zFFF, __LINE__, 0, 0, i4z0, 0xabcd0000) } if (LNotEqual(\i4z0, 0xabcd0000)) { - err("", zFFF, 0x001, 0, 0, \i4z0, 0xabcd0000) + err("", zFFF, __LINE__, 0, 0, \i4z0, 0xabcd0000) } m101() } @@ -53,10 +53,10 @@ Method(m1ec) Method(m101) { if (LNotEqual(i4z0, 0xabcd0000)) { - err("", zFFF, 0x002, 0, 0, i4z0, 0xabcd0000) + err("", zFFF, __LINE__, 0, 0, i4z0, 0xabcd0000) } if (LNotEqual(\i4z0, 0xabcd0000)) { - err("", zFFF, 0x003, 0, 0, \i4z0, 0xabcd0000) + err("", zFFF, __LINE__, 0, 0, \i4z0, 0xabcd0000) } } @@ -75,10 +75,10 @@ Method(m1ec) } if (LNotEqual(i4z1, 0xabcd0000)) { - err("", zFFF, 0x004, 0, 0, i4z1, 0xabcd0000) + err("", zFFF, __LINE__, 0, 0, i4z1, 0xabcd0000) } if (LNotEqual(\i4z1, 0xabcd0000)) { - err("", zFFF, 0x005, 0, 0, \i4z1, 0xabcd0000) + err("", zFFF, __LINE__, 0, 0, \i4z1, 0xabcd0000) } m101() } @@ -86,10 +86,10 @@ Method(m1ec) Method(m101) { if (LNotEqual(i4z1, 0xabcd0000)) { - err("", zFFF, 0x006, 0, 0, i4z1, 0xabcd0000) + err("", zFFF, __LINE__, 0, 0, i4z1, 0xabcd0000) } if (LNotEqual(\i4z1, 0xabcd0000)) { - err("", zFFF, 0x007, 0, 0, \i4z1, 0xabcd0000) + err("", zFFF, __LINE__, 0, 0, \i4z1, 0xabcd0000) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0304/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0304/DECL.asl index f6a51c74d..ae996c247 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0304/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0304/DECL.asl @@ -139,7 +139,7 @@ Method(m18a, 1, Serialized, 3) Store(DeRefOf(Index(arg2, lpC0)), Local0) Store(DeRefOf(Index(arg3, lpC0)), Local1) if (LNotEqual(Local0, Local1)) { - err("", zFFF, 0x000, 0, 0, Local0, Local1) + err("", zFFF, __LINE__, 0, 0, Local0, Local1) Store(arg0, Debug) Store(lpC0, Debug) } @@ -150,22 +150,22 @@ Method(m18a, 1, Serialized, 3) Switch (ToInteger (arg0)) { Case (1) { if (LNotEqual(ind1, n100)) { - err("", zFFF, 0x001, 0, 0, ind1, n100) + err("", zFFF, __LINE__, 0, 0, ind1, n100) } } Case (2) { if (LNotEqual(ind2, n200)) { - err("", zFFF, 0x002, 0, 0, ind2, n200) + err("", zFFF, __LINE__, 0, 0, ind2, n200) } } Case (3) { if (LNotEqual(ind3, n300)) { - err("", zFFF, 0x003, 0, 0, ind3, n300) + err("", zFFF, __LINE__, 0, 0, ind3, n300) } } Case (4) { if (LNotEqual(ind4, n400)) { - err("", zFFF, 0x004, 0, 0, ind4, n400) + err("", zFFF, __LINE__, 0, 0, ind4, n400) } } } @@ -203,7 +203,7 @@ Method(m18a, 1, Serialized, 3) Add(cnt1, Local0, cnt1) Store(DerefOf(Index(p100, Local1)), Local1) if (LNotEqual(Local1, Local0)) { - err("", zFFF, 0x005, 0, 0, Local1, Local0) + err("", zFFF, __LINE__, 0, 0, Local1, Local0) } } Method(m200, 0, Serialized, 0) @@ -222,7 +222,7 @@ Method(m18a, 1, Serialized, 3) Add(cnt1, Local0, cnt1) Store(DerefOf(Index(p200, Local1)), Local1) if (LNotEqual(Local1, Local0)) { - err("", zFFF, 0x006, 0, 0, Local1, Local0) + err("", zFFF, __LINE__, 0, 0, Local1, Local0) } } Method(m300, 0, Serialized, 0) @@ -247,7 +247,7 @@ Method(m18a, 1, Serialized, 3) Add(cnt1, Local0, cnt1) Store(DerefOf(Index(p300, Local1)), Local1) if (LNotEqual(Local1, Local0)) { - err("", zFFF, 0x007, 0, 0, Local1, Local0) + err("", zFFF, __LINE__, 0, 0, Local1, Local0) } } Method(m400, 0, Serialized, 0) @@ -265,7 +265,7 @@ Method(m18a, 1, Serialized, 3) Add(cnt1, Local0, cnt1) Store(DerefOf(Index(p400, Local1)), Local1) if (LNotEqual(Local1, Local0)) { - err("", zFFF, 0x008, 0, 0, Local1, Local0) + err("", zFFF, __LINE__, 0, 0, Local1, Local0) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0305/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0305/DECL.asl index d574735ca..9518c1afa 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0305/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0305/DECL.asl @@ -50,7 +50,7 @@ Method(mff2) Store("==================== 1", Debug) if (LNotEqual(Local0, 0xabcd0003)) { - err("", zFFF, 0x000, 0, 0, Local0, 0xabcd0003) + err("", zFFF, __LINE__, 0, 0, Local0, 0xabcd0003) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0306/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0306/DECL.asl index dbb42a0fc..9e483255e 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0306/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0306/DECL.asl @@ -47,13 +47,13 @@ Method(mff3) Store("87654321", Local0) if (LNotEqual(ObjectType(Local0), 2)) { - err("", zFFF, 0x001, 0, 0, ObjectType(Local0), 2) + err("", zFFF, __LINE__, 0, 0, ObjectType(Local0), 2) } m000(Refof(Local1)) if (LNotEqual(ObjectType(Local1), 2)) { - err("", zFFF, 0x002, 0, 0, ObjectType(Local1), 2) + err("", zFFF, __LINE__, 0, 0, ObjectType(Local1), 2) } Store(Refof(Local2), Local3) @@ -63,7 +63,7 @@ Method(mff3) Store("87654321", DeRefof(Local4)) if (LNotEqual(ObjectType(Local2), 2)) { - err("", zFFF, 0x003, 0, 0, ObjectType(Local2), 2) + err("", zFFF, __LINE__, 0, 0, ObjectType(Local2), 2) } CH03("", 0, 0x004, 0, 0) 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 0dbc488b1..02a65856b 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/common/proc.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/common/proc.asl @@ -74,7 +74,7 @@ Method(md6a, 7, Serialized) Store(DerefOf(Index(arg0, lpC0)), Local0) TRC1(arg0, lpC0, Local0) if (LNotEqual(Local0, lpC0)) { - err("", zFFF, 0x000, 0, 0, Local0, lpC0) + err("", zFFF, __LINE__, 0, 0, Local0, lpC0) } Decrement(lpN0) Increment(lpC0) @@ -86,7 +86,7 @@ Method(md6a, 7, Serialized) Store(DerefOf(Index(arg0, 0)), Local0) TRC1(arg0, 0, Local0) if (LNotEqual(Local0, 0)) { - err("", zFFF, 0x001, 0, 0, Local0, 0) + err("", zFFF, __LINE__, 0, 0, Local0, 0) } // Last pre-initialized element @@ -94,7 +94,7 @@ Method(md6a, 7, Serialized) Store(DerefOf(Index(arg0, Local0)), Local1) TRC1(arg0, Local0, Local1) if (LNotEqual(Local1, Local0)) { - err("", zFFF, 0x002, 0, 0, Local1, Local0) + err("", zFFF, __LINE__, 0, 0, Local1, Local0) } // Middle pre-initialized element @@ -102,7 +102,7 @@ Method(md6a, 7, Serialized) Store(DerefOf(Index(arg0, Local0)), Local1) TRC1(arg0, Local0, Local1) if (LNotEqual(Local1, Local0)) { - err("", zFFF, 0x003, 0, 0, Local1, Local0) + err("", zFFF, __LINE__, 0, 0, Local1, Local0) } } @@ -119,7 +119,7 @@ Method(md6a, 7, Serialized) Store(DerefOf(Index(arg0, lpC0)), Local0) TRC1(arg0, lpC0, Local0) if (LNotEqual(Local0, lpC0)) { - err("", zFFF, 0x004, 0, 0, Local0, lpC0) + err("", zFFF, __LINE__, 0, 0, Local0, lpC0) } Decrement(lpN0) Increment(lpC0) @@ -131,7 +131,7 @@ Method(md6a, 7, Serialized) Store(DerefOf(Index(arg0, arg3)), Local0) TRC1(arg0, arg3, Local0) if (LNotEqual(Local0, arg3)) { - err("", zFFF, 0x005, 0, 0, Local0, arg3) + err("", zFFF, __LINE__, 0, 0, Local0, arg3) } // Last written element @@ -140,7 +140,7 @@ Method(md6a, 7, Serialized) Store(DerefOf(Index(arg0, Local0)), Local1) TRC1(arg0, Local0, Local1) if (LNotEqual(Local1, Local0)) { - err("", zFFF, 0x006, 0, 0, Local1, Local0) + err("", zFFF, __LINE__, 0, 0, Local1, Local0) } // Middle written element @@ -149,7 +149,7 @@ Method(md6a, 7, Serialized) Store(DerefOf(Index(arg0, Local0)), Local1) TRC1(arg0, Local0, Local1) if (LNotEqual(Local1, Local0)) { - err("", zFFF, 0x007, 0, 0, Local1, Local0) + err("", zFFF, __LINE__, 0, 0, Local1, Local0) } } @@ -284,7 +284,7 @@ Method(md6b, 6) Store(DerefOf(Index(arg0, arg5)), Local0) TRC1(arg0, arg5, Local0) if (LNotEqual(Local0, arg5)) { - err("", zFFF, 0x008, 0, 0, Local0, arg5) + err("", zFFF, __LINE__, 0, 0, Local0, arg5) } CH03("", 0, 0x113, 0, 0) @@ -360,11 +360,11 @@ Method(mf88, 6) Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, arg1)) { - err("", zFFF, arg3, 0, 0, Local0, arg1) + err("", zFFF, __LINE__, 0, 0, Local0, arg1) } if (arg5) { if (LNotEqual(arg0, arg2)) { - err("", zFFF, arg4, 0, 0, arg0, arg2) + err("", zFFF, __LINE__, 0, 0, arg0, arg2) } } } @@ -373,5 +373,5 @@ Method(m02a) { Store("Check the error manually and remove call to m02a() when the bug is fixed.", Debug) - err("", zFFF, 0x800, 0, 0, 0, 0) + err("", zFFF, __LINE__, 0, 0, 0, 0) } diff --git a/tests/aslts/src/runtime/collections/complex/misc/misc.asl b/tests/aslts/src/runtime/collections/complex/misc/misc.asl index 8b92c1b5e..fb65a94e2 100644 --- a/tests/aslts/src/runtime/collections/complex/misc/misc.asl +++ b/tests/aslts/src/runtime/collections/complex/misc/misc.asl @@ -56,7 +56,7 @@ Method(m110, 1, Serialized) } if (LNotEqual(Local0, 1)) { - err(arg0, z054, 0, 0, 0, Local0, 0) + err(arg0, z054, __LINE__, 0, 0, Local0, 0) } } @@ -71,13 +71,13 @@ Method(m112, 1) Store(0, Local0) m111(Local0) if (LNotequal(Local0, 0)) { - err(arg0, z054, 1, 0, 0, Local0, 0) + err(arg0, z054, __LINE__, 0, 0, Local0, 0) } Store(0, Local0) Store(Concatenate("qwertyuiop", Local0), Local5) if (LNotequal(Local0, 0)) { - err(arg0, z054, 2, 0, 0, Local0, 0) + err(arg0, z054, __LINE__, 0, 0, Local0, 0) } } @@ -93,7 +93,7 @@ Method(m113, 1, Serialized) Store(ObjectType(RefOf(f000)), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z054, 3, 0, 0, Local0, 0) + err(arg0, z054, __LINE__, 0, 0, Local0, 0) } } @@ -120,35 +120,35 @@ Method(m114, 1, Serialized) Store(0, bnk0) if (LNotEqual(bnk0, 0)) { - err(arg0, z054, 4, 0, 0, bnk0, 0) + err(arg0, z054, __LINE__, 0, 0, bnk0, 0) } Store(0x87, bf00) if (LNotEqual(bnk0, 0)) { - err(arg0, z054, 5, 0, 0, bnk0, 0) + err(arg0, z054, __LINE__, 0, 0, bnk0, 0) } if (LNotEqual(bf00, 0x87)) { - err(arg0, z054, 6, 0, 0, bf00, 0x87) + err(arg0, z054, __LINE__, 0, 0, bf00, 0x87) } // Deal with 1-th bank layout: Store(1, bnk0) if (LNotEqual(bnk0, 1)) { - err(arg0, z054, 7, 0, 0, bnk0, 1) + err(arg0, z054, __LINE__, 0, 0, bnk0, 1) } Store(0x96, bf01) if (X192) { if (LNotEqual(bnk0, 1)) { - err(arg0, z054, 8, 0, 0, bnk0, 1) + err(arg0, z054, __LINE__, 0, 0, bnk0, 1) } } if (LNotEqual(bf01, 0x96)) { - err(arg0, z054, 9, 0, 0, bf01, 0x96) + err(arg0, z054, __LINE__, 0, 0, bf01, 0x96) } } @@ -159,7 +159,7 @@ Method(m115, 1) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c00b)) { - err(arg0, z054, 9, 0, 0, Local1, 0) + err(arg0, z054, __LINE__, 0, 0, Local1, 0) } ToBuffer(Local0, Local2) @@ -169,7 +169,7 @@ Method(m115, 1) Store(ObjectType(Local0), Local3) if (LNotEqual(Local3, c00b)) { - err(arg0, z054, 10, 0, 0, Local3, 0) + err(arg0, z054, __LINE__, 0, 0, Local3, 0) } } @@ -198,7 +198,7 @@ Method(m117, 2, Serialized) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, 0)) { - err(arg0, z054, 11, 0, 0, Local1, 0) + err(arg0, z054, __LINE__, 0, 0, Local1, 0) } CH03(ts, z054, 0x101, 0, 0) @@ -230,7 +230,7 @@ Method(m119, 1, Serialized) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, 3)) { - err(arg0, z054, 12, 0, 0, Local2, 0) + err(arg0, z054, __LINE__, 0, 0, Local2, 0) } Store("================ 2:", Debug) @@ -273,7 +273,7 @@ Method(m11a, 1) Store(Local3, Debug) if (LNotEqual(Local3, 3)) { - err(arg0, z054, 13, 0, 0, Local3, 3) + err(arg0, z054, __LINE__, 0, 0, Local3, 3) } // 1 @@ -283,7 +283,7 @@ Method(m11a, 1) Store(Local3, Debug) if (LNotEqual(Local3, 9)) { - err(arg0, z054, 14, 0, 0, Local3, 9) + err(arg0, z054, __LINE__, 0, 0, Local3, 9) } // 2 @@ -293,7 +293,7 @@ Method(m11a, 1) Store(Local3, Debug) if (LNotEqual(Local3, 6)) { - err(arg0, z054, 15, 0, 0, Local3, 6) + err(arg0, z054, __LINE__, 0, 0, Local3, 6) } Store(SizeOf(p000), Local0) @@ -301,7 +301,7 @@ Method(m11a, 1) Store(Local0, Debug) if (LNotEqual(Local0, 3)) { - err(arg0, z054, 16, 0, 0, Local0, 3) + err(arg0, z054, __LINE__, 0, 0, Local0, 3) } } */ @@ -318,11 +318,11 @@ Method(m11b, 1) Store(DeRefOf(Index(p000, 0)), Local7) if (LEqual(b000, Local7)) { - err(arg0, z054, 17, 0, 0, b000, Local7) + err(arg0, z054, __LINE__, 0, 0, b000, Local7) } if (LEqual(Local7, b000)) { - err(arg0, z054, 18, 0, 0, Local7, b000) + err(arg0, z054, __LINE__, 0, 0, Local7, b000) } return (0) @@ -356,7 +356,7 @@ Method(m11d, 1) { // ASL-compiler report Warning in this case // Store("ERROR 0: m121, after Return !!!", Debug) } - err(arg0, z054, 19, 0, 0, 0, 0) + err(arg0, z054, __LINE__, 0, 0, 0, 0) return (0x5678) } @@ -370,10 +370,10 @@ Method(m11d, 1) { // ASL-compiler DOESN'T report Warning in this case!!! // And the Store operator below is actually processed!!! - err(arg0, z054, 20, 0, 0, 0, 0) + err(arg0, z054, __LINE__, 0, 0, 0, 0) } - err(arg0, z054, 21, 0, 0, 0, 0) + err(arg0, z054, __LINE__, 0, 0, 0, 0) return } @@ -405,13 +405,13 @@ Method(m11e, 1, Serialized) { * * if (LNotEqual(Sizeof(buf0), 3)) { * // Error: length of the buffer not reduced to the stored string - * err(arg0, z054, 22, 0, 0, 0, 0) + * err(arg0, z054, __LINE__, 0, 0, 0, 0) * } * * New: */ if (LNotEqual(buf0, Buffer(){0x01, 0x02, 0, 0})) { - err(arg0, z054, 22, 0, 0, buf0, Buffer(){0x01, 0x02, 0, 0}) + err(arg0, z054, __LINE__, 0, 0, buf0, Buffer(){0x01, 0x02, 0, 0}) } return (0) } @@ -438,12 +438,12 @@ Method(m11f, 1, Serialized) { { Store(ObjectType(arg1), Local0) if (LNotEqual(Local0, arg2)) { - err(arg0, z054, 23, 0, 0, Local0, arg2) + err(arg0, z054, __LINE__, 0, 0, Local0, arg2) } Store(SizeOf(arg1), Local0) if (LNotEqual(Local0, arg3)) { - err(arg0, z054, 24, 0, 0, Local0, arg3) + err(arg0, z054, __LINE__, 0, 0, Local0, arg3) } } @@ -451,27 +451,27 @@ Method(m11f, 1, Serialized) { { Store(ObjectType(bf00), Local0) if (LNotEqual(Local0, 14)) { - err(arg0, z054, 25, 0, 0, Local0, 14) + err(arg0, z054, __LINE__, 0, 0, Local0, 14) } Store(ObjectType(bf01), Local0) if (LNotEqual(Local0, 14)) { - err(arg0, z054, 26, 0, 0, Local0, 14) + err(arg0, z054, __LINE__, 0, 0, Local0, 14) } Store(ObjectType(bf02), Local0) if (LNotEqual(Local0, 14)) { - err(arg0, z054, 27, 0, 0, Local0, 14) + err(arg0, z054, __LINE__, 0, 0, Local0, 14) } Store(ObjectType(bf03), Local0) if (LNotEqual(Local0, 14)) { - err(arg0, z054, 28, 0, 0, Local0, 14) + err(arg0, z054, __LINE__, 0, 0, Local0, 14) } Store(ObjectType(bf04), Local0) if (LNotEqual(Local0, 14)) { - err(arg0, z054, 29, 0, 0, Local0, 14) + err(arg0, z054, __LINE__, 0, 0, Local0, 14) } Store(ObjectType(bf05), Local0) if (LNotEqual(Local0, 14)) { - err(arg0, z054, 30, 0, 0, Local0, 14) + err(arg0, z054, __LINE__, 0, 0, Local0, 14) } if (F64) { @@ -517,12 +517,12 @@ Method(m120, 1, Serialized) { { Store(ObjectType(arg1), Local0) if (LNotEqual(Local0, arg2)) { - err(arg0, z054, 31, 0, 0, Local0, arg2) + err(arg0, z054, __LINE__, 0, 0, Local0, arg2) } Store(SizeOf(arg1), Local0) if (LNotEqual(Local0, arg3)) { - err(arg0, z054, 32, 0, 0, Local0, arg3) + err(arg0, z054, __LINE__, 0, 0, Local0, arg3) } } @@ -530,27 +530,27 @@ Method(m120, 1, Serialized) { { Store(ObjectType(f000), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z054, 33, 0, 0, Local0, 5) + err(arg0, z054, __LINE__, 0, 0, Local0, 5) } Store(ObjectType(f001), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z054, 34, 0, 0, Local0, 5) + err(arg0, z054, __LINE__, 0, 0, Local0, 5) } Store(ObjectType(f002), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z054, 35, 0, 0, Local0, 5) + err(arg0, z054, __LINE__, 0, 0, Local0, 5) } Store(ObjectType(f003), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z054, 36, 0, 0, Local0, 5) + err(arg0, z054, __LINE__, 0, 0, Local0, 5) } Store(ObjectType(f004), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z054, 37, 0, 0, Local0, 5) + err(arg0, z054, __LINE__, 0, 0, Local0, 5) } Store(ObjectType(f005), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z054, 38, 0, 0, Local0, 5) + err(arg0, z054, __LINE__, 0, 0, Local0, 5) } if (F64) { @@ -614,12 +614,12 @@ Method(m121, 1, Serialized) { Store(m000(arg1), Local1) Store(ObjectType(Local1), Local0) if (LNotEqual(Local0, arg2)) { - err(arg0, z054, 39, 0, 0, Local0, arg2) + err(arg0, z054, __LINE__, 0, 0, Local0, arg2) } Store(SizeOf(Local1), Local0) if (LNotEqual(Local0, arg3)) { - err(arg0, z054, 40, 0, 0, Local0, arg3) + err(arg0, z054, __LINE__, 0, 0, Local0, arg3) } } @@ -687,12 +687,12 @@ Method(m122, 1, Serialized) { Store(m000(arg1), Local1) Store(ObjectType(Local1), Local0) if (LNotEqual(Local0, arg2)) { - err(arg0, z054, 41, 0, 0, Local0, arg2) + err(arg0, z054, __LINE__, 0, 0, Local0, arg2) } Store(SizeOf(Local1), Local0) if (LNotEqual(Local0, arg3)) { - err(arg0, z054, 42, 0, 0, Local0, arg3) + err(arg0, z054, __LINE__, 0, 0, Local0, arg3) } } @@ -795,7 +795,7 @@ Method(m124, 1) Store(ObjectType(m000), Local0) if (LNotEqual(Local0, c010)) { - err(arg0, z054, 43, 0, 0, Local0, c010) + err(arg0, z054, __LINE__, 0, 0, Local0, c010) } // Bug 81. @@ -807,12 +807,12 @@ Method(m124, 1) //Store(ObjectType(m000()), Local0) //if (LNotEqual(Local0, c009)) { - // err(arg0, z054, 44, 0, 0, Local0, c009) + // err(arg0, z054, __LINE__, 0, 0, Local0, c009) //} // //Store(ObjectType(m001(123)), Local1) //if (LNotEqual(Local1, c009)) { - // err(arg0, z054, 45, 0, 0, Local1, c009) + // err(arg0, z054, __LINE__, 0, 0, Local1, c009) //} // //CH03(arg0, z054, 0x106, 0, 0) @@ -838,10 +838,10 @@ Method(m125, 1) Store(0x61, Index(Local0, 3)) if (LNotEqual(Local0, "Strang")) { - err(arg0, z054, 46, 0, 0, Local0, "Strang") + err(arg0, z054, __LINE__, 0, 0, Local0, "Strang") } if (LNotEqual(s000, "String")) { - err(arg0, z054, 47, 0, 0, s000, "String") + err(arg0, z054, __LINE__, 0, 0, s000, "String") } } @@ -854,10 +854,10 @@ Method(m125, 1) Store(0x61, Index(Local0, 3)) if (LNotEqual(Local0, Buffer(){0xa0, 0xa1, 0xa2, 0x61, 0xa4, 0xa5})) { - err(arg0, z054, 48, 0, 0, Local0, Buffer(){0xa0, 0xa1, 0xa2, 0x61, 0xa4, 0xa5}) + err(arg0, z054, __LINE__, 0, 0, Local0, Buffer(){0xa0, 0xa1, 0xa2, 0x61, 0xa4, 0xa5}) } if (LNotEqual(b000, Buffer(){0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5})) { - err(arg0, z054, 49, 0, 0, b000, Buffer(){0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5}) + err(arg0, z054, __LINE__, 0, 0, b000, Buffer(){0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5}) } } @@ -870,41 +870,41 @@ Method(m125, 1) Store(0x61, Index(Local0, 3)) if (LNotEqual(Derefof(Index(Local0, 0)), 0xfff0)) { - err(arg0, z054, 50, 0, 0, Derefof(Index(Local0, 0)), 0xfff0) + err(arg0, z054, __LINE__, 0, 0, Derefof(Index(Local0, 0)), 0xfff0) } if (LNotEqual(Derefof(Index(Local0, 1)), 0xfff1)) { - err(arg0, z054, 51, 0, 0, Derefof(Index(Local0, 1)), 0xfff1) + err(arg0, z054, __LINE__, 0, 0, Derefof(Index(Local0, 1)), 0xfff1) } if (LNotEqual(Derefof(Index(Local0, 2)), 0xfff2)) { - err(arg0, z054, 52, 0, 0, Derefof(Index(Local0, 2)), 0xfff2) + err(arg0, z054, __LINE__, 0, 0, Derefof(Index(Local0, 2)), 0xfff2) } if (LNotEqual(Derefof(Index(Local0, 3)), 0x61)) { - err(arg0, z054, 53, 0, 0, Derefof(Index(Local0, 3)), 0x61) + err(arg0, z054, __LINE__, 0, 0, Derefof(Index(Local0, 3)), 0x61) } if (LNotEqual(Derefof(Index(Local0, 4)), 0xfff4)) { - err(arg0, z054, 54, 0, 0, Derefof(Index(Local0, 4)), 0xfff4) + err(arg0, z054, __LINE__, 0, 0, Derefof(Index(Local0, 4)), 0xfff4) } if (LNotEqual(Derefof(Index(Local0, 5)), 0xfff5)) { - err(arg0, z054, 55, 0, 0, Derefof(Index(Local0, 5)), 0xfff5) + err(arg0, z054, __LINE__, 0, 0, Derefof(Index(Local0, 5)), 0xfff5) } if (LNotEqual(Derefof(Index(p000, 0)), 0xfff0)) { - err(arg0, z054, 56, 0, 0, Derefof(Index(p000, 0)), 0xfff0) + err(arg0, z054, __LINE__, 0, 0, Derefof(Index(p000, 0)), 0xfff0) } if (LNotEqual(Derefof(Index(p000, 1)), 0xfff1)) { - err(arg0, z054, 57, 0, 0, Derefof(Index(p000, 1)), 0xfff1) + err(arg0, z054, __LINE__, 0, 0, Derefof(Index(p000, 1)), 0xfff1) } if (LNotEqual(Derefof(Index(p000, 2)), 0xfff2)) { - err(arg0, z054, 58, 0, 0, Derefof(Index(p000, 2)), 0xfff2) + err(arg0, z054, __LINE__, 0, 0, Derefof(Index(p000, 2)), 0xfff2) } if (LNotEqual(Derefof(Index(p000, 3)), 0xfff3)) { - err(arg0, z054, 59, 0, 0, Derefof(Index(p000, 3)), 0xfff3) + err(arg0, z054, __LINE__, 0, 0, Derefof(Index(p000, 3)), 0xfff3) } if (LNotEqual(Derefof(Index(p000, 4)), 0xfff4)) { - err(arg0, z054, 60, 0, 0, Derefof(Index(p000, 4)), 0xfff4) + err(arg0, z054, __LINE__, 0, 0, Derefof(Index(p000, 4)), 0xfff4) } if (LNotEqual(Derefof(Index(p000, 5)), 0xfff5)) { - err(arg0, z054, 61, 0, 0, Derefof(Index(p000, 5)), 0xfff5) + err(arg0, z054, __LINE__, 0, 0, Derefof(Index(p000, 5)), 0xfff5) } } @@ -1002,7 +1002,7 @@ Method(mf75, 1) * Method(mf76, 1) * { * if (LNotEqual(arg0, "Strang")) { - * err(arg0, z054, 72, 0, 0, arg0, "Strang") + * err(arg0, z054, __LINE__, 0, 0, arg0, "Strang") * } * } * @@ -1020,7 +1020,7 @@ Method(mf75, 1) * * mf76(p000) * if (LNotEqual(s000, "String")) { - * err(arg0, z054, 73, 0, 0, s000, "String") + * err(arg0, z054, __LINE__, 0, 0, s000, "String") * } * } */ @@ -1033,7 +1033,7 @@ Method(mf86, 1) Store("0x0x12345678", Local1) ToInteger(Local1, Local0) if (LNotEqual(Local0, 0)) { - err(arg0, z054, 75, 0, 0, Local0, 0) + err(arg0, z054, __LINE__, 0, 0, Local0, 0) } CH04("mf86", 0, 0xff, z054, 2, 0, 0) @@ -1045,14 +1045,14 @@ Method(mf87, 1) Add("0x0xabcdef", 0x10234, Local0) if (LNotEqual(Local0, 0x10234)) { - err(arg0, z054, 77, 0, 0, Local0, 0x10234) + err(arg0, z054, __LINE__, 0, 0, Local0, 0x10234) } CH03("mf87", z054, 1, 0, 0) Add(0x10234, "0x0xabcdef", Local0) if (LNotEqual(Local0, 0x10234)) { - err(arg0, z054, 78, 0, 0, Local0, 0x10234) + err(arg0, z054, __LINE__, 0, 0, Local0, 0x10234) } CH03("mf87", z054, 2, 0, 0) @@ -1079,7 +1079,7 @@ Method(m15b,, Serialized) { Store(mm00, Local0) if (LNotEqual(Local0, 0xabcd0000)) { - err(ts, z054, 0x000, 0, 0, Local0, 0xabcd0000) + err(ts, z054, __LINE__, 0, 0, Local0, 0xabcd0000) } } @@ -1091,7 +1091,7 @@ Method(m15b,, Serialized) CH03(ts, z054, 0x002, 0, 0) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c010)) { - err(ts, z054, 0x003, 0, 0, Local1, c010) + err(ts, z054, __LINE__, 0, 0, Local1, c010) } } else { CH04(ts, 0, 47, z054, 0x004, 0, 0) // AE_AML_OPERAND_TYPE @@ -1106,7 +1106,7 @@ Method(m15b,, Serialized) CH03(ts, z054, 0x006, 0, 0) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c010)) { - err(ts, z054, 0x007, 0, 0, Local1, c010) + err(ts, z054, __LINE__, 0, 0, Local1, c010) } } else { CH04(ts, 0, 47, z054, 0x008, 0, 0) // AE_AML_OPERAND_TYPE @@ -1122,7 +1122,7 @@ Method(m15b,, Serialized) // CH03(ts, z054, 0x00a, 0, 0) // Store(ObjectType(Local0), Local1) // if (LNotEqual(Local1, c010)) { -// err(ts, z054, 0x00b, 0, 0, Local1, c010) +// err(ts, z054, __LINE__, 0, 0, Local1, c010) // } // } else { // CH04(ts, 0, 47, z054, 0x00c, 0, 0) // AE_AML_OPERAND_TYPE @@ -1135,7 +1135,7 @@ Method(m15b,, Serialized) { CopyObject(mm00, Local0) if (LNotEqual(Local0, 0xabcd0000)) { - err(ts, z054, 0x00d, 0, 0, Local0, 0xabcd0000) + err(ts, z054, __LINE__, 0, 0, Local0, 0xabcd0000) } } @@ -1147,7 +1147,7 @@ Method(m15b,, Serialized) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c010)) { - err(ts, z054, 0x010, 0, 0, Local1, c010) + err(ts, z054, __LINE__, 0, 0, Local1, c010) } } @@ -1159,7 +1159,7 @@ Method(m15b,, Serialized) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c010)) { - err(ts, z054, 0x013, 0, 0, Local1, c010) + err(ts, z054, __LINE__, 0, 0, Local1, c010) } } @@ -1173,7 +1173,7 @@ Method(m15b,, Serialized) // // Store(ObjectType(Local0), Local1) // if (LNotEqual(Local1, c010)) { -// err(ts, z054, 0x016, 0, 0, Local1, c010) +// err(ts, z054, __LINE__, 0, 0, Local1, c010) // } } @@ -1183,7 +1183,7 @@ Method(m15b,, Serialized) { Add(mm00, 1, Local0) if (LNotEqual(Local0, 0xabcd0001)) { - err(ts, z054, 0x017, 0, 0, Local0, 0xabcd0001) + err(ts, z054, __LINE__, 0, 0, Local0, 0xabcd0001) } } @@ -1216,7 +1216,7 @@ Method(m15b,, Serialized) { Store(ObjectType(mm00), Local0) if (LNotEqual(Local0, c010)) { - err(ts, z054, 0x01e, 0, 0, Local0, c010) + err(ts, z054, __LINE__, 0, 0, Local0, c010) } } @@ -1224,7 +1224,7 @@ Method(m15b,, Serialized) { Store(ObjectType(DerefOf(RefOf(mm00))), Local0) if (LNotEqual(Local0, c010)) { - err(ts, z054, 0x01f, 0, 0, Local0, c010) + err(ts, z054, __LINE__, 0, 0, Local0, c010) } } @@ -1232,7 +1232,7 @@ Method(m15b,, Serialized) { Store(ObjectType(DerefOf(Index(p000, 1))), Local0) if (LNotEqual(Local0, c010)) { - err(ts, z054, 0x020, 0, 0, Local0, c010) + err(ts, z054, __LINE__, 0, 0, Local0, c010) } } @@ -1242,7 +1242,7 @@ Method(m15b,, Serialized) // Store(ObjectType(DerefOf("mm00")), Local0) // if (LNotEqual(Local0, c010)) { -// err(ts, z054, 0x021, 0, 0, Local0, c010) +// err(ts, z054, __LINE__, 0, 0, Local0, c010) // } } diff --git a/tests/aslts/src/runtime/collections/complex/namespace/fullpath.asl b/tests/aslts/src/runtime/collections/complex/namespace/fullpath.asl index ef6775683..74cca255e 100644 --- a/tests/aslts/src/runtime/collections/complex/namespace/fullpath.asl +++ b/tests/aslts/src/runtime/collections/complex/namespace/fullpath.asl @@ -45,10 +45,10 @@ Method(fp00,, Serialized) Name(\i4z0, 0xabcd0000) if (LNotEqual(i4z0, 0xabcd0000)) { - err(ts, z179, 0x000, 0, 0, i4z0, 0xabcd0000) + err(ts, z179, __LINE__, 0, 0, i4z0, 0xabcd0000) } if (LNotEqual(\i4z0, 0xabcd0000)) { - err(ts, z179, 0x001, 0, 0, \i4z0, 0xabcd0000) + err(ts, z179, __LINE__, 0, 0, \i4z0, 0xabcd0000) } m001() } @@ -56,10 +56,10 @@ Method(fp00,, Serialized) Method(m001) { if (LNotEqual(i4z0, 0xabcd0000)) { - err(ts, z179, 0x002, 0, 0, i4z0, 0xabcd0000) + err(ts, z179, __LINE__, 0, 0, i4z0, 0xabcd0000) } if (LNotEqual(\i4z0, 0xabcd0000)) { - err(ts, z179, 0x003, 0, 0, \i4z0, 0xabcd0000) + err(ts, z179, __LINE__, 0, 0, \i4z0, 0xabcd0000) } } @@ -79,10 +79,10 @@ Method(fp01,, Serialized) } if (LNotEqual(i4z1, 0xabcd0000)) { - err(ts, z179, 0x000, 0, 0, i4z1, 0xabcd0000) + err(ts, z179, __LINE__, 0, 0, i4z1, 0xabcd0000) } if (LNotEqual(\i4z1, 0xabcd0000)) { - err(ts, z179, 0x001, 0, 0, \i4z1, 0xabcd0000) + err(ts, z179, __LINE__, 0, 0, \i4z1, 0xabcd0000) } m001() } @@ -90,10 +90,10 @@ Method(fp01,, Serialized) Method(m001) { if (LNotEqual(i4z1, 0xabcd0000)) { - err(ts, z179, 0x002, 0, 0, i4z1, 0xabcd0000) + err(ts, z179, __LINE__, 0, 0, i4z1, 0xabcd0000) } if (LNotEqual(\i4z1, 0xabcd0000)) { - err(ts, z179, 0x003, 0, 0, \i4z1, 0xabcd0000) + err(ts, z179, __LINE__, 0, 0, \i4z1, 0xabcd0000) } } diff --git a/tests/aslts/src/runtime/collections/complex/namespace/ns0.asl b/tests/aslts/src/runtime/collections/complex/namespace/ns0.asl index 7a0f289b2..2720543ee 100644 --- a/tests/aslts/src/runtime/collections/complex/namespace/ns0.asl +++ b/tests/aslts/src/runtime/collections/complex/namespace/ns0.asl @@ -74,7 +74,7 @@ Method(m000, 1, Serialized) } Store(Add(i000, m001()), Local0) if (LNotEqual(Local0, 0xabcd0003)) { - err(ts, z154, 0x001, 0, 0, Local0, 0xabcd0003) + err(ts, z154, __LINE__, 0, 0, Local0, 0xabcd0003) } Store(Local0, Debug) @@ -136,11 +136,11 @@ Method(m001, 1, Serialized) Store(Add(i000, m001()), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z154, 0x003, 0, 0, Local0, 0x87654321) + err(ts, z154, __LINE__, 0, 0, Local0, 0x87654321) } if (LNotEqual(i000, 0x80000000)) { - err(ts, z154, 0x004, 0, 0, i000, 0x80000000) + err(ts, z154, __LINE__, 0, 0, i000, 0x80000000) } CH03(ts, z154, 0x005, 0, 0) @@ -165,11 +165,11 @@ Method(m002,, Serialized) Store(Add(i000, m001()), Local0) if (LNotEqual(Local0, 0x065013BA)) { - err(ts, z154, 0x006, 0, 0, Local0, 0x065013BA) + err(ts, z154, __LINE__, 0, 0, Local0, 0x065013BA) } if (LNotEqual(i000, 0x00100064)) { - err(ts, z154, 0x007, 0, 0, i000, 0x00100064) + err(ts, z154, __LINE__, 0, 0, i000, 0x00100064) } CH03(ts, z154, 0x008, 0, 0) @@ -193,11 +193,11 @@ Method(m003,, Serialized) Store(Add(i000, m001()), Local0) if (LNotEqual(Local0, 0x065013BA)) { - err(ts, z154, 0x009, 0, 0, Local0, 0x065013BA) + err(ts, z154, __LINE__, 0, 0, Local0, 0x065013BA) } if (LNotEqual(i000, 0x00100064)) { - err(ts, z154, 0x00a, 0, 0, i000, 0x00100064) + err(ts, z154, __LINE__, 0, 0, i000, 0x00100064) } CH03(ts, z154, 0x00b, 0, 0) @@ -262,11 +262,11 @@ Method(m004, 1, Serialized) Store(Add(Local7, m001()), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z154, 0x00c, 0, 0, Local0, 0x87654321) + err(ts, z154, __LINE__, 0, 0, Local0, 0x87654321) } if (LNotEqual(Local7, 1)) { - err(ts, z154, 0x00d, 0, 0, Local7, 1) + err(ts, z154, __LINE__, 0, 0, Local7, 1) } CH03(ts, z154, 0x00e, 0, 0) @@ -331,11 +331,11 @@ Method(m005, 2, Serialized) Store(Add(arg1, m001()), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z154, 0x00f, 0, 0, Local0, 0x87654321) + err(ts, z154, __LINE__, 0, 0, Local0, 0x87654321) } if (LNotEqual(arg1, 1)) { - err(ts, z154, 0x010, 0, 0, arg1, 1) + err(ts, z154, __LINE__, 0, 0, arg1, 1) } CH03(ts, z154, 0x011, 0, 0) 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 b4c0f05cd..e5299ab7c 100644 --- a/tests/aslts/src/runtime/collections/complex/namespace/ns0_root.asl +++ b/tests/aslts/src/runtime/collections/complex/namespace/ns0_root.asl @@ -96,10 +96,10 @@ Method(m006, 1, Serialized) if (FLG9) { CH03(ts, z154, 0x014, 0, 0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z154, 0x012, 0, 0, Local0, 0x87654321) + err(ts, z154, __LINE__, 0, 0, Local0, 0x87654321) } if (LNotEqual(d000.i000, 0x80000000)) { - err(ts, z154, 0x013, 0, 0, d000.i000, 0x80000000) + err(ts, z154, __LINE__, 0, 0, d000.i000, 0x80000000) } } else { CH04(ts, 1, 5, z154, 0x014, 0, 0) // AE_NOT_FOUND @@ -171,10 +171,10 @@ Method(m007, 1, Serialized) if (FLG9) { CH03(ts, z154, 0x014, 0, 0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z154, 0x015, 0, 0, Local0, 0x87654321) + err(ts, z154, __LINE__, 0, 0, Local0, 0x87654321) } if (LNotEqual(tz00.i000, 0x80000000)) { - err(ts, z154, 0x016, 0, 0, tz00.i000, 0x80000000) + err(ts, z154, __LINE__, 0, 0, tz00.i000, 0x80000000) } } else { CH04(ts, 1, 5, z154, 0x014, 0, 0) // AE_NOT_FOUND @@ -247,10 +247,10 @@ Method(m008, 1, Serialized) if (FLG9) { CH03(ts, z154, 0x014, 0, 0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z154, 0x018, 0, 0, Local0, 0x87654321) + err(ts, z154, __LINE__, 0, 0, Local0, 0x87654321) } if (LNotEqual(pr00.i000, 0x80000000)) { - err(ts, z154, 0x019, 0, 0, pr00.i000, 0x80000000) + err(ts, z154, __LINE__, 0, 0, pr00.i000, 0x80000000) } } else { CH04(ts, 1, 5, z154, 0x014, 0, 0) // AE_NOT_FOUND @@ -323,10 +323,10 @@ Method(m009, 1, Serialized) if (FLG9) { CH03(ts, z154, 0x014, 0, 0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z154, 0x01b, 0, 0, Local0, 0x87654321) + err(ts, z154, __LINE__, 0, 0, Local0, 0x87654321) } if (LNotEqual(pw00.i000, 0x80000000)) { - err(ts, z154, 0x01c, 0, 0, pw00.i000, 0x80000000) + err(ts, z154, __LINE__, 0, 0, pw00.i000, 0x80000000) } } else { CH04(ts, 1, 5, z154, 0x014, 0, 0) // AE_NOT_FOUND diff --git a/tests/aslts/src/runtime/collections/complex/namespace/ns1.asl b/tests/aslts/src/runtime/collections/complex/namespace/ns1.asl index dd31c5f0b..9223aa53a 100644 --- a/tests/aslts/src/runtime/collections/complex/namespace/ns1.asl +++ b/tests/aslts/src/runtime/collections/complex/namespace/ns1.asl @@ -49,7 +49,7 @@ Method(m100,, Serialized) Store(DerefOf(Index(p000, 0)), Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z155, 0x000, 0, 0, Local0, 0x11112222) + err(ts, z155, __LINE__, 0, 0, Local0, 0x11112222) } CH03(ts, z155, 0x001, 0, 0) @@ -69,7 +69,7 @@ Method(m101,, Serialized) Store(DerefOf(Index(b000, 0)), Local0) if (LNotEqual(Local0, 0x67)) { - err(ts, z155, 0x002, 0, 0, Local0, 0x67) + err(ts, z155, __LINE__, 0, 0, Local0, 0x67) } CH03(ts, z155, 0x003, 0, 0) @@ -89,7 +89,7 @@ Method(m102,, Serialized) Store(DerefOf(Index(s000, 0)), Local0) if (LNotEqual(Local0, 0x38)) { - err(ts, z155, 0x004, 0, 0, Local0, 0x38) + err(ts, z155, __LINE__, 0, 0, Local0, 0x38) } CH03(ts, z155, 0x005, 0, 0) @@ -155,13 +155,13 @@ Method(m103, 1, Serialized) Store(Add(DerefOf(Index(pp00, 1)), m001()), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z155, 0x007, 0, 0, Local0, 0x87654321) + err(ts, z155, __LINE__, 0, 0, Local0, 0x87654321) } Store(DerefOf(Index(pp00, 1)), Local0) if (LNotEqual(Local0, 0x80000000)) { - err(ts, z155, 0x008, 0, 0, Local0, 0x80000000) + err(ts, z155, __LINE__, 0, 0, Local0, 0x80000000) } CH03(ts, z155, 0x009, 0, 0) @@ -192,13 +192,13 @@ Method(m104,, Serialized) Store(Add(DerefOf(Index(pp00, 1)), m001()), Local0) if (LNotEqual(Local0, 0x065013BA)) { - err(ts, z155, 0x00a, 0, 0, Local0, 0x065013BA) + err(ts, z155, __LINE__, 0, 0, Local0, 0x065013BA) } Store(DerefOf(Index(pp00, 1)), Local0) if (LNotEqual(Local0, 0x00100064)) { - err(ts, z155, 0x00b, 0, 0, Local0, 0x00100064) + err(ts, z155, __LINE__, 0, 0, Local0, 0x00100064) } CH03(ts, z155, 0x00c, 0, 0) @@ -267,7 +267,7 @@ Method(m105, 1, Serialized) Store(Add(bf00, m001()), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z155, 0x00e, 0, 0, Local0, 0x87654321) + err(ts, z155, __LINE__, 0, 0, Local0, 0x87654321) } if (arg0) { @@ -277,7 +277,7 @@ Method(m105, 1, Serialized) } if (LNotEqual(bf00, Local1)) { - err(ts, z155, 0x00f, 0, 0, bf00, Local1) + err(ts, z155, __LINE__, 0, 0, bf00, Local1) } CH03(ts, z155, 0x010, 0, 0) @@ -346,7 +346,7 @@ Method(m106, 1, Serialized) Store(Add(f001, m001()), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z155, 0x012, 0, 0, Local0, 0x87654321) + err(ts, z155, __LINE__, 0, 0, Local0, 0x87654321) } if (arg0) { @@ -356,7 +356,7 @@ Method(m106, 1, Serialized) } if (LNotEqual(f001, Local1)) { - err(ts, z155, 0x013, 0, 0, f001, Local1) + err(ts, z155, __LINE__, 0, 0, f001, Local1) } CH03(ts, z155, 0x014, 0, 0) @@ -428,7 +428,7 @@ Method(m107, 1, Serialized) Store(Add(bnk0, m001()), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z155, 0x016, 0, 0, Local0, 0x87654321) + err(ts, z155, __LINE__, 0, 0, Local0, 0x87654321) } if (arg0) { @@ -438,7 +438,7 @@ Method(m107, 1, Serialized) } if (LNotEqual(bnk0, Local1)) { - err(ts, z155, 0x017, 0, 0, bnk0, Local1) + err(ts, z155, __LINE__, 0, 0, bnk0, Local1) } CH03(ts, z155, 0x018, 0, 0) @@ -510,7 +510,7 @@ Method(m108, 1, Serialized) Store(Add(if00, m001()), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z155, 0x01a, 0, 0, Local0, 0x87654321) + err(ts, z155, __LINE__, 0, 0, Local0, 0x87654321) } if (arg0) { @@ -520,7 +520,7 @@ Method(m108, 1, Serialized) } if (LNotEqual(if00, Local1)) { - err(ts, z155, 0x01b, 0, 0, if00, Local1) + err(ts, z155, __LINE__, 0, 0, if00, Local1) } CH03(ts, z155, 0x01c, 0, 0) @@ -585,7 +585,7 @@ Method(m109, 1, Serialized) Store(Add(DerefOf(Index(b000, 1)), m001()), Local0) if (LNotEqual(Local0, 0x24)) { - err(ts, z155, 0x01e, 0, 0, Local0, 0x24) + err(ts, z155, __LINE__, 0, 0, Local0, 0x24) } Store(DerefOf(Index(b000, 1)), Local0) @@ -597,7 +597,7 @@ Method(m109, 1, Serialized) } if (LNotEqual(Local0, Local1)) { - err(ts, z155, 0x01f, 0, 0, Local0, Local1) + err(ts, z155, __LINE__, 0, 0, Local0, Local1) } CH03(ts, z155, 0x020, 0, 0) @@ -662,7 +662,7 @@ Method(m10a, 1, Serialized) Store(Add(DerefOf(Index(s000, 1)), m001()), Local0) if (LNotEqual(Local0, 0x24)) { - err(ts, z155, 0x022, 0, 0, Local0, 0x24) + err(ts, z155, __LINE__, 0, 0, Local0, 0x24) } Store(DerefOf(Index(s000, 1)), Local0) @@ -674,7 +674,7 @@ Method(m10a, 1, Serialized) } if (LNotEqual(Local0, Local1)) { - err(ts, z155, 0x023, 0, 0, Local0, Local1) + err(ts, z155, __LINE__, 0, 0, Local0, Local1) } CH03(ts, z155, 0x024, 0, 0) diff --git a/tests/aslts/src/runtime/collections/complex/namespace/ns2.asl b/tests/aslts/src/runtime/collections/complex/namespace/ns2.asl index e58bf1c91..b5b0807ae 100644 --- a/tests/aslts/src/runtime/collections/complex/namespace/ns2.asl +++ b/tests/aslts/src/runtime/collections/complex/namespace/ns2.asl @@ -51,7 +51,7 @@ Method(m200,, Serialized) Store(DerefOf(Index(d000.p000, 0)), Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z156, 0x000, 0, 0, Local0, 0x11112222) + err(ts, z156, __LINE__, 0, 0, Local0, 0x11112222) } CH03(ts, z156, 0x001, 0, 0) @@ -74,7 +74,7 @@ Method(m201,, Serialized) Store(DerefOf(Index(d000.b000, 0)), Local0) if (LNotEqual(Local0, 0x67)) { - err(ts, z156, 0x002, 0, 0, Local0, 0x67) + err(ts, z156, __LINE__, 0, 0, Local0, 0x67) } CH03(ts, z156, 0x003, 0, 0) @@ -97,7 +97,7 @@ Method(m202,, Serialized) Store(DerefOf(Index(d000.s000, 0)), Local0) if (LNotEqual(Local0, 0x38)) { - err(ts, z156, 0x004, 0, 0, Local0, 0x38) + err(ts, z156, __LINE__, 0, 0, Local0, 0x38) } CH03(ts, z156, 0x005, 0, 0) @@ -131,13 +131,13 @@ Method(m204,, Serialized) Store(Add(DerefOf(Index(d000.pp00, 1)), m001()), Local0) if (LNotEqual(Local0, 0x065013BA)) { - err(ts, z156, 0x00a, 0, 0, Local0, 0x065013BA) + err(ts, z156, __LINE__, 0, 0, Local0, 0x065013BA) } Store(DerefOf(Index(d000.pp00, 1)), Local0) if (LNotEqual(Local0, 0x00100064)) { - err(ts, z156, 0x00b, 0, 0, Local0, 0x00100064) + err(ts, z156, __LINE__, 0, 0, Local0, 0x00100064) } CH03(ts, z156, 0x00c, 0, 0) diff --git a/tests/aslts/src/runtime/collections/complex/namespace/ns2_root.asl b/tests/aslts/src/runtime/collections/complex/namespace/ns2_root.asl index 95f573731..af53ce68f 100644 --- a/tests/aslts/src/runtime/collections/complex/namespace/ns2_root.asl +++ b/tests/aslts/src/runtime/collections/complex/namespace/ns2_root.asl @@ -93,13 +93,13 @@ Method(m203, 1, Serialized) Store(Add(DerefOf(Index(d000.pp00, 1)), m001()), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z156, 0x007, 0, 0, Local0, 0x87654321) + err(ts, z156, __LINE__, 0, 0, Local0, 0x87654321) } Store(DerefOf(Index(d000.pp00, 1)), Local0) if (LNotEqual(Local0, 0x80000000)) { - err(ts, z156, 0x008, 0, 0, Local0, 0x80000000) + err(ts, z156, __LINE__, 0, 0, Local0, 0x80000000) } CH03(ts, z156, 0x009, 0, 0) @@ -176,13 +176,13 @@ Method(m205, 1, Serialized) Store(Add(DerefOf(Index(d000.bf00, 1)), m001()), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z156, 0x00f, 0, 0, Local0, 0x87654321) + err(ts, z156, __LINE__, 0, 0, Local0, 0x87654321) } Store(DerefOf(Index(d000.bf00, 1)), Local0) if (LNotEqual(Local0, 0x80000000)) { - err(ts, z156, 0x010, 0, 0, Local0, 0x80000000) + err(ts, z156, __LINE__, 0, 0, Local0, 0x80000000) } CH03(ts, z156, 0x011, 0, 0) diff --git a/tests/aslts/src/runtime/collections/complex/namespace/ns3.asl b/tests/aslts/src/runtime/collections/complex/namespace/ns3.asl index a91885934..0edd763c2 100644 --- a/tests/aslts/src/runtime/collections/complex/namespace/ns3.asl +++ b/tests/aslts/src/runtime/collections/complex/namespace/ns3.asl @@ -48,7 +48,7 @@ Method(m300,, Serialized) Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z157, 0x000, 0, 0, Local0, 0x11112222) + err(ts, z157, __LINE__, 0, 0, Local0, 0x11112222) } } @@ -57,7 +57,7 @@ Method(m300,, Serialized) Store(DerefOf(Index(p000, 0)), Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z157, 0x001, 0, 0, Local0, 0x11112222) + err(ts, z157, __LINE__, 0, 0, Local0, 0x11112222) } CH03(ts, z157, 0x002, 0, 0) @@ -80,7 +80,7 @@ Method(m301,, Serialized) Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0x67)) { - err(ts, z157, 0x003, 0, 0, Local0, 0x67) + err(ts, z157, __LINE__, 0, 0, Local0, 0x67) } } @@ -89,7 +89,7 @@ Method(m301,, Serialized) Store(DerefOf(Index(b000, 0)), Local0) if (LNotEqual(Local0, 0x67)) { - err(ts, z157, 0x004, 0, 0, Local0, 0x67) + err(ts, z157, __LINE__, 0, 0, Local0, 0x67) } CH03(ts, z157, 0x005, 0, 0) @@ -111,7 +111,7 @@ Method(m302,, Serialized) Store(DerefOf(Index(arg0, 0)), Local0) if (LNotEqual(Local0, 0x38)) { - err(ts, z157, 0x006, 0, 0, Local0, 0x38) + err(ts, z157, __LINE__, 0, 0, Local0, 0x38) } } @@ -120,7 +120,7 @@ Method(m302,, Serialized) Store(DerefOf(Index(s000, 0)), Local0) if (LNotEqual(Local0, 0x38)) { - err(ts, z157, 0x007, 0, 0, Local0, 0x38) + err(ts, z157, __LINE__, 0, 0, Local0, 0x38) } CH03(ts, z157, 0x008, 0, 0) @@ -189,13 +189,13 @@ Method(m303, 1, Serialized) Store(Add(DerefOf(Index(arg0, 1)), m001(arg0)), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z157, 0x00a, 0, 0, Local0, 0x87654321) + err(ts, z157, __LINE__, 0, 0, Local0, 0x87654321) } Store(DerefOf(Index(arg0, 1)), Local1) if (LNotEqual(Local1, 0x80000000)) { - err(ts, z157, 0x00b, 0, 0, Local1, 0x80000000) + err(ts, z157, __LINE__, 0, 0, Local1, 0x80000000) } CH03(ts, z157, 0x00c, 0, 0) @@ -206,13 +206,13 @@ Method(m303, 1, Serialized) Store(m000(pp00, arg0), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z157, 0x00d, 0, 0, Local0, 0x87654321) + err(ts, z157, __LINE__, 0, 0, Local0, 0x87654321) } Store(DerefOf(Index(pp00, 1)), Local0) if (LNotEqual(Local0, 0x80000000)) { - err(ts, z157, 0x00e, 0, 0, Local0, 0x80000000) + err(ts, z157, __LINE__, 0, 0, Local0, 0x80000000) } CH03(ts, z157, 0x00f, 0, 0) @@ -244,13 +244,13 @@ Method(m304,, Serialized) Store(Add(DerefOf(Index(arg0, 1)), m001(arg0)), Local0) if (LNotEqual(Local0, 0x065013BA)) { - err(ts, z157, 0x010, 0, 0, Local0, 0x065013BA) + err(ts, z157, __LINE__, 0, 0, Local0, 0x065013BA) } Store(DerefOf(Index(arg0, 1)), Local1) if (LNotEqual(Local1, 0x00100064)) { - err(ts, z157, 0x011, 0, 0, Local1, 0x00100064) + err(ts, z157, __LINE__, 0, 0, Local1, 0x00100064) } Return (Local0) } @@ -258,13 +258,13 @@ Method(m304,, Serialized) Store(m000(pp00), Local0) if (LNotEqual(Local0, 0x065013BA)) { - err(ts, z157, 0x012, 0, 0, Local0, 0x065013BA) + err(ts, z157, __LINE__, 0, 0, Local0, 0x065013BA) } Store(DerefOf(Index(pp00, 1)), Local1) if (LNotEqual(Local1, 0x00100064)) { - err(ts, z157, 0x013, 0, 0, Local1, 0x00100064) + err(ts, z157, __LINE__, 0, 0, Local1, 0x00100064) } CH03(ts, z157, 0x014, 0, 0) @@ -330,13 +330,13 @@ Method(m305,, Serialized) Store(Add(arg0, m001()), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z157, 0x016, 0, 0, Local0, 0x87654321) + err(ts, z157, __LINE__, 0, 0, Local0, 0x87654321) } Store(0x0000001, Local1) if (LNotEqual(arg0, Local1)) { - err(ts, z157, 0x017, 0, 0, arg0, Local1) + err(ts, z157, __LINE__, 0, 0, arg0, Local1) } CH03(ts, z157, 0x018, 0, 0) @@ -347,13 +347,13 @@ Method(m305,, Serialized) Store(m000(bf00), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z157, 0x019, 0, 0, Local0, 0x87654321) + err(ts, z157, __LINE__, 0, 0, Local0, 0x87654321) } Store(0xabcdef70, Local1) if (LNotEqual(bf00, Local1)) { - err(ts, z157, 0x01a, 0, 0, bf00, Local1) + err(ts, z157, __LINE__, 0, 0, bf00, Local1) } CH03(ts, z157, 0x01b, 0, 0) @@ -420,13 +420,13 @@ Method(m306,, Serialized) Store(Add(arg0, m001()), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z157, 0x01d, 0, 0, Local0, 0x87654321) + err(ts, z157, __LINE__, 0, 0, Local0, 0x87654321) } Store(0x0000001, Local1) if (LNotEqual(arg0, Local1)) { - err(ts, z157, 0x01e, 0, 0, arg0, Local1) + err(ts, z157, __LINE__, 0, 0, arg0, Local1) } CH03(ts, z157, 0x01f, 0, 0) @@ -437,13 +437,13 @@ Method(m306,, Serialized) Store(m000(f000), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z157, 0x020, 0, 0, Local0, 0x87654321) + err(ts, z157, __LINE__, 0, 0, Local0, 0x87654321) } Store(0xabcdef70, Local1) if (LNotEqual(f000, Local1)) { - err(ts, z157, 0x021, 0, 0, f000, Local1) + err(ts, z157, __LINE__, 0, 0, f000, Local1) } CH03(ts, z157, 0x022, 0, 0) @@ -511,13 +511,13 @@ Method(m307,, Serialized) Store(Add(arg0, m001()), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z157, 0x024, 0, 0, Local0, 0x87654321) + err(ts, z157, __LINE__, 0, 0, Local0, 0x87654321) } Store(0x0000001, Local1) if (LNotEqual(arg0, Local1)) { - err(ts, z157, 0x025, 0, 0, arg0, Local1) + err(ts, z157, __LINE__, 0, 0, arg0, Local1) } CH03(ts, z157, 0x026, 0, 0) @@ -528,13 +528,13 @@ Method(m307,, Serialized) Store(m000(bnk0), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z157, 0x027, 0, 0, Local0, 0x87654321) + err(ts, z157, __LINE__, 0, 0, Local0, 0x87654321) } Store(0xabcdef70, Local1) if (LNotEqual(bnk0, Local1)) { - err(ts, z157, 0x028, 0, 0, bnk0, Local1) + err(ts, z157, __LINE__, 0, 0, bnk0, Local1) } CH03(ts, z157, 0x029, 0, 0) @@ -602,13 +602,13 @@ Method(m308,, Serialized) Store(Add(arg0, m001()), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z157, 0x02b, 0, 0, Local0, 0x87654321) + err(ts, z157, __LINE__, 0, 0, Local0, 0x87654321) } Store(0x0000001, Local1) if (LNotEqual(arg0, Local1)) { - err(ts, z157, 0x02c, 0, 0, arg0, Local1) + err(ts, z157, __LINE__, 0, 0, arg0, Local1) } CH03(ts, z157, 0x02d, 0, 0) @@ -619,13 +619,13 @@ Method(m308,, Serialized) Store(m000(if00), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z157, 0x02e, 0, 0, Local0, 0x87654321) + err(ts, z157, __LINE__, 0, 0, Local0, 0x87654321) } Store(0xabcdef70, Local1) if (LNotEqual(if00, Local1)) { - err(ts, z157, 0x02f, 0, 0, if00, Local1) + err(ts, z157, __LINE__, 0, 0, if00, Local1) } CH03(ts, z157, 0x030, 0, 0) @@ -692,7 +692,7 @@ Method(m309, 1, Serialized) Store(Add(DerefOf(Index(arg0, 1)), m001(arg0)), Local0) if (LNotEqual(Local0, 0x24)) { - err(ts, z157, 0x032, 0, 0, Local0, 0x24) + err(ts, z157, __LINE__, 0, 0, Local0, 0x24) } Store(DerefOf(Index(arg0, 1)), Local1) @@ -704,7 +704,7 @@ Method(m309, 1, Serialized) } if (LNotEqual(Local1, Local2)) { - err(ts, z157, 0x033, 0, 0, Local1, Local2) + err(ts, z157, __LINE__, 0, 0, Local1, Local2) } CH03(ts, z157, 0x034, 0, 0) @@ -715,7 +715,7 @@ Method(m309, 1, Serialized) Store(m000(b000, arg0), Local0) if (LNotEqual(Local0, 0x24)) { - err(ts, z157, 0x035, 0, 0, Local0, 0x24) + err(ts, z157, __LINE__, 0, 0, Local0, 0x24) } Store(DerefOf(Index(b000, 1)), Local1) @@ -727,7 +727,7 @@ Method(m309, 1, Serialized) } if (LNotEqual(Local1, Local2)) { - err(ts, z157, 0x036, 0, 0, Local1, Local2) + err(ts, z157, __LINE__, 0, 0, Local1, Local2) } CH03(ts, z157, 0x037, 0, 0) @@ -794,7 +794,7 @@ Method(m30a, 1, Serialized) Store(Add(DerefOf(Index(arg0, 1)), m001(arg0)), Local0) if (LNotEqual(Local0, 0x24)) { - err(ts, z157, 0x039, 0, 0, Local0, 0x24) + err(ts, z157, __LINE__, 0, 0, Local0, 0x24) } Store(DerefOf(Index(arg0, 1)), Local1) @@ -806,7 +806,7 @@ Method(m30a, 1, Serialized) } if (LNotEqual(Local1, Local2)) { - err(ts, z157, 0x03a, 0, 0, Local1, Local2) + err(ts, z157, __LINE__, 0, 0, Local1, Local2) } CH03(ts, z157, 0x03b, 0, 0) @@ -817,7 +817,7 @@ Method(m30a, 1, Serialized) Store(m000(s000, arg0), Local0) if (LNotEqual(Local0, 0x24)) { - err(ts, z157, 0x03c, 0, 0, Local0, 0x24) + err(ts, z157, __LINE__, 0, 0, Local0, 0x24) } Store(DerefOf(Index(s000, 1)), Local1) @@ -829,7 +829,7 @@ Method(m30a, 1, Serialized) } if (LNotEqual(Local1, Local2)) { - err(ts, z157, 0x03d, 0, 0, Local1, Local2) + err(ts, z157, __LINE__, 0, 0, Local1, Local2) } CH03(ts, z157, 0x03e, 0, 0) @@ -903,7 +903,7 @@ Method(m30b, 1, Serialized) Store(Add(bf00, m001()), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z157, 0x040, 0, 0, Local0, 0x87654321) + err(ts, z157, __LINE__, 0, 0, Local0, 0x87654321) } if (arg1) { @@ -913,7 +913,7 @@ Method(m30b, 1, Serialized) } if (LNotEqual(bf00, Local1)) { - err(ts, z157, 0x041, 0, 0, bf00, Local1) + err(ts, z157, __LINE__, 0, 0, bf00, Local1) } CH03(ts, z157, 0x042, 0, 0) @@ -924,7 +924,7 @@ Method(m30b, 1, Serialized) Store(m000(0, arg0), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z157, 0x043, 0, 0, Local0, 0x87654321) + err(ts, z157, __LINE__, 0, 0, Local0, 0x87654321) } CH03(ts, z157, 0x044, 0, 0) diff --git a/tests/aslts/src/runtime/collections/complex/namespace/ns4.asl b/tests/aslts/src/runtime/collections/complex/namespace/ns4.asl index e245d1a6f..f914fbdfb 100644 --- a/tests/aslts/src/runtime/collections/complex/namespace/ns4.asl +++ b/tests/aslts/src/runtime/collections/complex/namespace/ns4.asl @@ -100,11 +100,11 @@ Method(m401, 1, Serialized) Store(MAdd(i000, m001()), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z158, 0x001, 0, 0, Local0, 0x87654321) + err(ts, z158, __LINE__, 0, 0, Local0, 0x87654321) } if (LNotEqual(i000, 0x80000000)) { - err(ts, z158, 0x002, 0, 0, i000, 0x80000000) + err(ts, z158, __LINE__, 0, 0, i000, 0x80000000) } CH03(ts, z158, 0x003, 0, 0) diff --git a/tests/aslts/src/runtime/collections/complex/namespace/ns5.asl b/tests/aslts/src/runtime/collections/complex/namespace/ns5.asl index 6704e14d3..99b7c25e5 100644 --- a/tests/aslts/src/runtime/collections/complex/namespace/ns5.asl +++ b/tests/aslts/src/runtime/collections/complex/namespace/ns5.asl @@ -37,7 +37,7 @@ Method(m500) Store(DerefOf(Index(d000.p000, 0)), Local0) if (LNotEqual(Local0, 0x11112222)) { - err(ts, z159, 0x000, 0, 0, Local0, 0x11112222) + err(ts, z159, __LINE__, 0, 0, Local0, 0x11112222) } CH03(ts, z159, 0x100, 0, 0) @@ -60,7 +60,7 @@ Method(m501) Store(DerefOf(Index(d000.b000, 0)), Local0) if (LNotEqual(Local0, 0x67)) { - err(ts, z159, 0x001, 0, 0, Local0, 0x67) + err(ts, z159, __LINE__, 0, 0, Local0, 0x67) } CH03(ts, z159, 0x101, 0, 0) @@ -83,7 +83,7 @@ Method(m502) Store(DerefOf(Index(d000.s000, 0)), Local0) if (LNotEqual(Local0, 0x38)) { - err(ts, z159, 0x002, 0, 0, Local0, 0x38) + err(ts, z159, __LINE__, 0, 0, Local0, 0x38) } CH03(ts, z159, 0x102, 0, 0) @@ -152,13 +152,13 @@ Method(m503, 1) Store(Add(DerefOf(Index(d000.pp00, 1)), m001()), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z159, 0x003, 0, 0, Local0, 0x87654321) + err(ts, z159, __LINE__, 0, 0, Local0, 0x87654321) } Store(DerefOf(Index(d000.pp00, 1)), Local0) if (LNotEqual(Local0, 0x80000000)) { - err(ts, z159, 0x004, 0, 0, Local0, 0x80000000) + err(ts, z159, __LINE__, 0, 0, Local0, 0x80000000) } CH03(ts, z159, 0x104, 0, 0) @@ -192,13 +192,13 @@ Method(m504) Store(Add(DerefOf(Index(d000.pp00, 1)), m001()), Local0) if (LNotEqual(Local0, 0x065013BA)) { - err(ts, z159, 0x005, 0, 0, Local0, 0x065013BA) + err(ts, z159, __LINE__, 0, 0, Local0, 0x065013BA) } Store(DerefOf(Index(d000.pp00, 1)), Local0) if (LNotEqual(Local0, 0x00100064)) { - err(ts, z159, 0x006, 0, 0, Local0, 0x00100064) + err(ts, z159, __LINE__, 0, 0, Local0, 0x00100064) } CH03(ts, z159, 0x105, 0, 0) @@ -275,13 +275,13 @@ Method(m505, 1) Store(Add(DerefOf(Index(d000.bf00, 1)), m001()), Local0) if (LNotEqual(Local0, 0x87654321)) { - err(ts, z159, 0x007, 0, 0, Local0, 0x87654321) + err(ts, z159, __LINE__, 0, 0, Local0, 0x87654321) } Store(DerefOf(Index(d000.bf00, 1)), Local0) if (LNotEqual(Local0, 0x80000000)) { - err(ts, z159, 0x008, 0, 0, Local0, 0x80000000) + err(ts, z159, __LINE__, 0, 0, Local0, 0x80000000) } CH03(ts, z159, 0x107, 0, 0) diff --git a/tests/aslts/src/runtime/collections/complex/namespace/ns6.asl b/tests/aslts/src/runtime/collections/complex/namespace/ns6.asl index 6d60f772c..d80b77777 100644 --- a/tests/aslts/src/runtime/collections/complex/namespace/ns6.asl +++ b/tests/aslts/src/runtime/collections/complex/namespace/ns6.asl @@ -10,14 +10,14 @@ Method(m600,, Serialized) { Store(0x11223344, i000) if (LNotEqual(arg0, 0xabcd0000)) { - err(ts, z160, 0x000, 0, 0, arg0, 0xabcd0000) + err(ts, z160, __LINE__, 0, 0, arg0, 0xabcd0000) } } m000(i000) if (LNotEqual(i000, 0x11223344)) { - err(ts, z160, 0x001, 0, 0, i000, 0x11223344) + err(ts, z160, __LINE__, 0, 0, i000, 0x11223344) } } diff --git a/tests/aslts/src/runtime/collections/complex/operand/common/ocommon.asl b/tests/aslts/src/runtime/collections/complex/operand/common/ocommon.asl index 9da3a4d72..e21a8ae91 100644 --- a/tests/aslts/src/runtime/collections/complex/operand/common/ocommon.asl +++ b/tests/aslts/src/runtime/collections/complex/operand/common/ocommon.asl @@ -784,9 +784,9 @@ Method(m600, 4) Store(ObjectType(arg2), Local0) Store(ObjectType(arg3), Local1) if (LNotEqual(Local0, Local1)) { - err(Concatenate(arg0, "-OType"), z084, arg1, 0, 0, Local0, Local1) + err(Concatenate(arg0, "-OType"), z084, __LINE__, 0, 0, Local0, Local1) } elseif (LNotEqual(arg2, arg3)) { - err(arg0, z084, arg1, 0, 0, arg2, arg3) + err(arg0, z084, __LINE__, 0, 0, arg2, arg3) } } @@ -870,7 +870,7 @@ Method(m601, 2, Serialized) Return (0xd650a283) } Default { - err(terr, z084, 11, 0, 0, arg0, arg1) + err(terr, z084, __LINE__, 0, 0, arg0, arg1) } } } @@ -910,7 +910,7 @@ Method(m601, 2, Serialized) Return ("21 03 01") } Default { - err(terr, z084, 12, 0, 0, arg0, arg1) + err(terr, z084, __LINE__, 0, 0, arg0, arg1) } } } @@ -944,7 +944,7 @@ Method(m601, 2, Serialized) Return (Buffer() {0x30, 0x33, 0x32, 0x31, 0x01}) } Default { - err(terr, z084, 13, 0, 0, arg0, arg1) + err(terr, z084, __LINE__, 0, 0, arg0, arg1) } } } @@ -956,12 +956,12 @@ Method(m601, 2, Serialized) 0xa58, 0xa59, 0xa5a, 0xa5b, 0xa5c, 0xa5d, 0xa5e,}) } Default { - err(terr, z084, 14, 0, 0, arg0, arg1) + err(terr, z084, __LINE__, 0, 0, arg0, arg1) } } } Default { - err(terr, z084, 15, 0, 0, arg0, arg1) + err(terr, z084, __LINE__, 0, 0, arg0, arg1) } } Return(Local0) @@ -1210,7 +1210,7 @@ Method(m602, 3, Serialized) } } Default { - err(terr, z084, 16, 0, 0, arg0, arg1) + err(terr, z084, __LINE__, 0, 0, arg0, arg1) } } } @@ -1327,7 +1327,7 @@ Method(m602, 3, Serialized) } } Default { - err(terr, z084, 17, 0, 0, arg0, arg1) + err(terr, z084, __LINE__, 0, 0, arg0, arg1) } } } @@ -1424,7 +1424,7 @@ Method(m602, 3, Serialized) } } Default { - err(terr, z084, 18, 0, 0, arg0, arg1) + err(terr, z084, __LINE__, 0, 0, arg0, arg1) } } } @@ -1441,16 +1441,16 @@ Method(m602, 3, Serialized) } } Default { - err(terr, z084, 19, 0, 0, arg0, arg1) + err(terr, z084, __LINE__, 0, 0, arg0, arg1) } } } Default { - err(terr, z084, 20, 0, 0, arg0, arg1) + err(terr, z084, __LINE__, 0, 0, arg0, arg1) } } } else { - err(terr, z084, 21, 0, 0, arg1, arg2) + err(terr, z084, __LINE__, 0, 0, arg1, arg2) } Return(Local0) } @@ -1478,11 +1478,11 @@ Method(m603, 3, Serialized) Return (Local0) } Default { - err(terr, z084, 22, 0, 0, arg1, arg2) + err(terr, z084, __LINE__, 0, 0, arg1, arg2) } } } else { - err(terr, z084, 23, 0, 0, arg0, arg1) + err(terr, z084, __LINE__, 0, 0, arg0, arg1) } } Case(2) { // String @@ -1499,11 +1499,11 @@ Method(m603, 3, Serialized) Return (Local0) } Default { - err(terr, z084, 24, 0, 0, arg1, arg2) + err(terr, z084, __LINE__, 0, 0, arg1, arg2) } } } else { - err(terr, z084, 25, 0, 0, arg0, arg1) + err(terr, z084, __LINE__, 0, 0, arg0, arg1) } } Case(3) { // Buffer @@ -1520,11 +1520,11 @@ Method(m603, 3, Serialized) Return (Local0) } Default { - err(terr, z084, 26, 0, 0, arg1, arg2) + err(terr, z084, __LINE__, 0, 0, arg1, arg2) } } } else { - err(terr, z084, 27, 0, 0, arg0, arg1) + err(terr, z084, __LINE__, 0, 0, arg0, arg1) } } Case(4) { // Package @@ -1541,15 +1541,15 @@ Method(m603, 3, Serialized) Return (Local0) } Default { - err(terr, z084, 28, 0, 0, arg1, arg2) + err(terr, z084, __LINE__, 0, 0, arg1, arg2) } } } else { - err(terr, z084, 29, 0, 0, arg0, arg1) + err(terr, z084, __LINE__, 0, 0, arg0, arg1) } } Default { - err(terr, z084, 30, 0, 0, arg0, arg1) + err(terr, z084, __LINE__, 0, 0, arg0, arg1) } } Return(Local0) @@ -1565,7 +1565,7 @@ Method(m604, 4, Serialized) Switch(ToInteger (arg0)) { Case(0) { // Constant if (arg3) { - err(terr, z084, 0, 0, 0, arg1, arg2) + err(terr, z084, __LINE__, 0, 0, arg1, arg2) } Switch(ToInteger (arg1)) { Case(1) { // Integer @@ -1589,7 +1589,7 @@ Method(m604, 4, Serialized) Return (0x6e7c534136002214) } Default { - err(terr, z084, 1, 0, 0, arg1, arg2) + err(terr, z084, __LINE__, 0, 0, arg1, arg2) } } } @@ -1632,7 +1632,7 @@ Method(m604, 4, Serialized) Return ("63") } Default { - err(terr, z084, 1, 0, 0, arg1, arg2) + err(terr, z084, __LINE__, 0, 0, arg1, arg2) } } } @@ -1674,12 +1674,12 @@ Method(m604, 4, Serialized) Return (Buffer(1){0x3f}) } Default { - err(terr, z084, 1, 0, 0, arg1, arg2) + err(terr, z084, __LINE__, 0, 0, arg1, arg2) } } } Default { - err(terr, z084, 2, 0, 0, arg1, arg2) + err(terr, z084, __LINE__, 0, 0, arg1, arg2) } } } @@ -1700,7 +1700,7 @@ Method(m604, 4, Serialized) Return (Local0) } Default { - err(terr, z084, 3, 0, 0, arg2, arg3) + err(terr, z084, __LINE__, 0, 0, arg2, arg3) } } } @@ -1717,17 +1717,17 @@ Method(m604, 4, Serialized) Return (Local0) } Default { - err(terr, z084, 4, 0, 0, arg2, arg3) + err(terr, z084, __LINE__, 0, 0, arg2, arg3) } } } Default { - err(terr, z084, 5, 0, 0, arg1, arg2) + err(terr, z084, __LINE__, 0, 0, arg1, arg2) } } } Default { - err(terr, z084, 6, 0, 0, arg1, arg2) + err(terr, z084, __LINE__, 0, 0, arg1, arg2) } } } @@ -1747,11 +1747,11 @@ Method(m604, 4, Serialized) Return (Local0) } Default { - err(terr, z084, 7, 0, 0, arg2, arg3) + err(terr, z084, __LINE__, 0, 0, arg2, arg3) } } } else { - err(terr, z084, 8, 0, 0, arg1, arg2) + err(terr, z084, __LINE__, 0, 0, arg1, arg2) } } Case(2) { // String @@ -1768,11 +1768,11 @@ Method(m604, 4, Serialized) Return (Local0) } Default { - err(terr, z084, 7, 0, 0, arg2, arg3) + err(terr, z084, __LINE__, 0, 0, arg2, arg3) } } } else { - err(terr, z084, 8, 0, 0, arg1, arg2) + err(terr, z084, __LINE__, 0, 0, arg1, arg2) } } Case(3) { // Buffer @@ -1789,20 +1789,20 @@ Method(m604, 4, Serialized) Return (Local0) } Default { - err(terr, z084, 7, 0, 0, arg2, arg3) + err(terr, z084, __LINE__, 0, 0, arg2, arg3) } } } else { - err(terr, z084, 8, 0, 0, arg1, arg2) + err(terr, z084, __LINE__, 0, 0, arg1, arg2) } } Default { - err(terr, z084, 9, 0, 0, arg1, arg2) + err(terr, z084, __LINE__, 0, 0, arg1, arg2) } } } Default { - err(terr, z084, 10, 0, 0, arg0, arg1) + err(terr, z084, __LINE__, 0, 0, arg0, arg1) } } Return(Local0) 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 bc01d62f9..ec3d4f1ec 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 @@ -12620,7 +12620,7 @@ Method(m617,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z121, 0, 0, 0, Local2, c08c) + err(arg0, z121, __LINE__, 0, 0, Local2, c08c) } // Stall @@ -12633,7 +12633,7 @@ Method(m617,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, 990)) { - err(arg0, z121, 1, 0, 0, Local2, 990) + err(arg0, z121, __LINE__, 0, 0, Local2, 990) } } @@ -12656,7 +12656,7 @@ Method(m617,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z121, 0, 0, 0, Local2, c08c) + err(arg0, z121, __LINE__, 0, 0, Local2, c08c) } } @@ -12676,7 +12676,7 @@ Method(m617,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z121, 0, 0, 0, Local2, c08c) + err(arg0, z121, __LINE__, 0, 0, Local2, c08c) } } @@ -24052,7 +24052,7 @@ Method(m617,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z121, 0, 0, 0, Local2, c08c) + err(arg0, z121, __LINE__, 0, 0, Local2, c08c) } // Stall @@ -24065,7 +24065,7 @@ Method(m617,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, 990)) { - err(arg0, z121, 1, 0, 0, Local2, 990) + err(arg0, z121, __LINE__, 0, 0, Local2, 990) } } @@ -24089,7 +24089,7 @@ Method(m617,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z121, 0, 0, 0, Local2, c08c) + err(arg0, z121, __LINE__, 0, 0, Local2, c08c) } } @@ -24109,7 +24109,7 @@ Method(m617,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z121, 0, 0, 0, Local2, c08c) + err(arg0, z121, __LINE__, 0, 0, Local2, c08c) } } diff --git a/tests/aslts/src/runtime/collections/complex/operand/tests/oconst/oconst.asl b/tests/aslts/src/runtime/collections/complex/operand/tests/oconst/oconst.asl index 16f9456df..2fb1fb97a 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 @@ -13138,7 +13138,7 @@ Method(m610,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z085, 0, 0, 0, Local2, c08c) + err(arg0, z085, __LINE__, 0, 0, Local2, c08c) } // Stall @@ -13151,7 +13151,7 @@ Method(m610,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, 990)) { - err(arg0, z085, 1, 0, 0, Local2, 990) + err(arg0, z085, __LINE__, 0, 0, Local2, 990) } } @@ -13174,7 +13174,7 @@ Method(m610,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z085, 0, 0, 0, Local2, c08c) + err(arg0, z085, __LINE__, 0, 0, Local2, c08c) } } @@ -13194,7 +13194,7 @@ Method(m610,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z085, 0, 0, 0, Local2, c08c) + err(arg0, z085, __LINE__, 0, 0, Local2, c08c) } } @@ -25042,7 +25042,7 @@ Method(m610,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z085, 0, 0, 0, Local2, c08c) + err(arg0, z085, __LINE__, 0, 0, Local2, c08c) } // Stall @@ -25055,7 +25055,7 @@ Method(m610,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, 990)) { - err(arg0, z085, 1, 0, 0, Local2, 990) + err(arg0, z085, __LINE__, 0, 0, Local2, 990) } } @@ -25079,7 +25079,7 @@ Method(m610,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z085, 0, 0, 0, Local2, c08c) + err(arg0, z085, __LINE__, 0, 0, Local2, c08c) } } @@ -25099,7 +25099,7 @@ Method(m610,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z085, 0, 0, 0, Local2, c08c) + err(arg0, z085, __LINE__, 0, 0, Local2, c08c) } } diff --git a/tests/aslts/src/runtime/collections/complex/operand/tests/olocal/olocal.asl b/tests/aslts/src/runtime/collections/complex/operand/tests/olocal/olocal.asl index 4835f70f1..511554557 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 @@ -12832,7 +12832,7 @@ Method(m618,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z117, 0, 0, 0, Local2, c08c) + err(arg0, z117, __LINE__, 0, 0, Local2, c08c) } // Stall @@ -12845,7 +12845,7 @@ Method(m618,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, 990)) { - err(arg0, z117, 1, 0, 0, Local2, 990) + err(arg0, z117, __LINE__, 0, 0, Local2, 990) } } @@ -12870,7 +12870,7 @@ Method(m618,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z117, 0, 0, 0, Local2, c08c) + err(arg0, z117, __LINE__, 0, 0, Local2, c08c) } } @@ -12892,7 +12892,7 @@ Method(m618,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z117, 0, 0, 0, Local2, c08c) + err(arg0, z117, __LINE__, 0, 0, Local2, c08c) } } @@ -24426,7 +24426,7 @@ Method(m618,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z117, 0, 0, 0, Local2, c08c) + err(arg0, z117, __LINE__, 0, 0, Local2, c08c) } // Stall @@ -24439,7 +24439,7 @@ Method(m618,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, 990)) { - err(arg0, z117, 1, 0, 0, Local2, 990) + err(arg0, z117, __LINE__, 0, 0, Local2, 990) } } @@ -24465,7 +24465,7 @@ Method(m618,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z117, 0, 0, 0, Local2, c08c) + err(arg0, z117, __LINE__, 0, 0, Local2, c08c) } } @@ -24487,7 +24487,7 @@ Method(m618,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z117, 0, 0, 0, Local2, c08c) + err(arg0, z117, __LINE__, 0, 0, Local2, c08c) } } diff --git a/tests/aslts/src/runtime/collections/complex/operand/tests/onamedglob/onamedglob1.asl b/tests/aslts/src/runtime/collections/complex/operand/tests/onamedglob/onamedglob1.asl index 5614930fb..26c80c66e 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 @@ -12622,7 +12622,7 @@ Method(m611,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z086, 0, 0, 0, Local2, c08c) + err(arg0, z086, __LINE__, 0, 0, Local2, c08c) } // Stall @@ -12635,7 +12635,7 @@ Method(m611,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, 990)) { - err(arg0, z086, 1, 0, 0, Local2, 990) + err(arg0, z086, __LINE__, 0, 0, Local2, 990) } } @@ -12658,7 +12658,7 @@ Method(m611,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z086, 0, 0, 0, Local2, c08c) + err(arg0, z086, __LINE__, 0, 0, Local2, c08c) } } @@ -12678,7 +12678,7 @@ Method(m611,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z086, 0, 0, 0, Local2, c08c) + err(arg0, z086, __LINE__, 0, 0, Local2, c08c) } } @@ -24043,7 +24043,7 @@ Method(m611,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z086, 0, 0, 0, Local2, c08c) + err(arg0, z086, __LINE__, 0, 0, Local2, c08c) } // Stall @@ -24056,7 +24056,7 @@ Method(m611,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, 990)) { - err(arg0, z086, 1, 0, 0, Local2, 990) + err(arg0, z086, __LINE__, 0, 0, Local2, 990) } } @@ -24080,7 +24080,7 @@ Method(m611,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z086, 0, 0, 0, Local2, c08c) + err(arg0, z086, __LINE__, 0, 0, Local2, c08c) } } @@ -24100,7 +24100,7 @@ Method(m611,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z086, 0, 0, 0, Local2, c08c) + err(arg0, z086, __LINE__, 0, 0, Local2, c08c) } } diff --git a/tests/aslts/src/runtime/collections/complex/operand/tests/onamedglob/onamedglob2.asl b/tests/aslts/src/runtime/collections/complex/operand/tests/onamedglob/onamedglob2.asl index 529273478..e87a1e293 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 @@ -11871,7 +11871,7 @@ Method(m612,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z087, 0, 0, 0, Local2, c08c) + err(arg0, z087, __LINE__, 0, 0, Local2, c08c) } // Stall @@ -11884,7 +11884,7 @@ Method(m612,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, 990)) { - err(arg0, z087, 1, 0, 0, Local2, 990) + err(arg0, z087, __LINE__, 0, 0, Local2, 990) } } @@ -11908,7 +11908,7 @@ Method(m612,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z087, 0, 0, 0, Local2, c08c) + err(arg0, z087, __LINE__, 0, 0, Local2, c08c) } } @@ -11928,7 +11928,7 @@ Method(m612,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z087, 0, 0, 0, Local2, c08c) + err(arg0, z087, __LINE__, 0, 0, Local2, c08c) } } diff --git a/tests/aslts/src/runtime/collections/complex/operand/tests/onamedloc/onamedloc1.asl b/tests/aslts/src/runtime/collections/complex/operand/tests/onamedloc/onamedloc1.asl index a6d01242a..a98687e22 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 @@ -12834,7 +12834,7 @@ Method(m613,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z088, 0, 0, 0, Local2, c08c) + err(arg0, z088, __LINE__, 0, 0, Local2, c08c) } // Stall @@ -12847,7 +12847,7 @@ Method(m613,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, 990)) { - err(arg0, z088, 1, 0, 0, Local2, 990) + err(arg0, z088, __LINE__, 0, 0, Local2, 990) } } @@ -12872,7 +12872,7 @@ Method(m613,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z088, 0, 0, 0, Local2, c08c) + err(arg0, z088, __LINE__, 0, 0, Local2, c08c) } } @@ -12894,7 +12894,7 @@ Method(m613,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z088, 0, 0, 0, Local2, c08c) + err(arg0, z088, __LINE__, 0, 0, Local2, c08c) } } @@ -24449,7 +24449,7 @@ Method(m613,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z088, 0, 0, 0, Local2, c08c) + err(arg0, z088, __LINE__, 0, 0, Local2, c08c) } // Stall @@ -24462,7 +24462,7 @@ Method(m613,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, 990)) { - err(arg0, z088, 1, 0, 0, Local2, 990) + err(arg0, z088, __LINE__, 0, 0, Local2, 990) } } @@ -24488,7 +24488,7 @@ Method(m613,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z088, 0, 0, 0, Local2, c08c) + err(arg0, z088, __LINE__, 0, 0, Local2, c08c) } } @@ -24510,7 +24510,7 @@ Method(m613,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z088, 0, 0, 0, Local2, c08c) + err(arg0, z088, __LINE__, 0, 0, Local2, c08c) } } diff --git a/tests/aslts/src/runtime/collections/complex/operand/tests/onamedloc/onamedloc2.asl b/tests/aslts/src/runtime/collections/complex/operand/tests/onamedloc/onamedloc2.asl index fe4e3c67a..977998ec5 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 @@ -12284,7 +12284,7 @@ Method(m614,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z089, 0, 0, 0, Local2, c08c) + err(arg0, z089, __LINE__, 0, 0, Local2, c08c) } // Stall @@ -12297,7 +12297,7 @@ Method(m614,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, 990)) { - err(arg0, z089, 1, 0, 0, Local2, 990) + err(arg0, z089, __LINE__, 0, 0, Local2, 990) } } @@ -12325,7 +12325,7 @@ Method(m614,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z089, 0, 0, 0, Local2, c08c) + err(arg0, z089, __LINE__, 0, 0, Local2, c08c) } } @@ -12349,7 +12349,7 @@ Method(m614,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z089, 0, 0, 0, Local2, c08c) + err(arg0, z089, __LINE__, 0, 0, Local2, c08c) } } diff --git a/tests/aslts/src/runtime/collections/complex/operand/tests/opackageel/opackageel.asl b/tests/aslts/src/runtime/collections/complex/operand/tests/opackageel/opackageel.asl index faac109e4..2f357f038 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 @@ -12622,7 +12622,7 @@ Method(m615,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z090, 0, 0, 0, Local2, c08c) + err(arg0, z090, __LINE__, 0, 0, Local2, c08c) } // Stall @@ -12635,7 +12635,7 @@ Method(m615,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, 990)) { - err(arg0, z090, 1, 0, 0, Local2, 990) + err(arg0, z090, __LINE__, 0, 0, Local2, 990) } } @@ -12658,7 +12658,7 @@ Method(m615,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z090, 0, 0, 0, Local2, c08c) + err(arg0, z090, __LINE__, 0, 0, Local2, c08c) } } @@ -12678,7 +12678,7 @@ Method(m615,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z090, 0, 0, 0, Local2, c08c) + err(arg0, z090, __LINE__, 0, 0, Local2, c08c) } } @@ -24043,7 +24043,7 @@ Method(m615,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z090, 0, 0, 0, Local2, c08c) + err(arg0, z090, __LINE__, 0, 0, Local2, c08c) } // Stall @@ -24056,7 +24056,7 @@ Method(m615,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, 990)) { - err(arg0, z090, 1, 0, 0, Local2, 990) + err(arg0, z090, __LINE__, 0, 0, Local2, 990) } } @@ -24080,7 +24080,7 @@ Method(m615,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z090, 0, 0, 0, Local2, c08c) + err(arg0, z090, __LINE__, 0, 0, Local2, c08c) } } @@ -24100,7 +24100,7 @@ Method(m615,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z090, 0, 0, 0, Local2, c08c) + err(arg0, z090, __LINE__, 0, 0, Local2, c08c) } } diff --git a/tests/aslts/src/runtime/collections/complex/operand/tests/oreftonamed/oreftonamed1.asl b/tests/aslts/src/runtime/collections/complex/operand/tests/oreftonamed/oreftonamed1.asl index 5804274bd..6a61b13db 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 @@ -12622,7 +12622,7 @@ Method(m616,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z091, 0, 0, 0, Local2, c08c) + err(arg0, z091, __LINE__, 0, 0, Local2, c08c) } // Stall @@ -12635,7 +12635,7 @@ Method(m616,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, 990)) { - err(arg0, z091, 1, 0, 0, Local2, 990) + err(arg0, z091, __LINE__, 0, 0, Local2, 990) } } @@ -12658,7 +12658,7 @@ Method(m616,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z091, 0, 0, 0, Local2, c08c) + err(arg0, z091, __LINE__, 0, 0, Local2, c08c) } } @@ -12678,7 +12678,7 @@ Method(m616,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z091, 0, 0, 0, Local2, c08c) + err(arg0, z091, __LINE__, 0, 0, Local2, c08c) } } @@ -24043,7 +24043,7 @@ Method(m616,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z091, 0, 0, 0, Local2, c08c) + err(arg0, z091, __LINE__, 0, 0, Local2, c08c) } // Stall @@ -24056,7 +24056,7 @@ Method(m616,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, 990)) { - err(arg0, z091, 1, 0, 0, Local2, 990) + err(arg0, z091, __LINE__, 0, 0, Local2, 990) } } @@ -24080,7 +24080,7 @@ Method(m616,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z091, 0, 0, 0, Local2, c08c) + err(arg0, z091, __LINE__, 0, 0, Local2, c08c) } } @@ -24100,7 +24100,7 @@ Method(m616,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z091, 0, 0, 0, Local2, c08c) + err(arg0, z091, __LINE__, 0, 0, Local2, c08c) } } diff --git a/tests/aslts/src/runtime/collections/complex/operand/tests/oreftonamed/oreftonamed2.asl b/tests/aslts/src/runtime/collections/complex/operand/tests/oreftonamed/oreftonamed2.asl index fb37b3415..445aaa721 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 @@ -11857,7 +11857,7 @@ Method(m61b,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z120, 0, 0, 0, Local2, c08c) + err(arg0, z120, __LINE__, 0, 0, Local2, c08c) } // Stall @@ -11870,7 +11870,7 @@ Method(m61b,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, 990)) { - err(arg0, z120, 1, 0, 0, Local2, 990) + err(arg0, z120, __LINE__, 0, 0, Local2, 990) } } @@ -11894,7 +11894,7 @@ Method(m61b,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z120, 0, 0, 0, Local2, c08c) + err(arg0, z120, __LINE__, 0, 0, Local2, c08c) } } @@ -11914,7 +11914,7 @@ Method(m61b,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z120, 0, 0, 0, Local2, c08c) + err(arg0, z120, __LINE__, 0, 0, Local2, c08c) } } diff --git a/tests/aslts/src/runtime/collections/complex/operand/tests/oreftopackageel/oreftopackageel.asl b/tests/aslts/src/runtime/collections/complex/operand/tests/oreftopackageel/oreftopackageel.asl index 7ec472766..c8a03e9ce 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 @@ -12623,7 +12623,7 @@ Method(m61a,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z119, 0, 0, 0, Local2, c08c) + err(arg0, z119, __LINE__, 0, 0, Local2, c08c) } // Stall @@ -12636,7 +12636,7 @@ Method(m61a,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, 990)) { - err(arg0, z119, 1, 0, 0, Local2, 990) + err(arg0, z119, __LINE__, 0, 0, Local2, 990) } } @@ -12659,7 +12659,7 @@ Method(m61a,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z119, 0, 0, 0, Local2, c08c) + err(arg0, z119, __LINE__, 0, 0, Local2, c08c) } } @@ -12679,7 +12679,7 @@ Method(m61a,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z119, 0, 0, 0, Local2, c08c) + err(arg0, z119, __LINE__, 0, 0, Local2, c08c) } } @@ -24045,7 +24045,7 @@ Method(m61a,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z119, 0, 0, 0, Local2, c08c) + err(arg0, z119, __LINE__, 0, 0, Local2, c08c) } // Stall @@ -24058,7 +24058,7 @@ Method(m61a,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, 990)) { - err(arg0, z119, 1, 0, 0, Local2, 990) + err(arg0, z119, __LINE__, 0, 0, Local2, 990) } } @@ -24082,7 +24082,7 @@ Method(m61a,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z119, 0, 0, 0, Local2, c08c) + err(arg0, z119, __LINE__, 0, 0, Local2, c08c) } } @@ -24102,7 +24102,7 @@ Method(m61a,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z119, 0, 0, 0, Local2, c08c) + err(arg0, z119, __LINE__, 0, 0, Local2, c08c) } } diff --git a/tests/aslts/src/runtime/collections/complex/operand/tests/oreturn/oreturn.asl b/tests/aslts/src/runtime/collections/complex/operand/tests/oreturn/oreturn.asl index 7eacf1d57..a24f03ec7 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 @@ -12622,7 +12622,7 @@ Method(m619,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z118, 0, 0, 0, Local2, c08c) + err(arg0, z118, __LINE__, 0, 0, Local2, c08c) } // Stall @@ -12635,7 +12635,7 @@ Method(m619,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, 990)) { - err(arg0, z118, 1, 0, 0, Local2, 990) + err(arg0, z118, __LINE__, 0, 0, Local2, 990) } } @@ -12658,7 +12658,7 @@ Method(m619,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z118, 0, 0, 0, Local2, c08c) + err(arg0, z118, __LINE__, 0, 0, Local2, c08c) } } @@ -12678,7 +12678,7 @@ Method(m619,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z118, 0, 0, 0, Local2, c08c) + err(arg0, z118, __LINE__, 0, 0, Local2, c08c) } } @@ -24043,7 +24043,7 @@ Method(m619,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z118, 0, 0, 0, Local2, c08c) + err(arg0, z118, __LINE__, 0, 0, Local2, c08c) } // Stall @@ -24056,7 +24056,7 @@ Method(m619,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, 990)) { - err(arg0, z118, 1, 0, 0, Local2, 990) + err(arg0, z118, __LINE__, 0, 0, Local2, 990) } } @@ -24080,7 +24080,7 @@ Method(m619,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z118, 0, 0, 0, Local2, c08c) + err(arg0, z118, __LINE__, 0, 0, Local2, c08c) } } @@ -24100,7 +24100,7 @@ Method(m619,, Serialized) Store(Timer, Local1) Subtract(Local1, Local0, Local2) if (LLess(Local2, c08c)) { - err(arg0, z118, 0, 0, 0, Local2, c08c) + err(arg0, z118, __LINE__, 0, 0, Local2, c08c) } } diff --git a/tests/aslts/src/runtime/collections/complex/provoke/provoke.asl b/tests/aslts/src/runtime/collections/complex/provoke/provoke.asl index c863ab71a..29bd4aeae 100644 --- a/tests/aslts/src/runtime/collections/complex/provoke/provoke.asl +++ b/tests/aslts/src/runtime/collections/complex/provoke/provoke.asl @@ -48,7 +48,7 @@ Method(m130, 1, Serialized) Store(ToString(B000, Local0), Local2) if (LNotequal(Local0, 0)) { - err(arg0, z055, 0, 0, 0, Local0, 0) + err(arg0, z055, __LINE__, 0, 0, Local0, 0) } CH03(arg0, z055, 1, 0, 0) @@ -69,7 +69,7 @@ Method(m132, 1) Store(10, Local0) m131(Local0) if (LNotEqual(Local0, 10)){ - err(arg0, z055, 2, 0, 0, Local0, 10) + err(arg0, z055, __LINE__, 0, 0, Local0, 10) } CH03(arg0, z055, 3, 0, 0) @@ -83,7 +83,7 @@ Method(m133, 1) Store(RefOf(Local0), Local1) m131(Local1) if (LNotEqual(Local0, 9)){ - err(arg0, z055, 4, 0, 0, Local0, 9) + err(arg0, z055, __LINE__, 0, 0, Local0, 9) } CH03(arg0, z055, 5, 0, 0) @@ -94,7 +94,7 @@ Method(m134, 1) Store(10, Local0) m131(RefOf(Local0)) if (LNotEqual(Local0, 9)){ - err(arg0, z055, 6, 0, 0, Local0, 9) + err(arg0, z055, __LINE__, 0, 0, Local0, 9) } CH03(arg0, z055, 7, 0, 0) @@ -110,7 +110,7 @@ Method(m136, 1) Store(10, Local0) m135(RefOf(Local0)) if (LNotEqual(Local0, 5)){ - err(arg0, z055, 8, 0, 0, Local0, 5) + err(arg0, z055, __LINE__, 0, 0, Local0, 5) } CH03(arg0, z055, 9, 0, 0) diff --git a/tests/aslts/src/runtime/collections/complex/result/common/rcommon.asl b/tests/aslts/src/runtime/collections/complex/result/common/rcommon.asl index ef8d2cdf1..70f975b75 100644 --- a/tests/aslts/src/runtime/collections/complex/result/common/rcommon.asl +++ b/tests/aslts/src/runtime/collections/complex/result/common/rcommon.asl @@ -325,11 +325,11 @@ Method(m680, 5) Store(ObjectType(arg3), Local0) Store(ObjectType(arg4), Local1) if (LNotEqual(Local0, Local1)) { - err(Concatenate(arg0, "-OType"), z122, arg1, arg2, 0, Local0, Local1) + err(Concatenate(arg0, "-OType"), z122, __LINE__, arg2, 0, Local0, Local1) Return (1) } elseif (Derefof(Index(b679, Local0))) { if (LNotEqual(arg3, arg4)) { - err(arg0, z122, arg1, arg2, 0, arg3, arg4) + err(arg0, z122, __LINE__, arg2, 0, arg3, arg4) Return (1) } } @@ -634,7 +634,7 @@ if (y361) { Method(m004, 3) { if (LNotEqual(arg0, arg1)) { - err(arg0, z122, 2, 0, 0, arg0, arg1) + err(arg0, z122, __LINE__, 0, 0, arg0, arg1) if (STCS) {m000(3, 0x100, arg2, arg1)} } } @@ -1103,7 +1103,7 @@ if (y361) { } Default { // Unexpected Target Type - err(Concatenate(arg0, terr), z122, 4, 0, 0, arg1, 0) + err(Concatenate(arg0, terr), z122, __LINE__, 0, 0, arg1, 0) Return (1) } } @@ -1120,7 +1120,7 @@ if (y361) { Store(ObjectType(arg2), Local0) if (LNotEqual(Local0, arg1)) { // ObjectType of Target can not be set up - err(arg0, z122, 6, 0, 0, Local0, arg1) + err(arg0, z122, __LINE__, 0, 0, Local0, arg1) Return (1) } @@ -1209,7 +1209,7 @@ if (y361) { } Default { // Unexpected Source Type - err(Concatenate(arg0, terr), z122, 7, 0, 0, arg1, 0) + err(Concatenate(arg0, terr), z122, __LINE__, 0, 0, arg1, 0) Return (1) } } @@ -1226,7 +1226,7 @@ if (y361) { Store(ObjectType(arg2), Local0) if (LNotEqual(Local0, arg1)) { // ObjectType of Source can not be set up - err(arg0, z122, 9, 0, 0, Local0, arg1) + err(arg0, z122, __LINE__, 0, 0, Local0, arg1) Return (1) } @@ -1255,7 +1255,7 @@ if (y361) { Store(ObjectType(arg2), Local0) if (LNotEqual(Local0, arg1)) { // ObjectType of Source object is corrupted - err(arg0, z122, 11, 0, 0, Local0, arg1) + err(arg0, z122, __LINE__, 0, 0, Local0, arg1) Return (1) } @@ -1321,14 +1321,14 @@ if (y361) { } Default { // Unexpected Result Type - err(arg0, z122, 12, 0, 0, arg1, 0) + err(arg0, z122, __LINE__, 0, 0, arg1, 0) Return (1) } } if (LNotEqual(Local0, arg1)) { // Mismatch of Source Type against specified Result Type - err(arg0, z122, 13, 0, 0, Local0, arg1) + err(arg0, z122, __LINE__, 0, 0, Local0, arg1) if (STCS) {m000(3, 0x1000000, Local0, arg1)} @@ -1338,31 +1338,31 @@ if (y361) { Switch(ToInteger(arg1)) { Case(1) { if (LNotEqual(INT0, Derefof(arg3))) { - err(arg0, z122, 14, 0, 0, INT0, Derefof(arg3)) + err(arg0, z122, __LINE__, 0, 0, INT0, Derefof(arg3)) Return (1) } if (LNotEqual(Derefof(arg2), INT0)) { - err(arg0, z122, 15, 0, 0, Derefof(arg2), INT0) + err(arg0, z122, __LINE__, 0, 0, Derefof(arg2), INT0) Return (1) } } Case(2) { if (LNotEqual(STR0, Derefof(arg3))) { - err(arg0, z122, 16, 0, 0, STR0, Derefof(arg3)) + err(arg0, z122, __LINE__, 0, 0, STR0, Derefof(arg3)) Return (1) } if (LNotEqual(Derefof(arg2), STR0)) { - err(arg0, z122, 17, 0, 0, Derefof(arg2), STR0) + err(arg0, z122, __LINE__, 0, 0, Derefof(arg2), STR0) Return (1) } } Case(3) { if (LNotEqual(BUF0, Derefof(arg3))) { - err(arg0, z122, 18, 0, 0, BUF0, Derefof(arg3)) + err(arg0, z122, __LINE__, 0, 0, BUF0, Derefof(arg3)) Return (1) } if (LNotEqual(Derefof(arg2), BUF0)) { - err(arg0, z122, 19, 0, 0, Derefof(arg2), BUF0) + err(arg0, z122, __LINE__, 0, 0, Derefof(arg2), BUF0) Return (1) } } @@ -1370,7 +1370,7 @@ if (y361) { Store(Sizeof(PAC0), Local0) if (LNotEqual(Sizeof(arg3), Local0)) { - err(arg0, z122, 20, 0, 0, Sizeof(arg3), Local0) + err(arg0, z122, __LINE__, 0, 0, Sizeof(arg3), Local0) Return (1) } While (Local0) { @@ -1379,7 +1379,7 @@ if (y361) { Store(ObjectType(Derefof(Index(PAC0, Local0))), Local2) if (LNotEqual(Local1, Local2)) { // ObjectType is corrupted - err(arg0, z122, 21, 0, 0, Local1, Local2) + err(arg0, z122, __LINE__, 0, 0, Local1, Local2) Return (1) } elseif (Derefof(Index(b679, Local1))) { // the computational data type @@ -1387,7 +1387,7 @@ if (y361) { Derefof(Index(Derefof(arg3), Local0)), Derefof(Index(PAC0, Local0)))) { // The value is corrupted - err(arg0, z122, 22, 0, 0, Derefof(Index(Derefof(arg3), Local0)), Local0) + err(arg0, z122, __LINE__, 0, 0, Derefof(Index(Derefof(arg3), Local0)), Local0) Return (1) } } @@ -1395,7 +1395,7 @@ if (y361) { Store(Sizeof(PAC0), Local0) if (LNotEqual(Sizeof(arg2), Local0)) { - err(arg0, z122, 23, 0, 0, Sizeof(arg2), Local0) + err(arg0, z122, __LINE__, 0, 0, Sizeof(arg2), Local0) Return (1) } While (Local0) { @@ -1404,7 +1404,7 @@ if (y361) { Store(ObjectType(Derefof(Index(PAC0, Local0))), Local2) if (LNotEqual(Local1, Local2)) { // ObjectType is corrupted - err(arg0, z122, 24, 0, 0, Local1, Local2) + err(arg0, z122, __LINE__, 0, 0, Local1, Local2) Return (1) } elseif (Derefof(Index(b679, Local1))) { // the computational data type @@ -1412,7 +1412,7 @@ if (y361) { Derefof(Index(Derefof(arg2), Local0)), Derefof(Index(PAC0, Local0)))) { // The value is corrupted - err(arg0, z122, 25, 0, 0, Derefof(Index(Derefof(arg2), Local0)), Local0) + err(arg0, z122, __LINE__, 0, 0, Derefof(Index(Derefof(arg2), Local0)), Local0) Return (1) } } @@ -1422,29 +1422,29 @@ if (y361) { Store(Derefof(Index(Derefof(arg3), 0)), Local0) if (LEqual(Local0, 0)) { if (LNotEqual(FLU0, Derefof(Index(Derefof(arg3), 1)))) { - err(arg0, z122, 26, 0, 0, FLU0, Derefof(Index(Derefof(arg3), 1))) + err(arg0, z122, __LINE__, 0, 0, FLU0, Derefof(Index(Derefof(arg3), 1))) Return (1) } if (LNotEqual(Derefof(arg2), FLU0)) { - err(arg0, z122, 27, 0, 0, Derefof(arg2), FLU0) + err(arg0, z122, __LINE__, 0, 0, Derefof(arg2), FLU0) Return (1) } } elseif (LEqual(Local0, 1)) { if (LNotEqual(FLU2, Derefof(Index(Derefof(arg3), 1)))) { - err(arg0, z122, 28, 0, 0, FLU2, Derefof(Index(Derefof(arg3), 1))) + err(arg0, z122, __LINE__, 0, 0, FLU2, Derefof(Index(Derefof(arg3), 1))) Return (1) } if (LNotEqual(Derefof(arg2), FLU2)) { - err(arg0, z122, 29, 0, 0, Derefof(arg2), FLU2) + err(arg0, z122, __LINE__, 0, 0, Derefof(arg2), FLU2) Return (1) } } else { if (LNotEqual(FLU4, Derefof(Index(Derefof(arg3), 1)))) { - err(arg0, z122, 30, 0, 0, FLU4, Derefof(Index(Derefof(arg3), 1))) + err(arg0, z122, __LINE__, 0, 0, FLU4, Derefof(Index(Derefof(arg3), 1))) Return (1) } if (LNotEqual(Derefof(arg2), FLU4)) { - err(arg0, z122, 31, 0, 0, Derefof(arg2), FLU4) + err(arg0, z122, __LINE__, 0, 0, Derefof(arg2), FLU4) Return (1) } } @@ -1452,7 +1452,7 @@ if (y361) { Case(8) { CopyObject(Derefof(arg2), MMM2) if (LNotEqual(MMM2, MMM0)) { - err(arg0, z122, 32, 0, 0, MMM2, MMM0) + err(arg0, z122, __LINE__, 0, 0, MMM2, MMM0) Return (1) } } @@ -1460,29 +1460,29 @@ if (y361) { Store(Derefof(Index(Derefof(arg3), 0)), Local0) if (LEqual(Local0, 0)) { if (LNotEqual(BFL0, Derefof(Index(Derefof(arg3), 1)))) { - err(arg0, z122, 33, 0, 0, BFL0, Derefof(Index(Derefof(arg3), 1))) + err(arg0, z122, __LINE__, 0, 0, BFL0, Derefof(Index(Derefof(arg3), 1))) Return (1) } if (LNotEqual(Derefof(arg2), BFL0)) { - err(arg0, z122, 34, 0, 0, Derefof(arg2), BFL0) + err(arg0, z122, __LINE__, 0, 0, Derefof(arg2), BFL0) Return (1) } } elseif (LEqual(Local0, 1)) { if (LNotEqual(BFL2, Derefof(Index(Derefof(arg3), 1)))) { - err(arg0, z122, 35, 0, 0, BFL2, Derefof(Index(Derefof(arg3), 1))) + err(arg0, z122, __LINE__, 0, 0, BFL2, Derefof(Index(Derefof(arg3), 1))) Return (1) } if (LNotEqual(Derefof(arg2), BFL2)) { - err(arg0, z122, 36, 0, 0, Derefof(arg2), BFL2) + err(arg0, z122, __LINE__, 0, 0, Derefof(arg2), BFL2) Return (1) } } else { if (LNotEqual(BFL4, Derefof(Index(Derefof(arg3), 1)))) { - err(arg0, z122, 37, 0, 0, BFL4, Derefof(Index(Derefof(arg3), 1))) + err(arg0, z122, __LINE__, 0, 0, BFL4, Derefof(Index(Derefof(arg3), 1))) Return (1) } if (LNotEqual(Derefof(arg2), BFL4)) { - err(arg0, z122, 38, 0, 0, Derefof(arg2), BFL4) + err(arg0, z122, __LINE__, 0, 0, Derefof(arg2), BFL4) Return (1) } } @@ -1512,10 +1512,10 @@ if (y361) { if (LEqual(arg2, c016)) { if (X170) { //this sentence is for m00d and invalid, removed. - //err(arg0, z122, 39, 0, 0, Local2, arg2) + //err(arg0, z122, __LINE__, 0, 0, Local2, arg2) } } else { - err(arg0, z122, 39, 0, 0, Local2, arg2) + err(arg0, z122, __LINE__, 0, 0, Local2, arg2) } if (STCS) {m000(3, 0x100, arg2, Local2)} @@ -1538,12 +1538,12 @@ if (y361) { } } elseif (LNotEqual(m684(arg3), 1)) { // Types mismatch Result/Target on storing - err(arg0, z122, 41, 0, 0, Local2, arg3) + err(arg0, z122, __LINE__, 0, 0, Local2, arg3) Return (1) } elseif (LNotEqual(Local2, 3)) { // Types mismatch Result/Target on storing // Test fixed type Objects are converted to Buffer - err(arg0, z122, 42, 0, 0, Local2, 3) + err(arg0, z122, __LINE__, 0, 0, Local2, 3) Return (1) } if (STCS) {m000(3, 0x100, arg3, Local2)} @@ -1576,18 +1576,18 @@ if (y361) { if (LEqual(arg3, 8)) { // Method CopyObject(Derefof(arg1), MMM2) if (LNotEqual(MMM2, Local7)) { - err(arg0, z122, 43, 0, 0, MMM2, Local7) + err(arg0, z122, __LINE__, 0, 0, MMM2, Local7) Return (1) } } elseif (LNotEqual(arg3, 4)) { // Not Package if (LNotEqual(Derefof(arg1), Local7)) { - err(arg0, z122, 44, 0, 0, Derefof(arg1), Local7) + err(arg0, z122, __LINE__, 0, 0, Derefof(arg1), Local7) Return (1) } } else { // Package Store(Sizeof(Local7), Local0) if (LNotEqual(Sizeof(arg1), Local0)) { - err(arg0, z122, 45, 0, 0, Sizeof(arg1), Local0) + err(arg0, z122, __LINE__, 0, 0, Sizeof(arg1), Local0) Return (1) } While (Local0) { @@ -1596,7 +1596,7 @@ if (y361) { Store(ObjectType(Derefof(Index(Local7, Local0))), Local2) if (LNotEqual(Local1, Local2)) { // ObjectType is corrupted - err(arg0, z122, 46, 0, 0, Local1, Local2) + err(arg0, z122, __LINE__, 0, 0, Local1, Local2) Return (1) } elseif (Derefof(Index(b679, Local1))) { // the computational data type @@ -1604,7 +1604,7 @@ if (y361) { Derefof(Index(Derefof(arg1), Local0)), Derefof(Index(Local7, Local0)))) { // The value is corrupted - err(arg0, z122, 47, 0, 0, Derefof(Index(Derefof(arg1), Local0)), Derefof(Index(Local7, Local0))) + err(arg0, z122, __LINE__, 0, 0, Derefof(Index(Derefof(arg1), Local0)), Derefof(Index(Local7, Local0))) Return (1) } } @@ -1742,7 +1742,7 @@ if (y361) { } if (m004(Concatenate(arg0, "-m004"), arg3, Local6, Local7)) { // Source Object can not be prepared - err(Concatenate(arg0, terr), z122, 51, 0, 0, arg3, 0) + err(Concatenate(arg0, terr), z122, __LINE__, 0, 0, arg3, 0) Return (1) } @@ -1759,7 +1759,7 @@ if (y361) { } if (m003(Concatenate(arg0, "-m003"), arg2, Local1, Local7)) { // Target Object can not be prepared - err(Concatenate(arg0, terr), z122, 52, 0, 0, arg2, 0) + err(Concatenate(arg0, terr), z122, __LINE__, 0, 0, arg2, 0) Return (1) } @@ -1817,7 +1817,7 @@ if (y361) { } } else { // Unexpected Kind of Op (0 - Store, ...) - err(Concatenate(arg0, terr), z122, 54, 0, 0, arg4, 0) + err(Concatenate(arg0, terr), z122, __LINE__, 0, 0, arg4, 0) Return (1) } } elseif (LEqual(arg2, 14)) { // Buffer Field Target @@ -1867,7 +1867,7 @@ if (y361) { } } else { // Unexpected Kind of Op (0 - Store, ...) - err(Concatenate(arg0, terr), z122, 55, 0, 0, arg4, 0) + err(Concatenate(arg0, terr), z122, __LINE__, 0, 0, arg4, 0) Return (1) } @@ -1919,7 +1919,7 @@ if (y361) { } else { // Unexpected Kind of Op (0 - Store, ...) - err(Concatenate(arg0, terr), z122, 56, 0, 0, arg4, 0) + err(Concatenate(arg0, terr), z122, __LINE__, 0, 0, arg4, 0) Return (1) } @@ -2102,7 +2102,7 @@ if (y361) { } if (m004(Concatenate(arg0, "-m004"), arg3, Local6, Local7)) { // Source Object can not be prepared - err(Concatenate(arg0, terr), z122, 59, 0, 0, arg3, 0) + err(Concatenate(arg0, terr), z122, __LINE__, 0, 0, arg3, 0) Return (1) } @@ -2110,7 +2110,7 @@ if (y361) { Store(Index(Derefof(Index(arg6, 3)), arg2), Local7) if (m003(Concatenate(arg0, "-m003"), arg2, Refof(Local4), Local7)) { // Target Object can not be prepared - err(Concatenate(arg0, terr), z122, 60, 0, 0, arg2, 0) + err(Concatenate(arg0, terr), z122, __LINE__, 0, 0, arg2, 0) Return (1) } @@ -2167,7 +2167,7 @@ if (y361) { } } else { // Unexpected Kind of Op (0 - Store, ...) - err(Concatenate(arg0, terr), z122, 62, 0, 0, arg4, 0) + err(Concatenate(arg0, terr), z122, __LINE__, 0, 0, arg4, 0) Return (1) } @@ -2254,7 +2254,7 @@ if (y361) { Store(Index(arg6, 2), Local7) if (m004(Concatenate(arg0, "-m004"), arg3, Refof(Local1), Local7)) { // Source Object can not be prepared - err(Concatenate(arg0, terr), z122, 64, 0, 0, arg3, 0) + err(Concatenate(arg0, terr), z122, __LINE__, 0, 0, arg3, 0) Return (1) } @@ -2271,7 +2271,7 @@ if (y361) { } if (m003(Concatenate(arg0, "-m003"), arg2, Local4, Local7)) { // Target Object can not be prepared - err(Concatenate(arg0, terr), z122, 65, 0, 0, arg2, 0) + err(Concatenate(arg0, terr), z122, __LINE__, 0, 0, arg2, 0) Return (1) } @@ -2288,7 +2288,7 @@ if (y361) { CopyObject(Local1, FLU1) } else { // Unexpected Kind of Op (0 - Store, ...) - err(Concatenate(arg0, terr), z122, 67, 0, 0, arg4, 0) + err(Concatenate(arg0, terr), z122, __LINE__, 0, 0, arg4, 0) Return (1) } } elseif (LEqual(arg2, 14)) { // Buffer Field Target @@ -2298,7 +2298,7 @@ if (y361) { CopyObject(Local1, BFL1) } else { // Unexpected Kind of Op (0 - Store, ...) - err(Concatenate(arg0, terr), z122, 68, 0, 0, arg4, 0) + err(Concatenate(arg0, terr), z122, __LINE__, 0, 0, arg4, 0) Return (1) } @@ -2310,7 +2310,7 @@ if (y361) { } else { // Unexpected Kind of Op (0 - Store, ...) - err(Concatenate(arg0, terr), z122, 69, 0, 0, arg4, 0) + err(Concatenate(arg0, terr), z122, __LINE__, 0, 0, arg4, 0) Return (1) } @@ -2450,7 +2450,7 @@ if (y361) { Store(Index(arg6, 2), Local7) if (m004(Concatenate(arg0, "-m004"), arg3, Refof(Local1), Local7)) { // Source Object can not be prepared - err(Concatenate(arg0, terr), z122, 72, 0, 0, arg3, 0) + err(Concatenate(arg0, terr), z122, __LINE__, 0, 0, arg3, 0) Return (1) } @@ -2458,7 +2458,7 @@ if (y361) { Store(Index(Derefof(Index(arg6, 3)), arg2), Local7) if (m003(Concatenate(arg0, "-m003"), arg2, Refof(Local4), Local7)) { // Target Object can not be prepared - err(Concatenate(arg0, terr), z122, 73, 0, 0, arg2, 0) + err(Concatenate(arg0, terr), z122, __LINE__, 0, 0, arg2, 0) Return (1) } @@ -2474,7 +2474,7 @@ if (y361) { CopyObject(Local1, Local4) } else { // Unexpected Kind of Op (0 - Store, ...) - err(Concatenate(arg0, terr), z122, 75, 0, 0, arg4, 0) + err(Concatenate(arg0, terr), z122, __LINE__, 0, 0, arg4, 0) Return (1) } @@ -2601,7 +2601,7 @@ if (y361) { } if (m004(Concatenate(arg0, "-m004"), arg3, Local6, Local7)) { // Source Object can not be prepared - err(Concatenate(arg0, terr), z122, 77, 0, 0, arg3, 0) + err(Concatenate(arg0, terr), z122, __LINE__, 0, 0, arg3, 0) Return (1) } @@ -2662,7 +2662,7 @@ if (y361) { } else { // Unexpected Kind of Op (0 - Store, ...) - err(Concatenate(arg0, terr), z122, 79, 0, 0, arg4, 0) + err(Concatenate(arg0, terr), z122, __LINE__, 0, 0, arg4, 0) Return (1) } @@ -2763,7 +2763,7 @@ if (y361) { } if (m003(Concatenate(arg0, "-m003"), arg2, Local1, Local7)) { // Target Object can not be prepared - err(Concatenate(arg0, terr), z122, 82, 0, 0, arg2, 0) + err(Concatenate(arg0, terr), z122, __LINE__, 0, 0, arg2, 0) Return (1) } @@ -2858,7 +2858,7 @@ if (y361) { } if (m004(Concatenate(arg0, "-m004"), arg3, Local6, Local7)) { // Source Object can not be prepared - err(Concatenate(arg0, terr), z122, 84, 0, 0, arg3, 0) + err(Concatenate(arg0, terr), z122, __LINE__, 0, 0, arg3, 0) Return (1) } @@ -2917,7 +2917,7 @@ if (y361) { } else { // Unexpected Kind of Op (0 - Store, ...) - err(Concatenate(arg0, terr), z122, 86, 0, 0, arg4, 0) + err(Concatenate(arg0, terr), z122, __LINE__, 0, 0, arg4, 0) Return (1) } @@ -3021,7 +3021,7 @@ if (y361) { } if (m003(Concatenate(arg0, "-m003"), arg2, Local1, Local7)) { // Target Object can not be prepared - err(Concatenate(arg0, terr), z122, 89, 0, 0, arg2, 0) + err(Concatenate(arg0, terr), z122, __LINE__, 0, 0, arg2, 0) Return (1) } @@ -3059,7 +3059,7 @@ if (y361) { Store(Index(arg6, 2), Local7) if (m004(Concatenate(arg0, "-m004"), arg3, Refof(Local1), Local7)) { // Source Object can not be prepared - err(Concatenate(arg0, terr), z122, 91, 0, 0, arg3, 0) + err(Concatenate(arg0, terr), z122, __LINE__, 0, 0, arg3, 0) Return (1) } @@ -3068,7 +3068,7 @@ if (y361) { Store(Index(Derefof(Index(arg6, 3)), arg2), Local7) if (m013(Concatenate(arg0, "-m003"), arg2, DST0, Local7)) { // Target Object can not be prepared - err(Concatenate(arg0, terr), z122, 92, 0, 0, arg2, 0) + err(Concatenate(arg0, terr), z122, __LINE__, 0, 0, arg2, 0) Return (1) } @@ -3080,7 +3080,7 @@ if (y361) { // Check Target Object to have the initial type and value if (m015(Concatenate(arg0, "-m015"), arg2, Local4, Local7)) { // Target Object can not be prepared - err(Concatenate(arg0, terr), z122, 94, 0, 0, arg2, 0) + err(Concatenate(arg0, terr), z122, __LINE__, 0, 0, arg2, 0) Return (1) } @@ -3091,7 +3091,7 @@ if (y361) { // CopyObject(Local1, Index(DST0, 0)) } else { // Unexpected Kind of Op (0 - Store, ...) - err(Concatenate(arg0, terr), z122, 95, 0, 0, arg4, 0) + err(Concatenate(arg0, terr), z122, __LINE__, 0, 0, arg4, 0) Return (1) } @@ -3193,7 +3193,7 @@ if (y361) { } Default { // Unexpected Target Type - err(Concatenate(arg0, terr), z122, 98, 0, 0, arg1, 0) + err(Concatenate(arg0, terr), z122, __LINE__, 0, 0, arg1, 0) Return (1) } } @@ -3210,7 +3210,7 @@ if (y361) { Store(ObjectType(Index(arg2, 0)), Local0) if (LNotEqual(Local0, arg1)) { // ObjectType of Target can not be set up - err(arg0, z122, 100, 0, 0, Local0, arg1) + err(arg0, z122, __LINE__, 0, 0, Local0, arg1) Return (1) } @@ -3237,7 +3237,7 @@ if (y361) { Store(ObjectType(arg2), Local0) if (LNotEqual(Local0, arg1)) { // ObjectType of Target object is corrupted - err(arg0, z122, 102, 0, 0, Local0, arg1) + err(arg0, z122, __LINE__, 0, 0, Local0, arg1) Return (1) } } @@ -3299,14 +3299,14 @@ if (y361) { } Default { // Unexpected Result Type - err(arg0, z122, 104, 0, 0, arg1, 0) + err(arg0, z122, __LINE__, 0, 0, arg1, 0) Return (1) } } if (LNotEqual(Local0, arg1)) { // Mismatch of Target Type against the specified one - err(arg0, z122, 105, 0, 0, Local0, arg1) + err(arg0, z122, __LINE__, 0, 0, Local0, arg1) if (STCS) {m000(3, 0x1000000, Local0, arg1)} @@ -3316,31 +3316,31 @@ if (y361) { Switch(ToInteger(arg1)) { Case(1) { if (LNotEqual(INT1, Derefof(arg3))) { - err(arg0, z122, 106, 0, 0, INT1, Derefof(arg3)) + err(arg0, z122, __LINE__, 0, 0, INT1, Derefof(arg3)) Return (1) } if (LNotEqual(Derefof(arg2), INT1)) { - err(arg0, z122, 107, 0, 0, Derefof(arg2), INT1) + err(arg0, z122, __LINE__, 0, 0, Derefof(arg2), INT1) Return (1) } } Case(2) { if (LNotEqual(STR1, Derefof(arg3))) { - err(arg0, z122, 108, 0, 0, STR1, Derefof(arg3)) + err(arg0, z122, __LINE__, 0, 0, STR1, Derefof(arg3)) Return (1) } if (LNotEqual(Derefof(arg2), STR1)) { - err(arg0, z122, 109, 0, 0, Derefof(arg2), STR1) + err(arg0, z122, __LINE__, 0, 0, Derefof(arg2), STR1) Return (1) } } Case(3) { if (LNotEqual(BUF1, Derefof(arg3))) { - err(arg0, z122, 110, 0, 0, BUF1, Derefof(arg3)) + err(arg0, z122, __LINE__, 0, 0, BUF1, Derefof(arg3)) Return (1) } if (LNotEqual(Derefof(arg2), BUF1)) { - err(arg0, z122, 111, 0, 0, Derefof(arg2), BUF1) + err(arg0, z122, __LINE__, 0, 0, Derefof(arg2), BUF1) Return (1) } } @@ -3348,7 +3348,7 @@ if (y361) { Store(Sizeof(PAC1), Local0) if (LNotEqual(Sizeof(arg3), Local0)) { - err(arg0, z122, 112, 0, 0, Sizeof(arg3), Local0) + err(arg0, z122, __LINE__, 0, 0, Sizeof(arg3), Local0) Return (1) } While (Local0) { @@ -3357,7 +3357,7 @@ if (y361) { Store(ObjectType(Derefof(Index(PAC1, Local0))), Local2) if (LNotEqual(Local1, Local2)) { // ObjectType is corrupted - err(arg0, z122, 113, 0, 0, Local1, Local2) + err(arg0, z122, __LINE__, 0, 0, Local1, Local2) Return (1) } elseif (Derefof(Index(b679, Local1))) { // the computational data type @@ -3365,7 +3365,7 @@ if (y361) { Derefof(Index(Derefof(arg3), Local0)), Derefof(Index(PAC1, Local0)))) { // The value is corrupted - err(arg0, z122, 114, 0, 0, Derefof(Index(Derefof(arg3), Local0)), Local0) + err(arg0, z122, __LINE__, 0, 0, Derefof(Index(Derefof(arg3), Local0)), Local0) Return (1) } } @@ -3373,7 +3373,7 @@ if (y361) { Store(Sizeof(PAC1), Local0) if (LNotEqual(Sizeof(arg2), Local0)) { - err(arg0, z122, 115, 0, 0, Sizeof(arg2), Local0) + err(arg0, z122, __LINE__, 0, 0, Sizeof(arg2), Local0) Return (1) } While (Local0) { @@ -3382,7 +3382,7 @@ if (y361) { Store(ObjectType(Derefof(Index(PAC1, Local0))), Local2) if (LNotEqual(Local1, Local2)) { // ObjectType is corrupted - err(arg0, z122, 116, 0, 0, Local1, Local2) + err(arg0, z122, __LINE__, 0, 0, Local1, Local2) Return (1) } elseif (Derefof(Index(b679, Local1))) { // the computational data type @@ -3390,7 +3390,7 @@ if (y361) { Derefof(Index(Derefof(arg2), Local0)), Derefof(Index(PAC1, Local0)))) { // The value is corrupted - err(arg0, z122, 117, 0, 0, Derefof(Index(Derefof(arg2), Local0)), Local0) + err(arg0, z122, __LINE__, 0, 0, Derefof(Index(Derefof(arg2), Local0)), Local0) Return (1) } } @@ -3398,20 +3398,20 @@ if (y361) { } Case(5) { if (LNotEqual(Derefof(arg2), Derefof(arg3))) { - err(arg0, z122, 118, 0, 0, Derefof(arg2), Derefof(arg3)) + err(arg0, z122, __LINE__, 0, 0, Derefof(arg2), Derefof(arg3)) Return (1) } } Case(8) { CopyObject(Derefof(arg2), MMM2) if (LNotEqual(MMM2, MMM1)) { - err(arg0, z122, 119, 0, 0, MMM2, MMM1) + err(arg0, z122, __LINE__, 0, 0, MMM2, MMM1) Return (1) } } Case(14) { if (LNotEqual(Derefof(arg2), Derefof(arg3))) { - err(arg0, z122, 120, 0, 0, Derefof(arg2), Derefof(arg3)) + err(arg0, z122, __LINE__, 0, 0, Derefof(arg2), Derefof(arg3)) Return (1) } } @@ -3482,14 +3482,14 @@ if (y361) { } Default { // Unexpected Result Type - err(arg0, z122, 122, 0, 0, arg1, 0) + err(arg0, z122, __LINE__, 0, 0, arg1, 0) Return (1) } } if (LNotEqual(Local0, arg1)) { // Mismatch of Target Type against the specified one - err(arg0, z122, 123, 0, 0, Local0, arg1) + err(arg0, z122, __LINE__, 0, 0, Local0, arg1) if (STCS) {m000(3, 0x1000000, Local0, arg1)} @@ -3499,19 +3499,19 @@ if (y361) { Switch(ToInteger(arg1)) { Case(1) { if (LNotEqual(INT1, Derefof(arg3))) { - err(arg0, z122, 124, 0, 0, INT1, Derefof(arg3)) + err(arg0, z122, __LINE__, 0, 0, INT1, Derefof(arg3)) Return (1) } } Case(2) { if (LNotEqual(STR1, Derefof(arg3))) { - err(arg0, z122, 125, 0, 0, STR1, Derefof(arg3)) + err(arg0, z122, __LINE__, 0, 0, STR1, Derefof(arg3)) Return (1) } } Case(3) { if (LNotEqual(BUF1, Derefof(arg3))) { - err(arg0, z122, 126, 0, 0, BUF1, Derefof(arg3)) + err(arg0, z122, __LINE__, 0, 0, BUF1, Derefof(arg3)) Return (1) } } @@ -3519,7 +3519,7 @@ if (y361) { Store(Sizeof(PAC1), Local0) if (LNotEqual(Sizeof(arg3), Local0)) { - err(arg0, z122, 127, 0, 0, Sizeof(arg3), Local0) + err(arg0, z122, __LINE__, 0, 0, Sizeof(arg3), Local0) Return (1) } While (Local0) { @@ -3528,7 +3528,7 @@ if (y361) { Store(ObjectType(Derefof(Index(PAC1, Local0))), Local2) if (LNotEqual(Local1, Local2)) { // ObjectType is corrupted - err(arg0, z122, 128, 0, 0, Local1, Local2) + err(arg0, z122, __LINE__, 0, 0, Local1, Local2) Return (1) } elseif (Derefof(Index(b679, Local1))) { // the computational data type @@ -3536,7 +3536,7 @@ if (y361) { Derefof(Index(Derefof(arg3), Local0)), Derefof(Index(PAC1, Local0)))) { // The value is corrupted - err(arg0, z122, 129, 0, 0, Derefof(Index(Derefof(arg3), Local0)), Local0) + err(arg0, z122, __LINE__, 0, 0, Derefof(Index(Derefof(arg3), Local0)), Local0) Return (1) } } @@ -4340,13 +4340,13 @@ if (y361) { if (LGreater(arg1, 1)) { // Unexpected Kind of Op (0 - Store, ...) - err(Concatenate(arg0, terr), z122, 133, 0, 0, arg1, 0) + err(Concatenate(arg0, terr), z122, __LINE__, 0, 0, arg1, 0) Return (1) } if (LGreater(arg5, 6)) { // Unexpected Kind of Source-Target pair - err(Concatenate(arg0, terr), z122, 134, 0, 0, arg5, 0) + err(Concatenate(arg0, terr), z122, __LINE__, 0, 0, arg5, 0) Return (1) } @@ -4397,7 +4397,7 @@ if (y361) { Store(Derefof(Index(Local2, 0)), Local3) if (LNotEqual(Local3, lpC1)) { // Unexpected data package - err(Concatenate(arg0, terr), z122, 135, 0, 0, arg1, lpC1) + err(Concatenate(arg0, terr), z122, __LINE__, 0, 0, arg1, lpC1) Return (1) } Store(Derefof(Index(Local2, 1)), Local3) diff --git a/tests/aslts/src/runtime/collections/complex/result/tests/rexplicitconv/rexplicitconv.asl b/tests/aslts/src/runtime/collections/complex/result/tests/rexplicitconv/rexplicitconv.asl index 57847c212..ca7502817 100644 --- a/tests/aslts/src/runtime/collections/complex/result/tests/rexplicitconv/rexplicitconv.asl +++ b/tests/aslts/src/runtime/collections/complex/result/tests/rexplicitconv/rexplicitconv.asl @@ -256,7 +256,7 @@ Method(m693, 5, Serialized) CopyObject(Derefof(arg3), BUF1) Store(Sizeof(BUF1), Local0) if (LNotEqual(Local0, 17)) { - err(Concatenate(arg0, terr), z126, 1, 0, 0, Local0, 17) + err(Concatenate(arg0, terr), z126, __LINE__, 0, 0, Local0, 17) Return (1) } CopyObject(BUF1, arg2) @@ -304,7 +304,7 @@ Method(m693, 5, Serialized) } Default { // Unexpected Target Type - err(Concatenate(arg0, terr), z126, 2, 0, 0, arg1, 0) + err(Concatenate(arg0, terr), z126, __LINE__, 0, 0, arg1, 0) Return (1) } } @@ -316,7 +316,7 @@ Method(m693, 5, Serialized) Store(ObjectType(arg2), Local0) if (LNotEqual(Local0, arg1)) { // ObjectType of Target can not be set up - err(arg0, z126, 4, 0, 0, Local0, arg1) + err(arg0, z126, __LINE__, 0, 0, Local0, arg1) Return (1) } @@ -345,7 +345,7 @@ Method(m693, 5, Serialized) } Default { // Unexpected Source Type - err(Concatenate(arg0, terr), z126, 5, 0, 0, arg1, 0) + err(Concatenate(arg0, terr), z126, __LINE__, 0, 0, arg1, 0) Return (1) } } @@ -357,7 +357,7 @@ Method(m693, 5, Serialized) Store(ObjectType(arg2), Local0) if (LNotEqual(Local0, arg1)) { // ObjectType of Source can not be set up - err(arg0, z126, 7, 0, 0, Local0, arg1) + err(arg0, z126, __LINE__, 0, 0, Local0, arg1) Return (1) } @@ -372,7 +372,7 @@ Method(m693, 5, Serialized) Store(ObjectType(arg2), Local0) if (LNotEqual(Local0, arg1)) { // ObjectType of Source object is corrupted - err(arg0, z126, 8, 0, 0, Local0, arg1) + err(arg0, z126, __LINE__, 0, 0, Local0, arg1) Return (1) } @@ -388,14 +388,14 @@ Method(m693, 5, Serialized) } Default { // Unexpected Result Type - err(arg0, z126, 9, 0, 0, arg1, 0) + err(arg0, z126, __LINE__, 0, 0, arg1, 0) Return (1) } } if (LNotEqual(Local0, arg1)) { // Mismatch of Source Type against specified one - err(arg0, z126, 10, 0, 0, Local0, arg1) + err(arg0, z126, __LINE__, 0, 0, Local0, arg1) if (STCS) {m000(3, 0x1000000, Local0, arg0)} Return (1) } else { @@ -403,31 +403,31 @@ Method(m693, 5, Serialized) Switch(ToInteger(arg1)) { Case(1) { if (LNotEqual(INT0, Derefof(arg3))) { - err(arg0, z126, 11, 0, 0, INT0, Derefof(arg3)) + err(arg0, z126, __LINE__, 0, 0, INT0, Derefof(arg3)) Return (1) } if (LNotEqual(Derefof(arg2), INT0)) { - err(arg0, z126, 12, 0, 0, Derefof(arg2), INT0) + err(arg0, z126, __LINE__, 0, 0, Derefof(arg2), INT0) Return (1) } } Case(2) { if (LNotEqual(STR0, Derefof(arg3))) { - err(arg0, z126, 13, 0, 0, STR0, Derefof(arg3)) + err(arg0, z126, __LINE__, 0, 0, STR0, Derefof(arg3)) Return (1) } if (LNotEqual(Derefof(arg2), STR0)) { - err(arg0, z126, 14, 0, 0, Derefof(arg2), STR0) + err(arg0, z126, __LINE__, 0, 0, Derefof(arg2), STR0) Return (1) } } Case(3) { if (LNotEqual(BUF0, Derefof(arg3))) { - err(arg0, z126, 15, 0, 0, BUF0, Derefof(arg3)) + err(arg0, z126, __LINE__, 0, 0, BUF0, Derefof(arg3)) Return (1) } if (LNotEqual(Derefof(arg2), BUF0)) { - err(arg0, z126, 16, 0, 0, Derefof(arg2), BUF0) + err(arg0, z126, __LINE__, 0, 0, Derefof(arg2), BUF0) Return (1) } } @@ -455,10 +455,10 @@ Method(m693, 5, Serialized) // Types mismatch Target/Target on storing if (LEqual(arg2, c016)) { if (X170) { - err(arg0, z126, 17, 0, 0, Local2, arg2) + err(arg0, z126, __LINE__, 0, 0, Local2, arg2) } } else { - err(arg0, z126, 17, 0, 0, Local2, arg2) + err(arg0, z126, __LINE__, 0, 0, Local2, arg2) } if (STCS) {m000(3, 0x100, arg2, Local2)} Return (1) @@ -469,12 +469,12 @@ Method(m693, 5, Serialized) if (LNotEqual(Local2, arg3)) { if (LNotEqual(m684(arg3), 1)) { // Types mismatch Result/Target on storing - err(arg0, z126, 18, 0, 0, Local2, arg3) + err(arg0, z126, __LINE__, 0, 0, Local2, arg3) Return (1) } elseif (LNotEqual(Local2, 3)) { // Types mismatch Result/Target on storing // Test fixed type Objects are converted to Buffer - err(arg0, z126, 19, 0, 0, Local2, 3) + err(arg0, z126, __LINE__, 0, 0, Local2, 3) Return (1) } if (STCS) {m000(3, 0x100, arg3, Local2)} @@ -494,10 +494,10 @@ Method(m693, 5, Serialized) if (LNotEqual(Derefof(arg1), Local7)) { if (LAnd(LEqual(arg2, c00b), LEqual(arg3, c00b))) { if (X194) { - err(arg0, z126, 20, 0, 0, Derefof(arg1), Local7) + err(arg0, z126, __LINE__, 0, 0, Derefof(arg1), Local7) } } else { - err(arg0, z126, 20, 0, 0, Derefof(arg1), Local7) + err(arg0, z126, __LINE__, 0, 0, Derefof(arg1), Local7) } Return (1) } @@ -527,7 +527,7 @@ Method(m693, 5, Serialized) Store(Index(arg6, 1), Local7) if (m004(Concatenate(arg0, "-m004"), arg3, Refof(SRC0), Local7)) { // Source Object can not be prepared - err(Concatenate(arg0, terr), z126, 21, 0, 0, arg3, 0) + err(Concatenate(arg0, terr), z126, __LINE__, 0, 0, arg3, 0) Return (1) } @@ -544,7 +544,7 @@ Method(m693, 5, Serialized) } if (m003(Concatenate(arg0, "-m003"), arg2, Local1, Local7)) { // Target Object can not be prepared - err(Concatenate(arg0, terr), z126, 22, 0, 0, arg2, 0) + err(Concatenate(arg0, terr), z126, __LINE__, 0, 0, arg2, 0) Return (1) } @@ -582,7 +582,7 @@ Method(m693, 5, Serialized) } } else { // Unexpected Kind of Op (0 - Store, ...) - err(Concatenate(arg0, terr), z126, 23, 0, 0, arg4, 0) + err(Concatenate(arg0, terr), z126, __LINE__, 0, 0, arg4, 0) Return (1) } } elseif (LEqual(arg2, 14)) { // Buffer Field Target @@ -618,7 +618,7 @@ Method(m693, 5, Serialized) } } else { // Unexpected Kind of Op (0 - Store, ...) - err(Concatenate(arg0, terr), z126, 24, 0, 0, arg4, 0) + err(Concatenate(arg0, terr), z126, __LINE__, 0, 0, arg4, 0) Return (1) } @@ -654,7 +654,7 @@ Method(m693, 5, Serialized) } } else { // Unexpected Kind of Op (0 - Store, ...) - err(Concatenate(arg0, terr), z126, 25, 0, 0, arg4, 0) + err(Concatenate(arg0, terr), z126, __LINE__, 0, 0, arg4, 0) Return (1) } @@ -711,7 +711,7 @@ Method(m693, 5, Serialized) Store(Index(arg6, 1), Local7) if (m004(Concatenate(arg0, "-m004"), arg3, Refof(SRC0), Local7)) { // Source Object can not be prepared - err(Concatenate(arg0, terr), z126, 28, 0, 0, arg3, 0) + err(Concatenate(arg0, terr), z126, __LINE__, 0, 0, arg3, 0) Return (1) } @@ -719,7 +719,7 @@ Method(m693, 5, Serialized) Store(Index(Derefof(Index(arg6, 2)), arg2), Local7) if (m003(Concatenate(arg0, "-m003"), arg2, Refof(Local4), Local7)) { // Target Object can not be prepared - err(Concatenate(arg0, terr), z126, 29, 0, 0, arg2, 0) + err(Concatenate(arg0, terr), z126, __LINE__, 0, 0, arg2, 0) Return (1) } @@ -756,7 +756,7 @@ Method(m693, 5, Serialized) } } else { // Unexpected Kind of Op (0 - Store, ...) - err(Concatenate(arg0, terr), z126, 30, 0, 0, arg4, 0) + err(Concatenate(arg0, terr), z126, __LINE__, 0, 0, arg4, 0) Return (1) } @@ -1288,13 +1288,13 @@ Method(m693, 5, Serialized) if (LGreater(arg0, 2)) { // Unexpected Kind of Op (0 - Store, ...) - err(Concatenate(ts, terr), z126, 33, 0, 0, arg0, 0) + err(Concatenate(ts, terr), z126, __LINE__, 0, 0, arg0, 0) Return (1) } if (LGreater(arg4, 1)) { // Unexpected Kind of Source-Target pair - err(Concatenate(ts, terr), z126, 34, 0, 0, arg4, 0) + err(Concatenate(ts, terr), z126, __LINE__, 0, 0, arg4, 0) Return (1) } diff --git a/tests/aslts/src/runtime/collections/complex/result/tests/rindecrement/rindecrement.asl b/tests/aslts/src/runtime/collections/complex/result/tests/rindecrement/rindecrement.asl index e0c7e7711..cc2ef3c8d 100644 --- a/tests/aslts/src/runtime/collections/complex/result/tests/rindecrement/rindecrement.asl +++ b/tests/aslts/src/runtime/collections/complex/result/tests/rindecrement/rindecrement.asl @@ -271,7 +271,7 @@ Method(m692, 2, Serialized) } Default { // Unexpected Source Type - err(Concatenate(arg0, terr), z125, 1, 0, 0, arg1, 0) + err(Concatenate(arg0, terr), z125, __LINE__, 0, 0, arg1, 0) Return (1) } } @@ -283,7 +283,7 @@ Method(m692, 2, Serialized) Store(ObjectType(arg2), Local0) if (LNotEqual(Local0, arg1)) { // ObjectType of Source can not be set up - err(arg0, z125, 3, 0, 0, Local0, arg1) + err(arg0, z125, __LINE__, 0, 0, Local0, arg1) Return (1) } @@ -305,10 +305,10 @@ Method(m692, 2, Serialized) // Target (Result) type should keep the original type if (LOr(LEqual(arg3, c00a), LEqual(arg3, c00b))) { if (X195) { - err(arg0, z125, 4, 0, 0, Local2, arg2) + err(arg0, z125, __LINE__, 0, 0, Local2, arg2) } } else { - err(arg0, z125, 4, 0, 0, Local2, arg2) + err(arg0, z125, __LINE__, 0, 0, Local2, arg2) } if (STCS) {m000(3, 0x100, arg2, Local2)} Return (1) @@ -327,7 +327,7 @@ Method(m692, 2, Serialized) Store(INT0, Local0) } if (LNotEqual(Derefof(arg1), Local0)) { - err(arg0, z125, 5, 0, 0, Derefof(arg1), Local0) + err(arg0, z125, __LINE__, 0, 0, Derefof(arg1), Local0) Return (1) } } @@ -341,7 +341,7 @@ Method(m692, 2, Serialized) Store(STR0, Local0) } if (LNotEqual(Derefof(arg1), Local0)) { - err(arg0, z125, 6, 0, 0, Derefof(arg1), Local0) + err(arg0, z125, __LINE__, 0, 0, Derefof(arg1), Local0) Return (1) } } @@ -355,12 +355,12 @@ Method(m692, 2, Serialized) Store(BUF0, Local0) } if (LNotEqual(Derefof(arg1), Local0)) { - err(arg0, z125, 7, 0, 0, Derefof(arg1), Local0) + err(arg0, z125, __LINE__, 0, 0, Derefof(arg1), Local0) Return (1) } } Default{ - err(Concatenate(arg0, terr), z125, 8, 0, 0, arg1, arg3) + err(Concatenate(arg0, terr), z125, __LINE__, 0, 0, arg1, arg3) Return (1) } } @@ -377,12 +377,12 @@ Method(m692, 2, Serialized) Store(STR0, STR1) } if (LNotEqual(Derefof(arg1), STR1)) { - err(arg0, z125, 9, 0, 0, Derefof(arg1), STR1) + err(arg0, z125, __LINE__, 0, 0, Derefof(arg1), STR1) Return (1) } } Default{ - err(Concatenate(arg0, terr), z125, 10, 0, 0, arg1, arg3) + err(Concatenate(arg0, terr), z125, __LINE__, 0, 0, arg1, arg3) Return (1) } } @@ -399,12 +399,12 @@ Method(m692, 2, Serialized) Store(BUF0, BUF1) } if (LNotEqual(Derefof(arg1), BUF1)) { - err(arg0, z125, 11, 0, 0, Derefof(arg1), BUF1) + err(arg0, z125, __LINE__, 0, 0, Derefof(arg1), BUF1) Return (1) } } Default{ - err(Concatenate(arg0, terr), z125, 12, 0, 0, arg1, arg3) + err(Concatenate(arg0, terr), z125, __LINE__, 0, 0, arg1, arg3) Return (1) } } @@ -421,12 +421,12 @@ Method(m692, 2, Serialized) Store(FLU0, FLU1) } if (LNotEqual(Derefof(arg1), FLU1)) { - err(arg0, z125, 13, 0, 0, Derefof(arg1), FLU1) + err(arg0, z125, __LINE__, 0, 0, Derefof(arg1), FLU1) Return (1) } } Default{ - err(Concatenate(arg0, terr), z125, 14, 0, 0, arg1, arg3) + err(Concatenate(arg0, terr), z125, __LINE__, 0, 0, arg1, arg3) Return (1) } } @@ -443,18 +443,18 @@ Method(m692, 2, Serialized) Store(BFL0, BFL1) } if (LNotEqual(Derefof(arg1), BFL1)) { - err(arg0, z125, 15, 0, 0, Derefof(arg1), BFL1) + err(arg0, z125, __LINE__, 0, 0, Derefof(arg1), BFL1) Return (1) } } Default{ - err(Concatenate(arg0, terr), z125, 16, 0, 0, arg1, arg3) + err(Concatenate(arg0, terr), z125, __LINE__, 0, 0, arg1, arg3) Return (1) } } } Default{ - err(Concatenate(arg0, terr), z125, 17, 0, 0, arg1, arg3) + err(Concatenate(arg0, terr), z125, __LINE__, 0, 0, arg1, arg3) Return (1) } } @@ -489,7 +489,7 @@ Method(m692, 2, Serialized) // Prepare Source of specified type if (m004(Concatenate(arg0, "-m004"), arg3, Local3)) { // Source Object can not be prepared - err(Concatenate(arg0, terr), z125, 18, 0, 0, arg3, 0) + err(Concatenate(arg0, terr), z125, __LINE__, 0, 0, arg3, 0) Return (1) } @@ -501,7 +501,7 @@ Method(m692, 2, Serialized) Decrement(FLU0) } else { // Unexpected Kind of Op (0 - Increment, 1 - Decrement) - err(Concatenate(arg0, terr), z125, 19, 0, 0, arg4, 0) + err(Concatenate(arg0, terr), z125, __LINE__, 0, 0, arg4, 0) Return (1) } } elseif (LEqual(arg3, 14)) { // Buffer Source/Field Target @@ -511,7 +511,7 @@ Method(m692, 2, Serialized) Decrement(BFL0) } else { // Unexpected Kind of Op (0 - Increment, 1 - Decrement) - err(Concatenate(arg0, terr), z125, 20, 0, 0, arg4, 0) + err(Concatenate(arg0, terr), z125, __LINE__, 0, 0, arg4, 0) Return (1) } } elseif (LEqual(arg4, 0)) { // Increment @@ -520,7 +520,7 @@ Method(m692, 2, Serialized) Decrement(SRC0) } else { // Unexpected Kind of Op (0 - Increment, 1 - Decrement) - err(Concatenate(arg0, terr), z125, 21, 0, 0, arg4, 0) + err(Concatenate(arg0, terr), z125, __LINE__, 0, 0, arg4, 0) Return (1) } @@ -557,7 +557,7 @@ Method(m692, 2, Serialized) if (m004(Concatenate(arg0, "-m004"), arg3, Refof(Local1))) { // Source Object can not be prepared - err(Concatenate(arg0, terr), z125, 24, 0, 0, arg3, 0) + err(Concatenate(arg0, terr), z125, __LINE__, 0, 0, arg3, 0) Return (1) } @@ -567,7 +567,7 @@ Method(m692, 2, Serialized) Decrement(Local1) } else { // Unexpected Kind of Op (0 - Increment, 1 - Decrement) - err(Concatenate(arg0, terr), z125, 25, 0, 0, arg4, 0) + err(Concatenate(arg0, terr), z125, __LINE__, 0, 0, arg4, 0) Return (1) } @@ -628,7 +628,7 @@ Method(m692, 2, Serialized) if (m004(Concatenate(arg0, "-m004"), arg3, Refof(Local1))) { // Source Object can not be prepared - err(Concatenate(arg0, terr), z125, 28, 0, 0, arg3, 0) + err(Concatenate(arg0, terr), z125, __LINE__, 0, 0, arg3, 0) Return (1) } @@ -638,7 +638,7 @@ Method(m692, 2, Serialized) Store(m101(Local1), Local2) } else { // Unexpected Kind of Op (0 - Increment, 1 - Decrement) - err(Concatenate(arg0, terr), z125, 29, 0, 0, arg4, 0) + err(Concatenate(arg0, terr), z125, __LINE__, 0, 0, arg4, 0) Return (1) } @@ -708,7 +708,7 @@ Method(m692, 2, Serialized) // Prepare Source of specified type if (m004(Concatenate(arg0, "-m004"), arg3, Local3)) { // Source Object can not be prepared - err(Concatenate(arg0, terr), z125, 32, 0, 0, arg3, 0) + err(Concatenate(arg0, terr), z125, __LINE__, 0, 0, arg3, 0) Return (1) } @@ -719,7 +719,7 @@ Method(m692, 2, Serialized) m101(Local3) } else { // Unexpected Kind of Op (0 - Increment, 1 - Decrement) - err(Concatenate(arg0, terr), z125, 33, 0, 0, arg4, 0) + err(Concatenate(arg0, terr), z125, __LINE__, 0, 0, arg4, 0) Return (1) } @@ -760,7 +760,7 @@ Method(m692, 2, Serialized) if (LGreater(arg0, 1)) { // Unexpected Kind of Op (0 - Increment, 1 - Decrement) - err(Concatenate(ts, terr), z125, 36, 0, 0, arg0, 0) + err(Concatenate(ts, terr), z125, __LINE__, 0, 0, arg0, 0) Return (1) } diff --git a/tests/aslts/src/runtime/collections/complex/result/tests/roptional/roptional.asl b/tests/aslts/src/runtime/collections/complex/result/tests/roptional/roptional.asl index af5060bd8..26ce5300d 100644 --- a/tests/aslts/src/runtime/collections/complex/result/tests/roptional/roptional.asl +++ b/tests/aslts/src/runtime/collections/complex/result/tests/roptional/roptional.asl @@ -285,7 +285,7 @@ Method(m694, 5, Serialized) CopyObject(Derefof(arg3), BUF1) Store(Sizeof(BUF1), Local0) if (LNotEqual(Local0, 17)) { - err(Concatenate(arg0, terr), z127, 1, 0, 0, Local0, 17) + err(Concatenate(arg0, terr), z127, __LINE__, 0, 0, Local0, 17) Return (1) } CopyObject(BUF1, arg2) @@ -333,7 +333,7 @@ Method(m694, 5, Serialized) } Default { // Unexpected Target Type - err(Concatenate(arg0, terr), z127, 2, 0, 0, arg1, 0) + err(Concatenate(arg0, terr), z127, __LINE__, 0, 0, arg1, 0) Return (1) } } @@ -350,7 +350,7 @@ Method(m694, 5, Serialized) Store(ObjectType(arg2), Local0) if (LNotEqual(Local0, arg1)) { // ObjectType of Target can not be set up - err(arg0, z127, 4, 0, 0, Local0, arg1) + err(arg0, z127, __LINE__, 0, 0, Local0, arg1) Return (1) } @@ -383,7 +383,7 @@ Method(m694, 5, Serialized) } Default { // Unexpected Source Type - err(Concatenate(arg0, terr), z127, 5, 0, 0, arg1, 0) + err(Concatenate(arg0, terr), z127, __LINE__, 0, 0, arg1, 0) Return (1) } } @@ -395,7 +395,7 @@ Method(m694, 5, Serialized) Store(ObjectType(arg2), Local0) if (LNotEqual(Local0, arg1)) { // ObjectType of Source can not be set up - err(arg0, z127, 7, 0, 0, Local0, arg1) + err(arg0, z127, __LINE__, 0, 0, Local0, arg1) Return (1) } @@ -410,7 +410,7 @@ Method(m694, 5, Serialized) Store(ObjectType(arg2), Local0) if (LNotEqual(Local0, arg1)) { // ObjectType of Source object is corrupted - err(arg0, z127, 8, 0, 0, Local0, arg1) + err(arg0, z127, __LINE__, 0, 0, Local0, arg1) Return (1) } @@ -429,14 +429,14 @@ Method(m694, 5, Serialized) } Default { // Unexpected Source Type - err(arg0, z127, 9, 0, 0, arg1, 0) + err(arg0, z127, __LINE__, 0, 0, arg1, 0) Return (1) } } if (LNotEqual(Local0, arg1)) { // Mismatch of Source Type against specified one - err(arg0, z127, 10, 0, 0, Local0, arg1) + err(arg0, z127, __LINE__, 0, 0, Local0, arg1) if (STCS) {m000(3, 0x1000000, Local0, arg0)} Return (1) } else { @@ -444,31 +444,31 @@ Method(m694, 5, Serialized) Switch(ToInteger(arg1)) { Case(1) { if (LNotEqual(INT0, Derefof(arg3))) { - err(arg0, z127, 11, 0, 0, INT0, Derefof(arg3)) + err(arg0, z127, __LINE__, 0, 0, INT0, Derefof(arg3)) Return (1) } if (LNotEqual(Derefof(arg2), INT0)) { - err(arg0, z127, 12, 0, 0, Derefof(arg2), INT0) + err(arg0, z127, __LINE__, 0, 0, Derefof(arg2), INT0) Return (1) } } Case(2) { if (LNotEqual(STR0, Derefof(arg3))) { - err(arg0, z127, 13, 0, 0, STR0, Derefof(arg3)) + err(arg0, z127, __LINE__, 0, 0, STR0, Derefof(arg3)) Return (1) } if (LNotEqual(Derefof(arg2), STR0)) { - err(arg0, z127, 14, 0, 0, Derefof(arg2), STR0) + err(arg0, z127, __LINE__, 0, 0, Derefof(arg2), STR0) Return (1) } } Case(3) { if (LNotEqual(BUF0, Derefof(arg3))) { - err(arg0, z127, 15, 0, 0, BUF0, Derefof(arg3)) + err(arg0, z127, __LINE__, 0, 0, BUF0, Derefof(arg3)) Return (1) } if (LNotEqual(Derefof(arg2), BUF0)) { - err(arg0, z127, 16, 0, 0, Derefof(arg2), BUF0) + err(arg0, z127, __LINE__, 0, 0, Derefof(arg2), BUF0) Return (1) } } @@ -495,10 +495,10 @@ Method(m694, 5, Serialized) if (LEqual(arg2, c016)) { if (X170) { //this error report is unnecessary, should be removed. - //err(arg0, z127, 17, 0, 0, Local2, arg2) + //err(arg0, z127, __LINE__, 0, 0, Local2, arg2) } } else { - err(arg0, z127, 17, 0, 0, Local2, arg2) + err(arg0, z127, __LINE__, 0, 0, Local2, arg2) } if (STCS) {m000(3, 0x100, arg2, Local2)} @@ -519,12 +519,12 @@ Method(m694, 5, Serialized) } } elseif (LNotEqual(m684(arg3), 1)) { // Types mismatch Result/Target on storing - err(arg0, z127, 19, 0, 0, Local2, arg3) + err(arg0, z127, __LINE__, 0, 0, Local2, arg3) Return (1) } elseif (LNotEqual(Local2, 3)) { // Types mismatch Result/Target on storing // Test fixed type Objects are converted to Buffer - err(arg0, z127, 20, 0, 0, Local2, 3) + err(arg0, z127, __LINE__, 0, 0, Local2, 3) Return (1) } if (STCS) {m000(3, 0x100, arg3, Local2)} @@ -544,10 +544,10 @@ Method(m694, 5, Serialized) if (LNotEqual(Derefof(arg1), Local7)) { if (LEqual(arg2, c016)) { if (X193) { - err(arg0, z127, 21, 0, 0, Derefof(arg1), Local7) + err(arg0, z127, __LINE__, 0, 0, Derefof(arg1), Local7) } } else { - err(arg0, z127, 21, 0, 0, Derefof(arg1), Local7) + err(arg0, z127, __LINE__, 0, 0, Derefof(arg1), Local7) } Return (1) } @@ -583,7 +583,7 @@ Method(m694, 5, Serialized) Store(Index(arg6, 1), Local7) if (m004(Concatenate(arg0, "-m004"), arg3, Refof(SRC0), Local7)) { // Source Object can not be prepared - err(Concatenate(arg0, terr), z127, 22, 0, 0, arg3, 0) + err(Concatenate(arg0, terr), z127, __LINE__, 0, 0, arg3, 0) Return (1) } @@ -600,7 +600,7 @@ Method(m694, 5, Serialized) } if (m003(Concatenate(arg0, "-m003"), arg2, Local1, Local7)) { // Target Object can not be prepared - err(Concatenate(arg0, terr), z127, 23, 0, 0, arg2, 0) + err(Concatenate(arg0, terr), z127, __LINE__, 0, 0, arg2, 0) Return (1) } @@ -674,7 +674,7 @@ Method(m694, 5, Serialized) } } else { // Unexpected Kind of Op (0 - Store, ...) - err(Concatenate(arg0, terr), z127, 24, 0, 0, arg4, 0) + err(Concatenate(arg0, terr), z127, __LINE__, 0, 0, arg4, 0) Return (1) } } elseif (LEqual(arg2, 14)) { // Buffer Field Target @@ -746,7 +746,7 @@ Method(m694, 5, Serialized) } } else { // Unexpected Kind of Op (0 - Store, ...) - err(Concatenate(arg0, terr), z127, 25, 0, 0, arg4, 0) + err(Concatenate(arg0, terr), z127, __LINE__, 0, 0, arg4, 0) Return (1) } @@ -818,7 +818,7 @@ Method(m694, 5, Serialized) } } else { // Unexpected Kind of Op (0 - Store, ...) - err(Concatenate(arg0, terr), z127, 26, 0, 0, arg4, 0) + err(Concatenate(arg0, terr), z127, __LINE__, 0, 0, arg4, 0) Return (1) } @@ -872,7 +872,7 @@ Method(m694, 5, Serialized) Store(Index(arg6, 1), Local7) if (m004(Concatenate(arg0, "-m004"), arg3, Refof(SRC0), Local7)) { // Source Object can not be prepared - err(Concatenate(arg0, terr), z127, 29, 0, 0, arg3, 0) + err(Concatenate(arg0, terr), z127, __LINE__, 0, 0, arg3, 0) Return (1) } @@ -880,7 +880,7 @@ Method(m694, 5, Serialized) Store(Index(Derefof(Index(arg6, 2)), arg2), Local7) if (m003(Concatenate(arg0, "-m003"), arg2, Refof(Local4), Local7)) { // Target Object can not be prepared - err(Concatenate(arg0, terr), z127, 30, 0, 0, arg2, 0) + err(Concatenate(arg0, terr), z127, __LINE__, 0, 0, arg2, 0) Return (1) } @@ -953,7 +953,7 @@ Method(m694, 5, Serialized) } } else { // Unexpected Kind of Op (0 - Store, ...) - err(Concatenate(arg0, terr), z127, 31, 0, 0, arg4, 0) + err(Concatenate(arg0, terr), z127, __LINE__, 0, 0, arg4, 0) Return (1) } @@ -2253,13 +2253,13 @@ Method(m694, 5, Serialized) if (LGreater(arg0, 2)) { // Unexpected Kind of Op (0 - Store, ...) - err(Concatenate(ts, terr), z127, 34, 0, 0, arg0, 0) + err(Concatenate(ts, terr), z127, __LINE__, 0, 0, arg0, 0) Return (1) } if (LGreater(arg4, 1)) { // Unexpected Kind of Source-Target pair - err(Concatenate(ts, terr), z127, 35, 0, 0, arg4, 0) + err(Concatenate(ts, terr), z127, __LINE__, 0, 0, arg4, 0) Return (1) } diff --git a/tests/aslts/src/runtime/collections/complex/result/tests/rstore/rstore.asl b/tests/aslts/src/runtime/collections/complex/result/tests/rstore/rstore.asl index 11a94b918..fd786a039 100644 --- a/tests/aslts/src/runtime/collections/complex/result/tests/rstore/rstore.asl +++ b/tests/aslts/src/runtime/collections/complex/result/tests/rstore/rstore.asl @@ -80,7 +80,7 @@ Method(m690,, Serialized) // ArgX Object // Store(Src0, arg3) Store("Not implemented", Debug) - err(terr, z123, 1, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } elseif (LEqual(arg2, 3)) { // LocalX Object @@ -89,17 +89,17 @@ Method(m690,, Serialized) // Reference in ArgX Object // Store(Src0, arg4) Store("Not implemented", Debug) - err(terr, z123, 2, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } elseif (LEqual(arg2, 5)) { // Elemenf of a Package // Store(Src0, Index(p680, 0)) Store("Not implemented", Debug) - err(terr, z123, 3, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } else { Store("Unexpected Kind of the Object to store into", Debug) - err(terr, z123, 4, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -109,7 +109,7 @@ Method(m690,, Serialized) // Constant // Store(Src0, "") Store("Not implemented", Debug) - err(terr, z123, 5, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } elseif (LEqual(arg2, 1)) { // Named Object @@ -118,7 +118,7 @@ Method(m690,, Serialized) // ArgX Object // Store(Src0, arg3) Store("Not implemented", Debug) - err(terr, z123, 6, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } elseif (LEqual(arg2, 3)) { // LocalX Object @@ -127,17 +127,17 @@ Method(m690,, Serialized) // Reference in ArgX Object // Store(Src0, arg4) Store("Not implemented", Debug) - err(terr, z123, 7, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } elseif (LEqual(arg2, 5)) { // Elemenf of a Package // Store(Src0, Index(p680, 0)) Store("Not implemented", Debug) - err(terr, z123, 8, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } else { Store("Unexpected Kind of the Object to store into", Debug) - err(terr, z123, 9, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -147,7 +147,7 @@ Method(m690,, Serialized) // Constant // Store(Src0, Buffer(1){}) Store("Not implemented", Debug) - err(terr, z123, 10, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } elseif (LEqual(arg2, 1)) { // Named Object @@ -156,36 +156,36 @@ Method(m690,, Serialized) // ArgX Object // Store(Src0, arg3) Store("Not implemented", Debug) - err(terr, z123, 11, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } elseif (LEqual(arg2, 3)) { // LocalX Object // Store(Src0, Local2) Store("Not implemented", Debug) - err(terr, z123, 12, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } elseif (LEqual(arg2, 4)) { // Reference in ArgX Object // Store(Src0, arg4) Store("Not implemented", Debug) - err(terr, z123, 13, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } elseif (LEqual(arg2, 5)) { // Elemenf of a Package // Store(Src0, Index(p680, 0)) Store("Not implemented", Debug) - err(terr, z123, 14, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } else { Store("Unexpected Kind of the Object to store into", Debug) - err(terr, z123, 15, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } Case(4) { // Package // Store(Src0, p680) Store("Not implemented", Debug) - err(terr, z123, 16, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer field @@ -193,7 +193,7 @@ Method(m690,, Serialized) if (LEqual(arg2, 0)) { // Constant (like Store(Src0, Zero)) Store("Not implemented", Debug) - err(terr, z123, 17, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } elseif (LEqual(arg2, 1)) { // Named Object @@ -204,35 +204,35 @@ Method(m690,, Serialized) // ArgX Object // Store(Src0, arg3) Store("Not implemented", Debug) - err(terr, z123, 18, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } elseif (LEqual(arg2, 3)) { // LocalX Object // Store(Src0, Local2) Store("Not implemented", Debug) - err(terr, z123, 19, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } elseif (LEqual(arg2, 4)) { // Reference in ArgX Object // Store(Src0, arg4) Store("Not implemented", Debug) - err(terr, z123, 20, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } elseif (LEqual(arg2, 5)) { // Elemenf of a Package // Store(Src0, Index(p680, 0)) Store("Not implemented", Debug) - err(terr, z123, 21, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } else { Store("Unexpected Kind of the Object to store into", Debug) - err(terr, z123, 22, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } Default { Store("Unexpected type of the Object to store into", Debug) - err(terr, z123, 23, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -282,12 +282,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 30, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 31, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -314,12 +314,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 38, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 39, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -351,12 +351,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 44, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 45, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -380,12 +380,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 52, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 53, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -407,12 +407,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 54, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 55, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -434,12 +434,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 62, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 63, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -466,12 +466,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 70, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 71, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -495,12 +495,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 78, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 79, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -524,12 +524,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 86, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 87, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -553,12 +553,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 94, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 95, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -569,7 +569,7 @@ Method(m690,, Serialized) // Derefof of Reference returned by called Method Default { Store("Unexpected way to obtain some result Object", Debug) - err(terr, z123, 96, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -621,12 +621,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 109, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 110, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -675,12 +675,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 123, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 124, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -725,12 +725,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 131, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 132, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -782,12 +782,12 @@ Method(m690,, Serialized) */ Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 145, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 146, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -809,12 +809,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 147, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 148, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -900,12 +900,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 173, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 174, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -950,12 +950,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 187, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 188, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -1000,12 +1000,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 201, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 202, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -1050,12 +1050,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 215, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 216, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -1066,7 +1066,7 @@ Method(m690,, Serialized) // Derefof of Reference returned by called Method Default { Store("Unexpected way to obtain some result Object", Debug) - err(terr, z123, 217, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -1112,12 +1112,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 231, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 232, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -1160,12 +1160,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 246, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 247, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -1204,12 +1204,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 255, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 256, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -1246,7 +1246,7 @@ Method(m690,, Serialized) } Default { Store("Unexpected type of the result Object to be stored", Debug) - err(terr, z123, 270, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -1271,12 +1271,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 271, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 272, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -1346,12 +1346,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 299, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 300, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -1420,12 +1420,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 327, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 328, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -1463,12 +1463,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 342, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 343, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -1479,7 +1479,7 @@ Method(m690,, Serialized) // Derefof of Reference returned by called Method Default { Store("Unexpected way to obtain some result Object", Debug) - err(terr, z123, 344, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -1527,12 +1527,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 359, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 360, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -1577,12 +1577,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 375, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 376, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -1619,12 +1619,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 384, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 385, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -1665,12 +1665,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 400, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 401, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -1692,12 +1692,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 402, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 403, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -1775,12 +1775,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 432, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 433, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -1821,12 +1821,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 448, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 449, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -1867,12 +1867,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 464, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 465, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -1914,12 +1914,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 480, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 481, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -1930,7 +1930,7 @@ Method(m690,, Serialized) // Derefof of Reference returned by called Method Default { Store("Unexpected way to obtain some result Object", Debug) - err(terr, z123, 482, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -1978,12 +1978,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 497, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 498, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -2028,12 +2028,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 513, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 514, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -2072,12 +2072,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 522, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 523, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -2118,12 +2118,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 538, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 539, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -2145,12 +2145,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 540, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 541, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -2228,12 +2228,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 570, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 571, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -2274,12 +2274,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 586, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 587, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -2320,12 +2320,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 602, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 603, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -2367,12 +2367,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 618, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 619, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -2383,7 +2383,7 @@ Method(m690,, Serialized) // Derefof of Reference returned by called Method Default { Store("Unexpected way to obtain some result Object", Debug) - err(terr, z123, 620, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -2415,12 +2415,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 624, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 625, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -2448,12 +2448,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 629, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 630, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -2522,12 +2522,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 631, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 632, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -2551,12 +2551,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 636, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 637, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -2578,12 +2578,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 638, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 639, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -2627,12 +2627,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 646, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 647, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -2656,12 +2656,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 651, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 652, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -2685,12 +2685,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 656, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 657, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -2723,12 +2723,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 669, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 670, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -2739,7 +2739,7 @@ Method(m690,, Serialized) // Derefof of Reference returned by called Method Default { Store("Unexpected way to obtain some result Object", Debug) - err(terr, z123, 671, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -2771,12 +2771,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 675, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 676, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -2804,12 +2804,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 680, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 681, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -2908,12 +2908,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 682, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 683, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -2937,12 +2937,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 687, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 688, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -2964,12 +2964,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 689, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 690, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -3013,12 +3013,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 697, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 698, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -3042,12 +3042,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 702, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 703, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -3071,12 +3071,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 707, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 708, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -3125,12 +3125,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 724, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 725, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -3141,7 +3141,7 @@ Method(m690,, Serialized) // Derefof of Reference returned by called Method Default { Store("Unexpected way to obtain some result Object", Debug) - err(terr, z123, 726, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -3173,12 +3173,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 730, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 731, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -3206,12 +3206,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 735, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 736, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -3290,12 +3290,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 737, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 738, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -3319,12 +3319,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 742, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 743, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -3346,12 +3346,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 744, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 745, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -3395,12 +3395,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 752, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 753, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -3424,12 +3424,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 757, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 758, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -3453,12 +3453,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 762, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 763, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -3491,12 +3491,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 775, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 776, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -3507,7 +3507,7 @@ Method(m690,, Serialized) // Derefof of Reference returned by called Method Default { Store("Unexpected way to obtain some result Object", Debug) - err(terr, z123, 777, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -3553,12 +3553,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 791, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 792, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -3601,12 +3601,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 806, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 807, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -3645,12 +3645,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 815, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 816, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -3687,7 +3687,7 @@ Method(m690,, Serialized) } Default { Store("Unexpected type of the result Object to be stored", Debug) - err(terr, z123, 830, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -3712,12 +3712,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 831, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 832, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -3787,12 +3787,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 859, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 860, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -3861,12 +3861,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 887, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 888, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -3904,12 +3904,12 @@ Method(m690,, Serialized) } Case(5) { // Field Unit Store("Not implemented", Debug) - err(terr, z123, 902, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } Case(14) { // Buffer Field Store("Not implemented", Debug) - err(terr, z123, 903, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } @@ -3920,7 +3920,7 @@ Method(m690,, Serialized) // Derefof of Reference returned by called Method Default { Store("Unexpected way to obtain some result Object", Debug) - err(terr, z123, 904, 0, 0, arg1, arg2) + err(terr, z123, __LINE__, 0, 0, arg1, arg2) Return (1) } } diff --git a/tests/aslts/src/runtime/collections/exceptions/exc/exc.asl b/tests/aslts/src/runtime/collections/exceptions/exc/exc.asl index edaecd1d3..4d16b03c6 100644 --- a/tests/aslts/src/runtime/collections/exceptions/exc/exc.asl +++ b/tests/aslts/src/runtime/collections/exceptions/exc/exc.asl @@ -812,7 +812,7 @@ Method(m155,, Serialized) CH03(ts, z058, 106, 0, 0) if (LNotEqual(Local0, 0)) { // Bug 63, Bugzilla 5329. - err(ts, z058, 170, 0, 0, Local0, 0) + err(ts, z058, __LINE__, 0, 0, Local0, 0) } } @@ -1453,11 +1453,11 @@ Method(m0bc,, Serialized) Store(m000(), Local1) if (LNotEqual(Local0, 0xabcd0000)) { - err(ts, z058, 0x0ce, 0, 0, Local0, 0xabcd0000) + err(ts, z058, __LINE__, 0, 0, Local0, 0xabcd0000) } if (LNotEqual(Local1, 0xabcd0001)) { - err(ts, z058, 0x0cf, 0, 0, Local1, 0xabcd0001) + err(ts, z058, __LINE__, 0, 0, Local1, 0xabcd0001) } } diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_00_undef.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_00_undef.asl index 18c301ac9..c5dfc18df 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 @@ -1265,7 +1265,7 @@ Method(m4b0, 1, Serialized) { Store(ObjectType(arg1), Local0) if (LNotEqual(Local0, 0)) { - err(arg0, z092, 8, 0, 0, Local0, 0) + err(arg0, z092, __LINE__, 0, 0, Local0, 0) return (1) } @@ -1776,7 +1776,7 @@ Method(m4b0, 1, Serialized) m00d(Derefof(Index(p000, 0))) CH06(arg0, 0, 51) if (LNotEqual(i001, 0)) { - err(arg0, z092, 1, 0, 0, i001, 0) + err(arg0, z092, __LINE__, 0, 0, i001, 0) } Store(0, i001) @@ -1784,14 +1784,14 @@ Method(m4b0, 1, Serialized) m00d(Derefof(Local1)) CH06(arg0, 2, 51) if (LNotEqual(i001, 0)) { - err(arg0, z092, 3, 0, 0, i001, 0) + err(arg0, z092, __LINE__, 0, 0, i001, 0) } Store(0, i001) m00d(Derefof(Index(p000, 0, Local2))) CH06(arg0, 4, 51) if (LNotEqual(i001, 0)) { - err(arg0, z092, 5, 0, 0, i001, 0) + err(arg0, z092, __LINE__, 0, 0, i001, 0) } Store(0, i001) @@ -1799,7 +1799,7 @@ Method(m4b0, 1, Serialized) m00d(Derefof(Local3)) CH06(arg0, 6, 51) if (LNotEqual(i001, 0)) { - err(arg0, z092, 7, 0, 0, i001, 0) + err(arg0, z092, __LINE__, 0, 0, i001, 0) } Store(0, i001) @@ -1807,7 +1807,7 @@ Method(m4b0, 1, Serialized) m00d(Derefof(Local5)) CH06(arg0, 8, 51) if (LNotEqual(i001, 0)) { - err(arg0, z092, 9, 0, 0, i001, 0) + err(arg0, z092, __LINE__, 0, 0, i001, 0) } } @@ -1912,7 +1912,7 @@ Method(m4b0, 1, Serialized) m00d(Local0) CH06(ts, 9, 49) if (LNotEqual(i001, 0)) { - err(ts, z092, 10, 0, 0, i001, 0) + err(ts, z092, __LINE__, 0, 0, i001, 0) } // Uninitialized element of Package as parameter of a method @@ -1927,7 +1927,7 @@ Method(m4b0, 1, Serialized) m00d(Arg1) CH06(ts, 11, 50) if (LNotEqual(i001, 0)) { - err(ts, z092, 12, i001, 0) + err(ts, z092, __LINE__, i001, 0) } */ } 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 3d083a24f..1602bbc2d 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 @@ -244,7 +244,7 @@ Method(m4b1, 1, Serialized) Store(ObjectType(arg1), Local0) if (LNotEqual(Local0, 1)) { - err(arg0, z093, 46, 0, 0, Local0, 1) + err(arg0, z093, __LINE__, 0, 0, Local0, 1) return (1) } @@ -278,7 +278,7 @@ Method(m4b1, 1, Serialized) Method(CH00, 2) { if (LNotEqual(i000, arg1)) { - err(arg0, z093, 50, 0, 0, i000, arg1) + err(arg0, z093, __LINE__, 0, 0, i000, arg1) } } @@ -346,7 +346,7 @@ Method(m4b1, 1, Serialized) Method(CH00, 2) { if (LNotEqual(i001, arg1)) { - err(arg0, z093, 59, 0, 0, i000, arg1) + err(arg0, z093, __LINE__, 0, 0, i000, arg1) } } diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_02_str.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_02_str.asl index cca2436fa..b21f04b1a 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 @@ -240,7 +240,7 @@ Method(m4b2, 1, Serialized) Store(ObjectType(arg1), Local0) if (LNotEqual(Local0, 2)) { - err(arg0, z094, 36, 0, 0, Local0, 2) + err(arg0, z094, __LINE__, 0, 0, Local0, 2) return (1) } @@ -274,7 +274,7 @@ Method(m4b2, 1, Serialized) Method(CH00, 2) { if (LNotEqual(i000, arg1)) { - err(arg0, z094, 39, 0, 0, i000, arg1) + err(arg0, z094, __LINE__, 0, 0, i000, arg1) } } @@ -347,7 +347,7 @@ Method(m4b2, 1, Serialized) Method(CH00, 2) { if (LNotEqual(i000, arg1)) { - err(arg0, z094, 47, 0, 0, i000, arg1) + err(arg0, z094, __LINE__, 0, 0, i000, arg1) } } diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_03_buf.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_03_buf.asl index f541a659c..6801dd413 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 @@ -155,7 +155,7 @@ Method(m4b3, 1, Serialized) Store(ObjectType(arg1), Local0) if (LNotEqual(Local0, 3)) { - err(arg0, z095, 20, 0, 0, Local0, 3) + err(arg0, z095, __LINE__, 0, 0, Local0, 3) return (1) } @@ -189,7 +189,7 @@ Method(m4b3, 1, Serialized) Method(CH00, 2) { if (LNotEqual(i000, arg1)) { - err(arg0, z095, 23, 0, 0, i000, arg1) + err(arg0, z095, __LINE__, 0, 0, i000, arg1) } } @@ -262,7 +262,7 @@ Method(m4b3, 1, Serialized) Method(CH00, 2) { if (LNotEqual(i000, arg1)) { - err(arg0, z095, 31, 0, 0, i000, arg1) + err(arg0, z095, __LINE__, 0, 0, i000, arg1) } } diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_04_pckg.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_04_pckg.asl index 7538b232b..5ff8c9c71 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 @@ -1747,7 +1747,7 @@ Method(m4b4, 1, Serialized) Store(ObjectType(arg1), Local0) if (LNotEqual(Local0, 4)) { - err(arg0, z096, 0, 0, 0, Local0, 4) + err(arg0, z096, __LINE__, 0, 0, Local0, 4) return (1) } @@ -2510,7 +2510,7 @@ Method(m4b4, 1, Serialized) Method(CH00, 2) { if (LNotEqual(i000, arg1)) { - err(arg0, z096, 0, 0, 0, i000, arg1) + err(arg0, z096, __LINE__, 0, 0, i000, arg1) } } @@ -2558,7 +2558,7 @@ Method(m4b4, 1, Serialized) Method(CH00, 2) { if (LNotEqual(i000, arg1)) { - err(arg0, z096, 0, 0, 0, i000, arg1) + err(arg0, z096, __LINE__, 0, 0, i000, arg1) } } diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_05_funit.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_05_funit.asl index b733ee240..15acb667e 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 @@ -132,7 +132,7 @@ Method(m4b5,, Serialized) Store(ObjectType(arg1), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z097, 6, 0, 0, Local0, 5) + err(arg0, z097, __LINE__, 0, 0, Local0, 5) return (1) } @@ -190,7 +190,7 @@ Method(m4b5,, Serialized) Method(CH00, 2) { if (LNotEqual(i000, arg1)) { - err(arg0, z097, 10, 0, 0, i000, arg1) + err(arg0, z097, __LINE__, 0, 0, i000, arg1) } } diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_06_dev.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_06_dev.asl index 3389edebe..d8a156c1c 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 @@ -441,7 +441,7 @@ Method(m4b6,, Serialized) Store(ObjectType(arg1), Local0) if (LNotEqual(Local0, 6)) { - err(arg0, z098, 200, 0, 0, Local0, 6) + err(arg0, z098, __LINE__, 0, 0, Local0, 6) return (1) } @@ -1186,7 +1186,7 @@ Method(m4b6,, Serialized) Method(CH00, 2) { if (LNotEqual(i000, arg1)) { - err(arg0, z098, 0, 0, 0, i000, arg1) + err(arg0, z098, __LINE__, 0, 0, i000, arg1) } } diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_07_event.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_07_event.asl index d32aa56f6..10b0f7931 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 @@ -440,7 +440,7 @@ Method(m4b7,, Serialized) { Store(ObjectType(arg1), Local0) if (LNotEqual(Local0, 7)) { - err(arg0, z099, 200, 0, 0, Local0, 7) + err(arg0, z099, __LINE__, 0, 0, Local0, 7) return (1) } @@ -1188,7 +1188,7 @@ Method(m4b7,, Serialized) Method(CH00, 2) { if (LNotEqual(i000, arg1)) { - err(arg0, z099, 0, 0, 0, i000, arg1) + err(arg0, z099, __LINE__, 0, 0, i000, arg1) } } diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_08_method.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_08_method.asl index 003baf942..abdb984ea 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 @@ -438,7 +438,7 @@ Method(m4b8,, Serialized) { Store(ObjectType(arg1), Local0) if (LNotEqual(Local0, 8)) { - err(arg0, z100, 200, 0, 0, Local0, 8) + err(arg0, z100, __LINE__, 0, 0, Local0, 8) return (1) } @@ -1185,7 +1185,7 @@ Method(m4b8,, Serialized) Method(CH00, 2) { if (LNotEqual(i000, arg1)) { - err(arg0, z100, 0, 0, 0, i000, arg1) + err(arg0, z100, __LINE__, 0, 0, i000, arg1) } } diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_09_mux.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_09_mux.asl index 2adf74b50..cd134537a 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 @@ -443,7 +443,7 @@ Method(m4b9,, Serialized) { Store(ObjectType(arg1), Local0) if (LNotEqual(Local0, 9)) { - err(arg0, z101, 200, 0, 0, Local0, 9) + err(arg0, z101, __LINE__, 0, 0, Local0, 9) return (1) } @@ -1189,7 +1189,7 @@ Method(m4b9,, Serialized) Method(CH00, 2) { if (LNotEqual(i000, arg1)) { - err(arg0, z101, 0, 0, 0, i000, arg1) + err(arg0, z101, __LINE__, 0, 0, i000, arg1) } } diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_10_oreg.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_10_oreg.asl index d11f25bb4..d21d9020d 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 @@ -444,7 +444,7 @@ Method(m4ba,, Serialized) { Store(ObjectType(arg1), Local0) if (LNotEqual(Local0, 10)) { - err(arg0, z102, 200, 0, 0, Local0, 10) + err(arg0, z102, __LINE__, 0, 0, Local0, 10) return (1) } @@ -1182,7 +1182,7 @@ Method(m4ba,, Serialized) Method(CH00, 2) { if (LNotEqual(i000, arg1)) { - err(arg0, z102, 0, 0, 0, i000, arg1) + err(arg0, z102, __LINE__, 0, 0, i000, arg1) } } diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_11_pwr.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_11_pwr.asl index 5e31a4d1d..45ac45349 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 @@ -442,7 +442,7 @@ Method(m4bb,, Serialized) { Store(ObjectType(arg1), Local0) if (LNotEqual(Local0, 11)) { - err(arg0, z103, 200, 0, 0, Local0, 11) + err(arg0, z103, __LINE__, 0, 0, Local0, 11) return (1) } @@ -1189,7 +1189,7 @@ Method(m4bb,, Serialized) Method(CH00, 2) { if (LNotEqual(i000, arg1)) { - err(arg0, z103, 0, 0, 0, i000, arg1) + err(arg0, z103, __LINE__, 0, 0, i000, arg1) } } diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_12_proc.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_12_proc.asl index b50d31881..312189870 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 @@ -444,7 +444,7 @@ Method(m4bc,, Serialized) { Store(ObjectType(arg1), Local0) if (LNotEqual(Local0, 12)) { - err(arg0, z104, 200, 0, 0, Local0, 12) + err(arg0, z104, __LINE__, 0, 0, Local0, 12) return (1) } @@ -1191,7 +1191,7 @@ Method(m4bc,, Serialized) Method(CH00, 2) { if (LNotEqual(i000, arg1)) { - err(arg0, z104, 0, 0, 0, i000, arg1) + err(arg0, z104, __LINE__, 0, 0, i000, arg1) } } diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_13_tzone.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_13_tzone.asl index 37b0132a6..558f88849 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 @@ -444,7 +444,7 @@ Method(m4bd,, Serialized) Store(ObjectType(arg1), Local0) if (LNotEqual(Local0, 13)) { - err(arg0, z105, 200, 0, 0, Local0, 13) + err(arg0, z105, __LINE__, 0, 0, Local0, 13) return (1) } @@ -1188,7 +1188,7 @@ Method(m4bd,, Serialized) Method(CH00, 2) { if (LNotEqual(i000, arg1)) { - err(arg0, z105, 0, 0, 0, i000, arg1) + err(arg0, z105, __LINE__, 0, 0, i000, arg1) } } diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_14_bfield.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_14_bfield.asl index 0c6b49215..5056ffe02 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 @@ -129,7 +129,7 @@ Method(m4be,, Serialized) Store(ObjectType(arg1), Local0) if (LNotEqual(Local0, 14)) { - err(arg0, z106, 6, 0, 0, Local0, 14) + err(arg0, z106, __LINE__, 0, 0, Local0, 14) return (1) } @@ -186,7 +186,7 @@ Method(m4be,, Serialized) Method(CH00, 2) { if (LNotEqual(i000, arg1)) { - err(arg0, z106, 10, 0, 0, i000, arg1) + err(arg0, z106, __LINE__, 0, 0, i000, arg1) } } diff --git a/tests/aslts/src/runtime/collections/functional/arithmetic/arithmetic.asl b/tests/aslts/src/runtime/collections/functional/arithmetic/arithmetic.asl index b35208611..44a62421b 100644 --- a/tests/aslts/src/runtime/collections/functional/arithmetic/arithmetic.asl +++ b/tests/aslts/src/runtime/collections/functional/arithmetic/arithmetic.asl @@ -55,95 +55,95 @@ Method(m000, 6, Serialized) case (0) { Add(Local0, Local1, Local7) if (LNotEqual(Local7, Local2)) { - err(arg0, z083, 0, 0, 0, Local5, arg2) + err(arg0, z083, __LINE__, 0, 0, Local5, arg2) } Add(Local1, Local0, Local7) if (LNotEqual(Local7, Local2)) { - err(arg0, z083, 1, 0, 0, Local5, arg2) + err(arg0, z083, __LINE__, 0, 0, Local5, arg2) } } case (1) { Subtract(Local0, Local1, Local7) if (LNotEqual(Local7, Local2)) { - err(arg0, z083, 2, 0, 0, Local5, arg2) + err(arg0, z083, __LINE__, 0, 0, Local5, arg2) } } case (2) { Multiply(Local0, Local1, Local7) if (LNotEqual(Local7, Local2)) { - err(arg0, z083, 3, 0, 0, Local5, arg2) + err(arg0, z083, __LINE__, 0, 0, Local5, arg2) } Multiply(Local1, Local0, Local7) if (LNotEqual(Local7, Local2)) { - err(arg0, z083, 4, 0, 0, Local5, arg2) + err(arg0, z083, __LINE__, 0, 0, Local5, arg2) } } case (3) { And(Local0, Local1, Local7) if (LNotEqual(Local7, Local2)) { - err(arg0, z083, 5, 0, 0, Local5, arg2) + err(arg0, z083, __LINE__, 0, 0, Local5, arg2) } And(Local1, Local0, Local7) if (LNotEqual(Local7, Local2)) { - err(arg0, z083, 6, 0, 0, Local5, arg2) + err(arg0, z083, __LINE__, 0, 0, Local5, arg2) } } case (4) { Nand(Local0, Local1, Local7) if (LNotEqual(Local7, Local2)) { - err(arg0, z083, 7, 0, 0, Local5, arg2) + err(arg0, z083, __LINE__, 0, 0, Local5, arg2) } Nand(Local1, Local0, Local7) if (LNotEqual(Local7, Local2)) { - err(arg0, z083, 8, 0, 0, Local5, arg2) + err(arg0, z083, __LINE__, 0, 0, Local5, arg2) } } case (5) { Nor(Local0, Local1, Local7) if (LNotEqual(Local7, Local2)) { - err(arg0, z083, 9, 0, 0, Local5, arg2) + err(arg0, z083, __LINE__, 0, 0, Local5, arg2) } Nor(Local1, Local0, Local7) if (LNotEqual(Local7, Local2)) { - err(arg0, z083, 10, 0, 0, Local5, arg2) + err(arg0, z083, __LINE__, 0, 0, Local5, arg2) } } case (6) { Or(Local0, Local1, Local7) if (LNotEqual(Local7, Local2)) { - err(arg0, z083, 11, 0, 0, Local5, arg2) + err(arg0, z083, __LINE__, 0, 0, Local5, arg2) } Or(Local1, Local0, Local7) if (LNotEqual(Local7, Local2)) { - err(arg0, z083, 12, 0, 0, Local5, arg2) + err(arg0, z083, __LINE__, 0, 0, Local5, arg2) } } case (7) { Xor(Local0, Local1, Local7) if (LNotEqual(Local7, Local2)) { - err(arg0, z083, 13, 0, 0, Local5, arg2) + err(arg0, z083, __LINE__, 0, 0, Local5, arg2) } Xor(Local1, Local0, Local7) if (LNotEqual(Local7, Local2)) { - err(arg0, z083, 14, 0, 0, Local5, arg2) + err(arg0, z083, __LINE__, 0, 0, Local5, arg2) } } case (8) { Mod(Local0, Local1, Local7) if (LNotEqual(Local7, Local2)) { - err(arg0, z083, 15, 0, 0, Local5, arg2) + err(arg0, z083, __LINE__, 0, 0, Local5, arg2) } } case (9) { ShiftLeft(Local0, Local1, Local7) if (LNotEqual(Local7, Local2)) { - err(arg0, z083, 16, 0, 0, Local5, arg2) + err(arg0, z083, __LINE__, 0, 0, Local5, arg2) } } case (10) { ShiftRight(Local0, Local1, Local7) if (LNotEqual(Local7, Local2)) { - err(arg0, z083, 17, 0, 0, Local5, arg2) + err(arg0, z083, __LINE__, 0, 0, Local5, arg2) } } } @@ -178,10 +178,10 @@ Method(m001, 6, Serialized) case (0) { Divide(Local0, Local1, Local6, Local7) if (LNotEqual(Local7, Local2)) { - err(arg0, z083, 18, 0, 0, Local5, arg2) + err(arg0, z083, __LINE__, 0, 0, Local5, arg2) } if (LNotEqual(Local6, Local3)) { - err(arg0, z083, 19, 0, 0, Local5, arg2) + err(arg0, z083, __LINE__, 0, 0, Local5, arg2) } } } @@ -210,31 +210,31 @@ Method(m002, 6, Serialized) case (0) { Increment(Local0) if (LNotEqual(Local0, Local1)) { - err(arg0, z083, 20, 0, 0, Local5, arg2) + err(arg0, z083, __LINE__, 0, 0, Local5, arg2) } } case (1) { Decrement(Local0) if (LNotEqual(Local0, Local1)) { - err(arg0, z083, 21, 0, 0, Local5, arg2) + err(arg0, z083, __LINE__, 0, 0, Local5, arg2) } } case (2) { Not(Local0, Local2) if (LNotEqual(Local2, Local1)) { - err(arg0, z083, 22, 0, 0, Local5, arg2) + err(arg0, z083, __LINE__, 0, 0, Local5, arg2) } } case (3) { FindSetLeftBit(Local0, Local2) if (LNotEqual(Local2, Local1)) { - err(arg0, z083, 23, 0, 0, Local5, arg2) + err(arg0, z083, __LINE__, 0, 0, Local5, arg2) } } case (4) { FindSetRightBit(Local0, Local2) if (LNotEqual(Local2, Local1)) { - err(arg0, z083, 24, 0, 0, Local5, arg2) + err(arg0, z083, __LINE__, 0, 0, Local5, arg2) } } } @@ -1441,7 +1441,7 @@ Method(FSL0,, Serialized) FindSetLeftBit(Local2, Local3) Add(Local1, 1, Local4) if (LNotEqual(Local3, Local4)) { - err(ts, z083, 25, 0, 0, Local0, 0) + err(ts, z083, __LINE__, 0, 0, Local0, 0) } Increment(Local1) Decrement(Local0) @@ -1502,7 +1502,7 @@ Method(FSR0,, Serialized) } FindSetRightBit(Local2, Local3) if (LNotEqual(Local3, Local4)) { - err(ts, z083, 26, 0, 0, Local0, 0) + err(ts, z083, __LINE__, 0, 0, Local0, 0) } Increment(Local1) Decrement(Local0) diff --git a/tests/aslts/src/runtime/collections/functional/bfield/crbuffield.asl b/tests/aslts/src/runtime/collections/functional/bfield/crbuffield.asl index bed20f85c..986699647 100644 --- a/tests/aslts/src/runtime/collections/functional/bfield/crbuffield.asl +++ b/tests/aslts/src/runtime/collections/functional/bfield/crbuffield.asl @@ -172,13 +172,13 @@ Method(m210, 7, Serialized) Store(f001, Local0) if (LNotEqual(Local0, 0)) { - err(arg0, z001, 0, 0, 0, Local0, 0) + err(arg0, z001, __LINE__, 0, 0, Local0, 0) } Store(arg2, b002) if (LNotEqual(b001, b002)) { - err(arg0, z001, 1, 0, 0, 0, 0) + err(arg0, z001, __LINE__, 0, 0, 0, 0) } if (pr00) { @@ -198,13 +198,13 @@ Method(m210, 7, Serialized) Store(f001, Local0) if (LNotEqual(Local0, 0)) { - err(arg0, z001, 2, 0, 0, Local0, 0) + err(arg0, z001, __LINE__, 0, 0, Local0, 0) } Store(arg5, b002) if (LNotEqual(b001, b002)) { - err(arg0, z001, 3, 0, 0, 0, 0) + err(arg0, z001, __LINE__, 0, 0, 0, 0) } if (pr00) { @@ -223,13 +223,13 @@ Method(m210, 7, Serialized) Store(f001, Local0) if (LNotEqual(Local0, 0x0000000000000001)) { - err(arg0, z001, 4, 0, 0, Local0, 0x0000000000000001) + err(arg0, z001, __LINE__, 0, 0, Local0, 0x0000000000000001) } Store(arg3, b002) if (LNotEqual(b001, b002)) { - err(arg0, z001, 5, 0, 0, 0, 0) + err(arg0, z001, __LINE__, 0, 0, 0, 0) } if (pr00) { @@ -248,13 +248,13 @@ Method(m210, 7, Serialized) Store(f001, Local0) if (LNotEqual(Local0, 0x0000000000000001)) { - err(arg0, z001, 6, 0, 0, Local0, 0x0000000000000001) + err(arg0, z001, __LINE__, 0, 0, Local0, 0x0000000000000001) } Store(arg4, b002) if (LNotEqual(b001, b002)) { - err(arg0, z001, 7, 0, 0, 0, 0) + err(arg0, z001, __LINE__, 0, 0, 0, 0) } if (pr00) { @@ -265,17 +265,17 @@ Method(m210, 7, Serialized) Store(SizeOf(b001), Local0) if (LNotEqual(Local0, arg6)) { - err(arg0, z001, 8, 0, 0, Local0, arg6) + err(arg0, z001, __LINE__, 0, 0, Local0, arg6) } Store(SizeOf(b002), Local0) if (LNotEqual(Local0, arg6)) { - err(arg0, z001, 9, 0, 0, Local0, arg6) + err(arg0, z001, __LINE__, 0, 0, Local0, arg6) } Store(ObjectType(f001), Local0) if (LNotEqual(Local0, c016)) { - err(arg0, z001, 10, 0, 0, Local0, c016) + err(arg0, z001, __LINE__, 0, 0, Local0, c016) } if (pr00) { @@ -307,7 +307,7 @@ Method(m211,, Serialized) While (n000) { if (LGreaterEqual(ncur, bsz1)) { - err(ts, z001, 11, 0, 0, ncur, bsz1) + err(ts, z001, __LINE__, 0, 0, ncur, bsz1) Break } @@ -359,13 +359,13 @@ Method(m212, 3, Serialized) Store(f001, Local0) if (LNotEqual(Local0, 0)) { - err(arg0, z001, 12, 0, 0, Local0, 0) + err(arg0, z001, __LINE__, 0, 0, Local0, 0) } Store(b000, b002) if (LNotEqual(b001, b002)) { - err(arg0, z001, 13, 0, 0, 0, 0) + err(arg0, z001, __LINE__, 0, 0, 0, 0) } if (pr00) { @@ -385,13 +385,13 @@ Method(m212, 3, Serialized) Store(f001, Local0) if (LNotEqual(Local0, 0)) { - err(arg0, z001, 14, 0, 0, Local0, 0) + err(arg0, z001, __LINE__, 0, 0, Local0, 0) } Store(b101, b002) if (LNotEqual(b001, b002)) { - err(arg0, z001, 15, 0, 0, 0, 0) + err(arg0, z001, __LINE__, 0, 0, 0, 0) } if (pr00) { @@ -410,13 +410,13 @@ Method(m212, 3, Serialized) Store(f001, Local0) if (LNotEqual(Local0, 0x00000000000000ff)) { - err(arg0, z001, 16, 0, 0, Local0, 0x00000000000000ff) + err(arg0, z001, __LINE__, 0, 0, Local0, 0x00000000000000ff) } Store(b0ff, b002) if (LNotEqual(b001, b002)) { - err(arg0, z001, 17, 0, 0, 0, 0) + err(arg0, z001, __LINE__, 0, 0, 0, 0) } if (pr00) { @@ -435,13 +435,13 @@ Method(m212, 3, Serialized) Store(f001, Local0) if (LNotEqual(Local0, 0x00000000000000ff)) { - err(arg0, z001, 18, 0, 0, Local0, 0x00000000000000ff) + err(arg0, z001, __LINE__, 0, 0, Local0, 0x00000000000000ff) } Store(b010, b002) if (LNotEqual(b001, b002)) { - err(arg0, z001, 19, 0, 0, 0, 0) + err(arg0, z001, __LINE__, 0, 0, 0, 0) } if (pr00) { @@ -460,13 +460,13 @@ Method(m212, 3, Serialized) Store(f001, Local0) if (LNotEqual(Local0, 0x0000000000000096)) { - err(arg0, z001, 20, 0, 0, Local0, 0x0000000000000096) + err(arg0, z001, __LINE__, 0, 0, Local0, 0x0000000000000096) } Store(b0B0, b002) if (LNotEqual(b001, b002)) { - err(arg0, z001, 21, 0, 0, 0, 0) + err(arg0, z001, __LINE__, 0, 0, 0, 0) } if (pr00) { @@ -477,17 +477,17 @@ Method(m212, 3, Serialized) Store(SizeOf(b001), Local0) if (LNotEqual(Local0, arg2)) { - err(arg0, z001, 22, 0, 0, Local0, arg2) + err(arg0, z001, __LINE__, 0, 0, Local0, arg2) } Store(SizeOf(b002), Local0) if (LNotEqual(Local0, arg2)) { - err(arg0, z001, 23, 0, 0, Local0, arg2) + err(arg0, z001, __LINE__, 0, 0, Local0, arg2) } Store(ObjectType(f001), Local0) if (LNotEqual(Local0, c016)) { - err(arg0, z001, 24, 0, 0, Local0, c016) + err(arg0, z001, __LINE__, 0, 0, Local0, c016) } if (pr00) { @@ -519,7 +519,7 @@ Method(m213,, Serialized) While (n000) { if (LGreaterEqual(ncur, bsz1)) { - err(ts, z001, 25, 0, 0, ncur, bsz1) + err(ts, z001, __LINE__, 0, 0, ncur, bsz1) Break } @@ -571,13 +571,13 @@ Method(m214, 3, Serialized) Store(f001, Local0) if (LNotEqual(Local0, 0)) { - err(arg0, z001, 26, 0, 0, Local0, 0) + err(arg0, z001, __LINE__, 0, 0, Local0, 0) } Store(b000, b002) if (LNotEqual(b001, b002)) { - err(arg0, z001, 27, 0, 0, 0, 0) + err(arg0, z001, __LINE__, 0, 0, 0, 0) } if (pr00) { @@ -597,13 +597,13 @@ Method(m214, 3, Serialized) Store(f001, Local0) if (LNotEqual(Local0, 0)) { - err(arg0, z001, 28, 0, 0, Local0, 0) + err(arg0, z001, __LINE__, 0, 0, Local0, 0) } Store(b101, b002) if (LNotEqual(b001, b002)) { - err(arg0, z001, 29, 0, 0, 0, 0) + err(arg0, z001, __LINE__, 0, 0, 0, 0) } if (pr00) { @@ -622,13 +622,13 @@ Method(m214, 3, Serialized) Store(f001, Local0) if (LNotEqual(Local0, 0x000000000000ffff)) { - err(arg0, z001, 30, 0, 0, Local0, 0x000000000000ffff) + err(arg0, z001, __LINE__, 0, 0, Local0, 0x000000000000ffff) } Store(b0ff, b002) if (LNotEqual(b001, b002)) { - err(arg0, z001, 31, 0, 0, 0, 0) + err(arg0, z001, __LINE__, 0, 0, 0, 0) } if (pr00) { @@ -647,13 +647,13 @@ Method(m214, 3, Serialized) Store(f001, Local0) if (LNotEqual(Local0, 0x000000000000ffff)) { - err(arg0, z001, 32, 0, 0, Local0, 0x000000000000ffff) + err(arg0, z001, __LINE__, 0, 0, Local0, 0x000000000000ffff) } Store(b010, b002) if (LNotEqual(b001, b002)) { - err(arg0, z001, 33, 0, 0, 0, 0) + err(arg0, z001, __LINE__, 0, 0, 0, 0) } if (pr00) { @@ -662,12 +662,12 @@ Method(m214, 3, Serialized) Store(SizeOf(b001), Local0) if (LNotEqual(Local0, arg2)) { - err(arg0, z001, 34, 0, 0, Local0, arg2) + err(arg0, z001, __LINE__, 0, 0, Local0, arg2) } Store(SizeOf(b002), Local0) if (LNotEqual(Local0, arg2)) { - err(arg0, z001, 35, 0, 0, Local0, arg2) + err(arg0, z001, __LINE__, 0, 0, Local0, arg2) } //////////////// E. 0->1 (000->010) @@ -682,13 +682,13 @@ Method(m214, 3, Serialized) Store(f001, Local0) if (LNotEqual(Local0, 0x0000000000007698)) { - err(arg0, z001, 36, 0, 0, Local0, 0x0000000000007698) + err(arg0, z001, __LINE__, 0, 0, Local0, 0x0000000000007698) } Store(b0B0, b002) if (LNotEqual(b001, b002)) { - err(arg0, z001, 37, 0, 0, 0, 0) + err(arg0, z001, __LINE__, 0, 0, 0, 0) } if (pr00) { @@ -699,17 +699,17 @@ Method(m214, 3, Serialized) Store(SizeOf(b001), Local0) if (LNotEqual(Local0, arg2)) { - err(arg0, z001, 38, 0, 0, Local0, arg2) + err(arg0, z001, __LINE__, 0, 0, Local0, arg2) } Store(SizeOf(b002), Local0) if (LNotEqual(Local0, arg2)) { - err(arg0, z001, 39, 0, 0, Local0, arg2) + err(arg0, z001, __LINE__, 0, 0, Local0, arg2) } Store(ObjectType(f001), Local0) if (LNotEqual(Local0, c016)) { - err(arg0, z001, 40, 0, 0, Local0, c016) + err(arg0, z001, __LINE__, 0, 0, Local0, c016) } if (pr00) { @@ -741,7 +741,7 @@ Method(m215,, Serialized) While (n000) { if (LGreaterEqual(ncur, bsz1)) { - err(ts, z001, 41, 0, 0, ncur, bsz1) + err(ts, z001, __LINE__, 0, 0, ncur, bsz1) Break } @@ -801,13 +801,13 @@ Method(m216, 3, Serialized) Store(f001, Local0) if (LNotEqual(Local0, 0)) { - err(arg0, z001, 42, 0, 0, Local0, 0) + err(arg0, z001, __LINE__, 0, 0, Local0, 0) } Store(b000, b002) if (LNotEqual(b001, b002)) { - err(arg0, z001, 43, 0, 0, 0, 0) + err(arg0, z001, __LINE__, 0, 0, 0, 0) } if (pr00) { @@ -827,13 +827,13 @@ Method(m216, 3, Serialized) Store(f001, Local0) if (LNotEqual(Local0, 0)) { - err(arg0, z001, 44, 0, 0, Local0, 0) + err(arg0, z001, __LINE__, 0, 0, Local0, 0) } Store(b101, b002) if (LNotEqual(b001, b002)) { - err(arg0, z001, 45, 0, 0, 0, 0) + err(arg0, z001, __LINE__, 0, 0, 0, 0) } if (pr00) { @@ -852,13 +852,13 @@ Method(m216, 3, Serialized) Store(f001, Local0) if (LNotEqual(Local0, 0x00000000ffffffff)) { - err(arg0, z001, 46, 0, 0, Local0, 0x00000000ffffffff) + err(arg0, z001, __LINE__, 0, 0, Local0, 0x00000000ffffffff) } Store(b0ff, b002) if (LNotEqual(b001, b002)) { - err(arg0, z001, 47, 0, 0, 0, 0) + err(arg0, z001, __LINE__, 0, 0, 0, 0) } if (pr00) { @@ -877,13 +877,13 @@ Method(m216, 3, Serialized) Store(f001, Local0) if (LNotEqual(Local0, 0x00000000ffffffff)) { - err(arg0, z001, 48, 0, 0, Local0, 0x00000000ffffffff) + err(arg0, z001, __LINE__, 0, 0, Local0, 0x00000000ffffffff) } Store(b010, b002) if (LNotEqual(b001, b002)) { - err(arg0, z001, 49, 0, 0, 0, 0) + err(arg0, z001, __LINE__, 0, 0, 0, 0) } if (pr00) { @@ -892,12 +892,12 @@ Method(m216, 3, Serialized) Store(SizeOf(b001), Local0) if (LNotEqual(Local0, arg2)) { - err(arg0, z001, 50, 0, 0, Local0, arg2) + err(arg0, z001, __LINE__, 0, 0, Local0, arg2) } Store(SizeOf(b002), Local0) if (LNotEqual(Local0, arg2)) { - err(arg0, z001, 51, 0, 0, Local0, arg2) + err(arg0, z001, __LINE__, 0, 0, Local0, arg2) } //////////////// E. 0->1 (000->010) @@ -912,13 +912,13 @@ Method(m216, 3, Serialized) Store(f001, Local0) if (LNotEqual(Local0, 0x0000000032547698)) { - err(arg0, z001, 52, 0, 0, Local0, 0x0000000032547698) + err(arg0, z001, __LINE__, 0, 0, Local0, 0x0000000032547698) } Store(b0B0, b002) if (LNotEqual(b001, b002)) { - err(arg0, z001, 53, 0, 0, 0, 0) + err(arg0, z001, __LINE__, 0, 0, 0, 0) } if (pr00) { @@ -929,17 +929,17 @@ Method(m216, 3, Serialized) Store(SizeOf(b001), Local0) if (LNotEqual(Local0, arg2)) { - err(arg0, z001, 54, 0, 0, Local0, arg2) + err(arg0, z001, __LINE__, 0, 0, Local0, arg2) } Store(SizeOf(b002), Local0) if (LNotEqual(Local0, arg2)) { - err(arg0, z001, 55, 0, 0, Local0, arg2) + err(arg0, z001, __LINE__, 0, 0, Local0, arg2) } Store(ObjectType(f001), Local0) if (LNotEqual(Local0, c016)) { - err(arg0, z001, 56, 0, 0, Local0, c016) + err(arg0, z001, __LINE__, 0, 0, Local0, c016) } if (pr00) { @@ -971,7 +971,7 @@ Method(m217,, Serialized) While (n000) { if (LGreaterEqual(ncur, bsz1)) { - err(ts, z001, 57, 0, 0, ncur, bsz1) + err(ts, z001, __LINE__, 0, 0, ncur, bsz1) Break } @@ -1059,18 +1059,18 @@ Method(m218, 3, Serialized) if (LEqual(F64, 1)) { if (LNotEqual(Local0, 0x0000000000000000)) { - err(arg0, z001, 58, 0, 0, Local0, 0x0000000000000000) + err(arg0, z001, __LINE__, 0, 0, Local0, 0x0000000000000000) } } else { if (LNotEqual(Local0, bb00)) { - err(arg0, z001, 59, 0, 0, 0, 0) + err(arg0, z001, __LINE__, 0, 0, 0, 0) } } Store(b000, b002) if (LNotEqual(b001, b002)) { - err(arg0, z001, 60, 0, 0, 0, 0) + err(arg0, z001, __LINE__, 0, 0, 0, 0) } if (pr00) { @@ -1093,18 +1093,18 @@ Method(m218, 3, Serialized) if (LEqual(F64, 1)) { if (LNotEqual(Local0, 0x0000000000000000)) { - err(arg0, z001, 61, 0, 0, Local0, 0x0000000000000000) + err(arg0, z001, __LINE__, 0, 0, Local0, 0x0000000000000000) } } else { if (LNotEqual(Local0, bb00)) { - err(arg0, z001, 62, 0, 0, 0, 0) + err(arg0, z001, __LINE__, 0, 0, 0, 0) } } Store(b101, b002) if (LNotEqual(b001, b002)) { - err(arg0, z001, 63, 0, 0, 0, 0) + err(arg0, z001, __LINE__, 0, 0, 0, 0) } if (pr00) { @@ -1128,7 +1128,7 @@ Method(m218, 3, Serialized) if (LEqual(F64, 1)) { if (LNotEqual(Local0, 0xffffffffffffffff)) { - err(arg0, z001, 64, 0, 0, Local0, 0xffffffffffffffff) + err(arg0, z001, __LINE__, 0, 0, Local0, 0xffffffffffffffff) } } else { if (LNotEqual(Local0, bb01)) { @@ -1140,7 +1140,7 @@ Method(m218, 3, Serialized) Store("=========================.", Debug) } - err(arg0, z001, 65, 0, 0, 0, 0) + err(arg0, z001, __LINE__, 0, 0, 0, 0) } } @@ -1160,7 +1160,7 @@ Method(m218, 3, Serialized) Store("=========================.", Debug) } - err(arg0, z001, 66, 0, 0, 0, 0) + err(arg0, z001, __LINE__, 0, 0, 0, 0) } if (pr00) { @@ -1200,7 +1200,7 @@ Method(m218, 3, Serialized) if (LEqual(F64, 1)) { if (LNotEqual(Local0, 0xffffffffffffffff)) { - err(arg0, z001, 67, 0, 0, Local0, 0xffffffffffffffff) + err(arg0, z001, __LINE__, 0, 0, Local0, 0xffffffffffffffff) } } else { if (LNotEqual(Local0, bb01)) { @@ -1212,7 +1212,7 @@ Method(m218, 3, Serialized) Store("=========================.", Debug) } - err(arg0, z001, 68, 0, 0, 0, 0) + err(arg0, z001, __LINE__, 0, 0, 0, 0) } } @@ -1232,7 +1232,7 @@ Method(m218, 3, Serialized) Store("=========================.", Debug) } - err(arg0, z001, 69, 0, 0, 0, 0) + err(arg0, z001, __LINE__, 0, 0, 0, 0) } if (pr00) { @@ -1242,12 +1242,12 @@ Method(m218, 3, Serialized) Store(SizeOf(b001), Local0) if (LNotEqual(Local0, arg2)) { - err(arg0, z001, 70, 0, 0, Local0, arg2) + err(arg0, z001, __LINE__, 0, 0, Local0, arg2) } Store(SizeOf(b002), Local0) if (LNotEqual(Local0, arg2)) { - err(arg0, z001, 71, 0, 0, Local0, arg2) + err(arg0, z001, __LINE__, 0, 0, Local0, arg2) } //////////////// E. 0->1 (000->010) @@ -1276,11 +1276,11 @@ Method(m218, 3, Serialized) if (LEqual(F64, 1)) { if (LNotEqual(Local0, 0xefcdab1032547698)) { - err(arg0, z001, 72, 0, 0, Local0, 0xefcdab1032547698) + err(arg0, z001, __LINE__, 0, 0, Local0, 0xefcdab1032547698) } } else { if (LNotEqual(Local0, bb02)) { - err(arg0, z001, 73, 0, 0, 0, 0) + err(arg0, z001, __LINE__, 0, 0, 0, 0) } } @@ -1292,7 +1292,7 @@ Method(m218, 3, Serialized) } if (LNotEqual(b001, b002)) { - err(arg0, z001, 74, 0, 0, 0, 0) + err(arg0, z001, __LINE__, 0, 0, 0, 0) } if (pr00) { @@ -1305,17 +1305,17 @@ Method(m218, 3, Serialized) Store(SizeOf(b001), Local0) if (LNotEqual(Local0, arg2)) { - err(arg0, z001, 75, 0, 0, Local0, arg2) + err(arg0, z001, __LINE__, 0, 0, Local0, arg2) } Store(SizeOf(b002), Local0) if (LNotEqual(Local0, arg2)) { - err(arg0, z001, 76, 0, 0, Local0, arg2) + err(arg0, z001, __LINE__, 0, 0, Local0, arg2) } Store(ObjectType(f001), Local0) if (LNotEqual(Local0, c016)) { - err(arg0, z001, 77, 0, 0, Local0, c016) + err(arg0, z001, __LINE__, 0, 0, Local0, c016) } if (pr00) { @@ -1356,7 +1356,7 @@ Method(m219,, Serialized) While (n000) { if (LGreaterEqual(ncur, bsz1)) { - err(ts, z001, 78, 0, 0, ncur, bsz1) + err(ts, z001, __LINE__, 0, 0, ncur, bsz1) Break } @@ -1467,7 +1467,7 @@ Method(m21a, 6, Serialized) Store(ObjectType(f001), Local0) if (LNotEqual(Local0, c016)) { - err(arg0, z001, 79, 0, 0, Local0, c016) + err(arg0, z001, __LINE__, 0, 0, Local0, c016) } // Fill the entire buffer (ground) @@ -1503,11 +1503,11 @@ Method(m21a, 6, Serialized) if (INT0) { Store(arg5, INT1) if (LNotEqual(Local0, INT1)) { - err(arg0, z001, 80, 0, 0, Local0, INT1) + err(arg0, z001, __LINE__, 0, 0, Local0, INT1) } } else { if (LNotEqual(Local0, arg5)) { - err(arg0, z001, 81, 0, 0, 0, 0) + err(arg0, z001, __LINE__, 0, 0, 0, 0) } } @@ -1516,7 +1516,7 @@ Method(m21a, 6, Serialized) Store(b0B0, b002) if (LNotEqual(b001, b002)) { - err(arg0, z001, 82, 0, 0, 0, 0) + err(arg0, z001, __LINE__, 0, 0, 0, 0) if (pr00) { Store("EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE:", Debug) @@ -1574,7 +1574,7 @@ Method(m21b, 6, Serialized) // Num of bits have to be non-zero if (LEqual(arg3, 0)) { - err(arg0, z001, 83, 0, 0, 0, 0) + err(arg0, z001, __LINE__, 0, 0, 0, 0) return (Ones) } diff --git a/tests/aslts/src/runtime/collections/functional/constant/constants.asl b/tests/aslts/src/runtime/collections/functional/constant/constants.asl index 4d2089bb9..ca666b71b 100644 --- a/tests/aslts/src/runtime/collections/functional/constant/constants.asl +++ b/tests/aslts/src/runtime/collections/functional/constant/constants.asl @@ -38,29 +38,29 @@ Method(CST1,, Serialized) Name(ts, "CST1") if (LNotEqual(Zero, 0)){ - err(ts, z002, 0, 0, 0, Zero, 0) + err(ts, z002, __LINE__, 0, 0, Zero, 0) } if (LNotEqual(One, 1)){ - err(ts, z002, 1, 0, 0, One, 1) + err(ts, z002, __LINE__, 0, 0, One, 1) } if (LEqual(F64, 1)) { if (LNotEqual(Ones, 0xffffffffffffffff)){ - err(ts, z002, 2, 0, 0, Ones, 0xffffffffffffffff) + err(ts, z002, __LINE__, 0, 0, Ones, 0xffffffffffffffff) } } else { if (LNotEqual(Ones, 0xffffffff)){ - err(ts, z002, 3, 0, 0, Ones, 0xffffffff) + err(ts, z002, __LINE__, 0, 0, Ones, 0xffffffff) } } if (LLess(Revision, 0x20140114)){ - err(ts, z002, 4, 0, 0, Revision, 0x20050114) + err(ts, z002, __LINE__, 0, 0, Revision, 0x20050114) } if (LGreater(Revision, 0x20500000)){ - err(ts, z002, 5, 0, 0, Revision, 0x20500000) + err(ts, z002, __LINE__, 0, 0, Revision, 0x20500000) } /* @@ -71,6 +71,6 @@ Method(CST1,, Serialized) * other ACPI implementations. */ if (LNotEqual(\_REV, 2)){ - err(ts, z002, 6, 0, 0, \_REV, 2) + err(ts, z002, __LINE__, 0, 0, \_REV, 2) } } diff --git a/tests/aslts/src/runtime/collections/functional/control/ImplicitReturn/add.asl b/tests/aslts/src/runtime/collections/functional/control/ImplicitReturn/add.asl index 13c71316d..3fc87f5f5 100644 --- a/tests/aslts/src/runtime/collections/functional/control/ImplicitReturn/add.asl +++ b/tests/aslts/src/runtime/collections/functional/control/ImplicitReturn/add.asl @@ -190,7 +190,7 @@ Method(mf71,, Serialized) Store(0xabcd0002, Local0) } if (LNotEqual(i000, Local0)) { - err("", z136, 0x102, 0, 0, i000, Local0) + err("", z136, __LINE__, 0, 0, i000, Local0) } } else { CH04("", 0, 0xff, z136, 0x103, 0, 0) @@ -207,7 +207,7 @@ Method(mf71,, Serialized) if (SLCK) { CH03("", z136, 0x105, 0, 0) if (LNotEqual(i000, 0xabcd0003)) { - err("", z136, 0x106, 0, 0, i000, 0xabcd0003) + err("", z136, __LINE__, 0, 0, i000, 0xabcd0003) } } else { CH04("", 0, 0xff, z136, 0x107, 0, 0) @@ -224,7 +224,7 @@ Method(mf71,, Serialized) if (SLCK) { CH03("", z136, 0x109, 0, 0) if (LNotEqual(i000, 0xabcd0004)) { - err("", z136, 0x10a, 0, 0, i000, 0xabcd0004) + err("", z136, __LINE__, 0, 0, i000, 0xabcd0004) } } else { CH04("", 0, 0xff, z136, 0x10b, 0, 0) @@ -241,7 +241,7 @@ Method(mf71,, Serialized) if (SLCK) { CH03("", z136, 0x10d, 0, 0) if (LNotEqual(i000, 0xabcd0006)) { - err("", z136, 0x10e, 0, 0, i000, 0xabcd0006) + err("", z136, __LINE__, 0, 0, i000, 0xabcd0006) } } else { CH04("", 0, 0xff, z136, 0x10f, 0, 0) @@ -258,7 +258,7 @@ Method(mf71,, Serialized) if (SLCK) { CH03("", z136, 0x111, 0, 0) if (LNotEqual(i000, 0xabcd0007)) { - err("", z136, 0x112, 0, 0, i000, 0xabcd0007) + err("", z136, __LINE__, 0, 0, i000, 0xabcd0007) } } else { CH04("", 0, 0xff, z136, 0x113, 0, 0) @@ -275,7 +275,7 @@ Method(mf71,, Serialized) if (SLCK) { CH03("", z136, 0x115, 0, 0) if (LNotEqual(i000, 0xabcd0008)) { - err("", z136, 0x116, 0, 0, i000, 0xabcd0008) + err("", z136, __LINE__, 0, 0, i000, 0xabcd0008) } } else { CH04("", 0, 0xff, z136, 0x117, 0, 0) @@ -292,7 +292,7 @@ Method(mf71,, Serialized) if (SLCK) { CH03("", z136, 0x119, 0, 0) if (LNotEqual(i000, 0xabcd0009)) { - err("", z136, 0x11a, 0, 0, i000, 0xabcd0009) + err("", z136, __LINE__, 0, 0, i000, 0xabcd0009) } } else { CH04("", 0, 0xff, z136, 0x11b, 0, 0) @@ -309,7 +309,7 @@ Method(mf71,, Serialized) if (SLCK) { CH03("", z136, 0x11d, 0, 0) if (LNotEqual(i000, 0xabcd000a)) { - err("", z136, 0x11e, 0, 0, i000, 0xabcd000a) + err("", z136, __LINE__, 0, 0, i000, 0xabcd000a) } } else { CH04("", 0, 0xff, z136, 0x11f, 0, 0) @@ -331,7 +331,7 @@ Method(mf71,, Serialized) Store(0xabcd000b, Local0) } if (LNotEqual(i000, Local0)) { - err("", z136, 0x122, 0, 0, i000, Local0) + err("", z136, __LINE__, 0, 0, i000, Local0) } } else { CH04("", 0, 0xff, z136, 0x123, 0, 0) @@ -353,7 +353,7 @@ Method(mf71,, Serialized) Store(0xabcd000c, Local0) } if (LNotEqual(i000, Local0)) { - err("", z136, 0x126, 0, 0, i000, Local0) + err("", z136, __LINE__, 0, 0, i000, Local0) } } else { CH04("", 0, 0xff, z136, 0x127, 0, 0) @@ -370,7 +370,7 @@ Method(mf71,, Serialized) if (SLCK) { CH03("", z136, 0x129, 0, 0) if (LNotEqual(i000, 0xabcd000d)) { - err("", z136, 0x12a, 0, 0, i000, 0xabcd000d) + err("", z136, __LINE__, 0, 0, i000, 0xabcd000d) } } else { CH04("", 0, 0xff, z136, 0x12b, 0, 0) @@ -573,7 +573,7 @@ Method(mff0,, Serialized) Store(0xabcd0002, Local0) } if (LNotEqual(i000, Local0)) { - err("", z136, 0x12e, 0, 0, i000, Local0) + err("", z136, __LINE__, 0, 0, i000, Local0) } } else { CH04("", 0, 0xff, z136, 0x12f, 0, 0) @@ -590,7 +590,7 @@ Method(mff0,, Serialized) if (SLCK) { CH03("", z136, 0x131, 0, 0) if (LNotEqual(i000, 0xabcd0003)) { - err("", z136, 0x132, 0, 0, i000, 0xabcd0003) + err("", z136, __LINE__, 0, 0, i000, 0xabcd0003) } } else { CH04("", 0, 0xff, z136, 0x133, 0, 0) @@ -607,7 +607,7 @@ Method(mff0,, Serialized) if (SLCK) { CH03("", z136, 0x135, 0, 0) if (LNotEqual(i000, 0xabcd0004)) { - err("", z136, 0x136, 0, 0, i000, 0xabcd0004) + err("", z136, __LINE__, 0, 0, i000, 0xabcd0004) } } else { CH04("", 0, 0xff, z136, 0x137, 0, 0) @@ -624,7 +624,7 @@ Method(mff0,, Serialized) if (SLCK) { CH03("", z136, 0x139, 0, 0) if (LNotEqual(i000, 0xabcd0006)) { - err("", z136, 0x10e, 0, 0, i000, 0xabcd0006) + err("", z136, __LINE__, 0, 0, i000, 0xabcd0006) } } else { CH04("", 0, 0xff, z136, 0x13a, 0, 0) @@ -641,7 +641,7 @@ Method(mff0,, Serialized) if (SLCK) { CH03("", z136, 0x13c, 0, 0) if (LNotEqual(i000, 0xabcd0007)) { - err("", z136, 0x13d, 0, 0, i000, 0xabcd0007) + err("", z136, __LINE__, 0, 0, i000, 0xabcd0007) } } else { CH04("", 0, 0xff, z136, 0x13e, 0, 0) @@ -658,7 +658,7 @@ Method(mff0,, Serialized) if (SLCK) { CH03("", z136, 0x140, 0, 0) if (LNotEqual(i000, 0xabcd0008)) { - err("", z136, 0x141, 0, 0, i000, 0xabcd0008) + err("", z136, __LINE__, 0, 0, i000, 0xabcd0008) } } else { CH04("", 0, 0xff, z136, 0x142, 0, 0) @@ -675,7 +675,7 @@ Method(mff0,, Serialized) if (SLCK) { CH03("", z136, 0x144, 0, 0) if (LNotEqual(i000, 0xabcd0009)) { - err("", z136, 0x145, 0, 0, i000, 0xabcd0009) + err("", z136, __LINE__, 0, 0, i000, 0xabcd0009) } } else { CH04("", 0, 0xff, z136, 0x146, 0, 0) @@ -692,7 +692,7 @@ Method(mff0,, Serialized) if (SLCK) { CH03("", z136, 0x148, 0, 0) if (LNotEqual(i000, 0xabcd000a)) { - err("", z136, 0x149, 0, 0, i000, 0xabcd000a) + err("", z136, __LINE__, 0, 0, i000, 0xabcd000a) } } else { CH04("", 0, 0xff, z136, 0x14a, 0, 0) @@ -714,7 +714,7 @@ Method(mff0,, Serialized) Store(0xabcd000b, Local0) } if (LNotEqual(i000, Local0)) { - err("", z136, 0x14d, 0, 0, i000, Local0) + err("", z136, __LINE__, 0, 0, i000, Local0) } } else { CH04("", 0, 0xff, z136, 0x14e, 0, 0) @@ -736,7 +736,7 @@ Method(mff0,, Serialized) Store(0xabcd000c, Local0) } if (LNotEqual(i000, Local0)) { - err("", z136, 0x151, 0, 0, i000, Local0) + err("", z136, __LINE__, 0, 0, i000, Local0) } } else { CH04("", 0, 0xff, z136, 0x152, 0, 0) @@ -753,7 +753,7 @@ Method(mff0,, Serialized) if (SLCK) { CH03("", z136, 0x154, 0, 0) if (LNotEqual(i000, 0xabcd000d)) { - err("", z136, 0x155, 0, 0, i000, 0xabcd000d) + err("", z136, __LINE__, 0, 0, i000, 0xabcd000d) } } else { CH04("", 0, 0xff, z136, 0x156, 0, 0) @@ -770,7 +770,7 @@ Method(mff0,, Serialized) if (SLCK) { CH03("", z136, 0x158, 0, 0) if (LNotEqual(i000, 0xabcd000e)) { - err("", z136, 0x159, 0, 0, i000, 0xabcd000e) + err("", z136, __LINE__, 0, 0, i000, 0xabcd000e) } } else { CH04("", 0, 0xff, z136, 0x15a, 0, 0) diff --git a/tests/aslts/src/runtime/collections/functional/control/ImplicitReturn/standaloneret.asl b/tests/aslts/src/runtime/collections/functional/control/ImplicitReturn/standaloneret.asl index 5e4646ca6..95b8f79d8 100644 --- a/tests/aslts/src/runtime/collections/functional/control/ImplicitReturn/standaloneret.asl +++ b/tests/aslts/src/runtime/collections/functional/control/ImplicitReturn/standaloneret.asl @@ -195,7 +195,7 @@ Method(mf6f,, Serialized) if (SLCK) { CH03("", z137, 0x201, 0, 0) if (LNotEqual(i000, 0)) { - err("", z137, 0x202, 0, 0, i000, 0) + err("", z137, __LINE__, 0, 0, i000, 0) } } else { CH03("", z137, 0x203, 0, 0) @@ -212,7 +212,7 @@ Method(mf6f,, Serialized) if (SLCK) { CH03("", z137, 0x205, 0, 0) if (LNotEqual(i000, 0)) { - err("", z137, 0x206, 0, 0, i000, 0) + err("", z137, __LINE__, 0, 0, i000, 0) } } else { CH03("", z137, 0x207, 0, 0) @@ -229,7 +229,7 @@ Method(mf6f,, Serialized) if (SLCK) { CH03("", z137, 0x209, 0, 0) if (LNotEqual(i000, 0)) { - err("", z137, 0x20a, 0, 0, i000, 0) + err("", z137, __LINE__, 0, 0, i000, 0) } } else { CH03("", z137, 0x20b, 0, 0) @@ -246,7 +246,7 @@ Method(mf6f,, Serialized) if (SLCK) { CH03("", z137, 0x20d, 0, 0) if (LNotEqual(i000, 0)) { - err("", z137, 0x20e, 0, 0, i000, 0) + err("", z137, __LINE__, 0, 0, i000, 0) } } else { CH03("", z137, 0x20f, 0, 0) @@ -263,7 +263,7 @@ Method(mf6f,, Serialized) if (SLCK) { CH03("", z137, 0x211, 0, 0) if (LNotEqual(i000, 0)) { - err("", z137, 0x212, 0, 0, i000, 0) + err("", z137, __LINE__, 0, 0, i000, 0) } } else { CH03("", z137, 0x213, 0, 0) @@ -280,7 +280,7 @@ Method(mf6f,, Serialized) if (SLCK) { CH03("", z137, 0x215, 0, 0) if (LNotEqual(i000, 0)) { - err("", z137, 0x216, 0, 0, i000, 0) + err("", z137, __LINE__, 0, 0, i000, 0) } } else { CH03("", z137, 0x217, 0, 0) @@ -297,7 +297,7 @@ Method(mf6f,, Serialized) if (SLCK) { CH03("", z137, 0x219, 0, 0) if (LNotEqual(i000, 0)) { - err("", z137, 0x21a, 0, 0, i000, 0) + err("", z137, __LINE__, 0, 0, i000, 0) } } else { CH03("", z137, 0x21b, 0, 0) @@ -314,7 +314,7 @@ Method(mf6f,, Serialized) if (SLCK) { CH03("", z137, 0x21d, 0, 0) if (LNotEqual(i000, 0)) { - err("", z137, 0x21e, 0, 0, i000, 0) + err("", z137, __LINE__, 0, 0, i000, 0) } } else { CH03("", z137, 0x21f, 0, 0) @@ -331,7 +331,7 @@ Method(mf6f,, Serialized) if (SLCK) { CH03("", z137, 0x221, 0, 0) if (LNotEqual(i000, 0)) { - err("", z137, 0x222, 0, 0, i000, 0) + err("", z137, __LINE__, 0, 0, i000, 0) } } else { CH03("", z137, 0x223, 0, 0) @@ -348,7 +348,7 @@ Method(mf6f,, Serialized) if (SLCK) { CH03("", z137, 0x225, 0, 0) if (LNotEqual(i000, 0)) { - err("", z137, 0x226, 0, 0, i000, 0) + err("", z137, __LINE__, 0, 0, i000, 0) } } else { CH03("", z137, 0x227, 0, 0) @@ -365,7 +365,7 @@ Method(mf6f,, Serialized) if (SLCK) { CH03("", z137, 0x229, 0, 0) if (LNotEqual(i000, 0)) { - err("", z137, 0x22a, 0, 0, i000, 0) + err("", z137, __LINE__, 0, 0, i000, 0) } } else { CH03("", z137, 0x22b, 0, 0) diff --git a/tests/aslts/src/runtime/collections/functional/control/ImplicitReturn/store.asl b/tests/aslts/src/runtime/collections/functional/control/ImplicitReturn/store.asl index c8f8b9e18..a16b41506 100644 --- a/tests/aslts/src/runtime/collections/functional/control/ImplicitReturn/store.asl +++ b/tests/aslts/src/runtime/collections/functional/control/ImplicitReturn/store.asl @@ -190,7 +190,7 @@ Method(mf6c,, Serialized) Store(0xabcd0002, Local0) } if (LNotEqual(i000, Local0)) { - err("", z138, 0x002, 0, 0, i000, Local0) + err("", z138, __LINE__, 0, 0, i000, Local0) } } else { CH04("", 0, 0xff, z138, 0x003, 0, 0) @@ -207,7 +207,7 @@ Method(mf6c,, Serialized) if (SLCK) { CH03("", z138, 0x005, 0, 0) if (LNotEqual(i000, 0xabcd0003)) { - err("", z138, 0x006, 0, 0, i000, 0xabcd0003) + err("", z138, __LINE__, 0, 0, i000, 0xabcd0003) } } else { CH04("", 0, 0xff, z138, 0x007, 0, 0) @@ -224,7 +224,7 @@ Method(mf6c,, Serialized) if (SLCK) { CH03("", z138, 0x009, 0, 0) if (LNotEqual(i000, 0xabcd0004)) { - err("", z138, 0x00a, 0, 0, i000, 0xabcd0004) + err("", z138, __LINE__, 0, 0, i000, 0xabcd0004) } } else { CH04("", 0, 0xff, z138, 0x00b, 0, 0) @@ -241,7 +241,7 @@ Method(mf6c,, Serialized) if (SLCK) { CH03("", z138, 0x00d, 0, 0) if (LNotEqual(i000, 0xabcd0006)) { - err("", z138, 0x00e, 0, 0, i000, 0xabcd0006) + err("", z138, __LINE__, 0, 0, i000, 0xabcd0006) } } else { CH04("", 0, 0xff, z138, 0x00f, 0, 0) @@ -258,7 +258,7 @@ Method(mf6c,, Serialized) if (SLCK) { CH03("", z138, 0x011, 0, 0) if (LNotEqual(i000, 0xabcd0007)) { - err("", z138, 0x012, 0, 0, i000, 0xabcd0007) + err("", z138, __LINE__, 0, 0, i000, 0xabcd0007) } } else { CH04("", 0, 0xff, z138, 0x013, 0, 0) @@ -275,7 +275,7 @@ Method(mf6c,, Serialized) if (SLCK) { CH03("", z138, 0x015, 0, 0) if (LNotEqual(i000, 0xabcd0008)) { - err("", z138, 0x016, 0, 0, i000, 0xabcd0008) + err("", z138, __LINE__, 0, 0, i000, 0xabcd0008) } } else { CH04("", 0, 0xff, z138, 0x017, 0, 0) @@ -292,7 +292,7 @@ Method(mf6c,, Serialized) if (SLCK) { CH03("", z138, 0x019, 0, 0) if (LNotEqual(i000, 0xabcd0009)) { - err("", z138, 0x01a, 0, 0, i000, 0xabcd0009) + err("", z138, __LINE__, 0, 0, i000, 0xabcd0009) } } else { CH04("", 0, 0xff, z138, 0x01b, 0, 0) @@ -309,7 +309,7 @@ Method(mf6c,, Serialized) if (SLCK) { CH03("", z138, 0x01d, 0, 0) if (LNotEqual(i000, 0xabcd000a)) { - err("", z138, 0x01e, 0, 0, i000, 0xabcd000a) + err("", z138, __LINE__, 0, 0, i000, 0xabcd000a) } } else { CH04("", 0, 0xff, z138, 0x01f, 0, 0) @@ -331,7 +331,7 @@ Method(mf6c,, Serialized) Store(0xabcd000b, Local0) } if (LNotEqual(i000, Local0)) { - err("", z138, 0x022, 0, 0, i000, Local0) + err("", z138, __LINE__, 0, 0, i000, Local0) } } else { CH04("", 0, 0xff, z138, 0x023, 0, 0) @@ -353,7 +353,7 @@ Method(mf6c,, Serialized) Store(0xabcd000c, Local0) } if (LNotEqual(i000, Local0)) { - err("", z138, 0x026, 0, 0, i000, Local0) + err("", z138, __LINE__, 0, 0, i000, Local0) } } else { CH04("", 0, 0xff, z138, 0x027, 0, 0) @@ -370,7 +370,7 @@ Method(mf6c,, Serialized) if (SLCK) { CH03("", z138, 0x029, 0, 0) if (LNotEqual(i000, 0xabcd000d)) { - err("", z138, 0x02a, 0, 0, i000, 0xabcd000d) + err("", z138, __LINE__, 0, 0, i000, 0xabcd000d) } } else { CH04("", 0, 0xff, z138, 0x02b, 0, 0) @@ -630,7 +630,7 @@ Method(mf6e,, Serialized) CH03("", z138, 0x02d, 0, 0) Store(0xaaaa0006, Local0) if (LNotEqual(i000, Local0)) { - err("", z138, 0x02e, 0, 0, i000, Local0) + err("", z138, __LINE__, 0, 0, i000, Local0) } } else { CH04("", 0, 0xff, z138, 0x02f, 0, 0) @@ -643,7 +643,7 @@ Method(mf6e,, Serialized) CH03("", z138, 0x031, 0, 0) Store(0xaaaa000c, Local0) if (LNotEqual(i000, Local0)) { - err("", z138, 0x032, 0, 0, i000, Local0) + err("", z138, __LINE__, 0, 0, i000, Local0) } } else { CH04("", 0, 0xff, z138, 0x033, 0, 0) @@ -656,7 +656,7 @@ Method(mf6e,, Serialized) CH03("", z138, 0x035, 0, 0) Store(0xaaaa0013, Local0) if (LNotEqual(i000, Local0)) { - err("", z138, 0x036, 0, 0, i000, Local0) + err("", z138, __LINE__, 0, 0, i000, Local0) } } else { CH04("", 0, 0xff, z138, 0x037, 0, 0) @@ -669,7 +669,7 @@ Method(mf6e,, Serialized) CH03("", z138, 0x039, 0, 0) Store(0xaaaa0019, Local0) if (LNotEqual(i000, Local0)) { - err("", z138, 0x03a, 0, 0, i000, Local0) + err("", z138, __LINE__, 0, 0, i000, Local0) } } else { CH04("", 0, 0xff, z138, 0x03b, 0, 0) @@ -686,7 +686,7 @@ Method(mf6e,, Serialized) CH03("", z138, 0x03d, 0, 0) Store(0, Local0) if (LNotEqual(i000, Local0)) { - err("", z138, 0x03e, 0, 0, i000, Local0) + err("", z138, __LINE__, 0, 0, i000, Local0) } } else { CH04("", 0, 0xff, z138, 0x03f, 0, 0) @@ -699,7 +699,7 @@ Method(mf6e,, Serialized) CH03("", z138, 0x041, 0, 0) Store(0, Local0) if (LNotEqual(i000, Local0)) { - err("", z138, 0x042, 0, 0, i000, Local0) + err("", z138, __LINE__, 0, 0, i000, Local0) } } else { CH04("", 0, 0xff, z138, 0x043, 0, 0) @@ -712,7 +712,7 @@ Method(mf6e,, Serialized) CH03("", z138, 0x045, 0, 0) Store(0xabcd0000, Local0) if (LNotEqual(i000, Local0)) { - err("", z138, 0x046, 0, 0, i000, Local0) + err("", z138, __LINE__, 0, 0, i000, Local0) } } else { CH04("", 0, 0xff, z138, 0x047, 0, 0) @@ -725,7 +725,7 @@ Method(mf6e,, Serialized) CH03("", z138, 0x049, 0, 0) Store(0xabcd0000, Local0) if (LNotEqual(i000, Local0)) { - err("", z138, 0x04a, 0, 0, i000, Local0) + err("", z138, __LINE__, 0, 0, i000, Local0) } } else { CH04("", 0, 0xff, z138, 0x04b, 0, 0) @@ -738,7 +738,7 @@ Method(mf6e,, Serialized) CH03("", z138, 0x04d, 0, 0) Store(0xabcd0008, Local0) if (LNotEqual(i000, Local0)) { - err("", z138, 0x04e, 0, 0, i000, Local0) + err("", z138, __LINE__, 0, 0, i000, Local0) } } else { CH04("", 0, 0xff, z138, 0x04f, 0, 0) @@ -758,7 +758,7 @@ Method(mf6e,, Serialized) // returns logical value of the operation Store(Ones, Local0) if (LNotEqual(i000, Local0)) { - err("", z138, 0x052, 0, 0, i000, Local0) + err("", z138, __LINE__, 0, 0, i000, Local0) } } else { CH04("", 0, 0xff, z138, 0x053, 0, 0) @@ -778,7 +778,7 @@ Method(mf6e,, Serialized) // returns logical value of the operation Store(Zero, Local0) if (LNotEqual(i000, Local0)) { - err("", z138, 0x056, 0, 0, i000, Local0) + err("", z138, __LINE__, 0, 0, i000, Local0) } } else { CH04("", 0, 0xff, z138, 0x057, 0, 0) @@ -791,7 +791,7 @@ Method(mf6e,, Serialized) CH03("", z138, 0x059, 0, 0) Store(0xabcd0009, Local0) if (LNotEqual(i000, Local0)) { - err("", z138, 0x05a, 0, 0, i000, Local0) + err("", z138, __LINE__, 0, 0, i000, Local0) } } else { CH04("", 0, 0xff, z138, 0x05b, 0, 0) @@ -811,7 +811,7 @@ Method(mf6e,, Serialized) // returns logical value of the operation Store(Ones, Local0) if (LNotEqual(i000, Local0)) { - err("", z138, 0x05e, 0, 0, i000, Local0) + err("", z138, __LINE__, 0, 0, i000, Local0) } } else { CH04("", 0, 0xff, z138, 0x55f, 0, 0) @@ -831,7 +831,7 @@ Method(mf6e,, Serialized) // returns logical value of the operation Store(Zero, Local0) if (LNotEqual(i000, Local0)) { - err("", z138, 0x062, 0, 0, i000, Local0) + err("", z138, __LINE__, 0, 0, i000, Local0) } } else { CH04("", 0, 0xff, z138, 0x063, 0, 0) @@ -844,7 +844,7 @@ Method(mf6e,, Serialized) CH03("", z138, 0x065, 0, 0) Store(0xabcd0008, Local0) if (LNotEqual(i000, Local0)) { - err("", z138, 0x066, 0, 0, i000, Local0) + err("", z138, __LINE__, 0, 0, i000, Local0) } } else { CH04("", 0, 0xff, z138, 0x067, 0, 0) @@ -859,7 +859,7 @@ Method(mf6e,, Serialized) CH03("", z138, 0x069, 0, 0) Store(Zero, Local0) if (LNotEqual(i000, Local0)) { - err("", z138, 0x06a, 0, 0, i000, Local0) + err("", z138, __LINE__, 0, 0, i000, Local0) } } else { CH04("", 0, 0xff, z138, 0x06b, 0, 0) @@ -872,7 +872,7 @@ Method(mf6e,, Serialized) CH03("", z138, 0x06d, 0, 0) Store(Ones, Local0) if (LNotEqual(i000, Local0)) { - err("", z138, 0x06e, 0, 0, i000, Local0) + err("", z138, __LINE__, 0, 0, i000, Local0) } } else { CH04("", 0, 0xff, z138, 0x06f, 0, 0) @@ -888,7 +888,7 @@ Method(mf6e,, Serialized) CH03("", z138, 0x071, 0, 0) Store(0xaaaa001c, Local0) if (LNotEqual(i000, Local0)) { - err("", z138, 0x072, 0, 0, i000, Local0) + err("", z138, __LINE__, 0, 0, i000, Local0) } } else { CH04("", 0, 0xff, z138, 0x073, 0, 0) @@ -920,7 +920,7 @@ Method(mf6e,, Serialized) if (SLCK) { CH03("", z138, 0x041, 0, 0) if (LNotEqual(i000, 0xaaaa0006)) { - err("", z138, 0x042, 0, 0, i000, 0xaaaa0006) + err("", z138, __LINE__, 0, 0, i000, 0xaaaa0006) } } else { CH04("", 0, 0xff, z138, 0x043, 0, 0) @@ -932,7 +932,7 @@ Method(mf6e,, Serialized) if (SLCK) { CH03("", z138, 0x045, 0, 0) if (LNotEqual(i000, 0xaaaa000c)) { - err("", z138, 0x046, 0, 0, i000, 0xaaaa000c) + err("", z138, __LINE__, 0, 0, i000, 0xaaaa000c) } } else { CH04("", 0, 0xff, z138, 0x047, 0, 0) @@ -947,7 +947,7 @@ Method(mf6e,, Serialized) if (SLCK) { CH03("", z138, 0x049, 0, 0) if (LNotEqual(i000, 0xaaaa0013)) { - err("", z138, 0x04a, 0, 0, i000, 0xaaaa0013) + err("", z138, __LINE__, 0, 0, i000, 0xaaaa0013) } } else { CH04("", 0, 0xff, z138, 0x04b, 0, 0) @@ -959,7 +959,7 @@ Method(mf6e,, Serialized) if (SLCK) { CH03("", z138, 0x04d, 0, 0) if (LNotEqual(i000, 0xaaaa0019)) { - err("", z138, 0x04e, 0, 0, i000, 0xaaaa0019) + err("", z138, __LINE__, 0, 0, i000, 0xaaaa0019) } } else { CH04("", 0, 0xff, z138, 0x04f, 0, 0) @@ -971,7 +971,7 @@ Method(mf6e,, Serialized) if (SLCK) { CH03("", z138, 0x051, 0, 0) if (LNotEqual(i000, 0xaaaa001c)) { - err("", z138, 0x052, 0, 0, i000, 0xaaaa001c) + err("", z138, __LINE__, 0, 0, i000, 0xaaaa001c) } } else { CH04("", 0, 0xff, z138, 0x053, 0, 0) @@ -1039,7 +1039,7 @@ Method(mf6e,, Serialized) if (SLCK) { CH03("", z138, 0x055, 0, 0) if (LNotEqual(i003, 0xabcd0030)) { - err("", z138, 0x056, 0, 0, i003, 0xabcd0030) + err("", z138, __LINE__, 0, 0, i003, 0xabcd0030) } } else { CH03("", z138, 0x057, 0, 0) @@ -1058,7 +1058,7 @@ Method(mf6e,, Serialized) Store(Ones, Local0) } if (LNotEqual(i003, Local0)) { - err("", z138, 0x05a, 0, 0, i003, Local0) + err("", z138, __LINE__, 0, 0, i003, Local0) } } else { CH04("", 0, 0xff, z138, 0x05b, 0, 0) @@ -1077,7 +1077,7 @@ Method(mf6e,, Serialized) Store(0xaaaa0006, Local0) } if (LNotEqual(i003, Local0)) { - err("", z138, 0x05e, 0, 0, i003, Local0) + err("", z138, __LINE__, 0, 0, i003, Local0) } } else { CH04("", 0, 0xff, z138, 0x05f, 0, 0) @@ -1096,7 +1096,7 @@ Method(mf6e,, Serialized) Store(0xdddd0123, Local0) } if (LNotEqual(i003, Local0)) { - err("", z138, 0x062, 0, 0, i003, Local0) + err("", z138, __LINE__, 0, 0, i003, Local0) } } else { CH04("", 0, 0xff, z138, 0x063, 0, 0) @@ -1233,7 +1233,7 @@ Method(mff1,, Serialized) if (SLCK) { CH03("", z138, 0x065, 0, 0) if (LNotEqual(Local0, 0xf3)) { - err("", z138, 0x066, 0, 0, Local0, 0xf3) + err("", z138, __LINE__, 0, 0, Local0, 0xf3) } } else { CH04("", 0, 0xff, z138, 0x067, 0, 0) @@ -1247,7 +1247,7 @@ Method(mff1,, Serialized) if (SLCK) { CH03("", z138, 0x069, 0, 0) if (LNotEqual(Local0, 0xfabec)) { - err("", z138, 0x06a, 0, 0, Local0, 0xfabec) + err("", z138, __LINE__, 0, 0, Local0, 0xfabec) } } else { CH04("", 0, 0xff, z138, 0x06b, 0, 0) @@ -1261,7 +1261,7 @@ Method(mff1,, Serialized) if (SLCK) { CH03("", z138, 0x06f, 0, 0) if (LNotEqual(Local0, 0xcedab)) { - err("", z138, 0x070, 0, 0, Local0, 0xcedab) + err("", z138, __LINE__, 0, 0, Local0, 0xcedab) } } else { CH04("", 0, 0xff, z138, 0x071, 0, 0) @@ -1275,7 +1275,7 @@ Method(mff1,, Serialized) if (SLCK) { CH03("", z138, 0x073, 0, 0) if (LNotEqual(Local0, 0xabcd)) { - err("", z138, 0x074, 0, 0, Local0, 0xabcd) + err("", z138, __LINE__, 0, 0, Local0, 0xabcd) } } else { CH04("", 0, 0xff, z138, 0x075, 0, 0) @@ -1289,7 +1289,7 @@ Method(mff1,, Serialized) if (SLCK) { CH03("", z138, 0x077, 0, 0) if (LNotEqual(Local0, 0x1234)) { - err("", z138, 0x078, 0, 0, Local0, 0x1234) + err("", z138, __LINE__, 0, 0, Local0, 0x1234) } } else { CH04("", 0, 0xff, z138, 0x079, 0, 0) @@ -1303,37 +1303,37 @@ Method(mff1,, Serialized) if (SLCK) { CH03("", z138, 0x081, 0, 0) if (LNotEqual(Local0, 0x5678)) { - err("", z138, 0x082, 0, 0, Local0, 0x5678) + err("", z138, __LINE__, 0, 0, Local0, 0x5678) } } else { CH04("", 0, 0xff, z138, 0x083, 0, 0) } if (LNotEqual(i000, 0xf3)) { - err("", z138, 0x084, 0, 0, i000, 0xf3) + err("", z138, __LINE__, 0, 0, i000, 0xf3) } if (LNotEqual(i001, 0xf3)) { - err("", z138, 0x085, 0, 0, i001, 0xf3) + err("", z138, __LINE__, 0, 0, i001, 0xf3) } if (LNotEqual(i002, 0xabcd)) { - err("", z138, 0x086, 0, 0, i002, 0xabcd) + err("", z138, __LINE__, 0, 0, i002, 0xabcd) } if (LNotEqual(i003, 0xabcd)) { - err("", z138, 0x087, 0, 0, i003, 0xabcd) + err("", z138, __LINE__, 0, 0, i003, 0xabcd) } if (LNotEqual(i004, 0xabcd)) { - err("", z138, 0x088, 0, 0, i004, 0xabcd) + err("", z138, __LINE__, 0, 0, i004, 0xabcd) } if (LNotEqual(i005, 0x1234)) { - err("", z138, 0x089, 0, 0, i005, 0x1234) + err("", z138, __LINE__, 0, 0, i005, 0x1234) } if (LNotEqual(i006, 0x1234)) { - err("", z138, 0x08a, 0, 0, i006, 0x1234) + err("", z138, __LINE__, 0, 0, i006, 0x1234) } if (LNotEqual(i007, 0x5678)) { - err("", z138, 0x08b, 0, 0, i007, 0x5678) + err("", z138, __LINE__, 0, 0, i007, 0x5678) } if (LNotEqual(i008, 0x5678)) { - err("", z138, 0x08c, 0, 0, i008, 0x5678) + err("", z138, __LINE__, 0, 0, i008, 0x5678) } } diff --git a/tests/aslts/src/runtime/collections/functional/control/Recursion/recursion.asl b/tests/aslts/src/runtime/collections/functional/control/Recursion/recursion.asl index 4b704ec1e..6c6f99c6a 100644 --- a/tests/aslts/src/runtime/collections/functional/control/Recursion/recursion.asl +++ b/tests/aslts/src/runtime/collections/functional/control/Recursion/recursion.asl @@ -160,12 +160,12 @@ Method(m0ef,, Serialized) /* Check Maximal number of methods being in progress simultaneously */ if (LNotEqual(max0, 45)) { - err(ts, z177, 0x001, 0, 0, max0, 45) + err(ts, z177, __LINE__, 0, 0, max0, 45) } /* Overall got out of methods the same number as got into methods */ if (LNotEqual(cnt0, 0)) { - err(ts, z177, 0x002, 0, 0, cnt0, 0) + err(ts, z177, __LINE__, 0, 0, cnt0, 0) } CH03(ts, z177, 0x003, 0, 0) @@ -281,7 +281,7 @@ Method(m0fb,, Serialized) Store(DeRefOf(Index(arg2, lpC0)), Local0) Store(DeRefOf(Index(arg3, lpC0)), Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z177, 0x004, 0, 0, Local0, Local1) + err(ts, z177, __LINE__, 0, 0, Local0, Local1) Store(arg0, Debug) Store(lpC0, Debug) } @@ -292,22 +292,22 @@ Method(m0fb,, Serialized) Switch (arg0) { Case (1) { if (LNotEqual(ind1, n100)) { - err(ts, z177, 0x005, 0, 0, ind1, n100) + err(ts, z177, __LINE__, 0, 0, ind1, n100) } } Case (2) { if (LNotEqual(ind2, n200)) { - err(ts, z177, 0x006, 0, 0, ind2, n200) + err(ts, z177, __LINE__, 0, 0, ind2, n200) } } Case (3) { if (LNotEqual(ind3, n300)) { - err(ts, z177, 0x007, 0, 0, ind3, n300) + err(ts, z177, __LINE__, 0, 0, ind3, n300) } } Case (4) { if (LNotEqual(ind4, n400)) { - err(ts, z177, 0x008, 0, 0, ind4, n400) + err(ts, z177, __LINE__, 0, 0, ind4, n400) } } } @@ -355,7 +355,7 @@ Method(m0fb,, Serialized) Add(cnt1, Local0, cnt1) Store(DerefOf(Index(p400, ii00)), ii00) if (LNotEqual(ii00, Local0)) { - err(ts, z177, 0x009, 0, 0, ii00, Local0) + err(ts, z177, __LINE__, 0, 0, ii00, Local0) } } Store(ind3, ii00) @@ -374,7 +374,7 @@ Method(m0fb,, Serialized) Add(cnt1, Local0, cnt1) Store(DerefOf(Index(p300, ii00)), ii00) if (LNotEqual(ii00, Local0)) { - err(ts, z177, 0x00a, 0, 0, ii00, Local0) + err(ts, z177, __LINE__, 0, 0, ii00, Local0) } } Store(ind2, ii00) @@ -393,7 +393,7 @@ Method(m0fb,, Serialized) Add(cnt1, Local0, cnt1) Store(DerefOf(Index(p200, ii00)), ii00) if (LNotEqual(ii00, Local0)) { - err(ts, z177, 0x00b, 0, 0, ii00, Local0) + err(ts, z177, __LINE__, 0, 0, ii00, Local0) } } Store(ind1, ii00) @@ -412,7 +412,7 @@ Method(m0fb,, Serialized) Add(cnt1, Local0, cnt1) Store(DerefOf(Index(p100, ii00)), ii00) if (LNotEqual(ii00, Local0)) { - err(ts, z177, 0x00c, 0, 0, ii00, Local0) + err(ts, z177, __LINE__, 0, 0, ii00, Local0) } } @@ -424,12 +424,12 @@ Method(m0fb,, Serialized) /* Check Maximal number of methods being in progress simultaneously */ if (LNotEqual(max0, 45)) { - err(ts, z177, 0x00e, 0, 0, max0, 45) + err(ts, z177, __LINE__, 0, 0, max0, 45) } /* Overall got out of methods the same number as got into methods */ if (LNotEqual(cnt0, 0)) { - err(ts, z177, 0x00f, 0, 0, cnt0, 0) + err(ts, z177, __LINE__, 0, 0, cnt0, 0) } /* Check indexes */ @@ -441,7 +441,7 @@ Method(m0fb,, Serialized) /* Check the overall sum of total indexes */ if (LNotEqual(cnt1, 0x3DE)) { - err(ts, z177, 0x010, 0, 0, cnt1, 0x3DE) + err(ts, z177, __LINE__, 0, 0, cnt1, 0x3DE) } CH03(ts, z177, 0x011, 0, 0) @@ -591,12 +591,12 @@ Method(m0ff, 1, Serialized) /* Check Maximal number of methods being in progress simultaneously */ if (LNotEqual(max0, 221)) { - err(ts, z177, 0x014, 0, 0, max0, 221) + err(ts, z177, __LINE__, 0, 0, max0, 221) } /* Overall got out of methods the same number as got into methods */ if (LNotEqual(cnt0, 0)) { - err(ts, z177, 0x015, 0, 0, cnt0, 0) + err(ts, z177, __LINE__, 0, 0, cnt0, 0) } } @@ -719,7 +719,7 @@ Method(m18a, 1, Serialized) Store(DeRefOf(Index(arg2, lpC0)), Local0) Store(DeRefOf(Index(arg3, lpC0)), Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z177, 0x017, 0, 0, Local0, Local1) + err(ts, z177, __LINE__, 0, 0, Local0, Local1) Store(arg0, Debug) Store(lpC0, Debug) } @@ -730,22 +730,22 @@ Method(m18a, 1, Serialized) Switch (arg0) { Case (1) { if (LNotEqual(ind1, n100)) { - err(ts, z177, 0x018, 0, 0, ind1, n100) + err(ts, z177, __LINE__, 0, 0, ind1, n100) } } Case (2) { if (LNotEqual(ind2, n200)) { - err(ts, z177, 0x019, 0, 0, ind2, n200) + err(ts, z177, __LINE__, 0, 0, ind2, n200) } } Case (3) { if (LNotEqual(ind3, n300)) { - err(ts, z177, 0x01a, 0, 0, ind3, n300) + err(ts, z177, __LINE__, 0, 0, ind3, n300) } } Case (4) { if (LNotEqual(ind4, n400)) { - err(ts, z177, 0x01b, 0, 0, ind4, n400) + err(ts, z177, __LINE__, 0, 0, ind4, n400) } } } @@ -783,7 +783,7 @@ Method(m18a, 1, Serialized) Add(cnt1, Local0, cnt1) Store(DerefOf(Index(p100, Local1)), Local1) if (LNotEqual(Local1, Local0)) { - err(ts, z177, 0x01c, 0, 0, Local1, Local0) + err(ts, z177, __LINE__, 0, 0, Local1, Local0) } } Method(m200, 0, Serialized, 0) @@ -802,7 +802,7 @@ Method(m18a, 1, Serialized) Add(cnt1, Local0, cnt1) Store(DerefOf(Index(p200, Local1)), Local1) if (LNotEqual(Local1, Local0)) { - err(ts, z177, 0x01d, 0, 0, Local1, Local0) + err(ts, z177, __LINE__, 0, 0, Local1, Local0) } } Method(m300, 0, Serialized, 0) @@ -826,7 +826,7 @@ Method(m18a, 1, Serialized) Add(cnt1, Local0, cnt1) Store(DerefOf(Index(p300, Local1)), Local1) if (LNotEqual(Local1, Local0)) { - err(ts, z177, 0x01e, 0, 0, Local1, Local0) + err(ts, z177, __LINE__, 0, 0, Local1, Local0) } } Method(m400, 0, Serialized, 0) @@ -844,7 +844,7 @@ Method(m18a, 1, Serialized) Add(cnt1, Local0, cnt1) Store(DerefOf(Index(p400, Local1)), Local1) if (LNotEqual(Local1, Local0)) { - err(ts, z177, 0x01f, 0, 0, Local1, Local0) + err(ts, z177, __LINE__, 0, 0, Local1, Local0) } } @@ -862,12 +862,12 @@ Method(m18a, 1, Serialized) /* Check Maximal number of methods being in progress simultaneously */ if (LNotEqual(max0, 45)) { - err(ts, z177, 0x021, 0, 0, max0, 45) + err(ts, z177, __LINE__, 0, 0, max0, 45) } /* Overall got out of methods the same number as got into methods */ if (LNotEqual(cnt0, 0)) { - err(ts, z177, 0x022, 0, 0, cnt0, 0) + err(ts, z177, __LINE__, 0, 0, cnt0, 0) } /* Check indexes */ @@ -879,7 +879,7 @@ Method(m18a, 1, Serialized) /* Check the overall sum of total indexes */ if (LNotEqual(cnt1, 0x3DE)) { - err(ts, z177, 0x023, 0, 0, cnt1, 0x3DE) + err(ts, z177, __LINE__, 0, 0, cnt1, 0x3DE) } } CH03(ts, z177, 0x024, 0, 0) @@ -1000,7 +1000,7 @@ Method(m18b, 1, Serialized) Store(DeRefOf(Index(arg2, lpC0)), Local0) Store(DeRefOf(Index(arg3, lpC0)), Local1) if (LNotEqual(Local0, Local1)) { - err(ts, z177, 0x025, 0, 0, Local0, Local1) + err(ts, z177, __LINE__, 0, 0, Local0, Local1) Store(arg0, Debug) Store(lpC0, Debug) } @@ -1011,22 +1011,22 @@ Method(m18b, 1, Serialized) Switch (arg0) { Case (1) { if (LNotEqual(ind1, n100)) { - err(ts, z177, 0x026, 0, 0, ind1, n100) + err(ts, z177, __LINE__, 0, 0, ind1, n100) } } Case (2) { if (LNotEqual(ind2, n200)) { - err(ts, z177, 0x027, 0, 0, ind2, n200) + err(ts, z177, __LINE__, 0, 0, ind2, n200) } } Case (3) { if (LNotEqual(ind3, n300)) { - err(ts, z177, 0x028, 0, 0, ind3, n300) + err(ts, z177, __LINE__, 0, 0, ind3, n300) } } Case (4) { if (LNotEqual(ind4, n400)) { - err(ts, z177, 0x029, 0, 0, ind4, n400) + err(ts, z177, __LINE__, 0, 0, ind4, n400) } } } @@ -1064,7 +1064,7 @@ Method(m18b, 1, Serialized) Add(cnt1, Local0, cnt1) Store(DerefOf(Index(p100, Local1)), Local1) if (LNotEqual(Local1, Local0)) { - err(ts, z177, 0x02a, 0, 0, Local1, Local0) + err(ts, z177, __LINE__, 0, 0, Local1, Local0) } } Method(m200, 0, Serialized, 7) @@ -1083,7 +1083,7 @@ Method(m18b, 1, Serialized) Add(cnt1, Local0, cnt1) Store(DerefOf(Index(p200, Local1)), Local1) if (LNotEqual(Local1, Local0)) { - err(ts, z177, 0x02b, 0, 0, Local1, Local0) + err(ts, z177, __LINE__, 0, 0, Local1, Local0) } } Method(m300, 0, Serialized, 7) @@ -1107,7 +1107,7 @@ Method(m18b, 1, Serialized) Add(cnt1, Local0, cnt1) Store(DerefOf(Index(p300, Local1)), Local1) if (LNotEqual(Local1, Local0)) { - err(ts, z177, 0x02c, 0, 0, Local1, Local0) + err(ts, z177, __LINE__, 0, 0, Local1, Local0) } } Method(m400, 0, Serialized, 7) @@ -1125,7 +1125,7 @@ Method(m18b, 1, Serialized) Add(cnt1, Local0, cnt1) Store(DerefOf(Index(p400, Local1)), Local1) if (LNotEqual(Local1, Local0)) { - err(ts, z177, 0x02d, 0, 0, Local1, Local0) + err(ts, z177, __LINE__, 0, 0, Local1, Local0) } } @@ -1143,12 +1143,12 @@ Method(m18b, 1, Serialized) /* Check Maximal number of methods being in progress simultaneously */ if (LNotEqual(max0, 45)) { - err(ts, z177, 0x02f, 0, 0, max0, 45) + err(ts, z177, __LINE__, 0, 0, max0, 45) } /* Overall got out of methods the same number as got into methods */ if (LNotEqual(cnt0, 0)) { - err(ts, z177, 0x030, 0, 0, cnt0, 0) + err(ts, z177, __LINE__, 0, 0, cnt0, 0) } /* Check indexes */ @@ -1160,7 +1160,7 @@ Method(m18b, 1, Serialized) /* Check the overall sum of total indexes */ if (LNotEqual(cnt1, 0x3DE)) { - err(ts, z177, 0x031, 0, 0, cnt1, 0x3DE) + err(ts, z177, __LINE__, 0, 0, cnt1, 0x3DE) } } @@ -1433,26 +1433,26 @@ Method(m19d,, Serialized) Name(\i2z0, 0xabcd0000) if (LNotEqual(i2z0, 0xabcd0000)) { - err(ts, z177, 0x044, 0, 0, i2z0, 0xabcd0000) + err(ts, z177, __LINE__, 0, 0, i2z0, 0xabcd0000) } if (LNotEqual(\i2z0, 0xabcd0000)) { - err(ts, z177, 0x045, 0, 0, \i2z0, 0xabcd0000) + err(ts, z177, __LINE__, 0, 0, \i2z0, 0xabcd0000) } Store(0x12345678, i2z0) if (LNotEqual(i2z0, 0x12345678)) { - err(ts, z177, 0x046, 0, 0, i2z0, 0x12345678) + err(ts, z177, __LINE__, 0, 0, i2z0, 0x12345678) } if (LNotEqual(\i2z0, 0x12345678)) { - err(ts, z177, 0x047, 0, 0, \i2z0, 0x12345678) + err(ts, z177, __LINE__, 0, 0, \i2z0, 0x12345678) } Store(0x11112222, \i2z0) if (LNotEqual(i2z0, 0x11112222)) { - err(ts, z177, 0x048, 0, 0, i2z0, 0x11112222) + err(ts, z177, __LINE__, 0, 0, i2z0, 0x11112222) } if (LNotEqual(\i2z0, 0x11112222)) { - err(ts, z177, 0x049, 0, 0, \i2z0, 0x11112222) + err(ts, z177, __LINE__, 0, 0, \i2z0, 0x11112222) } } CH03(ts, z177, 0x04a, 0, 0) @@ -1480,26 +1480,26 @@ Method(m19e,, Serialized) Name(\i2z1, 0xabcd0000) if (LNotEqual(i2z1, 0xabcd0000)) { - err(ts, z177, 0x04e, 0, 0, i2z1, 0xabcd0000) + err(ts, z177, __LINE__, 0, 0, i2z1, 0xabcd0000) } if (LNotEqual(\i2z1, 0xabcd0000)) { - err(ts, z177, 0x04f, 0, 0, \i2z1, 0xabcd0000) + err(ts, z177, __LINE__, 0, 0, \i2z1, 0xabcd0000) } Store(0x12345678, i2z1) if (LNotEqual(i2z1, 0x12345678)) { - err(ts, z177, 0x050, 0, 0, i2z1, 0x12345678) + err(ts, z177, __LINE__, 0, 0, i2z1, 0x12345678) } if (LNotEqual(\i2z1, 0x12345678)) { - err(ts, z177, 0x051, 0, 0, \i2z1, 0x12345678) + err(ts, z177, __LINE__, 0, 0, \i2z1, 0x12345678) } Store(0x22223333, \i2z1) if (LNotEqual(i2z1, 0x22223333)) { - err(ts, z177, 0x052, 0, 0, i2z1, 0x22223333) + err(ts, z177, __LINE__, 0, 0, i2z1, 0x22223333) } if (LNotEqual(\i2z1, 0x22223333)) { - err(ts, z177, 0x053, 0, 0, \i2z1, 0x22223333) + err(ts, z177, __LINE__, 0, 0, \i2z1, 0x22223333) } } CH03(ts, z177, 0x054, 0, 0) @@ -1659,34 +1659,34 @@ Method(m1bd,, Serialized) Name(\i2z8, 0xabcd0108) if (LNotEqual(i2z8, 0xabcd0108)) { - err(ts, z177, 0x064, 0, 0, i2z8, 0xabcd0108) + err(ts, z177, __LINE__, 0, 0, i2z8, 0xabcd0108) } if (LNotEqual(\i2z8, 0xabcd0108)) { - err(ts, z177, 0x065, 0, 0, \i2z8, 0xabcd0108) + err(ts, z177, __LINE__, 0, 0, \i2z8, 0xabcd0108) } } else { if (LNotEqual(i2z8, 0x22223333)) { - err(ts, z177, 0x066, 0, 0, i2z8, 0x22223333) + err(ts, z177, __LINE__, 0, 0, i2z8, 0x22223333) } if (LNotEqual(\i2z8, 0x22223333)) { - err(ts, z177, 0x067, 0, 0, \i2z8, 0x22223333) + err(ts, z177, __LINE__, 0, 0, \i2z8, 0x22223333) } } Store(0x12345678, i2z8) if (LNotEqual(i2z8, 0x12345678)) { - err(ts, z177, 0x068, 0, 0, i2z8, 0x12345678) + err(ts, z177, __LINE__, 0, 0, i2z8, 0x12345678) } if (LNotEqual(\i2z8, 0x12345678)) { - err(ts, z177, 0x069, 0, 0, \i2z8, 0x12345678) + err(ts, z177, __LINE__, 0, 0, \i2z8, 0x12345678) } Store(0x22223333, \i2z8) if (LNotEqual(i2z8, 0x22223333)) { - err(ts, z177, 0x06a, 0, 0, i2z8, 0x22223333) + err(ts, z177, __LINE__, 0, 0, i2z8, 0x22223333) } if (LNotEqual(\i2z8, 0x22223333)) { - err(ts, z177, 0x06b, 0, 0, \i2z8, 0x22223333) + err(ts, z177, __LINE__, 0, 0, \i2z8, 0x22223333) } if (LNot(arg0)) { @@ -1695,17 +1695,17 @@ Method(m1bd,, Serialized) if (arg0) { if (LNotEqual(i2z8, 0x22223333)) { - err(ts, z177, 0x06c, 0, 0, i2z8, 0x22223333) + err(ts, z177, __LINE__, 0, 0, i2z8, 0x22223333) } if (LNotEqual(\i2z8, 0x22223333)) { - err(ts, z177, 0x06d, 0, 0, \i2z8, 0x22223333) + err(ts, z177, __LINE__, 0, 0, \i2z8, 0x22223333) } } else { if (LNotEqual(i2z8, 0x66667777)) { - err(ts, z177, 0x06e, 0, 0, i2z8, 0x66667777) + err(ts, z177, __LINE__, 0, 0, i2z8, 0x66667777) } if (LNotEqual(\i2z8, 0x66667777)) { - err(ts, z177, 0x06f, 0, 0, \i2z8, 0x66667777) + err(ts, z177, __LINE__, 0, 0, \i2z8, 0x66667777) } } @@ -1736,34 +1736,34 @@ Method(m1be,, Serialized) Name(\i2z9, 0xabcd0109) if (LNotEqual(i2z9, 0xabcd0109)) { - err(ts, z177, 0x072, 0, 0, i2z9, 0xabcd0109) + err(ts, z177, __LINE__, 0, 0, i2z9, 0xabcd0109) } if (LNotEqual(\i2z9, 0xabcd0109)) { - err(ts, z177, 0x073, 0, 0, \i2z9, 0xabcd0109) + err(ts, z177, __LINE__, 0, 0, \i2z9, 0xabcd0109) } } else { if (LNotEqual(i2z9, 0x22223333)) { - err(ts, z177, 0x074, 0, 0, i2z9, 0x22223333) + err(ts, z177, __LINE__, 0, 0, i2z9, 0x22223333) } if (LNotEqual(\i2z9, 0x22223333)) { - err(ts, z177, 0x075, 0, 0, \i2z9, 0x22223333) + err(ts, z177, __LINE__, 0, 0, \i2z9, 0x22223333) } } Store(0x12345678, i2z9) if (LNotEqual(i2z9, 0x12345678)) { - err(ts, z177, 0x076, 0, 0, i2z9, 0x12345678) + err(ts, z177, __LINE__, 0, 0, i2z9, 0x12345678) } if (LNotEqual(\i2z9, 0x12345678)) { - err(ts, z177, 0x077, 0, 0, \i2z9, 0x12345678) + err(ts, z177, __LINE__, 0, 0, \i2z9, 0x12345678) } Store(0x22223333, \i2z9) if (LNotEqual(i2z9, 0x22223333)) { - err(ts, z177, 0x078, 0, 0, i2z9, 0x22223333) + err(ts, z177, __LINE__, 0, 0, i2z9, 0x22223333) } if (LNotEqual(\i2z9, 0x22223333)) { - err(ts, z177, 0x079, 0, 0, \i2z9, 0x22223333) + err(ts, z177, __LINE__, 0, 0, \i2z9, 0x22223333) } if (LNot(arg0)) { @@ -1772,17 +1772,17 @@ Method(m1be,, Serialized) if (arg0) { if (LNotEqual(i2z9, 0x22223333)) { - err(ts, z177, 0x07a, 0, 0, i2z9, 0x22223333) + err(ts, z177, __LINE__, 0, 0, i2z9, 0x22223333) } if (LNotEqual(\i2z9, 0x22223333)) { - err(ts, z177, 0x07b, 0, 0, \i2z9, 0x22223333) + err(ts, z177, __LINE__, 0, 0, \i2z9, 0x22223333) } } else { if (LNotEqual(i2z9, 0x66667777)) { - err(ts, z177, 0x07c, 0, 0, i2z9, 0x66667777) + err(ts, z177, __LINE__, 0, 0, i2z9, 0x66667777) } if (LNotEqual(\i2z9, 0x66667777)) { - err(ts, z177, 0x07d, 0, 0, \i2z9, 0x66667777) + err(ts, z177, __LINE__, 0, 0, \i2z9, 0x66667777) } } @@ -1811,17 +1811,17 @@ Method(m1de,, Serialized) { if (LNot(arg0)) { if (LNotEqual(i3z0, 0xabcd0000)) { - err(ts, z177, 0x080, 0, 0, i3z0, 0xabcd0000) + err(ts, z177, __LINE__, 0, 0, i3z0, 0xabcd0000) } } else { if (LNotEqual(i3z0, 0x12345678)) { - err(ts, z177, 0x081, 0, 0, i3z0, 0x12345678) + err(ts, z177, __LINE__, 0, 0, i3z0, 0x12345678) } } Store(0x12345678, i3z0) if (LNotEqual(i3z0, 0x12345678)) { - err(ts, z177, 0x082, 0, 0, i3z0, 0x12345678) + err(ts, z177, __LINE__, 0, 0, i3z0, 0x12345678) } if (LNot(arg0)) { @@ -1830,11 +1830,11 @@ Method(m1de,, Serialized) if (arg0) { if (LNotEqual(i3z0, 0x12345678)) { - err(ts, z177, 0x083, 0, 0, i3z0, 0x12345678) + err(ts, z177, __LINE__, 0, 0, i3z0, 0x12345678) } } else { if (LNotEqual(i3z0, 0x66667777)) { - err(ts, z177, 0x084, 0, 0, i3z0, 0x66667777) + err(ts, z177, __LINE__, 0, 0, i3z0, 0x66667777) } } @@ -1863,17 +1863,17 @@ Method(m1df,, Serialized) { if (LNot(arg0)) { if (LNotEqual(i3z0, 0xabcd0000)) { - err(ts, z177, 0x087, 0, 0, i3z0, 0xabcd0000) + err(ts, z177, __LINE__, 0, 0, i3z0, 0xabcd0000) } } else { if (LNotEqual(i3z0, 0x12345678)) { - err(ts, z177, 0x088, 0, 0, i3z0, 0x12345678) + err(ts, z177, __LINE__, 0, 0, i3z0, 0x12345678) } } Store(0x12345678, i3z0) if (LNotEqual(i3z0, 0x12345678)) { - err(ts, z177, 0x089, 0, 0, i3z0, 0x12345678) + err(ts, z177, __LINE__, 0, 0, i3z0, 0x12345678) } if (LNot(arg0)) { @@ -1882,11 +1882,11 @@ Method(m1df,, Serialized) if (arg0) { if (LNotEqual(i3z0, 0x12345678)) { - err(ts, z177, 0x08a, 0, 0, i3z0, 0x12345678) + err(ts, z177, __LINE__, 0, 0, i3z0, 0x12345678) } } else { if (LNotEqual(i3z0, 0x66667777)) { - err(ts, z177, 0x08b, 0, 0, i3z0, 0x66667777) + err(ts, z177, __LINE__, 0, 0, i3z0, 0x66667777) } } @@ -1916,16 +1916,16 @@ Method(m1ee,, Serialized) Name(\_SB.i0q8, 0xabcd0008) if (LNotEqual(\_SB.i0q8, 0xabcd0008)) { - err(ts, z177, 0x08e, 0, 0, \_SB.i0q8, 0xabcd0008) + err(ts, z177, __LINE__, 0, 0, \_SB.i0q8, 0xabcd0008) } } else { if (LNotEqual(\_SB.i0q8, 0x22223333)) { - err(ts, z177, 0x08f, 0, 0, \_SB.i0q8, 0x22223333) + err(ts, z177, __LINE__, 0, 0, \_SB.i0q8, 0x22223333) } } Store(0x22223333, \_SB.i0q8) if (LNotEqual(\_SB.i0q8, 0x22223333)) { - err(ts, z177, 0x090, 0, 0, \_SB.i0q8, 0x22223333) + err(ts, z177, __LINE__, 0, 0, \_SB.i0q8, 0x22223333) } if (LNot(arg0)) { @@ -1934,11 +1934,11 @@ Method(m1ee,, Serialized) if (arg0) { if (LNotEqual(\_SB.i0q8, 0x22223333)) { - err(ts, z177, 0x091, 0, 0, \_SB.i0q8, 0x22223333) + err(ts, z177, __LINE__, 0, 0, \_SB.i0q8, 0x22223333) } } else { if (LNotEqual(\_SB.i0q8, 0x66667777)) { - err(ts, z177, 0x092, 0, 0, \_SB.i0q8, 0x66667777) + err(ts, z177, __LINE__, 0, 0, \_SB.i0q8, 0x66667777) } } if (arg0) { @@ -1968,17 +1968,17 @@ Method(m1ef,, Serialized) Name(\_SB.i0q9, 0xabcd0009) if (LNotEqual(\_SB.i0q9, 0xabcd0009)) { - err(ts, z177, 0x08e, 0, 0, \_SB.i0q9, 0xabcd0009) + err(ts, z177, __LINE__, 0, 0, \_SB.i0q9, 0xabcd0009) } } else { if (LNotEqual(\_SB.i0q9, 0x22223333)) { - err(ts, z177, 0x08f, 0, 0, \_SB.i0q9, 0x22223333) + err(ts, z177, __LINE__, 0, 0, \_SB.i0q9, 0x22223333) } } Store(0x22223333, \_SB.i0q9) if (LNotEqual(\_SB.i0q9, 0x22223333)) { - err(ts, z177, 0x090, 0, 0, \_SB.i0q9, 0x22223333) + err(ts, z177, __LINE__, 0, 0, \_SB.i0q9, 0x22223333) } if (LNot(arg0)) { @@ -1987,11 +1987,11 @@ Method(m1ef,, Serialized) if (arg0) { if (LNotEqual(\_SB.i0q9, 0x22223333)) { - err(ts, z177, 0x091, 0, 0, \_SB.i0q9, 0x22223333) + err(ts, z177, __LINE__, 0, 0, \_SB.i0q9, 0x22223333) } } else { if (LNotEqual(\_SB.i0q9, 0x66667777)) { - err(ts, z177, 0x092, 0, 0, \_SB.i0q9, 0x66667777) + err(ts, z177, __LINE__, 0, 0, \_SB.i0q9, 0x66667777) } } @@ -2022,17 +2022,17 @@ Method(m1bf,, Serialized) Scope(\_SB) { Name(i1q8, 0xabcd0008) } if (LNotEqual(\_SB.i1q8, 0xabcd0008)) { - err(ts, z177, 0x095, 0, 0, \_SB.i1q8, 0xabcd0008) + err(ts, z177, __LINE__, 0, 0, \_SB.i1q8, 0xabcd0008) } } else { if (LNotEqual(\_SB.i1q8, 0x22223333)) { - err(ts, z177, 0x096, 0, 0, \_SB.i1q8, 0x22223333) + err(ts, z177, __LINE__, 0, 0, \_SB.i1q8, 0x22223333) } } Store(0x22223333, \_SB.i1q8) if (LNotEqual(\_SB.i1q8, 0x22223333)) { - err(ts, z177, 0x097, 0, 0, \_SB.i1q8, 0x22223333) + err(ts, z177, __LINE__, 0, 0, \_SB.i1q8, 0x22223333) } if (LNot(arg0)) { @@ -2041,11 +2041,11 @@ Method(m1bf,, Serialized) if (arg0) { if (LNotEqual(\_SB.i1q8, 0x22223333)) { - err(ts, z177, 0x098, 0, 0, \_SB.i1q8, 0x22223333) + err(ts, z177, __LINE__, 0, 0, \_SB.i1q8, 0x22223333) } } else { if (LNotEqual(\_SB.i1q8, 0x66667777)) { - err(ts, z177, 0x099, 0, 0, \_SB.i1q8, 0x66667777) + err(ts, z177, __LINE__, 0, 0, \_SB.i1q8, 0x66667777) } } if (arg0) { @@ -2075,17 +2075,17 @@ Method(m1dd,, Serialized) Scope(\_SB) { Name(i1q9, 0xabcd0008) } if (LNotEqual(\_SB.i1q9, 0xabcd0008)) { - err(ts, z177, 0x09c, 0, 0, \_SB.i1q9, 0xabcd0008) + err(ts, z177, __LINE__, 0, 0, \_SB.i1q9, 0xabcd0008) } } else { if (LNotEqual(\_SB.i1q9, 0x22223333)) { - err(ts, z177, 0x09d, 0, 0, \_SB.i1q9, 0x22223333) + err(ts, z177, __LINE__, 0, 0, \_SB.i1q9, 0x22223333) } } Store(0x22223333, \_SB.i1q9) if (LNotEqual(\_SB.i1q9, 0x22223333)) { - err(ts, z177, 0x09e, 0, 0, \_SB.i1q9, 0x22223333) + err(ts, z177, __LINE__, 0, 0, \_SB.i1q9, 0x22223333) } if (LNot(arg0)) { @@ -2094,11 +2094,11 @@ Method(m1dd,, Serialized) if (arg0) { if (LNotEqual(\_SB.i1q9, 0x22223333)) { - err(ts, z177, 0x09f, 0, 0, \_SB.i1q9, 0x22223333) + err(ts, z177, __LINE__, 0, 0, \_SB.i1q9, 0x22223333) } } else { if (LNotEqual(\_SB.i1q9, 0x66667777)) { - err(ts, z177, 0x0a0, 0, 0, \_SB.i1q9, 0x66667777) + err(ts, z177, __LINE__, 0, 0, \_SB.i1q9, 0x66667777) } } if (arg0) { @@ -2129,34 +2129,34 @@ Method(m277,, Serialized) Scope(\) { Name(i3z1, 0xabcd0208) } if (LNotEqual(i3z1, 0xabcd0208)) { - err(ts, z177, 0x064, 0, 0, i3z1, 0xabcd0208) + err(ts, z177, __LINE__, 0, 0, i3z1, 0xabcd0208) } if (LNotEqual(\i3z1, 0xabcd0208)) { - err(ts, z177, 0x065, 0, 0, \i3z1, 0xabcd0208) + err(ts, z177, __LINE__, 0, 0, \i3z1, 0xabcd0208) } } else { if (LNotEqual(i3z1, 0x22223333)) { - err(ts, z177, 0x066, 0, 0, i3z1, 0x22223333) + err(ts, z177, __LINE__, 0, 0, i3z1, 0x22223333) } if (LNotEqual(\i3z1, 0x22223333)) { - err(ts, z177, 0x067, 0, 0, \i3z1, 0x22223333) + err(ts, z177, __LINE__, 0, 0, \i3z1, 0x22223333) } } Store(0x12345678, i3z1) if (LNotEqual(i3z1, 0x12345678)) { - err(ts, z177, 0x068, 0, 0, i3z1, 0x12345678) + err(ts, z177, __LINE__, 0, 0, i3z1, 0x12345678) } if (LNotEqual(\i3z1, 0x12345678)) { - err(ts, z177, 0x069, 0, 0, \i3z1, 0x12345678) + err(ts, z177, __LINE__, 0, 0, \i3z1, 0x12345678) } Store(0x22223333, \i3z1) if (LNotEqual(i3z1, 0x22223333)) { - err(ts, z177, 0x06a, 0, 0, i3z1, 0x22223333) + err(ts, z177, __LINE__, 0, 0, i3z1, 0x22223333) } if (LNotEqual(\i3z1, 0x22223333)) { - err(ts, z177, 0x06b, 0, 0, \i3z1, 0x22223333) + err(ts, z177, __LINE__, 0, 0, \i3z1, 0x22223333) } if (LNot(arg0)) { @@ -2165,17 +2165,17 @@ Method(m277,, Serialized) if (arg0) { if (LNotEqual(i3z1, 0x22223333)) { - err(ts, z177, 0x06c, 0, 0, i3z1, 0x22223333) + err(ts, z177, __LINE__, 0, 0, i3z1, 0x22223333) } if (LNotEqual(\i3z1, 0x22223333)) { - err(ts, z177, 0x06d, 0, 0, \i3z1, 0x22223333) + err(ts, z177, __LINE__, 0, 0, \i3z1, 0x22223333) } } else { if (LNotEqual(i3z1, 0x66667777)) { - err(ts, z177, 0x06e, 0, 0, i3z1, 0x66667777) + err(ts, z177, __LINE__, 0, 0, i3z1, 0x66667777) } if (LNotEqual(\i3z1, 0x66667777)) { - err(ts, z177, 0x06f, 0, 0, \i3z1, 0x66667777) + err(ts, z177, __LINE__, 0, 0, \i3z1, 0x66667777) } } @@ -2206,34 +2206,34 @@ Method(m27d,, Serialized) Scope(\) { Name(i3z2, 0xabcd0209) } if (LNotEqual(i3z2, 0xabcd0209)) { - err(ts, z177, 0x072, 0, 0, i3z2, 0xabcd0209) + err(ts, z177, __LINE__, 0, 0, i3z2, 0xabcd0209) } if (LNotEqual(\i3z2, 0xabcd0209)) { - err(ts, z177, 0x073, 0, 0, \i3z2, 0xabcd0209) + err(ts, z177, __LINE__, 0, 0, \i3z2, 0xabcd0209) } } else { if (LNotEqual(i3z2, 0x22223333)) { - err(ts, z177, 0x074, 0, 0, i3z2, 0x22223333) + err(ts, z177, __LINE__, 0, 0, i3z2, 0x22223333) } if (LNotEqual(\i3z2, 0x22223333)) { - err(ts, z177, 0x075, 0, 0, \i3z2, 0x22223333) + err(ts, z177, __LINE__, 0, 0, \i3z2, 0x22223333) } } Store(0x12345678, i3z2) if (LNotEqual(i3z2, 0x12345678)) { - err(ts, z177, 0x076, 0, 0, i3z2, 0x12345678) + err(ts, z177, __LINE__, 0, 0, i3z2, 0x12345678) } if (LNotEqual(\i3z2, 0x12345678)) { - err(ts, z177, 0x077, 0, 0, \i3z2, 0x12345678) + err(ts, z177, __LINE__, 0, 0, \i3z2, 0x12345678) } Store(0x22223333, \i3z2) if (LNotEqual(i3z2, 0x22223333)) { - err(ts, z177, 0x078, 0, 0, i3z2, 0x22223333) + err(ts, z177, __LINE__, 0, 0, i3z2, 0x22223333) } if (LNotEqual(\i3z2, 0x22223333)) { - err(ts, z177, 0x079, 0, 0, \i3z2, 0x22223333) + err(ts, z177, __LINE__, 0, 0, \i3z2, 0x22223333) } if (LNot(arg0)) { @@ -2242,17 +2242,17 @@ Method(m27d,, Serialized) if (arg0) { if (LNotEqual(i3z2, 0x22223333)) { - err(ts, z177, 0x07a, 0, 0, i3z2, 0x22223333) + err(ts, z177, __LINE__, 0, 0, i3z2, 0x22223333) } if (LNotEqual(\i3z2, 0x22223333)) { - err(ts, z177, 0x07b, 0, 0, \i3z2, 0x22223333) + err(ts, z177, __LINE__, 0, 0, \i3z2, 0x22223333) } } else { if (LNotEqual(i3z2, 0x66667777)) { - err(ts, z177, 0x07c, 0, 0, i3z2, 0x66667777) + err(ts, z177, __LINE__, 0, 0, i3z2, 0x66667777) } if (LNotEqual(\i3z2, 0x66667777)) { - err(ts, z177, 0x07d, 0, 0, \i3z2, 0x66667777) + err(ts, z177, __LINE__, 0, 0, \i3z2, 0x66667777) } } diff --git a/tests/aslts/src/runtime/collections/functional/control/Recursion/stack_overflow.asl b/tests/aslts/src/runtime/collections/functional/control/Recursion/stack_overflow.asl index 8d5f1b252..6e8c90032 100644 --- a/tests/aslts/src/runtime/collections/functional/control/Recursion/stack_overflow.asl +++ b/tests/aslts/src/runtime/collections/functional/control/Recursion/stack_overflow.asl @@ -367,7 +367,7 @@ Method(m0fc, 1, Serialized) Store(0x77A4, Local0) } if (LNotEqual(i000, Local0)) { - err(ts, z178, 0x303, 0, 0, i000, Local0) + err(ts, z178, __LINE__, 0, 0, i000, Local0) } } } @@ -407,7 +407,7 @@ Method(m0fe, 1, Serialized) } else { CH03(ts, z178, 0x403, 0, 0) if (LNotEqual(i000, 0xf7)) { - err(ts, z178, 0x404, 0, 0, i000, 0xf7) + err(ts, z178, __LINE__, 0, 0, i000, 0xf7) } } } diff --git a/tests/aslts/src/runtime/collections/functional/control/Return/return.asl b/tests/aslts/src/runtime/collections/functional/control/Return/return.asl index c97656ac8..8f39347f8 100644 --- a/tests/aslts/src/runtime/collections/functional/control/Return/return.asl +++ b/tests/aslts/src/runtime/collections/functional/control/Return/return.asl @@ -606,7 +606,7 @@ Method(mf72, 1, Serialized) m004(Local0, Local1, Local2, Local3, Local4, Local5, Local6), i000) if (LNotEqual(i000, cmp0)) { - err("", z139, 0x000, 0, 0, i000, cmp0) + err("", z139, __LINE__, 0, 0, i000, cmp0) } m4c0(ts, Local0, 0, 0) m4c0(ts, Local1, 0xaaaa0001, 0xaaaa0001) @@ -626,7 +626,7 @@ Method(mf72, 1, Serialized) m004(Local0, Local1, Local2, Local3, Local4, Local5, Local6), i000) if (LNotEqual(i000, cmp0)) { - err("", z139, 0x001, 0, 0, i000, cmp0) + err("", z139, __LINE__, 0, 0, i000, cmp0) } m4c0(ts, Local0, 1, 1) m4c0(ts, Local1, 0xaaaa0001, 0xaaaa0001) @@ -646,7 +646,7 @@ Method(mf72, 1, Serialized) m004(Local0, Local1, Local2, Local3, Local4, Local5, Local6), i000) if (LNotEqual(i000, cmp0)) { - err("", z139, 0x002, 0, 0, i000, cmp0) + err("", z139, __LINE__, 0, 0, i000, cmp0) } m4c0(ts, Local0, 2, 2) m4c0(ts, Local1, 0xaaaa0001, 0xaaaa0001) @@ -666,7 +666,7 @@ Method(mf72, 1, Serialized) m004(Local0, Local1, Local2, Local3, Local4, Local5, Local6), i000) if (LNotEqual(i000, cmp0)) { - err("", z139, 0x003, 0, 0, i000, cmp0) + err("", z139, __LINE__, 0, 0, i000, cmp0) } m4c0(ts, Local0, 3, 3) m4c0(ts, Local1, 0xaaaa0001, 0xaaaa0001) @@ -686,7 +686,7 @@ Method(mf72, 1, Serialized) m004(Local0, Local1, Local2, Local3, Local4, Local5, Local6), i000) if (LNotEqual(i000, cmp0)) { - err("", z139, 0x004, 0, 0, i000, cmp0) + err("", z139, __LINE__, 0, 0, i000, cmp0) } m4c0(ts, Local0, 4, 4) m4c0(ts, Local1, 0xaaaa0001, 0xaaaa0001) @@ -706,7 +706,7 @@ Method(mf72, 1, Serialized) m004(Local0, Local1, Local2, Local3, Local4, Local5, Local6), i000) if (LNotEqual(i000, cmp0)) { - err("", z139, 0x005, 0, 0, i000, cmp0) + err("", z139, __LINE__, 0, 0, i000, cmp0) } m4c0(ts, Local0, 5, 5) m4c0(ts, Local1, 0xaaaa0001, 0xaaaa0001) @@ -726,7 +726,7 @@ Method(mf72, 1, Serialized) m004(Local0, Local1, Local2, Local3, Local4, Local5, Local6), i000) if (LNotEqual(i000, cmp0)) { - err("", z139, 0x006, 0, 0, i000, cmp0) + err("", z139, __LINE__, 0, 0, i000, cmp0) } m4c0(ts, Local0, 6, 6) m4c0(ts, Local1, 0xaaaa0001, 0xaaaa0001) @@ -746,7 +746,7 @@ Method(mf72, 1, Serialized) m004(Local0, Local1, Local2, Local3, Local4, Local5, Local6), i000) if (LNotEqual(i000, cmp0)) { - err("", z139, 0x007, 0, 0, i000, cmp0) + err("", z139, __LINE__, 0, 0, i000, cmp0) } m4c0(ts, Local0, 7, 7) m4c0(ts, Local1, 0xaaaa0001, 0xaaaa0001) @@ -766,7 +766,7 @@ Method(mf72, 1, Serialized) m004(Local0, Local1, Local2, Local3, Local4, Local5, Local6), i000) if (LNotEqual(i000, cmp0)) { - err("", z139, 0x008, 0, 0, i000, cmp0) + err("", z139, __LINE__, 0, 0, i000, cmp0) } m4c0(ts, Local0, 8, 8) m4c0(ts, Local1, 0xaaaa0001, 0xaaaa0001) @@ -786,7 +786,7 @@ Method(mf72, 1, Serialized) m004(Local0, Local1, Local2, Local3, Local4, Local5, Local6), i000) if (LNotEqual(i000, cmp0)) { - err("", z139, 0x009, 0, 0, i000, cmp0) + err("", z139, __LINE__, 0, 0, i000, cmp0) } m4c0(ts, Local0, 9, 9) m4c0(ts, Local1, 0xaaaa0001, 0xaaaa0001) diff --git a/tests/aslts/src/runtime/collections/functional/control/ctl0.asl b/tests/aslts/src/runtime/collections/functional/control/ctl0.asl index cd1870260..9bce217f8 100644 --- a/tests/aslts/src/runtime/collections/functional/control/ctl0.asl +++ b/tests/aslts/src/runtime/collections/functional/control/ctl0.asl @@ -100,13 +100,13 @@ Method(m074,, Serialized) Store(0, Local7) Store(m070(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z003, 0, 0, 0, Local7, 0) + err(ts, z003, __LINE__, 0, 0, Local7, 0) } Store(0x12345678, Local7) Store(m070(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z003, 1, 0, 0, Local7, 0) + err(ts, z003, __LINE__, 0, 0, Local7, 0) } // m071 @@ -115,7 +115,7 @@ Method(m074,, Serialized) While(LLess(Local7, 2)) { Store(m071(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z003, 2, 0, 0, Local7, 0) + err(ts, z003, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -123,7 +123,7 @@ Method(m074,, Serialized) Store(0x12345678, Local7) Store(m071(Local7), Local0) if (LNotEqual(Local0, 1)){ - err(ts, z003, 3, 0, 0, Local7, 0) + err(ts, z003, __LINE__, 0, 0, Local7, 0) } // m072 @@ -132,7 +132,7 @@ Method(m074,, Serialized) While(LLess(Local7, 2)) { Store(m072(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z003, 4, 0, 0, Local7, 0) + err(ts, z003, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -140,7 +140,7 @@ Method(m074,, Serialized) Store(0x12345678, Local7) Store(m072(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z003, 5, 0, 0, Local7, 0) + err(ts, z003, __LINE__, 0, 0, Local7, 0) } // m073 @@ -149,7 +149,7 @@ Method(m074,, Serialized) While(LLess(Local7, 3)) { Store(m073(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z003, 6, 0, 0, Local7, 0) + err(ts, z003, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -157,7 +157,7 @@ Method(m074,, Serialized) Store(0x12345678, Local7) Store(m073(Local7), Local0) if (LNotEqual(Local0, 2)){ - err(ts, z003, 7, 0, 0, Local7, 0) + err(ts, z003, __LINE__, 0, 0, Local7, 0) } } diff --git a/tests/aslts/src/runtime/collections/functional/control/ctl1.asl b/tests/aslts/src/runtime/collections/functional/control/ctl1.asl index 498304830..10cdcf310 100644 --- a/tests/aslts/src/runtime/collections/functional/control/ctl1.asl +++ b/tests/aslts/src/runtime/collections/functional/control/ctl1.asl @@ -982,7 +982,7 @@ Method(m0b8,, Serialized) While(LLessEqual(Local7, 1)) { Store(m080(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 0, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -990,7 +990,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m080(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 1, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m081 @@ -998,14 +998,14 @@ Method(m0b8,, Serialized) Store(0, Local7) Store(m081(Local7), Local0) if (LNotEqual(Local0, 2)){ - err(ts, z004, 2, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(1, Local7) While(LLessEqual(Local7, 2)) { Store(m081(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 3, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1013,7 +1013,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m081(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 4, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m082 @@ -1022,7 +1022,7 @@ Method(m0b8,, Serialized) While(LLessEqual(Local7, 2)) { Store(m082(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 5, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1030,7 +1030,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m082(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 6, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m083 @@ -1038,14 +1038,14 @@ Method(m0b8,, Serialized) Store(0, Local7) Store(m083(Local7), Local0) if (LNotEqual(Local0, 3)){ - err(ts, z004, 7, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(1, Local7) While(LLessEqual(Local7, 3)) { Store(m083(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 8, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1053,7 +1053,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m083(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 9, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m090 @@ -1062,7 +1062,7 @@ Method(m0b8,, Serialized) While(LLessEqual(Local7, 2)) { Store(m090(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 10, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1070,7 +1070,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m090(Local7), Local0) if (LNotEqual(Local0, 2)){ - err(ts, z004, 11, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m091 @@ -1079,7 +1079,7 @@ Method(m0b8,, Serialized) While(LLessEqual(Local7, 2)) { Store(m091(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 12, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1087,7 +1087,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m091(Local7), Local0) if (LNotEqual(Local0, 1)){ - err(ts, z004, 13, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m092 @@ -1096,7 +1096,7 @@ Method(m0b8,, Serialized) While(LLessEqual(Local7, 3)) { Store(m092(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 14, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1104,7 +1104,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m092(Local7), Local0) if (LNotEqual(Local0, 2)){ - err(ts, z004, 15, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m093 @@ -1112,14 +1112,14 @@ Method(m0b8,, Serialized) Store(0, Local7) Store(m093(Local7), Local0) if (LNotEqual(Local0, 2)){ - err(ts, z004, 16, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(1, Local7) While(LLessEqual(Local7, 3)) { Store(m093(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 17, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1127,7 +1127,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m093(Local7), Local0) if (LNotEqual(Local0, 3)){ - err(ts, z004, 18, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m094 @@ -1135,20 +1135,20 @@ Method(m0b8,, Serialized) Store(0, Local7) Store(m094(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 19, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(1, Local7) Store(m094(Local7), Local0) if (LNotEqual(Local0, 3)){ - err(ts, z004, 20, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(2, Local7) While(LLessEqual(Local7, 3)) { Store(m094(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 21, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1156,7 +1156,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m094(Local7), Local0) if (LNotEqual(Local0, 3)){ - err(ts, z004, 22, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m095 @@ -1164,14 +1164,14 @@ Method(m0b8,, Serialized) Store(0, Local7) Store(m095(Local7), Local0) if (LNotEqual(Local0, 2)){ - err(ts, z004, 23, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(1, Local7) While(LLessEqual(Local7, 2)) { Store(m095(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 24, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1180,14 +1180,14 @@ Method(m0b8,, Serialized) Store(3, Local7) Store(m095(Local7), Local0) if (LNotEqual(Local0, 5)){ - err(ts, z004, 25, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(4, Local7) While(LLessEqual(Local7, 5)) { Store(m095(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 26, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1196,7 +1196,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m095(Local7), Local0) if (LNotEqual(Local0, 5)){ - err(ts, z004, 27, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m096 @@ -1205,7 +1205,7 @@ Method(m0b8,, Serialized) While(LLessEqual(Local7, 3)) { Store(m096(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 28, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1213,7 +1213,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m096(Local7), Local0) if (LNotEqual(Local0, 3)){ - err(ts, z004, 29, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m097 @@ -1222,7 +1222,7 @@ Method(m0b8,, Serialized) While(LLessEqual(Local7, 3)) { Store(m097(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 30, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1230,7 +1230,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m097(Local7), Local0) if (LNotEqual(Local0, 1)){ - err(ts, z004, 31, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m098 @@ -1239,7 +1239,7 @@ Method(m0b8,, Serialized) While(LLessEqual(Local7, 5)) { Store(m098(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 32, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1247,7 +1247,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m098(Local7), Local0) if (LNotEqual(Local0, 3)){ - err(ts, z004, 33, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m099 @@ -1255,14 +1255,14 @@ Method(m0b8,, Serialized) Store(0, Local7) Store(m099(Local7), Local0) if (LNotEqual(Local0, 3)){ - err(ts, z004, 34, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(1, Local7) While(LLessEqual(Local7, 4)) { Store(m099(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 35, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1270,7 +1270,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m099(Local7), Local0) if (LNotEqual(Local0, 4)){ - err(ts, z004, 36, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m09a @@ -1278,20 +1278,20 @@ Method(m0b8,, Serialized) Store(0, Local7) Store(m09a(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 37, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(1, Local7) Store(m09a(Local7), Local0) if (LNotEqual(Local0, 4)){ - err(ts, z004, 38, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(2, Local7) While(LLessEqual(Local7, 4)) { Store(m09a(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 39, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1299,7 +1299,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m09a(Local7), Local0) if (LNotEqual(Local0, 4)){ - err(ts, z004, 40, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m09b @@ -1307,14 +1307,14 @@ Method(m0b8,, Serialized) Store(0, Local7) Store(m09b(Local7), Local0) if (LNotEqual(Local0, 3)){ - err(ts, z004, 41, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(1, Local7) While(LLessEqual(Local7, 3)) { Store(m09b(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 42, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1322,14 +1322,14 @@ Method(m0b8,, Serialized) Store(4, Local7) Store(m09b(Local7), Local0) if (LNotEqual(Local0, 7)){ - err(ts, z004, 43, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(5, Local7) While(LLessEqual(Local7, 7)) { Store(m09b(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 44, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1337,7 +1337,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m09b(Local7), Local0) if (LNotEqual(Local0, 7)){ - err(ts, z004, 45, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m09c @@ -1346,7 +1346,7 @@ Method(m0b8,, Serialized) While(LLessEqual(Local7, 2)) { Store(m09c(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 46, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1354,7 +1354,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m09c(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 47, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m09d @@ -1363,7 +1363,7 @@ Method(m0b8,, Serialized) While(LLessEqual(Local7, 2)) { Store(m09d(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 48, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1371,7 +1371,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m09d(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 49, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m09e @@ -1380,7 +1380,7 @@ Method(m0b8,, Serialized) While(LLessEqual(Local7, 3)) { Store(m09e(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 50, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1388,7 +1388,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m09e(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 51, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m09f @@ -1396,14 +1396,14 @@ Method(m0b8,, Serialized) Store(0, Local7) Store(m09f(Local7), Local0) if (LNotEqual(Local0, 2)){ - err(ts, z004, 52, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(1, Local7) While(LLessEqual(Local7, 3)) { Store(m09f(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 53, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1411,7 +1411,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m09f(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 54, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m0a0 @@ -1419,20 +1419,20 @@ Method(m0b8,, Serialized) Store(0, Local7) Store(m0a0(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 55, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(1, Local7) Store(m0a0(Local7), Local0) if (LNotEqual(Local0, 3)){ - err(ts, z004, 56, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(2, Local7) While(LLessEqual(Local7, 3)) { Store(m0a0(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 57, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1440,7 +1440,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m0a0(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 58, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m0a1 @@ -1448,14 +1448,14 @@ Method(m0b8,, Serialized) Store(0, Local7) Store(m0a1(Local7), Local0) if (LNotEqual(Local0, 2)){ - err(ts, z004, 59, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(1, Local7) While(LLessEqual(Local7, 2)) { Store(m0a1(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 60, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1463,14 +1463,14 @@ Method(m0b8,, Serialized) Store(3, Local7) Store(m0a1(Local7), Local0) if (LNotEqual(Local0, 5)){ - err(ts, z004, 61, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(4, Local7) While(LLessEqual(Local7, 5)) { Store(m0a1(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 62, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1478,7 +1478,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m0a1(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 63, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m0a2 @@ -1487,7 +1487,7 @@ Method(m0b8,, Serialized) While(LLessEqual(Local7, 3)) { Store(m0a2(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 64, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1495,7 +1495,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m0a2(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 65, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m0a3 @@ -1504,7 +1504,7 @@ Method(m0b8,, Serialized) While(LLessEqual(Local7, 3)) { Store(m0a3(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 66, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1512,7 +1512,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m0a3(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 67, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m0a4 @@ -1521,7 +1521,7 @@ Method(m0b8,, Serialized) While(LLessEqual(Local7, 5)) { Store(m0a4(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 68, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1529,7 +1529,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m0a4(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 69, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m0a5 @@ -1537,14 +1537,14 @@ Method(m0b8,, Serialized) Store(0, Local7) Store(m0a5(Local7), Local0) if (LNotEqual(Local0, 3)){ - err(ts, z004, 70, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(1, Local7) While(LLessEqual(Local7, 4)) { Store(m0a5(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 71, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1552,7 +1552,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m0a5(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 72, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m0a6 @@ -1560,20 +1560,20 @@ Method(m0b8,, Serialized) Store(0, Local7) Store(m0a6(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 73, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(1, Local7) Store(m0a6(Local7), Local0) if (LNotEqual(Local0, 4)){ - err(ts, z004, 74, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(2, Local7) While(LLessEqual(Local7, 4)) { Store(m0a6(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 75, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1581,7 +1581,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m0a6(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 76, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m0a7 @@ -1589,14 +1589,14 @@ Method(m0b8,, Serialized) Store(0, Local7) Store(m0a7(Local7), Local0) if (LNotEqual(Local0, 3)){ - err(ts, z004, 77, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(1, Local7) While(LLessEqual(Local7, 3)) { Store(m0a7(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 78, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1604,14 +1604,14 @@ Method(m0b8,, Serialized) Store(4, Local7) Store(m0a7(Local7), Local0) if (LNotEqual(Local0, 7)){ - err(ts, z004, 79, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(5, Local7) While(LLessEqual(Local7, 7)) { Store(m0a7(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 80, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1619,7 +1619,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m0a7(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 81, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m0a8 @@ -1628,7 +1628,7 @@ Method(m0b8,, Serialized) While(LLessEqual(Local7, 3)) { Store(m0a8(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 82, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1636,7 +1636,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m0a8(Local7), Local0) if (LNotEqual(Local0, 3)){ - err(ts, z004, 83, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m0a9 @@ -1645,7 +1645,7 @@ Method(m0b8,, Serialized) While(LLessEqual(Local7, 3)) { Store(m0a9(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 84, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1653,7 +1653,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m0a9(Local7), Local0) if (LNotEqual(Local0, 3)){ - err(ts, z004, 85, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m0aa @@ -1662,7 +1662,7 @@ Method(m0b8,, Serialized) While(LLessEqual(Local7, 3)) { Store(m0aa(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 86, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1670,7 +1670,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m0aa(Local7), Local0) if (LNotEqual(Local0, 2)){ - err(ts, z004, 87, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m0ab @@ -1679,7 +1679,7 @@ Method(m0b8,, Serialized) While(LLessEqual(Local7, 5)) { Store(m0ab(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 88, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1687,21 +1687,21 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m0ab(Local7), Local0) if (LNotEqual(Local0, 4)){ - err(ts, z004, 89, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m0ac Store(0, Local7) Store(m0ac(Local7), Local0) if (LNotEqual(Local0, 2)){ - err(ts, z004, 90, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(1, Local7) While(LLessEqual(Local7, 4)) { Store(m0ac(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 91, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1709,7 +1709,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m0ac(Local7), Local0) if (LNotEqual(Local0, 4)){ - err(ts, z004, 92, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m0ad @@ -1717,20 +1717,20 @@ Method(m0b8,, Serialized) Store(0, Local7) Store(m0ad(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 93, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(1, Local7) Store(m0ad(Local7), Local0) if (LNotEqual(Local0, 3)){ - err(ts, z004, 94, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(2, Local7) While(LLessEqual(Local7, 4)) { Store(m0ad(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 95, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1738,7 +1738,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m0ad(Local7), Local0) if (LNotEqual(Local0, 4)){ - err(ts, z004, 96, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m0ae @@ -1747,7 +1747,7 @@ Method(m0b8,, Serialized) While(LLessEqual(Local7, 1)) { Store(m0ae(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 97, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1755,14 +1755,14 @@ Method(m0b8,, Serialized) Store(2, Local7) Store(m0ae(Local7), Local0) if (LNotEqual(Local0, 4)){ - err(ts, z004, 98, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(3, Local7) While(LLessEqual(Local7, 4)) { Store(m0ae(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 99, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1770,7 +1770,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m0ae(Local7), Local0) if (LNotEqual(Local0, 4)){ - err(ts, z004, 100, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m0af @@ -1779,14 +1779,14 @@ Method(m0b8,, Serialized) Store(0, Local7) Store(m0af(Local7), Local0) if (LNotEqual(Local0, 2)){ - err(ts, z004, 101, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(1, Local7) While(LLessEqual(Local7, 2)) { Store(m0af(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 102, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1794,14 +1794,14 @@ Method(m0b8,, Serialized) Store(3, Local7) Store(m0af(Local7), Local0) if (LNotEqual(Local0, 5)){ - err(ts, z004, 103, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(4, Local7) While(LLessEqual(Local7, 5)) { Store(m0af(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 104, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1810,14 +1810,14 @@ Method(m0b8,, Serialized) Store(6, Local7) Store(m0af(Local7), Local0) if (LNotEqual(Local0, 8)){ - err(ts, z004, 105, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(7, Local7) While(LLessEqual(Local7, 8)) { Store(m0af(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 106, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1825,7 +1825,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m0af(Local7), Local0) if (LNotEqual(Local0, 8)){ - err(ts, z004, 107, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m0b0 @@ -1834,7 +1834,7 @@ Method(m0b8,, Serialized) While(LLessEqual(Local7, 4)) { Store(m0b0(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 108, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1842,7 +1842,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m0b0(Local7), Local0) if (LNotEqual(Local0, 4)){ - err(ts, z004, 109, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m0b1 @@ -1851,7 +1851,7 @@ Method(m0b8,, Serialized) While(LLessEqual(Local7, 4)) { Store(m0b1(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 110, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1859,7 +1859,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m0b1(Local7), Local0) if (LNotEqual(Local0, 4)){ - err(ts, z004, 111, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m0b2 @@ -1868,7 +1868,7 @@ Method(m0b8,, Serialized) While(LLessEqual(Local7, 4)) { Store(m0b2(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 112, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1876,7 +1876,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m0b2(Local7), Local0) if (LNotEqual(Local0, 2)){ - err(ts, z004, 113, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m0b3 @@ -1885,7 +1885,7 @@ Method(m0b8,, Serialized) While(LLessEqual(Local7, 4)) { Store(m0b3(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 114, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1893,7 +1893,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m0b3(Local7), Local0) if (LNotEqual(Local0, 6)){ - err(ts, z004, 115, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m0b4 @@ -1901,14 +1901,14 @@ Method(m0b8,, Serialized) Store(0, Local7) Store(m0b4(Local7), Local0) if (LNotEqual(Local0, 3)){ - err(ts, z004, 116, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(1, Local7) While(LLessEqual(Local7, 5)) { Store(m0b4(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 117, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1916,7 +1916,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m0b4(Local7), Local0) if (LNotEqual(Local0, 5)){ - err(ts, z004, 118, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m0b5 @@ -1924,20 +1924,20 @@ Method(m0b8,, Serialized) Store(0, Local7) Store(m0b5(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 119, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(1, Local7) Store(m0b5(Local7), Local0) if (LNotEqual(Local0, 4)){ - err(ts, z004, 120, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(2, Local7) While(LLessEqual(Local7, 5)) { Store(m0b5(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 121, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1945,7 +1945,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m0b5(Local7), Local0) if (LNotEqual(Local0, 5)){ - err(ts, z004, 122, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m0b6 @@ -1954,7 +1954,7 @@ Method(m0b8,, Serialized) While(LLessEqual(Local7, 1)) { Store(m0b6(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 123, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1962,14 +1962,14 @@ Method(m0b8,, Serialized) Store(2, Local7) Store(m0b6(Local7), Local0) if (LNotEqual(Local0, 5)){ - err(ts, z004, 124, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(3, Local7) While(LLessEqual(Local7, 5)) { Store(m0b6(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 125, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -1977,7 +1977,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m0b6(Local7), Local0) if (LNotEqual(Local0, 5)){ - err(ts, z004, 126, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } // m0b7 @@ -1985,14 +1985,14 @@ Method(m0b8,, Serialized) Store(0, Local7) Store(m0b7(Local7), Local0) if (LNotEqual(Local0, 3)){ - err(ts, z004, 127, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(1, Local7) While(LLessEqual(Local7, 3)) { Store(m0b7(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 128, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -2000,14 +2000,14 @@ Method(m0b8,, Serialized) Store(4, Local7) Store(m0b7(Local7), Local0) if (LNotEqual(Local0, 7)){ - err(ts, z004, 129, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(5, Local7) While(LLessEqual(Local7, 7)) { Store(m0b7(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 130, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -2015,14 +2015,14 @@ Method(m0b8,, Serialized) Store(8, Local7) Store(m0b7(Local7), Local0) if (LNotEqual(Local0, 11)){ - err(ts, z004, 131, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(9, Local7) While(LLessEqual(Local7, 11)) { Store(m0b7(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 132, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -2030,14 +2030,14 @@ Method(m0b8,, Serialized) Store(12, Local7) Store(m0b7(Local7), Local0) if (LNotEqual(Local0, 15)){ - err(ts, z004, 133, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Store(13, Local7) While(LLessEqual(Local7, 15)) { Store(m0b7(Local7), Local0) if (LNotEqual(Local0, Local7)){ - err(ts, z004, 134, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } Increment(Local7) } @@ -2045,7 +2045,7 @@ Method(m0b8,, Serialized) Store(0x12345678, Local7) Store(m0b7(Local7), Local0) if (LNotEqual(Local0, 15)){ - err(ts, z004, 135, 0, 0, Local7, 0) + err(ts, z004, __LINE__, 0, 0, Local7, 0) } } diff --git a/tests/aslts/src/runtime/collections/functional/control/ctl2.asl b/tests/aslts/src/runtime/collections/functional/control/ctl2.asl index dd4c8fb17..1d49054e2 100644 --- a/tests/aslts/src/runtime/collections/functional/control/ctl2.asl +++ b/tests/aslts/src/runtime/collections/functional/control/ctl2.asl @@ -796,7 +796,7 @@ Method(IF00,, Serialized) While (LLess(Local7, 302)) { Store(m040(Local7), Local0) if (LNotEqual(Local0, Local7)) { - err(ts, z005, Local7, 0, 0, Local0, 0) + err(ts, z005, __LINE__, 0, 0, Local0, 0) } Increment(Local7) } diff --git a/tests/aslts/src/runtime/collections/functional/control/switch1.asl b/tests/aslts/src/runtime/collections/functional/control/switch1.asl index a2db7298c..d36c094ee 100644 --- a/tests/aslts/src/runtime/collections/functional/control/switch1.asl +++ b/tests/aslts/src/runtime/collections/functional/control/switch1.asl @@ -585,7 +585,7 @@ Method(m0c7, 3, Serialized) } if (LNotEqual(Local0, ix00)){ - err(arg0, z068, 0, 0, 0, Local0, ix00) + err(arg0, z068, __LINE__, 0, 0, Local0, ix00) } Increment(ix00) Increment(swi1) diff --git a/tests/aslts/src/runtime/collections/functional/control/switch2.asl b/tests/aslts/src/runtime/collections/functional/control/switch2.asl index a23930cb8..77323a607 100644 --- a/tests/aslts/src/runtime/collections/functional/control/switch2.asl +++ b/tests/aslts/src/runtime/collections/functional/control/switch2.asl @@ -243,7 +243,7 @@ Method(SW02,, Serialized) Decrement(lpN0) Increment(lpC0) if (LNotEqual(Local1, lpN0)) { - err(ts, z069, 0, 0, 0, Local1, lpN0) + err(ts, z069, __LINE__, 0, 0, Local1, lpN0) return (Ones) } Store(1, Index(b0sw, lpN0)) @@ -546,7 +546,7 @@ Method(SW03,, Serialized) Decrement(lpN0) Increment(lpC0) if (LNotEqual(Local1, lpN0)) { - err(ts, z069, 1, 0, 0, Local1, lpN0) + err(ts, z069, __LINE__, 0, 0, Local1, lpN0) return (Ones) } Store(2, Index(b0sw, lpN0)) @@ -567,7 +567,7 @@ Method(SW03,, Serialized) Increment(lpC0) Add(TMAX, lpN0, Local7) if (LNotEqual(Local1, Local7)) { - err(ts, z069, 2, 0, 0, Local1, Local7) + err(ts, z069, __LINE__, 0, 0, Local1, Local7) return (Ones) } } @@ -907,7 +907,7 @@ Method(SW04,, Serialized) Store(m0c3(), Local1) if (LNotEqual(Local1, Local7)) { - err(ts, z069, 3, 0, 0, Local1, Local7) + err(ts, z069, __LINE__, 0, 0, Local1, Local7) return (Ones) } @@ -922,7 +922,7 @@ Method(SW04,, Serialized) Decrement(lpN0) Increment(lpC0) if (LNotEqual(Local1, lpN0)) { - err(ts, z069, 4, 0, 0, Local1, lpN0) + err(ts, z069, __LINE__, 0, 0, Local1, lpN0) return (Ones) } } @@ -1271,7 +1271,7 @@ Method(SW05,, Serialized) Store(m0c4(lpC0), Local1) if (LNotEqual(Local1, lpC0)) { - err(ts, z069, 5, 0, 0, Local1, lpC0) + err(ts, z069, __LINE__, 0, 0, Local1, lpC0) return (Ones) } Decrement(lpN0) @@ -1611,7 +1611,7 @@ Method(SW06,, Serialized) Decrement(lpN0) Increment(lpC0) if (LNotEqual(Local1, Local7)) { - err(ts, z069, 6, 0, 0, Local1, Local7) + err(ts, z069, __LINE__, 0, 0, Local1, Local7) return (Ones) } } @@ -1628,7 +1628,7 @@ Method(SW06,, Serialized) Increment(lpC0) Add(TMAX, lpN0, Local7) if (LNotEqual(Local1, Local7)) { - err(ts, z069, 7, 0, 0, Local1, Local7) + err(ts, z069, __LINE__, 0, 0, Local1, Local7) return (Ones) } Store(2, Index(b0sw, lpN0)) diff --git a/tests/aslts/src/runtime/collections/functional/control/switch3.asl b/tests/aslts/src/runtime/collections/functional/control/switch3.asl index 9abee25d4..4b01f8db2 100644 --- a/tests/aslts/src/runtime/collections/functional/control/switch3.asl +++ b/tests/aslts/src/runtime/collections/functional/control/switch3.asl @@ -349,7 +349,7 @@ Method(m0de, 1) Decrement(lpN0) Increment(lpC0) if (LNotEqual(Local1, lpN0)) { - err(arg0, z070, 0, 0, 0, Local1, lpN0) + err(arg0, z070, __LINE__, 0, 0, Local1, lpN0) return (Ones) } Store(2, Index(b0sw, lpN0)) @@ -370,7 +370,7 @@ Method(m0de, 1) Increment(lpC0) Add(TMAX, lpN0, Local7) if (LNotEqual(Local1, Local7)) { - err(arg0, z070, 1, 0, 0, Local1, Local7) + err(arg0, z070, __LINE__, 0, 0, Local1, Local7) return (Ones) } } @@ -712,7 +712,7 @@ Method(m0de, 1) Store(m002(), Local1) if (LNotEqual(Local1, Local7)) { - err(arg0, z070, 2, 0, 0, Local1, Local7) + err(arg0, z070, __LINE__, 0, 0, Local1, Local7) return (Ones) } @@ -727,7 +727,7 @@ Method(m0de, 1) Decrement(lpN0) Increment(lpC0) if (LNotEqual(Local1, lpN0)) { - err(arg0, z070, 3, 0, 0, Local1, lpN0) + err(arg0, z070, __LINE__, 0, 0, Local1, lpN0) return (Ones) } } @@ -912,7 +912,7 @@ Method(m0de, 1) Decrement(lpN0) Increment(lpC0) if (LNotEqual(Local0, lpN0)) { - err(arg0, z070, 4, 0, 0, Local0, lpN0) + err(arg0, z070, __LINE__, 0, 0, Local0, lpN0) return (Ones) } Store(1, Index(b0sw, lpN0)) diff --git a/tests/aslts/src/runtime/collections/functional/control/switch4.asl b/tests/aslts/src/runtime/collections/functional/control/switch4.asl index af05fa01b..cff708559 100644 --- a/tests/aslts/src/runtime/collections/functional/control/switch4.asl +++ b/tests/aslts/src/runtime/collections/functional/control/switch4.asl @@ -218,55 +218,55 @@ Method(m0e0, 1) Store(m0df(0321), Local0) if (LNotEqual(Local0, 36)) { - err(arg0, z071, 0, 0, 0, Local0, 36) + err(arg0, z071, __LINE__, 0, 0, Local0, 36) } Store(m0df(0xd1), Local0) if (LNotEqual(Local0, 36)) { - err(arg0, z071, 1, 0, 0, Local0, 36) + err(arg0, z071, __LINE__, 0, 0, Local0, 36) } Store(m0df(9876543210), Local0) if (LNotEqual(Local0, 37)) { - err(arg0, z071, 2, 0, 0, Local0, 37) + err(arg0, z071, __LINE__, 0, 0, Local0, 37) } Store(m0df(0xc179b3fe), Local0) if (LNotEqual(Local0, 28)) { - err(arg0, z071, 4, 0, 0, Local0, 28) + err(arg0, z071, __LINE__, 0, 0, Local0, 28) } Store(m0df(0xfe7cb391d650a284), Local0) if (F64) { if (LNotEqual(Local0, 29)) { - err(arg0, z071, 0x100, 0, 0, Local0, 29) + err(arg0, z071, __LINE__, 0, 0, Local0, 29) } } else { if (LNotEqual(Local0, 39)) { - err(arg0, z071, 0x101, 0, 0, Local0, 39) + err(arg0, z071, __LINE__, 0, 0, Local0, 39) } } Store(m0df(0), Local0) if (LNotEqual(Local0, 14)) { - err(arg0, z071, 6, 0, 0, Local0, 14) + err(arg0, z071, __LINE__, 0, 0, Local0, 14) } Store(m0df(0xffffffff), Local0) if (LNotEqual(Local0, 16)) { - err(arg0, z071, 7, 0, 0, Local0, 16) + err(arg0, z071, __LINE__, 0, 0, Local0, 16) } Store(m0df(0xffffffffffffffff), Local0) if (F64) { if (LNotEqual(Local0, 17)) { - err(arg0, z071, 8, 0, 0, Local0, 17) + err(arg0, z071, __LINE__, 0, 0, Local0, 17) } } else { if (LNotEqual(Local0, 16)) { - err(arg0, z071, 9, 0, 0, Local0, 16) + err(arg0, z071, __LINE__, 0, 0, Local0, 16) } } Store(m0df(0xff), Local0) if (LNotEqual(Local0, 20)) { - err(arg0, z071, 10, 0, 0, Local0, 20) + err(arg0, z071, __LINE__, 0, 0, Local0, 20) } Store(m0df(0xabcdef), Local0) if (LNotEqual(Local0, 44)) { - err(arg0, z071, 11, 0, 0, Local0, 44) + err(arg0, z071, __LINE__, 0, 0, Local0, 44) } } @@ -451,62 +451,62 @@ Method(m0e2, 1) Store(m0e1(0321), Local0) if (LNotEqual(Local0, 36)) { - err(arg0, z071, 12, 0, 0, Local0, 36) + err(arg0, z071, __LINE__, 0, 0, Local0, 36) } Store(m0e1(0xd1), Local0) if (LNotEqual(Local0, 36)) { - err(arg0, z071, 13, 0, 0, Local0, 36) + err(arg0, z071, __LINE__, 0, 0, Local0, 36) } Store(m0e1(9876543210), Local0) // if (F64) { if (LNotEqual(Local0, 37)) { - err(arg0, z071, 14, 0, 0, Local0, 37) + err(arg0, z071, __LINE__, 0, 0, Local0, 37) } // } else { // if (LNotEqual(Local0, 45)) { -// err(arg0, z071, 15, 0, 0, Local0, 45) +// err(arg0, z071, __LINE__, 0, 0, Local0, 45) // } // } Store(m0e1(0xc179b3fe), Local0) if (LNotEqual(Local0, 28)) { - err(arg0, z071, 16, 0, 0, Local0, 28) + err(arg0, z071, __LINE__, 0, 0, Local0, 28) } Store(m0e1(0xfe7cb391d650a284), Local0) if (F64) { if (LNotEqual(Local0, 29)) { - err(arg0, z071, 0x102, 0, 0, Local0, 29) + err(arg0, z071, __LINE__, 0, 0, Local0, 29) } } else { if (LNotEqual(Local0, 39)) { - err(arg0, z071, 0x103, 0, 0, Local0, 39) + err(arg0, z071, __LINE__, 0, 0, Local0, 39) } } Store(m0e1(0), Local0) if (LNotEqual(Local0, 14)) { - err(arg0, z071, 18, 0, 0, Local0, 14) + err(arg0, z071, __LINE__, 0, 0, Local0, 14) } Store(m0e1(0xffffffff), Local0) if (LNotEqual(Local0, 16)) { - err(arg0, z071, 19, 0, 0, Local0, 16) + err(arg0, z071, __LINE__, 0, 0, Local0, 16) } Store(m0e1(0xffffffffffffffff), Local0) if (F64) { if (LNotEqual(Local0, 17)) { - err(arg0, z071, 20, 0, 0, Local0, 17) + err(arg0, z071, __LINE__, 0, 0, Local0, 17) } } else { if (LNotEqual(Local0, 16)) { - err(arg0, z071, 21, 0, 0, Local0, 16) + err(arg0, z071, __LINE__, 0, 0, Local0, 16) } } Store(m0e1(0xff), Local0) if (LNotEqual(Local0, 20)) { - err(arg0, z071, 22, 0, 0, Local0, 20) + err(arg0, z071, __LINE__, 0, 0, Local0, 20) } Store(m0e1(0xabcdef), Local0) if (LNotEqual(Local0, 44)) { - err(arg0, z071, 23, 0, 0, Local0, 44) + err(arg0, z071, __LINE__, 0, 0, Local0, 44) } } @@ -717,83 +717,83 @@ Method(m0e4, 1) Store(m0e3("0321"), Local0) if (LNotEqual(Local0, 34)) { - err(arg0, z071, 24, 0, 0, Local0, 34) + err(arg0, z071, __LINE__, 0, 0, Local0, 34) } Store(m0e3("321"), Local0) if (LNotEqual(Local0, 35)) { - err(arg0, z071, 25, 0, 0, Local0, 35) + err(arg0, z071, __LINE__, 0, 0, Local0, 35) } Store(m0e3("ba9876"), Local0) if (LNotEqual(Local0, 36)) { - err(arg0, z071, 26, 0, 0, Local0, 36) + err(arg0, z071, __LINE__, 0, 0, Local0, 36) } Store(m0e3("c179b3fe"), Local0) if (LNotEqual(Local0, 37)) { - err(arg0, z071, 27, 0, 0, Local0, 37) + err(arg0, z071, __LINE__, 0, 0, Local0, 37) } Store(m0e3("fe7cb391d650a284"), Local0) if (LNotEqual(Local0, 38)) { - err(arg0, z071, 28, 0, 0, Local0, 38) + err(arg0, z071, __LINE__, 0, 0, Local0, 38) } Store(m0e3("ffffffff"), Local0) if (LNotEqual(Local0, 39)) { - err(arg0, z071, 29, 0, 0, Local0, 39) + err(arg0, z071, __LINE__, 0, 0, Local0, 39) } Store(m0e3("ffffffffffffffffff"), Local0) if (LNotEqual(Local0, 40)) { - err(arg0, z071, 30, 0, 0, Local0, 40) + err(arg0, z071, __LINE__, 0, 0, Local0, 40) } Store(m0e3("ffffffffffffffff"), Local0) if (LNotEqual(Local0, 41)) { - err(arg0, z071, 31, 0, 0, Local0, 41) + err(arg0, z071, __LINE__, 0, 0, Local0, 41) } Store(m0e3("ffffffffff"), Local0) if (LNotEqual(Local0, 42)) { - err(arg0, z071, 32, 0, 0, Local0, 42) + err(arg0, z071, __LINE__, 0, 0, Local0, 42) } Store(m0e3("ff"), Local0) if (LNotEqual(Local0, 43)) { - err(arg0, z071, 33, 0, 0, Local0, 43) + err(arg0, z071, __LINE__, 0, 0, Local0, 43) } Store(m0e3("fe7cb391d650a2841"), Local0) if (LNotEqual(Local0, 44)) { - err(arg0, z071, 34, 0, 0, Local0, 44) + err(arg0, z071, __LINE__, 0, 0, Local0, 44) } Store(m0e3("987654321"), Local0) if (LNotEqual(Local0, 45)) { - err(arg0, z071, 35, 0, 0, Local0, 45) + err(arg0, z071, __LINE__, 0, 0, Local0, 45) } Store(m0e3("0xfe7cb3"), Local0) if (LNotEqual(Local0, 46)) { - err(arg0, z071, 36, 0, 0, Local0, 46) + err(arg0, z071, __LINE__, 0, 0, Local0, 46) } Store(m0e3("1234q"), Local0) if (LNotEqual(Local0, 47)) { - err(arg0, z071, 37, 0, 0, Local0, 47) + err(arg0, z071, __LINE__, 0, 0, Local0, 47) } Store(m0e3(BIG0), Local0) if (LNotEqual(Local0, 48)) { - err(arg0, z071, 38, 0, 0, Local0, 48) + err(arg0, z071, __LINE__, 0, 0, Local0, 48) } Store(m0e3(""), Local0) if (LNotEqual(Local0, 49)) { - err(arg0, z071, 39, 0, 0, Local0, 49) + err(arg0, z071, __LINE__, 0, 0, Local0, 49) } Store(m0e3(" "), Local0) if (LNotEqual(Local0, 50)) { - err(arg0, z071, 40, 0, 0, Local0, 50) + err(arg0, z071, __LINE__, 0, 0, Local0, 50) } Store(m0e3(ALL0), Local0) if (LNotEqual(Local0, 51)) { - err(arg0, z071, 41, 0, 0, Local0, 51) + err(arg0, z071, __LINE__, 0, 0, Local0, 51) } Store(m0e3("abcdef"), Local0) if (LNotEqual(Local0, 52)) { - err(arg0, z071, 42, 0, 0, Local0, 52) + err(arg0, z071, __LINE__, 0, 0, Local0, 52) } Store(m0e3("ABCDEF"), Local0) if (LNotEqual(Local0, 53)) { - err(arg0, z071, 43, 0, 0, Local0, 53) + err(arg0, z071, __LINE__, 0, 0, Local0, 53) } } @@ -1060,51 +1060,51 @@ Method(m0e6, 1) Store(m0e5(Buffer(1){10}), Local0) if (LNotEqual(Local0, 29)) { - err(arg0, z071, 44, 0, 0, Local0, 29) + err(arg0, z071, __LINE__, 0, 0, Local0, 29) } Store(m0e5(Buffer(2){11,12}), Local0) if (LNotEqual(Local0, 30)) { - err(arg0, z071, 45, 0, 0, Local0, 30) + err(arg0, z071, __LINE__, 0, 0, Local0, 30) } Store(m0e5(Buffer() {13,14,15}), Local0) if (LNotEqual(Local0, 31)) { - err(arg0, z071, 46, 0, 0, Local0, 31) + err(arg0, z071, __LINE__, 0, 0, Local0, 31) } Store(m0e5(Buffer(2){16,17,18}), Local0) if (LNotEqual(Local0, 32)) { - err(arg0, z071, 47, 0, 0, Local0, 32) + err(arg0, z071, __LINE__, 0, 0, Local0, 32) } Store(m0e5(Buffer(3){19,20}), Local0) if (LNotEqual(Local0, 33)) { - err(arg0, z071, 48, 0, 0, Local0, 33) + err(arg0, z071, __LINE__, 0, 0, Local0, 33) } Store(m0e5(Buffer(3){21,22,23}), Local0) if (LNotEqual(Local0, 34)) { - err(arg0, z071, 49, 0, 0, Local0, 34) + err(arg0, z071, __LINE__, 0, 0, Local0, 34) } Store(m0e5(Buffer(4){24,25,26,27}), Local0) if (LNotEqual(Local0, 35)) { - err(arg0, z071, 50, 0, 0, Local0, 35) + err(arg0, z071, __LINE__, 0, 0, Local0, 35) } Store(m0e5(Buffer(5){28,29,30,31,32}), Local0) if (LNotEqual(Local0, 36)) { - err(arg0, z071, 51, 0, 0, Local0, 36) + err(arg0, z071, __LINE__, 0, 0, Local0, 36) } Store(m0e5(Buffer(8){33,34,35,36,37,38,39,40}), Local0) if (LNotEqual(Local0, 37)) { - err(arg0, z071, 52, 0, 0, Local0, 37) + err(arg0, z071, __LINE__, 0, 0, Local0, 37) } Store(m0e5(Buffer(){0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0}), Local0) if (LNotEqual(Local0, 38)) { - err(arg0, z071, 53, 0, 0, Local0, 38) + err(arg0, z071, __LINE__, 0, 0, Local0, 38) } Store(m0e5(Buffer(9){41,42,43,44,45,46,47,48,49}), Local0) if (LNotEqual(Local0, 39)) { - err(arg0, z071, 54, 0, 0, Local0, 39) + err(arg0, z071, __LINE__, 0, 0, Local0, 39) } Store(m0e5(Buffer(257){0x7d}), Local0) if (LNotEqual(Local0, 40)) { - err(arg0, z071, 55, 0, 0, Local0, 40) + err(arg0, z071, __LINE__, 0, 0, Local0, 40) } Store(m0e5(Buffer(257) { // 0-127 @@ -1145,7 +1145,7 @@ Method(m0e6, 1) // 256 0x01}), Local0) if (LNotEqual(Local0, 41)) { - err(arg0, z071, 56, 0, 0, Local0, 41) + err(arg0, z071, __LINE__, 0, 0, Local0, 41) } Store(m0e5(Buffer() { // 0-127 @@ -1186,71 +1186,71 @@ Method(m0e6, 1) // 256 0x02}), Local0) if (LNotEqual(Local0, 42)) { - err(arg0, z071, 57, 0, 0, Local0, 42) + err(arg0, z071, __LINE__, 0, 0, Local0, 42) } if (F64) { Store(m0e5(Buffer(4){0,0,0,0}), Local0) if (LNotEqual(Local0, 43)) { - err(arg0, z071, 58, 0, 0, Local0, 43) + err(arg0, z071, __LINE__, 0, 0, Local0, 43) } Store(m0e5(Buffer(8){0,0,0,0,0,0,0,0}), Local0) if (LNotEqual(Local0, 4)) { - err(arg0, z071, 59, 0, 0, Local0, 4) + err(arg0, z071, __LINE__, 0, 0, Local0, 4) } Store(m0e5(Buffer(4){0xff,0xff,0xff,0xff}), Local0) if (LNotEqual(Local0, 45)) { - err(arg0, z071, 60, 0, 0, Local0, 45) + err(arg0, z071, __LINE__, 0, 0, Local0, 45) } Store(m0e5(Buffer(8){0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff}), Local0) if (LNotEqual(Local0, 6)) { - err(arg0, z071, 61, 0, 0, Local0, 6) + err(arg0, z071, __LINE__, 0, 0, Local0, 6) } } else { Store(m0e5(Buffer(4){0,0,0,0}), Local0) if (LNotEqual(Local0, 4)) { - err(arg0, z071, 62, 0, 0, Local0, 4) + err(arg0, z071, __LINE__, 0, 0, Local0, 4) } Store(m0e5(Buffer(8){0,0,0,0,0,0,0,0}), Local0) if (LNotEqual(Local0, 44)) { - err(arg0, z071, 63, 0, 0, Local0, 44) + err(arg0, z071, __LINE__, 0, 0, Local0, 44) } Store(m0e5(Buffer(4){0xff,0xff,0xff,0xff}), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z071, 64, 0, 0, Local0, 5) + err(arg0, z071, __LINE__, 0, 0, Local0, 5) } Store(m0e5(Buffer(8){0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff}), Local0) if (LNotEqual(Local0, 47)) { - err(arg0, z071, 65, 0, 0, Local0, 47) + err(arg0, z071, __LINE__, 0, 0, Local0, 47) } } Store(m0e5(Buffer(9){0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff}), Local0) if (LNotEqual(Local0, 46)) { - err(arg0, z071, 66, 0, 0, Local0, 46) + err(arg0, z071, __LINE__, 0, 0, Local0, 46) } Store(m0e5(Buffer(5){0xff,0xff,0xff,0xff,0xff}), Local0) if (LNotEqual(Local0, 48)) { - err(arg0, z071, 67, 0, 0, Local0, 48) + err(arg0, z071, __LINE__, 0, 0, Local0, 48) } Store(m0e5(Buffer(1){0xff}), Local0) if (LNotEqual(Local0, 49)) { - err(arg0, z071, 68, 0, 0, Local0, 49) + err(arg0, z071, __LINE__, 0, 0, Local0, 49) } Store(m0e5(Buffer(1){}), Local0) if (LNotEqual(Local0, 24)) { - err(arg0, z071, 69, 0, 0, Local0, 24) + err(arg0, z071, __LINE__, 0, 0, Local0, 24) } Store(m0e5(Buffer(5){}), Local0) if (LNotEqual(Local0, 51)) { - err(arg0, z071, 70, 0, 0, Local0, 51) + err(arg0, z071, __LINE__, 0, 0, Local0, 51) } Store(m0e5(Buffer(9){}), Local0) if (LNotEqual(Local0, 52)) { - err(arg0, z071, 71, 0, 0, Local0, 52) + err(arg0, z071, __LINE__, 0, 0, Local0, 52) } Store(m0e5(Buffer(9){0xab, 0xcd, 0xef}), Local0) if (LNotEqual(Local0, 53)) { - err(arg0, z071, 72, 0, 0, Local0, 53) + err(arg0, z071, __LINE__, 0, 0, Local0, 53) } } diff --git a/tests/aslts/src/runtime/collections/functional/control/switch5.asl b/tests/aslts/src/runtime/collections/functional/control/switch5.asl index 0bb44a72e..939fd6718 100644 --- a/tests/aslts/src/runtime/collections/functional/control/switch5.asl +++ b/tests/aslts/src/runtime/collections/functional/control/switch5.asl @@ -222,55 +222,55 @@ Method(m0e8, 1) Store(m0e7(0321), Local0) if (LNotEqual(Local0, 36)) { - err(arg0, z072, 0, 0, 0, Local0, 36) + err(arg0, z072, __LINE__, 0, 0, Local0, 36) } Store(m0e7(0xd1), Local0) if (LNotEqual(Local0, 36)) { - err(arg0, z072, 1, 0, 0, Local0, 36) + err(arg0, z072, __LINE__, 0, 0, Local0, 36) } Store(m0e7(9876543210), Local0) if (LNotEqual(Local0, 37)) { - err(arg0, z072, 2, 0, 0, Local0, 37) + err(arg0, z072, __LINE__, 0, 0, Local0, 37) } Store(m0e7(0xc179b3fe), Local0) if (LNotEqual(Local0, 28)) { - err(arg0, z072, 4, 0, 0, Local0, 28) + err(arg0, z072, __LINE__, 0, 0, Local0, 28) } Store(m0e7(0xfe7cb391d650a284), Local0) if (F64) { if (LNotEqual(Local0, 29)) { - err(arg0, z072, 0x1005, 0, 0, Local0, 29) + err(arg0, z072, __LINE__, 0, 0, Local0, 29) } } else { if (LNotEqual(Local0, 39)) { - err(arg0, z072, 0x101, 0, 0, Local0, 39) + err(arg0, z072, __LINE__, 0, 0, Local0, 39) } } Store(m0e7(0), Local0) if (LNotEqual(Local0, 14)) { - err(arg0, z072, 6, 0, 0, Local0, 14) + err(arg0, z072, __LINE__, 0, 0, Local0, 14) } Store(m0e7(0xffffffff), Local0) if (LNotEqual(Local0, 16)) { - err(arg0, z072, 7, 0, 0, Local0, 16) + err(arg0, z072, __LINE__, 0, 0, Local0, 16) } Store(m0e7(0xffffffffffffffff), Local0) if (F64) { if (LNotEqual(Local0, 17)) { - err(arg0, z072, 8, 0, 0, Local0, 17) + err(arg0, z072, __LINE__, 0, 0, Local0, 17) } } else { if (LNotEqual(Local0, 16)) { - err(arg0, z072, 9, 0, 0, Local0, 16) + err(arg0, z072, __LINE__, 0, 0, Local0, 16) } } Store(m0e7(0xff), Local0) if (LNotEqual(Local0, 20)) { - err(arg0, z072, 10, 0, 0, Local0, 20) + err(arg0, z072, __LINE__, 0, 0, Local0, 20) } Store(m0e7(0xabcdef), Local0) if (LNotEqual(Local0, 44)) { - err(arg0, z072, 11, 0, 0, Local0, 44) + err(arg0, z072, __LINE__, 0, 0, Local0, 44) } } @@ -482,83 +482,83 @@ Method(m0ea, 1) Store(m0e9("0321"), Local0) if (LNotEqual(Local0, 34)) { - err(arg0, z072, 12, 0, 0, Local0, 34) + err(arg0, z072, __LINE__, 0, 0, Local0, 34) } Store(m0e9("321"), Local0) if (LNotEqual(Local0, 35)) { - err(arg0, z072, 13, 0, 0, Local0, 35) + err(arg0, z072, __LINE__, 0, 0, Local0, 35) } Store(m0e9("ba9876"), Local0) if (LNotEqual(Local0, 36)) { - err(arg0, z072, 14, 0, 0, Local0, 36) + err(arg0, z072, __LINE__, 0, 0, Local0, 36) } Store(m0e9("c179b3fe"), Local0) if (LNotEqual(Local0, 37)) { - err(arg0, z072, 15, 0, 0, Local0, 37) + err(arg0, z072, __LINE__, 0, 0, Local0, 37) } Store(m0e9("fe7cb391d650a284"), Local0) if (LNotEqual(Local0, 38)) { - err(arg0, z072, 16, 0, 0, Local0, 38) + err(arg0, z072, __LINE__, 0, 0, Local0, 38) } Store(m0e9("ffffffff"), Local0) if (LNotEqual(Local0, 39)) { - err(arg0, z072, 17, 0, 0, Local0, 39) + err(arg0, z072, __LINE__, 0, 0, Local0, 39) } Store(m0e9("ffffffffffffffffff"), Local0) if (LNotEqual(Local0, 40)) { - err(arg0, z072, 18, 0, 0, Local0, 40) + err(arg0, z072, __LINE__, 0, 0, Local0, 40) } Store(m0e9("ffffffffffffffff"), Local0) if (LNotEqual(Local0, 41)) { - err(arg0, z072, 19, 0, 0, Local0, 41) + err(arg0, z072, __LINE__, 0, 0, Local0, 41) } Store(m0e9("ffffffffff"), Local0) if (LNotEqual(Local0, 42)) { - err(arg0, z072, 20, 0, 0, Local0, 42) + err(arg0, z072, __LINE__, 0, 0, Local0, 42) } Store(m0e9("ff"), Local0) if (LNotEqual(Local0, 43)) { - err(arg0, z072, 21, 0, 0, Local0, 43) + err(arg0, z072, __LINE__, 0, 0, Local0, 43) } Store(m0e9("fe7cb391d650a2841"), Local0) if (LNotEqual(Local0, 44)) { - err(arg0, z072, 22, 0, 0, Local0, 44) + err(arg0, z072, __LINE__, 0, 0, Local0, 44) } Store(m0e9("987654321"), Local0) if (LNotEqual(Local0, 45)) { - err(arg0, z072, 23, 0, 0, Local0, 45) + err(arg0, z072, __LINE__, 0, 0, Local0, 45) } Store(m0e9("0xfe7cb3"), Local0) if (LNotEqual(Local0, 46)) { - err(arg0, z072, 24, 0, 0, Local0, 46) + err(arg0, z072, __LINE__, 0, 0, Local0, 46) } Store(m0e9("1234q"), Local0) if (LNotEqual(Local0, 47)) { - err(arg0, z072, 25, 0, 0, Local0, 47) + err(arg0, z072, __LINE__, 0, 0, Local0, 47) } Store(m0e9(BIG0), Local0) if (LNotEqual(Local0, 48)) { - err(arg0, z072, 26, 0, 0, Local0, 48) + err(arg0, z072, __LINE__, 0, 0, Local0, 48) } Store(m0e9(""), Local0) if (LNotEqual(Local0, 49)) { - err(arg0, z072, 27, 0, 0, Local0, 49) + err(arg0, z072, __LINE__, 0, 0, Local0, 49) } Store(m0e9(" "), Local0) if (LNotEqual(Local0, 50)) { - err(arg0, z072, 28, 0, 0, Local0, 50) + err(arg0, z072, __LINE__, 0, 0, Local0, 50) } Store(m0e9(ALL0), Local0) if (LNotEqual(Local0, 51)) { - err(arg0, z072, 29, 0, 0, Local0, 51) + err(arg0, z072, __LINE__, 0, 0, Local0, 51) } Store(m0e9("abcdef"), Local0) if (LNotEqual(Local0, 52)) { - err(arg0, z072, 30, 0, 0, Local0, 52) + err(arg0, z072, __LINE__, 0, 0, Local0, 52) } Store(m0e9("ABCDEF"), Local0) if (LNotEqual(Local0, 53)) { - err(arg0, z072, 31, 0, 0, Local0, 53) + err(arg0, z072, __LINE__, 0, 0, Local0, 53) } } @@ -826,51 +826,51 @@ Method(m0ec, 1) Store(m0eb(Buffer(1){10}), Local0) if (LNotEqual(Local0, 29)) { - err(arg0, z072, 32, 0, 0, Local0, 29) + err(arg0, z072, __LINE__, 0, 0, Local0, 29) } Store(m0eb(Buffer(2){11,12}), Local0) if (LNotEqual(Local0, 30)) { - err(arg0, z072, 33, 0, 0, Local0, 30) + err(arg0, z072, __LINE__, 0, 0, Local0, 30) } Store(m0eb(Buffer() {13,14,15}), Local0) if (LNotEqual(Local0, 31)) { - err(arg0, z072, 34, 0, 0, Local0, 31) + err(arg0, z072, __LINE__, 0, 0, Local0, 31) } Store(m0eb(Buffer(2){16,17,18}), Local0) if (LNotEqual(Local0, 32)) { - err(arg0, z072, 35, 0, 0, Local0, 32) + err(arg0, z072, __LINE__, 0, 0, Local0, 32) } Store(m0eb(Buffer(3){19,20}), Local0) if (LNotEqual(Local0, 33)) { - err(arg0, z072, 36, 0, 0, Local0, 33) + err(arg0, z072, __LINE__, 0, 0, Local0, 33) } Store(m0eb(Buffer(3){21,22,23}), Local0) if (LNotEqual(Local0, 34)) { - err(arg0, z072, 37, 0, 0, Local0, 34) + err(arg0, z072, __LINE__, 0, 0, Local0, 34) } Store(m0eb(Buffer(4){24,25,26,27}), Local0) if (LNotEqual(Local0, 35)) { - err(arg0, z072, 38, 0, 0, Local0, 35) + err(arg0, z072, __LINE__, 0, 0, Local0, 35) } Store(m0eb(Buffer(5){28,29,30,31,32}), Local0) if (LNotEqual(Local0, 36)) { - err(arg0, z072, 39, 0, 0, Local0, 36) + err(arg0, z072, __LINE__, 0, 0, Local0, 36) } Store(m0eb(Buffer(8){33,34,35,36,37,38,39,40}), Local0) if (LNotEqual(Local0, 37)) { - err(arg0, z072, 40, 0, 0, Local0, 37) + err(arg0, z072, __LINE__, 0, 0, Local0, 37) } Store(m0eb(Buffer(){0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0}), Local0) if (LNotEqual(Local0, 38)) { - err(arg0, z072, 41, 0, 0, Local0, 38) + err(arg0, z072, __LINE__, 0, 0, Local0, 38) } Store(m0eb(Buffer(9){41,42,43,44,45,46,47,48,49}), Local0) if (LNotEqual(Local0, 39)) { - err(arg0, z072, 42, 0, 0, Local0, 39) + err(arg0, z072, __LINE__, 0, 0, Local0, 39) } Store(m0eb(Buffer(257){0x7d}), Local0) if (LNotEqual(Local0, 40)) { - err(arg0, z072, 43, 0, 0, Local0, 40) + err(arg0, z072, __LINE__, 0, 0, Local0, 40) } Store(m0eb(Buffer(257) { // 0-127 @@ -911,7 +911,7 @@ Method(m0ec, 1) // 256 0x01}), Local0) if (LNotEqual(Local0, 41)) { - err(arg0, z072, 44, 0, 0, Local0, 41) + err(arg0, z072, __LINE__, 0, 0, Local0, 41) } Store(m0eb(Buffer() { // 0-127 @@ -952,71 +952,71 @@ Method(m0ec, 1) // 256 0x02}), Local0) if (LNotEqual(Local0, 42)) { - err(arg0, z072, 45, 0, 0, Local0, 42) + err(arg0, z072, __LINE__, 0, 0, Local0, 42) } if (F64) { Store(m0eb(Buffer(4){0,0,0,0}), Local0) if (LNotEqual(Local0, 43)) { - err(arg0, z072, 46, 0, 0, Local0, 43) + err(arg0, z072, __LINE__, 0, 0, Local0, 43) } Store(m0eb(Buffer(8){0,0,0,0,0,0,0,0}), Local0) if (LNotEqual(Local0, 4)) { - err(arg0, z072, 47, 0, 0, Local0, 4) + err(arg0, z072, __LINE__, 0, 0, Local0, 4) } Store(m0eb(Buffer(4){0xff,0xff,0xff,0xff}), Local0) if (LNotEqual(Local0, 45)) { - err(arg0, z072, 48, 0, 0, Local0, 45) + err(arg0, z072, __LINE__, 0, 0, Local0, 45) } Store(m0eb(Buffer(8){0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff}), Local0) if (LNotEqual(Local0, 6)) { - err(arg0, z072, 49, 0, 0, Local0, 6) + err(arg0, z072, __LINE__, 0, 0, Local0, 6) } } else { Store(m0eb(Buffer(4){0,0,0,0}), Local0) if (LNotEqual(Local0, 4)) { - err(arg0, z072, 50, 0, 0, Local0, 4) + err(arg0, z072, __LINE__, 0, 0, Local0, 4) } Store(m0eb(Buffer(8){0,0,0,0,0,0,0,0}), Local0) if (LNotEqual(Local0, 44)) { - err(arg0, z072, 51, 0, 0, Local0, 44) + err(arg0, z072, __LINE__, 0, 0, Local0, 44) } Store(m0eb(Buffer(4){0xff,0xff,0xff,0xff}), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z072, 52, 0, 0, Local0, 5) + err(arg0, z072, __LINE__, 0, 0, Local0, 5) } Store(m0eb(Buffer(8){0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff}), Local0) if (LNotEqual(Local0, 47)) { - err(arg0, z072, 53, 0, 0, Local0, 47) + err(arg0, z072, __LINE__, 0, 0, Local0, 47) } } Store(m0eb(Buffer(9){0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff}), Local0) if (LNotEqual(Local0, 46)) { - err(arg0, z072, 54, 0, 0, Local0, 46) + err(arg0, z072, __LINE__, 0, 0, Local0, 46) } Store(m0eb(Buffer(5){0xff,0xff,0xff,0xff,0xff}), Local0) if (LNotEqual(Local0, 48)) { - err(arg0, z072, 55, 0, 0, Local0, 48) + err(arg0, z072, __LINE__, 0, 0, Local0, 48) } Store(m0eb(Buffer(1){0xff}), Local0) if (LNotEqual(Local0, 49)) { - err(arg0, z072, 56, 0, 0, Local0, 49) + err(arg0, z072, __LINE__, 0, 0, Local0, 49) } Store(m0eb(Buffer(1){}), Local0) if (LNotEqual(Local0, 24)) { - err(arg0, z072, 57, 0, 0, Local0, 24) + err(arg0, z072, __LINE__, 0, 0, Local0, 24) } Store(m0eb(Buffer(5){}), Local0) if (LNotEqual(Local0, 51)) { - err(arg0, z072, 58, 0, 0, Local0, 51) + err(arg0, z072, __LINE__, 0, 0, Local0, 51) } Store(m0eb(Buffer(9){}), Local0) if (LNotEqual(Local0, 52)) { - err(arg0, z072, 59, 0, 0, Local0, 52) + err(arg0, z072, __LINE__, 0, 0, Local0, 52) } Store(m0eb(Buffer(9){0xab, 0xcd, 0xef}), Local0) if (LNotEqual(Local0, 53)) { - err(arg0, z072, 60, 0, 0, Local0, 53) + err(arg0, z072, __LINE__, 0, 0, Local0, 53) } } diff --git a/tests/aslts/src/runtime/collections/functional/control/switch6.asl b/tests/aslts/src/runtime/collections/functional/control/switch6.asl index 4454ccdac..798c475d3 100644 --- a/tests/aslts/src/runtime/collections/functional/control/switch6.asl +++ b/tests/aslts/src/runtime/collections/functional/control/switch6.asl @@ -133,56 +133,56 @@ Method(m101, 1) Store(m100(0321), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 0, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m100(0xd1), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 1, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m100(9876543210), Local0) if (F64) { if (LNotEqual(Local0, 5)) { - err(arg0, z073, 2, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } } else { if (LNotEqual(Local0, 5)) { - err(arg0, z073, 3, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } } Store(m100(0xc179b3fe), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 4, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m100(0xfe7cb391d650a284), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 5, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m100(0), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 6, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m100(0xffffffff), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 7, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m100(0xffffffffffffffff), Local0) if (F64) { if (LNotEqual(Local0, 5)) { - err(arg0, z073, 8, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } } else { if (LNotEqual(Local0, 5)) { - err(arg0, z073, 9, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } } Store(m100(0xff), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 10, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m100(0xabcdef), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 11, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } } @@ -292,83 +292,83 @@ Method(m103, 1) Store(m102("0321"), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 12, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m102("321"), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 13, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m102("ba9876"), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 14, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m102("c179b3fe"), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 15, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m102("fe7cb391d650a284"), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 16, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m102("ffffffff"), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 17, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m102("ffffffffffffffffff"), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 18, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m102("ffffffffffffffff"), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 19, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m102("ffffffffff"), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 20, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m102("ff"), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 21, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m102("fe7cb391d650a2841"), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 22, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m102("987654321"), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 23, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m102("0xfe7cb3"), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 24, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m102("1234q"), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 25, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m102(BIG0), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 26, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m102(""), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 27, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m102(" "), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 28, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m102(ALL0), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 29, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m102("abcdef"), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 30, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m102("ABCDEF"), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 31, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } } @@ -534,51 +534,51 @@ Method(m105, 1) Store(m104(Buffer(1){10}), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 32, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m104(Buffer(2){11,12}), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 33, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m104(Buffer() {13,14,15}), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 34, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m104(Buffer(2){16,17,18}), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 35, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m104(Buffer(3){19,20}), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 36, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m104(Buffer(3){21,22,23}), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 37, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m104(Buffer(4){24,25,26,27}), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 38, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m104(Buffer(5){28,29,30,31,32}), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 39, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m104(Buffer(8){33,34,35,36,37,38,39,40}), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 40, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m104(Buffer(){0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0}), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 41, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m104(Buffer(9){41,42,43,44,45,46,47,48,49}), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 42, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m104(Buffer(257){0x7d}), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 43, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m104(Buffer(257) { // 0-127 @@ -619,7 +619,7 @@ Method(m105, 1) // 256 0x01}), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 44, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m104(Buffer() { // 0-127 @@ -660,71 +660,71 @@ Method(m105, 1) // 256 0x02}), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 45, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } if (F64) { Store(m104(Buffer(4){0,0,0,0}), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 46, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m104(Buffer(8){0,0,0,0,0,0,0,0}), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 47, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m104(Buffer(4){0xff,0xff,0xff,0xff}), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 48, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m104(Buffer(8){0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff}), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 49, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } } else { Store(m104(Buffer(4){0,0,0,0}), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 50, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m104(Buffer(8){0,0,0,0,0,0,0,0}), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 51, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m104(Buffer(4){0xff,0xff,0xff,0xff}), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 52, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m104(Buffer(8){0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff}), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 53, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } } Store(m104(Buffer(9){0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff}), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 54, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m104(Buffer(5){0xff,0xff,0xff,0xff,0xff}), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 55, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m104(Buffer(1){0xff}), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 56, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m104(Buffer(1){}), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 57, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m104(Buffer(5){}), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 58, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m104(Buffer(9){}), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 59, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } Store(m104(Buffer(9){0xab, 0xcd, 0xef}), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z073, 60, 0, 0, Local0, 5) + err(arg0, z073, __LINE__, 0, 0, Local0, 5) } } diff --git a/tests/aslts/src/runtime/collections/functional/control/timing.asl b/tests/aslts/src/runtime/collections/functional/control/timing.asl index 7fa44ac69..db8e914b9 100644 --- a/tests/aslts/src/runtime/collections/functional/control/timing.asl +++ b/tests/aslts/src/runtime/collections/functional/control/timing.asl @@ -72,7 +72,7 @@ Method(m0c8, 6) if (LLess(Local6, Local4)) { Subtract(Local4, Local6, Local7) - err(arg0, z006, 0, 0, 0, Local5, arg2) + err(arg0, z006, __LINE__, 0, 0, Local5, arg2) Store(Local0, Debug) Store(Local4, Debug) Store(Local6, Debug) @@ -91,7 +91,7 @@ Method(m0c8, 6) if (LLess(Local6, Local4)) { Subtract(Local4, Local6, Local7) - err(arg0, z006, 1, 0, 0, Local5, arg2) + err(arg0, z006, __LINE__, 0, 0, Local5, arg2) Store(Local0, Debug) Store(Local4, Debug) Store(Local6, Debug) @@ -110,7 +110,7 @@ Method(m0c8, 6) if (LLess(Local6, Local4)) { Subtract(Local4, Local6, Local7) - err(arg0, z006, 2, 0, 0, Local5, arg2) + err(arg0, z006, __LINE__, 0, 0, Local5, arg2) Store(Local0, Debug) Store(Local4, Debug) Store(Local6, Debug) diff --git a/tests/aslts/src/runtime/collections/functional/control/while.asl b/tests/aslts/src/runtime/collections/functional/control/while.asl index 9ab7e78f9..82a081750 100644 --- a/tests/aslts/src/runtime/collections/functional/control/while.asl +++ b/tests/aslts/src/runtime/collections/functional/control/while.asl @@ -188,7 +188,7 @@ Method(m0f8, 4, Serialized) Store(m0f4(arg1, CHL0, lpC0), Local0) if (LEqual(Local0, 0)) { - err(arg0, z074, 0, 0, 0, 0, lpC0) + err(arg0, z074, __LINE__, 0, 0, 0, lpC0) } Decrement(lpN0) @@ -206,7 +206,7 @@ Method(m0f8, 4, Serialized) Store(m0f4(arg2, CNT0, lpC0), Local1) if (LNotEqual(Local0, Local1)) { - err(arg0, z074, 1, 0, 0, Local0, Local1) + err(arg0, z074, __LINE__, 0, 0, Local0, Local1) } Decrement(lpN0) @@ -224,7 +224,7 @@ Method(m0f8, 4, Serialized) Store(m0f4(arg2, BRK0, lpC0), Local1) if (LNotEqual(Local0, Local1)) { - err(arg0, z074, 2, 0, 0, Local0, Local1) + err(arg0, z074, __LINE__, 0, 0, Local0, Local1) } Decrement(lpN0) @@ -278,7 +278,7 @@ Method(m0fa, 2, Serialized) Store(Local0, Debug) if (LEqual(arg1, 0)) { - err(arg0, z074, 3, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Add(arg1, 1, Local0) @@ -3703,11 +3703,11 @@ Method(m0fa, 2, Serialized) if (c049) { // We should not be there - err(arg0, z074, 4, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b049) { // We should not be there - err(arg0, z074, 5, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln49), Local0) @@ -3724,7 +3724,7 @@ Method(m0fa, 2, Serialized) if (b049) { // We should not be there - err(arg0, z074, 6, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -3745,11 +3745,11 @@ Method(m0fa, 2, Serialized) if (c048) { // We should not be there - err(arg0, z074, 7, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b048) { // We should not be there - err(arg0, z074, 8, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln48), Local0) @@ -3766,7 +3766,7 @@ Method(m0fa, 2, Serialized) if (b048) { // We should not be there - err(arg0, z074, 9, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -3787,11 +3787,11 @@ Method(m0fa, 2, Serialized) if (c047) { // We should not be there - err(arg0, z074, 10, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b047) { // We should not be there - err(arg0, z074, 11, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln47), Local0) @@ -3808,7 +3808,7 @@ Method(m0fa, 2, Serialized) if (b047) { // We should not be there - err(arg0, z074, 12, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -3829,11 +3829,11 @@ Method(m0fa, 2, Serialized) if (c046) { // We should not be there - err(arg0, z074, 13, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b046) { // We should not be there - err(arg0, z074, 14, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln46), Local0) @@ -3850,7 +3850,7 @@ Method(m0fa, 2, Serialized) if (b046) { // We should not be there - err(arg0, z074, 15, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -3871,11 +3871,11 @@ Method(m0fa, 2, Serialized) if (c045) { // We should not be there - err(arg0, z074, 16, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b045) { // We should not be there - err(arg0, z074, 17, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln45), Local0) @@ -3892,7 +3892,7 @@ Method(m0fa, 2, Serialized) if (b045) { // We should not be there - err(arg0, z074, 18, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -3913,11 +3913,11 @@ Method(m0fa, 2, Serialized) if (c044) { // We should not be there - err(arg0, z074, 19, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b044) { // We should not be there - err(arg0, z074, 20, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln44), Local0) @@ -3934,7 +3934,7 @@ Method(m0fa, 2, Serialized) if (b044) { // We should not be there - err(arg0, z074, 21, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -3955,11 +3955,11 @@ Method(m0fa, 2, Serialized) if (c043) { // We should not be there - err(arg0, z074, 22, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b043) { // We should not be there - err(arg0, z074, 23, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln43), Local0) @@ -3976,7 +3976,7 @@ Method(m0fa, 2, Serialized) if (b043) { // We should not be there - err(arg0, z074, 24, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -3997,11 +3997,11 @@ Method(m0fa, 2, Serialized) if (c042) { // We should not be there - err(arg0, z074, 25, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b042) { // We should not be there - err(arg0, z074, 26, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln42), Local0) @@ -4018,7 +4018,7 @@ Method(m0fa, 2, Serialized) if (b042) { // We should not be there - err(arg0, z074, 27, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -4039,11 +4039,11 @@ Method(m0fa, 2, Serialized) if (c041) { // We should not be there - err(arg0, z074, 28, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b041) { // We should not be there - err(arg0, z074, 29, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln41), Local0) @@ -4060,7 +4060,7 @@ Method(m0fa, 2, Serialized) if (b041) { // We should not be there - err(arg0, z074, 30, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -4081,11 +4081,11 @@ Method(m0fa, 2, Serialized) if (c040) { // We should not be there - err(arg0, z074, 31, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b040) { // We should not be there - err(arg0, z074, 32, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln40), Local0) @@ -4102,7 +4102,7 @@ Method(m0fa, 2, Serialized) if (b040) { // We should not be there - err(arg0, z074, 33, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -4123,11 +4123,11 @@ Method(m0fa, 2, Serialized) if (c039) { // We should not be there - err(arg0, z074, 34, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b039) { // We should not be there - err(arg0, z074, 35, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln39), Local0) @@ -4144,7 +4144,7 @@ Method(m0fa, 2, Serialized) if (b039) { // We should not be there - err(arg0, z074, 36, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -4165,11 +4165,11 @@ Method(m0fa, 2, Serialized) if (c038) { // We should not be there - err(arg0, z074, 37, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b038) { // We should not be there - err(arg0, z074, 38, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln38), Local0) @@ -4186,7 +4186,7 @@ Method(m0fa, 2, Serialized) if (b038) { // We should not be there - err(arg0, z074, 39, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -4207,11 +4207,11 @@ Method(m0fa, 2, Serialized) if (c037) { // We should not be there - err(arg0, z074, 40, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b037) { // We should not be there - err(arg0, z074, 41, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln37), Local0) @@ -4228,7 +4228,7 @@ Method(m0fa, 2, Serialized) if (b037) { // We should not be there - err(arg0, z074, 42, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -4249,11 +4249,11 @@ Method(m0fa, 2, Serialized) if (c036) { // We should not be there - err(arg0, z074, 43, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b036) { // We should not be there - err(arg0, z074, 44, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln36), Local0) @@ -4270,7 +4270,7 @@ Method(m0fa, 2, Serialized) if (b036) { // We should not be there - err(arg0, z074, 45, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -4291,11 +4291,11 @@ Method(m0fa, 2, Serialized) if (c035) { // We should not be there - err(arg0, z074, 46, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b035) { // We should not be there - err(arg0, z074, 47, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln35), Local0) @@ -4312,7 +4312,7 @@ Method(m0fa, 2, Serialized) if (b035) { // We should not be there - err(arg0, z074, 48, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -4333,11 +4333,11 @@ Method(m0fa, 2, Serialized) if (c034) { // We should not be there - err(arg0, z074, 49, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b034) { // We should not be there - err(arg0, z074, 50, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln34), Local0) @@ -4354,7 +4354,7 @@ Method(m0fa, 2, Serialized) if (b034) { // We should not be there - err(arg0, z074, 51, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -4375,11 +4375,11 @@ Method(m0fa, 2, Serialized) if (c033) { // We should not be there - err(arg0, z074, 52, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b033) { // We should not be there - err(arg0, z074, 53, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln33), Local0) @@ -4396,7 +4396,7 @@ Method(m0fa, 2, Serialized) if (b033) { // We should not be there - err(arg0, z074, 54, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -4417,11 +4417,11 @@ Method(m0fa, 2, Serialized) if (c032) { // We should not be there - err(arg0, z074, 55, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b032) { // We should not be there - err(arg0, z074, 56, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln32), Local0) @@ -4438,7 +4438,7 @@ Method(m0fa, 2, Serialized) if (b032) { // We should not be there - err(arg0, z074, 57, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -4459,11 +4459,11 @@ Method(m0fa, 2, Serialized) if (c031) { // We should not be there - err(arg0, z074, 58, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b031) { // We should not be there - err(arg0, z074, 59, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln31), Local0) @@ -4480,7 +4480,7 @@ Method(m0fa, 2, Serialized) if (b031) { // We should not be there - err(arg0, z074, 60, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -4501,11 +4501,11 @@ Method(m0fa, 2, Serialized) if (c030) { // We should not be there - err(arg0, z074, 61, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b030) { // We should not be there - err(arg0, z074, 62, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln30), Local0) @@ -4522,7 +4522,7 @@ Method(m0fa, 2, Serialized) if (b030) { // We should not be there - err(arg0, z074, 63, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -4543,11 +4543,11 @@ Method(m0fa, 2, Serialized) if (c029) { // We should not be there - err(arg0, z074, 64, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b029) { // We should not be there - err(arg0, z074, 65, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln29), Local0) @@ -4564,7 +4564,7 @@ Method(m0fa, 2, Serialized) if (b029) { // We should not be there - err(arg0, z074, 66, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -4585,11 +4585,11 @@ Method(m0fa, 2, Serialized) if (c028) { // We should not be there - err(arg0, z074, 67, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b028) { // We should not be there - err(arg0, z074, 68, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln28), Local0) @@ -4606,7 +4606,7 @@ Method(m0fa, 2, Serialized) if (b028) { // We should not be there - err(arg0, z074, 69, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -4627,11 +4627,11 @@ Method(m0fa, 2, Serialized) if (c027) { // We should not be there - err(arg0, z074, 70, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b027) { // We should not be there - err(arg0, z074, 71, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln27), Local0) @@ -4648,7 +4648,7 @@ Method(m0fa, 2, Serialized) if (b027) { // We should not be there - err(arg0, z074, 72, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -4669,11 +4669,11 @@ Method(m0fa, 2, Serialized) if (c026) { // We should not be there - err(arg0, z074, 73, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b026) { // We should not be there - err(arg0, z074, 74, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln26), Local0) @@ -4690,7 +4690,7 @@ Method(m0fa, 2, Serialized) if (b026) { // We should not be there - err(arg0, z074, 75, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -4711,11 +4711,11 @@ Method(m0fa, 2, Serialized) if (c025) { // We should not be there - err(arg0, z074, 76, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b025) { // We should not be there - err(arg0, z074, 77, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln25), Local0) @@ -4732,7 +4732,7 @@ Method(m0fa, 2, Serialized) if (b025) { // We should not be there - err(arg0, z074, 78, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -4753,11 +4753,11 @@ Method(m0fa, 2, Serialized) if (c024) { // We should not be there - err(arg0, z074, 79, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b024) { // We should not be there - err(arg0, z074, 80, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln24), Local0) @@ -4774,7 +4774,7 @@ Method(m0fa, 2, Serialized) if (b024) { // We should not be there - err(arg0, z074, 81, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -4795,11 +4795,11 @@ Method(m0fa, 2, Serialized) if (c023) { // We should not be there - err(arg0, z074, 82, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b023) { // We should not be there - err(arg0, z074, 83, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln23), Local0) @@ -4816,7 +4816,7 @@ Method(m0fa, 2, Serialized) if (b023) { // We should not be there - err(arg0, z074, 84, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -4837,11 +4837,11 @@ Method(m0fa, 2, Serialized) if (c022) { // We should not be there - err(arg0, z074, 85, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b022) { // We should not be there - err(arg0, z074, 86, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln22), Local0) @@ -4858,7 +4858,7 @@ Method(m0fa, 2, Serialized) if (b022) { // We should not be there - err(arg0, z074, 87, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -4879,11 +4879,11 @@ Method(m0fa, 2, Serialized) if (c021) { // We should not be there - err(arg0, z074, 88, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b021) { // We should not be there - err(arg0, z074, 89, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln21), Local0) @@ -4900,7 +4900,7 @@ Method(m0fa, 2, Serialized) if (b021) { // We should not be there - err(arg0, z074, 90, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -4921,11 +4921,11 @@ Method(m0fa, 2, Serialized) if (c020) { // We should not be there - err(arg0, z074, 91, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b020) { // We should not be there - err(arg0, z074, 92, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln20), Local0) @@ -4942,7 +4942,7 @@ Method(m0fa, 2, Serialized) if (b020) { // We should not be there - err(arg0, z074, 93, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -4963,11 +4963,11 @@ Method(m0fa, 2, Serialized) if (c019) { // We should not be there - err(arg0, z074, 94, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b019) { // We should not be there - err(arg0, z074, 95, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln19), Local0) @@ -4984,7 +4984,7 @@ Method(m0fa, 2, Serialized) if (b019) { // We should not be there - err(arg0, z074, 96, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -5005,11 +5005,11 @@ Method(m0fa, 2, Serialized) if (c018) { // We should not be there - err(arg0, z074, 97, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b018) { // We should not be there - err(arg0, z074, 98, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln18), Local0) @@ -5026,7 +5026,7 @@ Method(m0fa, 2, Serialized) if (b018) { // We should not be there - err(arg0, z074, 99, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -5047,11 +5047,11 @@ Method(m0fa, 2, Serialized) if (c017) { // We should not be there - err(arg0, z074, 100, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b017) { // We should not be there - err(arg0, z074, 101, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln17), Local0) @@ -5068,7 +5068,7 @@ Method(m0fa, 2, Serialized) if (b017) { // We should not be there - err(arg0, z074, 102, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -5089,11 +5089,11 @@ Method(m0fa, 2, Serialized) if (c016) { // We should not be there - err(arg0, z074, 103, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b016) { // We should not be there - err(arg0, z074, 104, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln16), Local0) @@ -5110,7 +5110,7 @@ Method(m0fa, 2, Serialized) if (b016) { // We should not be there - err(arg0, z074, 105, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -5131,11 +5131,11 @@ Method(m0fa, 2, Serialized) if (c015) { // We should not be there - err(arg0, z074, 106, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b015) { // We should not be there - err(arg0, z074, 107, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln15), Local0) @@ -5152,7 +5152,7 @@ Method(m0fa, 2, Serialized) if (b015) { // We should not be there - err(arg0, z074, 108, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -5173,11 +5173,11 @@ Method(m0fa, 2, Serialized) if (c014) { // We should not be there - err(arg0, z074, 109, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b014) { // We should not be there - err(arg0, z074, 110, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln14), Local0) @@ -5194,7 +5194,7 @@ Method(m0fa, 2, Serialized) if (b014) { // We should not be there - err(arg0, z074, 111, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -5215,11 +5215,11 @@ Method(m0fa, 2, Serialized) if (c013) { // We should not be there - err(arg0, z074, 112, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b013) { // We should not be there - err(arg0, z074, 113, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln13), Local0) @@ -5236,7 +5236,7 @@ Method(m0fa, 2, Serialized) if (b013) { // We should not be there - err(arg0, z074, 114, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -5257,11 +5257,11 @@ Method(m0fa, 2, Serialized) if (c012) { // We should not be there - err(arg0, z074, 115, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b012) { // We should not be there - err(arg0, z074, 116, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln12), Local0) @@ -5278,7 +5278,7 @@ Method(m0fa, 2, Serialized) if (b012) { // We should not be there - err(arg0, z074, 117, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -5299,11 +5299,11 @@ Method(m0fa, 2, Serialized) if (c011) { // We should not be there - err(arg0, z074, 118, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b011) { // We should not be there - err(arg0, z074, 119, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln11), Local0) @@ -5320,7 +5320,7 @@ Method(m0fa, 2, Serialized) if (b011) { // We should not be there - err(arg0, z074, 120, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -5341,11 +5341,11 @@ Method(m0fa, 2, Serialized) if (c010) { // We should not be there - err(arg0, z074, 121, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b010) { // We should not be there - err(arg0, z074, 122, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln10), Local0) @@ -5362,7 +5362,7 @@ Method(m0fa, 2, Serialized) if (b010) { // We should not be there - err(arg0, z074, 123, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -5383,11 +5383,11 @@ Method(m0fa, 2, Serialized) if (c009) { // We should not be there - err(arg0, z074, 124, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b009) { // We should not be there - err(arg0, z074, 125, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln09), Local0) @@ -5404,7 +5404,7 @@ Method(m0fa, 2, Serialized) if (b009) { // We should not be there - err(arg0, z074, 126, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -5425,11 +5425,11 @@ Method(m0fa, 2, Serialized) if (c008) { // We should not be there - err(arg0, z074, 127, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b008) { // We should not be there - err(arg0, z074, 128, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln08), Local0) @@ -5446,7 +5446,7 @@ Method(m0fa, 2, Serialized) if (b008) { // We should not be there - err(arg0, z074, 129, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -5467,11 +5467,11 @@ Method(m0fa, 2, Serialized) if (c007) { // We should not be there - err(arg0, z074, 130, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b007) { // We should not be there - err(arg0, z074, 131, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln07), Local0) @@ -5488,7 +5488,7 @@ Method(m0fa, 2, Serialized) if (b007) { // We should not be there - err(arg0, z074, 132, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -5509,11 +5509,11 @@ Method(m0fa, 2, Serialized) if (c006) { // We should not be there - err(arg0, z074, 133, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b006) { // We should not be there - err(arg0, z074, 134, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln06), Local0) @@ -5530,7 +5530,7 @@ Method(m0fa, 2, Serialized) if (b006) { // We should not be there - err(arg0, z074, 135, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -5551,11 +5551,11 @@ Method(m0fa, 2, Serialized) if (c005) { // We should not be there - err(arg0, z074, 136, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b005) { // We should not be there - err(arg0, z074, 137, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln05), Local0) @@ -5572,7 +5572,7 @@ Method(m0fa, 2, Serialized) if (b005) { // We should not be there - err(arg0, z074, 138, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -5593,11 +5593,11 @@ Method(m0fa, 2, Serialized) if (c004) { // We should not be there - err(arg0, z074, 139, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b004) { // We should not be there - err(arg0, z074, 140, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln04), Local0) @@ -5614,7 +5614,7 @@ Method(m0fa, 2, Serialized) if (b004) { // We should not be there - err(arg0, z074, 141, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -5635,11 +5635,11 @@ Method(m0fa, 2, Serialized) if (c003) { // We should not be there - err(arg0, z074, 142, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b003) { // We should not be there - err(arg0, z074, 143, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln03), Local0) @@ -5656,7 +5656,7 @@ Method(m0fa, 2, Serialized) if (b003) { // We should not be there - err(arg0, z074, 144, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -5677,11 +5677,11 @@ Method(m0fa, 2, Serialized) if (c002) { // We should not be there - err(arg0, z074, 145, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b002) { // We should not be there - err(arg0, z074, 146, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln02), Local0) @@ -5698,7 +5698,7 @@ Method(m0fa, 2, Serialized) if (b002) { // We should not be there - err(arg0, z074, 147, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -5719,11 +5719,11 @@ Method(m0fa, 2, Serialized) if (c001) { // We should not be there - err(arg0, z074, 148, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b001) { // We should not be there - err(arg0, z074, 149, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln01), Local0) @@ -5740,7 +5740,7 @@ Method(m0fa, 2, Serialized) if (b001) { // We should not be there - err(arg0, z074, 150, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } @@ -5756,11 +5756,11 @@ Method(m0fa, 2, Serialized) } if (c000) { // We should not be there - err(arg0, z074, 151, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } if (b000) { // We should not be there - err(arg0, z074, 152, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } Store(m0f5(p000, p001, ln00), Local0) @@ -5776,7 +5776,7 @@ Method(m0fa, 2, Serialized) if (b000) { // We should not be there - err(arg0, z074, 153, 0, 0, 0, 0) + err(arg0, z074, __LINE__, 0, 0, 0, 0) } } diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/rtemplate.asl b/tests/aslts/src/runtime/collections/functional/descriptor/rtemplate.asl index b8a8b17f2..98aa04673 100644 --- a/tests/aslts/src/runtime/collections/functional/descriptor/rtemplate.asl +++ b/tests/aslts/src/runtime/collections/functional/descriptor/rtemplate.asl @@ -51,7 +51,7 @@ Method(m330, 5) // ts, len, msg, op, res Store(DeRefOf(Index(arg4, lpC0)), Local1) if (LNotEqual(Local0, Local1)) { - err(arg0, z029, 0, 0, 0, lpC0, arg2) + err(arg0, z029, __LINE__, 0, 0, lpC0, arg2) } Decrement(lpN0) @@ -63,10 +63,10 @@ Method(m330, 5) // ts, len, msg, op, res Method(m331, 7) // ts, grerr, val0, ver0, val1, ver1, msg { if (LNotEqual(arg2, arg3)) { - err(arg0, z029, arg1, arg6, arg6, arg2, arg3) + err(arg0, z029, __LINE__, arg6, arg6, arg2, arg3) } if (LNotEqual(arg4, arg5)) { - err(arg0, z029, arg1, arg6, arg6, arg4, arg5) + err(arg0, z029, __LINE__, arg6, arg6, arg4, arg5) } } @@ -98,7 +98,7 @@ Method(m332, 6, Serialized) // ts, len, msg, op1, op2, res if (LNotEqual(Local3, Local2)) { Store(Local3, Debug) Store(Local2, Debug) - err(arg0, z029, 3, 0, 0, lpC0, arg2) + err(arg0, z029, __LINE__, 0, 0, lpC0, arg2) } Decrement(lpN0) diff --git a/tests/aslts/src/runtime/collections/functional/local/local.asl b/tests/aslts/src/runtime/collections/functional/local/local.asl index 971fe082f..6e8b780a8 100644 --- a/tests/aslts/src/runtime/collections/functional/local/local.asl +++ b/tests/aslts/src/runtime/collections/functional/local/local.asl @@ -70,25 +70,25 @@ Method(ma00, 7) } // 5 if (LNotEqual(arg0, 8)) { - err(arg0, z999, 0, 0, 0, arg0, 8) + err(arg0, z999, __LINE__, 0, 0, arg0, 8) } if (LNotEqual(arg1, 9)) { - err(arg0, z999, 0, 0, 0, arg0, 9) + err(arg0, z999, __LINE__, 0, 0, arg0, 9) } if (LNotEqual(arg2, 10)) { - err(arg0, z999, 0, 0, 0, arg0, 10) + err(arg0, z999, __LINE__, 0, 0, arg0, 10) } if (LNotEqual(arg3, 11)) { - err(arg0, z999, 0, 0, 0, arg0, 11) + err(arg0, z999, __LINE__, 0, 0, arg0, 11) } if (LNotEqual(arg4, 12)) { - err(arg0, z999, 0, 0, 0, arg0, 12) + err(arg0, z999, __LINE__, 0, 0, arg0, 12) } if (LNotEqual(arg5, 13)) { - err(arg0, z999, 0, 0, 0, arg0, 13) + err(arg0, z999, __LINE__, 0, 0, arg0, 13) } // if (LNotEqual(arg6, 7)) { -// err(arg0, z999, 0, 0, 0, arg0, 7) +// err(arg0, z999, __LINE__, 0, 0, arg0, 7) // } m000(14,15,16,17,18) @@ -96,49 +96,49 @@ Method(ma00, 7) } // 6 if (LNotEqual(arg0, 1)) { - err(arg0, z999, 0, 0, 0, arg0, 1) + err(arg0, z999, __LINE__, 0, 0, arg0, 1) } if (LNotEqual(arg1, 2)) { - err(arg0, z999, 0, 0, 0, arg0, 2) + err(arg0, z999, __LINE__, 0, 0, arg0, 2) } if (LNotEqual(arg2, 3)) { - err(arg0, z999, 0, 0, 0, arg0, 3) + err(arg0, z999, __LINE__, 0, 0, arg0, 3) } if (LNotEqual(arg3, 4)) { - err(arg0, z999, 0, 0, 0, arg0, 4) + err(arg0, z999, __LINE__, 0, 0, arg0, 4) } if (LNotEqual(arg4, 5)) { - err(arg0, z999, 0, 0, 0, arg0, 5) + err(arg0, z999, __LINE__, 0, 0, arg0, 5) } if (LNotEqual(arg5, 6)) { - err(arg0, z999, 0, 0, 0, arg0, 6) + err(arg0, z999, __LINE__, 0, 0, arg0, 6) } if (LNotEqual(arg6, 7)) { - err(arg0, z999, 0, 0, 0, arg0, 7) + err(arg0, z999, __LINE__, 0, 0, arg0, 7) } m000(8,9,10,11,12,13) if (LNotEqual(arg0, 1)) { - err(arg0, z999, 0, 0, 0, arg0, 1) + err(arg0, z999, __LINE__, 0, 0, arg0, 1) } if (LNotEqual(arg1, 2)) { - err(arg0, z999, 0, 0, 0, arg0, 2) + err(arg0, z999, __LINE__, 0, 0, arg0, 2) } if (LNotEqual(arg2, 3)) { - err(arg0, z999, 0, 0, 0, arg0, 3) + err(arg0, z999, __LINE__, 0, 0, arg0, 3) } if (LNotEqual(arg3, 4)) { - err(arg0, z999, 0, 0, 0, arg0, 4) + err(arg0, z999, __LINE__, 0, 0, arg0, 4) } if (LNotEqual(arg4, 5)) { - err(arg0, z999, 0, 0, 0, arg0, 5) + err(arg0, z999, __LINE__, 0, 0, arg0, 5) } if (LNotEqual(arg5, 6)) { - err(arg0, z999, 0, 0, 0, arg0, 6) + err(arg0, z999, __LINE__, 0, 0, arg0, 6) } if (LNotEqual(arg6, 7)) { - err(arg0, z999, 0, 0, 0, arg0, 7) + err(arg0, z999, __LINE__, 0, 0, arg0, 7) } } diff --git a/tests/aslts/src/runtime/collections/functional/logic/logical.asl b/tests/aslts/src/runtime/collections/functional/logic/logical.asl index 4ced24a74..ac812fd1b 100644 --- a/tests/aslts/src/runtime/collections/functional/logic/logical.asl +++ b/tests/aslts/src/runtime/collections/functional/logic/logical.asl @@ -55,65 +55,65 @@ Method(m003, 6, Serialized) case (0) { Store(LNotEqual(Local0, Local1), Local7) if (LNotEqual(Local7, Local2)) { - err(arg0, z035, 0, 0, 0, Local5, arg2) + err(arg0, z035, __LINE__, 0, 0, Local5, arg2) } Store(LNotEqual(Local1, Local0), Local7) if (LNotEqual(Local7, Local2)) { - err(arg0, z035, 1, 0, 0, Local5, arg2) + err(arg0, z035, __LINE__, 0, 0, Local5, arg2) } } case (1) { Store(LAnd(Local0, Local1), Local7) if (LNotEqual(Local7, Local2)) { - err(arg0, z035, 2, 0, 0, Local5, arg2) + err(arg0, z035, __LINE__, 0, 0, Local5, arg2) } Store(LAnd(Local1, Local0), Local7) if (LNotEqual(Local7, Local2)) { - err(arg0, z035, 3, 0, 0, Local5, arg2) + err(arg0, z035, __LINE__, 0, 0, Local5, arg2) } } case (2) { Store(LOr(Local0, Local1), Local7) if (LNotEqual(Local7, Local2)) { - err(arg0, z035, 4, 0, 0, Local5, arg2) + err(arg0, z035, __LINE__, 0, 0, Local5, arg2) } Store(LOr(Local1, Local0), Local7) if (LNotEqual(Local7, Local2)) { - err(arg0, z035, 5, 0, 0, Local5, arg2) + err(arg0, z035, __LINE__, 0, 0, Local5, arg2) } } case (3) { Store(LEqual(Local0, Local1), Local7) if (LNotEqual(Local7, Local2)) { - err(arg0, z035, 6, 0, 0, Local5, arg2) + err(arg0, z035, __LINE__, 0, 0, Local5, arg2) } Store(LEqual(Local1, Local0), Local7) if (LNotEqual(Local7, Local2)) { - err(arg0, z035, 7, 0, 0, Local5, arg2) + err(arg0, z035, __LINE__, 0, 0, Local5, arg2) } } case (4) { Store(LGreater(Local0, Local1), Local7) if (LNotEqual(Local7, Local2)) { - err(arg0, z035, 8, 0, 0, Local5, arg2) + err(arg0, z035, __LINE__, 0, 0, Local5, arg2) } } case (5) { Store(LGreaterEqual(Local0, Local1), Local7) if (LNotEqual(Local7, Local2)) { - err(arg0, z035, 9, 0, 0, Local5, arg2) + err(arg0, z035, __LINE__, 0, 0, Local5, arg2) } } case (6) { Store(LLess(Local0, Local1), Local7) if (LNotEqual(Local7, Local2)) { - err(arg0, z035, 10, 0, 0, Local5, arg2) + err(arg0, z035, __LINE__, 0, 0, Local5, arg2) } } case (7) { Store(LLessEqual(Local0, Local1), Local7) if (LNotEqual(Local7, Local2)) { - err(arg0, z035, 11, 0, 0, Local5, arg2) + err(arg0, z035, __LINE__, 0, 0, Local5, arg2) } } } @@ -152,7 +152,7 @@ Method(m004, 6, Serialized) case (0) { Store(LNot(Local0), Local2) if (LNotEqual(Local2, Local1)) { - err(arg0, z035, 12, 0, 0, Local5, arg2) + err(arg0, z035, __LINE__, 0, 0, Local5, arg2) } } } @@ -576,7 +576,7 @@ Method(LEQ0,, Serialized) Store(LEqual(BIG0, BIG0), Local0) if (LNotEqual(Local0, Ones)) { - err(ts, z035, 13, 0, 0, 0, 0) + err(ts, z035, __LINE__, 0, 0, 0, 0) } // Buffers @@ -640,7 +640,7 @@ Method(LGR0,, Serialized) Store(LGreater(BIG0, BIG0), Local0) if (LNotEqual(Local0, Zero)) { - err(ts, z035, 14, 0, 0, 0, 0) + err(ts, z035, __LINE__, 0, 0, 0, 0) } // Buffers @@ -704,7 +704,7 @@ Method(LGE0,, Serialized) Store(LGreaterEqual(BIG0, BIG0), Local0) if (LNotEqual(Local0, Ones)) { - err(ts, z035, 15, 0, 0, 0, 0) + err(ts, z035, __LINE__, 0, 0, 0, 0) } // Buffers @@ -768,7 +768,7 @@ Method(LL00,, Serialized) Store(LLess(BIG0, BIG0), Local0) if (LNotEqual(Local0, Zero)) { - err(ts, z035, 16, 0, 0, 0, 0) + err(ts, z035, __LINE__, 0, 0, 0, 0) } // Buffers @@ -832,7 +832,7 @@ Method(LLE0,, Serialized) Store(LLessEqual(BIG0, BIG0), Local0) if (LNotEqual(Local0, Ones)) { - err(ts, z035, 17, 0, 0, 0, 0) + err(ts, z035, __LINE__, 0, 0, 0, 0) } // Buffers @@ -896,7 +896,7 @@ Method(LNE0,, Serialized) Store(LNotEqual(BIG0, BIG0), Local0) if (LNotEqual(Local0, Zero)) { - err(ts, z035, 18, 0, 0, 0, 0) + err(ts, z035, __LINE__, 0, 0, 0, 0) } // Buffers diff --git a/tests/aslts/src/runtime/collections/functional/manipulation/concatenate.asl b/tests/aslts/src/runtime/collections/functional/manipulation/concatenate.asl index e62183a5b..309234529 100644 --- a/tests/aslts/src/runtime/collections/functional/manipulation/concatenate.asl +++ b/tests/aslts/src/runtime/collections/functional/manipulation/concatenate.asl @@ -72,12 +72,12 @@ Method(m310, 4) Method(m311, 3) { if (LNotequal(ObjectType(arg1), 3)) { - err("m311: unexpected type of Arg1", z036, 0, 0, 0, 0, 0) + err("m311: unexpected type of Arg1", z036, __LINE__, 0, 0, 0, 0) return (Ones) } if (LNotequal(ObjectType(arg2), 3)) { - err("m311: unexpected type of Arg2", z036, 1, 0, 0, 0, 0) + err("m311: unexpected type of Arg2", z036, __LINE__, 0, 0, 0, 0) return (Ones) } @@ -119,7 +119,7 @@ Method(m312, 6, Serialized) Concatenate(Local0, Local1, Local7) if (m311(Arg0, Local7, Local2)) { - err(arg0, z036, 2, 0, 0, Local5, arg2) + err(arg0, z036, __LINE__, 0, 0, Local5, arg2) } } case (1) { @@ -128,11 +128,11 @@ Method(m312, 6, Serialized) Concatenate(Local0, Local1, Local7) if (LNotequal(ObjectType(Local7), 2)) { - err(arg0, z036, 3, 0, 0, Local7, arg2) + err(arg0, z036, __LINE__, 0, 0, Local7, arg2) } elseif (LNotequal(ObjectType(Local2), 2)) { - err(arg0, z036, 4, 0, 0, Local2, arg2) + err(arg0, z036, __LINE__, 0, 0, Local2, arg2) } elseif (LNotEqual(Local7, Local2)) { - err(arg0, z036, 5, 0, 0, Local7, arg2) + err(arg0, z036, __LINE__, 0, 0, Local7, arg2) } } } diff --git a/tests/aslts/src/runtime/collections/functional/manipulation/match1.asl b/tests/aslts/src/runtime/collections/functional/manipulation/match1.asl index c716c4c57..6fc8b007b 100644 --- a/tests/aslts/src/runtime/collections/functional/manipulation/match1.asl +++ b/tests/aslts/src/runtime/collections/functional/manipulation/match1.asl @@ -224,7 +224,7 @@ Method(m308, 7, Serialized) Store(m306(arg5, Local0, Local1, Local2, Local3, Local4), Local6) if (LNotEqual(Local7, Local6)) { - err("err 1", z038, lpC0, 0, 0, lpC1, arg2) + err("err 1", z038, __LINE__, 0, 0, lpC1, arg2) } if (LAnd(arg6, LNotEqual(Local1, Local3))) { @@ -237,7 +237,7 @@ Method(m308, 7, Serialized) Store(m306(arg5, Local0, Local3, Local2, Local1, Local4), Local6) if (LNotEqual(Local7, Local6)) { - err("err 2", z038, Add(lpC0, 36), 0, 0, lpC2, arg2) + err("err 2", z038, __LINE__, 0, 0, lpC2, arg2) } } diff --git a/tests/aslts/src/runtime/collections/functional/manipulation/match2.asl b/tests/aslts/src/runtime/collections/functional/manipulation/match2.asl index c76326650..f08dc4cab 100644 --- a/tests/aslts/src/runtime/collections/functional/manipulation/match2.asl +++ b/tests/aslts/src/runtime/collections/functional/manipulation/match2.asl @@ -97,7 +97,7 @@ Method(m331, 1) { Store(m330(0x12), Local0) if (LNotEqual(Local0, Ones)) { - err(arg0, z075, 0, 0, 0, Local0, Ones) + err(arg0, z075, __LINE__, 0, 0, Local0, Ones) } } */ @@ -193,56 +193,56 @@ Method(m331, 1) Store(m330(0321), Local0) if (LNotEqual(Local0, 36)) { - err(arg0, z075, 0, Local0, 36) + err(arg0, z075, __LINE__, Local0, 36) } Store(m330(0xd1), Local0) if (LNotEqual(Local0, 36)) { - err(arg0, z075, 1, Local0, 36) + err(arg0, z075, __LINE__, Local0, 36) } Store(m330(9876543210), Local0) if (F64) { if (LNotEqual(Local0, 37)) { - err(arg0, z075, 2, Local0, 37) + err(arg0, z075, __LINE__, Local0, 37) } } else { if (LNotEqual(Local0, 45)) { - err(arg0, z075, 3, Local0, 45) + err(arg0, z075, __LINE__, Local0, 45) } } Store(m330(0xc179b3fe), Local0) if (LNotEqual(Local0, 28)) { - err(arg0, z075, 4, Local0, 28) + err(arg0, z075, __LINE__, Local0, 28) } Store(m330(0xfe7cb391d650a284), Local0) if (LNotEqual(Local0, 29)) { - err(arg0, z075, 5, Local0, 29) + err(arg0, z075, __LINE__, Local0, 29) } Store(m330(0), Local0) if (LNotEqual(Local0, 14)) { - err(arg0, z075, 6, Local0, 14) + err(arg0, z075, __LINE__, Local0, 14) } Store(m330(0xffffffff), Local0) if (LNotEqual(Local0, 16)) { - err(arg0, z075, 7, Local0, 16) + err(arg0, z075, __LINE__, Local0, 16) } Store(m330(0xffffffffffffffff), Local0) if (F64) { if (LNotEqual(Local0, 17)) { - err(arg0, z075, 8, Local0, 17) + err(arg0, z075, __LINE__, Local0, 17) } } else { if (LNotEqual(Local0, 16)) { - err(arg0, z075, 9, Local0, 16) + err(arg0, z075, __LINE__, Local0, 16) } } Store(m330(0xff), Local0) if (LNotEqual(Local0, 20)) { - err(arg0, z075, 10, Local0, 20) + err(arg0, z075, __LINE__, Local0, 20) } Store(m330(0xabcdef), Local0) if (LNotEqual(Local0, 44)) { - err(arg0, z075, 11, Local0, 44) + err(arg0, z075, __LINE__, Local0, 44) } } @@ -346,87 +346,87 @@ Method(m333, 1) if (0) { Store(m332("0321"), Local0) if (LNotEqual(Local0, 34)) { - err(arg0, z075, 24, Local0, 34) + err(arg0, z075, __LINE__, Local0, 34) } Store(m332("321"), Local0) if (LNotEqual(Local0, 34)) { - err(arg0, z075, 25, Local0, 34) + err(arg0, z075, __LINE__, Local0, 34) } Store(m332("ba9876"), Local0) if (LNotEqual(Local0, 36)) { - err(arg0, z075, 26, Local0, 36) + err(arg0, z075, __LINE__, Local0, 36) } Store(m332("c179b3fe"), Local0) if (LNotEqual(Local0, 2)) { - err(arg0, z075, 27, Local0, 2) + err(arg0, z075, __LINE__, Local0, 2) } Store(m332("fe7cb391d650a284"), Local0) if (LNotEqual(Local0, 3)) { - err(arg0, z075, 28, Local0, 3) + err(arg0, z075, __LINE__, Local0, 3) } Store(m332("ffffffff"), Local0) if (LNotEqual(Local0, 5)) { - err(arg0, z075, 29, Local0, 5) + err(arg0, z075, __LINE__, Local0, 5) } } Store(m332("ffffffffffffffffff"), Local0) if (LNotEqual(Local0, 40)) { - err(arg0, z075, 30, Local0, 40) + err(arg0, z075, __LINE__, Local0, 40) } if (0) { Store(m332("ffffffffffffffff"), Local0) if (LNotEqual(Local0, 41)) { - err(arg0, z075, 31, Local0, 41) + err(arg0, z075, __LINE__, Local0, 41) } Store(m332("ffffffffff"), Local0) if (LNotEqual(Local0, 42)) { - err(arg0, z075, 32, Local0, 42) + err(arg0, z075, __LINE__, Local0, 42) } Store(m332("ff"), Local0) if (LNotEqual(Local0, 43)) { - err(arg0, z075, 33, Local0, 43) + err(arg0, z075, __LINE__, Local0, 43) } Store(m332("fe7cb391d650a2841"), Local0) if (LNotEqual(Local0, 44)) { - err(arg0, z075, 34, Local0, 44) + err(arg0, z075, __LINE__, Local0, 44) } Store(m332("987654321"), Local0) if (LNotEqual(Local0, 45)) { - err(arg0, z075, 35, Local0, 45) + err(arg0, z075, __LINE__, Local0, 45) } Store(m332("0xfe7cb3"), Local0) if (LNotEqual(Local0, 46)) { - err(arg0, z075, 36, Local0, 46) + err(arg0, z075, __LINE__, Local0, 46) } Store(m332("1234q"), Local0) if (LNotEqual(Local0, 47)) { - err(arg0, z075, 37, Local0, 47) + err(arg0, z075, __LINE__, Local0, 47) } Store(m332(BIG0), Local0) if (LNotEqual(Local0, 48)) { - err(arg0, z075, 38, Local0, 48) + err(arg0, z075, __LINE__, Local0, 48) } Store(m332(""), Local0) if (LNotEqual(Local0, 49)) { - err(arg0, z075, 39, Local0, 49) + err(arg0, z075, __LINE__, Local0, 49) } Store(m332(" "), Local0) if (LNotEqual(Local0, 50)) { - err(arg0, z075, 40, Local0, 50) + err(arg0, z075, __LINE__, Local0, 50) } Store(m332(ALL0), Local0) if (LNotEqual(Local0, 51)) { - err(arg0, z075, 41, Local0, 51) + err(arg0, z075, __LINE__, Local0, 51) } Store(m332("abcdef"), Local0) if (LNotEqual(Local0, 52)) { - err(arg0, z075, 42, Local0, 52) + err(arg0, z075, __LINE__, Local0, 52) } Store(m332("ABCDEF"), Local0) if (LNotEqual(Local0, 53)) { - err(arg0, z075, 43, Local0, 53) + err(arg0, z075, __LINE__, Local0, 53) } } } diff --git a/tests/aslts/src/runtime/collections/functional/manipulation/mid.asl b/tests/aslts/src/runtime/collections/functional/manipulation/mid.asl index a6a1f2172..de069a3ae 100644 --- a/tests/aslts/src/runtime/collections/functional/manipulation/mid.asl +++ b/tests/aslts/src/runtime/collections/functional/manipulation/mid.asl @@ -61,13 +61,13 @@ Method(m304, 6, Serialized) case (0) { Mid(Local0, Local1, Local4, Local7) if (LNotEqual(Local7, Local2)) { - err(arg0, z039, 0, 0, 0, Local5, arg2) + err(arg0, z039, __LINE__, 0, 0, Local5, arg2) } } case (1) { Mid(s200, Local1, Local4, Local7) if (LNotEqual(Local7, Local2)) { - err(arg0, z039, 1, 0, 0, Local5, arg2) + err(arg0, z039, __LINE__, 0, 0, Local5, arg2) } } } @@ -283,10 +283,10 @@ Method(MID0,, Serialized) // Buffer, Mid(Buffer(0){}) Mid(Buffer(Local1) {}, 0, 1, Local7) if (LNotEqual(Local7, Buffer(Local1) {})) { - err(ts, z039, 2, 0, 0, 0, "Buffer(0)") + err(ts, z039, __LINE__, 0, 0, 0, "Buffer(0)") } Mid(Buffer(Local1) {}, 300, 300, Local7) if (LNotEqual(Local7, Buffer(Local1) {})) { - err(ts, z039, 3, 0, 0, 0, "Buffer(0)") + err(ts, z039, __LINE__, 0, 0, 0, "Buffer(0)") } } diff --git a/tests/aslts/src/runtime/collections/functional/manipulation/objecttype.asl b/tests/aslts/src/runtime/collections/functional/manipulation/objecttype.asl index 0813b9466..0be2a4851 100644 --- a/tests/aslts/src/runtime/collections/functional/manipulation/objecttype.asl +++ b/tests/aslts/src/runtime/collections/functional/manipulation/objecttype.asl @@ -166,31 +166,31 @@ Method(m0f1, 7, Serialized) Store(ObjectType(Local0), Local7) if (LNotEqual(Local7, c008)) { - err(arg0, z040, 0, 0, 0, Local7, c008) + err(arg0, z040, __LINE__, 0, 0, Local7, c008) } Store(ObjectType(Local1), Local7) if (LNotEqual(Local7, c008)) { - err(arg0, z040, 1, 0, 0, Local7, c008) + err(arg0, z040, __LINE__, 0, 0, Local7, c008) } Store(ObjectType(Local2), Local7) if (LNotEqual(Local7, c008)) { - err(arg0, z040, 2, 0, 0, Local7, c008) + err(arg0, z040, __LINE__, 0, 0, Local7, c008) } Store(ObjectType(Local3), Local7) if (LNotEqual(Local7, c008)) { - err(arg0, z040, 3, 0, 0, Local7, c008) + err(arg0, z040, __LINE__, 0, 0, Local7, c008) } Store(ObjectType(Local4), Local7) if (LNotEqual(Local7, c008)) { - err(arg0, z040, 4, 0, 0, Local7, c008) + err(arg0, z040, __LINE__, 0, 0, Local7, c008) } Store(ObjectType(Local5), Local7) if (LNotEqual(Local7, c008)) { - err(arg0, z040, 5, 0, 0, Local7, c008) + err(arg0, z040, __LINE__, 0, 0, Local7, c008) } Store(ObjectType(Local6), Local7) if (LNotEqual(Local7, c008)) { - err(arg0, z040, 6, 0, 0, Local7, c008) + err(arg0, z040, __LINE__, 0, 0, Local7, c008) } } case (1) { @@ -202,20 +202,20 @@ Method(m0f1, 7, Serialized) Store(0x12345678, Local0) Store(ObjectType(Local0), Local7) if (LNotEqual(Local7, c009)) { - err(arg0, z040, 7, 0, 0, Local7, c009) + err(arg0, z040, __LINE__, 0, 0, Local7, c009) } if (LNotEqual(Local0, 0x12345678)) { - err(arg0, z040, 8, 0, 0, Local0, 0x12345678) + err(arg0, z040, __LINE__, 0, 0, Local0, 0x12345678) } // By ArgX Store(ObjectType(Arg2), Local7) if (LNotEqual(Local7, c009)) { - err(arg0, z040, 9, 0, 0, Local7, c009) + err(arg0, z040, __LINE__, 0, 0, Local7, c009) } if (LNotEqual(Arg2, 0x81223344)) { - err(arg0, z040, 10, 0, 0, Arg2, 0x81223344) + err(arg0, z040, __LINE__, 0, 0, Arg2, 0x81223344) } // By Name locally @@ -223,20 +223,20 @@ Method(m0f1, 7, Serialized) Name(n000, 0x98127364) Store(ObjectType(n000), Local7) if (LNotEqual(Local7, c009)) { - err(arg0, z040, 11, 0, 0, Local7, c009) + err(arg0, z040, __LINE__, 0, 0, Local7, c009) } if (LNotEqual(n000, 0x98127364)) { - err(arg0, z040, 12, 0, 0, n000, 0x98127364) + err(arg0, z040, __LINE__, 0, 0, n000, 0x98127364) } // By Name globally Store(ObjectType(n002), Local7) if (LNotEqual(Local7, c009)) { - err(arg0, z040, 13, 0, 0, Local7, c009) + err(arg0, z040, __LINE__, 0, 0, Local7, c009) } if (LNotEqual(n002, 0x90801020)) { - err(arg0, z040, 14, 0, 0, n002, 0x90801020) + err(arg0, z040, __LINE__, 0, 0, n002, 0x90801020) } // Not a Buffer in 32-bit mode @@ -244,7 +244,7 @@ Method(m0f1, 7, Serialized) Store(0xa1b2c3d4e5c6e7f8, Local0) Store(ObjectType(Local0), Local7) if (LNotEqual(Local7, c009)) { - err(arg0, z040, 15, 0, 0, Local7, c009) + err(arg0, z040, __LINE__, 0, 0, Local7, c009) } } case (2) { @@ -258,20 +258,20 @@ Method(m0f1, 7, Serialized) Store(0xa1b2c3d4e5c6e7f8, Local0) Store(ObjectType(Local0), Local7) if (LNotEqual(Local7, c009)) { - err(arg0, z040, 16, 0, 0, Local7, c009) + err(arg0, z040, __LINE__, 0, 0, Local7, c009) } if (LNotEqual(Local0, 0xa1b2c3d4e5c6e7f8)) { - err(arg0, z040, 17, 0, 0, Local0, 0xa1b2c3d4e5c6e7f8) + err(arg0, z040, __LINE__, 0, 0, Local0, 0xa1b2c3d4e5c6e7f8) } // By ArgX Store(ObjectType(Arg2), Local7) if (LNotEqual(Local7, c009)) { - err(arg0, z040, 18, 0, 0, Local7, c009) + err(arg0, z040, __LINE__, 0, 0, Local7, c009) } if (LNotEqual(Arg2, 0xfabefac489501248)) { - err(arg0, z040, 19, 0, 0, Arg2, 0xfabefac489501248) + err(arg0, z040, __LINE__, 0, 0, Arg2, 0xfabefac489501248) } // By Name locally @@ -279,20 +279,20 @@ Method(m0f1, 7, Serialized) Name(n001, 0x9081122384356647) Store(ObjectType(n001), Local7) if (LNotEqual(Local7, c009)) { - err(arg0, z040, 20, 0, 0, Local7, c009) + err(arg0, z040, __LINE__, 0, 0, Local7, c009) } if (LNotEqual(n001, 0x9081122384356647)) { - err(arg0, z040, 21, 0, 0, n001, 0x9081122384356647) + err(arg0, z040, __LINE__, 0, 0, n001, 0x9081122384356647) } // By Name globally Store(ObjectType(n003), Local7) if (LNotEqual(Local7, c009)) { - err(arg0, z040, 22, 0, 0, Local7, c009) + err(arg0, z040, __LINE__, 0, 0, Local7, c009) } if (LNotEqual(n003, 0x9189192989396949)) { - err(arg0, z040, 23, 0, 0, n003, 0x9189192989396949) + err(arg0, z040, __LINE__, 0, 0, n003, 0x9189192989396949) } } } @@ -305,35 +305,35 @@ Method(m0f1, 7, Serialized) Store("", Local0) Store(ObjectType(Local0), Local7) if (LNotEqual(Local7, c00a)) { - err(arg0, z040, 24, 0, 0, Local7, c00a) + err(arg0, z040, __LINE__, 0, 0, Local7, c00a) } Store("1", Local0) Store(ObjectType(Local0), Local7) if (LNotEqual(Local7, c00a)) { - err(arg0, z040, 25, 0, 0, Local7, c00a) + err(arg0, z040, __LINE__, 0, 0, Local7, c00a) } Store("abcd", Local0) Store(ObjectType(Local0), Local7) if (LNotEqual(Local7, c00a)) { - err(arg0, z040, 26, 0, 0, Local7, c00a) + err(arg0, z040, __LINE__, 0, 0, Local7, c00a) } Store("qwrt", Local0) Store(ObjectType(Local0), Local7) if (LNotEqual(Local7, c00a)) { - err(arg0, z040, 27, 0, 0, Local7, c00a) + err(arg0, z040, __LINE__, 0, 0, Local7, c00a) } // By ArgX Store(ObjectType(Arg2), Local7) if (LNotEqual(Local7, c00a)) { - err(arg0, z040, 28, 0, 0, Local7, c00a) + err(arg0, z040, __LINE__, 0, 0, Local7, c00a) } if (LNotEqual(Arg2, "zxcvbnm0912345678ok")) { - err(arg0, z040, 29, 0, 0, Arg2, "zxcvbnm0912345678ok") + err(arg0, z040, __LINE__, 0, 0, Arg2, "zxcvbnm0912345678ok") } // By Name locally @@ -341,20 +341,20 @@ Method(m0f1, 7, Serialized) Name(n004, "") Store(ObjectType(n004), Local7) if (LNotEqual(Local7, c00a)) { - err(arg0, z040, 30, 0, 0, Local7, c00a) + err(arg0, z040, __LINE__, 0, 0, Local7, c00a) } if (LNotEqual(n004, "")) { - err(arg0, z040, 31, 0, 0, n004, "") + err(arg0, z040, __LINE__, 0, 0, n004, "") } // By Name globally Store(ObjectType(n005), Local7) if (LNotEqual(Local7, c00a)) { - err(arg0, z040, 32, 0, 0, Local7, c00a) + err(arg0, z040, __LINE__, 0, 0, Local7, c00a) } if (LNotEqual(n005, "9876")) { - err(arg0, z040, 33, 0, 0, n005, "9876") + err(arg0, z040, __LINE__, 0, 0, n005, "9876") } } @@ -374,27 +374,27 @@ Method(m0f1, 7, Serialized) Store(ObjectType(f000), Local7) if (LNotEqual(Local7, c00d)) { - err(arg0, z040, 34, 0, 0, Local7, c00d) + err(arg0, z040, __LINE__, 0, 0, Local7, c00d) } if (LNotEqual(f000, 0x8d)) { - err(arg0, z040, 35, 0, 0, f000, 0x8d) + err(arg0, z040, __LINE__, 0, 0, f000, 0x8d) } Store(ObjectType(f222), Local7) if (LNotEqual(Local7, c00d)) { - err(arg0, z040, 36, 0, 0, Local7, c00d) + err(arg0, z040, __LINE__, 0, 0, Local7, c00d) } Store(ObjectType(f223), Local7) if (LNotEqual(Local7, c00d)) { - err(arg0, z040, 37, 0, 0, Local7, c00d) + err(arg0, z040, __LINE__, 0, 0, Local7, c00d) } Store(ObjectType(f224), Local7) if (LNotEqual(Local7, c00d)) { - err(arg0, z040, 38, 0, 0, Local7, c00d) + err(arg0, z040, __LINE__, 0, 0, Local7, c00d) } Store(ObjectType(f225), Local7) if (LNotEqual(Local7, c00d)) { - err(arg0, z040, 39, 0, 0, Local7, c00d) + err(arg0, z040, __LINE__, 0, 0, Local7, c00d) } } case (5) { @@ -413,10 +413,10 @@ Method(m0f1, 7, Serialized) Store(ObjectType(bkf0), Local7) if (LNotEqual(Local7, c00d)) { - err(arg0, z040, 40, 0, 0, Local7, c00d) + err(arg0, z040, __LINE__, 0, 0, Local7, c00d) } if (LNotEqual(bkf0, 0x95)) { - err(arg0, z040, 41, 0, 0, bkf0, 0x95) + err(arg0, z040, __LINE__, 0, 0, bkf0, 0x95) } } case (6) { @@ -440,19 +440,19 @@ Method(m0f1, 7, Serialized) Store(ObjectType(f00a), Local7) if (LNotEqual(Local7, c00d)) { - err(arg0, z040, 42, 0, 0, Local7, c00d) + err(arg0, z040, __LINE__, 0, 0, Local7, c00d) } Store(ObjectType(f00b), Local7) if (LNotEqual(Local7, c00d)) { - err(arg0, z040, 43, 0, 0, Local7, c00d) + err(arg0, z040, __LINE__, 0, 0, Local7, c00d) } Store(ObjectType(if00), Local7) if (LNotEqual(Local7, c00d)) { - err(arg0, z040, 44, 0, 0, Local7, c00d) + err(arg0, z040, __LINE__, 0, 0, Local7, c00d) } Store(ObjectType(if01), Local7) if (LNotEqual(Local7, c00d)) { - err(arg0, z040, 45, 0, 0, Local7, c00d) + err(arg0, z040, __LINE__, 0, 0, Local7, c00d) } } case (7) { @@ -462,10 +462,10 @@ Method(m0f1, 7, Serialized) Store(Buffer(4) {0, 1, 2, 3}, Local0) Store(ObjectType(Local0), Local7) if (LNotEqual(Local7, c00b)) { - err(arg0, z040, 46, 0, 0, Local7, c00b) + err(arg0, z040, __LINE__, 0, 0, Local7, c00b) } if (LNotEqual(Local0, Buffer(4) {0, 1, 2, 3})) { - err(arg0, z040, 47, 0, 0, 0, 0) + err(arg0, z040, __LINE__, 0, 0, 0, 0) } } case (8) { @@ -474,10 +474,10 @@ Method(m0f1, 7, Serialized) Store(ObjectType(Arg2), Local7) if (LNotEqual(Local7, c00b)) { - err(arg0, z040, 48, 0, 0, Local7, c00b) + err(arg0, z040, __LINE__, 0, 0, Local7, c00b) } if (LNotEqual(Arg2, Buffer(4) {4, 5, 6, 7})) { - err(arg0, z040, 49, 0, 0, 0, 0) + err(arg0, z040, __LINE__, 0, 0, 0, 0) } } case (9) { @@ -487,10 +487,10 @@ Method(m0f1, 7, Serialized) Name(b000, Buffer(4) {8, 9, 10, 11}) Store(ObjectType(b000), Local7) if (LNotEqual(Local7, c00b)) { - err(arg0, z040, 50, 0, 0, Local7, c00b) + err(arg0, z040, __LINE__, 0, 0, Local7, c00b) } if (LNotEqual(b000, Buffer(4) {8, 9, 10, 11})) { - err(arg0, z040, 51, 0, 0, 0, 0) + err(arg0, z040, __LINE__, 0, 0, 0, 0) } } case (10) { @@ -499,10 +499,10 @@ Method(m0f1, 7, Serialized) Store(ObjectType(b003), Local7) if (LNotEqual(Local7, c00b)) { - err(arg0, z040, 52, 0, 0, Local7, c00b) + err(arg0, z040, __LINE__, 0, 0, Local7, c00b) } if (LNotEqual(b003, Buffer(4) {12, 13, 14, 15})) { - err(arg0, z040, 53, 0, 0, 0, 0) + err(arg0, z040, __LINE__, 0, 0, 0, 0) } } case (11) { @@ -513,10 +513,10 @@ Method(m0f1, 7, Serialized) CreateBitField(Local0, 3, f001) Store(ObjectType(f001), Local7) if (LNotEqual(Local7, c016)) { - err(arg0, z040, 54, 0, 0, Local7, c016) + err(arg0, z040, __LINE__, 0, 0, Local7, c016) } if (LNotEqual(Local0, Buffer(4) {16, 17, 18, 19})) { - err(arg0, z040, 55, 0, 0, 0, 0) + err(arg0, z040, __LINE__, 0, 0, 0, 0) } } case (12) { @@ -527,10 +527,10 @@ Method(m0f1, 7, Serialized) CreateByteField(Local0, 3, f002) Store(ObjectType(f002), Local7) if (LNotEqual(Local7, c016)) { - err(arg0, z040, 56, 0, 0, Local7, c016) + err(arg0, z040, __LINE__, 0, 0, Local7, c016) } if (LNotEqual(Local0, Buffer(4) {20, 21, 22, 23})) { - err(arg0, z040, 57, 0, 0, 0, 0) + err(arg0, z040, __LINE__, 0, 0, 0, 0) } } case (13) { @@ -541,10 +541,10 @@ Method(m0f1, 7, Serialized) CreateDWordField(Local0, 0, f003) Store(ObjectType(f003), Local7) if (LNotEqual(Local7, c016)) { - err(arg0, z040, 58, 0, 0, Local7, c016) + err(arg0, z040, __LINE__, 0, 0, Local7, c016) } if (LNotEqual(Local0, Buffer(4) {24, 25, 26, 27})) { - err(arg0, z040, 59, 0, 0, 0, 0) + err(arg0, z040, __LINE__, 0, 0, 0, 0) } } case (14) { @@ -555,10 +555,10 @@ Method(m0f1, 7, Serialized) CreateField(Local0, 0, 32, f004) Store(ObjectType(f004), Local7) if (LNotEqual(Local7, c016)) { - err(arg0, z040, 60, 0, 0, Local7, c016) + err(arg0, z040, __LINE__, 0, 0, Local7, c016) } if (LNotEqual(Local0, Buffer(4) {28, 29, 30, 31})) { - err(arg0, z040, 61, 0, 0, 0, 0) + err(arg0, z040, __LINE__, 0, 0, 0, 0) } } case (15) { @@ -569,11 +569,11 @@ Method(m0f1, 7, Serialized) CreateField(Local0, 0, 64, f005) Store(ObjectType(f005), Local7) if (LNotEqual(Local7, c016)) { - err(arg0, z040, 62, 0, 0, Local7, c016) + err(arg0, z040, __LINE__, 0, 0, Local7, c016) } if (LNotEqual(Local0, Buffer() {33, 34, 35, 36, 37, 38, 39, 40, 41})) { - err(arg0, z040, 63, 0, 0, 0, 0) + err(arg0, z040, __LINE__, 0, 0, 0, 0) } } case (16) { @@ -584,21 +584,21 @@ Method(m0f1, 7, Serialized) CreateField(Local0, 0, 65, f006) Store(ObjectType(f006), Local7) if (LNotEqual(Local7, c016)) { - err(arg0, z040, 64, 0, 0, Local7, c016) + err(arg0, z040, __LINE__, 0, 0, Local7, c016) } if (LNotEqual(Local0, Buffer() {42, 43, 44, 45, 46, 47, 48, 49, 50})) { - err(arg0, z040, 65, 0, 0, 0, 0) + err(arg0, z040, __LINE__, 0, 0, 0, 0) } CreateField(Local0, 0, 17, f111) Store(ObjectType(f111), Local7) if (LNotEqual(Local7, c016)) { - err(arg0, z040, 66, 0, 0, Local7, c016) + err(arg0, z040, __LINE__, 0, 0, Local7, c016) } CreateField(Local0, 0, 57, f112) Store(ObjectType(f112), Local7) if (LNotEqual(Local7, c016)) { - err(arg0, z040, 67, 0, 0, Local7, c016) + err(arg0, z040, __LINE__, 0, 0, Local7, c016) } } case (17) { @@ -609,10 +609,10 @@ Method(m0f1, 7, Serialized) CreateQWordField(Local0, 0, f007) Store(ObjectType(f007), Local7) if (LNotEqual(Local7, c016)) { - err(arg0, z040, 68, 0, 0, Local7, c016) + err(arg0, z040, __LINE__, 0, 0, Local7, c016) } if (LNotEqual(Local0, Buffer() {42, 43, 44, 45, 46, 47, 48, 49, 50})) { - err(arg0, z040, 69, 0, 0, 0, 0) + err(arg0, z040, __LINE__, 0, 0, 0, 0) } } case (18) { @@ -623,10 +623,10 @@ Method(m0f1, 7, Serialized) CreateWordField(Local0, 0, f008) Store(ObjectType(f008), Local7) if (LNotEqual(Local7, c016)) { - err(arg0, z040, 70, 0, 0, Local7, c016) + err(arg0, z040, __LINE__, 0, 0, Local7, c016) } if (LNotEqual(Local0, Buffer() {51, 52, 53, 54})) { - err(arg0, z040, 71, 0, 0, 0, 0) + err(arg0, z040, __LINE__, 0, 0, 0, 0) } } case (19) { @@ -637,40 +637,40 @@ Method(m0f1, 7, Serialized) Store(Index(Local0, 0), Local1) Store(ObjectType(Local1), Local7) if (LNotEqual(Local7, c016)) { - err(arg0, z040, 72, 0, 0, Local7, c016) + err(arg0, z040, __LINE__, 0, 0, Local7, c016) } if (LNotEqual(Local0, "q")) { - err(arg0, z040, 73, 0, 0, 0, 0) + err(arg0, z040, __LINE__, 0, 0, 0, 0) } Store("qw", Local0) Store(Index(Local0, 0), Local1) Store(ObjectType(Local1), Local7) if (LNotEqual(Local7, c016)) { - err(arg0, z040, 74, 0, 0, Local7, c016) + err(arg0, z040, __LINE__, 0, 0, Local7, c016) } if (LNotEqual(Local0, "qw")) { - err(arg0, z040, 75, 0, 0, 0, 0) + err(arg0, z040, __LINE__, 0, 0, 0, 0) } Store("qwertyu", Local0) Store(Index(Local0, 0), Local1) Store(ObjectType(Local1), Local7) if (LNotEqual(Local7, c016)) { - err(arg0, z040, 76, 0, 0, Local7, c016) + err(arg0, z040, __LINE__, 0, 0, Local7, c016) } if (LNotEqual(Local0, "qwertyu")) { - err(arg0, z040, 77, 0, 0, 0, 0) + err(arg0, z040, __LINE__, 0, 0, 0, 0) } Store("qwertyuiop", Local0) Store(Index(Local0, 0), Local1) Store(ObjectType(Local1), Local7) if (LNotEqual(Local7, c016)) { - err(arg0, z040, 78, 0, 0, Local7, c016) + err(arg0, z040, __LINE__, 0, 0, Local7, c016) } if (LNotEqual(Local0, "qwertyuiop")) { - err(arg0, z040, 79, 0, 0, 0, 0) + err(arg0, z040, __LINE__, 0, 0, 0, 0) } } case (20) { @@ -681,30 +681,30 @@ Method(m0f1, 7, Serialized) Store(Index(Local0, 0), Local1) Store(ObjectType(Local1), Local7) if (LNotEqual(Local7, c016)) { - err(arg0, z040, 80, 0, 0, Local7, c016) + err(arg0, z040, __LINE__, 0, 0, Local7, c016) } if (LNotEqual(Local0, Buffer() {42, 43, 44, 45})) { - err(arg0, z040, 81, 0, 0, 0, 0) + err(arg0, z040, __LINE__, 0, 0, 0, 0) } Store(Buffer() {42, 43, 44, 45, 46, 47, 48, 49}, Local0) Store(Index(Local0, 0), Local1) Store(ObjectType(Local1), Local7) if (LNotEqual(Local7, c016)) { - err(arg0, z040, 82, 0, 0, Local7, c016) + err(arg0, z040, __LINE__, 0, 0, Local7, c016) } if (LNotEqual(Local0, Buffer() {42, 43, 44, 45, 46, 47, 48, 49})) { - err(arg0, z040, 83, 0, 0, 0, 0) + err(arg0, z040, __LINE__, 0, 0, 0, 0) } Store(Buffer() {42, 43, 44, 45, 46, 47, 48, 49, 50}, Local0) Store(Index(Local0, 0), Local1) Store(ObjectType(Local1), Local7) if (LNotEqual(Local7, c016)) { - err(arg0, z040, 84, 0, 0, Local7, c016) + err(arg0, z040, __LINE__, 0, 0, Local7, c016) } if (LNotEqual(Local0, Buffer() {42, 43, 44, 45, 46, 47, 48, 49, 50})) { - err(arg0, z040, 85, 0, 0, 0, 0) + err(arg0, z040, __LINE__, 0, 0, 0, 0) } } case (21) { @@ -726,7 +726,7 @@ Method(m0f1, 7, Serialized) Store(Index(Local0, 0), Local1) Store(ObjectType(Local1), Local7) if (LNotEqual(Local7, c00c)) { - err(arg0, z040, 86, 0, 0, Local7, c00c) + err(arg0, z040, __LINE__, 0, 0, Local7, c00c) } // Buffer @@ -734,7 +734,7 @@ Method(m0f1, 7, Serialized) Store(Index(Local0, 1), Local1) Store(ObjectType(Local1), Local7) if (LNotEqual(Local7, c00b)) { - err(arg0, z040, 87, 0, 0, Local7, c00b) + err(arg0, z040, __LINE__, 0, 0, Local7, c00b) } // String @@ -742,7 +742,7 @@ Method(m0f1, 7, Serialized) Store(Index(Local0, 2), Local1) Store(ObjectType(Local1), Local7) if (LNotEqual(Local7, c00a)) { - err(arg0, z040, 88, 0, 0, Local7, c00a) + err(arg0, z040, __LINE__, 0, 0, Local7, c00a) } // Integer @@ -750,7 +750,7 @@ Method(m0f1, 7, Serialized) Store(Index(Local0, 3), Local1) Store(ObjectType(Local1), Local7) if (LNotEqual(Local7, c009)) { - err(arg0, z040, 89, 0, 0, Local7, c009) + err(arg0, z040, __LINE__, 0, 0, Local7, c009) } } case (22) { @@ -760,7 +760,7 @@ Method(m0f1, 7, Serialized) DataTableRegion (HDR0, "DSDT", "", "") Store(ObjectType(HDR0), Local7) if (LNotEqual(Local7, c012)) { - err(arg0, z040, 90, 0, 0, Local7, c012) + err(arg0, z040, __LINE__, 0, 0, Local7, c012) } } case (23) { @@ -769,7 +769,7 @@ Method(m0f1, 7, Serialized) Store(ObjectType(Debug), Local7) if (LNotEqual(Local7, c018)) { - err(arg0, z040, 91, 0, 0, Local7, c018) + err(arg0, z040, __LINE__, 0, 0, Local7, c018) } } case (24) { @@ -779,7 +779,7 @@ Method(m0f1, 7, Serialized) Device(dv00) {} Store(ObjectType(dv00), Local7) if (LNotEqual(Local7, c00e)) { - err(arg0, z040, 92, 0, 0, Local7, c00e) + err(arg0, z040, __LINE__, 0, 0, Local7, c00e) } } case (25) { @@ -789,7 +789,7 @@ Method(m0f1, 7, Serialized) Event(evt0) Store(ObjectType(evt0), Local7) if (LNotEqual(Local7, c00f)) { - err(arg0, z040, 93, 0, 0, Local7, c00f) + err(arg0, z040, __LINE__, 0, 0, Local7, c00f) } } case (26) { @@ -799,7 +799,7 @@ Method(m0f1, 7, Serialized) Method(m0f2) { return (0x1234) } Store(ObjectType(m0f2), Local7) if (LNotEqual(Local7, c010)) { - err(arg0, z040, 94, 0, 0, Local7, c010) + err(arg0, z040, __LINE__, 0, 0, Local7, c010) } } case (27) { @@ -809,7 +809,7 @@ Method(m0f1, 7, Serialized) * Function(mof3) { return (0) } * Store(ObjectType(m0f3), Local7) * if (LNotEqual(Local7, c010)) { - * err(arg0, z040, 95, 0, 0, Local7, c010) + * err(arg0, z040, __LINE__, 0, 0, Local7, c010) * } */ } @@ -820,7 +820,7 @@ Method(m0f1, 7, Serialized) Mutex(mt00, 0) Store(ObjectType(mt00), Local7) if (LNotEqual(Local7, c011)) { - err(arg0, z040, 96, 0, 0, Local7, c011) + err(arg0, z040, __LINE__, 0, 0, Local7, c011) } } case (29) { @@ -829,11 +829,11 @@ Method(m0f1, 7, Serialized) Store(ObjectType(r000), Local7) if (LNotEqual(Local7, c012)) { - err(arg0, z040, 97, 0, 0, Local7, c012) + err(arg0, z040, __LINE__, 0, 0, Local7, c012) } Store(ObjectType(r001), Local7) if (LNotEqual(Local7, c012)) { - err(arg0, z040, 98, 0, 0, Local7, c012) + err(arg0, z040, __LINE__, 0, 0, Local7, c012) } } case (30) { @@ -865,83 +865,83 @@ Method(m0f1, 7, Serialized) Store(ObjectType(p000), Local7) if (LNotEqual(Local7, c00c)) { - err(arg0, z040, 99, 0, 0, Local7, c00c) + err(arg0, z040, __LINE__, 0, 0, Local7, c00c) } Store(ObjectType(p001), Local7) if (LNotEqual(Local7, c00c)) { - err(arg0, z040, 100, 0, 0, Local7, c00c) + err(arg0, z040, __LINE__, 0, 0, Local7, c00c) } Store(ObjectType(p002), Local7) if (LNotEqual(Local7, c00c)) { - err(arg0, z040, 101, 0, 0, Local7, c00c) + err(arg0, z040, __LINE__, 0, 0, Local7, c00c) } Store(ObjectType(p003), Local7) if (LNotEqual(Local7, c00c)) { - err(arg0, z040, 102, 0, 0, Local7, c00c) + err(arg0, z040, __LINE__, 0, 0, Local7, c00c) } Store(ObjectType(p004), Local7) if (LNotEqual(Local7, c00c)) { - err(arg0, z040, 103, 0, 0, Local7, c00c) + err(arg0, z040, __LINE__, 0, 0, Local7, c00c) } Store(ObjectType(p005), Local7) if (LNotEqual(Local7, c00c)) { - err(arg0, z040, 104, 0, 0, Local7, c00c) + err(arg0, z040, __LINE__, 0, 0, Local7, c00c) } Store(ObjectType(p006), Local7) if (LNotEqual(Local7, c00c)) { - err(arg0, z040, 105, 0, 0, Local7, c00c) + err(arg0, z040, __LINE__, 0, 0, Local7, c00c) } Store(ObjectType(p007), Local7) if (LNotEqual(Local7, c00c)) { - err(arg0, z040, 106, 0, 0, Local7, c00c) + err(arg0, z040, __LINE__, 0, 0, Local7, c00c) } Store(ObjectType(p008), Local7) if (LNotEqual(Local7, c00c)) { - err(arg0, z040, 107, 0, 0, Local7, c00c) + err(arg0, z040, __LINE__, 0, 0, Local7, c00c) } Store(ObjectType(p009), Local7) if (LNotEqual(Local7, c00c)) { - err(arg0, z040, 108, 0, 0, Local7, c00c) + err(arg0, z040, __LINE__, 0, 0, Local7, c00c) } Store(ObjectType(p00a), Local7) if (LNotEqual(Local7, c00c)) { - err(arg0, z040, 109, 0, 0, Local7, c00c) + err(arg0, z040, __LINE__, 0, 0, Local7, c00c) } Store(ObjectType(p00b), Local7) if (LNotEqual(Local7, c00c)) { - err(arg0, z040, 110, 0, 0, Local7, c00c) + err(arg0, z040, __LINE__, 0, 0, Local7, c00c) } Store(ObjectType(p00c), Local7) if (LNotEqual(Local7, c00c)) { - err(arg0, z040, 111, 0, 0, Local7, c00c) + err(arg0, z040, __LINE__, 0, 0, Local7, c00c) } Store(ObjectType(p00d), Local7) if (LNotEqual(Local7, c00c)) { - err(arg0, z040, 112, 0, 0, Local7, c00c) + err(arg0, z040, __LINE__, 0, 0, Local7, c00c) } Store(ObjectType(p00e), Local7) if (LNotEqual(Local7, c00c)) { - err(arg0, z040, 113, 0, 0, Local7, c00c) + err(arg0, z040, __LINE__, 0, 0, Local7, c00c) } Store(ObjectType(p00f), Local7) if (LNotEqual(Local7, c00c)) { - err(arg0, z040, 114, 0, 0, Local7, c00c) + err(arg0, z040, __LINE__, 0, 0, Local7, c00c) } Store(ObjectType(p010), Local7) if (LNotEqual(Local7, c00c)) { - err(arg0, z040, 115, 0, 0, Local7, c00c) + err(arg0, z040, __LINE__, 0, 0, Local7, c00c) } Store(ObjectType(p011), Local7) if (LNotEqual(Local7, c00c)) { - err(arg0, z040, 116, 0, 0, Local7, c00c) + err(arg0, z040, __LINE__, 0, 0, Local7, c00c) } Store(ObjectType(p012), Local7) if (LNotEqual(Local7, c00c)) { - err(arg0, z040, 117, 0, 0, Local7, c00c) + err(arg0, z040, __LINE__, 0, 0, Local7, c00c) } Store(ObjectType(p013), Local7) if (LNotEqual(Local7, c00c)) { - err(arg0, z040, 118, 0, 0, Local7, c00c) + err(arg0, z040, __LINE__, 0, 0, Local7, c00c) } } case (31) { @@ -951,7 +951,7 @@ Method(m0f1, 7, Serialized) PowerResource(pwr0, 1, 0) {Method(m000){return (0)}} Store(ObjectType(pwr0), Local7) if (LNotEqual(Local7, c013)) { - err(arg0, z040, 119, 0, 0, Local7, c013) + err(arg0, z040, __LINE__, 0, 0, Local7, c013) } } case (32) { @@ -961,14 +961,14 @@ Method(m0f1, 7, Serialized) Processor(pr00, 0, 0xFFFFFFFF, 0) {} Store(ObjectType(pr00), Local7) if (LNotEqual(Local7, c014)) { - err(arg0, z040, 120, 0, 0, Local7, c014) + err(arg0, z040, __LINE__, 0, 0, Local7, c014) } } case (33) { ThermalZone(tz00) {} Store(ObjectType(tz00), Local7) if (LNotEqual(Local7, c015)) { - err(arg0, z040, 121, 0, 0, Local7, c015) + err(arg0, z040, __LINE__, 0, 0, Local7, c015) } } case (34) { @@ -983,14 +983,14 @@ Store("==================================== zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz Store (LoadTable("OEM1", "MYOEM", "TABLE1"), Local0) Store(ObjectType(Local0), Local7) if (LNotEqual(Local7, c017)) { - err(arg0, z040, 122, 0, 0, Local7, c017) + err(arg0, z040, __LINE__, 0, 0, Local7, c017) } Store("==================================== uuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuu", Debug) */ } Default { - err(arg0, z040, 123, 0, 0, 0, 0) + err(arg0, z040, __LINE__, 0, 0, 0, 0) } } diff --git a/tests/aslts/src/runtime/collections/functional/manipulation/sizeof.asl b/tests/aslts/src/runtime/collections/functional/manipulation/sizeof.asl index 3622c397a..851c3ab61 100644 --- a/tests/aslts/src/runtime/collections/functional/manipulation/sizeof.asl +++ b/tests/aslts/src/runtime/collections/functional/manipulation/sizeof.asl @@ -47,27 +47,27 @@ Method(m1ef,, Serialized) Store(SizeOf(i000), Local0) if (LEqual(F64, 1)) { if (LNotEqual(Local0, 8)) { - err(ts, z041, 0, 0, 0, Local0, 8) + err(ts, z041, __LINE__, 0, 0, Local0, 8) } } else { if (LNotEqual(Local0, 4)) { - err(ts, z041, 1, 0, 0, Local0, 4) + err(ts, z041, __LINE__, 0, 0, Local0, 4) } } Store(SizeOf(s000), Local0) if (LNotEqual(Local0, 3)) { - err(ts, z041, 2, 0, 0, Local0, 3) + err(ts, z041, __LINE__, 0, 0, Local0, 3) } Store(SizeOf(b000), Local0) if (LNotEqual(Local0, 5)) { - err(ts, z041, 3, 0, 0, Local0, 5) + err(ts, z041, __LINE__, 0, 0, Local0, 5) } Store(SizeOf(p000), Local0) if (LNotEqual(Local0, 7)) { - err(ts, z041, 4, 0, 0, Local0, 7) + err(ts, z041, __LINE__, 0, 0, Local0, 7) } } diff --git a/tests/aslts/src/runtime/collections/functional/manipulation/store.asl b/tests/aslts/src/runtime/collections/functional/manipulation/store.asl index cee60f629..275904614 100644 --- a/tests/aslts/src/runtime/collections/functional/manipulation/store.asl +++ b/tests/aslts/src/runtime/collections/functional/manipulation/store.asl @@ -54,70 +54,70 @@ Method(m302, 6, Serialized) case (0) { ToInteger(Local0, Local2) if (LNotEqual(Local2, Local1)) { - err(arg0, z042, 0, 0, 0, Local5, arg2) + err(arg0, z042, __LINE__, 0, 0, Local5, arg2) return (1) } } case (1) { ToBuffer(Local0, Local2) if (LNotEqual(Local2, Local1)) { - err(arg0, z042, 1, 0, 0, Local5, arg2) + err(arg0, z042, __LINE__, 0, 0, Local5, arg2) return (1) } } case (2) { ToString(Local0, , Local2) if (LNotEqual(Local2, Local1)) { - err(arg0, z042, 2, 0, 0, Local5, arg2) + err(arg0, z042, __LINE__, 0, 0, Local5, arg2) return (1) } } case (3) { ToDecimalString(Local0, Local2) if (LNotEqual(Local2, Local1)) { - err(arg0, z042, 3, 0, 0, Local5, arg2) + err(arg0, z042, __LINE__, 0, 0, Local5, arg2) return (1) } } case (4) { ToHexString(Local0, Local2) if (LNotEqual(Local2, Local1)) { - err(arg0, z042, 4, 0, 0, Local5, arg2) + err(arg0, z042, __LINE__, 0, 0, Local5, arg2) return (1) } } case (5) { ToBCD(Local0, Local2) if (LNotEqual(Local2, Local1)) { - err(arg0, z042, 5, 0, 0, Local5, arg2) + err(arg0, z042, __LINE__, 0, 0, Local5, arg2) return (1) } } case (6) { FromBCD(Local0, Local2) if (LNotEqual(Local2, Local1)) { - err(arg0, z042, 6, 0, 0, Local5, arg2) + err(arg0, z042, __LINE__, 0, 0, Local5, arg2) return (1) } } case (7) { // ToUUID macro Store(Local0, Local2) if (LNotEqual(Local2, Local1)) { - err(arg0, z042, 7, 0, 0, Local5, arg2) + err(arg0, z042, __LINE__, 0, 0, Local5, arg2) return (1) } } case (8) { // Unicode macro Store(Local0, Local2) if (LNotEqual(Local2, Local1)) { - err(arg0, z042, 8, 0, 0, Local5, arg2) + err(arg0, z042, __LINE__, 0, 0, Local5, arg2) return (1) } } case (9) { // EISAID macro Store(Local0, Local2) if (LNotEqual(Local2, Local1)) { - err(arg0, z042, 9, 0, 0, Local5, arg2) + err(arg0, z042, __LINE__, 0, 0, Local5, arg2) return (1) } } @@ -138,7 +138,7 @@ Method(ST00,, Serialized) Store(Store(0xabcdef12, Local0), Local1) if (LNotEqual(Local1, 0xabcdef12)) { - err(ts, z042, 10, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } // Integer arithmetic @@ -147,11 +147,11 @@ Method(ST00,, Serialized) Store(Add(0x12345678, 0x11111111, Local0), Local1) if (LNotEqual(Local1, 0x23456789)) { - err(ts, z042, 11, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } Store(Add(0x23456781, 0x11111111), Local0) if (LNotEqual(Local0, 0x34567892)) { - err(ts, z042, 12, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } Store(Add(0x12345678, 0xf0000000, Local0), Local1) @@ -161,38 +161,38 @@ Method(ST00,, Serialized) Store(Subtract(0x87654321, 0x11111111, Local0), Local1) if (LNotEqual(Local1, 0x76543210)) { - err(ts, z042, 13, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } Store(Subtract(0x72387654, 0x22221111), Local0) if (LNotEqual(Local0, 0x50166543)) { - err(ts, z042, 14, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } // Multiply Store(Multiply(0x12345, 0x7abc, Local0), Local1) if (LNotEqual(Local1, 0x8BA4C8AC)) { - err(ts, z042, 15, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } Store(Multiply(0x145ab, 0x3247), Local0) if (LNotEqual(Local0, 0x3FF5B86D)) { - err(ts, z042, 16, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } // Divide Store(Divide(0x12345678, 0x1000, Local0, Local1), Local2) if (LNotEqual(Local2, 0x12345)) { - err(ts, z042, 17, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } Store(Divide(0x7abc56e8, 0x1000, Local0), Local1) if (LNotEqual(Local1, 0x7ABC5)) { - err(ts, z042, 18, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } Store(Divide(0x55667788, 0x1000), Local0) if (LNotEqual(Local0, 0x55667)) { - err(ts, z042, 19, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } // Increment @@ -200,7 +200,7 @@ Method(ST00,, Serialized) Store(0x12345678, Local0) Store(Increment(Local0), Local1) if (LNotEqual(Local1, 0x12345679)) { - err(ts, z042, 20, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } // Decrement @@ -208,47 +208,47 @@ Method(ST00,, Serialized) Store(0x67812345, Local0) Store(Decrement(Local0), Local1) if (LNotEqual(Local1, 0x67812344)) { - err(ts, z042, 21, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } // And Store(And(0x87654321, 0xaaaaaaaa, Local0), Local1) if (LNotEqual(Local1, 0x82200220)) { - err(ts, z042, 22, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } Store(And(0x88aabbcc, 0xaaaaaaaa), Local0) if (LNotEqual(Local0, 0x88AAAA88)) { - err(ts, z042, 23, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } // FindSetLeftBit Store(FindSetLeftBit(0x0000f001, Local0), Local1) if (LNotEqual(Local1, 16)) { - err(ts, z042, 24, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } Store(FindSetLeftBit(0x09007001), Local0) if (LNotEqual(Local0, 28)) { - err(ts, z042, 25, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } // FindSetRightBit Store(FindSetRightBit(0x01080040, Local0), Local1) if (LNotEqual(Local1, 7)) { - err(ts, z042, 26, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } Store(FindSetRightBit(0x09800000), Local0) if (LNotEqual(Local0, 24)) { - err(ts, z042, 27, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } // Mod Store(Mod(0x1afb3c4d, 0x400000), Local0) if (LNotEqual(Local0, 0x3b3c4d)) { - err(ts, z042, 28, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } // ShiftLeft @@ -263,11 +263,11 @@ Method(ST00,, Serialized) Store(ShiftRight(0x87654321, 25, Local0), Local1) if (LNotEqual(Local1, 0x00000043)) { - err(ts, z042, 29, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } Store(ShiftRight(0x7654a0cb, 21), Local0) if (LNotEqual(Local0, 0x000003b2)) { - err(ts, z042, 30, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } // Nand @@ -298,22 +298,22 @@ Method(ST00,, Serialized) Store(Or(0x9a3533ac, 0x39a696ca, Local0), Local1) if (LNotEqual(Local1, 0xBBB7B7EE)) { - err(ts, z042, 31, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } Store(Or(0xca3533a9, 0xa9a696c3), Local0) if (LNotEqual(Local0, 0xEBB7B7EB)) { - err(ts, z042, 32, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } // Xor Store(Xor(0x9a365ac3, 0x39a96ca6, Local0), Local1) if (LNotEqual(Local1, 0xA39F3665)) { - err(ts, z042, 33, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } Store(Xor(0xa9365ac3, 0x93a96ca6), Local0) if (LNotEqual(Local0, 0x3A9F3665)) { - err(ts, z042, 34, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } // Logical operators @@ -334,7 +334,7 @@ Method(ST00,, Serialized) Store(Acquire(MT04, 0x0005), Local0) if (LNotEqual(Local0, Zero)) { - err(ts, z042, 35, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } // Release (None) @@ -343,11 +343,11 @@ Method(ST00,, Serialized) Store(ToInteger("0x89abcdef", Local0), Local1) if (LNotEqual(Local1, 0x89abcdef)) { - err(ts, z042, 36, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } Store(ToInteger("0x89abcdef"), Local0) if (LNotEqual(Local0, 0x89abcdef)) { - err(ts, z042, 37, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } // ToString @@ -356,20 +356,20 @@ Method(ST00,, Serialized) Store(ToString(Local2, Ones, Local0), Local1) if (LNotEqual(Local1, "\x01")) { - err(ts, z042, 38, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } Store(ToString(Local2, Ones), Local0) if (LNotEqual(Local0, "\x01")) { - err(ts, z042, 39, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } Store(ToString(Local2, 1, Local0), Local1) if (LNotEqual(Local1, "\x01")) { - err(ts, z042, 40, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } Store(ToString(Local2, 1), Local0) if (LNotEqual(Local0, "\x01")) { - err(ts, z042, 41, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } // ToBuffer @@ -378,11 +378,11 @@ Method(ST00,, Serialized) Store(ToBuffer(Local2, Local0), Local1) if (LNotEqual(Local1, Buffer(2){0x01, 0x00})) { - err(ts, z042, 42, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } Store(ToBuffer(Local2), Local0) if (LNotEqual(Local0, Buffer(2){0x01, 0x00})) { - err(ts, z042, 43, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } // ToDecimalString @@ -391,11 +391,11 @@ Method(ST00,, Serialized) Store(ToDecimalString(Local2, Local0), Local1) if (LNotEqual(Local1, "12")) { - err(ts, z042, 44, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } Store(ToDecimalString(Local2), Local0) if (LNotEqual(Local0, "12")) { - err(ts, z042, 45, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } // ToHexString @@ -404,11 +404,11 @@ Method(ST00,, Serialized) Store(ToHexString(Local2, Local0), Local1) if (LNotEqual(Local1, "EF")) { - err(ts, z042, 46, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } Store(ToHexString(Local2), Local0) if (LNotEqual(Local0, "EF")) { - err(ts, z042, 47, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } // ToBCD @@ -417,11 +417,11 @@ Method(ST00,, Serialized) Store(ToBCD(Local2, Local0), Local1) if (LNotEqual(Local1, 0x10)) { - err(ts, z042, 48, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } Store(ToBCD(Local2), Local0) if (LNotEqual(Local0, 0x10)) { - err(ts, z042, 49, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } // FromBCD @@ -430,11 +430,11 @@ Method(ST00,, Serialized) Store(FromBCD(Local2, Local0), Local1) if (LNotEqual(Local1, 10)) { - err(ts, z042, 50, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } Store(FromBCD(Local2), Local0) if (LNotEqual(Local0, 10)) { - err(ts, z042, 51, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } // Mid @@ -443,22 +443,22 @@ Method(ST00,, Serialized) Store(Mid(Local2, 1, 2, Local0), Local1) if (LNotEqual(Local1, "12")) { - err(ts, z042, 52, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } Store(Mid(Local2, 1, 2), Local0) if (LNotEqual(Local0, "12")) { - err(ts, z042, 53, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } Store(Buffer(){0, 1, 2, 3}, Local2) Store(Mid(Local2, 1, 2, Local0), Local1) if (LNotEqual(Local1, Buffer(){1, 2})) { - err(ts, z042, 54, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } Store(Mid(Local2, 1, 2), Local0) if (LNotEqual(Local0, Buffer(){1, 2})) { - err(ts, z042, 55, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } // Match @@ -467,7 +467,7 @@ Method(ST00,, Serialized) Store(Match(Local2, MTR, 0, MTR, 0, 0), Local0) if (LNotEqual(Local0, 0)) { - err(ts, z042, 56, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } // ConcatenateResTemplate @@ -480,14 +480,14 @@ Method(ST00,, Serialized) * 20.12.2005: 0 instead of 0x87 */ if (LNotEqual(Local1, Buffer(){0x79, 0})) { - err(ts, z042, 57, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } /* * 20.12.2005: 0 instead of 0x87 */ Store(ConcatenateResTemplate(Local2, Local3), Local0) if (LNotEqual(Local0, Buffer(){0x79, 0})) { - err(ts, z042, 58, 0, 0, 0, 0) + err(ts, z042, __LINE__, 0, 0, 0, 0) } } @@ -499,7 +499,7 @@ Method(m30d,, Serialized) Store("A", Index(str0, 10)) if (LNotEqual(str0, str1)) { - err("m30d", z042, 59, 0, 0, str0, str1) + err("m30d", z042, __LINE__, 0, 0, str0, str1) } } diff --git a/tests/aslts/src/runtime/collections/functional/manipulation/tobuffer.asl b/tests/aslts/src/runtime/collections/functional/manipulation/tobuffer.asl index 7bea8a24e..46422be6a 100644 --- a/tests/aslts/src/runtime/collections/functional/manipulation/tobuffer.asl +++ b/tests/aslts/src/runtime/collections/functional/manipulation/tobuffer.asl @@ -137,10 +137,10 @@ Name(p325, Package() Method(m320, 6) // ts, buffer, len, null, err, case { if (LNotequal(ObjectType(arg1), 3)) { - err(arg0, z043, arg3, 0, 0, arg2, "Type") + err(arg0, z043, __LINE__, 0, 0, arg2, "Type") } else { if (LNotEqual(Sizeof(arg1), Add(arg2, arg3))) { - err(arg0, z043, arg4, 0, 0, arg2, "Sizeof") + err(arg0, z043, __LINE__, 0, 0, arg2, "Sizeof") } else { m305(arg0, arg1, arg2, arg4, arg5) } @@ -179,7 +179,7 @@ Method(m321, 1, Serialized) // Verify obtained buffer with the benchmark one if (LNotEqual(Local3, Local5)) { - err(arg0, z043, 2, 0, 0, Local0, "NotEqual") + err(arg0, z043, __LINE__, 0, 0, Local0, "NotEqual") } // Check the source string was not corrupted @@ -220,7 +220,7 @@ Method(m322, 1, Serialized) ToBuffer(Local4, Local3) if (LNotEqual(Local3, Local4)) { - err(arg0, z043, 3, 0, 0, Local0, "NotEqual") + err(arg0, z043, __LINE__, 0, 0, Local0, "NotEqual") } // Check the buffers were not corrupted diff --git a/tests/aslts/src/runtime/collections/functional/manipulation/tointeger.asl b/tests/aslts/src/runtime/collections/functional/manipulation/tointeger.asl index 01d2f4e0a..cb72d7b5f 100644 --- a/tests/aslts/src/runtime/collections/functional/manipulation/tointeger.asl +++ b/tests/aslts/src/runtime/collections/functional/manipulation/tointeger.asl @@ -408,13 +408,13 @@ Method(TOI0,, Serialized) Store(0x123456789abcdefa, Local1) ToInteger(Local0, Local2) if (LNotEqual(Local2, Local1)) { - err(ts, z047, 4, 0, 0, Local0, 0) + err(ts, z047, __LINE__, 0, 0, Local0, 0) } Store("0x000123456789abcdefa", Local0) ToInteger(Local0, Local2) if (LNotEqual(Local2, Local1)) { - err(ts, z047, 5, 0, 0, Local0, 0) + err(ts, z047, __LINE__, 0, 0, Local0, 0) } } } diff --git a/tests/aslts/src/runtime/collections/functional/manipulation/tostring.asl b/tests/aslts/src/runtime/collections/functional/manipulation/tostring.asl index 94f1efcfd..56ab1d1c7 100644 --- a/tests/aslts/src/runtime/collections/functional/manipulation/tostring.asl +++ b/tests/aslts/src/runtime/collections/functional/manipulation/tostring.asl @@ -92,7 +92,7 @@ Method(m305, 5) // ts, string, len, err, case While (LLess(Local0, arg2)) { Mod(Add(Local0, 1), 256, Local1) if (LNotEqual(Derefof(Index(arg1, Local0)), Local1)) { - err(arg0, z048, arg3, 0, 0, Local0, arg4) + err(arg0, z048, __LINE__, 0, 0, Local0, arg4) } Increment(Local0) } @@ -102,10 +102,10 @@ Method(m305, 5) // ts, string, len, err, case Method(m307, 5) // ts, string, len, ts, err, case { if (LNotequal(ObjectType(arg1), 2)) { - err(arg0, z048, arg3, 0, 0, arg2, "Type") + err(arg0, z048, __LINE__, 0, 0, arg2, "Type") } else { if (LNotEqual(Sizeof(arg1), arg2)) { - err(arg0, z048, arg3, 0, 0, arg2, "Sizeof") + err(arg0, z048, __LINE__, 0, 0, arg2, "Sizeof") } else { m305(arg0, arg1, arg2, arg3, arg4) } @@ -121,7 +121,7 @@ Method(m309, 3) // ts, indbuf, err Store(0, Local0) While (LLess(Local0, 8)) { if (LNotEqual(Derefof(Index(Local1, Local0)), 0xff)) { - err(arg0, z048, arg2, 0, 0, Local0, "buf8") + err(arg0, z048, __LINE__, 0, 0, Local0, "buf8") } Increment(Local0) } diff --git a/tests/aslts/src/runtime/collections/functional/module/object.asl b/tests/aslts/src/runtime/collections/functional/module/object.asl index f2feb5c21..9cf963ec4 100644 --- a/tests/aslts/src/runtime/collections/functional/module/object.asl +++ b/tests/aslts/src/runtime/collections/functional/module/object.asl @@ -101,16 +101,16 @@ Method(MLO0,, Serialized) Store("TEST: MLO0, Type1Opcode is executable under objects", Debug) if (LNotEqual(ml10, 2)) { - err(ts, z181, 0, z181, 0, ml10, 2) + err(ts, z181, __LINE__, z181, 0, ml10, 2) } if (LNotEqual(ml11, 2)) { - err(ts, z181, 1, z181, 1, ml11, 2) + err(ts, z181, __LINE__, z181, 1, ml11, 2) } if (LNotEqual(ml12, 2)) { - err(ts, z181, 2, z181, 2, ml12, 2) + err(ts, z181, __LINE__, z181, 2, ml12, 2) } if (LNotEqual(ml13, 2)) { - err(ts, z181, 3, z181, 3, ml13, 2) + err(ts, z181, __LINE__, z181, 3, ml13, 2) } } @@ -166,15 +166,15 @@ Method(MLO1,, Serialized) Store("TEST: MLO1 Type2Opcode is executable under objects", Debug) if (LNotEqual(ml14, 2)) { - err(ts, z181, 4, z181, 4, ml14, 2) + err(ts, z181, __LINE__, z181, 4, ml14, 2) } if (LNotEqual(ml15, 2)) { - err(ts, z181, 5, z181, 5, ml15, 2) + err(ts, z181, __LINE__, z181, 5, ml15, 2) } if (LNotEqual(ml16, 2)) { - err(ts, z181, 6, z181, 6, ml16, 2) + err(ts, z181, __LINE__, z181, 6, ml16, 2) } if (LNotEqual(ml17, 2)) { - err(ts, z181, 7, z181, 7, ml17, 2) + err(ts, z181, __LINE__, z181, 7, ml17, 2) } } diff --git a/tests/aslts/src/runtime/collections/functional/module/order.asl b/tests/aslts/src/runtime/collections/functional/module/order.asl index 3e9f38476..1b5547191 100644 --- a/tests/aslts/src/runtime/collections/functional/module/order.asl +++ b/tests/aslts/src/runtime/collections/functional/module/order.asl @@ -58,6 +58,6 @@ Method(MLD0,, Serialized) Store("TEST: MLD0, Type2Opcode is executed right in place", Debug) if (LNotEqual(ml20, 1)) { - err(ts, z182, 6, z182, 6, ml20, 1) + err(ts, z182, __LINE__, z182, 6, ml20, 1) } } diff --git a/tests/aslts/src/runtime/collections/functional/module/scope.asl b/tests/aslts/src/runtime/collections/functional/module/scope.asl index ed3224daf..bbe0beb3e 100644 --- a/tests/aslts/src/runtime/collections/functional/module/scope.asl +++ b/tests/aslts/src/runtime/collections/functional/module/scope.asl @@ -80,13 +80,13 @@ Method(MLS0,, Serialized) Store("TEST: MLS0, Type1Opcode is executable under scopes", Debug) if (LNotEqual(ml00, 2)) { - err(ts, z180, 0, z180, 0, ml00, 2) + err(ts, z180, __LINE__, z180, 0, ml00, 2) } if (LNotEqual(ml01, 2)) { - err(ts, z180, 1, z180, 1, ml01, 2) + err(ts, z180, __LINE__, z180, 1, ml01, 2) } if (LNotEqual(ml02, 2)) { - err(ts, z180, 2, z180, 2, ml02, 2) + err(ts, z180, __LINE__, z180, 2, ml02, 2) } } @@ -122,12 +122,12 @@ Method(MLS1,, Serialized) Store("TEST: MLS1, Type2Opcode is executable under scopes", Debug) if (LNotEqual(ml03, 2)) { - err(ts, z180, 3, z180, 3, ml03, 2) + err(ts, z180, __LINE__, z180, 3, ml03, 2) } if (LNotEqual(ml04, 2)) { - err(ts, z180, 4, z180, 4, ml04, 2) + err(ts, z180, __LINE__, z180, 4, ml04, 2) } if (LNotEqual(ml05, 2)) { - err(ts, z180, 5, z180, 5, ml05, 2) + err(ts, z180, __LINE__, z180, 5, ml05, 2) } } diff --git a/tests/aslts/src/runtime/collections/functional/name/method.asl b/tests/aslts/src/runtime/collections/functional/name/method.asl index af41602f9..fcf072270 100644 --- a/tests/aslts/src/runtime/collections/functional/name/method.asl +++ b/tests/aslts/src/runtime/collections/functional/name/method.asl @@ -151,7 +151,7 @@ Method(m205, 4) Store(ObjectType(arg2), Local0) Store(ObjectType(arg3), Local1) if (LNotEqual(Local0, Local1)) { - err(Concatenate(arg0, "-OType"), z133, arg1, 0, 0, Local0, Local1) + err(Concatenate(arg0, "-OType"), z133, __LINE__, 0, 0, Local0, Local1) Return (1) } elseif (Derefof(Index(bz00, Local0))) { if (LNot(y119)) { @@ -163,7 +163,7 @@ Method(m205, 4) } } if (LNotEqual(arg2, arg3)) { - err(arg0, z133, arg1, 0, 0, arg2, arg3) + err(arg0, z133, __LINE__, 0, 0, arg2, arg3) Return (1) } } elseif (LEqual(Local0, 8)) { @@ -195,7 +195,7 @@ Method(m20a, 4) { Store(Sizeof(arg3), Local0) if (LNotEqual(Sizeof(arg2), Local0)) { - err(Concatenate(arg0, "-Size"), z133, arg1, 0, 0, Sizeof(arg2), Local0) + err(Concatenate(arg0, "-Size"), z133, __LINE__, 0, 0, Sizeof(arg2), Local0) Return (1) } While (Local0) { @@ -204,7 +204,7 @@ Method(m20a, 4) Store(ObjectType(Derefof(Index(arg3, Local0))), Local2) if (LNotEqual(Local1, Local2)) { // ObjectType is corrupted - err(Concatenate(arg0, "-OType"), z133, arg1, 0, 0, Local1, Local2) + err(Concatenate(arg0, "-OType"), z133, __LINE__, 0, 0, Local1, Local2) Return (1) } elseif (Derefof(Index(bz00, Local1))) { // the computational data type @@ -212,7 +212,7 @@ Method(m20a, 4) Derefof(Index(arg2, Local0)), Derefof(Index(arg3, Local0)))) { // The value is corrupted - err(arg0, z133, arg1, 0, 0, Derefof(Index(arg2, Local0)), Derefof(Index(arg3, Local0))) + err(arg0, z133, __LINE__, 0, 0, Derefof(Index(arg2, Local0)), Derefof(Index(arg3, Local0))) Return (1) } } diff --git a/tests/aslts/src/runtime/collections/functional/name/package.asl b/tests/aslts/src/runtime/collections/functional/name/package.asl index 952ecb1df..f17072e23 100644 --- a/tests/aslts/src/runtime/collections/functional/name/package.asl +++ b/tests/aslts/src/runtime/collections/functional/name/package.asl @@ -144,29 +144,29 @@ Method(m1f0,, Serialized) if (LLessEqual(Local1, 95)) { if (LNotEqual(Local2, Local3)) { - err(ts, z051, 0, 0, 0, Local2, Local3) + err(ts, z051, __LINE__, 0, 0, Local2, Local3) } } elseif (LLessEqual(Local1, 159)) { Add(0x8765ac00, Local4, Local3) if (LNotEqual(Local2, Local3)) { - err(ts, z051, 1, 0, 0, Local2, Local3) + err(ts, z051, __LINE__, 0, 0, Local2, Local3) } Add(Local4, Local6, Local4) } elseif (LLessEqual(Local1, 195)) { Add(0x8765acba11223300, Local5, Local3) if (LNotEqual(Local2, Local3)) { - err(ts, z051, 2, 0, 0, Local2, Local3) + err(ts, z051, __LINE__, 0, 0, Local2, Local3) } Add(Local5, Local6, Local5) } else { if (LNotEqual(Local2, Local3)) { - err(ts, z051, 3, 0, 0, Local2, Local3) + err(ts, z051, __LINE__, 0, 0, Local2, Local3) } } Store(ObjectType(Local2), Local3) if (LNotEqual(Local3, 1)) { - err(ts, z051, 4, 0, 0, Local3, 1) + err(ts, z051, __LINE__, 0, 0, Local3, 1) } Add(Local1, Local6, Local1) @@ -175,7 +175,7 @@ Method(m1f0,, Serialized) Store(SizeOf(p000), Local0) if (LNotEqual(Local0, 255)) { - err(ts, z051, 5, 0, 0, Local0, 255) + err(ts, z051, __LINE__, 0, 0, Local0, 255) } } @@ -206,12 +206,12 @@ Method(m1f1,, Serialized) } if (LNotEqual(Local4, Local3)) { - err(ts, z051, 6, 0, 0, Local4, Local3) + err(ts, z051, __LINE__, 0, 0, Local4, Local3) } Store(ObjectType(Local2), Local3) if (LNotEqual(Local3, 2)) { - err(ts, z051, 7, 0, 0, Local3, 2) + err(ts, z051, __LINE__, 0, 0, Local3, 2) } Increment(Local1) @@ -220,7 +220,7 @@ Method(m1f1,, Serialized) Store(SizeOf(p000), Local0) if (LNotEqual(Local0, 10)) { - err(ts, z051, 8, 0, 0, Local0, 10) + err(ts, z051, __LINE__, 0, 0, Local0, 10) } } @@ -331,12 +331,12 @@ Method(m1f2,, Serialized) Add(Local1, 1, Local4) if (LNotEqual(Local4, Local3)) { - err(ts, z051, 9, 0, 0, Local4, Local3) + err(ts, z051, __LINE__, 0, 0, Local4, Local3) } Store(ObjectType(Local2), Local3) if (LNotEqual(Local3, 3)) { - err(ts, z051, 10, 0, 0, Local3, 3) + err(ts, z051, __LINE__, 0, 0, Local3, 3) } Add(Local1, Local6, Local1) @@ -345,7 +345,7 @@ Method(m1f2,, Serialized) Store(SizeOf(p000), Local0) if (LNotEqual(Local0, 255)) { - err(ts, z051, 11, 0, 0, Local0, 255) + err(ts, z051, __LINE__, 0, 0, Local0, 255) } } @@ -460,12 +460,12 @@ Method(m1f3,, Serialized) Add(Local1, 1, Local4) if (LNotEqual(Local4, Local3)) { - err(ts, z051, 12, 0, 0, Local4, Local3) + err(ts, z051, __LINE__, 0, 0, Local4, Local3) } Store(ObjectType(Local2), Local3) if (LNotEqual(Local3, 4)) { - err(ts, z051, 13, 0, 0, Local3, 4) + err(ts, z051, __LINE__, 0, 0, Local3, 4) } Add(Local1, Local6, Local1) @@ -474,7 +474,7 @@ Method(m1f3,, Serialized) Store(SizeOf(p000), Local0) if (LNotEqual(Local0, 255)) { - err(ts, z051, 14, 0, 0, Local0, 255) + err(ts, z051, __LINE__, 0, 0, Local0, 255) } } @@ -548,7 +548,7 @@ Method(m1f5, 3, Serialized) Store(ObjectType(Local7), Local0) if (LNotEqual(Local0, n002)) { - err(arg0, z051, 15, 0, 0, Local0, n002) + err(arg0, z051, __LINE__, 0, 0, Local0, n002) } // Contents @@ -566,10 +566,10 @@ Method(m1f5, 3, Serialized) } if (LNotEqual(Local1, n004)) { - err(arg0, z051, 16, 0, 0, Local1, n004) + err(arg0, z051, __LINE__, 0, 0, Local1, n004) Store(1, Local6) } elseif (LNotEqual(Local7, Local0)) { - err(arg0, z051, 17, 0, 0, Local7, Local0) + err(arg0, z051, __LINE__, 0, 0, Local7, Local0) Store(1, Local6) } if (Local6) { @@ -991,12 +991,12 @@ Method(m1f6,, Serialized) Store(SizeOf(p000), Local0) if (LNotEqual(Local0, 255)) { - err(ts, z051, 18, 0, 0, Local0, 255) + err(ts, z051, __LINE__, 0, 0, Local0, 255) } Store(SizeOf(p001), Local0) if (LNotEqual(Local0, 29)) { - err(ts, z051, 19, 0, 0, Local0, 29) + err(ts, z051, __LINE__, 0, 0, Local0, 29) } } @@ -1057,7 +1057,7 @@ Method(m1f8, 3, Serialized) Store(Local1, Debug) } if (LNotEqual(Local1, Local0)) { - err(ts, z051, 20, 0, 0, Local1, Local0) + err(ts, z051, __LINE__, 0, 0, Local1, Local0) } Increment(Local0) Decrement(n000) @@ -1066,12 +1066,12 @@ Method(m1f8, 3, Serialized) Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, 4)) { - err(ts, z051, 21, 0, 0, Local0, 4) + err(ts, z051, __LINE__, 0, 0, Local0, 4) } Store(SizeOf(arg0), Local0) if (LNotEqual(Local0, arg1)) { - err(ts, z051, 22, 0, 0, Local0, arg1) + err(ts, z051, __LINE__, 0, 0, Local0, arg1) } } @@ -1133,7 +1133,7 @@ Method(m1fb, 3, Serialized) Store(Local1, Debug) } if (LNotEqual(Local1, Local0)) { - err(ts, z051, 23, 0, 0, Local1, Local0) + err(ts, z051, __LINE__, 0, 0, Local1, Local0) } Decrement(n000) Increment(ncur) @@ -1141,12 +1141,12 @@ Method(m1fb, 3, Serialized) Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, 4)) { - err(ts, z051, 24, 0, 0, Local0, 4) + err(ts, z051, __LINE__, 0, 0, Local0, 4) } Store(SizeOf(arg0), Local0) if (LNotEqual(Local0, arg1)) { - err(ts, z051, 25, 0, 0, Local0, arg1) + err(ts, z051, __LINE__, 0, 0, Local0, arg1) } } @@ -1211,7 +1211,7 @@ Method(m1fe, 3, Serialized) Store(Local1, Debug) } if (LNotEqual(Local1, Local0)) { - err(ts, z051, 26, 0, 0, 0, 0) + err(ts, z051, __LINE__, 0, 0, 0, 0) Store(Local0, Debug) Store(Local1, Debug) return (Ones) @@ -1222,12 +1222,12 @@ Method(m1fe, 3, Serialized) Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, 4)) { - err(ts, z051, 27, 0, 0, Local0, 4) + err(ts, z051, __LINE__, 0, 0, Local0, 4) } Store(SizeOf(arg0), Local0) if (LNotEqual(Local0, arg1)) { - err(ts, z051, 28, 0, 0, Local0, arg1) + err(ts, z051, __LINE__, 0, 0, Local0, arg1) } return (Zero) @@ -1302,7 +1302,7 @@ Method(m201, 3, Serialized) Store(DeRefOf(Index(arg0, ncur)), Local1) Store(ObjectType(Local1), Local0) if (LNotEqual(Local0, 4)) { - err(ts, z051, 29, 0, 0, Local0, 4) + err(ts, z051, __LINE__, 0, 0, Local0, 4) return (Ones) } Decrement(n000) @@ -1311,12 +1311,12 @@ Method(m201, 3, Serialized) Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, 4)) { - err(ts, z051, 30, 0, 0, Local0, 4) + err(ts, z051, __LINE__, 0, 0, Local0, 4) } Store(SizeOf(arg0), Local0) if (LNotEqual(Local0, arg1)) { - err(ts, z051, 31, 0, 0, Local0, arg1) + err(ts, z051, __LINE__, 0, 0, Local0, arg1) } return (Zero) } diff --git a/tests/aslts/src/runtime/collections/functional/reference/ref00.asl b/tests/aslts/src/runtime/collections/functional/reference/ref00.asl index 3fed87786..9c1586313 100644 --- a/tests/aslts/src/runtime/collections/functional/reference/ref00.asl +++ b/tests/aslts/src/runtime/collections/functional/reference/ref00.asl @@ -60,7 +60,7 @@ Method(m1a0, 4) Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, arg1)) { - err(c080, z076, 0, 0, 0, Local0, arg1) + err(c080, z076, __LINE__, 0, 0, Local0, arg1) } else { if (c089) { @@ -129,18 +129,18 @@ Method(m1a0, 4) Store(RefOf(arg0), Local0) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, arg1)) { - err(c080, z076, 1, 0, 0, Local1, arg1) + err(c080, z076, __LINE__, 0, 0, Local1, arg1) } else { Store(1, Local7) } } elseif (LEqual(c08b, 2)) { Store(CondRefOf(arg0, Local0), Local1) if (LNotEqual(Local1, Ones)) { - err(c080, z076, 2, 0, 0, Local1, arg1) + err(c080, z076, __LINE__, 0, 0, Local1, arg1) } else { Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, arg1)) { - err(c080, z076, 3, 0, 0, Local1, arg1) + err(c080, z076, __LINE__, 0, 0, Local1, arg1) } else { Store(1, Local7) } @@ -155,14 +155,14 @@ Method(m1a0, 4) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, arg1)) { - err(c080, z076, 4, 0, 0, Local1, arg1) + err(c080, z076, __LINE__, 0, 0, Local1, arg1) } else { // Check DerefOf Store(ObjectType(DerefOf(Local0)), Local1) if (LNotEqual(Local1, arg1)) { - err(c080, z076, 5, 0, 0, Local1, arg1) + err(c080, z076, __LINE__, 0, 0, Local1, arg1) } // Check that writing into M2-ArgX-RefOf_Reference @@ -171,9 +171,9 @@ Method(m1a0, 4) m002(Local0) Store(ObjectType(arg0), Local1) if (LNotEqual(Local1, c009)) { - err(c080, z076, 6, 0, 0, Local1, c009) + err(c080, z076, __LINE__, 0, 0, Local1, c009) } elseif (LNotEqual(arg0, 0xabcd001a)) { - err(c080, z076, 7, 0, 0, arg0, 0xabcd001a) + err(c080, z076, __LINE__, 0, 0, arg0, 0xabcd001a) } else { // Check that M1-LocalX-RefOf_Reference remains @@ -183,11 +183,11 @@ Method(m1a0, 4) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c009)) { - err(c080, z076, 8, 0, 0, Local1, c009) + err(c080, z076, __LINE__, 0, 0, Local1, c009) } else { Store(SizeOf(Local0), Local1) if (LNotEqual(Local1, ISZ0)) { - err(c080, z076, 9, 0, 0, Local1, ISZ0) + err(c080, z076, __LINE__, 0, 0, Local1, ISZ0) } } } @@ -220,7 +220,7 @@ Method(m1a2, 7, Serialized) Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, arg1)) { - err(c080, z076, 10, 0, 0, Local0, arg1) + err(c080, z076, __LINE__, 0, 0, Local0, arg1) } else { if (c089) { @@ -307,10 +307,10 @@ Method(m1a2, 7, Serialized) Store(ObjectType(Local2), Local0) if (LNotEqual(Local0, arg4)) { - err(c080, z076, 11, 0, 0, Local0, arg4) + err(c080, z076, __LINE__, 0, 0, Local0, arg4) } else { if (LNotEqual(Local2, arg5)) { - err(c080, z076, 12, 0, 0, Local2, arg5) + err(c080, z076, __LINE__, 0, 0, Local2, arg5) } } } /* if(c084) */ @@ -346,18 +346,18 @@ Method(m1a2, 7, Serialized) Store(RefOf(arg0), Local0) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, arg1)) { - err(c080, z076, 13, 0, 0, Local1, arg1) + err(c080, z076, __LINE__, 0, 0, Local1, arg1) } else { Store(1, Local7) } } elseif (LEqual(c08b, 2)) { Store(CondRefOf(arg0, Local0), Local1) if (LNotEqual(Local1, Ones)) { - err(c080, z076, 14, 0, 0, Local1, arg1) + err(c080, z076, __LINE__, 0, 0, Local1, arg1) } else { Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, arg1)) { - err(c080, z076, 15, 0, 0, Local1, arg1) + err(c080, z076, __LINE__, 0, 0, Local1, arg1) } else { Store(1, Local7) } @@ -372,14 +372,14 @@ Method(m1a2, 7, Serialized) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, arg1)) { - err(c080, z076, 16, 0, 0, Local1, arg1) + err(c080, z076, __LINE__, 0, 0, Local1, arg1) } else { // Check DerefOf Store(ObjectType(DerefOf(Local0)), Local1) if (LNotEqual(Local1, arg1)) { - err(c080, z076, 17, 0, 0, Local1, arg1) + err(c080, z076, __LINE__, 0, 0, Local1, arg1) } // Check that writing into M2-ArgX-RefOf_Reference @@ -388,9 +388,9 @@ Method(m1a2, 7, Serialized) m002(Local0) Store(ObjectType(arg0), Local1) if (LNotEqual(Local1, c009)) { - err(c080, z076, 18, 0, 0, Local1, c009) + err(c080, z076, __LINE__, 0, 0, Local1, c009) } elseif (LNotEqual(arg0, 0xabcd001a)) { - err(c080, z076, 19, 0, 0, arg0, 0xabcd001a) + err(c080, z076, __LINE__, 0, 0, arg0, 0xabcd001a) } else { // Check that M1-LocalX-RefOf_Reference remains @@ -400,11 +400,11 @@ Method(m1a2, 7, Serialized) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c009)) { - err(c080, z076, 20, 0, 0, Local1, c009) + err(c080, z076, __LINE__, 0, 0, Local1, c009) } else { Store(SizeOf(Local0), Local1) if (LNotEqual(Local1, ISZ0)) { - err(c080, z076, 21, 0, 0, Local1, ISZ0) + err(c080, z076, __LINE__, 0, 0, Local1, ISZ0) } } } @@ -430,10 +430,10 @@ Method(m1a4, 2) Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, c009)) { - err(c080, z076, 22, 0, 0, Local0, c009) + err(c080, z076, __LINE__, 0, 0, Local0, c009) Store(0, Local7) } elseif (LNotEqual(arg0, Ones)) { - err(c080, z076, 23, 0, 0, arg0, Ones) + err(c080, z076, __LINE__, 0, 0, arg0, Ones) Store(0, Local7) } diff --git a/tests/aslts/src/runtime/collections/functional/reference/ref01.asl b/tests/aslts/src/runtime/collections/functional/reference/ref01.asl index 44192d665..7abe6faf1 100644 --- a/tests/aslts/src/runtime/collections/functional/reference/ref01.asl +++ b/tests/aslts/src/runtime/collections/functional/reference/ref01.asl @@ -362,80 +362,80 @@ Method(m169,, Serialized) Store(ObjectType(i900), Local0) if (LNotEqual(Local0, c009)) { - err(c080, z077, 0x100, 0, 0, Local0, c009) + err(c080, z077, __LINE__, 0, 0, Local0, c009) } if (LNotEqual(i900, 0xfe7cb391d65a1000)) { - err(c080, z077, 0x101, 0, 0, i900, 0xfe7cb391d65a1000) + err(c080, z077, __LINE__, 0, 0, i900, 0xfe7cb391d65a1000) } Store(ObjectType(i901), Local0) if (LNotEqual(Local0, c009)) { - err(c080, z077, 0x102, 0, 0, Local0, c009) + err(c080, z077, __LINE__, 0, 0, Local0, c009) } if (LNotEqual(i901, 0xc1791001)) { - err(c080, z077, 0x103, 0, 0, i901, 0xc1791001) + err(c080, z077, __LINE__, 0, 0, i901, 0xc1791001) } Store(ObjectType(i902), Local0) if (LNotEqual(Local0, c009)) { - err(c080, z077, 0x104, 0, 0, Local0, c009) + err(c080, z077, __LINE__, 0, 0, Local0, c009) } if (LNotEqual(i902, 0)) { - err(c080, z077, 0x105, 0, 0, i902, 0) + err(c080, z077, __LINE__, 0, 0, i902, 0) } Store(ObjectType(i903), Local0) if (LNotEqual(Local0, c009)) { - err(c080, z077, 0x106, 0, 0, Local0, c009) + err(c080, z077, __LINE__, 0, 0, Local0, c009) } if (LNotEqual(i903, 0xffffffffffffffff)) { - err(c080, z077, 0x107, 0, 0, i903, 0xffffffffffffffff) + err(c080, z077, __LINE__, 0, 0, i903, 0xffffffffffffffff) } Store(ObjectType(i904), Local0) if (LNotEqual(Local0, c009)) { - err(c080, z077, 0x108, 0, 0, Local0, c009) + err(c080, z077, __LINE__, 0, 0, Local0, c009) } if (LNotEqual(i904, 0xffffffff)) { - err(c080, z077, 0x109, 0, 0, i904, 0xffffffff) + err(c080, z077, __LINE__, 0, 0, i904, 0xffffffff) } // String Store(ObjectType(s900), Local0) if (LNotEqual(Local0, c00a)) { - err(c080, z077, 0x10a, 0, 0, Local0, c00a) + err(c080, z077, __LINE__, 0, 0, Local0, c00a) } if (LNotEqual(s900, "12341002")) { - err(c080, z077, 0x10b, 0, 0, s900, "12341002") + err(c080, z077, __LINE__, 0, 0, s900, "12341002") } Store(ObjectType(s901), Local0) if (LNotEqual(Local0, c00a)) { - err(c080, z077, 0x10c, 0, 0, Local0, c00a) + err(c080, z077, __LINE__, 0, 0, Local0, c00a) } if (LNotEqual(s901, "qwrtyu1003")) { - err(c080, z077, 0x10d, 0, 0, s901, "qwrtyu1003") + err(c080, z077, __LINE__, 0, 0, s901, "qwrtyu1003") } // Buffer Store(ObjectType(b900), Local0) if (LNotEqual(Local0, c00b)) { - err(c080, z077, 0x10e, 0, 0, Local0, c00b) + err(c080, z077, __LINE__, 0, 0, Local0, c00b) } if (LNotEqual(b900, Buffer() {0x10,0x11,0x12,0x13,0x14})) { - err(c080, z077, 0x10f, 0, 0, b900, Buffer() {0x10,0x11,0x12,0x13,0x14}) + err(c080, z077, __LINE__, 0, 0, b900, Buffer() {0x10,0x11,0x12,0x13,0x14}) } // Buffer Field Store(ObjectType(bf90), Local0) if (LNotEqual(Local0, c016)) { - err(c080, z077, 0x110, 0, 0, Local0, c016) + err(c080, z077, __LINE__, 0, 0, Local0, c016) } if (LNotEqual(bf90, 0x10)) { - err(c080, z077, 0x111, 0, 0, bf90, 0x10) + err(c080, z077, __LINE__, 0, 0, bf90, 0x10) } // One level Package @@ -443,87 +443,87 @@ Method(m169,, Serialized) Store(Index(p900, 0), Local0) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c008)) { - err(c080, z077, 0x112, 0, 0, Local1, c008) + err(c080, z077, __LINE__, 0, 0, Local1, c008) } Store(Index(p901, 0), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c009)) { - err(c080, z077, 0x113, 0, 0, Local2, c009) + err(c080, z077, __LINE__, 0, 0, Local2, c009) } if (LNotEqual(Local1, 0xabcd1004)) { - err(c080, z077, 0x114, 0, 0, Local1, 0xabcd1004) + err(c080, z077, __LINE__, 0, 0, Local1, 0xabcd1004) } Store(Index(p901, 1), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c009)) { - err(c080, z077, 0x115, 0, 0, Local2, c009) + err(c080, z077, __LINE__, 0, 0, Local2, c009) } if (LNotEqual(Local1, 0x1122334455661005)) { - err(c080, z077, 0x116, 0, 0, Local1, 0x1122334455661005) + err(c080, z077, __LINE__, 0, 0, Local1, 0x1122334455661005) } Store(Index(p902, 0), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00a)) { - err(c080, z077, 0x117, 0, 0, Local2, c00a) + err(c080, z077, __LINE__, 0, 0, Local2, c00a) } if (LNotEqual(Local1, "12341006")) { - err(c080, z077, 0x118, 0, 0, Local1, "12341006") + err(c080, z077, __LINE__, 0, 0, Local1, "12341006") } Store(Index(p902, 1), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00a)) { - err(c080, z077, 0x119, 0, 0, Local2, c00a) + err(c080, z077, __LINE__, 0, 0, Local2, c00a) } if (LNotEqual(Local1, "q1w2e3r4t5y6u7i81007")) { - err(c080, z077, 0x11a, 0, 0, Local1, "q1w2e3r4t5y6u7i81007") + err(c080, z077, __LINE__, 0, 0, Local1, "q1w2e3r4t5y6u7i81007") } Store(Index(p903, 0), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00a)) { - err(c080, z077, 0x11b, 0, 0, Local2, c00a) + err(c080, z077, __LINE__, 0, 0, Local2, c00a) } if (LNotEqual(Local1, "qwrtyuiop1008")) { - err(c080, z077, 0x11c, 0, 0, Local1, "qwrtyuiop1008") + err(c080, z077, __LINE__, 0, 0, Local1, "qwrtyuiop1008") } Store(Index(p903, 1), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00a)) { - err(c080, z077, 0x11d, 0, 0, Local2, c00a) + err(c080, z077, __LINE__, 0, 0, Local2, c00a) } if (LNotEqual(Local1, "1234567890abdef0251009")) { - err(c080, z077, 0x11e, 0, 0, Local1, "1234567890abdef0251009") + err(c080, z077, __LINE__, 0, 0, Local1, "1234567890abdef0251009") } Store(Index(p904, 0), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00b)) { - err(c080, z077, 0x11f, 0, 0, Local2, c00b) + err(c080, z077, __LINE__, 0, 0, Local2, c00b) } if (LNotEqual(Local1, Buffer() {0xa0,0xa1,0xa2})) { - err(c080, z077, 0x120, 0, 0, Local1, Buffer() {0xa0,0xa1,0xa2}) + err(c080, z077, __LINE__, 0, 0, Local1, Buffer() {0xa0,0xa1,0xa2}) } Store(Index(p904, 1), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00b)) { - err(c080, z077, 0x121, 0, 0, Local2, c00b) + err(c080, z077, __LINE__, 0, 0, Local2, c00b) } if (LNotEqual(Local1, Buffer() {0xa3,0xa4})) { - err(c080, z077, 0x122, 0, 0, Local1, Buffer() {0xa3,0xa4}) + err(c080, z077, __LINE__, 0, 0, Local1, Buffer() {0xa3,0xa4}) } // Two level Package @@ -534,10 +534,10 @@ Method(m169,, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c009)) { - err(c080, z077, 0x123, 0, 0, Local4, c009) + err(c080, z077, __LINE__, 0, 0, Local4, c009) } if (LNotEqual(Local3, 0xabc100a)) { - err(c080, z077, 0x124, 0, 0, Local3, 0xabc100a) + err(c080, z077, __LINE__, 0, 0, Local3, 0xabc100a) } Store(Index(p905, 0), Local0) @@ -546,10 +546,10 @@ Method(m169,, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c00a)) { - err(c080, z077, 0x125, 0, 0, Local4, c00a) + err(c080, z077, __LINE__, 0, 0, Local4, c00a) } if (LNotEqual(Local3, "0xabc100b")) { - err(c080, z077, 0x126, 0, 0, Local3, "0xabc100b") + err(c080, z077, __LINE__, 0, 0, Local3, "0xabc100b") } Store(Index(p905, 0), Local0) @@ -558,10 +558,10 @@ Method(m169,, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c00a)) { - err(c080, z077, 0x127, 0, 0, Local4, c00a) + err(c080, z077, __LINE__, 0, 0, Local4, c00a) } if (LNotEqual(Local3, "abc100c")) { - err(c080, z077, 0x128, 0, 0, Local3, "abc100c") + err(c080, z077, __LINE__, 0, 0, Local3, "abc100c") } Store(Index(p906, 0), Local0) @@ -570,10 +570,10 @@ Method(m169,, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c00a)) { - err(c080, z077, 0x129, 0, 0, Local4, c00a) + err(c080, z077, __LINE__, 0, 0, Local4, c00a) } if (LNotEqual(Local3, "abc100d")) { - err(c080, z077, 0x12a, 0, 0, Local3, "abc100d") + err(c080, z077, __LINE__, 0, 0, Local3, "abc100d") } Store(Index(p907, 0), Local0) @@ -582,10 +582,10 @@ Method(m169,, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c00a)) { - err(c080, z077, 0x12b, 0, 0, Local4, c00a) + err(c080, z077, __LINE__, 0, 0, Local4, c00a) } if (LNotEqual(Local3, "aqwevbgnm100e")) { - err(c080, z077, 0x12c, 0, 0, Local3, "aqwevbgnm100e") + err(c080, z077, __LINE__, 0, 0, Local3, "aqwevbgnm100e") } Store(Index(p908, 0), Local0) @@ -594,10 +594,10 @@ Method(m169,, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c00b)) { - err(c080, z077, 0x12d, 0, 0, Local4, c00b) + err(c080, z077, __LINE__, 0, 0, Local4, c00b) } if (LNotEqual(Local3, Buffer() {0xa5,0xa6,0xa7,0xa8,0xa9})) { - err(c080, z077, 0x12e, 0, 0, Local3, Buffer() {0xa5,0xa6,0xa7,0xa8,0xa9}) + err(c080, z077, __LINE__, 0, 0, Local3, Buffer() {0xa5,0xa6,0xa7,0xa8,0xa9}) } // Three level Package @@ -610,10 +610,10 @@ Method(m169,, Serialized) Store(DerefOf(Local4), Local5) Store(ObjectType(Local5), Local6) if (LNotEqual(Local6, c009)) { - err(c080, z077, 0x12f, 0, 0, Local6, c009) + err(c080, z077, __LINE__, 0, 0, Local6, c009) } if (LNotEqual(Local5, 0xabc100f)) { - err(c080, z077, 0x130, 0, 0, Local5, 0xabc100f) + err(c080, z077, __LINE__, 0, 0, Local5, 0xabc100f) } Store(Index(p90a, 0), Local0) @@ -624,10 +624,10 @@ Method(m169,, Serialized) Store(DerefOf(Local4), Local5) Store(ObjectType(Local5), Local6) if (LNotEqual(Local6, c00a)) { - err(c080, z077, 0x131, 0, 0, Local6, c00a) + err(c080, z077, __LINE__, 0, 0, Local6, c00a) } if (LNotEqual(Local5, "12341010")) { - err(c080, z077, 0x132, 0, 0, Local5, "12341010") + err(c080, z077, __LINE__, 0, 0, Local5, "12341010") } Store(Index(p90b, 0), Local0) @@ -638,10 +638,10 @@ Method(m169,, Serialized) Store(DerefOf(Local4), Local5) Store(ObjectType(Local5), Local6) if (LNotEqual(Local6, c00a)) { - err(c080, z077, 0x133, 0, 0, Local6, c00a) + err(c080, z077, __LINE__, 0, 0, Local6, c00a) } if (LNotEqual(Local5, "zxswefas1011")) { - err(c080, z077, 0x134, 0, 0, Local5, "zxswefas1011") + err(c080, z077, __LINE__, 0, 0, Local5, "zxswefas1011") } Store(Index(p90c, 0), Local0) @@ -652,30 +652,30 @@ Method(m169,, Serialized) Store(DerefOf(Local4), Local5) Store(ObjectType(Local5), Local6) if (LNotEqual(Local6, c00b)) { - err(c080, z077, 0x135, 0, 0, Local6, c00b) + err(c080, z077, __LINE__, 0, 0, Local6, c00b) } if (LNotEqual(Local5, Buffer() {0xaa,0xab,0xac})) { - err(c080, z077, 0x136, 0, 0, Local5, Buffer() {0xaa,0xab,0xac}) + err(c080, z077, __LINE__, 0, 0, Local5, Buffer() {0xaa,0xab,0xac}) } Store(Index(p953, 0), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c009)) { - err(c080, z077, 0x137, 0, 0, Local2, c009) + err(c080, z077, __LINE__, 0, 0, Local2, c009) } if (LNotEqual(Local1, 0xabcd1018)) { - err(c080, z077, 0x138, 0, 0, Local1, 0xabcd1018) + err(c080, z077, __LINE__, 0, 0, Local1, 0xabcd1018) } Store(Index(p953, 1), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c009)) { - err(c080, z077, 0x139, 0, 0, Local2, c009) + err(c080, z077, __LINE__, 0, 0, Local2, c009) } if (LNotEqual(Local1, 0xabcd1019)) { - err(c080, z077, 0x13a, 0, 0, Local1, 0xabcd1019) + err(c080, z077, __LINE__, 0, 0, Local1, 0xabcd1019) } // Not Computational Data @@ -694,13 +694,13 @@ Method(m169,, Serialized) * // Field Unit (Field) * * if (LNotEqual(f900, 0xd7)) { - * err(c080, z077, 0x137, 0, 0, f900, 0xd7) + * err(c080, z077, __LINE__, 0, 0, f900, 0xd7) * } * * // Field Unit (IndexField) * * if (LNotEqual(if90, 0xd7)) { - * err(c080, z077, 0x138, 0, 0, if90, 0xd7) + * err(c080, z077, __LINE__, 0, 0, if90, 0xd7) * } */ } /* m000 */ @@ -1609,80 +1609,80 @@ Method(m16a, 1, Serialized) Store(ObjectType(i900), Local0) if (LNotEqual(Local0, c009)) { - err(c080, z077, 0x100, 0, 0, Local0, c009) + err(c080, z077, __LINE__, 0, 0, Local0, c009) } if (LNotEqual(i900, 0xfe7cb391d65a2000)) { - err(c080, z077, 0x101, 0, 0, i900, 0xfe7cb391d65a2000) + err(c080, z077, __LINE__, 0, 0, i900, 0xfe7cb391d65a2000) } Store(ObjectType(i901), Local0) if (LNotEqual(Local0, c009)) { - err(c080, z077, 0x102, 0, 0, Local0, c009) + err(c080, z077, __LINE__, 0, 0, Local0, c009) } if (LNotEqual(i901, 0xc1792001)) { - err(c080, z077, 0x103, 0, 0, i901, 0xc1792001) + err(c080, z077, __LINE__, 0, 0, i901, 0xc1792001) } Store(ObjectType(i902), Local0) if (LNotEqual(Local0, c009)) { - err(c080, z077, 0x104, 0, 0, Local0, c009) + err(c080, z077, __LINE__, 0, 0, Local0, c009) } if (LNotEqual(i902, 0)) { - err(c080, z077, 0x105, 0, 0, i902, 0) + err(c080, z077, __LINE__, 0, 0, i902, 0) } Store(ObjectType(i903), Local0) if (LNotEqual(Local0, c009)) { - err(c080, z077, 0x106, 0, 0, Local0, c009) + err(c080, z077, __LINE__, 0, 0, Local0, c009) } if (LNotEqual(i903, 0xffffffffffffffff)) { - err(c080, z077, 0x107, 0, 0, i903, 0xffffffffffffffff) + err(c080, z077, __LINE__, 0, 0, i903, 0xffffffffffffffff) } Store(ObjectType(i904), Local0) if (LNotEqual(Local0, c009)) { - err(c080, z077, 0x108, 0, 0, Local0, c009) + err(c080, z077, __LINE__, 0, 0, Local0, c009) } if (LNotEqual(i904, 0xffffffff)) { - err(c080, z077, 0x109, 0, 0, i904, 0xffffffff) + err(c080, z077, __LINE__, 0, 0, i904, 0xffffffff) } // String Store(ObjectType(s900), Local0) if (LNotEqual(Local0, c00a)) { - err(c080, z077, 0x10a, 0, 0, Local0, c00a) + err(c080, z077, __LINE__, 0, 0, Local0, c00a) } if (LNotEqual(s900, "12342002")) { - err(c080, z077, 0x10b, 0, 0, s900, "12342002") + err(c080, z077, __LINE__, 0, 0, s900, "12342002") } Store(ObjectType(s901), Local0) if (LNotEqual(Local0, c00a)) { - err(c080, z077, 0x10c, 0, 0, Local0, c00a) + err(c080, z077, __LINE__, 0, 0, Local0, c00a) } if (LNotEqual(s901, "qwrtyu2003")) { - err(c080, z077, 0x10d, 0, 0, s901, "qwrtyu2003") + err(c080, z077, __LINE__, 0, 0, s901, "qwrtyu2003") } // Buffer Store(ObjectType(b900), Local0) if (LNotEqual(Local0, c00b)) { - err(c080, z077, 0x10e, 0, 0, Local0, c00b) + err(c080, z077, __LINE__, 0, 0, Local0, c00b) } if (LNotEqual(b900, Buffer() {0xc0,0xc1,0xc2,0xc3,0xc4})) { - err(c080, z077, 0x10f, 0, 0, b900, Buffer() {0xc0,0xc1,0xc2,0xc3,0xc4}) + err(c080, z077, __LINE__, 0, 0, b900, Buffer() {0xc0,0xc1,0xc2,0xc3,0xc4}) } // Buffer Field Store(ObjectType(bf90), Local0) if (LNotEqual(Local0, c016)) { - err(c080, z077, 0x110, 0, 0, Local0, c016) + err(c080, z077, __LINE__, 0, 0, Local0, c016) } if (LNotEqual(bf90, 0xc0)) { - err(c080, z077, 0x111, 0, 0, bf90, 0xc0) + err(c080, z077, __LINE__, 0, 0, bf90, 0xc0) } // One level Package @@ -1690,87 +1690,87 @@ Method(m16a, 1, Serialized) Store(Index(p900, 0), Local0) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c008)) { - err(c080, z077, 0x112, 0, 0, Local1, c008) + err(c080, z077, __LINE__, 0, 0, Local1, c008) } Store(Index(p901, 0), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c009)) { - err(c080, z077, 0x113, 0, 0, Local2, c009) + err(c080, z077, __LINE__, 0, 0, Local2, c009) } if (LNotEqual(Local1, 0xabcd2004)) { - err(c080, z077, 0x114, 0, 0, Local1, 0xabcd2004) + err(c080, z077, __LINE__, 0, 0, Local1, 0xabcd2004) } Store(Index(p901, 1), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c009)) { - err(c080, z077, 0x115, 0, 0, Local2, c009) + err(c080, z077, __LINE__, 0, 0, Local2, c009) } if (LNotEqual(Local1, 0x1122334455662005)) { - err(c080, z077, 0x116, 0, 0, Local1, 0x1122334455662005) + err(c080, z077, __LINE__, 0, 0, Local1, 0x1122334455662005) } Store(Index(p902, 0), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00a)) { - err(c080, z077, 0x117, 0, 0, Local2, c00a) + err(c080, z077, __LINE__, 0, 0, Local2, c00a) } if (LNotEqual(Local1, "12342006")) { - err(c080, z077, 0x118, 0, 0, Local1, "12342006") + err(c080, z077, __LINE__, 0, 0, Local1, "12342006") } Store(Index(p902, 1), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00a)) { - err(c080, z077, 0x119, 0, 0, Local2, c00a) + err(c080, z077, __LINE__, 0, 0, Local2, c00a) } if (LNotEqual(Local1, "q1w2e3r4t5y6u7i82007")) { - err(c080, z077, 0x11a, 0, 0, Local1, "q1w2e3r4t5y6u7i82007") + err(c080, z077, __LINE__, 0, 0, Local1, "q1w2e3r4t5y6u7i82007") } Store(Index(p903, 0), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00a)) { - err(c080, z077, 0x11b, 0, 0, Local2, c00a) + err(c080, z077, __LINE__, 0, 0, Local2, c00a) } if (LNotEqual(Local1, "qwrtyuiop2008")) { - err(c080, z077, 0x11c, 0, 0, Local1, "qwrtyuiop2008") + err(c080, z077, __LINE__, 0, 0, Local1, "qwrtyuiop2008") } Store(Index(p903, 1), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00a)) { - err(c080, z077, 0x11d, 0, 0, Local2, c00a) + err(c080, z077, __LINE__, 0, 0, Local2, c00a) } if (LNotEqual(Local1, "1234567890abdef0252009")) { - err(c080, z077, 0x11e, 0, 0, Local1, "1234567890abdef0252009") + err(c080, z077, __LINE__, 0, 0, Local1, "1234567890abdef0252009") } Store(Index(p904, 0), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00b)) { - err(c080, z077, 0x11f, 0, 0, Local2, c00b) + err(c080, z077, __LINE__, 0, 0, Local2, c00b) } if (LNotEqual(Local1, Buffer() {0xc5,0xc6,0xc7})) { - err(c080, z077, 0x120, 0, 0, Local1, Buffer() {0xc5,0xc6,0xc7}) + err(c080, z077, __LINE__, 0, 0, Local1, Buffer() {0xc5,0xc6,0xc7}) } Store(Index(p904, 1), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00b)) { - err(c080, z077, 0x121, 0, 0, Local2, c00b) + err(c080, z077, __LINE__, 0, 0, Local2, c00b) } if (LNotEqual(Local1, Buffer() {0xc8,0xc9})) { - err(c080, z077, 0x122, 0, 0, Local1, Buffer() {0xc8,0xc9}) + err(c080, z077, __LINE__, 0, 0, Local1, Buffer() {0xc8,0xc9}) } // Two level Package @@ -1781,10 +1781,10 @@ Method(m16a, 1, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c009)) { - err(c080, z077, 0x123, 0, 0, Local4, c009) + err(c080, z077, __LINE__, 0, 0, Local4, c009) } if (LNotEqual(Local3, 0xabc200a)) { - err(c080, z077, 0x124, 0, 0, Local3, 0xabc200a) + err(c080, z077, __LINE__, 0, 0, Local3, 0xabc200a) } Store(Index(p905, 0), Local0) @@ -1793,10 +1793,10 @@ Method(m16a, 1, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c00a)) { - err(c080, z077, 0x125, 0, 0, Local4, c00a) + err(c080, z077, __LINE__, 0, 0, Local4, c00a) } if (LNotEqual(Local3, "0xabc200b")) { - err(c080, z077, 0x126, 0, 0, Local3, "0xabc200b") + err(c080, z077, __LINE__, 0, 0, Local3, "0xabc200b") } Store(Index(p905, 0), Local0) @@ -1805,10 +1805,10 @@ Method(m16a, 1, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c00a)) { - err(c080, z077, 0x127, 0, 0, Local4, c00a) + err(c080, z077, __LINE__, 0, 0, Local4, c00a) } if (LNotEqual(Local3, "abc200c")) { - err(c080, z077, 0x128, 0, 0, Local3, "abc200c") + err(c080, z077, __LINE__, 0, 0, Local3, "abc200c") } Store(Index(p906, 0), Local0) @@ -1817,10 +1817,10 @@ Method(m16a, 1, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c00a)) { - err(c080, z077, 0x129, 0, 0, Local4, c00a) + err(c080, z077, __LINE__, 0, 0, Local4, c00a) } if (LNotEqual(Local3, "abc200d")) { - err(c080, z077, 0x12a, 0, 0, Local3, "abc200d") + err(c080, z077, __LINE__, 0, 0, Local3, "abc200d") } Store(Index(p907, 0), Local0) @@ -1829,10 +1829,10 @@ Method(m16a, 1, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c00a)) { - err(c080, z077, 0x12b, 0, 0, Local4, c00a) + err(c080, z077, __LINE__, 0, 0, Local4, c00a) } if (LNotEqual(Local3, "aqwevbgnm200e")) { - err(c080, z077, 0x12c, 0, 0, Local3, "aqwevbgnm200e") + err(c080, z077, __LINE__, 0, 0, Local3, "aqwevbgnm200e") } Store(Index(p908, 0), Local0) @@ -1841,10 +1841,10 @@ Method(m16a, 1, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c00b)) { - err(c080, z077, 0x12d, 0, 0, Local4, c00b) + err(c080, z077, __LINE__, 0, 0, Local4, c00b) } if (LNotEqual(Local3, Buffer() {0xca,0xcb,0xcc,0xcd,0xce})) { - err(c080, z077, 0x12e, 0, 0, Local3, Buffer() {0xca,0xcb,0xcc,0xcd,0xce}) + err(c080, z077, __LINE__, 0, 0, Local3, Buffer() {0xca,0xcb,0xcc,0xcd,0xce}) } // Three level Package @@ -1857,10 +1857,10 @@ Method(m16a, 1, Serialized) Store(DerefOf(Local4), Local5) Store(ObjectType(Local5), Local6) if (LNotEqual(Local6, c009)) { - err(c080, z077, 0x12f, 0, 0, Local6, c009) + err(c080, z077, __LINE__, 0, 0, Local6, c009) } if (LNotEqual(Local5, 0xabc200f)) { - err(c080, z077, 0x130, 0, 0, Local5, 0xabc200f) + err(c080, z077, __LINE__, 0, 0, Local5, 0xabc200f) } Store(Index(p90a, 0), Local0) @@ -1871,10 +1871,10 @@ Method(m16a, 1, Serialized) Store(DerefOf(Local4), Local5) Store(ObjectType(Local5), Local6) if (LNotEqual(Local6, c00a)) { - err(c080, z077, 0x131, 0, 0, Local6, c00a) + err(c080, z077, __LINE__, 0, 0, Local6, c00a) } if (LNotEqual(Local5, "12342010")) { - err(c080, z077, 0x132, 0, 0, Local5, "12342010") + err(c080, z077, __LINE__, 0, 0, Local5, "12342010") } Store(Index(p90b, 0), Local0) @@ -1885,10 +1885,10 @@ Method(m16a, 1, Serialized) Store(DerefOf(Local4), Local5) Store(ObjectType(Local5), Local6) if (LNotEqual(Local6, c00a)) { - err(c080, z077, 0x133, 0, 0, Local6, c00a) + err(c080, z077, __LINE__, 0, 0, Local6, c00a) } if (LNotEqual(Local5, "zxswefas2011")) { - err(c080, z077, 0x134, 0, 0, Local5, "zxswefas2011") + err(c080, z077, __LINE__, 0, 0, Local5, "zxswefas2011") } Store(Index(p90c, 0), Local0) @@ -1899,30 +1899,30 @@ Method(m16a, 1, Serialized) Store(DerefOf(Local4), Local5) Store(ObjectType(Local5), Local6) if (LNotEqual(Local6, c00b)) { - err(c080, z077, 0x135, 0, 0, Local6, c00b) + err(c080, z077, __LINE__, 0, 0, Local6, c00b) } if (LNotEqual(Local5, Buffer() {0xcf,0xd0,0xd1})) { - err(c080, z077, 0x136, 0, 0, Local5, Buffer() {0xcf,0xd0,0xd1}) + err(c080, z077, __LINE__, 0, 0, Local5, Buffer() {0xcf,0xd0,0xd1}) } Store(Index(p953, 0), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c009)) { - err(c080, z077, 0x137, 0, 0, Local2, c009) + err(c080, z077, __LINE__, 0, 0, Local2, c009) } if (LNotEqual(Local1, 0xabcd2018)) { - err(c080, z077, 0x138, 0, 0, Local1, 0xabcd2018) + err(c080, z077, __LINE__, 0, 0, Local1, 0xabcd2018) } Store(Index(p953, 1), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c009)) { - err(c080, z077, 0x139, 0, 0, Local2, c009) + err(c080, z077, __LINE__, 0, 0, Local2, c009) } if (LNotEqual(Local1, 0xabcd2019)) { - err(c080, z077, 0x13a, 0, 0, Local1, 0xabcd2019) + err(c080, z077, __LINE__, 0, 0, Local1, 0xabcd2019) } // Not Computational Data @@ -1941,13 +1941,13 @@ Method(m16a, 1, Serialized) * // Field Unit (Field) * * if (LNotEqual(f900, 0xd7)) { - * err(c080, z077, 0x137, 0, 0, f900, 0xd7) + * err(c080, z077, __LINE__, 0, 0, f900, 0xd7) * } * * // Field Unit (IndexField) * * if (LNotEqual(if90, 0xd7)) { - * err(c080, z077, 0x138, 0, 0, if90, 0xd7) + * err(c080, z077, __LINE__, 0, 0, if90, 0xd7) * } */ } /* m000 */ @@ -2728,80 +2728,80 @@ Method(m16b,, Serialized) Store(ObjectType(i900), Local0) if (LNotEqual(Local0, c009)) { - err(c080, z077, 0x100, 0, 0, Local0, c009) + err(c080, z077, __LINE__, 0, 0, Local0, c009) } if (LNotEqual(i900, 0xfe7cb391d65a3000)) { - err(c080, z077, 0x101, 0, 0, i900, 0xfe7cb391d65a3000) + err(c080, z077, __LINE__, 0, 0, i900, 0xfe7cb391d65a3000) } Store(ObjectType(i901), Local0) if (LNotEqual(Local0, c009)) { - err(c080, z077, 0x102, 0, 0, Local0, c009) + err(c080, z077, __LINE__, 0, 0, Local0, c009) } if (LNotEqual(i901, 0x21793001)) { - err(c080, z077, 0x103, 0, 0, i901, 0x21793001) + err(c080, z077, __LINE__, 0, 0, i901, 0x21793001) } Store(ObjectType(i902), Local0) if (LNotEqual(Local0, c009)) { - err(c080, z077, 0x104, 0, 0, Local0, c009) + err(c080, z077, __LINE__, 0, 0, Local0, c009) } if (LNotEqual(i902, 0)) { - err(c080, z077, 0x105, 0, 0, i902, 0) + err(c080, z077, __LINE__, 0, 0, i902, 0) } Store(ObjectType(i903), Local0) if (LNotEqual(Local0, c009)) { - err(c080, z077, 0x106, 0, 0, Local0, c009) + err(c080, z077, __LINE__, 0, 0, Local0, c009) } if (LNotEqual(i903, 0xffffffffffffffff)) { - err(c080, z077, 0x107, 0, 0, i903, 0xffffffffffffffff) + err(c080, z077, __LINE__, 0, 0, i903, 0xffffffffffffffff) } Store(ObjectType(i904), Local0) if (LNotEqual(Local0, c009)) { - err(c080, z077, 0x108, 0, 0, Local0, c009) + err(c080, z077, __LINE__, 0, 0, Local0, c009) } if (LNotEqual(i904, 0xffffffff)) { - err(c080, z077, 0x109, 0, 0, i904, 0xffffffff) + err(c080, z077, __LINE__, 0, 0, i904, 0xffffffff) } // String Store(ObjectType(s900), Local0) if (LNotEqual(Local0, c00a)) { - err(c080, z077, 0x10a, 0, 0, Local0, c00a) + err(c080, z077, __LINE__, 0, 0, Local0, c00a) } if (LNotEqual(s900, "12343002")) { - err(c080, z077, 0x10b, 0, 0, s900, "12343002") + err(c080, z077, __LINE__, 0, 0, s900, "12343002") } Store(ObjectType(s901), Local0) if (LNotEqual(Local0, c00a)) { - err(c080, z077, 0x10c, 0, 0, Local0, c00a) + err(c080, z077, __LINE__, 0, 0, Local0, c00a) } if (LNotEqual(s901, "qwrtyu3003")) { - err(c080, z077, 0x10d, 0, 0, s901, "qwrtyu3003") + err(c080, z077, __LINE__, 0, 0, s901, "qwrtyu3003") } // Buffer Store(ObjectType(b900), Local0) if (LNotEqual(Local0, c00b)) { - err(c080, z077, 0x10e, 0, 0, Local0, c00b) + err(c080, z077, __LINE__, 0, 0, Local0, c00b) } if (LNotEqual(b900, Buffer() {0xd0,0xd1,0xd2,0xd3,0xd4})) { - err(c080, z077, 0x10f, 0, 0, b900, Buffer() {0xd0,0xd1,0xd2,0xd3,0xd4}) + err(c080, z077, __LINE__, 0, 0, b900, Buffer() {0xd0,0xd1,0xd2,0xd3,0xd4}) } // Buffer Field Store(ObjectType(bf90), Local0) if (LNotEqual(Local0, c016)) { - err(c080, z077, 0x110, 0, 0, Local0, c016) + err(c080, z077, __LINE__, 0, 0, Local0, c016) } if (LNotEqual(bf90, 0xd0)) { - err(c080, z077, 0x111, 0, 0, bf90, 0xd0) + err(c080, z077, __LINE__, 0, 0, bf90, 0xd0) } // One level Package @@ -2809,87 +2809,87 @@ Method(m16b,, Serialized) Store(Index(p900, 0), Local0) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c008)) { - err(c080, z077, 0x112, 0, 0, Local1, c008) + err(c080, z077, __LINE__, 0, 0, Local1, c008) } Store(Index(p901, 0), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c009)) { - err(c080, z077, 0x113, 0, 0, Local2, c009) + err(c080, z077, __LINE__, 0, 0, Local2, c009) } if (LNotEqual(Local1, 0xabcd3004)) { - err(c080, z077, 0x114, 0, 0, Local1, 0xabcd3004) + err(c080, z077, __LINE__, 0, 0, Local1, 0xabcd3004) } Store(Index(p901, 1), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c009)) { - err(c080, z077, 0x115, 0, 0, Local2, c009) + err(c080, z077, __LINE__, 0, 0, Local2, c009) } if (LNotEqual(Local1, 0x1122334455663005)) { - err(c080, z077, 0x116, 0, 0, Local1, 0x1122334455663005) + err(c080, z077, __LINE__, 0, 0, Local1, 0x1122334455663005) } Store(Index(p902, 0), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00a)) { - err(c080, z077, 0x117, 0, 0, Local2, c00a) + err(c080, z077, __LINE__, 0, 0, Local2, c00a) } if (LNotEqual(Local1, "12343006")) { - err(c080, z077, 0x118, 0, 0, Local1, "12343006") + err(c080, z077, __LINE__, 0, 0, Local1, "12343006") } Store(Index(p902, 1), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00a)) { - err(c080, z077, 0x119, 0, 0, Local2, c00a) + err(c080, z077, __LINE__, 0, 0, Local2, c00a) } if (LNotEqual(Local1, "q1w2e3r4t5y6u7i83007")) { - err(c080, z077, 0x11a, 0, 0, Local1, "q1w2e3r4t5y6u7i83007") + err(c080, z077, __LINE__, 0, 0, Local1, "q1w2e3r4t5y6u7i83007") } Store(Index(p903, 0), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00a)) { - err(c080, z077, 0x11b, 0, 0, Local2, c00a) + err(c080, z077, __LINE__, 0, 0, Local2, c00a) } if (LNotEqual(Local1, "qwrtyuiop3008")) { - err(c080, z077, 0x11c, 0, 0, Local1, "qwrtyuiop3008") + err(c080, z077, __LINE__, 0, 0, Local1, "qwrtyuiop3008") } Store(Index(p903, 1), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00a)) { - err(c080, z077, 0x11d, 0, 0, Local2, c00a) + err(c080, z077, __LINE__, 0, 0, Local2, c00a) } if (LNotEqual(Local1, "1234567890abdef0253009")) { - err(c080, z077, 0x11e, 0, 0, Local1, "1234567890abdef0253009") + err(c080, z077, __LINE__, 0, 0, Local1, "1234567890abdef0253009") } Store(Index(p904, 0), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00b)) { - err(c080, z077, 0x11f, 0, 0, Local2, c00b) + err(c080, z077, __LINE__, 0, 0, Local2, c00b) } if (LNotEqual(Local1, Buffer() {0xd5,0xd6,0xd7})) { - err(c080, z077, 0x120, 0, 0, Local1, Buffer() {0xd5,0xd6,0xd7}) + err(c080, z077, __LINE__, 0, 0, Local1, Buffer() {0xd5,0xd6,0xd7}) } Store(Index(p904, 1), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00b)) { - err(c080, z077, 0x121, 0, 0, Local2, c00b) + err(c080, z077, __LINE__, 0, 0, Local2, c00b) } if (LNotEqual(Local1, Buffer() {0xd8,0xd9})) { - err(c080, z077, 0x122, 0, 0, Local1, Buffer() {0xd8,0xd9}) + err(c080, z077, __LINE__, 0, 0, Local1, Buffer() {0xd8,0xd9}) } // Two level Package @@ -2900,10 +2900,10 @@ Method(m16b,, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c009)) { - err(c080, z077, 0x123, 0, 0, Local4, c009) + err(c080, z077, __LINE__, 0, 0, Local4, c009) } if (LNotEqual(Local3, 0xabc300a)) { - err(c080, z077, 0x124, 0, 0, Local3, 0xabc300a) + err(c080, z077, __LINE__, 0, 0, Local3, 0xabc300a) } Store(Index(p905, 0), Local0) @@ -2912,10 +2912,10 @@ Method(m16b,, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c00a)) { - err(c080, z077, 0x125, 0, 0, Local4, c00a) + err(c080, z077, __LINE__, 0, 0, Local4, c00a) } if (LNotEqual(Local3, "0xabc300b")) { - err(c080, z077, 0x126, 0, 0, Local3, "0xabc300b") + err(c080, z077, __LINE__, 0, 0, Local3, "0xabc300b") } Store(Index(p905, 0), Local0) @@ -2924,10 +2924,10 @@ Method(m16b,, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c00a)) { - err(c080, z077, 0x127, 0, 0, Local4, c00a) + err(c080, z077, __LINE__, 0, 0, Local4, c00a) } if (LNotEqual(Local3, "abc300c")) { - err(c080, z077, 0x128, 0, 0, Local3, "abc300c") + err(c080, z077, __LINE__, 0, 0, Local3, "abc300c") } Store(Index(p906, 0), Local0) @@ -2936,10 +2936,10 @@ Method(m16b,, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c00a)) { - err(c080, z077, 0x129, 0, 0, Local4, c00a) + err(c080, z077, __LINE__, 0, 0, Local4, c00a) } if (LNotEqual(Local3, "abc300d")) { - err(c080, z077, 0x12a, 0, 0, Local3, "abc300d") + err(c080, z077, __LINE__, 0, 0, Local3, "abc300d") } Store(Index(p907, 0), Local0) @@ -2948,10 +2948,10 @@ Method(m16b,, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c00a)) { - err(c080, z077, 0x12b, 0, 0, Local4, c00a) + err(c080, z077, __LINE__, 0, 0, Local4, c00a) } if (LNotEqual(Local3, "aqwevbgnm300e")) { - err(c080, z077, 0x12c, 0, 0, Local3, "aqwevbgnm300e") + err(c080, z077, __LINE__, 0, 0, Local3, "aqwevbgnm300e") } Store(Index(p908, 0), Local0) @@ -2960,10 +2960,10 @@ Method(m16b,, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c00b)) { - err(c080, z077, 0x12d, 0, 0, Local4, c00b) + err(c080, z077, __LINE__, 0, 0, Local4, c00b) } if (LNotEqual(Local3, Buffer() {0xda,0xdb,0xdc,0xdd,0xde})) { - err(c080, z077, 0x12e, 0, 0, Local3, Buffer() {0xda,0xdb,0xdc,0xdd,0xde}) + err(c080, z077, __LINE__, 0, 0, Local3, Buffer() {0xda,0xdb,0xdc,0xdd,0xde}) } // Three level Package @@ -2976,10 +2976,10 @@ Method(m16b,, Serialized) Store(DerefOf(Local4), Local5) Store(ObjectType(Local5), Local6) if (LNotEqual(Local6, c009)) { - err(c080, z077, 0x12f, 0, 0, Local6, c009) + err(c080, z077, __LINE__, 0, 0, Local6, c009) } if (LNotEqual(Local5, 0xabc300f)) { - err(c080, z077, 0x130, 0, 0, Local5, 0xabc300f) + err(c080, z077, __LINE__, 0, 0, Local5, 0xabc300f) } Store(Index(p90a, 0), Local0) @@ -2990,10 +2990,10 @@ Method(m16b,, Serialized) Store(DerefOf(Local4), Local5) Store(ObjectType(Local5), Local6) if (LNotEqual(Local6, c00a)) { - err(c080, z077, 0x131, 0, 0, Local6, c00a) + err(c080, z077, __LINE__, 0, 0, Local6, c00a) } if (LNotEqual(Local5, "12343010")) { - err(c080, z077, 0x132, 0, 0, Local5, "12343010") + err(c080, z077, __LINE__, 0, 0, Local5, "12343010") } Store(Index(p90b, 0), Local0) @@ -3004,10 +3004,10 @@ Method(m16b,, Serialized) Store(DerefOf(Local4), Local5) Store(ObjectType(Local5), Local6) if (LNotEqual(Local6, c00a)) { - err(c080, z077, 0x133, 0, 0, Local6, c00a) + err(c080, z077, __LINE__, 0, 0, Local6, c00a) } if (LNotEqual(Local5, "zxswefas3011")) { - err(c080, z077, 0x134, 0, 0, Local5, "zxswefas3011") + err(c080, z077, __LINE__, 0, 0, Local5, "zxswefas3011") } Store(Index(p90c, 0), Local0) @@ -3018,30 +3018,30 @@ Method(m16b,, Serialized) Store(DerefOf(Local4), Local5) Store(ObjectType(Local5), Local6) if (LNotEqual(Local6, c00b)) { - err(c080, z077, 0x135, 0, 0, Local6, c00b) + err(c080, z077, __LINE__, 0, 0, Local6, c00b) } if (LNotEqual(Local5, Buffer() {0xdf,0x20,0x21})) { - err(c080, z077, 0x136, 0, 0, Local5, Buffer() {0xdf,0x20,0x21}) + err(c080, z077, __LINE__, 0, 0, Local5, Buffer() {0xdf,0x20,0x21}) } Store(Index(p953, 0), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c009)) { - err(c080, z077, 0x137, 0, 0, Local2, c009) + err(c080, z077, __LINE__, 0, 0, Local2, c009) } if (LNotEqual(Local1, 0xabcd3018)) { - err(c080, z077, 0x138, 0, 0, Local1, 0xabcd3018) + err(c080, z077, __LINE__, 0, 0, Local1, 0xabcd3018) } Store(Index(p953, 1), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c009)) { - err(c080, z077, 0x139, 0, 0, Local2, c009) + err(c080, z077, __LINE__, 0, 0, Local2, c009) } if (LNotEqual(Local1, 0xabcd3019)) { - err(c080, z077, 0x13a, 0, 0, Local1, 0xabcd3019) + err(c080, z077, __LINE__, 0, 0, Local1, 0xabcd3019) } // Not Computational Data @@ -3060,13 +3060,13 @@ Method(m16b,, Serialized) * // Field Unit (Field) * * if (LNotEqual(f900, 0xd7)) { - * err(c080, z077, 0x137, 0, 0, f900, 0xd7) + * err(c080, z077, __LINE__, 0, 0, f900, 0xd7) * } * * // Field Unit (IndexField) * * if (LNotEqual(if90, 0xd7)) { - * err(c080, z077, 0x138, 0, 0, if90, 0xd7) + * err(c080, z077, __LINE__, 0, 0, if90, 0xd7) * } */ } /* m000 */ @@ -3768,80 +3768,80 @@ Method(m16c, 1, Serialized) Store(ObjectType(i900), Local0) if (LNotEqual(Local0, c009)) { - err(c080, z077, 0x100, 0, 0, Local0, c009) + err(c080, z077, __LINE__, 0, 0, Local0, c009) } if (LNotEqual(i900, 0xfe7cb391d65a4000)) { - err(c080, z077, 0x101, 0, 0, i900, 0xfe7cb391d65a4000) + err(c080, z077, __LINE__, 0, 0, i900, 0xfe7cb391d65a4000) } Store(ObjectType(i901), Local0) if (LNotEqual(Local0, c009)) { - err(c080, z077, 0x102, 0, 0, Local0, c009) + err(c080, z077, __LINE__, 0, 0, Local0, c009) } if (LNotEqual(i901, 0xc1794001)) { - err(c080, z077, 0x103, 0, 0, i901, 0xc1794001) + err(c080, z077, __LINE__, 0, 0, i901, 0xc1794001) } Store(ObjectType(i902), Local0) if (LNotEqual(Local0, c009)) { - err(c080, z077, 0x104, 0, 0, Local0, c009) + err(c080, z077, __LINE__, 0, 0, Local0, c009) } if (LNotEqual(i902, 0)) { - err(c080, z077, 0x105, 0, 0, i902, 0) + err(c080, z077, __LINE__, 0, 0, i902, 0) } Store(ObjectType(i903), Local0) if (LNotEqual(Local0, c009)) { - err(c080, z077, 0x106, 0, 0, Local0, c009) + err(c080, z077, __LINE__, 0, 0, Local0, c009) } if (LNotEqual(i903, 0xffffffffffffffff)) { - err(c080, z077, 0x107, 0, 0, i903, 0xffffffffffffffff) + err(c080, z077, __LINE__, 0, 0, i903, 0xffffffffffffffff) } Store(ObjectType(i904), Local0) if (LNotEqual(Local0, c009)) { - err(c080, z077, 0x108, 0, 0, Local0, c009) + err(c080, z077, __LINE__, 0, 0, Local0, c009) } if (LNotEqual(i904, 0xffffffff)) { - err(c080, z077, 0x109, 0, 0, i904, 0xffffffff) + err(c080, z077, __LINE__, 0, 0, i904, 0xffffffff) } // String Store(ObjectType(s900), Local0) if (LNotEqual(Local0, c00a)) { - err(c080, z077, 0x10a, 0, 0, Local0, c00a) + err(c080, z077, __LINE__, 0, 0, Local0, c00a) } if (LNotEqual(s900, "12344002")) { - err(c080, z077, 0x10b, 0, 0, s900, "12344002") + err(c080, z077, __LINE__, 0, 0, s900, "12344002") } Store(ObjectType(s901), Local0) if (LNotEqual(Local0, c00a)) { - err(c080, z077, 0x10c, 0, 0, Local0, c00a) + err(c080, z077, __LINE__, 0, 0, Local0, c00a) } if (LNotEqual(s901, "qwrtyu4003")) { - err(c080, z077, 0x10d, 0, 0, s901, "qwrtyu4003") + err(c080, z077, __LINE__, 0, 0, s901, "qwrtyu4003") } // Buffer Store(ObjectType(b900), Local0) if (LNotEqual(Local0, c00b)) { - err(c080, z077, 0x10e, 0, 0, Local0, c00b) + err(c080, z077, __LINE__, 0, 0, Local0, c00b) } if (LNotEqual(b900, Buffer() {0xe0,0xe1,0xe2,0xe3,0xe4})) { - err(c080, z077, 0x10f, 0, 0, b900, Buffer() {0xe0,0xe1,0xe2,0xe3,0xe4}) + err(c080, z077, __LINE__, 0, 0, b900, Buffer() {0xe0,0xe1,0xe2,0xe3,0xe4}) } // Buffer Field Store(ObjectType(bf90), Local0) if (LNotEqual(Local0, c016)) { - err(c080, z077, 0x110, 0, 0, Local0, c016) + err(c080, z077, __LINE__, 0, 0, Local0, c016) } if (LNotEqual(bf90, 0xe0)) { - err(c080, z077, 0x111, 0, 0, bf90, 0xe0) + err(c080, z077, __LINE__, 0, 0, bf90, 0xe0) } // One level Package @@ -3849,87 +3849,87 @@ Method(m16c, 1, Serialized) Store(Index(p900, 0), Local0) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c008)) { - err(c080, z077, 0x112, 0, 0, Local1, c008) + err(c080, z077, __LINE__, 0, 0, Local1, c008) } Store(Index(p901, 0), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c009)) { - err(c080, z077, 0x113, 0, 0, Local2, c009) + err(c080, z077, __LINE__, 0, 0, Local2, c009) } if (LNotEqual(Local1, 0xabcd4004)) { - err(c080, z077, 0x114, 0, 0, Local1, 0xabcd4004) + err(c080, z077, __LINE__, 0, 0, Local1, 0xabcd4004) } Store(Index(p901, 1), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c009)) { - err(c080, z077, 0x115, 0, 0, Local2, c009) + err(c080, z077, __LINE__, 0, 0, Local2, c009) } if (LNotEqual(Local1, 0x1122334455664005)) { - err(c080, z077, 0x116, 0, 0, Local1, 0x1122334455664005) + err(c080, z077, __LINE__, 0, 0, Local1, 0x1122334455664005) } Store(Index(p902, 0), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00a)) { - err(c080, z077, 0x117, 0, 0, Local2, c00a) + err(c080, z077, __LINE__, 0, 0, Local2, c00a) } if (LNotEqual(Local1, "12344006")) { - err(c080, z077, 0x118, 0, 0, Local1, "12344006") + err(c080, z077, __LINE__, 0, 0, Local1, "12344006") } Store(Index(p902, 1), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00a)) { - err(c080, z077, 0x119, 0, 0, Local2, c00a) + err(c080, z077, __LINE__, 0, 0, Local2, c00a) } if (LNotEqual(Local1, "q1w2e3r4t5y6u7i84007")) { - err(c080, z077, 0x11a, 0, 0, Local1, "q1w2e3r4t5y6u7i84007") + err(c080, z077, __LINE__, 0, 0, Local1, "q1w2e3r4t5y6u7i84007") } Store(Index(p903, 0), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00a)) { - err(c080, z077, 0x11b, 0, 0, Local2, c00a) + err(c080, z077, __LINE__, 0, 0, Local2, c00a) } if (LNotEqual(Local1, "qwrtyuiop4008")) { - err(c080, z077, 0x11c, 0, 0, Local1, "qwrtyuiop4008") + err(c080, z077, __LINE__, 0, 0, Local1, "qwrtyuiop4008") } Store(Index(p903, 1), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00a)) { - err(c080, z077, 0x11d, 0, 0, Local2, c00a) + err(c080, z077, __LINE__, 0, 0, Local2, c00a) } if (LNotEqual(Local1, "1234567890abdef0254009")) { - err(c080, z077, 0x11e, 0, 0, Local1, "1234567890abdef0254009") + err(c080, z077, __LINE__, 0, 0, Local1, "1234567890abdef0254009") } Store(Index(p904, 0), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00b)) { - err(c080, z077, 0x11f, 0, 0, Local2, c00b) + err(c080, z077, __LINE__, 0, 0, Local2, c00b) } if (LNotEqual(Local1, Buffer() {0xe5,0xe6,0xe7})) { - err(c080, z077, 0x120, 0, 0, Local1, Buffer() {0xe5,0xe6,0xe7}) + err(c080, z077, __LINE__, 0, 0, Local1, Buffer() {0xe5,0xe6,0xe7}) } Store(Index(p904, 1), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00b)) { - err(c080, z077, 0x121, 0, 0, Local2, c00b) + err(c080, z077, __LINE__, 0, 0, Local2, c00b) } if (LNotEqual(Local1, Buffer() {0xe8,0xe9})) { - err(c080, z077, 0x122, 0, 0, Local1, Buffer() {0xe8,0xe9}) + err(c080, z077, __LINE__, 0, 0, Local1, Buffer() {0xe8,0xe9}) } // Two level Package @@ -3940,10 +3940,10 @@ Method(m16c, 1, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c009)) { - err(c080, z077, 0x123, 0, 0, Local4, c009) + err(c080, z077, __LINE__, 0, 0, Local4, c009) } if (LNotEqual(Local3, 0xabc400a)) { - err(c080, z077, 0x124, 0, 0, Local3, 0xabc400a) + err(c080, z077, __LINE__, 0, 0, Local3, 0xabc400a) } Store(Index(p905, 0), Local0) @@ -3952,10 +3952,10 @@ Method(m16c, 1, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c00a)) { - err(c080, z077, 0x125, 0, 0, Local4, c00a) + err(c080, z077, __LINE__, 0, 0, Local4, c00a) } if (LNotEqual(Local3, "0xabc400b")) { - err(c080, z077, 0x126, 0, 0, Local3, "0xabc400b") + err(c080, z077, __LINE__, 0, 0, Local3, "0xabc400b") } Store(Index(p905, 0), Local0) @@ -3964,10 +3964,10 @@ Method(m16c, 1, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c00a)) { - err(c080, z077, 0x127, 0, 0, Local4, c00a) + err(c080, z077, __LINE__, 0, 0, Local4, c00a) } if (LNotEqual(Local3, "abc400c")) { - err(c080, z077, 0x128, 0, 0, Local3, "abc400c") + err(c080, z077, __LINE__, 0, 0, Local3, "abc400c") } Store(Index(p906, 0), Local0) @@ -3976,10 +3976,10 @@ Method(m16c, 1, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c00a)) { - err(c080, z077, 0x129, 0, 0, Local4, c00a) + err(c080, z077, __LINE__, 0, 0, Local4, c00a) } if (LNotEqual(Local3, "abc400d")) { - err(c080, z077, 0x12a, 0, 0, Local3, "abc400d") + err(c080, z077, __LINE__, 0, 0, Local3, "abc400d") } Store(Index(p907, 0), Local0) @@ -3988,10 +3988,10 @@ Method(m16c, 1, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c00a)) { - err(c080, z077, 0x12b, 0, 0, Local4, c00a) + err(c080, z077, __LINE__, 0, 0, Local4, c00a) } if (LNotEqual(Local3, "aqwevbgnm400e")) { - err(c080, z077, 0x12c, 0, 0, Local3, "aqwevbgnm400e") + err(c080, z077, __LINE__, 0, 0, Local3, "aqwevbgnm400e") } Store(Index(p908, 0), Local0) @@ -4000,10 +4000,10 @@ Method(m16c, 1, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c00b)) { - err(c080, z077, 0x12d, 0, 0, Local4, c00b) + err(c080, z077, __LINE__, 0, 0, Local4, c00b) } if (LNotEqual(Local3, Buffer() {0xea,0xeb,0xec,0xed,0xee})) { - err(c080, z077, 0x12e, 0, 0, Local3, Buffer() {0xea,0xeb,0xec,0xed,0xee}) + err(c080, z077, __LINE__, 0, 0, Local3, Buffer() {0xea,0xeb,0xec,0xed,0xee}) } // Three level Package @@ -4016,10 +4016,10 @@ Method(m16c, 1, Serialized) Store(DerefOf(Local4), Local5) Store(ObjectType(Local5), Local6) if (LNotEqual(Local6, c009)) { - err(c080, z077, 0x12f, 0, 0, Local6, c009) + err(c080, z077, __LINE__, 0, 0, Local6, c009) } if (LNotEqual(Local5, 0xabc400f)) { - err(c080, z077, 0x130, 0, 0, Local5, 0xabc400f) + err(c080, z077, __LINE__, 0, 0, Local5, 0xabc400f) } Store(Index(p90a, 0), Local0) @@ -4030,10 +4030,10 @@ Method(m16c, 1, Serialized) Store(DerefOf(Local4), Local5) Store(ObjectType(Local5), Local6) if (LNotEqual(Local6, c00a)) { - err(c080, z077, 0x131, 0, 0, Local6, c00a) + err(c080, z077, __LINE__, 0, 0, Local6, c00a) } if (LNotEqual(Local5, "12344010")) { - err(c080, z077, 0x132, 0, 0, Local5, "12344010") + err(c080, z077, __LINE__, 0, 0, Local5, "12344010") } Store(Index(p90b, 0), Local0) @@ -4044,10 +4044,10 @@ Method(m16c, 1, Serialized) Store(DerefOf(Local4), Local5) Store(ObjectType(Local5), Local6) if (LNotEqual(Local6, c00a)) { - err(c080, z077, 0x133, 0, 0, Local6, c00a) + err(c080, z077, __LINE__, 0, 0, Local6, c00a) } if (LNotEqual(Local5, "zxswefas4011")) { - err(c080, z077, 0x134, 0, 0, Local5, "zxswefas4011") + err(c080, z077, __LINE__, 0, 0, Local5, "zxswefas4011") } Store(Index(p90c, 0), Local0) @@ -4058,30 +4058,30 @@ Method(m16c, 1, Serialized) Store(DerefOf(Local4), Local5) Store(ObjectType(Local5), Local6) if (LNotEqual(Local6, c00b)) { - err(c080, z077, 0x135, 0, 0, Local6, c00b) + err(c080, z077, __LINE__, 0, 0, Local6, c00b) } if (LNotEqual(Local5, Buffer() {0xef,0x30,0x31})) { - err(c080, z077, 0x136, 0, 0, Local5, Buffer() {0xef,0x30,0x31}) + err(c080, z077, __LINE__, 0, 0, Local5, Buffer() {0xef,0x30,0x31}) } Store(Index(p953, 0), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c009)) { - err(c080, z077, 0x137, 0, 0, Local2, c009) + err(c080, z077, __LINE__, 0, 0, Local2, c009) } if (LNotEqual(Local1, 0xabcd4018)) { - err(c080, z077, 0x138, 0, 0, Local1, 0xabcd4018) + err(c080, z077, __LINE__, 0, 0, Local1, 0xabcd4018) } Store(Index(p953, 1), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c009)) { - err(c080, z077, 0x139, 0, 0, Local2, c009) + err(c080, z077, __LINE__, 0, 0, Local2, c009) } if (LNotEqual(Local1, 0xabcd4019)) { - err(c080, z077, 0x13a, 0, 0, Local1, 0xabcd4019) + err(c080, z077, __LINE__, 0, 0, Local1, 0xabcd4019) } // Not Computational Data @@ -4100,13 +4100,13 @@ Method(m16c, 1, Serialized) * // Field Unit (Field) * * if (LNotEqual(f900, 0xd7)) { - * err(c080, z077, 0x137, 0, 0, f900, 0xd7) + * err(c080, z077, __LINE__, 0, 0, f900, 0xd7) * } * * // Field Unit (IndexField) * * if (LNotEqual(if90, 0xd7)) { - * err(c080, z077, 0x138, 0, 0, if90, 0xd7) + * err(c080, z077, __LINE__, 0, 0, if90, 0xd7) * } */ } /* m000 */ @@ -5110,80 +5110,80 @@ Method(m16e,, Serialized) Store(ObjectType(i900), Local0) if (LNotEqual(Local0, c009)) { - err(c080, z077, 0x100, 0, 0, Local0, c009) + err(c080, z077, __LINE__, 0, 0, Local0, c009) } if (LNotEqual(i900, 0xfe7cb391d65a5000)) { - err(c080, z077, 0x101, 0, 0, i900, 0xfe7cb391d65a5000) + err(c080, z077, __LINE__, 0, 0, i900, 0xfe7cb391d65a5000) } Store(ObjectType(i901), Local0) if (LNotEqual(Local0, c009)) { - err(c080, z077, 0x102, 0, 0, Local0, c009) + err(c080, z077, __LINE__, 0, 0, Local0, c009) } if (LNotEqual(i901, 0x41795001)) { - err(c080, z077, 0x103, 0, 0, i901, 0x41795001) + err(c080, z077, __LINE__, 0, 0, i901, 0x41795001) } Store(ObjectType(i902), Local0) if (LNotEqual(Local0, c009)) { - err(c080, z077, 0x104, 0, 0, Local0, c009) + err(c080, z077, __LINE__, 0, 0, Local0, c009) } if (LNotEqual(i902, 0)) { - err(c080, z077, 0x105, 0, 0, i902, 0) + err(c080, z077, __LINE__, 0, 0, i902, 0) } Store(ObjectType(i903), Local0) if (LNotEqual(Local0, c009)) { - err(c080, z077, 0x106, 0, 0, Local0, c009) + err(c080, z077, __LINE__, 0, 0, Local0, c009) } if (LNotEqual(i903, 0xffffffffffffffff)) { - err(c080, z077, 0x107, 0, 0, i903, 0xffffffffffffffff) + err(c080, z077, __LINE__, 0, 0, i903, 0xffffffffffffffff) } Store(ObjectType(i904), Local0) if (LNotEqual(Local0, c009)) { - err(c080, z077, 0x108, 0, 0, Local0, c009) + err(c080, z077, __LINE__, 0, 0, Local0, c009) } if (LNotEqual(i904, 0xffffffff)) { - err(c080, z077, 0x109, 0, 0, i904, 0xffffffff) + err(c080, z077, __LINE__, 0, 0, i904, 0xffffffff) } // String Store(ObjectType(s900), Local0) if (LNotEqual(Local0, c00a)) { - err(c080, z077, 0x10a, 0, 0, Local0, c00a) + err(c080, z077, __LINE__, 0, 0, Local0, c00a) } if (LNotEqual(s900, "12345002")) { - err(c080, z077, 0x10b, 0, 0, s900, "12345002") + err(c080, z077, __LINE__, 0, 0, s900, "12345002") } Store(ObjectType(s901), Local0) if (LNotEqual(Local0, c00a)) { - err(c080, z077, 0x10c, 0, 0, Local0, c00a) + err(c080, z077, __LINE__, 0, 0, Local0, c00a) } if (LNotEqual(s901, "qwrtyu5003")) { - err(c080, z077, 0x10d, 0, 0, s901, "qwrtyu5003") + err(c080, z077, __LINE__, 0, 0, s901, "qwrtyu5003") } // Buffer Store(ObjectType(b900), Local0) if (LNotEqual(Local0, c00b)) { - err(c080, z077, 0x10e, 0, 0, Local0, c00b) + err(c080, z077, __LINE__, 0, 0, Local0, c00b) } if (LNotEqual(b900, Buffer() {0xf0,0xf1,0xf2,0xf3,0xf4})) { - err(c080, z077, 0x10f, 0, 0, b900, Buffer() {0xf0,0xf1,0xf2,0xf3,0xf4}) + err(c080, z077, __LINE__, 0, 0, b900, Buffer() {0xf0,0xf1,0xf2,0xf3,0xf4}) } // Buffer Field Store(ObjectType(bf90), Local0) if (LNotEqual(Local0, c016)) { - err(c080, z077, 0x110, 0, 0, Local0, c016) + err(c080, z077, __LINE__, 0, 0, Local0, c016) } if (LNotEqual(bf90, 0xf0)) { - err(c080, z077, 0x111, 0, 0, bf90, 0xf0) + err(c080, z077, __LINE__, 0, 0, bf90, 0xf0) } // One level Package @@ -5191,87 +5191,87 @@ Method(m16e,, Serialized) Store(Index(p900, 0), Local0) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c008)) { - err(c080, z077, 0x112, 0, 0, Local1, c008) + err(c080, z077, __LINE__, 0, 0, Local1, c008) } Store(Index(p901, 0), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c009)) { - err(c080, z077, 0x113, 0, 0, Local2, c009) + err(c080, z077, __LINE__, 0, 0, Local2, c009) } if (LNotEqual(Local1, 0xabcd5004)) { - err(c080, z077, 0x114, 0, 0, Local1, 0xabcd5004) + err(c080, z077, __LINE__, 0, 0, Local1, 0xabcd5004) } Store(Index(p901, 1), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c009)) { - err(c080, z077, 0x115, 0, 0, Local2, c009) + err(c080, z077, __LINE__, 0, 0, Local2, c009) } if (LNotEqual(Local1, 0x1122334455665005)) { - err(c080, z077, 0x116, 0, 0, Local1, 0x1122334455665005) + err(c080, z077, __LINE__, 0, 0, Local1, 0x1122334455665005) } Store(Index(p902, 0), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00a)) { - err(c080, z077, 0x117, 0, 0, Local2, c00a) + err(c080, z077, __LINE__, 0, 0, Local2, c00a) } if (LNotEqual(Local1, "12345006")) { - err(c080, z077, 0x118, 0, 0, Local1, "12345006") + err(c080, z077, __LINE__, 0, 0, Local1, "12345006") } Store(Index(p902, 1), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00a)) { - err(c080, z077, 0x119, 0, 0, Local2, c00a) + err(c080, z077, __LINE__, 0, 0, Local2, c00a) } if (LNotEqual(Local1, "q1w2e3r4t5y6u7i85007")) { - err(c080, z077, 0x11a, 0, 0, Local1, "q1w2e3r4t5y6u7i85007") + err(c080, z077, __LINE__, 0, 0, Local1, "q1w2e3r4t5y6u7i85007") } Store(Index(p903, 0), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00a)) { - err(c080, z077, 0x11b, 0, 0, Local2, c00a) + err(c080, z077, __LINE__, 0, 0, Local2, c00a) } if (LNotEqual(Local1, "qwrtyuiop5008")) { - err(c080, z077, 0x11c, 0, 0, Local1, "qwrtyuiop5008") + err(c080, z077, __LINE__, 0, 0, Local1, "qwrtyuiop5008") } Store(Index(p903, 1), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00a)) { - err(c080, z077, 0x11d, 0, 0, Local2, c00a) + err(c080, z077, __LINE__, 0, 0, Local2, c00a) } if (LNotEqual(Local1, "1234567890abdef0255009")) { - err(c080, z077, 0x11e, 0, 0, Local1, "1234567890abdef0255009") + err(c080, z077, __LINE__, 0, 0, Local1, "1234567890abdef0255009") } Store(Index(p904, 0), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00b)) { - err(c080, z077, 0x11f, 0, 0, Local2, c00b) + err(c080, z077, __LINE__, 0, 0, Local2, c00b) } if (LNotEqual(Local1, Buffer() {0xf5,0xf6,0xf7})) { - err(c080, z077, 0x120, 0, 0, Local1, Buffer() {0xf5,0xf6,0xf7}) + err(c080, z077, __LINE__, 0, 0, Local1, Buffer() {0xf5,0xf6,0xf7}) } Store(Index(p904, 1), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00b)) { - err(c080, z077, 0x121, 0, 0, Local2, c00b) + err(c080, z077, __LINE__, 0, 0, Local2, c00b) } if (LNotEqual(Local1, Buffer() {0xf8,0xf9})) { - err(c080, z077, 0x122, 0, 0, Local1, Buffer() {0xf8,0xf9}) + err(c080, z077, __LINE__, 0, 0, Local1, Buffer() {0xf8,0xf9}) } // Two level Package @@ -5282,10 +5282,10 @@ Method(m16e,, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c009)) { - err(c080, z077, 0x123, 0, 0, Local4, c009) + err(c080, z077, __LINE__, 0, 0, Local4, c009) } if (LNotEqual(Local3, 0xabc500a)) { - err(c080, z077, 0x124, 0, 0, Local3, 0xabc500a) + err(c080, z077, __LINE__, 0, 0, Local3, 0xabc500a) } Store(Index(p905, 0), Local0) @@ -5294,10 +5294,10 @@ Method(m16e,, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c00a)) { - err(c080, z077, 0x125, 0, 0, Local4, c00a) + err(c080, z077, __LINE__, 0, 0, Local4, c00a) } if (LNotEqual(Local3, "0xabc500b")) { - err(c080, z077, 0x126, 0, 0, Local3, "0xabc500b") + err(c080, z077, __LINE__, 0, 0, Local3, "0xabc500b") } Store(Index(p905, 0), Local0) @@ -5306,10 +5306,10 @@ Method(m16e,, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c00a)) { - err(c080, z077, 0x127, 0, 0, Local4, c00a) + err(c080, z077, __LINE__, 0, 0, Local4, c00a) } if (LNotEqual(Local3, "abc500c")) { - err(c080, z077, 0x128, 0, 0, Local3, "abc500c") + err(c080, z077, __LINE__, 0, 0, Local3, "abc500c") } Store(Index(p906, 0), Local0) @@ -5318,10 +5318,10 @@ Method(m16e,, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c00a)) { - err(c080, z077, 0x129, 0, 0, Local4, c00a) + err(c080, z077, __LINE__, 0, 0, Local4, c00a) } if (LNotEqual(Local3, "abc500d")) { - err(c080, z077, 0x12a, 0, 0, Local3, "abc500d") + err(c080, z077, __LINE__, 0, 0, Local3, "abc500d") } Store(Index(p907, 0), Local0) @@ -5330,10 +5330,10 @@ Method(m16e,, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c00a)) { - err(c080, z077, 0x12b, 0, 0, Local4, c00a) + err(c080, z077, __LINE__, 0, 0, Local4, c00a) } if (LNotEqual(Local3, "aqwevbgnm500e")) { - err(c080, z077, 0x12c, 0, 0, Local3, "aqwevbgnm500e") + err(c080, z077, __LINE__, 0, 0, Local3, "aqwevbgnm500e") } Store(Index(p908, 0), Local0) @@ -5342,10 +5342,10 @@ Method(m16e,, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c00b)) { - err(c080, z077, 0x12d, 0, 0, Local4, c00b) + err(c080, z077, __LINE__, 0, 0, Local4, c00b) } if (LNotEqual(Local3, Buffer() {0xfa,0xfb,0xfc,0xfd,0xfe})) { - err(c080, z077, 0x12e, 0, 0, Local3, Buffer() {0xfa,0xfb,0xfc,0xfd,0xfe}) + err(c080, z077, __LINE__, 0, 0, Local3, Buffer() {0xfa,0xfb,0xfc,0xfd,0xfe}) } // Three level Package @@ -5358,10 +5358,10 @@ Method(m16e,, Serialized) Store(DerefOf(Local4), Local5) Store(ObjectType(Local5), Local6) if (LNotEqual(Local6, c009)) { - err(c080, z077, 0x12f, 0, 0, Local6, c009) + err(c080, z077, __LINE__, 0, 0, Local6, c009) } if (LNotEqual(Local5, 0xabc500f)) { - err(c080, z077, 0x130, 0, 0, Local5, 0xabc500f) + err(c080, z077, __LINE__, 0, 0, Local5, 0xabc500f) } Store(Index(p90a, 0), Local0) @@ -5372,10 +5372,10 @@ Method(m16e,, Serialized) Store(DerefOf(Local4), Local5) Store(ObjectType(Local5), Local6) if (LNotEqual(Local6, c00a)) { - err(c080, z077, 0x131, 0, 0, Local6, c00a) + err(c080, z077, __LINE__, 0, 0, Local6, c00a) } if (LNotEqual(Local5, "12345010")) { - err(c080, z077, 0x132, 0, 0, Local5, "12345010") + err(c080, z077, __LINE__, 0, 0, Local5, "12345010") } Store(Index(p90b, 0), Local0) @@ -5386,10 +5386,10 @@ Method(m16e,, Serialized) Store(DerefOf(Local4), Local5) Store(ObjectType(Local5), Local6) if (LNotEqual(Local6, c00a)) { - err(c080, z077, 0x133, 0, 0, Local6, c00a) + err(c080, z077, __LINE__, 0, 0, Local6, c00a) } if (LNotEqual(Local5, "zxswefas5011")) { - err(c080, z077, 0x134, 0, 0, Local5, "zxswefas5011") + err(c080, z077, __LINE__, 0, 0, Local5, "zxswefas5011") } Store(Index(p90c, 0), Local0) @@ -5400,30 +5400,30 @@ Method(m16e,, Serialized) Store(DerefOf(Local4), Local5) Store(ObjectType(Local5), Local6) if (LNotEqual(Local6, c00b)) { - err(c080, z077, 0x135, 0, 0, Local6, c00b) + err(c080, z077, __LINE__, 0, 0, Local6, c00b) } if (LNotEqual(Local5, Buffer() {0xff,0x40,0x41})) { - err(c080, z077, 0x136, 0, 0, Local5, Buffer() {0xff,0x40,0x41}) + err(c080, z077, __LINE__, 0, 0, Local5, Buffer() {0xff,0x40,0x41}) } Store(Index(p953, 0), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c009)) { - err(c080, z077, 0x137, 0, 0, Local2, c009) + err(c080, z077, __LINE__, 0, 0, Local2, c009) } if (LNotEqual(Local1, 0xabcd5018)) { - err(c080, z077, 0x138, 0, 0, Local1, 0xabcd5018) + err(c080, z077, __LINE__, 0, 0, Local1, 0xabcd5018) } Store(Index(p953, 1), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c009)) { - err(c080, z077, 0x139, 0, 0, Local2, c009) + err(c080, z077, __LINE__, 0, 0, Local2, c009) } if (LNotEqual(Local1, 0xabcd5019)) { - err(c080, z077, 0x13a, 0, 0, Local1, 0xabcd5019) + err(c080, z077, __LINE__, 0, 0, Local1, 0xabcd5019) } // Not Computational Data @@ -5442,13 +5442,13 @@ Method(m16e,, Serialized) * // Field Unit (Field) * * if (LNotEqual(f900, 0xd7)) { - * err(c080, z077, 0x137, 0, 0, f900, 0xd7) + * err(c080, z077, __LINE__, 0, 0, f900, 0xd7) * } * * // Field Unit (IndexField) * * if (LNotEqual(if90, 0xd7)) { - * err(c080, z077, 0x138, 0, 0, if90, 0xd7) + * err(c080, z077, __LINE__, 0, 0, if90, 0xd7) * } */ } /* m000 */ diff --git a/tests/aslts/src/runtime/collections/functional/reference/ref06.asl b/tests/aslts/src/runtime/collections/functional/reference/ref06.asl index fd1243244..5d79ad733 100644 --- a/tests/aslts/src/runtime/collections/functional/reference/ref06.asl +++ b/tests/aslts/src/runtime/collections/functional/reference/ref06.asl @@ -100,7 +100,7 @@ Method(m1e1, 1, Serialized) Increment(i205) } Default { - err("m1e2", z110, 0, 0, 0, Local7, 0) + err("m1e2", z110, __LINE__, 0, 0, Local7, 0) } } @@ -711,7 +711,7 @@ Method(m1e0, 1, Serialized) m1a3(Local1, c010, z110, ts, 151) } Default { - err(ts, z110, 1, 0, 0, ind0, 0) + err(ts, z110, __LINE__, 0, 0, ind0, 0) } } /* Switch */ diff --git a/tests/aslts/src/runtime/collections/functional/reference/ref07.asl b/tests/aslts/src/runtime/collections/functional/reference/ref07.asl index f662eb782..2f0564ecf 100644 --- a/tests/aslts/src/runtime/collections/functional/reference/ref07.asl +++ b/tests/aslts/src/runtime/collections/functional/reference/ref07.asl @@ -1023,7 +1023,7 @@ Method(m1ca,, Serialized) Store(Index(p000, lpC0), Local0) Store(DerefOf(Local0), Local1) if (LNotEqual(Local1, lpC0)) { - err(ts, z116, 0, z116, 0, Local1, lpC0) + err(ts, z116, __LINE__, z116, 0, Local1, lpC0) break } Decrement(lpN0) @@ -1074,7 +1074,7 @@ Method(m1cb,, Serialized) Store(SizeOf(p000), Local0) if (LNotEqual(Local0, 6)) { - err(ts, z116, 1, 0, 0, Local0, 6) + err(ts, z116, __LINE__, 0, 0, Local0, 6) } } @@ -1091,7 +1091,7 @@ Method(m1cc, 4) Add(Local0, 1, Local7) if (LNotEqual(Local7, arg2)) { - err(arg0, z116, 2, 0, 0, Local7, arg2) + err(arg0, z116, __LINE__, 0, 0, Local7, arg2) } CH03(arg0, z116, 167, 0, 0) @@ -1109,7 +1109,7 @@ Method(m1cd, 4) Add(arg1, 1, Local7) if (LNotEqual(Local7, arg2)) { - err(arg0, z116, 3, 0, 0, Local7, arg2) + err(arg0, z116, __LINE__, 0, 0, Local7, arg2) } CH03(arg0, z116, 169, 0, 0) diff --git a/tests/aslts/src/runtime/collections/functional/reference/ref50.asl b/tests/aslts/src/runtime/collections/functional/reference/ref50.asl index 83df725aa..cbf216f02 100644 --- a/tests/aslts/src/runtime/collections/functional/reference/ref50.asl +++ b/tests/aslts/src/runtime/collections/functional/reference/ref50.asl @@ -236,11 +236,11 @@ Method(m22c,, Serialized) { CreateField(arg0, 8, 8, bf90) if (LNotEqual(bf90, 0x77)) { - err(ts, z111, 0, 0, 0, bf90, 0x77) + err(ts, z111, __LINE__, 0, 0, bf90, 0x77) } Store(0x9999992b, bf90) if (LNotEqual(bf90, 0x2b)) { - err(ts, z111, 1, 0, 0, bf90, 0x2b) + err(ts, z111, __LINE__, 0, 0, bf90, 0x2b) } } @@ -248,13 +248,13 @@ Method(m22c,, Serialized) { CreateField(arg0, 8, 8, bf90) if (LNotEqual(bf90, 0x77)) { - err(ts, z111, 2, 0, 0, bf90, 0x77) + err(ts, z111, __LINE__, 0, 0, bf90, 0x77) } Store(0x2b, bf90) CopyObject(0x9999992b, bf90) if (LNotEqual(bf90, 0x2b)) { - err(ts, z111, 3, 0, 0, bf90, 0x2b) + err(ts, z111, __LINE__, 0, 0, bf90, 0x2b) } } @@ -373,11 +373,11 @@ Method(m234,, Serialized) CreateField(Local2, 8, 8, bf90) if (LNotEqual(bf90, 0x77)) { - err(ts, z111, 0, 0, 0, bf90, 0x77) + err(ts, z111, __LINE__, 0, 0, bf90, 0x77) } Store(0x9999992b, bf90) if (LNotEqual(bf90, 0x2b)) { - err(ts, z111, 1, 0, 0, bf90, 0x2b) + err(ts, z111, __LINE__, 0, 0, bf90, 0x2b) } } @@ -387,11 +387,11 @@ Method(m234,, Serialized) CreateField(Local2, 8, 8, bf90) if (LNotEqual(bf90, 0x77)) { - err(ts, z111, 2, 0, 0, bf90, 0x77) + err(ts, z111, __LINE__, 0, 0, bf90, 0x77) } CopyObject(0x9999992b, bf90) if (LNotEqual(bf90, 0x2b)) { - err(ts, z111, 3, 0, 0, bf90, 0x2b) + err(ts, z111, __LINE__, 0, 0, bf90, 0x2b) } } @@ -789,7 +789,7 @@ Method(m236,, Serialized) Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, arg1)) { - err(ts, z111, 8, 0, 0, Local0, arg1) + err(ts, z111, __LINE__, 0, 0, Local0, arg1) } // Overwrite LocalX which contains either @@ -3643,7 +3643,7 @@ Method(m341,, Serialized) Store(DerefOf(Arg0), Local0) Add(Local0, 5, Local7) if (LNotEqual(Local7, 0x1928374b)) { - err(ts, z111, 9, 0, 0, Local7, 0x1928374b) + err(ts, z111, __LINE__, 0, 0, Local7, 0x1928374b) } } @@ -3683,7 +3683,7 @@ Method(m343,, Serialized) Store(DerefOf(Arg0), Local0) Add(Local0, 5, Local7) if (LNotEqual(Local7, 19)) { - err(ts, z111, 10, 0, 0, Local7, 19) + err(ts, z111, __LINE__, 0, 0, Local7, 19) } } @@ -3702,7 +3702,7 @@ Method(m344,, Serialized) { Add(Arg0, 5, Local7) if (LNotEqual(Local7, 19)) { - err(ts, z111, 11, 0, 0, Local7, 19) + err(ts, z111, __LINE__, 0, 0, Local7, 19) } } @@ -3729,11 +3729,11 @@ Method(m345,, Serialized) Store(0x90, Local0) if (LNotEqual(Local0, 0x90)) { - err(ts, z111, 12, 0, 0, Local0, 0x90) + err(ts, z111, __LINE__, 0, 0, Local0, 0x90) } Store(0x91, Local1) if (LNotEqual(Local1, 0x91)) { - err(ts, z111, 13, 0, 0, Local1, 0x91) + err(ts, z111, __LINE__, 0, 0, Local1, 0x91) } } @@ -3744,11 +3744,11 @@ Method(m345,, Serialized) CopyObject(0x94, Local0) if (LNotEqual(Local0, 0x94)) { - err(ts, z111, 14, 0, 0, Local0, 0x94) + err(ts, z111, __LINE__, 0, 0, Local0, 0x94) } CopyObject(0x95, Local1) if (LNotEqual(Local1, 0x95)) { - err(ts, z111, 15, 0, 0, Local1, 0x95) + err(ts, z111, __LINE__, 0, 0, Local1, 0x95) } } @@ -3827,24 +3827,24 @@ Method(m346,, Serialized) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c009)) { - err(ts, z111, 16, 0, 0, Local1, c009) + err(ts, z111, __LINE__, 0, 0, Local1, c009) } else { Store(SizeOf(Local0), Local1) if (LNotEqual(Local1, ISZ0)) { - err(ts, z111, 17, 0, 0, Local1, ISZ0) + err(ts, z111, __LINE__, 0, 0, Local1, ISZ0) } if (LNotEqual(Local6, 0xabcd0000)) { - err(ts, z111, 18, 0, 0, Local6, 0xabcd0000) + err(ts, z111, __LINE__, 0, 0, Local6, 0xabcd0000) } if (LNotEqual(Local7, 0x11111111)) { - err(ts, z111, 19, 0, 0, Local7, 0x11111111) + err(ts, z111, __LINE__, 0, 0, Local7, 0x11111111) } } } m000(i000) if (LNotEqual(i000, 0xabcd0000)) { - err(ts, z111, 20, 0, 0, i000, 0xabcd0000) + err(ts, z111, __LINE__, 0, 0, i000, 0xabcd0000) } } @@ -3859,21 +3859,21 @@ Method(m347,, Serialized) Store(DerefOf(RefOf(arg0)), Local0) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c009)) { - err(ts, z111, 21, 0, 0, Local1, c009) + err(ts, z111, __LINE__, 0, 0, Local1, c009) } else { Store(SizeOf(Local0), Local1) if (LNotEqual(Local1, ISZ0)) { - err(ts, z111, 22, 0, 0, Local1, ISZ0) + err(ts, z111, __LINE__, 0, 0, Local1, ISZ0) } if (LNotEqual(Local0, 0xabcd0000)) { - err(ts, z111, 23, 0, 0, Local0, 0xabcd0000) + err(ts, z111, __LINE__, 0, 0, Local0, 0xabcd0000) } } } m000(i000) if (LNotEqual(i000, 0xabcd0000)) { - err(ts, z111, 24, 0, 0, i000, 0xabcd0000) + err(ts, z111, __LINE__, 0, 0, i000, 0xabcd0000) } } @@ -3889,7 +3889,7 @@ Method(m348,, Serialized) Store(DeRefOf(Local0), Local1) Store(DeRefOf(Local1), Local2) if (LNotEqual(Local2, 0xabcd0000)) { - err(ts, z111, 25, 0, 0, Local2, 0xabcd0000) + err(ts, z111, __LINE__, 0, 0, Local2, 0xabcd0000) } Store(0x11111111, RefOf(arg0)) @@ -3897,23 +3897,23 @@ Method(m348,, Serialized) Store(0x11111111, Local0) if (LNotEqual(Local0, 0x11111111)) { - err(ts, z111, 26, 0, 0, Local0, 0x11111111) + err(ts, z111, __LINE__, 0, 0, Local0, 0x11111111) } } m000(RefOf(i000)) if (LNotEqual(i000, 0xabcd0000)) { - err(ts, z111, 27, 0, 0, i000, 0xabcd0000) + err(ts, z111, __LINE__, 0, 0, i000, 0xabcd0000) } Store(RefOf(i000), Local0) m000(Local0) if (LNotEqual(i000, 0xabcd0000)) { - err(ts, z111, 28, 0, 0, i000, 0xabcd0000) + err(ts, z111, __LINE__, 0, 0, i000, 0xabcd0000) } Store(DeRefOf(Local0), Local2) if (LNotEqual(Local2, 0xabcd0000)) { - err(ts, z111, 29, 0, 0, Local2, 0xabcd0000) + err(ts, z111, __LINE__, 0, 0, Local2, 0xabcd0000) } } @@ -3929,7 +3929,7 @@ Method(m349,, Serialized) Store(DeRefOf(RefOf(arg0)), Local1) Store(DeRefOf(Local1), Local2) if (LNotEqual(Local2, 0xabcd0000)) { - err(ts, z111, 30, 0, 0, Local2, 0xabcd0000) + err(ts, z111, __LINE__, 0, 0, Local2, 0xabcd0000) } } @@ -3943,18 +3943,18 @@ Method(m349,, Serialized) m000(RefOf(i000)) if (LNotEqual(i000, 0xabcd0000)) { - err(ts, z111, 31, 0, 0, i000, 0xabcd0000) + err(ts, z111, __LINE__, 0, 0, i000, 0xabcd0000) } Store(RefOf(i000), Local0) m000(Local0) if (LNotEqual(i000, 0xabcd0000)) { - err(ts, z111, 32, 0, 0, i000, 0xabcd0000) + err(ts, z111, __LINE__, 0, 0, i000, 0xabcd0000) } if (y512) { Store(DeRefOf(Local0), Local2) if (LNotEqual(Local2, 0xabcd0000)) { - err(ts, z111, 33, 0, 0, Local2, 0xabcd0000) + err(ts, z111, __LINE__, 0, 0, Local2, 0xabcd0000) } } @@ -3962,18 +3962,18 @@ Method(m349,, Serialized) m001(RefOf(i001)) if (LNotEqual(i001, 0x11111111)) { - err(ts, z111, 34, 0, 0, i001, 0x11111111) + err(ts, z111, __LINE__, 0, 0, i001, 0x11111111) } Store(RefOf(i001), Local0) m001(Local0) if (LNotEqual(i001, 0x11111111)) { - err(ts, z111, 35, 0, 0, i001, 0x11111111) + err(ts, z111, __LINE__, 0, 0, i001, 0x11111111) } if (y512) { Store(DeRefOf(Local0), Local2) if (LNotEqual(Local2, 0x11111111)) { - err(ts, z111, 36, 0, 0, Local2, 0x11111111) + err(ts, z111, __LINE__, 0, 0, Local2, 0x11111111) } } } @@ -3988,7 +3988,7 @@ Method(m34a,, Serialized) { Store(DeRefOf(arg0), Local2) if (LNotEqual(Local2, 0x69)) { - err(ts, z111, 37, 0, 0, Local2, 0x69) + err(ts, z111, __LINE__, 0, 0, Local2, 0x69) } } @@ -4000,7 +4000,7 @@ Method(m34a,, Serialized) Store(DeRefOf(Local1), Local2) if (LNotEqual(Local2, 0x69)) { - err(ts, z111, 38, 0, 0, Local2, 0x69) + err(ts, z111, __LINE__, 0, 0, Local2, 0x69) } } @@ -4011,7 +4011,7 @@ Method(m34a,, Serialized) Store(0x11111111, Local0) if (LNotEqual(Local0, 0x11111111)) { - err(ts, z111, 39, 0, 0, Local0, 0x11111111) + err(ts, z111, __LINE__, 0, 0, Local0, 0x11111111) } } @@ -4019,105 +4019,105 @@ Method(m34a,, Serialized) m000(Index(b000, 2)) if (LNotEqual(b000, Buffer() {1,2,0x69,4,5})) { - err(ts, z111, 40, 0, 0, b000, Buffer() {1,2,0x69,4,5}) + err(ts, z111, __LINE__, 0, 0, b000, Buffer() {1,2,0x69,4,5}) } Store(Index(b000, 2), Local0) m000(Local0) if (LNotEqual(b000, Buffer() {1,2,0x69,4,5})) { - err(ts, z111, 41, 0, 0, b000, Buffer() {1,2,0x69,4,5}) + err(ts, z111, __LINE__, 0, 0, b000, Buffer() {1,2,0x69,4,5}) } Store(DeRefOf(Local0), Local2) if (LNotEqual(Local2, 0x69)) { - err(ts, z111, 42, 0, 0, Local2, 0x69) + err(ts, z111, __LINE__, 0, 0, Local2, 0x69) } Store(Index(b000, 2, Local0), Local1) m000(Local0) if (LNotEqual(b000, Buffer() {1,2,0x69,4,5})) { - err(ts, z111, 43, 0, 0, b000, Buffer() {1,2,0x69,4,5}) + err(ts, z111, __LINE__, 0, 0, b000, Buffer() {1,2,0x69,4,5}) } Store(DeRefOf(Local0), Local2) if (LNotEqual(Local2, 0x69)) { - err(ts, z111, 44, 0, 0, Local2, 0x69) + err(ts, z111, __LINE__, 0, 0, Local2, 0x69) } m000(Local1) if (LNotEqual(b000, Buffer() {1,2,0x69,4,5})) { - err(ts, z111, 45, 0, 0, b000, Buffer() {1,2,0x69,4,5}) + err(ts, z111, __LINE__, 0, 0, b000, Buffer() {1,2,0x69,4,5}) } Store(DeRefOf(Local1), Local2) if (LNotEqual(Local2, 0x69)) { - err(ts, z111, 46, 0, 0, Local2, 0x69) + err(ts, z111, __LINE__, 0, 0, Local2, 0x69) } // m001 m001(Index(b000, 2)) if (LNotEqual(b000, Buffer() {1,2,0x69,4,5})) { - err(ts, z111, 47, 0, 0, b000, Buffer() {1,2,0x69,4,5}) + err(ts, z111, __LINE__, 0, 0, b000, Buffer() {1,2,0x69,4,5}) } Store(Index(b000, 2), Local0) m001(Local0) if (LNotEqual(b000, Buffer() {1,2,0x69,4,5})) { - err(ts, z111, 48, 0, 0, b000, Buffer() {1,2,0x69,4,5}) + err(ts, z111, __LINE__, 0, 0, b000, Buffer() {1,2,0x69,4,5}) } Store(DeRefOf(Local0), Local2) if (LNotEqual(Local2, 0x69)) { - err(ts, z111, 49, 0, 0, Local2, 0x69) + err(ts, z111, __LINE__, 0, 0, Local2, 0x69) } Store(Index(b000, 2, Local0), Local1) m001(Local0) if (LNotEqual(b000, Buffer() {1,2,0x69,4,5})) { - err(ts, z111, 50, 0, 0, b000, Buffer() {1,2,0x69,4,5}) + err(ts, z111, __LINE__, 0, 0, b000, Buffer() {1,2,0x69,4,5}) } Store(DeRefOf(Local0), Local2) if (LNotEqual(Local2, 0x69)) { - err(ts, z111, 51, 0, 0, Local2, 0x69) + err(ts, z111, __LINE__, 0, 0, Local2, 0x69) } m001(Local1) if (LNotEqual(b000, Buffer() {1,2,0x69,4,5})) { - err(ts, z111, 52, 0, 0, b000, Buffer() {1,2,0x69,4,5}) + err(ts, z111, __LINE__, 0, 0, b000, Buffer() {1,2,0x69,4,5}) } Store(DeRefOf(Local1), Local2) if (LNotEqual(Local2, 0x69)) { - err(ts, z111, 53, 0, 0, Local2, 0x69) + err(ts, z111, __LINE__, 0, 0, Local2, 0x69) } // m002 m002(Index(b000, 2)) if (LNotEqual(b000, Buffer() {1,2,0x69,4,5})) { - err(ts, z111, 54, 0, 0, b000, Buffer() {1,2,0x69,4,5}) + err(ts, z111, __LINE__, 0, 0, b000, Buffer() {1,2,0x69,4,5}) } Store(Index(b000, 2), Local0) m002(Local0) if (LNotEqual(b000, Buffer() {1,2,0x69,4,5})) { - err(ts, z111, 55, 0, 0, b000, Buffer() {1,2,0x69,4,5}) + err(ts, z111, __LINE__, 0, 0, b000, Buffer() {1,2,0x69,4,5}) } Store(DeRefOf(Local0), Local2) if (LNotEqual(Local2, 0x69)) { - err(ts, z111, 56, 0, 0, Local2, 0x69) + err(ts, z111, __LINE__, 0, 0, Local2, 0x69) } Store(Index(b000, 2, Local0), Local1) m002(Local0) if (LNotEqual(b000, Buffer() {1,2,0x69,4,5})) { - err(ts, z111, 57, 0, 0, b000, Buffer() {1,2,0x69,4,5}) + err(ts, z111, __LINE__, 0, 0, b000, Buffer() {1,2,0x69,4,5}) } Store(DeRefOf(Local0), Local2) if (LNotEqual(Local2, 0x69)) { - err(ts, z111, 58, 0, 0, Local2, 0x69) + err(ts, z111, __LINE__, 0, 0, Local2, 0x69) } m002(Local1) if (LNotEqual(b000, Buffer() {1,2,0x69,4,5})) { - err(ts, z111, 59, 0, 0, b000, Buffer() {1,2,0x69,4,5}) + err(ts, z111, __LINE__, 0, 0, b000, Buffer() {1,2,0x69,4,5}) } Store(DeRefOf(Local1), Local2) if (LNotEqual(Local2, 0x69)) { - err(ts, z111, 60, 0, 0, Local2, 0x69) + err(ts, z111, __LINE__, 0, 0, Local2, 0x69) } } @@ -4132,7 +4132,7 @@ Method(m34b,, Serialized) { Store(DeRefOf(arg0), Local2) if (LNotEqual(Local2, 0x69)) { - err(ts, z111, 61, 0, 0, Local2, 0x69) + err(ts, z111, __LINE__, 0, 0, Local2, 0x69) } } @@ -4143,7 +4143,7 @@ Method(m34b,, Serialized) Store(DeRefOf(Local1), Local2) if (LNotEqual(Local2, 0x69)) { - err(ts, z111, 62, 0, 0, Local2, 0x69) + err(ts, z111, __LINE__, 0, 0, Local2, 0x69) } } @@ -4157,75 +4157,75 @@ Method(m34b,, Serialized) m000(Index(b000, 2)) if (LNotEqual(b000, Buffer() {1,2,0x69,4,5})) { - err(ts, z111, 63, 0, 0, b000, Buffer() {1,2,0x69,4,5}) + err(ts, z111, __LINE__, 0, 0, b000, Buffer() {1,2,0x69,4,5}) } Store(Index(b000, 2), Local0) m000(Local0) if (LNotEqual(b000, Buffer() {1,2,0x69,4,5})) { - err(ts, z111, 64, 0, 0, b000, Buffer() {1,2,0x69,4,5}) + err(ts, z111, __LINE__, 0, 0, b000, Buffer() {1,2,0x69,4,5}) } Store(DeRefOf(Local0), Local2) if (LNotEqual(Local2, 0x69)) { - err(ts, z111, 65, 0, 0, Local2, 0x69) + err(ts, z111, __LINE__, 0, 0, Local2, 0x69) } Store(Index(b000, 2, Local0), Local1) m000(Local0) if (LNotEqual(b000, Buffer() {1,2,0x69,4,5})) { - err(ts, z111, 66, 0, 0, b000, Buffer() {1,2,0x69,4,5}) + err(ts, z111, __LINE__, 0, 0, b000, Buffer() {1,2,0x69,4,5}) } Store(DeRefOf(Local0), Local2) if (LNotEqual(Local2, 0x69)) { - err(ts, z111, 67, 0, 0, Local2, 0x69) + err(ts, z111, __LINE__, 0, 0, Local2, 0x69) } m000(Local1) if (LNotEqual(b000, Buffer() {1,2,0x69,4,5})) { - err(ts, z111, 68, 0, 0, b000, Buffer() {1,2,0x69,4,5}) + err(ts, z111, __LINE__, 0, 0, b000, Buffer() {1,2,0x69,4,5}) } Store(DeRefOf(Local1), Local2) if (LNotEqual(Local2, 0x69)) { - err(ts, z111, 69, 0, 0, Local2, 0x69) + err(ts, z111, __LINE__, 0, 0, Local2, 0x69) } // m001 m001(Index(b000, 2)) if (LNotEqual(b000, Buffer() {1,2,0x69,4,5})) { - err(ts, z111, 70, 0, 0, b000, Buffer() {1,2,0x69,4,5}) + err(ts, z111, __LINE__, 0, 0, b000, Buffer() {1,2,0x69,4,5}) } Store(Index(b000, 2), Local0) m001(Local0) if (LNotEqual(b000, Buffer() {1,2,0x69,4,5})) { - err(ts, z111, 71, 0, 0, b000, Buffer() {1,2,0x69,4,5}) + err(ts, z111, __LINE__, 0, 0, b000, Buffer() {1,2,0x69,4,5}) } if (y512) { Store(DeRefOf(Local0), Local2) if (LNotEqual(Local2, 0x69)) { - err(ts, z111, 72, 0, 0, Local2, 0x69) + err(ts, z111, __LINE__, 0, 0, Local2, 0x69) } } Store(Index(b000, 2, Local0), Local1) m001(Local0) if (LNotEqual(b000, Buffer() {1,2,0x69,4,5})) { - err(ts, z111, 73, 0, 0, b000, Buffer() {1,2,0x69,4,5}) + err(ts, z111, __LINE__, 0, 0, b000, Buffer() {1,2,0x69,4,5}) } if (y512) { Store(DeRefOf(Local0), Local2) if (LNotEqual(Local2, 0x69)) { - err(ts, z111, 74, 0, 0, Local2, 0x69) + err(ts, z111, __LINE__, 0, 0, Local2, 0x69) } } m001(Local1) if (LNotEqual(b000, Buffer() {1,2,0x69,4,5})) { - err(ts, z111, 75, 0, 0, b000, Buffer() {1,2,0x69,4,5}) + err(ts, z111, __LINE__, 0, 0, b000, Buffer() {1,2,0x69,4,5}) } if (y512) { Store(DeRefOf(Local1), Local2) if (LNotEqual(Local2, 0x69)) { - err(ts, z111, 76, 0, 0, Local2, 0x69) + err(ts, z111, __LINE__, 0, 0, Local2, 0x69) } } @@ -4233,40 +4233,40 @@ Method(m34b,, Serialized) m002(Index(b000, 2)) if (LNotEqual(b000, Buffer() {1,2,0x11,4,5})) { - err(ts, z111, 77, 0, 0, b000, Buffer() {1,2,0x11,4,5}) + err(ts, z111, __LINE__, 0, 0, b000, Buffer() {1,2,0x11,4,5}) } Store(Index(b000, 2), Local0) m002(Local0) if (LNotEqual(b000, Buffer() {1,2,0x11,4,5})) { - err(ts, z111, 78, 0, 0, b000, Buffer() {1,2,0x11,4,5}) + err(ts, z111, __LINE__, 0, 0, b000, Buffer() {1,2,0x11,4,5}) } if (y512) { Store(DeRefOf(Local0), Local2) if (LNotEqual(Local2, 0x11)) { - err(ts, z111, 79, 0, 0, Local2, 0x11) + err(ts, z111, __LINE__, 0, 0, Local2, 0x11) } } Store(Index(b000, 2, Local0), Local1) m002(Local0) if (LNotEqual(b000, Buffer() {1,2,0x11,4,5})) { - err(ts, z111, 80, 0, 0, b000, Buffer() {1,2,0x11,4,5}) + err(ts, z111, __LINE__, 0, 0, b000, Buffer() {1,2,0x11,4,5}) } if (y512) { Store(DeRefOf(Local0), Local2) if (LNotEqual(Local2, 0x11)) { - err(ts, z111, 81, 0, 0, Local2, 0x11) + err(ts, z111, __LINE__, 0, 0, Local2, 0x11) } } m002(Local1) if (LNotEqual(b000, Buffer() {1,2,0x11,4,5})) { - err(ts, z111, 82, 0, 0, b000, Buffer() {1,2,0x11,4,5}) + err(ts, z111, __LINE__, 0, 0, b000, Buffer() {1,2,0x11,4,5}) } if (y512) { Store(DeRefOf(Local1), Local2) if (LNotEqual(Local2, 0x11)) { - err(ts, z111, 83, 0, 0, Local2, 0x11) + err(ts, z111, __LINE__, 0, 0, Local2, 0x11) } } } @@ -4299,18 +4299,18 @@ Method(m34c,, Serialized) Store(ObjectType(Local2), Local3) if (LNotEqual(Local3, arg1)) { - err(ts, z111, 84, 0, 0, Local3, arg1) + err(ts, z111, __LINE__, 0, 0, Local3, arg1) } Store(Index(Local2, 1, Local0), Local1) Store(0x90, Local0) if (LNotEqual(Local0, 0x90)) { - err(ts, z111, 85, 0, 0, Local0, 0x90) + err(ts, z111, __LINE__, 0, 0, Local0, 0x90) } Store(0x91, Local1) if (LNotEqual(Local1, 0x91)) { - err(ts, z111, 86, 0, 0, Local1, 0x91) + err(ts, z111, __LINE__, 0, 0, Local1, 0x91) } } @@ -4323,11 +4323,11 @@ Method(m34c,, Serialized) CopyObject(0x94, Local0) if (LNotEqual(Local0, 0x94)) { - err(ts, z111, 87, 0, 0, Local0, 0x94) + err(ts, z111, __LINE__, 0, 0, Local0, 0x94) } CopyObject(0x95, Local1) if (LNotEqual(Local1, 0x95)) { - err(ts, z111, 88, 0, 0, Local1, 0x95) + err(ts, z111, __LINE__, 0, 0, Local1, 0x95) } } @@ -4365,7 +4365,7 @@ Method(m34c,, Serialized) Store(DerefOf(Local0), Local2) if (LNotEqual(Local2, 0x2b)) { - err(ts, z111, 89, 0, 0, Local2, 0x2b) + err(ts, z111, __LINE__, 0, 0, Local2, 0x2b) } } @@ -4571,7 +4571,7 @@ Method(m34d, 1, Serialized) { Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, arg2)) { - err(ts, z111, 90, 0, 0, Local0, arg2) + err(ts, z111, __LINE__, 0, 0, Local0, arg2) } if (op00) { @@ -4781,7 +4781,7 @@ Method(m34e, 1, Serialized) { Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, arg2)) { - err(ts, z111, 91, 0, 0, Local0, arg2) + err(ts, z111, __LINE__, 0, 0, Local0, arg2) } if (op00) { CopyObject(0x2b, arg0) @@ -4913,11 +4913,11 @@ Method(m351, 1, Serialized) Store(Index(arg0, lpC0), Local0) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c009)) { - err(ts, z111, 92, 0, 0, Local1, c009) + err(ts, z111, __LINE__, 0, 0, Local1, c009) } else { Store(DerefOf(Local0), Local1) if (LNotEqual(Local1, Local6)) { - err(ts, z111, 93, 0, 0, Local1, Local6) + err(ts, z111, __LINE__, 0, 0, Local1, Local6) } } Increment(Local6) @@ -5112,12 +5112,12 @@ Method(mfab,, Serialized) Index(p000, 15, Local0) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c01c)) { - err("mfab", z111, 94, 0, 0, Local1, c01c) + err("mfab", z111, __LINE__, 0, 0, Local1, c01c) } Store(ObjectType(DerefOf(Local0)), Local1) if (LNotEqual(Local1, c01c)) { - err("mfab", z111, 95, 0, 0, Local1, c01c) + err("mfab", z111, __LINE__, 0, 0, Local1, c01c) } } @@ -5160,14 +5160,14 @@ Method(mfad,, Serialized) Store(ObjectType(Local0), Local1) Store(Local1, Debug) if (LNotEqual(Local1, c01c)) { - err("mfad", z111, 96, 0, 0, Local1, c01c) + err("mfad", z111, __LINE__, 0, 0, Local1, c01c) } } else { /* * ObjectType here falls into the infinitive loop. * Sort this out! */ - err("mfad", z111, 97, 0, 0, 0, 0) + err("mfad", z111, __LINE__, 0, 0, 0, 0) } } @@ -5210,14 +5210,14 @@ Method(mfc3,, Serialized) Store(SizeOf(Local0), Local1) Store(Local1, Debug) if (LNotEqual(Local1, 100)) { - err("mfc3", z111, 98, 0, 0, Local1, 100) + err("mfc3", z111, __LINE__, 0, 0, Local1, 100) } } else { /* * SizeOf here falls into the infinitive loop. * Sort this out! */ - err("mfc3", z111, 99, 0, 0, 0, 0) + err("mfc3", z111, __LINE__, 0, 0, 0, 0) } } @@ -5261,14 +5261,14 @@ Method(mfc4,, Serialized) Store(DerefOf(Local0), Local1) Store(Local1, Debug) if (LNotEqual(Local1, 100)) { - err("mfc4", z111, 100, 0, 0, Local1, 100) + err("mfc4", z111, __LINE__, 0, 0, Local1, 100) } } else { /* * SizeOf here falls into the infinitive loop. * Sort this out! */ - err("mfc4", z111, 101, 0, 0, 0, 0) + err("mfc4", z111, __LINE__, 0, 0, 0, 0) } } diff --git a/tests/aslts/src/runtime/collections/functional/reference/ref71.asl b/tests/aslts/src/runtime/collections/functional/reference/ref71.asl index 66877cd27..cdbddcce4 100644 --- a/tests/aslts/src/runtime/collections/functional/reference/ref71.asl +++ b/tests/aslts/src/runtime/collections/functional/reference/ref71.asl @@ -63,31 +63,31 @@ Method(m1b3,, Serialized) Store(i900, Local0) Store(ObjectType(Local0), Local7) if (LNotEqual(Local7, c009)) { - err(ts, z109, 2, 0, 0, Local7, c009) + err(ts, z109, __LINE__, 0, 0, Local7, c009) } Store(s900, Local0) Store(ObjectType(Local0), Local7) if (LNotEqual(Local7, c00a)) { - err(ts, z109, 3, 0, 0, Local7, c00a) + err(ts, z109, __LINE__, 0, 0, Local7, c00a) } Store(b900, Local0) Store(ObjectType(Local0), Local7) if (LNotEqual(Local7, c00b)) { - err(ts, z109, 4, 0, 0, Local7, c00b) + err(ts, z109, __LINE__, 0, 0, Local7, c00b) } Store(p900, Local0) Store(ObjectType(Local0), Local7) if (LNotEqual(Local7, c00c)) { - err(ts, z109, 5, 0, 0, Local7, c00c) + err(ts, z109, __LINE__, 0, 0, Local7, c00c) } Store(f900, Local0) Store(ObjectType(Local0), Local7) if (LNotEqual(Local7, c009)) { - err(ts, z109, 6, 0, 0, Local7, c009) + err(ts, z109, __LINE__, 0, 0, Local7, c009) } /* @@ -157,6 +157,6 @@ Method(m1b3,, Serialized) Store(bf90, Local0) Store(ObjectType(Local0), Local7) if (LNotEqual(Local7, c009)) { - err(ts, z109, 23, 0, 0, Local7, c009) + err(ts, z109, __LINE__, 0, 0, Local7, c009) } } diff --git a/tests/aslts/src/runtime/collections/functional/region/bankfield.asl b/tests/aslts/src/runtime/collections/functional/region/bankfield.asl index 72fea151d..fb82027a1 100644 --- a/tests/aslts/src/runtime/collections/functional/region/bankfield.asl +++ b/tests/aslts/src/runtime/collections/functional/region/bankfield.asl @@ -69,9 +69,9 @@ OperationRegion(OPRj, SystemIO, 0x230, 0x133) Method(m7bf, 4) { if (LNotEqual(ObjectType(arg1), ObjectType(arg2))) { - err(arg0, z145, arg3, 0, 0, ObjectType(arg1), ObjectType(arg2)) + err(arg0, z145, __LINE__, 0, 0, ObjectType(arg1), ObjectType(arg2)) } elseif (LNotEqual(arg1, arg2)) { - err(arg0, z145, arg3, 0, 0, arg1, arg2) + err(arg0, z145, __LINE__, 0, 0, arg1, arg2) } } @@ -400,7 +400,7 @@ Method(m7d0, 6, Serialized) Store(Refof(g000), Local4) } default { - err(arg0, z145, 11, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -528,7 +528,7 @@ Method(m7d0, 6, Serialized) Store(Refof(g001), Local4) } default { - err(arg0, z145, 12, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -656,7 +656,7 @@ Method(m7d0, 6, Serialized) Store(Refof(g002), Local4) } default { - err(arg0, z145, 13, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -784,7 +784,7 @@ Method(m7d0, 6, Serialized) Store(Refof(g003), Local4) } default { - err(arg0, z145, 14, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -912,7 +912,7 @@ Method(m7d0, 6, Serialized) Store(Refof(g004), Local4) } default { - err(arg0, z145, 15, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -1040,7 +1040,7 @@ Method(m7d0, 6, Serialized) Store(Refof(g005), Local4) } default { - err(arg0, z145, 16, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -1168,7 +1168,7 @@ Method(m7d0, 6, Serialized) Store(Refof(g006), Local4) } default { - err(arg0, z145, 17, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -1296,7 +1296,7 @@ Method(m7d0, 6, Serialized) Store(Refof(g007), Local4) } default { - err(arg0, z145, 18, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -1424,7 +1424,7 @@ Method(m7d0, 6, Serialized) Store(Refof(g008), Local4) } default { - err(arg0, z145, 19, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -1552,7 +1552,7 @@ Method(m7d0, 6, Serialized) Store(Refof(g009), Local4) } default { - err(arg0, z145, 20, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -1680,7 +1680,7 @@ Method(m7d0, 6, Serialized) Store(Refof(g00a), Local4) } default { - err(arg0, z145, 21, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -1808,7 +1808,7 @@ Method(m7d0, 6, Serialized) Store(Refof(g00b), Local4) } default { - err(arg0, z145, 22, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -1936,7 +1936,7 @@ Method(m7d0, 6, Serialized) Store(Refof(g00c), Local4) } default { - err(arg0, z145, 23, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -2064,7 +2064,7 @@ Method(m7d0, 6, Serialized) Store(Refof(g00d), Local4) } default { - err(arg0, z145, 24, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -2192,7 +2192,7 @@ Method(m7d0, 6, Serialized) Store(Refof(g00e), Local4) } default { - err(arg0, z145, 25, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -2320,13 +2320,13 @@ Method(m7d0, 6, Serialized) Store(Refof(g000), Local4) } default { - err(arg0, z145, 26, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } } default { - err(arg0, z145, 27, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return} } @@ -2520,7 +2520,7 @@ Method(m7d1, 6, Serialized) Store(Refof(g000), Local4) } default { - err(arg0, z145, 28, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -2648,7 +2648,7 @@ Method(m7d1, 6, Serialized) Store(Refof(g001), Local4) } default { - err(arg0, z145, 29, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -2776,7 +2776,7 @@ Method(m7d1, 6, Serialized) Store(Refof(g002), Local4) } default { - err(arg0, z145, 30, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -2904,7 +2904,7 @@ Method(m7d1, 6, Serialized) Store(Refof(g003), Local4) } default { - err(arg0, z145, 31, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -3032,7 +3032,7 @@ Method(m7d1, 6, Serialized) Store(Refof(g004), Local4) } default { - err(arg0, z145, 32, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -3160,7 +3160,7 @@ Method(m7d1, 6, Serialized) Store(Refof(g005), Local4) } default { - err(arg0, z145, 33, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -3288,7 +3288,7 @@ Method(m7d1, 6, Serialized) Store(Refof(g006), Local4) } default { - err(arg0, z145, 34, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -3416,7 +3416,7 @@ Method(m7d1, 6, Serialized) Store(Refof(g007), Local4) } default { - err(arg0, z145, 35, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -3544,7 +3544,7 @@ Method(m7d1, 6, Serialized) Store(Refof(g008), Local4) } default { - err(arg0, z145, 36, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -3672,7 +3672,7 @@ Method(m7d1, 6, Serialized) Store(Refof(g009), Local4) } default { - err(arg0, z145, 37, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -3800,7 +3800,7 @@ Method(m7d1, 6, Serialized) Store(Refof(g00a), Local4) } default { - err(arg0, z145, 38, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -3928,7 +3928,7 @@ Method(m7d1, 6, Serialized) Store(Refof(g00b), Local4) } default { - err(arg0, z145, 39, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -4056,7 +4056,7 @@ Method(m7d1, 6, Serialized) Store(Refof(g00c), Local4) } default { - err(arg0, z145, 40, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -4184,7 +4184,7 @@ Method(m7d1, 6, Serialized) Store(Refof(g00d), Local4) } default { - err(arg0, z145, 41, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -4312,7 +4312,7 @@ Method(m7d1, 6, Serialized) Store(Refof(g00e), Local4) } default { - err(arg0, z145, 42, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -4440,13 +4440,13 @@ Method(m7d1, 6, Serialized) Store(Refof(g000), Local4) } default { - err(arg0, z145, 43, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } } default { - err(arg0, z145, 44, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return} } @@ -4640,7 +4640,7 @@ Method(m7d2, 6, Serialized) Store(Refof(g000), Local4) } default { - err(arg0, z145, 45, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -4768,7 +4768,7 @@ Method(m7d2, 6, Serialized) Store(Refof(g001), Local4) } default { - err(arg0, z145, 46, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -4896,7 +4896,7 @@ Method(m7d2, 6, Serialized) Store(Refof(g002), Local4) } default { - err(arg0, z145, 47, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -5024,7 +5024,7 @@ Method(m7d2, 6, Serialized) Store(Refof(g003), Local4) } default { - err(arg0, z145, 48, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -5152,7 +5152,7 @@ Method(m7d2, 6, Serialized) Store(Refof(g004), Local4) } default { - err(arg0, z145, 49, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -5280,7 +5280,7 @@ Method(m7d2, 6, Serialized) Store(Refof(g005), Local4) } default { - err(arg0, z145, 50, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -5408,7 +5408,7 @@ Method(m7d2, 6, Serialized) Store(Refof(g006), Local4) } default { - err(arg0, z145, 51, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -5536,7 +5536,7 @@ Method(m7d2, 6, Serialized) Store(Refof(g007), Local4) } default { - err(arg0, z145, 52, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -5664,7 +5664,7 @@ Method(m7d2, 6, Serialized) Store(Refof(g008), Local4) } default { - err(arg0, z145, 53, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -5792,7 +5792,7 @@ Method(m7d2, 6, Serialized) Store(Refof(g009), Local4) } default { - err(arg0, z145, 54, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -5920,7 +5920,7 @@ Method(m7d2, 6, Serialized) Store(Refof(g00a), Local4) } default { - err(arg0, z145, 55, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -6048,7 +6048,7 @@ Method(m7d2, 6, Serialized) Store(Refof(g00b), Local4) } default { - err(arg0, z145, 56, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -6176,7 +6176,7 @@ Method(m7d2, 6, Serialized) Store(Refof(g00c), Local4) } default { - err(arg0, z145, 32, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -6312,7 +6312,7 @@ Method(m7d2, 6, Serialized) Store(Refof(g00d), Local4) } default { - err(arg0, z145, 57, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -6440,7 +6440,7 @@ Method(m7d2, 6, Serialized) Store(Refof(g00e), Local4) } default { - err(arg0, z145, 58, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -6568,13 +6568,13 @@ Method(m7d2, 6, Serialized) Store(Refof(g000), Local4) } default { - err(arg0, z145, 59, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } } default { - err(arg0, z145, 60, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return} } @@ -6768,7 +6768,7 @@ Method(m7d3, 6, Serialized) Store(Refof(g000), Local4) } default { - err(arg0, z145, 61, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -6896,7 +6896,7 @@ Method(m7d3, 6, Serialized) Store(Refof(g001), Local4) } default { - err(arg0, z145, 62, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -7024,7 +7024,7 @@ Method(m7d3, 6, Serialized) Store(Refof(g002), Local4) } default { - err(arg0, z145, 63, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -7152,7 +7152,7 @@ Method(m7d3, 6, Serialized) Store(Refof(g003), Local4) } default { - err(arg0, z145, 64, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -7280,7 +7280,7 @@ Method(m7d3, 6, Serialized) Store(Refof(g004), Local4) } default { - err(arg0, z145, 65, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -7408,7 +7408,7 @@ Method(m7d3, 6, Serialized) Store(Refof(g005), Local4) } default { - err(arg0, z145, 66, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -7536,7 +7536,7 @@ Method(m7d3, 6, Serialized) Store(Refof(g006), Local4) } default { - err(arg0, z145, 67, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -7664,7 +7664,7 @@ Method(m7d3, 6, Serialized) Store(Refof(g007), Local4) } default { - err(arg0, z145, 68, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -7792,7 +7792,7 @@ Method(m7d3, 6, Serialized) Store(Refof(g008), Local4) } default { - err(arg0, z145, 69, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -7920,7 +7920,7 @@ Method(m7d3, 6, Serialized) Store(Refof(g009), Local4) } default { - err(arg0, z145, 70, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -8048,7 +8048,7 @@ Method(m7d3, 6, Serialized) Store(Refof(g00a), Local4) } default { - err(arg0, z145, 71, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -8176,7 +8176,7 @@ Method(m7d3, 6, Serialized) Store(Refof(g00b), Local4) } default { - err(arg0, z145, 72, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -8304,7 +8304,7 @@ Method(m7d3, 6, Serialized) Store(Refof(g00c), Local4) } default { - err(arg0, z145, 73, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -8432,7 +8432,7 @@ Method(m7d3, 6, Serialized) Store(Refof(g00d), Local4) } default { - err(arg0, z145, 74, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -8560,7 +8560,7 @@ Method(m7d3, 6, Serialized) Store(Refof(g00e), Local4) } default { - err(arg0, z145, 75, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -8688,13 +8688,13 @@ Method(m7d3, 6, Serialized) Store(Refof(g000), Local4) } default { - err(arg0, z145, 76, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } } default { - err(arg0, z145, 77, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return} } @@ -8888,7 +8888,7 @@ Method(m7d4, 6, Serialized) Store(Refof(g000), Local4) } default { - err(arg0, z145, 78, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -9016,7 +9016,7 @@ Method(m7d4, 6, Serialized) Store(Refof(g001), Local4) } default { - err(arg0, z145, 79, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -9144,7 +9144,7 @@ Method(m7d4, 6, Serialized) Store(Refof(g002), Local4) } default { - err(arg0, z145, 80, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -9272,7 +9272,7 @@ Method(m7d4, 6, Serialized) Store(Refof(g003), Local4) } default { - err(arg0, z145, 81, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -9400,7 +9400,7 @@ Method(m7d4, 6, Serialized) Store(Refof(g004), Local4) } default { - err(arg0, z145, 82, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -9528,7 +9528,7 @@ Method(m7d4, 6, Serialized) Store(Refof(g005), Local4) } default { - err(arg0, z145, 83, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -9656,7 +9656,7 @@ Method(m7d4, 6, Serialized) Store(Refof(g006), Local4) } default { - err(arg0, z145, 84, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -9784,7 +9784,7 @@ Method(m7d4, 6, Serialized) Store(Refof(g007), Local4) } default { - err(arg0, z145, 85, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -9912,7 +9912,7 @@ Method(m7d4, 6, Serialized) Store(Refof(g008), Local4) } default { - err(arg0, z145, 86, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -10040,7 +10040,7 @@ Method(m7d4, 6, Serialized) Store(Refof(g009), Local4) } default { - err(arg0, z145, 87, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -10168,7 +10168,7 @@ Method(m7d4, 6, Serialized) Store(Refof(g00a), Local4) } default { - err(arg0, z145, 88, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -10296,7 +10296,7 @@ Method(m7d4, 6, Serialized) Store(Refof(g00b), Local4) } default { - err(arg0, z145, 89, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -10424,7 +10424,7 @@ Method(m7d4, 6, Serialized) Store(Refof(g00c), Local4) } default { - err(arg0, z145, 90, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -10552,7 +10552,7 @@ Method(m7d4, 6, Serialized) Store(Refof(g00d), Local4) } default { - err(arg0, z145, 91, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -10680,7 +10680,7 @@ Method(m7d4, 6, Serialized) Store(Refof(g00e), Local4) } default { - err(arg0, z145, 92, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } @@ -10808,13 +10808,13 @@ Method(m7d4, 6, Serialized) Store(Refof(g000), Local4) } default { - err(arg0, z145, 93, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return } } } default { - err(arg0, z145, 94, 0, 0, arg2, arg3) + err(arg0, z145, __LINE__, 0, 0, arg2, arg3) return} } @@ -11572,7 +11572,7 @@ Method(m7c8, 1, Serialized) } if (LNotEqual(bf03, i000)) { - err(arg0, z145, arg2, 0, 0, bf03, i000) + err(arg0, z145, __LINE__, 0, 0, bf03, i000) } } @@ -11581,13 +11581,13 @@ Method(m7c8, 1, Serialized) Store(i000, bf00) if (LNotEqual(bf00, i000)) { - err(arg0, z145, 115, 0, 0, bf00, i000) + err(arg0, z145, __LINE__, 0, 0, bf00, i000) } if (LNotEqual(bf01, i000)) { - err(arg0, z145, 116, 0, 0, bf00, i000) + err(arg0, z145, __LINE__, 0, 0, bf00, i000) } if (LNotEqual(bf02, i000)) { - err(arg0, z145, 117, 0, 0, bf00, i000) + err(arg0, z145, __LINE__, 0, 0, bf00, i000) } // diff --git a/tests/aslts/src/runtime/collections/functional/region/dtregions.asl b/tests/aslts/src/runtime/collections/functional/region/dtregions.asl index 8ad59ccf2..8a4edd2de 100644 --- a/tests/aslts/src/runtime/collections/functional/region/dtregions.asl +++ b/tests/aslts/src/runtime/collections/functional/region/dtregions.asl @@ -115,16 +115,16 @@ Method(m7f0, 1) \DTR0._REG(0x101, 2) if (LNotEqual(\DTR0.IRSK, 1)) { - err(arg0, z142, 1, 0, 0, \DTR0.IRSK, 1) + err(arg0, z142, __LINE__, 0, 0, \DTR0.IRSK, 1) } if (LNotEqual(\DTR0.IFLG, 1)) { - err(arg0, z142, 2, 0, 0, \DTR0.IFLG, 1) + err(arg0, z142, __LINE__, 0, 0, \DTR0.IFLG, 1) } if (LNotEqual(\DTR0.VRSK, 2)) { - err(arg0, z142, 3, 0, 0, \DTR0.VRSK, 2) + err(arg0, z142, __LINE__, 0, 0, \DTR0.VRSK, 2) } if (LNotEqual(Derefof(Index(\DTR0.VFLG, 1)), 2)) { - err(arg0, z142, 4, 0, 0, Derefof(Index(\DTR0.VFLG, 1)), 2) + err(arg0, z142, __LINE__, 0, 0, Derefof(Index(\DTR0.VFLG, 1)), 2) } } @@ -175,34 +175,34 @@ Method(m7f1, 1, Serialized) Concatenate(arg0, "-m7f1", arg0) if (LNotEqual(VRSK, 0)) { - err(arg0, z142, 5, 0, 0, VRSK, 0) + err(arg0, z142, __LINE__, 0, 0, VRSK, 0) } if (LNotEqual(Derefof(Index(VFLG, 1)), 0)) { - err(arg0, z142, 6, 0, 0, Derefof(Index(VFLG, 1)), 0) + err(arg0, z142, __LINE__, 0, 0, Derefof(Index(VFLG, 1)), 0) } DataTableRegion (DR00, "SSDT", "", "") if (LNotEqual(IRSK, 0)) { - err(arg0, z142, 8, 0, 0, IRSK, 0) + err(arg0, z142, __LINE__, 0, 0, IRSK, 0) } if (LNotEqual(IFLG, 0)) { - err(arg0, z142, 9, 0, 0, IFLG, 0) + err(arg0, z142, __LINE__, 0, 0, IFLG, 0) } _REG(0x101, 2) if (LNotEqual(IRSK, 1)) { - err(arg0, z142, 10, 0, 0, IRSK, 1) + err(arg0, z142, __LINE__, 0, 0, IRSK, 1) } if (LNotEqual(IFLG, 1)) { - err(arg0, z142, 11, 0, 0, IFLG, 1) + err(arg0, z142, __LINE__, 0, 0, IFLG, 1) } if (LNotEqual(VRSK, 1)) { - err(arg0, z142, 12, 0, 0, VRSK, 1) + err(arg0, z142, __LINE__, 0, 0, VRSK, 1) } if (LNotEqual(Derefof(Index(VFLG, 1)), 1)) { - err(arg0, z142, 13, 0, 0, Derefof(Index(VFLG, 1)), 1) + err(arg0, z142, __LINE__, 0, 0, Derefof(Index(VFLG, 1)), 1) } } @@ -226,7 +226,7 @@ Method(m7f2, 1, Serialized) Store(\DTR0.SSDT, Local3) if (LNotEqual(Local2, Local3)) { - err(arg0, z142, 17, 0, 0, Local2, Local3) + err(arg0, z142, __LINE__, 0, 0, Local2, Local3) } } @@ -249,7 +249,7 @@ Method(m7f3, 1, Serialized) Store(\DTR0.SSDT, Local1) if (LNotEqual(Local0, Local1)) { - err(arg0, z142, 18, 0, 0, Local0, Local1) + err(arg0, z142, __LINE__, 0, 0, Local0, Local1) } } @@ -264,7 +264,7 @@ Method(m7f3, 1, Serialized) Store(\DTR0.SSDT, Local1) if (LNotEqual(Local0, Local1)) { - err(arg0, z142, 19, 0, 0, Local0, Local1) + err(arg0, z142, __LINE__, 0, 0, Local0, Local1) } } @@ -279,7 +279,7 @@ Method(m7f3, 1, Serialized) Store(\DTR0.SSDT, Local1) if (LNotEqual(Local0, Local1)) { - err(arg0, z142, 20, 0, 0, Local0, Local1) + err(arg0, z142, __LINE__, 0, 0, Local0, Local1) } } @@ -298,7 +298,7 @@ Method(m7f3, 1, Serialized) Store(\DTR0.SSDT, Local1) if (LNotEqual(Local0, Local1)) { - err(arg0, z142, 21, 0, 0, Local0, Local1) + err(arg0, z142, __LINE__, 0, 0, Local0, Local1) } } @@ -316,7 +316,7 @@ Method(m7f3, 1, Serialized) Store(\DTR0.SSDT, Local1) if (LNotEqual(Local0, Local1)) { - err(arg0, z142, 22, 0, 0, Local0, Local1) + err(arg0, z142, __LINE__, 0, 0, Local0, Local1) } } @@ -343,7 +343,7 @@ Method(m7f4, 1) Store(ToString(FU00, 4), Local0) if (LNotEqual(Local0, arg1)) { - err(arg0, z142, arg2, 0, 0, Local0, arg1) + err(arg0, z142, __LINE__, 0, 0, Local0, arg1) } } diff --git a/tests/aslts/src/runtime/collections/functional/region/indexfield.asl b/tests/aslts/src/runtime/collections/functional/region/indexfield.asl index 40b40e3ee..e4e141b2e 100644 --- a/tests/aslts/src/runtime/collections/functional/region/indexfield.asl +++ b/tests/aslts/src/runtime/collections/functional/region/indexfield.asl @@ -100,25 +100,25 @@ Method(m770, 1, Serialized) Store(ObjectType(reg0), Local0) Store(c00d, Local1) if (LNotEqual(Local0, Local1)) { - err(arg0, z144, 1, 0, 0, Local0, Local1) + err(arg0, z144, __LINE__, 0, 0, Local0, Local1) } Store(ObjectType(reg1), Local0) Store(c00d, Local1) if (LNotEqual(Local0, Local1)) { - err(arg0, z144, 2, 0, 0, Local0, Local1) + err(arg0, z144, __LINE__, 0, 0, Local0, Local1) } Store(ObjectType(reg2), Local0) Store(c00d, Local1) if (LNotEqual(Local1, Local0)) { - err(arg0, z144, 3, 0, 0, Local0, Local1) + err(arg0, z144, __LINE__, 0, 0, Local0, Local1) } Store(ObjectType(reg3), Local0) Store(c00d, Local1) if (LNotEqual(Local1, Local0)) { - err(arg0, z144, 4, 0, 0, Local0, Local1) + err(arg0, z144, __LINE__, 0, 0, Local0, Local1) } // Check actual writes to the IndexField(s). @@ -131,7 +131,7 @@ Method(m770, 1, Serialized) Store(fk32, Local0) Store(0xF11A, Local1) if (LNotEqual(Local1, Local0)) { - err(arg0, z144, 5, 0, 0, Local0, Local1) + err(arg0, z144, __LINE__, 0, 0, Local0, Local1) } Store(i000, fk32) @@ -140,7 +140,7 @@ Method(m770, 1, Serialized) Store(fk32, Local0) Store(0xD25B, Local1) if (LNotEqual(Local1, Local0)) { - err(arg0, z144, 6, 0, 0, Local0, Local1) + err(arg0, z144, __LINE__, 0, 0, Local0, Local1) } Store(i000, fk32) @@ -149,7 +149,7 @@ Method(m770, 1, Serialized) Store(fk32, Local0) Store(0x939C, Local1) if (LNotEqual(Local1, Local0)) { - err(arg0, z144, 7, 0, 0, Local0, Local1) + err(arg0, z144, __LINE__, 0, 0, Local0, Local1) } Store(i000, fk32) @@ -158,7 +158,7 @@ Method(m770, 1, Serialized) Store(fk32, Local0) Store(0x54ED, Local1) if (LNotEqual(Local1, Local0)) { - err(arg0, z144, 8, 0, 0, Local0, Local1) + err(arg0, z144, __LINE__, 0, 0, Local0, Local1) } } @@ -340,7 +340,7 @@ Method(m77e, 7) } if (LNotEqual(arg5, Local2)) { - err(arg0, z144, 9, z144, arg6, Local2, arg5) + err(arg0, z144, __LINE__, z144, arg6, Local2, arg5) } // Fill then immediately read @@ -352,7 +352,7 @@ Method(m77e, 7) Store(Derefof(arg2), Local2) if (LNotEqual(arg1, Local2)) { - err(arg0, z144, 10, z144, arg6, Local2, arg1) + err(arg0, z144, __LINE__, z144, arg6, Local2, arg1) } /* @@ -366,7 +366,7 @@ Method(m77e, 7) Store(Derefof(arg3), Local2) if (LNotEqual(arg5, Local2)) { - err(arg0, z144, 11, z144, arg6, Local2, arg5) + err(arg0, z144, __LINE__, z144, arg6, Local2, arg5) } */ } @@ -1347,7 +1347,7 @@ BreakPoint Store(Refof(g000), Local4) } default { - err(arg0, z144, 12, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -1459,7 +1459,7 @@ BreakPoint Store(Refof(g001), Local4) } default { - err(arg0, z144, 13, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -1571,7 +1571,7 @@ BreakPoint Store(Refof(g002), Local4) } default { - err(arg0, z144, 14, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -1683,7 +1683,7 @@ BreakPoint Store(Refof(g003), Local4) } default { - err(arg0, z144, 15, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -1795,7 +1795,7 @@ BreakPoint Store(Refof(g004), Local4) } default { - err(arg0, z144, 16, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -1907,7 +1907,7 @@ BreakPoint Store(Refof(g005), Local4) } default { - err(arg0, z144, 17, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -2019,7 +2019,7 @@ BreakPoint Store(Refof(g006), Local4) } default { - err(arg0, z144, 18, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -2131,7 +2131,7 @@ BreakPoint Store(Refof(g007), Local4) } default { - err(arg0, z144, 19, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -2243,7 +2243,7 @@ BreakPoint Store(Refof(g008), Local4) } default { - err(arg0, z144, 20, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -2355,7 +2355,7 @@ BreakPoint Store(Refof(g009), Local4) } default { - err(arg0, z144, 21, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -2467,7 +2467,7 @@ BreakPoint Store(Refof(g00a), Local4) } default { - err(arg0, z144, 22, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -2579,7 +2579,7 @@ BreakPoint Store(Refof(g00b), Local4) } default { - err(arg0, z144, 23, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -2691,7 +2691,7 @@ BreakPoint Store(Refof(g00c), Local4) } default { - err(arg0, z144, 24, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -2803,7 +2803,7 @@ BreakPoint Store(Refof(g00d), Local4) } default { - err(arg0, z144, 25, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -2915,7 +2915,7 @@ BreakPoint Store(Refof(g00e), Local4) } default { - err(arg0, z144, 26, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -3027,13 +3027,13 @@ BreakPoint Store(Refof(g000), Local4) } default { - err(arg0, z144, 27, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } } default { - err(arg0, z144, 28, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return} } @@ -3301,7 +3301,7 @@ Method(m791, 6, Serialized) Store(Refof(g000), Local4) } default { - err(arg0, z144, 29, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -3405,7 +3405,7 @@ Method(m791, 6, Serialized) Store(Refof(g001), Local4) } default { - err(arg0, z144, 30, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -3509,7 +3509,7 @@ Method(m791, 6, Serialized) Store(Refof(g002), Local4) } default { - err(arg0, z144, 31, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -3613,7 +3613,7 @@ Method(m791, 6, Serialized) Store(Refof(g003), Local4) } default { - err(arg0, z144, 32, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -3717,7 +3717,7 @@ Method(m791, 6, Serialized) Store(Refof(g004), Local4) } default { - err(arg0, z144, 33, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -3821,7 +3821,7 @@ Method(m791, 6, Serialized) Store(Refof(g005), Local4) } default { - err(arg0, z144, 34, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -3925,7 +3925,7 @@ Method(m791, 6, Serialized) Store(Refof(g006), Local4) } default { - err(arg0, z144, 35, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -4029,7 +4029,7 @@ Method(m791, 6, Serialized) Store(Refof(g007), Local4) } default { - err(arg0, z144, 36, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -4133,7 +4133,7 @@ Method(m791, 6, Serialized) Store(Refof(g008), Local4) } default { - err(arg0, z144, 37, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -4237,7 +4237,7 @@ Method(m791, 6, Serialized) Store(Refof(g009), Local4) } default { - err(arg0, z144, 38, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -4341,7 +4341,7 @@ Method(m791, 6, Serialized) Store(Refof(g00a), Local4) } default { - err(arg0, z144, 39, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -4445,7 +4445,7 @@ Method(m791, 6, Serialized) Store(Refof(g00b), Local4) } default { - err(arg0, z144, 40, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -4549,7 +4549,7 @@ Method(m791, 6, Serialized) Store(Refof(g00c), Local4) } default { - err(arg0, z144, 41, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -4653,7 +4653,7 @@ Method(m791, 6, Serialized) Store(Refof(g00d), Local4) } default { - err(arg0, z144, 42, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -4757,7 +4757,7 @@ Method(m791, 6, Serialized) Store(Refof(g00e), Local4) } default { - err(arg0, z144, 43, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -4861,13 +4861,13 @@ Method(m791, 6, Serialized) Store(Refof(g000), Local4) } default { - err(arg0, z144, 44, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } } default { - err(arg0, z144, 45, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return} } @@ -5135,7 +5135,7 @@ Method(m792, 6, Serialized) Store(Refof(g000), Local4) } default { - err(arg0, z144, 46, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -5239,7 +5239,7 @@ Method(m792, 6, Serialized) Store(Refof(g001), Local4) } default { - err(arg0, z144, 47, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -5343,7 +5343,7 @@ Method(m792, 6, Serialized) Store(Refof(g002), Local4) } default { - err(arg0, z144, 48, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -5447,7 +5447,7 @@ Method(m792, 6, Serialized) Store(Refof(g003), Local4) } default { - err(arg0, z144, 49, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -5551,7 +5551,7 @@ Method(m792, 6, Serialized) Store(Refof(g004), Local4) } default { - err(arg0, z144, 50, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -5655,7 +5655,7 @@ Method(m792, 6, Serialized) Store(Refof(g005), Local4) } default { - err(arg0, z144, 51, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -5759,7 +5759,7 @@ Method(m792, 6, Serialized) Store(Refof(g006), Local4) } default { - err(arg0, z144, 52, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -5863,7 +5863,7 @@ Method(m792, 6, Serialized) Store(Refof(g007), Local4) } default { - err(arg0, z144, 53, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -5967,7 +5967,7 @@ Method(m792, 6, Serialized) Store(Refof(g008), Local4) } default { - err(arg0, z144, 54, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -6071,7 +6071,7 @@ Method(m792, 6, Serialized) Store(Refof(g009), Local4) } default { - err(arg0, z144, 55, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -6175,7 +6175,7 @@ Method(m792, 6, Serialized) Store(Refof(g00a), Local4) } default { - err(arg0, z144, 56, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -6279,7 +6279,7 @@ Method(m792, 6, Serialized) Store(Refof(g00b), Local4) } default { - err(arg0, z144, 57, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -6383,7 +6383,7 @@ Method(m792, 6, Serialized) Store(Refof(g00c), Local4) } default { - err(arg0, z144, 58, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -6487,7 +6487,7 @@ Method(m792, 6, Serialized) Store(Refof(g00d), Local4) } default { - err(arg0, z144, 59, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -6591,7 +6591,7 @@ Method(m792, 6, Serialized) Store(Refof(g00e), Local4) } default { - err(arg0, z144, 60, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -6695,13 +6695,13 @@ Method(m792, 6, Serialized) Store(Refof(g000), Local4) } default { - err(arg0, z144, 61, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } } default { - err(arg0, z144, 62, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return} } @@ -6971,7 +6971,7 @@ Method(m793, 6, Serialized) Store(Refof(g000), Local4) } default { - err(arg0, z144, 63, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -7075,7 +7075,7 @@ Method(m793, 6, Serialized) Store(Refof(g001), Local4) } default { - err(arg0, z144, 64, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -7179,7 +7179,7 @@ Method(m793, 6, Serialized) Store(Refof(g002), Local4) } default { - err(arg0, z144, 65, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -7283,7 +7283,7 @@ Method(m793, 6, Serialized) Store(Refof(g003), Local4) } default { - err(arg0, z144, 66, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -7387,7 +7387,7 @@ Method(m793, 6, Serialized) Store(Refof(g004), Local4) } default { - err(arg0, z144, 67, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -7491,7 +7491,7 @@ Method(m793, 6, Serialized) Store(Refof(g005), Local4) } default { - err(arg0, z144, 68, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -7595,7 +7595,7 @@ Method(m793, 6, Serialized) Store(Refof(g006), Local4) } default { - err(arg0, z144, 69, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -7699,7 +7699,7 @@ Method(m793, 6, Serialized) Store(Refof(g007), Local4) } default { - err(arg0, z144, 70, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -7803,7 +7803,7 @@ Method(m793, 6, Serialized) Store(Refof(g008), Local4) } default { - err(arg0, z144, 71, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -7907,7 +7907,7 @@ Method(m793, 6, Serialized) Store(Refof(g009), Local4) } default { - err(arg0, z144, 72, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -8011,7 +8011,7 @@ Method(m793, 6, Serialized) Store(Refof(g00a), Local4) } default { - err(arg0, z144, 73, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -8115,7 +8115,7 @@ Method(m793, 6, Serialized) Store(Refof(g00b), Local4) } default { - err(arg0, z144, 74, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -8219,7 +8219,7 @@ Method(m793, 6, Serialized) Store(Refof(g00c), Local4) } default { - err(arg0, z144, 75, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -8323,7 +8323,7 @@ Method(m793, 6, Serialized) Store(Refof(g00d), Local4) } default { - err(arg0, z144, 76, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -8427,7 +8427,7 @@ Method(m793, 6, Serialized) Store(Refof(g00e), Local4) } default { - err(arg0, z144, 77, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -8531,13 +8531,13 @@ Method(m793, 6, Serialized) Store(Refof(g000), Local4) } default { - err(arg0, z144, 78, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } } default { - err(arg0, z144, 79, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return} } @@ -8807,7 +8807,7 @@ BreakPoint Store(Refof(g000), Local4) } default { - err(arg0, z144, 80, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -8911,7 +8911,7 @@ BreakPoint Store(Refof(g001), Local4) } default { - err(arg0, z144, 81, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -9015,7 +9015,7 @@ BreakPoint Store(Refof(g002), Local4) } default { - err(arg0, z144, 82, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -9119,7 +9119,7 @@ BreakPoint Store(Refof(g003), Local4) } default { - err(arg0, z144, 83, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -9223,7 +9223,7 @@ BreakPoint Store(Refof(g004), Local4) } default { - err(arg0, z144, 84, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -9327,7 +9327,7 @@ BreakPoint Store(Refof(g005), Local4) } default { - err(arg0, z144, 85, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -9431,7 +9431,7 @@ BreakPoint Store(Refof(g006), Local4) } default { - err(arg0, z144, 86, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -9535,7 +9535,7 @@ BreakPoint Store(Refof(g007), Local4) } default { - err(arg0, z144, 87, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -9639,7 +9639,7 @@ BreakPoint Store(Refof(g008), Local4) } default { - err(arg0, z144, 88, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -9743,7 +9743,7 @@ BreakPoint Store(Refof(g009), Local4) } default { - err(arg0, z144, 89, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -9847,7 +9847,7 @@ BreakPoint Store(Refof(g00a), Local4) } default { - err(arg0, z144, 90, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -9951,7 +9951,7 @@ BreakPoint Store(Refof(g00b), Local4) } default { - err(arg0, z144, 91, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -10055,7 +10055,7 @@ BreakPoint Store(Refof(g00c), Local4) } default { - err(arg0, z144, 92, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -10159,7 +10159,7 @@ BreakPoint Store(Refof(g00d), Local4) } default { - err(arg0, z144, 93, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -10263,7 +10263,7 @@ BreakPoint Store(Refof(g00e), Local4) } default { - err(arg0, z144, 94, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } @@ -10367,13 +10367,13 @@ BreakPoint Store(Refof(g000), Local4) } default { - err(arg0, z144, 95, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return } } } default { - err(arg0, z144, 100, 0, 0, arg2, arg3) + err(arg0, z144, __LINE__, 0, 0, arg2, arg3) return} } diff --git a/tests/aslts/src/runtime/collections/functional/region/opregions.asl b/tests/aslts/src/runtime/collections/functional/region/opregions.asl index 3260ec9e1..9f7571188 100644 --- a/tests/aslts/src/runtime/collections/functional/region/opregions.asl +++ b/tests/aslts/src/runtime/collections/functional/region/opregions.asl @@ -398,17 +398,17 @@ Method(m700, 1) // Check incorrect calls if (LNotEqual(IRSK, 0)) { - err(arg0, z141, 1, 0, 0, IRSK, 0) + err(arg0, z141, __LINE__, 0, 0, IRSK, 0) } if (LNotEqual(IFLG, 0)) { - err(arg0, z141, 2, 0, 0, IFLG, 0) + err(arg0, z141, __LINE__, 0, 0, IFLG, 0) } if (LNotEqual(\DOR0.IRSK, 0)) { - err(arg0, z141, 3, 0, 0, IRSK, 0) + err(arg0, z141, __LINE__, 0, 0, IRSK, 0) } if (LNotEqual(\DOR0.IFLG, 0)) { - err(arg0, z141, 4, 0, 0, IFLG, 0) + err(arg0, z141, __LINE__, 0, 0, IFLG, 0) } // Emulate and verify incorrect calls @@ -417,29 +417,29 @@ Method(m700, 1) \DOR0._REG(FRSK, 2) if (LNotEqual(IRSK, 1)) { - err(arg0, z141, 5, 0, 0, IRSK, 1) + err(arg0, z141, __LINE__, 0, 0, IRSK, 1) } if (LNotEqual(IFLG, 1)) { - err(arg0, z141, 6, 0, 0, IFLG, 1) + err(arg0, z141, __LINE__, 0, 0, IFLG, 1) } if (LNotEqual(\DOR0.IRSK, 1)) { - err(arg0, z141, 7, 0, 0, IRSK, 1) + err(arg0, z141, __LINE__, 0, 0, IRSK, 1) } if (LNotEqual(\DOR0.IFLG, 1)) { - err(arg0, z141, 8, 0, 0, IFLG, 1) + err(arg0, z141, __LINE__, 0, 0, IFLG, 1) } // Check total calls to \_REG if (LNotEqual(Derefof(Index(VFLG, 1)), 9)) { - err(arg0, z141, 9, 0, 0, Derefof(Index(VFLG, 1)), 9) + err(arg0, z141, __LINE__, 0, 0, Derefof(Index(VFLG, 1)), 9) } m70e(arg0, 1, VRSK, ERSK, 10) // Check total calls to \DOR0._REG if (LNotEqual(Derefof(Index(\DOR0.VFLG, 1)), 6)) { - err(arg0, z141, 11, 0, 0, Derefof(Index(\DOR0.VFLG, 1)), 6) + err(arg0, z141, __LINE__, 0, 0, Derefof(Index(\DOR0.VFLG, 1)), 6) } m70e(arg0, 1, \DOR0.VRSK, \DOR0.ERSK, 12) } @@ -452,35 +452,35 @@ Method(m701, 1) Concatenate(arg0, "-m701", arg0) if (LNotEqual(\DOR1.IREG, 0)) { - err(arg0, z141, 13, 0, 0, \DOR1.IREG, 0) + err(arg0, z141, __LINE__, 0, 0, \DOR1.IREG, 0) } if (LNotEqual(\DOR1.IRSK, 0)) { - err(arg0, z141, 14, 0, 0, \DOR1.IRSK, 0) + err(arg0, z141, __LINE__, 0, 0, \DOR1.IRSK, 0) } if (LNotEqual(\DOR1.IFLG, 0)) { - err(arg0, z141, 15, 0, 0, \DOR1.IFLG, 0) + err(arg0, z141, __LINE__, 0, 0, \DOR1.IFLG, 0) } if (LNotEqual(Derefof(Index(\DOR1.VFLG, 1)), 0)) { - err(arg0, z141, 16, 0, 0, Derefof(Index(\DOR1.VFLG, 1)), 0) + err(arg0, z141, __LINE__, 0, 0, Derefof(Index(\DOR1.VFLG, 1)), 0) } m70e(arg0, 2, \DOR1.VRSK, 0, 17) \DOR1.M000() if (LNotEqual(\DOR1.IREG, 0)) { - err(arg0, z141, 18, 0, 0, \DOR1.IREG, 1) + err(arg0, z141, __LINE__, 0, 0, \DOR1.IREG, 1) } if (LNotEqual(\DOR1.IRSK, 1)) { - err(arg0, z141, 19, 0, 0, \DOR1.IRSK, 1) + err(arg0, z141, __LINE__, 0, 0, \DOR1.IRSK, 1) } if (LNotEqual(\DOR1.IFLG, 1)) { - err(arg0, z141, 20, 0, 0, \DOR1.IFLG, 1) + err(arg0, z141, __LINE__, 0, 0, \DOR1.IFLG, 1) } // Check total calls to \DOR1._REG if (LNotEqual(Derefof(Index(\DOR1.VFLG, 1)), 6)) { - err(arg0, z141, 21, 0, 0, Derefof(Index(\DOR1.VFLG, 1)), 6) + err(arg0, z141, __LINE__, 0, 0, Derefof(Index(\DOR1.VFLG, 1)), 6) } m70e(arg0, 1, \DOR1.VRSK, \DOR1.ERSK, 22) } @@ -593,11 +593,11 @@ Method(m70c, 3, Serialized) Store(ObjectType(Derefof(Local6)), Local0) Store(c00b, Local1) if (LNotEqual(Local0, Local1)) { - err(arg0, z141, 25, 0, 0, Local0, Local1) + err(arg0, z141, __LINE__, 0, 0, Local0, Local1) } else { Store(Derefof(Local6), Local0) if (LNotEqual(Local0, b000)) { - err(arg0, z141, 26, z141, arg2, Local0, b000) + err(arg0, z141, __LINE__, z141, arg2, Local0, b000) } } } @@ -650,12 +650,12 @@ Method(m70e, 5, Serialized) case (1) { Index(arg3, Local0, Local3) if (LNotEqual(DeRefof(Local1), DeRefof(Local3))) { - err(arg0, z141, arg4, z141, Local0, DeRefof(Local1), DeRefof(Local3)) + err(arg0, z141, __LINE__, z141, Local0, DeRefof(Local1), DeRefof(Local3)) } } case (2) { if (LNotEqual(DeRefof(Local1), 0)) { - err(arg0, z141, arg4, z141, Local0, DeRefof(Local1), 0) + err(arg0, z141, __LINE__, z141, Local0, DeRefof(Local1), 0) } } } @@ -704,7 +704,7 @@ Method(m70f, 5, Serialized) Store(Buffer(){1,1,1,2,2,2,2,2,2,2}, Local1) if (LNotEqual(Local0, Local1)) { - err(arg0, z141, 27, z141, arg4, Local0, Local1) + err(arg0, z141, __LINE__, z141, arg4, Local0, Local1) } } @@ -717,7 +717,7 @@ Method(m704, 1, Serialized) Method(CHCK, 4) { if (LNotEqual(arg1, arg2)) { - err(arg0, z141, 28, z141, arg3, arg1, arg2) + err(arg0, z141, __LINE__, z141, arg3, arg1, arg2) } } @@ -793,7 +793,7 @@ Method(m705, 1, Serialized) Store(i002, Derefof(Local6)) Store(DeRefof(Local5), Local7) if (LNotEqual(i002, Local7)) { - err(arg0, z141, 29, z141, arg1, Local7, i002) + err(arg0, z141, __LINE__, z141, arg1, Local7, i002) } } @@ -828,7 +828,7 @@ Method(m705, 1, Serialized) Store(i002, Derefof(Local6)) Store(DeRefof(Local5), Local7) if (LNotEqual(i002, Local7)) { - err(arg0, z141, 30, z141, arg1, Local7, i002) + err(arg0, z141, __LINE__, z141, arg1, Local7, i002) } } @@ -866,7 +866,7 @@ Method(m705, 1, Serialized) Store(i002, Derefof(Local6)) Store(DeRefof(Local5), Local7) if (LNotEqual(i002, Local7)) { - err(arg0, z141, 31, z141, arg1, Local7, i002) + err(arg0, z141, __LINE__, z141, arg1, Local7, i002) } } @@ -904,7 +904,7 @@ Method(m705, 1, Serialized) Store(i002, Derefof(Local6)) Store(DeRefof(Local5), Local7) if (LNotEqual(i002, Local7)) { - err(arg0, z141, 32, z141, arg1, Local7, i002) + err(arg0, z141, __LINE__, z141, arg1, Local7, i002) } } @@ -972,7 +972,7 @@ Method(m706, 1, Serialized) FU04, 0x20} if (LNotEqual(FU04, i000)) { - err(arg0, z141, arg3, 0, 0, FU04, i000) + err(arg0, z141, __LINE__, 0, 0, FU04, i000) } } @@ -981,33 +981,33 @@ Method(m706, 1, Serialized) Store(i000, FU00) if (LNotEqual(FU00, i000)) { - err(arg0, z141, 33, 0, 0, FU00, i000) + err(arg0, z141, __LINE__, 0, 0, FU00, i000) } if (LNotEqual(0xfedcba987654321f, off0)) { - err(arg0, z141, 34, 0, 0, off0, 0xfedcba987654321f) + err(arg0, z141, __LINE__, 0, 0, off0, 0xfedcba987654321f) } elseif (LNotEqual(0x123, len0)) { - err(arg0, z141, 35, 0, 0, len0, 0x123) + err(arg0, z141, __LINE__, 0, 0, len0, 0x123) } elseif (LNotEqual(FU01, i000)) { - err(arg0, z141, 36, 0, 0, FU00, i000) + err(arg0, z141, __LINE__, 0, 0, FU00, i000) } if (LNotEqual(0xfedcba987654321f, offb)) { - err(arg0, z141, 37, 0, 0, offb, 0xfedcba987654321f) + err(arg0, z141, __LINE__, 0, 0, offb, 0xfedcba987654321f) } elseif (LNotEqual(0x123, lenb)) { - err(arg0, z141, 38, 0, 0, lenb, 0x123) + err(arg0, z141, __LINE__, 0, 0, lenb, 0x123) } elseif (LNotEqual(FU02, i000)) { - err(arg0, z141, 39, 0, 0, FU00, i000) + err(arg0, z141, __LINE__, 0, 0, FU00, i000) } if (LNotEqual(0xfedcba987654321f, offs)) { Add(offs, 0, Local0) - err(arg0, z141, 40, 0, 0, Local0, 0xfedcba987654321f) + err(arg0, z141, __LINE__, 0, 0, Local0, 0xfedcba987654321f) } elseif (LNotEqual(0x123, lens)) { Add(lens, 0, Local0) - err(arg0, z141, 41, 0, 0, Local0, 0x123) + err(arg0, z141, __LINE__, 0, 0, Local0, 0x123) } elseif (LNotEqual(FU03, i000)) { - err(arg0, z141, 42, 0, 0, FU00, i000) + err(arg0, z141, __LINE__, 0, 0, FU00, i000) } m000(arg0, off0, len0, 43) @@ -1087,7 +1087,7 @@ Method(m707, 1, Serialized) Store(Buffer(){4,4,4,4,4,4,2,2,5,5,1,1,6,6,3,3,7,7,7,7,7,7}, Local1) if (LNotEqual(Local0, Local1)) { - err(arg0, z141, 43, 0, 0, Local0, Local1) + err(arg0, z141, __LINE__, 0, 0, Local0, Local1) } } diff --git a/tests/aslts/src/runtime/collections/functional/region/regionfield.asl b/tests/aslts/src/runtime/collections/functional/region/regionfield.asl index 8dade9c3e..7ba5c8879 100644 --- a/tests/aslts/src/runtime/collections/functional/region/regionfield.asl +++ b/tests/aslts/src/runtime/collections/functional/region/regionfield.asl @@ -425,23 +425,23 @@ Method(m751, 1, Serialized) Store(Store(BUFF, FLD0), BUFR) // Invoke Write Quick transaction if (LNotEqual(OB10, 0x00)) { - err(arg0, z143, 4, 0, 0, OB10, 0x00) + err(arg0, z143, __LINE__, 0, 0, OB10, 0x00) } if (LNotEqual(LEN0, 0x00)) { - err(arg0, z143, 8, 0, 0, LEN0, 0x00) + err(arg0, z143, __LINE__, 0, 0, LEN0, 0x00) } if (LNotEqual(DAT0, 0x00)) { - err(arg0, z143, 12, 0, 0, DAT0, 0x00) + err(arg0, z143, __LINE__, 0, 0, DAT0, 0x00) } if (LNotEqual(OB11, 0x7A)) { - err(arg0, z143, 16, 0, 0, OB11, 0x7A) + err(arg0, z143, __LINE__, 0, 0, OB11, 0x7A) } if (LNotEqual(LEN1, 0x00)) { - err(arg0, z143, 20, 0, 0, LEN1, 0x00) + err(arg0, z143, __LINE__, 0, 0, LEN1, 0x00) } if (LNotEqual(DAT1, 0x00)) { - err(arg0, z143, 24, 0, 0, DAT1, 0x00) + err(arg0, z143, __LINE__, 0, 0, DAT1, 0x00) } Store(0x00, OB10) @@ -452,10 +452,10 @@ Method(m751, 1, Serialized) Store(FLD0, BUFF) // Invoke Read Quick transaction if (LNotEqual(OB10, 0x7A)) { - err(arg0, z143, 28, 0, 0, OB10, 0x7A) + err(arg0, z143, __LINE__, 0, 0, OB10, 0x7A) } if (LNotEqual(LEN0, 0x00)) { // Length is zero for Quick operations - err(arg0, z143, 32, 0, 0, LEN0, 0x00) + err(arg0, z143, __LINE__, 0, 0, LEN0, 0x00) } /* Note: Since LEN0 should be zero there's no need to check DAT0 */ } @@ -490,36 +490,36 @@ Method(m752, 1, Serialized) Store(Store(BUFF, FLD0), BUFR) // Invoke a Send Byte transaction if (LNotEqual(OB10, 0x00)) { - err(arg0, z143, 40, 0, 0, OB10, 0x00) + err(arg0, z143, __LINE__, 0, 0, OB10, 0x00) } if (LNotEqual(LEN0, 0x00)) { - err(arg0, z143, 44, 0, 0, LEN0, 0x00) + err(arg0, z143, __LINE__, 0, 0, LEN0, 0x00) } if (LNotEqual(DAT0, 0x16)) { - err(arg0, z143, 48, 0, 0, DAT0, 0x16) + err(arg0, z143, __LINE__, 0, 0, DAT0, 0x16) } if (LNotEqual(OB11, 0x7A)) { - err(arg0, z143, 52, 0, 0, OB11, 0x7A) + err(arg0, z143, __LINE__, 0, 0, OB11, 0x7A) } if (LNotEqual(LEN1, 0x00)) { - err(arg0, z143, 56, 0, 0, LEN1, 0x00) + err(arg0, z143, __LINE__, 0, 0, LEN1, 0x00) } if (LNotEqual(DAT1, 0x16)) { - err(arg0, z143, 60, 0, 0, DAT1, 0x00) + err(arg0, z143, __LINE__, 0, 0, DAT1, 0x00) } /* Receive a byte of data from the device */ Store(FLD0, BUFF) // Invoke a Receive Byte transaction if (LNotEqual(OB10, 0x7A)) { - err(arg0, z143, 64, 0, 0, OB10, 0x7A) + err(arg0, z143, __LINE__, 0, 0, OB10, 0x7A) } if (LNotEqual(LEN0, 0x01)) { - err(arg0, z143, 68, 0, 0, LEN0, 0x01) + err(arg0, z143, __LINE__, 0, 0, LEN0, 0x01) } if (LNotEqual(DAT0, 0xA0)) { - err(arg0, z143, 72, 0, 0, DAT0, 0xA0) + err(arg0, z143, __LINE__, 0, 0, DAT0, 0xA0) } } @@ -555,36 +555,36 @@ Method(m753, 1, Serialized) Store(Store(BUFF, FLD2), BUFR) // Invoke a Write Byte transaction if (LNotEqual(OB10, 0x00)) { - err(arg0, z143, 76, 0, 0, OB10, 0x00) + err(arg0, z143, __LINE__, 0, 0, OB10, 0x00) } if (LNotEqual(LEN0, 0x00)) { - err(arg0, z143, 80, 0, 0, LEN0, 0x00) + err(arg0, z143, __LINE__, 0, 0, LEN0, 0x00) } if (LNotEqual(DAT0, 0x16)) { - err(arg0, z143, 84, 0, 0, DAT0, 0x16) + err(arg0, z143, __LINE__, 0, 0, DAT0, 0x16) } if (LNotEqual(OB11, 0x7A)) { - err(arg0, z143, 88, 0, 0, OB11, 0x7A) + err(arg0, z143, __LINE__, 0, 0, OB11, 0x7A) } if (LNotEqual(LEN1, 0x00)) { - err(arg0, z143, 92, 0, 0, LEN1, 0x00) + err(arg0, z143, __LINE__, 0, 0, LEN1, 0x00) } if (LNotEqual(DAT1, 0x16)) { - err(arg0, z143, 96, 0, 0, DAT1, 0x00) + err(arg0, z143, __LINE__, 0, 0, DAT1, 0x00) } /* Read a byte of data from the device using command value 1 */ Store(FLD1, BUFF) // Invoke a Read Byte transaction if (LNotEqual(OB10, 0x7A)) { - err(arg0, z143, 100, 0, 0, OB10, 0x7A) + err(arg0, z143, __LINE__, 0, 0, OB10, 0x7A) } if (LNotEqual(LEN0, 0x01)) { - err(arg0, z143, 104, 0, 0, LEN0, 0x01) + err(arg0, z143, __LINE__, 0, 0, LEN0, 0x01) } if (LNotEqual(DAT0, 0xA0)) { - err(arg0, z143, 108, 0, 0, DAT0, 0xA0) + err(arg0, z143, __LINE__, 0, 0, DAT0, 0xA0) } } @@ -620,36 +620,36 @@ Method(m754, 1, Serialized) Store(Store(BUFF, FLD2), BUFR) // Invoke a Write Word transaction if (LNotEqual(OB10, 0x00)) { - err(arg0, z143, 112, 0, 0, OB10, 0x00) + err(arg0, z143, __LINE__, 0, 0, OB10, 0x00) } if (LNotEqual(LEN0, 0x00)) { - err(arg0, z143, 116, 0, 0, LEN0, 0x00) + err(arg0, z143, __LINE__, 0, 0, LEN0, 0x00) } if (LNotEqual(DAT0, 0x5416)) { - err(arg0, z143, 120, 0, 0, DAT0, 0x16) + err(arg0, z143, __LINE__, 0, 0, DAT0, 0x16) } if (LNotEqual(OB11, 0x7A)) { - err(arg0, z143, 124, 0, 0, OB11, 0x7A) + err(arg0, z143, __LINE__, 0, 0, OB11, 0x7A) } if (LNotEqual(LEN1, 0x00)) { - err(arg0, z143, 128, 0, 0, LEN1, 0x00) + err(arg0, z143, __LINE__, 0, 0, LEN1, 0x00) } if (LNotEqual(DAT1, 0x5416)) { - err(arg0, z143, 132, 0, 0, DAT1, 0x00) + err(arg0, z143, __LINE__, 0, 0, DAT1, 0x00) } /* Read two bytes of data from the device using command value 1 */ Store(FLD1, BUFF) // Invoke a Read Word transaction if (LNotEqual(OB10, 0x7A)) { - err(arg0, z143, 136, 0, 0, OB10, 0x7A) + err(arg0, z143, __LINE__, 0, 0, OB10, 0x7A) } if (LNotEqual(LEN0, 0x02)) { - err(arg0, z143, 140, 0, 0, LEN0, 0x02) + err(arg0, z143, __LINE__, 0, 0, LEN0, 0x02) } if (LNotEqual(DAT0, 0xA1A0)) { - err(arg0, z143, 144, 0, 0, DAT0, 0xA1A0) + err(arg0, z143, __LINE__, 0, 0, DAT0, 0xA1A0) } } @@ -685,34 +685,34 @@ Method(m755, 1, Serialized) Store(Store(BUFF, FLD2), BUFR) // Invoke a Write Block transaction if (LNotEqual(OB10, 0x00)) { - err(arg0, z143, 148, 0, 0, OB10, 0x00) + err(arg0, z143, __LINE__, 0, 0, OB10, 0x00) } if (LNotEqual(LEN0, 0x04)) { - err(arg0, z143, 152, 0, 0, LEN0, 0x04) + err(arg0, z143, __LINE__, 0, 0, LEN0, 0x04) } Store(Buffer(0x20){"TEST"}, Local0) if (LNotEqual(DAT0, Local0)) { - err(arg0, z143, 156, 0, 0, DAT0, Local0) + err(arg0, z143, __LINE__, 0, 0, DAT0, Local0) } if (LNotEqual(OB11, 0x7A)) { - err(arg0, z143, 160, 0, 0, OB11, 0x7A) + err(arg0, z143, __LINE__, 0, 0, OB11, 0x7A) } if (LNotEqual(LEN1, 0x00)) { - err(arg0, z143, 164, 0, 0, LEN1, 0x00) + err(arg0, z143, __LINE__, 0, 0, LEN1, 0x00) } if (LNotEqual(DAT1, Local0)) { - err(arg0, z143, 168, 0, 0, DAT1, Local0) + err(arg0, z143, __LINE__, 0, 0, DAT1, Local0) } /* Read block of data from the device using command value 1 */ Store(FLD1, BUFF) // Invoke a Read Block transaction if (LNotEqual(OB10, 0x7A)) { - err(arg0, z143, 172, 0, 0, OB10, 0x7A) + err(arg0, z143, __LINE__, 0, 0, OB10, 0x7A) } if (LNotEqual(LEN0, 0x20)) { - err(arg0, z143, 176, 0, 0, LEN0, 0x20) + err(arg0, z143, __LINE__, 0, 0, LEN0, 0x20) } Store(Buffer(0x20){ 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, @@ -721,7 +721,7 @@ Method(m755, 1, Serialized) 0xB8, 0xB9, 0xBA, 0xBB, 0xBC, 0xBD, 0xBE, 0xBF}, Local1) if (LNotEqual(DAT0, Local1)) { - err(arg0, z143, 180, 0, 0, DAT0, Local1) + err(arg0, z143, __LINE__, 0, 0, DAT0, Local1) } } @@ -757,23 +757,23 @@ Method(m756, 1, Serialized) Store(Store(BUFF, FLD1), BUFR) // Invoke a Process Call transaction if (LNotEqual(OB10, 0x00)) { - err(arg0, z143, 184, 0, 0, OB10, 0x00) + err(arg0, z143, __LINE__, 0, 0, OB10, 0x00) } if (LNotEqual(LEN0, 0x00)) { - err(arg0, z143, 188, 0, 0, LEN0, 0x00) + err(arg0, z143, __LINE__, 0, 0, LEN0, 0x00) } if (LNotEqual(DAT0, 0x5416)) { - err(arg0, z143, 192, 0, 0, DAT0, 0x16) + err(arg0, z143, __LINE__, 0, 0, DAT0, 0x16) } if (LNotEqual(OB11, 0x7A)) { - err(arg0, z143, 196, 0, 0, OB11, 0x7A) + err(arg0, z143, __LINE__, 0, 0, OB11, 0x7A) } if (LNotEqual(LEN1, 0x02)) { - err(arg0, z143, 200, 0, 0, LEN1, 0x02) + err(arg0, z143, __LINE__, 0, 0, LEN1, 0x02) } if (LNotEqual(DAT1, 0xA1A0)) { - err(arg0, z143, 204, 0, 0, DAT1, 0xA1A0) + err(arg0, z143, __LINE__, 0, 0, DAT1, 0xA1A0) } } @@ -808,21 +808,21 @@ Method(m757, 1, Serialized) Store(Store(BUFF, FLD1), BUFR) // Invoke a Write Block transaction if (LNotEqual(OB10, 0x00)) { - err(arg0, z143, 208, 0, 0, OB10, 0x00) + err(arg0, z143, __LINE__, 0, 0, OB10, 0x00) } if (LNotEqual(LEN0, 0x04)) { - err(arg0, z143, 212, 0, 0, LEN0, 0x04) + err(arg0, z143, __LINE__, 0, 0, LEN0, 0x04) } Store(Buffer(0x20){"TEST"}, Local0) if (LNotEqual(DAT0, Local0)) { - err(arg0, z143, 216, 0, 0, DAT0, Local0) + err(arg0, z143, __LINE__, 0, 0, DAT0, Local0) } if (LNotEqual(OB11, 0x7A)) { - err(arg0, z143, 220, 0, 0, OB11, 0x7A) + err(arg0, z143, __LINE__, 0, 0, OB11, 0x7A) } if (LNotEqual(LEN1, 0x20)) { - err(arg0, z143, 224, 0, 0, LEN1, 0x20) + err(arg0, z143, __LINE__, 0, 0, LEN1, 0x20) } Store(Buffer(0x20){ 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, @@ -831,7 +831,7 @@ Method(m757, 1, Serialized) 0xB8, 0xB9, 0xBA, 0xBB, 0xBC, 0xBD, 0xBE, 0xBF}, Local1) if (LNotEqual(DAT1, Local1)) { - err(arg0, z143, 228, 0, 0, DAT1, Local1) + err(arg0, z143, __LINE__, 0, 0, DAT1, Local1) } } @@ -919,23 +919,23 @@ Method(m758, 1, Serialized) Store(Store(BUFF, FLD0), BUFR) // Invoke Write Quick transaction if (LNotEqual(OB10, 0x00)) { - err(arg0, z143, 232, 0, 0, OB10, 0x00) + err(arg0, z143, __LINE__, 0, 0, OB10, 0x00) } if (LNotEqual(LEN0, 0x00)) { - err(arg0, z143, 236, 0, 0, LEN0, 0x00) + err(arg0, z143, __LINE__, 0, 0, LEN0, 0x00) } if (LNotEqual(DAT0, 0x00)) { - err(arg0, z143, 240, 0, 0, DAT0, 0x00) + err(arg0, z143, __LINE__, 0, 0, DAT0, 0x00) } if (LNotEqual(OB11, 0x7A)) { - err(arg0, z143, 244, 0, 0, OB11, 0x7A) + err(arg0, z143, __LINE__, 0, 0, OB11, 0x7A) } if (LNotEqual(LEN1, 0x00)) { - err(arg0, z143, 248, 0, 0, LEN1, 0x00) + err(arg0, z143, __LINE__, 0, 0, LEN1, 0x00) } if (LNotEqual(DAT1, 0x00)) { - err(arg0, z143, 252, 0, 0, DAT1, 0x00) + err(arg0, z143, __LINE__, 0, 0, DAT1, 0x00) } Store(0x00, OB10) @@ -946,10 +946,10 @@ Method(m758, 1, Serialized) Store(FLD0, BUFF) // Invoke Read Quick transaction if (LNotEqual(OB10, 0x7A)) { - err(arg0, z143, 256, 0, 0, OB10, 0x7A) + err(arg0, z143, __LINE__, 0, 0, OB10, 0x7A) } if (LNotEqual(LEN0, 0x00)) { // Length is zero for Quick operations - err(arg0, z143, 260, 0, 0, LEN0, 0x00) + err(arg0, z143, __LINE__, 0, 0, LEN0, 0x00) } /* Note: Since LEN0 should be zero there's no need to check DAT0 */ } @@ -991,36 +991,36 @@ Method(m759, 1, Serialized) Store(Store(BUFF, FLD0), BUFR) // Invoke a Send Byte transaction if (LNotEqual(OB10, 0x00)) { - err(arg0, z143, 268, 0, 0, OB10, 0x00) + err(arg0, z143, __LINE__, 0, 0, OB10, 0x00) } if (LNotEqual(LEN0, 0x00)) { - err(arg0, z143, 272, 0, 0, LEN0, 0x00) + err(arg0, z143, __LINE__, 0, 0, LEN0, 0x00) } if (LNotEqual(DAT0, 0x16)) { - err(arg0, z143, 276, 0, 0, DAT0, 0x16) + err(arg0, z143, __LINE__, 0, 0, DAT0, 0x16) } if (LNotEqual(OB11, 0x7A)) { - err(arg0, z143, 280, 0, 0, OB11, 0x7A) + err(arg0, z143, __LINE__, 0, 0, OB11, 0x7A) } if (LNotEqual(LEN1, 0x00)) { - err(arg0, z143, 284, 0, 0, LEN1, 0x00) + err(arg0, z143, __LINE__, 0, 0, LEN1, 0x00) } if (LNotEqual(DAT1, 0x16)) { - err(arg0, z143, 288, 0, 0, DAT1, 0x00) + err(arg0, z143, __LINE__, 0, 0, DAT1, 0x00) } /* Receive a byte of data from the device */ Store(FLD0, BUFF) // Invoke a Receive Byte transaction if (LNotEqual(OB10, 0x7A)) { - err(arg0, z143, 292, 0, 0, OB10, 0x7A) + err(arg0, z143, __LINE__, 0, 0, OB10, 0x7A) } if (LNotEqual(LEN0, 0x01)) { - err(arg0, z143, 296, 0, 0, LEN0, 0x01) + err(arg0, z143, __LINE__, 0, 0, LEN0, 0x01) } if (LNotEqual(DAT0, 0xA0)) { - err(arg0, z143, 300, 0, 0, DAT0, 0xA0) + err(arg0, z143, __LINE__, 0, 0, DAT0, 0xA0) } } @@ -1063,36 +1063,36 @@ Method(m75a, 1, Serialized) Store(Store(BUFF, FLD2), BUFR) // Invoke a Write Byte transaction if (LNotEqual(OB10, 0x00)) { - err(arg0, z143, 304, 0, 0, OB10, 0x00) + err(arg0, z143, __LINE__, 0, 0, OB10, 0x00) } if (LNotEqual(LEN0, 0x00)) { - err(arg0, z143, 308, 0, 0, LEN0, 0x00) + err(arg0, z143, __LINE__, 0, 0, LEN0, 0x00) } if (LNotEqual(DAT0, 0x16)) { - err(arg0, z143, 312, 0, 0, DAT0, 0x16) + err(arg0, z143, __LINE__, 0, 0, DAT0, 0x16) } if (LNotEqual(OB11, 0x7A)) { - err(arg0, z143, 316, 0, 0, OB11, 0x7A) + err(arg0, z143, __LINE__, 0, 0, OB11, 0x7A) } if (LNotEqual(LEN1, 0x00)) { - err(arg0, z143, 320, 0, 0, LEN1, 0x00) + err(arg0, z143, __LINE__, 0, 0, LEN1, 0x00) } if (LNotEqual(DAT1, 0x16)) { - err(arg0, z143, 324, 0, 0, DAT1, 0x00) + err(arg0, z143, __LINE__, 0, 0, DAT1, 0x00) } /* Read a byte of data from the device using command value 1 */ Store(FLD1, BUFF) // Invoke a Read Byte transaction if (LNotEqual(OB10, 0x7A)) { - err(arg0, z143, 328, 0, 0, OB10, 0x7A) + err(arg0, z143, __LINE__, 0, 0, OB10, 0x7A) } if (LNotEqual(LEN0, 0x01)) { - err(arg0, z143, 332, 0, 0, LEN0, 0x01) + err(arg0, z143, __LINE__, 0, 0, LEN0, 0x01) } if (LNotEqual(DAT0, 0xA0)) { - err(arg0, z143, 336, 0, 0, DAT0, 0xA0) + err(arg0, z143, __LINE__, 0, 0, DAT0, 0xA0) } } @@ -1135,36 +1135,36 @@ Method(m75b, 1, Serialized) Store(Store(BUFF, FLD2), BUFR) // Invoke a Write Word transaction if (LNotEqual(OB10, 0x00)) { - err(arg0, z143, 340, 0, 0, OB10, 0x00) + err(arg0, z143, __LINE__, 0, 0, OB10, 0x00) } if (LNotEqual(LEN0, 0x00)) { - err(arg0, z143, 344, 0, 0, LEN0, 0x00) + err(arg0, z143, __LINE__, 0, 0, LEN0, 0x00) } if (LNotEqual(DAT0, 0x5416)) { - err(arg0, z143, 348, 0, 0, DAT0, 0x16) + err(arg0, z143, __LINE__, 0, 0, DAT0, 0x16) } if (LNotEqual(OB11, 0x7A)) { - err(arg0, z143, 352, 0, 0, OB11, 0x7A) + err(arg0, z143, __LINE__, 0, 0, OB11, 0x7A) } if (LNotEqual(LEN1, 0x00)) { - err(arg0, z143, 356, 0, 0, LEN1, 0x00) + err(arg0, z143, __LINE__, 0, 0, LEN1, 0x00) } if (LNotEqual(DAT1, 0x5416)) { - err(arg0, z143, 360, 0, 0, DAT1, 0x00) + err(arg0, z143, __LINE__, 0, 0, DAT1, 0x00) } /* Read two bytes of data from the device using command value 1 */ Store(FLD1, BUFF) // Invoke a Read Word transaction if (LNotEqual(OB10, 0x7A)) { - err(arg0, z143, 364, 0, 0, OB10, 0x7A) + err(arg0, z143, __LINE__, 0, 0, OB10, 0x7A) } if (LNotEqual(LEN0, 0x02)) { - err(arg0, z143, 368, 0, 0, LEN0, 0x02) + err(arg0, z143, __LINE__, 0, 0, LEN0, 0x02) } if (LNotEqual(DAT0, 0xA1A0)) { - err(arg0, z143, 372, 0, 0, DAT0, 0xA1A0) + err(arg0, z143, __LINE__, 0, 0, DAT0, 0xA1A0) } } @@ -1207,34 +1207,34 @@ Method(m75c, 1, Serialized) Store(Store(BUFF, FLD2), BUFR) // Invoke a Write Block transaction if (LNotEqual(OB10, 0x00)) { - err(arg0, z143, 376, 0, 0, OB10, 0x00) + err(arg0, z143, __LINE__, 0, 0, OB10, 0x00) } if (LNotEqual(LEN0, 0x04)) { - err(arg0, z143, 380, 0, 0, LEN0, 0x04) + err(arg0, z143, __LINE__, 0, 0, LEN0, 0x04) } Store(Buffer(0x20){"TEST"}, Local0) if (LNotEqual(DAT0, Local0)) { - err(arg0, z143, 384, 0, 0, DAT0, Local0) + err(arg0, z143, __LINE__, 0, 0, DAT0, Local0) } if (LNotEqual(OB11, 0x7A)) { - err(arg0, z143, 388, 0, 0, OB11, 0x7A) + err(arg0, z143, __LINE__, 0, 0, OB11, 0x7A) } if (LNotEqual(LEN1, 0x00)) { - err(arg0, z143, 392, 0, 0, LEN1, 0x00) + err(arg0, z143, __LINE__, 0, 0, LEN1, 0x00) } if (LNotEqual(DAT1, Local0)) { - err(arg0, z143, 396, 0, 0, DAT1, Local0) + err(arg0, z143, __LINE__, 0, 0, DAT1, Local0) } /* Read block of data from the device using command value 1 */ Store(FLD1, BUFF) // Invoke a Read Block transaction if (LNotEqual(OB10, 0x7A)) { - err(arg0, z143, 400, 0, 0, OB10, 0x7A) + err(arg0, z143, __LINE__, 0, 0, OB10, 0x7A) } if (LNotEqual(LEN0, 0x20)) { - err(arg0, z143, 404, 0, 0, LEN0, 0x20) + err(arg0, z143, __LINE__, 0, 0, LEN0, 0x20) } Store(Buffer(0x20){ 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, @@ -1243,7 +1243,7 @@ Method(m75c, 1, Serialized) 0xB8, 0xB9, 0xBA, 0xBB, 0xBC, 0xBD, 0xBE, 0xBF}, Local1) if (LNotEqual(DAT0, Local1)) { - err(arg0, z143, 408, 0, 0, DAT0, Local1) + err(arg0, z143, __LINE__, 0, 0, DAT0, Local1) } } @@ -1286,23 +1286,23 @@ Method(m75d, 1, Serialized) Store(Store(BUFF, FLD1), BUFR) // Invoke a Process Call transaction if (LNotEqual(OB10, 0x00)) { - err(arg0, z143, 412, 0, 0, OB10, 0x00) + err(arg0, z143, __LINE__, 0, 0, OB10, 0x00) } if (LNotEqual(LEN0, 0x00)) { - err(arg0, z143, 416, 0, 0, LEN0, 0x00) + err(arg0, z143, __LINE__, 0, 0, LEN0, 0x00) } if (LNotEqual(DAT0, 0x5416)) { - err(arg0, z143, 420, 0, 0, DAT0, 0x16) + err(arg0, z143, __LINE__, 0, 0, DAT0, 0x16) } if (LNotEqual(OB11, 0x7A)) { - err(arg0, z143, 424, 0, 0, OB11, 0x7A) + err(arg0, z143, __LINE__, 0, 0, OB11, 0x7A) } if (LNotEqual(LEN1, 0x02)) { - err(arg0, z143, 428, 0, 0, LEN1, 0x02) + err(arg0, z143, __LINE__, 0, 0, LEN1, 0x02) } if (LNotEqual(DAT1, 0xA1A0)) { - err(arg0, z143, 432, 0, 0, DAT1, 0xA1A0) + err(arg0, z143, __LINE__, 0, 0, DAT1, 0xA1A0) } } @@ -1344,21 +1344,21 @@ Method(m75e, 1, Serialized) Store(Store(BUFF, FLD1), BUFR) // Invoke a Write Block transaction if (LNotEqual(OB10, 0x00)) { - err(arg0, z143, 436, 0, 0, OB10, 0x00) + err(arg0, z143, __LINE__, 0, 0, OB10, 0x00) } if (LNotEqual(LEN0, 0x04)) { - err(arg0, z143, 440, 0, 0, LEN0, 0x04) + err(arg0, z143, __LINE__, 0, 0, LEN0, 0x04) } Store(Buffer(0x20){"TEST"}, Local0) if (LNotEqual(DAT0, Local0)) { - err(arg0, z143, 444, 0, 0, DAT0, Local0) + err(arg0, z143, __LINE__, 0, 0, DAT0, Local0) } if (LNotEqual(OB11, 0x7A)) { - err(arg0, z143, 448, 0, 0, OB11, 0x7A) + err(arg0, z143, __LINE__, 0, 0, OB11, 0x7A) } if (LNotEqual(LEN1, 0x20)) { - err(arg0, z143, 452, 0, 0, LEN1, 0x20) + err(arg0, z143, __LINE__, 0, 0, LEN1, 0x20) } Store(Buffer(0x20){ 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, @@ -1367,7 +1367,7 @@ Method(m75e, 1, Serialized) 0xB8, 0xB9, 0xBA, 0xBB, 0xBC, 0xBD, 0xBE, 0xBF}, Local1) if (LNotEqual(DAT1, Local1)) { - err(arg0, z143, 456, 0, 0, DAT1, Local1) + err(arg0, z143, __LINE__, 0, 0, DAT1, Local1) } } @@ -1415,21 +1415,21 @@ Method(m75f, 1, Serialized) Store(Store(BUFF, FLD1), BUFR) // Invoke a Write Block transaction if (LNotEqual(OB10, 0x00)) { - err(arg0, z143, 460, 0, 0, OB10, 0x00) + err(arg0, z143, __LINE__, 0, 0, OB10, 0x00) } if (LNotEqual(LEN0, 0x04)) { - err(arg0, z143, 464, 0, 0, LEN0, 0x04) + err(arg0, z143, __LINE__, 0, 0, LEN0, 0x04) } Store(Buffer(0x20){"TEST"}, Local0) if (LNotEqual(DAT0, Local0)) { - err(arg0, z143, 468, 0, 0, DAT0, Local0) + err(arg0, z143, __LINE__, 0, 0, DAT0, Local0) } if (LNotEqual(OB11, 0x7A)) { - err(arg0, z143, 472, 0, 0, OB11, 0x7A) + err(arg0, z143, __LINE__, 0, 0, OB11, 0x7A) } if (LNotEqual(LEN1, 0x20)) { - err(arg0, z143, 476, 0, 0, LEN1, 0x20) + err(arg0, z143, __LINE__, 0, 0, LEN1, 0x20) } Store(Buffer(0x20){ 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, @@ -1438,7 +1438,7 @@ Method(m75f, 1, Serialized) 0xB8, 0xB9, 0xBA, 0xBB, 0xBC, 0xBD, 0xBE, 0xBF}, Local1) if (LNotEqual(DAT1, Local1)) { - err(arg0, z143, 480, 0, 0, DAT1, Local1) + err(arg0, z143, __LINE__, 0, 0, DAT1, Local1) } } @@ -1486,21 +1486,21 @@ Method(m760, 1, Serialized) Store(Store(BUFF, FLD1), BUFR) // Invoke a Write Block transaction if (LNotEqual(OB10, 0x00)) { - err(arg0, z143, 484, 0, 0, OB10, 0x00) + err(arg0, z143, __LINE__, 0, 0, OB10, 0x00) } if (LNotEqual(LEN0, 0x04)) { - err(arg0, z143, 488, 0, 0, LEN0, 0x04) + err(arg0, z143, __LINE__, 0, 0, LEN0, 0x04) } Store(Buffer(0x20){"TEST"}, Local0) if (LNotEqual(DAT0, Local0)) { - err(arg0, z143, 492, 0, 0, DAT0, Local0) + err(arg0, z143, __LINE__, 0, 0, DAT0, Local0) } if (LNotEqual(OB11, 0x7A)) { - err(arg0, z143, 496, 0, 0, OB11, 0x7A) + err(arg0, z143, __LINE__, 0, 0, OB11, 0x7A) } if (LNotEqual(LEN1, 0x20)) { - err(arg0, z143, 500, 0, 0, LEN1, 0x20) + err(arg0, z143, __LINE__, 0, 0, LEN1, 0x20) } Store(Buffer(0x20){ 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, @@ -1509,7 +1509,7 @@ Method(m760, 1, Serialized) 0xB8, 0xB9, 0xBA, 0xBB, 0xBC, 0xBD, 0xBE, 0xBF}, Local1) if (LNotEqual(DAT1, Local1)) { - err(arg0, z143, 504, 0, 0, DAT1, Local1) + err(arg0, z143, __LINE__, 0, 0, DAT1, Local1) } } @@ -1557,21 +1557,21 @@ Method(m761, 1, Serialized) Store(Store(BUFF, FLD1), BUFR) // Invoke a Write Block transaction if (LNotEqual(OB10, 0x00)) { - err(arg0, z143, 508, 0, 0, OB10, 0x00) + err(arg0, z143, __LINE__, 0, 0, OB10, 0x00) } if (LNotEqual(LEN0, 0x04)) { - err(arg0, z143, 512, 0, 0, LEN0, 0x04) + err(arg0, z143, __LINE__, 0, 0, LEN0, 0x04) } Store(Buffer(0x20){"TEST"}, Local0) if (LNotEqual(DAT0, Local0)) { - err(arg0, z143, 516, 0, 0, DAT0, Local0) + err(arg0, z143, __LINE__, 0, 0, DAT0, Local0) } if (LNotEqual(OB11, 0x7A)) { - err(arg0, z143, 520, 0, 0, OB11, 0x7A) + err(arg0, z143, __LINE__, 0, 0, OB11, 0x7A) } if (LNotEqual(LEN1, 0x20)) { - err(arg0, z143, 524, 0, 0, LEN1, 0x20) + err(arg0, z143, __LINE__, 0, 0, LEN1, 0x20) } Store(Buffer(0x20){ 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, @@ -1580,7 +1580,7 @@ Method(m761, 1, Serialized) 0xB8, 0xB9, 0xBA, 0xBB, 0xBC, 0xBD, 0xBE, 0xBF}, Local1) if (LNotEqual(DAT1, Local1)) { - err(arg0, z143, 528, 0, 0, DAT1, Local1) + err(arg0, z143, __LINE__, 0, 0, DAT1, Local1) } } @@ -1629,19 +1629,19 @@ Method(m764, 1, Serialized) Store(0x03, MODE) //Set both MODE bits. Power Mode 3 Store (MODE, Local0) if (LNotEqual(Local0, 0x03)) { - err(arg0, z143, 532, 0, 0, Local0, 0x03) + err(arg0, z143, __LINE__, 0, 0, Local0, 0x03) } Store(0x01, MODE) Store (MODE, Local0) if (LNotEqual(Local0, 0x01)) { - err(arg0, z143, 536, 0, 0, Local0, 0x01) + err(arg0, z143, __LINE__, 0, 0, Local0, 0x01) } Store(0x01, STAT) Store (STAT, Local0) if (LNotEqual(Local0, 0x01)) { - err(arg0, z143, 540, 0, 0, Local0, 0x01) + err(arg0, z143, __LINE__, 0, 0, Local0, 0x01) } Name (TBUF, Buffer(0x10) { @@ -1651,7 +1651,7 @@ Method(m764, 1, Serialized) Store(TBUF, BUFF) Store (BUFF, Local0) if (LNotEqual(Local0, TBUF)) { - err(arg0, z143, 544, 0, 0, Local0, TBUF) + err(arg0, z143, __LINE__, 0, 0, Local0, TBUF) } } @@ -1705,15 +1705,15 @@ Method(m768, 1, Serialized) If (LNotEqual (STAT, 0)) { - err(arg0, z143, 548, 0, 0, STAT, 0) + err(arg0, z143, __LINE__, 0, 0, STAT, 0) } If (LNotEqual (CMPC, 0)) { - err(arg0, z143, 552, 0, 0, CMPC, 0) + err(arg0, z143, __LINE__, 0, 0, CMPC, 0) } If (LNotEqual (BUFF, Local1)) { - err(arg0, z143, 556, 0, 0, Local1, BUFF) + err(arg0, z143, __LINE__, 0, 0, Local1, BUFF) } } @@ -2306,37 +2306,37 @@ Method(m72a, 3) // 1-1-1 Store(Derefof(Index(arg2, 0)), Local4) if(LNotEqual(Local4, Local0)) { - err(arg0, z143, 560, z143, Local3, Local4, Local0) + err(arg0, z143, __LINE__, z143, Local3, Local4, Local0) } Store(Derefof(Index(arg2, 1)), Local4) if(LNotEqual(Local4, Local1)) { - err(arg0, z143, 564, z143, Local3, Local4, Local1) + err(arg0, z143, __LINE__, z143, Local3, Local4, Local1) } Store(Derefof(Index(arg2, 2)), Local4) if(LNotEqual(Local4, Local2)) { - err(arg0, z143, 568, z143, Local3, Local4, Local2) + err(arg0, z143, __LINE__, z143, Local3, Local4, Local2) } // 1-2 Store(Derefof(Index(arg2, 3)), Local4) if(LNotEqual(Local4, Local0)) { - err(arg0, z143, 572, z143, Local3, Local4, Local0) + err(arg0, z143, __LINE__, z143, Local3, Local4, Local0) } Store(Derefof(Index(arg2, 4)), Local4) Or(Local1, ShiftLeft(Local2, 1), Local5) if(LNotEqual(Local4, Local5)) { - err(arg0, z143, 576, z143, Local3, Local4, Local5) + err(arg0, z143, __LINE__, z143, Local3, Local4, Local5) } // 2-1 Store(Derefof(Index(arg2, 5)), Local4) Or(Local0, ShiftLeft(Local1, 1), Local5) if(LNotEqual(Local4, Local5)) { - err(arg0, z143, 580, z143, Local3, Local4, Local5) + err(arg0, z143, __LINE__, z143, Local3, Local4, Local5) } Store(Derefof(Index(arg2, 6)), Local4) if(LNotEqual(Local4, Local2)) { - err(arg0, z143, 584, z143, Local3, Local4, Local2) + err(arg0, z143, __LINE__, z143, Local3, Local4, Local2) } } @@ -2488,7 +2488,7 @@ Method(m72e, 6, Serialized) // Num of bits have to be non-zero if (LEqual(arg3, 0)) { - err(arg0, z143, 588, 0, 0, 0, 0) + err(arg0, z143, __LINE__, 0, 0, 0, 0) return (Ones) } @@ -2735,7 +2735,7 @@ Method(m72e, 6, Serialized) m7d4(arg0, arg1, arg2, arg3, arg5, Local6) } default { - err(arg0, z143, 592, 0, 0, Local4, Local5) + err(arg0, z143, __LINE__, 0, 0, Local4, Local5) return (Ones) } } @@ -2850,7 +2850,7 @@ Method(m730, 6, Serialized) Store(Refof(f00f), Local3) } default { - err(arg0, z143, 596, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -2938,7 +2938,7 @@ Method(m730, 6, Serialized) Store(Refof(f01f), Local3) } default { - err(arg0, z143, 600, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -3026,7 +3026,7 @@ Method(m730, 6, Serialized) Store(Refof(f02f), Local3) } default { - err(arg0, z143, 604, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -3114,7 +3114,7 @@ Method(m730, 6, Serialized) Store(Refof(f03f), Local3) } default { - err(arg0, z143, 608, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -3202,7 +3202,7 @@ Method(m730, 6, Serialized) Store(Refof(f04f), Local3) } default { - err(arg0, z143, 612, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -3290,7 +3290,7 @@ Method(m730, 6, Serialized) Store(Refof(f05f), Local3) } default { - err(arg0, z143, 616, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -3378,7 +3378,7 @@ Method(m730, 6, Serialized) Store(Refof(f06f), Local3) } default { - err(arg0, z143, 620, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -3466,7 +3466,7 @@ Method(m730, 6, Serialized) Store(Refof(f07f), Local3) } default { - err(arg0, z143, 624, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -3554,7 +3554,7 @@ Method(m730, 6, Serialized) Store(Refof(f08f), Local3) } default { - err(arg0, z143, 628, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -3642,7 +3642,7 @@ Method(m730, 6, Serialized) Store(Refof(f09f), Local3) } default { - err(arg0, z143, 632, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -3730,7 +3730,7 @@ Method(m730, 6, Serialized) Store(Refof(f0af), Local3) } default { - err(arg0, z143, 636, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -3818,7 +3818,7 @@ Method(m730, 6, Serialized) Store(Refof(f0bf), Local3) } default { - err(arg0, z143, 640, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -3906,7 +3906,7 @@ Method(m730, 6, Serialized) Store(Refof(f0cf), Local3) } default { - err(arg0, z143, 644, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -3994,7 +3994,7 @@ Method(m730, 6, Serialized) Store(Refof(f0df), Local3) } default { - err(arg0, z143, 648, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -4082,7 +4082,7 @@ Method(m730, 6, Serialized) Store(Refof(f0ef), Local3) } default { - err(arg0, z143, 652, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -4170,13 +4170,13 @@ Method(m730, 6, Serialized) Store(Refof(f0ff), Local3) } default { - err(arg0, z143, 656, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } } default { - err(arg0, z143, 660, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return} } @@ -4279,7 +4279,7 @@ Method(m731, 6, Serialized) Store(Refof(f00f), Local3) } default { - err(arg0, z143, 664, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -4367,7 +4367,7 @@ Method(m731, 6, Serialized) Store(Refof(f01f), Local3) } default { - err(arg0, z143, 668, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -4455,7 +4455,7 @@ Method(m731, 6, Serialized) Store(Refof(f02f), Local3) } default { - err(arg0, z143, 672, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -4543,7 +4543,7 @@ Method(m731, 6, Serialized) Store(Refof(f03f), Local3) } default { - err(arg0, z143, 676, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -4631,7 +4631,7 @@ Method(m731, 6, Serialized) Store(Refof(f04f), Local3) } default { - err(arg0, z143, 680, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -4719,7 +4719,7 @@ Method(m731, 6, Serialized) Store(Refof(f05f), Local3) } default { - err(arg0, z143, 684, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -4807,7 +4807,7 @@ Method(m731, 6, Serialized) Store(Refof(f06f), Local3) } default { - err(arg0, z143, 688, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -4895,7 +4895,7 @@ Method(m731, 6, Serialized) Store(Refof(f07f), Local3) } default { - err(arg0, z143, 692, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -4983,7 +4983,7 @@ Method(m731, 6, Serialized) Store(Refof(f08f), Local3) } default { - err(arg0, z143, 696, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -5071,7 +5071,7 @@ Method(m731, 6, Serialized) Store(Refof(f09f), Local3) } default { - err(arg0, z143, 700, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -5159,7 +5159,7 @@ Method(m731, 6, Serialized) Store(Refof(f0af), Local3) } default { - err(arg0, z143, 704, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -5247,7 +5247,7 @@ Method(m731, 6, Serialized) Store(Refof(f0bf), Local3) } default { - err(arg0, z143, 708, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -5335,7 +5335,7 @@ Method(m731, 6, Serialized) Store(Refof(f0cf), Local3) } default { - err(arg0, z143, 712, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -5423,7 +5423,7 @@ Method(m731, 6, Serialized) Store(Refof(f0df), Local3) } default { - err(arg0, z143, 716, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -5511,7 +5511,7 @@ Method(m731, 6, Serialized) Store(Refof(f0ef), Local3) } default { - err(arg0, z143, 720, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -5599,13 +5599,13 @@ Method(m731, 6, Serialized) Store(Refof(f0ff), Local3) } default { - err(arg0, z143, 724, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } } default { - err(arg0, z143, 728, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return} } @@ -5708,7 +5708,7 @@ Method(m732, 6, Serialized) Store(Refof(f00f), Local3) } default { - err(arg0, z143, 732, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -5796,7 +5796,7 @@ Method(m732, 6, Serialized) Store(Refof(f01f), Local3) } default { - err(arg0, z143, 736, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -5884,7 +5884,7 @@ Method(m732, 6, Serialized) Store(Refof(f02f), Local3) } default { - err(arg0, z143, 740, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -5972,7 +5972,7 @@ Method(m732, 6, Serialized) Store(Refof(f03f), Local3) } default { - err(arg0, z143, 744, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -6060,7 +6060,7 @@ Method(m732, 6, Serialized) Store(Refof(f04f), Local3) } default { - err(arg0, z143, 748, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -6148,7 +6148,7 @@ Method(m732, 6, Serialized) Store(Refof(f05f), Local3) } default { - err(arg0, z143, 752, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -6236,7 +6236,7 @@ Method(m732, 6, Serialized) Store(Refof(f06f), Local3) } default { - err(arg0, z143, 756, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -6324,7 +6324,7 @@ Method(m732, 6, Serialized) Store(Refof(f07f), Local3) } default { - err(arg0, z143, 760, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -6412,7 +6412,7 @@ Method(m732, 6, Serialized) Store(Refof(f08f), Local3) } default { - err(arg0, z143, 764, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -6500,7 +6500,7 @@ Method(m732, 6, Serialized) Store(Refof(f09f), Local3) } default { - err(arg0, z143, 768, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -6588,7 +6588,7 @@ Method(m732, 6, Serialized) Store(Refof(f0af), Local3) } default { - err(arg0, z143, 772, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -6676,7 +6676,7 @@ Method(m732, 6, Serialized) Store(Refof(f0bf), Local3) } default { - err(arg0, z143, 776, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -6764,7 +6764,7 @@ Method(m732, 6, Serialized) Store(Refof(f0cf), Local3) } default { - err(arg0, z143, 780, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -6852,7 +6852,7 @@ Method(m732, 6, Serialized) Store(Refof(f0df), Local3) } default { - err(arg0, z143, 784, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -6940,7 +6940,7 @@ Method(m732, 6, Serialized) Store(Refof(f0ef), Local3) } default { - err(arg0, z143, 788, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -7028,13 +7028,13 @@ Method(m732, 6, Serialized) Store(Refof(f0ff), Local3) } default { - err(arg0, z143, 792, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } } default { - err(arg0, z143, 796, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return} } @@ -7137,7 +7137,7 @@ Method(m733, 6, Serialized) Store(Refof(f00f), Local3) } default { - err(arg0, z143, 800, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -7225,7 +7225,7 @@ Method(m733, 6, Serialized) Store(Refof(f01f), Local3) } default { - err(arg0, z143, 804, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -7313,7 +7313,7 @@ Method(m733, 6, Serialized) Store(Refof(f02f), Local3) } default { - err(arg0, z143, 808, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -7401,7 +7401,7 @@ Method(m733, 6, Serialized) Store(Refof(f03f), Local3) } default { - err(arg0, z143, 812, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -7489,7 +7489,7 @@ Method(m733, 6, Serialized) Store(Refof(f04f), Local3) } default { - err(arg0, z143, 816, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -7577,7 +7577,7 @@ Method(m733, 6, Serialized) Store(Refof(f05f), Local3) } default { - err(arg0, z143, 820, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -7665,7 +7665,7 @@ Method(m733, 6, Serialized) Store(Refof(f06f), Local3) } default { - err(arg0, z143, 824, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -7753,7 +7753,7 @@ Method(m733, 6, Serialized) Store(Refof(f07f), Local3) } default { - err(arg0, z143, 828, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -7841,7 +7841,7 @@ Method(m733, 6, Serialized) Store(Refof(f08f), Local3) } default { - err(arg0, z143, 832, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -7929,7 +7929,7 @@ Method(m733, 6, Serialized) Store(Refof(f09f), Local3) } default { - err(arg0, z143, 836, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -8017,7 +8017,7 @@ Method(m733, 6, Serialized) Store(Refof(f0af), Local3) } default { - err(arg0, z143, 840, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -8105,7 +8105,7 @@ Method(m733, 6, Serialized) Store(Refof(f0bf), Local3) } default { - err(arg0, z143, 844, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -8193,7 +8193,7 @@ Method(m733, 6, Serialized) Store(Refof(f0cf), Local3) } default { - err(arg0, z143, 848, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -8281,7 +8281,7 @@ Method(m733, 6, Serialized) Store(Refof(f0df), Local3) } default { - err(arg0, z143, 852, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -8369,7 +8369,7 @@ Method(m733, 6, Serialized) Store(Refof(f0ef), Local3) } default { - err(arg0, z143, 856, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -8457,13 +8457,13 @@ Method(m733, 6, Serialized) Store(Refof(f0ff), Local3) } default { - err(arg0, z143, 860, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } } default { - err(arg0, z143, 864, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return} } @@ -8566,7 +8566,7 @@ Method(m734, 6, Serialized) Store(Refof(f00f), Local3) } default { - err(arg0, z143, 868, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -8654,7 +8654,7 @@ Method(m734, 6, Serialized) Store(Refof(f01f), Local3) } default { - err(arg0, z143, 872, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -8742,7 +8742,7 @@ Method(m734, 6, Serialized) Store(Refof(f02f), Local3) } default { - err(arg0, z143, 876, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -8830,7 +8830,7 @@ Method(m734, 6, Serialized) Store(Refof(f03f), Local3) } default { - err(arg0, z143, 880, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -8918,7 +8918,7 @@ Method(m734, 6, Serialized) Store(Refof(f04f), Local3) } default { - err(arg0, z143, 884, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -9006,7 +9006,7 @@ Method(m734, 6, Serialized) Store(Refof(f05f), Local3) } default { - err(arg0, z143, 888, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -9094,7 +9094,7 @@ Method(m734, 6, Serialized) Store(Refof(f06f), Local3) } default { - err(arg0, z143, 892, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -9182,7 +9182,7 @@ Method(m734, 6, Serialized) Store(Refof(f07f), Local3) } default { - err(arg0, z143, 896, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -9270,7 +9270,7 @@ Method(m734, 6, Serialized) Store(Refof(f08f), Local3) } default { - err(arg0, z143, 900, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -9358,7 +9358,7 @@ Method(m734, 6, Serialized) Store(Refof(f09f), Local3) } default { - err(arg0, z143, 904, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -9446,7 +9446,7 @@ Method(m734, 6, Serialized) Store(Refof(f0af), Local3) } default { - err(arg0, z143, 908, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -9534,7 +9534,7 @@ Method(m734, 6, Serialized) Store(Refof(f0bf), Local3) } default { - err(arg0, z143, 912, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -9622,7 +9622,7 @@ Method(m734, 6, Serialized) Store(Refof(f0cf), Local3) } default { - err(arg0, z143, 916, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -9710,7 +9710,7 @@ Method(m734, 6, Serialized) Store(Refof(f0df), Local3) } default { - err(arg0, z143, 920, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -9798,7 +9798,7 @@ Method(m734, 6, Serialized) Store(Refof(f0ef), Local3) } default { - err(arg0, z143, 924, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -9886,13 +9886,13 @@ Method(m734, 6, Serialized) Store(Refof(f0ff), Local3) } default { - err(arg0, z143, 928, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } } default { - err(arg0, z143, 932, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return} } @@ -9995,7 +9995,7 @@ Method(m735, 6, Serialized) Store(Refof(f00f), Local3) } default { - err(arg0, z143, 936, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -10083,7 +10083,7 @@ Method(m735, 6, Serialized) Store(Refof(f01f), Local3) } default { - err(arg0, z143, 940, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -10171,7 +10171,7 @@ Method(m735, 6, Serialized) Store(Refof(f02f), Local3) } default { - err(arg0, z143, 944, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -10259,7 +10259,7 @@ Method(m735, 6, Serialized) Store(Refof(f03f), Local3) } default { - err(arg0, z143, 948, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -10347,7 +10347,7 @@ Method(m735, 6, Serialized) Store(Refof(f04f), Local3) } default { - err(arg0, z143, 952, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -10435,7 +10435,7 @@ Method(m735, 6, Serialized) Store(Refof(f05f), Local3) } default { - err(arg0, z143, 956, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -10523,7 +10523,7 @@ Method(m735, 6, Serialized) Store(Refof(f06f), Local3) } default { - err(arg0, z143, 960, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -10611,7 +10611,7 @@ Method(m735, 6, Serialized) Store(Refof(f07f), Local3) } default { - err(arg0, z143, 964, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -10699,7 +10699,7 @@ Method(m735, 6, Serialized) Store(Refof(f08f), Local3) } default { - err(arg0, z143, 968, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -10787,7 +10787,7 @@ Method(m735, 6, Serialized) Store(Refof(f09f), Local3) } default { - err(arg0, z143, 972, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -10875,7 +10875,7 @@ Method(m735, 6, Serialized) Store(Refof(f0af), Local3) } default { - err(arg0, z143, 976, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -10963,7 +10963,7 @@ Method(m735, 6, Serialized) Store(Refof(f0bf), Local3) } default { - err(arg0, z143, 980, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -11051,7 +11051,7 @@ Method(m735, 6, Serialized) Store(Refof(f0cf), Local3) } default { - err(arg0, z143, 984, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -11139,7 +11139,7 @@ Method(m735, 6, Serialized) Store(Refof(f0df), Local3) } default { - err(arg0, z143, 988, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -11227,7 +11227,7 @@ Method(m735, 6, Serialized) Store(Refof(f0ef), Local3) } default { - err(arg0, z143, 992, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -11315,13 +11315,13 @@ Method(m735, 6, Serialized) Store(Refof(f0ff), Local3) } default { - err(arg0, z143, 996, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } } default { - err(arg0, z143, 1000, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return} } @@ -11424,7 +11424,7 @@ Method(m736, 6, Serialized) Store(Refof(f00f), Local3) } default { - err(arg0, z143, 1004, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -11512,7 +11512,7 @@ Method(m736, 6, Serialized) Store(Refof(f01f), Local3) } default { - err(arg0, z143, 1008, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -11600,7 +11600,7 @@ Method(m736, 6, Serialized) Store(Refof(f02f), Local3) } default { - err(arg0, z143, 1012, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -11688,7 +11688,7 @@ Method(m736, 6, Serialized) Store(Refof(f03f), Local3) } default { - err(arg0, z143, 1016, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -11776,7 +11776,7 @@ Method(m736, 6, Serialized) Store(Refof(f04f), Local3) } default { - err(arg0, z143, 1020, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -11864,7 +11864,7 @@ Method(m736, 6, Serialized) Store(Refof(f05f), Local3) } default { - err(arg0, z143, 1024, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -11952,7 +11952,7 @@ Method(m736, 6, Serialized) Store(Refof(f06f), Local3) } default { - err(arg0, z143, 1028, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -12040,7 +12040,7 @@ Method(m736, 6, Serialized) Store(Refof(f07f), Local3) } default { - err(arg0, z143, 1032, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -12128,7 +12128,7 @@ Method(m736, 6, Serialized) Store(Refof(f08f), Local3) } default { - err(arg0, z143, 1036, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -12216,7 +12216,7 @@ Method(m736, 6, Serialized) Store(Refof(f09f), Local3) } default { - err(arg0, z143, 1040, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -12304,7 +12304,7 @@ Method(m736, 6, Serialized) Store(Refof(f0af), Local3) } default { - err(arg0, z143, 1044, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -12392,7 +12392,7 @@ Method(m736, 6, Serialized) Store(Refof(f0bf), Local3) } default { - err(arg0, z143, 1048, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -12480,7 +12480,7 @@ Method(m736, 6, Serialized) Store(Refof(f0cf), Local3) } default { - err(arg0, z143, 1052, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -12568,7 +12568,7 @@ Method(m736, 6, Serialized) Store(Refof(f0df), Local3) } default { - err(arg0, z143, 1056, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -12656,7 +12656,7 @@ Method(m736, 6, Serialized) Store(Refof(f0ef), Local3) } default { - err(arg0, z143, 1060, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -12744,13 +12744,13 @@ Method(m736, 6, Serialized) Store(Refof(f0ff), Local3) } default { - err(arg0, z143, 1064, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } } default { - err(arg0, z143, 1068, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return} } @@ -12853,7 +12853,7 @@ Method(m737, 6, Serialized) Store(Refof(f00f), Local3) } default { - err(arg0, z143, 1072, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -12941,7 +12941,7 @@ Method(m737, 6, Serialized) Store(Refof(f01f), Local3) } default { - err(arg0, z143, 1076, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -13029,7 +13029,7 @@ Method(m737, 6, Serialized) Store(Refof(f02f), Local3) } default { - err(arg0, z143, 1080, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -13117,7 +13117,7 @@ Method(m737, 6, Serialized) Store(Refof(f03f), Local3) } default { - err(arg0, z143, 1084, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -13205,7 +13205,7 @@ Method(m737, 6, Serialized) Store(Refof(f04f), Local3) } default { - err(arg0, z143, 1088, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -13293,7 +13293,7 @@ Method(m737, 6, Serialized) Store(Refof(f05f), Local3) } default { - err(arg0, z143, 1092, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -13381,7 +13381,7 @@ Method(m737, 6, Serialized) Store(Refof(f06f), Local3) } default { - err(arg0, z143, 1096, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -13469,7 +13469,7 @@ Method(m737, 6, Serialized) Store(Refof(f07f), Local3) } default { - err(arg0, z143, 1100, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -13557,7 +13557,7 @@ Method(m737, 6, Serialized) Store(Refof(f08f), Local3) } default { - err(arg0, z143, 1104, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -13645,7 +13645,7 @@ Method(m737, 6, Serialized) Store(Refof(f09f), Local3) } default { - err(arg0, z143, 1108, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -13733,7 +13733,7 @@ Method(m737, 6, Serialized) Store(Refof(f0af), Local3) } default { - err(arg0, z143, 1112, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -13821,7 +13821,7 @@ Method(m737, 6, Serialized) Store(Refof(f0bf), Local3) } default { - err(arg0, z143, 1116, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -13909,7 +13909,7 @@ Method(m737, 6, Serialized) Store(Refof(f0cf), Local3) } default { - err(arg0, z143, 1120, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -13997,7 +13997,7 @@ Method(m737, 6, Serialized) Store(Refof(f0df), Local3) } default { - err(arg0, z143, 1124, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -14085,7 +14085,7 @@ Method(m737, 6, Serialized) Store(Refof(f0ef), Local3) } default { - err(arg0, z143, 1128, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -14173,13 +14173,13 @@ Method(m737, 6, Serialized) Store(Refof(f0ff), Local3) } default { - err(arg0, z143, 1132, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } } default { - err(arg0, z143, 1136, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return} } @@ -14282,7 +14282,7 @@ Method(m738, 6, Serialized) Store(Refof(f00f), Local3) } default { - err(arg0, z143, 1140, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -14370,7 +14370,7 @@ Method(m738, 6, Serialized) Store(Refof(f01f), Local3) } default { - err(arg0, z143, 1144, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -14458,7 +14458,7 @@ Method(m738, 6, Serialized) Store(Refof(f02f), Local3) } default { - err(arg0, z143, 1148, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -14546,7 +14546,7 @@ Method(m738, 6, Serialized) Store(Refof(f03f), Local3) } default { - err(arg0, z143, 1152, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -14634,7 +14634,7 @@ Method(m738, 6, Serialized) Store(Refof(f04f), Local3) } default { - err(arg0, z143, 1156, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -14722,7 +14722,7 @@ Method(m738, 6, Serialized) Store(Refof(f05f), Local3) } default { - err(arg0, z143, 1160, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -14810,7 +14810,7 @@ Method(m738, 6, Serialized) Store(Refof(f06f), Local3) } default { - err(arg0, z143, 1164, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -14898,7 +14898,7 @@ Method(m738, 6, Serialized) Store(Refof(f07f), Local3) } default { - err(arg0, z143, 1168, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -14986,7 +14986,7 @@ Method(m738, 6, Serialized) Store(Refof(f08f), Local3) } default { - err(arg0, z143, 1172, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -15074,7 +15074,7 @@ Method(m738, 6, Serialized) Store(Refof(f09f), Local3) } default { - err(arg0, z143, 1176, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -15162,7 +15162,7 @@ Method(m738, 6, Serialized) Store(Refof(f0af), Local3) } default { - err(arg0, z143, 1180, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -15250,7 +15250,7 @@ Method(m738, 6, Serialized) Store(Refof(f0bf), Local3) } default { - err(arg0, z143, 1184, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -15338,7 +15338,7 @@ Method(m738, 6, Serialized) Store(Refof(f0cf), Local3) } default { - err(arg0, z143, 1188, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -15426,7 +15426,7 @@ Method(m738, 6, Serialized) Store(Refof(f0df), Local3) } default { - err(arg0, z143, 1192, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -15514,7 +15514,7 @@ Method(m738, 6, Serialized) Store(Refof(f0ef), Local3) } default { - err(arg0, z143, 1196, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -15602,13 +15602,13 @@ Method(m738, 6, Serialized) Store(Refof(f0ff), Local3) } default { - err(arg0, z143, 1200, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } } default { - err(arg0, z143, 1204, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return} } @@ -15711,7 +15711,7 @@ Method(m739, 6, Serialized) Store(Refof(f00f), Local3) } default { - err(arg0, z143, 1208, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -15799,7 +15799,7 @@ Method(m739, 6, Serialized) Store(Refof(f01f), Local3) } default { - err(arg0, z143, 1212, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -15887,7 +15887,7 @@ Method(m739, 6, Serialized) Store(Refof(f02f), Local3) } default { - err(arg0, z143, 1216, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -15975,7 +15975,7 @@ Method(m739, 6, Serialized) Store(Refof(f03f), Local3) } default { - err(arg0, z143, 1220, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -16063,7 +16063,7 @@ Method(m739, 6, Serialized) Store(Refof(f04f), Local3) } default { - err(arg0, z143, 1224, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -16151,7 +16151,7 @@ Method(m739, 6, Serialized) Store(Refof(f05f), Local3) } default { - err(arg0, z143, 1228, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -16239,7 +16239,7 @@ Method(m739, 6, Serialized) Store(Refof(f06f), Local3) } default { - err(arg0, z143, 1232, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -16327,7 +16327,7 @@ Method(m739, 6, Serialized) Store(Refof(f07f), Local3) } default { - err(arg0, z143, 1236, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -16415,7 +16415,7 @@ Method(m739, 6, Serialized) Store(Refof(f08f), Local3) } default { - err(arg0, z143, 1240, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -16503,7 +16503,7 @@ Method(m739, 6, Serialized) Store(Refof(f09f), Local3) } default { - err(arg0, z143, 1244, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -16591,7 +16591,7 @@ Method(m739, 6, Serialized) Store(Refof(f0af), Local3) } default { - err(arg0, z143, 1248, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -16679,7 +16679,7 @@ Method(m739, 6, Serialized) Store(Refof(f0bf), Local3) } default { - err(arg0, z143, 1252, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -16767,7 +16767,7 @@ Method(m739, 6, Serialized) Store(Refof(f0cf), Local3) } default { - err(arg0, z143, 1256, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -16855,7 +16855,7 @@ Method(m739, 6, Serialized) Store(Refof(f0df), Local3) } default { - err(arg0, z143, 1260, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -16943,7 +16943,7 @@ Method(m739, 6, Serialized) Store(Refof(f0ef), Local3) } default { - err(arg0, z143, 1264, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -17031,13 +17031,13 @@ Method(m739, 6, Serialized) Store(Refof(f0ff), Local3) } default { - err(arg0, z143, 1268, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } } default { - err(arg0, z143, 1272, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return} } @@ -17140,7 +17140,7 @@ Method(m73a, 6, Serialized) Store(Refof(f00f), Local3) } default { - err(arg0, z143, 1276, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -17228,7 +17228,7 @@ Method(m73a, 6, Serialized) Store(Refof(f01f), Local3) } default { - err(arg0, z143, 1280, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -17316,7 +17316,7 @@ Method(m73a, 6, Serialized) Store(Refof(f02f), Local3) } default { - err(arg0, z143, 1284, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -17404,7 +17404,7 @@ Method(m73a, 6, Serialized) Store(Refof(f03f), Local3) } default { - err(arg0, z143, 1288, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -17492,7 +17492,7 @@ Method(m73a, 6, Serialized) Store(Refof(f04f), Local3) } default { - err(arg0, z143, 1292, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -17580,7 +17580,7 @@ Method(m73a, 6, Serialized) Store(Refof(f05f), Local3) } default { - err(arg0, z143, 1296, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -17668,7 +17668,7 @@ Method(m73a, 6, Serialized) Store(Refof(f06f), Local3) } default { - err(arg0, z143, 1300, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -17756,7 +17756,7 @@ Method(m73a, 6, Serialized) Store(Refof(f07f), Local3) } default { - err(arg0, z143, 1304, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -17844,7 +17844,7 @@ Method(m73a, 6, Serialized) Store(Refof(f08f), Local3) } default { - err(arg0, z143, 1308, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -17932,7 +17932,7 @@ Method(m73a, 6, Serialized) Store(Refof(f09f), Local3) } default { - err(arg0, z143, 1312, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -18020,7 +18020,7 @@ Method(m73a, 6, Serialized) Store(Refof(f0af), Local3) } default { - err(arg0, z143, 1316, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -18108,7 +18108,7 @@ Method(m73a, 6, Serialized) Store(Refof(f0bf), Local3) } default { - err(arg0, z143, 1320, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -18196,7 +18196,7 @@ Method(m73a, 6, Serialized) Store(Refof(f0cf), Local3) } default { - err(arg0, z143, 1324, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -18284,7 +18284,7 @@ Method(m73a, 6, Serialized) Store(Refof(f0df), Local3) } default { - err(arg0, z143, 1328, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -18372,7 +18372,7 @@ Method(m73a, 6, Serialized) Store(Refof(f0ef), Local3) } default { - err(arg0, z143, 1332, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -18460,13 +18460,13 @@ Method(m73a, 6, Serialized) Store(Refof(f0ff), Local3) } default { - err(arg0, z143, 1336, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } } default { - err(arg0, z143, 1340, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return} } @@ -18569,7 +18569,7 @@ Method(m73b, 6, Serialized) Store(Refof(f00f), Local3) } default { - err(arg0, z143, 1344, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -18657,7 +18657,7 @@ Method(m73b, 6, Serialized) Store(Refof(f01f), Local3) } default { - err(arg0, z143, 1348, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -18745,7 +18745,7 @@ Method(m73b, 6, Serialized) Store(Refof(f02f), Local3) } default { - err(arg0, z143, 1352, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -18833,7 +18833,7 @@ Method(m73b, 6, Serialized) Store(Refof(f03f), Local3) } default { - err(arg0, z143, 1356, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -18921,7 +18921,7 @@ Method(m73b, 6, Serialized) Store(Refof(f04f), Local3) } default { - err(arg0, z143, 1360, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -19009,7 +19009,7 @@ Method(m73b, 6, Serialized) Store(Refof(f05f), Local3) } default { - err(arg0, z143, 1364, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -19097,7 +19097,7 @@ Method(m73b, 6, Serialized) Store(Refof(f06f), Local3) } default { - err(arg0, z143, 1368, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -19185,7 +19185,7 @@ Method(m73b, 6, Serialized) Store(Refof(f07f), Local3) } default { - err(arg0, z143, 1372, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -19273,7 +19273,7 @@ Method(m73b, 6, Serialized) Store(Refof(f08f), Local3) } default { - err(arg0, z143, 1376, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -19361,7 +19361,7 @@ Method(m73b, 6, Serialized) Store(Refof(f09f), Local3) } default { - err(arg0, z143, 1380, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -19449,7 +19449,7 @@ Method(m73b, 6, Serialized) Store(Refof(f0af), Local3) } default { - err(arg0, z143, 1384, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -19537,7 +19537,7 @@ Method(m73b, 6, Serialized) Store(Refof(f0bf), Local3) } default { - err(arg0, z143, 1388, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -19625,7 +19625,7 @@ Method(m73b, 6, Serialized) Store(Refof(f0cf), Local3) } default { - err(arg0, z143, 1392, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -19713,7 +19713,7 @@ Method(m73b, 6, Serialized) Store(Refof(f0df), Local3) } default { - err(arg0, z143, 1396, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -19801,7 +19801,7 @@ Method(m73b, 6, Serialized) Store(Refof(f0ef), Local3) } default { - err(arg0, z143, 1400, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -19889,13 +19889,13 @@ Method(m73b, 6, Serialized) Store(Refof(f0ff), Local3) } default { - err(arg0, z143, 1404, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } } default { - err(arg0, z143, 1408, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return} } @@ -19998,7 +19998,7 @@ Method(m73c, 6, Serialized) Store(Refof(f00f), Local3) } default { - err(arg0, z143, 1412, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -20086,7 +20086,7 @@ Method(m73c, 6, Serialized) Store(Refof(f01f), Local3) } default { - err(arg0, z143, 1416, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -20174,7 +20174,7 @@ Method(m73c, 6, Serialized) Store(Refof(f02f), Local3) } default { - err(arg0, z143, 1420, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -20262,7 +20262,7 @@ Method(m73c, 6, Serialized) Store(Refof(f03f), Local3) } default { - err(arg0, z143, 1424, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -20350,7 +20350,7 @@ Method(m73c, 6, Serialized) Store(Refof(f04f), Local3) } default { - err(arg0, z143, 1428, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -20438,7 +20438,7 @@ Method(m73c, 6, Serialized) Store(Refof(f05f), Local3) } default { - err(arg0, z143, 1432, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -20526,7 +20526,7 @@ Method(m73c, 6, Serialized) Store(Refof(f06f), Local3) } default { - err(arg0, z143, 1436, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -20614,7 +20614,7 @@ Method(m73c, 6, Serialized) Store(Refof(f07f), Local3) } default { - err(arg0, z143, 1440, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -20702,7 +20702,7 @@ Method(m73c, 6, Serialized) Store(Refof(f08f), Local3) } default { - err(arg0, z143, 1444, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -20790,7 +20790,7 @@ Method(m73c, 6, Serialized) Store(Refof(f09f), Local3) } default { - err(arg0, z143, 1448, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -20878,7 +20878,7 @@ Method(m73c, 6, Serialized) Store(Refof(f0af), Local3) } default { - err(arg0, z143, 1452, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -20966,7 +20966,7 @@ Method(m73c, 6, Serialized) Store(Refof(f0bf), Local3) } default { - err(arg0, z143, 1456, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -21054,7 +21054,7 @@ Method(m73c, 6, Serialized) Store(Refof(f0cf), Local3) } default { - err(arg0, z143, 1460, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -21142,7 +21142,7 @@ Method(m73c, 6, Serialized) Store(Refof(f0df), Local3) } default { - err(arg0, z143, 1464, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -21230,7 +21230,7 @@ Method(m73c, 6, Serialized) Store(Refof(f0ef), Local3) } default { - err(arg0, z143, 1468, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -21318,13 +21318,13 @@ Method(m73c, 6, Serialized) Store(Refof(f0ff), Local3) } default { - err(arg0, z143, 1472, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } } default { - err(arg0, z143, 1476, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return} } @@ -21427,7 +21427,7 @@ Method(m73d, 6, Serialized) Store(Refof(f00f), Local3) } default { - err(arg0, z143, 1480, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -21515,7 +21515,7 @@ Method(m73d, 6, Serialized) Store(Refof(f01f), Local3) } default { - err(arg0, z143, 1484, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -21603,7 +21603,7 @@ Method(m73d, 6, Serialized) Store(Refof(f02f), Local3) } default { - err(arg0, z143, 1488, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -21691,7 +21691,7 @@ Method(m73d, 6, Serialized) Store(Refof(f03f), Local3) } default { - err(arg0, z143, 1492, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -21779,7 +21779,7 @@ Method(m73d, 6, Serialized) Store(Refof(f04f), Local3) } default { - err(arg0, z143, 1496, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -21867,7 +21867,7 @@ Method(m73d, 6, Serialized) Store(Refof(f05f), Local3) } default { - err(arg0, z143, 1500, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -21955,7 +21955,7 @@ Method(m73d, 6, Serialized) Store(Refof(f06f), Local3) } default { - err(arg0, z143, 1504, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -22043,7 +22043,7 @@ Method(m73d, 6, Serialized) Store(Refof(f07f), Local3) } default { - err(arg0, z143, 1508, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -22131,7 +22131,7 @@ Method(m73d, 6, Serialized) Store(Refof(f08f), Local3) } default { - err(arg0, z143, 1512, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -22219,7 +22219,7 @@ Method(m73d, 6, Serialized) Store(Refof(f09f), Local3) } default { - err(arg0, z143, 1516, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -22307,7 +22307,7 @@ Method(m73d, 6, Serialized) Store(Refof(f0af), Local3) } default { - err(arg0, z143, 1520, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -22395,7 +22395,7 @@ Method(m73d, 6, Serialized) Store(Refof(f0bf), Local3) } default { - err(arg0, z143, 1524, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -22483,7 +22483,7 @@ Method(m73d, 6, Serialized) Store(Refof(f0cf), Local3) } default { - err(arg0, z143, 1528, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -22571,7 +22571,7 @@ Method(m73d, 6, Serialized) Store(Refof(f0df), Local3) } default { - err(arg0, z143, 1532, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -22659,7 +22659,7 @@ Method(m73d, 6, Serialized) Store(Refof(f0ef), Local3) } default { - err(arg0, z143, 1536, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -22747,13 +22747,13 @@ Method(m73d, 6, Serialized) Store(Refof(f0ff), Local3) } default { - err(arg0, z143, 1540, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } } default { - err(arg0, z143, 1544, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return} } @@ -22856,7 +22856,7 @@ Method(m73e, 6, Serialized) Store(Refof(f00f), Local3) } default { - err(arg0, z143, 1548, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -22944,7 +22944,7 @@ Method(m73e, 6, Serialized) Store(Refof(f01f), Local3) } default { - err(arg0, z143, 1552, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -23032,7 +23032,7 @@ Method(m73e, 6, Serialized) Store(Refof(f02f), Local3) } default { - err(arg0, z143, 1556, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -23120,7 +23120,7 @@ Method(m73e, 6, Serialized) Store(Refof(f03f), Local3) } default { - err(arg0, z143, 1560, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -23208,7 +23208,7 @@ Method(m73e, 6, Serialized) Store(Refof(f04f), Local3) } default { - err(arg0, z143, 1564, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -23296,7 +23296,7 @@ Method(m73e, 6, Serialized) Store(Refof(f05f), Local3) } default { - err(arg0, z143, 1568, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -23384,7 +23384,7 @@ Method(m73e, 6, Serialized) Store(Refof(f06f), Local3) } default { - err(arg0, z143, 1572, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -23472,7 +23472,7 @@ Method(m73e, 6, Serialized) Store(Refof(f07f), Local3) } default { - err(arg0, z143, 1576, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -23560,7 +23560,7 @@ Method(m73e, 6, Serialized) Store(Refof(f08f), Local3) } default { - err(arg0, z143, 1580, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -23648,7 +23648,7 @@ Method(m73e, 6, Serialized) Store(Refof(f09f), Local3) } default { - err(arg0, z143, 1584, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -23736,7 +23736,7 @@ Method(m73e, 6, Serialized) Store(Refof(f0af), Local3) } default { - err(arg0, z143, 1588, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -23824,7 +23824,7 @@ Method(m73e, 6, Serialized) Store(Refof(f0bf), Local3) } default { - err(arg0, z143, 1592, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -23912,7 +23912,7 @@ Method(m73e, 6, Serialized) Store(Refof(f0cf), Local3) } default { - err(arg0, z143, 1596, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -24000,7 +24000,7 @@ Method(m73e, 6, Serialized) Store(Refof(f0df), Local3) } default { - err(arg0, z143, 1600, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -24088,7 +24088,7 @@ Method(m73e, 6, Serialized) Store(Refof(f0ef), Local3) } default { - err(arg0, z143, 1604, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } @@ -24176,13 +24176,13 @@ Method(m73e, 6, Serialized) Store(Refof(f0ff), Local3) } default { - err(arg0, z143, 1608, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return } } } default { - err(arg0, z143, 1612, 0, 0, arg2, arg3) + err(arg0, z143, __LINE__, 0, 0, arg2, arg3) return} } @@ -24230,7 +24230,7 @@ Method(m72d, 7, Serialized) Store(Derefof(Derefof(Index(fcp0, 1))), Local0) if (LNotEqual(Local0, 0xa5)) { - err(arg0, z143, 1616, 0, 0, Local0, 0xa5) + err(arg0, z143, __LINE__, 0, 0, Local0, 0xa5) } } } @@ -24244,7 +24244,7 @@ Method(m72d, 7, Serialized) Store(Derefof(Derefof(Index(fcp0, 1))), Local0) if (LNotEqual(Local0, Derefof(Index(fcp0, 2)))) { - err(arg0, z143, 1620, 0, 0, Local0, Derefof(Index(fcp0, 2))) + err(arg0, z143, __LINE__, 0, 0, Local0, Derefof(Index(fcp0, 2))) } } } @@ -24264,7 +24264,7 @@ Method(m72d, 7, Serialized) Store(Derefof(Derefof(Index(fcp0, 1))), Local0) if (LNotEqual(Local0, 0xa5)) { - err(arg0, z143, 1624, 0, 0, Local0, 0xa5) + err(arg0, z143, __LINE__, 0, 0, Local0, 0xa5) } } } @@ -24287,7 +24287,7 @@ Method(m72d, 7, Serialized) Store(Derefof(Derefof(Index(fcp0, 1))), Local0) if (LNotEqual(Local0, Derefof(Index(fcp0, 2)))) { - err(arg0, z143, 1628, 0, 0, Local0, Derefof(Index(fcp0, 2))) + err(arg0, z143, __LINE__, 0, 0, Local0, Derefof(Index(fcp0, 2))) } } } @@ -24296,7 +24296,7 @@ Method(m72d, 7, Serialized) Store(ObjectType(arg1), Local0) if (LNotEqual(Local0, c00d)) { - err(arg0, z143, 1632, 0, 0, Local0, c00d) + err(arg0, z143, __LINE__, 0, 0, Local0, c00d) } // Retrieve the field back @@ -24309,7 +24309,7 @@ Method(m72d, 7, Serialized) Store(Derefof(Derefof(Index(fcp0, 1))), Local0) if (LNotEqual(Local0, 0xa5)) { - err(arg0, z143, 1636, 0, 0, Local0, 0xa5) + err(arg0, z143, __LINE__, 0, 0, Local0, 0xa5) } } } @@ -24331,11 +24331,11 @@ Method(m72d, 7, Serialized) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, INT0)) { - err(arg0, z143, 1640, 0, 0, Local1, INT0) + err(arg0, z143, __LINE__, 0, 0, Local1, INT0) } if (LNotEqual(Local0, arg5)) { - err(arg0, z143, 1644, 0, 0, Local0, arg5) + err(arg0, z143, __LINE__, 0, 0, Local0, arg5) } switch(ToInteger (pr01)) { @@ -24344,7 +24344,7 @@ Method(m72d, 7, Serialized) Store(Derefof(Derefof(Index(fcp0, 1))), Local0) if (LNotEqual(Local0, Derefof(Index(fcp0, 2)))) { - err(arg0, z143, 1648, 0, 0, Local0, Derefof(Index(fcp0, 2))) + err(arg0, z143, __LINE__, 0, 0, Local0, Derefof(Index(fcp0, 2))) } } } @@ -24359,7 +24359,7 @@ Method(m72d, 7, Serialized) Store(Derefof(Derefof(Index(fcp0, 1))), Local0) if (LNotEqual(Local0, 0xa5)) { - err(arg0, z143, 1652, 0, 0, Local0, 0xa5) + err(arg0, z143, __LINE__, 0, 0, Local0, 0xa5) } } } @@ -24372,13 +24372,13 @@ Method(m72d, 7, Serialized) Store(Derefof(Derefof(Index(fcp0, 1))), Local0) if (LNotEqual(Local0, Derefof(Index(fcp0, 2)))) { - err(arg0, z143, 1656, 0, 0, Local0, Derefof(Index(fcp0, 2))) + err(arg0, z143, __LINE__, 0, 0, Local0, Derefof(Index(fcp0, 2))) } } } if (LNotEqual(Local1, brB0)) { - err(arg0, z143, 1660, 0, 0, Local1, brB0) + err(arg0, z143, __LINE__, 0, 0, Local1, brB0) } elseif (pr00) { Store("==PostGround==:", Debug) Store(Local1, Debug) @@ -24640,7 +24640,7 @@ Method(m743, 1, Serialized) case (14) { Store(Refof(f00e), Local4) } case (15) { Store(Refof(f00f), Local4) } default { - err(arg0, z143, 1664, 0, 0, Local1, Local3) + err(arg0, z143, __LINE__, 0, 0, Local1, Local3) return } } @@ -24664,7 +24664,7 @@ Method(m743, 1, Serialized) case (14) { Store(Refof(f01e), Local4) } case (15) { Store(Refof(f01f), Local4) } default { - err(arg0, z143, 1668, 0, 0, Local1, Local3) + err(arg0, z143, __LINE__, 0, 0, Local1, Local3) return } } @@ -24688,7 +24688,7 @@ Method(m743, 1, Serialized) case (14) { Store(Refof(f02e), Local4) } case (15) { Store(Refof(f02f), Local4) } default { - err(arg0, z143, 1672, 0, 0, Local1, Local3) + err(arg0, z143, __LINE__, 0, 0, Local1, Local3) return } } @@ -24712,13 +24712,13 @@ Method(m743, 1, Serialized) case (14) { Store(Refof(f03e), Local4) } case (15) { Store(Refof(f03f), Local4) } default { - err(arg0, z143, 1676, 0, 0, Local1, Local3) + err(arg0, z143, __LINE__, 0, 0, Local1, Local3) return } } } default { - err(arg0, z143, 1680, 0, 0, Local1, Local3) + err(arg0, z143, __LINE__, 0, 0, Local1, Local3) return } } @@ -24764,7 +24764,7 @@ Method(m743, 1, Serialized) Mid(Local6, Derefof(Index(Local4, 0)), Sizeof (Local5), Local7) if (LNotEqual(Local7, Local5)) { - err(arg0, z143, 1684, z143, Add(Multiply(16, Local1), Local3), Local7, Local5) + err(arg0, z143, __LINE__, z143, Add(Multiply(16, Local1), Local3), Local7, Local5) } // Check contents of the external accessed memory @@ -24787,7 +24787,7 @@ Method(m743, 1, Serialized) Derefof(Index(Local6, Subtract(Subtract(Derefof(Index(Local4, 0)), Local7), 1))), 0x00)) { - err(arg0, z143, 1688, z143, Add(Multiply(16, Local1), Local3), + err(arg0, z143, __LINE__, z143, Add(Multiply(16, Local1), Local3), Derefof(Index(Local6, Subtract(Derefof(Index(Local4, 0)), Local7))), 0x00 ) @@ -24799,7 +24799,7 @@ Method(m743, 1, Serialized) if (LNotEqual( Derefof(Index(Local6, Subtract(Derefof(Index(Local4, 0)), Local7))), 0xff)) { - err(arg0, z143, 1692, z143, Add(Multiply(16, Local1), Local3), + err(arg0, z143, __LINE__, z143, Add(Multiply(16, Local1), Local3), Derefof(Index(Local6, Subtract(Derefof(Index(Local4, 0)), Local7))), 0xff ) @@ -24825,7 +24825,7 @@ Method(m743, 1, Serialized) if (LNotEqual( Derefof(Index(Local6, Add(i000, Local7))), 0x00)) { - err(arg0, z143, 1696, z143, Add(Multiply(16, Local1), Local3), + err(arg0, z143, __LINE__, z143, Add(Multiply(16, Local1), Local3), Derefof(Index(Local6, Add(i000, Local7))), 0x00 ) @@ -24837,7 +24837,7 @@ Method(m743, 1, Serialized) if (LNotEqual( Derefof(Index(Local6, Add(i000, Local7))), 0xff)) { - err(arg0, z143, 1700, z143, Add(Multiply(16, Local1), Local3), + err(arg0, z143, __LINE__, z143, Add(Multiply(16, Local1), Local3), Derefof(Index(Local6, Add(i000, Local7))), 0xff ) @@ -24879,7 +24879,7 @@ Method(m744, 1, Serialized) Store(0x1, f001) if (LNotEqual(f000, 0x08)) { - err(arg0, z143, 1704, 0, 0, f000, 0x08) + err(arg0, z143, __LINE__, 0, 0, f000, 0x08) } } diff --git a/tests/aslts/src/runtime/collections/functional/synchronization/mutex2.asl b/tests/aslts/src/runtime/collections/functional/synchronization/mutex2.asl index b51b65ced..d517998a7 100644 --- a/tests/aslts/src/runtime/collections/functional/synchronization/mutex2.asl +++ b/tests/aslts/src/runtime/collections/functional/synchronization/mutex2.asl @@ -80,71 +80,71 @@ Method(m301,, Serialized) Store(Acquire(MT00, 0xffff), Local0) if (Local0) { - err(ts, z150, 1, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(\_GL, 0xffff), Local0) /* GL */ if (Local0) { - err(ts, z150, 3, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT10, 0xffff), Local0) if (Local0) { - err(ts, z150, 2, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT20, 0xffff), Local0) if (Local0) { - err(ts, z150, 3, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT30, 0xffff), Local0) if (Local0) { - err(ts, z150, 4, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT40, 0xffff), Local0) if (Local0) { - err(ts, z150, 5, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT50, 0xffff), Local0) if (Local0) { - err(ts, z150, 6, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT60, 0xffff), Local0) if (Local0) { - err(ts, z150, 7, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT70, 0xffff), Local0) if (Local0) { - err(ts, z150, 8, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT80, 0xffff), Local0) if (Local0) { - err(ts, z150, 9, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT90, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x00a, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTa0, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x00b, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTb0, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x00c, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTc0, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x00d, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTd0, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x00e, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTe0, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x00f, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTf0, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x010, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Release(MTF0) Release(MTE0) @@ -243,131 +243,131 @@ Method(m369, 1, Serialized) Store(Acquire(MT00, 0xffff), Local0) if (Local0) { - err(ts, z150, 1, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT01, 0xffff), Local0) /* the same level */ if (Local0) { - err(ts, z150, 2, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(\_GL, 0xffff), Local0) /* GL */ if (Local0) { - err(ts, z150, 3, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT10, 0xffff), Local0) if (Local0) { - err(ts, z150, 4, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT11, 0xffff), Local0) if (Local0) { - err(ts, z150, 5, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT20, 0xffff), Local0) if (Local0) { - err(ts, z150, 6, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT21, 0xffff), Local0) if (Local0) { - err(ts, z150, 7, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT30, 0xffff), Local0) if (Local0) { - err(ts, z150, 8, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT31, 0xffff), Local0) if (Local0) { - err(ts, z150, 9, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT40, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x00a, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT41, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x00b, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT50, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x00c, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT51, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x00d, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT60, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x00e, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT61, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x00f, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT70, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x010, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT71, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x011, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT80, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x012, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT81, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x013, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT90, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x014, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT91, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x015, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTa0, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x016, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTa1, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x017, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTb0, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x018, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTb1, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x019, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTc0, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x01a, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTc1, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x01b, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTd0, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x01c, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTd1, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x01d, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTe0, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x01e, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTe1, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x01f, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTf0, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x020, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { if (arg0) { Store(Acquire(MTf1, 0xffff), Local0) @@ -375,7 +375,7 @@ Method(m369, 1, Serialized) Store(0, Local0) } if (Local0) { - err(ts, z150, 0x021, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { if (arg0) { Release(MTF1) @@ -489,71 +489,71 @@ Method(m36a,, Serialized) Store(Acquire(MT00, 0xffff), Local0) if (Local0) { - err(ts, z150, 1, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(\_GL, 0xffff), Local0) if (Local0) { - err(ts, z150, 2, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT10, 0xffff), Local0) if (Local0) { - err(ts, z150, 3, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT20, 0xffff), Local0) if (Local0) { - err(ts, z150, 4, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT30, 0xffff), Local0) if (Local0) { - err(ts, z150, 5, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT40, 0xffff), Local0) if (Local0) { - err(ts, z150, 6, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT50, 0xffff), Local0) if (Local0) { - err(ts, z150, 7, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT60, 0xffff), Local0) if (Local0) { - err(ts, z150, 8, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT70, 0xffff), Local0) if (Local0) { - err(ts, z150, 9, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT80, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x00a, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT90, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x00b, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTa0, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x00c, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTb0, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x00d, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTc0, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x00e, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTd0, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x00f, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTe0, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x010, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTf0, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x011, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { m001() } @@ -637,71 +637,71 @@ Method(m36b,, Serialized) Store(Acquire(MT00, 0xffff), Local0) if (Local0) { - err(ts, z150, 1, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(\_GL, 0xffff), Local0) if (Local0) { - err(ts, z150, 2, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT10, 0xffff), Local0) if (Local0) { - err(ts, z150, 3, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT20, 0xffff), Local0) if (Local0) { - err(ts, z150, 4, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT30, 0xffff), Local0) if (Local0) { - err(ts, z150, 5, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT40, 0xffff), Local0) if (Local0) { - err(ts, z150, 6, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT50, 0xffff), Local0) if (Local0) { - err(ts, z150, 7, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT60, 0xffff), Local0) if (Local0) { - err(ts, z150, 8, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT70, 0xffff), Local0) if (Local0) { - err(ts, z150, 9, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT80, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x00a, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MT90, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x00b, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTa0, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x00c, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTb0, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x00d, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTc0, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x00e, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTd0, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x00f, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTe0, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x010, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } else { Store(Acquire(MTf0, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x011, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } } } @@ -1364,7 +1364,7 @@ Method(m0bb,, Serialized) Store(Acquire(T805, 0xffff), i103) if (i103) { - err(ts, z150, 0x001, 0, 0, 0, i103) + err(ts, z150, __LINE__, 0, 0, 0, i103) } Store("m13e completed", Debug) @@ -1394,12 +1394,12 @@ Method(m0bb,, Serialized) if (i102) { Store("Acquire(T804, 0xffff) failed", Debug) - err(ts, z150, 0x002, 0, 0, 0, i102) + err(ts, z150, __LINE__, 0, 0, 0, i102) } if (i103) { Store("Acquire(T805, 0xffff) failed", Debug) - err(ts, z150, 0x003, 0, 0, 0, i103) + err(ts, z150, __LINE__, 0, 0, 0, i103) } CH03(ts, z150, 0x004, 0, 0) @@ -1426,87 +1426,87 @@ Method(m07c,, Serialized) Store(Acquire(\_GL, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x000, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Store(Acquire(T000, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x000, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Store(Acquire(T100, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x000, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Store(Acquire(T200, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x000, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Store(Acquire(T300, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x000, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Store(Acquire(T400, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x000, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Store(Acquire(T500, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x000, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Store(Acquire(T600, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x000, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Store(Acquire(T700, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x000, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Store(Acquire(T800, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x000, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Store(Acquire(T900, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x000, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Store(Acquire(Ta00, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x000, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Store(Acquire(Tb00, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x000, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Store(Acquire(Tc00, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x000, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Store(Acquire(Td00, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x000, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Store(Acquire(Te00, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x000, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Store(Acquire(Tf00, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x000, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } CH03(ts, z150, 0x000, 0, 0) @@ -1543,87 +1543,87 @@ Method(m07c,, Serialized) Store(Acquire(\_GL, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x000, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Store(Acquire(T000, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x000, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Store(Acquire(T100, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x000, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Store(Acquire(T200, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x000, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Store(Acquire(T300, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x000, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Store(Acquire(T400, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x000, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Store(Acquire(T500, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x000, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Store(Acquire(T600, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x000, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Store(Acquire(T700, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x000, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Store(Acquire(T800, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x000, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Store(Acquire(T900, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x000, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Store(Acquire(Ta00, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x000, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Store(Acquire(Tb00, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x000, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Store(Acquire(Tc00, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x000, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Store(Acquire(Td00, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x000, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Store(Acquire(Te00, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x000, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Store(Acquire(Tf00, 0xffff), Local0) if (Local0) { - err(ts, z150, 0x000, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } CH03(ts, z150, 0x000, 0, 0) @@ -1734,12 +1734,12 @@ Method(m0ba,, Serialized) Add(Acquire(\_GL, 0xffff), 1, Local0) if (LNotEqual(Local0, 1)) { - err(ts, z150, 0x001, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Add(Acquire(T500, 0xffff), 1, Local0) if (LNotEqual(Local0, 1)) { - err(ts, z150, 0x002, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Release(T500) @@ -1749,12 +1749,12 @@ Method(m0ba,, Serialized) Subtract(1, Acquire(\_GL, 0xffff), Local0) if (LNotEqual(Local0, 1)) { - err(ts, z150, 0x003, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Subtract(1, Acquire(T500, 0xffff), Local0) if (LNotEqual(Local0, 1)) { - err(ts, z150, 0x004, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Release(T500) @@ -1763,7 +1763,7 @@ Method(m0ba,, Serialized) /* LEqual */ if (LNotEqual(Acquire(T500, 0xffff), 0)) { - err(ts, z150, 0x004, 0, 0, 0, Local0) + err(ts, z150, __LINE__, 0, 0, 0, Local0) } Release(T500) @@ -2105,7 +2105,7 @@ Method(m300) SRMT("m300") if (ERR7) { - err("ERRORS were detected during the loading stage", z150, 0x200, 0, 0, 0, ERR7) + err("ERRORS were detected during the loading stage", z150, __LINE__, 0, 0, 0, ERR7) } /* ATTENTION: this test must be run the first */ diff --git a/tests/aslts/src/runtime/collections/functional/synchronization/mutex_proc.asl b/tests/aslts/src/runtime/collections/functional/synchronization/mutex_proc.asl index c86432cd9..a43512d50 100644 --- a/tests/aslts/src/runtime/collections/functional/synchronization/mutex_proc.asl +++ b/tests/aslts/src/runtime/collections/functional/synchronization/mutex_proc.asl @@ -55,119 +55,119 @@ Method(m36d, 1, Serialized) } Store(Acquire(T000, 0xffff), Local0) if (Local0) { - err(ts, z151, 1, 0, 0, 0, Local0) + err(ts, z151, __LINE__, 0, 0, 0, Local0) } else { if (LEqual(arg0, 1)) { return } Store(Acquire(\_GL, 0xffff), Local0) if (Local0) { - err(ts, z151, 2, 0, 0, 0, Local0) + err(ts, z151, __LINE__, 0, 0, 0, Local0) } else { if (LEqual(arg0, 2)) { return } Store(Acquire(T100, 0xffff), Local0) if (Local0) { - err(ts, z151, 3, 0, 0, 0, Local0) + err(ts, z151, __LINE__, 0, 0, 0, Local0) } else { if (LEqual(arg0, 3)) { return } Store(Acquire(T200, 0xffff), Local0) if (Local0) { - err(ts, z151, 4, 0, 0, 0, Local0) + err(ts, z151, __LINE__, 0, 0, 0, Local0) } else { if (LEqual(arg0, 4)) { return } Store(Acquire(T300, 0xffff), Local0) if (Local0) { - err(ts, z151, 5, 0, 0, 0, Local0) + err(ts, z151, __LINE__, 0, 0, 0, Local0) } else { if (LEqual(arg0, 5)) { return } Store(Acquire(T400, 0xffff), Local0) if (Local0) { - err(ts, z151, 6, 0, 0, 0, Local0) + err(ts, z151, __LINE__, 0, 0, 0, Local0) } else { if (LEqual(arg0, 6)) { return } Store(Acquire(T500, 0xffff), Local0) if (Local0) { - err(ts, z151, 7, 0, 0, 0, Local0) + err(ts, z151, __LINE__, 0, 0, 0, Local0) } else { if (LEqual(arg0, 7)) { return } Store(Acquire(T600, 0xffff), Local0) if (Local0) { - err(ts, z151, 8, 0, 0, 0, Local0) + err(ts, z151, __LINE__, 0, 0, 0, Local0) } else { if (LEqual(arg0, 8)) { return } Store(Acquire(T700, 0xffff), Local0) if (Local0) { - err(ts, z151, 9, 0, 0, 0, Local0) + err(ts, z151, __LINE__, 0, 0, 0, Local0) } else { if (LEqual(arg0, 9)) { return } Store(Acquire(T800, 0xffff), Local0) if (Local0) { - err(ts, z151, 0x00a, 0, 0, 0, Local0) + err(ts, z151, __LINE__, 0, 0, 0, Local0) } else { if (LEqual(arg0, 10)) { return } Store(Acquire(T900, 0xffff), Local0) if (Local0) { - err(ts, z151, 0x00b, 0, 0, 0, Local0) + err(ts, z151, __LINE__, 0, 0, 0, Local0) } else { if (LEqual(arg0, 11)) { return } Store(Acquire(Ta00, 0xffff), Local0) if (Local0) { - err(ts, z151, 0x00c, 0, 0, 0, Local0) + err(ts, z151, __LINE__, 0, 0, 0, Local0) } else { if (LEqual(arg0, 12)) { return } Store(Acquire(Tb00, 0xffff), Local0) if (Local0) { - err(ts, z151, 0x00d, 0, 0, 0, Local0) + err(ts, z151, __LINE__, 0, 0, 0, Local0) } else { if (LEqual(arg0, 13)) { return } Store(Acquire(Tc00, 0xffff), Local0) if (Local0) { - err(ts, z151, 0x00e, 0, 0, 0, Local0) + err(ts, z151, __LINE__, 0, 0, 0, Local0) } else { if (LEqual(arg0, 14)) { return } Store(Acquire(Td00, 0xffff), Local0) if (Local0) { - err(ts, z151, 0x00f, 0, 0, 0, Local0) + err(ts, z151, __LINE__, 0, 0, 0, Local0) } else { if (LEqual(arg0, 15)) { return } Store(Acquire(Te00, 0xffff), Local0) if (Local0) { - err(ts, z151, 0x010, 0, 0, 0, Local0) + err(ts, z151, __LINE__, 0, 0, 0, Local0) } else { if (LEqual(arg0, 16)) { return } Store(Acquire(Tf00, 0xffff), Local0) if (Local0) { - err(ts, z151, 0x011, 0, 0, 0, Local0) + err(ts, z151, __LINE__, 0, 0, 0, Local0) } else { if (LEqual(arg0, 17)) { return @@ -346,7 +346,7 @@ Method(m36f, 4, Serialized) if (LNot(arg2)) { if (Local0) { - err("m36f", z151, 0x002, 0, 0, Local0, 0) + err("m36f", z151, __LINE__, 0, 0, Local0, 0) } } diff --git a/tests/aslts/src/runtime/collections/functional/synchronization/serialized.asl b/tests/aslts/src/runtime/collections/functional/synchronization/serialized.asl index 92edb2f32..6ea3ec321 100644 --- a/tests/aslts/src/runtime/collections/functional/synchronization/serialized.asl +++ b/tests/aslts/src/runtime/collections/functional/synchronization/serialized.asl @@ -60,7 +60,7 @@ Method(m3b0, 0, Serialized, 0) Increment(i000) Store("m016", Debug) if (LNotEqual(i000, 17)) { - err(ts, z173, 0x000, 0, 0, i000, 17) + err(ts, z173, __LINE__, 0, 0, i000, 17) } } @@ -98,7 +98,7 @@ Method(m3b1,, Serialized) Increment(i000) Store("m016", Debug) if (LNotEqual(i000, 17)) { - err(ts, z173, 0x003, 0, 0, i000, 17) + err(ts, z173, __LINE__, 0, 0, i000, 17) } } @@ -163,7 +163,7 @@ Method(m3b2, 0, Serialized, 0) Increment(i000) Store("m016", Debug) if (LNotEqual(i000, 28)) { - err(ts, z173, 0x006, 0, 0, i000, 28) + err(ts, z173, __LINE__, 0, 0, i000, 28) } Store(0xabcd0000, i001) } @@ -172,7 +172,7 @@ Method(m3b2, 0, Serialized, 0) m000() if (LNotEqual(i001, 0xabcd0000)) { - err(ts, z173, 0x008, 0, 0, i001, 0xabcd0000) + err(ts, z173, __LINE__, 0, 0, i001, 0xabcd0000) } CH03(ts, z173, 0x009, 0, 0) } @@ -308,10 +308,10 @@ Method(m3b3, 3, Serialized) CH04(ts, 0, 64, z173, 0x00b, 0, 0) // AE_AML_MUTEX_ORDER } else { if (LNotEqual(i003, arg0)) { - err(ts, z173, 0x00c, 0, 0, i003, arg0) + err(ts, z173, __LINE__, 0, 0, i003, arg0) } if (LNotEqual(i004, arg1)) { - err(ts, z173, 0x00d, 0, 0, i004, arg1) + err(ts, z173, __LINE__, 0, 0, i004, arg1) } } @@ -440,10 +440,10 @@ Method(m3b5, 2, Serialized) CH04(ts, 0, 64, z173, 0x010, 0, 0) // AE_AML_MUTEX_ORDER } else { if (LNotEqual(i003, arg0)) { - err(ts, z173, 0x011, 0, 0, i003, arg0) + err(ts, z173, __LINE__, 0, 0, i003, arg0) } if (LNotEqual(i004, arg1)) { - err(ts, z173, 0x012, 0, 0, i004, arg1) + err(ts, z173, __LINE__, 0, 0, i004, arg1) } } @@ -613,10 +613,10 @@ Method(m3b7, 3, Serialized) CH04(ts, 0, 64, z173, 0x015, 0, 0) // AE_AML_MUTEX_ORDER } else { if (LNotEqual(i003, arg0)) { - err(ts, z173, 0x016, 0, 0, i003, arg0) + err(ts, z173, __LINE__, 0, 0, i003, arg0) } if (LNotEqual(i004, arg1)) { - err(ts, z173, 0x017, 0, 0, i004, arg1) + err(ts, z173, __LINE__, 0, 0, i004, arg1) } } @@ -804,7 +804,7 @@ Method(m3bb, 3, Serialized) mm00(1, i000, i001) if (arg1) { if (Local0) { - err(ts, z173, 0x019, 0, 0, 0, Local0) + err(ts, z173, __LINE__, 0, 0, 0, Local0) } } if (LNot(Local0)) { @@ -821,7 +821,7 @@ Method(m3bb, 3, Serialized) mm00(1, i000, i001) if (arg1) { if (Local0) { - err(ts, z173, 0x019, 0, 0, 0, Local0) + err(ts, z173, __LINE__, 0, 0, 0, Local0) } } if (LNot(Local0)) { @@ -838,7 +838,7 @@ Method(m3bb, 3, Serialized) mm00(1, i000, i001) if (arg1) { if (Local0) { - err(ts, z173, 0x019, 0, 0, 0, Local0) + err(ts, z173, __LINE__, 0, 0, 0, Local0) } } if (LNot(Local0)) { @@ -855,7 +855,7 @@ Method(m3bb, 3, Serialized) mm00(1, i000, i001) if (arg1) { if (Local0) { - err(ts, z173, 0x019, 0, 0, 0, Local0) + err(ts, z173, __LINE__, 0, 0, 0, Local0) } } if (LNot(Local0)) { @@ -872,7 +872,7 @@ Method(m3bb, 3, Serialized) mm00(1, i000, i001) if (arg1) { if (Local0) { - err(ts, z173, 0x019, 0, 0, 0, Local0) + err(ts, z173, __LINE__, 0, 0, 0, Local0) } } if (LNot(Local0)) { @@ -889,7 +889,7 @@ Method(m3bb, 3, Serialized) mm00(1, i000, i001) if (arg1) { if (Local0) { - err(ts, z173, 0x019, 0, 0, 0, Local0) + err(ts, z173, __LINE__, 0, 0, 0, Local0) } } if (LNot(Local0)) { @@ -906,7 +906,7 @@ Method(m3bb, 3, Serialized) mm00(1, i000, i001) if (arg1) { if (Local0) { - err(ts, z173, 0x019, 0, 0, 0, Local0) + err(ts, z173, __LINE__, 0, 0, 0, Local0) } } if (LNot(Local0)) { @@ -923,7 +923,7 @@ Method(m3bb, 3, Serialized) mm00(1, i000, i001) if (arg1) { if (Local0) { - err(ts, z173, 0x019, 0, 0, 0, Local0) + err(ts, z173, __LINE__, 0, 0, 0, Local0) } } if (LNot(Local0)) { @@ -940,7 +940,7 @@ Method(m3bb, 3, Serialized) mm00(1, i000, i001) if (arg1) { if (Local0) { - err(ts, z173, 0x019, 0, 0, 0, Local0) + err(ts, z173, __LINE__, 0, 0, 0, Local0) } } if (LNot(Local0)) { @@ -957,7 +957,7 @@ Method(m3bb, 3, Serialized) mm00(1, i000, i001) if (arg1) { if (Local0) { - err(ts, z173, 0x019, 0, 0, 0, Local0) + err(ts, z173, __LINE__, 0, 0, 0, Local0) } } if (LNot(Local0)) { @@ -974,7 +974,7 @@ Method(m3bb, 3, Serialized) mm00(1, i000, i001) if (arg1) { if (Local0) { - err(ts, z173, 0x019, 0, 0, 0, Local0) + err(ts, z173, __LINE__, 0, 0, 0, Local0) } } if (LNot(Local0)) { @@ -991,7 +991,7 @@ Method(m3bb, 3, Serialized) mm00(1, i000, i001) if (arg1) { if (Local0) { - err(ts, z173, 0x019, 0, 0, 0, Local0) + err(ts, z173, __LINE__, 0, 0, 0, Local0) } } if (LNot(Local0)) { @@ -1008,7 +1008,7 @@ Method(m3bb, 3, Serialized) mm00(1, i000, i001) if (arg1) { if (Local0) { - err(ts, z173, 0x019, 0, 0, 0, Local0) + err(ts, z173, __LINE__, 0, 0, 0, Local0) } } if (LNot(Local0)) { @@ -1025,7 +1025,7 @@ Method(m3bb, 3, Serialized) mm00(1, i000, i001) if (arg1) { if (Local0) { - err(ts, z173, 0x019, 0, 0, 0, Local0) + err(ts, z173, __LINE__, 0, 0, 0, Local0) } } if (LNot(Local0)) { @@ -1042,7 +1042,7 @@ Method(m3bb, 3, Serialized) mm00(1, i000, i001) if (arg1) { if (Local0) { - err(ts, z173, 0x019, 0, 0, 0, Local0) + err(ts, z173, __LINE__, 0, 0, 0, Local0) } } if (LNot(Local0)) { @@ -1059,7 +1059,7 @@ Method(m3bb, 3, Serialized) mm00(1, i000, i001) if (arg1) { if (Local0) { - err(ts, z173, 0x019, 0, 0, 0, Local0) + err(ts, z173, __LINE__, 0, 0, 0, Local0) } } if (LNot(Local0)) { @@ -1239,10 +1239,10 @@ Method(m3bb, 3, Serialized) CH04(ts, 1, 64, z173, 0x00b, 0, 0) // AE_AML_MUTEX_ORDER } else { if (LNotEqual(i003, arg0)) { - err(ts, z173, 0x00c, 0, 0, i003, arg0) + err(ts, z173, __LINE__, 0, 0, i003, arg0) } if (LNotEqual(i004, arg1)) { - err(ts, z173, 0x00d, 0, 0, i004, arg1) + err(ts, z173, __LINE__, 0, 0, i004, arg1) } } diff --git a/tests/aslts/src/runtime/collections/functional/table/load.asl b/tests/aslts/src/runtime/collections/functional/table/load.asl index 76f06b303..353d96056 100644 --- a/tests/aslts/src/runtime/collections/functional/table/load.asl +++ b/tests/aslts/src/runtime/collections/functional/table/load.asl @@ -312,7 +312,7 @@ Device(DTM0) { Store(BUF0, RFU0) if (CondRefof(\SSS0, Local0)) { - err(arg0, z174, 0x000, 0, 0, "\\SSS0", 1) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 1) return } @@ -335,7 +335,7 @@ Device(DTM0) { case (3) {Load(RFU0, Index(PHI0, 0))} default { Store("Unexpected parameter of the test", Debug) - err(arg0, z174, 0x002, 0, 0, "\\SSS0", 1) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 1) return } } @@ -354,26 +354,26 @@ Device(DTM0) { case (3) {Store(ObjectType(Index(PHI0, 0)), Local1)} } if (LNotEqual(Local1, c017)) { // DDB Handle - err(arg0, z174, 0x004, 0, 0, Local1, c017) + err(arg0, z174, __LINE__, 0, 0, Local1, c017) } // Check the new Object appears if (CondRefof(\SSS0, Local0)) { } else { - err(arg0, z174, 0x005, 0, 0, "\\SSS0", 0) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 0) } Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c010)) { // Method - err(arg0, z174, 0x006, 0, 0, Local1, c010) + err(arg0, z174, __LINE__, 0, 0, Local1, c010) } else { Store(\SSS0(), Local0) if (CH03(arg0, z174, 0x007, "\\SSS0", 1)) { return } if (LNotEqual("\\SSS0", Local0)) { - err(arg0, z174, 0x008, 0, 0, Local0, "\\SSS0") + err(arg0, z174, __LINE__, 0, 0, Local0, "\\SSS0") } } @@ -392,7 +392,7 @@ Device(DTM0) { Store("Table Unloaded", Debug) if (CondRefof(\SSS0, Local0)) { - err(arg0, z174, 0x00a, 0, 0, "\\SSS0", 1) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 1) } return @@ -407,7 +407,7 @@ Device(DTM0) { Store(BUF0, RFU0) if (CondRefof(\SSS0, Local0)) { - err(arg0, z174, 0x00b, 0, 0, "\\SSS0", 1) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 1) return (1) } @@ -443,26 +443,26 @@ Device(DTM0) { // Check DDBHandle ObjectType Store(ObjectType(Arg1), Local1) if (LNotEqual(Local1, c017)) { // DDB Handle - err(arg0, z174, 0x00e, 0, 0, Local1, c017) + err(arg0, z174, __LINE__, 0, 0, Local1, c017) } // Check the new Object appears if (CondRefof(\SSS0, Local0)) { } else { - err(arg0, z174, 0x00f, 0, 0, "\\SSS0", 0) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 0) } Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c010)) { // Method - err(arg0, z174, 0x010, 0, 0, Local1, c010) + err(arg0, z174, __LINE__, 0, 0, Local1, c010) } else { Store(\SSS0(), Local0) if (CH03(arg0, z174, 0x011, "\\SSS0", 1)) { return } if (LNotEqual("\\SSS0", Local0)) { - err(arg0, z174, 0x012, 0, 0, Local0, "\\SSS0") + err(arg0, z174, __LINE__, 0, 0, Local0, "\\SSS0") } } @@ -475,7 +475,7 @@ Device(DTM0) { Store("SSDT Unloaded", Debug) if (CondRefof(\SSS0, Local0)) { - err(arg0, z174, 0x014, 0, 0, "\\SSS0", 1) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 1) } return @@ -609,7 +609,7 @@ Device(DTM0) { Store(BUF0, RFU0) if (CondRefof(\SSS0, Local0)) { - err(arg0, z174, 0x015, 0, 0, "\\SSS0", 1) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 1) return } @@ -632,7 +632,7 @@ Device(DTM0) { case (3) {Load(RFU0, Index(PHI0, 0))} default { Store("Unexpected parameter of the test", Debug) - err(arg0, z174, 0x017, 0, 0, "\\SSS0", 1) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 1) return } } @@ -651,26 +651,26 @@ Device(DTM0) { case (3) {Store(ObjectType(Index(PHI0, 0)), Local1)} } if (LNotEqual(Local1, c017)) { // DDB Handle - err(arg0, z174, 0x019, 0, 0, Local1, c017) + err(arg0, z174, __LINE__, 0, 0, Local1, c017) } // Check the new Object appears if (CondRefof(\SSS0, Local0)) { } else { - err(arg0, z174, 0x01a, 0, 0, "\\SSS0", 0) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 0) } Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c010)) { // Method - err(arg0, z174, 0x01b, 0, 0, Local1, c010) + err(arg0, z174, __LINE__, 0, 0, Local1, c010) } else { Store(\SSS0(), Local0) if (CH03(arg0, z174, 0x01c, "\\SSS0", 1)) { return } if (LNotEqual("\\SSS0", Local0)) { - err(arg0, z174, 0x01d, 0, 0, Local0, "\\SSS0") + err(arg0, z174, __LINE__, 0, 0, Local0, "\\SSS0") } } @@ -689,7 +689,7 @@ Device(DTM0) { Store("SSDT Unloaded", Debug) if (CondRefof(\SSS0, Local0)) { - err(arg0, z174, 0x01f, 0, 0, "\\SSS0", 1) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 1) } return @@ -727,7 +727,7 @@ Device(DTM0) { Store(BUF0, RFU0) if (CondRefof(\SSS0, Local0)) { - err(arg0, z174, 0x020, 0, 0, "\\SSS0", 1) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 1) return (1) } @@ -818,7 +818,7 @@ Device(DTM0) { m003(Local4, Arg2) } else { Store("This Region type's AddrSpace Handler not installed", Debug) - err(arg0, z174, 0x023, 0, 0, Local2, Arg1) + err(arg0, z174, __LINE__, 0, 0, Local2, Arg1) } } @@ -888,10 +888,10 @@ Device(DTM0) { // Check absence if (CondRefof(NABS, Local0)) { - err(arg0, z174, 0x024, 0, 0, "NABS", 1) + err(arg0, z174, __LINE__, 0, 0, "NABS", 1) } if (CondRefof(NCRR, Local0)) { - err(arg0, z174, 0x025, 0, 0, "NCRR", 1) + err(arg0, z174, __LINE__, 0, 0, "NCRR", 1) } Store(BUF1, RFU1) @@ -901,36 +901,36 @@ Device(DTM0) { // Check existence if (CondRefof(NABS, Local0)) { if (LNotEqual("absolute location obj", Derefof(Local0))) { - err(arg0, z174, 0x026, 0, 0, Derefof(Local0), + err(arg0, z174, __LINE__, 0, 0, Derefof(Local0), "absolute location obj") } } else { - err(arg0, z174, 0x027, 0, 0, "NABS", 0) + err(arg0, z174, __LINE__, 0, 0, "NABS", 0) } if (CondRefof(NCRR, Local0)) { if (LNotEqual("current location obj", Derefof(Local0))) { - err(arg0, z174, 0x028, 0, 0, Derefof(Local0), + err(arg0, z174, __LINE__, 0, 0, Derefof(Local0), "current location obj") } } else { - err(arg0, z174, 0x029, 0, 0, "NCRR", 0) + err(arg0, z174, __LINE__, 0, 0, "NCRR", 0) } // Check location if (CondRefof(\NABS, Local0)) { } else { - err(arg0, z174, 0x02a, 0, 0, "NABS", 0) + err(arg0, z174, __LINE__, 0, 0, "NABS", 0) } //Note: We load the table objects relative to the root of the namespace. if (CondRefof(\NCRR, Local0)) { } else { - err(arg0, z174, 0x02b, 0, 0, "\\NCRR", 1) + err(arg0, z174, __LINE__, 0, 0, "\\NCRR", 1) } if (CondRefof(\DTM0.NCRR, Local0)) { - err(arg0, z174, 0x02c, 0, 0, "\\DTM0.NCRR", 1) + err(arg0, z174, __LINE__, 0, 0, "\\DTM0.NCRR", 1) } if (CondRefof(\DTM0.TST8.NCRR, Local0)) { - err(arg0, z174, 0x02d, 0, 0, "\\DTM0.TST8.NCRR", 0) + err(arg0, z174, __LINE__, 0, 0, "\\DTM0.TST8.NCRR", 0) } UnLoad(DDBH) @@ -938,10 +938,10 @@ Device(DTM0) { // Check absence if (CondRefof(NABS, Local0)) { - err(arg0, z174, 0x02e, 0, 0, "NABS", 1) + err(arg0, z174, __LINE__, 0, 0, "NABS", 1) } if (CondRefof(NCRR, Local0)) { - err(arg0, z174, 0x02f, 0, 0, "NCRR", 1) + err(arg0, z174, __LINE__, 0, 0, "NCRR", 1) } } @@ -1005,7 +1005,7 @@ Device(DTM0) { Store(BUF2, RFU2) if (CondRefof(\AUXD, Local0)) { - err(arg0, z174, 0x030, 0, 0, "\\AUXD", 1) + err(arg0, z174, __LINE__, 0, 0, "\\AUXD", 1) return } @@ -1021,39 +1021,39 @@ Device(DTM0) { if (CondRefof(\AUXD, Local0)) { } else { - err(arg0, z174, 0x033, 0, 0, "\\AUXD", 0) + err(arg0, z174, __LINE__, 0, 0, "\\AUXD", 0) return } Store (ObjectType(Local0), Local1) if (LNotEqual(Local1, 6)) { - err(arg0, z174, 0x034, 0, 0, Local1, 6) + err(arg0, z174, __LINE__, 0, 0, Local1, 6) return } if (CondRefof(\AUXD.REGC, Local0)) { } else { - err(arg0, z174, 0x035, 0, 0, "\\AUXD.REGC", 0) + err(arg0, z174, __LINE__, 0, 0, "\\AUXD.REGC", 0) return } Store(Derefof(Local0), Local1) if (LNotEqual(1, Local1)) { - err(arg0, z174, 0x036, 0, 0, Local1, 1) + err(arg0, z174, __LINE__, 0, 0, Local1, 1) } if (CondRefof(\AUXD.REGD, Local0)) { } else { - err(arg0, z174, 0x037, 0, 0, "\\AUXD.REGD", 0) + err(arg0, z174, __LINE__, 0, 0, "\\AUXD.REGD", 0) return } Store(Derefof(Local0), Local1) if (LNotEqual(0xFFFFFFFF, Local1)) { - err(arg0, z174, 0x038, 0, 0, Local1, 0xFFFFFFFF) + err(arg0, z174, __LINE__, 0, 0, Local1, 0xFFFFFFFF) } elseif (CondRefof(\AUXD.M000, Local2)) { \AUXD.M000() @@ -1061,16 +1061,16 @@ Device(DTM0) { Store(Derefof(Local0), Local1) if (LNotEqual(1, Local1)) { - err(arg0, z174, 0x039, 0, 0, Local1, 1) + err(arg0, z174, __LINE__, 0, 0, Local1, 1) } } else { - err(arg0, z174, 0x03a, 0, 0, "\\AUXD.M000", 0) + err(arg0, z174, __LINE__, 0, 0, "\\AUXD.M000", 0) } UnLoad(DDBH) if (CondRefof(\AUXD, Local0)) { - err(arg0, z174, 0x03b, 0, 0, "\\AUXD", 1) + err(arg0, z174, __LINE__, 0, 0, "\\AUXD", 1) } return } @@ -1123,7 +1123,7 @@ Device(DTM0) { return (3) } if (LNotEqual(Local5, Local2)) { - err(arg0, z174, 0x043, 0, 0, Local2, Local5) + err(arg0, z174, __LINE__, 0, 0, Local2, Local5) } } else { if (CH04(arg0, 0, 0xff, z174, 0x044, 0, 0)) { // AE_NOT_FOUND @@ -1144,7 +1144,7 @@ Device(DTM0) { Concatenate(arg0, "-tsta", arg0) if (INIT()) { - err(arg0, z174, 0x045, 0, 0, "INIT", 1) + err(arg0, z174, __LINE__, 0, 0, "INIT", 1) return (1) } if (CH03(arg0, z174, 0x046, 0, 0)) { @@ -1154,7 +1154,7 @@ Device(DTM0) { Store(arg1, Local0) while (Local0) { if (LD()) { - err(arg0, z174, 0x047, 0, 0, "HI0N", HI0N) + err(arg0, z174, __LINE__, 0, 0, "HI0N", HI0N) return (1) } if (CH03(arg0, z174, 0x048, 0, 0)) { @@ -1163,7 +1163,7 @@ Device(DTM0) { Decrement(Local0) if (LDCH(arg0)) { - err(arg0, z174, 0x049, 0, 0, "HI0N", HI0N) + err(arg0, z174, __LINE__, 0, 0, "HI0N", HI0N) return (1) } } @@ -1171,7 +1171,7 @@ Device(DTM0) { Store(arg1, Local0) while (Local0) { if (UNLD()) { - err(arg0, z174, 0x040a, 0, 0, "HI0N", HI0N) + err(arg0, z174, __LINE__, 0, 0, "HI0N", HI0N) return (1) } if (CH03(arg0, z174, 0x04b, 0, 0)) { @@ -1180,7 +1180,7 @@ Device(DTM0) { Decrement(Local0) if (LDCH(arg0)) { - err(arg0, z174, 0x04c, 0, 0, "HI0N", HI0N) + err(arg0, z174, __LINE__, 0, 0, "HI0N", HI0N) return (1) } } @@ -1259,7 +1259,7 @@ Device(DTM0) { CH04(arg0, 0, 47, z174, 0x051, 0, 0) // AE_AML_OPERAND_TYPE Store(ObjectType(\AUXD.INT0), Local0) if (LNotEqual(c009, Local0)) { - err(arg0, z174, 0x052, 0, 0, Local0, c009) + err(arg0, z174, __LINE__, 0, 0, Local0, c009) } // String @@ -1267,7 +1267,7 @@ Device(DTM0) { CH04(arg0, 0, 47, z174, 0x053, 0, 0) // AE_AML_OPERAND_TYPE Store(ObjectType(\AUXD.STR0), Local0) if (LNotEqual(c00a, Local0)) { - err(arg0, z174, 0x054, 0, 0, Local0, c00a) + err(arg0, z174, __LINE__, 0, 0, Local0, c00a) } // Buffer @@ -1277,7 +1277,7 @@ Device(DTM0) { CH04(arg0, 0, 47, z174, 0x055, 0, 0) // AE_AML_OPERAND_TYPE Store(ObjectType(\AUXD.BUF0), Local0) if (LNotEqual(c00b, Local0)) { - err(arg0, z174, 0x056, 0, 0, Local0, c00b) + err(arg0, z174, __LINE__, 0, 0, Local0, c00b) } } @@ -1286,7 +1286,7 @@ Device(DTM0) { CH04(arg0, 0, 47, z174, 0x057, 0, 0) // AE_AML_OPERAND_TYPE Store(ObjectType(\AUXD.PAC0), Local0) if (LNotEqual(c00c, Local0)) { - err(arg0, z174, 0x058, 0, 0, Local0, c00c) + err(arg0, z174, __LINE__, 0, 0, Local0, c00c) } // Field Unit @@ -1296,7 +1296,7 @@ Device(DTM0) { CH04(arg0, 0, 47, z174, 0x059, 0, 0) // AE_AML_OPERAND_TYPE Store(ObjectType(\AUXD.DEV0), Local0) if (LNotEqual(c00e, Local0)) { - err(arg0, z174, 0x05a, 0, 0, Local0, c00e) + err(arg0, z174, __LINE__, 0, 0, Local0, c00e) } // Event @@ -1304,7 +1304,7 @@ Device(DTM0) { CH04(arg0, 0, 47, z174, 0x05b, 0, 0) // AE_AML_OPERAND_TYPE Store(ObjectType(\AUXD.EVE0), Local0) if (LNotEqual(c00f, Local0)) { - err(arg0, z174, 0x05c, 0, 0, Local0, c00f) + err(arg0, z174, __LINE__, 0, 0, Local0, c00f) } // Method @@ -1312,7 +1312,7 @@ Device(DTM0) { CH04(arg0, 0, 47, z174, 0x05d, 0, 0) // AE_AML_OPERAND_TYPE Store(ObjectType(\AUXD.MMM0), Local0) if (LNotEqual(c010, Local0)) { - err(arg0, z174, 0x05e, 0, 0, Local0, c010) + err(arg0, z174, __LINE__, 0, 0, Local0, c010) } // Mutex @@ -1320,7 +1320,7 @@ Device(DTM0) { CH04(arg0, 0, 47, z174, 0x05f, 0, 0) // AE_AML_OPERAND_TYPE Store(ObjectType(\AUXD.MTX0), Local0) if (LNotEqual(c011, Local0)) { - err(arg0, z174, 0x060, 0, 0, Local0, c011) + err(arg0, z174, __LINE__, 0, 0, Local0, c011) } // OpRegion @@ -1330,7 +1330,7 @@ Device(DTM0) { CH04(arg0, 0, 47, z174, 0x061, 0, 0) // AE_AML_OPERAND_TYPE Store(ObjectType(\AUXD.PWR0), Local0) if (LNotEqual(c013, Local0)) { - err(arg0, z174, 0x062, 0, 0, Local0, c013) + err(arg0, z174, __LINE__, 0, 0, Local0, c013) } // Processor @@ -1338,7 +1338,7 @@ Device(DTM0) { CH04(arg0, 0, 47, z174, 0x063, 0, 0) // AE_AML_OPERAND_TYPE Store(ObjectType(\AUXD.CPU0), Local0) if (LNotEqual(c014, Local0)) { - err(arg0, z174, 0x064, 0, 0, Local0, c014) + err(arg0, z174, __LINE__, 0, 0, Local0, c014) } // Thermal Zone @@ -1346,7 +1346,7 @@ Device(DTM0) { CH04(arg0, 0, 47, z174, 0x065, 0, 0) // AE_AML_OPERAND_TYPE Store(ObjectType(\AUXD.TZN0), Local0) if (LNotEqual(c015, Local0)) { - err(arg0, z174, 0x066, 0, 0, Local0, c015) + err(arg0, z174, __LINE__, 0, 0, Local0, c015) } // Buffer Field @@ -1356,7 +1356,7 @@ Device(DTM0) { CH04(arg0, 0, 47, z174, 0x067, 0, 0) // AE_AML_OPERAND_TYPE Store(ObjectType(\AUXD.BFL0), Local0) if (LNotEqual(c016, Local0)) { - err(arg0, z174, 0x068, 0, 0, Local0, c016) + err(arg0, z174, __LINE__, 0, 0, Local0, c016) } } @@ -1365,7 +1365,7 @@ Device(DTM0) { CH04(arg0, 0, 47, z174, 0x069, 0, 0) // AE_AML_OPERAND_TYPE Store(ObjectType(DDB0), Local0) if (LNotEqual(c017, Local0)) { - err(arg0, z174, 0x06a, 0, 0, Local0, c017) + err(arg0, z174, __LINE__, 0, 0, Local0, c017) } UnLoad(DDB0) @@ -1402,7 +1402,7 @@ Device(DTM0) { CH04(arg0, 0, 47, z174, 0x220, 0, 0) // AE_AML_OPERAND_TYPE Store(ObjectType(RGN1), Local0) if (LNotEqual(c012, Local0)) { - err(arg0, z174, 0x071, 0, 0, Local0, c012) + err(arg0, z174, __LINE__, 0, 0, Local0, c012) } // PCI_Config @@ -1410,7 +1410,7 @@ Device(DTM0) { CH04(arg0, 0, 47, z174, 0x072, 0, 0) // AE_AML_OPERAND_TYPE Store(ObjectType(RGN2), Local0) if (LNotEqual(c012, Local0)) { - err(arg0, z174, 0x073, 0, 0, Local0, c012) + err(arg0, z174, __LINE__, 0, 0, Local0, c012) } // EmbeddedControl @@ -1418,7 +1418,7 @@ Device(DTM0) { CH04(arg0, 0, 47, z174, 0x074, 0, 0) // AE_AML_OPERAND_TYPE Store(ObjectType(RGN3), Local0) if (LNotEqual(c012, Local0)) { - err(arg0, z174, 0x075, 0, 0, Local0, c012) + err(arg0, z174, __LINE__, 0, 0, Local0, c012) } // SMBus @@ -1426,7 +1426,7 @@ Device(DTM0) { CH04(arg0, 0, 47, z174, 0x076, 0, 0) // AE_AML_OPERAND_TYPE Store(ObjectType(RGN4), Local0) if (LNotEqual(c012, Local0)) { - err(arg0, z174, 0x077, 0, 0, Local0, c012) + err(arg0, z174, __LINE__, 0, 0, Local0, c012) } // SystemCMOS @@ -1434,7 +1434,7 @@ Device(DTM0) { CH04(arg0, 0, 47, z174, 0x078, 0, 0) // AE_AML_OPERAND_TYPE Store(ObjectType(RGN5), Local0) if (LNotEqual(c012, Local0)) { - err(arg0, z174, 0x079, 0, 0, Local0, c012) + err(arg0, z174, __LINE__, 0, 0, Local0, c012) } // PciBarTarget @@ -1442,7 +1442,7 @@ Device(DTM0) { CH04(arg0, 0, 47, z174, 0x07a, 0, 0) // AE_AML_OPERAND_TYPE Store(ObjectType(RGN6), Local0) if (LNotEqual(c012, Local0)) { - err(arg0, z174, 0x07b, 0, 0, Local0, c012) + err(arg0, z174, __LINE__, 0, 0, Local0, c012) } // UserDefRegionSpace 0x80 @@ -1450,7 +1450,7 @@ Device(DTM0) { CH04(arg0, 0, 47, z174, 0x07c, 0, 0) // AE_AML_OPERAND_TYPE Store(ObjectType(RGN7), Local0) if (LNotEqual(c012, Local0)) { - err(arg0, z174, 0x07d, 0, 0, Local0, c012) + err(arg0, z174, __LINE__, 0, 0, Local0, c012) } // UserDefRegionSpace 0xcf @@ -1458,7 +1458,7 @@ Device(DTM0) { CH04(arg0, 0, 47, z174, 0x07e, 0, 0) // AE_AML_OPERAND_TYPE Store(ObjectType(RGN8), Local0) if (LNotEqual(c012, Local0)) { - err(arg0, z174, 0x07f, 0, 0, Local0, c012) + err(arg0, z174, __LINE__, 0, 0, Local0, c012) } // UserDefRegionSpace 0xff @@ -1466,7 +1466,7 @@ Device(DTM0) { CH04(arg0, 0, 47, z174, 0x080, 0, 0) // AE_AML_OPERAND_TYPE Store(ObjectType(RGN9), Local0) if (LNotEqual(c012, Local0)) { - err(arg0, z174, 0x081, 0, 0, Local0, c012) + err(arg0, z174, __LINE__, 0, 0, Local0, c012) } return (0) @@ -1481,7 +1481,7 @@ Device(DTM0) { Concatenate(arg0, "-tstd", arg0) if (CondRefof(\SSS0, Local0)) { - err(arg0, z174, 0x082, 0, 0, "\\SSS0", 1) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 1) return (1) } @@ -1506,7 +1506,7 @@ Device(DTM0) { CH04(arg0, 0, 37, z174, 0x084, 0, 0) // AE_BAD_SIGNATURE if (CondRefof(\SSS0, Local0)) { - err(arg0, z174, 0x085, 0, 0, "\\SSS0", 1) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 1) return (1) } } @@ -1516,7 +1516,7 @@ Device(DTM0) { CH04(arg0, 0, 37, z174, 0x086, 0, 0) // AE_BAD_SIGNATURE if (CondRefof(\SSS0, Local0)) { - err(arg0, z174, 0x087, 0, 0, "\\SSS0", 1) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 1) } return (0) @@ -1537,7 +1537,7 @@ Device(DTM0) { } if (CondRefof(\SSS0, Local0)) { - err(arg0, z174, 0x090, 0, 0, "\\SSS0", 1) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 1) return (1) } @@ -1566,7 +1566,7 @@ Device(DTM0) { CH04(arg0, 0, 42, z174, 0x092, 0, 0) // AE_INVALID_TABLE_LENGTH if (CondRefof(\SSS0, Local0)) { - err(arg0, z174, 0x093, 0, 0, "\\SSS0", 1) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 1) // CleanUp UnLoad(HI0) @@ -1574,7 +1574,7 @@ Device(DTM0) { return (1) } if (CondRefof(\SSS0, Local0)) { - err(arg0, z174, 0x095, 0, 0, "\\SSS0", 1) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 1) return (1) } } @@ -1591,13 +1591,13 @@ Device(DTM0) { } if (CondRefof(\SSS0, Local0)) { - err(arg0, z174, 0x097, 0, 0, "\\SSS0", 1) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 1) UnLoad(HI0) if (CH03(arg0, z174, 0x098, 0, 0)) { return (1) } if (CondRefof(\SSS0, Local0)) { - err(arg0, z174, 0x099, 0, 0, "\\SSS0", 1) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 1) return (1) } } @@ -1613,7 +1613,7 @@ Device(DTM0) { Concatenate(arg0, "-tstf", arg0) if (CondRefof(\SSS0, Local0)) { - err(arg0, z174, 0x0a0, 0, 0, "\\SSS0", 1) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 1) return (1) } @@ -1636,7 +1636,7 @@ Device(DTM0) { CH04(arg0, 0, 39, z174, 0x0a2, 0, 0) // AE_BAD_CHECKSUM if (CondRefof(\SSS0, Local0)) { - err(arg0, z174, 0x0a3, 0, 0, "\\SSS0", 1) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 1) //Cleanup UnLoad(HI0) @@ -1652,7 +1652,7 @@ Device(DTM0) { CH04(arg0, 0, 39, z174, 0x0a5, 0, 0) // AE_BAD_CHECKSUM if (CondRefof(\SSS0, Local0)) { - err(arg0, z174, 0x0a6, 0, 0, "\\SSS0", 1) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 1) //Cleanup UnLoad(HI0) @@ -1682,12 +1682,12 @@ Device(DTM0) { Store(ObjectType(arg2), Local0) if (LNotEqual(arg3, Local0)) { - err(arg0, z174, 0x0b0, 0, 0, Local0, arg3) + err(arg0, z174, __LINE__, 0, 0, Local0, arg3) return (1) } if (CondRefof(\SSS0, Local0)) { - err(arg0, z174, 0x0b1, 0, 0, "\\SSS0", 1) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 1) return (1) } @@ -1697,11 +1697,11 @@ Device(DTM0) { } Store(ObjectType(arg2), Local0) if (LNotEqual(c017, Local0)) { - err(arg0, z174, 0x0b3, 0, 0, Local0, c017) + err(arg0, z174, __LINE__, 0, 0, Local0, c017) } if (CondRefof(\SSS0, Local0)) { } else { - err(arg0, z174, 0x0b4, 0, 0, "\\SSS0", 0) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 0) return (1) } @@ -1710,7 +1710,7 @@ Device(DTM0) { return (1) } if (CondRefof(\SSS0, Local0)) { - err(arg0, z174, 0x0b6, 0, 0, "\\SSS0", 1) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 1) return (1) } @@ -1804,7 +1804,7 @@ Device(DTM0) { Concatenate(arg0, "-tsth", arg0) if (INIT()) { - err(arg0, z174, 0x0c0, 0, 0, "INIT", 1) + err(arg0, z174, __LINE__, 0, 0, "INIT", 1) return (1) } if (CH03(arg0, z174, 0x0c1, 0, 0)) { @@ -1817,7 +1817,7 @@ Device(DTM0) { while (Local0) { Store(HI0N, Debug) if (LD()) { - err(arg0, z174, 0x0c2, 0, 0, "HI0N", HI0N) + err(arg0, z174, __LINE__, 0, 0, "HI0N", HI0N) return (1) } if (CH03(arg0, z174, 0x0c3, 0, 0)) { @@ -1845,7 +1845,7 @@ Device(DTM0) { Store(MAXT, Local0) while (Local0) { if (UNLD()) { - err(arg0, z174, 0x0c5, 0, 0, "HI0N", HI0N) + err(arg0, z174, __LINE__, 0, 0, "HI0N", HI0N) return (1) } if (CH03(arg0, z174, 0x0c6, 0, 0)) { @@ -1855,7 +1855,7 @@ Device(DTM0) { } if (LDCH(0)) { - err(arg0, z174, 0x0c7, 0, 0, "HI0N", HI0N) + err(arg0, z174, __LINE__, 0, 0, "HI0N", HI0N) return (1) } @@ -1872,7 +1872,7 @@ Device(DTM0) { Concatenate(arg0, "-tsti", arg0) if (CondRefof(\SSS0, Local0)) { - err(arg0, z174, 0x0d0, 0, 0, "\\SSS0", 1) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 1) return (1) } @@ -1894,12 +1894,12 @@ Device(DTM0) { Store(ObjectType(HI0), Local0) if (LNotEqual(c017, Local0)) { - err(arg0, z174, 0x0d3, 0, 0, Local0, c017) + err(arg0, z174, __LINE__, 0, 0, Local0, c017) } if (CondRefof(\SSS0, Local0)) { } else { - err(arg0, z174, 0x0d4, 0, 0, "\\SSS0", 0) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 0) return (1) } @@ -1912,7 +1912,7 @@ Device(DTM0) { Store(ObjectType(HI1), Local0) if (LNotEqual(c009, Local0)) { - err(arg0, z174, 0x0d6, 0, 0, Local0, c009) + err(arg0, z174, __LINE__, 0, 0, Local0, c009) } Decrement(Local1) @@ -1925,7 +1925,7 @@ Device(DTM0) { } if (CondRefof(\SSS0, Local0)) { - err(arg0, z174, 0x0d8, 0, 0, "\\SSS0", 1) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 1) } return (0) @@ -1941,7 +1941,7 @@ Device(DTM0) { Concatenate(arg0, "-tstj", arg0) if (CondRefof(\SSS0, Local0)) { - err(arg0, z174, 0x0e0, 0, 0, "\\SSS0", 1) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 1) return (1) } @@ -1963,12 +1963,12 @@ Device(DTM0) { Store(ObjectType(HI0), Local0) if (LNotEqual(c017, Local0)) { - err(arg0, z174, 0x0e3, 0, 0, Local0, c017) + err(arg0, z174, __LINE__, 0, 0, Local0, c017) } if (CondRefof(\SSS0, Local0)) { } else { - err(arg0, z174, 0x0e4, 0, 0, "\\SSS0", 0) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 0) return (1) } @@ -2014,7 +2014,7 @@ Device(DTM0) { Store(ObjectType(HI1), Local0) if (LNotEqual(c009, Local0)) { - err(arg0, z174, 0x0e6, 0, 0, Local0, c009) + err(arg0, z174, __LINE__, 0, 0, Local0, c009) } Decrement(Local1) @@ -2027,7 +2027,7 @@ Device(DTM0) { } if (CondRefof(\SSS0, Local0)) { - err(arg0, z174, 0x0e8, 0, 0, "\\SSS0", 1) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 1) } return (0) @@ -2070,11 +2070,11 @@ Device(DTM0) { Concatenate(arg0, "-tstk", arg0) if (CondRefof(\DDBX, Local0)) { - err(arg0, z174, 0x0f0, 0, 0, "\\DDBX", 1) + err(arg0, z174, __LINE__, 0, 0, "\\DDBX", 1) return } if (CondRefof(\SSS0, Local0)) { - err(arg0, z174, 0x0f1, 0, 0, "\\SSS0", 1) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 1) return } @@ -2086,12 +2086,12 @@ Device(DTM0) { if (CondRefof(\DDBX, Local0)) { } else { - err(arg0, z174, 0x0f3, 0, 0, "\\DDBX", 1) + err(arg0, z174, __LINE__, 0, 0, "\\DDBX", 1) return } if (CondRefof(\SSS0, Local0)) { } else { - err(arg0, z174, 0x0f4, 0, 0, "\\SSS0", 1) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 1) return } @@ -2101,7 +2101,7 @@ Device(DTM0) { } if (CondRefof(\SSS0, Local0)) { - err(arg0, z174, 0x0f6, 0, 0, "\\SSS0", 1) + err(arg0, z174, __LINE__, 0, 0, "\\SSS0", 1) return } @@ -2111,7 +2111,7 @@ Device(DTM0) { } if (CondRefof(\DDBX, Local0)) { - err(arg0, z174, 0x0f8, 0, 0, "\\DDBX", 1) + err(arg0, z174, __LINE__, 0, 0, "\\DDBX", 1) return } } diff --git a/tests/aslts/src/runtime/collections/functional/table/loadtable.asl b/tests/aslts/src/runtime/collections/functional/table/loadtable.asl index 4eb5b07ee..33dc768ff 100644 --- a/tests/aslts/src/runtime/collections/functional/table/loadtable.asl +++ b/tests/aslts/src/runtime/collections/functional/table/loadtable.asl @@ -156,7 +156,7 @@ Device(DTM2) { Concatenate(arg0, "-tst0", arg0) if (LNotEqual(OEMT, FU00)) { - err(arg0, z176, 0x001, 0, 0, FU00, OEMT) + err(arg0, z176, __LINE__, 0, 0, FU00, OEMT) return (1) } @@ -175,7 +175,7 @@ Device(DTM2) { } if (CondRefof(\_XT2, Local0)) { - err(arg0, z176, 0x002, 0, 0, "\\_XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 1) return (1) } @@ -189,17 +189,17 @@ Device(DTM2) { Store(ObjectType(DDBH), Local1) if (LNotEqual(Local1, c017)) { // DDB Handle - err(arg0, z176, 0x005, 0, 0, Local1, c017) + err(arg0, z176, __LINE__, 0, 0, Local1, c017) return (1) } if (LNotEqual(1, \DTM2.PLDT)) { - err(arg0, z176, 0x006, 0, 0, \DTM2.PLDT, 1) + err(arg0, z176, __LINE__, 0, 0, \DTM2.PLDT, 1) } if (CondRefof(\_XT2, Local0)) { } else { - err(arg0, z176, 0x007, 0, 0, "\\_XT2", 0) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 0) } UnLoad(DDBH) @@ -210,7 +210,7 @@ Device(DTM2) { } if (CondRefof(\_XT2, Local0)) { - err(arg0, z176, 0x009, 0, 0, "\\_XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 1) } return (0) @@ -225,7 +225,7 @@ Device(DTM2) { Concatenate(arg0, "-tst1", arg0) if (CondRefof(\_XT2, Local0)) { - err(arg0, z176, 0x010, 0, 0, "\\_XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 1) return (1) } @@ -245,17 +245,17 @@ Device(DTM2) { Store(ObjectType(DDBH), Local1) if (LNotEqual(Local1, c017)) { // DDB Handle - err(arg0, z176, 0x012, 0, 0, Local1, c017) + err(arg0, z176, __LINE__, 0, 0, Local1, c017) return (1) } if (LNotEqual(1, \DTM2.PLDT)) { - err(arg0, z176, 0x013, 0, 0, \DTM2.PLDT, 1) + err(arg0, z176, __LINE__, 0, 0, \DTM2.PLDT, 1) } if (CondRefof(\_XT2, Local0)) { } else { - err(arg0, z176, 0x014, 0, 0, "\\_XT2", 0) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 0) } UnLoad(DDBH) @@ -266,7 +266,7 @@ Device(DTM2) { } if (CondRefof(\_XT2, Local0)) { - err(arg0, z176, 0x016, 0, 0, "\\_XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 1) } // Unhappy comparison due to the SignatureString @@ -275,7 +275,7 @@ Device(DTM2) { Store(ObjectType(Local2), Local1) if (LNotEqual(Local1, c008)) { - err(arg0, z176, 0x017, 0, 0, Local1, c008) + err(arg0, z176, __LINE__, 0, 0, Local1, c008) } Store(LoadTable("OeM1", "Intel", "Many", "\\", PPST, 1), Local2) @@ -293,23 +293,23 @@ Device(DTM2) { Store(ObjectType(Local2), Local1) if (y281) { if (LNotEqual(Local1, c009)) { - err(arg0, z176, 0x01a, 0, 0, Local1, c009) + err(arg0, z176, __LINE__, 0, 0, Local1, c009) } if (LNotEqual(Local2, 0)) { - err(arg0, z176, 0x01b, 0, 0, Local2, 0) + err(arg0, z176, __LINE__, 0, 0, Local2, 0) } } else { if (LNotEqual(Local1, c008)) { - err(arg0, z176, 0x01c, 0, 0, Local1, c008) + err(arg0, z176, __LINE__, 0, 0, Local1, c008) } } if (LNotEqual(0, \DTM2.PLDT)) { - err(arg0, z176, 0x01d, 0, 0, \DTM2.PLDT, 0) + err(arg0, z176, __LINE__, 0, 0, \DTM2.PLDT, 0) } if (CondRefof(\_XT2, Local0)) { - err(arg0, z176, 0x01e, 0, 0, "\\_XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 1) } // Unhappy comparison due to the OEMIDString @@ -318,7 +318,7 @@ Device(DTM2) { Store(ObjectType(Local3), Local1) if (LNotEqual(Local1, c008)) { - err(arg0, z176, 0x01f, 0, 0, Local1, c008) + err(arg0, z176, __LINE__, 0, 0, Local1, c008) } Store(LoadTable("OEM1", "InteL", "Many", "\\", PPST, 1), Local3) @@ -329,19 +329,19 @@ Device(DTM2) { Store(ObjectType(Local3), Local1) if (LNotEqual(Local1, c009)) { - err(arg0, z176, 0x021, 0, 0, Local1, c009) + err(arg0, z176, __LINE__, 0, 0, Local1, c009) } if (LNotEqual(Local3, 0)) { - err(arg0, z176, 0x022, 0, 0, Local3, 0) + err(arg0, z176, __LINE__, 0, 0, Local3, 0) } if (LNotEqual(0, \DTM2.PLDT)) { - err(arg0, z176, 0x023, 0, 0, \DTM2.PLDT, 0) + err(arg0, z176, __LINE__, 0, 0, \DTM2.PLDT, 0) } if (CondRefof(\_XT2, Local0)) { - err(arg0, z176, 0x024, 0, 0, "\\_XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 1) } // Unhappy comparison due to the OEMTableIDString @@ -350,7 +350,7 @@ Device(DTM2) { Store(ObjectType(Local4), Local1) if (LNotEqual(Local1, c008)) { - err(arg0, z176, 0x025, 0, 0, Local1, c008) + err(arg0, z176, __LINE__, 0, 0, Local1, c008) } Store(LoadTable("OEM1", "Intel", "many", "\\", PPST, 1), Local4) @@ -361,19 +361,19 @@ Device(DTM2) { Store(ObjectType(Local4), Local1) if (LNotEqual(Local1, c009)) { - err(arg0, z176, 0x027, 0, 0, Local1, c009) + err(arg0, z176, __LINE__, 0, 0, Local1, c009) } if (LNotEqual(Local4, 0)) { - err(arg0, z176, 0x028, 0, 0, Local4, 0) + err(arg0, z176, __LINE__, 0, 0, Local4, 0) } if (LNotEqual(0, \DTM2.PLDT)) { - err(arg0, z176, 0x029, 0, 0, \DTM2.PLDT, 0) + err(arg0, z176, __LINE__, 0, 0, \DTM2.PLDT, 0) } if (CondRefof(\_XT2, Local0)) { - err(arg0, z176, 0x02a, 0, 0, "\\_XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 1) } return (0) @@ -391,7 +391,7 @@ Device(DTM2) { Concatenate(arg0, "-tst2", arg0) if (CondRefof(\_XT2, Local0)) { - err(arg0, z176, 0x030, 0, 0, "\\_XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 1) return (1) } @@ -407,17 +407,17 @@ Device(DTM2) { Store(ObjectType(DDB0), Local1) if (LNotEqual(Local1, c017)) { // DDB Handle - err(arg0, z176, 0x032, 0, 0, Local1, c017) + err(arg0, z176, __LINE__, 0, 0, Local1, c017) return (1) } if (LNotEqual(1, \DTM2.PLDT)) { - err(arg0, z176, 0x033, 0, 0, \DTM2.PLDT, 1) + err(arg0, z176, __LINE__, 0, 0, \DTM2.PLDT, 1) } if (CondRefof(\_XT2, Local0)) { } else { - err(arg0, z176, 0x034, 0, 0, "\\_XT2", 0) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 0) } UnLoad(DDB0) @@ -428,7 +428,7 @@ Device(DTM2) { } if (CondRefof(\_XT2, Local0)) { - err(arg0, z176, 0x036, 0, 0, "\\_XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 1) } // Check when ParameterPathString omitted @@ -443,17 +443,17 @@ Device(DTM2) { Store(ObjectType(DDB1), Local1) if (LNotEqual(Local1, c017)) { // DDB Handle - err(arg0, z176, 0x038, 0, 0, Local1, c017) + err(arg0, z176, __LINE__, 0, 0, Local1, c017) return (1) } if (LNotEqual(0, \DTM2.PLDT)) { - err(arg0, z176, 0x039, 0, 0, \DTM2.PLDT, 0) + err(arg0, z176, __LINE__, 0, 0, \DTM2.PLDT, 0) } if (CondRefof(\_XT2, Local0)) { } else { - err(arg0, z176, 0x03a, 0, 0, "\\_XT2", 0) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 0) } UnLoad(DDB1) @@ -464,7 +464,7 @@ Device(DTM2) { } if (CondRefof(\_XT2, Local0)) { - err(arg0, z176, 0x03c, 0, 0, "\\_XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 1) } // Check when ParameterData omitted @@ -479,17 +479,17 @@ Device(DTM2) { Store(ObjectType(DDB2), Local1) if (LNotEqual(Local1, c017)) { // DDB Handle - err(arg0, z176, 0x03e, 0, 0, Local1, c017) + err(arg0, z176, __LINE__, 0, 0, Local1, c017) return (1) } if (LNotEqual(0, \DTM2.PLDT)) { - err(arg0, z176, 0x03f, 0, 0, \DTM2.PLDT, 0) + err(arg0, z176, __LINE__, 0, 0, \DTM2.PLDT, 0) } if (CondRefof(\_XT2, Local0)) { } else { - err(arg0, z176, 0x040, 0, 0, "\\_XT2", 0) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 0) } UnLoad(DDB2) @@ -500,7 +500,7 @@ Device(DTM2) { } if (CondRefof(\_XT2, Local0)) { - err(arg0, z176, 0x042, 0, 0, "\\_XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 1) } // Check when all optional parameters omitted @@ -515,17 +515,17 @@ Device(DTM2) { Store(ObjectType(DDB3), Local1) if (LNotEqual(Local1, c017)) { // DDB Handle - err(arg0, z176, 0x044, 0, 0, Local1, c017) + err(arg0, z176, __LINE__, 0, 0, Local1, c017) return (1) } if (LNotEqual(0, \DTM2.PLDT)) { - err(arg0, z176, 0x045, 0, 0, \DTM2.PLDT, 0) + err(arg0, z176, __LINE__, 0, 0, \DTM2.PLDT, 0) } if (CondRefof(\_XT2, Local0)) { } else { - err(arg0, z176, 0x046, 0, 0, "\\_XT2", 0) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 0) } UnLoad(DDB3) @@ -536,7 +536,7 @@ Device(DTM2) { } if (CondRefof(\_XT2, Local0)) { - err(arg0, z176, 0x048, 0, 0, "\\_XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 1) } return (0) @@ -571,17 +571,17 @@ Device(DTM2) { Store(ObjectType(arg1), Local1) if (LNotEqual(Local1, c017)) { // DDB Handle - err(arg0, z176, 0x052, 0, 0, Local1, c017) + err(arg0, z176, __LINE__, 0, 0, Local1, c017) return (1) } if (LNotEqual(0, \DTM2.PLDT)) { - err(arg0, z176, 0x053, 0, 0, \DTM2.PLDT, 0) + err(arg0, z176, __LINE__, 0, 0, \DTM2.PLDT, 0) } if (CondRefof(\_XT2, Local0)) { } else { - err(arg0, z176, 0x054, 0, 0, "\\DTM2._XT2", 0) + err(arg0, z176, __LINE__, 0, 0, "\\DTM2._XT2", 0) } UnLoad(arg1) @@ -592,7 +592,7 @@ Device(DTM2) { } if (CondRefof(\_XT2, Local0)) { - err(arg0, z176, 0x056, 0, 0, "\\DTM2._XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\DTM2._XT2", 1) return (1) } @@ -623,7 +623,7 @@ Device(DTM2) { } if (CondRefof(\DTM2._XT2, Local0)) { - err(arg0, z176, 0x057, 0, 0, "\\_XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 1) return (1) } @@ -756,17 +756,17 @@ Device(DTM2) { Store(ObjectType(arg1), Local1) if (LNotEqual(Local1, c017)) { // DDB Handle - err(arg0, z176, 0x062, 0, 0, Local1, c017) + err(arg0, z176, __LINE__, 0, 0, Local1, c017) return (1) } if (LNotEqual(1, \DTM2.PLDT)) { - err(arg0, z176, 0x063, 0, 0, \DTM2.PLDT, 1) + err(arg0, z176, __LINE__, 0, 0, \DTM2.PLDT, 1) } if (CondRefof(\DTM2._XT2, Local0)) { } else { - err(arg0, z176, 0x064, 0, 0, "\\DTM2._XT2", 0) + err(arg0, z176, __LINE__, 0, 0, "\\DTM2._XT2", 0) } UnLoad(arg1) @@ -777,7 +777,7 @@ Device(DTM2) { } if (CondRefof(\DTM2._XT2, Local0)) { - err(arg0, z176, 0x066, 0, 0, "\\DTM2._XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\DTM2._XT2", 1) return (1) } @@ -811,7 +811,7 @@ Device(DTM2) { Concatenate(arg0, "-tst4", arg0) if (CondRefof(\DTM2._XT2, Local0)) { - err(arg0, z176, 0x067, 0, 0, "\\DTM2._XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\DTM2._XT2", 1) return (1) } @@ -932,12 +932,12 @@ Device(DTM2) { Concatenate(arg0, "-tst5", arg0) if (CondRefof(\_XT2, Local0)) { - err(arg0, z176, 0x070, 0, 0, "\\_XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 1) return (1) } if (CondRefof(\DTM2.DEVR._XT2, Local0)) { - err(arg0, z176, 0x071, 0, 0, "\\DTM2.DEVR._XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\DTM2.DEVR._XT2", 1) return (1) } @@ -951,21 +951,21 @@ Device(DTM2) { Store(ObjectType(DDBH), Local1) if (LNotEqual(Local1, c017)) { // DDB Handle - err(arg0, z176, 0x073, 0, 0, Local1, c017) + err(arg0, z176, __LINE__, 0, 0, Local1, c017) return (1) } if (LNotEqual(1, \DTM2.PLDT)) { - err(arg0, z176, 0x074, 0, 0, \DTM2.PLDT, 1) + err(arg0, z176, __LINE__, 0, 0, \DTM2.PLDT, 1) } if (CondRefof(\_XT2, Local0)) { - err(arg0, z176, 0x075, 0, 0, "\\_XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 1) } if (CondRefof(\DTM2.DEVR._XT2, Local0)) { } else { - err(arg0, z176, 0x076, 0, 0, "\\DTM2.DEVR._XT2", 0) + err(arg0, z176, __LINE__, 0, 0, "\\DTM2.DEVR._XT2", 0) } UnLoad(DDBH) @@ -976,11 +976,11 @@ Device(DTM2) { } if (CondRefof(\_XT2, Local0)) { - err(arg0, z176, 0x078, 0, 0, "\\_XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 1) } if (CondRefof(\DTM2.DEVR._XT2, Local0)) { - err(arg0, z176, 0x079, 0, 0, "\\DTM2.DEVR._XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\DTM2.DEVR._XT2", 1) } return (0) @@ -995,7 +995,7 @@ Device(DTM2) { Concatenate(arg0, "-tst6", arg0) if (CondRefof(\_XT2, Local0)) { - err(arg0, z176, 0x080, 0, 0, "\\_XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 1) return (1) } @@ -1009,17 +1009,17 @@ Device(DTM2) { Store(ObjectType(DDBH), Local1) if (LNotEqual(Local1, c017)) { // DDB Handle - err(arg0, z176, 0x082, 0, 0, Local1, c017) + err(arg0, z176, __LINE__, 0, 0, Local1, c017) return (1) } if (LNotEqual(1, \DTM2.PLDT)) { - err(arg0, z176, 0x083, 0, 0, \DTM2.PLDT, 1) + err(arg0, z176, __LINE__, 0, 0, \DTM2.PLDT, 1) } if (CondRefof(\_XT2, Local0)) { } else { - err(arg0, z176, 0x084, 0, 0, "\\_XT2", 0) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 0) } UnLoad(DDBH) @@ -1030,7 +1030,7 @@ Device(DTM2) { } if (CondRefof(\_XT2, Local0)) { - err(arg0, z176, 0x086, 0, 0, "\\_XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 1) } return (0) @@ -1055,12 +1055,12 @@ Device(DTM2) { Store(ObjectType(DDBH), Local1) if (LNotEqual(Local1, c017)) { // DDB Handle - err(arg0, z176, 0x092, 0, 0, Local1, c017) + err(arg0, z176, __LINE__, 0, 0, Local1, c017) return (1) } if (LNotEqual(1, PLDT)) { - err(arg0, z176, 0x093, 0, 0, PLDT, 1) + err(arg0, z176, __LINE__, 0, 0, PLDT, 1) } UnLoad(DDBH) @@ -1080,16 +1080,16 @@ Device(DTM2) { Store(ObjectType(DDBH), Local1) if (LNotEqual(Local1, c017)) { // DDB Handle - err(arg0, z176, 0x096, 0, 0, Local1, c017) + err(arg0, z176, __LINE__, 0, 0, Local1, c017) return (1) } if (LNotEqual(0, PLDT)) { - err(arg0, z176, 0x097, 0, 0, PLDT, 0) + err(arg0, z176, __LINE__, 0, 0, PLDT, 0) } if (LNotEqual(1, \DTM2.PLDT)) { - err(arg0, z176, 0x098, 0, 0, \DTM2.PLDT, 1) + err(arg0, z176, __LINE__, 0, 0, \DTM2.PLDT, 1) } UnLoad(DDBH) @@ -1122,7 +1122,7 @@ Device(DTM2) { CH04(arg0, 0, 61, z176, 0x0a0, 0, 0) // AE_AML_STRING_LIMIT if (LNotEqual(0, \DTM2.PLDT)) { - err(arg0, z176, 0x0a1, 0, 0, \DTM2.PLDT, 1) + err(arg0, z176, __LINE__, 0, 0, \DTM2.PLDT, 1) if (y287) { return (1) @@ -1139,7 +1139,7 @@ Device(DTM2) { CH04(arg0, 0, 61, z176, 0x0a2, 0, 0) // AE_AML_STRING_LIMIT if (LNotEqual(0, \DTM2.PLDT)) { - err(arg0, z176, 0x0a3, 0, 0, \DTM2.PLDT, 1) + err(arg0, z176, __LINE__, 0, 0, \DTM2.PLDT, 1) return (1) } @@ -1149,7 +1149,7 @@ Device(DTM2) { CH04(arg0, 0, 61, z176, 0x0a4, 0, 0) // AE_AML_STRING_LIMIT if (LNotEqual(0, \DTM2.PLDT)) { - err(arg0, z176, 0x0a5, 0, 0, \DTM2.PLDT, 1) + err(arg0, z176, __LINE__, 0, 0, \DTM2.PLDT, 1) return (1) } @@ -1170,7 +1170,7 @@ Device(DTM2) { CH04(arg0, 0, 7, z176, 0x0a6, 0, 0) // AE_ALREADY_EXISTS if (LNotEqual(0, \DTM2.PLDT)) { - err(arg0, z176, 0x0a7, 0, 0, \DTM2.PLDT, 1) + err(arg0, z176, __LINE__, 0, 0, \DTM2.PLDT, 1) } // SignatureString is "SSDT" @@ -1179,7 +1179,7 @@ Device(DTM2) { CH04(arg0, 0, 7, z176, 0x0a8, 0, 0) // AE_ALREADY_EXISTS if (LNotEqual(0, \DTM2.PLDT)) { - err(arg0, z176, 0x0a9, 0, 0, \DTM2.PLDT, 1) + err(arg0, z176, __LINE__, 0, 0, \DTM2.PLDT, 1) } return (0) @@ -1193,7 +1193,7 @@ Device(DTM2) { Concatenate(arg0, "-tsta", arg0) if (CondRefof(\_XT2, Local0)) { - err(arg0, z176, 0x0b0, 0, 0, "\\_XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 1) return (1) } @@ -1207,17 +1207,17 @@ Device(DTM2) { Store(ObjectType(DDBH), Local1) if (LNotEqual(Local1, c017)) { // DDB Handle - err(arg0, z176, 0x0b2, 0, 0, Local1, c017) + err(arg0, z176, __LINE__, 0, 0, Local1, c017) return (1) } if (LNotEqual(1, \DTM2.PLDT)) { - err(arg0, z176, 0x0b3, 0, 0, \DTM2.PLDT, 1) + err(arg0, z176, __LINE__, 0, 0, \DTM2.PLDT, 1) } if (CondRefof(\_XT2, Local0)) { } else { - err(arg0, z176, 0x0b4, 0, 0, "\\_XT2", 0) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 0) } Store(0, \DTM2.PLDT) @@ -1227,16 +1227,16 @@ Device(DTM2) { CH04(arg0, 0, 7, z176, 0x0b5, 0, 0) // AE_ALREADY_EXISTS if (LNotEqual(0, \DTM2.PLDT)) { - err(arg0, z176, 0x0b6, 0, 0, \DTM2.PLDT, 0) + err(arg0, z176, __LINE__, 0, 0, \DTM2.PLDT, 0) } if (CondRefof(\DTM2._XT2, Local0)) { - err(arg0, z176, 0x0b7, 0, 0, "\\DTM2._XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\DTM2._XT2", 1) } if (CondRefof(\_XT2, Local0)) { } else { - err(arg0, z176, 0x0b8, 0, 0, "\\_XT2", 0) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 0) } UnLoad(DDBH) @@ -1247,7 +1247,7 @@ Device(DTM2) { } if (CondRefof(\_XT2, Local0)) { - err(arg0, z176, 0x0ba, 0, 0, "\\_XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 1) } return (0) @@ -1281,7 +1281,7 @@ Device(DTM2) { Concatenate(arg0, "-tstb", arg0) if (CondRefof(\_XT2, Local0)) { - err(arg0, z176, 0x0c0, 0, 0, "\\_XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 1) return (1) } @@ -1294,13 +1294,13 @@ Device(DTM2) { Store(ObjectType(DDBH), Local1) if (LNotEqual(Local1, c017)) { // DDB Handle - err(arg0, z176, 0x0c2, 0, 0, Local1, c017) + err(arg0, z176, __LINE__, 0, 0, Local1, c017) return (1) } if (CondRefof(\_XT2, Local0)) { } else { - err(arg0, z176, 0x0c3, 0, 0, "\\_XT2", 0) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 0) } Store(0, \DTM2.PLDT) @@ -1310,12 +1310,12 @@ Device(DTM2) { CH04(arg0, 0, 7, z176, 0x0c4, 0, 0) // AE_ALREADY_EXISTS if (LNotEqual(0, \DTM2.PLDT)) { - err(arg0, z176, 0x0c5, 0, 0, \DTM2.PLDT, 0) + err(arg0, z176, __LINE__, 0, 0, \DTM2.PLDT, 0) } if (CondRefof(\_XT2, Local0)) { } else { - err(arg0, z176, 0x0c6, 0, 0, "\\_XT2", 0) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 0) } UnLoad(DDBH) @@ -1326,7 +1326,7 @@ Device(DTM2) { } if (CondRefof(\_XT2, Local0)) { - err(arg0, z176, 0x0c8, 0, 0, "\\_XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 1) } return (0) @@ -1358,11 +1358,11 @@ Device(DTM2) { CH04(arg0, 0, 47, z176, 0x0ca, 0, 0) // AE_AML_OPERAND_TYPE if (LNotEqual(0, \DTM2.PLDT)) { - err(arg0, z176, 0x0cb, 0, 0, \DTM2.PLDT, 0) + err(arg0, z176, __LINE__, 0, 0, \DTM2.PLDT, 0) } if (CondRefof(\_XT2, Local0)) { - err(arg0, z176, 0x0cc, 0, 0, "\\_XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 1) } return (0) @@ -1413,7 +1413,7 @@ Device(DTM2) { } if (LNotEqual(0, \DTM2.PLDT)) { - err(arg0, z176, 0x0d4, 0, 0, \DTM2.PLDT, 0) + err(arg0, z176, __LINE__, 0, 0, \DTM2.PLDT, 0) return (1) } @@ -1424,12 +1424,12 @@ Device(DTM2) { } if (LNotEqual(Local5, c009)) { // Integer - err(arg0, z176, 0x0d6, 0, 0, Local5, c009) + err(arg0, z176, __LINE__, 0, 0, Local5, c009) return (1) } if (LNotEqual(0, DDBH)) { - err(arg0, z176, 0x0d7, 0, 0, DDBH, 0) + err(arg0, z176, __LINE__, 0, 0, DDBH, 0) return (1) } @@ -1462,27 +1462,27 @@ Device(DTM2) { // Check consistency of the parameters if (LNotEqual(ToBuffer(SOEM), Local0)) { - err(arg0, z176, 0x0d8, 0, 0, Local0, ToBuffer(SOEM)) + err(arg0, z176, __LINE__, 0, 0, Local0, ToBuffer(SOEM)) return (1) } if (LNotEqual(ToBuffer(SOID), Local1)) { - err(arg0, z176, 0x0d9, 0, 0, Local1, ToBuffer(SOID)) + err(arg0, z176, __LINE__, 0, 0, Local1, ToBuffer(SOID)) return (1) } if (LNotEqual(ToBuffer(STID), Local2)) { - err(arg0, z176, 0x0da, 0, 0, Local2, ToBuffer(STID)) + err(arg0, z176, __LINE__, 0, 0, Local2, ToBuffer(STID)) return (1) } if (LNotEqual(ToBuffer(RPST), Local3)) { - err(arg0, z176, 0x0db, 0, 0, Local3, ToBuffer(RPST)) + err(arg0, z176, __LINE__, 0, 0, Local3, ToBuffer(RPST)) return (1) } if (LNotEqual(ToBuffer(PPST), Local4)) { - err(arg0, z176, 0x0dc, 0, 0, Local4, ToBuffer(PPST)) + err(arg0, z176, __LINE__, 0, 0, Local4, ToBuffer(PPST)) return (1) } @@ -1504,7 +1504,7 @@ Device(DTM2) { if (y293) { if (CondRefof(\_XT2, Local0)) { - err(arg0, z176, 0x0e0, 0, 0, "\\_XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 1) return (1) } @@ -1520,13 +1520,13 @@ Device(DTM2) { } if (LNotEqual(1, \DTM2.PLDT)) { - err(arg0, z176, 0x0e2, 0, 0, \DTM2.PLDT, 1) + err(arg0, z176, __LINE__, 0, 0, \DTM2.PLDT, 1) return (1) } if (CondRefof(\_XT2, Local0)) { } else { - err(arg0, z176, 0x0e3, 0, 0, "\\_XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 1) return (1) } @@ -1537,7 +1537,7 @@ Device(DTM2) { } if (CondRefof(\_XT2, Local0)) { - err(arg0, z176, 0x0e5, 0, 0, "\\_XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 1) return (1) } } @@ -1570,7 +1570,7 @@ Device(DTM2) { Concatenate(arg0, "-tstf", arg0) if (CondRefof(\_XT2, Local0)) { - err(arg0, z176, 0x0f1, 0, 0, "\\_XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 1) return (1) } @@ -1583,13 +1583,13 @@ Device(DTM2) { Store(ObjectType(DDBH), Local1) if (LNotEqual(Local1, c017)) { // DDB Handle - err(arg0, z176, 0x0f3, 0, 0, Local1, c017) + err(arg0, z176, __LINE__, 0, 0, Local1, c017) return (1) } if (CondRefof(\_XT2, Local0)) { } else { - err(arg0, z176, 0x0f4, 0, 0, "\\_XT2", 0) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 0) } UnLoad(DDBH) @@ -1600,7 +1600,7 @@ Device(DTM2) { } if (CondRefof(\_XT2, Local0)) { - err(arg0, z176, 0x0f6, 0, 0, "\\_XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 1) return (1) } @@ -1615,11 +1615,11 @@ Device(DTM2) { CH04(arg0, 0, 28, z176, 0x0f7, 0, 0) // AE_BAD_PARAMETER if (LNotEqual(0, \DTM2.PLDT)) { - err(arg0, z176, 0x0f8, 0, 0, \DTM2.PLDT, 0) + err(arg0, z176, __LINE__, 0, 0, \DTM2.PLDT, 0) } if (CondRefof(\_XT2, Local0)) { - err(arg0, z176, 0x0f9, 0, 0, "\\_XT2", 1) + err(arg0, z176, __LINE__, 0, 0, "\\_XT2", 1) if (y289) { // Cleanup UnLoad(DDBH) @@ -1653,7 +1653,7 @@ Device(DTM2) { Store(ObjectType(arg2), Local0) if (LNotEqual(arg3, Local0)) { - err(arg0, z176, 0x100, 0, 0, Local0, arg3) + err(arg0, z176, __LINE__, 0, 0, Local0, arg3) return (1) } @@ -1670,7 +1670,7 @@ Device(DTM2) { Store(ObjectType(arg2), Local0) if (LNotEqual(arg3, Local0)) { - err(arg0, z176, 0x102, 0, 0, Local0, arg3) + err(arg0, z176, __LINE__, 0, 0, Local0, arg3) return (1) } @@ -1687,7 +1687,7 @@ Device(DTM2) { Store(ObjectType(arg2), Local0) if (LNotEqual(arg3, Local0)) { - err(arg0, z176, 0x104, 0, 0, Local0, arg3) + err(arg0, z176, __LINE__, 0, 0, Local0, arg3) return (1) } @@ -1704,7 +1704,7 @@ Device(DTM2) { Store(ObjectType(arg2), Local0) if (LNotEqual(arg3, Local0)) { - err(arg0, z176, 0x106, 0, 0, Local0, arg3) + err(arg0, z176, __LINE__, 0, 0, Local0, arg3) return (1) } @@ -1725,7 +1725,7 @@ Device(DTM2) { Store(ObjectType(arg2), Local0) if (LNotEqual(arg3, Local0)) { - err(arg0, z176, 0x109, 0, 0, Local0, arg3) + err(arg0, z176, __LINE__, 0, 0, Local0, arg3) return (1) } @@ -1755,7 +1755,7 @@ Device(DTM2) { } Store(ObjectType(Local1), Local0) if (LNotEqual(c008, Local0)) { - err(arg0, z176, 0x10d, 0, 0, Local0, c008) + err(arg0, z176, __LINE__, 0, 0, Local0, c008) } else { LoadTable(Local1, "", "", "\\", "\\DTM2.PLDT", 1) if (SLCK) { @@ -1827,7 +1827,7 @@ Device(DTM2) { CH04(arg0, 0, 47, z176, 0x117, 0, 0) // AE_AML_OPERAND_TYPE Store(ObjectType(\AUXD.PAC0), Local0) if (LNotEqual(c00c, Local0)) { - err(arg0, z176, 0x118, 0, 0, Local0, c00c) + err(arg0, z176, __LINE__, 0, 0, Local0, c00c) } // Field Unit @@ -1847,7 +1847,7 @@ Device(DTM2) { CH04(arg0, 0, 47, z176, 0x11d, 0, 0) // AE_AML_OPERAND_TYPE Store(ObjectType(\AUXD.DEV0), Local0) if (LNotEqual(c00e, Local0)) { - err(arg0, z176, 0x11e, 0, 0, Local0, c00e) + err(arg0, z176, __LINE__, 0, 0, Local0, c00e) } // Event @@ -1905,7 +1905,7 @@ Device(DTM2) { CH04(arg0, 0, 47, z176, 0x124, 0, 0) // AE_AML_OPERAND_TYPE Store(ObjectType(\AUXD.TZN0), Local0) if (LNotEqual(c015, Local0)) { - err(arg0, z176, 0x125, 0, 0, Local0, c015) + err(arg0, z176, __LINE__, 0, 0, Local0, c015) } // Buffer Field @@ -1942,7 +1942,7 @@ Device(DTM2) { } Store(ObjectType(Local1), Local0) if (LNotEqual(c008, Local0)) { - err(arg0, z176, 0x131, 0, 0, Local0, c008) + err(arg0, z176, __LINE__, 0, 0, Local0, c008) } else { // Bug 288: iASL unexpectedly forbids ParameterData of Loadtable to be LocalX or UserTerm /* @@ -1958,7 +1958,7 @@ Device(DTM2) { // Integer Store(ObjectType(\DTM2.PLDT), Local0) if (LNotEqual(c009, Local0)) { - err(arg0, z176, 0x133, 0, 0, Local0, c009) + err(arg0, z176, __LINE__, 0, 0, Local0, c009) return (1) } Store(LoadTable("OEM1", "", "", "\\", "\\DTM2.PLDT", \AUXD.INT0), DDB1) @@ -1967,11 +1967,11 @@ Device(DTM2) { } Store(ObjectType(\DTM2.PLDT), Local0) if (LNotEqual(c009, Local0)) { - err(arg0, z176, 0x135, 0, 0, Local0, c009) + err(arg0, z176, __LINE__, 0, 0, Local0, c009) return (1) } if (LNotEqual(\DTM2.PLDT, \AUXD.INT0)) { - err(arg0, z176, 0x136, 0, 0, \DTM2.PLDT, \AUXD.INT0) + err(arg0, z176, __LINE__, 0, 0, \DTM2.PLDT, \AUXD.INT0) return (1) } Unload(DDB1) @@ -1980,14 +1980,14 @@ Device(DTM2) { } Store(ObjectType(\AUXD.INT0), Local0) if (LNotEqual(c009, Local0)) { - err(arg0, z176, 0x138, 0, 0, Local0, c009) + err(arg0, z176, __LINE__, 0, 0, Local0, c009) } // String if (y296) { Store(ObjectType(\DTM2.PLDT), Local0) if (LNotEqual(c009, Local0)) { - err(arg0, z176, 0x139, 0, 0, Local0, c009) + err(arg0, z176, __LINE__, 0, 0, Local0, c009) return (1) } Store(LoadTable("OEM1", "", "", "\\", "\\DTM2.PLDT", \AUXD.STR0), DDB1) @@ -1996,11 +1996,11 @@ Device(DTM2) { } Store(ObjectType(\DTM2.PLDT), Local0) if (LNotEqual(c009, Local0)) { - err(arg0, z176, 0x13b, 0, 0, Local0, c009) + err(arg0, z176, __LINE__, 0, 0, Local0, c009) return (1) } if (LNotEqual(\DTM2.PLDT, \AUXD.STR0)) { - err(arg0, z176, 0x13c, 0, 0, \DTM2.PLDT, \AUXD.STR0) + err(arg0, z176, __LINE__, 0, 0, \DTM2.PLDT, \AUXD.STR0) return (1) } Unload(DDB1) @@ -2009,7 +2009,7 @@ Device(DTM2) { } Store(ObjectType(\AUXD.STR0), Local0) if (LNotEqual(c00a, Local0)) { - err(arg0, z176, 0x13e, 0, 0, Local0, c00a) + err(arg0, z176, __LINE__, 0, 0, Local0, c00a) } } @@ -2017,7 +2017,7 @@ Device(DTM2) { if (y296) { Store(ObjectType(\DTM2.PLDT), Local0) if (LNotEqual(c009, Local0)) { - err(arg0, z176, 0x13f, 0, 0, Local0, c009) + err(arg0, z176, __LINE__, 0, 0, Local0, c009) return (1) } Store(LoadTable("OEM1", "", "", "\\", "\\DTM2.PLDT", \AUXD.BUF0), DDB1) @@ -2026,11 +2026,11 @@ Device(DTM2) { } Store(ObjectType(\DTM2.PLDT), Local0) if (LNotEqual(c009, Local0)) { - err(arg0, z176, 0x141, 0, 0, Local0, c009) + err(arg0, z176, __LINE__, 0, 0, Local0, c009) return (1) } if (LNotEqual(\DTM2.PLDT, \AUXD.BUF0)) { - err(arg0, z176, 0x142, 0, 0, \DTM2.PLDT, \AUXD.BUF0) + err(arg0, z176, __LINE__, 0, 0, \DTM2.PLDT, \AUXD.BUF0) return (1) } Unload(DDB1) @@ -2039,7 +2039,7 @@ Device(DTM2) { } Store(ObjectType(\AUXD.BUF0), Local0) if (LNotEqual(c00b, Local0)) { - err(arg0, z176, 0x144, 0, 0, Local0, c00b) + err(arg0, z176, __LINE__, 0, 0, Local0, c00b) } } @@ -2048,14 +2048,14 @@ Device(DTM2) { CH04(arg0, 0, 47, z176, 0x145, 0, 0) // AE_AML_OPERAND_TYPE Store(ObjectType(\AUXD.PAC0), Local0) if (LNotEqual(c00c, Local0)) { - err(arg0, z176, 0x146, 0, 0, Local0, c00c) + err(arg0, z176, __LINE__, 0, 0, Local0, c00c) } // Field Unit if (y296) { Store(ObjectType(\DTM2.PLDT), Local0) if (LNotEqual(c009, Local0)) { - err(arg0, z176, 0x147, 0, 0, Local0, c009) + err(arg0, z176, __LINE__, 0, 0, Local0, c009) return (1) } Store(LoadTable("OEM1", "", "", "\\", "\\DTM2.PLDT", \AUXD.FLU0), DDB1) @@ -2064,11 +2064,11 @@ Device(DTM2) { } Store(ObjectType(\DTM2.PLDT), Local0) if (LNotEqual(c009, Local0)) { - err(arg0, z176, 0x149, 0, 0, Local0, c009) + err(arg0, z176, __LINE__, 0, 0, Local0, c009) return (1) } if (LNotEqual(\DTM2.PLDT, \AUXD.FLU0)) { - err(arg0, z176, 0x14a, 0, 0, \DTM2.PLDT, \AUXD.FLU0) + err(arg0, z176, __LINE__, 0, 0, \DTM2.PLDT, \AUXD.FLU0) return (1) } Unload(DDB1) @@ -2077,7 +2077,7 @@ Device(DTM2) { } Store(ObjectType(\AUXD.FLU0), Local0) if (LNotEqual(c00d, Local0)) { - err(arg0, z176, 0x14c, 0, 0, Local0, c00d) + err(arg0, z176, __LINE__, 0, 0, Local0, c00d) } } @@ -2086,7 +2086,7 @@ Device(DTM2) { CH04(arg0, 0, 47, z176, 0x14d, 0, 0) // AE_AML_OPERAND_TYPE Store(ObjectType(\AUXD.DEV0), Local0) if (LNotEqual(c00e, Local0)) { - err(arg0, z176, 0x14e, 0, 0, Local0, c00e) + err(arg0, z176, __LINE__, 0, 0, Local0, c00e) } // Event @@ -2094,7 +2094,7 @@ Device(DTM2) { CH04(arg0, 0, 47, z176, 0x14f, 0, 0) // AE_AML_OPERAND_TYPE Store(ObjectType(\AUXD.EVE0), Local0) if (LNotEqual(c00f, Local0)) { - err(arg0, z176, 0x150, 0, 0, Local0, c00f) + err(arg0, z176, __LINE__, 0, 0, Local0, c00f) } // Method @@ -2103,7 +2103,7 @@ Device(DTM2) { CH04(arg0, 0, 47, z176, 0x151, 0, 0) // AE_AML_OPERAND_TYPE Store(ObjectType(\AUXD.MMM0), Local0) if (LNotEqual(c010, Local0)) { - err(arg0, z176, 0x152, 0, 0, Local0, c010) + err(arg0, z176, __LINE__, 0, 0, Local0, c010) } } @@ -2112,7 +2112,7 @@ Device(DTM2) { CH04(arg0, 0, 47, z176, 0x153, 0, 0) // AE_AML_OPERAND_TYPE Store(ObjectType(\AUXD.MTX0), Local0) if (LNotEqual(c011, Local0)) { - err(arg0, z176, 0x154, 0, 0, Local0, c011) + err(arg0, z176, __LINE__, 0, 0, Local0, c011) } // OpRegion @@ -2120,7 +2120,7 @@ Device(DTM2) { CH04(arg0, 0, 47, z176, 0x155, 0, 0) // AE_AML_OPERAND_TYPE Store(ObjectType(\AUXD.OPR0), Local0) if (LNotEqual(c012, Local0)) { - err(arg0, z176, 0x156, 0, 0, Local0, c012) + err(arg0, z176, __LINE__, 0, 0, Local0, c012) } // Power Resource @@ -2128,7 +2128,7 @@ Device(DTM2) { CH04(arg0, 0, 47, z176, 0x157, 0, 0) // AE_AML_OPERAND_TYPE Store(ObjectType(\AUXD.PWR0), Local0) if (LNotEqual(c013, Local0)) { - err(arg0, z176, 0x158, 0, 0, Local0, c013) + err(arg0, z176, __LINE__, 0, 0, Local0, c013) } // Processor @@ -2136,7 +2136,7 @@ Device(DTM2) { CH04(arg0, 0, 47, z176, 0x159, 0, 0) // AE_AML_OPERAND_TYPE Store(ObjectType(\AUXD.CPU0), Local0) if (LNotEqual(c014, Local0)) { - err(arg0, z176, 0x15a, 0, 0, Local0, c014) + err(arg0, z176, __LINE__, 0, 0, Local0, c014) } // Thermal Zone @@ -2144,14 +2144,14 @@ Device(DTM2) { CH04(arg0, 0, 47, z176, 0x15b, 0, 0) // AE_AML_OPERAND_TYPE Store(ObjectType(\AUXD.TZN0), Local0) if (LNotEqual(c015, Local0)) { - err(arg0, z176, 0x15c, 0, 0, Local0, c015) + err(arg0, z176, __LINE__, 0, 0, Local0, c015) } // Buffer Field if (y296) { Store(ObjectType(\DTM2.PLDT), Local0) if (LNotEqual(c009, Local0)) { - err(arg0, z176, 0x15d, 0, 0, Local0, c009) + err(arg0, z176, __LINE__, 0, 0, Local0, c009) return (1) } Store(LoadTable("OEM1", "", "", "\\", "\\DTM2.PLDT", \AUXD.BFL0), DDB1) @@ -2160,11 +2160,11 @@ Device(DTM2) { } Store(ObjectType(\DTM2.PLDT), Local0) if (LNotEqual(c009, Local0)) { - err(arg0, z176, 0x15f, 0, 0, Local0, c009) + err(arg0, z176, __LINE__, 0, 0, Local0, c009) return (1) } if (LNotEqual(\DTM2.PLDT, \AUXD.BFL0)) { - err(arg0, z176, 0x160, 0, 0, \DTM2.PLDT, \AUXD.BFL0) + err(arg0, z176, __LINE__, 0, 0, \DTM2.PLDT, \AUXD.BFL0) return (1) } Unload(DDB1) @@ -2173,7 +2173,7 @@ Device(DTM2) { } Store(ObjectType(\AUXD.BFL0), Local0) if (LNotEqual(c016, Local0)) { - err(arg0, z176, 0x162, 0, 0, Local0, c016) + err(arg0, z176, __LINE__, 0, 0, Local0, c016) } } diff --git a/tests/aslts/src/runtime/collections/functional/table/unload.asl b/tests/aslts/src/runtime/collections/functional/table/unload.asl index 8b7882c35..8895289e7 100644 --- a/tests/aslts/src/runtime/collections/functional/table/unload.asl +++ b/tests/aslts/src/runtime/collections/functional/table/unload.asl @@ -95,7 +95,7 @@ Device(DTM1) { Store(\DTM0.BUF0, \DTM0.RFU0) if (CondRefof(\SSS0, Local0)) { - err(arg0, z175, 0x000, 0, 0, "\\SSS0", 1) + err(arg0, z175, __LINE__, 0, 0, "\\SSS0", 1) return } @@ -120,26 +120,26 @@ Device(DTM1) { Store(ObjectType(HI0), Local1) if (LNotEqual(Local1, c017)) { // DDB Handle - err(arg0, z175, 0x003, 0, 0, Local1, c017) + err(arg0, z175, __LINE__, 0, 0, Local1, c017) } // Check the new Object appears if (CondRefof(\SSS0, Local0)) { } else { - err(arg0, z175, 0x004, 0, 0, "\\SSS0", 0) + err(arg0, z175, __LINE__, 0, 0, "\\SSS0", 0) } Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c010)) { // Method - err(arg0, z175, 0x005, 0, 0, Local1, c010) + err(arg0, z175, __LINE__, 0, 0, Local1, c010) } else { Store(\SSS0(), Local0) if (CH03(arg0, z175, 0x006, "\\SSS0", 1)) { return } if (LNotEqual("\\SSS0", Local0)) { - err(arg0, z175, 0x007, 0, 0, Local0, "\\SSS0") + err(arg0, z175, __LINE__, 0, 0, Local0, "\\SSS0") } } @@ -153,7 +153,7 @@ Device(DTM1) { Store("Table Unloaded", Debug) if (CondRefof(\SSS0, Local0)) { - err(arg0, z175, 0x009, 0, 0, "\\SSS0", 1) + err(arg0, z175, __LINE__, 0, 0, "\\SSS0", 1) } return } @@ -172,7 +172,7 @@ Device(DTM1) { Store(ObjectType(arg2), Local0) if (LNotEqual(arg3, Local0)) { - err(arg0, z175, 0x010, 0, 0, Local0, arg3) + err(arg0, z175, __LINE__, 0, 0, Local0, arg3) return (1) } @@ -185,85 +185,85 @@ Device(DTM1) { // Integer if (CondRefof(\AUXD.INT0, Local0)) { - err(arg0, z175, 0x011, 0, 0, "\\AUXD.INT0", 1) + err(arg0, z175, __LINE__, 0, 0, "\\AUXD.INT0", 1) return (1) } // String if (CondRefof(\AUXD.STR0, Local0)) { - err(arg0, z175, 0x012, 0, 0, "\\AUXD.STR0", 1) + err(arg0, z175, __LINE__, 0, 0, "\\AUXD.STR0", 1) return (1) } // Buffer if (CondRefof(\AUXD.BUF0, Local0)) { - err(arg0, z175, 0x013, 0, 0, "\\AUXD.BUF0", 1) + err(arg0, z175, __LINE__, 0, 0, "\\AUXD.BUF0", 1) return (1) } // Package if (CondRefof(\AUXD.PAC0, Local0)) { - err(arg0, z175, 0x014, 0, 0, "\\AUXD.PAC0", 1) + err(arg0, z175, __LINE__, 0, 0, "\\AUXD.PAC0", 1) return (1) } // Field Unit if (CondRefof(\AUXD.FLU0, Local0)) { - err(arg0, z175, 0x015, 0, 0, "\\AUXD.FLU0", 1) + err(arg0, z175, __LINE__, 0, 0, "\\AUXD.FLU0", 1) return (1) } // Device if (CondRefof(\AUXD.DEV0, Local0)) { - err(arg0, z175, 0x016, 0, 0, "\\AUXD.DEV0", 1) + err(arg0, z175, __LINE__, 0, 0, "\\AUXD.DEV0", 1) return (1) } // Event if (CondRefof(\AUXD.EVE0, Local0)) { - err(arg0, z175, 0x017, 0, 0, "\\AUXD.EVE0", 1) + err(arg0, z175, __LINE__, 0, 0, "\\AUXD.EVE0", 1) return (1) } // Method if (CondRefof(\AUXD.MMM0, Local0)) { - err(arg0, z175, 0x018, 0, 0, "\\AUXD.MMM0", 1) + err(arg0, z175, __LINE__, 0, 0, "\\AUXD.MMM0", 1) return (1) } // Mutex if (CondRefof(\AUXD.MTX0, Local0)) { - err(arg0, z175, 0x019, 0, 0, "\\AUXD.MTX0", 1) + err(arg0, z175, __LINE__, 0, 0, "\\AUXD.MTX0", 1) return (1) } // OpRegion if (CondRefof(\AUXD.OPR0, Local0)) { - err(arg0, z175, 0x01a, 0, 0, "\\AUXD.OPR0", 1) + err(arg0, z175, __LINE__, 0, 0, "\\AUXD.OPR0", 1) return (1) } // Power Resource if (CondRefof(\AUXD.PWR0, Local0)) { - err(arg0, z175, 0x01b, 0, 0, "\\AUXD.PWR0", 1) + err(arg0, z175, __LINE__, 0, 0, "\\AUXD.PWR0", 1) return (1) } // Processor if (CondRefof(\AUXD.CPU0, Local0)) { - err(arg0, z175, 0x01c, 0, 0, "\\AUXD.CPU0", 1) + err(arg0, z175, __LINE__, 0, 0, "\\AUXD.CPU0", 1) return (1) } // Thermal Zone if (CondRefof(\AUXD.TZN0, Local0)) { - err(arg0, z175, 0x01d, 0, 0, "\\AUXD.TZN0", 1) + err(arg0, z175, __LINE__, 0, 0, "\\AUXD.TZN0", 1) return (1) } // Buffer Field if (CondRefof(\AUXD.BFL0, Local0)) { - err(arg0, z175, 0x01e, 0, 0, "\\AUXD.BFL0", 1) + err(arg0, z175, __LINE__, 0, 0, "\\AUXD.BFL0", 1) return (1) } @@ -289,21 +289,21 @@ Device(DTM1) { if (CondRefof(\AUXD.INT0, Local0)) { m000(arg0, "int", Local0, c009) } else { - err(arg0, z175, 0x021, 0, 0, "\\AUXD.INT0", 0) + err(arg0, z175, __LINE__, 0, 0, "\\AUXD.INT0", 0) } // String if (CondRefof(\AUXD.STR0, Local0)) { m000(arg0, "str", Local0, c00a) } else { - err(arg0, z175, 0x022, 0, 0, "\\AUXD.STR0", 0) + err(arg0, z175, __LINE__, 0, 0, "\\AUXD.STR0", 0) } // Buffer if (CondRefof(\AUXD.BUF0, Local0)) { m000(arg0, "buf", Local0, c00b) } else { - err(arg0, z175, 0x023, 0, 0, "\\AUXD.BUF0", 0) + err(arg0, z175, __LINE__, 0, 0, "\\AUXD.BUF0", 0) } // Package @@ -311,7 +311,7 @@ Device(DTM1) { if (CondRefof(\AUXD.PAC0, Local0)) { m000(arg0, "pac", Local0, c00c) } else { - err(arg0, z175, 0x024, 0, 0, "\\AUXD.PAC0", 0) + err(arg0, z175, __LINE__, 0, 0, "\\AUXD.PAC0", 0) } } @@ -319,70 +319,70 @@ Device(DTM1) { if (CondRefof(\AUXD.FLU0, Local0)) { m000(arg0, "flu", Local0, c00d) } else { - err(arg0, z175, 0x025, 0, 0, "\\AUXD.FLU0", 0) + err(arg0, z175, __LINE__, 0, 0, "\\AUXD.FLU0", 0) } // Device if (CondRefof(\AUXD.DEV0, Local0)) { m000(arg0, "dev", Local0, c00e) } else { - err(arg0, z175, 0x026, 0, 0, "\\AUXD.DEV0", 0) + err(arg0, z175, __LINE__, 0, 0, "\\AUXD.DEV0", 0) } // Event if (CondRefof(\AUXD.EVE0, Local0)) { m000(arg0, "evt", Local0, c00f) } else { - err(arg0, z175, 0x027, 0, 0, "\\AUXD.EVE0", 0) + err(arg0, z175, __LINE__, 0, 0, "\\AUXD.EVE0", 0) } // Method if (CondRefof(\AUXD.MMM0, Local0)) { m000(arg0, "met", Local0, c010) } else { - err(arg0, z175, 0x028, 0, 0, "\\AUXD.MMM0", 0) + err(arg0, z175, __LINE__, 0, 0, "\\AUXD.MMM0", 0) } // Mutex if (CondRefof(\AUXD.MTX0, Local0)) { m000(arg0, "mtx", Local0, c011) } else { - err(arg0, z175, 0x029, 0, 0, "\\AUXD.MTX0", 0) + err(arg0, z175, __LINE__, 0, 0, "\\AUXD.MTX0", 0) } // OpRegion if (CondRefof(\AUXD.OPR0, Local0)) { m000(arg0, "opr", Local0, c012) } else { - err(arg0, z175, 0x02a, 0, 0, "\\AUXD.OPR0", 0) + err(arg0, z175, __LINE__, 0, 0, "\\AUXD.OPR0", 0) } // Power Resource if (CondRefof(\AUXD.PWR0, Local0)) { m000(arg0, "pwr", Local0, c013) } else { - err(arg0, z175, 0x02b, 0, 0, "\\AUXD.PWR0", 0) + err(arg0, z175, __LINE__, 0, 0, "\\AUXD.PWR0", 0) } // Processor if (CondRefof(\AUXD.CPU0, Local0)) { m000(arg0, "cpu", Local0, c014) } else { - err(arg0, z175, 0x02c, 0, 0, "\\AUXD.CPU0", 0) + err(arg0, z175, __LINE__, 0, 0, "\\AUXD.CPU0", 0) } // Thermal Zone if (CondRefof(\AUXD.TZN0, Local0)) { m000(arg0, "cpu", Local0, c015) } else { - err(arg0, z175, 0x02d, 0, 0, "\\AUXD.TZN0", 0) + err(arg0, z175, __LINE__, 0, 0, "\\AUXD.TZN0", 0) } // Buffer Field if (CondRefof(\AUXD.BFL0, Local0)) { m000(arg0, "bfl", Local0, c016) } else { - err(arg0, z175, 0x02e, 0, 0, "\\AUXD.BFL0", 0) + err(arg0, z175, __LINE__, 0, 0, "\\AUXD.BFL0", 0) } UnLoad(DDB0) @@ -428,7 +428,7 @@ Device(DTM1) { Store(ObjectType(arg2), Local0) if (LNotEqual(arg3, Local0)) { - err(arg0, z175, 0x031, 0, 0, Local0, arg3) + err(arg0, z175, __LINE__, 0, 0, Local0, arg3) return (1) } @@ -454,7 +454,7 @@ Device(DTM1) { } Store(ObjectType(Local1), Local0) if (LNotEqual(c008, Local0)) { - err(arg0, z175, 0x034, 0, 0, Local0, c008) + err(arg0, z175, __LINE__, 0, 0, Local0, c008) } else { UnLoad(Local1) if (SLCK) { @@ -481,7 +481,7 @@ Device(DTM1) { Store(ObjectType(\AUXD.PAC0), Local0) if (LNotEqual(c00c, Local0)) { - err(arg0, z175, 0x036, 0, 0, Local0, c00c) + err(arg0, z175, __LINE__, 0, 0, Local0, c00c) } else { UnLoad(\AUXD.PAC0) CH04(arg0, 0, 47, z175, 0x037, 0, 0) // AE_AML_OPERAND_TYPE @@ -493,7 +493,7 @@ Device(DTM1) { // Device Store(ObjectType(\AUXD.DEV0), Local0) if (LNotEqual(c00e, Local0)) { - err(arg0, z175, 0x038, 0, 0, Local0, c00e) + err(arg0, z175, __LINE__, 0, 0, Local0, c00e) } else { UnLoad(\AUXD.DEV0) CH04(arg0, 0, 47, z175, 0x039, 0, 0) // AE_AML_OPERAND_TYPE @@ -520,7 +520,7 @@ Device(DTM1) { // Thermal Zone Store(ObjectType(\AUXD.TZN0), Local0) if (LNotEqual(c015, Local0)) { - err(arg0, z175, 0x03a, 0, 0, Local0, c015) + err(arg0, z175, __LINE__, 0, 0, Local0, c015) } else { UnLoad(\AUXD.TZN0) CH04(arg0, 0, 47, z175, 0x03b, 0, 0) // AE_AML_OPERAND_TYPE diff --git a/tests/aslts/src/runtime/collections/mt/mutex/common.asl b/tests/aslts/src/runtime/collections/mt/mutex/common.asl index b5ad2f699..0363a37bd 100644 --- a/tests/aslts/src/runtime/collections/mt/mutex/common.asl +++ b/tests/aslts/src/runtime/collections/mt/mutex/common.asl @@ -635,7 +635,7 @@ Method(m106, 2, Serialized) * lpC0 - Index of thread * Local0 - the scale of its errors */ - err(arg0, z147, 0x000, 0, 0, lpC0, Local0) + err(arg0, z147, __LINE__, 0, 0, lpC0, Local0) } Decrement(lpN0) Increment(lpC0) @@ -673,7 +673,7 @@ Method(m107, 4) Store(m104(arg0), Local0) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c00c)) { - err("m107", z147, 0x001, 0, 0, Local1, c00c) + err("m107", z147, __LINE__, 0, 0, Local1, c00c) return (0) } @@ -682,12 +682,12 @@ Method(m107, 4) Store(DeRefOf(Index(Local0, 1)), Local7) if (LNotEqual(Local6, arg1)) { - err("m107", z147, 0x002, 0, 0, Local6, arg1) + err("m107", z147, __LINE__, 0, 0, Local6, arg1) return (0) } if (LNotEqual(Local7, arg2)) { - err("m107", z147, 0x003, 0, 0, Local7, arg2) + err("m107", z147, __LINE__, 0, 0, Local7, arg2) return (0) } } @@ -893,7 +893,7 @@ Method(m110, 4, Serialized) } elseif (cmd0) { if (LNotEqual(Local0, cmd0)) { - err("m110", z147, 0x004, 0, 0, Local0, cmd0) + err("m110", z147, __LINE__, 0, 0, Local0, cmd0) Store(lpC0, Debug) } if (LNot(Local1)) { @@ -902,7 +902,7 @@ Method(m110, 4, Serialized) break } elseif (LNotEqual(Local1, Local0)) { /* Has executed unexpected command */ - err("m110", z147, 0x005, 0, 0, Local1, Local0) + err("m110", z147, __LINE__, 0, 0, Local1, Local0) Store(lpC0, Debug) } } elseif (hng0) { @@ -921,15 +921,15 @@ Method(m110, 4, Serialized) /* Doesn't hang */ if (LNotEqual(Local4, Local0)) { /* Has executed unexpected command */ - err("m110", z147, 0x006, 0, 0, Local1, Local0) + err("m110", z147, __LINE__, 0, 0, Local1, Local0) Store(lpC0, Debug) } - err("m110", z147, 0x007, 0, 0, Local0, Local4) + err("m110", z147, __LINE__, 0, 0, Local0, Local4) Store(lpC0, Debug) } } elseif (idl0) { if (LNotEqual(Local0, c100)) { - err("m110", z147, 0x008, 0, 0, Local0, cmd0) + err("m110", z147, __LINE__, 0, 0, Local0, cmd0) Store(lpC0, Debug) } if (LNot(Local2)) { @@ -938,11 +938,11 @@ Method(m110, 4, Serialized) break } elseif (LNotEqual(Local2, c100)) { /* Has executed unexpected command */ - err("m110", z147, 0x009, 0, 0, Local0, cmd0) + err("m110", z147, __LINE__, 0, 0, Local0, cmd0) Store(lpC0, Debug) } } else { - err("m110", z147, 0x00a, 0, 0, lpC0, Local0) + err("m110", z147, __LINE__, 0, 0, lpC0, Local0) Store(lpC0, Debug) } } @@ -1116,7 +1116,7 @@ Method(m112, 4) /* FAIL of operation expected */ if (LNot(arg3)) { - err("m112", z147, 0x00e, 0, 0, arg3, 1) + err("m112", z147, __LINE__, 0, 0, arg3, 1) } } elseif (arg2) { diff --git a/tests/aslts/src/runtime/collections/mt/mutex/mxs.asl b/tests/aslts/src/runtime/collections/mt/mutex/mxs.asl index d3c762559..e901f864f 100644 --- a/tests/aslts/src/runtime/collections/mt/mutex/mxs.asl +++ b/tests/aslts/src/runtime/collections/mt/mutex/mxs.asl @@ -489,7 +489,7 @@ Method(m333, 3) Store(DerefOf(Index(cnt0, arg0)), Local0) Store(DerefOf(Index(Local0, arg1)), Local1) if (LNotEqual(Local1, arg2)) { - err("m333", z149, 0x000, 0, 0, Local1, arg2) + err("m333", z149, __LINE__, 0, 0, Local1, arg2) Store(arg0, Debug) Store(arg1, Debug) } @@ -637,10 +637,10 @@ Method(m33d, 2) { Store(m10f(arg0, arg1), Local0) if (And(Local0, 0x01)) { - err("m33d", z149, 0x001, 0, 0, Local0, 0) + err("m33d", z149, __LINE__, 0, 0, Local0, 0) } if (And(Local0, 0x02)) { - err("m33d", z149, 0x002, 0, 0, Local0, 0) + err("m33d", z149, __LINE__, 0, 0, Local0, 0) } } @@ -778,7 +778,7 @@ Method(m33f, 7, Serialized) /* Check params */ Store(m344(arg5, arg6), Local0) if (Local0) { - err("m33f: incorrect parameters", z149, 0x003, 0, 0, arg5, arg6) + err("m33f: incorrect parameters", z149, __LINE__, 0, 0, arg5, arg6) Store(Local0, Debug) return } @@ -1024,7 +1024,7 @@ Method(m341, 4) Store(1, has0) } Default { - err("m341: unexpected command:", z149, 0x004, 0, 0, 0, arg0) + err("m341: unexpected command:", z149, __LINE__, 0, 0, 0, arg0) } } @@ -1140,7 +1140,7 @@ Method(m343, 4, Serialized) } if (err0) { - err("m333", z149, 0x005, 0, 0, 0, 0) + err("m333", z149, __LINE__, 0, 0, 0, 0) } return (b000) @@ -1200,12 +1200,12 @@ Method(m336, 2) if (arg1) { if (LNot(EXC0)) { /* Expected exceptions but have none */ - err("m333", z149, 0x006, 0, 0, EXC0, 0) + err("m333", z149, __LINE__, 0, 0, EXC0, 0) } } else { if (EXC0) { /* Unexpected exceptions */ - err("m333", z149, 0x007, 0, 0, EXC0, 0) + err("m333", z149, __LINE__, 0, 0, EXC0, 0) } } diff --git a/tests/aslts/src/runtime/collections/mt/mutex/service.asl b/tests/aslts/src/runtime/collections/mt/mutex/service.asl index fe1196642..44567b574 100644 --- a/tests/aslts/src/runtime/collections/mt/mutex/service.asl +++ b/tests/aslts/src/runtime/collections/mt/mutex/service.asl @@ -82,7 +82,7 @@ Method(m210, 7, Serialized) Name(ix02, 0) if (LGreaterEqual(arg3, arg1)) { - err("m210", z153, 0x000, 0, 0, arg3, arg1) + err("m210", z153, __LINE__, 0, 0, arg3, arg1) return } @@ -94,7 +94,7 @@ Method(m210, 7, Serialized) } Add(arg3, sz01, ix02) if (LGreater(ix02, arg1)) { - err("m210", z153, 0x001, 0, 0, ix02, arg1) + err("m210", z153, __LINE__, 0, 0, ix02, arg1) Store(arg1, Debug) Store(arg3, Debug) Store(arg4, Debug) diff --git a/tests/aslts/src/runtime/collections/mt/mutex/tests.asl b/tests/aslts/src/runtime/collections/mt/mutex/tests.asl index 752886ef3..ad34e7ff9 100644 --- a/tests/aslts/src/runtime/collections/mt/mutex/tests.asl +++ b/tests/aslts/src/runtime/collections/mt/mutex/tests.asl @@ -2384,10 +2384,10 @@ Method(m818, 1, Serialized) m103(arg0) if (LNotequal(FLG2, thr1)) { - err(arg0, z152, 0x000, 0, 0, FLG2, thr1) + err(arg0, z152, __LINE__, 0, 0, FLG2, thr1) } if (LNotequal(FLG3, thr2)) { - err(arg0, z152, 0x001, 0, 0, FLG3, thr2) + err(arg0, z152, __LINE__, 0, 0, FLG3, thr2) } } diff --git a/tests/aslts/src/runtime/collections/service/condbranches/condbranches.asl b/tests/aslts/src/runtime/collections/service/condbranches/condbranches.asl index cd0df0ea2..ecfdb800c 100644 --- a/tests/aslts/src/runtime/collections/service/condbranches/condbranches.asl +++ b/tests/aslts/src/runtime/collections/service/condbranches/condbranches.asl @@ -45,7 +45,7 @@ Method(SRV0,, Serialized) { Method(m280, 2) { SRMT(arg1) if (LNot(arg0)) { - err(arg0, z135, i000, 0, 0, 0, 1) + err(arg0, z135, __LINE__, 0, 0, 0, 1) } Increment(i000) } diff --git a/tests/aslts/src/runtime/common/TCI/tcicmd.asl b/tests/aslts/src/runtime/common/TCI/tcicmd.asl index 7e3c6fca0..01babd4e6 100644 --- a/tests/aslts/src/runtime/common/TCI/tcicmd.asl +++ b/tests/aslts/src/runtime/common/TCI/tcicmd.asl @@ -184,12 +184,12 @@ Method(m165, 2, Serialized) Store(arg1, num) } Default { - err("m165", z128, 0, 0, 0, arg0, 0) + err("m165", z128, __LINE__, 0, 0, arg0, 0) } } if (LLess(num, c22b)) { - err("m165", z128, 0, 0, 0, num, c22b) + err("m165", z128, __LINE__, 0, 0, num, c22b) } else { Name(p000, Package(num) {}) Name(lpN0, 0) @@ -456,7 +456,7 @@ Method(m3a4, 7, Serialized) if (LNotEqual(Local6, Local5)) { if (LNot(DE00)) { - err("m3a4", z128, 1, 0, arg6, Local6, Local5) + err("m3a4", z128, __LINE__, 0, arg6, Local6, Local5) Store(lpC0, Debug) Store(Local0, Debug) Store(Local1, Debug) @@ -486,7 +486,7 @@ Method(m3a4, 7, Serialized) Store(DerefOf(Index(arg2, Local1)), Local3) if (LNotEqual(Local2, Local3)) { if (LNot(DE00)) { - err("m3a4", z128, 2, 0, arg6, Local2, Local3) + err("m3a4", z128, __LINE__, 0, arg6, Local2, Local3) } Store(1, Local7) } @@ -515,7 +515,7 @@ Method(m3a4, 7, Serialized) Add(Local4, Local5, Local6) if (LNotEqual(Local3, Local6)) { if (LNot(DE00)) { - err("m3a4", z128, 3, 0, arg6, Local3, Local6) + err("m3a4", z128, __LINE__, 0, arg6, Local3, Local6) } Store(1, Local7) } @@ -545,7 +545,7 @@ Method(m3a4, 7, Serialized) Add(Local4, Local5, Local6) if (LNotEqual(Local3, Local6)) { if (LNot(DE00)) { - err("m3a4", z128, 4, 0, arg6, Local3, Local6) + err("m3a4", z128, __LINE__, 0, arg6, Local3, Local6) } Store(1, Local7) } @@ -571,7 +571,7 @@ Method(m3a4, 7, Serialized) Store(DerefOf(Index(arg3, Local1)), Local3) if (LNotEqual(Local2, Local3)) { if (LNot(DE00)) { - err("m3a4", z128, 5, 0, arg6, Local2, Local3) + err("m3a4", z128, __LINE__, 0, arg6, Local2, Local3) } Store(1, Local7) } @@ -605,7 +605,7 @@ Method(m3a4, 7, Serialized) Store(DerefOf(Index(Local4, Local1)), Local3) if (LNotEqual(Local2, Local3)) { if (LNot(DE00)) { - err("m3a4", z128, 6, 0, arg6, Local2, Local3) + err("m3a4", z128, __LINE__, 0, arg6, Local2, Local3) } Store(1, Local7) } @@ -668,7 +668,7 @@ Method(m3a6, 3) Store(DerefOf(Index(arg0, 0)), Local1) if (LNotEqual(Local1, Local0)) { - err("m3a6", z128, 7, 0, arg2, Local1, Local0) + err("m3a6", z128, __LINE__, 0, arg2, Local1, Local0) Store(1, Local7) } @@ -676,7 +676,7 @@ Method(m3a6, 3) Store(DerefOf(Index(arg0, 1)), Local1) if (LNotEqual(Local1, c220)) { - err("m3a6", z128, 8, 0, arg2, Local1, c220) + err("m3a6", z128, __LINE__, 0, arg2, Local1, c220) Store(1, Local7) } @@ -690,7 +690,7 @@ Method(m3a6, 3) Store(DerefOf(Index(arg0, 2)), Local1) if (LNotEqual(Local1, Local0)) { - err("m3a6", z128, 9, 0, arg2, Local1, Local0) + err("m3a6", z128, __LINE__, 0, arg2, Local1, Local0) Store(1, Local7) } @@ -698,7 +698,7 @@ Method(m3a6, 3) Store(DerefOf(Index(arg0, 3)), Local1) if (LNot(Local1)) { - err("m3a6", z128, 10, 0, arg2, Local1, 1) + err("m3a6", z128, __LINE__, 0, arg2, Local1, 1) Store(1, Local7) } @@ -729,7 +729,7 @@ Method(m3a7, 3) Store(DerefOf(Index(arg0, Local0)), Local2) if (LNotEqual(Local2, Local1)) { - err("m3a7", z128, 11, 0, arg2, Local2, Local1) + err("m3a7", z128, __LINE__, 0, arg2, Local2, Local1) Store(1, Local7) } */ @@ -741,7 +741,7 @@ Method(m3a7, 3) Store(c21d, Local0) Store(DerefOf(Index(arg0, Local0)), Local1) if (Local1) { - err("m3a7", z128, 12, 0, arg2, Local1, 0) + err("m3a7", z128, __LINE__, 0, arg2, Local1, 0) Store(1, Local7) } @@ -750,7 +750,7 @@ Method(m3a7, 3) Increment(Local0) Store(DerefOf(Index(arg0, Local0)), Local1) if (Local1) { - err("m3a7", z128, 13, 0, arg2, Local1, 0) + err("m3a7", z128, __LINE__, 0, arg2, Local1, 0) Store(1, Local7) } @@ -759,7 +759,7 @@ Method(m3a7, 3) Increment(Local0) Store(DerefOf(Index(arg0, Local0)), Local1) if (Local1) { - err("m3a7", z128, 14, 0, arg2, Local1, 0) + err("m3a7", z128, __LINE__, 0, arg2, Local1, 0) Store(1, Local7) } @@ -768,7 +768,7 @@ Method(m3a7, 3) Increment(Local0) Store(DerefOf(Index(arg0, Local0)), Local1) if (Local1) { - err("m3a7", z128, 15, 0, arg2, Local1, 0) + err("m3a7", z128, __LINE__, 0, arg2, Local1, 0) Store(1, Local7) } @@ -777,7 +777,7 @@ Method(m3a7, 3) Increment(Local0) Store(DerefOf(Index(arg0, Local0)), Local1) if (Local1) { - err("m3a7", z128, 16, 0, arg2, Local1, 0) + err("m3a7", z128, __LINE__, 0, arg2, Local1, 0) Store(1, Local7) } } @@ -869,7 +869,7 @@ Method(m3aa,, Serialized) if (LEqual(Local6, Local7)) { Store("Internal error 0", Debug) - err("m3aa", z128, 17, 0, 0, Local6, Local7) + err("m3aa", z128, __LINE__, 0, 0, Local6, Local7) } elseif (Local6) { Store(1, FOPT) } else { diff --git a/tests/aslts/src/runtime/common/conversion/oproc.asl b/tests/aslts/src/runtime/common/conversion/oproc.asl index 73ff8f836..2a5fa1c4d 100644 --- a/tests/aslts/src/runtime/common/conversion/oproc.asl +++ b/tests/aslts/src/runtime/common/conversion/oproc.asl @@ -570,7 +570,7 @@ Method(m484, 1, Serialized) default { if (LNotEqual(arg0, 0)) { - err("----------- ERROR, m484: incorrect Arg0:", z064, 0, 0, 0, 0, 0) + err("----------- ERROR, m484: incorrect Arg0:", z064, __LINE__, 0, 0, 0, 0) Store(arg0, Debug) } } @@ -790,7 +790,7 @@ Method(m487, 1, Serialized) default { if (LNotEqual(arg0, 0)) { - err("----------- ERROR, m487: incorrect Arg0:", z064, 1, 0, 0, 0, 0) + err("----------- ERROR, m487: incorrect Arg0:", z064, __LINE__, 0, 0, 0, 0) Store(arg0, Debug) Store(0, Local7) } @@ -887,9 +887,9 @@ Method(m489, 3) Store(ObjectType(arg2), Local1) if (LNotEqual(Local0, Local1)) { - err(arg0, z064, 2, 0, 0, Local0, Local1) + err(arg0, z064, __LINE__, 0, 0, Local0, Local1) } elseif (LNotEqual(arg1, arg2)) { - err(arg0, z064, 3, 0, 0, arg1, arg2) + err(arg0, z064, __LINE__, 0, 0, arg1, arg2) } } @@ -904,11 +904,11 @@ Method(m48a, 4) if (F64) { if (LNotEqual(arg2, Local7)) { - err(arg0, z064, 4, 0, 0, arg2, Local7) + err(arg0, z064, __LINE__, 0, 0, arg2, Local7) } } else { if (LNotEqual(arg2, Local6)) { - err(arg0, z064, 5, 0, 0, arg2, Local6) + err(arg0, z064, __LINE__, 0, 0, arg2, Local6) } } } diff --git a/tests/aslts/src/runtime/common/conversion/otest.asl b/tests/aslts/src/runtime/common/conversion/otest.asl index 1cf19a308..1f14003b3 100644 --- a/tests/aslts/src/runtime/common/conversion/otest.asl +++ b/tests/aslts/src/runtime/common/conversion/otest.asl @@ -87,11 +87,11 @@ Method(m4a2, 1, Serialized) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, 2)) { - err(arg0, z065, 0, 0, 0, Local1, 2) + err(arg0, z065, __LINE__, 0, 0, Local1, 2) } else { Store(SizeOf(Local0), Local1) if (LNotEqual(Local1, 1)) { - err(arg0, z065, 1, 0, 0, Local1, 1) + err(arg0, z065, __LINE__, 0, 0, Local1, 1) } else { CH03(ts, z065, 0, 0, 0) Add(Local0, 0, Local7) @@ -126,11 +126,11 @@ Method(m4a4, 1, Serialized) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, 2)) { - err(arg0, z065, 2, 0, 0, Local1, 2) + err(arg0, z065, __LINE__, 0, 0, Local1, 2) } else { Store(SizeOf(Local0), Local1) if (LNotEqual(Local1, 1)) { - err(arg0, z065, 3, 0, 0, Local1, 1) + err(arg0, z065, __LINE__, 0, 0, Local1, 1) } else { CH03(ts, z065, 4, 0, 0) Add(Local0, 0, Local7) diff --git a/tests/aslts/src/runtime/common/conversion/rproc.asl b/tests/aslts/src/runtime/common/conversion/rproc.asl index 506a792cd..00bbf6c68 100644 --- a/tests/aslts/src/runtime/common/conversion/rproc.asl +++ b/tests/aslts/src/runtime/common/conversion/rproc.asl @@ -60,16 +60,16 @@ Method(m4c1, 7, Serialized) if (F64) { Store(ObjectType(Local0), tmp1) if (LNotEqual(tmp0, tmp1)) { - err(arg0, z066, 0, 0, 0, tmp0, tmp1) + err(arg0, z066, __LINE__, 0, 0, tmp0, tmp1) } elseif (LNotEqual(arg5, Local0)) { - err(arg0, z066, 1, 0, 0, arg5, Local0) + err(arg0, z066, __LINE__, 0, 0, arg5, Local0) } } else { Store(ObjectType(Local1), tmp1) if (LNotEqual(tmp0, tmp1)) { - err(arg0, z066, 2, 0, 0, tmp0, tmp1) + err(arg0, z066, __LINE__, 0, 0, tmp0, tmp1) } elseif (LNotEqual(arg5, Local1)) { - err(arg0, z066, 3, 0, 0, arg5, Local1) + err(arg0, z066, __LINE__, 0, 0, arg5, Local1) } } } else { @@ -92,16 +92,16 @@ Method(m4c1, 7, Serialized) if (F64) { Store(ObjectType(Local2), tmp1) if (LNotEqual(tmp0, tmp1)) { - err(arg0, z066, 4, 0, 0, tmp0, tmp1) + err(arg0, z066, __LINE__, 0, 0, tmp0, tmp1) } elseif (LNotEqual(arg6, Local2)) { - err(arg0, z066, 5, 0, 0, arg6, Local2) + err(arg0, z066, __LINE__, 0, 0, arg6, Local2) } } else { Store(ObjectType(Local3), tmp1) if (LNotEqual(tmp0, tmp1)) { - err(arg0, z066, 6, 0, 0, tmp0, tmp1) + err(arg0, z066, __LINE__, 0, 0, tmp0, tmp1) } elseif (LNotEqual(arg6, Local3)) { - err(arg0, z066, 7, 0, 0, arg6, Local3) + err(arg0, z066, __LINE__, 0, 0, arg6, Local3) } } } diff --git a/tests/aslts/src/runtime/common/conversion/rtest.asl b/tests/aslts/src/runtime/common/conversion/rtest.asl index f4ab588c3..16a3c584c 100644 --- a/tests/aslts/src/runtime/common/conversion/rtest.asl +++ b/tests/aslts/src/runtime/common/conversion/rtest.asl @@ -311,16 +311,16 @@ Method(m563,, Serialized) Store(ObjectType(Local0), Local2) if (LNotEqual(Local2, 2)) { - err(ts, z067, 0, 0, 0, Local2, 2) + err(ts, z067, __LINE__, 0, 0, Local2, 2) } elseif (LNotEqual(Local0, "abcdef")) { - err(ts, z067, 1, 0, 0, Local0, "abcdef") + err(ts, z067, __LINE__, 0, 0, Local0, "abcdef") } Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, 2)) { - err(ts, z067, 2, 0, 0, Local2, 2) + err(ts, z067, __LINE__, 0, 0, Local2, 2) } elseif (LNotEqual(Local1, "12345678")) { - err(ts, z067, 3, 0, 0, Local1, "12345678") + err(ts, z067, __LINE__, 0, 0, Local1, "12345678") } } @@ -519,16 +519,16 @@ Method(m564,, Serialized) Store(ObjectType(Local0), Local2) if (LNotEqual(Local2, 3)) { - err(ts, z067, 4, 0, 0, Local2, 3) + err(ts, z067, __LINE__, 0, 0, Local2, 3) } elseif (LNotEqual(Local0, b000)) { - err(ts, z067, 5, 0, 0, Local0, b000) + err(ts, z067, __LINE__, 0, 0, Local0, b000) } Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, 3)) { - err(ts, z067, 6, 0, 0, Local2, 3) + err(ts, z067, __LINE__, 0, 0, Local2, 3) } elseif (LNotEqual(Local1, b001)) { - err(ts, z067, 7, 0, 0, Local1, b001) + err(ts, z067, __LINE__, 0, 0, Local1, b001) } } @@ -1187,9 +1187,9 @@ Method(m544, 1, Serialized) Store(ObjectType(ss00), Local0) if (LNotEqual(Local0, 2)) { - err(ts, z067, 8, 0, 0, Local0, 2) + err(ts, z067, __LINE__, 0, 0, Local0, 2) } elseif (LNotEqual(ss00, "ABC")) { - err(ts, z067, 9, 0, 0, ss00, "ABC") + err(ts, z067, __LINE__, 0, 0, ss00, "ABC") } // If the string is shorter than the buffer, the buffer size is reduced. @@ -1202,11 +1202,11 @@ Method(m544, 1, Serialized) Store(SizeOf(b000), Local1) if (LNotEqual(Local0, 3)) { - err(ts, z067, 10, 0, 0, Local0, 3) + err(ts, z067, __LINE__, 0, 0, Local0, 3) } elseif (LNotEqual(Local1, 6)) { - err(ts, z067, 11, 0, 0, Local1, 6) + err(ts, z067, __LINE__, 0, 0, Local1, 6) } elseif (LNotEqual(b000, b001)) { - err(ts, z067, 12, 0, 0, b000, b001) + err(ts, z067, __LINE__, 0, 0, b000, b001) } /* diff --git a/tests/aslts/src/runtime/common/dataproc.asl b/tests/aslts/src/runtime/common/dataproc.asl index 34d8953d1..6e861d885 100644 --- a/tests/aslts/src/runtime/common/dataproc.asl +++ b/tests/aslts/src/runtime/common/dataproc.asl @@ -42,7 +42,7 @@ Method(m1a3, 5) Store(ObjectType(arg0), Local0) if (LNotEqual(Local0, arg1)) { - err("m1a3", z114, 0, arg2, arg4, Local0, arg1) + err("m1a3", z114, __LINE__, arg2, arg4, Local0, arg1) Store(0, Local7) } @@ -60,80 +60,80 @@ Method(m1a6,, Serialized) Store(ObjectType(i900), Local0) if (LNotEqual(Local0, c009)) { - err(ts, z114, 0x100, 0, 0, Local0, c009) + err(ts, z114, __LINE__, 0, 0, Local0, c009) } if (LNotEqual(i900, 0xfe7cb391d65a0000)) { - err(ts, z114, 0x101, 0, 0, i900, 0xfe7cb391d65a0000) + err(ts, z114, __LINE__, 0, 0, i900, 0xfe7cb391d65a0000) } Store(ObjectType(i901), Local0) if (LNotEqual(Local0, c009)) { - err(ts, z114, 0x102, 0, 0, Local0, c009) + err(ts, z114, __LINE__, 0, 0, Local0, c009) } if (LNotEqual(i901, 0xc1790001)) { - err(ts, z114, 0x103, 0, 0, i901, 0xc1790001) + err(ts, z114, __LINE__, 0, 0, i901, 0xc1790001) } Store(ObjectType(i902), Local0) if (LNotEqual(Local0, c009)) { - err(ts, z114, 0x104, 0, 0, Local0, c009) + err(ts, z114, __LINE__, 0, 0, Local0, c009) } if (LNotEqual(i902, 0)) { - err(ts, z114, 0x105, 0, 0, i902, 0) + err(ts, z114, __LINE__, 0, 0, i902, 0) } Store(ObjectType(i903), Local0) if (LNotEqual(Local0, c009)) { - err(ts, z114, 0x106, 0, 0, Local0, c009) + err(ts, z114, __LINE__, 0, 0, Local0, c009) } if (LNotEqual(i903, 0xffffffffffffffff)) { - err(ts, z114, 0x107, 0, 0, i903, 0xffffffffffffffff) + err(ts, z114, __LINE__, 0, 0, i903, 0xffffffffffffffff) } Store(ObjectType(i904), Local0) if (LNotEqual(Local0, c009)) { - err(ts, z114, 0x108, 0, 0, Local0, c009) + err(ts, z114, __LINE__, 0, 0, Local0, c009) } if (LNotEqual(i904, 0xffffffff)) { - err(ts, z114, 0x109, 0, 0, i904, 0xffffffff) + err(ts, z114, __LINE__, 0, 0, i904, 0xffffffff) } // String Store(ObjectType(s900), Local0) if (LNotEqual(Local0, c00a)) { - err(ts, z114, 0x10a, 0, 0, Local0, c00a) + err(ts, z114, __LINE__, 0, 0, Local0, c00a) } if (LNotEqual(s900, "12340002")) { - err(ts, z114, 0x10b, 0, 0, s900, "12340002") + err(ts, z114, __LINE__, 0, 0, s900, "12340002") } Store(ObjectType(s901), Local0) if (LNotEqual(Local0, c00a)) { - err(ts, z114, 0x10c, 0, 0, Local0, c00a) + err(ts, z114, __LINE__, 0, 0, Local0, c00a) } if (LNotEqual(s901, "qwrtyu0003")) { - err(ts, z114, 0x10d, 0, 0, s901, "qwrtyu0003") + err(ts, z114, __LINE__, 0, 0, s901, "qwrtyu0003") } // Buffer Store(ObjectType(b900), Local0) if (LNotEqual(Local0, c00b)) { - err(ts, z114, 0x10e, 0, 0, Local0, c00b) + err(ts, z114, __LINE__, 0, 0, Local0, c00b) } if (LNotEqual(b900, Buffer() {0xb0,0xb1,0xb2,0xb3,0xb4})) { - err(ts, z114, 0x10f, 0, 0, b900, Buffer() {0xb0,0xb1,0xb2,0xb3,0xb4}) + err(ts, z114, __LINE__, 0, 0, b900, Buffer() {0xb0,0xb1,0xb2,0xb3,0xb4}) } // Buffer Field Store(ObjectType(bf90), Local0) if (LNotEqual(Local0, c016)) { - err(ts, z114, 0x110, 0, 0, Local0, c016) + err(ts, z114, __LINE__, 0, 0, Local0, c016) } if (LNotEqual(bf90, 0xb0)) { - err(ts, z114, 0x111, 0, 0, bf90, 0xb0) + err(ts, z114, __LINE__, 0, 0, bf90, 0xb0) } // One level Package @@ -141,87 +141,87 @@ Method(m1a6,, Serialized) Store(Index(p900, 0), Local0) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c008)) { - err(ts, z114, 0x112, 0, 0, Local1, c008) + err(ts, z114, __LINE__, 0, 0, Local1, c008) } Store(Index(p901, 0), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c009)) { - err(ts, z114, 0x113, 0, 0, Local2, c009) + err(ts, z114, __LINE__, 0, 0, Local2, c009) } if (LNotEqual(Local1, 0xabcd0004)) { - err(ts, z114, 0x114, 0, 0, Local1, 0xabcd0004) + err(ts, z114, __LINE__, 0, 0, Local1, 0xabcd0004) } Store(Index(p901, 1), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c009)) { - err(ts, z114, 0x115, 0, 0, Local2, c009) + err(ts, z114, __LINE__, 0, 0, Local2, c009) } if (LNotEqual(Local1, 0x1122334455660005)) { - err(ts, z114, 0x116, 0, 0, Local1, 0x1122334455660005) + err(ts, z114, __LINE__, 0, 0, Local1, 0x1122334455660005) } Store(Index(p902, 0), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00a)) { - err(ts, z114, 0x117, 0, 0, Local2, c00a) + err(ts, z114, __LINE__, 0, 0, Local2, c00a) } if (LNotEqual(Local1, "12340006")) { - err(ts, z114, 0x118, 0, 0, Local1, "12340006") + err(ts, z114, __LINE__, 0, 0, Local1, "12340006") } Store(Index(p902, 1), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00a)) { - err(ts, z114, 0x119, 0, 0, Local2, c00a) + err(ts, z114, __LINE__, 0, 0, Local2, c00a) } if (LNotEqual(Local1, "q1w2e3r4t5y6u7i80007")) { - err(ts, z114, 0x11a, 0, 0, Local1, "q1w2e3r4t5y6u7i80007") + err(ts, z114, __LINE__, 0, 0, Local1, "q1w2e3r4t5y6u7i80007") } Store(Index(p903, 0), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00a)) { - err(ts, z114, 0x11b, 0, 0, Local2, c00a) + err(ts, z114, __LINE__, 0, 0, Local2, c00a) } if (LNotEqual(Local1, "qwrtyuiop0008")) { - err(ts, z114, 0x11c, 0, 0, Local1, "qwrtyuiop0008") + err(ts, z114, __LINE__, 0, 0, Local1, "qwrtyuiop0008") } Store(Index(p903, 1), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00a)) { - err(ts, z114, 0x11d, 0, 0, Local2, c00a) + err(ts, z114, __LINE__, 0, 0, Local2, c00a) } if (LNotEqual(Local1, "1234567890abdef0250009")) { - err(ts, z114, 0x11e, 0, 0, Local1, "1234567890abdef0250009") + err(ts, z114, __LINE__, 0, 0, Local1, "1234567890abdef0250009") } Store(Index(p904, 0), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00b)) { - err(ts, z114, 0x11f, 0, 0, Local2, c00b) + err(ts, z114, __LINE__, 0, 0, Local2, c00b) } if (LNotEqual(Local1, Buffer() {0xb5,0xb6,0xb7})) { - err(ts, z114, 0x120, 0, 0, Local1, Buffer() {0xb5,0xb6,0xb7}) + err(ts, z114, __LINE__, 0, 0, Local1, Buffer() {0xb5,0xb6,0xb7}) } Store(Index(p904, 1), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c00b)) { - err(ts, z114, 0x121, 0, 0, Local2, c00b) + err(ts, z114, __LINE__, 0, 0, Local2, c00b) } if (LNotEqual(Local1, Buffer() {0xb8,0xb9})) { - err(ts, z114, 0x122, 0, 0, Local1, Buffer() {0xb8,0xb9}) + err(ts, z114, __LINE__, 0, 0, Local1, Buffer() {0xb8,0xb9}) } // Two level Package @@ -232,10 +232,10 @@ Method(m1a6,, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c009)) { - err(ts, z114, 0x123, 0, 0, Local4, c009) + err(ts, z114, __LINE__, 0, 0, Local4, c009) } if (LNotEqual(Local3, 0xabc000a)) { - err(ts, z114, 0x124, 0, 0, Local3, 0xabc000a) + err(ts, z114, __LINE__, 0, 0, Local3, 0xabc000a) } Store(Index(p905, 0), Local0) @@ -244,10 +244,10 @@ Method(m1a6,, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c00a)) { - err(ts, z114, 0x125, 0, 0, Local4, c00a) + err(ts, z114, __LINE__, 0, 0, Local4, c00a) } if (LNotEqual(Local3, "0xabc000b")) { - err(ts, z114, 0x126, 0, 0, Local3, "0xabc000b") + err(ts, z114, __LINE__, 0, 0, Local3, "0xabc000b") } Store(Index(p905, 0), Local0) @@ -256,10 +256,10 @@ Method(m1a6,, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c00a)) { - err(ts, z114, 0x127, 0, 0, Local4, c00a) + err(ts, z114, __LINE__, 0, 0, Local4, c00a) } if (LNotEqual(Local3, "abc000c")) { - err(ts, z114, 0x128, 0, 0, Local3, "abc000c") + err(ts, z114, __LINE__, 0, 0, Local3, "abc000c") } Store(Index(p906, 0), Local0) @@ -268,10 +268,10 @@ Method(m1a6,, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c00a)) { - err(ts, z114, 0x129, 0, 0, Local4, c00a) + err(ts, z114, __LINE__, 0, 0, Local4, c00a) } if (LNotEqual(Local3, "abc000d")) { - err(ts, z114, 0x12a, 0, 0, Local3, "abc000d") + err(ts, z114, __LINE__, 0, 0, Local3, "abc000d") } Store(Index(p907, 0), Local0) @@ -280,10 +280,10 @@ Method(m1a6,, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c00a)) { - err(ts, z114, 0x12b, 0, 0, Local4, c00a) + err(ts, z114, __LINE__, 0, 0, Local4, c00a) } if (LNotEqual(Local3, "aqwevbgnm000e")) { - err(ts, z114, 0x12c, 0, 0, Local3, "aqwevbgnm000e") + err(ts, z114, __LINE__, 0, 0, Local3, "aqwevbgnm000e") } Store(Index(p908, 0), Local0) @@ -292,10 +292,10 @@ Method(m1a6,, Serialized) Store(DerefOf(Local2), Local3) Store(ObjectType(Local3), Local4) if (LNotEqual(Local4, c00b)) { - err(ts, z114, 0x12d, 0, 0, Local4, c00b) + err(ts, z114, __LINE__, 0, 0, Local4, c00b) } if (LNotEqual(Local3, Buffer() {0xba,0xbb,0xbc,0xbd,0xbe})) { - err(ts, z114, 0x12e, 0, 0, Local3, Buffer() {0xba,0xbb,0xbc,0xbd,0xbe}) + err(ts, z114, __LINE__, 0, 0, Local3, Buffer() {0xba,0xbb,0xbc,0xbd,0xbe}) } // Three level Package @@ -308,10 +308,10 @@ Method(m1a6,, Serialized) Store(DerefOf(Local4), Local5) Store(ObjectType(Local5), Local6) if (LNotEqual(Local6, c009)) { - err(ts, z114, 0x12f, 0, 0, Local6, c009) + err(ts, z114, __LINE__, 0, 0, Local6, c009) } if (LNotEqual(Local5, 0xabc000f)) { - err(ts, z114, 0x130, 0, 0, Local5, 0xabc000f) + err(ts, z114, __LINE__, 0, 0, Local5, 0xabc000f) } Store(Index(p90a, 0), Local0) @@ -322,10 +322,10 @@ Method(m1a6,, Serialized) Store(DerefOf(Local4), Local5) Store(ObjectType(Local5), Local6) if (LNotEqual(Local6, c00a)) { - err(ts, z114, 0x131, 0, 0, Local6, c00a) + err(ts, z114, __LINE__, 0, 0, Local6, c00a) } if (LNotEqual(Local5, "12340010")) { - err(ts, z114, 0x132, 0, 0, Local5, "12340010") + err(ts, z114, __LINE__, 0, 0, Local5, "12340010") } Store(Index(p90b, 0), Local0) @@ -336,10 +336,10 @@ Method(m1a6,, Serialized) Store(DerefOf(Local4), Local5) Store(ObjectType(Local5), Local6) if (LNotEqual(Local6, c00a)) { - err(ts, z114, 0x133, 0, 0, Local6, c00a) + err(ts, z114, __LINE__, 0, 0, Local6, c00a) } if (LNotEqual(Local5, "zxswefas0011")) { - err(ts, z114, 0x134, 0, 0, Local5, "zxswefas0011") + err(ts, z114, __LINE__, 0, 0, Local5, "zxswefas0011") } Store(Index(p90c, 0), Local0) @@ -350,10 +350,10 @@ Method(m1a6,, Serialized) Store(DerefOf(Local4), Local5) Store(ObjectType(Local5), Local6) if (LNotEqual(Local6, c00b)) { - err(ts, z114, 0x135, 0, 0, Local6, c00b) + err(ts, z114, __LINE__, 0, 0, Local6, c00b) } if (LNotEqual(Local5, Buffer() {0xbf,0xc0,0xc1})) { - err(ts, z114, 0x136, 0, 0, Local5, Buffer() {0xbf,0xc0,0xc1}) + err(ts, z114, __LINE__, 0, 0, Local5, Buffer() {0xbf,0xc0,0xc1}) } // Additional Packages @@ -364,20 +364,20 @@ Method(m1a6,, Serialized) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c009)) { - err(ts, z114, 0x137, 0, 0, Local2, c009) + err(ts, z114, __LINE__, 0, 0, Local2, c009) } if (LNotEqual(Local1, 0xabcd0018)) { - err(ts, z114, 0x138, 0, 0, Local1, 0xabcd0018) + err(ts, z114, __LINE__, 0, 0, Local1, 0xabcd0018) } Store(Index(p953, 1), Local0) Store(DerefOf(Local0), Local1) Store(ObjectType(Local1), Local2) if (LNotEqual(Local2, c009)) { - err(ts, z114, 0x139, 0, 0, Local2, c009) + err(ts, z114, __LINE__, 0, 0, Local2, c009) } if (LNotEqual(Local1, 0xabcd0019)) { - err(ts, z114, 0x13a, 0, 0, Local1, 0xabcd0019) + err(ts, z114, __LINE__, 0, 0, Local1, 0xabcd0019) } // p955 @@ -400,46 +400,46 @@ Method(m1a6,, Serialized) Store(ObjectType(f900), Local0) if (LNotEqual(Local0, c00d)) { - err(ts, z114, 0x142, 0, 0, Local0, c00d) + err(ts, z114, __LINE__, 0, 0, Local0, c00d) } Store(ObjectType(f901), Local0) if (LNotEqual(Local0, c00d)) { - err(ts, z114, 0x143, 0, 0, Local0, c00d) + err(ts, z114, __LINE__, 0, 0, Local0, c00d) } Store(ObjectType(f902), Local0) if (LNotEqual(Local0, c00d)) { - err(ts, z114, 0x144, 0, 0, Local0, c00d) + err(ts, z114, __LINE__, 0, 0, Local0, c00d) } Store(ObjectType(f903), Local0) if (LNotEqual(Local0, c00d)) { - err(ts, z114, 0x145, 0, 0, Local0, c00d) + err(ts, z114, __LINE__, 0, 0, Local0, c00d) } // Field Unit (IndexField) Store(ObjectType(if90), Local0) if (LNotEqual(Local0, c00d)) { - err(ts, z114, 0x146, 0, 0, Local0, c00d) + err(ts, z114, __LINE__, 0, 0, Local0, c00d) } Store(ObjectType(if91), Local0) if (LNotEqual(Local0, c00d)) { - err(ts, z114, 0x147, 0, 0, Local0, c00d) + err(ts, z114, __LINE__, 0, 0, Local0, c00d) } // Field Unit (BankField) Store(ObjectType(bn90), Local0) if (LNotEqual(Local0, c00d)) { - err(ts, z114, 0x148, 0, 0, Local0, c00d) + err(ts, z114, __LINE__, 0, 0, Local0, c00d) } /* * if (LNotEqual(f900, 0xd7)) { - * err(ts, z114, 0x149, 0, 0, f900, 0xd7) + * err(ts, z114, __LINE__, 0, 0, f900, 0xd7) * } * * if (LNotEqual(if90, 0xd7)) { - * err(ts, z114, 0x14a, 0, 0, if90, 0xd7) + * err(ts, z114, __LINE__, 0, 0, if90, 0xd7) * } */ } @@ -457,11 +457,11 @@ Method(m1aa, 5) Store(ObjectType(arg1), Local0) if (LNotEqual(Local0, arg2)) { - err(arg0, z114, 8, 0, arg4, Local0, arg2) + err(arg0, z114, __LINE__, 0, arg4, Local0, arg2) Store(1, Local7) } elseif (LLess(arg2, c00c)) { if (LNotEqual(arg1, arg3)) { - err(arg0, z114, 9, 0, arg4, arg1, arg3) + err(arg0, z114, __LINE__, 0, arg4, arg1, arg3) Store(1, Local7) } } @@ -561,11 +561,11 @@ Method(m1af, 4, Serialized) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c009)) { - err(ts, z114, 0x112, 0, 0, Local1, c009) + err(ts, z114, __LINE__, 0, 0, Local1, c009) } else { Store(DerefOf(Local0), Local1) if (LNotEqual(Local1, 0)) { - err(ts, z113, 0x112, 0, 0, Local1, 0) + err(ts, z113, __LINE__, 0, 0, Local1, 0) } } @@ -573,7 +573,7 @@ Method(m1af, 4, Serialized) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c009)) { - err(ts, z114, 0x112, 0, 0, Local1, c009) + err(ts, z114, __LINE__, 0, 0, Local1, c009) } else { Store(DerefOf(Local0), Local1) if (arg3) { @@ -581,7 +581,7 @@ Method(m1af, 4, Serialized) Store(Local2, Local1) } if (LNotEqual(Local1, 0xfe7cb391d65a0000)) { - err(ts, z114, 0x112, 0, 0, Local1, 0xfe7cb391d65a0000) + err(ts, z114, __LINE__, 0, 0, Local1, 0xfe7cb391d65a0000) } } @@ -589,7 +589,7 @@ Method(m1af, 4, Serialized) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c00a)) { - err(ts, z114, 0x112, 0, 0, Local1, c00a) + err(ts, z114, __LINE__, 0, 0, Local1, c00a) } else { Store(DerefOf(Local0), Local1) if (arg3) { @@ -597,7 +597,7 @@ Method(m1af, 4, Serialized) Store(Local2, Local1) } if (LNotEqual(Local1, "12340002")) { - err(ts, z114, 0x112, 0, 0, Local1, "12340002") + err(ts, z114, __LINE__, 0, 0, Local1, "12340002") } } @@ -605,7 +605,7 @@ Method(m1af, 4, Serialized) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c00b)) { - err(ts, z114, 0x112, 0, 0, Local1, c00a) + err(ts, z114, __LINE__, 0, 0, Local1, c00a) } else { Store(DerefOf(Local0), Local1) if (arg3) { @@ -613,7 +613,7 @@ Method(m1af, 4, Serialized) Store(Local2, Local1) } if (LNotEqual(Local1, Buffer() {0xb0,0xb1,0xb2,0xb3,0xb4})) { - err(ts, z114, 0x112, 0, 0, Local1, Buffer() {0xb0,0xb1,0xb2,0xb3,0xb4}) + err(ts, z114, __LINE__, 0, 0, Local1, Buffer() {0xb0,0xb1,0xb2,0xb3,0xb4}) } } @@ -630,7 +630,7 @@ Method(m1af, 4, Serialized) if (arg3) { if (LNotEqual(Local1, c00d)) { - err(ts, z114, 0x112, 0, 0, Local1, c00d) + err(ts, z114, __LINE__, 0, 0, Local1, c00d) } else { Store(DerefOf(Local7), Local6) Store(Local6, Local7) @@ -640,10 +640,10 @@ Method(m1af, 4, Serialized) Store(ObjectType(Local7), Local5) if (LNotEqual(Local5, c009)) { - err(ts, z114, 0x112, 0, 0, Local5, c009) + err(ts, z114, __LINE__, 0, 0, Local5, c009) } else { if (LNotEqual(Local7, 0)) { - err(ts, z114, 0x112, 0, 0, Local7, 0) + err(ts, z114, __LINE__, 0, 0, Local7, 0) } } } @@ -684,7 +684,7 @@ Method(m1af, 4, Serialized) if (arg3) { if (LNotEqual(Local1, c016)) { - err(ts, z114, 0x112, 0, 0, Local1, c016) + err(ts, z114, __LINE__, 0, 0, Local1, c016) } else { Store(DerefOf(Local7), Local6) Store(Local6, Local7) @@ -694,10 +694,10 @@ Method(m1af, 4, Serialized) Store(ObjectType(Local7), Local5) if (LNotEqual(Local5, c009)) { - err(ts, z114, 0x112, 0, 0, Local5, c009) + err(ts, z114, __LINE__, 0, 0, Local5, c009) } else { if (LNotEqual(Local7, 0xb0)) { - err(ts, z114, 0x112, 0, 0, Local7, 0) + err(ts, z114, __LINE__, 0, 0, Local7, 0) } } } @@ -706,11 +706,11 @@ Method(m1af, 4, Serialized) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c009)) { - err(ts, z114, 0x112, 0, 0, Local1, c009) + err(ts, z114, __LINE__, 0, 0, Local1, c009) } else { Store(DerefOf(Local0), Local1) if (LNotEqual(Local1, 15)) { - err(ts, z114, 0x112, 0, 0, Local1, 15) + err(ts, z114, __LINE__, 0, 0, Local1, 15) } } @@ -718,11 +718,11 @@ Method(m1af, 4, Serialized) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c009)) { - err(ts, z114, 0x112, 0, 0, Local1, c009) + err(ts, z114, __LINE__, 0, 0, Local1, c009) } else { Store(DerefOf(Local0), Local1) if (LNotEqual(Local1, 16)) { - err(ts, z114, 0x112, 0, 0, Local1, 16) + err(ts, z114, __LINE__, 0, 0, Local1, 16) } } @@ -730,13 +730,13 @@ Method(m1af, 4, Serialized) Store(ObjectType(Local0), Local1) if (LNotEqual(Local1, c008)) { - err(ts, z114, 0x115, 0, 0, Local1, c008) + err(ts, z114, __LINE__, 0, 0, Local1, c008) } // Evaluation of Method m936 takes place if (LNotEqual(i905, 0xabcd001a)) { - err(ts, z114, 0x116, 0, 0, i905, 0xabcd001a) + err(ts, z114, __LINE__, 0, 0, i905, 0xabcd001a) } } diff --git a/tests/aslts/src/runtime/common/datastproc.asl b/tests/aslts/src/runtime/common/datastproc.asl index aa40ee4c6..7965ae8e0 100644 --- a/tests/aslts/src/runtime/common/datastproc.asl +++ b/tests/aslts/src/runtime/common/datastproc.asl @@ -43,9 +43,9 @@ Method(m380, 4) Store(ObjectType(arg1), Local0) if (LNotEqual(Local0, c009)) { - err(arg0, z115, 0, arg2, arg3, Local0, c009) + err(arg0, z115, __LINE__, arg2, arg3, Local0, c009) } elseif (LNotEqual(arg1, 0x77)) { - err(arg0, z115, 1, arg2, arg3, arg1, 0x77) + err(arg0, z115, __LINE__, arg2, arg3, arg1, 0x77) } } @@ -58,9 +58,9 @@ Method(m381, 4) Store(ObjectType(arg1), Local0) if (LNotEqual(Local0, c00a)) { - err(arg0, z115, 2, arg2, arg3, Local0, c00a) + err(arg0, z115, __LINE__, arg2, arg3, Local0, c00a) } elseif (LNotEqual(arg1, "qwer0000")) { - err(arg0, z115, 3, arg2, arg3, arg1, "qwer0000") + err(arg0, z115, __LINE__, arg2, arg3, arg1, "qwer0000") } } @@ -73,9 +73,9 @@ Method(m382, 4) Store(ObjectType(arg1), Local0) if (LNotEqual(Local0, c00b)) { - err(arg0, z115, 4, arg2, arg3, Local0, c00b) + err(arg0, z115, __LINE__, arg2, arg3, Local0, c00b) } elseif (LNotEqual(arg1, Buffer(4) {1,0x77,3,4})) { - err(arg0, z115, 5, arg2, arg3, arg1, Buffer(4) {1,0x77,3,4}) + err(arg0, z115, __LINE__, arg2, arg3, arg1, Buffer(4) {1,0x77,3,4}) } } @@ -88,24 +88,24 @@ Method(m383, 4) Store(ObjectType(arg1), Local0) if (LNotEqual(Local0, c00c)) { - err(arg0, z115, 6, arg2, arg3, Local0, c00c) + err(arg0, z115, __LINE__, arg2, arg3, Local0, c00c) } else { Index(arg1, 0, Local0) Store(DerefOf(Local0), Local1) if (LNotEqual(Local1, 5)) { - err(arg0, z115, 7, arg2, arg3, Local1, 5) + err(arg0, z115, __LINE__, arg2, arg3, Local1, 5) } Index(arg1, 1, Local0) Store(DerefOf(Local0), Local1) if (LNotEqual(Local1, 0x77)) { - err(arg0, z115, 8, arg2, arg3, Local1, 0x77) + err(arg0, z115, __LINE__, arg2, arg3, Local1, 0x77) } Index(arg1, 2, Local0) Store(DerefOf(Local0), Local1) if (LNotEqual(Local1, 7)) { - err(arg0, z115, 9, arg2, arg3, Local1, 7) + err(arg0, z115, __LINE__, arg2, arg3, Local1, 7) } } } @@ -121,9 +121,9 @@ Method(m384, 4) Store(ObjectType(arg1), Local0) if (LNotEqual(Local0, c009)) { - err(arg0, z115, 10, arg2, arg3, Local0, c009) + err(arg0, z115, __LINE__, arg2, arg3, Local0, c009) } elseif (LNotEqual(arg1, 0x2b)) { - err(arg0, z115, 11, arg2, arg3, arg1, 0x2b) + err(arg0, z115, __LINE__, arg2, arg3, arg1, 0x2b) } } @@ -136,9 +136,9 @@ Method(m385, 4) Store(ObjectType(arg1), Local0) if (LNotEqual(Local0, c00a)) { - err(arg0, z115, 12, arg2, arg3, Local0, c00a) + err(arg0, z115, __LINE__, arg2, arg3, Local0, c00a) } elseif (LNotEqual(arg1, "q+er0000")) { - err(arg0, z115, 13, arg2, arg3, arg1, "q+er0000") + err(arg0, z115, __LINE__, arg2, arg3, arg1, "q+er0000") } } @@ -151,9 +151,9 @@ Method(m386, 4) Store(ObjectType(arg1), Local0) if (LNotEqual(Local0, c00b)) { - err(arg0, z115, 14, arg2, arg3, Local0, c00b) + err(arg0, z115, __LINE__, arg2, arg3, Local0, c00b) } elseif (LNotEqual(arg1, Buffer(4) {1,0x2b,3,4})) { - err(arg0, z115, 15, arg2, arg3, arg1, Buffer(4) {1,0x2b,3,4}) + err(arg0, z115, __LINE__, arg2, arg3, arg1, Buffer(4) {1,0x2b,3,4}) } } @@ -166,24 +166,24 @@ Method(m387, 4) Store(ObjectType(arg1), Local0) if (LNotEqual(Local0, c00c)) { - err(arg0, z115, 16, arg2, arg3, Local0, c00c) + err(arg0, z115, __LINE__, arg2, arg3, Local0, c00c) } else { Index(arg1, 0, Local0) Store(DerefOf(Local0), Local1) if (LNotEqual(Local1, 5)) { - err(arg0, z115, 17, arg2, arg3, Local1, 5) + err(arg0, z115, __LINE__, arg2, arg3, Local1, 5) } Index(arg1, 1, Local0) Store(DerefOf(Local0), Local1) if (LNotEqual(Local1, 0x2b)) { - err(arg0, z115, 18, arg2, arg3, Local1, 0x2b) + err(arg0, z115, __LINE__, arg2, arg3, Local1, 0x2b) } Index(arg1, 2, Local0) Store(DerefOf(Local0), Local1) if (LNotEqual(Local1, 7)) { - err(arg0, z115, 19, arg2, arg3, Local1, 7) + err(arg0, z115, __LINE__, arg2, arg3, Local1, 7) } } } diff --git a/tests/aslts/src/runtime/common/operations.asl b/tests/aslts/src/runtime/common/operations.asl index 825da2d4f..debe58716 100644 --- a/tests/aslts/src/runtime/common/operations.asl +++ b/tests/aslts/src/runtime/common/operations.asl @@ -416,47 +416,47 @@ Method(m480, 7, Serialized) Store(ObjectType(arg0), tmp0) if (LNotEqual(tmp0, OT00)) { - err(ts, z082, 0, 0, 0, tmp0, OT00) + err(ts, z082, __LINE__, 0, 0, tmp0, OT00) } Store(ObjectType(arg1), tmp0) if (LNotEqual(tmp0, OT01)) { - err(ts, z082, 1, 0, 0, tmp0, OT01) + err(ts, z082, __LINE__, 0, 0, tmp0, OT01) } Store(ObjectType(arg2), tmp0) if (LNotEqual(tmp0, OT02)) { - err(ts, z082, 2, 0, 0, tmp0, OT02) + err(ts, z082, __LINE__, 0, 0, tmp0, OT02) } Store(ObjectType(arg3), tmp0) if (LNotEqual(tmp0, OT03)) { - err(ts, z082, 3, 0, 0, tmp0, OT03) + err(ts, z082, __LINE__, 0, 0, tmp0, OT03) } Store(ObjectType(arg4), tmp0) if (LNotEqual(tmp0, OT04)) { - err(ts, z082, 4, 0, 0, tmp0, OT04) + err(ts, z082, __LINE__, 0, 0, tmp0, OT04) } if (res0) { Store(ObjectType(arg5), tmp0) if (LNotEqual(tmp0, OT05)) { - err(ts, z082, 5, 0, 0, tmp0, OT05) + err(ts, z082, __LINE__, 0, 0, tmp0, OT05) } } Store(ObjectType(arg6), tmp0) if (LNotEqual(tmp0, OT06)) { - err(ts, z082, 6, 0, 0, tmp0, OT06) + err(ts, z082, __LINE__, 0, 0, tmp0, OT06) } // Types of LocalX are save, and data of LocalX and ArgX are identical Store(ObjectType(Local0), tmp0) if (LNotEqual(tmp0, OT10)) { - err(ts, z082, 7, 0, 0, tmp0, OT10) + err(ts, z082, __LINE__, 0, 0, tmp0, OT10) } else { m481(ts, 8, tmp0, Local0, arg0) } Store(ObjectType(Local1), tmp0) if (LNotEqual(tmp0, OT11)) { - err(ts, z082, 9, 0, 0, tmp0, OT11) + err(ts, z082, __LINE__, 0, 0, tmp0, OT11) } else { m481(ts, 10, tmp0, Local1, arg1) } @@ -464,7 +464,7 @@ Method(m480, 7, Serialized) if (res1) { Store(ObjectType(Local2), tmp0) if (LNotEqual(tmp0, OT12)) { - err(ts, z082, 11, 0, 0, tmp0, OT12) + err(ts, z082, __LINE__, 0, 0, tmp0, OT12) } else { m481(ts, 12, tmp0, Local2, arg2) } @@ -472,38 +472,38 @@ Method(m480, 7, Serialized) Store(ObjectType(Local3), tmp0) if (LNotEqual(tmp0, OT13)) { - err(ts, z082, 13, 0, 0, tmp0, OT13) + err(ts, z082, __LINE__, 0, 0, tmp0, OT13) } else { m481(ts, 14, tmp0, Local3, arg3) } Store(ObjectType(Local4), tmp0) if (LNotEqual(tmp0, OT14)) { - err(ts, z082, 15, 0, 0, tmp0, OT14) + err(ts, z082, __LINE__, 0, 0, tmp0, OT14) } else { m481(ts, 16, tmp0, Local4, arg4) } Store(ObjectType(Local5), tmp0) if (LNotEqual(tmp0, OT15)) { - err(ts, z082, 17, 0, 0, tmp0, OT15) + err(ts, z082, __LINE__, 0, 0, tmp0, OT15) } elseif (res0) { m481(ts, 18, tmp0, Local5, arg5) } Store(ObjectType(Local6), tmp0) if (LNotEqual(tmp0, OT16)) { - err(ts, z082, 19, 0, 0, tmp0, OT16) + err(ts, z082, __LINE__, 0, 0, tmp0, OT16) } else { m481(ts, 20, tmp0, Local6, arg6) } if (res2) { if (LNotEqual(Local7, Ones)) { - err(ts, z082, 21, 0, 0, Local7, Ones) + err(ts, z082, __LINE__, 0, 0, Local7, Ones) } } elseif (res0) { Store(ObjectType(Local7), tmp0) Store(ObjectType(arg5), tmp1) if (LNotEqual(tmp0, tmp1)) { - err(ts, z082, 22, 0, 0, tmp0, tmp1) + err(ts, z082, __LINE__, 0, 0, tmp0, tmp1) } else { m481(ts, 23, tmp0, Local7, arg5) } @@ -545,19 +545,19 @@ Method(m481, 5, Serialized) switch (ToInteger (arg2)) { case (1) { if (LNotEqual(arg3, arg4)) { - err(arg0, z082, 24, 0, 0, arg1, 0) + err(arg0, z082, __LINE__, 0, 0, arg1, 0) Store(1, Local0) } } case (2) { if (LNotEqual(arg3, arg4)) { - err(arg0, z082, 25, 0, 0, arg1, 0) + err(arg0, z082, __LINE__, 0, 0, arg1, 0) Store(1, Local0) } } case (3) { if (LNotEqual(arg3, arg4)) { - err(arg0, z082, 26, 0, 0, arg1, 0) + err(arg0, z082, __LINE__, 0, 0, arg1, 0) Store(1, Local0) } } @@ -650,75 +650,75 @@ Method(m482, 7, Serialized) Store(ObjectType(arg0), tmp0) if (LNotEqual(tmp0, OT00)) { - err(ts, z082, 27, 0, 0, tmp0, OT00) + err(ts, z082, __LINE__, 0, 0, tmp0, OT00) } Store(ObjectType(arg1), tmp0) if (LNotEqual(tmp0, OT01)) { - err(ts, z082, 28, 0, 0, tmp0, OT01) + err(ts, z082, __LINE__, 0, 0, tmp0, OT01) } Store(ObjectType(arg2), tmp0) if (LNotEqual(tmp0, OT02)) { - err(ts, z082, 29, 0, 0, tmp0, OT02) + err(ts, z082, __LINE__, 0, 0, tmp0, OT02) } Store(ObjectType(arg3), tmp0) if (LNotEqual(tmp0, OT03)) { - err(ts, z082, 30, 0, 0, tmp0, OT03) + err(ts, z082, __LINE__, 0, 0, tmp0, OT03) } Store(ObjectType(arg4), tmp0) if (LNotEqual(tmp0, OT04)) { - err(ts, z082, 31, 0, 0, tmp0, OT04) + err(ts, z082, __LINE__, 0, 0, tmp0, OT04) } Store(ObjectType(arg5), tmp0) if (LNotEqual(tmp0, OT05)) { - err(ts, z082, 32, 0, 0, tmp0, OT05) + err(ts, z082, __LINE__, 0, 0, tmp0, OT05) } Store(ObjectType(arg6), tmp0) if (LNotEqual(tmp0, OT06)) { - err(ts, z082, 33, 0, 0, tmp0, OT06) + err(ts, z082, __LINE__, 0, 0, tmp0, OT06) } // Types of LocalX are save, and data of LocalX and ArgX are identical Store(ObjectType(Local0), tmp0) if (LNotEqual(tmp0, OT10)) { - err(ts, z082, 34, 0, 0, tmp0, OT10) + err(ts, z082, __LINE__, 0, 0, tmp0, OT10) } else { m481(ts, 35, tmp0, Local0, arg0) } Store(ObjectType(Local1), tmp0) if (LNotEqual(tmp0, OT11)) { - err(ts, z082, 36, 0, 0, tmp0, OT11) + err(ts, z082, __LINE__, 0, 0, tmp0, OT11) } else { m481(ts, 37, tmp0, Local1, arg1) } Store(ObjectType(Local2), tmp0) if (LNotEqual(tmp0, OT12)) { - err(ts, z082, 38, 0, 0, tmp0, OT12) + err(ts, z082, __LINE__, 0, 0, tmp0, OT12) } else { m481(ts, 39, tmp0, Local2, arg2) } Store(ObjectType(Local3), tmp0) if (LNotEqual(tmp0, OT13)) { - err(ts, z082, 40, 0, 0, tmp0, OT13) + err(ts, z082, __LINE__, 0, 0, tmp0, OT13) } else { m481(ts, 41, tmp0, Local3, arg3) } Store(ObjectType(Local4), tmp0) if (LNotEqual(tmp0, OT14)) { - err(ts, z082, 42, 0, 0, tmp0, OT14) + err(ts, z082, __LINE__, 0, 0, tmp0, OT14) } else { m481(ts, 43, tmp0, Local4, arg4) } Store(ObjectType(Local5), tmp0) if (LNotEqual(tmp0, OT15)) { - err(ts, z082, 44, 0, 0, tmp0, OT15) + err(ts, z082, __LINE__, 0, 0, tmp0, OT15) } else { m481(ts, 45, tmp0, Local5, arg5) } Store(ObjectType(Local6), tmp0) if (LNotEqual(tmp0, OT16)) { - err(ts, z082, 46, 0, 0, tmp0, OT16) + err(ts, z082, __LINE__, 0, 0, tmp0, OT16) } else { // Package is passed by arg6 // m481(ts, 47, tmp0, Local6, arg6) @@ -744,14 +744,14 @@ Method(m482, 7, Serialized) Store(0, Local3) if (LNotEqual(Local2, Local0)) { - err(ts, z082, 48, 0, 0, 0, 0) + err(ts, z082, __LINE__, 0, 0, 0, 0) Store("Expected type of result:", Debug) Store(Local0, Debug) Store("The type of obtained result:", Debug) Store(Local2, Debug) Store(1, Local3) } elseif (LNotEqual(Local7, Local1)) { - err(ts, z082, 49, 0, 0, 0, 0) + err(ts, z082, __LINE__, 0, 0, 0, 0) Store(1, Local3) } if (Local3) { |