ASLTS: converting files to ASL plus with converter

functional/control test case has been left unconverted for
readability of deeply nested control statements (if, switch, while)

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

1 files changed, 72 insertions, 79 deletions

diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0125/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0125/DECL.asl
index 053cc21ca..96aa8ef0a 100644
--- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0125/DECL.asl
+++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0125/DECL.asl
@@ -1,84 +1,77 @@
-/*
- * Some or all of this work - Copyright (c) 2006 - 2017, Intel Corp.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * Neither the name of Intel Corporation nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+    /*
+     * Some or all of this work - Copyright (c) 2006 - 2017, Intel Corp.
+     * All rights reserved.
+     *
+     * Redistribution and use in source and binary forms, with or without modification,
+     * are permitted provided that the following conditions are met:
+     *
+     * Redistributions of source code must retain the above copyright notice,
+     * this list of conditions and the following disclaimer.
+     * Redistributions in binary form must reproduce the above copyright notice,
+     * this list of conditions and the following disclaimer in the documentation
+     * and/or other materials provided with the distribution.
+     * Neither the name of Intel Corporation nor the names of its contributors
+     * may be used to endorse or promote products derived from this software
+     * without specific prior written permission.
+     *
+     * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+     * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+     * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+     * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+     * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+     * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+     * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+     * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+     * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+     * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+     */
+    /*
+     * Bug 125:
+     *
+     * SUMMARY: The Mid operator in 64-bit mode returns non-empty result for improper Index
+     */
+    Method (MF08, 5, NotSerialized)
+    {
+        Debug = Arg0
+        Debug = "source"
+        Debug = Arg1
+        Debug = Arg2
+        Debug = Arg3
+        Debug = "expected"
+        Debug = Arg4
+        Mid (Arg1, Arg2, Arg3, Local0)
+        If ((Arg4 != Local0))
+        {
+            ERR ("", ZFFF, 0x30, 0x00, 0x00, Arg4, Local0)
+        }
+    }
 
-/*
- * Bug 125:
- *
- * SUMMARY: The Mid operator in 64-bit mode returns non-empty result for improper Index
- */
+    Method (MF09, 0, NotSerialized)
+    {
+        Local0 = 0x00
+        /* Mid (Source, Index, Length, Result) */
+        /* a) Index >= 0x100000000 */
+        /* b) Modulo(Index, 0x100000000) < Size. */
+        If (0x0000000100000000)
+        {
+            MF08 ("Buffer: Index >= 0x100000000, Modulo(Index, 0x100000000) < Size:", BD07, 0x0000000100001FFF, 0x8000, Buffer (Local0){})
+            MF08 ("String: Index >= 0x100000000, Modulo(Index, 0x100000000) < Size:", SD03, 0x0000000100000005, 0x0A, "")
+        }
 
-	Method(mf08, 5)
-	{
-		Store(arg0, Debug)
-		Store("source", Debug)
-		Store(arg1, Debug)
-		Store(arg2, Debug)
-		Store(arg3, Debug)
-		Store("expected", Debug)
-		Store(arg4, Debug)
+        /* a) Index < Size */
+        /* b) Index + Length >= 0x100000000 */
+        /* c) Modulo(Index + Length, 0x100000000) < Size. */
+        /* Now causes exception AE_NO_MEMORY */
+        If (0x01)
+        {
+            MF08 ("Buffer: Index < Size, Index + Length >= 0x100000000:", BD07, 0x1388, 0xFFFFF000, Buffer (0x0C79){})
+        }
 
-		Mid(arg1, arg2, arg3, Local0)
-
-		if (LNotEqual(arg4, Local0)) {
-			err("", zFFF, __LINE__, 0, 0, arg4, Local0)
-		}
-	}
-
-	Method(mf09)
-	{
-		Store(0, Local0)
-
-		// Mid (Source, Index, Length, Result)
-		// a) Index >= 0x100000000
-		// b) Modulo(Index, 0x100000000) < Size.
-		if (0x100000000) {
-			mf08("Buffer: Index >= 0x100000000, Modulo(Index, 0x100000000) < Size:",
-				bd07, 0x100001fff, 0x8000, Buffer(Local0){})
-
-			mf08("String: Index >= 0x100000000, Modulo(Index, 0x100000000) < Size:",
-				sd03, 0x100000005, 10, "")
-		}
-
-		// a) Index < Size
-		// b) Index + Length >= 0x100000000
-		// c) Modulo(Index + Length, 0x100000000) < Size.
-
-		// Now causes exception AE_NO_MEMORY
-		if (1) {
-			mf08("Buffer: Index < Size, Index + Length >= 0x100000000:",
-				bd07, 5000, 0xfffff000, Buffer(3193){})
-		}
-
-		// Now causes CRASH
-		if (1) {
-			mf08("String: Index < Size, Index + Length >= 0x100000000:",
-				sd03, 8, 0xfffffffc, "89a")
-		}
-	}
+        /* Now causes CRASH */
 
+        If (0x01)
+        {
+            MF08 ("String: Index < Size, Index + Length >= 0x100000000:", SD03, 0x08, 0xFFFFFFFC, "89a")
+        }
+    }