Changes required for update to Package contruction in interpreter.

Named references are resolved to objects immediately. Except for control methods.

3 files changed, 24 insertions, 24 deletions

diff --git a/tests/aslts/src/runtime/collections/complex/misc/MAIN.asl b/tests/aslts/src/runtime/collections/complex/misc/MAIN.asl
index 385ddc853..1ad101a6d 100644
--- a/tests/aslts/src/runtime/collections/complex/misc/MAIN.asl
+++ b/tests/aslts/src/runtime/collections/complex/misc/MAIN.asl
@@ -31,7 +31,7 @@
 DefinitionBlock(
 	"misc.aml",   // Output filename
 	"DSDT",     // Signature
-	0x02,       // DSDT Revision
+	0x01,       // DSDT Revision
 	"Intel",    // OEMID
 	"Many",     // TABLE ID
 	0x00000001  // OEM Revision
diff --git a/tests/aslts/src/runtime/collections/functional/reference/ref01.asl b/tests/aslts/src/runtime/collections/functional/reference/ref01.asl
index 542998937..2e6c23b9a 100644
--- a/tests/aslts/src/runtime/collections/functional/reference/ref01.asl
+++ b/tests/aslts/src/runtime/collections/functional/reference/ref01.asl
@@ -4142,29 +4142,29 @@ Method(m16c, 1)
 	// Not Computational Data
 
 	m1aa(c080, e900, c009, c08a, 0x14a)
-	CopyObject(e9Z0, e900)
+	CopyObject(RefOf (e9Z0), e900)
 
 	m1aa(c080, mx90, c009, c08a, 0x14b)
-	CopyObject(mx91, mx90)
+	CopyObject(RefOf (mx91), mx90)
 
 	m1aa(c080, d900, c009, c08a, 0x14c)
-	CopyObject(d9Z0, d900)
+	CopyObject(RefOf (d9Z0), d900)
 
 	if (y508) {
 		m1aa(c080, tz90, c009, c08a, 0x14d)
-		CopyObject(tz91, tz90)
+		CopyObject(RefOf (tz91), tz90)
 	}
 
 	m1aa(c080, pr90, c009, c08a, 0x14e)
-	CopyObject(pr91, pr90)
+	CopyObject(RefOf (pr91), pr90)
 
 	if (y510) {
 		m1aa(c080, r900, c009, c08a, 0x14f)
-		CopyObject(r9Z0, r900)
+		CopyObject(RefOf (r9Z0), r900)
 	}
 
 	m1aa(c080, pw90, c009, c08a, 0x150)
-	CopyObject(pw91, pw90)
+	CopyObject(RefOf (pw91), pw90)
 
 	m000()
 	} /* m001 */
diff --git a/tests/aslts/src/runtime/collections/functional/reference/ref06.asl b/tests/aslts/src/runtime/collections/functional/reference/ref06.asl
index 26fb3c610..6fbd5e638 100644
--- a/tests/aslts/src/runtime/collections/functional/reference/ref06.asl
+++ b/tests/aslts/src/runtime/collections/functional/reference/ref06.asl
@@ -215,42 +215,42 @@ Method(m1e0, 1)
 	            m1a3(Local0, c009, z110, ts, 4)
             }
             Case (5) {
-	            CopyObject(d900, Local0)
+	            CopyObject(RefOf(d900), Local0)
 	            m1a3(Local0, c00e, z110, ts, 5)
             }
             Case (6) {
-	            CopyObject(e900, Local0)
+	            CopyObject(RefOf(e900), Local0)
 	            m1a3(Local0, c00f, z110, ts, 6)
             }
             Case (7) {
 	            if (rn06) {
-		            CopyObject(m901, Local0)
+		            CopyObject(RefOf(m901), Local0)
 	            } else {
-		            CopyObject(DerefOf(RefOf(m901)), Local0)
+		            CopyObject(RefOf(m901), Local0)
 	            }
 	            m1a3(Local0, c010, z110, ts, 7)
             }
             Case (8) {
-	            CopyObject(mx90, Local0)
+	            CopyObject(RefOf(mx90), Local0)
 	            m1a3(Local0, c011, z110, ts, 8)
             }
             Case (9) {
 	            if (y510) {
-		            CopyObject(r900, Local0)
+		            CopyObject(RefOf(r900), Local0)
 		            m1a3(Local0, c012, z110, ts, 9)
 	            }
             }
             Case (10) {
-	            CopyObject(pw90, Local0)
+	            CopyObject(RefOf(pw90), Local0)
 	            m1a3(Local0, c013, z110, ts, 10)
             }
             Case (11) {
-	            CopyObject(pr90, Local0)
+	            CopyObject(RefOf(pr90), Local0)
 	            m1a3(Local0, c014, z110, ts, 11)
             }
             Case (12) {
 	            if (y508) {
-		            CopyObject(tz90, Local0)
+		            CopyObject(RefOf(tz90), Local0)
 		            m1a3(Local0, c015, z110, ts, 12)
 	            }
             }
@@ -331,8 +331,8 @@ Method(m1e0, 1)
 	            m1a3(Local0, c011, z110, ts, 28)
             }
             Case (29) {
-		            CopyObject(RefOf(r900), Local0)
-		            m1a3(Local0, c012, z110, ts, 29)
+                CopyObject(RefOf(r900), Local0)
+                m1a3(Local0, c012, z110, ts, 29)
             }
             Case (30) {
 	            CopyObject(RefOf(pw90), Local0)
@@ -393,8 +393,8 @@ Method(m1e0, 1)
 	            m1a3(Local0, c011, z110, ts, 42)
             }
             Case (43) {
-		            Store(RefOf(r900), Local0)
-		            m1a3(Local0, c012, z110, ts, 43)
+                Store(RefOf(r900), Local0)
+                m1a3(Local0, c012, z110, ts, 43)
             }
             Case (44) {
 	            Store(RefOf(pw90), Local0)
@@ -405,8 +405,8 @@ Method(m1e0, 1)
 	            m1a3(Local0, c014, z110, ts, 45)
             }
             Case (46) {
-		            Store(RefOf(tz90), Local0)
-		            m1a3(Local0, c015, z110, ts, 46)
+		        Store(RefOf(tz90), Local0)
+		        m1a3(Local0, c015, z110, ts, 46)
             }
             Case (47) {
 	            Store(RefOf(bf90), Local0)
@@ -733,5 +733,5 @@ Method(m1e0, 1)
 */
 
 
-	m1a6()
+//	m1a6()
 }