ASLTS: rstore, rcopyobject: fix expected values to account for CreateField() change

Signed-off-by: Erik Schmauss <erik.schmauss@intel.com>

2 files changed, 67 insertions, 184 deletions

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 0a56d26d6..c7bb6e0fd 100644
--- a/tests/aslts/src/runtime/collections/complex/result/common/rcommon.asl
+++ b/tests/aslts/src/runtime/collections/complex/result/common/rcommon.asl
@@ -2583,25 +2583,16 @@
                 If ((Local0 == 0x00))
                 {
                     Local6 = RefOf (BFL0)
-                    Local5 = 0x03
                 }
                 ElseIf ((Local0 == 0x01))
                 {
                     Local6 = RefOf (BFL2)
-                    If (F64)
-                    {
-                        Local5 = 0x01
-                    }
-                    Else
-                    {
-                        Local5 = 0x03
-                    }
                 }
                 Else
                 {
                     Local6 = RefOf (BFL4)
-                    Local5 = 0x01
                 }
+                Local5 = 0x03
             }
             Else
             {
@@ -3213,25 +3204,16 @@ DerefOf (Index (Buffer (0x12)
                 If ((Local0 == 0x00))
                 {
                     Local6 = RefOf (BFL0)
-                    Local5 = 0x03
                 }
                 ElseIf ((Local0 == 0x01))
                 {
                     Local6 = RefOf (BFL2)
-                    If (F64)
-                    {
-                        Local5 = 0x01
-                    }
-                    Else
-                    {
-                        Local5 = 0x03
-                    }
                 }
                 Else
                 {
                     Local6 = RefOf (BFL4)
-                    Local5 = 0x01
                 }
+                Local5 = 0x03
             }
             Else
             {
@@ -4013,25 +3995,16 @@ DerefOf (Index (Buffer (0x12)
                     If ((Local0 == 0x00))
                     {
                         Local6 = RefOf (BFL0)
-                        Local5 = 0x03
                     }
                     ElseIf ((Local0 == 0x01))
                     {
                         Local6 = RefOf (BFL2)
-                        If (F64)
-                        {
-                            Local5 = 0x01
-                        }
-                        Else
-                        {
-                            Local5 = 0x03
-                        }
                     }
                     Else
                     {
                         Local6 = RefOf (BFL4)
-                        Local5 = 0x01
                     }
+                    Local5 = 0x03
                 }
                 Else
                 {
@@ -4422,25 +4395,16 @@ DerefOf (Index (Buffer (0x12)
                     If ((Local0 == 0x00))
                     {
                         Local6 = RefOf (BFL0)
-                        Local5 = 0x03
                     }
                     ElseIf ((Local0 == 0x01))
                     {
                         Local6 = RefOf (BFL2)
-                        If (F64)
-                        {
-                            Local5 = 0x01
-                        }
-                        Else
-                        {
-                            Local5 = 0x03
-                        }
                     }
                     Else
                     {
                         Local6 = RefOf (BFL4)
-                        Local5 = 0x01
                     }
+                    Local5 = 0x03
                 }
                 Else
                 {
@@ -6806,13 +6770,13 @@ DerefOf (Index (Buffer (0x12)
             P001,
             /* Benchmark Result object value */
 
-            0x65758595,
+            Buffer() {0x95, 0x85, 0x75, 0x65},
             /* Benchmark Result object converted to Target type values */
 
             Package (0x12)
             {
                 0x00,
-                0x65758595,
+                Buffer() {0x95, 0x85, 0x75, 0x65},
                 "65758595",
                 Buffer (0x11)
                 {
@@ -6867,13 +6831,13 @@ DerefOf (Index (Buffer (0x12)
             P001,
             /* Benchmark Result object value */
 
-            0x65758595,
+            Buffer() {0x95, 0x85, 0x75, 0x65},
             /* Benchmark Result object converted to Target type values */
 
             Package (0x12)
             {
                 0x00,
-                0x65758595,
+                Buffer() {0x95, 0x85, 0x75, 0x65},
                 "0000000065758595",
                 Buffer (0x11)
                 {
@@ -7270,10 +7234,10 @@ DerefOf (SCL0 [LPC0])))
         Concatenate (Arg0, "-m020", Arg0)
         /* Named-Named */
 
-        M020 (Concatenate (Arg0, "-NN"), Arg1, Arg2, B676, B676, 0x00)
+        M020 (Concatenate (Arg0, "-NN"), Arg1, Arg2, B676, B676, 0x00) // TODO:
         /* Named-LocalX */
 
-        M020 (Concatenate (Arg0, "-NL"), Arg1, Arg2, B677, B676, 0x01)
+        M020 (Concatenate (Arg0, "-NL"), Arg1, Arg2, B677, B676, 0x01) // TODO:
         /* LocalX-Named */
 
         M020 (Concatenate (Arg0, "-LN"), Arg1, Arg2, B676, B677, 0x02)
@@ -7282,10 +7246,10 @@ DerefOf (SCL0 [LPC0])))
         M020 (Concatenate (Arg0, "-LL"), Arg1, Arg2, B677, B677, 0x03)
         /* Named-ArgX(Named read-only) */
 
-        M020 (Concatenate (Arg0, "-NA-RO"), Arg1, Arg2, B676, B676, 0x04)
+        M020 (Concatenate (Arg0, "-NA-RO"), Arg1, Arg2, B676, B676, 0x04) // TODO:
         /* Named-ArgX(Named by reference) */
 
-        M020 (Concatenate (Arg0, "-NA-REF"), Arg1, Arg2, B676, B676, 0x05)
+        M020 (Concatenate (Arg0, "-NA-REF"), Arg1, Arg2, B676, B676, 0x05) // TODO:
         /* LocalX-Element of Package */
 
         If ((Arg1 == 0x00))
diff --git a/tests/aslts/src/runtime/collections/complex/result/tests/rstore/rstore.asl b/tests/aslts/src/runtime/collections/complex/result/tests/rstore/rstore.asl
index 8161519fd..743e04b2e 100644
--- a/tests/aslts/src/runtime/collections/complex/result/tests/rstore/rstore.asl
+++ b/tests/aslts/src/runtime/collections/complex/result/tests/rstore/rstore.asl
@@ -4405,10 +4405,10 @@
             Method (M010, 3, NotSerialized)
             {
                 M680 (Arg0, Arg1, 0x00, ObjectType (BF80), 0x0E)
-                M680 (Arg0, Arg1, 0x01, BF80, 0x5650A284)
+                M680 (Arg0, Arg1, 0x01, BF80, Buffer(){0x84, 0xA2, 0x50, 0x56})
                 BF80 = 0xC179B3FE
                 M680 (Arg0, Arg1, 0x02, ObjectType (BF80), 0x0E)
-                M680 (Arg0, Arg1, 0x03, BF80, 0x4179B3FE)
+                M680 (Arg0, Arg1, 0x03, BF80, Buffer(){0xFE, 0xB3, 0x79, 0x41})
             }
 
             /* Check storing of "FE7CB391D650A284" to bf80, */
@@ -4417,10 +4417,10 @@
             Method (M020, 3, NotSerialized)
             {
                 M680 (Arg0, Arg1, 0x00, ObjectType (BF80), 0x0E)
-                M680 (Arg0, Arg1, 0x01, BF80, 0x43374546)
+                M680 (Arg0, Arg1, 0x01, BF80, Buffer(){0x46, 0x45, 0x37, 0x43})
                 BF80 = "C179B3FE"
                 M680 (Arg0, Arg1, 0x02, ObjectType (BF80), 0x0E)
-                M680 (Arg0, Arg1, 0x03, BF80, 0x39373143)
+                M680 (Arg0, Arg1, 0x03, BF80, Buffer(){0x43, 0x31, 0x37, 0x39})
             }
 
             /* Check storing of Buffer(){0x84, 0xA2, 0x50, 0xD6, 0x91, 0xB3, 0x7C, 0xFE} */
@@ -4429,13 +4429,13 @@
             Method (M030, 3, NotSerialized)
             {
                 M680 (Arg0, Arg1, 0x00, ObjectType (BF80), 0x0E)
-                M680 (Arg0, Arg1, 0x01, BF80, 0x5650A284)
+                M680 (Arg0, Arg1, 0x01, BF80, Buffer(){0x84, 0xA2, 0x50, 0x56})
                 BF80 = Buffer (0x04)
                     {
                          0xFE, 0xB3, 0x79, 0xC1                           // ..y.
                     }
                 M680 (Arg0, Arg1, 0x02, ObjectType (BF80), 0x0E)
-                M680 (Arg0, Arg1, 0x03, BF80, 0x4179B3FE)
+                M680 (Arg0, Arg1, 0x03, BF80, Buffer(){0xFE, 0xB3, 0x79, 0x41})
             }
 
             /* Fill the bytes range of the Buffer Field in the SourceBuffer */
@@ -4818,10 +4818,10 @@
 
                             BF80 = Mid (S6E7, 0x02, 0x0E)
                             M680 (Arg0, 0x0293, 0x00, ObjectType (BF80), 0x0E)
-                            M680 (Arg0, 0x0294, 0x00, BF80, 0x33424337)
+                            M680 (Arg0, 0x0294, 0x00, BF80, Buffer() {0x37, 0x43, 0x42, 0x33})
                             BF80 = "C179B3FE"
                             M680 (Arg0, 0x0295, 0x00, ObjectType (BF80), 0x0E)
-                            M680 (Arg0, 0x0296, 0x00, BF80, 0x39373143)
+                            M680 (Arg0, 0x0296, 0x00, BF80, Buffer() {0x43, 0x31, 0x37, 0x39})
                             M680 (Arg0, 0x0297, 0x00, S6E7, "FE7CB391D650A284")
                         }
                         Case (0x03)
@@ -4830,13 +4830,13 @@
 
                             BF80 = Mid (B6E7, 0x01, 0x07)
                             M680 (Arg0, 0x0298, 0x00, ObjectType (BF80), 0x0E)
-                            M680 (Arg0, 0x0299, 0x00, BF80, 0x11D650A2)
+                            M680 (Arg0, 0x0299, 0x00, BF80, Buffer() {0xA2, 0x50, 0xD6, 0x11})
                             BF80 = Buffer (0x04)
                                 {
                                      0xFE, 0xB3, 0x79, 0xC1                           // ..y.
                                 }
                             M680 (Arg0, 0x029A, 0x00, ObjectType (BF80), 0x0E)
-                            M680 (Arg0, 0x029B, 0x00, BF80, 0x4179B3FE)
+                            M680 (Arg0, 0x029B, 0x00, BF80, Buffer() {0xFE, 0xB3, 0x79, 0x41})
                             M680 (Arg0, 0x029C, 0x00, B6E7, Buffer (0x08)
                                 {
                                      0x84, 0xA2, 0x50, 0xD6, 0x91, 0xB3, 0x7C, 0xFE   // ..P...|.
@@ -4997,33 +4997,19 @@
             Method (M010, 3, NotSerialized)
             {
                 M680 (Arg0, Arg1, 0x00, ObjectType (BF81), 0x0E)
-                If (F64)
-                {
-                    M680 (Arg0, Arg1, 0x01, BF81, 0x7E7CB391D650A284)
-                }
-                Else
-                {
-                    M680 (Arg0, Arg1, 0x02, BF81, Buffer (0x08)
-                        {
-                             0x84, 0xA2, 0x50, 0xD6, 0x00, 0x00, 0x00, 0x00   // ..P.....
-                        })
-                }
+                M680 (Arg0, Arg1, 0x02, BF81, Buffer (0x08)
+                    {
+                        0x84, 0xA2, 0x50, 0xD6, 0x91, 0xB3, 0x7C, 0x7E   // ..P.....
+                    })
 
                 If (Arg2)
                 {
                     BF81 = 0xC179B3FE
                     M680 (Arg0, Arg1, 0x03, ObjectType (BF81), 0x0E)
-                    If (F64)
-                    {
-                        M680 (Arg0, Arg1, 0x04, BF81, 0xC179B3FE)
-                    }
-                    Else
-                    {
-                        M680 (Arg0, Arg1, 0x05, BF81, Buffer (0x08)
-                            {
-                                 0xFE, 0xB3, 0x79, 0xC1, 0x00, 0x00, 0x00, 0x00   // ..y.....
-                            })
-                    }
+                    M680 (Arg0, Arg1, 0x05, BF81, Buffer (0x08)
+                        {
+                            0xFE, 0xB3, 0x79, 0xC1, 0x00, 0x00, 0x00, 0x00   // ..y.....
+                        })
                 }
             }
 
@@ -5033,33 +5019,19 @@
             Method (M020, 3, NotSerialized)
             {
                 M680 (Arg0, Arg1, 0x00, ObjectType (BF81), 0x0E)
-                If (F64)
-                {
-                    M680 (Arg0, Arg1, 0x01, BF81, 0x3139334243374546)
-                }
-                Else
-                {
-                    M680 (Arg0, Arg1, 0x02, BF81, Buffer (0x08)
-                        {
-                             0x46, 0x45, 0x37, 0x43, 0x42, 0x33, 0x39, 0x31   // FE7CB391
-                        })
-                }
+                M680 (Arg0, Arg1, 0x02, BF81, Buffer (0x08)
+                    {
+                        0x46, 0x45, 0x37, 0x43, 0x42, 0x33, 0x39, 0x31   // FE7CB391
+                    })
 
                 If (Arg2)
                 {
                     BF81 = "C179B3FE"
                     M680 (Arg0, Arg1, 0x03, ObjectType (BF81), 0x0E)
-                    If (F64)
-                    {
-                        M680 (Arg0, Arg1, 0x04, BF81, 0x4546334239373143)
-                    }
-                    Else
-                    {
-                        M680 (Arg0, Arg1, 0x05, BF81, Buffer (0x08)
-                            {
-                                 0x43, 0x31, 0x37, 0x39, 0x42, 0x33, 0x46, 0x45   // C179B3FE
-                            })
-                    }
+                    M680 (Arg0, Arg1, 0x05, BF81, Buffer (0x08)
+                        {
+                            0x43, 0x31, 0x37, 0x39, 0x42, 0x33, 0x46, 0x45   // C179B3FE
+                        })
                 }
             }
 
@@ -5069,17 +5041,10 @@
             Method (M030, 3, NotSerialized)
             {
                 M680 (Arg0, Arg1, 0x00, ObjectType (BF81), 0x0E)
-                If (F64)
-                {
-                    M680 (Arg0, Arg1, 0x01, BF81, 0x7E7CB391D650A284)
-                }
-                Else
-                {
-                    M680 (Arg0, Arg1, 0x02, BF81, Buffer (0x08)
-                        {
-                             0x84, 0xA2, 0x50, 0xD6, 0x91, 0xB3, 0x7C, 0x7E   // ..P...|~
-                        })
-                }
+                M680 (Arg0, Arg1, 0x02, BF81, Buffer (0x08)
+                    {
+                        0x84, 0xA2, 0x50, 0xD6, 0x91, 0xB3, 0x7C, 0x7E   // ..P...|~
+                    })
 
                 If (Arg2)
                 {
@@ -5088,17 +5053,10 @@
                              0xFE, 0xB3, 0x79, 0xC1                           // ..y.
                         }
                     M680 (Arg0, Arg1, 0x03, ObjectType (BF81), 0x0E)
-                    If (F64)
-                    {
-                        M680 (Arg0, Arg1, 0x04, BF81, 0xC179B3FE)
-                    }
-                    Else
-                    {
-                        M680 (Arg0, Arg1, 0x05, BF81, Buffer (0x08)
-                            {
-                                 0xFE, 0xB3, 0x79, 0xC1, 0x00, 0x00, 0x00, 0x00   // ..y.....
-                            })
-                    }
+                    M680 (Arg0, Arg1, 0x05, BF81, Buffer (0x08)
+                        {
+                            0xFE, 0xB3, 0x79, 0xC1, 0x00, 0x00, 0x00, 0x00   // ..y.....
+                        })
                 }
             }
 
@@ -5482,31 +5440,17 @@
 
                             BF81 = Mid (S6E7, 0x02, 0x0E)
                             M680 (Arg0, 0x02C6, 0x00, ObjectType (BF81), 0x0E)
-                            If (F64)
-                            {
-                                M680 (Arg0, 0x02C7, 0x00, BF81, 0x3644313933424337)
-                            }
-                            Else
-                            {
-                                M680 (Arg0, 0x02C8, 0x00, BF81, Buffer (0x08)
-                                    {
-                                         0x37, 0x43, 0x42, 0x33, 0x39, 0x31, 0x44, 0x36   // 7CB391D6
-                                    })
-                            }
+                            M680 (Arg0, 0x02C8, 0x00, BF81, Buffer (0x08)
+                                {
+                                     0x37, 0x43, 0x42, 0x33, 0x39, 0x31, 0x44, 0x36   // 7CB391D6
+                                })
 
                             BF81 = "C179B3FE"
                             M680 (Arg0, 0x02C9, 0x00, ObjectType (BF81), 0x0E)
-                            If (F64)
-                            {
-                                M680 (Arg0, 0x02CA, 0x00, BF81, 0x4546334239373143)
-                            }
-                            Else
-                            {
-                                M680 (Arg0, 0x02CB, 0x00, BF81, Buffer (0x08)
-                                    {
-                                         0x43, 0x31, 0x37, 0x39, 0x42, 0x33, 0x46, 0x45   // C179B3FE
-                                    })
-                            }
+                            M680 (Arg0, 0x02CB, 0x00, BF81, Buffer (0x08)
+                                {
+                                     0x43, 0x31, 0x37, 0x39, 0x42, 0x33, 0x46, 0x45   // C179B3FE
+                                })
 
                             M680 (Arg0, 0x02CC, 0x00, S6E7, "FE7CB391D650A284")
                         }
@@ -5516,34 +5460,20 @@
 
                             BF81 = Mid (B6E7, 0x01, 0x07)
                             M680 (Arg0, 0x02CD, 0x00, ObjectType (BF81), 0x0E)
-                            If (F64)
-                            {
-                                M680 (Arg0, 0x02CE, 0x00, BF81, 0x00FE7CB391D650A2)
-                            }
-                            Else
-                            {
-                                M680 (Arg0, 0x02CF, 0x00, BF81, Buffer (0x08)
-                                    {
-                                         0xA2, 0x50, 0xD6, 0x91, 0xB3, 0x7C, 0xFE, 0x00   // .P...|..
-                                    })
-                            }
+                            M680 (Arg0, 0x02CF, 0x00, BF81, Buffer (0x08)
+                                {
+                                     0xA2, 0x50, 0xD6, 0x91, 0xB3, 0x7C, 0xFE, 0x00   // .P...|..
+                                })
 
                             BF81 = Buffer (0x04)
                                 {
                                      0xFE, 0xB3, 0x79, 0xC1                           // ..y.
                                 }
                             M680 (Arg0, 0x02D0, 0x00, ObjectType (BF81), 0x0E)
-                            If (F64)
-                            {
-                                M680 (Arg0, 0x02D1, 0x00, BF81, 0xC179B3FE)
-                            }
-                            Else
-                            {
-                                M680 (Arg0, 0x02D2, 0x00, BF81, Buffer (0x08)
-                                    {
-                                         0xFE, 0xB3, 0x79, 0xC1, 0x00, 0x00, 0x00, 0x00   // ..y.....
-                                    })
-                            }
+                            M680 (Arg0, 0x02D2, 0x00, BF81, Buffer (0x08)
+                                {
+                                     0xFE, 0xB3, 0x79, 0xC1, 0x00, 0x00, 0x00, 0x00   // ..y.....
+                                })
 
                             M680 (Arg0, 0x02D3, 0x00, B6E7, Buffer (0x08)
                                 {
@@ -5705,22 +5635,11 @@
             Method (M010, 3, NotSerialized)
             {
                 M680 (Arg0, Arg1, 0x00, ObjectType (BF82), 0x0E)
-                If (F64)
-                {
-                    M680 (Arg0, Arg1, 0x01, BF82, Buffer (0x09)
-                        {
-                            /* 0000 */  0x84, 0xA2, 0x50, 0xD6, 0x91, 0xB3, 0x7C, 0xFE,  // ..P...|.
-                            /* 0008 */  0x00                                             // .
-                        })
-                }
-                Else
-                {
-                    M680 (Arg0, Arg1, 0x02, BF82, Buffer (0x09)
-                        {
-                            /* 0000 */  0x84, 0xA2, 0x50, 0xD6, 0x00, 0x00, 0x00, 0x00,  // ..P.....
-                            /* 0008 */  0x00                                             // .
-                        })
-                }
+                M680 (Arg0, Arg1, 0x01, BF82, Buffer (0x09)
+                    {
+                        /* 0000 */  0x84, 0xA2, 0x50, 0xD6, 0x91, 0xB3, 0x7C, 0xFE,  // ..P...|.
+                        /* 0008 */  0x00                                             // .
+                    })
 
                 If (Arg2)
                 {