Fixup the compiler/disassembler to support big-endian.

Signed-off-by: Al Stone <ahs3@redhat.com>

diff -Naur acpica-unix2-20160930/source/common/acfileio.c acpica-unix2-20160930-s390/source/common/acfileio.c

--- acpica-unix2-20160930/source/common/acfileio.c	2016-09-30 10:43:55.000000000 -0600

+++ acpica-unix2-20160930-s390/source/common/acfileio.c	2016-10-28 14:25:41.845397957 -0600

@@ -241,6 +241,7 @@

     ACPI_TABLE_HEADER       *Table;

     INT32                   Count;

     long                    TableOffset;

+    UINT32		    TableLen;

     *ReturnTable = NULL;

@@ -281,7 +282,8 @@

     /* Allocate a buffer for the entire table */

-    Table = AcpiOsAllocate ((ACPI_SIZE) TableHeader.Length);

+    ACPI_MOVE_32_TO_32(&TableLen, &TableHeader.Length);

+    Table = AcpiOsAllocate ((ACPI_SIZE) TableLen);

     if (!Table)

     {

         return (AE_NO_MEMORY);

@@ -291,8 +293,8 @@

     fseek (File, TableOffset, SEEK_SET);

-    Count = fread (Table, 1, TableHeader.Length, File);

-    if (Count != (INT32) TableHeader.Length)

+    Count = fread (Table, 1, TableLen, File);

+    if (Count != (INT32) TableLen)

     {

         Status = AE_ERROR;

         goto ErrorExit;

@@ -300,7 +302,7 @@

     /* Validate the checksum (just issue a warning) */

-    Status = AcpiTbVerifyChecksum (Table, TableHeader.Length);

+    Status = AcpiTbVerifyChecksum (Table, TableLen);

     if (ACPI_FAILURE (Status))

     {

         Status = AcCheckTextModeCorruption (Table);

@@ -392,6 +394,7 @@

     ACPI_SIZE               Actual;

     long                    OriginalOffset;

     UINT32                  FileSize;

+    UINT32                  TableLength;

     UINT32                  i;

@@ -423,11 +426,12 @@

     /* Validate table length against bytes remaining in the file */

     FileSize = CmGetFileSize (File);

-    if (TableHeader.Length > (UINT32) (FileSize - TableOffset))

+    ACPI_MOVE_32_TO_32(&TableLength, &TableHeader.Length);

+    if (TableLength > (UINT32) (FileSize - TableOffset))

     {

         fprintf (stderr, "Table [%4.4s] is too long for file - "

             "needs: 0x%.2X, remaining in file: 0x%.2X\n",

-            TableHeader.Signature, TableHeader.Length,

+            TableHeader.Signature, TableLength,

             (UINT32) (FileSize - TableOffset));

         return (AE_BAD_HEADER);

     }

diff -Naur acpica-unix2-20160930/source/common/ahpredef.c acpica-unix2-20160930-s390/source/common/ahpredef.c

--- acpica-unix2-20160930/source/common/ahpredef.c	2016-09-30 10:43:56.000000000 -0600

+++ acpica-unix2-20160930-s390/source/common/ahpredef.c	2016-10-28 14:25:41.844397962 -0600

@@ -358,7 +358,7 @@

     char                        *Nameseg)

 {

     const AH_PREDEFINED_NAME    *Info;

-

+  

     for (Info = AslPredefinedInfo; Info->Name; Info++)

     {

diff -Naur acpica-unix2-20160930/source/common/dmtable.c acpica-unix2-20160930-s390/source/common/dmtable.c

--- acpica-unix2-20160930/source/common/dmtable.c	2016-09-30 10:43:56.000000000 -0600

+++ acpica-unix2-20160930-s390/source/common/dmtable.c	2016-10-28 14:25:41.840397982 -0600

@@ -499,7 +499,7 @@

      */

     if (ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_FACS))

     {

-        Length = Table->Length;

+        ACPI_MOVE_32_TO_32(&Length, &Table->Length);

         Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoFacs);

         if (ACPI_FAILURE (Status))

         {

@@ -513,13 +513,14 @@

     else if (ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_S3PT))

     {

         Length = AcpiDmDumpS3pt (Table);

+        ACPI_MOVE_32_TO_32(&Length, &Table->Length);

     }

     else

     {

         /*

          * All other tables must use the common ACPI table header, dump it now

          */

-        Length = Table->Length;

+        ACPI_MOVE_32_TO_32(&Length, &Table->Length);

         Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoHeader);

         if (ACPI_FAILURE (Status))

         {

@@ -730,6 +731,7 @@

     BOOLEAN                 LastOutputBlankLine = FALSE;

     ACPI_STATUS             Status;

     char                    RepairedName[8];

+    UINT16		    Val16;

     if (!Info)

@@ -1097,8 +1099,9 @@

             /* Checksum, display and validate */

             AcpiOsPrintf ("%2.2X", *Target);

-            Temp8 = AcpiDmGenerateChecksum (Table,

-                ACPI_CAST_PTR (ACPI_TABLE_HEADER, Table)->Length,

+	    ACPI_MOVE_32_TO_32(&Temp32,

+			&ACPI_CAST_PTR (ACPI_TABLE_HEADER, Table)->Length);

+            Temp8 = AcpiDmGenerateChecksum (Table, Temp32,

                 ACPI_CAST_PTR (ACPI_TABLE_HEADER, Table)->Checksum);

             if (Temp8 != ACPI_CAST_PTR (ACPI_TABLE_HEADER, Table)->Checksum)

@@ -1163,14 +1166,14 @@

             /* DMAR subtable types */

-            Temp16 = ACPI_GET16 (Target);

+            Val16 = ACPI_GET16 (Target);

+	    ACPI_MOVE_16_TO_16(&Temp16, &Val16);

             if (Temp16 > ACPI_DMAR_TYPE_RESERVED)

             {

                 Temp16 = ACPI_DMAR_TYPE_RESERVED;

             }

-            AcpiOsPrintf (UINT16_FORMAT, ACPI_GET16 (Target),

-                AcpiDmDmarSubnames[Temp16]);

+            AcpiOsPrintf (UINT16_FORMAT, Temp16, AcpiDmDmarSubnames[Temp16]);

             break;

         case ACPI_DMT_DMAR_SCOPE:

@@ -1261,14 +1264,14 @@

             /* HEST subtable types */

-            Temp16 = ACPI_GET16 (Target);

+            Val16 = ACPI_GET16 (Target);

+	    ACPI_MOVE_16_TO_16(&Temp16, &Val16);

             if (Temp16 > ACPI_HEST_TYPE_RESERVED)

             {

                 Temp16 = ACPI_HEST_TYPE_RESERVED;

             }

-            AcpiOsPrintf (UINT16_FORMAT, ACPI_GET16 (Target),

-                AcpiDmHestSubnames[Temp16]);

+            AcpiOsPrintf (UINT16_FORMAT, Temp16, AcpiDmHestSubnames[Temp16]);

             break;

         case ACPI_DMT_HESTNTFY:

@@ -1334,13 +1337,14 @@

             /* NFIT subtable types */

-            Temp16 = ACPI_GET16 (Target);

+            Val16 = ACPI_GET16 (Target);

+            ACPI_MOVE_16_TO_16(&Temp16, &Val16);

             if (Temp16 > ACPI_NFIT_TYPE_RESERVED)

             {

                 Temp16 = ACPI_NFIT_TYPE_RESERVED;

             }

-            AcpiOsPrintf (UINT16_FORMAT, ACPI_GET16 (Target),

+            AcpiOsPrintf (UINT16_FORMAT, Temp16,

                 AcpiDmNfitSubnames[Temp16]);

             break;

diff -Naur acpica-unix2-20160930/source/common/dmtables.c acpica-unix2-20160930-s390/source/common/dmtables.c

--- acpica-unix2-20160930/source/common/dmtables.c	2016-09-30 10:43:56.000000000 -0600

+++ acpica-unix2-20160930-s390/source/common/dmtables.c	2016-10-28 14:25:41.844397962 -0600

@@ -140,7 +140,9 @@

     ACPI_TABLE_HEADER       *Table)

 {

     UINT8                   Checksum;

-

+    UINT32		    TableLen;

+    UINT32		    OemRev;

+    UINT32		    CompilerRev;

     /* Reset globals for External statements */

@@ -152,9 +154,10 @@

      */

     AdDisassemblerHeader (Filename, ACPI_IS_AML_TABLE);

+    ACPI_MOVE_32_TO_32(&TableLen, &Table->Length);

     AcpiOsPrintf (" * Original Table Header:\n");

     AcpiOsPrintf (" *     Signature        \"%4.4s\"\n",    Table->Signature);

-    AcpiOsPrintf (" *     Length           0x%8.8X (%u)\n", Table->Length, Table->Length);

+    AcpiOsPrintf (" *     Length           0x%8.8X (%u)\n", TableLen, TableLen);

     /* Print and validate the revision */

@@ -186,7 +189,7 @@

     AcpiOsPrintf ("\n *     Checksum         0x%2.2X",        Table->Checksum);

-    Checksum = AcpiTbChecksum (ACPI_CAST_PTR (UINT8, Table), Table->Length);

+    Checksum = AcpiTbChecksum (ACPI_CAST_PTR (UINT8, Table), TableLen);

     if (Checksum)

     {

         AcpiOsPrintf (" **** Incorrect checksum, should be 0x%2.2X",

@@ -196,9 +199,11 @@

     AcpiOsPrintf ("\n");

     AcpiOsPrintf (" *     OEM ID           \"%.6s\"\n",     Table->OemId);

     AcpiOsPrintf (" *     OEM Table ID     \"%.8s\"\n",     Table->OemTableId);

-    AcpiOsPrintf (" *     OEM Revision     0x%8.8X (%u)\n", Table->OemRevision, Table->OemRevision);

+    ACPI_MOVE_32_TO_32(&OemRev, &Table->OemRevision);

+    AcpiOsPrintf (" *     OEM Revision     0x%8.8X (%u)\n", OemRev, OemRev);

     AcpiOsPrintf (" *     Compiler ID      \"%.4s\"\n",     Table->AslCompilerId);

-    AcpiOsPrintf (" *     Compiler Version 0x%8.8X (%u)\n", Table->AslCompilerRevision, Table->AslCompilerRevision);

+    ACPI_MOVE_32_TO_32(&CompilerRev, &Table->AslCompilerRevision);

+    AcpiOsPrintf (" *     Compiler Version 0x%8.8X (%u)\n", CompilerRev, CompilerRev);

     AcpiOsPrintf (" */\n");

     /*

@@ -211,7 +216,7 @@

     AcpiOsPrintf (

         "DefinitionBlock (\"\", \"%4.4s\", %hu, \"%.6s\", \"%.8s\", 0x%8.8X)\n",

         Table->Signature, Table->Revision,

-        Table->OemId, Table->OemTableId, Table->OemRevision);

+        Table->OemId, Table->OemTableId, OemRev);

 }

@@ -386,7 +391,8 @@

     fprintf (stderr, "Pass 1 parse of [%4.4s]\n", (char *) Table->Signature);

-    AmlLength = Table->Length - sizeof (ACPI_TABLE_HEADER);

+    ACPI_MOVE_32_TO_32(&AmlLength, &Table->Length);

+    AmlLength -= sizeof (ACPI_TABLE_HEADER);

     AmlStart = ((UINT8 *) Table + sizeof (ACPI_TABLE_HEADER));

     /* Create the root object */

diff -Naur acpica-unix2-20160930/source/common/dmtbdump.c acpica-unix2-20160930-s390/source/common/dmtbdump.c

--- acpica-unix2-20160930/source/common/dmtbdump.c	2016-09-30 10:43:56.000000000 -0600

+++ acpica-unix2-20160930-s390/source/common/dmtbdump.c	2016-10-28 14:25:41.841397977 -0600

@@ -296,6 +296,8 @@

     UINT32                  Entries;

     UINT32                  Offset;

     UINT32                  i;

+    UINT32		    Length;

+    UINT32		    Address;

     /* Point to start of table pointer array */

@@ -305,12 +307,14 @@

     /* RSDT uses 32-bit pointers */

-    Entries = (Table->Length - sizeof (ACPI_TABLE_HEADER)) / sizeof (UINT32);

+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);

+    Entries = (Length - sizeof (ACPI_TABLE_HEADER)) / sizeof (UINT32);

     for (i = 0; i < Entries; i++)

     {

         AcpiDmLineHeader2 (Offset, sizeof (UINT32), "ACPI Table Address", i);

-        AcpiOsPrintf ("%8.8X\n", Array[i]);

+	ACPI_MOVE_32_TO_32(&Address, &Array[i]);

+        AcpiOsPrintf ("%8.8X\n", Address);

         Offset += sizeof (UINT32);

     }

 }

@@ -336,6 +340,8 @@

     UINT32                  Entries;

     UINT32                  Offset;

     UINT32                  i;

+    UINT32                  Length;

+    UINT64		    Address;

     /* Point to start of table pointer array */

@@ -345,12 +351,14 @@

     /* XSDT uses 64-bit pointers */

-    Entries = (Table->Length - sizeof (ACPI_TABLE_HEADER)) / sizeof (UINT64);

+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);

+    Entries = (Length - sizeof (ACPI_TABLE_HEADER)) / sizeof (UINT64);

     for (i = 0; i < Entries; i++)

     {

         AcpiDmLineHeader2 (Offset, sizeof (UINT64), "ACPI Table Address", i);

-        AcpiOsPrintf ("%8.8X%8.8X\n", ACPI_FORMAT_UINT64 (Array[i]));

+	ACPI_MOVE_64_TO_64(&Address, &Array[i]);

+        AcpiOsPrintf ("%8.8X%8.8X\n", ACPI_FORMAT_UINT64 (Address));

         Offset += sizeof (UINT64);

     }

 }

@@ -384,6 +392,7 @@

     ACPI_STATUS             Status;

     UINT8                   FadtRevision;

     UINT32                  ExpectedLength;

+    UINT32                  ActualLength;

     UINT32                  i;

@@ -400,6 +409,7 @@

         return;

     }

+    ACPI_MOVE_32_TO_32(&ActualLength, &Table->Length);

     if (FadtRevision > ACPI_FADT_MAX_VERSION)

     {

         AcpiOsPrintf ("// ACPI Warning: Revision %u is not fully supported, "

@@ -409,12 +419,12 @@

     else

     {

         ExpectedLength = FadtRevisionLength[FadtRevision];

-        if (Table->Length != ExpectedLength)

+        if (ActualLength != ExpectedLength)

         {

             AcpiOsPrintf (

                 "// ACPI Warning: Input FADT revision %X does not match "

                 "expected length: found 0x%X expected 0x%X\n",

-                FadtRevision, Table->Length, ExpectedLength);

+                FadtRevision, ActualLength, ExpectedLength);

         }

     }

@@ -432,14 +442,14 @@

         /* Dump the fields specific to FADT revision[i] */

-        Status = AcpiDmDumpTable (Table->Length, 0, Table, 0,

+        Status = AcpiDmDumpTable (ActualLength, 0, Table, 0,

             FadtRevisionInfo[i]);

         if (ACPI_FAILURE (Status))

         {

             return;

         }

-        if (Table->Length <= FadtRevisionLength[i])

+        if (ActualLength <= FadtRevisionLength[i])

         {

             break;  /* End of table */

         }

@@ -447,7 +457,7 @@

     /* Build a local FADT to test some FADT values */

-    AcpiTbCreateLocalFadt (Table, Table->Length);

+    AcpiTbCreateLocalFadt (Table, ActualLength);

 }

@@ -478,17 +488,21 @@

     UINT32                  DataOffset = 0;

     UINT32                  i;

     UINT8                   Type;

+    UINT32		    Len;

+    UINT16		    SubLen;

     /* No main table, only subtables */

+    ACPI_MOVE_32_TO_32(&Len, &Table->Length);

     SubTable = ACPI_ADD_PTR (ACPI_ASF_INFO, Table, Offset);

-    while (Offset < Table->Length)

+    while (Offset < Len)

     {

         /* Common subtable header */

-        Status = AcpiDmDumpTable (Table->Length, Offset, SubTable,

-            SubTable->Header.Length, AcpiDmTableInfoAsfHdr);

+	ACPI_MOVE_16_TO_16(&SubLen, &SubTable->Header.Length);

+        Status = AcpiDmDumpTable (Len, Offset, SubTable,

+            SubLen, AcpiDmTableInfoAsfHdr);

         if (ACPI_FAILURE (Status))

         {

             return;

@@ -545,8 +559,7 @@

             return;

         }

-        Status = AcpiDmDumpTable (Table->Length, Offset, SubTable,

-            SubTable->Header.Length, InfoTable);

+        Status = AcpiDmDumpTable (Len, Offset, SubTable, SubLen, InfoTable);

         if (ACPI_FAILURE (Status))

         {

             return;

@@ -562,7 +575,7 @@

             for (i = 0; i < DataCount; i++)

             {

                 AcpiOsPrintf ("\n");

-                Status = AcpiDmDumpTable (Table->Length, DataOffset,

+                Status = AcpiDmDumpTable (Len, DataOffset,

                     DataTable, DataLength, DataInfoTable);

                 if (ACPI_FAILURE (Status))

                 {

@@ -608,15 +621,14 @@

         /* Point to next subtable */

-        if (!SubTable->Header.Length)

+        if (!SubLen)

         {

             AcpiOsPrintf ("Invalid zero subtable header length\n");

             return;

         }

-        Offset += SubTable->Header.Length;

-        SubTable = ACPI_ADD_PTR (ACPI_ASF_INFO, SubTable,

-            SubTable->Header.Length);

+        Offset += SubLen;

+        SubTable = ACPI_ADD_PTR (ACPI_ASF_INFO, SubTable, SubLen);

     }

 }

@@ -640,12 +652,13 @@

 {

     ACPI_STATUS             Status;

     ACPI_CPEP_POLLING       *SubTable;

-    UINT32                  Length = Table->Length;

+    UINT32                  Length;

     UINT32                  Offset = sizeof (ACPI_TABLE_CPEP);

     /* Main table */

+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);

     Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoCpep);

     if (ACPI_FAILURE (Status))

     {

@@ -655,7 +668,7 @@

     /* Subtables */

     SubTable = ACPI_ADD_PTR (ACPI_CPEP_POLLING, Table, Offset);

-    while (Offset < Table->Length)

+    while (Offset < Length)

     {

         AcpiOsPrintf ("\n");

         Status = AcpiDmDumpTable (Length, Offset, SubTable,

@@ -695,7 +708,10 @@

     ACPI_CSRT_GROUP         *SubTable;

     ACPI_CSRT_SHARED_INFO   *SharedInfoTable;

     ACPI_CSRT_DESCRIPTOR    *SubSubTable;

-    UINT32                  Length = Table->Length;

+    UINT32                  Length;

+    UINT32                  SubLength;

+    UINT32                  SubSubLength;

+    UINT32                  SharedInfoLength;

     UINT32                  Offset = sizeof (ACPI_TABLE_CSRT);

     UINT32                  SubOffset;

     UINT32                  SubSubOffset;

@@ -706,14 +722,16 @@

     /* Subtables (Resource Groups) */

+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);

     SubTable = ACPI_ADD_PTR (ACPI_CSRT_GROUP, Table, Offset);

-    while (Offset < Table->Length)

+    while (Offset < Length)

     {

         /* Resource group subtable */

         AcpiOsPrintf ("\n");

+        ACPI_MOVE_32_TO_32(&SubLength, &SubTable->Length);

         Status = AcpiDmDumpTable (Length, Offset, SubTable,

-            SubTable->Length, AcpiDmTableInfoCsrt0);

+            SubLength, AcpiDmTableInfoCsrt0);

         if (ACPI_FAILURE (Status))

         {

             return;

@@ -733,19 +751,20 @@

             return;

         }

-        SubOffset += SubTable->SharedInfoLength;

+	ACPI_MOVE_32_TO_32(&SharedInfoLength, &SubTable->SharedInfoLength);

+        SubOffset += SharedInfoLength;

         /* Sub-Subtables (Resource Descriptors) */

         SubSubTable = ACPI_ADD_PTR (ACPI_CSRT_DESCRIPTOR, Table,

             Offset + SubOffset);

-        while ((SubOffset < SubTable->Length) &&

-              ((Offset + SubOffset) < Table->Length))

+        while ((SubOffset < SubLength) && ((Offset + SubOffset) < Length))

         {

             AcpiOsPrintf ("\n");

+	    ACPI_MOVE_32_TO_32(&SubSubLength, &SubSubTable->Length);

             Status = AcpiDmDumpTable (Length, Offset + SubOffset, SubSubTable,

-                SubSubTable->Length, AcpiDmTableInfoCsrt2);

+                SubSubLength, AcpiDmTableInfoCsrt2);

             if (ACPI_FAILURE (Status))

             {

                 return;

@@ -755,7 +774,7 @@

             /* Resource-specific info buffer */

-            InfoLength = SubSubTable->Length - SubSubOffset;

+            InfoLength = SubSubLength - SubSubOffset;

             if (InfoLength)

             {

                 Status = AcpiDmDumpTable (Length,

@@ -770,16 +789,15 @@

             /* Point to next sub-subtable */

-            SubOffset += SubSubTable->Length;

+            SubOffset += SubSubLength;

             SubSubTable = ACPI_ADD_PTR (ACPI_CSRT_DESCRIPTOR, SubSubTable,

-                SubSubTable->Length);

+                SubSubLength);

         }

         /* Point to next subtable */

-        Offset += SubTable->Length;

-        SubTable = ACPI_ADD_PTR (ACPI_CSRT_GROUP, SubTable,

-            SubTable->Length);

+        Offset += SubLength;

+        SubTable = ACPI_ADD_PTR (ACPI_CSRT_GROUP, SubTable, SubLength);

     }

 }

@@ -803,16 +821,20 @@

 {

     ACPI_STATUS             Status;

     ACPI_DBG2_DEVICE        *SubTable;

-    UINT32                  Length = Table->Length;

+    UINT32                  Length;

+    UINT16                  SubLength;

     UINT32                  Offset = sizeof (ACPI_TABLE_DBG2);

     UINT32                  i;

     UINT32                  ArrayOffset;

     UINT32                  AbsoluteOffset;

     UINT8                   *Array;

+    UINT16		    Tmp16;

+    UINT16		    AlsoTmp16;

     /* Main table */

+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);

     Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoDbg2);

     if (ACPI_FAILURE (Status))

     {

@@ -822,11 +844,12 @@

     /* Subtables */

     SubTable = ACPI_ADD_PTR (ACPI_DBG2_DEVICE, Table, Offset);

-    while (Offset < Table->Length)

+    while (Offset < Length)

     {

         AcpiOsPrintf ("\n");

+        ACPI_MOVE_16_TO_16(&SubLength, &SubTable->Length);

         Status = AcpiDmDumpTable (Length, Offset, SubTable,

-            SubTable->Length, AcpiDmTableInfoDbg2Device);

+            SubLength, AcpiDmTableInfoDbg2Device);

         if (ACPI_FAILURE (Status))

         {

             return;

@@ -836,13 +859,13 @@

         for (i = 0; i < SubTable->RegisterCount; i++)

         {

-            ArrayOffset = SubTable->BaseAddressOffset +

-                (sizeof (ACPI_GENERIC_ADDRESS) * i);

+	    ACPI_MOVE_16_TO_16(&Tmp16, &SubTable->BaseAddressOffset);

+            ArrayOffset = Tmp16 + (sizeof (ACPI_GENERIC_ADDRESS) * i);

             AbsoluteOffset = Offset + ArrayOffset;

             Array = (UINT8 *) SubTable + ArrayOffset;

             Status = AcpiDmDumpTable (Length, AbsoluteOffset, Array,

-                SubTable->Length, AcpiDmTableInfoDbg2Addr);

+                SubLength, AcpiDmTableInfoDbg2Addr);

             if (ACPI_FAILURE (Status))

             {

                 return;

@@ -853,13 +876,13 @@

         for (i = 0; i < SubTable->RegisterCount; i++)

         {

-            ArrayOffset = SubTable->AddressSizeOffset +

-                (sizeof (UINT32) * i);

+	    ACPI_MOVE_16_TO_16(&Tmp16, &SubTable->AddressSizeOffset);

+            ArrayOffset = Tmp16 + (sizeof (UINT32) * i);

             AbsoluteOffset = Offset + ArrayOffset;

             Array = (UINT8 *) SubTable + ArrayOffset;

             Status = AcpiDmDumpTable (Length, AbsoluteOffset, Array,

-                SubTable->Length, AcpiDmTableInfoDbg2Size);

+                SubLength, AcpiDmTableInfoDbg2Size);

             if (ACPI_FAILURE (Status))

             {

                 return;

@@ -869,12 +892,13 @@

         /* Dump the Namestring (required) */

         AcpiOsPrintf ("\n");

-        ArrayOffset = SubTable->NamepathOffset;

+	ACPI_MOVE_16_TO_16(&Tmp16, &SubTable->NamepathOffset);

+        ArrayOffset = Tmp16;

         AbsoluteOffset = Offset + ArrayOffset;

         Array = (UINT8 *) SubTable + ArrayOffset;

         Status = AcpiDmDumpTable (Length, AbsoluteOffset, Array,

-            SubTable->Length, AcpiDmTableInfoDbg2Name);

+            SubLength, AcpiDmTableInfoDbg2Name);

         if (ACPI_FAILURE (Status))

         {

             return;

@@ -884,9 +908,10 @@

         if (SubTable->OemDataOffset)

         {

-            Status = AcpiDmDumpTable (Length, Offset + SubTable->OemDataOffset,

-                Table, SubTable->OemDataLength,

-                AcpiDmTableInfoDbg2OemData);

+	    ACPI_MOVE_16_TO_16(&Tmp16, &SubTable->OemDataOffset);

+	    ACPI_MOVE_16_TO_16(&AlsoTmp16, &SubTable->OemDataLength);

+            Status = AcpiDmDumpTable (Length, Offset + Tmp16,

+                Table, AlsoTmp16, AcpiDmTableInfoDbg2OemData);

             if (ACPI_FAILURE (Status))

             {

                 return;

@@ -895,9 +920,9 @@

         /* Point to next subtable */

-        Offset += SubTable->Length;

+        Offset += SubLength;

         SubTable = ACPI_ADD_PTR (ACPI_DBG2_DEVICE, SubTable,

-            SubTable->Length);

+            SubLength);

     }

 }

@@ -921,17 +946,20 @@

 {

     ACPI_STATUS             Status;

     ACPI_DMAR_HEADER        *SubTable;

-    UINT32                  Length = Table->Length;

+    UINT32                  Length;

+    UINT16                  SubLength;

     UINT32                  Offset = sizeof (ACPI_TABLE_DMAR);

     ACPI_DMTABLE_INFO       *InfoTable;

     ACPI_DMAR_DEVICE_SCOPE  *ScopeTable;

     UINT32                  ScopeOffset;

     UINT8                   *PciPath;

     UINT32                  PathOffset;

+    UINT16		    SubType;

     /* Main table */

+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);

     Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoDmar);

     if (ACPI_FAILURE (Status))

     {

@@ -941,13 +969,14 @@

     /* Subtables */

     SubTable = ACPI_ADD_PTR (ACPI_DMAR_HEADER, Table, Offset);

-    while (Offset < Table->Length)

+    while (Offset < Length)

     {

         /* Common subtable header */

         AcpiOsPrintf ("\n");

+	ACPI_MOVE_16_TO_16(&SubLength, &SubTable->Length);

         Status = AcpiDmDumpTable (Length, Offset, SubTable,

-            SubTable->Length, AcpiDmTableInfoDmarHdr);

+            SubLength, AcpiDmTableInfoDmarHdr);

         if (ACPI_FAILURE (Status))

         {

             return;

@@ -955,7 +984,8 @@

         AcpiOsPrintf ("\n");

-        switch (SubTable->Type)

+	ACPI_MOVE_16_TO_16(&SubType, &SubTable->Type);

+        switch (SubType)

         {

         case ACPI_DMAR_TYPE_HARDWARE_UNIT:

@@ -990,12 +1020,12 @@

         default:

             AcpiOsPrintf ("\n**** Unknown DMAR subtable type 0x%X\n\n",

-                SubTable->Type);

+                SubType);

             return;

         }

         Status = AcpiDmDumpTable (Length, Offset, SubTable,

-            SubTable->Length, InfoTable);

+            SubLength, InfoTable);

         if (ACPI_FAILURE (Status))

         {

             return;

@@ -1004,8 +1034,8 @@

         /*

          * Dump the optional device scope entries

          */

-        if ((SubTable->Type == ACPI_DMAR_TYPE_HARDWARE_AFFINITY) ||

-            (SubTable->Type == ACPI_DMAR_TYPE_NAMESPACE))

+        if ((SubType == ACPI_DMAR_TYPE_HARDWARE_AFFINITY) ||

+            (SubType == ACPI_DMAR_TYPE_NAMESPACE))

         {

             /* These types do not support device scopes */

@@ -1013,7 +1043,7 @@

         }

         ScopeTable = ACPI_ADD_PTR (ACPI_DMAR_DEVICE_SCOPE, SubTable, ScopeOffset);

-        while (ScopeOffset < SubTable->Length)

+        while (ScopeOffset < SubLength)

         {

             AcpiOsPrintf ("\n");

             Status = AcpiDmDumpTable (Length, Offset + ScopeOffset, ScopeTable,

@@ -1054,9 +1084,8 @@

 NextSubtable:

         /* Point to next subtable */

-        Offset += SubTable->Length;

-        SubTable = ACPI_ADD_PTR (ACPI_DMAR_HEADER, SubTable,

-            SubTable->Length);

+        Offset += SubLength;

+        SubTable = ACPI_ADD_PTR (ACPI_DMAR_HEADER, SubTable, SubLength);

     }

 }

@@ -1083,12 +1112,15 @@

     ACPI_DRTM_RESOURCE_LIST *DrtmRl;

     ACPI_DRTM_DPS_ID        *DrtmDps;

     UINT32                  Count;

+    UINT32                  ValidatedCount;

+    UINT32                  ResourceCount;

+    UINT32		    Length;

     /* Main table */

-    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0,

-        AcpiDmTableInfoDrtm);

+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);

+    Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoDrtm);

     if (ACPI_FAILURE (Status))

     {

         return;

@@ -1102,7 +1134,7 @@

     DrtmVtl = ACPI_ADD_PTR (ACPI_DRTM_VTABLE_LIST, Table, Offset);

     AcpiOsPrintf ("\n");

-    Status = AcpiDmDumpTable (Table->Length, Offset,

+    Status = AcpiDmDumpTable (Length, Offset,

         DrtmVtl, ACPI_OFFSET (ACPI_DRTM_VTABLE_LIST, ValidatedTables),

         AcpiDmTableInfoDrtm0);

     if (ACPI_FAILURE (Status))

@@ -1115,10 +1147,11 @@

     /* Dump Validated table addresses */

     Count = 0;

-    while ((Offset < Table->Length) &&

-            (DrtmVtl->ValidatedTableCount > Count))

+    ACPI_MOVE_32_TO_32(&ValidatedCount, &DrtmVtl->ValidatedTableCount);

+    while ((Offset < Length) &&

+            (ValidatedCount > Count))

     {

-        Status = AcpiDmDumpTable (Table->Length, Offset,

+        Status = AcpiDmDumpTable (Length, Offset,

             ACPI_ADD_PTR (void, Table, Offset), sizeof (UINT64),

             AcpiDmTableInfoDrtm0a);

         if (ACPI_FAILURE (Status))

@@ -1134,7 +1167,7 @@

     DrtmRl = ACPI_ADD_PTR (ACPI_DRTM_RESOURCE_LIST, Table, Offset);

     AcpiOsPrintf ("\n");

-    Status = AcpiDmDumpTable (Table->Length, Offset,

+    Status = AcpiDmDumpTable (Length, Offset,

         DrtmRl, ACPI_OFFSET (ACPI_DRTM_RESOURCE_LIST, Resources),

         AcpiDmTableInfoDrtm1);

     if (ACPI_FAILURE (Status))

@@ -1147,10 +1180,11 @@

     /* Dump the Resource List */

     Count = 0;

-    while ((Offset < Table->Length) &&

-           (DrtmRl->ResourceCount > Count))

+    ACPI_MOVE_32_TO_32(&ResourceCount, &DrtmRl->ResourceCount);

+    while ((Offset < Length) &&

+           (ResourceCount > Count))

     {

-        Status = AcpiDmDumpTable (Table->Length, Offset,

+        Status = AcpiDmDumpTable (Length, Offset,

             ACPI_ADD_PTR (void, Table, Offset),

             sizeof (ACPI_DRTM_RESOURCE), AcpiDmTableInfoDrtm1a);

         if (ACPI_FAILURE (Status))

@@ -1166,7 +1200,7 @@

     DrtmDps = ACPI_ADD_PTR (ACPI_DRTM_DPS_ID, Table, Offset);

     AcpiOsPrintf ("\n");

-    (void) AcpiDmDumpTable (Table->Length, Offset,

+    (void) AcpiDmDumpTable (Length, Offset,

         DrtmDps, sizeof (ACPI_DRTM_DPS_ID), AcpiDmTableInfoDrtm2);

 }

@@ -1190,12 +1224,13 @@

 {

     ACPI_STATUS             Status;

     ACPI_WHEA_HEADER        *SubTable;

-    UINT32                  Length = Table->Length;

+    UINT32                  Length;

     UINT32                  Offset = sizeof (ACPI_TABLE_EINJ);

     /* Main table */

+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);

     Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoEinj);

     if (ACPI_FAILURE (Status))

     {

@@ -1205,7 +1240,7 @@

     /* Subtables */

     SubTable = ACPI_ADD_PTR (ACPI_WHEA_HEADER, Table, Offset);

-    while (Offset < Table->Length)

+    while (Offset < Length)

     {

         AcpiOsPrintf ("\n");

         Status = AcpiDmDumpTable (Length, Offset, SubTable,

@@ -1243,12 +1278,13 @@

 {

     ACPI_STATUS             Status;

     ACPI_WHEA_HEADER        *SubTable;

-    UINT32                  Length = Table->Length;

+    UINT32                  Length;

     UINT32                  Offset = sizeof (ACPI_TABLE_ERST);

     /* Main table */

+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);

     Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoErst);

     if (ACPI_FAILURE (Status))

     {

@@ -1258,7 +1294,7 @@

     /* Subtables */

     SubTable = ACPI_ADD_PTR (ACPI_WHEA_HEADER, Table, Offset);

-    while (Offset < Table->Length)

+    while (Offset < Length)

     {

         AcpiOsPrintf ("\n");

         Status = AcpiDmDumpTable (Length, Offset, SubTable,

@@ -1296,17 +1332,19 @@

 {

     ACPI_STATUS             Status;

     ACPI_FPDT_HEADER        *SubTable;

-    UINT32                  Length = Table->Length;

+    UINT32                  Length;

     UINT32                  Offset = sizeof (ACPI_TABLE_FPDT);

     ACPI_DMTABLE_INFO       *InfoTable;

+    UINT16		    Type;

     /* There is no main table (other than the standard ACPI header) */