diff options
| author | Robert Moore <Robert.Moore@intel.com> | 2013-03-07 13:58:57 -0800 |
|---|---|---|
| committer | Robert Moore <Robert.Moore@intel.com> | 2013-03-07 13:58:57 -0800 |
| commit | 85091665578f4ec2d22e51515280a892e38c7ee6 (patch) | |
| tree | e7383d6287e1cc2ccf2a760ce275cd574b488d54 /tests | |
| parent | ca5bb5c7303d04e9dab89317d64d7136fc35d971 (diff) | |
| download | acpica-85091665578f4ec2d22e51515280a892e38c7ee6.tar.gz | |
Tests/ASLTS: Fix all cases of "return value not used".
This is now an error in iASL, so must be fixed in the test suite.
Chao Guan.
Diffstat (limited to 'tests')
71 files changed, 1618 insertions, 6155 deletions
diff --git a/tests/aslts/src/runtime/collections/IMPL/ACPICA/tests/dynobj/dobexec.asl b/tests/aslts/src/runtime/collections/IMPL/ACPICA/tests/dynobj/dobexec.asl index e90be0e72..8e68b69bc 100644 --- a/tests/aslts/src/runtime/collections/IMPL/ACPICA/tests/dynobj/dobexec.asl +++ b/tests/aslts/src/runtime/collections/IMPL/ACPICA/tests/dynobj/dobexec.asl @@ -136,6 +136,8 @@ if (rn00) { // Check simple particular operations Method(m371) { + // Because Local0-7 all have been taken, we declare a new variable here. + Name(temp,0) // The Created Objects benchmark Package Name(pp00, Package(1) {}) @@ -359,7 +361,7 @@ if (rn00) { m000() _TCI(c200, Local0) - Add(3, 4) + Store(Add(3, 4), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -367,8 +369,8 @@ if (rn00) { m3a4(Local0, pp0a, Local1, pp00, 0, 0, 5) _TCI(c200, Local0) - Add(3, 4) - Add(3, 4) + Store(Add(3, 4), temp) + Store(Add(3, 4), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -379,7 +381,7 @@ if (rn00) { Store(0, lpC0) _TCI(c200, Local0) While (lpN0) { - Add(3, 4) + Store(Add(3, 4), temp) Decrement(lpN0) Increment(lpC0) } @@ -394,7 +396,7 @@ if (rn00) { Store(4, i001) _TCI(c200, Local0) - Add(i000, i001) + Store(Add(i000, i001), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -522,7 +524,7 @@ if (rn00) { m001() _TCI(c200, Local0) - And(3, 4) + Store(And(3, 4), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -563,7 +565,7 @@ if (rn00) { Store("Concatenate", Debug) _TCI(c200, Local0) - Concatenate(3, 4) + Store(Concatenate(3, 4), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -590,7 +592,7 @@ if (rn00) { m3a4(Local0, pp0a, Local1, pp00, 0, 0, 21) _TCI(c200, Local0) - Concatenate("3", "4") + Store(Concatenate("3", "4"), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -610,7 +612,7 @@ if (rn00) { Store(3, i001) _TCI(c200, Local0) - Concatenate(Buffer(i000) {3,4}, Buffer(i001) {6,7,8}) + Store(Concatenate(Buffer(i000) {3,4}, Buffer(i001) {6,7,8}), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -747,7 +749,7 @@ if (rn01) { // Investigate: why 3 objects, but not 2 _TCI(c200, Local0) - CondRefOf(i003) + Store(CondRefOf(i003), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -758,7 +760,7 @@ if (rn01) { CopyObject("sssss", s000) _TCI(c200, Local0) - CondRefOf(s000) + Store(CondRefOf(s000), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -767,8 +769,8 @@ if (rn01) { m3a4(Local0, pp0a, Local1, pp00, 0, 0, 34) _TCI(c200, Local0) - CondRefOf(i003) - CondRefOf(i003) + Store(CondRefOf(i003), temp) + Store(CondRefOf(i003), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -904,7 +906,7 @@ if (rn00) { Store(RefOf(i000), Local4) _TCI(c200, Local0) - DerefOf(Local4) + Store(DerefOf(Local4), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -931,7 +933,7 @@ if (rn01) { // Investigate: why 6 objects, but not 5 _TCI(c200, Local0) - Divide(1, 2) + Store(Divide(1, 2), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -1019,7 +1021,7 @@ if (rn00) { Store("FindSetLeftBit", Debug) _TCI(c200, Local0) - FindSetLeftBit(5) + Store(FindSetLeftBit(5), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -1027,7 +1029,7 @@ if (rn00) { m3a4(Local0, pp0a, Local1, pp00, 0, 0, 53) _TCI(c200, Local0) - FindSetLeftBit(i000) + Store(FindSetLeftBit(i000), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -1079,7 +1081,7 @@ if (rn00) { Store("FindSetRightBit", Debug) _TCI(c200, Local0) - FindSetRightBit(5) + Store(FindSetRightBit(5), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -1087,7 +1089,7 @@ if (rn00) { m3a4(Local0, pp0a, Local1, pp00, 0, 0, 59) _TCI(c200, Local0) - FindSetRightBit(i000) + Store(FindSetRightBit(i000), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -1156,7 +1158,7 @@ if (rn00) { Store("FromBCD", Debug) _TCI(c200, Local0) - FromBCD(4) + Store(FromBCD(4), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -1167,7 +1169,7 @@ if (rn00) { Store(1, i001) _TCI(c200, Local0) - FromBCD(i000) + Store(FromBCD(i000), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -1246,7 +1248,7 @@ if (rn00) { // Package _TCI(c200, Local0) - Index(p001, 1) + Store(Index(p001, 1), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -1255,7 +1257,7 @@ if (rn00) { m3a4(Local0, pp0a, Local1, pp00, 0, 0, 73) _TCI(c200, Local0) - Index(Package(16) {1,2,3,4,5,6,7,8}, 1) + Store(Index(Package(16) {1,2,3,4,5,6,7,8}, 1), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -1302,7 +1304,7 @@ if (rn00) { // Buffer _TCI(c200, Local0) - Index(b004, 1) + Store(Index(b004, 1), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -1311,7 +1313,7 @@ if (rn00) { m3a4(Local0, pp0a, Local1, pp00, 0, 0, 77) _TCI(c200, Local0) - Index(Buffer(16) {1,2,3,4,5,6,7,8}, 1) + Store(Index(Buffer(16) {1,2,3,4,5,6,7,8}, 1), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -1377,7 +1379,7 @@ if (rn00) { // String _TCI(c200, Local0) - Index(s002, 1) + Store(Index(s002, 1), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -1386,7 +1388,7 @@ if (rn00) { m3a4(Local0, pp0a, Local1, pp00, 0, 0, 82) _TCI(c200, Local0) - Index("sdrtghjkiopuiy", 1) + Store(Index("sdrtghjkiopuiy", 1), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -1441,7 +1443,7 @@ if (rn00) { Store(1, i001) _TCI(c200, Local0) - LAnd(3, 4) + Store(LAnd(3, 4), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -1449,7 +1451,7 @@ if (rn00) { m3a4(Local0, pp0a, Local1, pp00, 0, 0, 86) _TCI(c200, Local0) - LAnd(i000, i001) + Store(LAnd(i000, i001), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -1460,7 +1462,7 @@ if (rn00) { Store(1, Local5) _TCI(c200, Local0) - LAnd(Local4, Local4) + Store(LAnd(Local4, Local4), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -1471,7 +1473,7 @@ if (rn00) { Store(1, Local5) _TCI(c200, Local0) - LAnd(i000, Local5) + Store(LAnd(i000, Local5), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -1492,7 +1494,7 @@ if (rn00) { Store(1, i001) _TCI(c200, Local0) - LEqual(3, 4) + Store(LEqual(3, 4), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -1500,7 +1502,7 @@ if (rn00) { m3a4(Local0, pp0a, Local1, pp00, 0, 0, 90) _TCI(c200, Local0) - LEqual(i000, i001) + Store(LEqual(i000, i001), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -1508,7 +1510,7 @@ if (rn00) { m3a4(Local0, pp0a, Local1, pp00, 0, 0, 91) _TCI(c200, Local0) - LEqual(Local4, Local4) + Store(LEqual(Local4, Local4), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -1517,7 +1519,7 @@ if (rn00) { m3a4(Local0, pp0a, Local1, pp00, 0, 0, 92) _TCI(c200, Local0) - LEqual(i000, Local5) + Store(LEqual(i000, Local5), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -1533,7 +1535,7 @@ if (rn00) { Store("LGreater", Debug) _TCI(c200, Local0) - LGreater(3, 4) + Store(LGreater(3, 4), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -1541,7 +1543,7 @@ if (rn00) { m3a4(Local0, pp0a, Local1, pp00, 0, 0, 94) _TCI(c200, Local0) - LGreater(i000, i001) + Store(LGreater(i000, i001), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -1549,7 +1551,7 @@ if (rn00) { m3a4(Local0, pp0a, Local1, pp00, 0, 0, 95) _TCI(c200, Local0) - LGreater(Local4, Local4) + Store(LGreater(Local4, Local4), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -1558,7 +1560,7 @@ if (rn00) { m3a4(Local0, pp0a, Local1, pp00, 0, 0, 96) _TCI(c200, Local0) - LGreater(i000, Local5) + Store(LGreater(i000, Local5), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -1577,7 +1579,7 @@ if (rn01) { // those of LGreater (+1 Integer). _TCI(c200, Local0) - LGreaterEqual(3, 4) + Store(LGreaterEqual(3, 4), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -1585,7 +1587,7 @@ if (rn01) { m3a4(Local0, pp0a, Local1, pp00, 0, 0, 98) _TCI(c200, Local0) - LGreaterEqual(i000, i001) + Store(LGreaterEqual(i000, i001), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -1593,7 +1595,7 @@ if (rn01) { m3a4(Local0, pp0a, Local1, pp00, 0, 0, 99) _TCI(c200, Local0) - LGreaterEqual(Local4, Local4) + Store(LGreaterEqual(Local4, Local4), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -1602,7 +1604,7 @@ if (rn01) { m3a4(Local0, pp0a, Local1, pp00, 0, 0, 100) _TCI(c200, Local0) - LGreaterEqual(i000, Local5) + Store(LGreaterEqual(i000, Local5), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -1618,7 +1620,7 @@ if (rn00) { Store("LLess", Debug) _TCI(c200, Local0) - LLess(3, 4) + Store(LLess(3, 4), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -1626,7 +1628,7 @@ if (rn00) { m3a4(Local0, pp0a, Local1, pp00, 0, 0, 102) _TCI(c200, Local0) - LLess(i000, i001) + Store(LLess(i000, i001), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -1634,7 +1636,7 @@ if (rn00) { m3a4(Local0, pp0a, Local1, pp00, 0, 0, 103) _TCI(c200, Local0) - LLess(Local4, Local4) + Store(LLess(Local4, Local4), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -1643,7 +1645,7 @@ if (rn00) { m3a4(Local0, pp0a, Local1, pp00, 0, 0, 104) _TCI(c200, Local0) - LLess(i000, Local5) + Store(LLess(i000, Local5), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -1663,7 +1665,7 @@ if (rn01) { // identical to LGreaterEqual). _TCI(c200, Local0) - LLessEqual(3, 4) + Store(LLessEqual(3, 4), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -1671,7 +1673,7 @@ if (rn01) { m3a4(Local0, pp0a, Local1, pp00, 0, 0, 106) _TCI(c200, Local0) - LLessEqual(i000, i001) + Store(LLessEqual(i000, i001), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -1679,7 +1681,7 @@ if (rn01) { m3a4(Local0, pp0a, Local1, pp00, 0, 0, 107) _TCI(c200, Local0) - LLessEqual(Local4, Local4) + Store(LLessEqual(Local4, Local4), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -1688,7 +1690,7 @@ if (rn01) { m3a4(Local0, pp0a, Local1, pp00, 0, 0, 108) _TCI(c200, Local0) - LLessEqual(i000, Local5) + Store(LLessEqual(i000, Local5), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -1704,7 +1706,7 @@ if (rn00) { Store("LNot", Debug) _TCI(c200, Local0) - LNot(3) + Store(LNot(3), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -1712,7 +1714,7 @@ if (rn00) { m3a4(Local0, pp0a, Local1, pp00, 0, 0, 110) _TCI(c200, Local0) - LNot(i000) + Store(LNot(i000), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -1720,7 +1722,7 @@ if (rn00) { m3a4(Local0, pp0a, Local1, pp00, 0, 0, 111) _TCI(c200, Local0) - LNot(Local4) + Store(LNot(Local4), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -1740,7 +1742,7 @@ if (rn01) { // identical to LGreaterEqual). _TCI(c200, Local0) - LNotEqual(3, 4) + Store(LNotEqual(3, 4), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -1748,7 +1750,7 @@ if (rn01) { m3a4(Local0, pp0a, Local1, pp00, 0, 0, 113) _TCI(c200, Local0) - LNotEqual(i000, i001) + Store(LNotEqual(i000, i001), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -1756,7 +1758,7 @@ if (rn01) { m3a4(Local0, pp0a, Local1, pp00, 0, 0, 114) _TCI(c200, Local0) - LNotEqual(Local4, Local4) + Store(LNotEqual(Local4, Local4), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -1765,7 +1767,7 @@ if (rn01) { m3a4(Local0, pp0a, Local1, pp00, 0, 0, 115) _TCI(c200, Local0) - LNotEqual(i000, Local5) + Store(LNotEqual(i000, Local5), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -1781,7 +1783,7 @@ if (rn00) { Store("LOr", Debug) _TCI(c200, Local0) - LOr(3, 4) + Store(LOr(3, 4), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -1789,7 +1791,7 @@ if (rn00) { m3a4(Local0, pp0a, Local1, pp00, 0, 0, 117) _TCI(c200, Local0) - LOr(i000, i001) + Store(LOr(i000, i001), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -1797,7 +1799,7 @@ if (rn00) { m3a4(Local0, pp0a, Local1, pp00, 0, 0, 118) _TCI(c200, Local0) - LOr(Local4, Local4) + Store(LOr(Local4, Local4), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -1806,7 +1808,7 @@ if (rn00) { m3a4(Local0, pp0a, Local1, pp00, 0, 0, 119) _TCI(c200, Local0) - LOr(i000, Local5) + Store(LOr(i000, Local5), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -1827,7 +1829,7 @@ if (rn00) { Store(1, i001) _TCI(c200, Local0) - Match(Package(8) {1,2,3,4,5,6,7,8}, MTR, 2, MTR, 3, 0) + Store(Match(Package(8) {1,2,3,4,5,6,7,8}, MTR, 2, MTR, 3, 0), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -1836,7 +1838,7 @@ if (rn00) { m3a4(Local0, pp0a, Local1, pp00, 0, 0, 121) _TCI(c200, Local0) - Match(Package(i001) {1,2,3,4,5,6,7,8}, MTR, i000, MTR, Local4, Local4) + Store(Match(Package(i001) {1,2,3,4,5,6,7,8}, MTR, i000, MTR, Local4, Local4), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -1846,7 +1848,7 @@ if (rn00) { m3a4(Local0, pp0a, Local1, pp00, 0, 0, 122) _TCI(c200, Local0) - Match(p002, MTR, i000, MTR, Local4, Local4) + Store(Match(p002, MTR, i000, MTR, Local4, Local4), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -1862,7 +1864,7 @@ if (rn00) { Store("Mid", Debug) _TCI(c200, Local0) - Mid("asdfghjk", 0, 1) + Store(Mid("asdfghjk", 0, 1), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -1931,7 +1933,7 @@ if (rn00) { Store("Mod", Debug) _TCI(c200, Local0) - Mod(3, 4) + Store(Mod(3, 4), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -1972,7 +1974,7 @@ if (rn00) { Store("Multiply", Debug) _TCI(c200, Local0) - Multiply(3, 4) + Store(Multiply(3, 4), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -2006,7 +2008,7 @@ if (rn00) { Store("NAnd", Debug) _TCI(c200, Local0) - NAnd(3, 4) + Store(NAnd(3, 4), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -2038,7 +2040,7 @@ if (rn00) { Store("NOr", Debug) _TCI(c200, Local0) - NOr(3, 4) + Store(NOr(3, 4), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -2070,7 +2072,7 @@ if (rn00) { Store("Not", Debug) _TCI(c200, Local0) - Not(3) + Store(Not(3), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -2129,7 +2131,7 @@ if (rn00) { Store("ObjectType", Debug) _TCI(c200, Local0) - ObjectType(i000) + Store(ObjectType(i000), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -2139,7 +2141,7 @@ if (rn00) { Store(Package(1){}, Local4) _TCI(c200, Local0) - ObjectType(Local4) + Store(ObjectType(Local4), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -2155,7 +2157,7 @@ if (rn00) { Store("Or", Debug) _TCI(c200, Local0) - Or(3, 4) + Store(Or(3, 4), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -2193,7 +2195,7 @@ if (rn00) { Store("RefOf", Debug) _TCI(c200, Local0) - RefOf(i000) + Store(RefOf(i000), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -2203,7 +2205,7 @@ if (rn00) { Store(1, Local4) _TCI(c200, Local0) - RefOf(Local4) + Store(RefOf(Local4), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -2248,7 +2250,7 @@ if (rn00) { Store("ShiftLeft", Debug) _TCI(c200, Local0) - ShiftLeft(3, 4) + Store(ShiftLeft(3, 4), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -2290,7 +2292,7 @@ if (rn00) { Store("ShiftRight", Debug) _TCI(c200, Local0) - ShiftRight(3, 4) + Store(ShiftRight(3, 4), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -2350,7 +2352,7 @@ if (rn00) { Store(Package(9) {}, Local4) _TCI(c200, Local0) - SizeOf(Local4) + Store(SizeOf(Local4), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -2359,7 +2361,7 @@ if (rn00) { m3a4(Local0, pp0a, Local1, pp00, 0, 0, 161) _TCI(c200, Local0) - SizeOf(b000) + Store(SizeOf(b000), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -2583,7 +2585,7 @@ if (rn00) { Store("Subtract", Debug) _TCI(c200, Local0) - Subtract(3, 4) + Store(Subtract(3, 4), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -2591,8 +2593,8 @@ if (rn00) { m3a4(Local0, pp0a, Local1, pp00, 0, 0, 178) _TCI(c200, Local0) - Subtract(3, 4) - Subtract(3, 4) + Store(Subtract(3, 4), temp) + Store(Subtract(3, 4), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -2604,7 +2606,7 @@ if (rn00) { Store(0, lpC0) _TCI(c200, Local0) While (lpN0) { - Subtract(3, 4) + Store(Subtract(3, 4), temp) Decrement(lpN0) Increment(lpC0) } @@ -2619,7 +2621,7 @@ if (rn00) { Store(4, i001) _TCI(c200, Local0) - Subtract(i000, i001) + Store(Subtract(i000, i001), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -2667,7 +2669,7 @@ if (rn00) { Store("ToBCD", Debug) _TCI(c200, Local0) - ToBCD(3) + Store(ToBCD(3), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -2716,7 +2718,7 @@ if (rn00) { Store("ToBuffer", Debug) _TCI(c200, Local0) - ToBuffer(3) + Store(ToBuffer(3), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -2804,7 +2806,7 @@ if (rn00) { Store("ToDecimalString", Debug) _TCI(c200, Local0) - ToDecimalString(3) + Store(ToDecimalString(3), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -2875,7 +2877,7 @@ if (rn00) { Store("ToHexString", Debug) _TCI(c200, Local0) - ToHexString(3) + Store(ToHexString(3), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -2949,7 +2951,7 @@ if (rn01) { // Investigate: why only 2 objects, but not 3 _TCI(c200, Local0) - ToInteger(3) + Store(ToInteger(3), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -2993,7 +2995,7 @@ if (rn01) { // See: there are created all the expected 3 objects _TCI(c200, Local0) - ToInteger("0xaaaa") + Store(ToInteger("0xaaaa"), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -3037,7 +3039,7 @@ if (rn01) { m3a4(Local0, pp0a, Local1, pp00, pp01, 0, 213) _TCI(c200, Local0) - ToInteger(Buffer(9){1,2,3,4,5,6,7,8,9}) + Store(ToInteger(Buffer(9){1,2,3,4,5,6,7,8,9}), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -3058,7 +3060,7 @@ if (rn02) { // Error: 1 Integer is not deleted _TCI(c200, Local0) - ToString(2) + Store(ToString(2), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) @@ -3200,7 +3202,7 @@ if (rn00) { Store("XOr", Debug) _TCI(c200, Local0) - XOr(3, 4) + Store(XOr(3, 4), temp) _TCI(c201, pp0a) m3a3(Local0, pp0a, Local1) Store(m3a8(), pp00) diff --git a/tests/aslts/src/runtime/collections/IMPL/ACPICA/tests/dynobj/dobmisc.asl b/tests/aslts/src/runtime/collections/IMPL/ACPICA/tests/dynobj/dobmisc.asl index ddae36196..e5efb98f8 100644 --- a/tests/aslts/src/runtime/collections/IMPL/ACPICA/tests/dynobj/dobmisc.asl +++ b/tests/aslts/src/runtime/collections/IMPL/ACPICA/tests/dynobj/dobmisc.asl @@ -66,7 +66,7 @@ Method(m375) /* to be implemented, now arbitrary operation only */ - Add(0, 1) + Store(Add(0, 1), Local2) // Use NamedX for _TCI-begin statistics Package // not to touch the LOCAL_REFERENCE entry. 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 aab10c9f8..8700ebe74 100644 --- a/tests/aslts/src/runtime/collections/Identity2MS/abbu/MsFail/msfail.asl +++ b/tests/aslts/src/runtime/collections/Identity2MS/abbu/MsFail/msfail.asl @@ -131,7 +131,7 @@ Method(mf02) Name(s000, "qwertyuiop") Name(s001, "_sdfghjkl") - LEqual("qwerty", "sdfghj") + Store(LEqual("qwerty", "sdfghj"), Local3) if (chk0) { /* This LNotEqual breaks */ @@ -333,7 +333,7 @@ Method(mf08) CreateField(b000, 0, 8, bf00) // Doesn't work - LNotEqual(bf00, 0x80) + Store(LNotEqual(bf00, 0x80), Local3) if (chk0) { @@ -341,11 +341,11 @@ Method(mf08) Store(bf00, Local0) // Doesn't work (!) too: - LNotEqual(Local0, 0x80) + Store(LNotEqual(Local0, 0x80), Local3) // Doesn't work (!) too: Store(Local0, Local1) - LNotEqual(Local1, 0x80) + Store(LNotEqual(Local1, 0x80), Local3) // Works if (pr) { @@ -789,7 +789,7 @@ Method(mf11) Name(b000, Buffer(4) {0x10, 0x11, 0x12, 0x13}) Name(b001, Buffer(4) {0x10, 0x11, 0x12, 0x13}) - LEqual(b000, b001) + Store(LEqual(b000, b001), Local3) Return(POUT) } @@ -1213,7 +1213,7 @@ Method(mf18) Name(s000, "qwertyuiop") Name(s001, "qwertyuiop") - LEqual(s000, s001) + Store(LEqual(s000, s001), Local3) if (chk0) { Store(LEqual(s000, s001), Local0) @@ -1236,7 +1236,7 @@ Method(mf19) Name(b000, Buffer(4) {0x10, 0x11, 0x12, 0x13}) Name(b001, Buffer(4) {0x10, 0x11, 0x12, 0x13}) - LEqual(b000, b001) + Store(LEqual(b000, b001), Local3) if (chk0) { Store(LEqual(b000, b001), Local0) @@ -1283,7 +1283,7 @@ Method(mf1b) Name(s000, "12345678") Name(s001, "56789012") - Add(s000, s001) + Store(Add(s000, s001), Local3) if (chk0) { Store(Add(s000, s001), Local0) @@ -1306,7 +1306,7 @@ Method(mf1c) Name(b000, Buffer(4) {0x10, 0x11, 0x12, 0x13}) Name(b001, Buffer(4) {0x24, 0x35, 0x46, 0x57}) - Add(b000, b001) + Store(Add(b000, b001), Local3) if (chk0) { Store(Add(b000, b001), Local0) @@ -1331,7 +1331,7 @@ Method(mf1d) Store(0xabcd0000, f000) - LEqual(f000, 0xabcd0000) + Store(LEqual(f000, 0xabcd0000), Local3) Store(LEqual(f000, 0xabcd0000), Local0) if (LNot(Local0)) { @@ -1408,7 +1408,7 @@ Method(mf20) Store(0xabcd0000, f000) - Add(f000, 0x12) + Store(Add(f000, 0x12), Local3) Store(Add(f000, 0x12), Local0) if (LNotEqual(Local0, 0xabcd0012)) { 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 e6ebdde1d..0ce8a22fb 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 @@ -98,15 +98,15 @@ Method(in50) NAnd (Local0, Local1, Local2) NOr (Local0, Local1, Local2) Not (Local0, Local2) - LNot (Local0) - LOr (Local0, Local1) - LAnd (Local0, Local1) - LEqual (Local0, Local1) - LGreater (Local0, Local1) - LGreaterEqual (Local0, Local1) - LLess (Local0, Local1) - LLessEqual (Local0, Local1) - LNotEqual (Local0, Local1) + Store(LNot (Local0), Local4) + Store(LOr (Local0, Local1), Local4) + Store(LAnd (Local0, Local1), Local4) + Store(LEqual (Local0, Local1), Local4) + Store(LGreater (Local0, Local1), Local4) + Store(LGreaterEqual (Local0, Local1), Local4) + Store(LLess (Local0, Local1), Local4) + Store(LLessEqual (Local0, Local1), Local4) + Store(LNotEqual (Local0, Local1), Local4) } /* 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 c86ab8a77..d9b8816fe 100644 --- a/tests/aslts/src/runtime/collections/Identity2MS/abbu/misc/ms1.asl +++ b/tests/aslts/src/runtime/collections/Identity2MS/abbu/misc/ms1.asl @@ -200,10 +200,10 @@ Method(ms11, 1, Serialized) OUTP("Name(i000, 0x89abcdef)") if (arg0) { - Derefof(i000) + Store(Derefof(i000), Local0) CH04(ts, 0, 0xff, z179, 0x004, 0, 0) } else { - Derefof(Refof(i000)) + Store(Derefof(Refof(i000)), Local0) CH03(ts, z179, 0x005, 0, 0) } } @@ -221,7 +221,7 @@ Method(ms11, 1, Serialized) Store(Refof(i000), Local0) OUTP("Store(Refof(i000), Local0)") } - Derefof(Local0) + Store(Derefof(Local0), Local1) if (arg0) { CH04(ts, 0, 0xff, z179, 0x006, 0, 0) } else { @@ -1105,20 +1105,20 @@ Method(ms18) Store(Index(p000, 0, Local0), Local1) - Derefof(Local0) + Store(Derefof(Local0), Local4) CH03(ts, z179, 0x04b, 0, 0) - Derefof(Local1) + Store(Derefof(Local1), Local4) CH03(ts, z179, 0x04c, 0, 0) OUTP("CopyObject(Index(p000, 0, Local2), Local3):") CopyObject(Index(p000, 0, Local2), Local3) - Derefof(Local2) + Store(Derefof(Local2), Local4) CH03(ts, z179, 0x04d, 0, 0) - Derefof(Local3) + Store(Derefof(Local3), Local4) CH03(ts, z179, 0x04e, 0, 0) } @@ -2229,7 +2229,7 @@ Method(ms23, 1, Serialized) Method(m001) { if (fl00) { - Add (0xabcd, 0) + Store(Add (0xabcd, 0), Local1) } elseif (0) { return (1) } @@ -2250,7 +2250,7 @@ Method(ms23, 1, Serialized) Method(m001) { if (fl00) { - Add (0xabcd, 0) + Store(Add (0xabcd, 0), Local1) } else { return (1) } 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 1849552d7..8af13cb7a 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0004/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0004/DECL.asl @@ -34,7 +34,7 @@ Method(md9f, 1) { - Concatenate("qwertyuiop", arg0) + Concatenate("qwertyuiop", arg0, Local1) } Method(mda0) 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 95056c71f..1cd78800f 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0007/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0007/DECL.asl @@ -38,7 +38,7 @@ Method(mda4) Store(0, Local0) - ToString(B000, Local0) + ToString(B000, Local0, Local1) if (LNotequal(Local0, 0)) { err("", zFFF, 0x000, 0, 0, Local0, 0) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0012/DataLevel10.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0012/DataLevel10.asl index c1fa5908d..3781f973a 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0012/DataLevel10.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0012/DataLevel10.asl @@ -320,31 +320,31 @@ Method(mf8e) CH03("", 0, 0x04a, 0, 0) - DerefOf("b006") + Store(DerefOf("b006"), Local2) - DerefOf(Local0) + Store(DerefOf(Local0), Local2) - DerefOf(Local7) + Store(DerefOf(Local7), Local2) - DerefOf(s006) - DerefOf(s006) - DerefOf(s006) - DerefOf(s006) - DerefOf(s006) - DerefOf(s006) - DerefOf(s006) - DerefOf(s006) - DerefOf(s006) + Store(DerefOf(s006), Local2) + Store(DerefOf(s006), Local2) + Store(DerefOf(s006), Local2) + Store(DerefOf(s006), Local2) + Store(DerefOf(s006), Local2) + Store(DerefOf(s006), Local2) + Store(DerefOf(s006), Local2) + Store(DerefOf(s006), Local2) + Store(DerefOf(s006), Local2) - DerefOf(mm60()) + Store(DerefOf(mm60()), Local2) - DerefOf(mm61(ss06)) + Store(DerefOf(mm61(ss06)), Local2) - DerefOf(ToString("b006")) + Store(DerefOf(ToString("b006")), Local2) - DerefOf(Store("b006", Local6)) + Store(DerefOf(Store("b006", Local6)), Local2) - DerefOf(i006) + Store(DerefOf(i006), Local2) CH03("", 0, 0x04b, 0, 0) } @@ -365,31 +365,31 @@ Method(mf8f) // Checkings CH03("", 0, 0x04c, 0, 0) - DerefOf("e007") + Store(DerefOf("e007"), Local2) CH03("", 0, 0x04d, 0, 0) CH03("", 0, 0x04e, 0, 0) - DerefOf("mx07") + Store(DerefOf("mx07"), Local2) CH03("", 0, 0x04f, 0, 0) CH03("", 0, 0x050, 0, 0) - DerefOf("d007") + Store(DerefOf("d007"), Local2) CH03("", 0, 0x051, 0, 0) CH03("", 0, 0x052, 0, 0) - DerefOf("tz07") + Store(DerefOf("tz07"), Local2) CH03("", 0, 0x053, 0, 0) CH03("", 0, 0x054, 0, 0) - DerefOf("pr07") + Store(DerefOf("pr07"), Local2) CH03("", 0, 0x055, 0, 0) CH03("", 0, 0x056, 0, 0) - DerefOf("r007") + Store(DerefOf("r007"), Local2) CH03("", 0, 0x057, 0, 0) CH03("", 0, 0x058, 0, 0) - DerefOf("pw07") + Store(DerefOf("pw07"), Local2) CH03("", 0, 0x059, 0, 0) } @@ -405,15 +405,15 @@ Method(mf90) // Checkings CH03("", 0, 0x05a, 0, 0) - DerefOf(b008) + Store(DerefOf(b008), Local2) CH04("", 0, 0xff, 0, 0x05b, 0, 0) CH03("", 0, 0x05c, 0, 0) - DerefOf(i008) + Store(DerefOf(i008), Local2) CH04("", 0, 0xff, 0, 0x05d, 0, 0) CH03("", 0, 0x05e, 0, 0) - DerefOf(p008) + Store(DerefOf(p008), Local2) CH04("", 0, 0xff, 0, 0x05f, 0, 0) } @@ -423,19 +423,19 @@ Method(mf90) Method(mf91) { CH03("", 0, 0x060, 0, 0) - DerefOf("0123") + Store(DerefOf("0123"), Local2) CH04("", 0, 0xff, 0, 0x061, 0, 0) CH03("", 0, 0x062, 0, 0) - DerefOf("zxcvbnm,./;'\][0123") + Store(DerefOf("zxcvbnm,./;'\][0123"), Local2) CH04("", 0, 0xff, 0, 0x063, 0, 0) CH03("", 0, 0x064, 0, 0) - DerefOf("mf_d") + Store(DerefOf("mf_d"), Local2) CH04("", 0, 0xff, 0, 0x065, 0, 0) CH03("", 0, 0x066, 0, 0) - DerefOf("b009") + Store(DerefOf("b009"), Local2) CH04("", 0, 0xff, 0, 0x067, 0, 0) } @@ -539,31 +539,31 @@ Method(mfa2) // Checkings CH03("", 0, 0x08a, 0, 0) - DerefOf(e00c) + Store(DerefOf(e00c), Local2) CH04("", 0, 0xff, 0, 0x08b, 0, 0) CH03("", 0, 0x08c, 0, 0) - DerefOf(mx0c) + Store(DerefOf(mx0c), Local2) CH04("", 0, 0xff, 0, 0x08d, 0, 0) CH03("", 0, 0x08e, 0, 0) - DerefOf(d00c) + Store(DerefOf(d00c), Local2) CH04("", 0, 0xff, 0, 0x08f, 0, 0) CH03("", 0, 0x090, 0, 0) - DerefOf(tz0c) + Store(DerefOf(tz0c), Local2) CH04("", 0, 0xff, 0, 0x091, 0, 0) CH03("", 0, 0x092, 0, 0) - DerefOf(pr0c) + Store(DerefOf(pr0c), Local2) CH04("", 0, 0xff, 0, 0x093, 0, 0) CH03("", 0, 0x094, 0, 0) - DerefOf(r00c) + Store(DerefOf(r00c), Local2) CH04("", 0, 0xff, 0, 0x095, 0, 0) CH03("", 0, 0x096, 0, 0) - DerefOf(pw0c) + Store(DerefOf(pw0c), Local2) CH04("", 0, 0xff, 0, 0x097, 0, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0012/DataLevel20.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0012/DataLevel20.asl index 75c6e513d..241033467 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0012/DataLevel20.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0012/DataLevel20.asl @@ -323,31 +323,31 @@ Method(mf8e) CH03("", 0, 0x04a, 0, 0) - DerefOf("b006") + Store(DerefOf("b006"), Local2) - DerefOf(Local0) + Store(DerefOf(Local0), Local2) - DerefOf(Local7) + Store(DerefOf(Local7), Local2) - DerefOf(s006) - DerefOf(s006) - DerefOf(s006) - DerefOf(s006) - DerefOf(s006) - DerefOf(s006) - DerefOf(s006) - DerefOf(s006) - DerefOf(s006) + Store(DerefOf(s006), Local2) + Store(DerefOf(s006), Local2) + Store(DerefOf(s006), Local2) + Store(DerefOf(s006), Local2) + Store(DerefOf(s006), Local2) + Store(DerefOf(s006), Local2) + Store(DerefOf(s006), Local2) + Store(DerefOf(s006), Local2) + Store(DerefOf(s006), Local2) - DerefOf(mm60()) + Store(DerefOf(mm60()), Local2) - DerefOf(mm61(ss06)) + Store(DerefOf(mm61(ss06)), Local2) - DerefOf(ToString("b006")) + Store(DerefOf(ToString("b006")), Local2) - DerefOf(Store("b006", Local6)) + Store(DerefOf(Store("b006", Local6)), Local2) - DerefOf(i006) + Store(DerefOf(i006), Local2) CH03("", 0, 0x04b, 0, 0) } @@ -368,31 +368,31 @@ Method(mf8f) // Checkings CH03("", 0, 0x04c, 0, 0) - DerefOf("e007") + Store(DerefOf("e007"), Local2) CH03("", 0, 0x04d, 0, 0) CH03("", 0, 0x04e, 0, 0) - DerefOf("mx07") + Store(DerefOf("mx07"), Local2) CH03("", 0, 0x04f, 0, 0) CH03("", 0, 0x050, 0, 0) - DerefOf("d007") + Store(DerefOf("d007"), Local2) CH03("", 0, 0x051, 0, 0) CH03("", 0, 0x052, 0, 0) - DerefOf("tz07") + Store(DerefOf("tz07"), Local2) CH03("", 0, 0x053, 0, 0) CH03("", 0, 0x054, 0, 0) - DerefOf("pr07") + Store(DerefOf("pr07"), Local2) CH03("", 0, 0x055, 0, 0) CH03("", 0, 0x056, 0, 0) - DerefOf("r007") + Store(DerefOf("r007"), Local2) CH03("", 0, 0x057, 0, 0) CH03("", 0, 0x058, 0, 0) - DerefOf("pw07") + Store(DerefOf("pw07"), Local2) CH03("", 0, 0x059, 0, 0) } @@ -408,15 +408,15 @@ Method(mf90) // Checkings CH03("", 0, 0x05a, 0, 0) - DerefOf(b008) + Store(DerefOf(b008), Local2) CH04("", 0, 0xff, 0, 0x05b, 0, 0) CH03("", 0, 0x05c, 0, 0) - DerefOf(i008) + Store(DerefOf(i008), Local2) CH04("", 0, 0xff, 0, 0x05d, 0, 0) CH03("", 0, 0x05e, 0, 0) - DerefOf(p008) + Store(DerefOf(p008), Local2) CH04("", 0, 0xff, 0, 0x05f, 0, 0) } @@ -426,19 +426,19 @@ Method(mf90) Method(mf91) { CH03("", 0, 0x060, 0, 0) - DerefOf("0123") + Store(DerefOf("0123"), Local2) CH04("", 0, 0xff, 0, 0x061, 0, 0) CH03("", 0, 0x062, 0, 0) - DerefOf("zxcvbnm,./;'\][0123") + Store(DerefOf("zxcvbnm,./;'\][0123"), Local2) CH04("", 0, 0xff, 0, 0x063, 0, 0) CH03("", 0, 0x064, 0, 0) - DerefOf("mf_d") + Store(DerefOf("mf_d"), Local2) CH04("", 0, 0xff, 0, 0x065, 0, 0) CH03("", 0, 0x066, 0, 0) - DerefOf("b009") + Store(DerefOf("b009"), Local2) CH04("", 0, 0xff, 0, 0x067, 0, 0) } @@ -542,31 +542,31 @@ Method(mfa2) // Checkings CH03("", 0, 0x08a, 0, 0) - DerefOf(e00c) + Store(DerefOf(e00c), Local2) CH04("", 0, 0xff, 0, 0x08b, 0, 0) CH03("", 0, 0x08c, 0, 0) - DerefOf(mx0c) + Store(DerefOf(mx0c), Local2) CH04("", 0, 0xff, 0, 0x08d, 0, 0) CH03("", 0, 0x08e, 0, 0) - DerefOf(d00c) + Store(DerefOf(d00c), Local2) CH04("", 0, 0xff, 0, 0x08f, 0, 0) CH03("", 0, 0x090, 0, 0) - DerefOf(tz0c) + Store(DerefOf(tz0c), Local2) CH04("", 0, 0xff, 0, 0x091, 0, 0) CH03("", 0, 0x092, 0, 0) - DerefOf(pr0c) + Store(DerefOf(pr0c), Local2) CH04("", 0, 0xff, 0, 0x093, 0, 0) CH03("", 0, 0x094, 0, 0) - DerefOf(r00c) + Store(DerefOf(r00c), Local2) CH04("", 0, 0xff, 0, 0x095, 0, 0) CH03("", 0, 0x096, 0, 0) - DerefOf(pw0c) + Store(DerefOf(pw0c), Local2) CH04("", 0, 0xff, 0, 0x097, 0, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0012/DataLevel21_DeclDown.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0012/DataLevel21_DeclDown.asl index 7be88f19b..df4ae2951 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0012/DataLevel21_DeclDown.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0012/DataLevel21_DeclDown.asl @@ -237,31 +237,31 @@ Method(mf8e) CH03("", 0, 0x04a, 0, 0) - DerefOf("b006") + Store(DerefOf("b006"), Local2) - DerefOf(Local0) + Store(DerefOf(Local0), Local2) - DerefOf(Local7) + Store(DerefOf(Local7), Local2) - DerefOf(s006) - DerefOf(s006) - DerefOf(s006) - DerefOf(s006) - DerefOf(s006) - DerefOf(s006) - DerefOf(s006) - DerefOf(s006) - DerefOf(s006) + Store(DerefOf(s006), Local2) + Store(DerefOf(s006), Local2) + Store(DerefOf(s006), Local2) + Store(DerefOf(s006), Local2) + Store(DerefOf(s006), Local2) + Store(DerefOf(s006), Local2) + Store(DerefOf(s006), Local2) + Store(DerefOf(s006), Local2) + Store(DerefOf(s006), Local2) - DerefOf(mm60()) + Store(DerefOf(mm60()), Local2) - DerefOf(mm61(ss06)) + Store(DerefOf(mm61(ss06)), Local2) - DerefOf(ToString("b006")) + Store(DerefOf(ToString("b006")), Local2) - DerefOf(Store("b006", Local6)) + Store(DerefOf(Store("b006", Local6)), Local2) - DerefOf(i006) + Store(DerefOf(i006), Local2) CH03("", 0, 0x04b, 0, 0) } @@ -274,31 +274,31 @@ Method(mf8f) // Checkings CH03("", 0, 0x04c, 0, 0) - DerefOf("e007") + Store(DerefOf("e007"), Local2) CH03("", 0, 0x04d, 0, 0) CH03("", 0, 0x04e, 0, 0) - DerefOf("mx07") + Store(DerefOf("mx07"), Local2) CH03("", 0, 0x04f, 0, 0) CH03("", 0, 0x050, 0, 0) - DerefOf("d007") + Store(DerefOf("d007"), Local2) CH03("", 0, 0x051, 0, 0) CH03("", 0, 0x052, 0, 0) - DerefOf("tz07") + Store(DerefOf("tz07"), Local2) CH03("", 0, 0x053, 0, 0) CH03("", 0, 0x054, 0, 0) - DerefOf("pr07") + Store(DerefOf("pr07"), Local2) CH03("", 0, 0x055, 0, 0) CH03("", 0, 0x056, 0, 0) - DerefOf("r007") + Store(DerefOf("r007"), Local2) CH03("", 0, 0x057, 0, 0) CH03("", 0, 0x058, 0, 0) - DerefOf("pw07") + Store(DerefOf("pw07"), Local2) CH03("", 0, 0x059, 0, 0) } @@ -310,15 +310,15 @@ Method(mf90) // Checkings CH03("", 0, 0x05a, 0, 0) - DerefOf(b008) + Store(DerefOf(b008), Local2) CH04("", 0, 0xff, 0, 0x05b, 0, 0) CH03("", 0, 0x05c, 0, 0) - DerefOf(i008) + Store(DerefOf(i008), Local2) CH04("", 0, 0xff, 0, 0x05d, 0, 0) CH03("", 0, 0x05e, 0, 0) - DerefOf(p008) + Store(DerefOf(p008), Local2) CH04("", 0, 0xff, 0, 0x05f, 0, 0) } @@ -328,19 +328,19 @@ Method(mf90) Method(mf91) { CH03("", 0, 0x060, 0, 0) - DerefOf("0123") + Store(DerefOf("0123"), Local2) CH04("", 0, 0xff, 0, 0x061, 0, 0) CH03("", 0, 0x062, 0, 0) - DerefOf("zxcvbnm,./;'\][0123") + Store(DerefOf("zxcvbnm,./;'\][0123"), Local2) CH04("", 0, 0xff, 0, 0x063, 0, 0) CH03("", 0, 0x064, 0, 0) - DerefOf("mf_d") + Store(DerefOf("mf_d"), Local2) CH04("", 0, 0xff, 0, 0x065, 0, 0) CH03("", 0, 0x066, 0, 0) - DerefOf("b009") + Store(DerefOf("b009"), Local2) CH04("", 0, 0xff, 0, 0x067, 0, 0) } @@ -420,31 +420,31 @@ Method(mfa2) // Checkings CH03("", 0, 0x08a, 0, 0) - DerefOf(e00c) + Store(DerefOf(e00c), Local2) CH04("", 0, 0xff, 0, 0x08b, 0, 0) CH03("", 0, 0x08c, 0, 0) - DerefOf(mx0c) + Store(DerefOf(mx0c), Local2) CH04("", 0, 0xff, 0, 0x08d, 0, 0) CH03("", 0, 0x08e, 0, 0) - DerefOf(d00c) + Store(DerefOf(d00c), Local2) CH04("", 0, 0xff, 0, 0x08f, 0, 0) CH03("", 0, 0x090, 0, 0) - DerefOf(tz0c) + Store(DerefOf(tz0c), Local2) CH04("", 0, 0xff, 0, 0x091, 0, 0) CH03("", 0, 0x092, 0, 0) - DerefOf(pr0c) + Store(DerefOf(pr0c), Local2) CH04("", 0, 0xff, 0, 0x093, 0, 0) CH03("", 0, 0x094, 0, 0) - DerefOf(r00c) + Store(DerefOf(r00c), Local2) CH04("", 0, 0xff, 0, 0x095, 0, 0) CH03("", 0, 0x096, 0, 0) - DerefOf(pw0c) + Store(DerefOf(pw0c), Local2) CH04("", 0, 0xff, 0, 0x097, 0, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0012/DataLevel21_DeclUp.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0012/DataLevel21_DeclUp.asl index 6fff120de..f68972e5f 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0012/DataLevel21_DeclUp.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0012/DataLevel21_DeclUp.asl @@ -365,31 +365,31 @@ Method(mf8e) CH03("", 0, 0x04a, 0, 0) - DerefOf("b006") + Store(DerefOf("b006"), Local2) - DerefOf(Local0) + Store(DerefOf(Local0), Local2) - DerefOf(Local7) + Store(DerefOf(Local7), Local2) - DerefOf(s006) - DerefOf(s006) - DerefOf(s006) - DerefOf(s006) - DerefOf(s006) - DerefOf(s006) - DerefOf(s006) - DerefOf(s006) - DerefOf(s006) + Store(DerefOf(s006), Local2) + Store(DerefOf(s006), Local2) + Store(DerefOf(s006), Local2) + Store(DerefOf(s006), Local2) + Store(DerefOf(s006), Local2) + Store(DerefOf(s006), Local2) + Store(DerefOf(s006), Local2) + Store(DerefOf(s006), Local2) + Store(DerefOf(s006), Local2) - DerefOf(mm60()) + Store(DerefOf(mm60()), Local2) - DerefOf(mm61(ss06)) + Store(DerefOf(mm61(ss06)), Local2) - DerefOf(ToString("b006")) + Store(DerefOf(ToString("b006")), Local2) - DerefOf(Store("b006", Local6)) + Store(DerefOf(Store("b006", Local6)), Local2) - DerefOf(i006) + Store(DerefOf(i006), Local2) CH03("", 0, 0x04b, 0, 0) } @@ -402,31 +402,31 @@ Method(mf8f) // Checkings CH03("", 0, 0x04c, 0, 0) - DerefOf("e007") + Store(DerefOf("e007"), Local2) CH03("", 0, 0x04d, 0, 0) CH03("", 0, 0x04e, 0, 0) - DerefOf("mx07") + Store(DerefOf("mx07"), Local2) CH03("", 0, 0x04f, 0, 0) CH03("", 0, 0x050, 0, 0) - DerefOf("d007") + Store(DerefOf("d007"), Local2) CH03("", 0, 0x051, 0, 0) CH03("", 0, 0x052, 0, 0) - DerefOf("tz07") + Store(DerefOf("tz07"), Local2) CH03("", 0, 0x053, 0, 0) CH03("", 0, 0x054, 0, 0) - DerefOf("pr07") + Store(DerefOf("pr07"), Local2) CH03("", 0, 0x055, 0, 0) CH03("", 0, 0x056, 0, 0) - DerefOf("r007") + Store(DerefOf("r007"), Local2) CH03("", 0, 0x057, 0, 0) CH03("", 0, 0x058, 0, 0) - DerefOf("pw07") + Store(DerefOf("pw07"), Local2) CH03("", 0, 0x059, 0, 0) } @@ -438,15 +438,15 @@ Method(mf90) // Checkings CH03("", 0, 0x05a, 0, 0) - DerefOf(b008) + Store(DerefOf(b008), Local2) CH04("", 0, 0xff, 0, 0x05b, 0, 0) CH03("", 0, 0x05c, 0, 0) - DerefOf(i008) + Store(DerefOf(i008), Local2) CH04("", 0, 0xff, 0, 0x05d, 0, 0) CH03("", 0, 0x05e, 0, 0) - DerefOf(p008) + Store(DerefOf(p008), Local2) CH04("", 0, 0xff, 0, 0x05f, 0, 0) } @@ -456,19 +456,19 @@ Method(mf90) Method(mf91) { CH03("", 0, 0x060, 0, 0) - DerefOf("0123") + Store(DerefOf("0123"), Local2) CH04("", 0, 0xff, 0, 0x061, 0, 0) CH03("", 0, 0x062, 0, 0) - DerefOf("zxcvbnm,./;'\][0123") + Store(DerefOf("zxcvbnm,./;'\][0123"), Local2) CH04("", 0, 0xff, 0, 0x063, 0, 0) CH03("", 0, 0x064, 0, 0) - DerefOf("mf_d") + Store(DerefOf("mf_d"), Local2) CH04("", 0, 0xff, 0, 0x065, 0, 0) CH03("", 0, 0x066, 0, 0) - DerefOf("b009") + Store(DerefOf("b009"), Local2) CH04("", 0, 0xff, 0, 0x067, 0, 0) } @@ -548,31 +548,31 @@ Method(mfa2) // Checkings CH03("", 0, 0x08a, 0, 0) - DerefOf(e00c) + Store(DerefOf(e00c), Local2) CH04("", 0, 0xff, 0, 0x08b, 0, 0) CH03("", 0, 0x08c, 0, 0) - DerefOf(mx0c) + Store(DerefOf(mx0c), Local2) CH04("", 0, 0xff, 0, 0x08d, 0, 0) CH03("", 0, 0x08e, 0, 0) - DerefOf(d00c) + Store(DerefOf(d00c), Local2) CH04("", 0, 0xff, 0, 0x08f, 0, 0) CH03("", 0, 0x090, 0, 0) - DerefOf(tz0c) + Store(DerefOf(tz0c), Local2) CH04("", 0, 0xff, 0, 0x091, 0, 0) CH03("", 0, 0x092, 0, 0) - DerefOf(pr0c) + Store(DerefOf(pr0c), Local2) CH04("", 0, 0xff, 0, 0x093, 0, 0) CH03("", 0, 0x094, 0, 0) - DerefOf(r00c) + Store(DerefOf(r00c), Local2) CH04("", 0, 0xff, 0, 0x095, 0, 0) CH03("", 0, 0x096, 0, 0) - DerefOf(pw0c) + Store(DerefOf(pw0c), Local2) CH04("", 0, 0xff, 0, 0x097, 0, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0040/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0040/DECL.asl index 1340f0191..7277b034f 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0040/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0040/DECL.asl @@ -34,7 +34,7 @@ Method(mdd0) { Mutex(MTX0, 0) - Acquire(MTX0, 0) + Store(Acquire(MTX0, 0), Local0) Release(MTX0) } 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 19582b46e..d1a8ca81d 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0041/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0041/DECL.asl @@ -36,7 +36,7 @@ Method(mdd2) { Store(0, Local0) Store(Local0, Debug) - ToInteger(Local0) + Store(ToInteger(Local0), Local1) Store(Local0, Debug) Add(Local0, 1, Local7) if (LNotEqual(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 3838127bd..a9e101535 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0042/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0042/DECL.asl @@ -36,7 +36,7 @@ Method(mdd3) { Store("0", Local0) Store(Local0, Debug) - ToDecimalString(Local0) + Store(ToDecimalString(Local0), Local2) Store(Local0, Debug) Add(Local0, 1, Local7) if (LNotEqual(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 0cc351fb2..b65425a40 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0043/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0043/DECL.asl @@ -36,7 +36,7 @@ Method(mdd4) { Store("a", Local0) Store(Local0, Debug) - ToHexString(Local0) + Store(ToHexString(Local0), Local1) Store(Local0, Debug) Add(Local0, 1, Local7) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0048/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0048/DECL.asl index a0123a325..32578505a 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0048/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0048/DECL.asl @@ -45,7 +45,7 @@ Method(mdd8) CH03("", 0, 0x000, 0, 0) - Concatenate(Local0, Local1) + Store(Concatenate(Local0, Local1), Local2) /* * No restriction on the length of String objects now: diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0060/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0060/DECL.asl index b1aea5e64..ecd8da331 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0060/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0060/DECL.asl @@ -50,7 +50,7 @@ Method(mdfa) Store(1, f001) Store(2, f002) - Add(f001, f002) + Store(Add(f001, f002), Local0) } // Outstanding: 0x1 allocations after execution @@ -65,31 +65,31 @@ Method(mdfb) Store(1, f001) Store(2, f002) - Add(f001, f002) + Store(Add(f001, f002), Local0) } // No outstanding allocations Method(mdfc) { - Add(1, 2) + Store(Add(1, 2), Local0) } // Outstanding: 0x1 allocations after execution Method(mdfd) { - Add(1, "2") + Store(Add(1, "2"), Local0) } // Outstanding: 0x1 allocations after execution Method(mdfe) { - Add("1", 2) + Store(Add("1", 2), Local0) } // Outstanding: 0x2 allocations after execution Method(mdff) { - Add("1", "2") + Store(Add("1", "2"), Local0) } // Outstanding: 0x1 allocations after execution @@ -97,7 +97,7 @@ Method(me00) { Name(b000, Buffer() {0x91}) - Add(b000, 2) + Store(Add(b000, 2), Local0) } Method(me01) 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 23f22303e..61fae6492 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0063/Misc.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0063/Misc.asl @@ -328,7 +328,7 @@ Method(md74) { CH03(ts, zFFF, 0x109, 0, 0) // Only decimal, much more than 16 - Add("123456789012345601112223334446667788990087654", 0) + Store(Add("123456789012345601112223334446667788990087654", 0), Local1) if (F64) { if (LNotEqual(Local0, 0x1234567890123456)) { err("", zFFF, 0x025, 0, 0, Local0, 0x1234567890123456) @@ -342,7 +342,7 @@ Method(md74) { CH03(ts, zFFF, 0x10a, 0, 0) // Only hex, much more than 16 - Add("abcdefabcdefabcdefabcdefabcdefabcdefabcdefabc", 0) + Store(Add("abcdefabcdefabcdefabcdefabcdefabcdefabcdefabc", 0), Local1) if (F64) { if (LNotEqual(Local0, 0xabcdefabcdefabcd)) { err("", zFFF, 0x027, 0, 0, Local0, 0xabcdefabcdefabcd) @@ -356,7 +356,7 @@ Method(md74) { CH03(ts, zFFF, 0x10b, 0, 0) // Only decimal, much more than 16, non-hex at the end - Add("123456789012345601112223334446667788990087654ZZZZ", 0) + Store(Add("123456789012345601112223334446667788990087654ZZZZ", 0), Local1) if (F64) { if (LNotEqual(Local0, 0x1234567890123456)) { err("", zFFF, 0x029, 0, 0, Local0, 0x1234567890123456) @@ -370,7 +370,7 @@ Method(md74) { CH03(ts, zFFF, 0x10c, 0, 0) // Only hex, much more than 16, non-hex at the end - Add("abcdefabcdefabcdefabcdefabcdefabcdefabcdefabcZZZZ", 0) + Store(Add("abcdefabcdefabcdefabcdefabcdefabcdefabcdefabcZZZZ", 0), Local1) if (F64) { if (LNotEqual(Local0, 0xabcdefabcdefabcd)) { err("", zFFF, 0x02b, 0, 0, Local0, 0xabcdefabcdefabcd) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0077/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0077/DECL.asl index b363f54ff..5b7fa4a7c 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0077/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0077/DECL.asl @@ -38,11 +38,11 @@ CH03("", 0, 0x000, 0, 0) - ToInteger("0") // AE_BAD_DECIMAL_CONSTANT + Store(ToInteger("0"), Local0) // AE_BAD_DECIMAL_CONSTANT - ToInteger("0x0") // AE_BAD_HEX_CONSTANT + Store(ToInteger("0x0"), Local0) // AE_BAD_HEX_CONSTANT - Add("0", 1) // AE_BAD_HEX_CONSTANT + Store(Add("0", 1), Local0) // AE_BAD_HEX_CONSTANT Store("0", i000) // AE_BAD_HEX_CONSTANT diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0078/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0078/DECL.asl index 400544046..38a68d392 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0078/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0078/DECL.asl @@ -34,7 +34,7 @@ Method(me2b) { - Derefof(Refof(id0b)) + Store(Derefof(Refof(id0b)), Local0) Store(id0b, Debug) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0079/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0079/DECL.asl index dcf60f051..4040cfa20 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0079/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0079/DECL.asl @@ -36,6 +36,6 @@ { Store(0, Local0) - ToBuffer("1234567") + Store(ToBuffer("1234567"), Local1) Store(ToBuffer("1234567"), Local0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0083/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0083/DECL.asl index 82a5c6d5f..432b96c12 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0083/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0083/DECL.asl @@ -63,77 +63,77 @@ // Expected exception for each DerefOf below CH03("", 0, 0x000, 0, 0) - DerefOf(i000) + Store(DerefOf(i000), Local0) CH04("", 0, 0xff, 0, 0x001, 0, 0) CH03("", 0, 0x000, 0, 0) - DerefOf(b000) + Store(DerefOf(b000), Local0) CH04("", 0, 0xff, 0, 0x001, 0, 0) CH03("", 0, 0x000, 0, 0) - DerefOf(p000) + Store(DerefOf(p000), Local0) CH04("", 0, 0xff, 0, 0x001, 0, 0) CH03("", 0, 0x000, 0, 0) - DerefOf(d000) + Store(DerefOf(d000), Local0) CH04("", 0, 0xff, 0, 0x001, 0, 0) CH03("", 0, 0x000, 0, 0) - DerefOf(e000) + Store(DerefOf(e000), Local0) CH04("", 0, 0xff, 0, 0x001, 0, 0) CH03("", 0, 0x000, 0, 0) - DerefOf(mx00) + Store(DerefOf(mx00), Local0) CH04("", 0, 0xff, 0, 0x001, 0, 0) CH03("", 0, 0x000, 0, 0) - DerefOf(tz00) + Store(DerefOf(tz00), Local0) CH04("", 0, 0xff, 0, 0x001, 0, 0) CH03("", 0, 0x000, 0, 0) - DerefOf(pr00) + Store(DerefOf(pr00), Local0) CH04("", 0, 0xff, 0, 0x001, 0, 0) CH03("", 0, 0x000, 0, 0) - DerefOf(pw00) + Store(DerefOf(pw00), Local0) CH04("", 0, 0xff, 0, 0x001, 0, 0) CH03("", 0, 0x000, 0, 0) - DerefOf(r000) + Store(DerefOf(r000), Local0) CH04("", 0, 0xff, 0, 0x001, 0, 0) CH03("", 0, 0x000, 0, 0) - DerefOf(bf90) + Store(DerefOf(bf90), Local0) CH04("", 0, 0xff, 0, 0x001, 0, 0) CH03("", 0, 0x000, 0, 0) - DerefOf(f900) + Store(DerefOf(f900), Local0) CH04("", 0, 0xff, 0, 0x001, 0, 0) CH03("", 0, 0x000, 0, 0) - DerefOf(f901) + Store(DerefOf(f901), Local0) CH04("", 0, 0xff, 0, 0x001, 0, 0) CH03("", 0, 0x000, 0, 0) - DerefOf(f902) + Store(DerefOf(f902), Local0) CH04("", 0, 0xff, 0, 0x001, 0, 0) CH03("", 0, 0x000, 0, 0) - DerefOf(f903) + Store(DerefOf(f903), Local0) CH04("", 0, 0xff, 0, 0x001, 0, 0) CH03("", 0, 0x000, 0, 0) - DerefOf(bn90) + Store(DerefOf(bn90), Local0) CH04("", 0, 0xff, 0, 0x001, 0, 0) CH03("", 0, 0x000, 0, 0) - DerefOf(if90) + Store(DerefOf(if90), Local0) CH04("", 0, 0xff, 0, 0x001, 0, 0) CH03("", 0, 0x000, 0, 0) - DerefOf(if91) + Store(DerefOf(if91), Local0) CH04("", 0, 0xff, 0, 0x001, 0, 0) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0085/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0085/DECL.asl index fcd8500d1..b52427547 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0085/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0085/DECL.asl @@ -41,12 +41,12 @@ Name(p000, Package(1){}) - DeRefOf(Index(p000, 0)) + Store(DeRefOf(Index(p000, 0)), Local1) Index(p000, 0, Local0) Store(Local0, Debug) - DeRefOf(Local0) + Store(DeRefOf(Local0), Local1) Index(p000, 0, Local0) @@ -62,7 +62,7 @@ // Ref #2 Store(arg0, Debug) - DeRefOf(arg0) + Store(DeRefOf(arg0), Local1) } else { Increment(DeRefOf(arg0)) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0086/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0086/DECL.asl index 992623cc4..3ad179a96 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0086/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0086/DECL.asl @@ -37,38 +37,38 @@ if (0) { // 1 Outstanding allocation - ToString("qwrtyu") + Store(ToString("qwrtyu"), Local0) } elseif (0) { // 6 Outstanding allocations - ToString("qwrtyu") - ToString("qwrtyu") - ToString("qwrtyu") - ToString("qwrtyu") - ToString("qwrtyu") - ToString("qwrtyu") + Store(ToString("qwrtyu"), Local0) + Store(ToString("qwrtyu"), Local0) + Store(ToString("qwrtyu"), Local0) + Store(ToString("qwrtyu"), Local0) + Store(ToString("qwrtyu"), Local0) + Store(ToString("qwrtyu"), Local0) } else { // 17 Outstanding allocations - ToString("qwrtyu") - ToString("qwrtyu") - ToString("qwrtyu") - ToString("qwrtyu") - ToString("qwrtyu") - ToString("qwrtyu") - ToString("qwrtyu") - ToString("qwrtyu") - ToString("qwrtyu") - ToString("qwrtyu") - ToString("qwrtyu") - ToString("qwrtyu") - ToString("qwrtyu") - ToString("qwrtyu") - ToString("qwrtyu") - ToString("qwrtyu") - ToString("qwrtyu") + Store(ToString("qwrtyu"), Local0) + Store(ToString("qwrtyu"), Local0) + Store(ToString("qwrtyu"), Local0) + Store(ToString("qwrtyu"), Local0) + Store(ToString("qwrtyu"), Local0) + Store(ToString("qwrtyu"), Local0) + Store(ToString("qwrtyu"), Local0) + Store(ToString("qwrtyu"), Local0) + Store(ToString("qwrtyu"), Local0) + Store(ToString("qwrtyu"), Local0) + Store(ToString("qwrtyu"), Local0) + Store(ToString("qwrtyu"), Local0) + Store(ToString("qwrtyu"), Local0) + Store(ToString("qwrtyu"), Local0) + Store(ToString("qwrtyu"), Local0) + Store(ToString("qwrtyu"), Local0) + Store(ToString("qwrtyu"), Local0) } } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0113/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0113/DECL.asl index c0d7d2df9..0da9b187d 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0113/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0113/DECL.asl @@ -44,32 +44,32 @@ Store("Test 0", Debug) CH03("", 0, 0x000, 0, 0) - Add(arg0, 1) + Store(Add(arg0, 1), Local5) CH04("", 0, 47, 0, 0x001, 0, 0) // AE_AML_OPERAND_TYPE Store("Test 1", Debug) CH03("", 0, 0x002, 0, 0) - Add(arg1, 1) + Store(Add(arg1, 1), Local5) CH04("", 0, 47, 0, 0x003, 0, 0) // AE_AML_OPERAND_TYPE Store("Test 2", Debug) CH03("", 0, 0x004, 0, 0) - Add(arg2, 1) + Store(Add(arg2, 1), Local5) CH04("", 0, 47, 0, 0x005, 0, 0) // AE_AML_OPERAND_TYPE Store("Test 3", Debug) CH03("", 0, 0x006, 0, 0) - Add(arg3, 1) + Store(Add(arg3, 1), Local5) CH04("", 0, 47, 0, 0x007, 0, 0) // AE_AML_OPERAND_TYPE Store("Test 4", Debug) CH03("", 0, 0x008, 0, 0) - Add(arg4, 1) + Store(Add(arg4, 1), Local5) CH04("", 0, 47, 0, 0x009, 0, 0) // AE_AML_OPERAND_TYPE Store("Test 5", Debug) CH03("", 0, 0x00a, 0, 0) - Add(arg5, 1) + Store(Add(arg5, 1), Local5) CH04("", 0, 47, 0, 0x00b, 0, 0) // AE_AML_OPERAND_TYPE } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0124/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0124/DECL.asl index 3ce0cb330..a31cac10e 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0124/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0124/DECL.asl @@ -42,15 +42,15 @@ // c) Modulo(Index, 0x100000000) < Size. CH03("", 0, 0x000, 0, 0) - Index(p000, 0x100000001) + Store(Index(p000, 0x100000001), Local0) CH04("", 0, 55, 0, 0x001, 0, 0) // AE_AML_PACKAGE_LIMIT CH03("", 0, 0x002, 0, 0) - Index(b000, 0x100000002) + Store(Index(b000, 0x100000002), Local0) CH04("", 0, 54, 0, 0x003, 0, 0) // AE_AML_BUFFER_LIMIT CH03("", 0, 0x004, 0, 0) - Index(s000, 0x100000003) + Store(Index(s000, 0x100000003), Local0) CH04("", 0, 61, 0, 0x005, 0, 0) // AE_AML_STRING_LIMIT } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0127/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0127/DECL.asl index 0123390cd..22f871556 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0127/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0127/DECL.asl @@ -40,21 +40,21 @@ Store(Index(pd11, 0, Local0), Local1) CH03("", 0, 0x000, 0, 0) - Add(Local0, 0) + Store(Add(Local0, 0), Local2) CH04("", 0, 47, 0, 0x001, 0, 0) // AE_AML_OPERAND_TYPE CH03("", 0, 0x002, 0, 0) - Add(Local1, 0) + Store(Add(Local1, 0), Local2) CH04("", 0, 47, 0, 0x003, 0, 0) // AE_AML_OPERAND_TYPE Store(Index(pd11, 1, Local0), Local1) CH03("", 0, 0x004, 0, 0) - Add(Local0, 0) + Store(Add(Local0, 0), Local2) CH04("", 0, 47, 0, 0x005, 0, 0) // AE_AML_OPERAND_TYPE CH03("", 0, 0x006, 0, 0) - Add(Local1, 0) + Store(Add(Local1, 0), Local2) CH04("", 0, 47, 0, 0x007, 0, 0) // AE_AML_OPERAND_TYPE } @@ -65,11 +65,11 @@ CopyObject(Index(pd11, 0, Local0), Local1) CH03("", 0, 0x008, 0, 0) - Add(Local0, 0) + Store(Add(Local0, 0), Local2) CH04("", 0, 47, 0, 0x009, 0, 0) // AE_AML_OPERAND_TYPE CH03("", 0, 0x00a, 0, 0) - Add(Local1, 0) + Store(Add(Local1, 0), Local2) CH04("", 0, 47, 0, 0x00b, 0, 0) // AE_AML_OPERAND_TYPE } @@ -80,11 +80,11 @@ CopyObject(Index(pd11, 1, Local0), Local1) CH03("", 0, 0x00d, 0, 0) - Add(Local0, 0) + Store(Add(Local0, 0), Local2) CH04("", 0, 47, 0, 0x00e, 0, 0) // AE_AML_OPERAND_TYPE CH03("", 0, 0x00f, 0, 0) - Add(Local1, 0) + Store(Add(Local1, 0), Local2) CH04("", 0, 47, 0, 0x010, 0, 0) // AE_AML_OPERAND_TYPE } 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 d8bfba830..242085c3b 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0139/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0139/DECL.asl @@ -63,7 +63,7 @@ Store("DeRefof(Local0)" , Debug) - DeRefof(Local0) + Store(DeRefof(Local0), Local1) if (LNotEqual(id1c, 0xfedcba9876543211)) { err("", zFFF, 0x003, 0, 0, id1c, 0xfedcba9876543211) 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 f33c6b715..4e29880fa 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0151/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0151/DECL.asl @@ -47,7 +47,7 @@ // 1. - Concatenate(b000, b001) + Store(Concatenate(b000, b001), Local1) Store("Ok: Concatenate(<Default empty buffer>, ...)", Debug) Concatenate(b000, b001, Local0) @@ -62,7 +62,7 @@ Store(Sizeof(Local0), Debug) Store("Try: Concatenate(<Mid empty buffer result object>, ...)", Debug) - Concatenate(Local0, b001) + Store(Concatenate(Local0, b001), Local1) Store("Ok: Concatenate(<Mid empty buffer result object>, ...)", Debug) Concatenate(Local0, b001, Local0) @@ -84,7 +84,7 @@ // 3. - Concatenate(s000, s001) + Store(Concatenate(s000, s001), Local1) Store("Ok: Concatenate(<Default empty string>, ...)", Debug) Concatenate(s000, s001, Local0) @@ -99,7 +99,7 @@ Store(Sizeof(Local0), Debug) Store("Try: Concatenate(<Mid empty string result object>, ...)", Debug) - Concatenate(Local0, s001) + Store(Concatenate(Local0, s001), Local1) Store("Ok: Concatenate(<Mid empty string result object>, ...)", Debug) Concatenate(Local0, s001, Local0) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0177/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0177/DECL.asl index 4d2bde147..101907689 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0177/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0177/DECL.asl @@ -51,21 +51,21 @@ // Named CH03("", 0, 0x000, 0, 0) - Index(p000, 2) + Store(Index(p000, 2), Local1) CH04("", 0, 55, 0, 0x001, 0, 0) // AE_AML_PACKAGE_LIMIT CH03("", 0, 0x002, 0, 0) - Index(b000, 3) + Store(Index(b000, 3), Local1) CH04("", 0, 54, 0, 0x003, 0, 0) // AE_AML_BUFFER_LIMIT CH03("", 0, 0x004, 0, 0) - Index(s000, 4) + Store(Index(s000, 4), Local1) CH04("", 0, 61, 0, 0x005, 0, 0) // AE_AML_STRING_LIMIT // Immediate CH03("", 0, 0x006, 0, 0) - Index(Package(2){0, 1}, 2) + Store(Index(Package(2){0, 1}, 2), Local1) if (y900) { CH04("", 0, 55, 0, 0x007, 0, 0) // AE_AML_PACKAGE_LIMIT } else { @@ -73,7 +73,7 @@ } CH03("", 0, 0x009, 0, 0) - Index(Buffer(3){2, 3, 4}, 3) + Store(Index(Buffer(3){2, 3, 4}, 3), Local1) if (y900) { CH04("", 0, 54, 0, 0x00a, 0, 0) // AE_AML_BUFFER_LIMIT } else { @@ -81,7 +81,7 @@ } CH03("", 0, 0x00c, 0, 0) - Index("5678", 4) + Store(Index("5678", 4), Local1) if (y900) { CH04("", 0, 61, 0, 0x00d, 0, 0) // AE_AML_STRING_LIMIT } else { diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0189/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0189/DECL.asl index b340d939f..bf02561ac 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0189/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0189/DECL.asl @@ -40,13 +40,13 @@ Method(mf7d) CH03("", 0, 0x000, 0, 0) - ConcatenateResTemplate(RT00, Local0) + Store(ConcatenateResTemplate(RT00, Local0), Local1) CH04("", 0, 0xff, 0, 0x001, 0, 0) Store(Buffer(){0x78}, Local0) - ConcatenateResTemplate(RT00, Local0) + Store(ConcatenateResTemplate(RT00, Local0), Local1) CH04("", 0, 0xff, 0, 0x002, 0, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0190/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0190/DECL.asl index 458623ede..6251c189a 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0190/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0190/DECL.asl @@ -42,7 +42,7 @@ Method(mf7e) CH03("", 0, 0x000, 0, 0) - ConcatenateResTemplate(RT00, Local0) + Store(ConcatenateResTemplate(RT00, Local0), Local1) CH04("", 0, 0xff, 0, 0x001, 0, 0) } diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0199/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0199/DECL.asl index 87f32f573..646c0cd76 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0199/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0199/DECL.asl @@ -39,15 +39,15 @@ Method(mfb2) Name(p000, Package() {1,2,3,4}) CH03("", 0, 0x000, 0, 0) - DerefOf(b000) + Store(DerefOf(b000), Local0) CH04("", 0, 47, 0, 0x001, 0, 0) // AE_AML_OPERAND_TYPE CH03("", 0, 0x002, 0, 0) - DerefOf(i000) + Store(DerefOf(i000), Local0) CH04("", 0, 47, 0, 0x003, 0, 0) // AE_AML_OPERAND_TYPE CH03("", 0, 0x004, 0, 0) - DerefOf(p000) + Store(DerefOf(p000), Local0) CH04("", 0, 47, 0, 0x005, 0, 0) // AE_AML_OPERAND_TYPE } @@ -62,30 +62,30 @@ Method(mfb3) PowerResource(pw00, 1, 0) {Method(mmmm){return (0)}} CH03("", 0, 0x006, 0, 0) - DerefOf(e000) + Store(DerefOf(e000), Local0) CH04("", 0, 47, 0, 0x007, 0, 0) // AE_AML_OPERAND_TYPE CH03("", 0, 0x008, 0, 0) - DerefOf(mx00) + Store(DerefOf(mx00), Local0) CH04("", 0, 47, 0, 0x009, 0, 0) // AE_AML_OPERAND_TYPE CH03("", 0, 0x00a, 0, 0) - DerefOf(d000) + Store(DerefOf(d000), Local0) CH04("", 0, 47, 0, 0x00b, 0, 0) // AE_AML_OPERAND_TYPE CH03("", 0, 0x00c, 0, 0) - DerefOf(tz00) + Store(DerefOf(tz00), Local0) CH04("", 0, 47, 0, 0x00d, 0, 0) // AE_AML_OPERAND_TYPE CH03("", 0, 0x00e, 0, 0) - DerefOf(pr00) + Store(DerefOf(pr00), Local0) CH04("", 0, 47, 0, 0x00f, 0, 0) // AE_AML_OPERAND_TYPE CH03("", 0, 0x010, 0, 0) - DerefOf(r000) + Store(DerefOf(r000), Local0) CH04("", 0, 47, 0, 0x011, 0, 0) // AE_AML_OPERAND_TYPE CH03("", 0, 0x012, 0, 0) - DerefOf(pw00) + Store(DerefOf(pw00), Local0) CH04("", 0, 47, 0, 0x013, 0, 0) // AE_AML_OPERAND_TYPE } 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 e72a8bc90..ac4a299dd 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 @@ -57,7 +57,7 @@ Method(m1e7) Store(RefOf(p000), Local2) // L0(0x004d5ec8, 0x123), L2 (0x004d5dc8, res of RefOf) Store(DerefOf(Local2), Local3) Store("Sit 1: Local2 contains bad object there!!!!!", Debug) - LAnd(0xabcd0000, 0xabcd0001) + Store(LAnd(0xabcd0000, 0xabcd0001), Local5) Decrement(Local0) // L0(0x004d5ec8, 0x123), L2 (0x004d5dc8, 0xCACA) Store("============================== 0", Debug) Store(Local0, Debug) diff --git a/tests/aslts/src/runtime/collections/complex/misc/misc.asl b/tests/aslts/src/runtime/collections/complex/misc/misc.asl index a21ef7b25..87bcddebe 100644 --- a/tests/aslts/src/runtime/collections/complex/misc/misc.asl +++ b/tests/aslts/src/runtime/collections/complex/misc/misc.asl @@ -63,7 +63,7 @@ Method(m110, 1, Serialized) // Concatenate operator affects the object passed as Source2 parameter Method(m111, 1) { - Concatenate("qwertyuiop", arg0) + Store(Concatenate("qwertyuiop", arg0), Local5) } Method(m112, 1) @@ -75,7 +75,7 @@ Method(m112, 1) } Store(0, Local0) - Concatenate("qwertyuiop", Local0) + Store(Concatenate("qwertyuiop", Local0), Local5) if (LNotequal(Local0, 0)) { err(arg0, z054, 2, 0, 0, Local0, 0) } @@ -339,7 +339,7 @@ Method(m11c, 1) CH03(ts, z054, 0x103, 0, 0) - Add( Buffer() {0x79}, Buffer() {0x79} ) + Store(Add( Buffer() {0x79}, Buffer() {0x79} ), Local5) CH03(ts, z054, 0x104, 0, 0) } 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 acb7bbcc0..4606605f4 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 @@ -11817,13 +11817,13 @@ Method(m617) CH03(arg0, z121, 0, 0, 0) - Index(m601(2, 6), arg1) + Store(Index(m601(2, 6), arg1), Local3) CH04(arg0, 0, 85, z121, 9, 0, 0) // AE_INDEX_TO_NOT_ATTACHED - Index(m601(3, 6), arg1) + Store(Index(m601(3, 6), arg1), Local3) CH04(arg0, 0, 85, z121, 10, 0, 0) // AE_INDEX_TO_NOT_ATTACHED - Index(m601(4, 0), arg1) + Store(Index(m601(4, 0), arg1), Local3) CH04(arg0, 0, 85, z121, 11, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } 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 2d0edd4ec..a432a91db 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 @@ -12262,13 +12262,13 @@ Method(m610) CH03(arg0, z085, 0, 0, 0) - Index(m601(2, 6), "B") + Store(Index(m601(2, 6), "B"), Local3) CH04(arg0, 0, 85, z085, 9, 0, 0) // AE_INDEX_TO_NOT_ATTACHED - Index(m601(3, 6), "B") + Store(Index(m601(3, 6), "B"), Local3) CH04(arg0, 0, 85, z085, 10, 0, 0) // AE_INDEX_TO_NOT_ATTACHED - Index(m601(4, 0), "B") + Store(Index(m601(4, 0), "B"), Local3) CH04(arg0, 0, 85, z085, 11, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } @@ -24200,13 +24200,13 @@ Method(m610) CH03(arg0, z085, 0, 0, 0) - Index(m601(2, 6), Buffer(1){0xb}) + Store(Index(m601(2, 6), Buffer(1){0xb}), Local3) CH04(arg0, 0, 85, z085, 9, 0, 0) // AE_INDEX_TO_NOT_ATTACHED - Index(m601(3, 6), Buffer(1){0xb}) + Store(Index(m601(3, 6), Buffer(1){0xb}), Local3) CH04(arg0, 0, 85, z085, 10, 0, 0) // AE_INDEX_TO_NOT_ATTACHED - Index(m601(4, 0), Buffer(1){0xb}) + Store(Index(m601(4, 0), Buffer(1){0xb}), Local3) CH04(arg0, 0, 85, z085, 11, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } 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 3f6b0a19c..fc941c9f4 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 @@ -12012,13 +12012,13 @@ Method(m618) CH03(arg0, z117, 0, 0, 0) - Index(m601(2, 6), Local1) + Store(Index(m601(2, 6), Local1), Local5) CH04(arg0, 0, 85, z117, 9, 0, 0) // AE_INDEX_TO_NOT_ATTACHED - Index(m601(3, 6), Local1) + Store(Index(m601(3, 6), Local1), Local5) CH04(arg0, 0, 85, z117, 10, 0, 0) // AE_INDEX_TO_NOT_ATTACHED - Index(m601(4, 0), Local1) + Store(Index(m601(4, 0), Local1), Local5) CH04(arg0, 0, 85, z117, 11, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } 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 9bdbabf6b..f810fee76 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 @@ -11819,13 +11819,13 @@ Method(m611) CH03(arg0, z086, 0, 0, 0) - Index(m601(2, 6), s614) + Store(Index(m601(2, 6), s614), Local3) CH04(arg0, 0, 85, z086, 9, 0, 0) // AE_INDEX_TO_NOT_ATTACHED - Index(m601(3, 6), s614) + Store(Index(m601(3, 6), s614), Local3) CH04(arg0, 0, 85, z086, 10, 0, 0) // AE_INDEX_TO_NOT_ATTACHED - Index(m601(4, 0), s614) + Store(Index(m601(4, 0), s614), Local3) CH04(arg0, 0, 85, z086, 11, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } @@ -23240,13 +23240,13 @@ Method(m611) CH03(arg0, z086, 0, 0, 0) - Index(m601(2, 6), b60e) + Store(Index(m601(2, 6), b60e), Local3) CH04(arg0, 0, 85, z086, 9, 0, 0) // AE_INDEX_TO_NOT_ATTACHED - Index(m601(3, 6), b60e) + Store(Index(m601(3, 6), b60e), Local3) CH04(arg0, 0, 85, z086, 10, 0, 0) // AE_INDEX_TO_NOT_ATTACHED - Index(m601(4, 0), b60e) + Store(Index(m601(4, 0), b60e), Local3) CH04(arg0, 0, 85, z086, 11, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } 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 141cef622..daefb4c00 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 @@ -11072,13 +11072,13 @@ Method(m612) CH03(arg0, z087, 0, 0, 0) - Index(m601(2, 6), bf74) + Store(Index(m601(2, 6), bf74), Local3) CH04(arg0, 0, 85, z087, 9, 0, 0) // AE_INDEX_TO_NOT_ATTACHED - Index(m601(3, 6), bf74) + Store(Index(m601(3, 6), bf74), Local3) CH04(arg0, 0, 85, z087, 10, 0, 0) // AE_INDEX_TO_NOT_ATTACHED - Index(m601(4, 0), bf74) + Store(Index(m601(4, 0), bf74), Local3) CH04(arg0, 0, 85, z087, 11, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } 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 37ae036d2..d5bf2f822 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 @@ -12014,13 +12014,13 @@ Method(m613) CH03(arg0, z088, 0, 0, 0) - Index(m601(2, 6), s614) + Store(Index(m601(2, 6), s614), Local3) CH04(arg0, 0, 85, z088, 9, 0, 0) // AE_INDEX_TO_NOT_ATTACHED - Index(m601(3, 6), s614) + Store(Index(m601(3, 6), s614), Local3) CH04(arg0, 0, 85, z088, 10, 0, 0) // AE_INDEX_TO_NOT_ATTACHED - Index(m601(4, 0), s614) + Store(Index(m601(4, 0), s614), Local3) CH04(arg0, 0, 85, z088, 11, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } @@ -23630,13 +23630,13 @@ Method(m613) CH03(arg0, z088, 0, 0, 0) - Index(m601(2, 6), b60e) + Store(Index(m601(2, 6), b60e), Local3) CH04(arg0, 0, 85, z088, 9, 0, 0) // AE_INDEX_TO_NOT_ATTACHED - Index(m601(3, 6), b60e) + Store(Index(m601(3, 6), b60e), Local3) CH04(arg0, 0, 85, z088, 10, 0, 0) // AE_INDEX_TO_NOT_ATTACHED - Index(m601(4, 0), b60e) + Store(Index(m601(4, 0), b60e), Local3) CH04(arg0, 0, 85, z088, 11, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } 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 f09dd7fe0..6eaff93d9 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 @@ -11453,13 +11453,13 @@ Method(m614) CH03(arg0, z089, 0, 0, 0) - Index(m601(2, 6), bf74) + Store(Index(m601(2, 6), bf74), Local3) CH04(arg0, 0, 85, z089, 9, 0, 0) // AE_INDEX_TO_NOT_ATTACHED - Index(m601(3, 6), bf74) + Store(Index(m601(3, 6), bf74), Local3) CH04(arg0, 0, 85, z089, 10, 0, 0) // AE_INDEX_TO_NOT_ATTACHED - Index(m601(4, 0), bf74) + Store(Index(m601(4, 0), bf74), Local3) CH04(arg0, 0, 85, z089, 11, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } 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 9912faaaa..959b5fcc8 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 @@ -11819,13 +11819,13 @@ Method(m615) CH03(arg0, z090, 0, 0, 0) - Index(m601(2, 6), Derefof(Index(ps60, 20))) + Store(Index(m601(2, 6), Derefof(Index(ps60, 20))), Local3) CH04(arg0, 0, 85, z090, 9, 0, 0) // AE_INDEX_TO_NOT_ATTACHED - Index(m601(3, 6), Derefof(Index(ps60, 20))) + Store(Index(m601(3, 6), Derefof(Index(ps60, 20))), Local3) CH04(arg0, 0, 85, z090, 10, 0, 0) // AE_INDEX_TO_NOT_ATTACHED - Index(m601(4, 0), Derefof(Index(ps60, 20))) + Store(Index(m601(4, 0), Derefof(Index(ps60, 20))), Local3) CH04(arg0, 0, 85, z090, 11, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } @@ -23240,13 +23240,13 @@ Method(m615) CH03(arg0, z090, 0, 0, 0) - Index(m601(2, 6), Derefof(Index(pb60, 14))) + Store(Index(m601(2, 6), Derefof(Index(pb60, 14))), Local3) CH04(arg0, 0, 85, z090, 9, 0, 0) // AE_INDEX_TO_NOT_ATTACHED - Index(m601(3, 6), Derefof(Index(pb60, 14))) + Store(Index(m601(3, 6), Derefof(Index(pb60, 14))), Local3) CH04(arg0, 0, 85, z090, 10, 0, 0) // AE_INDEX_TO_NOT_ATTACHED - Index(m601(4, 0), Derefof(Index(pb60, 14))) + Store(Index(m601(4, 0), Derefof(Index(pb60, 14))), Local3) CH04(arg0, 0, 85, z090, 11, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } 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 a8a1e2eb9..69170923f 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 @@ -11819,13 +11819,13 @@ Method(m616) CH03(arg0, z091, 0, 0, 0) - Index(m601(2, 6), Derefof(Refof(s614))) + Store(Index(m601(2, 6), Derefof(Refof(s614))), Local3) CH04(arg0, 0, 85, z091, 9, 0, 0) // AE_INDEX_TO_NOT_ATTACHED - Index(m601(3, 6), Derefof(Refof(s614))) + Store(Index(m601(3, 6), Derefof(Refof(s614))), Local3) CH04(arg0, 0, 85, z091, 10, 0, 0) // AE_INDEX_TO_NOT_ATTACHED - Index(m601(4, 0), Derefof(Refof(s614))) + Store(Index(m601(4, 0), Derefof(Refof(s614))), Local3) CH04(arg0, 0, 85, z091, 11, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } @@ -23240,13 +23240,13 @@ Method(m616) CH03(arg0, z091, 0, 0, 0) - Index(m601(2, 6), Derefof(Refof(b60e))) + Store(Index(m601(2, 6), Derefof(Refof(b60e))), Local3) CH04(arg0, 0, 85, z091, 9, 0, 0) // AE_INDEX_TO_NOT_ATTACHED - Index(m601(3, 6), Derefof(Refof(b60e))) + Store(Index(m601(3, 6), Derefof(Refof(b60e))), Local3) CH04(arg0, 0, 85, z091, 10, 0, 0) // AE_INDEX_TO_NOT_ATTACHED - Index(m601(4, 0), Derefof(Refof(b60e))) + Store(Index(m601(4, 0), Derefof(Refof(b60e))), Local3) CH04(arg0, 0, 85, z091, 11, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } 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 6a5eed287..aa9f3a0a9 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 @@ -11058,13 +11058,13 @@ Method(m61b) CH03(arg0, z120, 0, 0, 0) - Index(m601(2, 6), Derefof(Refof(bf74))) + Store(Index(m601(2, 6), Derefof(Refof(bf74))), Local3) CH04(arg0, 0, 85, z120, 9, 0, 0) // AE_INDEX_TO_NOT_ATTACHED - Index(m601(3, 6), Derefof(Refof(bf74))) + Store(Index(m601(3, 6), Derefof(Refof(bf74))), Local3) CH04(arg0, 0, 85, z120, 10, 0, 0) // AE_INDEX_TO_NOT_ATTACHED - Index(m601(4, 0), Derefof(Refof(bf74))) + Store(Index(m601(4, 0), Derefof(Refof(bf74))), local3) CH04(arg0, 0, 85, z120, 11, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } 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 f613bea46..a75a12e1e 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 @@ -11820,13 +11820,13 @@ Method(m61a) CH03(arg0, z119, 0, 0, 0) - Index(m601(2, 6), Derefof(m604(2, 2, 20, 1))) + Store(Index(m601(2, 6), Derefof(m604(2, 2, 20, 1))), Local3) CH04(arg0, 0, 85, z119, 9, 0, 0) // AE_INDEX_TO_NOT_ATTACHED - Index(m601(3, 6), Derefof(m604(2, 2, 20, 1))) + Store(Index(m601(3, 6), Derefof(m604(2, 2, 20, 1))), Local3) CH04(arg0, 0, 85, z119, 10, 0, 0) // AE_INDEX_TO_NOT_ATTACHED - Index(m601(4, 0), Derefof(m604(2, 2, 20, 1))) + Store(Index(m601(4, 0), Derefof(m604(2, 2, 20, 1))), Local3) CH04(arg0, 0, 85, z119, 11, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } @@ -23242,13 +23242,13 @@ Method(m61a) CH03(arg0, z119, 0, 0, 0) - Index(m601(2, 6), Derefof(m604(2, 3, 14, 1))) + Store(Index(m601(2, 6), Derefof(m604(2, 3, 14, 1))), Local3) CH04(arg0, 0, 85, z119, 9, 0, 0) // AE_INDEX_TO_NOT_ATTACHED - Index(m601(3, 6), Derefof(m604(2, 3, 14, 1))) + Store(Index(m601(3, 6), Derefof(m604(2, 3, 14, 1))), Local3) CH04(arg0, 0, 85, z119, 10, 0, 0) // AE_INDEX_TO_NOT_ATTACHED - Index(m601(4, 0), Derefof(m604(2, 3, 14, 1))) + Store(Index(m601(4, 0), Derefof(m604(2, 3, 14, 1))), Local3) CH04(arg0, 0, 85, z119, 11, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } 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 1dfb5d593..6a2ef6de4 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 @@ -11819,13 +11819,13 @@ Method(m619) CH03(arg0, z118, 0, 0, 0) - Index(m601(2, 6), m604(0, 2, 20, 0)) + Store(Index(m601(2, 6), m604(0, 2, 20, 0)), Local3) CH04(arg0, 0, 85, z118, 9, 0, 0) // AE_INDEX_TO_NOT_ATTACHED - Index(m601(3, 6), m604(0, 2, 20, 0)) + Store(Index(m601(3, 6), m604(0, 2, 20, 0)), Local3) CH04(arg0, 0, 85, z118, 10, 0, 0) // AE_INDEX_TO_NOT_ATTACHED - Index(m601(4, 0), m604(0, 2, 20, 0)) + Store(Index(m601(4, 0), m604(0, 2, 20, 0)), Local3) CH04(arg0, 0, 85, z118, 11, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } @@ -23240,13 +23240,13 @@ Method(m619) CH03(arg0, z118, 0, 0, 0) - Index(m601(2, 6), m604(0, 3, 14, 0)) + Store(Index(m601(2, 6), m604(0, 3, 14, 0)), Local3) CH04(arg0, 0, 85, z118, 9, 0, 0) // AE_INDEX_TO_NOT_ATTACHED - Index(m601(3, 6), m604(0, 3, 14, 0)) + Store(Index(m601(3, 6), m604(0, 3, 14, 0)), Local3) CH04(arg0, 0, 85, z118, 10, 0, 0) // AE_INDEX_TO_NOT_ATTACHED - Index(m601(4, 0), m604(0, 3, 14, 0)) + Store(Index(m601(4, 0), m604(0, 3, 14, 0)), Local3) CH04(arg0, 0, 85, z118, 11, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } diff --git a/tests/aslts/src/runtime/collections/complex/provoke/provoke.asl b/tests/aslts/src/runtime/collections/complex/provoke/provoke.asl index 60b3ef580..7b71b9aa4 100644 --- a/tests/aslts/src/runtime/collections/complex/provoke/provoke.asl +++ b/tests/aslts/src/runtime/collections/complex/provoke/provoke.asl @@ -45,7 +45,7 @@ Method(m130, 1) Store(0, Local0) - ToString(B000, Local0) + Store(ToString(B000, Local0), Local2) if (LNotequal(Local0, 0)) { err(arg0, z055, 0, 0, 0, Local0, 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 2004d63cf..b22d2c95e 100644 --- a/tests/aslts/src/runtime/collections/complex/result/common/rcommon.asl +++ b/tests/aslts/src/runtime/collections/complex/result/common/rcommon.asl @@ -1241,7 +1241,7 @@ if (y361) { // Source object is a reference // Check that it can be used as reference Store(Derefof(arg2), Local0) - Derefof(Local0) + Store(Derefof(Local0) ,Local3) if (CH03(arg0, z122, 10, arg1, Local0)) { // Derefof caused unexpected exception Return (1) @@ -1528,7 +1528,7 @@ if (y361) { // Result object is a reference // Check that Target can be used as reference Store(Derefof(arg1), Local0) - Derefof(Local0) + Store(Derefof(Local0), Local3) if (CH03(arg0, z122, 40, Local2, arg3)) { // Derefof caused unexpected exception Return (1) @@ -3221,7 +3221,7 @@ if (y361) { // Target object is a reference // Check that it can be used as reference Store(Derefof(arg2), Local0) - Derefof(Local0) + Store(Derefof(Local0), Local3) if (CH03(arg0, z122, 101, arg1, Local0)) { // Derefof caused unexpected exception Return (1) @@ -3282,7 +3282,7 @@ if (y361) { Store(14, Local0) } Case(17) { - Derefof(REF1) + Store(Derefof(REF1), Local3) if (CH03(arg0, z122, 103, arg1, Local0)) { // Derefof caused unexpected exception Return (1) @@ -3464,7 +3464,7 @@ if (y361) { Store(14, Local0) } Case(17) { - Derefof(REF1) + Store(Derefof(REF1), Local3) if (CH03(arg0, z122, 121, arg1, 0)) { // Derefof caused unexpected exception 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 c8a326770..4e60838b4 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 @@ -512,7 +512,7 @@ Method(m694, 5) // Result object is a reference // Check that Target can be used as reference Store(Derefof(arg1), Local0) - Derefof(Local0) + Store(Derefof(Local0), Local3) if (CH03(arg0, z127, 18, Local2, arg3)) { // Derefof caused unexpected exception Return (1) diff --git a/tests/aslts/src/runtime/collections/exceptions/exc/MAIN.asl b/tests/aslts/src/runtime/collections/exceptions/exc/MAIN.asl index a9bc60654..1d9858f19 100644 --- a/tests/aslts/src/runtime/collections/exceptions/exc/MAIN.asl +++ b/tests/aslts/src/runtime/collections/exceptions/exc/MAIN.asl @@ -40,7 +40,7 @@ DefinitionBlock( //TMP Method (XXXX, 1) { - Add (Arg0, 4) + Add (Arg0, 4, Local0) } // All declarations @@ -62,7 +62,7 @@ Method (XXXX, 1) Store(FNSH(), Local7) // TMP: -Add (Local7, 1) +Add (Local7, 1, Local0) return (Local7) } diff --git a/tests/aslts/src/runtime/collections/exceptions/exc/exc.asl b/tests/aslts/src/runtime/collections/exceptions/exc/exc.asl index 3b6277c30..bbb3917de 100644 --- a/tests/aslts/src/runtime/collections/exceptions/exc/exc.asl +++ b/tests/aslts/src/runtime/collections/exceptions/exc/exc.asl @@ -146,38 +146,38 @@ Method(m143) CH03(ts, z058, 10, 0, 0) - SizeOf (STR0) - SizeOf (BUF0) - SizeOf (PAC0) - SizeOf (INT0) + Store(SizeOf(STR0), Local5) + Store(SizeOf(BUF0), Local5) + Store(SizeOf(PAC0), Local5) + Store(SizeOf(INT0), Local5) CH03(ts, z058, 11, 0, 0) if (INT0) { Store(0, Local1) } - SizeOf (Local1) + Store(SizeOf(Local1), Local5) CH04(ts, 0, 49, z058, 12, 0, 0) // AE_AML_UNINITIALIZED_LOCAL - SizeOf (DEV0) + Store(SizeOf(DEV0), Local5) CH04(ts, 0, 47, z058, 13, 0, 0) // AE_AML_OPERAND_TYPE - SizeOf (EVE0) + Store(SizeOf(EVE0), Local5) CH04(ts, 0, 47, z058, 14, 0, 0) // AE_AML_OPERAND_TYPE - SizeOf (MTX0) + Store(SizeOf(MTX0), Local5) CH04(ts, 0, 47, z058, 15, 0, 0) // AE_AML_OPERAND_TYPE - SizeOf (OPR0) + Store(SizeOf(OPR0), Local5) CH04(ts, 0, 47, z058, 16, 0, 0) // AE_AML_OPERAND_TYPE - SizeOf (PWR0) + Store(SizeOf(PWR0), Local5) CH04(ts, 0, 47, z058, 17, 0, 0) // AE_AML_OPERAND_TYPE - SizeOf (CPU0) + Store(SizeOf(CPU0), Local5) CH04(ts, 0, 47, z058, 18, 0, 0) // AE_AML_OPERAND_TYPE - SizeOf (TZN0) + Store(SizeOf(TZN0), Local5) CH04(ts, 0, 47, z058, 19, 0, 0) // AE_AML_OPERAND_TYPE } @@ -196,7 +196,7 @@ Method(m144) CH03(ts, z058, 20, 0, 0) - ToString(b000, Ones) + ToString(b000, Ones, Local5) CH03(ts, z058, 21, 0, 0) @@ -208,7 +208,7 @@ Method(m144) Increment(Local0) } - ToString(b001, Ones) + ToString(b001, Ones, Local5) /* * CH04(ts, 0, 61, z058, 22, 0, 0) // AE_AML_STRING_LIMIT @@ -231,11 +231,11 @@ Method(m145) // Package() - Index(p000, 2) + Store(Index(p000, 2), Local5) CH03(ts, z058, 24, 0, 0) - Index(p000, 3) + Store(Index(p000, 3), Local5) CH04(ts, 0, 55, z058, 25, 0, 0) // AE_AML_PACKAGE_LIMIT @@ -249,11 +249,11 @@ Method(m145) // Package(3) - Index(p001, 2) + Store(Index(p001, 2), Local5) CH03(ts, z058, 28, 0, 0) - Index(p001, 3) + Index(p001, 3, Local5) CH04(ts, 0, 55, z058, 29, 0, 0) // AE_AML_PACKAGE_LIMIT @@ -275,11 +275,11 @@ Method(m085) CH03(ts, z058, 32, 0, 0) - Index(s000, 2) + Index(s000, 2, Local5) CH03(ts, z058, 33, 0, 0) - Index(s000, 3) + Index(s000, 3, Local5) // Bug 177, Bugzilla 5480. CH04(ts, 0, 61, z058, 34, 0, 0) // AE_AML_STRING_LIMIT @@ -305,11 +305,11 @@ Method(m086) // Buffer() - Index(b000, 2) + Index(b000, 2, Local5) CH03(ts, z058, 38, 0, 0) - Index(b000, 3) + Index(b000, 3, Local5) CH04(ts, 0, 54, z058, 39, 0, 0) // AE_AML_BUFFER_LIMIT @@ -323,11 +323,11 @@ Method(m086) // Buffer(3) - Index(b001, 2) + Index(b001, 2, Local5) CH03(ts, z058, 42, 0, 0) - Index(b001, 3) + Index(b001, 3, Local5) CH04(ts, 0, 54, z058, 43, 0, 0) // AE_AML_BUFFER_LIMIT @@ -353,7 +353,7 @@ Method(m146) } else { Store("0xffffffff", Local0) } - ToInteger(Local0) + ToInteger(Local0, Local5) CH03(ts, z058, 47, 0, 0) @@ -362,7 +362,7 @@ Method(m146) } else { Store("0x111111111", Local0) } - ToInteger(Local0) + ToInteger(Local0, Local5) CH04(ts, 0, 46, z058, 48, 0, 0) // AE_AML_NO_OPERAND } @@ -446,11 +446,11 @@ Method(m14c) CH03(ts, z058, 55, 0, 0) - Concatenate(Local0, Local0) + Concatenate(Local0, Local0, Local5) CH03(ts, z058, 56, 0, 0) - Concatenate(Local0, Local1) + Concatenate(Local0, Local1, Local5) /* * CH04(ts, 0, 61, z058, 57, 0, 0) // AE_AML_STRING_LIMIT @@ -489,11 +489,11 @@ Method(m14d) CH03(ts, z058, 58, 0, 0) - ToDecimalString(b000) + ToDecimalString(b000, Local5) CH03(ts, z058, 59, 0, 0) - ToDecimalString(b001) + ToDecimalString(b001, Local5) /* * CH04(ts, 0, 61, z058, 60, 0, 0) // AE_AML_STRING_LIMIT @@ -513,17 +513,17 @@ Method(m14e) CH03(ts, z058, 61, 0, 0) if (LEqual(F64, 1)) { - ToBCD(9999999999999999) + ToBCD(9999999999999999, Local5) } else { - ToBCD(99999999) + ToBCD(99999999, Local5) } CH03(ts, z058, 62, 0, 0) if (LEqual(F64, 1)) { - ToBCD(10000000000000000) + ToBCD(10000000000000000, Local5) } else { - ToBCD(100000000) + ToBCD(100000000, Local5) } CH04(ts, 0, 52, z058, 63, 0, 0) // AE_AML_NUMERIC_OVERFLOW @@ -590,7 +590,7 @@ Method(m150, 1) CH03(ts, z058, 85, 0, 0) - Index(Local0, 0) + Index(Local0, 0, Local5) CH04(ts, 0, 49, z058, 86, 0, 0) // AE_AML_UNINITIALIZED_LOCAL } @@ -604,11 +604,11 @@ Method(m151) CH03(ts, z058, 87, 0, 0) - DeRefOf(Index(p000, 2)) + Store(DeRefOf(Index(p000, 2)), Local5) CH03(ts, z058, 88, 0, 0) - DeRefOf(Index(p000, 3)) + Store(DeRefOf(Index(p000, 3)), Local5) /* * Obsolete: @@ -619,7 +619,7 @@ Method(m151) */ CH03(ts, z058, 89, 0, 0) - Add(DeRefOf(Index(p000, 3)), 1) + Add(DeRefOf(Index(p000, 3)), 1, Local5) if (EXCV) { CH04(ts, 0, 51, z058, 169, 0, 0) // AE_AML_UNINITIALIZED_ELEMENT @@ -653,11 +653,11 @@ Method(m152) CH03(ts, z058, 90, 0, 0) - ToHexString(b000) + ToHexString(b000, Local5) CH03(ts, z058, 91, 0, 0) - ToHexString(b001) + ToHexString(b001, Local5) /* * CH04(ts, 0, 61, z058, 92, 0, 0) // AE_AML_STRING_LIMIT @@ -678,11 +678,11 @@ Method(m153) CH03(ts, z058, 93, 0, 0) - Match(PAC0, MTR, 0, MTR, 0, 0) + Store(Match(PAC0, MTR, 0, MTR, 0, 0), Local5) CH03(ts, z058, 94, 0, 0) - Match(PAC0, MTR, 0, MTR, 0, 1) + Store(Match(PAC0, MTR, 0, MTR, 0, 1), Local5) CH04(ts, 0, 55, z058, 95, 0, 0) // AE_AML_PACKAGE_LIMIT } @@ -702,11 +702,11 @@ Method(m154) CH03(ts, z058, 96, 0, 0) - ConcatenateResTemplate(RT00, RT00) + ConcatenateResTemplate(RT00, RT00, Local5) CH03(ts, z058, 97, 0, 0) - ConcatenateResTemplate(RT00, Local2) + ConcatenateResTemplate(RT00, Local2, Local5) // Bug 188. CH03(ts, z058, 98, 0, 0) @@ -716,7 +716,7 @@ Method(m154) Store(Buffer(){0}, Local2) - ConcatenateResTemplate(RT00, Local2) + ConcatenateResTemplate(RT00, Local2, Local5) /* * Note: As for there is not a separate type for ResourceTemplate, @@ -734,7 +734,7 @@ Method(m154) Store(Buffer(){0x79}, Local2) - ConcatenateResTemplate(RT00, Local2) + ConcatenateResTemplate(RT00, Local2, Local5) // Bug 189. CH04(ts, 0, 71, z058, 101, 0, 0) // AE_AML_NO_RESOURCE_END_TAG @@ -743,7 +743,7 @@ Method(m154) Store(Buffer(){0x2a, 0x04, 0x02}, Local2) - ConcatenateResTemplate(RT00, Local2) + ConcatenateResTemplate(RT00, Local2, Local5) if (EXCV) { CH04(ts, 0, 71, z058, 102, 0, 0) // AE_AML_NO_RESOURCE_END_TAG @@ -755,7 +755,7 @@ Method(m154) Store(Buffer(){0x2a, 0x10, 0x05, 0x79}, Local2) - ConcatenateResTemplate(RT00, Local2) + ConcatenateResTemplate(RT00, Local2, Local5) // Bug 190. CH04(ts, 0, 71, z058, 103, 0, 0) // AE_AML_NO_RESOURCE_END_TAG @@ -764,7 +764,7 @@ Method(m154) Store(Buffer(){0x00, 0x00, 0x00, 0x79, 0x00}, Local2) - ConcatenateResTemplate(RT00, Local2) + ConcatenateResTemplate(RT00, Local2, Local5) if (EXCV) { CH04(ts, 0, 71, z058, 104, 0, 0) // AE_AML_NO_RESOURCE_END_TAG @@ -825,36 +825,36 @@ Method(m156) CH03(ts, z058, 107, 0, 0) // Add, empty String - Add("", 0) + Add("", 0, Local5) // CH04(ts, 0, 34, z058, 108, 0, 0) // AE_BAD_HEX_CONSTANT CH03(ts, z058, 108, 0, 0) // Add, String filled with blanks - Add(" ", 0) + Add(" ", 0, Local5) // CH04(ts, 0, 34, z058, 109, 0, 0) // AE_BAD_HEX_CONSTANT CH03(ts, z058, 109, 0, 0) // ToInteger, empty String - ToInteger("") + ToInteger("", Local5) CH04(ts, 0, 36, z058, 110, 0, 0) // AE_BAD_DECIMAL_CONSTANT // ToInteger, String filled with blanks - ToInteger(" ") + ToInteger(" ", Local5) // CH04(ts, 0, 34, z058, 111, 0, 0) // AE_BAD_HEX_CONSTANT CH04(ts, 0, 36, z058, 111, 0, 0) // AE_BAD_DECIMAL_CONSTANT // Add, zero-length Buffer - Add(b000, 0) + Add(b000, 0, Local5) // CH04(ts, 0, 34, z058, 112, 0, 0) // AE_BAD_HEX_CONSTANT CH04(ts, 0, 54, z058, 112, 0, 0) // AE_AML_BUFFER_LIMIT // ToInteger, zero-length Buffer - ToInteger(b000) + ToInteger(b000, Local5) // CH04(ts, 0, 34, z058, 113, 0, 0) // AE_BAD_HEX_CONSTANT CH04(ts, 0, 54, z058, 113, 0, 0) // AE_AML_BUFFER_LIMIT @@ -875,7 +875,7 @@ Method(m157) CH03(ts, z058, 114, 0, 0) - Index(i000, 0) + Store(Index(i000, 0), Local5) CH04(ts, 0, 47, z058, 115, 0, 0) // AE_AML_OPERAND_TYPE @@ -903,7 +903,7 @@ Method(m158) CH03(ts, z058, 119, 0, 0) // Bug 83, Bugzilla 5387. - DerefOf(i000) + Store(DerefOf(i000), Local5) CH04(ts, 0, 0xff, z058, 120, 0, 0) @@ -927,7 +927,7 @@ Method(m087) // Index(Integer) - Index(Local7, 0) + Store(Index(Local7, 0), Local5) CH04(ts, 0, 47, z058, 123, 0, 0) // AE_AML_OPERAND_TYPE @@ -945,7 +945,7 @@ Method(m087) // DerefOf(Integer) - DerefOf(Local7) + Store(DerefOf(Local7), Local5) CH04(ts, 0, 0xff, z058, 127, 0, 0) @@ -964,7 +964,7 @@ Method(m159) CH03(ts, z058, 129, 0, 0) - Index(bf00, 0) + Store(Index(bf00, 0), Local5) CH04(ts, 0, 47, z058, 130, 0, 0) // AE_AML_OPERAND_TYPE @@ -996,7 +996,7 @@ Method(m15a) CH03(ts, z058, 135, 0, 0) - DerefOf(bf00) + Store(DerefOf(bf00), Local5) // Bug 83, Bugzilla 5387. CH04(ts, 0, 0xff, z058, 136, 0, 0) @@ -1022,7 +1022,7 @@ Method(m15d) // Field - Index(f000, 0) + Store(Index(f000, 0), Local5) CH04(ts, 0, 47, z058, 139, 0, 0) // AE_AML_OPERAND_TYPE @@ -1044,7 +1044,7 @@ Method(m15d) // BankField - Index(bkf0, 0) + Store(Index(bkf0, 0), Local5) CH04(ts, 0, 47, z058, 144, 0, 0) // AE_AML_OPERAND_TYPE @@ -1066,7 +1066,7 @@ Method(m15d) // IndexField - Index(if00, 0) + Store(Index(if00, 0), Local5) CH04(ts, 0, 47, z058, 149, 0, 0) // AE_AML_OPERAND_TYPE @@ -1103,7 +1103,7 @@ Method(m15e) // Field - DerefOf(f000) + Store(DerefOf(f000), Local5) // Bug 83, Bugzilla 5387. CH04(ts, 0, 0xff, z058, 155, 0, 0) @@ -1115,7 +1115,7 @@ Method(m15e) // BankField - DerefOf(bkf0) + Store(DerefOf(bkf0), Local5) // Bug 83, Bugzilla 5387. CH04(ts, 0, 0xff, z058, 157, 0, 0) @@ -1127,7 +1127,7 @@ Method(m15e) // IndexField - DerefOf(if00) + Store(DerefOf(if00), Local5) // Bug 83, Bugzilla 5387. CH04(ts, 0, 0xff, z058, 159, 0, 0) 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 08ef80ebc..d8a1d171e 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 @@ -55,9 +55,6 @@ Method(m4b0, 1) // CondRefOf - CondRefOf(Local0) - CH03(ts, z092, 0, 0, 0) - CondRefOf(Local0, Local1) CH03(ts, z092, 1, 0, 0) @@ -73,30 +70,21 @@ Method(m4b0, 1) // DerefOf - DerefOf(Local0) + Store (DerefOf(Local0), Local1) CH06(arg0, 2, 49) // FindSetLeftBit - FindSetLeftBit(Local0) - CH06(arg0, 3, 49) - FindSetLeftBit(Local0, Local1) CH06(arg0, 4, 49) // FindSetRightBit - FindSetRightBit(Local0) - CH06(arg0, 5, 49) - FindSetRightBit(Local0, Local1) CH06(arg0, 6, 49) // FromBCD - FromBCD(Local0) - CH06(arg0, 7, 49) - FromBCD(Local0, Local1) CH06(arg0, 8, 49) @@ -107,25 +95,22 @@ Method(m4b0, 1) // LNot - LNot(Local0) + Store (LNot(Local0), Local1) CH06(arg0, 10, 49) // Not - Not(Local0) - CH06(arg0, 11, 49) - Not(Local0, Local1) CH06(arg0, 12, 49) // ObjectType - ObjectType(Local0) + Store (ObjectType(Local0), Local1) CH03(ts, z092, 2, 0, 0) // RefOf - RefOf(Local0) + Store (RefOf(Local0), Local1) CH03(ts, z092, 3, 0, 0) // Release @@ -145,7 +130,7 @@ Method(m4b0, 1) // SizeOf - SizeOf(Local0) + Store (SizeOf(Local0), Local1) CH06(arg0, 16, 49) // Sleep @@ -165,57 +150,36 @@ Method(m4b0, 1) // ToBCD - ToBCD(Local0) - CH06(arg0, 20, 49) - ToBCD(Local0, Local1) CH06(arg0, 21, 49) // ToBuffer - ToBuffer(Local0) - CH06(arg0, 22, 49) - ToBuffer(Local0, Local1) CH06(arg0, 23, 49) // ToDecimalString - ToDecimalString(Local0) - CH06(arg0, 24, 49) - ToDecimalString(Local0, Local1) CH06(arg0, 25, 49) // ToHexString - ToHexString(Local0) - CH06(arg0, 26, 49) - ToHexString(Local0, Local1) CH06(arg0, 27, 49) // ToInteger - ToInteger(Local0) - CH06(arg0, 28, 49) - ToInteger(Local0, Local1) CH06(arg0, 29, 49) // Acquire - Acquire(Local0, 100) + Store(Acquire(Local0, 100), Local1) CH06(arg0, 30, 49) // Add - Add(Local0, i000) - CH06(arg0, 31, 49) - - Add(i000, Local0) - CH06(arg0, 32, 49) - Add(Local0, i000, Local1) CH06(arg0, 33, 49) @@ -224,12 +188,6 @@ Method(m4b0, 1) // And - And(Local0, i000) - CH06(arg0, 35, 49) - - And(i000, Local0) - CH06(arg0, 36, 49) - And(Local0, i000, Local1) CH06(arg0, 37, 49) @@ -238,12 +196,6 @@ Method(m4b0, 1) // Concatenate - Concatenate(Local0, i000) - CH06(arg0, 39, 49) - - Concatenate(i000, Local0) - CH06(arg0, 40, 49) - Concatenate(Local0, i000, Local1) CH06(arg0, 41, 49) @@ -252,12 +204,6 @@ Method(m4b0, 1) // ConcatenateResTemplate - ConcatenateResTemplate(Local0, ResourceTemplate(){}) - CH06(arg0, 43, 49) - - ConcatenateResTemplate(ResourceTemplate(){}, Local0) - CH06(arg0, 44, 49) - ConcatenateResTemplate(Local0, ResourceTemplate(){}, Local1) CH06(arg0, 45, 49) @@ -266,12 +212,6 @@ Method(m4b0, 1) // Divide - Divide(Local0, i000) - CH06(arg0, 47, 49) - - Divide(i000, Local0) - CH06(arg0, 48, 49) - Divide(Local0, i000, Local2) CH06(arg0, 49, 49) @@ -291,12 +231,6 @@ Method(m4b0, 1) // Index - Index(Local0, 0) - CH06(arg0, 54, 49) - - Index("0", Local0) - CH06(arg0, 55, 49) - Index(Local0, 0, Local1) CH06(arg0, 56, 49) @@ -305,68 +239,62 @@ Method(m4b0, 1) // LEqual - LEqual(Local0, i000) + Store (LEqual(Local0, i000), Local1) CH06(arg0, 58, 49) - LEqual(i000, Local0) + Store (LEqual(i000, Local0), Local1) CH06(arg0, 59, 49) // LGreater - LGreater(Local0, i000) + Store (LGreater(Local0, i000), Local1) CH06(arg0, 60, 49) - LGreater(i000, Local0) + Store (LGreater(i000, Local0), Local1) CH06(arg0, 61, 49) // LGreaterEqual - LGreaterEqual(Local0, i000) + Store (LGreaterEqual(Local0, i000), Local1) CH06(arg0, 62, 0xff) - LGreaterEqual(i000, Local0) + Store (LGreaterEqual(i000, Local0), Local1) CH06(arg0, 63, 0xff) // LLess - LLess(Local0, i000) + Store (LLess(Local0, i000), Local1) CH06(arg0, 64, 49) - LLess(i000, Local0) + Store (LLess(i000, Local0), Local1) CH06(arg0, 65, 49) // LLessEqual - LLessEqual(Local0, i000) + Store (LLessEqual(Local0, i000), Local1) CH06(arg0, 66, 0xff) - LLessEqual(i000, Local0) + Store (LLessEqual(i000, Local0), Local1) CH06(arg0, 67, 0xff) // LNotEqual - LNotEqual(Local0, i000) + Store (LNotEqual(Local0, i000), Local1) CH06(arg0, 68, 0xff) - LNotEqual(i000, Local0) + Store (LNotEqual(i000, Local0), Local1) CH06(arg0, 69, 0xff) // LOr - LOr(Local0, i000) + Store (LOr(Local0, i000), Local1) CH06(arg0, 70, 49) - LOr(i000, Local0) + Store (LOr(i000, Local0), Local1) CH06(arg0, 71, 49) // Mod - Mod(Local0, i000) - CH06(arg0, 72, 49) - - Mod(i000, Local0) - CH06(arg0, 73, 49) - Mod(Local0, i000, Local1) CH06(arg0, 74, 49) @@ -375,12 +303,6 @@ Method(m4b0, 1) // Multiply - Multiply(Local0, i000) - CH06(arg0, 76, 49) - - Multiply(i000, Local0) - CH06(arg0, 77, 49) - Multiply(Local0, i000, Local1) CH06(arg0, 78, 49) @@ -389,12 +311,6 @@ Method(m4b0, 1) // NAnd - NAnd(Local0, i000) - CH06(arg0, 80, 49) - - NAnd(i000, Local0) - CH06(arg0, 81, 49) - NAnd(Local0, i000, Local1) CH06(arg0, 82, 49) @@ -403,12 +319,6 @@ Method(m4b0, 1) // NOr - NOr(Local0, i000) - CH06(arg0, 84, 49) - - NOr(i000, Local0) - CH06(arg0, 85, 49) - NOr(Local0, i000, Local1) CH06(arg0, 86, 49) @@ -417,12 +327,6 @@ Method(m4b0, 1) // Or - Or(Local0, i000) - CH06(arg0, 88, 49) - - Or(i000, Local0) - CH06(arg0, 89, 49) - Or(Local0, i000, Local1) CH06(arg0, 90, 49) @@ -431,12 +335,6 @@ Method(m4b0, 1) // ShiftLeft - ShiftLeft(Local0, i000) - CH06(arg0, 92, 49) - - ShiftLeft(i000, Local0) - CH06(arg0, 93, 49) - ShiftLeft(Local0, i000, Local1) CH06(arg0, 94, 49) @@ -445,12 +343,6 @@ Method(m4b0, 1) // ShiftRight - ShiftRight(Local0, i000) - CH06(arg0, 96, 49) - - ShiftRight(i000, Local0) - CH06(arg0, 97, 49) - ShiftRight(Local0, i000, Local1) CH06(arg0, 98, 49) @@ -459,12 +351,6 @@ Method(m4b0, 1) // Subtract - Subtract(Local0, i000) - CH06(arg0, 100, 49) - - Subtract(i000, Local0) - CH06(arg0, 101, 49) - Subtract(Local0, i000, Local1) CH06(arg0, 102, 49) @@ -473,12 +359,6 @@ Method(m4b0, 1) // ToString - ToString(Local0, 1) - CH06(arg0, 104, 49) - - ToString(i000, Local0) - CH06(arg0, 105, 49) - ToString(Local0, 1, Local1) CH06(arg0, 106, 49) @@ -487,20 +367,14 @@ Method(m4b0, 1) // Wait - Wait(Local0, i000) + Store(Wait(Local0, i000), Local1) CH06(arg0, 108, 49) - Wait(e000, Local0) + Store(Wait(e000, Local0), Local1) CH06(arg0, 109, 49) // XOr - XOr(Local0, i000) - CH06(arg0, 110, 49) - - XOr(i000, Local0) - CH06(arg0, 111, 49) - XOr(Local0, i000, Local1) CH06(arg0, 112, 49) @@ -509,15 +383,6 @@ Method(m4b0, 1) // Mid - Mid(Local0, 1, 1) - CH06(arg0, 114, 49) - - Mid("123", Local0, 1) - CH06(arg0, 115, 49) - - Mid("123", 1, Local0) - CH06(arg0, 116, 49) - Mid(Local0, 1, 1, Local1) CH06(arg0, 117, 49) @@ -529,16 +394,16 @@ Method(m4b0, 1) // Match - Match(Local0, MTR, 0, MTR, 0, 0) + Store (Match(Local0, MTR, 0, MTR, 0, 0), Local1) CH06(arg0, 120, 49) - Match(Package(){1}, MTR, Local0, MTR, 0, 0) + Store (Match(Package(){1}, MTR, Local0, MTR, 0, 0), Local1) CH06(arg0, 121, 49) - Match(Package(){1}, MTR, 0, MTR, Local0, 0) + Store (Match(Package(){1}, MTR, 0, MTR, Local0, 0), Local1) CH06(arg0, 122, 49) - Match(Package(){1}, MTR, 0, MTR, 0, Local0) + Store (Match(Package(){1}, MTR, 0, MTR, 0, Local0), Local1) CH06(arg0, 123, 49) } @@ -549,14 +414,11 @@ Method(m4b0, 1) // DeRefOf(Index(Package, Ind)) - DeRefOf(Index(p000, 0)) + Store (DeRefOf(Index(p000, 0)), Local1) CH03(ts, z092, 4, 0, 0) // CondRefOf - CondRefOf(DeRefOf(Index(p000, 0))) - CH06(arg0, 0, 0xff) - CondRefOf(DeRefOf(Index(p000, 0)), Local1) CH06(arg0, 1, 0xff) @@ -572,30 +434,21 @@ Method(m4b0, 1) // DerefOf - DerefOf(DeRefOf(Index(p000, 0))) + Store (DerefOf(DeRefOf(Index(p000, 0))), Local1) CH06(arg0, 4, 0xff) // FindSetLeftBit - FindSetLeftBit(DeRefOf(Index(p000, 0))) - CH06(arg0, 5, 0xff) - FindSetLeftBit(DeRefOf(Index(p000, 0)), Local1) CH06(arg0, 6, 0xff) // FindSetRightBit - FindSetRightBit(DeRefOf(Index(p000, 0))) - CH06(arg0, 7, 0xff) - FindSetRightBit(DeRefOf(Index(p000, 0)), Local1) CH06(arg0, 8, 0xff) // FromBCD - FromBCD(DeRefOf(Index(p000, 0))) - CH06(arg0, 9, 0xff) - FromBCD(DeRefOf(Index(p000, 0)), Local1) CH06(arg0, 10, 0xff) @@ -606,27 +459,24 @@ Method(m4b0, 1) // LNot - LNot(DeRefOf(Index(p000, 0))) + Store (LNot(DeRefOf(Index(p000, 0))), Local1) CH06(arg0, 12, 0xff) // Not - Not(DeRefOf(Index(p000, 0))) - CH06(arg0, 13, 0xff) - Not(DeRefOf(Index(p000, 0)), Local1) CH06(arg0, 14, 0xff) // ObjectType if (X104) { - ObjectType(DeRefOf(Index(p000, 0))) + Store (ObjectType(DeRefOf(Index(p000, 0))), Local1) CH03(ts, z092, 5, 0, 0) } // RefOf - RefOf(DeRefOf(Index(p000, 0))) + Store (RefOf(DeRefOf(Index(p000, 0))), Local1) CH06(arg0, 15, 0xff) // Release @@ -637,7 +487,7 @@ Method(m4b0, 1) // SizeOf - SizeOf(DeRefOf(Index(p000, 0))) + Store (SizeOf(DeRefOf(Index(p000, 0))), Local1) CH06(arg0, 16, 0xff) // Sleep @@ -657,41 +507,26 @@ Method(m4b0, 1) // ToBCD - ToBCD(DeRefOf(Index(p000, 0))) - CH06(arg0, 20, 0xff) - ToBCD(DeRefOf(Index(p000, 0)), Local1) CH06(arg0, 21, 0xff) // ToBuffer - ToBuffer(DeRefOf(Index(p000, 0))) - CH06(arg0, 22, 0xff) - ToBuffer(DeRefOf(Index(p000, 0)), Local1) CH06(arg0, 23, 0xff) // ToDecimalString - ToDecimalString(DeRefOf(Index(p000, 0))) - CH06(arg0, 24, 0xff) - ToDecimalString(DeRefOf(Index(p000, 0)), Local1) CH06(arg0, 25, 0xff) // ToHexString - ToHexString(DeRefOf(Index(p000, 0))) - CH06(arg0, 26, 0xff) - ToHexString(DeRefOf(Index(p000, 0)), Local1) CH06(arg0, 27, 0xff) // ToInteger - ToInteger(DeRefOf(Index(p000, 0))) - CH06(arg0, 28, 0xff) - ToInteger(DeRefOf(Index(p000, 0)), Local1) CH06(arg0, 29, 0xff) @@ -699,12 +534,6 @@ Method(m4b0, 1) // Add - Add(DeRefOf(Index(p000, 0)), i000) - CH06(arg0, 31, 0xff) - - Add(i000, DeRefOf(Index(p000, 0))) - CH06(arg0, 32, 0xff) - Add(DeRefOf(Index(p000, 0)), i000, Local1) CH06(arg0, 33, 0xff) @@ -713,12 +542,6 @@ Method(m4b0, 1) // And - And(DeRefOf(Index(p000, 0)), i000) - CH06(arg0, 35, 0xff) - - And(i000, DeRefOf(Index(p000, 0))) - CH06(arg0, 36, 0xff) - And(DeRefOf(Index(p000, 0)), i000, Local1) CH06(arg0, 37, 0xff) @@ -727,12 +550,6 @@ Method(m4b0, 1) // Concatenate - Concatenate(DeRefOf(Index(p000, 0)), i000) - CH06(arg0, 39, 0xff) - - Concatenate(i000, DeRefOf(Index(p000, 0))) - CH06(arg0, 40, 0xff) - Concatenate(DeRefOf(Index(p000, 0)), i000, Local1) CH06(arg0, 41, 0xff) @@ -741,12 +558,6 @@ Method(m4b0, 1) // ConcatenateResTemplate - ConcatenateResTemplate(DeRefOf(Index(p000, 0)), ResourceTemplate(){}) - CH06(arg0, 43, 0xff) - - ConcatenateResTemplate(ResourceTemplate(){}, DeRefOf(Index(p000, 0))) - CH06(arg0, 44, 0xff) - ConcatenateResTemplate(DeRefOf(Index(p000, 0)), ResourceTemplate(){}, Local1) CH06(arg0, 45, 0xff) @@ -755,12 +566,6 @@ Method(m4b0, 1) // Divide - Divide(DeRefOf(Index(p000, 0)), i000) - CH06(arg0, 47, 0xff) - - Divide(i000, DeRefOf(Index(p000, 0))) - CH06(arg0, 48, 0xff) - Divide(DeRefOf(Index(p000, 0)), i000, Local2) CH06(arg0, 49, 0xff) @@ -780,12 +585,6 @@ Method(m4b0, 1) // Index - Index(DeRefOf(Index(p000, 0)), 0) - CH06(arg0, 54, 0xff) - - Index("0", DeRefOf(Index(p000, 0))) - CH06(arg0, 55, 0xff) - Index(DeRefOf(Index(p000, 0)), 0, Local1) CH06(arg0, 56, 0xff) @@ -794,68 +593,62 @@ Method(m4b0, 1) // LEqual - LEqual(DeRefOf(Index(p000, 0)), i000) + Store (LEqual(DeRefOf(Index(p000, 0)), i000), Local1) CH06(arg0, 58, 0xff) - LEqual(i000, DeRefOf(Index(p000, 0))) + Store (LEqual(i000, DeRefOf(Index(p000, 0))), Local1) CH06(arg0, 59, 0xff) // LGreater - LGreater(DeRefOf(Index(p000, 0)), i000) + Store (LGreater(DeRefOf(Index(p000, 0)), i000), Local1) CH06(arg0, 60, 0xff) - LGreater(i000, DeRefOf(Index(p000, 0))) + Store (LGreater(i000, DeRefOf(Index(p000, 0))), Local1) CH06(arg0, 61, 0xff) // LGreaterEqual - LGreaterEqual(DeRefOf(Index(p000, 0)), i000) + Store (LGreaterEqual(DeRefOf(Index(p000, 0)), i000), Local1) CH06(arg0, 62, 0xff) - LGreaterEqual(i000, DeRefOf(Index(p000, 0))) + Store (LGreaterEqual(i000, DeRefOf(Index(p000, 0))), Local1) CH06(arg0, 63, 0xff) // LLess - LLess(DeRefOf(Index(p000, 0)), i000) + Store (LLess(DeRefOf(Index(p000, 0)), i000), Local1) CH06(arg0, 64, 0xff) - LLess(i000, DeRefOf(Index(p000, 0))) + Store (LLess(i000, DeRefOf(Index(p000, 0))), Local1) CH06(arg0, 65, 0xff) // LLessEqual - LLessEqual(DeRefOf(Index(p000, 0)), i000) + Store (LLessEqual(DeRefOf(Index(p000, 0)), i000), Local1) CH06(arg0, 66, 0xff) - LLessEqual(i000, DeRefOf(Index(p000, 0))) + Store (LLessEqual(i000, DeRefOf(Index(p000, 0))), Local1) CH06(arg0, 67, 0xff) // LNotEqual - LNotEqual(DeRefOf(Index(p000, 0)), i000) + Store (LNotEqual(DeRefOf(Index(p000, 0)), i000), Local1) CH06(arg0, 68, 0xff) - LNotEqual(i000, DeRefOf(Index(p000, 0))) + Store (LNotEqual(i000, DeRefOf(Index(p000, 0))), Local1) CH06(arg0, 69, 0xff) // LOr - LOr(DeRefOf(Index(p000, 0)), i000) + Store (LOr(DeRefOf(Index(p000, 0)), i000), Local1) CH06(arg0, 70, 0xff) - LOr(i000, DeRefOf(Index(p000, 0))) + Store (LOr(i000, DeRefOf(Index(p000, 0))), Local1) CH06(arg0, 71, 0xff) // Mod - Mod(DeRefOf(Index(p000, 0)), i000) - CH06(arg0, 72, 0xff) - - Mod(i000, DeRefOf(Index(p000, 0))) - CH06(arg0, 73, 0xff) - Mod(DeRefOf(Index(p000, 0)), i000, Local1) CH06(arg0, 74, 0xff) @@ -864,12 +657,6 @@ Method(m4b0, 1) // Multiply - Multiply(DeRefOf(Index(p000, 0)), i000) - CH06(arg0, 76, 0xff) - - Multiply(i000, DeRefOf(Index(p000, 0))) - CH06(arg0, 77, 0xff) - Multiply(DeRefOf(Index(p000, 0)), i000, Local1) CH06(arg0, 78, 0xff) @@ -878,12 +665,6 @@ Method(m4b0, 1) // NAnd - NAnd(DeRefOf(Index(p000, 0)), i000) - CH06(arg0, 80, 0xff) - - NAnd(i000, DeRefOf(Index(p000, 0))) - CH06(arg0, 81, 0xff) - NAnd(DeRefOf(Index(p000, 0)), i000, Local1) CH06(arg0, 82, 0xff) @@ -892,12 +673,6 @@ Method(m4b0, 1) // NOr - NOr(DeRefOf(Index(p000, 0)), i000) - CH06(arg0, 84, 0xff) - - NOr(i000, DeRefOf(Index(p000, 0))) - CH06(arg0, 85, 0xff) - NOr(DeRefOf(Index(p000, 0)), i000, Local1) CH06(arg0, 86, 0xff) @@ -906,12 +681,6 @@ Method(m4b0, 1) // Or - Or(DeRefOf(Index(p000, 0)), i000) - CH06(arg0, 88, 0xff) - - Or(i000, DeRefOf(Index(p000, 0))) - CH06(arg0, 89, 0xff) - Or(DeRefOf(Index(p000, 0)), i000, Local1) CH06(arg0, 90, 0xff) @@ -920,12 +689,6 @@ Method(m4b0, 1) // ShiftLeft - ShiftLeft(DeRefOf(Index(p000, 0)), i000) - CH06(arg0, 92, 0xff) - - ShiftLeft(i000, DeRefOf(Index(p000, 0))) - CH06(arg0, 93, 0xff) - ShiftLeft(DeRefOf(Index(p000, 0)), i000, Local1) CH06(arg0, 94, 0xff) @@ -934,12 +697,6 @@ Method(m4b0, 1) // ShiftRight - ShiftRight(DeRefOf(Index(p000, 0)), i000) - CH06(arg0, 96, 0xff) - - ShiftRight(i000, DeRefOf(Index(p000, 0))) - CH06(arg0, 97, 0xff) - ShiftRight(DeRefOf(Index(p000, 0)), i000, Local1) CH06(arg0, 98, 0xff) @@ -948,12 +705,6 @@ Method(m4b0, 1) // Subtract - Subtract(DeRefOf(Index(p000, 0)), i000) - CH06(arg0, 100, 0xff) - - Subtract(i000, DeRefOf(Index(p000, 0))) - CH06(arg0, 101, 0xff) - Subtract(DeRefOf(Index(p000, 0)), i000, Local1) CH06(arg0, 102, 0xff) @@ -962,12 +713,6 @@ Method(m4b0, 1) // ToString - ToString(DeRefOf(Index(p000, 0)), 1) - CH06(arg0, 104, 0xff) - - ToString(i000, DeRefOf(Index(p000, 0))) - CH06(arg0, 105, 0xff) - ToString(DeRefOf(Index(p000, 0)), 1, Local1) CH06(arg0, 106, 0xff) @@ -976,17 +721,11 @@ Method(m4b0, 1) // Wait - Wait(e000, DeRefOf(Index(p000, 0))) + Store(Wait(e000, DeRefOf(Index(p000, 0))), Local1) CH06(arg0, 109, 0xff) // XOr - XOr(DeRefOf(Index(p000, 0)), i000) - CH06(arg0, 110, 0xff) - - XOr(i000, DeRefOf(Index(p000, 0))) - CH06(arg0, 111, 0xff) - XOr(DeRefOf(Index(p000, 0)), i000, Local1) CH06(arg0, 112, 0xff) @@ -995,15 +734,6 @@ Method(m4b0, 1) // Mid - Mid(DeRefOf(Index(p000, 0)), 1, 1) - CH06(arg0, 114, 0xff) - - Mid("123", DeRefOf(Index(p000, 0)), 1) - CH06(arg0, 115, 0xff) - - Mid("123", 1, DeRefOf(Index(p000, 0))) - CH06(arg0, 116, 0xff) - Mid(DeRefOf(Index(p000, 0)), 1, 1, Local1) CH06(arg0, 117, 0xff) @@ -1015,16 +745,13 @@ Method(m4b0, 1) // Match - Match(DeRefOf(Index(p000, 0)), MTR, 0, MTR, 0, 0) - CH06(arg0, 120, 0xff) - - Match(Package(){1}, MTR, DeRefOf(Index(p000, 0)), MTR, 0, 0) + Store (Match(Package(){1}, MTR, DeRefOf(Index(p000, 0)), MTR, 0, 0), Local1) CH06(arg0, 121, 0xff) - Match(Package(){1}, MTR, 0, MTR, DeRefOf(Index(p000, 0)), 0) + Store (Match(Package(){1}, MTR, 0, MTR, DeRefOf(Index(p000, 0)), 0), Local1) CH06(arg0, 122, 0xff) - Match(Package(){1}, MTR, 0, MTR, 0, DeRefOf(Index(p000, 0))) + Store (Match(Package(){1}, MTR, 0, MTR, 0, DeRefOf(Index(p000, 0))), Local1) CH06(arg0, 123, 0xff) // DeRefOf(Index(Package, Ind, Dest)) @@ -1195,7 +922,7 @@ Method(m4b0, 1) // Acquire - Acquire(arg2, 100) + Store(Acquire(arg2, 100), Local1) CH06(arg0, 30, 50) // Add @@ -1477,10 +1204,10 @@ Method(m4b0, 1) // Wait - Wait(arg2, i000) + Store(Wait(arg2, i000), Local1) CH06(arg0, 108, 50) - Wait(e000, arg2) + Store(Wait(e000, arg2), Local1) CH06(arg0, 109, 50) // XOr @@ -1542,14 +1269,11 @@ Method(m4b0, 1) return (1) } - DeRefOf(arg1) + Store (DeRefOf(arg1), Local1) CH03(ts, z092, 10, 0, 0) // CondRefOf - CondRefOf(DeRefOf(arg1)) - CH06(arg0, 0, 0xff) - CondRefOf(DeRefOf(arg1), Local1) CH06(arg0, 1, 0xff) @@ -1565,30 +1289,21 @@ Method(m4b0, 1) // DerefOf - DerefOf(DeRefOf(arg1)) + Store (DerefOf(DeRefOf(arg1)), Local1) CH06(arg0, 4, 0xff) // FindSetLeftBit - FindSetLeftBit(DeRefOf(arg1)) - CH06(arg0, 5, 0xff) - FindSetLeftBit(DeRefOf(arg1), Local1) CH06(arg0, 6, 0xff) // FindSetRightBit - FindSetRightBit(DeRefOf(arg1)) - CH06(arg0, 7, 0xff) - FindSetRightBit(DeRefOf(arg1), Local1) CH06(arg0, 8, 0xff) // FromBCD - FromBCD(DeRefOf(arg1)) - CH06(arg0, 9, 0xff) - FromBCD(DeRefOf(arg1), Local1) CH06(arg0, 10, 0xff) @@ -1599,27 +1314,24 @@ Method(m4b0, 1) // LNot - LNot(DeRefOf(arg1)) + Store (LNot(DeRefOf(arg1)), Local1) CH06(arg0, 12, 0xff) // Not - Not(DeRefOf(arg1)) - CH06(arg0, 13, 0xff) - - Not(DeRefOf(arg1), Local1) + Store (Not(DeRefOf(arg1)), Local1) CH06(arg0, 14, 0xff) // ObjectType if (X104) { - ObjectType(DeRefOf(arg1)) + Store (ObjectType(DeRefOf(arg1)), Local1) CH03(ts, z092, 11, 0, 0) } // RefOf - RefOf(DeRefOf(arg1)) + Store (RefOf(DeRefOf(arg1)), Local1) CH06(arg0, 15, 0xff) // Release @@ -1630,7 +1342,7 @@ Method(m4b0, 1) // SizeOf - SizeOf(DeRefOf(arg1)) + Store (SizeOf(DeRefOf(arg1)), Local1) CH06(arg0, 16, 0xff) // Sleep @@ -1650,41 +1362,26 @@ Method(m4b0, 1) // ToBCD - ToBCD(DeRefOf(arg1)) - CH06(arg0, 20, 0xff) - ToBCD(DeRefOf(arg1), Local1) CH06(arg0, 21, 0xff) // ToBuffer - ToBuffer(DeRefOf(arg1)) - CH06(arg0, 22, 0xff) - ToBuffer(DeRefOf(arg1), Local1) CH06(arg0, 23, 0xff) // ToDecimalString - ToDecimalString(DeRefOf(arg1)) - CH06(arg0, 24, 0xff) - ToDecimalString(DeRefOf(arg1), Local1) CH06(arg0, 25, 0xff) // ToHexString - ToHexString(DeRefOf(arg1)) - CH06(arg0, 26, 0xff) - ToHexString(DeRefOf(arg1), Local1) CH06(arg0, 27, 0xff) // ToInteger - ToInteger(DeRefOf(arg1)) - CH06(arg0, 28, 0xff) - ToInteger(DeRefOf(arg1), Local1) CH06(arg0, 29, 0xff) @@ -1692,12 +1389,6 @@ Method(m4b0, 1) // Add - Add(DeRefOf(arg1), i000) - CH06(arg0, 31, 0xff) - - Add(i000, DeRefOf(arg1)) - CH06(arg0, 32, 0xff) - Add(DeRefOf(arg1), i000, Local1) CH06(arg0, 33, 0xff) @@ -1706,12 +1397,6 @@ Method(m4b0, 1) // And - And(DeRefOf(arg1), i000) - CH06(arg0, 35, 0xff) - - And(i000, DeRefOf(arg1)) - CH06(arg0, 36, 0xff) - And(DeRefOf(arg1), i000, Local1) CH06(arg0, 37, 0xff) @@ -1720,12 +1405,6 @@ Method(m4b0, 1) // Concatenate - Concatenate(DeRefOf(arg1), i000) - CH06(arg0, 39, 0xff) - - Concatenate(i000, DeRefOf(arg1)) - CH06(arg0, 40, 0xff) - Concatenate(DeRefOf(arg1), i000, Local1) CH06(arg0, 41, 0xff) @@ -1734,12 +1413,6 @@ Method(m4b0, 1) // ConcatenateResTemplate - ConcatenateResTemplate(DeRefOf(arg1), ResourceTemplate(){}) - CH06(arg0, 43, 0xff) - - ConcatenateResTemplate(ResourceTemplate(){}, DeRefOf(arg1)) - CH06(arg0, 44, 0xff) - ConcatenateResTemplate(DeRefOf(arg1), ResourceTemplate(){}, Local1) CH06(arg0, 45, 0xff) @@ -1748,12 +1421,6 @@ Method(m4b0, 1) // Divide - Divide(DeRefOf(arg1), i000) - CH06(arg0, 47, 0xff) - - Divide(i000, DeRefOf(arg1)) - CH06(arg0, 48, 0xff) - Divide(DeRefOf(arg1), i000, Local2) CH06(arg0, 49, 0xff) @@ -1773,12 +1440,6 @@ Method(m4b0, 1) // Index - Index(DeRefOf(arg1), 0) - CH06(arg0, 54, 0xff) - - Index("0", DeRefOf(arg1)) - CH06(arg0, 55, 0xff) - Index(DeRefOf(arg1), 0, Local1) CH06(arg0, 56, 0xff) @@ -1787,68 +1448,62 @@ Method(m4b0, 1) // LEqual - LEqual(DeRefOf(arg1), i000) + Store (LEqual(DeRefOf(arg1), i000), Local1) CH06(arg0, 58, 0xff) - LEqual(i000, DeRefOf(arg1)) + Store (LEqual(i000, DeRefOf(arg1)), Local1) CH06(arg0, 59, 0xff) // LGreater - LGreater(DeRefOf(arg1), i000) + Store (LGreater(DeRefOf(arg1), i000), Local1) CH06(arg0, 60, 0xff) - LGreater(i000, DeRefOf(arg1)) + Store (LGreater(i000, DeRefOf(arg1)), Local1) CH06(arg0, 61, 0xff) // LGreaterEqual - LGreaterEqual(DeRefOf(arg1), i000) + Store (LGreaterEqual(DeRefOf(arg1), i000), Local1) CH06(arg0, 62, 0xff) - LGreaterEqual(i000, DeRefOf(arg1)) + Store (LGreaterEqual(i000, DeRefOf(arg1)), Local1) CH06(arg0, 63, 0xff) // LLess - LLess(DeRefOf(arg1), i000) + Store (LLess(DeRefOf(arg1), i000), Local1) CH06(arg0, 64, 0xff) - LLess(i000, DeRefOf(arg1)) + Store (LLess(i000, DeRefOf(arg1)), Local1) CH06(arg0, 65, 0xff) // LLessEqual - LLessEqual(DeRefOf(arg1), i000) + Store (LLessEqual(DeRefOf(arg1), i000), Local1) CH06(arg0, 66, 0xff) - LLessEqual(i000, DeRefOf(arg1)) + Store (LLessEqual(i000, DeRefOf(arg1)), Local1) CH06(arg0, 67, 0xff) // LNotEqual - LNotEqual(DeRefOf(arg1), i000) + Store (LNotEqual(DeRefOf(arg1), i000), Local1) CH06(arg0, 68, 0xff) - LNotEqual(i000, DeRefOf(arg1)) + Store (LNotEqual(i000, DeRefOf(arg1)), Local1) CH06(arg0, 69, 0xff) // LOr - LOr(DeRefOf(arg1), i000) + Store (LOr(DeRefOf(arg1), i000), Local1) CH06(arg0, 70, 0xff) - LOr(i000, DeRefOf(arg1)) + Store (LOr(i000, DeRefOf(arg1)), Local1) CH06(arg0, 71, 0xff) // Mod - Mod(DeRefOf(arg1), i000) - CH06(arg0, 72, 0xff) - - Mod(i000, DeRefOf(arg1)) - CH06(arg0, 73, 0xff) - Mod(DeRefOf(arg1), i000, Local1) CH06(arg0, 74, 0xff) @@ -1857,12 +1512,6 @@ Method(m4b0, 1) // Multiply - Multiply(DeRefOf(arg1), i000) - CH06(arg0, 76, 0xff) - - Multiply(i000, DeRefOf(arg1)) - CH06(arg0, 77, 0xff) - Multiply(DeRefOf(arg1), i000, Local1) CH06(arg0, 78, 0xff) @@ -1871,12 +1520,6 @@ Method(m4b0, 1) // NAnd - NAnd(DeRefOf(arg1), i000) - CH06(arg0, 80, 0xff) - - NAnd(i000, DeRefOf(arg1)) - CH06(arg0, 81, 0xff) - NAnd(DeRefOf(arg1), i000, Local1) CH06(arg0, 82, 0xff) @@ -1885,12 +1528,6 @@ Method(m4b0, 1) // NOr - NOr(DeRefOf(arg1), i000) - CH06(arg0, 84, 0xff) - - NOr(i000, DeRefOf(arg1)) - CH06(arg0, 85, 0xff) - NOr(DeRefOf(arg1), i000, Local1) CH06(arg0, 86, 0xff) @@ -1899,12 +1536,6 @@ Method(m4b0, 1) // Or - Or(DeRefOf(arg1), i000) - CH06(arg0, 88, 0xff) - - Or(i000, DeRefOf(arg1)) - CH06(arg0, 89, 0xff) - Or(DeRefOf(arg1), i000, Local1) CH06(arg0, 90, 0xff) @@ -1913,12 +1544,6 @@ Method(m4b0, 1) // ShiftLeft - ShiftLeft(DeRefOf(arg1), i000) - CH06(arg0, 92, 0xff) - - ShiftLeft(i000, DeRefOf(arg1)) - CH06(arg0, 93, 0xff) - ShiftLeft(DeRefOf(arg1), i000, Local1) CH06(arg0, 94, 0xff) @@ -1927,12 +1552,6 @@ Method(m4b0, 1) // ShiftRight - ShiftRight(DeRefOf(arg1), i000) - CH06(arg0, 96, 0xff) - - ShiftRight(i000, DeRefOf(arg1)) - CH06(arg0, 97, 0xff) - ShiftRight(DeRefOf(arg1), i000, Local1) CH06(arg0, 98, 0xff) @@ -1941,12 +1560,6 @@ Method(m4b0, 1) // Subtract - Subtract(DeRefOf(arg1), i000) - CH06(arg0, 100, 0xff) - - Subtract(i000, DeRefOf(arg1)) - CH06(arg0, 101, 0xff) - Subtract(DeRefOf(arg1), i000, Local1) CH06(arg0, 102, 0xff) @@ -1955,12 +1568,6 @@ Method(m4b0, 1) // ToString - ToString(DeRefOf(arg1), 1) - CH06(arg0, 104, 0xff) - - ToString(i000, DeRefOf(arg1)) - CH06(arg0, 105, 0xff) - ToString(DeRefOf(arg1), 1, Local1) CH06(arg0, 106, 0xff) @@ -1969,17 +1576,11 @@ Method(m4b0, 1) // Wait - Wait(e000, DeRefOf(arg1)) + Store(Wait(e000, DeRefOf(arg1)), Local1) CH06(arg0, 109, 0xff) // XOr - XOr(DeRefOf(arg1), i000) - CH06(arg0, 110, 0xff) - - XOr(i000, DeRefOf(arg1)) - CH06(arg0, 111, 0xff) - XOr(DeRefOf(arg1), i000, Local1) CH06(arg0, 112, 0xff) @@ -1988,15 +1589,6 @@ Method(m4b0, 1) // Mid - Mid(DeRefOf(arg1), 1, 1) - CH06(arg0, 114, 0xff) - - Mid("123", DeRefOf(arg1), 1) - CH06(arg0, 115, 0xff) - - Mid("123", 1, DeRefOf(arg1)) - CH06(arg0, 116, 0xff) - Mid(DeRefOf(arg1), 1, 1, Local1) CH06(arg0, 117, 0xff) @@ -2008,16 +1600,16 @@ Method(m4b0, 1) // Match - Match(DeRefOf(arg1), MTR, 0, MTR, 0, 0) + Store (Match(DeRefOf(arg1), MTR, 0, MTR, 0, 0), Local1) CH06(arg0, 120, 0xff) - Match(Package(){1}, MTR, DeRefOf(arg1), MTR, 0, 0) + Store (Match(Package(){1}, MTR, DeRefOf(arg1), MTR, 0, 0), Local1) CH06(arg0, 121, 0xff) - Match(Package(){1}, MTR, 0, MTR, DeRefOf(arg1), 0) + Store (Match(Package(){1}, MTR, 0, MTR, DeRefOf(arg1), 0), Local1) CH06(arg0, 122, 0xff) - Match(Package(){1}, MTR, 0, MTR, 0, DeRefOf(arg1)) + Store (Match(Package(){1}, MTR, 0, MTR, 0, DeRefOf(arg1)), Local1) CH06(arg0, 123, 0xff) return (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 e89177911..57b0b1051 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 @@ -60,32 +60,22 @@ Method(m4b1, 1) // DerefOf if (y083) { - DerefOf(i000) + Store (DerefOf(i000), Local1) CH06(arg0, 0, 47) } // Index - Index(i000, 0) - CH06(arg0, 1, 47) - Index(i000, 0, Local1) CH06(arg0, 2, 47) // ConcatenateResTemplate - ConcatenateResTemplate(i000, ResourceTemplate(){}) - CH06(arg0, 3, 47) - - ConcatenateResTemplate(ResourceTemplate(){}, i000) - CH06(arg0, 4, 47) - ConcatenateResTemplate(i000, ResourceTemplate(){}, Local1) CH06(arg0, 5, 47) ConcatenateResTemplate(ResourceTemplate(){}, i000, Local1) CH06(arg0, 6, 47) - } // Global Named Object @@ -94,26 +84,17 @@ Method(m4b1, 1) // DerefOf if (y083) { - DerefOf(i100) + Store (DerefOf(i100), Local1) CH06(arg0, 7, 47) } // Index - Index(i100, 0) - CH06(arg0, 8, 47) - Index(i100, 0, Local1) CH06(arg0, 9, 47) // ConcatenateResTemplate - ConcatenateResTemplate(i100, ResourceTemplate(){}) - CH06(arg0, 10, 47) - - ConcatenateResTemplate(ResourceTemplate(){}, i100) - CH06(arg0, 11, 47) - ConcatenateResTemplate(i100, ResourceTemplate(){}, Local1) CH06(arg0, 12, 47) @@ -126,7 +107,7 @@ Method(m4b1, 1) { // DerefOf - DerefOf(arg1) + Store (DerefOf(arg1), Local1) CH06(arg0, 14, 47) // Release @@ -146,17 +127,11 @@ Method(m4b1, 1) // Acquire - Acquire(arg1, 0) + Store(Acquire(arg1, 0), Local1) CH06(arg0, 18, 47) // ConcatenateResTemplate - ConcatenateResTemplate(arg1, ResourceTemplate(){}) - CH06(arg0, 19, 47) - - ConcatenateResTemplate(ResourceTemplate(){}, arg1) - CH06(arg0, 20, 47) - ConcatenateResTemplate(arg1, ResourceTemplate(){}, Local1) CH06(arg0, 21, 47) @@ -165,20 +140,17 @@ Method(m4b1, 1) // Index - Index(arg1, 0) - CH06(arg0, 23, 47) - Index(arg1, 0, Local1) CH06(arg0, 24, 47) // Wait - Wait(arg1, 0) + Store(Wait(arg1, 0), Local1) CH06(arg0, 25, 47) // Match - Match(arg1, MTR, 0, MTR, 0, 0) + Store (Match(arg1, MTR, 0, MTR, 0, 0), Local1) CH06(arg0, 26, 47) } @@ -189,7 +161,7 @@ Method(m4b1, 1) // DerefOf - DerefOf(Local0) + Store(DerefOf(Local0), Local1) CH06(arg0, 27, 47) // Release @@ -209,17 +181,11 @@ Method(m4b1, 1) // Acquire - Acquire(Local0, 0) + Store(Acquire(Local0, 0), Local1) CH06(arg0, 31, 47) // ConcatenateResTemplate - ConcatenateResTemplate(Local0, ResourceTemplate(){}) - CH06(arg0, 32, 47) - - ConcatenateResTemplate(ResourceTemplate(){}, Local0) - CH06(arg0, 33, 47) - ConcatenateResTemplate(Local0, ResourceTemplate(){}, Local1) CH06(arg0, 34, 47) @@ -228,20 +194,17 @@ Method(m4b1, 1) // Index - Index(Local0, 0) - CH06(arg0, 36, 47) - Index(Local0, 0, Local1) CH06(arg0, 37, 47) // Wait - Wait(Local0, 0) + Store(Wait(Local0, 0), Local1) CH06(arg0, 38, 47) // Match - Match(Local0, MTR, 0, MTR, 0, 0) + Store (Match(Local0, MTR, 0, MTR, 0, 0), Local1) CH06(arg0, 39, 47) } @@ -252,24 +215,24 @@ Method(m4b1, 1) // DeRefOf(Index(Package, Ind)) - DerefOf(DeRefOf(Index(p000, 0))) + Store (DerefOf(DeRefOf(Index(p000, 0))), Local1) CH06(arg0, 40, 47) - Index(DeRefOf(Index(p000, 0)), 0) + Store (Index(DeRefOf(Index(p000, 0)), 0), Local1) CH06(arg0, 41, 47) - Match(DeRefOf(Index(p000, 0)), MTR, 0, MTR, 0, 0) + Store (Match(DeRefOf(Index(p000, 0)), MTR, 0, MTR, 0, 0), Local1) CH06(arg0, 42, 47) // DeRefOf(Index(Package, Ind, Dest)) - DerefOf(DeRefOf(Index(p000, 0, Local0))) + Store (DerefOf(DeRefOf(Index(p000, 0, Local0))), Local1) CH06(arg0, 43, 47) - Index(DeRefOf(Index(p000, 0, Local0)), 0) + Store (Index(DeRefOf(Index(p000, 0, Local0)), 0), Local1) CH06(arg0, 44, 47) - Match(DeRefOf(Index(p000, 0, Local0)), MTR, 0, MTR, 0, 0) + Store (Match(DeRefOf(Index(p000, 0, Local0)), MTR, 0, MTR, 0, 0), Local1) CH06(arg0, 45, 47) } @@ -285,16 +248,16 @@ Method(m4b1, 1) return (1) } - DerefOf(arg1) + Store (DerefOf(arg1), Local1) CH03(ts, z093, 0, 0, 0) - DerefOf(DerefOf(arg1)) + Store (DerefOf(DerefOf(arg1)), Local1) CH06(arg0, 47, 47) - Index(DerefOf(arg1), 0) + Store (Index(DerefOf(arg1), 0), Local1) CH06(arg0, 48, 47) - Match(DerefOf(arg1), MTR, 0, MTR, 0, 0) + Store (Match(DerefOf(arg1), MTR, 0, MTR, 0, 0), Local1) CH06(arg0, 49, 47) return (0) @@ -319,7 +282,7 @@ Method(m4b1, 1) } } - DerefOf(m000(1)) + Store (DerefOf(m000(1)), Local1) CH06(arg0, 51, 47) CH00(arg0, 1) @@ -341,23 +304,23 @@ Method(m4b1, 1) CH00(arg0, 4) } - Acquire(m000(5), 0) + Store(Acquire(m000(5), 0), Local1) CH06(arg0, 55, 47) if (y600) { CH00(arg0, 5) } - Index(m000(6), 0) + Store (Index(m000(6), 0), Local1) CH06(arg0, 56, 47) CH00(arg0, 6) - Wait(m000(7), 0) + Store(Wait(m000(7), 0), Local1) CH06(arg0, 57, 47) if (y600) { CH00(arg0, 7) } - Match(m000(8), MTR, 0, MTR, 0, 0) + Store (Match(m000(8), MTR, 0, MTR, 0, 0), Local1) CH06(arg0, 58, 47) CH00(arg0, 8) } @@ -395,19 +358,19 @@ Method(m4b1, 1) Store(0, i001) - DerefOf(m000(1, lpC0)) + Store (DerefOf(m000(1, lpC0)), Local1) CH03(ts, z093, Add(1, lpC0), 0, 0) CH00(arg0, 1) - DerefOf(DerefOf(m000(2, lpC0))) + Store (DerefOf(DerefOf(m000(2, lpC0))), Local1) CH06(arg0, Add(60, Local0), 47) CH00(arg0, 2) - Index(DerefOf(m000(3, lpC0)), 0) + Store (Index(DerefOf(m000(3, lpC0)), 0), Local1) CH06(arg0, Add(61, Local0), 47) CH00(arg0, 3) - Match(DerefOf(m000(4, lpC0)), MTR, 0, MTR, 0, 0) + Store (Match(DerefOf(m000(4, lpC0)), MTR, 0, MTR, 0, 0), Local1) CH06(arg0, Add(62, Local0), 47) CH00(arg0, 4) 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 dc1014b8e..962918a1d 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 @@ -56,26 +56,17 @@ Method(m4b2, 1) // DerefOf if (y083) { - DerefOf(s000) + Store (DerefOf(s000), Local1) CH06(arg0, 0, 47) } // Index - Index(s000, 0) - CH03(ts, z094, 0, 0, 0) - Index(s000, 0, Local1) CH03(ts, z094, 1, 0, 0) // ConcatenateResTemplate - ConcatenateResTemplate(s000, ResourceTemplate(){}) - CH06(arg0, 1, 47) - - ConcatenateResTemplate(ResourceTemplate(){}, s000) - CH06(arg0, 2, 47) - ConcatenateResTemplate(s000, ResourceTemplate(){}, Local1) CH06(arg0, 3, 47) @@ -88,26 +79,17 @@ Method(m4b2, 1) Method(m001, 1) { if (y083) { - DerefOf(s100) + Store (DerefOf(s100), Local1) CH06(arg0, 5, 47) } // Index - Index(s100, 0) - CH03(ts, z094, 2, 0, 0) - Index(s100, 0, Local1) CH03(ts, z094, 3, 0, 0) // ConcatenateResTemplate - ConcatenateResTemplate(s100, ResourceTemplate(){}) - CH06(arg0, 6, 47) - - ConcatenateResTemplate(ResourceTemplate(){}, s100) - CH06(arg0, 7, 47) - ConcatenateResTemplate(s100, ResourceTemplate(){}, Local1) CH06(arg0, 8, 47) @@ -121,7 +103,7 @@ Method(m4b2, 1) { // DerefOf - DerefOf(arg1) + Store (DerefOf(arg1), Local1) CH06(arg0, 10, 47) // Release @@ -141,17 +123,11 @@ Method(m4b2, 1) // Acquire - Acquire(arg1, 0) + Store(Acquire(arg1, 0), Local1) CH06(arg0, 14, 47) // ConcatenateResTemplate - ConcatenateResTemplate(arg1, ResourceTemplate(){}) - CH06(arg0, 15, 47) - - ConcatenateResTemplate(ResourceTemplate(){}, arg1) - CH06(arg0, 16, 47) - ConcatenateResTemplate(arg1, ResourceTemplate(){}, Local1) CH06(arg0, 17, 47) @@ -160,20 +136,17 @@ Method(m4b2, 1) // Index - Index(arg1, 0) - CH03(ts, z094, 4, 0, 0) - Index(arg1, 0, Local1) CH03(ts, z094, 5, 0, 0) // Wait - Wait(arg1, 0) + Store(Wait(arg1, 0), Local1) CH06(arg0, 19, 47) // Match - Match(arg1, MTR, 0, MTR, 0, 0) + Store (Match(arg1, MTR, 0, MTR, 0, 0), Local1) CH06(arg0, 20, 47) } @@ -184,7 +157,7 @@ Method(m4b2, 1) // DerefOf - DerefOf(Local0) + Store (DerefOf(Local0), Local1) CH06(arg0, 21, 47) // Release @@ -204,17 +177,11 @@ Method(m4b2, 1) // Acquire - Acquire(Local0, 0) + Store(Acquire(Local0, 0), Local1) CH06(arg0, 25, 47) // ConcatenateResTemplate - ConcatenateResTemplate(Local0, ResourceTemplate(){}) - CH06(arg0, 26, 47) - - ConcatenateResTemplate(ResourceTemplate(){}, Local0) - CH06(arg0, 27, 47) - ConcatenateResTemplate(Local0, ResourceTemplate(){}, Local1) CH06(arg0, 28, 47) @@ -223,20 +190,17 @@ Method(m4b2, 1) // Index - Index(Local0, 0) - CH03(ts, z094, 6, 0, 0) - Index(Local0, 0, Local1) CH03(ts, z094, 7, 0, 0) // Wait - Wait(Local0, 0) + Store(Wait(Local0, 0), Local1) CH06(arg0, 30, 47) // Match - Match(Local0, MTR, 0, MTR, 0, 0) + Store (Match(Local0, MTR, 0, MTR, 0, 0), Local1) CH06(arg0, 31, 47) } @@ -247,24 +211,24 @@ Method(m4b2, 1) // DeRefOf(Index(Package, Ind)) - DerefOf(DeRefOf(Index(p000, 0))) + Store (DerefOf(DeRefOf(Index(p000, 0))), Local1) CH06(arg0, 32, 5) - Index(DeRefOf(Index(p000, 0)), 0) + Store (Index(DeRefOf(Index(p000, 0)), 0), Local1) CH03(ts, z094, 8, 0, 0) - Match(DeRefOf(Index(p000, 0)), MTR, 0, MTR, 0, 0) + Store (Match(DeRefOf(Index(p000, 0)), MTR, 0, MTR, 0, 0), Local1) CH06(arg0, 33, 47) // DeRefOf(Index(Package, Ind, Dest)) - DerefOf(DeRefOf(Index(p000, 0, Local0))) + Store (DerefOf(DeRefOf(Index(p000, 0, Local0))), Local1) CH06(arg0, 34, 5) - Index(DeRefOf(Index(p000, 0, Local0)), 0) + Store (Index(DeRefOf(Index(p000, 0, Local0)), 0), Local1) CH03(ts, z094, 9, 0, 0) - Match(DeRefOf(Index(p000, 0, Local0)), MTR, 0, MTR, 0, 0) + Store (Match(DeRefOf(Index(p000, 0, Local0)), MTR, 0, MTR, 0, 0), Local1) CH06(arg0, 35, 47) } @@ -280,16 +244,16 @@ Method(m4b2, 1) return (1) } - DerefOf(arg1) + Store (DerefOf(arg1), Local1) CH03(ts, z094, 10, 0, 0) - DerefOf(DerefOf(arg1)) + Store (DerefOf(DerefOf(arg1)), Local1) CH06(arg0, 37, 5) - Index(DerefOf(arg1), 0) + Store (Index(DerefOf(arg1), 0), Local1) CH03(ts, z094, 11, 0, 0) - Match(DerefOf(arg1), MTR, 0, MTR, 0, 0) + Store (Match(DerefOf(arg1), MTR, 0, MTR, 0, 0), Local1) CH06(arg0, 38, 47) return (0) @@ -314,7 +278,7 @@ Method(m4b2, 1) } } - DerefOf(m000(1)) + Store (DerefOf(m000(1)), Local1) CH06(arg0, 40, 5) CH00(arg0, 1) @@ -336,14 +300,14 @@ Method(m4b2, 1) CH00(arg0, 4) } - Acquire(m000(5), 0) + Store(Acquire(m000(5), 0), Local1) CH06(arg0, 44, 47) if (y600) { CH00(arg0, 5) } CH03(ts, z094, 12, 0, 0) - Index(m000(6), 0) + Store (Index(m000(6), 0), Local1) if (y900) { CH03(ts, z094, 12, 0, 0) CH00(arg0, 6) @@ -351,13 +315,13 @@ Method(m4b2, 1) CH04(ts, 0, 85, z094, 0x123, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } - Wait(m000(7), 0) + Store(Wait(m000(7), 0), Local1) CH06(arg0, 45, 47) if (y600) { CH00(arg0, 7) } - Match(m000(8), MTR, 0, MTR, 0, 0) + Store (Match(m000(8), MTR, 0, MTR, 0, 0), Local1) CH06(arg0, 46, 47) CH00(arg0, 8) } @@ -395,19 +359,19 @@ Method(m4b2, 1) Store(0, i000) - DerefOf(m000(1, lpC0)) + Store (DerefOf(m000(1, lpC0)), Local1) CH03(ts, z094, Add(13, lpC0), 0, 0) CH00(arg0, 1) - DerefOf(DerefOf(m000(2, lpC0))) + Store (DerefOf(DerefOf(m000(2, lpC0))), Local1) CH06(arg0, Add(48, Local0), 47) CH00(arg0, 2) - Index(DerefOf(m000(3, lpC0)), 0) + Store (Index(DerefOf(m000(3, lpC0)), 0), Local1) CH06(arg0, Add(49, Local0), 47) CH00(arg0, 3) - Match(DerefOf(m000(4, lpC0)), MTR, 0, MTR, 0, 0) + Store (Match(DerefOf(m000(4, lpC0)), MTR, 0, MTR, 0, 0), Local1) CH06(arg0, Add(50, Local0), 47) CH00(arg0, 4) 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 569b3fa93..ac17f168f 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 @@ -52,11 +52,11 @@ Method(m4b3, 1) Name(b000, Buffer(){0x63}) if (y083) { - DerefOf(b000) + Store (DerefOf(b000), Local1) CH06(arg0, 0, 47) } - Index(b000, 0) + Store (Index(b000, 0), Local1) CH03(ts, z095, 0, 0, 0) } @@ -64,18 +64,18 @@ Method(m4b3, 1) Method(m001, 1) { if (y083) { - DerefOf(b100) + Store (DerefOf(b100), Local1) CH06(arg0, 1, 47) } - Index(b100, 0) + Store (Index(b100, 0), Local1) CH03(ts, z095, 1, 0, 0) } // Argument Method(m002, 2) { - DerefOf(arg1) + Store (DerefOf(arg1), Local1) CH06(arg0, 2, 47) Release(arg1) @@ -87,16 +87,16 @@ Method(m4b3, 1) Signal(arg1) CH06(arg0, 5, 47) - Acquire(arg1, 0) + Store(Acquire(arg1, 0), Local1) CH06(arg0, 6, 47) - Index(arg1, 0) + Store (Index(arg1, 0), Local1) CH03(ts, z095, 2, 0, 0) - Wait(arg1, 0) + Store(Wait(arg1, 0), Local1) CH06(arg0, 7, 47) - Match(arg1, MTR, 0, MTR, 0, 0) + Store (Match(arg1, MTR, 0, MTR, 0, 0), Local1) CH06(arg0, 8, 47) } @@ -105,7 +105,7 @@ Method(m4b3, 1) { Store(Buffer(){0x63}, Local0) - DerefOf(Local0) + Store (DerefOf(Local0), Local1) CH06(arg0, 9, 47) Release(Local0) @@ -117,16 +117,16 @@ Method(m4b3, 1) Signal(Local0) CH06(arg0, 12, 47) - Acquire(Local0, 0) + Store(Acquire(Local0, 0), Local1) CH06(arg0, 13, 47) - Index(Local0, 0) + Store (Index(Local0, 0), Local1) CH03(ts, z095, 3, 0, 0) - Wait(Local0, 0) + Store(Wait(Local0, 0), Local1) CH06(arg0, 14, 47) - Match(Local0, MTR, 0, MTR, 0, 0) + Store (Match(Local0, MTR, 0, MTR, 0, 0), Local1) CH06(arg0, 15, 47) } @@ -135,26 +135,15 @@ Method(m4b3, 1) { Name(p000, Package(){Buffer(){0x63}}) - // DeRefOf(Index(Package, Ind)) - - DerefOf(DeRefOf(Index(p000, 0))) - CH06(arg0, 16, 47) - - Index(DeRefOf(Index(p000, 0)), 0) - CH03(ts, z095, 4, 0, 0) - - Match(DeRefOf(Index(p000, 0)), MTR, 0, MTR, 0, 0) - CH06(arg0, 17, 47) - // DeRefOf(Index(Package, Ind, Dest)) - DerefOf(DeRefOf(Index(p000, 0, Local0))) + Store (DerefOf(DeRefOf(Index(p000, 0, Local0))), Local1) CH06(arg0, 18, 47) - Index(DeRefOf(Index(p000, 0, Local0)), 0) + Store (Index(DeRefOf(Index(p000, 0, Local0)), 0), Local1) CH03(ts, z095, 5, 0, 0) - Match(DeRefOf(Index(p000, 0, Local0)), MTR, 0, MTR, 0, 0) + Store (Match(DeRefOf(Index(p000, 0, Local0)), MTR, 0, MTR, 0, 0), Local1) CH06(arg0, 19, 47) } @@ -170,16 +159,16 @@ Method(m4b3, 1) return (1) } - DerefOf(arg1) + Store (DerefOf(arg1), Local1) CH03(ts, z095, 6, 0, 0) - DerefOf(DerefOf(arg1)) + Store (DerefOf(DerefOf(arg1)), Local1) CH06(arg0, 21, 47) - Index(DerefOf(arg1), 0) + Store (Index(DerefOf(arg1), 0), Local1) CH03(ts, z095, 7, 0, 0) - Match(DerefOf(arg1), MTR, 0, MTR, 0, 0) + Store (Match(DerefOf(arg1), MTR, 0, MTR, 0, 0), Local1) CH06(arg0, 22, 47) return (0) @@ -204,7 +193,7 @@ Method(m4b3, 1) } } - DerefOf(m000(1)) + Store (DerefOf(m000(1)), Local1) CH06(arg0, 24, 47) CH00(arg0, 1) @@ -226,14 +215,14 @@ Method(m4b3, 1) CH00(arg0, 4) } - Acquire(m000(5), 0) + Store(Acquire(m000(5), 0), Local1) CH06(arg0, 28, 47) if (y600) { CH00(arg0, 5) } CH03(ts, z095, 12, 0, 0) - Index(m000(6), 0) + Store (Index(m000(6), 0), Local1) if (y900) { CH03(ts, z095, 8, 0, 0) CH00(arg0, 6) @@ -241,13 +230,13 @@ Method(m4b3, 1) CH04(ts, 0, 85, z095, 0x123, 0, 0) // AE_INDEX_TO_NOT_ATTACHED } - Wait(m000(7), 0) + Store(Wait(m000(7), 0), Local1) CH06(arg0, 29, 47) if (y600) { CH00(arg0, 7) } - Match(m000(8), MTR, 0, MTR, 0, 0) + Store (Match(m000(8), MTR, 0, MTR, 0, 0), Local1) CH06(arg0, 30, 47) CH00(arg0, 8) } @@ -285,19 +274,19 @@ Method(m4b3, 1) Store(0, i000) - DerefOf(m000(1, lpC0)) + Store (DerefOf(m000(1, lpC0)), Local1) CH03(ts, z095, Add(9, lpC0), 0, 0) CH00(arg0, 1) - DerefOf(DerefOf(m000(2, lpC0))) + Store (DerefOf(DerefOf(m000(2, lpC0))), Local1) CH06(arg0, Add(32, Local0), 47) CH00(arg0, 2) - Index(DerefOf(m000(3, lpC0)), 0) + Store (Index(DerefOf(m000(3, lpC0)), 0), Local1) CH06(arg0, Add(33, Local0), 47) CH00(arg0, 3) - Match(DerefOf(m000(4, lpC0)), MTR, 0, MTR, 0, 0) + Store (Match(DerefOf(m000(4, lpC0)), MTR, 0, MTR, 0, 0), Local1) CH06(arg0, Add(34, Local0), 47) CH00(arg0, 4) 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 4edcdad55..afe5c0736 100644 --- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_04_pckg.asl +++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_04_pckg.asl @@ -59,7 +59,7 @@ Method(m4b4, 1) // CondRefOf - CondRefOf(p000) + Store (CondRefOf(p000), Local1) CH03(ts, z096, 0, 0, 0) CondRefOf(p000, Local1) @@ -75,7 +75,7 @@ Method(m4b4, 1) // DerefOf if (y083) { - DerefOf(p000) + Store (DerefOf(p000), Local1) CH06(arg0, 0, 47) } @@ -93,12 +93,12 @@ Method(m4b4, 1) // ObjectType - ObjectType(p000) + Store (ObjectType(p000), Local1) CH03(ts, z096, 3, 0, 0) // RefOf - RefOf(p000) + Store (RefOf(p000), Local1) CH03(ts, z096, 4, 0, 0) // Release @@ -109,7 +109,7 @@ Method(m4b4, 1) // SizeOf - SizeOf(p000) + Store (SizeOf(p000), Local1) CH03(ts, z096, 5, 0, 0) // Sleep @@ -147,10 +147,10 @@ Method(m4b4, 1) // Index - Index(p000, 0) + Index(p000, 0, Local1) CH03(ts, z096, 7, 0, 0) - Index(p000, 0, Local1) + Store (Index(p000, 0), Local1) CH03(ts, z096, 8, 0, 0) // LEqual @@ -193,7 +193,7 @@ Method(m4b4, 1) // Match - Match(p000, MTR, 0, MTR, 0, 0) + Store (Match(p000, MTR, 0, MTR, 0, 0), Local1) CH03(ts, z096, 9, 0, 0) } @@ -202,9 +202,6 @@ Method(m4b4, 1) { // CondRefOf - CondRefOf(p100) - CH03(ts, z096, 10, 0, 0) - CondRefOf(p100, Local1) CH03(ts, z096, 11, 0, 0) @@ -218,7 +215,7 @@ Method(m4b4, 1) // DerefOf if (y083) { - DerefOf(p100) + Store (DerefOf(p100), Local1) CH06(arg0, 1, 47) } @@ -236,12 +233,12 @@ Method(m4b4, 1) // ObjectType - ObjectType(p100) + Store (ObjectType(p100), Local1) CH03(ts, z096, 13, 0, 0) // RefOf - RefOf(p100) + Store (RefOf(p100), Local1) CH03(ts, z096, 14, 0, 0) // Release @@ -252,7 +249,7 @@ Method(m4b4, 1) // SizeOf - SizeOf(p100) + Store (SizeOf(p100), Local1) CH03(ts, z096, 15, 0, 0) // Sleep @@ -290,10 +287,7 @@ Method(m4b4, 1) // Index - Index(p100, 0) - CH03(ts, z096, 17, 0, 0) - - Index(p100, 0, Local1) + Store (Index(p100, 0), Local1) CH03(ts, z096, 18, 0, 0) // LEqual @@ -336,7 +330,7 @@ Method(m4b4, 1) // Match - Match(p100, MTR, 0, MTR, 0, 0) + Store (Match(p100, MTR, 0, MTR, 0, 0), Local1) CH03(ts, z096, 19, 0, 0) } @@ -347,9 +341,6 @@ Method(m4b4, 1) // CondRefOf - CondRefOf(arg1) - CH03(ts, z096, 20, 0, 0) - CondRefOf(arg1, Local1) CH03(ts, z096, 21, 0, 0) @@ -365,30 +356,21 @@ Method(m4b4, 1) // DerefOf - DerefOf(arg1) + Store (DerefOf(arg1), Local1) CH06(arg0, 3, 47) // FindSetLeftBit - FindSetLeftBit(arg1) - CH06(arg0, 4, 47) - FindSetLeftBit(arg1, Local1) CH06(arg0, 5, 47) // FindSetRightBit - FindSetRightBit(arg1) - CH06(arg0, 6, 47) - FindSetRightBit(arg1, Local1) CH06(arg0, 7, 47) // FromBCD - FromBCD(arg1) - CH06(arg0, 8, 47) - FromBCD(arg1, Local1) CH06(arg0, 9, 47) @@ -399,25 +381,22 @@ Method(m4b4, 1) // LNot - LNot(arg1) + Store (LNot(arg1), Local1) CH06(arg0, 11, 47) // Not - Not(arg1) - CH06(arg0, 12, 47) - Not(arg1, Local1) CH06(arg0, 13, 47) // ObjectType - ObjectType(arg1) + Store (ObjectType(arg1), Local1) CH03(ts, z096, 23, 0, 0) // RefOf - RefOf(arg1) + Store (RefOf(arg1), Local1) CH03(ts, z096, 24, 0, 0) // Release @@ -437,7 +416,7 @@ Method(m4b4, 1) // SizeOf - SizeOf(arg1) + Store (SizeOf(arg1), Local1) CH03(ts, z096, 25, 0, 0) // Sleep @@ -457,57 +436,36 @@ Method(m4b4, 1) // ToBCD - ToBCD(arg1) - CH06(arg0, 20, 47) - ToBCD(arg1, Local1) CH06(arg0, 21, 47) // ToBuffer - ToBuffer(arg1) - CH06(arg0, 22, 47) - ToBuffer(arg1, Local1) CH06(arg0, 23, 47) // ToDecimalString - ToDecimalString(arg1) - CH06(arg0, 24, 47) - ToDecimalString(arg1, Local1) CH06(arg0, 25, 47) // ToHexString - ToHexString(arg1) - CH06(arg0, 26, 47) - ToHexString(arg1, Local1) CH06(arg0, 27, 47) // ToInteger - ToInteger(arg1) - CH06(arg0, 28, 47) - ToInteger(arg1, Local1) CH06(arg0, 29, 47) // Acquire - Acquire(arg1, 100) + Store(Acquire(arg1, 100), Local1) CH06(arg0, 30, 47) // Add - Add(arg1, i000) - CH06(arg0, 31, 47) - - Add(i000, arg1) - CH06(arg0, 32, 47) - Add(arg1, i000, Local1) CH06(arg0, 33, 47) @@ -516,12 +474,6 @@ Method(m4b4, 1) // And - And(arg1, i000) - CH06(arg0, 35, 47) - - And(i000, arg1) - CH06(arg0, 36, 47) - And(arg1, i000, Local1) CH06(arg0, 37, 47) @@ -530,12 +482,6 @@ Method(m4b4, 1) // Concatenate - Concatenate(arg1, i000) - CH06(arg0, 39, 47) - - Concatenate(i000, arg1) - CH06(arg0, 40, 47) - Concatenate(arg1, i000, Local1) CH06(arg0, 41, 47) @@ -544,12 +490,6 @@ Method(m4b4, 1) // ConcatenateResTemplate - ConcatenateResTemplate(arg1, ResourceTemplate(){}) - CH06(arg0, 43, 47) - - ConcatenateResTemplate(ResourceTemplate(){}, arg1) - CH06(arg0, 44, 47) - ConcatenateResTemplate(arg1, ResourceTemplate(){}, Local1) CH06(arg0, 45, 47) @@ -558,12 +498,6 @@ Method(m4b4, 1) // Divide - Divide(arg1, i000) - CH06(arg0, 47, 47) - - Divide(i000, arg1) - CH06(arg0, 48, 47) - Divide(arg1, i000, Local2) CH06(arg0, 49, 47) @@ -583,12 +517,6 @@ Method(m4b4, 1) // Index - Index(arg1, 0) - CH03(ts, z096, 27, 0, 0) - - Index("0", arg1) - CH06(arg0, 55, 47) - Index(arg1, 0, Local1) CH03(ts, z096, 28, 0, 0) @@ -597,68 +525,62 @@ Method(m4b4, 1) // LEqual - LEqual(arg1, i000) + Store (LEqual(arg1, i000), Local1) CH06(arg0, 58, 47) - LEqual(i000, arg1) + Store (LEqual(i000, arg1), Local1) CH06(arg0, 59, 47) // LGreater - LGreater(arg1, i000) + Store (LGreater(arg1, i000), Local1) CH06(arg0, 60, 47) - LGreater(i000, arg1) + Store (LGreater(i000, arg1), Local1) CH06(arg0, 61, 47) // LGreaterEqual - LGreaterEqual(arg1, i000) + Store (LGreaterEqual(arg1, i000), Local1) CH06(arg0, 62, 0xff) - LGreaterEqual(i000, arg1) + Store (LGreaterEqual(i000, arg1), Local1) CH06(arg0, 63, 0xff) // LLess - LLess(arg1, i000) + Store (LLess(arg1, i000), Local1) CH06(arg0, 64, 47) - LLess(i000, arg1) + Store (LLess(i000, arg1), Local1) CH06(arg0, 65, 47) // LLessEqual - LLessEqual(arg1, i000) + Store (LLessEqual(arg1, i000), Local1) CH06(arg0, 66, 0xff) - LLessEqual(i000, arg1) + Store (LLessEqual(i000, arg1), Local1) CH06(arg0, 67, 0xff) // LNotEqual - LNotEqual(arg1, i000) + Store (LNotEqual(arg1, i000), Local1) CH06(arg0, 68, 0xff) - LNotEqual(i000, arg1) + Store (LNotEqual(i000, arg1), Local1) CH06(arg0, 69, 0xff) // LOr - LOr(arg1, i000) + Store (LOr(arg1, i000), Local1) CH06(arg0, 70, 47) - LOr(i000, arg1) + Store (LOr(i000, arg1), Local1) CH06(arg0, 71, 47) // Mod - Mod(arg1, i000) - CH06(arg0, 72, 47) - - Mod(i000, arg1) - CH06(arg0, 73, 47) - Mod(arg1, i000, Local1) CH06(arg0, 74, 47) @@ -667,12 +589,6 @@ Method(m4b4, 1) // Multiply - Multiply(arg1, i000) - CH06(arg0, 76, 47) - - Multiply(i000, arg1) - CH06(arg0, 77, 47) - Multiply(arg1, i000, Local1) CH06(arg0, 78, 47) @@ -681,12 +597,6 @@ Method(m4b4, 1) // NAnd - NAnd(arg1, i000) - CH06(arg0, 80, 47) - - NAnd(i000, arg1) - CH06(arg0, 81, 47) - NAnd(arg1, i000, Local1) CH06(arg0, 82, 47) @@ -695,12 +605,6 @@ Method(m4b4, 1) // NOr - NOr(arg1, i000) - CH06(arg0, 84, 47) - - NOr(i000, arg1) - CH06(arg0, 85, 47) - NOr(arg1, i000, Local1) CH06(arg0, 86, 47) @@ -709,12 +613,6 @@ Method(m4b4, 1) // Or - Or(arg1, i000) - CH06(arg0, 88, 47) - - Or(i000, arg1) - CH06(arg0, 89, 47) - Or(arg1, i000, Local1) CH06(arg0, 90, 47) @@ -723,12 +621,6 @@ Method(m4b4, 1) // ShiftLeft - ShiftLeft(arg1, i000) - CH06(arg0, 92, 47) - - ShiftLeft(i000, arg1) - CH06(arg0, 93, 47) - ShiftLeft(arg1, i000, Local1) CH06(arg0, 94, 47) @@ -737,12 +629,6 @@ Method(m4b4, 1) // ShiftRight - ShiftRight(arg1, i000) - CH06(arg0, 96, 47) - - ShiftRight(i000, arg1) - CH06(arg0, 97, 47) - ShiftRight(arg1, i000, Local1) CH06(arg0, 98, 47) @@ -751,12 +637,6 @@ Method(m4b4, 1) // Subtract - Subtract(arg1, i000) - CH06(arg0, 100, 47) - - Subtract(i000, arg1) - CH06(arg0, 101, 47) - Subtract(arg1, i000, Local1) CH06(arg0, 102, 47) @@ -765,12 +645,6 @@ Method(m4b4, 1) // ToString - ToString(arg1, 1) - CH06(arg0, 104, 47) - - ToString(i000, arg1) - CH06(arg0, 105, 47) - ToString(arg1, 1, Local1) CH06(arg0, 106, 47) @@ -779,20 +653,14 @@ Method(m4b4, 1) // Wait - Wait(arg1, i000) + Store(Wait(arg1, i000), Local1) CH06(arg0, 108, 47) - Wait(e000, arg1) + Store(Wait(e000, arg1), Local1) CH06(arg0, 109, 47) // XOr - XOr(arg1, i000) - CH06(arg0, 110, 47) - - XOr(i000, arg1) - CH06(arg0, 111, 47) - XOr(arg1, i000, Local1) CH06(arg0, 112, 47) @@ -801,15 +669,6 @@ Method(m4b4, 1) // Mid - Mid(arg1, 1, 1) - CH06(arg0, 114, 47) - - Mid("123", arg1, 1) - CH06(arg0, 115, 47) - - Mid("123", 1, arg1) - CH06(arg0, 116, 47) - Mid(arg1, 1, 1, Local1) CH06(arg0, 117, 47) @@ -821,16 +680,16 @@ Method(m4b4, 1) // Match - Match(arg1, MTR, 0, MTR, 0, 0) + Store (Match(arg1, MTR, 0, MTR, 0, 0), Local1) CH03(ts, z096, 29, 0, 0) - Match(Package(){1}, MTR, arg1, MTR, 0, 0) + Store (Match(Package(){1}, MTR, arg1, MTR, 0, 0), Local1) CH06(arg0, 121, 47) - Match(Package(){1}, MTR, 0, MTR, arg1, 0) + Store (Match(Package(){1}, MTR, 0, MTR, arg1, 0), Local1) CH06(arg0, 122, 47) - Match(Package(){1}, MTR, 0, MTR, 0, arg1) + Store (Match(Package(){1}, MTR, 0, MTR, 0, arg1), Local1) CH06(arg0, 123, 47) } @@ -841,9 +700,6 @@ Method(m4b4, 1) // CondRefOf - CondRefOf(Local0) - CH03(ts, z096, 30, 0, 0) - CondRefOf(Local0, Local1) CH03(ts, z096, 31, 0, 0) @@ -859,30 +715,21 @@ Method(m4b4, 1) // DerefOf - DerefOf(Local0) + Store (DerefOf(Local0), Local1) CH06(arg0, 2, 47) // FindSetLeftBit - FindSetLeftBit(Local0) - CH06(arg0, 3, 47) - FindSetLeftBit(Local0, Local1) CH06(arg0, 4, 47) // FindSetRightBit - FindSetRightBit(Local0) - CH06(arg0, 5, 47) - FindSetRightBit(Local0, Local1) CH06(arg0, 6, 47) // FromBCD - FromBCD(Local0) - CH06(arg0, 7, 47) - FromBCD(Local0, Local1) CH06(arg0, 8, 47) @@ -893,25 +740,22 @@ Method(m4b4, 1) // LNot - LNot(Local0) + Store (LNot(Local0), Local1) CH06(arg0, 10, 47) // Not - Not(Local0) - CH06(arg0, 11, 47) - Not(Local0, Local1) CH06(arg0, 12, 47) // ObjectType - ObjectType(Local0) + Store (ObjectType(Local0), Local1) CH03(ts, z096, 33, 0, 0) // RefOf - RefOf(Local0) + Store (RefOf(Local0), Local1) CH03(ts, z096, 34, 0, 0) // Release @@ -931,7 +775,7 @@ Method(m4b4, 1) // SizeOf - SizeOf(Local0) + Store (SizeOf(Local0), Local1) CH03(ts, z096, 35, 0, 0) // Sleep @@ -951,71 +795,41 @@ Method(m4b4, 1) // ToBCD - ToBCD(Local0) - CH06(arg0, 20, 47) - ToBCD(Local0, Local1) CH06(arg0, 21, 47) // ToBuffer - ToBuffer(Local0) - CH06(arg0, 22, 47) - ToBuffer(Local0, Local1) CH06(arg0, 23, 47) // ToDecimalString - ToDecimalString(Local0) - CH06(arg0, 24, 47) - ToDecimalString(Local0, Local1) CH06(arg0, 25, 47) // ToHexString - ToHexString(Local0) - CH06(arg0, 26, 47) - ToHexString(Local0, Local1) CH06(arg0, 27, 47) // ToInteger - ToInteger(Local0) - CH06(arg0, 28, 47) - ToInteger(Local0, Local1) CH06(arg0, 29, 47) // Acquire - Acquire(Local0, 100) + Store(Acquire(Local0, 100), Local1) CH06(arg0, 30, 47) // Add - Add(Local0, i000) - CH06(arg0, 31, 47) - - Add(i000, Local0) - CH06(arg0, 32, 47) - - Add(Local0, i000, Local1) - CH06(arg0, 33, 47) - Add(i000, Local0, Local1) CH06(arg0, 34, 47) // And - And(Local0, i000) - CH06(arg0, 35, 47) - - And(i000, Local0) - CH06(arg0, 36, 47) - And(Local0, i000, Local1) CH06(arg0, 37, 47) @@ -1024,12 +838,6 @@ Method(m4b4, 1) // Concatenate - Concatenate(Local0, i000) - CH06(arg0, 39, 47) - - Concatenate(i000, Local0) - CH06(arg0, 40, 47) - Concatenate(Local0, i000, Local1) CH06(arg0, 41, 47) @@ -1038,12 +846,6 @@ Method(m4b4, 1) // ConcatenateResTemplate - ConcatenateResTemplate(Local0, ResourceTemplate(){}) - CH06(arg0, 43, 47) - - ConcatenateResTemplate(ResourceTemplate(){}, Local0) - CH06(arg0, 44, 47) - ConcatenateResTemplate(Local0, ResourceTemplate(){}, Local1) CH06(arg0, 45, 47) @@ -1052,12 +854,6 @@ Method(m4b4, 1) // Divide - Divide(Local0, i000) - CH06(arg0, 47, 47) - - Divide(i000, Local0) - CH06(arg0, 48, 47) - Divide(Local0, i000, Local2) CH06(arg0, 49, 47) @@ -1077,12 +873,6 @@ Method(m4b4, 1) // Index - Index(Local0, 0) - CH03(ts, z096, 37, 0, 0) - - Index("0", Local0) - CH06(arg0, 55, 47) - Index(Local0, 0, Local1) CH03(ts, z096, 38, 0, 0) @@ -1091,68 +881,62 @@ Method(m4b4, 1) // LEqual - LEqual(Local0, i000) + Store (LEqual(Local0, i000), Local1) CH06(arg0, 58, 47) - LEqual(i000, Local0) + Store (LEqual(i000, Local0), Local1) CH06(arg0, 59, 47) // LGreater - LGreater(Local0, i000) + Store (LGreater(Local0, i000), Local1) CH06(arg0, 60, 47) - LGreater(i000, Local0) + Store (LGreater(i000, Local0), Local1) CH06(arg0, 61, 47) // LGreaterEqual - LGreaterEqual(Local0, i000) + Store (LGreaterEqual(Local0, i000), Local1) CH06(arg0, 62, 0xff) - LGreaterEqual(i000, Local0) + Store (LGreaterEqual(i000, Local0), Local1) CH06(arg0, 63, 0xff) // LLess - LLess(Local0, i000) + Store (LLess(Local0, i000), Local1) CH06(arg0, 64, 47) - LLess(i000, Local0) + Store (LLess(i000, Local0), Local1) CH06(arg0, 65, 47) // LLessEqual - LLessEqual(Local0, i000) + Store (LLessEqual(Local0, i000), Local1) CH06(arg0, 66, 0xff) - LLessEqual(i000, Local0) + Store (LLessEqual(i000, Local0), Local1) CH06(arg0, 67, 0xff) // LNotEqual - LNotEqual(Local0, i000) + Store (LNotEqual(Local0, i000), Local1) CH06(arg0, 68, 0xff) - LNotEqual(i000, Local0) + Store (LNotEqual(i000, Local0), Local1) CH06(arg0, 69, 0xff) // LOr - LOr(Local0, i000) + Store (LOr(Local0, i000), Local1) CH06(arg0, 70, 47) - LOr(i000, Local0) + Store (LOr(i000, Local0), Local1) CH06(arg0, 71, 47) // Mod - Mod(Local0, i000) - CH06(arg0, 72, 47) - - Mod(i000, Local0) - CH06(arg0, 73, 47) - Mod(Local0, i000, Local1) CH06(arg0, 74, 47) @@ -1161,12 +945,6 @@ Method(m4b4, 1) // Multiply - Multiply(Local0, i000) - CH06(arg0, 76, 47) - - Multiply(i000, Local0) - CH06(arg0, 77, 47) - Multiply(Local0, i000, Local1) CH06(arg0, 78, 47) @@ -1175,12 +953,6 @@ Method(m4b4, 1) // NAnd - NAnd(Local0, i000) - CH06(arg0, 80, 47) - - NAnd(i000, Local0) - CH06(arg0, 81, 47) - NAnd(Local0, i000, Local1) CH06(arg0, 82, 47) @@ -1189,12 +961,6 @@ Method(m4b4, 1) // NOr - NOr(Local0, i000) - CH06(arg0, 84, 47) - - NOr(i000, Local0) - CH06(arg0, 85, 47) - NOr(Local0, i000, Local1) CH06(arg0, 86, 47) @@ -1203,12 +969,6 @@ Method(m4b4, 1) // Or - Or(Local0, i000) - CH06(arg0, 88, 47) - - Or(i000, Local0) - CH06(arg0, 89, 47) - Or(Local0, i000, Local1) CH06(arg0, 90, 47) @@ -1217,12 +977,6 @@ Method(m4b4, 1) // ShiftLeft - ShiftLeft(Local0, i000) - CH06(arg0, 92, 47) - - ShiftLeft(i000, Local0) - CH06(arg0, 93, 47) - ShiftLeft(Local0, i000, Local1) CH06(arg0, 94, 47) @@ -1231,12 +985,6 @@ Method(m4b4, 1) // ShiftRight - ShiftRight(Local0, i000) - CH06(arg0, 96, 47) - - ShiftRight(i000, Local0) - CH06(arg0, 97, 47) - ShiftRight(Local0, i000, Local1) CH06(arg0, 98, 47) @@ -1245,12 +993,6 @@ Method(m4b4, 1) // Subtract - Subtract(Local0, i000) - CH06(arg0, 100, 47) - - Subtract(i000, Local0) - CH06(arg0, 101, 47) - Subtract(Local0, i000, Local1) CH06(arg0, 102, 47) @@ -1259,12 +1001,6 @@ Method(m4b4, 1) // ToString - ToString(Local0, 1) - CH06(arg0, 104, 47) - - ToString(i000, Local0) - CH06(arg0, 105, 47) - ToString(Local0, 1, Local1) CH06(arg0, 106, 47) @@ -1273,20 +1009,14 @@ Method(m4b4, 1) // Wait - Wait(Local0, i000) + Store(Wait(Local0, i000), Local1) CH06(arg0, 108, 47) - Wait(e000, Local0) + Store(Wait(e000, Local0), Local1) CH06(arg0, 109, 47) // XOr - XOr(Local0, i000) - CH06(arg0, 110, 47) - - XOr(i000, Local0) - CH06(arg0, 111, 47) - XOr(Local0, i000, Local1) CH06(arg0, 112, 47) @@ -1295,15 +1025,6 @@ Method(m4b4, 1) // Mid - Mid(Local0, 1, 1) - CH06(arg0, 114, 47) - - Mid("123", Local0, 1) - CH06(arg0, 115, 47) - - Mid("123", 1, Local0) - CH06(arg0, 116, 47) - Mid(Local0, 1, 1, Local1) CH06(arg0, 117, 47) @@ -1315,16 +1036,16 @@ Method(m4b4, 1) // Match - Match(Local0, MTR, 0, MTR, 0, 0) + Store (Match(Local0, MTR, 0, MTR, 0, 0), Local1) CH03(ts, z096, 39, 0, 0) - Match(Package(){1}, MTR, Local0, MTR, 0, 0) + Store (Match(Package(){1}, MTR, Local0, MTR, 0, 0), Local1) CH06(arg0, 121, 47) - Match(Package(){1}, MTR, 0, MTR, Local0, 0) + Store (Match(Package(){1}, MTR, 0, MTR, Local0, 0), Local1) CH06(arg0, 122, 47) - Match(Package(){1}, MTR, 0, MTR, 0, Local0) + Store (Match(Package(){1}, MTR, 0, MTR, 0, Local0), Local1) CH06(arg0, 123, 47) } @@ -1337,9 +1058,6 @@ Method(m4b4, 1) // CondRefOf - CondRefOf(DeRefOf(Index(p000, 0))) - CH06(arg0, 0, 47) - CondRefOf(DeRefOf(Index(p000, 0)), Local1) CH06(arg0, 1, 47) @@ -1355,30 +1073,21 @@ Method(m4b4, 1) // DerefOf - DerefOf(DeRefOf(Index(p000, 0))) + Store (DerefOf(DeRefOf(Index(p000, 0))), Local1) CH06(arg0, 3, 47) // FindSetLeftBit - FindSetLeftBit(DeRefOf(Index(p000, 0))) - CH06(arg0, 4, 47) - FindSetLeftBit(DeRefOf(Index(p000, 0)), Local1) CH06(arg0, 5, 47) // FindSetRightBit - FindSetRightBit(DeRefOf(Index(p000, 0))) - CH06(arg0, 6, 47) - FindSetRightBit(DeRefOf(Index(p000, 0)), Local1) CH06(arg0, 7, 47) // FromBCD - FromBCD(DeRefOf(Index(p000, 0))) - CH06(arg0, 8, 47) - FromBCD(DeRefOf(Index(p000, 0)), Local1) CH06(arg0, 9, 47) @@ -1389,25 +1098,22 @@ Method(m4b4, 1) // LNot - LNot(DeRefOf(Index(p000, 0))) + Store (LNot(DeRefOf(Index(p000, 0))), Local1) CH06(arg0, 11, 47) // Not - Not(DeRefOf(Index(p000, 0))) - CH06(arg0, 12, 47) - Not(DeRefOf(Index(p000, 0)), Local1) CH06(arg0, 13, 47) // ObjectType - ObjectType(DeRefOf(Index(p000, 0))) + Store (ObjectType(DeRefOf(Index(p000, 0))), Local1) CH03(ts, z096, 41, 0, 0) // RefOf - RefOf(DeRefOf(Index(p000, 0))) + Store (RefOf(DeRefOf(Index(p000, 0))), Local1) CH06(arg0, 14, 47) // Release @@ -1418,7 +1124,7 @@ Method(m4b4, 1) // SizeOf - SizeOf(DeRefOf(Index(p000, 0))) + Store (SizeOf(DeRefOf(Index(p000, 0))), Local1) CH03(ts, z096, 42, 0, 0) // Sleep @@ -1438,41 +1144,26 @@ Method(m4b4, 1) // ToBCD - ToBCD(DeRefOf(Index(p000, 0))) - CH06(arg0, 20, 47) - ToBCD(DeRefOf(Index(p000, 0)), Local1) CH06(arg0, 21, 47) // ToBuffer - ToBuffer(DeRefOf(Index(p000, 0))) - CH06(arg0, 22, 47) - ToBuffer(DeRefOf(Index(p000, 0)), Local1) CH06(arg0, 23, 47) // ToDecimalString - ToDecimalString(DeRefOf(Index(p000, 0))) - CH06(arg0, 24, 47) - ToDecimalString(DeRefOf(Index(p000, 0)), Local1) CH06(arg0, 25, 47) // ToHexString - ToHexString(DeRefOf(Index(p000, 0))) - CH06(arg0, 26, 47) - ToHexString(DeRefOf(Index(p000, 0)), Local1) CH06(arg0, 27, 47) // ToInteger - ToInteger(DeRefOf(Index(p000, 0))) - CH06(arg0, 28, 47) - ToInteger(DeRefOf(Index(p000, 0)), Local1) CH06(arg0, 29, 47) @@ -1480,12 +1171,6 @@ Method(m4b4, 1) // Add - Add(DeRefOf(Index(p000, 0)), i000) - CH06(arg0, 31, 47) - - Add(i000, DeRefOf(Index(p000, 0))) - CH06(arg0, 32, 47) - Add(DeRefOf(Index(p000, 0)), i000, Local1) CH06(arg0, 33, 47) @@ -1494,12 +1179,6 @@ Method(m4b4, 1) // And - And(DeRefOf(Index(p000, 0)), i000) - CH06(arg0, 35, 47) - - And(i000, DeRefOf(Index(p000, 0))) - CH06(arg0, 36, 47) - And(DeRefOf(Index(p000, 0)), i000, Local1) CH06(arg0, 37, 47) @@ -1508,12 +1187,6 @@ Method(m4b4, 1) // Concatenate - Concatenate(DeRefOf(Index(p000, 0)), i000) - CH06(arg0, 39, 47) - - Concatenate(i000, DeRefOf(Index(p000, 0))) - CH06(arg0, 40, 47) - Concatenate(DeRefOf(Index(p000, 0)), i000, Local1) CH06(arg0, 41, 47) @@ -1522,12 +1195,6 @@ Method(m4b4, 1) // ConcatenateResTemplate - ConcatenateResTemplate(DeRefOf(Index(p000, 0)), ResourceTemplate(){}) - CH06(arg0, 43, 47) - - ConcatenateResTemplate(ResourceTemplate(){}, DeRefOf(Index(p000, 0))) - CH06(arg0, 44, 47) - ConcatenateResTemplate(DeRefOf(Index(p000, 0)), ResourceTemplate(){}, Local1) CH06(arg0, 45, 47) @@ -1536,12 +1203,6 @@ Method(m4b4, 1) // Divide - Divide(DeRefOf(Index(p000, 0)), i000) - CH06(arg0, 47, 47) - - Divide(i000, DeRefOf(Index(p000, 0))) - CH06(arg0, 48, 47) - Divide(DeRefOf(Index(p000, 0)), i000, Local2) CH06(arg0, 49, 47) @@ -1561,12 +1222,6 @@ Method(m4b4, 1) // Index - Index(DeRefOf(Index(p000, 0)), 0) - CH03(ts, z096, 44, 0, 0) - - Index("0", DeRefOf(Index(p000, 0))) - CH06(arg0, 55, 47) - Index(DeRefOf(Index(p000, 0)), 0, Local1) CH03(ts, z096, 45, 0, 0) @@ -1575,68 +1230,62 @@ Method(m4b4, 1) // LEqual - LEqual(DeRefOf(Index(p000, 0)), i000) + Store (LEqual(DeRefOf(Index(p000, 0)), i000), Local1) CH06(arg0, 58, 47) - LEqual(i000, DeRefOf(Index(p000, 0))) + Store (LEqual(i000, DeRefOf(Index(p000, 0))), Local1) CH06(arg0, 59, 47) // LGreater - LGreater(DeRefOf(Index(p000, 0)), i000) + Store (LGreater(DeRefOf(Index(p000, 0)), i000), Local1) CH06(arg0, 60, 47) - LGreater(i000, DeRefOf(Index(p000, 0))) + Store (LGreater(i000, DeRefOf(Index(p000, 0))), Local1) CH06(arg0, 61, 47) // LGreaterEqual - LGreaterEqual(DeRefOf(Index(p000, 0)), i000) + Store (LGreaterEqual(DeRefOf(Index(p000, 0)), i000), Local1) CH06(arg0, 62, 0xff) - LGreaterEqual(i000, DeRefOf(Index(p000, 0))) + Store (LGreaterEqual(i000, DeRefOf(Index(p000, 0))), Local1) CH06(arg0, 63, 0xff) // LLess - LLess(DeRefOf(Index(p000, 0)), i000) + Store (LLess(DeRefOf(Index(p000, 0)), i000), Local1) CH06(arg0, 64, 47) - LLess(i000, DeRefOf(Index(p000, 0))) + Store (LLess(i000, DeRefOf(Index(p000, 0))), Local1) CH06(arg0, 65, 47) // LLessEqual - LLessEqual(DeRefOf(Index(p000, 0)), i000) + Store (LLessEqual(DeRefOf(Index(p000, 0)), i000), Local1) CH06(arg0, 66, 0xff) - LLessEqual(i000, DeRefOf(Index(p000, 0))) + Store (LLessEqual(i000, DeRefOf(Index(p000, 0))), Local1) CH06(arg0, 67, 0xff) // LNotEqual - LNotEqual(DeRefOf(Index(p000, 0)), i000) + Store (LNotEqual(DeRefOf(Index(p000, 0)), i000), Local1) CH06(arg0, 68, 0xff) - LNotEqual(i000, DeRefOf(Index(p000, 0))) + Store (LNotEqual(i000, DeRefOf(Index(p000, 0))), Local1) CH06(arg0, 69, 0xff) // LOr - LOr(DeRefOf(Index(p000, 0)), i000) + Store (LOr(DeRefOf(Index(p000, 0)), i000), Local1) CH06(arg0, 70, 47) - LOr(i000, DeRefOf(Index(p000, 0))) + Store (LOr(i000, DeRefOf(Index(p000, 0))), Local1) CH06(arg0, 71, 47) // Mod - Mod(DeRefOf(Index(p000, 0)), i000) - CH06(arg0, 72, 47) - - Mod(i000, DeRefOf(Index(p000, 0))) - CH06(arg0, 73, 47) - Mod(DeRefOf(Index(p000, 0)), i000, Local1) CH06(arg0, 74, 47) @@ -1645,12 +1294,6 @@ Method(m4b4, 1) // Multiply - Multiply(DeRefOf(Index(p000, 0)), i000) - CH06(arg0, 76, 47) - - Multiply(i000, DeRefOf(Index(p000, 0))) - CH06(arg0, 77, 47) - Multiply(DeRefOf(Index(p000, 0)), i000, Local1) CH06(arg0, 78, 47) @@ -1659,12 +1302,6 @@ Method(m4b4, 1) // NAnd - NAnd(DeRefOf(Index(p000, 0)), i000) - CH06(arg0, 80, 47) - - NAnd(i000, DeRefOf(Index(p000, 0))) - CH06(arg0, 81, 47) - NAnd(DeRefOf(Index(p000, 0)), i000, Local1) CH06(arg0, 82, 47) @@ -1673,12 +1310,6 @@ Method(m4b4, 1) // NOr - NOr(DeRefOf(Index(p000, 0)), i000) - CH06(arg0, 84, 47) - - NOr(i000, DeRefOf(Index(p000, 0))) - CH06(arg0, 85, 47) - NOr(DeRefOf(Index(p000, 0)), i000, Local1) CH06(arg0, 86, 47) @@ -1687,12 +1318,6 @@ Method(m4b4, 1) // Or - Or(DeRefOf(Index(p000, 0)), i000) - CH06(arg0, 88, 47) - - Or(i000, DeRefOf(Index(p000, 0))) - CH06(arg0, 89, 47) - Or(DeRefOf(Index(p000, 0)), i000, Local1) CH06(arg0, 90, 47) @@ -1701,12 +1326,6 @@ Method(m4b4, 1) // ShiftLeft - ShiftLeft(DeRefOf(Index(p000, 0)), i000) - CH06(arg0, 92, 47) - - ShiftLeft(i000, DeRefOf(Index(p000, 0))) - CH06(arg0, 93, 47) - ShiftLeft(DeRefOf(Index(p000, 0)), i000, Local1) CH06(arg0, 94, 47) @@ -1715,12 +1334,6 @@ Method(m4b4, 1) // ShiftRight - ShiftRight(DeRefOf(Index(p000, 0)), i000) - CH06(arg0, 96, 47) - - ShiftRight(i000, DeRefOf(Index(p000, 0))) - CH06(arg0, 97, 47) - ShiftRight(DeRefOf(Index(p000, 0)), i000, Local1) CH06(arg0, 98, 47) @@ -1729,12 +1342,6 @@ Method(m4b4, 1) // Subtract - Subtract(DeRefOf(Index(p000, 0)), i000) - CH06(arg0, 100, 47) - - Subtract(i000, DeRefOf(Index(p000, 0))) - CH06(arg0, 101, 47) - Subtract(DeRefOf(Index(p000, 0)), i000, Local1) CH06(arg0, 102, 47) @@ -1743,12 +1350,6 @@ Method(m4b4, 1) // ToString - ToString(DeRefOf(Index(p000, 0)), 1) - CH06(arg0, 104, 47) - - ToString(i000, DeRefOf(Index(p000, 0))) - CH06(arg0, 105, 47) - ToString(DeRefOf(Index(p000, 0)), 1, Local1) CH06(arg0, 106, 47) @@ -1757,17 +1358,11 @@ Method(m4b4, 1) // Wait - Wait(e000, DeRefOf(Index(p000, 0))) + Store(Wait(e000, DeRefOf(Index(p000, 0))), Local1) CH06(arg0, 109, 47) // XOr - XOr(DeRefOf(Index(p000, 0)), i000) - CH06(arg0, 110, 47) - - XOr(i000, DeRefOf(Index(p000, 0))) - CH06(arg0, 111, 47) - XOr(DeRefOf(Index(p000, 0)), i000, Local1) CH06(arg0, 112, 47) @@ -1776,15 +1371,6 @@ Method(m4b4, 1) // Mid - Mid(DeRefOf(Index(p000, 0)), 1, 1) - CH06(arg0, 114, 47) - - Mid("123", DeRefOf(Index(p000, 0)), 1) - CH06(arg0, 115, 47) - - Mid("123", 1, DeRefOf(Index(p000, 0))) - CH06(arg0, 116, 47) - Mid(DeRefOf(Index(p000, 0)), 1, 1, Local1) CH06(arg0, 117, 47) @@ -1796,16 +1382,16 @@ Method(m4b4, 1) // Match - Match(DeRefOf(Index(p000, 0)), MTR, 0, MTR, 0, 0) + Store (Match(DeRefOf(Index(p000, 0)), MTR, 0, MTR, 0, 0), Local1) CH03(ts, z096, 46, 0, 0) - Match(Package(){1}, MTR, DeRefOf(Index(p000, 0)), MTR, 0, 0) + Store (Match(Package(){1}, MTR, DeRefOf(Index(p000, 0)), MTR, 0, 0), Local1) CH06(arg0, 121, 47) - Match(Package(){1}, MTR, 0, MTR, DeRefOf(Index(p000, 0)), 0) + Store (Match(Package(){1}, MTR, 0, MTR, DeRefOf(Index(p000, 0)), 0), Local1) CH06(arg0, 122, 47) - Match(Package(){1}, MTR, 0, MTR, 0, DeRefOf(Index(p000, 0))) + Store (Match(Package(){1}, MTR, 0, MTR, 0, DeRefOf(Index(p000, 0))), Local1) CH06(arg0, 123, 47) @@ -1813,9 +1399,6 @@ Method(m4b4, 1) // CondRefOf - CondRefOf(DeRefOf(Index(p000, 0, Local0))) - CH06(arg0, 203, 47) - CondRefOf(DeRefOf(Index(p000, 0, Local0)), Local1) CH06(arg0, 204, 47) @@ -1831,30 +1414,21 @@ Method(m4b4, 1) // DerefOf - DerefOf(DeRefOf(Index(p000, 0, Local0))) + Store (DerefOf(DeRefOf(Index(p000, 0, Local0))), Local1) CH06(arg0, 2, 47) // FindSetLeftBit - FindSetLeftBit(DeRefOf(Index(p000, 0, Local0))) - CH06(arg0, 3, 47) - FindSetLeftBit(DeRefOf(Index(p000, 0, Local0)), Local1) CH06(arg0, 4, 47) // FindSetRightBit - FindSetRightBit(DeRefOf(Index(p000, 0, Local0))) - CH06(arg0, 5, 47) - FindSetRightBit(DeRefOf(Index(p000, 0, Local0)), Local1) CH06(arg0, 6, 47) // FromBCD - FromBCD(DeRefOf(Index(p000, 0, Local0))) - CH06(arg0, 7, 47) - FromBCD(DeRefOf(Index(p000, 0, Local0)), Local1) CH06(arg0, 8, 47) @@ -1865,25 +1439,22 @@ Method(m4b4, 1) // LNot - LNot(DeRefOf(Index(p000, 0, Local0))) + Store (LNot(DeRefOf(Index(p000, 0, Local0))), Local1) CH06(arg0, 10, 47) // Not - Not(DeRefOf(Index(p000, 0, Local0))) - CH06(arg0, 11, 47) - Not(DeRefOf(Index(p000, 0, Local0)), Local1) CH06(arg0, 12, 47) // ObjectType - ObjectType(DeRefOf(Index(p000, 0, Local0))) + Store (ObjectType(DeRefOf(Index(p000, 0, Local0))), Local1) CH03(ts, z096, 48, 0, 0) // RefOf - RefOf(DeRefOf(Index(p000, 0, Local0))) + Store (RefOf(DeRefOf(Index(p000, 0, Local0))), Local1) CH06(arg0, 205, 47) // Release @@ -1894,7 +1465,7 @@ Method(m4b4, 1) // SizeOf - SizeOf(DeRefOf(Index(p000, 0, Local0))) + Store (SizeOf(DeRefOf(Index(p000, 0, Local0))), Local1) CH03(ts, z096, 49, 0, 0) // Sleep @@ -1914,41 +1485,26 @@ Method(m4b4, 1) // ToBCD - ToBCD(DeRefOf(Index(p000, 0, Local0))) - CH06(arg0, 20, 47) - ToBCD(DeRefOf(Index(p000, 0, Local0)), Local1) CH06(arg0, 21, 47) // ToBuffer - ToBuffer(DeRefOf(Index(p000, 0, Local0))) - CH06(arg0, 22, 47) - ToBuffer(DeRefOf(Index(p000, 0, Local0)), Local1) CH06(arg0, 23, 47) // ToDecimalString - ToDecimalString(DeRefOf(Index(p000, 0, Local0))) - CH06(arg0, 24, 47) - ToDecimalString(DeRefOf(Index(p000, 0, Local0)), Local1) CH06(arg0, 25, 47) // ToHexString - ToHexString(DeRefOf(Index(p000, 0, Local0))) - CH06(arg0, 26, 47) - ToHexString(DeRefOf(Index(p000, 0, Local0)), Local1) CH06(arg0, 27, 47) // ToInteger - ToInteger(DeRefOf(Index(p000, 0, Local0))) - CH06(arg0, 28, 47) - ToInteger(DeRefOf(Index(p000, 0, Local0)), Local1) CH06(arg0, 29, 47) @@ -1956,12 +1512,6 @@ Method(m4b4, 1) // Add - Add(DeRefOf(Index(p000, 0, Local0)), i000) - CH06(arg0, 31, 47) - - Add(i000, DeRefOf(Index(p000, 0, Local0))) - CH06(arg0, 32, 47) - Add(DeRefOf(Index(p000, 0, Local0)), i000, Local1) CH06(arg0, 33, 47) @@ -1970,12 +1520,6 @@ Method(m4b4, 1) // And - And(DeRefOf(Index(p000, 0, Local0)), i000) - CH06(arg0, 35, 47) - - And(i000, DeRefOf(Index(p000, 0, Local0))) - CH06(arg0, 36, 47) - And(DeRefOf(Index(p000, 0, Local0)), i000, Local1) CH06(arg0, 37, 47) @@ -1984,12 +1528,6 @@ Method(m4b4, 1) // Concatenate - Concatenate(DeRefOf(Index(p000, 0, Local0)), i000) - CH06(arg0, 39, 47) - - Concatenate(i000, DeRefOf(Index(p000, 0, Local0))) - CH06(arg0, 40, 47) - Concatenate(DeRefOf(Index(p000, 0, Local0)), i000, Local1) CH06(arg0, 41, 47) @@ -1998,12 +1536,6 @@ Method(m4b4, 1) // ConcatenateResTemplate - ConcatenateResTemplate(DeRefOf(Index(p000, 0, Local0)), ResourceTemplate(){}) - CH06(arg0, 43, 47) - - ConcatenateResTemplate(ResourceTemplate(){}, DeRefOf(Index(p000, 0, Local0))) - CH06(arg0, 44, 47) - ConcatenateResTemplate(DeRefOf(Index(p000, 0, Local0)), ResourceTemplate(){}, Local1) CH06(arg0, 45, 47) @@ -2012,12 +1544,6 @@ Method(m4b4, 1) // Divide - Divide(DeRefOf(Index(p000, 0, Local0)), i000) - CH06(arg0, 47, 47) - - Divide(i000, DeRefOf(Index(p000, 0, Local0))) - CH06(arg0, 48, 47) - Divide(DeRefOf(Index(p000, 0, Local0)), i000, Local2) CH06(arg0, 49, 47) @@ -2037,12 +1563,6 @@ Method(m4b4, 1) // Index - Index(DeRefOf(Index(p000, 0, Local0)), 0) - CH03(ts, z096, 51, 0, 0) - - Index("0", DeRefOf(Index(p000, 0, Local0))) - CH06(arg0, 55, 47) - Index(DeRefOf(Index(p000, 0, Local0)), 0, Local1) CH03(ts, z096, 52, 0, 0) @@ -2051,68 +1571,62 @@ Method(m4b4, 1) // LEqual - LEqual(DeRefOf(Index(p000, 0, Local0)), i000) + Store (LEqual(DeRefOf(Index(p000, 0, Local0)), i000), Local1) CH06(arg0, 58, 47) - LEqual(i000, DeRefOf(Index(p000, 0, Local0))) + Store (LEqual(i000, DeRefOf(Index(p000, 0, Local0))), Local1) CH06(arg0, 59, 47) // LGreater - LGreater(DeRefOf(Index(p000, 0, Local0)), i000) + Store (LGreater(DeRefOf(Index(p000, 0, Local0)), i000), Local1) CH06(arg0, 60, 47) - LGreater(i000, DeRefOf(Index(p000, 0, Local0))) + Store (LGreater(i000, DeRefOf(Index(p000, 0, Local0))), Local1) CH06(arg0, 61, 47) // LGreaterEqual - LGreaterEqual(DeRefOf(Index(p000, 0, Local0)), i000) + Store (LGreaterEqual(DeRefOf(Index(p000, 0, Local0)), i000), Local1) CH06(arg0, 62, 0xff) - LGreaterEqual(i000, DeRefOf(Index(p000, 0, Local0))) + Store (LGreaterEqual(i000, DeRefOf(Index(p000, 0, Local0))), Local1) CH06(arg0, 63, 0xff) // LLess - LLess(DeRefOf(Index(p000, 0, Local0)), i000) + Store (LLess(DeRefOf(Index(p000, 0, Local0)), i000), Local1) CH06(arg0, 64, 47) - LLess(i000, DeRefOf(Index(p000, 0, Local0))) + Store (LLess(i000, DeRefOf(Index(p000, 0, Local0))), Local1) CH06(arg0, 65, 47) // LLessEqual - LLessEqual(DeRefOf(Index(p000, 0, Local0)), i000) + Store (LLessEqual(DeRefOf(Index(p000, 0, Local0)), i000), Local1) CH06(arg0, 66, 0xff) - LLessEqual(i000, DeRefOf(Index(p000, 0, Local0))) + Store (LLessEqual(i000, DeRefOf(Index(p000, 0, Local0))), Local1) CH06(arg0, 67, 0xff) // LNotEqual - LNotEqual(DeRefOf(Index(p000, 0, Local0)), i000) + Store (LNotEqual(DeRefOf(Index(p000, 0, Local0)), i000), Local1) CH06(arg0, 68, 0xff) - LNotEqual(i000, DeRefOf(Index(p000, 0, Local0))) + Store (LNotEqual(i000, DeRefOf(Index(p000, 0, Local0))), Local1) CH06(arg0, 69, 0xff) // LOr - LOr(DeRefOf(Index(p000, 0, Local0)), i000) + Store (LOr(DeRefOf(Index(p000, 0, Local0)), i000), Local1) CH06(arg0, 70, 47) - LOr(i000, DeRefOf(Index(p000, 0, Local0))) + Store (LOr(i000, DeRefOf(Index(p000, 0, Local0))), Local1) CH06(arg0, 71, 47) // Mod - Mod(DeRefOf(Index(p000, 0, Local0)), i000) - CH06(arg0, 72, 47) - - Mod(i000, DeRefOf(Index(p000, 0, Local0))) - CH06(arg0, 73, 47) - Mod(DeRefOf(Index(p000, 0, Local0)), i000, Local1) CH06(arg0, 74, 47) @@ -2121,12 +1635,6 @@ Method(m4b4, 1) // Multiply - Multiply(DeRefOf(Index(p000, 0, Local0)), i000) - CH06(arg0, 76, 47) - - Multiply(i000, DeRefOf(Index(p000, 0, Local0))) - CH06(arg0, 77, 47) - Multiply(DeRefOf(Index(p000, 0, Local0)), i000, Local1) CH06(arg0, 78, 47) @@ -2135,12 +1643,6 @@ Method(m4b4, 1) // NAnd - NAnd(DeRefOf(Index(p000, 0, Local0)), i000) - CH06(arg0, 80, 47) - - NAnd(i000, DeRefOf(Index(p000, 0, Local0))) - CH06(arg0, 81, 47) - NAnd(DeRefOf(Index(p000, 0, Local0)), i000, Local1) CH06(arg0, 82, 47) @@ -2149,12 +1651,6 @@ Method(m4b4, 1) // NOr - NOr(DeRefOf(Index(p000, 0, Local0)), i000) - CH06(arg0, 84, 47) - - NOr(i000, DeRefOf(Index(p000, 0, Local0))) - CH06(arg0, 85, 47) - NOr(DeRefOf(Index(p000, 0, Local0)), i000, Local1) CH06(arg0, 86, 47) @@ -2163,12 +1659,6 @@ Method(m4b4, 1) // Or - Or(DeRefOf(Index(p000, 0, Local0)), i000) - CH06(arg0, 88, 47) - - Or(i000, DeRefOf(Index(p000, 0, Local0))) - CH06(arg0, 89, 47) - Or(DeRefOf(Index(p000, 0, Local0)), i000, Local1) CH06(arg0, 90, 47) @@ -2177,12 +1667,6 @@ Method(m4b4, 1) // ShiftLeft - ShiftLeft(DeRefOf(Index(p000, 0, Local0)), i000) - CH06(arg0, 92, 47) - - ShiftLeft(i000, DeRefOf(Index(p000, 0, Local0))) - CH06(arg0, 93, 47) - ShiftLeft(DeRefOf(Index(p000, 0, Local0)), i000, Local1) CH06(arg0, 94, 47) @@ -2191,12 +1675,6 @@ Method(m4b4, 1) // ShiftRight - ShiftRight(DeRefOf(Index(p000, 0, Local0)), i000) - CH06(arg0, 96, 47) - - ShiftRight(i000, DeRefOf(Index(p000, 0, Local0))) - CH06(arg0, 97, 47) - ShiftRight(DeRefOf(Index(p000, 0, Local0)), i000, Local1) CH06(arg0, 98, 47) @@ -2205,12 +1683,6 @@ Method(m4b4, 1) // Subtract - Subtract(DeRefOf(Index(p000, 0, Local0)), i000) - CH06(arg0, 100, 47) - - Subtract(i000, DeRefOf(Index(p000, 0, Local0))) - CH06(arg0, 101, 47) - Subtract(DeRefOf(Index(p000, 0, Local0)), i000, Local1) CH06(arg0, 102, 47) @@ -2219,12 +1691,6 @@ Method(m4b4, 1) // ToString - ToString(DeRefOf(Index(p000, 0, Local0)), 1) - CH06(arg0, 104, 47) - - ToString(i000, DeRefOf(Index(p000, 0, Local0))) - CH06(arg0, 105, 47) - ToString(DeRefOf(Index(p000, 0, Local0)), 1, Local1) CH06(arg0, 106, 47) @@ -2233,17 +1699,11 @@ Method(m4b4, 1) // Wait - Wait(e000, DeRefOf(Index(p000, 0, Local0))) + Store(Wait(e000, DeRefOf(Index(p000, 0, Local0))), Local1) CH06(arg0, 109, 47) // XOr - XOr(DeRefOf(Index(p000, 0, Local0)), i000) - CH06(arg0, 110, 47) - - XOr(i000, DeRefOf(Index(p000, 0, Local0))) - CH06(arg0, 111, 47) - XOr(DeRefOf(Index(p000, 0, Local0)), i000, Local1) CH06(arg0, 112, 47) @@ -2252,15 +1712,6 @@ Method(m4b4, 1) // Mid - Mid(DeRefOf(Index(p000, 0, Local0)), 1, 1) - CH06(arg0, 114, 47) - - Mid("123", DeRefOf(Index(p000, 0, Local0)), 1) - CH06(arg0, 115, 47) - - Mid("123", 1, DeRefOf(Index(p000, 0, Local0))) - CH06(arg0, 116, 47) - Mid(DeRefOf(Index(p000, 0, Local0)), 1, 1, Local1) CH06(arg0, 117, 47) @@ -2272,16 +1723,16 @@ Method(m4b4, 1) // Match - Match(DeRefOf(Index(p000, 0, Local0)), MTR, 0, MTR, 0, 0) + Store (Match(DeRefOf(Index(p000, 0, Local0)), MTR, 0, MTR, 0, 0), Local1) CH03(ts, z096, 53, 0, 0) - Match(Package(){1}, MTR, DeRefOf(Index(p000, 0, Local0)), MTR, 0, 0) + Store (Match(Package(){1}, MTR, DeRefOf(Index(p000, 0, Local0)), MTR, 0, 0), Local1) CH06(arg0, 121, 47) - Match(Package(){1}, MTR, 0, MTR, DeRefOf(Index(p000, 0, Local0)), 0) + Store (Match(Package(){1}, MTR, 0, MTR, DeRefOf(Index(p000, 0, Local0)), 0), Local1) CH06(arg0, 122, 47) - Match(Package(){1}, MTR, 0, MTR, 0, DeRefOf(Index(p000, 0, Local0))) + Store (Match(Package(){1}, MTR, 0, MTR, 0, DeRefOf(Index(p000, 0, Local0))), Local1) CH06(arg0, 123, 47) } @@ -2297,15 +1748,15 @@ Method(m4b4, 1) return (1) } - DerefOf(arg1) + Store (DerefOf(arg1), Local1) CH03(ts, z096, 54, 0, 0) // CondRefOf - CondRefOf(DerefOf(arg1)) + Store (CondRefOf(DerefOf(arg1)), Local1) CH06(arg0, 1, 47) - CondRefOf(DerefOf(arg1), Local1) + Store (CondRefOf(DerefOf(arg1), Local1), Local1) CH06(arg0, 2, 47) // CopyObject @@ -2320,30 +1771,21 @@ Method(m4b4, 1) // DerefOf - DerefOf(DerefOf(arg1)) + Store (DerefOf(DerefOf(arg1)), Local1) CH06(arg0, 4, 47) // FindSetLeftBit - FindSetLeftBit(DerefOf(arg1)) - CH06(arg0, 5, 47) - FindSetLeftBit(DerefOf(arg1), Local1) CH06(arg0, 6, 47) // FindSetRightBit - FindSetRightBit(DerefOf(arg1)) - CH06(arg0, 7, 47) - FindSetRightBit(DerefOf(arg1), Local1) CH06(arg0, 8, 47) // FromBCD - FromBCD(DerefOf(arg1)) - CH06(arg0, 9, 47) - FromBCD(DerefOf(arg1), Local1) CH06(arg0, 10, 47) @@ -2354,25 +1796,22 @@ Method(m4b4, 1) // LNot - LNot(DerefOf(arg1)) + Store (LNot(DerefOf(arg1)), Local1) CH06(arg0, 12, 47) // Not - Not(DerefOf(arg1)) - CH06(arg0, 13, 47) - Not(DerefOf(arg1), Local1) CH06(arg0, 14, 47) // ObjectType - ObjectType(DerefOf(arg1)) + Store (ObjectType(DerefOf(arg1)), Local1) CH03(ts, z096, 56, 0, 0) // RefOf - RefOf(DerefOf(arg1)) + Store (RefOf(DerefOf(arg1)), Local1) CH06(arg0, 15, 47) // Release @@ -2383,7 +1822,7 @@ Method(m4b4, 1) // SizeOf - SizeOf(DerefOf(arg1)) + Store (SizeOf(DerefOf(arg1)), Local1) CH03(ts, z096, 57, 0, 0) // Sleep @@ -2403,41 +1842,26 @@ Method(m4b4, 1) // ToBCD - ToBCD(DerefOf(arg1)) - CH06(arg0, 20, 47) - ToBCD(DerefOf(arg1), Local1) CH06(arg0, 21, 47) // ToBuffer - ToBuffer(DerefOf(arg1)) - CH06(arg0, 22, 47) - ToBuffer(DerefOf(arg1), Local1) CH06(arg0, 23, 47) // ToDecimalString - ToDecimalString(DerefOf(arg1)) - CH06(arg0, 24, 47) - ToDecimalString(DerefOf(arg1), Local1) CH06(arg0, 25, 47) // ToHexString - ToHexString(DerefOf(arg1)) - CH06(arg0, 26, 47) - ToHexString(DerefOf(arg1), Local1) CH06(arg0, 27, 47) // ToInteger - ToInteger(DerefOf(arg1)) - CH06(arg0, 28, 47) - ToInteger(DerefOf(arg1), Local1) CH06(arg0, 29, 47) @@ -2445,12 +1869,6 @@ Method(m4b4, 1) // Add - Add(DerefOf(arg1), i000) - CH06(arg0, 31, 47) - - Add(i000, DerefOf(arg1)) - CH06(arg0, 32, 47) - Add(DerefOf(arg1), i000, Local1) CH06(arg0, 33, 47) @@ -2459,12 +1877,6 @@ Method(m4b4, 1) // And - And(DerefOf(arg1), i000) - CH06(arg0, 35, 47) - - And(i000, DerefOf(arg1)) - CH06(arg0, 36, 47) - And(DerefOf(arg1), i000, Local1) CH06(arg0, 37, 47) @@ -2473,12 +1885,6 @@ Method(m4b4, 1) // Concatenate - Concatenate(DerefOf(arg1), i000) - CH06(arg0, 39, 47) - - Concatenate(i000, DerefOf(arg1)) - CH06(arg0, 40, 47) - Concatenate(DerefOf(arg1), i000, Local1) CH06(arg0, 41, 47) @@ -2487,12 +1893,6 @@ Method(m4b4, 1) // ConcatenateResTemplate - ConcatenateResTemplate(DerefOf(arg1), ResourceTemplate(){}) - CH06(arg0, 43, 47) - - ConcatenateResTemplate(ResourceTemplate(){}, DerefOf(arg1)) - CH06(arg0, 44, 47) - ConcatenateResTemplate(DerefOf(arg1), ResourceTemplate(){}, Local1) CH06(arg0, 45, 47) @@ -2501,12 +1901,6 @@ Method(m4b4, 1) // Divide - Divide(DerefOf(arg1), i000) - CH06(arg0, 47, 47) - - Divide(i000, DerefOf(arg1)) - CH06(arg0, 48, 47) - Divide(DerefOf(arg1), i000, Local2) CH06(arg0, 49, 47) @@ -2526,12 +1920,6 @@ Method(m4b4, 1) // Index - Index(DerefOf(arg1), 0) - CH03(ts, z096, 59, 0, 0) - - Index("0", DerefOf(arg1)) - CH06(arg0, 55, 47) - Index(DerefOf(arg1), 0, Local1) CH03(ts, z096, 60, 0, 0) @@ -2540,68 +1928,62 @@ Method(m4b4, 1) // LEqual - LEqual(DerefOf(arg1), i000) + Store (LEqual(DerefOf(arg1), i000), Local1) CH06(arg0, 58, 47) - LEqual(i000, DerefOf(arg1)) + Store (LEqual(i000, DerefOf(arg1)), Local1) CH06(arg0, 59, 47) // LGreater - LGreater(DerefOf(arg1), i000) + Store (LGreater(DerefOf(arg1), i000), Local1) CH06(arg0, 60, 47) - LGreater(i000, DerefOf(arg1)) + Store (LGreater(i000, DerefOf(arg1)), Local1) CH06(arg0, 61, 47) // LGreaterEqual - LGreaterEqual(DerefOf(arg1), i000) + Store (LGreaterEqual(DerefOf(arg1), i000), Local1) CH06(arg0, 62, 0xff) - LGreaterEqual(i000, DerefOf(arg1)) + Store (LGreaterEqual(i000, DerefOf(arg1)), Local1) CH06(arg0, 63, 0xff) // LLess - LLess(DerefOf(arg1), i000) + Store (LLess(DerefOf(arg1), i000), Local1) CH06(arg0, 64, 47) - LLess(i000, DerefOf(arg1)) + Store (LLess(i000, DerefOf(arg1)), Local1) CH06(arg0, 65, 47) // LLessEqual - LLessEqual(DerefOf(arg1), i000) + Store (LLessEqual(DerefOf(arg1), i000), Local1) CH06(arg0, 66, 0xff) - LLessEqual(i000, DerefOf(arg1)) + Store (LLessEqual(i000, DerefOf(arg1)), Local1) CH06(arg0, 67, 0xff) // LNotEqual - LNotEqual(DerefOf(arg1), i000) + Store (LNotEqual(DerefOf(arg1), i000), Local1) CH06(arg0, 68, 0xff) - LNotEqual(i000, DerefOf(arg1)) + Store (LNotEqual(i000, DerefOf(arg1)), Local1) CH06(arg0, 69, 0xff) // LOr - LOr(DerefOf(arg1), i000) + Store (LOr(DerefOf(arg1), i000), Local1) CH06(arg0, 70, 47) - LOr(i000, DerefOf(arg1)) + Store (LOr(i000, DerefOf(arg1)), Local1) CH06(arg0, 71, 47) // Mod - Mod(DerefOf(arg1), i000) - CH06(arg0, 72, 47) - - Mod(i000, DerefOf(arg1)) - CH06(arg0, 73, 47) - Mod(DerefOf(arg1), i000, Local1) CH06(arg0, 74, 47) @@ -2610,12 +1992,6 @@ Method(m4b4, 1) // Multiply - Multiply(DerefOf(arg1), i000) - CH06(arg0, 76, 47) - - Multiply(i000, DerefOf(arg1)) - CH06(arg0, 77, 47) - Multiply(DerefOf(arg1), i000, Local1) CH06(arg0, 78, 47) @@ -2624,12 +2000,6 @@ Method(m4b4, 1) // NAnd - NAnd(DerefOf(arg1), i000) - CH06(arg0, 80, 47) - - NAnd(i000, DerefOf(arg1)) - CH06(arg0, 81, 47) - NAnd(DerefOf(arg1), i000, Local1) CH06(arg0, 82, 47) @@ -2638,12 +2008,6 @@ Method(m4b4, 1) // NOr - NOr(DerefOf(arg1), i000) - CH06(arg0, 84, 47) - - NOr(i000, DerefOf(arg1)) - CH06(arg0, 85, 47) - NOr(DerefOf(arg1), i000, Local1) CH06(arg0, 86, 47) @@ -2652,12 +2016,6 @@ Method(m4b4, 1) // Or - Or(DerefOf(arg1), i000) - CH06(arg0, 88, 47) - - Or(i000, DerefOf(arg1)) - CH06(arg0, 89, 47) - Or(DerefOf(arg1), i000, Local1) CH06(arg0, 90, 47) @@ -2666,12 +2024,6 @@ Method(m4b4, 1) // ShiftLeft - ShiftLeft(DerefOf(arg1), i000) - CH06(arg0, 92, 47) - - ShiftLeft(i000, DerefOf(arg1)) - CH06(arg0, 93, 47) - ShiftLeft(DerefOf(arg1), i000, Local1) CH06(arg0, 94, 47) @@ -2680,12 +2032,6 @@ Method(m4b4, 1) // ShiftRight - ShiftRight(DerefOf(arg1), i000) - CH06(arg0, 96, 47) - - ShiftRight(i000, DerefOf(arg1)) - CH06(arg0, 97, 47) - ShiftRight(DerefOf(arg1), i000, Local1) CH06(arg0, 98, 47) @@ -2694,12 +2040,6 @@ Method(m4b4, 1) // Subtract - Subtract(DerefOf(arg1), i000) - CH06(arg0, 100, 47) - - Subtract(i000, DerefOf(arg1)) - CH06(arg0, 101, 47) - Subtract(DerefOf(arg1), i000, Local1) CH06(arg0, 102, 47) @@ -2708,12 +2048,6 @@ Method(m4b4, 1) // ToString - ToString(DerefOf(arg1), 1) - CH06(arg0, 104, 47) - - ToString(i000, DerefOf(arg1)) - CH06(arg0, 105, 47) - ToString(DerefOf(arg1), 1, Local1) CH06(arg0, 106, 47) @@ -2722,17 +2056,11 @@ Method(m4b4, 1) // Wait - Wait(e000, DerefOf(arg1)) + Store(Wait(e000, DerefOf(arg1)), Local1) CH06(arg0, 109, 47) // XOr - XOr(DerefOf(arg1), i000) - CH06(arg0, 110, 47) - - XOr(i000, DerefOf(arg1)) - CH06(arg0, 111, 47) - XOr(DerefOf(arg1), i000, Local1) CH06(arg0, 112, 47) @@ -2741,15 +2069,6 @@ Method(m4b4, 1) // Mid - Mid(DerefOf(arg1), 1, 1) - CH06(arg0, 114, 47) - - Mid("123", DerefOf(arg1), 1) - CH06(arg0, 115, 47) - - Mid("123", 1, DerefOf(arg1)) - CH06(arg0, 116, 47) - Mid(DerefOf(arg1), 1, 1, Local1) CH06(arg0, 117, 47) @@ -2761,16 +2080,16 @@ Method(m4b4, 1) // Match - Match(DerefOf(arg1), MTR, 0, MTR, 0, 0) + Store (Match(DerefOf(arg1), MTR, 0, MTR, 0, 0), Local1) CH03(ts, z096, 61, 0, 0) - Match(Package(){1}, MTR, DerefOf(arg1), MTR, 0, 0) + Store (Match(Package(){1}, MTR, DerefOf(arg1), MTR, 0, 0), Local1) CH06(arg0, 121, 47) - Match(Package(){1}, MTR, 0, MTR, DerefOf(arg1), 0) + Store (Match(Package(){1}, MTR, 0, MTR, DerefOf(arg1), 0), Local1) CH06(arg0, 122, 47) - Match(Package(){1}, MTR, 0, MTR, 0, DerefOf(arg1)) + Store (Match(Package(){1}, MTR, 0, MTR, 0, DerefOf(arg1)), Local1) CH06(arg0, 123, 47) return (0) @@ -2792,7 +2111,7 @@ Method(m4b4, 1) // CondRefOf if (y601) { - CondRefOf(m000()) + Store (CondRefOf(m000()), Local1) CH06(arg0, 0, 47) CondRefOf(m000(), Local1) @@ -2811,30 +2130,21 @@ Method(m4b4, 1) // DerefOf - DerefOf(m000()) + Store (DerefOf(m000()), Local1) CH06(arg0, 3, 47) // FindSetLeftBit - FindSetLeftBit(m000()) - CH06(arg0, 4, 47) - FindSetLeftBit(m000(), Local1) CH06(arg0, 5, 47) // FindSetRightBit - FindSetRightBit(m000()) - CH06(arg0, 6, 47) - FindSetRightBit(m000(), Local1) CH06(arg0, 7, 47) // FromBCD - FromBCD(m000()) - CH06(arg0, 8, 47) - FromBCD(m000(), Local1) CH06(arg0, 9, 47) @@ -2845,14 +2155,11 @@ Method(m4b4, 1) // LNot - LNot(m000()) + Store (LNot(m000()), Local1) CH06(arg0, 11, 47) // Not - Not(m000()) - CH06(arg0, 12, 47) - Not(m000(), Local1) CH06(arg0, 13, 47) @@ -2865,7 +2172,7 @@ Method(m4b4, 1) // RefOf if (y601) { - RefOf(m000()) + Store (RefOf(m000()), Local1) CH06(arg0, 14, 47) } @@ -2886,7 +2193,7 @@ Method(m4b4, 1) // SizeOf - SizeOf(m000()) + Store (SizeOf(m000()), Local1) CH06(arg0, 16, 47) // Sleep @@ -2903,57 +2210,36 @@ Method(m4b4, 1) // ToBCD - ToBCD(m000()) - CH06(arg0, 20, 47) - ToBCD(m000(), Local1) CH06(arg0, 21, 47) // ToBuffer - ToBuffer(m000()) - CH06(arg0, 22, 47) - ToBuffer(m000(), Local1) CH06(arg0, 23, 47) // ToDecimalString - ToDecimalString(m000()) - CH06(arg0, 24, 47) - ToDecimalString(m000(), Local1) CH06(arg0, 25, 47) // ToHexString - ToHexString(m000()) - CH06(arg0, 26, 47) - ToHexString(m000(), Local1) CH06(arg0, 27, 47) // ToInteger - ToInteger(m000()) - CH06(arg0, 28, 47) - ToInteger(m000(), Local1) CH06(arg0, 29, 47) // Acquire - Acquire(m000(), 100) + Store(Acquire(m000(), 100), Local1) CH06(arg0, 30, 47) // Add - Add(m000(), i000) - CH06(arg0, 31, 47) - - Add(i000, m000()) - CH06(arg0, 32, 47) - Add(m000(), i000, Local1) CH06(arg0, 33, 47) @@ -2962,12 +2248,6 @@ Method(m4b4, 1) // And - And(m000(), i000) - CH06(arg0, 35, 47) - - And(i000, m000()) - CH06(arg0, 36, 47) - And(m000(), i000, Local1) CH06(arg0, 37, 47) @@ -2976,12 +2256,6 @@ Method(m4b4, 1) // Concatenate - Concatenate(m000(), i000) - CH06(arg0, 39, 47) - - Concatenate(i000, m000()) - CH06(arg0, 40, 47) - Concatenate(m000(), i000, Local1) CH06(arg0, 41, 47) @@ -2990,12 +2264,6 @@ Method(m4b4, 1) // ConcatenateResTemplate - ConcatenateResTemplate(m000(), ResourceTemplate(){}) - CH06(arg0, 43, 47) - - ConcatenateResTemplate(ResourceTemplate(){}, m000()) - CH06(arg0, 44, 47) - ConcatenateResTemplate(m000(), ResourceTemplate(){}, Local1) CH06(arg0, 45, 47) @@ -3004,12 +2272,6 @@ Method(m4b4, 1) // Divide - Divide(m000(), i000) - CH06(arg0, 47, 47) - - Divide(i000, m000()) - CH06(arg0, 48, 47) - Divide(m000(), i000, Local2) CH06(arg0, 49, 47) @@ -3030,12 +2292,6 @@ Method(m4b4, 1) // Index if (y900) { - Index(m000(), 0) - CH03(ts, z096, 64, 0, 0) - - Index("0", m000()) - CH06(arg0, 55, 47) - Index(m000(), 0, Local1) CH03(ts, z096, 65, 0, 0) @@ -3043,13 +2299,6 @@ Method(m4b4, 1) CH06(arg0, 57, 47) } else { CH03(ts, z096, 0x123, 0, 0) - Index(m000(), 0) - CH04(ts, 0, 85, z094, 0x124, 0, 0) // AE_INDEX_TO_NOT_ATTACHED - - CH03(ts, z096, 0x125, 0, 0) - Index("0", m000()) - CH04(ts, 0, 0xff, z094, 0x126, 0, 0) // AE_INDEX_TO_NOT_ATTACHED - CH03(ts, z096, 0x127, 0, 0) Index(m000(), 0, Local1) CH04(ts, 0, 85, z094, 0x128, 0, 0) // AE_INDEX_TO_NOT_ATTACHED @@ -3058,11 +2307,6 @@ Method(m4b4, 1) Index("0", m000(), Local1) CH04(ts, 0, 0xff, z094, 0x12a, 0, 0) // AE_INDEX_TO_NOT_ATTACHED - - CH03(ts, z096, 0x125, 0, 0) - Index(ss00, m000()) - CH04(ts, 0, 47, z094, 0x126, 0, 0) // AE_INDEX_TO_NOT_ATTACHED - CH03(ts, z096, 0x129, 0, 0) Index(ss00, m000(), Local1) CH04(ts, 0, 47, z094, 0x12a, 0, 0) // AE_INDEX_TO_NOT_ATTACHED @@ -3070,68 +2314,62 @@ Method(m4b4, 1) // LEqual - LEqual(m000(), i000) + Store (LEqual(m000(), i000), Local1) CH06(arg0, 58, 47) - LEqual(i000, m000()) + Store (LEqual(i000, m000()), Local1) CH06(arg0, 59, 47) // LGreater - LGreater(m000(), i000) + Store (LGreater(m000(), i000), Local1) CH06(arg0, 60, 47) - LGreater(i000, m000()) + Store (LGreater(i000, m000()), Local1) CH06(arg0, 61, 47) // LGreaterEqual - LGreaterEqual(m000(), i000) + Store (LGreaterEqual(m000(), i000), Local1) CH06(arg0, 62, 0xff) - LGreaterEqual(i000, m000()) + Store (LGreaterEqual(i000, m000()), Local1) CH06(arg0, 63, 0xff) // LLess - LLess(m000(), i000) + Store (LLess(m000(), i000), Local1) CH06(arg0, 64, 47) - LLess(i000, m000()) + Store (LLess(i000, m000()), Local1) CH06(arg0, 65, 47) // LLessEqual - LLessEqual(m000(), i000) + Store (LLessEqual(m000(), i000), Local1) CH06(arg0, 66, 0xff) - LLessEqual(i000, m000()) + Store (LLessEqual(i000, m000()), Local1) CH06(arg0, 67, 0xff) // LNotEqual - LNotEqual(m000(), i000) + Store (LNotEqual(m000(), i000), Local1) CH06(arg0, 68, 0xff) - LNotEqual(i000, m000()) + Store (LNotEqual(i000, m000()), Local1) CH06(arg0, 69, 0xff) // LOr - LOr(m000(), i000) + Store (LOr(m000(), i000), Local1) CH06(arg0, 70, 47) - LOr(i000, m000()) + Store (LOr(i000, m000()), Local1) CH06(arg0, 71, 47) // Mod - Mod(m000(), i000) - CH06(arg0, 72, 47) - - Mod(i000, m000()) - CH06(arg0, 73, 47) - Mod(m000(), i000, Local1) CH06(arg0, 74, 47) @@ -3140,12 +2378,6 @@ Method(m4b4, 1) // Multiply - Multiply(m000(), i000) - CH06(arg0, 76, 47) - - Multiply(i000, m000()) - CH06(arg0, 77, 47) - Multiply(m000(), i000, Local1) CH06(arg0, 78, 47) @@ -3154,12 +2386,6 @@ Method(m4b4, 1) // NAnd - NAnd(m000(), i000) - CH06(arg0, 80, 47) - - NAnd(i000, m000()) - CH06(arg0, 81, 47) - NAnd(m000(), i000, Local1) CH06(arg0, 82, 47) @@ -3168,12 +2394,6 @@ Method(m4b4, 1) // NOr - NOr(m000(), i000) - CH06(arg0, 84, 47) - - NOr(i000, m000()) - CH06(arg0, 85, 47) - NOr(m000(), i000, Local1) CH06(arg0, 86, 47) @@ -3182,12 +2402,6 @@ Method(m4b4, 1) // Or - Or(m000(), i000) - CH06(arg0, 88, 47) - - Or(i000, m000()) - CH06(arg0, 89, 47) - Or(m000(), i000, Local1) CH06(arg0, 90, 47) @@ -3196,12 +2410,6 @@ Method(m4b4, 1) // ShiftLeft - ShiftLeft(m000(), i000) - CH06(arg0, 92, 47) - - ShiftLeft(i000, m000()) - CH06(arg0, 93, 47) - ShiftLeft(m000(), i000, Local1) CH06(arg0, 94, 47) @@ -3210,12 +2418,6 @@ Method(m4b4, 1) // ShiftRight - ShiftRight(m000(), i000) - CH06(arg0, 96, 47) - - ShiftRight(i000, m000()) - CH06(arg0, 97, 47) - ShiftRight(m000(), i000, Local1) CH06(arg0, 98, 47) @@ -3224,12 +2426,6 @@ Method(m4b4, 1) // Subtract - Subtract(m000(), i000) - CH06(arg0, 100, 47) - - Subtract(i000, m000()) - CH06(arg0, 101, 47) - Subtract(m000(), i000, Local1) CH06(arg0, 102, 47) @@ -3238,12 +2434,6 @@ Method(m4b4, 1) // ToString - ToString(m000(), 1) - CH06(arg0, 104, 47) - - ToString(i000, m000()) - CH06(arg0, 105, 47) - ToString(m000(), 1, Local1) CH06(arg0, 106, 47) @@ -3252,20 +2442,14 @@ Method(m4b4, 1) // Wait - Wait(m000(), i000) + Store(Wait(m000(), i000), Local1) CH06(arg0, 108, 47) - Wait(e000, m000()) + Store(Wait(e000, m000()), Local1) CH06(arg0, 109, 47) // XOr - XOr(m000(), i000) - CH06(arg0, 110, 47) - - XOr(i000, m000()) - CH06(arg0, 111, 47) - XOr(m000(), i000, Local1) CH06(arg0, 112, 47) @@ -3274,15 +2458,6 @@ Method(m4b4, 1) // Mid - Mid(m000(), 1, 1) - CH06(arg0, 114, 47) - - Mid("123", m000(), 1) - CH06(arg0, 115, 47) - - Mid("123", 1, m000()) - CH06(arg0, 116, 47) - Mid(m000(), 1, 1, Local1) CH06(arg0, 117, 47) @@ -3294,16 +2469,16 @@ Method(m4b4, 1) // Match - Match(m000(), MTR, 0, MTR, 0, 0) + Store (Match(m000(), MTR, 0, MTR, 0, 0), Local1) CH03(ts, z096, 66, 0, 0) - Match(Package(){1}, MTR, m000(), MTR, 0, 0) + Store (Match(Package(){1}, MTR, m000(), MTR, 0, 0), Local1) CH06(arg0, 121, 47) - Match(Package(){1}, MTR, 0, MTR, m000(), 0) + Store (Match(Package(){1}, MTR, 0, MTR, m000(), 0), Local1) CH06(arg0, 122, 47) - Match(Package(){1}, MTR, 0, MTR, 0, m000()) + Store (Match(Package(){1}, MTR, 0, MTR, 0, m000()), Local1) CH06(arg0, 123, 47) } @@ -3340,19 +2515,19 @@ Method(m4b4, 1) Store(0, i000) - DerefOf(m000(1, lpC0)) + Store (DerefOf(m000(1, lpC0)), Local1) CH03(ts, z096, Add(67, lpC0), 0, 0) CH00(arg0, 1) - DerefOf(DerefOf(m000(2, lpC0))) + Store (DerefOf(DerefOf(m000(2, lpC0))), Local1) CH06(arg0, Add(1, Local0), 47) CH00(arg0, 2) - Index(DerefOf(m000(3, lpC0)), 0) + Store (Index(DerefOf(m000(3, lpC0)), 0), Local1) CH06(arg0, Add(2, Local0), 47) CH00(arg0, 3) - Match(DerefOf(m000(4, lpC0)), MTR, 0, MTR, 0, 0) + Store (Match(DerefOf(m000(4, lpC0)), MTR, 0, MTR, 0, 0), Local1) CH06(arg0, Add(3, Local0), 47) CH00(arg0, 4) @@ -3383,12 +2558,12 @@ Method(m4b4, 1) // CondRefOf if (y601) { - CondRefOf(m000(1)) + Store (CondRefOf(m000(1)), Local1) CH06(arg0, 1, 47) CH00(arg0, 1) } - CondRefOf(m000(2), Local1) + Store (CondRefOf(m000(2)), Local1) CH06(arg0, 2, 47) if (y600) { CH00(arg0, 2) @@ -3396,14 +2571,14 @@ Method(m4b4, 1) // DerefOf - DerefOf(m000(3)) + Store (DerefOf(m000(3)), Local1) CH06(arg0, 3, 47) CH00(arg0, 3) // RefOf if (y601) { - RefOf(m000(4)) + Store (RefOf(m000(4)), Local1) CH06(arg0, 4, 47) CH00(arg0, 4) } @@ -3434,7 +2609,7 @@ Method(m4b4, 1) // Acquire - Acquire(m000(8), 0) + Store(Acquire(m000(8), 0), Local1) CH06(arg0, 8, 47) if (y600) { CH00(arg0, 8) @@ -3443,7 +2618,7 @@ Method(m4b4, 1) // Index CH03(ts, z094, 0x123, 0, 0) - Index(m000(9), 0) + Store (Index(m000(9), 0), Local1) if (y900) { CH03(ts, z096, 69, 0, 0) CH00(arg0, 9) @@ -3453,7 +2628,7 @@ Method(m4b4, 1) // Wait - Wait(m000(10), 0) + Store(Wait(m000(10), 0), Local1) CH06(arg0, 9, 47) if (y600) { CH00(arg0, 10) @@ -3461,7 +2636,7 @@ Method(m4b4, 1) // Match - Match(m000(11), MTR, 0, MTR, 0, 0) + Store (Match(m000(11), MTR, 0, MTR, 0, 0), Local1) CH03(ts, z096, 70, 0, 0) CH00(arg0, 11) } 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 5ef50e208..a915adbfc 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 @@ -71,21 +71,21 @@ Method(m4b5) // Like Integer behaviour if (y083) { - DerefOf(fu02) + Store (DerefOf(fu02), Local1) CH06(arg0, 0, 47) } - Index(fu02, 0) + Store (Index(fu02, 0), Local1) CH06(arg0, 1, 47) // Like Buffer behaviour if (y083) { - DerefOf(fu03) + Store (DerefOf(fu03), Local1) CH06(arg0, 2, 47) } - Index(fu03, 0) + Store (Index(fu03, 0), Local1) if (y900) { CH03(ts, z097, 0, 0, 0) } else { @@ -102,21 +102,21 @@ Method(m4b5) // Like Integer behaviour if (y083) { - DerefOf(fu00) + Store (DerefOf(fu00), Local1) CH06(arg0, 3, 47) } - Index(fu00, 0) + Store (Index(fu00, 0), Local1) CH06(arg0, 4, 47) // Like Buffer behaviour if (y083) { - DerefOf(fu01) + Store (DerefOf(fu01), Local1) CH06(arg0, 5, 47) } - Index(fu01, 0) + Store (Index(fu01, 0), Local1) if (y900) { CH03(ts, z097, 1, 0, 0) } else { @@ -136,13 +136,13 @@ Method(m4b5) return (1) } - DerefOf(arg1) + Store (DerefOf(arg1), Local1) CH03(ts, z097, 2, 0, 0) - DerefOf(DerefOf(arg1)) + Store (DerefOf(DerefOf(arg1)), Local1) CH06(arg0, 7, 47) - Index(DerefOf(arg1), 0) + Store (Index(DerefOf(arg1), 0), Local1) if (arg2) { // Like Buffer behaviour @@ -156,7 +156,7 @@ Method(m4b5) CH06(arg0, 8, 47) } - Match(DerefOf(arg1), MTR, 0, MTR, 0, 0) + Store (Match(DerefOf(arg1), MTR, 0, MTR, 0, 0), Local1) CH06(arg0, 9, 47) return (0) @@ -207,16 +207,16 @@ Method(m4b5) Store(0, i000) - DerefOf(m000(1, lpC0)) + Store (DerefOf(m000(1, lpC0)), Local1) CH03(ts, z097, Add(4, lpC0), 0, 0) CH00(arg0, 1) - DerefOf(DerefOf(m000(2, lpC0))) + Store (DerefOf(DerefOf(m000(2, lpC0))), Local1) CH06(arg0, Add(11, Local0), 47) CH00(arg0, 2) - Index(DerefOf(m000(3, lpC0)), 0) + Store (Index(DerefOf(m000(3, lpC0)), 0), Local1) if (Mod(lpC0, 2)) { // Like Buffer behaviour if (y900) { @@ -230,7 +230,7 @@ Method(m4b5) } CH00(arg0, 3) - Match(DerefOf(m000(4, lpC0)), MTR, 0, MTR, 0, 0) + Store (Match(DerefOf(m000(4, lpC0)), MTR, 0, MTR, 0, 0), Local1) CH06(arg0, Add(13, Local0), 47) CH00(arg0, 4) 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 09195fd93..aa8fa7837 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 @@ -55,7 +55,7 @@ Method(m4b6) { Device(dev2) {} - DerefOf(dev2) + Store (DerefOf(dev2), Local1) CH06(arg0, 0, 47) } @@ -63,7 +63,7 @@ Method(m4b6) Method(m001, 1) { if (y083) { - DerefOf(dev0) + Store (DerefOf(dev0), Local1) CH06(arg0, 1, 47) } } @@ -79,9 +79,6 @@ Method(m4b6) // CondRefOf - CondRefOf(Local0) - CH03(ts, z098, 0, 0, 0) - CondRefOf(Local0, Local1) CH03(ts, z098, 1, 0, 0) @@ -97,30 +94,21 @@ Method(m4b6) // DerefOf - DerefOf(Local0) + Store (DerefOf(Local0), Local1) CH06(arg0, 2, 47) // FindSetLeftBit - FindSetLeftBit(Local0) - CH06(arg0, 3, 47) - FindSetLeftBit(Local0, Local1) CH06(arg0, 4, 47) // FindSetRightBit - FindSetRightBit(Local0) - CH06(arg0, 5, 47) - FindSetRightBit(Local0, Local1) CH06(arg0, 6, 47) // FromBCD - FromBCD(Local0) - CH06(arg0, 7, 47) - FromBCD(Local0, Local1) CH06(arg0, 8, 47) @@ -131,25 +119,22 @@ Method(m4b6) // LNot - LNot(Local0) + Store (LNot(Local0), Local1) CH06(arg0, 10, 47) // Not - Not(Local0) - CH06(arg0, 11, 47) - Not(Local0, Local1) CH06(arg0, 12, 47) // ObjectType - ObjectType(Local0) + Store (ObjectType(Local0), Local1) CH03(ts, z098, 3, 0, 0) // RefOf - RefOf(Local0) + Store (RefOf(Local0), Local1) CH03(ts, z098, 4, 0, 0) // Release @@ -169,7 +154,7 @@ Method(m4b6) // SizeOf - SizeOf(Local0) + Store (SizeOf(Local0), Local1) CH06(arg0, 16, 47) // Sleep @@ -189,57 +174,36 @@ Method(m4b6) // ToBCD - ToBCD(Local0) - CH06(arg0, 20, 47) - ToBCD(Local0, Local1) CH06(arg0, 21, 47) // ToBuffer - ToBuffer(Local0) - CH06(arg0, 22, 47) - ToBuffer(Local0, Local1) CH06(arg0, 23, 47) // ToDecimalString - ToDecimalString(Local0) - CH06(arg0, 24, 47) - ToDecimalString(Local0, Local1) CH06(arg0, 25, 47) // ToHexString - ToHexString(Local0) - CH06(arg0, 26, 47) - ToHexString(Local0, Local1) CH06(arg0, 27, 47) // ToInteger - ToInteger(Local0) - CH06(arg0, 28, 47) - ToInteger(Local0, Local1) CH06(arg0, 29, 47) // Acquire - Acquire(Local0, 100) + Store(Acquire(Local0, 100), Local1) CH06(arg0, 30, 47) // Add - Add(Local0, i000) - CH06(arg0, 31, 47) - - Add(i000, Local0) - CH06(arg0, 32, 47) - Add(Local0, i000, Local1) CH06(arg0, 33, 47) @@ -248,12 +212,6 @@ Method(m4b6) // And - And(Local0, i000) - CH06(arg0, 35, 47) - - And(i000, Local0) - CH06(arg0, 36, 47) - And(Local0, i000, Local1) CH06(arg0, 37, 47) @@ -262,12 +220,6 @@ Method(m4b6) // Concatenate - Concatenate(Local0, i000) - CH06(arg0, 39, 47) - - Concatenate(i000, Local0) - CH06(arg0, 40, 47) - Concatenate(Local0, i000, Local1) CH06(arg0, 41, 47) @@ -276,12 +228,6 @@ Method(m4b6) // ConcatenateResTemplate - ConcatenateResTemplate(Local0, ResourceTemplate(){}) - CH06(arg0, 43, 47) - - ConcatenateResTemplate(ResourceTemplate(){}, Local0) - CH06(arg0, 44, 47) - ConcatenateResTemplate(Local0, ResourceTemplate(){}, Local1) CH06(arg0, 45, 47) @@ -290,12 +236,6 @@ Method(m4b6) // Divide - Divide(Local0, i000) - CH06(arg0, 47, 47) - - Divide(i000, Local0) - CH06(arg0, 48, 47) - Divide(Local0, i000, Local2) CH06(arg0, 49, 47) @@ -315,12 +255,6 @@ Method(m4b6) // Index - Index(Local0, 0) - CH06(arg0, 54, 47) - - Index("0", Local0) - CH06(arg0, 55, 47) - Index(Local0, 0, Local1) CH06(arg0, 56, 47) @@ -329,68 +263,62 @@ Method(m4b6) // LEqual - LEqual(Local0, i000) + Store (LEqual(Local0, i000), Local1) CH06(arg0, 58, 47) - LEqual(i000, Local0) + Store (LEqual(i000, Local0), Local1) CH06(arg0, 59, 47) // LGreater - LGreater(Local0, i000) + Store (LGreater(Local0, i000), Local1) CH06(arg0, 60, 47) - LGreater(i000, Local0) + Store (LGreater(i000, Local0), Local1) CH06(arg0, 61, 47) // LGreaterEqual - LGreaterEqual(Local0, i000) + Store (LGreaterEqual(Local0, i000), Local1) CH06(arg0, 62, 0xff) - LGreaterEqual(i000, Local0) + Store (LGreaterEqual(i000, Local0), Local1) CH06(arg0, 63, 0xff) // LLess - LLess(Local0, i000) + Store (LLess(Local0, i000), Local1) CH06(arg0, 64, 47) - LLess(i000, Local0) + Store (LLess(i000, Local0), Local1) CH06(arg0, 65, 47) // LLessEqual - LLessEqual(Local0, i000) + Store (LLessEqual(Local0, i000), Local1) CH06(arg0, 66, 0xff) - LLessEqual(i000, Local0) + Store (LLessEqual(i000, Local0), Local1) CH06(arg0, 67, 0xff) // LNotEqual - LNotEqual(Local0, i000) + Store (LNotEqual(Local0, i000), Local1) CH06(arg0, 68, 0xff) - LNotEqual(i000, Local0) + Store (LNotEqual(i000, Local0), Local1) CH06(arg0, 69, 0xff) // LOr - LOr(Local0, i000) + Store (LOr(Local0, i000), Local1) CH06(arg0, 70, 47) - LOr(i000, Local0) + Store (LOr(i000, Local0), Local1) CH06(arg0, 71, 47) // Mod - Mod(Local0, i000) - CH06(arg0, 72, 47) - - Mod(i000, Local0) - CH06(arg0, 73, 47) - Mod(Local0, i000, Local1) CH06(arg0, 74, 47) @@ -399,12 +327,6 @@ Method(m4b6) // Multiply - Multiply(Local0, i000) - CH06(arg0, 76, 47) - - Multiply(i000, Local0) - CH06(arg0, 77, 47) - Multiply(Local0, i000, Local1) CH06(arg0, 78, 47) @@ -413,12 +335,6 @@ Method(m4b6) // NAnd - NAnd(Local0, i000) - CH06(arg0, 80, 47) - - NAnd(i000, Local0) - CH06(arg0, 81, 47) - NAnd(Local0, i000, Local1) CH06(arg0, 82, 47) @@ -427,12 +343,6 @@ Method(m4b6) // NOr - NOr(Local0, i000) - CH06(arg0, 84, 47) - - NOr(i000, Local0) - CH06(arg0, 85, 47) - NOr(Local0, i000, Local1) CH06(arg0, 86, 47) @@ -441,12 +351,6 @@ Method(m4b6) // Or - Or(Local0, i000) - CH06(arg0, 88, 47) - - Or(i000, Local0) - CH06(arg0, 89, 47) - Or(Local0, i000, Local1) CH06(arg0, 90, 47) @@ -455,12 +359,6 @@ Method(m4b6) // ShiftLeft - ShiftLeft(Local0, i000) - CH06(arg0, 92, 47) - - ShiftLeft(i000, Local0) - CH06(arg0, 93, 47) - ShiftLeft(Local0, i000, Local1) CH06(arg0, 94, 47) @@ -469,12 +367,6 @@ Method(m4b6) // ShiftRight - ShiftRight(Local0, i000) - CH06(arg0, 96, 47) - - ShiftRight(i000, Local0) - CH06(arg0, 97, 47) - ShiftRight(Local0, i000, Local1) CH06(arg0, 98, 47) @@ -483,12 +375,6 @@ Method(m4b6) // Subtract - Subtract(Local0, i000) - CH06(arg0, 100, 47) - - Subtract(i000, Local0) - CH06(arg0, 101, 47) - Subtract(Local0, i000, Local1) CH06(arg0, 102, 47) @@ -497,12 +383,6 @@ Method(m4b6) // ToString - ToString(Local0, 1) - CH06(arg0, 104, 47) - - ToString(i000, Local0) - CH06(arg0, 105, 47) - ToString(Local0, 1, Local1) CH06(arg0, 106, 47) @@ -511,20 +391,14 @@ Method(m4b6) // Wait - Wait(Local0, i000) + Store(Wait(Local0, i000), Local1) CH06(arg0, 108, 47) - Wait(e000, Local0) + Store(Wait(e000, Local0), Local1) CH06(arg0, 109, 47) // XOr - XOr(Local0, i000) - CH06(arg0, 110, 47) - - XOr(i000, Local0) - CH06(arg0, 111, 47) - XOr(Local0, i000, Local1) CH06(arg0, 112, 47) @@ -533,15 +407,6 @@ Method(m4b6) // Mid - Mid(Local0, 1, 1) - CH06(arg0, 114, 47) - - Mid("123", Local0, 1) - CH06(arg0, 115, 47) - - Mid("123", 1, Local0) - CH06(arg0, 116, 47) - Mid(Local0, 1, 1, Local1) CH06(arg0, 117, 47) @@ -553,16 +418,16 @@ Method(m4b6) // Match - Match(Local0, MTR, 0, MTR, 0, 0) + Store (Match(Local0, MTR, 0, MTR, 0, 0), Local1) CH06(arg0, 120, 47) - Match(Package(){1}, MTR, Local0, MTR, 0, 0) + Store (Match(Package(){1}, MTR, Local0, MTR, 0, 0), Local1) CH06(arg0, 121, 47) - Match(Package(){1}, MTR, 0, MTR, Local0, 0) + Store (Match(Package(){1}, MTR, 0, MTR, Local0, 0), Local1) CH06(arg0, 122, 47) - Match(Package(){1}, MTR, 0, MTR, 0, Local0) + Store (Match(Package(){1}, MTR, 0, MTR, 0, Local0), Local1) CH06(arg0, 123, 47) } @@ -583,14 +448,11 @@ Method(m4b6) } } - DeRefOf(arg1) + Store (DeRefOf(arg1), Local1) CH03(ts, z098, 5, 0, 0) // CondRefOf - CondRefOf(DeRefOf(arg1)) - CH06(arg0, 0, EXC0) - CondRefOf(DeRefOf(arg1), Local1) CH06(arg0, 1, EXC0) @@ -606,30 +468,21 @@ Method(m4b6) // DerefOf - DerefOf(DeRefOf(arg1)) + Store (DerefOf(DeRefOf(arg1)), Local1) CH06(arg0, 4, EXC0) // FindSetLeftBit - FindSetLeftBit(DeRefOf(arg1)) - CH06(arg0, 5, EXC0) - FindSetLeftBit(DeRefOf(arg1), Local1) CH06(arg0, 6, EXC0) // FindSetRightBit - FindSetRightBit(DeRefOf(arg1)) - CH06(arg0, 7, EXC0) - FindSetRightBit(DeRefOf(arg1), Local1) CH06(arg0, 8, EXC0) // FromBCD - FromBCD(DeRefOf(arg1)) - CH06(arg0, 9, EXC0) - FromBCD(DeRefOf(arg1), Local1) CH06(arg0, 10, EXC0) @@ -640,25 +493,22 @@ Method(m4b6) // LNot - LNot(DeRefOf(arg1)) + Store (LNot(DeRefOf(arg1)), Local1) CH06(arg0, 12, EXC0) // Not - Not(DeRefOf(arg1)) - CH06(arg0, 13, EXC0) - Not(DeRefOf(arg1), Local1) CH06(arg0, 14, EXC0) // ObjectType - ObjectType(DeRefOf(arg1)) + Store (ObjectType(DeRefOf(arg1)), Local1) CH03(ts, z098, 6, 0, 0) // RefOf - RefOf(DeRefOf(arg1)) + Store (RefOf(DeRefOf(arg1)), Local1) CH06(arg0, 15, EXC0) // Release @@ -669,7 +519,7 @@ Method(m4b6) // SizeOf - SizeOf(DeRefOf(arg1)) + Store (SizeOf(DeRefOf(arg1)), Local1) CH06(arg0, 16, EXC0) // Sleep @@ -689,41 +539,26 @@ Method(m4b6) // ToBCD - ToBCD(DeRefOf(arg1)) - CH06(arg0, 20, EXC0) - ToBCD(DeRefOf(arg1), Local1) CH06(arg0, 21, EXC0) // ToBuffer - ToBuffer(DeRefOf(arg1)) - CH06(arg0, 22, EXC0) - ToBuffer(DeRefOf(arg1), Local1) CH06(arg0, 23, EXC0) // ToDecimalString - ToDecimalString(DeRefOf(arg1)) - CH06(arg0, 24, EXC0) - ToDecimalString(DeRefOf(arg1), Local1) CH06(arg0, 25, EXC0) // ToHexString - ToHexString(DeRefOf(arg1)) - CH06(arg0, 26, EXC0) - ToHexString(DeRefOf(arg1), Local1) CH06(arg0, 27, EXC0) // ToInteger - ToInteger(DeRefOf(arg1)) - CH06(arg0, 28, EXC0) - ToInteger(DeRefOf(arg1), Local1) CH06(arg0, 29, EXC0) @@ -731,12 +566,6 @@ Method(m4b6) // Add - Add(DeRefOf(arg1), i000) - CH06(arg0, 31, EXC0) - - Add(i000, DeRefOf(arg1)) - CH06(arg0, 32, EXC0) - Add(DeRefOf(arg1), i000, Local1) CH06(arg0, 33, EXC0) @@ -745,12 +574,6 @@ Method(m4b6) // And - And(DeRefOf(arg1), i000) - CH06(arg0, 35, EXC0) - - And(i000, DeRefOf(arg1)) - CH06(arg0, 36, EXC0) - And(DeRefOf(arg1), i000, Local1) CH06(arg0, 37, EXC0) @@ -759,12 +582,6 @@ Method(m4b6) // Concatenate - Concatenate(DeRefOf(arg1), i000) - CH06(arg0, 39, EXC0) - - Concatenate(i000, DeRefOf(arg1)) - CH06(arg0, 40, EXC0) - Concatenate(DeRefOf(arg1), i000, Local1) CH06(arg0, 41, EXC0) @@ -773,12 +590,6 @@ Method(m4b6) // ConcatenateResTemplate - ConcatenateResTemplate(DeRefOf(arg1), ResourceTemplate(){}) - CH06(arg0, 43, EXC0) - - ConcatenateResTemplate(ResourceTemplate(){}, DeRefOf(arg1)) - CH06(arg0, 44, EXC0) - ConcatenateResTemplate(DeRefOf(arg1), ResourceTemplate(){}, Local1) CH06(arg0, 45, EXC0) @@ -787,12 +598,6 @@ Method(m4b6) // Divide - Divide(DeRefOf(arg1), i000) - CH06(arg0, 47, EXC0) - - Divide(i000, DeRefOf(arg1)) - CH06(arg0, 48, EXC0) - Divide(DeRefOf(arg1), i000, Local2) CH06(arg0, 49, EXC0) @@ -812,12 +617,6 @@ Method(m4b6) // Index - Index(DeRefOf(arg1), 0) - CH06(arg0, 54, EXC0) - - Index("0", DeRefOf(arg1)) - CH06(arg0, 55, EXC0) - Index(DeRefOf(arg1), 0, Local1) CH06(arg0, 56, EXC0) @@ -826,68 +625,62 @@ Method(m4b6) // LEqual - LEqual(DeRefOf(arg1), i000) + Store (LEqual(DeRefOf(arg1), i000), Local1) CH06(arg0, 58, EXC0) - LEqual(i000, DeRefOf(arg1)) + Store (LEqual(i000, DeRefOf(arg1)), Local1) CH06(arg0, 59, EXC0) // LGreater - LGreater(DeRefOf(arg1), i000) + Store (LGreater(DeRefOf(arg1), i000), Local1) CH06(arg0, 60, EXC0) - LGreater(i000, DeRefOf(arg1)) + Store (LGreater(i000, DeRefOf(arg1)), Local1) CH06(arg0, 61, EXC0) // LGreaterEqual - LGreaterEqual(DeRefOf(arg1), i000) + Store (LGreaterEqual(DeRefOf(arg1), i000), Local1) CH06(arg0, 62, 0xff) - LGreaterEqual(i000, DeRefOf(arg1)) + Store (LGreaterEqual(i000, DeRefOf(arg1)), Local1) CH06(arg0, 63, 0xff) // LLess - LLess(DeRefOf(arg1), i000) + Store (LLess(DeRefOf(arg1), i000), Local1) CH06(arg0, 64, EXC0) - LLess(i000, DeRefOf(arg1)) + Store (LLess(i000, DeRefOf(arg1)), Local1) CH06(arg0, 65, EXC0) // LLessEqual - LLessEqual(DeRefOf(arg1), i000) + Store (LLessEqual(DeRefOf(arg1), i000), Local1) CH06(arg0, 66, 0xff) - LLessEqual(i000, DeRefOf(arg1)) + Store (LLessEqual(i000, DeRefOf(arg1)), Local1) CH06(arg0, 67, 0xff) // LNotEqual - LNotEqual(DeRefOf(arg1), i000) + Store (LNotEqual(DeRefOf(arg1), i000), Local1) CH06(arg0, 68, 0xff) - LNotEqual(i000, DeRefOf(arg1)) + Store (LNotEqual(i000, DeRefOf(arg1)), Local1) CH06(arg0, 69, 0xff) // LOr - LOr(DeRefOf(arg1), i000) + Store (LOr(DeRefOf(arg1), i000), Local1) CH06(arg0, 70, EXC0) - LOr(i000, DeRefOf(arg1)) + Store (LOr(i000, DeRefOf(arg1)), Local1) CH06(arg0, 71, EXC0) // Mod - Mod(DeRefOf(arg1), i000) - CH06(arg0, 72, EXC0) - - Mod(i000, DeRefOf(arg1)) - CH06(arg0, 73, EXC0) - Mod(DeRefOf(arg1), i000, Local1) CH06(arg0, 74, EXC0) @@ -896,12 +689,6 @@ Method(m4b6) // Multiply - Multiply(DeRefOf(arg1), i000) - CH06(arg0, 76, EXC0) - - Multiply(i000, DeRefOf(arg1)) - CH06(arg0, 77, EXC0) - Multiply(DeRefOf(arg1), i000, Local1) CH06(arg0, 78, EXC0) @@ -910,12 +697,6 @@ Method(m4b6) // NAnd - NAnd(DeRefOf(arg1), i000) - CH06(arg0, 80, EXC0) - - NAnd(i000, DeRefOf(arg1)) - CH06(arg0, 81, EXC0) - NAnd(DeRefOf(arg1), i000, Local1) CH06(arg0, 82, EXC0) @@ -924,12 +705,6 @@ Method(m4b6) // NOr - NOr(DeRefOf(arg1), i000) - CH06(arg0, 84, EXC0) - - NOr(i000, DeRefOf(arg1)) - CH06(arg0, 85, EXC0) - NOr(DeRefOf(arg1), i000, Local1) CH06(arg0, 86, EXC0) @@ -938,12 +713,6 @@ Method(m4b6) // Or - Or(DeRefOf(arg1), i000) - CH06(arg0, 88, EXC0) - - Or(i000, DeRefOf(arg1)) - CH06(arg0, 89, EXC0) - Or(DeRefOf(arg1), i000, Local1) CH06(arg0, 90, EXC0) @@ -952,12 +721,6 @@ Method(m4b6) // ShiftLeft - ShiftLeft(DeRefOf(arg1), i000) - CH06(arg0, 92, EXC0) - - ShiftLeft(i000, DeRefOf(arg1)) - CH06(arg0, 93, EXC0) - ShiftLeft(DeRefOf(arg1), i000, Local1) CH06(arg0, 94, EXC0) @@ -966,12 +729,6 @@ Method(m4b6) // ShiftRight - ShiftRight(DeRefOf(arg1), i000) - CH06(arg0, 96, EXC0) - - ShiftRight(i000, DeRefOf(arg1)) - CH06(arg0, 97, EXC0) - ShiftRight(DeRefOf(arg1), i000, Local1) CH06(arg0, 98, EXC0) @@ -980,12 +737,6 @@ Method(m4b6) // Subtract - Subtract(DeRefOf(arg1), i000) - CH06(arg0, 100, EXC0) - - Subtract(i000, DeRefOf(arg1)) - CH06(arg0, 101, EXC0) - Subtract(DeRefOf(arg1), i000, Local1) CH06(arg0, 102, EXC0) @@ -994,12 +745,6 @@ Method(m4b6) // ToString - ToString(DeRefOf(arg1), 1) - CH06(arg0, 104, EXC0) - - ToString(i000, DeRefOf(arg1)) - CH06(arg0, 105, EXC0) - ToString(DeRefOf(arg1), 1, Local1) CH06(arg0, 106, EXC0) @@ -1008,17 +753,11 @@ Method(m4b6) // Wait - Wait(e000, DeRefOf(arg1)) + Store(Wait(e000, DeRefOf(arg1)), Local1) CH06(arg0, 109, EXC0) // XOr - XOr(DeRefOf(arg1), i000) - CH06(arg0, 110, EXC0) - - XOr(i000, DeRefOf(arg1)) - CH06(arg0, 111, EXC0) - XOr(DeRefOf(arg1), i000, Local1) CH06(arg0, 112, EXC0) @@ -1027,15 +766,6 @@ Method(m4b6) // Mid - Mid(DeRefOf(arg1), 1, 1) - CH06(arg0, 114, EXC0) - - Mid("123", DeRefOf(arg1), 1) - CH06(arg0, 115, EXC0) - - Mid("123", 1, DeRefOf(arg1)) - CH06(arg0, 116, EXC0) - Mid(DeRefOf(arg1), 1, 1, Local1) CH06(arg0, 117, EXC0) @@ -1047,16 +777,16 @@ Method(m4b6) // Match - Match(DeRefOf(arg1), MTR, 0, MTR, 0, 0) + Store (Match(DeRefOf(arg1), MTR, 0, MTR, 0, 0), Local1) CH06(arg0, 120, EXC0) - Match(Package(){1}, MTR, DeRefOf(arg1), MTR, 0, 0) + Store (Match(Package(){1}, MTR, DeRefOf(arg1), MTR, 0, 0), Local1) CH06(arg0, 121, EXC0) - Match(Package(){1}, MTR, 0, MTR, DeRefOf(arg1), 0) + Store (Match(Package(){1}, MTR, 0, MTR, DeRefOf(arg1), 0), Local1) CH06(arg0, 122, EXC0) - Match(Package(){1}, MTR, 0, MTR, 0, DeRefOf(arg1)) + Store (Match(Package(){1}, MTR, 0, MTR, 0, DeRefOf(arg1)), Local1) CH06(arg0, 123, EXC0) return (0) @@ -1075,9 +805,6 @@ Method(m4b6) // CondRefOf - CondRefOf(m000()) - CH06(arg0, 0, 47) - CondRefOf(m000(), Local1) CH06(arg0, 1, 47) @@ -1093,30 +820,21 @@ Method(m4b6) // DerefOf - DerefOf(m000()) + Store (DerefOf(m000()), Local1) CH06(arg0, 3, 47) // FindSetLeftBit - FindSetLeftBit(m000()) - CH06(arg0, 4, 47) - FindSetLeftBit(m000(), Local1) CH06(arg0, 5, 47) // FindSetRightBit - FindSetRightBit(m000()) - CH06(arg0, 6, 47) - FindSetRightBit(m000(), Local1) CH06(arg0, 7, 47) // FromBCD - FromBCD(m000()) - CH06(arg0, 8, 47) - FromBCD(m000(), Local1) CH06(arg0, 9, 47) @@ -1127,14 +845,11 @@ Method(m4b6) // LNot - LNot(m000()) + Store (LNot(m000()), Local1) CH06(arg0, 11, 47) // Not - Not(m000()) - CH06(arg0, 12, 47) - Not(m000(), Local1) CH06(arg0, 13, 47) @@ -1146,7 +861,7 @@ Method(m4b6) // RefOf - RefOf(m000()) + Store (RefOf(m000()), Local1) CH06(arg0, 14, 47) // Release @@ -1166,7 +881,7 @@ Method(m4b6) // SizeOf - SizeOf(m000()) + Store (SizeOf(m000()), Local1) CH06(arg0, 16, 47) // Sleep @@ -1186,57 +901,36 @@ Method(m4b6) // ToBCD - ToBCD(m000()) - CH06(arg0, 20, 47) - ToBCD(m000(), Local1) CH06(arg0, 21, 47) // ToBuffer - ToBuffer(m000()) - CH06(arg0, 22, 47) - ToBuffer(m000(), Local1) CH06(arg0, 23, 47) // ToDecimalString - ToDecimalString(m000()) - CH06(arg0, 24, 47) - ToDecimalString(m000(), Local1) CH06(arg0, 25, 47) // ToHexString - ToHexString(m000()) - CH06(arg0, 26, 47) - ToHexString(m000(), Local1) CH06(arg0, 27, 47) // ToInteger - ToInteger(m000()) - CH06(arg0, 28, 47) - ToInteger(m000(), Local1) CH06(arg0, 29, 47) // Acquire - Acquire(m000(), 100) + Store(Acquire(m000(), 100), Local1) CH06(arg0, 30, 47) // Add - Add(m000(), i000) - CH06(arg0, 31, 47) - - Add(i000, m000()) - CH06(arg0, 32, 47) - Add(m000(), i000, Local1) CH06(arg0, 33, 47) @@ -1245,12 +939,6 @@ Method(m4b6) // And - And(m000(), i000) - CH06(arg0, 35, 47) - - And(i000, m000()) - CH06(arg0, 36, 47) - And(m000(), i000, Local1) CH06(arg0, 37, 47) @@ -1259,12 +947,6 @@ Method(m4b6) // Concatenate - Concatenate(m000(), i000) - CH06(arg0, 39, 47) - - Concatenate(i000, m000()) - CH06(arg0, 40, 47) - Concatenate(m000(), i000, Local1) CH06(arg0, 41, 47) @@ -1273,12 +955,6 @@ Method(m4b6) // ConcatenateResTemplate - ConcatenateResTemplate(m000(), ResourceTemplate(){}) - CH06(arg0, 43, 47) - - ConcatenateResTemplate(ResourceTemplate(){}, m000()) - CH06(arg0, 44, 47) - ConcatenateResTemplate(m000(), ResourceTemplate(){}, Local1) CH06(arg0, 45, 47) @@ -1287,12 +963,6 @@ Method(m4b6) // Divide - Divide(m000(), i000) - CH06(arg0, 47, 47) - - Divide(i000, m000()) - CH06(arg0, 48, 47) - Divide(m000(), i000, Local2) CH06(arg0, 49, 47) @@ -1312,12 +982,6 @@ Method(m4b6) // Index - Index(m000(), 0) - CH06(arg0, 54, 47) - - Index("0", m000()) - CH06(arg0, 55, 47) - Index(m000(), 0, Local1) CH06(arg0, 56, 47) @@ -1326,68 +990,62 @@ Method(m4b6) // LEqual - LEqual(m000(), i000) + Store (LEqual(m000(), i000), Local1) CH06(arg0, 58, 47) - LEqual(i000, m000()) + Store (LEqual(i000, m000()), Local1) CH06(arg0, 59, 47) // LGreater - LGreater(m000(), i000) + Store (LGreater(m000(), i000), Local1) CH06(arg0, 60, 47) - LGreater(i000, m000()) + Store (LGreater(i000, m000()), Local1) CH06(arg0, 61, 47) // LGreaterEqual - LGreaterEqual(m000(), i000) + Store (LGreaterEqual(m000(), i000), Local1) CH06(arg0, 62, 0xff) - LGreaterEqual(i000, m000()) + Store (LGreaterEqual(i000, m000()), Local1) CH06(arg0, 63, 0xff) // LLess - LLess(m000(), i000) + Store (LLess(m000(), i000), Local1) CH06(arg0, 64, 47) - LLess(i000, m000()) + Store (LLess(i000, m000()), Local1) CH06(arg0, 65, 47) // LLessEqual - LLessEqual(m000(), i000) + Store (LLessEqual(m000(), i000), Local1) CH06(arg0, 66, 0xff) - LLessEqual(i000, m000()) + Store (LLessEqual(i000, m000()), Local1) CH06(arg0, 67, 0xff) // LNotEqual - LNotEqual(m000(), i000) + Store (LNotEqual(m000(), i000), Local1) CH06(arg0, 68, 0xff) - LNotEqual(i000, m000()) + Store (LNotEqual(i000, m000()), Local1) CH06(arg0, 69, 0xff) // LOr - LOr(m000(), i000) + Store (LOr(m000(), i000), Local1) CH06(arg0, 70, 47) - LOr(i000, m000()) + Store (LOr(i000, m000()), Local1) CH06(arg0, 71, 47) // Mod - Mod(m000(), i000) - CH06(arg0, 72, 47) - - Mod(i000, m000()) - CH06(arg0, 73, 47) - Mod(m000(), i000, Local1) CH06(arg0, 74, 47) @@ -1396,12 +1054,6 @@ Method(m4b6) // Multiply - Multiply(m000(), i000) - CH06(arg0, 76, 47) - - Multiply(i000, m000()) - CH06(arg0, 77, 47) - Multiply(m000(), i000, Local1) CH06(arg0, 78, 47) @@ -1410,12 +1062,6 @@ Method(m4b6) // NAnd - NAnd(m000(), i000) - CH06(arg0, 80, 47) - - NAnd(i000, m000()) - CH06(arg0, 81, 47) - NAnd(m000(), i000, Local1) CH06(arg0, 82, 47) @@ -1424,12 +1070,6 @@ Method(m4b6) // NOr - NOr(m000(), i000) - CH06(arg0, 84, 47) - - NOr(i000, m000()) - CH06(arg0, 85, 47) - NOr(m000(), i000, Local1) CH06(arg0, 86, 47) @@ -1438,12 +1078,6 @@ Method(m4b6) // Or - Or(m000(), i000) - CH06(arg0, 88, 47) - - Or(i000, m000()) - CH06(arg0, 89, 47) - Or(m000(), i000, Local1) CH06(arg0, 90, 47) @@ -1452,12 +1086,6 @@ Method(m4b6) // ShiftLeft - ShiftLeft(m000(), i000) - CH06(arg0, 92, 47) - - ShiftLeft(i000, m000()) - CH06(arg0, 93, 47) - ShiftLeft(m000(), i000, Local1) CH06(arg0, 94, 47) @@ -1466,12 +1094,6 @@ Method(m4b6) // ShiftRight - ShiftRight(m000(), i000) - CH06(arg0, 96, 47) - - ShiftRight(i000, m000()) - CH06(arg0, 97, 47) - ShiftRight(m000(), i000, Local1) CH06(arg0, 98, 47) @@ -1480,12 +1102,6 @@ Method(m4b6) // Subtract - Subtract(m000(), i000) - CH06(arg0, 100, 47) - - Subtract(i000, m000()) - CH06(arg0, 101, 47) - Subtract(m000(), i000, Local1) CH06(arg0, 102, 47) @@ -1494,12 +1110,6 @@ Method(m4b6) // ToString - ToString(m000(), 1) - CH06(arg0, 104, 47) - - ToString(i000, m000()) - CH06(arg0, 105, 47) - ToString(m000(), 1, Local1) CH06(arg0, 106, 47) @@ -1508,20 +1118,14 @@ Method(m4b6) // Wait - Wait(m000(), i000) + Store(Wait(m000(), i000), Local1) CH06(arg0, 108, 47) - Wait(e000, m000()) + Store(Wait(e000, m000()), Local1) CH06(arg0, 109, 47) // XOr - XOr(m000(), i000) - CH06(arg0, 110, 47) - - XOr(i000, m000()) - CH06(arg0, 111, 47) - XOr(m000(), i000, Local1) CH06(arg0, 112, 47) @@ -1530,15 +1134,6 @@ Method(m4b6) // Mid - Mid(m000(), 1, 1) - CH06(arg0, 114, 47) - - Mid("123", m000(), 1) - CH06(arg0, 115, 47) - - Mid("123", 1, m000()) - CH06(arg0, 116, 47) - Mid(m000(), 1, 1, Local1) CH06(arg0, 117, 47) @@ -1550,16 +1145,16 @@ Method(m4b6) // Match - Match(m000(), MTR, 0, MTR, 0, 0) + Store (Match(m000(), MTR, 0, MTR, 0, 0), Local1) CH06(arg0, 120, 47) - Match(Package(){1}, MTR, m000(), MTR, 0, 0) + Store (Match(Package(){1}, MTR, m000(), MTR, 0, 0), Local1) CH06(arg0, 121, 47) - Match(Package(){1}, MTR, 0, MTR, m000(), 0) + Store (Match(Package(){1}, MTR, 0, MTR, m000(), 0), Local1) CH06(arg0, 122, 47) - Match(Package(){1}, MTR, 0, MTR, 0, m000()) + Store (Match(Package(){1}, MTR, 0, MTR, 0, m000()), Local1) CH06(arg0, 123, 47) } @@ -1596,19 +1191,19 @@ Method(m4b6) Store(0, i000) - DerefOf(m000(1, lpC0)) + Store (DerefOf(m000(1, lpC0)), Local1) CH03(ts, z098, Add(9, lpC0), 0, 0) CH00(arg0, 1) - DerefOf(DerefOf(m000(2, lpC0))) + Store (DerefOf(DerefOf(m000(2, lpC0))), Local1) CH06(arg0, Add(1, Local0), 47) CH00(arg0, 2) - Index(DerefOf(m000(3, lpC0)), 0) + Store (Index(DerefOf(m000(3, lpC0)), 0), Local1) CH06(arg0, Add(2, Local0), 47) CH00(arg0, 3) - Match(DerefOf(m000(4, lpC0)), MTR, 0, MTR, 0, 0) + Store (Match(DerefOf(m000(4, lpC0)), MTR, 0, MTR, 0, 0), Local1) CH06(arg0, Add(3, Local0), 47) CH00(arg0, 4) 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 66d1afc38..284bb3993 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 @@ -56,7 +56,7 @@ Method(m4b7) Event(ev02) if (y083) { - DerefOf(ev02) + Store (DerefOf(ev02), Local1) CH06(arg0, 0x100, 47) } } @@ -65,7 +65,7 @@ Method(m4b7) Method(m001, 1) { if (y083) { - DerefOf(ev00) + Store (DerefOf(ev00), Local1) CH06(arg0, 0x101, 47) } } @@ -81,9 +81,6 @@ Method(m4b7) // CondRefOf - CondRefOf(Local0) - CH03(ts, z099, 0, 0, 0) - CondRefOf(Local0, Local1) CH03(ts, z099, 1, 0, 0) @@ -99,30 +96,21 @@ Method(m4b7) // DerefOf - DerefOf(Local0) + Store (DerefOf(Local0), Local1) CH06(arg0, 2, 47) // FindSetLeftBit - FindSetLeftBit(Local0) - CH06(arg0, 3, 47) - FindSetLeftBit(Local0, Local1) CH06(arg0, 4, 47) // FindSetRightBit - FindSetRightBit(Local0) - CH06(arg0, 5, 47) - FindSetRightBit(Local0, Local1) CH06(arg0, 6, 47) // FromBCD - FromBCD(Local0) - CH06(arg0, 7, 47) - FromBCD(Local0, Local1) CH06(arg0, 8, 47) @@ -133,25 +121,22 @@ Method(m4b7) // LNot - LNot(Local0) + Store (LNot(Local0), Local1) CH06(arg0, 10, 47) // Not - Not(Local0) - CH06(arg0, 11, 47) - Not(Local0, Local1) CH06(arg0, 12, 47) // ObjectType - ObjectType(Local0) + Store (ObjectType(Local0), Local1) CH03(ts, z099, 3, 0, 0) // RefOf - RefOf(Local0) + Store (RefOf(Local0), Local1) CH03(ts, z099, 4, 0, 0) // Release @@ -171,7 +156,7 @@ Method(m4b7) // SizeOf - SizeOf(Local0) + Store (SizeOf(Local0), Local1) CH06(arg0, 16, 47) // Sleep @@ -191,57 +176,36 @@ Method(m4b7) // ToBCD - ToBCD(Local0) - CH06(arg0, 20, 47) - ToBCD(Local0, Local1) CH06(arg0, 21, 47) // ToBuffer - ToBuffer(Local0) - CH06(arg0, 22, 47) - ToBuffer(Local0, Local1) CH06(arg0, 23, 47) // ToDecimalString - ToDecimalString(Local0) - CH06(arg0, 24, 47) - ToDecimalString(Local0, Local1) CH06(arg0, 25, 47) // ToHexString - ToHexString(Local0) - CH06(arg0, 26, 47) - ToHexString(Local0, Local1) CH06(arg0, 27, 47) // ToInteger - ToInteger(Local0) - CH06(arg0, 28, 47) - ToInteger(Local0, Local1) CH06(arg0, 29, 47) // Acquire - Acquire(Local0, 100) + Store(Acquire(Local0, 100), Local1) CH06(arg0, 30, 47) // Add - Add(Local0, i000) - CH06(arg0, 31, 47) - - Add(i000, Local0) - CH06(arg0, 32, 47) - Add(Local0, i000, Local1) CH06(arg0, 33, 47) @@ -250,12 +214,6 @@ Method(m4b7) // And - And(Local0, i000) - CH06(arg0, 35, 47) - - And(i000, Local0) - CH06(arg0, 36, 47) - And(Local0, i000, Local1) CH06(arg0, 37, 47) @@ -264,12 +222,6 @@ Method(m4b7) // Concatenate - Concatenate(Local0, i000) - CH06(arg0, 39, 47) - - Concatenate(i000, Local0) - CH06(arg0, 40, 47) - Concatenate(Local0, i000, Local1) CH06(arg0, 41, 47) @@ -278,12 +230,6 @@ Method(m4b7) // ConcatenateResTemplate - ConcatenateResTemplate(Local0, ResourceTemplate(){}) - CH06(arg0, 43, 47) - - ConcatenateResTemplate(ResourceTemplate(){}, Local0) - CH06(arg0, 44, 47) - ConcatenateResTemplate(Local0, ResourceTemplate(){}, Local1) CH06(arg0, 45, 47) @@ -292,12 +238,6 @@ Method(m4b7) // Divide - Divide(Local0, i000) - CH06(arg0, 47, 47) - - Divide(i000, Local0) - CH06(arg0, 48, 47) - Divide(Local0, i000, Local2) CH06(arg0, 49, 47) @@ -317,12 +257,6 @@ Method(m4b7) // Index - Index(Local0, 0) - CH06(arg0, 54, 47) - - Index("0", Local0) - CH06(arg0, 55, 47) - Index(Local0, 0, Local1) CH06(arg0, 56, 47) @@ -331,68 +265,62 @@ Method(m4b7) // LEqual - LEqual(Local0, i000) + Store (LEqual(Local0, i000), Local1) CH06(arg0, 58, 47) - LEqual(i000, Local0) + Store (LEqual(i000, Local0), Local1) CH06(arg0, 59, 47) // LGreater - LGreater(Local0, i000) + Store (LGreater(Local0, i000), Local1) CH06(arg0, 60, 47) - LGreater(i000, Local0) + Store (LGreater(i000, Local0), Local1) CH06(arg0, 61, 47) // LGreaterEqual - LGreaterEqual(Local0, i000) + Store (LGreaterEqual(Local0, i000), Local1) CH06(arg0, 62, 0xff) - LGreaterEqual(i000, Local0) + Store (LGreaterEqual(i000, Local0), Local1) CH06(arg0, 63, 0xff) // LLess - LLess(Local0, i000) + Store (LLess(Local0, i000), Local1) CH06(arg0, 64, 47) - LLess(i000, Local0) + Store (LLess(i000, Local0), Local1) CH06(arg0, 65, 47) // LLessEqual - LLessEqual(Local0, i000) + Store (LLessEqual(Local0, i000), Local1) CH06(arg0, 66, 0xff) - LLessEqual(i000, Local0) + Store (LLessEqual(i000, Local0), Local1) CH06(arg0, 67, 0xff) // LNotEqual - LNotEqual(Local0, i000) + Store (LNotEqual(Local0, i000), Local1) CH06(arg0, 68, 0xff) - LNotEqual(i000, Local0) + Store (LNotEqual(i000, Local0), Local1) CH06(arg0, 69, 0xff) // LOr - LOr(Local0, i000) + Store (LOr(Local0, i000), Local1) CH06(arg0, 70, 47) - LOr(i000, Local0) + Store (LOr(i000, Local0), Local1) CH06(arg0, 71, 47) // Mod - Mod(Local0, i000) - CH06(arg0, 72, 47) - - Mod(i000, Local0) - CH06(arg0, 73, 47) - Mod(Local0, i000, Local1) CH06(arg0, 74, 47) @@ -401,12 +329,6 @@ Method(m4b7) // Multiply - Multiply(Local0, i000) - CH06(arg0, 76, 47) - - Multiply(i000, Local0) - CH06(arg0, 77, 47) - Multiply(Local0, i000, Local1) CH06(arg0, 78, 47) @@ -415,12 +337,6 @@ Method(m4b7) // NAnd - NAnd(Local0, i000) - CH06(arg0, 80, 47) - - NAnd(i000, Local0) - CH06(arg0, 81, 47) - NAnd(Local0, i000, Local1) CH06(arg0, 82, 47) @@ -429,12 +345,6 @@ Method(m4b7) // NOr - NOr(Local0, i000) - CH06(arg0, 84, 47) - - NOr(i000, Local0) - CH06(arg0, 85, 47) - NOr(Local0, i000, Local1) CH06(arg0, 86, 47) @@ -443,12 +353,6 @@ Method(m4b7) // Or - Or(Local0, i000) - CH06(arg0, 88, 47) - - Or(i000, Local0) - CH06(arg0, 89, 47) - Or(Local0, i000, Local1) CH06(arg0, 90, 47) @@ -457,12 +361,6 @@ Method(m4b7) // ShiftLeft - ShiftLeft(Local0, i000) - CH06(arg0, 92, 47) - - ShiftLeft(i000, Local0) - CH06(arg0, 93, 47) - ShiftLeft(Local0, i000, Local1) CH06(arg0, 94, 47) @@ -471,12 +369,6 @@ Method(m4b7) // ShiftRight - ShiftRight(Local0, i000) - CH06(arg0, 96, 47) - - ShiftRight(i000, Local0) - CH06(arg0, 97, 47) - ShiftRight(Local0, i000, Local1) CH06(arg0, 98, 47) @@ -485,12 +377,6 @@ Method(m4b7) // Subtract - Subtract(Local0, i000) - CH06(arg0, 100, 47) - - Subtract(i000, Local0) - CH06(arg0, 101, 47) - Subtract(Local0, i000, Local1) CH06(arg0, 102, 47) @@ -499,12 +385,6 @@ Method(m4b7) // ToString - ToString(Local0, 1) - CH06(arg0, 104, 47) - - ToString(i000, Local0) - CH06(arg0, 105, 47) - ToString(Local0, 1, Local1) CH06(arg0, 106, 47) @@ -513,20 +393,14 @@ Method(m4b7) // Wait - Wait(Local0, i000) + Store(Wait(Local0, i000), Local1) CH03(ts, z099, 108, 0, 0) - Wait(e000, Local0) + Store(Wait(e000, Local0), Local1) CH06(arg0, 109, 47) // XOr - XOr(Local0, i000) - CH06(arg0, 110, 47) - - XOr(i000, Local0) - CH06(arg0, 111, 47) - XOr(Local0, i000, Local1) CH06(arg0, 112, 47) @@ -535,15 +409,6 @@ Method(m4b7) // Mid - Mid(Local0, 1, 1) - CH06(arg0, 114, 47) - - Mid("123", Local0, 1) - CH06(arg0, 115, 47) - - Mid("123", 1, Local0) - CH06(arg0, 116, 47) - Mid(Local0, 1, 1, Local1) CH06(arg0, 117, 47) @@ -555,16 +420,16 @@ Method(m4b7) // Match - Match(Local0, MTR, 0, MTR, 0, 0) + Store (Match(Local0, MTR, 0, MTR, 0, 0), Local1) CH06(arg0, 120, 47) - Match(Package(){1}, MTR, Local0, MTR, 0, 0) + Store (Match(Package(){1}, MTR, Local0, MTR, 0, 0), Local1) CH06(arg0, 121, 47) - Match(Package(){1}, MTR, 0, MTR, Local0, 0) + Store (Match(Package(){1}, MTR, 0, MTR, Local0, 0), Local1) CH06(arg0, 122, 47) - Match(Package(){1}, MTR, 0, MTR, 0, Local0) + Store (Match(Package(){1}, MTR, 0, MTR, 0, Local0), Local1) CH06(arg0, 123, 47) } @@ -577,14 +442,11 @@ Method(m4b7) return (1) } - DeRefOf(arg1) + Store (DeRefOf(arg1), Local1) CH03(ts, z099, 5, 0, 0) // CondRefOf - CondRefOf(DeRefOf(arg1)) - CH06(arg0, 0, 47) - CondRefOf(DeRefOf(arg1), Local1) CH06(arg0, 1, 47) @@ -600,30 +462,21 @@ Method(m4b7) // DerefOf - DerefOf(DeRefOf(arg1)) + Store (DerefOf(DeRefOf(arg1)), Local1) CH06(arg0, 4, 47) // FindSetLeftBit - FindSetLeftBit(DeRefOf(arg1)) - CH06(arg0, 5, 47) - FindSetLeftBit(DeRefOf(arg1), Local1) CH06(arg0, 6, 47) // FindSetRightBit - FindSetRightBit(DeRefOf(arg1)) - CH06(arg0, 7, 47) - FindSetRightBit(DeRefOf(arg1), Local1) CH06(arg0, 8, 47) // FromBCD - FromBCD(DeRefOf(arg1)) - CH06(arg0, 9, 47) - FromBCD(DeRefOf(arg1), Local1) CH06(arg0, 10, 47) @@ -634,25 +487,22 @@ Method(m4b7) // LNot - LNot(DeRefOf(arg1)) + Store (LNot(DeRefOf(arg1)), Local1) CH06(arg0, 12, 47) // Not - Not(DeRefOf(arg1)) - CH06(arg0, 13, 47) - Not(DeRefOf(arg1), Local1) CH06(arg0, 14, 47) // ObjectType - ObjectType(DeRefOf(arg1)) + Store (ObjectType(DeRefOf(arg1)), Local1) CH03(ts, z099, 6, 0, 0) // RefOf - RefOf(DeRefOf(arg1)) + Store (RefOf(DeRefOf(arg1)), Local1) CH06(arg0, 15, 47) // Release @@ -663,7 +513,7 @@ Method(m4b7) // SizeOf - SizeOf(DeRefOf(arg1)) + Store (SizeOf(DeRefOf(arg1)), Local1) CH06(arg0, 16, 47) // Sleep @@ -683,41 +533,26 @@ Method(m4b7) // ToBCD - ToBCD(DeRefOf(arg1)) - CH06(arg0, 20, 47) - ToBCD(DeRefOf(arg1), Local1) CH06(arg0, 21, 47) // ToBuffer - ToBuffer(DeRefOf(arg1)) - CH06(arg0, 22, 47) - ToBuffer(DeRefOf(arg1), Local1) CH06(arg0, 23, 47) // ToDecimalString - ToDecimalString(DeRefOf(arg1)) - CH06(arg0, 24, 47) - ToDecimalString(DeRefOf(arg1), Local1) CH06(arg0, 25, 47) // ToHexString - ToHexString(DeRefOf(arg1)) - CH06(arg0, 26, 47) - ToHexString(DeRefOf(arg1), Local1) CH06(arg0, 27, 47) // ToInteger - ToInteger(DeRefOf(arg1)) - CH06(arg0, 28, 47) - ToInteger(DeRefOf(arg1), Local1) CH06(arg0, 29, 47) @@ -725,12 +560,6 @@ Method(m4b7) // Add - Add(DeRefOf(arg1), i000) - CH06(arg0, 31, 47) - - Add(i000, DeRefOf(arg1)) - CH06(arg0, 32, 47) - Add(DeRefOf(arg1), i000, Local1) CH06(arg0, 33, 47) @@ -739,12 +568,6 @@ Method(m4b7) // And - And(DeRefOf(arg1), i000) - CH06(arg0, 35, 47) - - And(i000, DeRefOf(arg1)) - CH06(arg0, 36, 47) - And(DeRefOf(arg1), i000, Local1) CH06(arg0, 37, 47) @@ -753,12 +576,6 @@ Method(m4b7) // Concatenate - Concatenate(DeRefOf(arg1), i000) - CH06(arg0, 39, 47) - - Concatenate(i000, DeRefOf(arg1)) - CH06(arg0, 40, 47) - Concatenate(DeRefOf(arg1), i000, Local1) CH06(arg0, 41, 47) @@ -767,12 +584,6 @@ Method(m4b7) // ConcatenateResTemplate - ConcatenateResTemplate(DeRefOf(arg1), ResourceTemplate(){}) - CH06(arg0, 43, 47) - - ConcatenateResTemplate(ResourceTemplate(){}, DeRefOf(arg1)) - CH06(arg0, 44, 47) - ConcatenateResTemplate(DeRefOf(arg1), ResourceTemplate(){}, Local1) CH06(arg0, 45, 47) @@ -781,12 +592,6 @@ Method(m4b7) // Divide - Divide(DeRefOf(arg1), i000) - CH06(arg0, 47, 47) - - Divide(i000, DeRefOf(arg1)) - CH06(arg0, 48, 47) - Divide(DeRefOf(arg1), i000, Local2) CH06(arg0, 49, 47) @@ -806,12 +611,6 @@ Method(m4b7) // Index - Index(DeRefOf(arg1), 0) - CH06(arg0, 54, 47) - - Index("0", DeRefOf(arg1)) - CH06(arg0, 55, 47) - Index(DeRefOf(arg1), 0, Local1) CH06(arg0, 56, 47) @@ -820,68 +619,62 @@ Method(m4b7) // LEqual - LEqual(DeRefOf(arg1), i000) + Store (LEqual(DeRefOf(arg1), i000), Local1) CH06(arg0, 58, 47) - LEqual(i000, DeRefOf(arg1)) + Store (LEqual(i000, DeRefOf(arg1)), Local1) CH06(arg0, 59, 47) // LGreater - LGreater(DeRefOf(arg1), i000) + Store (LGreater(DeRefOf(arg1), i000), Local1) CH06(arg0, 60, 47) - LGreater(i000, DeRefOf(arg1)) + Store (LGreater(i000, DeRefOf(arg1)), Local1) CH06(arg0, 61, 47) // LGreaterEqual - LGreaterEqual(DeRefOf(arg1), i000) + Store (LGreaterEqual(DeRefOf(arg1), i000), Local1) CH06(arg0, 62, 0xff) - LGreaterEqual(i000, DeRefOf(arg1)) + Store (LGreaterEqual(i000, DeRefOf(arg1)), Local1) CH06(arg0, 63, 0xff) // LLess - LLess(DeRefOf(arg1), i000) + Store (LLess(DeRefOf(arg1), i000), Local1) CH06(arg0, 64, 47) - LLess(i000, DeRefOf(arg1)) + Store (LLess(i000, DeRefOf(arg1)), Local1) CH06(arg0, 65, 47) // LLessEqual - LLessEqual(DeRefOf(arg1), i000) + Store (LLessEqual(DeRefOf(arg1), i000), Local1) CH06(arg0, 66, 0xff) - LLessEqual(i000, DeRefOf(arg1)) + Store (LLessEqual(i000, DeRefOf(arg1)), Local1) CH06(arg0, 67, 0xff) // LNotEqual - LNotEqual(DeRefOf(arg1), i000) + Store (LNotEqual(DeRefOf(arg1), i000), Local1) CH06(arg0, 68, 0xff) - LNotEqual(i000, DeRefOf(arg1)) + Store (LNotEqual(i000, DeRefOf(arg1)), Local1) CH06(arg0, 69, 0xff) // LOr - LOr(DeRefOf(arg1), i000) + Store (LOr(DeRefOf(arg1), i000), Local1) CH06(arg0, 70, 47) - LOr(i000, DeRefOf(arg1)) + Store (LOr(i000, DeRefOf(arg1)), Local1) CH06(arg0, 71, 47) // Mod - Mod(DeRefOf(arg1), i000) - CH06(arg0, 72, 47) - - Mod(i000, DeRefOf(arg1)) - CH06(arg0, 73, 47) - Mod(DeRefOf(arg1), i000, Local1) CH06(arg0, 74, 47) @@ -890,12 +683,6 @@ Method(m4b7) // Multiply - Multiply(DeRefOf(arg1), i000) - CH06(arg0, 76, 47) - - Multiply(i000, DeRefOf(arg1)) - CH06(arg0, 77, 47) - Multiply(DeRefOf(arg1), i000, Local1) CH06(arg0, 78, 47) @@ -904,12 +691,6 @@ Method(m4b7) // NAnd - NAnd(DeRefOf(arg1), i000) - CH06(arg0, 80, 47) - - NAnd(i000, DeRefOf(arg1)) - CH06(arg0, 81, 47) - NAnd(DeRefOf(arg1), i000, Local1) CH06(arg0, 82, 47) @@ -918,12 +699,6 @@ Method(m4b7) // NOr - NOr(DeRefOf(arg1), i000) - CH06(arg0, 84, 47) - - NOr(i000, DeRefOf(arg1)) - CH06(arg0, 85, 47) - NOr(DeRefOf(arg1), i000, Local1) CH06(arg0, 86, 47) @@ -932,12 +707,6 @@ Method(m4b7) // Or - Or(DeRefOf(arg1), i000) - CH06(arg0, 88, 47) - - Or(i000, DeRefOf(arg1)) - CH06(arg0, 89, 47) - Or(DeRefOf(arg1), i000, Local1) CH06(arg0, 90, 47) @@ -946,12 +715,6 @@ Method(m4b7) // ShiftLeft - ShiftLeft(DeRefOf(arg1), i000) - CH06(arg0, 92, 47) - - ShiftLeft(i000, DeRefOf(arg1)) - CH06(arg0, 93, 47) - ShiftLeft(DeRefOf(arg1), i000, Local1) CH06(arg0, 94, 47) @@ -960,12 +723,6 @@ Method(m4b7) // ShiftRight - ShiftRight(DeRefOf(arg1), i000) - CH06(arg0, 96, 47) - - ShiftRight(i000, DeRefOf(arg1)) - CH06(arg0, 97, 47) - ShiftRight(DeRefOf(arg1), i000, Local1) CH06(arg0, 98, 47) @@ -974,12 +731,6 @@ Method(m4b7) // Subtract - Subtract(DeRefOf(arg1), i000) - CH06(arg0, 100, 47) - - Subtract(i000, DeRefOf(arg1)) - CH06(arg0, 101, 47) - Subtract(DeRefOf(arg1), i000, Local1) CH06(arg0, 102, 47) @@ -988,12 +739,6 @@ Method(m4b7) // ToString - ToString(DeRefOf(arg1), 1) - CH06(arg0, 104, 47) - - ToString(i000, DeRefOf(arg1)) - CH06(arg0, 105, 47) - ToString(DeRefOf(arg1), 1, Local1) CH06(arg0, 106, 47) @@ -1002,17 +747,11 @@ Method(m4b7) // Wait - Wait(e000, DeRefOf(arg1)) + Store(Wait(e000, DeRefOf(arg1)), Local1) CH06(arg0, 109, 47) // XOr - XOr(DeRefOf(arg1), i000) - CH06(arg0, 110, 47) - - XOr(i000, DeRefOf(arg1)) - CH06(arg0, 111, 47) - XOr(DeRefOf(arg1), i000, Local1) CH06(arg0, 112, 47) @@ -1021,15 +760,6 @@ Method(m4b7) // Mid - Mid(DeRefOf(arg1), 1, 1) - CH06(arg0, 114, 47) - - Mid("123", DeRefOf(arg1), 1) - CH06(arg0, 115, 47) - - Mid("123", 1, DeRefOf(arg1)) - CH06(arg0, 116, 47) - Mid(DeRefOf(arg1), 1, 1, Local1) CH06(arg0, 117, 47) @@ -1041,16 +771,16 @@ Method(m4b7) // Match - Match(DeRefOf(arg1), MTR, 0, MTR, 0, 0) + Store (Match(DeRefOf(arg1), MTR, 0, MTR, 0, 0), Local1) CH06(arg0, 120, 47) - Match(Package(){1}, MTR, DeRefOf(arg1), MTR, 0, 0) + Store (Match(Package(){1}, MTR, DeRefOf(arg1), MTR, 0, 0), Local1) CH06(arg0, 121, 47) - Match(Package(){1}, MTR, 0, MTR, DeRefOf(arg1), 0) + Store (Match(Package(){1}, MTR, 0, MTR, DeRefOf(arg1), 0), Local1) CH06(arg0, 122, 47) - Match(Package(){1}, MTR, 0, MTR, 0, DeRefOf(arg1)) + Store (Match(Package(){1}, MTR, 0, MTR, 0, DeRefOf(arg1)), Local1) CH06(arg0, 123, 47) return (0) @@ -1070,7 +800,7 @@ Method(m4b7) // CondRefOf if (y601) { - CondRefOf(m000()) + Store (CondRefOf(m000()), Local1) CH06(arg0, 0, 47) CondRefOf(m000(), Local1) @@ -1089,30 +819,21 @@ Method(m4b7) // DerefOf - DerefOf(m000()) + Store (DerefOf(m000()), Local1) CH06(arg0, 3, 47) // FindSetLeftBit - FindSetLeftBit(m000()) - CH06(arg0, 4, 47) - FindSetLeftBit(m000(), Local1) CH06(arg0, 5, 47) // FindSetRightBit - FindSetRightBit(m000()) - CH06(arg0, 6, 47) - FindSetRightBit(m000(), Local1) CH06(arg0, 7, 47) // FromBCD - FromBCD(m000()) - CH06(arg0, 8, 47) - FromBCD(m000(), Local1) CH06(arg0, 9, 47) @@ -1123,14 +844,11 @@ Method(m4b7) // LNot - LNot(m000()) + Store (LNot(m000()), Local1) CH06(arg0, 11, 47) // Not - Not(m000()) - CH06(arg0, 12, 47) - Not(m000(), Local1) CH06(arg0, 13, 47) @@ -1143,7 +861,7 @@ Method(m4b7) // RefOf if (y601) { - RefOf(m000()) + Store (RefOf(m000()), Local1) CH06(arg0, 14, 47) } @@ -1164,7 +882,7 @@ Method(m4b7) // SizeOf - SizeOf(m000()) + Store (SizeOf(m000()), Local1) CH06(arg0, 16, 47) // Sleep @@ -1184,57 +902,36 @@ Method(m4b7) // ToBCD - ToBCD(m000()) - CH06(arg0, 20, 47) - ToBCD(m000(), Local1) CH06(arg0, 21, 47) // ToBuffer - ToBuffer(m000()) - CH06(arg0, 22, 47) - ToBuffer(m000(), Local1) CH06(arg0, 23, 47) // ToDecimalString - ToDecimalString(m000()) - CH06(arg0, 24, 47) - ToDecimalString(m000(), Local1) CH06(arg0, 25, 47) // ToHexString - ToHexString(m000()) - CH06(arg0, 26, 47) - ToHexString(m000(), Local1) CH06(arg0, 27, 47) // ToInteger - ToInteger(m000()) - CH06(arg0, 28, 47) - ToInteger(m000(), Local1) CH06(arg0, 29, 47) // Acquire - Acquire(m000(), 100) + Store(Acquire(m000(), 100), Local1) CH06(arg0, 30, 47) // Add - Add(m000(), i000) - CH06(arg0, 31, 47) - - Add(i000, m000()) - CH06(arg0, 32, 47) - Add(m000(), i000, Local1) CH06(arg0, 33, 47) @@ -1243,12 +940,6 @@ Method(m4b7) // And - And(m000(), i000) - CH06(arg0, 35, 47) - - And(i000, m000()) - CH06(arg0, 36, 47) - And(m000(), i000, Local1) CH06(arg0, 37, 47) @@ -1257,12 +948,6 @@ Method(m4b7) // Concatenate - Concatenate(m000(), i000) - CH06(arg0, 39, 47) - - Concatenate(i000, m000()) - CH06(arg0, 40, 47) - Concatenate(m000(), i000, Local1) CH06(arg0, 41, 47) @@ -1271,12 +956,6 @@ Method(m4b7) // ConcatenateResTemplate - ConcatenateResTemplate(m000(), ResourceTemplate(){}) - CH06(arg0, 43, 47) - - ConcatenateResTemplate(ResourceTemplate(){}, m000()) - CH06(arg0, 44, 47) - ConcatenateResTemplate(m000(), ResourceTemplate(){}, Local1) CH06(arg0, 45, 47) @@ -1285,12 +964,6 @@ Method(m4b7) // Divide - Divide(m000(), i000) - CH06(arg0, 47, 47) - - Divide(i000, m000()) - CH06(arg0, 48, 47) - Divide(m000(), i000, Local2) CH06(arg0, 49, 47) @@ -1310,12 +983,6 @@ Method(m4b7) // Index - Index(m000(), 0) - CH06(arg0, 54, 47) - - Index("0", m000()) - CH06(arg0, 55, 47) - Index(m000(), 0, Local1) CH06(arg0, 56, 47) @@ -1324,68 +991,62 @@ Method(m4b7) // LEqual - LEqual(m000(), i000) + Store (LEqual(m000(), i000), Local1) CH06(arg0, 58, 47) - LEqual(i000, m000()) + Store (LEqual(i000, m000()), Local1) CH06(arg0, 59, 47) // LGreater - LGreater(m000(), i000) + Store (LGreater(m000(), i000), Local1) CH06(arg0, 60, 47) - LGreater(i000, m000()) + Store (LGreater(i000, m000()), Local1) CH06(arg0, 61, 47) // LGreaterEqual - LGreaterEqual(m000(), i000) + Store (LGreaterEqual(m000(), i000), Local1) CH06(arg0, 62, 0xff) - LGreaterEqual(i000, m000()) + Store (LGreaterEqual(i000, m000()), Local1) CH06(arg0, 63, 0xff) // LLess - LLess(m000(), i000) + Store (LLess(m000(), i000), Local1) CH06(arg0, 64, 47) - LLess(i000, m000()) + Store (LLess(i000, m000()), Local1) CH06(arg0, 65, 47) // LLessEqual - LLessEqual(m000(), i000) + Store (LLessEqual(m000(), i000), Local1) CH06(arg0, 66, 0xff) - LLessEqual(i000, m000()) + Store (LLessEqual(i000, m000()), Local1) CH06(arg0, 67, 0xff) // LNotEqual - LNotEqual(m000(), i000) + Store (LNotEqual(m000(), i000), Local1) CH06(arg0, 68, 0xff) - LNotEqual(i000, m000()) + Store (LNotEqual(i000, m000()), Local1) CH06(arg0, 69, 0xff) // LOr - LOr(m000(), i000) + Store (LOr(m000(), i000), Local1) CH06(arg0, 70, 47) - LOr(i000, m000()) + Store (LOr(i000, m000()), Local1) CH06(arg0, 71, 47) // Mod - Mod(m000(), i000) - CH06(arg0, 72, 47) - - Mod(i000, m000()) - CH06(arg0, 73, 47) - Mod(m000(), i000, Local1) CH06(arg0, 74, 47) @@ -1394,12 +1055,6 @@ Method(m4b7) // Multiply - Multiply(m000(), i000) - CH06(arg0, 76, 47) - - Multiply(i000, m000()) - CH06(arg0, 77, 47) - Multiply(m000(), i000, Local1) CH06(arg0, 78, 47) @@ -1408,12 +1063,6 @@ Method(m4b7) // NAnd - NAnd(m000(), i000) - CH06(arg0, 80, 47) - - NAnd(i000, m000()) - CH06(arg0, 81, 47) - NAnd(m000(), i000, Local1) CH06(arg0, 82, 47) @@ -1422,12 +1071,6 @@ Method(m4b7) // NOr - NOr(m000(), i000) - CH06(arg0, 84, 47) - - NOr(i000, m000()) - CH06(arg0, 85, 47) - NOr(m000(), i000, Local1) CH06(arg0, 86, 47) @@ -1436,12 +1079,6 @@ Method(m4b7) // Or - Or(m000(), i000) - CH06(arg0, 88, 47) - - Or(i000, m000()) - CH06(arg0, 89, 47) - Or(m000(), i000, Local1) CH06(arg0, 90, 47) @@ -1450,12 +1087,6 @@ Method(m4b7) // ShiftLeft - ShiftLeft(m000(), i000) - CH06(arg0, 92, 47) - - ShiftLeft(i000, m000()) - CH06(arg0, 93, 47) - ShiftLeft(m000(), i000, Local1) CH06(arg0, 94, 47) @@ -1464,12 +1095,6 @@ Method(m4b7) // ShiftRight - ShiftRight(m000(), i000) - CH06(arg0, 96, 47) - - ShiftRight(i000, m000()) - CH06(arg0, 97, 47) - ShiftRight(m000(), i000, Local1) CH06(arg0, 98, 47) @@ -1478,12 +1103,6 @@ Method(m4b7) // Subtract - Subtract(m000(), i000) - CH06(arg0, 100, 47) - - Subtract(i000, m000()) - CH06(arg0, 101, 47) - Subtract(m000(), i000, Local1) CH06(arg0, 102, 47) @@ -1492,12 +1111,6 @@ Method(m4b7) // ToString - ToString(m000(), 1) - CH06(arg0, 104, 47) - - ToString(i000, m000()) - CH06(arg0, 105, 47) - ToString(m000(), 1, Local1) CH06(arg0, 106, 47) @@ -1506,20 +1119,14 @@ Method(m4b7) // Wait - Wait(m000(), i000) + Store(Wait(m000(), i000), Local1) CH06(arg0, 108, 47) - Wait(e000, m000()) + Store(Wait(e000, m000()),Local1) CH06(arg0, 109, 47) // XOr - XOr(m000(), i000) - CH06(arg0, 110, 47) - - XOr(i000, m000()) - CH06(arg0, 111, 47) - XOr(m000(), i000, Local1) CH06(arg0, 112, 47) @@ -1528,15 +1135,6 @@ Method(m4b7) // Mid - Mid(m000(), 1, 1) - CH06(arg0, 114, 47) - - Mid("123", m000(), 1) - CH06(arg0, 115, 47) - - Mid("123", 1, m000()) - CH06(arg0, 116, 47) - Mid(m000(), 1, 1, Local1) CH06(arg0, 117, 47) @@ -1548,16 +1146,16 @@ Method(m4b7) // Match - Match(m000(), MTR, 0, MTR, 0, 0) + Store (Match(m000(), MTR, 0, MTR, 0, 0), Local1) CH06(arg0, 120, 47) - Match(Package(){1}, MTR, m000(), MTR, 0, 0) + Store (Match(Package(){1}, MTR, m000(), MTR, 0, 0), Local1) CH06(arg0, 121, 47) - Match(Package(){1}, MTR, 0, MTR, m000(), 0) + Store (Match(Package(){1}, MTR, 0, MTR, m000(), 0), Local1) CH06(arg0, 122, 47) - Match(Package(){1}, MTR, 0, MTR, 0, m000()) + Store (Match(Package(){1}, MTR, 0, MTR, 0, m000()), Local1) CH06(arg0, 123, 47) } @@ -1594,19 +1192,19 @@ Method(m4b7) Store(0, i000) - DerefOf(m000(1, lpC0)) + Store (DerefOf(m000(1, lpC0)), Local1) CH03(ts, z099, Add(9, lpC0), 0, 0) CH00(arg0, 1) - DerefOf(DerefOf(m000(2, lpC0))) + Store (DerefOf(DerefOf(m000(2, lpC0))), Local1) CH06(arg0, Add(1, Local0), 47) CH00(arg0, 2) - Index(DerefOf(m000(3, lpC0)), 0) + Store (Index(DerefOf(m000(3, lpC0)), 0), Local1) CH06(arg0, Add(2, Local0), 47) CH00(arg0, 3) - Match(DerefOf(m000(4, lpC0)), MTR, 0, MTR, 0, 0) + Store (Match(DerefOf(m000(4, lpC0)), MTR, 0, MTR, 0, 0), Local1) CH06(arg0, Add(3, Local0), 47) CH00(arg0, 4) 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 14bdcbdc7..bf15f33c3 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 @@ -56,7 +56,7 @@ Method(m4b8) Method(m4f2) {Return ("m4f2")} if (y083) { - DerefOf(m4f2) + Store (DerefOf(m4f2), Local1) CH06(arg0, 0, 47) } } @@ -65,7 +65,7 @@ Method(m4b8) Method(m001, 1) { if (y083) { - DerefOf(m4f0) + Store (DerefOf(m4f0), Local1) CH06(arg0, 1, 47) } } @@ -81,9 +81,6 @@ Method(m4b8) // CondRefOf - CondRefOf(Local0) - CH03(ts, z100, 0, 0, 0) - CondRefOf(Local0, Local1) CH03(ts, z100, 1, 0, 0) @@ -99,30 +96,21 @@ Method(m4b8) // DerefOf - DerefOf(Local0) + Store (DerefOf(Local0), Local1) CH06(arg0, 2, 47) // FindSetLeftBit - FindSetLeftBit(Local0) - CH06(arg0, 3, 47) - FindSetLeftBit(Local0, Local1) CH06(arg0, 4, 47) // FindSetRightBit - FindSetRightBit(Local0) - CH06(arg0, 5, 47) - FindSetRightBit(Local0, Local1) CH06(arg0, 6, 47) // FromBCD - FromBCD(Local0) - CH06(arg0, 7, 47) - FromBCD(Local0, Local1) CH06(arg0, 8, 47) @@ -133,25 +121,22 @@ Method(m4b8) // LNot - LNot(Local0) + Store (LNot(Local0), Local1) CH06(arg0, 10, 47) // Not - Not(Local0) - CH06(arg0, 11, 47) - Not(Local0, Local1) CH06(arg0, 12, 47) // ObjectType - ObjectType(Local0) + Store (ObjectType(Local0), Local1) CH03(ts, z100, 3, 0, 0) // RefOf - RefOf(Local0) + Store (RefOf(Local0), Local1) CH03(ts, z100, 4, 0, 0) // Release @@ -171,7 +156,7 @@ Method(m4b8) // SizeOf - SizeOf(Local0) + Store (SizeOf(Local0), Local1) CH06(arg0, 16, 47) // Sleep @@ -191,57 +176,36 @@ Method(m4b8) // ToBCD - ToBCD(Local0) - CH06(arg0, 20, 47) - ToBCD(Local0, Local1) CH06(arg0, 21, 47) // ToBuffer - ToBuffer(Local0) - CH06(arg0, 22, 47) - ToBuffer(Local0, Local1) CH06(arg0, 23, 47) // ToDecimalString - ToDecimalString(Local0) - CH06(arg0, 24, 47) - ToDecimalString(Local0, Local1) CH06(arg0, 25, 47) // ToHexString - ToHexString(Local0) - CH06(arg0, 26, 47) - ToHexString(Local0, Local1) CH06(arg0, 27, 47) // ToInteger - ToInteger(Local0) - CH06(arg0, 28, 47) - ToInteger(Local0, Local1) CH06(arg0, 29, 47) // Acquire - Acquire(Local0, 100) + Store(Acquire(Local0, 100), Local1) CH06(arg0, 30, 47) // Add - Add(Local0, i000) - CH06(arg0, 31, 47) - - Add(i000, Local0) - CH06(arg0, 32, 47) - Add(Local0, i000, Local1) CH06(arg0, 33, 47) @@ -250,12 +214,6 @@ Method(m4b8) // And - And(Local0, i000) - CH06(arg0, 35, 47) - - And(i000, Local0) - CH06(arg0, 36, 47) - And(Local0, i000, Local1) CH06(arg0, 37, 47) @@ -264,12 +222,6 @@ Method(m4b8) // Concatenate - Concatenate(Local0, i000) - CH06(arg0, 39, 47) - - Concatenate(i000, Local0) - CH06(arg0, 40, 47) - Concatenate(Local0, i000, Local1) CH06(arg0, 41, 47) @@ -278,12 +230,6 @@ Method(m4b8) // ConcatenateResTemplate - ConcatenateResTemplate(Local0, ResourceTemplate(){}) - CH06(arg0, 43, 47) - - ConcatenateResTemplate(ResourceTemplate(){}, Local0) - CH06(arg0, 44, 47) - ConcatenateResTemplate(Local0, ResourceTemplate(){}, Local1) CH06(arg0, 45, 47) @@ -292,12 +238,6 @@ Method(m4b8) // Divide - Divide(Local0, i000) - CH06(arg0, 47, 47) - - Divide(i000, Local0) - CH06(arg0, 48, 47) - Divide(Local0, i000, Local2) CH06(arg0, 49, 47) @@ -317,12 +257,6 @@ Method(m4b8) // Index - Index(Local0, 0) - CH06(arg0, 54, 47) - - Index("0", Local0) - CH06(arg0, 55, 47) - Index(Local0, 0, Local1) CH06(arg0, 56, 47) @@ -331,68 +265,62 @@ Method(m4b8) // LEqual - LEqual(Local0, i000) + Store (LEqual(Local0, i000), Local1) CH06(arg0, 58, 47) - LEqual(i000, Local0) + Store (LEqual(i000, Local0), Local1) CH06(arg0, 59, 47) // LGreater - LGreater(Local0, i000) + Store (LGreater(Local0, i000), Local1) CH06(arg0, 60, 47) - LGreater(i000, Local0) + Store (LGreater(i000, Local0), Local1) CH06(arg0, 61, 47) // LGreaterEqual - LGreaterEqual(Local0, i000) + Store (LGreaterEqual(Local0, i000), Local1) CH06(arg0, 62, 0xff) - LGreaterEqual(i000, Local0) + Store (LGreaterEqual(i000, Local0), Local1) CH06(arg0, 63, 0xff) // LLess - LLess(Local0, i000) + Store (LLess(Local0, i000), Local1) CH06(arg0, 64, 47) - LLess(i000, Local0) + Store (LLess(i000, Local0), Local1) CH06(arg0, 65, 47) // LLessEqual - LLessEqual(Local0, i000) + Store (LLessEqual(Local0, i000), Local1) CH06(arg0, 66, 0xff) - LLessEqual(i000, Local0) + Store (LLessEqual(i000, Local0), Local1) CH06(arg0, 67, 0xff) // LNotEqual - LNotEqual(Local0, i000) + Store (LNotEqual(Local0, i000), Local1) CH06(arg0, 68, 0xff) - LNotEqual(i000, Local0) + Store (LNotEqual(i000, Local0), Local1) CH06(arg0, 69, 0xff) // LOr - LOr(Local0, i000) + Store (LOr(Local0, i000), Local1) CH06(arg0, 70, 47) - LOr(i000, Local0) + Store (LOr(i000, Local0), Local1) CH06(arg0, 71, 47) // Mod - Mod(Local0, i000) - CH06(arg0, 72, 47) - - Mod(i000, Local0) - CH06(arg0, 73, 47) - Mod(Local0, i000, Local1) CH06(arg0, 74, 47) @@ -401,12 +329,6 @@ Method(m4b8) // Multiply - Multiply(Local0, i000) - CH06(arg0, 76, 47) - - Multiply(i000, Local0) - CH06(arg0, 77, 47) - Multiply(Local0, i000, Local1) CH06(arg0, 78, 47) @@ -415,12 +337,6 @@ Method(m4b8) // NAnd - NAnd(Local0, i000) - CH06(arg0, 80, 47) - - NAnd(i000, Local0) - CH06(arg0, 81, 47) - NAnd(Local0, i000, Local1) CH06(arg0, 82, 47) @@ -429,12 +345,6 @@ Method(m4b8) // NOr - NOr(Local0, i000) - CH06(arg0, 84, 47) - - NOr(i000, Local0) - CH06(arg0, 85, 47) - NOr(Local0, i000, Local1) CH06(arg0, 86, 47) @@ -443,12 +353,6 @@ Method(m4b8) // Or - Or(Local0, i000) - CH06(arg0, 88, 47) - - Or(i000, Local0) - CH06(arg0, 89, 47) - Or(Local0, i000, Local1) CH06(arg0, 90, 47) @@ -457,12 +361,6 @@ Method(m4b8) // ShiftLeft - ShiftLeft(Local0, i000) - CH06(arg0, 92, 47) - - ShiftLeft(i000, Local0) - CH06(arg0, 93, 47) - ShiftLeft(Local0, i000, Local1) CH06(arg0, 94, 47) @@ -471,12 +369,6 @@ Method(m4b8) // ShiftRight - ShiftRight(Local0, i000) - CH06(arg0, 96, 47) - - ShiftRight(i000, Local0) - CH06(arg0, 97, 47) - ShiftRight(Local0, i000, Local1) CH06(arg0, 98, 47) @@ -485,12 +377,6 @@ Method(m4b8) // Subtract - Subtract(Local0, i000) - CH06(arg0, 100, 47) - - Subtract(i000, Local0) - CH06(arg0, 101, 47) - Subtract(Local0, i000, Local1) CH06(arg0, 102, 47) @@ -499,12 +385,6 @@ Method(m4b8) // ToString - ToString(Local0, 1) - CH06(arg0, 104, 47) - - ToString(i000, Local0) - CH06(arg0, 105, 47) - ToString(Local0, 1, Local1) CH06(arg0, 106, 47) @@ -513,20 +393,14 @@ Method(m4b8) // Wait - Wait(Local0, i000) + Store(Wait(Local0, i000), Local1) CH06(arg0, 108, 47) - Wait(e000, Local0) + Store(Wait(e000, Local0), Local1) CH06(arg0, 109, 47) // XOr - XOr(Local0, i000) - CH06(arg0, 110, 47) - - XOr(i000, Local0) - CH06(arg0, 111, 47) - XOr(Local0, i000, Local1) CH06(arg0, 112, 47) @@ -535,15 +409,6 @@ Method(m4b8) // Mid - Mid(Local0, 1, 1) - CH06(arg0, 114, 47) - - Mid("123", Local0, 1) - CH06(arg0, 115, 47) - - Mid("123", 1, Local0) - CH06(arg0, 116, 47) - Mid(Local0, 1, 1, Local1) CH06(arg0, 117, 47) @@ -555,16 +420,16 @@ Method(m4b8) // Match - Match(Local0, MTR, 0, MTR, 0, 0) + Store (Match(Local0, MTR, 0, MTR, 0, 0), Local1) CH06(arg0, 120, 47) - Match(Package(){1}, MTR, Local0, MTR, 0, 0) + Store (Match(Package(){1}, MTR, Local0, MTR, 0, 0), Local1) CH06(arg0, 121, 47) - Match(Package(){1}, MTR, 0, MTR, Local0, 0) + Store (Match(Package(){1}, MTR, 0, MTR, Local0, 0), Local1) CH06(arg0, 122, 47) - Match(Package(){1}, MTR, 0, MTR, 0, Local0) + Store (Match(Package(){1}, MTR, 0, MTR, 0, Local0), Local1) CH06(arg0, 123, 47) } @@ -577,14 +442,11 @@ Method(m4b8) return (1) } - DeRefOf(arg1) + Store (DeRefOf(arg1), Local1) CH03(ts, z100, 5, 0, 0) // CondRefOf - CondRefOf(DeRefOf(arg1)) - CH06(arg0, 0, 47) - CondRefOf(DeRefOf(arg1), Local1) CH06(arg0, 1, 47) @@ -600,30 +462,21 @@ Method(m4b8) // DerefOf - DerefOf(DeRefOf(arg1)) + Store (DerefOf(DeRefOf(arg1)), Local1) CH06(arg0, 4, 47) // FindSetLeftBit - FindSetLeftBit(DeRefOf(arg1)) - CH06(arg0, 5, 47) - FindSetLeftBit(DeRefOf(arg1), Local1) CH06(arg0, 6, 47) // FindSetRightBit - FindSetRightBit(DeRefOf(arg1)) - CH06(arg0, 7, 47) - FindSetRightBit(DeRefOf(arg1), Local1) CH06(arg0, 8, 47) // FromBCD - FromBCD(DeRefOf(arg1)) - CH06(arg0, 9, 47) - FromBCD(DeRefOf(arg1), Local1) CH06(arg0, 10, 47) @@ -634,25 +487,22 @@ Method(m4b8) // LNot - LNot(DeRefOf(arg1)) + Store (LNot(DeRefOf(arg1)), Local1) CH06(arg0, 12, 47) // Not - Not(DeRefOf(arg1)) - CH06(arg0, 13, 47) - Not(DeRefOf(arg1), Local1) CH06(arg0, 14, 47) // ObjectType - ObjectType(DeRefOf(arg1)) + Store (ObjectType(DeRefOf(arg1)), Local1) CH03(ts, z100, 6, 0, 0) // RefOf - RefOf(DeRefOf(arg1)) + Store (RefOf(DeRefOf(arg1)), Local1) CH06(arg0, 15, 47) // Release @@ -663,7 +513,7 @@ Method(m4b8) // SizeOf - SizeOf(DeRefOf(arg1)) + Store (SizeOf(DeRefOf(arg1)), Local1) CH06(arg0, 16, 47) // Sleep @@ -683,41 +533,26 @@ Method(m4b8) // ToBCD - ToBCD(DeRefOf(arg1)) - CH06(arg0, 20, 47) - ToBCD(DeRefOf(arg1), Local1) CH06(arg0, 21, 47) // ToBuffer - ToBuffer(DeRefOf(arg1)) - CH06(arg0, 22, 47) - ToBuffer(DeRefOf(arg1), Local1) CH06(arg0, 23, 47) // ToDecimalString - ToDecimalString(DeRefOf(arg1)) - CH06(arg0, 24, 47) - ToDecimalString(DeRefOf(arg1), Local1) CH06(arg0, 25, 47) // ToHexString - ToHexString(DeRefOf(arg1)) - CH06(arg0, 26, 47) - ToHexString(DeRefOf(arg1), Local1) CH06(arg0, 27, 47) // ToInteger - ToInteger(DeRefOf(arg1)) - CH06(arg0, 28, 47) - ToInteger(DeRefOf(arg1), Local1) CH06(arg0, 29, 47) @@ -725,12 +560,6 @@ Method(m4b8) // Add - Add(DeRefOf(arg1), i000) - CH06(arg0, 31, 47) - - Add(i000, DeRefOf(arg1)) - CH06(arg0, 32, 47) - Add(DeRefOf(arg1), i000, Local1) CH06(arg0, 33, 47) @@ -739,12 +568,6 @@ Method(m4b8) // And - And(DeRefOf(arg1), i000) - CH06(arg0, 35, 47) - - And(i000, DeRefOf(arg1)) - CH06(arg0, 36, 47) - And(DeRefOf(arg1), i000, Local1) CH06(arg0, 37, 47) @@ -753,12 +576,6 @@ Method(m4b8) // Concatenate - Concatenate(DeRefOf(arg1), i000) - CH06(arg0, 39, 47) - - Concatenate(i000, DeRefOf(arg1)) - CH06(arg0, 40, 47) - Concatenate(DeRefOf(arg1), i000, Local1) CH06(arg0, 41, 47) @@ -767,12 +584,6 @@ Method(m4b8) // ConcatenateResTemplate - ConcatenateResTemplate(DeRefOf(arg1), ResourceTemplate(){}) - CH06(arg0, 43, 47) - - ConcatenateResTemplate(ResourceTemplate(){}, DeRefOf(arg1)) - CH06(arg0, 44, 47) - ConcatenateResTemplate(DeRefOf(arg1), ResourceTemplate(){}, Local1) CH06(arg0, 45, 47) @@ -781,12 +592,6 @@ Method(m4b8) // Divide - Divide(DeRefOf(arg1), i000) - CH06(arg0, 47, 47) - - Divide(i000, DeRefOf(arg1)) - CH06(arg0, 48, 47) - Divide(DeRefOf(arg1), i000, Local2) CH06(arg0, 49, 47) @@ -806,12 +611,6 @@ Method(m4b8) // Index - Index(DeRefOf(arg1), 0) - CH06(arg0, 54, 47) - - Index("0", DeRefOf(arg1)) - CH06(arg0, 55, 47) - Index(DeRefOf(arg1), 0, Local1) CH06(arg0, 56, 47) @@ -820,68 +619,62 @@ Method(m4b8) // LEqual - LEqual(DeRefOf(arg1), i000) + Store (LEqual(DeRefOf(arg1), i000), Local1) CH06(arg0, 58, 47) - LEqual(i000, DeRefOf(arg1)) + Store (LEqual(i000, DeRefOf(arg1)), Local1) CH06(arg0, 59, 47) // LGreater - LGreater(DeRefOf(arg1), i000) + Store (LGreater(DeRefOf(arg1), i000), Local1) CH06(arg0, 60, 47) - LGreater(i000, DeRefOf(arg1)) + Store (LGreater(i000, DeRefOf(arg1)), Local1) CH06(arg0, 61, 47) // LGreaterEqual - LGreaterEqual(DeRefOf(arg1), i000) + Store (LGreaterEqual(DeRefOf(arg1), i000), Local1) CH06(arg0, 62, 0xff) - LGreaterEqual(i000, DeRefOf(arg1)) + Store (LGreaterEqual(i000, DeRefOf(arg1)), Local1) CH06(arg0, 63, 0xff) // LLess - LLess(DeRefOf(arg1), i000) + Store (LLess(DeRefOf(arg1), i000), Local1) CH06(arg0, 64, 47) - LLess(i000, DeRefOf(arg1)) + Store (LLess(i000, DeRefOf(arg1)), Local1) CH06(arg0, 65, 47) // LLessEqual - LLessEqual(DeRefOf(arg1), i000) + Store (LLessEqual(DeRefOf(arg1), i000), Local1) CH06(arg0, 66, 0xff) - LLessEqual(i000, DeRefOf(arg1)) + Store (LLessEqual(i000, DeRefOf(arg1)), Local1) CH06(arg0, 67, 0xff) // LNotEqual - LNotEqual(DeRefOf(arg1), i000) + Store (LNotEqual(DeRefOf(arg1), i000), Local1) CH06(arg0, 68, 0xff) - LNotEqual(i000, DeRefOf(arg1)) + Store (LNotEqual(i000, DeRefOf(arg1)), Local1) CH06(arg0, 69, 0xff) // LOr - LOr(DeRefOf(arg1), i000) + Store (LOr(DeRefOf(arg1), i000), Local1) CH06(arg0, 70, 47) - LOr(i000, DeRefOf(arg1)) + Store (LOr(i000, DeRefOf(arg1)), Local1) CH06(arg0, 71, 47) // Mod - Mod(DeRefOf(arg1), i000) - CH06(arg0, 72, 47) - - Mod(i000, DeRefOf(arg1)) - CH06(arg0, 73, 47) - Mod(DeRefOf(arg1), i000, Local1) CH06(arg0, 74, 47) @@ -890,12 +683,6 @@ Method(m4b8) // Multiply - Multiply(DeRefOf(arg1), i000) - CH06(arg0, 76, 47) - - Multiply(i000, DeRefOf(arg1)) - CH06(arg0, 77, 47) - Multiply(DeRefOf(arg1), i000, Local1) CH06(arg0, 78, 47) @@ -904,12 +691,6 @@ Method(m4b8) // NAnd - NAnd(DeRefOf(arg1), i000) - CH06(arg0, 80, 47) - - NAnd(i000, DeRefOf(arg1)) - CH06(arg0, 81, 47) - NAnd(DeRefOf(arg1), i000, Local1) CH06(arg0, 82, 47) @@ -918,12 +699,6 @@ Method(m4b8) // NOr - NOr(DeRefOf(arg1), i000) - CH06(arg0, 84, 47) - - NOr(i000, DeRefOf(arg1)) - CH06(arg0, 85, 47) - NOr(DeRefOf(arg1), i000, Local1) CH06(arg0, 86, 47) @@ -932,12 +707,6 @@ Method(m4b8) // Or - Or(DeRefOf(arg1), i000) - CH06(arg0, 88, 47) - - Or(i000, DeRefOf(arg1)) - CH06(arg0, 89, 47) - Or(DeRefOf(arg1), i000, Local1) CH06(arg0, 90, 47) @@ -946,12 +715,6 @@ Method(m4b8) // ShiftLeft - ShiftLeft(DeRefOf(arg1), i000) - CH06(arg0, 92, 47) - - ShiftLeft(i000, DeRefOf(arg1)) - CH06(arg0, 93, 47) - ShiftLeft(DeRefOf(arg1), i000, Local1) CH06(arg0, 94, 47) @@ -960,12 +723,6 @@ Method(m4b8) // ShiftRight - ShiftRight(DeRefOf(arg1), i000) - CH06(arg0, 96, 47) - - ShiftRight(i000, DeRefOf(arg1)) - CH06(arg0, 97, 47) - ShiftRight(DeRefOf(arg1), i000, Local1) CH06(arg0, 98, 47) @@ -974,12 +731,6 @@ Method(m4b8) // Subtract - Subtract(DeRefOf(arg1), i000) - CH06(arg0, 100, 47) - - Subtract(i000, DeRefOf(arg1)) - CH06(arg0, 101, 47) - Subtract(DeRefOf(arg1), i000, Local1) CH06(arg0, 102, 47) @@ -988,12 +739,6 @@ Method(m4b8) // ToString - ToString(DeRefOf(arg1), 1) - CH06(arg0, 104, 47) - - ToString(i000, DeRefOf(arg1)) - CH06(arg0, 105, 47) - ToString(DeRefOf(arg1), 1, Local1) CH06(arg0, 106, 47) @@ -1002,17 +747,11 @@ Method(m4b8) // Wait - Wait(e000, DeRefOf(arg1)) + Store(Wait(e000, DeRefOf(arg1)), Local1) CH06(arg0, 109, 47) // XOr - XOr(DeRefOf(arg1), i000) - CH06(arg0, 110, 47) - - XOr(i000, DeRefOf(arg1)) - CH06(arg0, 111, 47) - XOr(DeRefOf(arg1), i000, Local1) CH06(arg0, 112, 47) @@ -1021,15 +760,6 @@ Method(m4b8) // Mid - Mid(DeRefOf(arg1), 1, 1) - CH06(arg0, 114, 47) - - Mid("123", DeRefOf(arg1), 1) - CH06(arg0, 115, 47) - - Mid("123", 1, DeRefOf(arg1)) - CH06(arg0, 116, 47) - Mid(DeRefOf(arg1), 1, 1, Local1) CH06(arg0, 117, 47) @@ -1041,16 +771,16 @@ Method(m4b8) // Match - Match(DeRefOf(arg1), MTR, 0, MTR, 0, 0) + Store (Match(DeRefOf(arg1), MTR, 0, MTR, 0, 0), Local1) CH06(arg0, 120, 47) - Match(Package(){1}, MTR, DeRefOf(arg1), MTR, 0, 0) + Store (Match(Package(){1}, MTR, DeRefOf(arg1), MTR, 0, 0), Local1) CH06(arg0, 121, 47) - Match(Package(){1}, MTR, 0, MTR, DeRefOf(arg1), 0) + Store (Match(Package(){1}, MTR, 0, MTR, DeRefOf(arg1), 0), Local1) CH06(arg0, 122, 47) - Match(Package(){1}, MTR, 0, MTR, 0, DeRefOf(arg1)) + Store (Match(Package(){1}, MTR, 0, MTR, 0, DeRefOf(arg1)), Local1) CH06(arg0, 123, 47) return (0) @@ -1070,7 +800,7 @@ Method(m4b8) // CondRefOf if (y601) { - CondRefOf(m000()) + Store (CondRefOf(m000()), Local1) CH06(arg0, 0, 47) CondRefOf(m000(), Local1) @@ -1089,30 +819,21 @@ Method(m4b8) // DerefOf - DerefOf(m000()) + Store (DerefOf(m000()), Local1) CH06(arg0, 3, 47) // FindSetLeftBit - FindSetLeftBit(m000()) - CH06(arg0, 4, 47) - FindSetLeftBit(m000(), Local1) CH06(arg0, 5, 47) // FindSetRightBit - FindSetRightBit(m000()) - CH06(arg0, 6, 47) - FindSetRightBit(m000(), Local1) CH06(arg0, 7, 47) // FromBCD - FromBCD(m000()) - CH06(arg0, 8, 47) - FromBCD(m000(), Local1) CH06(arg0, 9, 47) @@ -1123,14 +844,11 @@ Method(m4b8) // LNot - LNot(m000()) + Store (LNot(m000()), Local1) CH06(arg0, 11, 47) // Not - Not(m000()) - CH06(arg0, 12, 47) - Not(m000(), Local1) CH06(arg0, 13, 47) @@ -1143,7 +861,7 @@ Method(m4b8) // RefOf if (y601) { - RefOf(m000()) + Store (RefOf(m000()), Local1) CH06(arg0, 14, 47) } @@ -1164,7 +882,7 @@ Method(m4b8) // SizeOf - SizeOf(m000()) + Store (SizeOf(m000()), Local1) CH06(arg0, 16, 47) // Sleep @@ -1184,57 +902,36 @@ Method(m4b8) // ToBCD - ToBCD(m000()) - CH06(arg0, 20, 47) - ToBCD(m000(), Local1) CH06(arg0, 21, 47) // ToBuffer - ToBuffer(m000()) - CH06(arg0, 22, 47) - ToBuffer(m000(), Local1) CH06(arg0, 23, 47) // ToDecimalString - ToDecimalString(m000()) - CH06(arg0, 24, 47) - ToDecimalString(m000(), Local1) CH06(arg0, 25, 47) // ToHexString - ToHexString(m000()) - CH06(arg0, 26, 47) - ToHexString(m000(), Local1) CH06(arg0, 27, 47) // ToInteger - ToInteger(m000()) - CH06(arg0, 28, 47) - ToInteger(m000(), Local1) CH06(arg0, 29, 47) // Acquire - Acquire(m000(), 100) + Store(Acquire(m000(), 100), Local1) CH06(arg0, 30, 47) // Add - Add(m000(), i000) - CH06(arg0, 31, 47) - - Add(i000, m000()) - CH06(arg0, 32, 47) - Add(m000(), i000, Local1) CH06(arg0, 33, 47) @@ -1243,12 +940,6 @@ Method(m4b8) // And - And(m000(), i000) - CH06(arg0, 35, 47) - - And(i000, m000()) - CH06(arg0, 36, 47) - And(m000(), i000, Local1) CH06(arg0, 37, 47) @@ -1257,12 +948,6 @@ Method(m4b8) // Concatenate - Concatenate(m000(), i000) - CH06(arg0, 39, 47) - - Concatenate(i000, m000()) - CH06(arg0, 40, 47) - Concatenate(m000(), i000, Local1) CH06(arg0, 41, 47) @@ -1271,12 +956,6 @@ Method(m4b8) // ConcatenateResTemplate - ConcatenateResTemplate(m000(), ResourceTemplate(){}) - CH06(arg0, 43, 47) - - ConcatenateResTemplate(ResourceTemplate(){}, m000()) - CH06(arg0, 44, 47) - ConcatenateResTemplate(m000(), ResourceTemplate(){}, Local1) CH06(arg0, 45, 47) @@ -1285,12 +964,6 @@ Method(m4b8) // Divide - Divide(m000(), i000) - CH06(arg0, 47, 47) - - Divide(i000, m000()) - CH06(arg0, 48, 47) - Divide(m000(), i000, Local2) CH06(arg0, 49, 47) @@ -1310,12 +983,6 @@ Method(m4b8) // Index - Index(m000(), 0) - CH06(arg0, 54, 47) - - Index("0", m000()) - CH06(arg0, 55, 47) - Index(m000(), 0, Local1) CH06(arg0, 56, 47) @@ -1324,68 +991,62 @@ Method(m4b8) // LEqual - LEqual(m000(), i000) + Store (LEqual(m000(), i000), Local1) CH06(arg0, 58, 47) - LEqual(i000, m000()) + Store (LEqual(i000, m000()), Local1) CH06(arg0, 59, 47) // LGreater - LGreater(m000(), i000) + Store (LGreater(m000(), i000), Local1) CH06(arg0, 60, 47) - LGreater(i000, m000()) + Store (LGreater(i000, m000()), Local1) CH06(arg0, 61, 47) // LGreaterEqual - LGreaterEqual(m000(), i000) + Store (LGreaterEqual(m000(), i000), Local1) CH06(arg0, 62, 0xff) - LGreaterEqual(i000, m000()) + Store (LGreaterEqual(i000, m000()), Local1) CH06(arg0, 63, 0xff) // LLess - LLess(m000(), i000) + Store (LLess(m000(), i000), Local1) CH06(arg0, 64, 47) - LLess(i000, m000()) + Store (LLess(i000, m000()), Local1) CH06(arg0, 65, 47) // LLessEqual - LLessEqual(m000(), i000) + Store (LLessEqual(m000(), i000), Local1) CH06(arg0, 66, 0xff) - LLessEqual(i000, m000()) + Store (LLessEqual(i000, m000()), Local1) CH06(arg0, 67, 0xff) // LNotEqual - LNotEqual(m000(), i000) + Store (LNotEqual(m000(), i000), Local1) CH06(arg0, 68, 0xff) - LNotEqual(i000, m000()) + Store (LNotEqual(i000, m000()), Local1) CH06(arg0, 69, 0xff) // LOr - LOr(m000(), i000) + Store (LOr(m000(), i000), Local1) CH06(arg0, 70, 47) - LOr(i000, m000()) + Store (LOr(i000, m000()), Local1) CH06(arg0, 71, 47) // Mod - Mod(m000(), i000) - CH06(arg0, 72, 47) - - Mod(i000, m000()) - CH06(arg0, 73, 47) - Mod(m000(), i000, Local1) CH06(arg0, 74, 47) @@ -1394,12 +1055,6 @@ Method(m4b8) // Multiply - Multiply(m000(), i000) - CH06(arg0, 76, 47) - - Multiply(i000, m000()) - CH06(arg0, 77, 47) - Multiply(m000(), i000, Local1) CH06(arg0, 78, 47) @@ -1408,12 +1063,6 @@ Method(m4b8) // NAnd - NAnd(m000(), i000) - CH06(arg0, 80, 47) - - NAnd(i000, m000()) - CH06(arg0, 81, 47) - NAnd(m000(), i000, Local1) CH06(arg0, 82, 47) @@ -1422,12 +1071,6 @@ Method(m4b8) // NOr - NOr(m000(), i000) - CH06(arg0, 84, 47) - - NOr(i000, m000()) - CH06(arg0, 85, 47) - NOr(m000(), i000, Local1) CH06(arg0, 86, 47) @@ -1436,12 +1079,6 @@ Method(m4b8) // Or - Or(m000(), i000) - CH06(arg0, 88, 47) - - Or(i000, m000()) - CH06(arg0, 89, 47) - Or(m000(), i000, Local1) CH06(arg0, 90, 47) @@ -1450,12 +1087,6 @@ Method(m4b8) // ShiftLeft - ShiftLeft(m000(), i000) - CH06(arg0, 92, 47) - - ShiftLeft(i000, m000()) - CH06(arg0, 93, 47) - ShiftLeft(m000(), i000, Local1) CH06(arg0, 94, 47) @@ -1464,12 +1095,6 @@ Method(m4b8) // ShiftRight - ShiftRight(m000(), i000) - CH06(arg0, 96, 47) - - ShiftRight(i000, m000()) - CH06(arg0, 97, 47) - ShiftRight(m000(), i000, Local1) CH06(arg0, 98, 47) @@ -1478,12 +1103,6 @@ Method(m4b8) // Subtract - Subtract(m000(), i000) - CH06(arg0, 100, 47) - - Subtract(i000, m000()) - CH06(arg0, 101, 47) - Subtract(m000(), i000, Local1) CH06(arg0, 102, 47) @@ -1492,12 +1111,6 @@ Method(m4b8) // ToString - ToString(m000(), 1) - CH06(arg0, 104, 47) - - ToString(i000, m000()) - CH06(arg0, 105, 47) - ToString(m000(), 1, Local1) CH06(arg0, 106, 47) @@ -1506,20 +1119,14 @@ Method(m4b8) // Wait - Wait(m000(), i000) + Store(Wait(m000(), i000), Local1) CH06(arg0, 108, 47) - Wait(e000, m000()) + Store(Wait(e000, m000()), Local1) CH06(arg0, 109, 47) // XOr - XOr(m000(), i000) - CH06(arg0, 110, 47) - - XOr(i000, m000()) - CH06(arg0, 111, 47) - XOr(m000(), i000, Local1) CH06(arg0, 112, 47) @@ -1528,15 +1135,6 @@ Method(m4b8) // Mid - Mid(m000(), 1, 1) - CH06(arg0, 114, 47) - - Mid("123", m000(), 1) - CH06(arg0, 115, 47) - - Mid("123", 1, m000()) - CH06(arg0, 116, 47) - Mid(m000(), 1, 1, Local1) CH06(arg0, 117, 47) @@ -1548,16 +1146,16 @@ Method(m4b8) // Match - Match(m000(), MTR, 0, MTR, 0, 0) + Store (Match(m000(), MTR, 0, MTR, 0, 0), Local1) CH06(arg0, 120, 47) - Match(Package(){1}, MTR, m000(), MTR, 0, 0) + Store (Match(Package(){1}, MTR, m000(), MTR, 0, 0), Local1) CH06(arg0, 121, 47) - Match(Package(){1}, MTR, 0, MTR, m000(), 0) + Store (Match(Package(){1}, MTR, 0, MTR, m000(), 0), Local1) CH06(arg0, 122, 47) - Match(Package(){1}, MTR, 0, MTR, 0, m000()) + Store (Match(Package(){1}, MTR, 0, MTR, 0, m000()), Local1) CH06(arg0, 123, 47) } @@ -1594,19 +1192,19 @@ Method(m4b8) Store(0, i000) - DerefOf(m000(1, lpC0)) + Store (DerefOf(m000(1, lpC0)), Local1) CH03(ts, z100, Add(9, lpC0), 0, 0) CH00(arg0, 1) - DerefOf(DerefOf(m000(2, lpC0))) + Store (DerefOf(DerefOf(m000(2, lpC0))), Local1) CH06(arg0, Add(1, Local0), 47) CH00(arg0, 2) - Index(DerefOf(m000(3, lpC0)), 0) + Store (Index(DerefOf(m000(3, lpC0)), 0), Local1) CH06(arg0, Add(2, Local0), 47) CH00(arg0, 3) - Match(DerefOf(m000(4, lpC0)), MTR, 0, MTR, 0, 0) + Store (Match(DerefOf(m000(4, lpC0)), MTR, 0, MTR, 0, 0), Local1) CH06(arg0, Add(3, Local0), 47) CH00(arg0, 4) 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 7b63aa0f5..e9e8f561d 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 @@ -56,7 +56,7 @@ Method(m4b9) Mutex(mx02, 0) if (y083) { - DerefOf(mx02) + Store (DerefOf(mx02), Local1) CH06(arg0, 0, 47) } } @@ -65,7 +65,7 @@ Method(m4b9) Method(m001, 1) { if (y083) { - DerefOf(mx10) + Store (DerefOf(mx10), Local1) CH06(arg0, 1, 47) } } @@ -81,9 +81,6 @@ Method(m4b9) // CondRefOf - CondRefOf(Local0) - CH03(ts, z101, 0, 0, 0) - CondRefOf(Local0, Local1) CH03(ts, z101, 1, 0, 0) @@ -99,30 +96,21 @@ Method(m4b9) // DerefOf - DerefOf(Local0) + Store (DerefOf(Local0), Local1) CH06(arg0, 2, 47) // FindSetLeftBit - FindSetLeftBit(Local0) - CH06(arg0, 3, 47) - FindSetLeftBit(Local0, Local1) CH06(arg0, 4, 47) // FindSetRightBit - FindSetRightBit(Local0) - CH06(arg0, 5, 47) - FindSetRightBit(Local0, Local1) CH06(arg0, 6, 47) // FromBCD - FromBCD(Local0) - CH06(arg0, 7, 47) - FromBCD(Local0, Local1) CH06(arg0, 8, 47) @@ -133,25 +121,22 @@ Method(m4b9) // LNot - LNot(Local0) + Store (LNot(Local0), Local1) CH06(arg0, 10, 47) // Not - Not(Local0) - CH06(arg0, 11, 47) - Not(Local0, Local1) CH06(arg0, 12, 47) // ObjectType - ObjectType(Local0) + Store (ObjectType(Local0), Local1) CH03(ts, z101, 3, 0, 0) // RefOf - RefOf(Local0) + Store (RefOf(Local0), Local1) CH03(ts, z101, 4, 0, 0) // Release @@ -171,7 +156,7 @@ Method(m4b9) // SizeOf - SizeOf(Local0) + Store (SizeOf(Local0), Local1) CH06(arg0, 16, 47) // Sleep @@ -191,57 +176,36 @@ Method(m4b9) // ToBCD - ToBCD(Local0) - CH06(arg0, 20, 47) - ToBCD(Local0, Local1) CH06(arg0, 21, 47) // ToBuffer - ToBuffer(Local0) - CH06(arg0, 22, 47) - ToBuffer(Local0, Local1) CH06(arg0, 23, 47) // ToDecimalString - ToDecimalString(Local0) - CH06(arg0, 24, 47) - ToDecimalString(Local0, Local1) CH06(arg0, 25, 47) // ToHexString - ToHexString(Local0) - CH06(arg0, 26, 47) - ToHexString(Local0, Local1) CH06(arg0, 27, 47) // ToInteger - ToInteger(Local0) - CH06(arg0, 28, 47) - ToInteger(Local0, Local1) CH06(arg0, 29, 47) // Acquire - Acquire(Local0, 100) + Store(Acquire(Local0, 100), Local1) CH03(ts, z101, 30, 0, 0) // Add - Add(Local0, i000) - CH06(arg0, 31, 47) - - Add(i000, Local0) - CH06(arg0, 32, 47) - Add(Local0, i000, Local1) CH06(arg0, 33, 47) @@ -250,12 +214,6 @@ Method(m4b9) // And - And(Local0, i000) - CH06(arg0, 35, 47) - - And(i000, Local0) - CH06(arg0, 36, 47) - And(Local0, i000, Local1) CH06(arg0, 37, 47) @@ -264,12 +222,6 @@ Method(m4b9) // Concatenate - Concatenate(Local0, i000) - CH06(arg0, 39, 47) - - Concatenate(i000, Local0) - CH06(arg0, 40, 47) - Concatenate(Local0, i000, Local1) CH06(arg0, 41, 47) @@ -278,12 +230,6 @@ Method(m4b9) // ConcatenateResTemplate - ConcatenateResTemplate(Local0, ResourceTemplate(){}) - CH06(arg0, 43, 47) - - ConcatenateResTemplate(ResourceTemplate(){}, Local0) - CH06(arg0, 44, 47) - ConcatenateResTemplate(Local0, ResourceTemplate(){}, Local1) CH06(arg0, 45, 47) @@ -292,12 +238,6 @@ Method(m4b9) // Divide - Divide(Local0, i000) - CH06(arg0, 47, 47) - - Divide(i000, Local0) - CH06(arg0, 48, 47) - Divide(Local0, i000, Local2) CH06(arg0, 49, 47) @@ -317,12 +257,6 @@ Method(m4b9) // Index - Index(Local0, 0) - CH06(arg0, 54, 47) - - Index("0", Local0) - CH06(arg0, 55, 47) - Index(Local0, 0, Local1) CH06(arg0, 56, 47) @@ -331,68 +265,62 @@ Method(m4b9) // LEqual - LEqual(Local0, i000) + Store (LEqual(Local0, i000), Local1) CH06(arg0, 58, 47) - LEqual(i000, Local0) + Store (LEqual(i000, Local0), Local1) CH06(arg0, 59, 47) // LGreater - LGreater(Local0, i000) + Store (LGreater(Local0, i000), Local1) CH06(arg0, 60, 47) - LGreater(i000, Local0) + Store (LGreater(i000, Local0), Local1) CH06(arg0, 61, 47) // LGreaterEqual - LGreaterEqual(Local0, i000) + Store (LGreaterEqual(Local0, i000), Local1) CH06(arg0, 62, 0xff) - LGreaterEqual(i000, Local0) + Store (LGreaterEqual(i000, Local0), Local1) CH06(arg0, 63, 0xff) // LLess - LLess(Local0, i000) + Store (LLess(Local0, i000), Local1) CH06(arg0, 64, 47) - LLess(i000, Local0) + Store (LLess(i000, Local0), Local1) CH06(arg0, 65, 47) // LLessEqual - LLessEqual(Local0, i000) + Store (LLessEqual(Local0, i000), Local1) CH06(arg0, 66, 0xff) - LLessEqual(i000, Local0) + Store (LLessEqual(i000, Local0), Local1) CH06(arg0, 67, 0xff) // LNotEqual - LNotEqual(Local0, i000) + Store (LNotEqual(Local0, i000), Local1) CH06(arg0, 68, 0xff) - LNotEqual(i000, Local0) + Store (LNotEqual(i000, Local0), Local1) CH06(arg0, 69, 0xff) // LOr - LOr(Local0, i000) + Store (LOr(Local0, i000), Local1) CH06(arg0, 70, 47) - LOr(i000, Local0) + Store (LOr(i000, Local0), Local1) CH06(arg0, 71, 47) // Mod - Mod(Local0, i000) - CH06(arg0, 72, 47) - - Mod(i000, Local0) - CH06(arg0, 73, 47) - Mod(Local0, i000, Local1) CH06(arg0, 74, 47) @@ -401,12 +329,6 @@ Method(m4b9) // Multiply - Multiply(Local0, i000) - CH06(arg0, 76, 47) - - Multiply(i000, Local0) - CH06(arg0, 77, 47) - Multiply(Local0, i000, Local1) CH06(arg0, 78, 47) @@ -415,12 +337,6 @@ Method(m4b9) // NAnd - NAnd(Local0, i000) - CH06(arg0, 80, 47) - - NAnd(i000, Local0) - CH06(arg0, 81, 47) - NAnd(Local0, i000, Local1) CH06(arg0, 82, 47) @@ -429,12 +345,6 @@ Method(m4b9) // NOr - NOr(Local0, i000) - CH06(arg0, 84, 47) - - NOr(i000, Local0) - CH06(arg0, 85, 47) - NOr(Local0, i000, Local1) CH06(arg0, 86, 47) @@ -443,12 +353,6 @@ Method(m4b9) // Or - Or(Local0, i000) - CH06(arg0, 88, 47) - - Or(i000, Local0) - CH06(arg0, 89, 47) - Or(Local0, i000, Local1) CH06(arg0, 90, 47) @@ -457,12 +361,6 @@ Method(m4b9) // ShiftLeft - ShiftLeft(Local0, i000) - CH06(arg0, 92, 47) - - ShiftLeft(i000, Local0) - CH06(arg0, 93, 47) - ShiftLeft(Local0, i000, Local1) CH06(arg0, 94, 47) @@ -471,12 +369,6 @@ Method(m4b9) // ShiftRight - ShiftRight(Local0, i000) - CH06(arg0, 96, 47) - - ShiftRight(i000, Local0) - CH06(arg0, 97, 47) - ShiftRight(Local0, i000, Local1) CH06(arg0, 98, 47) @@ -485,12 +377,6 @@ Method(m4b9) // Subtract - Subtract(Local0, i000) - CH06(arg0, 100, 47) - - Subtract(i000, Local0) - CH06(arg0, 101, 47) - Subtract(Local0, i000, Local1) CH06(arg0, 102, 47) @@ -499,12 +385,6 @@ Method(m4b9) // ToString - ToString(Local0, 1) - CH06(arg0, 104, 47) - - ToString(i000, Local0) - CH06(arg0, 105, 47) - ToString(Local0, 1, Local1) CH06(arg0, 106, 47) @@ -513,20 +393,14 @@ Method(m4b9) // Wait - Wait(Local0, i000) + Store(Wait(Local0, i000), Local1) CH06(arg0, 108, 47) - Wait(e000, Local0) + Store(Wait(e000, Local0), Local1) CH06(arg0, 109, 47) // XOr - XOr(Local0, i000) - CH06(arg0, 110, 47) - - XOr(i000, Local0) - CH06(arg0, 111, 47) - XOr(Local0, i000, Local1) CH06(arg0, 112, 47) @@ -535,15 +409,6 @@ Method(m4b9) // Mid - Mid(Local0, 1, 1) - CH06(arg0, 114, 47) - - Mid("123", Local0, 1) - CH06(arg0, 115, 47) - - Mid("123", 1, Local0) - CH06(arg0, 116, 47) - Mid(Local0, 1, 1, Local1) CH06(arg0, 117, 47) @@ -555,16 +420,16 @@ Method(m4b9) // Match - Match(Local0, MTR, 0, MTR, 0, 0) + Store (Match(Local0, MTR, 0, MTR, 0, 0), Local1) CH06(arg0, 120, 47) - Match(Package(){1}, MTR, Local0, MTR, 0, 0) + Store (Match(Package(){1}, MTR, Local0, MTR, 0, 0), Local1) CH06(arg0, 121, 47) - Match(Package(){1}, MTR, 0, MTR, Local0, 0) + Store (Match(Package(){1}, MTR, 0, MTR, Local0, 0), Local1) CH06(arg0, 122, 47) - Match(Package(){1}, MTR, 0, MTR, 0, Local0) + Store (Match(Package(){1}, MTR, 0, MTR, 0, Local0), Local1) CH06(arg0, 123, 47) } @@ -577,14 +442,11 @@ Method(m4b9) return (1) } - DeRefOf(arg1) + Store (DeRefOf(arg1), Local1) CH03(ts, z101, 5, 0, 0) // CondRefOf - CondRefOf(DeRefOf(arg1)) - CH06(arg0, 0, 47) - CondRefOf(DeRefOf(arg1), Local1) CH06(arg0, 1, 47) @@ -600,30 +462,21 @@ Method(m4b9) // DerefOf - DerefOf(DeRefOf(arg1)) + Store (DerefOf(DeRefOf(arg1)), Local1) CH06(arg0, 4, 47) // FindSetLeftBit - FindSetLeftBit(DeRefOf(arg1)) - CH06(arg0, 5, 47) - FindSetLeftBit(DeRefOf(arg1), Local1) CH06(arg0, 6, 47) // FindSetRightBit - FindSetRightBit(DeRefOf(arg1)) - CH06(arg0, 7, 47) - FindSetRightBit(DeRefOf(arg1), Local1) CH06(arg0, 8, 47) // FromBCD - FromBCD(DeRefOf(arg1)) - CH06(arg0, 9, 47) - FromBCD(DeRefOf(arg1), Local1) CH06(arg0, 10, 47) @@ -634,25 +487,22 @@ Method(m4b9) // LNot - LNot(DeRefOf(arg1)) + Store (LNot(DeRefOf(arg1)), Local1) CH06(arg0, 12, 47) // Not - Not(DeRefOf(arg1)) - CH06(arg0, 13, 47) - Not(DeRefOf(arg1), Local1) CH06(arg0, 14, 47) // ObjectType - ObjectType(DeRefOf(arg1)) + Store (ObjectType(DeRefOf(arg1)), Local1) CH03(ts, z101, 6, 0, 0) // RefOf - RefOf(DeRefOf(arg1)) + Store (RefOf(DeRefOf(arg1)), Local1) CH06(arg0, 15, 47) // Release @@ -663,7 +513,7 @@ Method(m4b9) // SizeOf - SizeOf(DeRefOf(arg1)) + Store (SizeOf(DeRefOf(arg1)), Local1) CH06(arg0, 16, 47) // Sleep @@ -683,41 +533,26 @@ Method(m4b9) // ToBCD - ToBCD(DeRefOf(arg1)) - CH06(arg0, 20, 47) - ToBCD(DeRefOf(arg1), Local1) CH06(arg0, 21, 47) // ToBuffer - ToBuffer(DeRefOf(arg1)) - CH06(arg0, 22, 47) - ToBuffer(DeRefOf(arg1), Local1) CH06(arg0, 23, 47) // ToDecimalString - ToDecimalString(DeRefOf(arg1)) - CH06(arg0, 24, 47) - ToDecimalString(DeRefOf(arg1), Local1) CH06(arg0, 25, 47) // ToHexString - ToHexString(DeRefOf(arg1)) - CH06(arg0, 26, 47) - ToHexString(DeRefOf(arg1), Local1) CH06(arg0, 27, 47) // ToInteger - ToInteger(DeRefOf(arg1)) - CH06(arg0, 28, 47) - ToInteger(DeRefOf(arg1), Local1) CH06(arg0, 29, 47) @@ -725,12 +560,6 @@ Method(m4b9) // Add - Add(DeRefOf(arg1), i000) - CH06(arg0, 31, 47) - - Add(i000, DeRefOf(arg1)) - CH06(arg0, 32, 47) - Add(DeRefOf(arg1), i000, Local1) CH06(arg0, 33, 47) @@ -739,12 +568,6 @@ Method(m4b9) // And - And(DeRefOf(arg1), i000) - CH06(arg0, 35, 47) - - And(i000, DeRefOf(arg1)) - CH06(arg0, 36, 47) - And(DeRefOf(arg1), i000, Local1) CH06(arg0, 37, 47) @@ -753,12 +576,6 @@ Method(m4b9) // Concatenate - Concatenate(DeRefOf(arg1), i000) - CH06(arg0, 39, 47) - - Concatenate(i000, DeRefOf(arg1)) - CH06(arg0, 40, 47) - Concatenate(DeRefOf(arg1), i000, Local1) CH06(arg0, 41, 47) @@ -767,12 +584,6 @@ Method(m4b9) // ConcatenateResTemplate - ConcatenateResTemplate(DeRefOf(arg1), ResourceTemplate(){}) - CH06(arg0, 43, 47) - - ConcatenateResTemplate(ResourceTemplate(){}, DeRefOf(arg1)) - CH06(arg0, 44, 47) - ConcatenateResTemplate(DeRefOf(arg1), ResourceTemplate(){}, Local1) CH06(arg0, 45, 47) @@ -781,12 +592,6 @@ Method(m4b9) // Divide - Divide(DeRefOf(arg1), i000) - CH06(arg0, 47, 47) - - Divide(i000, DeRefOf(arg1)) - CH06(arg0, 48, 47) - Divide(DeRefOf(arg1), i000, Local2) CH06(arg0, 49, 47) @@ -806,12 +611,6 @@ Method(m4b9) // Index - Index(DeRefOf(arg1), 0) - CH06(arg0, 54, 47) - - Index("0", DeRefOf(arg1)) - CH06(arg0, 55, 47) - Index(DeRefOf(arg1), 0, Local1) CH06(arg0, 56, 47) @@ -820,68 +619,62 @@ Method(m4b9) // LEqual - LEqual(DeRefOf(arg1), i000) + Store (LEqual(DeRefOf(arg1), i000), Local1) CH06(arg0, 58, 47) - LEqual(i000, DeRefOf(arg1)) + Store (LEqual(i000, DeRefOf(arg1)), Local1) CH06(arg0, 59, 47) // LGreater - LGreater(DeRefOf(arg1), i000) + Store (LGreater(DeRefOf(arg1), i000), Local1) CH06(arg0, 60, 47) - LGreater(i000, DeRefOf(arg1)) + Store (LGreater(i000, DeRefOf(arg1)), Local1) CH06(arg0, 61, 47) // LGreaterEqual - LGreaterEqual(DeRefOf(arg1), i000) + Store (LGreaterEqual(DeRefOf(arg1), i000), Local1) CH06(arg0, 62, 0xff) - LGreaterEqual(i000, DeRefOf(arg1)) + Store (LGreaterEqual(i000, DeRefOf(arg1)), Local1) CH06(arg0, 63, 0xff) // LLess - LLess(DeRefOf(arg1), i000) + Store (LLess(DeRefOf(arg1), i000), Local1) CH06(arg0, 64, 47) - LLess(i000, DeRefOf(arg1)) + Store (LLess(i000, DeRefOf(arg1)), Local1) CH06(arg0, 65, 47) // LLessEqual - LLessEqual(DeRefOf(arg1), i000) + Store (LLessEqual(DeRefOf(arg1), i000), Local1) CH06(arg0, 66, 0xff) - LLessEqual(i000, DeRefOf(arg1)) + Store (LLessEqual(i000, DeRefOf(arg1)), Local1) CH06(arg0, 67, 0xff) // LNotEqual - LNotEqual(DeRefOf(arg1), i000) + Store (LNotEqual(DeRefOf(arg1), i000), Local1) CH06(arg0, 68, 0xff) - LNotEqual(i000, DeRefOf(arg1)) + Store (LNotEqual(i000, DeRefOf(arg1)), Local1) CH06(arg0, 69, 0xff) // LOr - LOr(DeRefOf(arg1), i000) + Store (LOr(DeRefOf(arg1), i000), Local1) CH06(arg0, 70, 47) - LOr(i000, DeRefOf(arg1)) + Store (LOr(i000, DeRefOf(arg1)), Local1) CH06(arg0, 71, 47) // Mod - Mod(DeRefOf(arg1), i000) - CH06(arg0, 72, 47) - - Mod(i000, DeRefOf(arg1)) - CH06(arg0, 73, 47) - Mod(DeRefOf(arg1), i000, Local1) CH06(arg0, 74, 47) @@ -890,12 +683,6 @@ Method(m4b9) // Multiply - Multiply(DeRefOf(arg1), i000) - CH06(arg0, 76, 47) - - Multiply(i000, DeRefOf(arg1)) - CH06(arg0, 77, 47) - Multiply(DeRefOf(arg1), i000, Local1) CH06(arg0, 78, 47) @@ -904,12 +691,6 @@ Method(m4b9) // NAnd - NAnd(DeRefOf(arg1), i000) - CH06(arg0, 80, 47) - - NAnd(i000, DeRefOf(arg1)) - CH06(arg0, 81, 47) - NAnd(DeRefOf(arg1), i000, Local1) CH06(arg0, 82, 47) @@ -918,12 +699,6 @@ Method(m4b9) // NOr - NOr(DeRefOf(arg1), i000) - CH06(arg0, 84, 47) - - NOr(i000, DeRefOf(arg1)) - CH06(arg0, 85, 47) - NOr(DeRefOf(arg1), i000, Local1) CH06(arg0, 86, 47) @@ -932,12 +707,6 @@ Method(m4b9) // Or - Or(DeRefOf(arg1), i000) - CH06(arg0, 88, 47) - - Or(i000, DeRefOf(arg1)) - CH06(arg0, 89, 47) - Or(DeRefOf(arg1), i000, Local1) CH06(arg0, 90, 47) @@ -946,12 +715,6 @@ Method(m4b9) // ShiftLeft - ShiftLeft(DeRefOf(arg1), i000) - CH06(arg0, 92, 47) - - ShiftLeft(i000, DeRefOf(arg1)) - CH06(arg0, 93, 47) - ShiftLeft(DeRefOf(arg1), i000, Local1) CH06(arg0, 94, 47) @@ -960,12 +723,6 @@ Method(m4b9) // ShiftRight - ShiftRight(DeRefOf(arg1), i000) - CH06(arg0, 96, 47) - - ShiftRight(i000, DeRefOf(arg1)) - CH06(arg0, 97, 47) - ShiftRight(DeRefOf(arg1), i000, Local1) CH06(arg0, 98, 47) @@ -974,12 +731,6 @@ Method(m4b9) // Subtract - Subtract(DeRefOf(arg1), i000) - CH06(arg0, 100, 47) - - Subtract(i000, DeRefOf(arg1)) - CH06(arg0, 101, 47) - Subtract(DeRefOf(arg1), i000, Local1) CH06(arg0, 102, 47) @@ -988,12 +739,6 @@ Method(m4b9) // ToString - ToString(DeRefOf(arg1), 1) - CH06(arg0, 104, 47) - - ToString(i000, DeRefOf(arg1)) - CH06(arg0, 105, 47) - ToString(DeRefOf(arg1), 1, Local1) CH06(arg0, 106, 47) @@ -1002,17 +747,11 @@ Method(m4b9) // Wait - Wait(e000, DeRefOf(arg1)) + Store(Wait(e000, DeRefOf(arg1)), Local1) CH06(arg0, 109, 47) // XOr - XOr(DeRefOf(arg1), i000) - CH06(arg0, 110, 47) - - XOr(i000, DeRefOf(arg1)) - CH06(arg0, 111, 47) - XOr(DeRefOf(arg1), i000, Local1) CH06(arg0, 112, 47) @@ -1021,15 +760,6 @@ Method(m4b9) // Mid - Mid(DeRefOf(arg1), 1, 1) - CH06(arg0, 114, 47) - - Mid("123", DeRefOf(arg1), 1) - CH06(arg0, 115, 47) - - Mid("123", 1, DeRefOf(arg1)) - CH06(arg0, 116, 47) - Mid(DeRefOf(arg1), 1, 1, Local1) CH06(arg0, 117, 47) @@ -1041,16 +771,16 @@ Method(m4b9) // Match - Match(DeRefOf(arg1), MTR, 0, MTR, 0, 0) + Store (Match(DeRefOf(arg1), MTR, 0, MTR, 0, 0), Local1) CH06(arg0, 120, 47) - Match(Package(){1}, MTR, DeRefOf(arg1), MTR, 0, 0) + Store (Match(Package(){1}, MTR, DeRefOf(arg1), MTR, 0, 0), Local1) CH06(arg0, 121, 47) - Match(Package(){1}, MTR, 0, MTR, DeRefOf(arg1), 0) + Store (Match(Package(){1}, MTR, 0, MTR, DeRefOf(arg1), 0), Local1) CH06(arg0, 122, 47) - Match(Package(){1}, MTR, 0, MTR, 0, DeRefOf(arg1)) + Store (Match(Package(){1}, MTR, 0, MTR, 0, DeRefOf(arg1)), Local1) CH06(arg0, 123, 47) return (0) @@ -1070,10 +800,10 @@ Method(m4b9) // CondRefOf if (y601) { - CondRefOf(m000()) + Store (CondRefOf(m000()), Local1) CH06(arg0, 0, 47) - CondRefOf(m000(), Local1) + Store (CondRefOf(m000(), Local1), Local1) CH06(arg0, 1, 47) } @@ -1089,30 +819,21 @@ Method(m4b9) // DerefOf - DerefOf(m000()) + Store (DerefOf(m000()), Local1) CH06(arg0, 3, 47) // FindSetLeftBit - FindSetLeftBit(m000()) - CH06(arg0, 4, 47) - FindSetLeftBit(m000(), Local1) CH06(arg0, 5, 47) // FindSetRightBit - FindSetRightBit(m000()) - CH06(arg0, 6, 47) - FindSetRightBit(m000(), Local1) CH06(arg0, 7, 47) // FromBCD - FromBCD(m000()) - CH06(arg0, 8, 47) - FromBCD(m000(), Local1) CH06(arg0, 9, 47) @@ -1123,14 +844,11 @@ Method(m4b9) // LNot - LNot(m000()) + Store (LNot(m000()), Local1) CH06(arg0, 11, 47) // Not - Not(m000()) - CH06(arg0, 12, 47) - Not(m000(), Local1) CH06(arg0, 13, 47) @@ -1143,7 +861,7 @@ Method(m4b9) // RefOf if (y601) { - RefOf(m000()) + Store (RefOf(m000()), Local1) CH06(arg0, 14, 47) } @@ -1164,7 +882,7 @@ Method(m4b9) // SizeOf - SizeOf(m000()) + Store (SizeOf(m000()), Local1) CH06(arg0, 16, 47) // Sleep @@ -1184,57 +902,36 @@ Method(m4b9) // ToBCD - ToBCD(m000()) - CH06(arg0, 20, 47) - ToBCD(m000(), Local1) CH06(arg0, 21, 47) // ToBuffer - ToBuffer(m000()) - CH06(arg0, 22, 47) - ToBuffer(m000(), Local1) CH06(arg0, 23, 47) // ToDecimalString - ToDecimalString(m000()) - CH06(arg0, 24, 47) - ToDecimalString(m000(), Local1) CH06(arg0, 25, 47) // ToHexString - ToHexString(m000()) - CH06(arg0, 26, 47) - ToHexString(m000(), Local1) CH06(arg0, 27, 47) // ToInteger - ToInteger(m000()) - CH06(arg0, 28, 47) - ToInteger(m000(), Local1) CH06(arg0, 29, 47) // Acquire - Acquire(m000(), 100) + Store(Acquire(m000(), 100), Local1) CH06(arg0, 30, 47) // Add - Add(m000(), i000) - CH06(arg0, 31, 47) - - Add(i000, m000()) - CH06(arg0, 32, 47) - Add(m000(), i000, Local1) CH06(arg0, 33, 47) @@ -1243,12 +940,6 @@ Method(m4b9) // And - And(m000(), i000) - CH06(arg0, 35, 47) - - And(i000, m000()) - CH06(arg0, 36, 47) - And(m000(), i000, Local1) CH06(arg0, 37, 47) @@ -1257,12 +948,6 @@ Method(m4b9) // Concatenate - Concatenate(m000(), i000) - CH06(arg0, 39, 47) - - Concatenate(i000, m000()) - CH06(arg0, 40, 47) - Concatenate(m000(), i000, Local1) CH06(arg0, 41, 47) @@ -1271,12 +956,6 @@ Method(m4b9) // ConcatenateResTemplate - ConcatenateResTemplate(m000(), ResourceTemplate(){}) - CH06(arg0, 43, 47) - - ConcatenateResTemplate(ResourceTemplate(){}, m000()) - CH06(arg0, 44, 47) - ConcatenateResTemplate(m000(), ResourceTemplate(){}, Local1) CH06(arg0, 45, 47) @@ -1285,12 +964,6 @@ Method(m4b9) // Divide - Divide(m000(), i000) - CH06(arg0, 47, 47) - - Divide(i000, m000()) - CH06(arg0, 48, 47) - Divide(m000(), i000, Local2) CH06(arg0, 49, 47) @@ -1310,12 +983,6 @@ Method(m4b9) // Index - Index(m000(), 0) - CH06(arg0, 54, 47) - - Index("0", m000()) - CH06(arg0, 55, 47) - Index(m000(), 0, Local1) CH06(arg0, 56, 47) @@ -1324,68 +991,62 @@ Method(m4b9) // LEqual - LEqual(m000(), i000) + Store (LEqual(m000(), i000), Local1) CH06(arg0, 58, 47) - LEqual(i000, m000()) + Store (LEqual(i000, m000()), Local1) CH06(arg0, 59, 47) // LGreater - LGreater(m000(), i000) + Store (LGreater(m000(), i000), Local1) CH06(arg0, 60, 47) - LGreater(i000, m000()) + Store (LGreater(i000, m000()), Local1) CH06(arg0, 61, 47) // LGreaterEqual - LGreaterEqual(m000(), i000) + Store (LGreaterEqual(m000(), i000), Local1) CH06(arg0, 62, 0xff) - LGreaterEqual(i000, m000()) + Store (LGreaterEqual(i000, m000()), Local1) CH06(arg0, 63, 0xff) // LLess - LLess(m000(), i000) + Store (LLess(m000(), i000), Local1) CH06(arg0, 64, 47) - LLess(i000, m000()) + Store (LLess(i000, m000()), Local1) CH06(arg0, 65, 47) // LLessEqual - LLessEqual(m000(), i000) + Store (LLessEqual(m000(), i000), Local1) CH06(arg0, 66, 0xff) - LLessEqual(i000, m000()) + Store (LLessEqual(i000, m000()), Local1) CH06(arg0, 67, 0xff) // LNotEqual - LNotEqual(m000(), i000) + Store (LNotEqual(m000(), i000), Local1) CH06(arg0, 68, 0xff) - LNotEqual(i000, m000()) + Store (LNotEqual(i000, m000()), Local1) CH06(arg0, 69, 0xff) // LOr - LOr(m000(), i000) + Store (LOr(m000(), i000), Local1) CH06(arg0, 70, 47) - LOr(i000, m000()) + Store (LOr(i000, m000()), Local1) CH06(arg0, 71, 47) // Mod - Mod(m000(), i000) - CH06(arg0, 72, 47) - - Mod(i000, m000()) - CH06(arg0, 73, 47) - Mod(m000(), i000, Local1) CH06(arg0, 74, 47) @@ -1394,12 +1055,6 @@ Method(m4b9) // Multiply - Multiply(m000(), i000) - CH06(arg0, 76, 47) - - Multiply(i000, m000()) - CH06(arg0, 77, 47) - Multiply(m000(), i000, Local1) CH06(arg0, 78, 47) @@ -1408,12 +1063,6 @@ Method(m4b9) // NAnd - NAnd(m000(), i000) - CH06(arg0, 80, 47) - - NAnd(i000, m000()) - CH06(arg0, 81, 47) - NAnd(m000(), i000, Local1) CH06(arg0, 82, 47) @@ -1422,12 +1071,6 @@ Method(m4b9) // NOr - NOr(m000(), i000) - CH06(arg0, 84, 47) - - NOr(i000, m000()) - CH06(arg0, 85, 47) - NOr(m000(), i000, Local1) CH06(arg0, 86, 47) @@ -1436,12 +1079,6 @@ Method(m4b9) // Or - Or(m000(), i000) - CH06(arg0, 88, 47) - - Or(i000, m000()) - CH06(arg0, 89, 47) - Or(m000(), i000, Local1) CH06(arg0, 90, 47) @@ -1450,12 +1087,6 @@ Method(m4b9) // ShiftLeft - ShiftLeft(m000(), i000) - CH06(arg0, 92, 47) - - ShiftLeft(i000, m000()) - CH06(arg0, 93, 47) - ShiftLeft(m000(), i000, Local1) CH06(arg0, 94, 47) @@ -1464,12 +1095,6 @@ Method(m4b9) // ShiftRight - ShiftRight(m000(), i000) - CH06(arg0, 96, 47) - - ShiftRight(i000, m000()) - CH06(arg0, 97, 47) - ShiftRight(m000(), i000, Local1) CH06(arg0, 98, 47) @@ -1478,12 +1103,6 @@ Method(m4b9) // Subtract - Subtract(m000(), i000) - CH06(arg0, 100, 47) - - Subtract(i000, m000()) - CH06(arg0, 101, 47) - Subtract(m000(), i000, Local1) CH06(arg0, 102, 47) @@ -1492,12 +1111,6 @@ Method(m4b9) // ToString - ToString(m000(), 1) - CH06(arg0, 104, 47) - - ToString(i000, m000()) - CH06(arg0, 105, 47) - ToString(m000(), 1, Local1) CH06(arg0, 106, 47) @@ -1506,20 +1119,14 @@ Method(m4b9) // Wait - Wait(m000(), i000) + Store(Wait(m000(), i000), Local1) CH06(arg0, 108, 47) - Wait(e000, m000()) + Store(Wait(e000, m000()), Local1) CH06(arg0, 109, 47) // XOr - XOr(m000(), i000) - CH06(arg0, 110, 47) - - XOr(i000, m000()) - CH06(arg0, 111, 47) - XOr(m000(), i000, Local1) CH06(arg0, 112, 47) @@ -1528,15 +1135,6 @@ Method(m4b9) // Mid - Mid(m000(), 1, 1) - CH06(arg0, 114, 47) - - Mid("123", m000(), 1) - CH06(arg0, 115, 47) - - Mid("123", 1, m000()) - CH06(arg0, 116, 47) - Mid(m000(), 1, 1, Local1) CH06(arg0, 117, 47) @@ -1548,16 +1146,16 @@ Method(m4b9) // Match - Match(m000(), MTR, 0, MTR, 0, 0) + Store (Match(m000(), MTR, 0, MTR, 0, 0), Local1) CH06(arg0, 120, 47) - Match(Package(){1}, MTR, m000(), MTR, 0, 0) + Store (Match(Package(){1}, MTR, m000(), MTR, 0, 0), Local1) CH06(arg0, 121, 47) - Match(Package(){1}, MTR, 0, MTR, m000(), 0) + Store (Match(Package(){1}, MTR, 0, MTR, m000(), 0), Local1) CH06(arg0, 122, 47) - Match(Package(){1}, MTR, 0, MTR, 0, m000()) + Store (Match(Package(){1}, MTR, 0, MTR, 0, m000()), Local1) CH06(arg0, 123, 47) } @@ -1594,19 +1192,19 @@ Method(m4b9) Store(0, i000) - DerefOf(m000(1, lpC0)) + Store (DerefOf(m000(1, lpC0)), Local1) CH03(ts, z101, Add(9, lpC0), 0, 0) CH00(arg0, 1) - DerefOf(DerefOf(m000(2, lpC0))) + Store (DerefOf(DerefOf(m000(2, lpC0))), Local1) CH06(arg0, Add(1, Local0), 47) CH00(arg0, 2) - Index(DerefOf(m000(3, lpC0)), 0) + Store (Index(DerefOf(m000(3, lpC0)), 0), Local1) CH06(arg0, Add(2, Local0), 47) CH00(arg0, 3) - Match(DerefOf(m000(4, lpC0)), MTR, 0, MTR, 0, 0) + Store (Match(DerefOf(m000(4, lpC0)), MTR, 0, MTR, 0, 0), Local1) CH06(arg0, Add(3, Local0), 47) CH00(arg0, 4) 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 49cbda77b..a0fd66f62 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 @@ -55,7 +55,7 @@ Method(m4ba) { OperationRegion(opr2, SystemMemory, 0x100, 0x100) - DerefOf(opr2) + Store (DerefOf(opr2), Local1) CH06(arg0, 0, 47) } @@ -63,7 +63,7 @@ Method(m4ba) Method(m001, 1) { if (y083) { - DerefOf(opr9) + Store (DerefOf(opr9), Local1) CH06(arg0, 1, 47) } } @@ -79,7 +79,7 @@ Method(m4ba) // CondRefOf - CondRefOf(Local0) + Store (CondRefOf(Local0), Local1) CH03(ts, z102, 0, 0, 0) CondRefOf(Local0, Local1) @@ -97,30 +97,21 @@ Method(m4ba) // DerefOf - DerefOf(Local0) + Store (DerefOf(Local0), Local1) CH06(arg0, 2, 47) // FindSetLeftBit - FindSetLeftBit(Local0) - CH06(arg0, 3, 47) - FindSetLeftBit(Local0, Local1) CH06(arg0, 4, 47) // FindSetRightBit - FindSetRightBit(Local0) - CH06(arg0, 5, 47) - FindSetRightBit(Local0, Local1) CH06(arg0, 6, 47) // FromBCD - FromBCD(Local0) - CH06(arg0, 7, 47) - FromBCD(Local0, Local1) CH06(arg0, 8, 47) @@ -131,25 +122,22 @@ Method(m4ba) // LNot - LNot(Local0) + Store (LNot(Local0), Local1) CH06(arg0, 10, 47) // Not - Not(Local0) - CH06(arg0, 11, 47) - Not(Local0, Local1) CH06(arg0, 12, 47) // ObjectType - ObjectType(Local0) + Store (ObjectType(Local0), Local1) CH03(ts, z102, 3, 0, 0) // RefOf - RefOf(Local0) + Store (RefOf(Local0), Local1) CH03(ts, z102, 4, 0, 0) // Release @@ -169,7 +157,7 @@ Method(m4ba) // SizeOf - SizeOf(Local0) + Store (SizeOf(Local0), Local1) CH06(arg0, 16, 47) // Sleep @@ -189,57 +177,36 @@ Method(m4ba) // ToBCD - ToBCD(Local0) - CH06(arg0, 20, 47) - ToBCD(Local0, Local1) CH06(arg0, 21, 47) // ToBuffer - ToBuffer(Local0) - CH06(arg0, 22, 47) - ToBuffer(Local0, Local1) CH06(arg0, 23, 47) // ToDecimalString - ToDecimalString(Local0) - CH06(arg0, 24, 47) - ToDecimalString(Local0, Local1) CH06(arg0, 25, 47) // ToHexString - ToHexString(Local0) - CH06(arg0, 26, 47) - ToHexString(Local0, Local1) CH06(arg0, 27, 47) // ToInteger - ToInteger(Local0) - CH06(arg0, 28, 47) - ToInteger(Local0, Local1) CH06(arg0, 29, 47) // Acquire - Acquire(Local0, 100) + Store(Acquire(Local0, 100), Local1) CH06(arg0, 30, 47) // Add - Add(Local0, i000) - CH06(arg0, 31, 47) - - Add(i000, Local0) - CH06(arg0, 32, 47) - Add(Local0, i000, Local1) CH06(arg0, 33, 47) @@ -248,12 +215,6 @@ Method(m4ba) // And - And(Local0, i000) - CH06(arg0, 35, 47) - - And(i000, Local0) - CH06(arg0, 36, 47) - And(Local0, i000, Local1) CH06(arg0, 37, 47) @@ -262,12 +223,6 @@ Method(m4ba) // Concatenate - Concatenate(Local0, i000) - CH06(arg0, 39, 47) - - Concatenate(i000, Local0) - CH06(arg0, 40, 47) - Concatenate(Local0, i000, Local1) CH06(arg0, 41, 47) @@ -276,12 +231,6 @@ Method(m4ba) // ConcatenateResTemplate - ConcatenateResTemplate(Local0, ResourceTemplate(){}) - CH06(arg0, 43, 47) - - ConcatenateResTemplate(ResourceTemplate(){}, Local0) - CH06(arg0, 44, 47) - ConcatenateResTemplate(Local0, ResourceTemplate(){}, Local1) CH06(arg0, 45, 47) @@ -290,12 +239,6 @@ Method(m4ba) // Divide - Divide(Local0, i000) - CH06(arg0, 47, 47) - - Divide(i000, Local0) - CH06(arg0, 48, 47) - Divide(Local0, i000, Local2) CH06(arg0, 49, 47) @@ -315,12 +258,6 @@ Method(m4ba) // Index - Index(Local0, 0) - CH06(arg0, 54, 47) - - Index("0", Local0) - CH06(arg0, 55, 47) - Index(Local0, 0, Local1) CH06(arg0, 56, 47) @@ -329,68 +266,62 @@ Method(m4ba) // LEqual - LEqual(Local0, i000) + Store (LEqual(Local0, i000), Local1) CH06(arg0, 58, 47) - LEqual(i000, Local0) + Store (LEqual(i000, Local0), Local1) CH06(arg0, 59, 47) // LGreater - LGreater(Local0, i000) + Store (LGreater(Local0, i000), Local1) CH06(arg0, 60, 47) - LGreater(i000, Local0) + Store (LGreater(i000, Local0), Local1) CH06(arg0, 61, 47) // LGreaterEqual - LGreaterEqual(Local0, i000) + Store (LGreaterEqual(Local0, i000), Local1) CH06(arg0, 62, 0xff) - LGreaterEqual(i000, Local0) + Store (LGreaterEqual(i000, Local0), Local1) CH06(arg0, 63, 0xff) // LLess - LLess(Local0, i000) + Store (LLess(Local0, i000), Local1) CH06(arg0, 64, 47) - LLess(i000, Local0) + Store (LLess(i000, Local0), Local1) CH06(arg0, 65, 47) // LLessEqual - LLessEqual(Local0, i000) + Store (LLessEqual(Local0, i000), Local1) CH06(arg0, 66, 0xff) - LLessEqual(i000, Local0) + Store (LLessEqual(i000, Local0), Local1) CH06(arg0, 67, 0xff) // LNotEqual - LNotEqual(Local0, i000) + Store (LNotEqual(Local0, i000), Local1) CH06(arg0, 68, 0xff) - LNotEqual(i000, Local0) + Store (LNotEqual(i000, Local0), Local1) CH06(arg0, 69, 0xff) // LOr - LOr(Local0, i000) + Store (LOr(Local0, i000), Local1) CH06(arg0, 70, 47) - LOr(i000, Local0) + Store (LOr(i000, Local0), Local1) CH06(arg0, 71, 47) // Mod - Mod(Local0, i000) - CH06(arg0, 72, 47) - - Mod(i000, Local0) - CH06(arg0, 73, 47) - Mod(Local0, i000, Local1) CH06(arg0, 74, 47) @@ -399,12 +330,6 @@ Method(m4ba) // Multiply - Multiply(Local0, i000) - CH06(arg0, 76, 47) - - Multiply(i000, Local0) - CH06(arg0, 77, 47) - Multiply(Local0, i000, Local1) CH06(arg0, 78, 47) @@ -413,12 +338,6 @@ Method(m4ba) // NAnd - NAnd(Local0, i000) - CH06(arg0, 80, 47) - - NAnd(i000, Local0) - CH06(arg0, 81, 47) - NAnd(Local0, i000, Local1) CH06(arg0, 82, 47) @@ -427,12 +346,6 @@ Method(m4ba) // NOr - NOr(Local0, i000) - CH06(arg0, 84, 47) - - NOr(i000, Local0) - CH06(arg0, 85, 47) - NOr(Local0, i000, Local1) CH06(arg0, 86, 47) @@ -441,12 +354,6 @@ Method(m4ba) // Or - Or(Local0, i000) - CH06(arg0, 88, 47) - - Or(i000, Local0) - CH06(arg0, 89, 47) - Or(Local0, i000, Local1) CH06(arg0, 90, 47) @@ -455,12 +362,6 @@ Method(m4ba) // ShiftLeft - ShiftLeft(Local0, i000) - CH06(arg0, 92, 47) - - ShiftLeft(i000, Local0) - CH06(arg0, 93, 47) - ShiftLeft(Local0, i000, Local1) CH06(arg0, 94, 47) @@ -469,12 +370,6 @@ Method(m4ba) // ShiftRight - ShiftRight(Local0, i000) - CH06(arg0, 96, 47) - - ShiftRight(i000, Local0) - CH06(arg0, 97, 47) - ShiftRight(Local0, i000, Local1) CH06(arg0, 98, 47) @@ -483,12 +378,6 @@ Method(m4ba) // Subtract - Subtract(Local0, i000) - CH06(arg0, 100, 47) - - Subtract(i000, Local0) - CH06(arg0, 101, 47) - Subtract(Local0, i000, Local1) CH06(arg0, 102, 47) @@ -497,12 +386,6 @@ Method(m4ba) // ToString - ToString(Local0, 1) - CH06(arg0, 104, 47) - - ToString(i000, Local0) - CH06(arg0, 105, 47) - ToString(Local0, 1, Local1) CH06(arg0, 106, 47) @@ -511,20 +394,14 @@ Method(m4ba) // Wait - Wait(Local0, i000) + Store(Wait(Local0, i000), Local1) CH06(arg0, 108, 47) - Wait(e000, Local0) + Store(Wait(e000, Local0), Local1) CH06(arg0, 109, 47) // XOr - XOr(Local0, i000) - CH06(arg0, 110, 47) - - XOr(i000, Local0) - CH06(arg0, 111, 47) - XOr(Local0, i000, Local1) CH06(arg0, 112, 47) @@ -533,15 +410,6 @@ Method(m4ba) // Mid - Mid(Local0, 1, 1) - CH06(arg0, 114, 47) - - Mid("123", Local0, 1) - CH06(arg0, 115, 47) - - Mid("123", 1, Local0) - CH06(arg0, 116, 47) - Mid(Local0, 1, 1, Local1) CH06(arg0, 117, 47) @@ -553,16 +421,16 @@ Method(m4ba) // Match - Match(Local0, MTR, 0, MTR, 0, 0) + Store (Match(Local0, MTR, 0, MTR, 0, 0), Local1) CH06(arg0, 120, 47) - Match(Package(){1}, MTR, Local0, MTR, 0, 0) + Store (Match(Package(){1}, MTR, Local0, MTR, 0, 0), Local1) CH06(arg0, 121, 47) - Match(Package(){1}, MTR, 0, MTR, Local0, 0) + Store (Match(Package(){1}, MTR, 0, MTR, Local0, 0), Local1) CH06(arg0, 122, 47) - Match(Package(){1}, MTR, 0, MTR, 0, Local0) + Store (Match(Package(){1}, MTR, 0, MTR, 0, Local0), Local1) CH06(arg0, 123, 47) } @@ -575,14 +443,11 @@ Method(m4ba) return (1) } - DeRefOf(arg1) + Store (DeRefOf(arg1), Local1) CH03(ts, z102, 5, 0, 0) // CondRefOf - CondRefOf(DeRefOf(arg1)) - CH06(arg0, 0, 47) - CondRefOf(DeRefOf(arg1), Local1) CH06(arg0, 1, 47) @@ -598,30 +463,21 @@ Method(m4ba) // DerefOf - DerefOf(DeRefOf(arg1)) + Store (DerefOf(DeRefOf(arg1)), Local1) CH06(arg0, 4, 47) // FindSetLeftBit - FindSetLeftBit(DeRefOf(arg1)) - CH06(arg0, 5, 47) - FindSetLeftBit(DeRefOf(arg1), Local1) CH06(arg0, 6, 47) // FindSetRightBit - FindSetRightBit(DeRefOf(arg1)) - CH06(arg0, 7, 47) - FindSetRightBit(DeRefOf(arg1), Local1) CH06(arg0, 8, 47) // FromBCD - FromBCD(DeRefOf(arg1)) - CH06(arg0, 9, 47) - FromBCD(DeRefOf(arg1), Local1) CH06(arg0, 10, 47) @@ -632,25 +488,22 @@ Method(m4ba) // LNot - LNot(DeRefOf(arg1)) + Store (LNot(DeRefOf(arg1)), Local1) CH06(arg0, 12, 47) // Not - Not(DeRefOf(arg1)) - CH06(arg0, 13, 47) - Not(DeRefOf(arg1), Local1) CH06(arg0, 14, 47) // ObjectType - ObjectType(DeRefOf(arg1)) + Store (ObjectType(DeRefOf(arg1)), Local1) CH03(ts, z102, 6, 0, 0) // RefOf - RefOf(DeRefOf(arg1)) + Store (RefOf(DeRefOf(arg1)), Local1) CH06(arg0, 15, 47) // Release @@ -661,7 +514,7 @@ Method(m4ba) // SizeOf - SizeOf(DeRefOf(arg1)) + Store (SizeOf(DeRefOf(arg1)), Local1) CH06(arg0, 16, 47) // Sleep @@ -681,41 +534,26 @@ Method(m4ba) // ToBCD - ToBCD(DeRefOf(arg1)) - CH06(arg0, 20, 47) - ToBCD(DeRefOf(arg1), Local1) CH06(arg0, 21, 47) // ToBuffer - ToBuffer(DeRefOf(arg1)) - CH06(arg0, 22, 47) - ToBuffer(DeRefOf(arg1), Local1) CH06(arg0, 23, 47) // ToDecimalString - ToDecimalString(DeRefOf(arg1)) - CH06(arg0, 24, 47) - ToDecimalString(DeRefOf(arg1), Local1) CH06(arg0, 25, 47) // ToHexString - ToHexString(DeRefOf(arg1)) - CH06(arg0, 26, 47) - ToHexString(DeRefOf(arg1), Local1) CH06(arg0, 27, 47) // ToInteger - ToInteger(DeRefOf(arg1)) - CH06(arg0, 28, 47) - ToInteger(DeRefOf(arg1), Local1) CH06(arg0, 29, 47) @@ -723,12 +561,6 @@ Method(m4ba) // Add - Add(DeRefOf(arg1), i000) - CH06(arg0, 31, 47) - - Add(i000, DeRefOf(arg1)) - CH06(arg0, 32, 47) - Add(DeRefOf(arg1), i000, Local1) CH06(arg0, 33, 47) @@ -737,12 +569,6 @@ Method(m4ba) // And - And(DeRefOf(arg1), i000) - CH06(arg0, 35, 47) - - And(i000, DeRefOf(arg1)) - CH06(arg0, 36, 47) - And(DeRefOf(arg1), i000, Local1) CH06(arg0, 37, 47) @@ -751,12 +577,6 @@ Method(m4ba) // Concatenate - Concatenate(DeRefOf(arg1), i000) - CH06(arg0, 39, 47) - - Concatenate(i000, DeRefOf(arg1)) - CH06(arg0, 40, 47) - Concatenate(DeRefOf(arg1), i000, Local1) CH06(arg0, 41, 47) @@ -765,12 +585,6 @@ Method(m4ba) // ConcatenateResTemplate - ConcatenateResTemplate(DeRefOf(arg1), ResourceTemplate(){}) - CH06(arg0, 43, 47) - - ConcatenateResTemplate(ResourceTemplate(){}, DeRefOf(arg1)) - CH06(arg0, 44, 47) - ConcatenateResTemplate(DeRefOf(arg1), ResourceTemplate(){}, Local1) CH06(arg0, 45, 47) @@ -779,12 +593,6 @@ Method(m4ba) // Divide - Divide(DeRefOf(arg1), i000) - CH06(arg0, 47, 47) - - Divide(i000, DeRefOf(arg1)) - CH06(arg0, 48, 47) - Divide(DeRefOf(arg1), i000, Local2) CH06(arg0, 49, 47) @@ -804,12 +612,6 @@ Method(m4ba) // Index - Index(DeRefOf(arg1), 0) - CH06(arg0, 54, 47) - - Index("0", DeRefOf(arg1)) - CH06(arg0, 55, 47) - Index(DeRefOf(arg1), 0, Local1) CH06(arg0, 56, 47) @@ -818,68 +620,62 @@ Method(m4ba) // LEqual - LEqual(DeRefOf(arg1), i000) + Store (LEqual(DeRefOf(arg1), i000), Local1) CH06(arg0, 58, 47) - LEqual(i000, DeRefOf(arg1)) + Store (LEqual(i000, DeRefOf(arg1)), Local1) CH06(arg0, 59, 47) // LGreater - LGreater(DeRefOf(arg1), i000) + Store (LGreater(DeRefOf(arg1), i000), Local1) CH06(arg0, 60, 47) - LGreater(i000, DeRefOf(arg1)) + Store (LGreater(i000, DeRefOf(arg1)), Local1) CH06(arg0, 61, 47) // LGreaterEqual - LGreaterEqual(DeRefOf(arg1), i000) + Store (LGreaterEqual(DeRefOf(arg1), i000), Local1) CH06(arg0, 62, 0xff) - LGreaterEqual(i000, DeRefOf(arg1)) + Store (LGreaterEqual(i000, DeRefOf(arg1)), Local1) CH06(arg0, 63, 0xff) // LLess - LLess(DeRefOf(arg1), i000) + Store (LLess(DeRefOf(arg1), i000), Local1) CH06(arg0, 64, 47) - LLess(i000, DeRefOf(arg1)) + Store (LLess(i000, DeRefOf(arg1)), Local1) CH06(arg0, 65, 47) // LLessEqual - LLessEqual(DeRefOf(arg1), i000) + Store (LLessEqual(DeRefOf(arg1), i000), Local1) CH06(arg0, 66, 0xff) - LLessEqual(i000, DeRefOf(arg1)) + Store (LLessEqual(i000, DeRefOf(arg1)), Local1) CH06(arg0, 67, 0xff) // LNotEqual - LNotEqual(DeRefOf(arg1), i000) + Store (LNotEqual(DeRefOf(arg1), i000), Local1) CH06(arg0, 68, 0xff) - LNotEqual(i000, DeRefOf(arg1)) + Store (LNotEqual(i000, DeRefOf(arg1)), Local1) CH06(arg0, 69, 0xff) // LOr - LOr(DeRefOf(arg1), i000) + Store (LOr(DeRefOf(arg1), i000), Local1) CH06(arg0, 70, 47) - LOr(i000, DeRefOf(arg1)) + Store (LOr(i000, DeRefOf(arg1)), Local1) CH06(arg0, 71, 47) // Mod - Mod(DeRefOf(arg1), i000) - CH06(arg0, 72, 47) - - Mod(i000, DeRefOf(arg1)) - CH06(arg0, 73, 47) - Mod(DeRefOf(arg1), i000, Local1) CH06(arg0, 74, 47) @@ -888,12 +684,6 @@ Method(m4ba) // Multiply - Multiply(DeRefOf(arg1), i000) - CH06(arg0, 76, 47) - - Multiply(i000, DeRefOf(arg1)) - CH06(arg0, 77, 47) - Multiply(DeRefOf(arg1), i000, Local1) CH06(arg0, 78, 47) @@ -902,12 +692,6 @@ Method(m4ba) // NAnd - NAnd(DeRefOf(arg1), i000) - CH06(arg0, 80, 47) - - NAnd(i000, DeRefOf(arg1)) - CH06(arg0, 81, 47) - NAnd(DeRefOf(arg1), i000, Local1) CH06(arg0, 82, 47) @@ -916,12 +700,6 @@ Method(m4ba) // NOr - NOr(DeRefOf(arg1), i000) - CH06(arg0, 84, 47) - - NOr(i000, DeRefOf(arg1)) - CH06(arg0, 85, 47) - NOr(DeRefOf(arg1), i000, Local1) CH06(arg0, 86, 47) @@ -930,12 +708,6 @@ Method(m4ba) // Or - Or(DeRefOf(arg1), i000) - CH06(arg0, 88, 47) - - Or(i000, DeRefOf(arg1)) - CH06(arg0, 89, 47) - Or(DeRefOf(arg1), i000, Local1) CH06(arg0, 90, 47) @@ -944,12 +716,6 @@ Method(m4ba) // ShiftLeft - ShiftLeft(DeRefOf(arg1), i000) - CH06(arg0, 92, 47) - - ShiftLeft(i000, DeRefOf(arg1)) - CH06(arg0, 93, 47) - ShiftLeft(DeRefOf(arg1), i000, Local1) CH06(arg0, 94, 47) @@ -958,12 +724,6 @@ Method(m4ba) // ShiftRight - ShiftRight(DeRefOf(arg1), i000) - CH06(arg0, 96, 47) - - ShiftRight(i000, DeRefOf(arg1)) - CH06(arg0, 97, 47) - ShiftRight(DeRefOf(arg1), i000, Local1) CH06(arg0, 98, 47) @@ -972,12 +732,6 @@ Method(m4ba) // Subtract - Subtract(DeRefOf(arg1), i000) - CH06(arg0, 100, 47) - - Subtract(i000, DeRefOf(arg1)) - CH06(arg0, 101, 47) - Subtract(DeRefOf(arg1), i000, Local1) CH06(arg0, 102, 47) @@ -986,12 +740,6 @@ Method(m4ba) // ToString - ToString(DeRefOf(arg1), 1) - CH06(arg0, 104, 47) - - ToString(i000, DeRefOf(arg1)) - CH06(arg0, 105, 47) - ToString(DeRefOf(arg1), 1, Local1) CH06(arg0, 106, 47) @@ -1000,17 +748,11 @@ Method(m4ba) // Wait - Wait(e000, DeRefOf(arg1)) + Store(Wait(e000, DeRefOf(arg1)), Local1) CH06(arg0, 109, 47) // XOr - XOr(DeRefOf(arg1), i000) - CH06(arg0, 110, 47) - - XOr(i000, DeRefOf(arg1)) - CH06(arg0, 111, 47) - XOr(DeRefOf(arg1), i000, Local1) CH06(arg0, 112, 47) @@ -1019,15 +761,6 @@ Method(m4ba) // Mid - Mid(DeRefOf(arg1), 1, 1) - CH06(arg0, 114, 47) - - Mid("123", DeRefOf(arg1), 1) - CH06(arg0, 115, 47) - - Mid("123", 1, DeRefOf(arg1)) - CH06(arg0, 116, 47) - Mid(DeRefOf(arg1), 1, 1, Local1) CH06(arg0, 117, 47) @@ -1039,16 +772,16 @@ Method(m4ba) // Match - Match(DeRefOf(arg1), MTR, 0, MTR, 0, 0) + Store (Match(DeRefOf(arg1), MTR, 0, MTR, 0, 0), Local1) CH06(arg0, 120, 47) - Match(Package(){1}, MTR, DeRefOf(arg1), MTR, 0, 0) + Store (Match(Package(){1}, MTR, DeRefOf(arg1), MTR, 0, 0), Local1) CH06(arg0, 121, 47) - Match(Package(){1}, MTR, 0, MTR, DeRefOf(arg1), 0) + Store (Match(Package(){1}, MTR, 0, MTR, DeRefOf(arg1), 0), Local1) CH06(arg0, 122, 47) - Match(Package(){1}, MTR, 0, MTR, 0, DeRefOf(arg1)) + Store (Match(Package(){1}, MTR, 0, MTR, 0, DeRefOf(arg1)), Local1) CH06(arg0, 123, 47) return (0) @@ -1067,9 +800,6 @@ Method(m4ba) // CondRefOf - CondRefOf(m000()) - CH06(arg0, 0, 47) - CondRefOf(m000(), Local1) CH06(arg0, 1, 47) @@ -1085,30 +815,21 @@ Method(m4ba) // DerefOf - DerefOf(m000()) + Store (DerefOf(m000()), Local1) CH06(arg0, 3, 47) // FindSetLeftBit - FindSetLeftBit(m000()) - CH06(arg0, 4, 47) - FindSetLeftBit(m000(), Local1) CH06(arg0, 5, 47) // FindSetRightBit - FindSetRightBit(m000()) - CH06(arg0, 6, 47) - FindSetRightBit(m000(), Local1) CH06(arg0, 7, 47) // FromBCD - FromBCD(m000()) - CH06(arg0, 8, 47) - FromBCD(m000(), Local1) CH06(arg0, 9, 47) @@ -1119,14 +840,11 @@ Method(m4ba) // LNot - LNot(m000()) + Store (LNot(m000()), Local1) CH06(arg0, 11, 47) // Not - Not(m000()) - CH06(arg0, 12, 47) - Not(m000(), Local1) CH06(arg0, 13, 47) @@ -1138,7 +856,7 @@ Method(m4ba) // RefOf - RefOf(m000()) + Store (RefOf(m000()), Local1) CH06(arg0, 14, 47) // Release @@ -1158,7 +876,7 @@ Method(m4ba) // SizeOf - SizeOf(m000()) + Store (SizeOf(m000()), Local1) CH06(arg0, 16, 47) // Sleep @@ -1178,57 +896,36 @@ Method(m4ba) // ToBCD - ToBCD(m000()) - CH06(arg0, 20, 47) - ToBCD(m000(), Local1) CH06(arg0, 21, 47) // ToBuffer - ToBuffer(m000()) - CH06(arg0, 22, 47) - ToBuffer(m000(), Local1) CH06(arg0, 23, 47) // ToDecimalString - ToDecimalString(m000()) - CH06(arg0, 24, 47) - ToDecimalString(m000(), Local1) CH06(arg0, 25, 47) // ToHexString - ToHexString(m000()) - CH06(arg0, 26, 47) - ToHexString(m000(), Local1) CH06(arg0, 27, 47) // ToInteger - ToInteger(m000()) - CH06(arg0, 28, 47) - ToInteger(m000(), Local1) CH06(arg0, 29, 47) // Acquire - Acquire(m000(), 100) + Store(Acquire(m000(), 100), Local1) CH06(arg0, 30, 47) // Add - Add(m000(), i000) - CH06(arg0, 31, 47) - - Add(i000, m000()) - CH06(arg0, 32, 47) - Add(m000(), i000, Local1) CH06(arg0, 33, 47) @@ -1237,12 +934,6 @@ Method(m4ba) // And - And(m000(), i000) - CH06(arg0, 35, 47) - - And(i000, m000()) - CH06(arg0, 36, 47) - And(m000(), i000, Local1) CH06(arg0, 37, 47) @@ -1251,12 +942,6 @@ Method(m4ba) // Concatenate - Concatenate(m000(), i000) - CH06(arg0, 39, 47) - - Concatenate(i000, m000()) - CH06(arg0, 40, 47) - Concatenate(m000(), i000, Local1) CH06(arg0, 41, 47) @@ -1265,12 +950,6 @@ Method(m4ba) // ConcatenateResTemplate - ConcatenateResTemplate(m000(), ResourceTemplate(){}) - CH06(arg0, 43, 47) - - ConcatenateResTemplate(ResourceTemplate(){}, m000()) - CH06(arg0, 44, 47) - ConcatenateResTemplate(m000(), ResourceTemplate(){}, Local1) CH06(arg0, 45, 47) @@ -1279,12 +958,6 @@ Method(m4ba) // Divide - Divide(m000(), i000) - CH06(arg0, 47, 47) - - Divide(i000, m000()) - CH06(arg0, 48, 47) - Divide(m000(), i000, Local2) CH06(arg0, 49, 47) @@ -1304,12 +977,6 @@ Method(m4ba) // Index - Index(m000(), 0) - CH06(arg0, 54, 47) - - Index("0", m000()) - CH06(arg0, 55, 47) - Index(m000(), 0, Local1) CH06(arg0, 56, 47) @@ -1318,68 +985,62 @@ Method(m4ba) // LEqual - LEqual(m000(), i000) + Store (LEqual(m000(), i000), Local1) CH06(arg0, 58, 47) - LEqual(i000, m000()) + Store (LEqual(i000, m000()), Local1) CH06(arg0, 59, 47) // LGreater - LGreater(m000(), i000) + Store (LGreater(m000(), i000), Local1) CH06(arg0, 60, 47) - LGreater(i000, m000()) + Store (LGreater(i000, m000()), Local1) CH06(arg0, 61, 47) // LGreaterEqual - LGreaterEqual(m000(), i000) + Store (LGreaterEqual(m000(), i000), Local1) CH06(arg0, 62, 0xff) - LGreaterEqual(i000, m000()) + Store (LGreaterEqual(i000, m000()), Local1) CH06(arg0, 63, 0xff) // LLess - LLess(m000(), i000) + Store (LLess(m000(), i000), Local1) CH06(arg0, 64, 47) - LLess(i000, m000()) + Store (LLess(i000, m000()), Local1) CH06(arg0, 65, 47) // LLessEqual - LLessEqual(m000(), i000) + Store (LLessEqual(m000(), i000), Local1) CH06(arg0, 66, 0xff) - LLessEqual(i000, m000()) + Store (LLessEqual(i000, m000()), Local1) CH06(arg0, 67, 0xff) // LNotEqual - LNotEqual(m000(), i000) + Store (LNotEqual(m000(), i000), Local1) CH06(arg0, 68, 0xff) - LNotEqual(i000, m000()) + Store (LNotEqual(i000, m000()), Local1) CH06(arg0, 69, 0xff) // LOr - LOr(m000(), i000) + Store (LOr(m000(), i000), Local1) CH06(arg0, 70, 47) - LOr(i000, m000()) + Store (LOr(i000, m000()), Local1) CH06(arg0, 71, 47) // Mod - Mod(m000(), i000) - CH06(arg0, 72, 47) - - Mod(i000, m000()) - CH06(arg0, 73, 47) - Mod(m000(), i000, Local1) CH06(arg0, 74, 47) @@ -1388,12 +1049,6 @@ Method(m4ba) // Multiply - Multiply(m000(), i000) - CH06(arg0, 76, 47) - - Multiply(i000, m000()) - CH06(arg0, 77, 47) - Multiply(m000(), i000, Local1) CH06(arg0, 78, 47) @@ -1402,12 +1057,6 @@ Method(m4ba) // NAnd - NAnd(m000(), i000) - CH06(arg0, 80, 47) - - NAnd(i000, m000()) - CH06(arg0, 81, 47) - NAnd(m000(), i000, Local1) CH06(arg0, 82, 47) @@ -1416,12 +1065,6 @@ Method(m4ba) // NOr - NOr(m000(), i000) - CH06(arg0, 84, 47) - - NOr(i000, m000()) - CH06(arg0, 85, 47) - NOr(m000(), i000, Local1) CH06(arg0, 86, 47) @@ -1430,12 +1073,6 @@ Method(m4ba) // Or - Or(m000(), i000) - CH06(arg0, 88, 47) - - Or(i000, m000()) - CH06(arg0, 89, 47) - Or(m000(), i000, Local1) CH06(arg0, 90, 47) @@ -1444,12 +1081,6 @@ Method(m4ba) // ShiftLeft - ShiftLeft(m000(), i000) - CH06(arg0, 92, 47) - - ShiftLeft(i000, m000()) - CH06(arg0, 93, 47) - ShiftLeft(m000(), i000, Local1) CH06(arg0, 94, 47) @@ -1458,12 +1089,6 @@ Method(m4ba) // ShiftRight - ShiftRight(m000(), i000) - CH06(arg0, 96, 47) - - ShiftRight(i000, m000()) - CH06(arg0, 97, 47) - ShiftRight(m000(), i000, Local1) CH06(arg0, 98, 47) @@ -1472,12 +1097,6 @@ Method(m4ba) // Subtract - Subtract(m000(), i000) - CH06(arg0, 100, 47) - - Subtract(i000, m000()) - CH06(arg0, 101, 47) - Subtract(m000(), i000, Local1) CH06(arg0, 102, 47) @@ -1486,12 +1105,6 @@ Method(m4ba) // ToString - ToString(m000(), 1) - CH06(arg0, 104, 47) - - ToString(i000, m000()) - CH06(arg0, 105, 47) - ToString(m000(), 1, Local1) CH06(arg0, 106, 47) @@ -1500,20 +1113,14 @@ Method(m4ba) // Wait - Wait(m000(), i000) + Store(Wait(m000(), i000), Local1) CH06(arg0, 108, 47) - Wait(e000, m000()) + Store(Wait(e000, m000()), Local1) CH06(arg0, 109, 47) // XOr - XOr(m000(), i000) - CH06(arg0, 110, 47) - - XOr(i000, m000()) - CH06(arg0, 111, 47) - XOr(m000(), i000, Local1) CH06(arg0, 112, 47) @@ -1522,15 +1129,6 @@ Method(m4ba) // Mid - Mid(m000(), 1, 1) - CH06(arg0, 114, 47) - - Mid("123", m000(), 1) - CH06(arg0, 115, 47) - - Mid("123", 1, m000()) - CH06(arg0, 116, 47) - Mid(m000(), 1, 1, Local1) CH06(arg0, 117, 47) @@ -1542,16 +1140,16 @@ Method(m4ba) // Match - Match(m000(), MTR, 0, MTR, 0, 0) + Store (Match(m000(), MTR, 0, MTR, 0, 0), Local1) CH06(arg0, 120, 47) - Match(Package(){1}, MTR, m000(), MTR, 0, 0) + Store (Match(Package(){1}, MTR, m000(), MTR, 0, 0), Local1) CH06(arg0, 121, 47) - Match(Package(){1}, MTR, 0, MTR, m000(), 0) + Store (Match(Package(){1}, MTR, 0, MTR, m000(), 0), Local1) CH06(arg0, 122, 47) - Match(Package(){1}, MTR, 0, MTR, 0, m000()) + Store (Match(Package(){1}, MTR, 0, MTR, 0, m000()), Local1) CH06(arg0, 123, 47) } @@ -1588,19 +1186,19 @@ Method(m4ba) Store(0, i000) - DerefOf(m000(1, lpC0)) + Store (DerefOf(m000(1, lpC0)), Local1) CH03(ts, z102, Add(9, lpC0), 0, 0) CH00(arg0, 1) - DerefOf(DerefOf(m000(2, lpC0))) + Store (DerefOf(DerefOf(m000(2, lpC0))), Local1) CH06(arg0, Add(1, Local0), 47) CH00(arg0, 2) - Index(DerefOf(m000(3, lpC0)), 0) + Store (Index(DerefOf(m000(3, lpC0)), 0), Local1) CH06(arg0, Add(2, Local0), 47) CH00(arg0, 3) - Match(DerefOf(m000(4, lpC0)), MTR, 0, MTR, 0, 0) + Store (Match(DerefOf(m000(4, lpC0)), MTR, 0, MTR, 0, 0), Local1) CH06(arg0, Add(3, Local0), 47) CH00(arg0, 4) 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 cc1000125..378598015 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 @@ -56,7 +56,7 @@ Method(m4bb) PowerResource(pw02, 1, 0) {Method(m000){return (0)}} if (y083) { - DerefOf(pw02) + Store (DerefOf(pw02), Local1) CH06(arg0, 0, 47) } } @@ -65,7 +65,7 @@ Method(m4bb) Method(m001, 1) { if (y083) { - DerefOf(pw00) + Store (DerefOf(pw00), Local1) CH06(arg0, 1, 47) } } @@ -81,9 +81,6 @@ Method(m4bb) // CondRefOf - CondRefOf(Local0) - CH03(ts, z103, 0, 0, 0) - CondRefOf(Local0, Local1) CH03(ts, z103, 1, 0, 0) @@ -99,30 +96,21 @@ Method(m4bb) // DerefOf - DerefOf(Local0) + Store (DerefOf(Local0), Local1) CH06(arg0, 2, 47) // FindSetLeftBit - FindSetLeftBit(Local0) - CH06(arg0, 3, 47) - FindSetLeftBit(Local0, Local1) CH06(arg0, 4, 47) // FindSetRightBit - FindSetRightBit(Local0) - CH06(arg0, 5, 47) - FindSetRightBit(Local0, Local1) CH06(arg0, 6, 47) // FromBCD - FromBCD(Local0) - CH06(arg0, 7, 47) - FromBCD(Local0, Local1) CH06(arg0, 8, 47) @@ -133,25 +121,22 @@ Method(m4bb) // LNot - LNot(Local0) + Store (LNot(Local0), Local1) CH06(arg0, 10, 47) // Not - Not(Local0) - CH06(arg0, 11, 47) - Not(Local0, Local1) CH06(arg0, 12, 47) // ObjectType - ObjectType(Local0) + Store (ObjectType(Local0), Local1) CH03(ts, z103, 3, 0, 0) // RefOf - RefOf(Local0) + Store (RefOf(Local0), Local1) CH03(ts, z103, 4, 0, 0) // Release @@ -171,7 +156,7 @@ Method(m4bb) // SizeOf - SizeOf(Local0) + Store (SizeOf(Local0), Local1) CH06(arg0, 16, 47) // Sleep @@ -191,57 +176,36 @@ Method(m4bb) // ToBCD - ToBCD(Local0) - CH06(arg0, 20, 47) - ToBCD(Local0, Local1) CH06(arg0, 21, 47) // ToBuffer - ToBuffer(Local0) - CH06(arg0, 22, 47) - ToBuffer(Local0, Local1) CH06(arg0, 23, 47) // ToDecimalString - ToDecimalString(Local0) - CH06(arg0, 24, 47) - ToDecimalString(Local0, Local1) CH06(arg0, 25, 47) // ToHexString - ToHexString(Local0) - CH06(arg0, 26, 47) - ToHexString(Local0, Local1) CH06(arg0, 27, 47) // ToInteger - ToInteger(Local0) - CH06(arg0, 28, 47) - ToInteger(Local0, Local1) CH06(arg0, 29, 47) // Acquire - Acquire(Local0, 100) + Store(Acquire(Local0, 100), Local1) CH06(arg0, 30, 47) // Add - Add(Local0, i000) - CH06(arg0, 31, 47) - - Add(i000, Local0) - CH06(arg0, 32, 47) - Add(Local0, i000, Local1) CH06(arg0, 33, 47) @@ -250,12 +214,6 @@ Method(m4bb) // And - And(Local0, i000) - CH06(arg0, 35, 47) - - And(i000, Local0) - CH06(arg0, 36, 47) - And(Local0, i000, Local1) CH06(arg0, 37, 47) @@ -264,12 +222,6 @@ Method(m4bb) // Concatenate - Concatenate(Local0, i000) - CH06(arg0, 39, 47) - - Concatenate(i000, Local0) - CH06(arg0, 40, 47) - Concatenate(Local0, i000, Local1) CH06(arg0, 41, 47) @@ -278,12 +230,6 @@ Method(m4bb) // ConcatenateResTemplate - ConcatenateResTemplate(Local0, ResourceTemplate(){}) - CH06(arg0, 43, 47) - - ConcatenateResTemplate(ResourceTemplate(){}, Local0) - CH06(arg0, 44, 47) - ConcatenateResTemplate(Local0, ResourceTemplate(){}, Local1) CH06(arg0, 45, 47) @@ -292,12 +238,6 @@ Method(m4bb) // Divide - Divide(Local0, i000) - CH06(arg0, 47, 47) - - Divide(i000, Local0) - CH06(arg0, 48, 47) - Divide(Local0, i000, Local2) CH06(arg0, 49, 47) @@ -317,12 +257,6 @@ Method(m4bb) // Index - Index(Local0, 0) - CH06(arg0, 54, 47) - - Index("0", Local0) - CH06(arg0, 55, 47) - Index(Local0, 0, Local1) CH06(arg0, 56, 47) @@ -331,68 +265,62 @@ Method(m4bb) // LEqual - LEqual(Local0, i000) + Store (LEqual(Local0, i000), Local1) CH06(arg0, 58, 47) - LEqual(i000, Local0) + Store (LEqual(i000, Local0), Local1) CH06(arg0, 59, 47) // LGreater - LGreater(Local0, i000) + Store (LGreater(Local0, i000), Local1) CH06(arg0, 60, 47) - LGreater(i000, Local0) + Store (LGreater(i000, Local0), Local1) CH06(arg0, 61, 47) // LGreaterEqual - LGreaterEqual(Local0, i000) + Store (LGreaterEqual(Local0, i000), Local1) CH06(arg0, 62, 0xff) - LGreaterEqual(i000, Local0) + Store (LGreaterEqual(i000, Local0), Local1) CH06(arg0, 63, 0xff) // LLess - LLess(Local0, i000) + Store (LLess(Local0, i000), Local1) CH06(arg0, 64, 47) - LLess(i000, Local0) + Store (LLess(i000, Local0), Local1) CH06(arg0, 65, 47) // LLessEqual - LLessEqual(Local0, i000) + Store (LLessEqual(Local0, i000), Local1) CH06(arg0, 66, 0xff) - LLessEqual(i000, Local0) + Store (LLessEqual(i000, Local0), Local1) CH06(arg0, 67, 0xff) // LNotEqual - LNotEqual(Local0, i000) + Store (LNotEqual(Local0, i000), Local1) CH06(arg0, 68, 0xff) - LNotEqual(i000, Local0) + Store (LNotEqual(i000, Local0), Local1) CH06(arg0, 69, 0xff) // LOr - LOr(Local0, i000) + Store (LOr(Local0, i000), Local1) CH06(arg0, 70, 47) - LOr(i000, Local0) + Store (LOr(i000, Local0), Local1) CH06(arg0, 71, 47) // Mod - Mod(Local0, i000) - CH06(arg0, 72, 47) - - Mod(i000, Local0) - CH06(arg0, 73, 47) - Mod(Local0, i000, Local1) CH06(arg0, 74, 47) @@ -401,12 +329,6 @@ Method(m4bb) // Multiply - Multiply(Local0, i000) - CH06(arg0, 76, 47) - - Multiply(i000, Local0) - CH06(arg0, 77, 47) - Multiply(Local0, i000, Local1) CH06(arg0, 78, 47) @@ -415,12 +337,6 @@ Method(m4bb) // NAnd - NAnd(Local0, i000) - CH06(arg0, 80, 47) - - NAnd(i000, Local0) - CH06(arg0, 81, 47) - NAnd(Local0, i000, Local1) CH06(arg0, 82, 47) @@ -429,12 +345,6 @@ Method(m4bb) // NOr - NOr(Local0, i000) - CH06(arg0, 84, 47) - - NOr(i000, Local0) - CH06(arg0, 85, 47) - NOr(Local0, i000, Local1) CH06(arg0, 86, 47) @@ -443,12 +353,6 @@ Method(m4bb) // Or - Or(Local0, i000) - CH06(arg0, 88, 47) - - Or(i000, Local0) - CH06(arg0, 89, 47) - Or(Local0, i000, Local1) CH06(arg0, 90, 47) @@ -457,12 +361,6 @@ Method(m4bb) // ShiftLeft - ShiftLeft(Local0, i000) - CH06(arg0, 92, 47) - - ShiftLeft(i000, Local0) - CH06(arg0, 93, 47) - ShiftLeft(Local0, i000, Local1) CH06(arg0, 94, 47) @@ -471,12 +369,6 @@ Method(m4bb) // ShiftRight - ShiftRight(Local0, i000) - CH06(arg0, 96, 47) - - ShiftRight(i000, Local0) - CH06(arg0, 97, 47) - ShiftRight(Local0, i000, Local1) CH06(arg0, 98, 47) @@ -485,12 +377,6 @@ Method(m4bb) // Subtract - Subtract(Local0, i000) - CH06(arg0, 100, 47) - - Subtract(i000, Local0) - CH06(arg0, 101, 47) - Subtract(Local0, i000, Local1) CH06(arg0, 102, 47) @@ -499,12 +385,6 @@ Method(m4bb) // ToString - ToString(Local0, 1) - CH06(arg0, 104, 47) - - ToString(i000, Local0) - CH06(arg0, 105, 47) - ToString(Local0, 1, Local1) CH06(arg0, 106, 47) @@ -513,20 +393,14 @@ Method(m4bb) // Wait - Wait(Local0, i000) + Store(Wait(Local0, i000), Local1) CH06(arg0, 108, 47) - Wait(e000, Local0) + Store(Wait(e000, Local0), Local1) CH06(arg0, 109, 47) // XOr - XOr(Local0, i000) - CH06(arg0, 110, 47) - - XOr(i000, Local0) - CH06(arg0, 111, 47) - XOr(Local0, i000, Local1) CH06(arg0, 112, 47) @@ -535,15 +409,6 @@ Method(m4bb) // Mid - Mid(Local0, 1, 1) - CH06(arg0, 114, 47) - - Mid("123", Local0, 1) - CH06(arg0, 115, 47) - - Mid("123", 1, Local0) - CH06(arg0, 116, 47) - Mid(Local0, 1, 1, Local1) CH06(arg0, 117, 47) @@ -555,16 +420,16 @@ Method(m4bb) // Match - Match(Local0, MTR, 0, MTR, 0, 0) + Store (Match(Local0, MTR, 0, MTR, 0, 0), Local1) CH06(arg0, 120, 47) - Match(Package(){1}, MTR, Local0, MTR, 0, 0) + Store (Match(Package(){1}, MTR, Local0, MTR, 0, 0), Local1) CH06(arg0, 121, 47) - Match(Package(){1}, MTR, 0, MTR, Local0, 0) + Store (Match(Package(){1}, MTR, 0, MTR, Local0, 0), Local1) CH06(arg0, 122, 47) - Match(Package(){1}, MTR, 0, MTR, 0, Local0) + Store (Match(Package(){1}, MTR, 0, MTR, 0, Local0), Local1) CH06(arg0, 123, 47) } @@ -577,14 +442,11 @@ Method(m4bb) return (1) } - DeRefOf(arg1) + Store (DeRefOf(arg1), Local1) CH03(ts, z103, 5, 0, 0) // CondRefOf - CondRefOf(DeRefOf(arg1)) - CH06(arg0, 0, 47) - CondRefOf(DeRefOf(arg1), Local1) CH06(arg0, 1, 47) @@ -600,30 +462,21 @@ Method(m4bb) // DerefOf - DerefOf(DeRefOf(arg1)) + Store (DerefOf(DeRefOf(arg1)), Local1) CH06(arg0, 4, 47) // FindSetLeftBit - FindSetLeftBit(DeRefOf(arg1)) - CH06(arg0, 5, 47) - FindSetLeftBit(DeRefOf(arg1), Local1) CH06(arg0, 6, 47) // FindSetRightBit - FindSetRightBit(DeRefOf(arg1)) - CH06(arg0, 7, 47) - FindSetRightBit(DeRefOf(arg1), Local1) CH06(arg0, 8, 47) // FromBCD - FromBCD(DeRefOf(arg1)) - CH06(arg0, 9, 47) - FromBCD(DeRefOf(arg1), Local1) CH06(arg0, 10, 47) @@ -634,25 +487,22 @@ Method(m4bb) // LNot - LNot(DeRefOf(arg1)) + Store (LNot(DeRefOf(arg1)), Local1) CH06(arg0, 12, 47) // Not - Not(DeRefOf(arg1)) - CH06(arg0, 13, 47) - Not(DeRefOf(arg1), Local1) CH06(arg0, 14, 47) // ObjectType - ObjectType(DeRefOf(arg1)) + Store (ObjectType(DeRefOf(arg1)), Local1) CH03(ts, z103, 6, 0, 0) // RefOf - RefOf(DeRefOf(arg1)) + Store (RefOf(DeRefOf(arg1)), Local1) CH06(arg0, 15, 47) // Release @@ -663,7 +513,7 @@ Method(m4bb) // SizeOf - SizeOf(DeRefOf(arg1)) + Store (SizeOf(DeRefOf(arg1)), Local1) CH06(arg0, 16, 47) // Sleep @@ -683,41 +533,26 @@ Method(m4bb) // ToBCD - ToBCD(DeRefOf(arg1)) - CH06(arg0, 20, 47) - ToBCD(DeRefOf(arg1), Local1) CH06(arg0, 21, 47) // ToBuffer - ToBuffer(DeRefOf(arg1)) - CH06(arg0, 22, 47) - ToBuffer(DeRefOf(arg1), Local1) CH06(arg0, 23, 47) // ToDecimalString - ToDecimalString(DeRefOf(arg1)) - CH06(arg0, 24, 47) - ToDecimalString(DeRefOf(arg1), Local1) CH06(arg0, 25, 47) // ToHexString - ToHexString(DeRefOf(arg1)) - CH06(arg0, 26, 47) - ToHexString(DeRefOf(arg1), Local1) CH06(arg0, 27, 47) // ToInteger - ToInteger(DeRefOf(arg1)) - CH06(arg0, 28, 47) - ToInteger(DeRefOf(arg1), Local1) CH06(arg0, 29, 47) @@ -725,12 +560,6 @@ Method(m4bb) // Add - Add(DeRefOf(arg1), i000) - CH06(arg0, 31, 47) - - Add(i000, DeRefOf(arg1)) - CH06(arg0, 32, 47) - Add(DeRefOf(arg1), i000, Local1) CH06(arg0, 33, 47) @@ -739,12 +568,6 @@ Method(m4bb) // And - And(DeRefOf(arg1), i000) - CH06(arg0, 35, 47) - - And(i000, DeRefOf(arg1)) - CH06(arg0, 36, 47) - And(DeRefOf(arg1), i000, Local1) CH06(arg0, 37, 47) @@ -753,12 +576,6 @@ Method(m4bb) // Concatenate - Concatenate(DeRefOf(arg1), i000) - CH06(arg0, 39, 47) - - Concatenate(i000, DeRefOf(arg1)) - CH06(arg0, 40, 47) - Concatenate(DeRefOf(arg1), i000, Local1) CH06(arg0, 41, 47) @@ -767,12 +584,6 @@ Method(m4bb) // ConcatenateResTemplate - ConcatenateResTemplate(DeRefOf(arg1), ResourceTemplate(){}) - CH06(arg0, 43, 47) - - ConcatenateResTemplate(ResourceTemplate(){}, DeRefOf(arg1)) - CH06(arg0, 44, 47) - ConcatenateResTemplate(DeRefOf(arg1), ResourceTemplate(){}, Local1) CH06(arg0, 45, 47) @@ -781,12 +592,6 @@ Method(m4bb) // Divide - Divide(DeRefOf(arg1), i000) - CH06(arg0, 47, 47) - - Divide(i000, DeRefOf(arg1)) - CH06(arg0, 48, 47) - Divide(DeRefOf(arg1), i000, Local2) CH06(arg0, 49, 47) @@ -806,12 +611,6 @@ Method(m4bb) // Index - Index(DeRefOf(arg1), 0) - CH06(arg0, 54, 47) - - Index("0", DeRefOf(arg1)) - CH06(arg0, 55, 47) - Index(DeRefOf(arg1), 0, Local1) CH06(arg0, 56, 47) @@ -820,68 +619,62 @@ Method(m4bb) // LEqual - LEqual(DeRefOf(arg1), i000) + Store (LEqual(DeRefOf(arg1), i000), Local1) CH06(arg0, 58, 47) - LEqual(i000, DeRefOf(arg1)) + Store (LEqual(i000, DeRefOf(arg1)), Local1) CH06(arg0, 59, 47) // LGreater - LGreater(DeRefOf(arg1), i000) + Store (LGreater(DeRefOf(arg1), i000), Local1) CH06(arg0, 60, 47) - LGreater(i000, DeRefOf(arg1)) + Store (LGreater(i000, DeRefOf(arg1)), Local1) CH06(arg0, 61, 47) // LGreaterEqual - LGreaterEqual(DeRefOf(arg1), i000) + Store (LGreaterEqual(DeRefOf(arg1), i000), Local1) CH06(arg0, 62, 0xff) - LGreaterEqual(i000, DeRefOf(arg1)) + Store (LGreaterEqual(i000, DeRefOf(arg1)), Local1) CH06(arg0, 63, 0xff) // LLess - LLess(DeRefOf(arg1), i000) + Store (LLess(DeRefOf(arg1), i000), Local1) CH06(arg0, 64, 47) - LLess(i000, DeRefOf(arg1)) + Store (LLess(i000, DeRefOf(arg1)), Local1) CH06(arg0, 65, 47) // LLessEqual - LLessEqual(DeRefOf(arg1), i000) + Store (LLessEqual(DeRefOf(arg1), i000), Local1) CH06(arg0, 66, 0xff) - LLessEqual(i000, DeRefOf(arg1)) + Store (LLessEqual(i000, DeRefOf(arg1)), Local1) CH06(arg0, 67, 0xff) // LNotEqual - LNotEqual(DeRefOf(arg1), i000) + Store (LNotEqual(DeRefOf(arg1), i000), Local1) CH06(arg0, 68, 0xff) - LNotEqual(i000, DeRefOf(arg1)) + Store (LNotEqual(i000, DeRefOf(arg1)), Local1) CH06(arg0, 69, 0xff) // LOr - LOr(DeRefOf(arg1), i000) + Store (LOr(DeRefOf(arg1), i000), Local1) CH06(arg0, 70, 47) - LOr(i000, DeRefOf(arg1)) + Store (LOr(i000, DeRefOf(arg1)), Local1) CH06(arg0, 71, 47) // Mod - Mod(DeRefOf(arg1), i000) - CH06(arg0, 72, 47) - - Mod(i000, DeRefOf(arg1)) - CH06(arg0, 73, 47) - Mod(DeRefOf(arg1), i000, Local1) CH06(arg0, 74, 47) @@ -890,12 +683,6 @@ Method(m4bb) // Multiply - Multiply(DeRefOf(arg1), i000) - CH06(arg0, 76, 47) - - Multiply(i000, DeRefOf(arg1)) - CH06(arg0, 77, 47) - Multiply(DeRefOf(arg1), i000, Local1) CH06(arg0, 78, 47) @@ -904,12 +691,6 @@ Method(m4bb) // NAnd - NAnd(DeRefOf(arg1), i000) - CH06(arg0, 80, 47) - - NAnd(i000, DeRefOf(arg1)) - CH06(arg0, 81, 47) - NAnd(DeRefOf(arg1), i000, Local1) CH06(arg0, 82, 47) @@ -918,12 +699,6 @@ Method(m4bb) // NOr - NOr(DeRefOf(arg1), i000) - CH06(arg0, 84, 47) - - NOr(i000, DeRefOf(arg1)) - CH06(arg0, 85, 47) - NOr(DeRefOf(arg1), i000, Local1) CH06(arg0, 86, 47) @@ -932,12 +707,6 @@ Method(m4bb) // Or - Or(DeRefOf(arg1), i000) - CH06(arg0, 88, 47) - - Or(i000, DeRefOf(arg1)) - CH06(arg0, 89, 47) - Or(DeRefOf(arg1), i000, Local1) CH06(arg0, 90, 47) @@ -946,12 +715,6 @@ Method(m4bb) // ShiftLeft - ShiftLeft(DeRefOf(arg1), i000) - CH06(arg0, 92, 47) - - ShiftLeft(i000, DeRefOf(arg1)) - CH06(arg0, 93, 47) - ShiftLeft(DeRefOf(arg1), i000, Local1) CH06(arg0, 94, 47) @@ -960,12 +723,6 @@ Method(m4bb) // ShiftRight - ShiftRight(DeRefOf(arg1), i000) - CH06(arg0, 96, 47) - - ShiftRight(i000, DeRefOf(arg1)) - CH06(arg0, 97, 47) - ShiftRight(DeRefOf(arg1), i000, Local1) CH06(arg0, 98, 47) @@ -974,12 +731,6 @@ Method(m4bb) // Subtract - Subtract(DeRefOf(arg1), i000) - CH06(arg0, 100, 47) - - Subtract(i000, DeRefOf(arg1)) - CH06(arg0, 101, 47) - Subtract(DeRefOf(arg1), i000, Local1) CH06(arg0, 102, 47) @@ -988,12 +739,6 @@ Method(m4bb) // ToString - ToString(DeRefOf(arg1), 1) - CH06(arg0, 104, 47) - - ToString(i000, DeRefOf(arg1)) - CH06(arg0, 105, 47) - ToString(DeRefOf(arg1), 1, Local1) CH06(arg0, 106, 47) @@ -1002,17 +747,11 @@ Method(m4bb) // Wait - Wait(e000, DeRefOf(arg1)) + Store(Wait(e000, DeRefOf(arg1)), Local1) CH06(arg0, 109, 47) // XOr - XOr(DeRefOf(arg1), i000) - CH06(arg0, 110, 47) - - XOr(i000, DeRefOf(arg1)) - CH06(arg0, 111, 47) - XOr(DeRefOf(arg1), i000, Local1) CH06(arg0, 112, 47) @@ -1021,15 +760,6 @@ Method(m4bb) // Mid - Mid(DeRefOf(arg1), 1, 1) - CH06(arg0, 114, 47) - - Mid("123", DeRefOf(arg1), 1) - CH06(arg0, 115, 47) - - Mid("123", 1, DeRefOf(arg1)) - CH06(arg0, 116, 47) - Mid(DeRefOf(arg1), 1, 1, Local1) CH06(arg0, 117, 47) @@ -1041,16 +771,16 @@ Method(m4bb) // Match - Match(DeRefOf(arg1), MTR, 0, MTR, 0, 0) + Store (Match(DeRefOf(arg1), MTR, 0, MTR, 0, 0), Local1) CH06(arg0, 120, 47) - Match(Package(){1}, MTR, DeRefOf(arg1), MTR, 0, 0) + Store (Match(Package(){1}, MTR, DeRefOf(arg1), MTR, 0, 0), Local1) CH06(arg0, 121, 47) - Match(Package(){1}, MTR, 0, MTR, DeRefOf(arg1), 0) + Store (Match(Package(){1}, MTR, 0, MTR, DeRefOf(arg1), 0), Local1) CH06(arg0, 122, 47) - Match(Package(){1}, MTR, 0, MTR, 0, DeRefOf(arg1)) + Store (Match(Package(){1}, MTR, 0, MTR, 0, DeRefOf(arg1)), Local1) CH06(arg0, 123, 47) return (0) @@ -1070,10 +800,10 @@ Method(m4bb) // CondRefOf if (y601) { - CondRefOf(m000()) + Store (CondRefOf(m000()), Local1) CH06(arg0, 0, 47) - CondRefOf(m000(), Local1) + Store (CondRefOf(m000()), Local1) CH06(arg0, 1, 47) } @@ -1089,30 +819,21 @@ Method(m4bb) // DerefOf - DerefOf(m000()) + Store (DerefOf(m000()), Local1) CH06(arg0, 3, 47) // FindSetLeftBit - FindSetLeftBit(m000()) - CH06(arg0, 4, 47) - FindSetLeftBit(m000(), Local1) CH06(arg0, 5, 47) // FindSetRightBit - FindSetRightBit(m000()) - CH06(arg0, 6, 47) - FindSetRightBit(m000(), Local1) CH06(arg0, 7, 47) // FromBCD - FromBCD(m000()) - CH06(arg0, 8, 47) - FromBCD(m000(), Local1) CH06(arg0, 9, 47) @@ -1123,14 +844,11 @@ Method(m4bb) // LNot - LNot(m000()) + Store (LNot(m000()), Local1) CH06(arg0, 11, 47) // Not - Not(m000()) - CH06(arg0, 12, 47) - Not(m000(), Local1) CH06(arg0, 13, 47) @@ -1143,7 +861,7 @@ Method(m4bb) // RefOf if (y601) { - RefOf(m000()) + Store (RefOf(m000()), Local1) CH06(arg0, 14, 47) } @@ -1164,7 +882,7 @@ Method(m4bb) // SizeOf - SizeOf(m000()) + Store (SizeOf(m000()), Local1) CH06(arg0, 16, 47) // Sleep @@ -1184,57 +902,36 @@ Method(m4bb) // ToBCD - ToBCD(m000()) - CH06(arg0, 20, 47) - ToBCD(m000(), Local1) CH06(arg0, 21, 47) // ToBuffer - ToBuffer(m000()) - CH06(arg0, 22, 47) - ToBuffer(m000(), Local1) CH06(arg0, 23, 47) // ToDecimalString - ToDecimalString(m000()) - CH06(arg0, 24, 47) - ToDecimalString(m000(), Local1) CH06(arg0, 25, 47) // ToHexString - ToHexString(m000()) - CH06(arg0, 26, 47) - ToHexString(m000(), Local1) CH06(arg0, 27, 47) // ToInteger - ToInteger(m000()) - CH06(arg0, 28, 47) - ToInteger(m000(), Local1) CH06(arg0, 29, 47) // Acquire - Acquire(m000(), 100) + Store(Acquire(m000(), 100), Local1) CH06(arg0, 30, 47) // Add - Add(m000(), i000) - CH06(arg0, 31, 47) - - Add(i000, m000()) - CH06(arg0, 32, 47) - Add(m000(), i000, Local1) CH06(arg0, 33, 47) @@ -1243,12 +940,6 @@ Method(m4bb) // And - And(m000(), i000) - CH06(arg0, 35, 47) - - And(i000, m000()) - CH06(arg0, 36, 47) - And(m000(), i000, Local1) CH06(arg0, 37, 47) @@ -1257,12 +948,6 @@ Method(m4bb) // Concatenate - Concatenate(m000(), i000) - CH06(arg0, 39, 47) - - Concatenate(i000, m000()) - CH06(arg0, 40, 47) - Concatenate(m000(), i000, Local1) CH06(arg0, 41, 47) @@ -1271,12 +956,6 @@ Method(m4bb) // ConcatenateResTemplate - ConcatenateResTemplate(m000(), ResourceTemplate(){}) - CH06(arg0, 43, 47) - - ConcatenateResTemplate(ResourceTemplate(){}, m000()) - CH06(arg0, 44, 47) - ConcatenateResTemplate(m000(), ResourceTemplate(){}, Local1) CH06(arg0, 45, 47) @@ -1285,12 +964,6 @@ Method(m4bb) // Divide - Divide(m000(), i000) - CH06(arg0, 47, 47) - - Divide(i000, m000()) - CH06(arg0, 48, 47) - Divide(m000(), i000, Local2) CH06(arg0, 49, 47) @@ -1310,12 +983,6 @@ Method(m4bb) // Index - Index(m000(), 0) - CH06(arg0, 54, 47) - - Index("0", m000()) - CH06(arg0, 55, 47) - Index(m000(), 0, Local1) CH06(arg0, 56, 47) @@ -1324,68 +991,62 @@ Method(m4bb) // LEqual - LEqual(m000(), i000) + Store (LEqual(m000(), i000), Local1) CH06(arg0, 58, 47) - LEqual(i000, m000()) + Store (LEqual(i000, m000()), Local1) CH06(arg0, 59, 47) // LGreater - LGreater(m000(), i000) + Store (LGreater(m000(), i000), Local1) CH06(arg0, 60, 47) - LGreater(i000, m000()) + Store (LGreater(i000, m000()), Local1) CH06(arg0, 61, 47) // LGreaterEqual - LGreaterEqual(m000(), i000) + Store (LGreaterEqual(m000(), i000), Local1) CH06(arg0, 62, 0xff) - LGreaterEqual(i000, m000()) + Store (LGreaterEqual(i000, m000()), Local1) CH06(arg0, 63, 0xff) // LLess - LLess(m000(), i000) + Store (LLess(m000(), i000), Local1) CH06(arg0, 64, 47) - LLess(i000, m000()) + Store (LLess(i000, m000()), Local1) CH06(arg0, 65, 47) // LLessEqual - LLessEqual(m000(), i000) + Store (LLessEqual(m000(), i000), Local1) CH06(arg0, 66, 0xff) - LLessEqual(i000, m000()) + Store (LLessEqual(i000, m000()), Local1) CH06(arg0, 67, 0xff) // LNotEqual - LNotEqual(m000(), i000) + Store (LNotEqual(m000(), i000), Local1) CH06(arg0, 68, 0xff) - LNotEqual(i000, m000()) + Store (LNotEqual(i000, m000()), Local1) CH06(arg0, 69, 0xff) // LOr - LOr(m000(), i000) + Store (LOr(m000(), i000), Local1) CH06(arg0, 70, 47) - LOr(i000, m000()) + Store (LOr(i000, m000()), Local1) CH06(arg0, 71, 47) // Mod - Mod(m000(), i000) - CH06(arg0, 72, 47) - - Mod(i000, m000()) - CH06(arg0, 73, 47) - Mod(m000(), i000, Local1) CH06(arg0, 74, 47) @@ -1394,12 +1055,6 @@ Method(m4bb) // Multiply - Multiply(m000(), i000) - CH06(arg0, 76, 47) - - Multiply(i000, m000()) - CH06(arg0, 77, 47) - Multiply(m000(), i000, Local1) CH06(arg0, 78, 47) @@ -1408,12 +1063,6 @@ Method(m4bb) // NAnd - NAnd(m000(), i000) - CH06(arg0, 80, 47) - - NAnd(i000, m000()) - CH06(arg0, 81, 47) - NAnd(m000(), i000, Local1) CH06(arg0, 82, 47) @@ -1422,12 +1071,6 @@ Method(m4bb) // NOr - NOr(m000(), i000) - CH06(arg0, 84, 47) - - NOr(i000, m000()) - CH06(arg0, 85, 47) - NOr(m000(), i000, Local1) CH06(arg0, 86, 47) @@ -1436,12 +1079,6 @@ Method(m4bb) // Or - Or(m000(), i000) - CH06(arg0, 88, 47) - - Or(i000, m000()) - CH06(arg0, 89, 47) - Or(m000(), i000, Local1) CH06(arg0, 90, 47) @@ -1450,12 +1087,6 @@ Method(m4bb) // ShiftLeft - ShiftLeft(m000(), i000) - CH06(arg0, 92, 47) - - ShiftLeft(i000, m000()) - CH06(arg0, 93, 47) - ShiftLeft(m000(), i000, Local1) CH06(arg0, 94, 47) @@ -1464,12 +1095,6 @@ Method(m4bb) // ShiftRight - ShiftRight(m000(), i000) - CH06(arg0, 96, 47) - - ShiftRight(i000, m000()) - CH06(arg0, 97, 47) - ShiftRight(m000(), i000, Local1) CH06(arg0, 98, 47) @@ -1478,12 +1103,6 @@ Method(m4bb) // Subtract - Subtract(m000(), i000) - CH06(arg0, 100, 47) - - Subtract(i000, m000()) - CH06(arg0, 101, 47) - Subtract(m000(), i000, Local1) CH06(arg0, 102, 47) @@ -1492,12 +1111,6 @@ Method(m4bb) // ToString - ToString(m000(), 1) - CH06(arg0, 104, 47) - - ToString(i000, m000()) - CH06(arg0, 105, 47) - ToString(m000(), 1, Local1) CH06(arg0, 106, 47) @@ -1506,20 +1119,14 @@ Method(m4bb) // Wait - Wait(m000(), i000) + Store(Wait(m000(), i000), Local1) CH06(arg0, 108, 47) - Wait(e000, m000()) + Store(Wait(e000, m000()), Local1) CH06(arg0, 109, 47) // XOr - XOr(m000(), i000) - CH06(arg0, 110, 47) - - XOr(i000, m000()) - CH06(arg0, 111, 47) - XOr(m000(), i000, Local1) CH06(arg0, 112, 47) @@ -1528,15 +1135,6 @@ Method(m4bb) // Mid - Mid(m000(), 1, 1) - CH06(arg0, 114, 47) - - Mid("123", m000(), 1) - CH06(arg0, 115, 47) - - Mid("123", 1, m000()) - CH06(arg0, 116, 47) - Mid(m000(), 1, 1, Local1) CH06(arg0, 117, 47) @@ -1548,16 +1146,16 @@ Method(m4bb) // Match - Match(m000(), MTR, 0, MTR, 0, 0) + Store (Match(m000(), MTR, 0, MTR, 0, 0), Local1) CH06(arg0, 120, 47) - Match(Package(){1}, MTR, m000(), MTR, 0, 0) + Store (Match(Package(){1}, MTR, m000(), MTR, 0, 0), Local1) CH06(arg0, 121, 47) - Match(Package(){1}, MTR, 0, MTR, m000(), 0) + Store (Match(Package(){1}, MTR, 0, MTR, m000(), 0), Local1) CH06(arg0, 122, 47) - Match(Package(){1}, MTR, 0, MTR, 0, m000()) + Store (Match(Package(){1}, MTR, 0, MTR, 0, m000()), Local1) CH06(arg0, 123, 47) } @@ -1594,19 +1192,19 @@ Method(m4bb) Store(0, i000) - DerefOf(m000(1, lpC0)) + Store (DerefOf(m000(1, lpC0)), Local1) CH03(ts, z103, Add(9, lpC0), 0, 0) CH00(arg0, 1) - DerefOf(DerefOf(m000(2, lpC0))) + Store (DerefOf(DerefOf(m000(2, lpC0))), Local1) CH06(arg0, Add(1, Local0), 47) CH00(arg0, 2) - Index(DerefOf(m000(3, lpC0)), 0) + Store (Index(DerefOf(m000(3, lpC0)), 0), Local1) CH06(arg0, Add(2, Local0), 47) CH00(arg0, 3) - Match(DerefOf(m000(4, lpC0)), MTR, 0, MTR, 0, 0) + Store (Match(DerefOf(m000(4, lpC0)), MTR, 0, MTR, 0, 0), Local1) CH06(arg0, Add(3, Local0), 47) CH00(arg0, 4) 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 4de19258d..69537d275 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 @@ -56,7 +56,7 @@ Method(m4bc) Processor(prc2, 0, 0xFFFFFFFF, 0) {} if (y083) { - DerefOf(prc2) + Store (DerefOf(prc2), Local1) CH06(arg0, 0, 47) } } @@ -65,7 +65,7 @@ Method(m4bc) Method(m001, 1) { if (y083) { - DerefOf(pr10) + Store (DerefOf(pr10), Local1) CH06(arg0, 1, 47) } } @@ -81,9 +81,6 @@ Method(m4bc) // CondRefOf - CondRefOf(Local0) - CH03(ts, z104, 0, 0, 0) - CondRefOf(Local0, Local1) CH03(ts, z104, 1, 0, 0) @@ -99,30 +96,21 @@ Method(m4bc) // DerefOf - DerefOf(Local0) + Store (DerefOf(Local0), Local1) CH06(arg0, 2, 47) // FindSetLeftBit - FindSetLeftBit(Local0) - CH06(arg0, 3, 47) - FindSetLeftBit(Local0, Local1) CH06(arg0, 4, 47) // FindSetRightBit - FindSetRightBit(Local0) - CH06(arg0, 5, 47) - FindSetRightBit(Local0, Local1) CH06(arg0, 6, 47) // FromBCD - FromBCD(Local0) - CH06(arg0, 7, 47) - FromBCD(Local0, Local1) CH06(arg0, 8, 47) @@ -133,25 +121,22 @@ Method(m4bc) // LNot - LNot(Local0) + Store (LNot(Local0), Local1) CH06(arg0, 10, 47) // Not - Not(Local0) - CH06(arg0, 11, 47) - Not(Local0, Local1) CH06(arg0, 12, 47) // ObjectType - ObjectType(Local0) + Store (ObjectType(Local0), Local1) CH03(ts, z104, 3, 0, 0) // RefOf - RefOf(Local0) + Store (RefOf(Local0), Local1) CH03(ts, z104, 4, 0, 0) // Release @@ -171,7 +156,7 @@ Method(m4bc) // SizeOf - SizeOf(Local0) + Store (SizeOf(Local0), Local1) CH06(arg0, 16, 47) // Sleep @@ -191,57 +176,36 @@ Method(m4bc) // ToBCD - ToBCD(Local0) - CH06(arg0, 20, 47) - ToBCD(Local0, Local1) CH06(arg0, 21, 47) // ToBuffer - ToBuffer(Local0) - CH06(arg0, 22, 47) - ToBuffer(Local0, Local1) CH06(arg0, 23, 47) // ToDecimalString - ToDecimalString(Local0) - CH06(arg0, 24, 47) - ToDecimalString(Local0, Local1) CH06(arg0, 25, 47) // ToHexString - ToHexString(Local0) - CH06(arg0, 26, 47) - ToHexString(Local0, Local1) CH06(arg0, 27, 47) // ToInteger - ToInteger(Local0) - CH06(arg0, 28, 47) - ToInteger(Local0, Local1) CH06(arg0, 29, 47) // Acquire - Acquire(Local0, 100) + Store(Acquire(Local0, 100), Local1) CH06(arg0, 30, 47) // Add - Add(Local0, i000) - CH06(arg0, 31, 47) - - Add(i000, Local0) - CH06(arg0, 32, 47) - Add(Local0, i000, Local1) CH06(arg0, 33, 47) @@ -250,12 +214,6 @@ Method(m4bc) // And - And(Local0, i000) - CH06(arg0, 35, 47) - - And(i000, Local0) - CH06(arg0, 36, 47) - And(Local0, i000, Local1) CH06(arg0, 37, 47) @@ -264,12 +222,6 @@ Method(m4bc) // Concatenate - Concatenate(Local0, i000) - CH06(arg0, 39, 47) - - Concatenate(i000, Local0) - CH06(arg0, 40, 47) - Concatenate(Local0, i000, Local1) CH06(arg0, 41, 47) @@ -278,12 +230,6 @@ Method(m4bc) // ConcatenateResTemplate - ConcatenateResTemplate(Local0, ResourceTemplate(){}) - CH06(arg0, 43, 47) - - ConcatenateResTemplate(ResourceTemplate(){}, Local0) - CH06(arg0, 44, 47) - ConcatenateResTemplate(Local0, ResourceTemplate(){}, Local1) CH06(arg0, 45, 47) @@ -292,12 +238,6 @@ Method(m4bc) // Divide - Divide(Local0, i000) - CH06(arg0, 47, 47) - - Divide(i000, Local0) - CH06(arg0, 48, 47) - Divide(Local0, i000, Local2) CH06(arg0, 49, 47) @@ -317,12 +257,6 @@ Method(m4bc) // Index - Index(Local0, 0) - CH06(arg0, 54, 47) - - Index("0", Local0) - CH06(arg0, 55, 47) - Index(Local0, 0, Local1) CH06(arg0, 56, 47) @@ -331,68 +265,62 @@ Method(m4bc) // LEqual - LEqual(Local0, i000) + Store (LEqual(Local0, i000), Local1) CH06(arg0, 58, 47) - LEqual(i000, Local0) + Store (LEqual(i000, Local0), Local1) CH06(arg0, 59, 47) // LGreater - LGreater(Local0, i000) + Store (LGreater(Local0, i000), Local1) CH06(arg0, 60, 47) - LGreater(i000, Local0) + Store (LGreater(i000, Local0), Local1) CH06(arg0, 61, 47) // LGreaterEqual - LGreaterEqual(Local0, i000) + Store (LGreaterEqual(Local0, i000), Local1) CH06(arg0, 62, 0xff) - LGreaterEqual(i000, Local0) + Store (LGreaterEqual(i000, Local0), Local1) CH06(arg0, 63, 0xff) // LLess - LLess(Local0, i000) + Store (LLess(Local0, i000), Local1) CH06(arg0, 64, 47) - LLess(i000, Local0) + Store (LLess(i000, Local0), Local1) CH06(arg0, 65, 47) // LLessEqual - LLessEqual(Local0, i000) + Store (LLessEqual(Local0, i000), Local1) CH06(arg0, 66, 0xff) - LLessEqual(i000, Local0) + Store (LLessEqual(i000, Local0), Local1) CH06(arg0, 67, 0xff) // LNotEqual - LNotEqual(Local0, i000) + Store (LNotEqual(Local0, i000), Local1) CH06(arg0, 68, 0xff) - LNotEqual(i000, Local0) + Store (LNotEqual(i000, Local0), Local1) CH06(arg0, 69, 0xff) // LOr - LOr(Local0, i000) + Store (LOr(Local0, i000), Local1) CH06(arg0, 70, 47) - LOr(i000, Local0) + Store (LOr(i000, Local0), Local1) CH06(arg0, 71, 47) // Mod - Mod(Local0, i000) - CH06(arg0, 72, 47) - - Mod(i000, Local0) - CH06(arg0, 73, 47) - Mod(Local0, i000, Local1) CH06(arg0, 74, 47) @@ -401,12 +329,6 @@ Method(m4bc) // Multiply - Multiply(Local0, i000) - CH06(arg0, 76, 47) - - Multiply(i000, Local0) - CH06(arg0, 77, 47) - Multiply(Local0, i000, Local1) CH06(arg0, 78, 47) @@ -415,12 +337,6 @@ Method(m4bc) // NAnd - NAnd(Local0, i000) - CH06(arg0, 80, 47) - - NAnd(i000, Local0) - CH06(arg0, 81, 47) - NAnd(Local0, i000, Local1) CH06(arg0, 82, 47) @@ -429,12 +345,6 @@ Method(m4bc) // NOr - NOr(Local0, i000) - CH06(arg0, 84, 47) - - NOr(i000, Local0) - CH06(arg0, 85, 47) - NOr(Local0, i000, Local1) CH06(arg0, 86, 47) @@ -443,12 +353,6 @@ Method(m4bc) // Or - Or(Local0, i000) - CH06(arg0, 88, 47) - - Or(i000, Local0) - CH06(arg0, 89, 47) - Or(Local0, i000, Local1) CH06(arg0, 90, 47) @@ -457,12 +361,6 @@ Method(m4bc) // ShiftLeft - ShiftLeft(Local0, i000) - CH06(arg0, 92, 47) - - ShiftLeft(i000, Local0) - CH06(arg0, 93, 47) - ShiftLeft(Local0, i000, Local1) CH06(arg0, 94, 47) @@ -471,12 +369,6 @@ Method(m4bc) // ShiftRight - ShiftRight(Local0, i000) - CH06(arg0, 96, 47) - - ShiftRight(i000, Local0) - CH06(arg0, 97, 47) - ShiftRight(Local0, i000, Local1) CH06(arg0, 98, 47) @@ -485,12 +377,6 @@ Method(m4bc) // Subtract - Subtract(Local0, i000) - CH06(arg0, 100, 47) - - Subtract(i000, Local0) - CH06(arg0, 101, 47) - Subtract(Local0, i000, Local1) CH06(arg0, 102, 47) @@ -499,12 +385,6 @@ Method(m4bc) // ToString - ToString(Local0, 1) - CH06(arg0, 104, 47) - - ToString(i000, Local0) - CH06(arg0, 105, 47) - ToString(Local0, 1, Local1) CH06(arg0, 106, 47) @@ -513,20 +393,14 @@ Method(m4bc) // Wait - Wait(Local0, i000) + Store(Wait(Local0, i000), Local1) CH06(arg0, 108, 47) - Wait(e000, Local0) + Store(Wait(e000, Local0), Local1) CH06(arg0, 109, 47) // XOr - XOr(Local0, i000) - CH06(arg0, 110, 47) - - XOr(i000, Local0) - CH06(arg0, 111, 47) - XOr(Local0, i000, Local1) CH06(arg0, 112, 47) @@ -535,15 +409,6 @@ Method(m4bc) // Mid - Mid(Local0, 1, 1) - CH06(arg0, 114, 47) - - Mid("123", Local0, 1) - CH06(arg0, 115, 47) - - Mid("123", 1, Local0) - CH06(arg0, 116, 47) - Mid(Local0, 1, 1, Local1) CH06(arg0, 117, 47) @@ -555,16 +420,16 @@ Method(m4bc) // Match - Match(Local0, MTR, 0, MTR, 0, 0) + Store (Match(Local0, MTR, 0, MTR, 0, 0), Local1) CH06(arg0, 120, 47) - Match(Package(){1}, MTR, Local0, MTR, 0, 0) + Store (Match(Package(){1}, MTR, Local0, MTR, 0, 0), Local1) CH06(arg0, 121, 47) - Match(Package(){1}, MTR, 0, MTR, Local0, 0) + Store (Match(Package(){1}, MTR, 0, MTR, Local0, 0), Local1) CH06(arg0, 122, 47) - Match(Package(){1}, MTR, 0, MTR, 0, Local0) + Store (Match(Package(){1}, MTR, 0, MTR, 0, Local0), Local1) CH06(arg0, 123, 47) } @@ -577,14 +442,11 @@ Method(m4bc) return (1) } - DeRefOf(arg1) + Store (DeRefOf(arg1), Local1) CH03(ts, z104, 5, 0, 0) // CondRefOf - CondRefOf(DeRefOf(arg1)) - CH06(arg0, 0, 47) - CondRefOf(DeRefOf(arg1), Local1) CH06(arg0, 1, 47) @@ -600,30 +462,21 @@ Method(m4bc) // DerefOf - DerefOf(DeRefOf(arg1)) + Store (DerefOf(DeRefOf(arg1)), Local1) CH06(arg0, 4, 47) // FindSetLeftBit - FindSetLeftBit(DeRefOf(arg1)) - CH06(arg0, 5, 47) - FindSetLeftBit(DeRefOf(arg1), Local1) CH06(arg0, 6, 47) // FindSetRightBit - FindSetRightBit(DeRefOf(arg1)) - CH06(arg0, 7, 47) - FindSetRightBit(DeRefOf(arg1), Local1) CH06(arg0, 8, 47) // FromBCD - FromBCD(DeRefOf(arg1)) - CH06(arg0, 9, 47) - FromBCD(DeRefOf(arg1), Local1) CH06(arg0, 10, 47) @@ -634,25 +487,22 @@ Method(m4bc) // LNot - LNot(DeRefOf(arg1)) + Store (LNot(DeRefOf(arg1)), Local1) CH06(arg0, 12, 47) // Not - Not(DeRefOf(arg1)) - CH06(arg0, 13, 47) - Not(DeRefOf(arg1), Local1) CH06(arg0, 14, 47) // ObjectType - ObjectType(DeRefOf(arg1)) + Store (ObjectType(DeRefOf(arg1)), Local1) CH03(ts, z104, 6, 0, 0) // RefOf - RefOf(DeRefOf(arg1)) + Store (RefOf(DeRefOf(arg1)), Local1) CH06(arg0, 15, 47) // Release @@ -663,7 +513,7 @@ Method(m4bc) // SizeOf - SizeOf(DeRefOf(arg1)) + Store (SizeOf(DeRefOf(arg1)), Local1) CH06(arg0, 16, 47) // Sleep @@ -683,41 +533,26 @@ Method(m4bc) // ToBCD - ToBCD(DeRefOf(arg1)) - CH06(arg0, 20, 47) - ToBCD(DeRefOf(arg1), Local1) CH06(arg0, 21, 47) // ToBuffer - ToBuffer(DeRefOf(arg1)) - CH06(arg0, 22, 47) - ToBuffer(DeRefOf(arg1), Local1) CH06(arg0, 23, 47) // ToDecimalString - ToDecimalString(DeRefOf(arg1)) - CH06(arg0, 24, 47) - ToDecimalString(DeRefOf(arg1), Local1) CH06(arg0, 25, 47) // ToHexString - ToHexString(DeRefOf(arg1)) - CH06(arg0, 26, 47) - ToHexString(DeRefOf(arg1), Local1) CH06(arg0, 27, 47) // ToInteger - ToInteger(DeRefOf(arg1)) - CH06(arg0, 28, 47) - ToInteger(DeRefOf(arg1), Local1) CH06(arg0, 29, 47) @@ -725,12 +560,6 @@ Method(m4bc) // Add - Add(DeRefOf(arg1), i000) - CH06(arg0, 31, 47) - - Add(i000, DeRefOf(arg1)) - CH06(arg0, 32, 47) - Add(DeRefOf(arg1), i000, Local1) CH06(arg0, 33, 47) @@ -739,12 +568,6 @@ Method(m4bc) // And - And(DeRefOf(arg1), i000) - CH06(arg0, 35, 47) - - And(i000, DeRefOf(arg1)) - CH06(arg0, 36, 47) - And(DeRefOf(arg1), i000, Local1) CH06(arg0, 37, 47) @@ -753,12 +576,6 @@ Method(m4bc) // Concatenate - Concatenate(DeRefOf(arg1), i000) - CH06(arg0, 39, 47) - - Concatenate(i000, DeRefOf(arg1)) - CH06(arg0, 40, 47) - Concatenate(DeRefOf(arg1), i000, Local1) CH06(arg0, 41, 47) @@ -767,12 +584,6 @@ Method(m4bc) // ConcatenateResTemplate - ConcatenateResTemplate(DeRefOf(arg1), ResourceTemplate(){}) - CH06(arg0, 43, 47) - - ConcatenateResTemplate(ResourceTemplate(){}, DeRefOf(arg1)) - CH06(arg0, 44, 47) - ConcatenateResTemplate(DeRefOf(arg1), ResourceTemplate(){}, Local1) CH06(arg0, 45, 47) @@ -781,12 +592,6 @@ Method(m4bc) // Divide - Divide(DeRefOf(arg1), i000) - CH06(arg0, 47, 47) - - Divide(i000, DeRefOf(arg1)) - CH06(arg0, 48, 47) - Divide(DeRefOf(arg1), i000, Local2) CH06(arg0, 49, 47) @@ -806,12 +611,6 @@ Method(m4bc) // Index - Index(DeRefOf(arg1), 0) - CH06(arg0, 54, 47) - - Index("0", DeRefOf(arg1)) - CH06(arg0, 55, 47) - Index(DeRefOf(arg1), 0, Local1) CH06(arg0, 56, 47) @@ -820,68 +619,62 @@ Method(m4bc) // LEqual - LEqual(DeRefOf(arg1), i000) + Store (LEqual(DeRefOf(arg1), i000), Local1) CH06(arg0, 58, 47) - LEqual(i000, DeRefOf(arg1)) + Store (LEqual(i000, DeRefOf(arg1)), Local1) CH06(arg0, 59, 47) // LGreater - LGreater(DeRefOf(arg1), i000) + Store (LGreater(DeRefOf(arg1), i000), Local1) CH06(arg0, 60, 47) - LGreater(i000, DeRefOf(arg1)) + Store (LGreater(i000, DeRefOf(arg1)), Local1) CH06(arg0, 61, 47) // LGreaterEqual - LGreaterEqual(DeRefOf(arg1), i000) + Store (LGreaterEqual(DeRefOf(arg1), i000), Local1) CH06(arg0, 62, 0xff) - LGreaterEqual(i000, DeRefOf(arg1)) + Store (LGreaterEqual(i000, DeRefOf(arg1)), Local1) CH06(arg0, 63, 0xff) // LLess - LLess(DeRefOf(arg1), i000) + Store (LLess(DeRefOf(arg1), i000), Local1) CH06(arg0, 64, 47) - LLess(i000, DeRefOf(arg1)) + Store (LLess(i000, DeRefOf(arg1)), Local1) CH06(arg0, 65, 47) // LLessEqual - LLessEqual(DeRefOf(arg1), i000) + Store (LLessEqual(DeRefOf(arg1), i000), Local1) CH06(arg0, 66, 0xff) - LLessEqual(i000, DeRefOf(arg1)) + Store (LLessEqual(i000, DeRefOf(arg1)), Local1) CH06(arg0, 67, 0xff) // LNotEqual - LNotEqual(DeRefOf(arg1), i000) + Store (LNotEqual(DeRefOf(arg1), i000), Local1) CH06(arg0, 68, 0xff) - LNotEqual(i000, DeRefOf(arg1)) + Store (LNotEqual(i000, DeRefOf(arg1)), Local1) CH06(arg0, 69, 0xff) // LOr - LOr(DeRefOf(arg1), i000) + Store (LOr(DeRefOf(arg1), i000), Local1) CH06(arg0, 70, 47) - LOr(i000, DeRefOf(arg1)) + Store (LOr(i000, DeRefOf(arg1)), Local1) CH06(arg0, 71, 47) // Mod - Mod(DeRefOf(arg1), i000) - CH06(arg0, 72, 47) - - Mod(i000, DeRefOf(arg1)) - CH06(arg0, 73, 47) - Mod(DeRefOf(arg1), i000, Local1) CH06(arg0, 74, 47) @@ -890,12 +683,6 @@ Method(m4bc) // Multiply - Multiply(DeRefOf(arg1), i000) - CH06(arg0, 76, 47) - - Multiply(i000, DeRefOf(arg1)) - CH06(arg0, 77, 47) - Multiply(DeRefOf(arg1), i000, Local1) CH06(arg0, 78, 47) @@ -904,12 +691,6 @@ Method(m4bc) // NAnd - NAnd(DeRefOf(arg1), i000) - CH06(arg0, 80, 47) - - NAnd(i000, DeRefOf(arg1)) - CH06(arg0, 81, 47) - NAnd(DeRefOf(arg1), i000, Local1) CH06(arg0, 82, 47) @@ -918,12 +699,6 @@ Method(m4bc) // NOr - NOr(DeRefOf(arg1), i000) - CH06(arg0, 84, 47) - - NOr(i000, DeRefOf(arg1)) - CH06(arg0, 85, 47) - NOr(DeRefOf(arg1), i000, Local1) CH06(arg0, 86, 47) @@ -932,12 +707,6 @@ Method(m4bc) // Or - Or(DeRefOf(arg1), i000) - CH06(arg0, 88, 47) - - Or(i000, DeRefOf(arg1)) - CH06(arg0, 89, 47) - Or(DeRefOf(arg1), i000, Local1) CH06(arg0, 90, 47) @@ -946,12 +715,6 @@ Method(m4bc) // ShiftLeft - ShiftLeft(DeRefOf(arg1), i000) - CH06(arg0, 92, 47) - - ShiftLeft(i000, DeRefOf(arg1)) - CH06(arg0, 93, 47) - ShiftLeft(DeRefOf(arg1), i000, Local1) CH06(arg0, 94, 47) @@ -960,12 +723,6 @@ Method(m4bc) // ShiftRight - ShiftRight(DeRefOf(arg1), i000) - CH06(arg0, 96, 47) - - ShiftRight(i000, DeRefOf(arg1)) - CH06(arg0, 97, 47) - ShiftRight(DeRefOf(arg1), i000, Local1) CH06(arg0, 98, 47) @@ -974,12 +731,6 @@ Method(m4bc) // Subtract - Subtract(DeRefOf(arg1), i000) - CH06(arg0, 100, 47) - - Subtract(i000, DeRefOf(arg1)) - CH06(arg0, 101, 47) - Subtract(DeRefOf(arg1), i000, Local1) CH06(arg0, 102, 47) @@ -988,12 +739,6 @@ Method(m4bc) // ToString - ToString(DeRefOf(arg1), 1) - CH06(arg0, 104, 47) - - ToString(i000, DeRefOf(arg1)) - CH06(arg0, 105, 47) - ToString(DeRefOf(arg1), 1, Local1) CH06(arg0, 106, 47) @@ -1002,17 +747,11 @@ Method(m4bc) // Wait - Wait(e000, DeRefOf(arg1)) + Store(Wait(e000, DeRefOf(arg1)), Local1) CH06(arg0, 109, 47) // XOr - XOr(DeRefOf(arg1), i000) - CH06(arg0, 110, 47) - - XOr(i000, DeRefOf(arg1)) - CH06(arg0, 111, 47) - XOr(DeRefOf(arg1), i000, Local1) CH06(arg0, 112, 47) @@ -1021,15 +760,6 @@ Method(m4bc) // Mid - Mid(DeRefOf(arg1), 1, 1) - CH06(arg0, 114, 47) - - Mid("123", DeRefOf(arg1), 1) - CH06(arg0, 115, 47) - - Mid("123", 1, DeRefOf(arg1)) - CH06(arg0, 116, 47) - Mid(DeRefOf(arg1), 1, 1, Local1) CH06(arg0, 117, 47) @@ -1041,16 +771,16 @@ Method(m4bc) // Match - Match(DeRefOf(arg1), MTR, 0, MTR, 0, 0) + Store (Match(DeRefOf(arg1), MTR, 0, MTR, 0, 0), Local1) CH06(arg0, 120, 47) - Match(Package(){1}, MTR, DeRefOf(arg1), MTR, 0, 0) + Store (Match(Package(){1}, MTR, DeRefOf(arg1), MTR, 0, 0), Local1) CH06(arg0, 121, 47) - Match(Package(){1}, MTR, 0, MTR, DeRefOf(arg1), 0) + Store (Match(Package(){1}, MTR, 0, MTR, DeRefOf(arg1), 0), Local1) CH06(arg0, 122, 47) - Match(Package(){1}, MTR, 0, MTR, 0, DeRefOf(arg1)) + Store (Match(Package(){1}, MTR, 0, MTR, 0, DeRefOf(arg1)), Local1) CH06(arg0, 123, 47) return (0) @@ -1070,10 +800,10 @@ Method(m4bc) // CondRefOf if (y601) { - CondRefOf(m000()) + Store (CondRefOf(m000()), Local1) CH06(arg0, 0, 47) - CondRefOf(m000(), Local1) + Store (CondRefOf(m000(), Local1), Local1) CH06(arg0, 1, 47) } @@ -1089,30 +819,21 @@ Method(m4bc) // DerefOf - DerefOf(m000()) + Store (DerefOf(m000()), Local1) CH06(arg0, 3, 47) // FindSetLeftBit - FindSetLeftBit(m000()) - CH06(arg0, 4, 47) - FindSetLeftBit(m000(), Local1) CH06(arg0, 5, 47) // FindSetRightBit - FindSetRightBit(m000()) - CH06(arg0, 6, 47) - FindSetRightBit(m000(), Local1) CH06(arg0, 7, 47) // FromBCD - FromBCD(m000()) - CH06(arg0, 8, 47) - FromBCD(m000(), Local1) CH06(arg0, 9, 47) @@ -1123,14 +844,11 @@ Method(m4bc) // LNot - LNot(m000()) + Store (LNot(m000()), Local1) CH06(arg0, 11, 47) // Not - Not(m000()) - CH06(arg0, 12, 47) - Not(m000(), Local1) CH06(arg0, 13, 47) @@ -1143,7 +861,7 @@ Method(m4bc) // RefOf if (y601) { - RefOf(m000()) + Store (RefOf(m000()), Local1) CH06(arg0, 14, 47) } @@ -1164,7 +882,7 @@ Method(m4bc) // SizeOf - SizeOf(m000()) + Store (SizeOf(m000()), Local1) CH06(arg0, 16, 47) // Sleep @@ -1184,57 +902,36 @@ Method(m4bc) // ToBCD - ToBCD(m000()) - CH06(arg0, 20, 47) - ToBCD(m000(), Local1) CH06(arg0, 21, 47) // ToBuffer - ToBuffer(m000()) - CH06(arg0, 22, 47) - ToBuffer(m000(), Local1) CH06(arg0, 23, 47) // ToDecimalString - ToDecimalString(m000()) - CH06(arg0, 24, 47) - ToDecimalString(m000(), Local1) CH06(arg0, 25, 47) // ToHexString - ToHexString(m000()) - CH06(arg0, 26, 47) - ToHexString(m000(), Local1) CH06(arg0, 27, 47) // ToInteger - ToInteger(m000()) - CH06(arg0, 28, 47) - ToInteger(m000(), Local1) CH06(arg0, 29, 47) // Acquire - Acquire(m000(), 100) + Store(Acquire(m000(), 100), Local1) CH06(arg0, 30, 47) // Add - Add(m000(), i000) - CH06(arg0, 31, 47) - - Add(i000, m000()) - CH06(arg0, 32, 47) - Add(m000(), i000, Local1) CH06(arg0, 33, 47) @@ -1243,12 +940,6 @@ Method(m4bc) // And - And(m000(), i000) - CH06(arg0, 35, 47) - - And(i000, m000()) - CH06(arg0, 36, 47) - And(m000(), i000, Local1) CH06(arg0, 37, 47) @@ -1257,12 +948,6 @@ Method(m4bc) // Concatenate - Concatenate(m000(), i000) - CH06(arg0, 39, 47) - - Concatenate(i000, m000()) - CH06(arg0, 40, 47) - Concatenate(m000(), i000, Local1) CH06(arg0, 41, 47) @@ -1271,12 +956,6 @@ Method(m4bc) // ConcatenateResTemplate - ConcatenateResTemplate(m000(), ResourceTemplate(){}) - CH06(arg0, 43, 47) - - ConcatenateResTemplate(ResourceTemplate(){}, m000()) - CH06(arg0, 44, 47) - ConcatenateResTemplate(m000(), ResourceTemplate(){}, Local1) CH06(arg0, 45, 47) @@ -1285,12 +964,6 @@ Method(m4bc) // Divide - Divide(m000(), i000) - CH06(arg0, 47, 47) - - Divide(i000, m000()) - CH06(arg0, 48, 47) - Divide(m000(), i000, Local2) CH06(arg0, 49, 47) @@ -1310,12 +983,6 @@ Method(m4bc) // Index - Index(m000(), 0) - CH06(arg0, 54, 47) - - Index("0", m000()) - CH06(arg0, 55, 47) - Index(m000(), 0, Local1) CH06(arg0, 56, 47) @@ -1324,68 +991,62 @@ Method(m4bc) // LEqual - LEqual(m000(), i000) + Store (LEqual(m000(), i000), Local1) CH06(arg0, 58, 47) - LEqual(i000, m000()) + Store (LEqual(i000, m000()), Local1) CH06(arg0, 59, 47) // LGreater - LGreater(m000(), i000) + Store (LGreater(m000(), i000), Local1) CH06(arg0, 60, 47) - LGreater(i000, m000()) + Store (LGreater(i000, m000()), Local1) CH06(arg0, 61, 47) // LGreaterEqual - LGreaterEqual(m000(), i000) + Store (LGreaterEqual(m000(), i000), Local1) CH06(arg0, 62, 0xff) - LGreaterEqual(i000, m000()) + Store (LGreaterEqual(i000, m000()), Local1) CH06(arg0, 63, 0xff) // LLess - LLess(m000(), i000) + Store (LLess(m000(), i000), Local1) CH06(arg0, 64, 47) - LLess(i000, m000()) + Store (LLess(i000, m000()), Local1) CH06(arg0, 65, 47) // LLessEqual - LLessEqual(m000(), i000) + Store (LLessEqual(m000(), i000), Local1) CH06(arg0, 66, 0xff) - LLessEqual(i000, m000()) + Store (LLessEqual(i000, m000()), Local1) CH06(arg0, 67, 0xff) // LNotEqual - LNotEqual(m000(), i000) + Store (LNotEqual(m000(), i000), Local1) CH06(arg0, 68, 0xff) - LNotEqual(i000, m000()) + Store (LNotEqual(i000, m000()), Local1) CH06(arg0, 69, 0xff) // LOr - LOr(m000(), i000) + Store (LOr(m000(), i000), Local1) CH06(arg0, 70, 47) - LOr(i000, m000()) + Store (LOr(i000, m000()), Local1) CH06(arg0, 71, 47) // Mod - Mod(m000(), i000) - CH06(arg0, 72, 47) - - Mod(i000, m000()) - CH06(arg0, 73, 47) - Mod(m000(), i000, Local1) CH06(arg0, 74, 47) @@ -1394,12 +1055,6 @@ Method(m4bc) // Multiply - Multiply(m000(), i000) - CH06(arg0, 76, 47) - - Multiply(i000, m000()) - CH06(arg0, 77, 47) - Multiply(m000(), i000, Local1) CH06(arg0, 78, 47) @@ -1408,12 +1063,6 @@ Method(m4bc) // NAnd - NAnd(m000(), i000) - CH06(arg0, 80, 47) - - NAnd(i000, m000()) - CH06(arg0, 81, 47) - NAnd(m000(), i000, Local1) CH06(arg0, 82, 47) @@ -1422,12 +1071,6 @@ Method(m4bc) // NOr - NOr(m000(), i000) - CH06(arg0, 84, 47) - - NOr(i000, m000()) - CH06(arg0, 85, 47) - NOr(m000(), i000, Local1) CH06(arg0, 86, 47) @@ -1436,12 +1079,6 @@ Method(m4bc) // Or - Or(m000(), i000) - CH06(arg0, 88, 47) - - Or(i000, m000()) - CH06(arg0, 89, 47) - Or(m000(), i000, Local1) CH06(arg0, 90, 47) @@ -1450,12 +1087,6 @@ Method(m4bc) // ShiftLeft - ShiftLeft(m000(), i000) - CH06(arg0, 92, 47) - - ShiftLeft(i000, m000()) - CH06(arg0, 93, 47) - ShiftLeft(m000(), i000, Local1) CH06(arg0, 94, 47) @@ -1464,12 +1095,6 @@ Method(m4bc) // ShiftRight - ShiftRight(m000(), i000) - CH06(arg0, 96, 47) - - ShiftRight(i000, m000()) - CH06(arg0, 97, 47) - ShiftRight(m000(), i000, Local1) CH06(arg0, 98, 47) @@ -1478,12 +1103,6 @@ Method(m4bc) // Subtract - Subtract(m000(), i000) - CH06(arg0, 100, 47) - - Subtract(i000, m000()) - CH06(arg0, 101, 47) - Subtract(m000(), i000, Local1) CH06(arg0, 102, 47) @@ -1492,12 +1111,6 @@ Method(m4bc) // ToString - ToString(m000(), 1) - CH06(arg0, 104, 47) - - ToString(i000, m000()) - CH06(arg0, 105, 47) - ToString(m000(), 1, Local1) CH06(arg0, 106, 47) @@ -1506,20 +1119,14 @@ Method(m4bc) // Wait - Wait(m000(), i000) + Store(Wait(m000(), i000), Local1) CH06(arg0, 108, 47) - Wait(e000, m000()) + Store(Wait(e000, m000()), Local1) CH06(arg0, 109, 47) // XOr - XOr(m000(), i000) - CH06(arg0, 110, 47) - - XOr(i000, m000()) - CH06(arg0, 111, 47) - XOr(m000(), i000, Local1) CH06(arg0, 112, 47) @@ -1528,15 +1135,6 @@ Method(m4bc) // Mid - Mid(m000(), 1, 1) - CH06(arg0, 114, 47) - - Mid("123", m000(), 1) - CH06(arg0, 115, 47) - - Mid("123", 1, m000()) - CH06(arg0, 116, 47) - Mid(m000(), 1, 1, Local1) CH06(arg0, 117, 47) @@ -1548,16 +1146,16 @@ Method(m4bc) // Match - Match(m000(), MTR, 0, MTR, 0, 0) + Store (Match(m000(), MTR, 0, MTR, 0, 0), Local1) CH06(arg0, 120, 47) - Match(Package(){1}, MTR, m000(), MTR, 0, 0) + Store (Match(Package(){1}, MTR, m000(), MTR, 0, 0), Local1) CH06(arg0, 121, 47) - Match(Package(){1}, MTR, 0, MTR, m000(), 0) + Store (Match(Package(){1}, MTR, 0, MTR, m000(), 0), Local1) CH06(arg0, 122, 47) - Match(Package(){1}, MTR, 0, MTR, 0, m000()) + Store (Match(Package(){1}, MTR, 0, MTR, 0, m000()), Local1) CH06(arg0, 123, 47) } @@ -1594,19 +1192,19 @@ Method(m4bc) Store(0, i000) - DerefOf(m000(1, lpC0)) + Store (DerefOf(m000(1, lpC0)), Local1) CH03(ts, z104, Add(9, lpC0), 0, 0) CH00(arg0, 1) - DerefOf(DerefOf(m000(2, lpC0))) + Store (DerefOf(DerefOf(m000(2, lpC0))), Local1) CH06(arg0, Add(1, Local0), 47) CH00(arg0, 2) - Index(DerefOf(m000(3, lpC0)), 0) + Store (Index(DerefOf(m000(3, lpC0)), 0), Local1) CH06(arg0, Add(2, Local0), 47) CH00(arg0, 3) - Match(DerefOf(m000(4, lpC0)), MTR, 0, MTR, 0, 0) + Store (Match(DerefOf(m000(4, lpC0)), MTR, 0, MTR, 0, 0), Local1) CH06(arg0, Add(3, Local0), 47) CH00(arg0, 4) 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 9045f404b..a411bff87 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 @@ -55,7 +55,7 @@ Method(m4bd) { ThermalZone (tz02) {Name(n000, "tz02")} - DerefOf(tz02) + Store (DerefOf(tz02), Local1) CH06(arg0, 0, 47) } @@ -63,7 +63,7 @@ Method(m4bd) Method(m001, 1) { if (y083) { - DerefOf(tz00) + Store (DerefOf(tz00), Local1) CH06(arg0, 1, 47) } } @@ -79,9 +79,6 @@ Method(m4bd) // CondRefOf - CondRefOf(Local0) - CH03(ts, z105, 0, 0, 0) - CondRefOf(Local0, Local1) CH03(ts, z105, 1, 0, 0) @@ -97,30 +94,21 @@ Method(m4bd) // DerefOf - DerefOf(Local0) + Store (DerefOf(Local0), Local1) CH06(arg0, 2, 47) // FindSetLeftBit - FindSetLeftBit(Local0) - CH06(arg0, 3, 47) - FindSetLeftBit(Local0, Local1) CH06(arg0, 4, 47) // FindSetRightBit - FindSetRightBit(Local0) - CH06(arg0, 5, 47) - FindSetRightBit(Local0, Local1) CH06(arg0, 6, 47) // FromBCD - FromBCD(Local0) - CH06(arg0, 7, 47) - FromBCD(Local0, Local1) CH06(arg0, 8, 47) @@ -131,25 +119,22 @@ Method(m4bd) // LNot - LNot(Local0) + Store (LNot(Local0), Local1) CH06(arg0, 10, 47) // Not - Not(Local0) - CH06(arg0, 11, 47) - Not(Local0, Local1) CH06(arg0, 12, 47) // ObjectType - ObjectType(Local0) + Store (ObjectType(Local0), Local1) CH03(ts, z105, 3, 0, 0) // RefOf - RefOf(Local0) + Store (RefOf(Local0), Local1) CH03(ts, z105, 4, 0, 0) // Release @@ -169,7 +154,7 @@ Method(m4bd) // SizeOf - SizeOf(Local0) + Store (SizeOf(Local0), Local1) CH06(arg0, 16, 47) // Sleep @@ -189,57 +174,36 @@ Method(m4bd) // ToBCD - ToBCD(Local0) - CH06(arg0, 20, 47) - ToBCD(Local0, Local1) CH06(arg0, 21, 47) // ToBuffer - ToBuffer(Local0) - CH06(arg0, 22, 47) - ToBuffer(Local0, Local1) CH06(arg0, 23, 47) // ToDecimalString - ToDecimalString(Local0) - CH06(arg0, 24, 47) - ToDecimalString(Local0, Local1) CH06(arg0, 25, 47) // ToHexString - ToHexString(Local0) - CH06(arg0, 26, 47) - ToHexString(Local0, Local1) CH06(arg0, 27, 47) // ToInteger - ToInteger(Local0) - CH06(arg0, 28, 47) - ToInteger(Local0, Local1) CH06(arg0, 29, 47) // Acquire - Acquire(Local0, 100) + Store(Acquire(Local0, 100), Local1) CH06(arg0, 30, 47) // Add - Add(Local0, i000) - CH06(arg0, 31, 47) - - Add(i000, Local0) - CH06(arg0, 32, 47) - Add(Local0, i000, Local1) CH06(arg0, 33, 47) @@ -248,12 +212,6 @@ Method(m4bd) // And - And(Local0, i000) - CH06(arg0, 35, 47) - - And(i000, Local0) - CH06(arg0, 36, 47) - And(Local0, i000, Local1) CH06(arg0, 37, 47) @@ -262,12 +220,6 @@ Method(m4bd) // Concatenate - Concatenate(Local0, i000) - CH06(arg0, 39, 47) - - Concatenate(i000, Local0) - CH06(arg0, 40, 47) - Concatenate(Local0, i000, Local1) CH06(arg0, 41, 47) @@ -276,12 +228,6 @@ Method(m4bd) // ConcatenateResTemplate - ConcatenateResTemplate(Local0, ResourceTemplate(){}) - CH06(arg0, 43, 47) - - ConcatenateResTemplate(ResourceTemplate(){}, Local0) - CH06(arg0, 44, 47) - ConcatenateResTemplate(Local0, ResourceTemplate(){}, Local1) CH06(arg0, 45, 47) @@ -290,12 +236,6 @@ Method(m4bd) // Divide - Divide(Local0, i000) - CH06(arg0, 47, 47) - - Divide(i000, Local0) - CH06(arg0, 48, 47) - Divide(Local0, i000, Local2) CH06(arg0, 49, 47) @@ -315,12 +255,6 @@ Method(m4bd) // Index - Index(Local0, 0) - CH06(arg0, 54, 47) - - Index("0", Local0) - CH06(arg0, 55, 47) - Index(Local0, 0, Local1) CH06(arg0, 56, 47) @@ -329,68 +263,62 @@ Method(m4bd) // LEqual - LEqual(Local0, i000) + Store (LEqual(Local0, i000), Local1) CH06(arg0, 58, 47) - LEqual(i000, Local0) + Store (LEqual(i000, Local0), Local1) CH06(arg0, 59, 47) // LGreater - LGreater(Local0, i000) + Store (LGreater(Local0, i000), Local1) CH06(arg0, 60, 47) - LGreater(i000, Local0) + Store (LGreater(i000, Local0), Local1) CH06(arg0, 61, 47) // LGreaterEqual - LGreaterEqual(Local0, i000) + Store (LGreaterEqual(Local0, i000), Local1) CH06(arg0, 62, 0xff) - LGreaterEqual(i000, Local0) + Store (LGreaterEqual(i000, Local0), Local1) CH06(arg0, 63, 0xff) // LLess - LLess(Local0, i000) + Store (LLess(Local0, i000), Local1) CH06(arg0, 64, 47) - LLess(i000, Local0) + Store (LLess(i000, Local0), Local1) CH06(arg0, 65, 47) // LLessEqual - LLessEqual(Local0, i000) + Store (LLessEqual(Local0, i000), Local1) CH06(arg0, 66, 0xff) - LLessEqual(i000, Local0) + Store (LLessEqual(i000, Local0), Local1) CH06(arg0, 67, 0xff) // LNotEqual - LNotEqual(Local0, i000) + Store (LNotEqual(Local0, i000), Local1) CH06(arg0, 68, 0xff) - LNotEqual(i000, Local0) + Store (LNotEqual(i000, Local0), Local1) CH06(arg0, 69, 0xff) // LOr - LOr(Local0, i000) + Store (LOr(Local0, i000), Local1) CH06(arg0, 70, 47) - LOr(i000, Local0) + Store (LOr(i000, Local0), Local1) CH06(arg0, 71, 47) // Mod - Mod(Local0, i000) - CH06(arg0, 72, 47) - - Mod(i000, Local0) - CH06(arg0, 73, 47) - Mod(Local0, i000, Local1) CH06(arg0, 74, 47) @@ -399,12 +327,6 @@ Method(m4bd) // Multiply - Multiply(Local0, i000) - CH06(arg0, 76, 47) - - Multiply(i000, Local0) - CH06(arg0, 77, 47) - Multiply(Local0, i000, Local1) CH06(arg0, 78, 47) @@ -413,12 +335,6 @@ Method(m4bd) // NAnd - NAnd(Local0, i000) - CH06(arg0, 80, 47) - - NAnd(i000, Local0) - CH06(arg0, 81, 47) - NAnd(Local0, i000, Local1) CH06(arg0, 82, 47) @@ -427,12 +343,6 @@ Method(m4bd) // NOr - NOr(Local0, i000) - CH06(arg0, 84, 47) - - NOr(i000, Local0) - CH06(arg0, 85, 47) - NOr(Local0, i000, Local1) CH06(arg0, 86, 47) @@ -441,12 +351,6 @@ Method(m4bd) // Or - Or(Local0, i000) - CH06(arg0, 88, 47) - - Or(i000, Local0) - CH06(arg0, 89, 47) - Or(Local0, i000, Local1) CH06(arg0, 90, 47) @@ -455,12 +359,6 @@ Method(m4bd) // ShiftLeft - ShiftLeft(Local0, i000) - CH06(arg0, 92, 47) - - ShiftLeft(i000, Local0) - CH06(arg0, 93, 47) - ShiftLeft(Local0, i000, Local1) CH06(arg0, 94, 47) @@ -469,12 +367,6 @@ Method(m4bd) // ShiftRight - ShiftRight(Local0, i000) - CH06(arg0, 96, 47) - - ShiftRight(i000, Local0) - CH06(arg0, 97, 47) - ShiftRight(Local0, i000, Local1) CH06(arg0, 98, 47) @@ -483,12 +375,6 @@ Method(m4bd) // Subtract - Subtract(Local0, i000) - CH06(arg0, 100, 47) - - Subtract(i000, Local0) - CH06(arg0, 101, 47) - Subtract(Local0, i000, Local1) CH06(arg0, 102, 47) @@ -497,12 +383,6 @@ Method(m4bd) // ToString - ToString(Local0, 1) - CH06(arg0, 104, 47) - - ToString(i000, Local0) - CH06(arg0, 105, 47) - ToString(Local0, 1, Local1) CH06(arg0, 106, 47) @@ -511,20 +391,14 @@ Method(m4bd) // Wait - Wait(Local0, i000) + Store(Wait(Local0, i000), Local1) CH06(arg0, 108, 47) - Wait(e000, Local0) + Store(Wait(e000, Local0), Local1) CH06(arg0, 109, 47) // XOr - XOr(Local0, i000) - CH06(arg0, 110, 47) - - XOr(i000, Local0) - CH06(arg0, 111, 47) - XOr(Local0, i000, Local1) CH06(arg0, 112, 47) @@ -533,15 +407,6 @@ Method(m4bd) // Mid - Mid(Local0, 1, 1) - CH06(arg0, 114, 47) - - Mid("123", Local0, 1) - CH06(arg0, 115, 47) - - Mid("123", 1, Local0) - CH06(arg0, 116, 47) - Mid(Local0, 1, 1, Local1) CH06(arg0, 117, 47) @@ -553,16 +418,16 @@ Method(m4bd) // Match - Match(Local0, MTR, 0, MTR, 0, 0) + Store (Match(Local0, MTR, 0, MTR, 0, 0), Local1) CH06(arg0, 120, 47) - Match(Package(){1}, MTR, Local0, MTR, 0, 0) + Store (Match(Package(){1}, MTR, Local0, MTR, 0, 0), Local1) CH06(arg0, 121, 47) - Match(Package(){1}, MTR, 0, MTR, Local0, 0) + Store (Match(Package(){1}, MTR, 0, MTR, Local0, 0), Local1) CH06(arg0, 122, 47) - Match(Package(){1}, MTR, 0, MTR, 0, Local0) + Store (Match(Package(){1}, MTR, 0, MTR, 0, Local0), Local1) CH06(arg0, 123, 47) } @@ -583,14 +448,11 @@ Method(m4bd) } } - DeRefOf(arg1) + Store (DeRefOf(arg1), Local1) CH03(ts, z105, 5, 0, 0) // CondRefOf - CondRefOf(DeRefOf(arg1)) - CH06(arg0, 0, EXC0) - CondRefOf(DeRefOf(arg1), Local1) CH06(arg0, 1, EXC0) @@ -606,30 +468,21 @@ Method(m4bd) // DerefOf - DerefOf(DeRefOf(arg1)) + Store (DerefOf(DeRefOf(arg1)), Local1) CH06(arg0, 4, EXC0) // FindSetLeftBit - FindSetLeftBit(DeRefOf(arg1)) - CH06(arg0, 5, EXC0) - FindSetLeftBit(DeRefOf(arg1), Local1) CH06(arg0, 6, EXC0) // FindSetRightBit - FindSetRightBit(DeRefOf(arg1)) - CH06(arg0, 7, EXC0) - FindSetRightBit(DeRefOf(arg1), Local1) CH06(arg0, 8, EXC0) // FromBCD - FromBCD(DeRefOf(arg1)) - CH06(arg0, 9, EXC0) - FromBCD(DeRefOf(arg1), Local1) CH06(arg0, 10, EXC0) @@ -640,25 +493,22 @@ Method(m4bd) // LNot - LNot(DeRefOf(arg1)) + Store (LNot(DeRefOf(arg1)), Local1) CH06(arg0, 12, EXC0) // Not - Not(DeRefOf(arg1)) - CH06(arg0, 13, EXC0) - Not(DeRefOf(arg1), Local1) CH06(arg0, 14, EXC0) // ObjectType - ObjectType(DeRefOf(arg1)) + Store (ObjectType(DeRefOf(arg1)), Local1) CH03(ts, z105, 6, 0, 0) // RefOf - RefOf(DeRefOf(arg1)) + Store (RefOf(DeRefOf(arg1)), Local1) CH06(arg0, 15, EXC0) // Release @@ -669,7 +519,7 @@ Method(m4bd) // SizeOf - SizeOf(DeRefOf(arg1)) + Store (SizeOf(DeRefOf(arg1)), Local1) CH06(arg0, 16, EXC0) // Sleep @@ -689,41 +539,26 @@ Method(m4bd) // ToBCD - ToBCD(DeRefOf(arg1)) - CH06(arg0, 20, EXC0) - ToBCD(DeRefOf(arg1), Local1) CH06(arg0, 21, EXC0) // ToBuffer - ToBuffer(DeRefOf(arg1)) - CH06(arg0, 22, EXC0) - ToBuffer(DeRefOf(arg1), Local1) CH06(arg0, 23, EXC0) // ToDecimalString - ToDecimalString(DeRefOf(arg1)) - CH06(arg0, 24, EXC0) - ToDecimalString(DeRefOf(arg1), Local1) CH06(arg0, 25, EXC0) // ToHexString - ToHexString(DeRefOf(arg1)) - CH06(arg0, 26, EXC0) - ToHexString(DeRefOf(arg1), Local1) CH06(arg0, 27, EXC0) // ToInteger - ToInteger(DeRefOf(arg1)) - CH06(arg0, 28, EXC0) - ToInteger(DeRefOf(arg1), Local1) CH06(arg0, 29, EXC0) @@ -731,12 +566,6 @@ Method(m4bd) // Add - Add(DeRefOf(arg1), i000) - CH06(arg0, 31, EXC0) - - Add(i000, DeRefOf(arg1)) - CH06(arg0, 32, EXC0) - Add(DeRefOf(arg1), i000, Local1) CH06(arg0, 33, EXC0) @@ -745,12 +574,6 @@ Method(m4bd) // And - And(DeRefOf(arg1), i000) - CH06(arg0, 35, EXC0) - - And(i000, DeRefOf(arg1)) - CH06(arg0, 36, EXC0) - And(DeRefOf(arg1), i000, Local1) CH06(arg0, 37, EXC0) @@ -759,12 +582,6 @@ Method(m4bd) // Concatenate - Concatenate(DeRefOf(arg1), i000) - CH06(arg0, 39, EXC0) - - Concatenate(i000, DeRefOf(arg1)) - CH06(arg0, 40, EXC0) - Concatenate(DeRefOf(arg1), i000, Local1) CH06(arg0, 41, EXC0) @@ -773,12 +590,6 @@ Method(m4bd) // ConcatenateResTemplate - ConcatenateResTemplate(DeRefOf(arg1), ResourceTemplate(){}) - CH06(arg0, 43, EXC0) - - ConcatenateResTemplate(ResourceTemplate(){}, DeRefOf(arg1)) - CH06(arg0, 44, EXC0) - ConcatenateResTemplate(DeRefOf(arg1), ResourceTemplate(){}, Local1) CH06(arg0, 45, EXC0) @@ -787,12 +598,6 @@ Method(m4bd) // Divide - Divide(DeRefOf(arg1), i000) - CH06(arg0, 47, EXC0) - - Divide(i000, DeRefOf(arg1)) - CH06(arg0, 48, EXC0) - Divide(DeRefOf(arg1), i000, Local2) CH06(arg0, 49, EXC0) @@ -812,12 +617,6 @@ Method(m4bd) // Index - Index(DeRefOf(arg1), 0) - CH06(arg0, 54, EXC0) - - Index("0", DeRefOf(arg1)) - CH06(arg0, 55, EXC0) - Index(DeRefOf(arg1), 0, Local1) CH06(arg0, 56, EXC0) @@ -826,68 +625,62 @@ Method(m4bd) // LEqual - LEqual(DeRefOf(arg1), i000) + Store (LEqual(DeRefOf(arg1), i000), Local1) CH06(arg0, 58, EXC0) - LEqual(i000, DeRefOf(arg1)) + Store (LEqual(i000, DeRefOf(arg1)), Local1) CH06(arg0, 59, EXC0) // LGreater - LGreater(DeRefOf(arg1), i000) + Store (LGreater(DeRefOf(arg1), i000), Local1) CH06(arg0, 60, EXC0) - LGreater(i000, DeRefOf(arg1)) + Store (LGreater(i000, DeRefOf(arg1)), Local1) CH06(arg0, 61, EXC0) // LGreaterEqual - LGreaterEqual(DeRefOf(arg1), i000) + Store (LGreaterEqual(DeRefOf(arg1), i000), Local1) CH06(arg0, 62, 0xff) - LGreaterEqual(i000, DeRefOf(arg1)) + Store (LGreaterEqual(i000, DeRefOf(arg1)), Local1) CH06(arg0, 63, 0xff) // LLess - LLess(DeRefOf(arg1), i000) + Store (LLess(DeRefOf(arg1), i000), Local1) CH06(arg0, 64, EXC0) - LLess(i000, DeRefOf(arg1)) + Store (LLess(i000, DeRefOf(arg1)), Local1) CH06(arg0, 65, EXC0) // LLessEqual - LLessEqual(DeRefOf(arg1), i000) + Store (LLessEqual(DeRefOf(arg1), i000), Local1) CH06(arg0, 66, 0xff) - LLessEqual(i000, DeRefOf(arg1)) + Store (LLessEqual(i000, DeRefOf(arg1)), Local1) CH06(arg0, 67, 0xff) // LNotEqual - LNotEqual(DeRefOf(arg1), i000) + Store (LNotEqual(DeRefOf(arg1), i000), Local1) CH06(arg0, 68, 0xff) - LNotEqual(i000, DeRefOf(arg1)) + Store (LNotEqual(i000, DeRefOf(arg1)), Local1) CH06(arg0, 69, 0xff) // LOr - LOr(DeRefOf(arg1), i000) + Store (LOr(DeRefOf(arg1), i000), Local1) CH06(arg0, 70, EXC0) - LOr(i000, DeRefOf(arg1)) + Store (LOr(i000, DeRefOf(arg1)), Local1) CH06(arg0, 71, EXC0) // Mod - Mod(DeRefOf(arg1), i000) - CH06(arg0, 72, EXC0) - - Mod(i000, DeRefOf(arg1)) - CH06(arg0, 73, EXC0) - Mod(DeRefOf(arg1), i000, Local1) CH06(arg0, 74, EXC0) @@ -896,12 +689,6 @@ Method(m4bd) // Multiply - Multiply(DeRefOf(arg1), i000) - CH06(arg0, 76, EXC0) - - Multiply(i000, DeRefOf(arg1)) - CH06(arg0, 77, EXC0) - Multiply(DeRefOf(arg1), i000, Local1) CH06(arg0, 78, EXC0) @@ -910,12 +697,6 @@ Method(m4bd) // NAnd - NAnd(DeRefOf(arg1), i000) - CH06(arg0, 80, EXC0) - - NAnd(i000, DeRefOf(arg1)) - CH06(arg0, 81, EXC0) - NAnd(DeRefOf(arg1), i000, Local1) CH06(arg0, 82, EXC0) @@ -924,12 +705,6 @@ Method(m4bd) // NOr - NOr(DeRefOf(arg1), i000) - CH06(arg0, 84, EXC0) - - NOr(i000, DeRefOf(arg1)) - CH06(arg0, 85, EXC0) - NOr(DeRefOf(arg1), i000, Local1) CH06(arg0, 86, EXC0) @@ -938,12 +713,6 @@ Method(m4bd) // Or - Or(DeRefOf(arg1), i000) - CH06(arg0, 88, EXC0) - - Or(i000, DeRefOf(arg1)) - CH06(arg0, 89, EXC0) - Or(DeRefOf(arg1), i000, Local1) CH06(arg0, 90, EXC0) @@ -952,12 +721,6 @@ Method(m4bd) // ShiftLeft - ShiftLeft(DeRefOf(arg1), i000) - CH06(arg0, 92, EXC0) - - ShiftLeft(i000, DeRefOf(arg1)) - CH06(arg0, 93, EXC0) - ShiftLeft(DeRefOf(arg1), i000, Local1) CH06(arg0, 94, EXC0) @@ -966,12 +729,6 @@ Method(m4bd) // ShiftRight - ShiftRight(DeRefOf(arg1), i000) - CH06(arg0, 96, EXC0) - - ShiftRight(i000, DeRefOf(arg1)) - CH06(arg0, 97, EXC0) - ShiftRight(DeRefOf(arg1), i000, Local1) CH06(arg0, 98, EXC0) @@ -980,12 +737,6 @@ Method(m4bd) // Subtract - Subtract(DeRefOf(arg1), i000) - CH06(arg0, 100, EXC0) - - Subtract(i000, DeRefOf(arg1)) - CH06(arg0, 101, EXC0) - Subtract(DeRefOf(arg1), i000, Local1) CH06(arg0, 102, EXC0) @@ -994,12 +745,6 @@ Method(m4bd) // ToString - ToString(DeRefOf(arg1), 1) - CH06(arg0, 104, EXC0) - - ToString(i000, DeRefOf(arg1)) - CH06(arg0, 105, EXC0) - ToString(DeRefOf(arg1), 1, Local1) CH06(arg0, 106, EXC0) @@ -1008,17 +753,11 @@ Method(m4bd) // Wait - Wait(e000, DeRefOf(arg1)) + Store(Wait(e000, DeRefOf(arg1)), Local1) CH06(arg0, 109, EXC0) // XOr - XOr(DeRefOf(arg1), i000) - CH06(arg0, 110, EXC0) - - XOr(i000, DeRefOf(arg1)) - CH06(arg0, 111, EXC0) - XOr(DeRefOf(arg1), i000, Local1) CH06(arg0, 112, EXC0) @@ -1027,15 +766,6 @@ Method(m4bd) // Mid - Mid(DeRefOf(arg1), 1, 1) - CH06(arg0, 114, EXC0) - - Mid("123", DeRefOf(arg1), 1) - CH06(arg0, 115, EXC0) - - Mid("123", 1, DeRefOf(arg1)) - CH06(arg0, 116, EXC0) - Mid(DeRefOf(arg1), 1, 1, Local1) CH06(arg0, 117, EXC0) @@ -1047,16 +777,16 @@ Method(m4bd) // Match - Match(DeRefOf(arg1), MTR, 0, MTR, 0, 0) + Store (Match(DeRefOf(arg1), MTR, 0, MTR, 0, 0), Local1) CH06(arg0, 120, EXC0) - Match(Package(){1}, MTR, DeRefOf(arg1), MTR, 0, 0) + Store (Match(Package(){1}, MTR, DeRefOf(arg1), MTR, 0, 0), Local1) CH06(arg0, 121, EXC0) - Match(Package(){1}, MTR, 0, MTR, DeRefOf(arg1), 0) + Store (Match(Package(){1}, MTR, 0, MTR, DeRefOf(arg1), 0), Local1) CH06(arg0, 122, EXC0) - Match(Package(){1}, MTR, 0, MTR, 0, DeRefOf(arg1)) + Store (Match(Package(){1}, MTR, 0, MTR, 0, DeRefOf(arg1)), Local1) CH06(arg0, 123, EXC0) return (0) @@ -1075,9 +805,6 @@ Method(m4bd) // CondRefOf - CondRefOf(m000()) - CH06(arg0, 0, 47) - CondRefOf(m000(), Local1) CH06(arg0, 1, 47) @@ -1093,30 +820,21 @@ Method(m4bd) // DerefOf - DerefOf(m000()) + Store (DerefOf(m000()), Local1) CH06(arg0, 3, 47) // FindSetLeftBit - FindSetLeftBit(m000()) - CH06(arg0, 4, 47) - FindSetLeftBit(m000(), Local1) CH06(arg0, 5, 47) // FindSetRightBit - FindSetRightBit(m000()) - CH06(arg0, 6, 47) - FindSetRightBit(m000(), Local1) CH06(arg0, 7, 47) // FromBCD - FromBCD(m000()) - CH06(arg0, 8, 47) - FromBCD(m000(), Local1) CH06(arg0, 9, 47) @@ -1127,14 +845,11 @@ Method(m4bd) // LNot - LNot(m000()) + Store (LNot(m000()), Local1) CH06(arg0, 11, 47) // Not - Not(m000()) - CH06(arg0, 12, 47) - Not(m000(), Local1) CH06(arg0, 13, 47) @@ -1146,7 +861,7 @@ Method(m4bd) // RefOf - RefOf(m000()) + Store (RefOf(m000()), Local1) CH06(arg0, 14, 47) // Release @@ -1166,7 +881,7 @@ Method(m4bd) // SizeOf - SizeOf(m000()) + Store (SizeOf(m000()), Local1) CH06(arg0, 16, 47) // Sleep @@ -1186,57 +901,36 @@ Method(m4bd) // ToBCD - ToBCD(m000()) - CH06(arg0, 20, 47) - ToBCD(m000(), Local1) CH06(arg0, 21, 47) // ToBuffer - ToBuffer(m000()) - CH06(arg0, 22, 47) - ToBuffer(m000(), Local1) CH06(arg0, 23, 47) // ToDecimalString - ToDecimalString(m000()) - CH06(arg0, 24, 47) - ToDecimalString(m000(), Local1) CH06(arg0, 25, 47) // ToHexString - ToHexString(m000()) - CH06(arg0, 26, 47) - ToHexString(m000(), Local1) CH06(arg0, 27, 47) // ToInteger - ToInteger(m000()) - CH06(arg0, 28, 47) - ToInteger(m000(), Local1) CH06(arg0, 29, 47) // Acquire - Acquire(m000(), 100) + Store(Acquire(m000(), 100), Local1) CH06(arg0, 30, 47) // Add - Add(m000(), i000) - CH06(arg0, 31, 47) - - Add(i000, m000()) - CH06(arg0, 32, 47) - Add(m000(), i000, Local1) CH06(arg0, 33, 47) @@ -1245,12 +939,6 @@ Method(m4bd) // And - And(m000(), i000) - CH06(arg0, 35, 47) - - And(i000, m000()) - CH06(arg0, 36, 47) - And(m000(), i000, Local1) CH06(arg0, 37, 47) @@ -1259,12 +947,6 @@ Method(m4bd) // Concatenate - Concatenate(m000(), i000) - CH06(arg0, 39, 47) - - Concatenate(i000, m000()) - CH06(arg0, 40, 47) - Concatenate(m000(), i000, Local1) CH06(arg0, 41, 47) @@ -1273,12 +955,6 @@ Method(m4bd) // ConcatenateResTemplate - ConcatenateResTemplate(m000(), ResourceTemplate(){}) - CH06(arg0, 43, 47) - - ConcatenateResTemplate(ResourceTemplate(){}, m000()) - CH06(arg0, 44, 47) - ConcatenateResTemplate(m000(), ResourceTemplate(){}, Local1) CH06(arg0, 45, 47) @@ -1287,12 +963,6 @@ Method(m4bd) // Divide - Divide(m000(), i000) - CH06(arg0, 47, 47) - - Divide(i000, m000()) - CH06(arg0, 48, 47) - Divide(m000(), i000, Local2) CH06(arg0, 49, 47) @@ -1312,12 +982,6 @@ Method(m4bd) // Index - Index(m000(), 0) - CH06(arg0, 54, 47) - - Index("0", m000()) - CH06(arg0, 55, 47) - Index(m000(), 0, Local1) CH06(arg0, 56, 47) @@ -1326,68 +990,62 @@ Method(m4bd) // LEqual - LEqual(m000(), i000) + Store (LEqual(m000(), i000), Local1) CH06(arg0, 58, 47) - LEqual(i000, m000()) + Store (LEqual(i000, m000()), Local1) CH06(arg0, 59, 47) // LGreater - LGreater(m000(), i000) + Store (LGreater(m000(), i000), Local1) CH06(arg0, 60, 47) - LGreater(i000, m000()) + Store (LGreater(i000, m000()), Local1) CH06(arg0, 61, 47) // LGreaterEqual - LGreaterEqual(m000(), i000) + Store (LGreaterEqual(m000(), i000), Local1) CH06(arg0, 62, 0xff) - LGreaterEqual(i000, m000()) + Store (LGreaterEqual(i000, m000()), Local1) CH06(arg0, 63, 0xff) // LLess - LLess(m000(), i000) + Store (LLess(m000(), i000), Local1) CH06(arg0, 64, 47) - LLess(i000, m000()) + Store (LLess(i000, m000()), Local1) CH06(arg0, 65, 47) // LLessEqual - LLessEqual(m000(), i000) + Store (LLessEqual(m000(), i000), Local1) CH06(arg0, 66, 0xff) - LLessEqual(i000, m000()) + Store (LLessEqual(i000, m000()), Local1) CH06(arg0, 67, 0xff) // LNotEqual - LNotEqual(m000(), i000) + Store (LNotEqual(m000(), i000), Local1) CH06(arg0, 68, 0xff) - LNotEqual(i000, m000()) + Store (LNotEqual(i000, m000()), Local1) CH06(arg0, 69, 0xff) // LOr - LOr(m000(), i000) + Store (LOr(m000(), i000), Local1) CH06(arg0, 70, 47) - LOr(i000, m000()) + Store (LOr(i000, m000()), Local1) CH06(arg0, 71, 47) // Mod - Mod(m000(), i000) - CH06(arg0, 72, 47) - - Mod(i000, m000()) - CH06(arg0, 73, 47) - Mod(m000(), i000, Local1) CH06(arg0, 74, 47) @@ -1396,12 +1054,6 @@ Method(m4bd) // Multiply - Multiply(m000(), i000) - CH06(arg0, 76, 47) - - Multiply(i000, m000()) - CH06(arg0, 77, 47) - Multiply(m000(), i000, Local1) CH06(arg0, 78, 47) @@ -1410,12 +1062,6 @@ Method(m4bd) // NAnd - NAnd(m000(), i000) - CH06(arg0, 80, 47) - - NAnd(i000, m000()) - CH06(arg0, 81, 47) - NAnd(m000(), i000, Local1) CH06(arg0, 82, 47) @@ -1424,12 +1070,6 @@ Method(m4bd) // NOr - NOr(m000(), i000) - CH06(arg0, 84, 47) - - NOr(i000, m000()) - CH06(arg0, 85, 47) - NOr(m000(), i000, Local1) CH06(arg0, 86, 47) @@ -1438,12 +1078,6 @@ Method(m4bd) // Or - Or(m000(), i000) - CH06(arg0, 88, 47) - - Or(i000, m000()) - CH06(arg0, 89, 47) - Or(m000(), i000, Local1) CH06(arg0, 90, 47) @@ -1452,12 +1086,6 @@ Method(m4bd) // ShiftLeft - ShiftLeft(m000(), i000) - CH06(arg0, 92, 47) - - ShiftLeft(i000, m000()) - CH06(arg0, 93, 47) - ShiftLeft(m000(), i000, Local1) CH06(arg0, 94, 47) @@ -1466,12 +1094,6 @@ Method(m4bd) // ShiftRight - ShiftRight(m000(), i000) - CH06(arg0, 96, 47) - - ShiftRight(i000, m000()) - CH06(arg0, 97, 47) - ShiftRight(m000(), i000, Local1) CH06(arg0, 98, 47) @@ -1480,12 +1102,6 @@ Method(m4bd) // Subtract - Subtract(m000(), i000) - CH06(arg0, 100, 47) - - Subtract(i000, m000()) - CH06(arg0, 101, 47) - Subtract(m000(), i000, Local1) CH06(arg0, 102, 47) @@ -1494,12 +1110,6 @@ Method(m4bd) // ToString - ToString(m000(), 1) - CH06(arg0, 104, 47) - - ToString(i000, m000()) - CH06(arg0, 105, 47) - ToString(m000(), 1, Local1) CH06(arg0, 106, 47) @@ -1508,20 +1118,14 @@ Method(m4bd) // Wait - Wait(m000(), i000) + Store(Wait(m000(), i000), Local1) CH06(arg0, 108, 47) - Wait(e000, m000()) + Store(Wait(e000, m000()), Local1) CH06(arg0, 109, 47) // XOr - XOr(m000(), i000) - CH06(arg0, 110, 47) - - XOr(i000, m000()) - CH06(arg0, 111, 47) - XOr(m000(), i000, Local1) CH06(arg0, 112, 47) @@ -1530,15 +1134,6 @@ Method(m4bd) // Mid - Mid(m000(), 1, 1) - CH06(arg0, 114, 47) - - Mid("123", m000(), 1) - CH06(arg0, 115, 47) - - Mid("123", 1, m000()) - CH06(arg0, 116, 47) - Mid(m000(), 1, 1, Local1) CH06(arg0, 117, 47) @@ -1550,16 +1145,16 @@ Method(m4bd) // Match - Match(m000(), MTR, 0, MTR, 0, 0) + Store (Match(m000(), MTR, 0, MTR, 0, 0), Local1) CH06(arg0, 120, 47) - Match(Package(){1}, MTR, m000(), MTR, 0, 0) + Store (Match(Package(){1}, MTR, m000(), MTR, 0, 0), Local1) CH06(arg0, 121, 47) - Match(Package(){1}, MTR, 0, MTR, m000(), 0) + Store (Match(Package(){1}, MTR, 0, MTR, m000(), 0), Local1) CH06(arg0, 122, 47) - Match(Package(){1}, MTR, 0, MTR, 0, m000()) + Store (Match(Package(){1}, MTR, 0, MTR, 0, m000()), Local1) CH06(arg0, 123, 47) } @@ -1596,19 +1191,19 @@ Method(m4bd) Store(0, i000) - DerefOf(m000(1, lpC0)) + Store (DerefOf(m000(1, lpC0)), Local1) CH03(ts, z105, Add(9, lpC0), 0, 0) CH00(arg0, 1) - DerefOf(DerefOf(m000(2, lpC0))) + Store (DerefOf(DerefOf(m000(2, lpC0))), Local1) CH06(arg0, Add(1, Local0), 47) CH00(arg0, 2) - Index(DerefOf(m000(3, lpC0)), 0) + Store (Index(DerefOf(m000(3, lpC0)), 0), Local1) CH06(arg0, Add(2, Local0), 47) CH00(arg0, 3) - Match(DerefOf(m000(4, lpC0)), MTR, 0, MTR, 0, 0) + Store (Match(DerefOf(m000(4, lpC0)), MTR, 0, MTR, 0, 0), Local1) CH06(arg0, Add(3, Local0), 47) CH00(arg0, 4) 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 de263a8f8..571a8d890 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 @@ -67,21 +67,21 @@ Method(m4be) // Like Integer behaviour if (y083) { - DerefOf(bf02) + Store (DerefOf(bf02), Local1) CH06(arg0, 0, 47) } - Index(bf02, 0) + Store (Index(bf02, 0), Local1) CH06(arg0, 1, 47) // Like Buffer behaviour if (y083) { - DerefOf(bf03) + Store (DerefOf(bf03), Local1) CH06(arg0, 2, 47) } - Index(bf03, 0) + Store (Index(bf03, 0), Local1) if (y900) { CH03(ts, z106, 0, 0, 0) } else { @@ -98,21 +98,21 @@ Method(m4be) // Like Integer behaviour if (y083) { - DerefOf(bf20) + Store (DerefOf(bf20), Local1) CH06(arg0, 3, 47) } - Index(bf20, 0) + Store (Index(bf20, 0), Local1) CH06(arg0, 4, 47) // Like Buffer behaviour if (y083) { - DerefOf(bf21) + Store (DerefOf(bf21), Local1) CH06(arg0, 5, 47) } - Index(bf21, 0) + Store (Index(bf21, 0), Local1) if (y900) { CH03(ts, z106, 1, 0, 0) } else { @@ -133,13 +133,13 @@ Method(m4be) return (1) } - DerefOf(arg1) + Store (DerefOf(arg1), Local1) CH03(ts, z106, 2, 0, 0) - DerefOf(DerefOf(arg1)) + Store (DerefOf(DerefOf(arg1)), Local1) CH06(arg0, 7, 47) - Index(DerefOf(arg1), 0) + Store (Index(DerefOf(arg1), 0), Local1) if (arg2) { // Like Buffer behaviour @@ -153,7 +153,7 @@ Method(m4be) CH06(arg0, 8, 47) } - Match(DerefOf(arg1), MTR, 0, MTR, 0, 0) + Store (Match(DerefOf(arg1), MTR, 0, MTR, 0, 0), Local1) CH06(arg0, 9, 47) return (0) @@ -203,16 +203,16 @@ Method(m4be) Store(0, i000) - DerefOf(m000(1, lpC0)) + Store (DerefOf(m000(1, lpC0)), Local1) CH03(ts, z106, Add(4, lpC0), 0, 0) CH00(arg0, 1) - DerefOf(DerefOf(m000(2, lpC0))) + Store (DerefOf(DerefOf(m000(2, lpC0))), Local1) CH06(arg0, Add(11, Local0), 47) CH00(arg0, 2) - Index(DerefOf(m000(3, lpC0)), 0) + Store (Index(DerefOf(m000(3, lpC0)), 0), Local1) if (Mod(lpC0, 2)) { // Like Buffer behaviour if (y900) { @@ -226,7 +226,7 @@ Method(m4be) } CH00(arg0, 3) - Match(DerefOf(m000(4, lpC0)), MTR, 0, MTR, 0, 0) + Store (Match(DerefOf(m000(4, lpC0)), MTR, 0, MTR, 0, 0), Local1) CH06(arg0, Add(13, Local0), 47) CH00(arg0, 4) 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 8cb895257..21502a34e 100644 --- a/tests/aslts/src/runtime/collections/functional/control/ImplicitReturn/add.asl +++ b/tests/aslts/src/runtime/collections/functional/control/ImplicitReturn/add.asl @@ -42,7 +42,7 @@ Method(mf71) Method(m000) { - Add(0xabcd0002, i001) + Store(Add(0xabcd0002, i001), Local1) if (fl00) { Store(0xdddd0000, i001) Return (0) @@ -55,7 +55,7 @@ Method(mf71) Store(0xdddd0001, i001) Return (0) } - Add(0xabcd0003, i001) + Store(Add(0xabcd0003, i001), Local1) } Method(m002, 1) @@ -68,7 +68,7 @@ Method(mf71) Return (0) } if (arg0) { - Add(0xabcd0004, i001) + Store(Add(0xabcd0004, i001), Local1) } } @@ -82,9 +82,9 @@ Method(mf71) Return (0) } if (arg0) { - Add(0xabcd0005, i001) + Store(Add(0xabcd0005, i001), Local1) } else { - Add(0xabcd0006, i001) + Store(Add(0xabcd0006, i001), Local1) } } @@ -96,13 +96,13 @@ Method(mf71) switch (arg0) { case (0) { - Add(0xabcd0007, i001) + Store(Add(0xabcd0007, i001), Local1) } case (0x12345678) { - Add(0xabcd0008, i001) + Store(Add(0xabcd0008, i001), Local1) } default { - Add(0xabcd0009, i001) + Store(Add(0xabcd0009, i001), Local1) } } } @@ -114,7 +114,7 @@ Method(mf71) } While (1) { - Add(0xabcd000a, i001) + Store(Add(0xabcd000a, i001), Local1) Break } } @@ -125,7 +125,7 @@ Method(mf71) Return (0) } - Add(0xabcd000b, i001) + Store(Add(0xabcd000b, i001), Local1) While (0xabcd0003) { Break } @@ -154,7 +154,7 @@ Method(mf71) Decrement(lpN0) Increment(lpC0) Store(0xabcd0001, i000) - Add(0xabcd000c, i001) + Store(Add(0xabcd000c, i001), Local1) Continue } } @@ -163,7 +163,7 @@ Method(mf71) { Method(m000) { - Add(0xabcd000d, i001) + Store(Add(0xabcd000d, i001), Local1) } if (fl00) { @@ -388,7 +388,7 @@ Method(mff0) { Store(0, Local0) - Add(0xabcd0002, Local0) + Store(Add(0xabcd0002, Local0), Local1) if (fl00) { Store(0xdddd0000, Local0) Return (0) @@ -403,7 +403,7 @@ Method(mff0) Store(0xdddd0001, Local0) Return (0) } - Add(0xabcd0003, Local0) + Store(Add(0xabcd0003, Local0), Local1) } Method(m002, 1) @@ -418,7 +418,7 @@ Method(mff0) Return (0) } if (arg0) { - Add(0xabcd0004, Local0) + Store(Add(0xabcd0004, Local0), Local1) } } @@ -434,9 +434,9 @@ Method(mff0) Return (0) } if (arg0) { - Add(0xabcd0005, Local0) + Store(Add(0xabcd0005, Local0), Local1) } else { - Add(0xabcd0006, Local0) + Store(Add(0xabcd0006, Local0), Local1) } } @@ -450,13 +450,13 @@ Method(mff0) switch (arg0) { case (0) { - Add(0xabcd0007, Local0) + Store(Add(0xabcd0007, Local0), Local1) } case (0x12345678) { - Add(0xabcd0008, Local0) + Store(Add(0xabcd0008, Local0), Local1) } default { - Add(0xabcd0009, Local0) + Store(Add(0xabcd0009, Local0), Local1) } } } @@ -470,7 +470,7 @@ Method(mff0) } While (1) { - Add(0xabcd000a, Local0) + Store(Add(0xabcd000a, Local0), Local1) Break } } @@ -483,7 +483,7 @@ Method(mff0) Return (0) } - Add(0xabcd000b, Local0) + Store(Add(0xabcd000b, Local0), Local1) While (0xabcd0002) { Break } @@ -514,7 +514,7 @@ Method(mff0) Decrement(lpN0) Increment(lpC0) Store(0xabcd0005, i000) - Add(0xabcd000c, Local0) + Store(Add(0xabcd000c, Local0), Local1) Continue } } @@ -525,7 +525,7 @@ Method(mff0) { Store(0, Local0) - Add(0xabcd000d, Local0) + Store(Add(0xabcd000d, Local0), Local1) } if (fl00) { @@ -541,7 +541,7 @@ Method(mff0) { Store(0, Local0) - Add(0xabcd000e, Local0, Local0) + Store(Add(0xabcd000e, Local0, Local0), Local1) m001(Local0) } 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 bb8d77661..b1cfa0e90 100644 --- a/tests/aslts/src/runtime/collections/functional/control/ImplicitReturn/store.asl +++ b/tests/aslts/src/runtime/collections/functional/control/ImplicitReturn/store.asl @@ -391,9 +391,9 @@ Method(mf6e) Return (0) } Increment(i002) - Add(0xaaaa0003, 0) - Subtract(0xaaaa0004, 0) - Multiply(0xaaaa0005, 1) + Store(Add(0xaaaa0003, 0), Local1) + Store(Subtract(0xaaaa0004, 0), Local1) + Store(Multiply(0xaaaa0005, 1), Local1) Store(0xaaaa0006, i001) } @@ -404,9 +404,9 @@ Method(mf6e) } if (Store(0xaaaa0007, i001)) { Increment(i002) - Add(0xaaaa0008, 0) - Subtract(0xaaaa0009, 0) - Multiply(0xaaaa000a, 1) + Store(Add(0xaaaa0008, 0), Local1) + Store(Subtract(0xaaaa0009, 0), Local1) + Store(Multiply(0xaaaa000a, 1), Local1) Store(0xaaaa000d, i001) Decrement(i001) } @@ -420,9 +420,9 @@ Method(mf6e) if (Add(0xaaaa000d, 0)) { if (0xaaaa000e) { Increment(i002) - Add(0xaaaa000f, 0) - Subtract(0xaaaa0010, 0) - Multiply(0xaaaa0011, 1) + Store(Add(0xaaaa000f, 0), Local1) + Store(Subtract(0xaaaa0010, 0), Local1) + Store(Multiply(0xaaaa0011, 1), Local1) Store(0xaaaa0012, i001) Increment(i001) }} @@ -435,11 +435,11 @@ Method(mf6e) } while (Subtract(0xaaaa0014, 0)) { Increment(i002) - Add(0xaaaa0015, 0) - Subtract(0xaaaa0016, 0) - Multiply(0xaaaa0017, 1) + Store(Add(0xaaaa0015, 0), Local1) + Store(Subtract(0xaaaa0016, 0), Local1) + Store(Multiply(0xaaaa0017, 1), Local1) Store(0xaaaa0018, i001) - Multiply(0xaaaa0019, 1) + Store(Multiply(0xaaaa0019, 1), Local1) Break } } 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 c5b5a4a16..11b875d5f 100644 --- a/tests/aslts/src/runtime/collections/functional/control/Return/return.asl +++ b/tests/aslts/src/runtime/collections/functional/control/Return/return.asl @@ -128,12 +128,12 @@ Method(mf72, 1) m001() if (Store(0xaaaa0007, i001)) { Increment(i002) - Add(0xaaaa0008, 0) - Subtract(0xaaaa0009, 0) + Store(Add(0xaaaa0008, 0), Local5) + Store(Subtract(0xaaaa0009, 0), Local5) if (LEqual(arg0, 0)) { return (0x55550000) } - Multiply(0xaaaa000a, 1) + Store(Multiply(0xaaaa000a, 1), Local5) Store(0xaaaa000d, i001) Decrement(i001) } @@ -158,12 +158,12 @@ Method(mf72, 1) while (0xabcd0004) { if (Store(0xaaaa0007, i001)) { Increment(i002) - Add(0xaaaa0008, 0) - Subtract(0xaaaa0009, 0) + Store(Add(0xaaaa0008, 0), Local5) + Store(Subtract(0xaaaa0009, 0), Local5) if (LEqual(arg0, 3)) { return (0x55550003) } - Multiply(0xaaaa000a, 1) + Store(Multiply(0xaaaa000a, 1), Local5) Store(0xaaaa000d, i001) Decrement(i001) } @@ -300,8 +300,8 @@ Method(mf72, 1) m001() if (Store(0xaaaa0007, i001)) { Increment(i002) - Add(0xaaaa0008, 0) - Subtract(0xaaaa0009, 0) + Store(Add(0xaaaa0008, 0), Local5) + Store(Subtract(0xaaaa0009, 0), Local5) if (LEqual(arg0, 0)) { CopyObject(Store(CopyObject(Store(CopyObject(CopyObject(Store(Store( m008(arg0, arg1, arg2, arg3, arg4, arg5, arg6), @@ -309,7 +309,7 @@ Method(mf72, 1) return (ret9) // return (0x55550000) } - Multiply(0xaaaa000a, 1) + Store(Multiply(0xaaaa000a, 1), Local5) Store(0xaaaa000d, i001) Decrement(i001) } @@ -338,8 +338,8 @@ Method(mf72, 1) while (0xabcd0004) { if (Store(0xaaaa0007, i001)) { Increment(i002) - Add(0xaaaa0008, 0) - Subtract(0xaaaa0009, 0) + Store(Add(0xaaaa0008, 0), Local5) + Store(Subtract(0xaaaa0009, 0), Local5) if (LEqual(arg0, 3)) { Store(Store(CopyObject(Store(Store(Store(Store(Store( m008(arg0, arg1, arg2, arg3, arg4, arg5, arg6), @@ -347,7 +347,7 @@ Method(mf72, 1) return (ret9) // return (0x55550003) } - Multiply(0xaaaa000a, 1) + Store(Multiply(0xaaaa000a, 1), Local5) Store(0xaaaa000d, i001) Decrement(i001) } diff --git a/tests/aslts/src/runtime/collections/functional/name/package.asl b/tests/aslts/src/runtime/collections/functional/name/package.asl index 3828e3acd..13e8f0f63 100644 --- a/tests/aslts/src/runtime/collections/functional/name/package.asl +++ b/tests/aslts/src/runtime/collections/functional/name/package.asl @@ -1015,7 +1015,7 @@ Method(m1f7) // Store(DeRefOf(Index(p000, 0)), Local0) Store(Index(p000, 0), Local0) - ObjectType(Local0) + Store(ObjectType(Local0), Local2) // Store(ObjectType(Local0), Local1) } |