From 0a2fbe98cfee6c3ebb8d6897b99f45441ff16e7d Mon Sep 17 00:00:00 2001 From: Al Stone Date: Apr 01 2017 00:03:16 +0000 Subject: Update to 20170224 version of upstream source. Signed-off-by: Al Stone --- diff --git a/.gitignore b/.gitignore index a58343e..23b4456 100644 --- a/.gitignore +++ b/.gitignore @@ -64,3 +64,5 @@ /acpitests-unix-20161222.tar.gz /acpica-unix2-20170119.tar.gz /acpitests-unix-20170119.tar.gz +/acpica-unix2-20170224.tar.gz +/acpitests-unix-20170224.tar.gz diff --git a/acpica-tools.spec b/acpica-tools.spec index dba92d2..259f1c9 100644 --- a/acpica-tools.spec +++ b/acpica-tools.spec @@ -1,6 +1,6 @@ Name: acpica-tools -Version: 20170119 -Release: 2%{?dist} +Version: 20170224 +Release: 1%{?dist} Summary: ACPICA tools for the development and debug of ACPI tables Group: Development/Languages @@ -35,9 +35,8 @@ Patch8: asllookup-ppc64.patch Patch9: template.patch Patch10: free.patch Patch11: update-big-endian.patch -Patch12: aslts.patch -Patch13: ppc64le.patch -Patch14: arm7hl.patch +Patch12: ppc64le.patch +Patch13: arm7hl.patch BuildRequires: bison patchutils flex @@ -99,9 +98,8 @@ gzip -dc %{SOURCE1} | tar -x --strip-components=1 -f - %patch9 -p1 -b .template %patch10 -p1 -b .free %patch11 -p1 -b .update-big-endian -%patch12 -p1 -b .aslts -%patch13 -p1 -b .ppc64le -%patch14 -p1 -b .arm7hl +%patch12 -p1 -b .ppc64le +%patch13 -p1 -b .arm7hl cp -p %{SOURCE2} README.Fedora cp -p %{SOURCE3} iasl.1 @@ -196,6 +194,10 @@ fi %changelog +* Fri Mar 31 2017 Al Stone - 20170224-1 +- Update to latest upstream. Closes BZ#1381017. +- Refresh patches. + * Fri Feb 10 2017 Fedora Release Engineering - 20170119-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/aslts.patch b/aslts.patch deleted file mode 100644 index 8e9f75e..0000000 --- a/aslts.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur acpica-unix2-20170119.orig/tests/aslts/Makefile.def acpica-unix2-20170119/tests/aslts/Makefile.def ---- acpica-unix2-20170119.orig/tests/aslts/Makefile.def 2017-01-27 17:36:03.736555369 -0700 -+++ acpica-unix2-20170119/tests/aslts/Makefile.def 2017-01-27 17:36:46.171389519 -0700 -@@ -123,7 +123,7 @@ - if [ x$$base != xaslts ]; then \ - echo "Bad base name of ASLTS Test Suite: <$$base> of <$$dd>"; exit 1; \ - else \ -- x=`"$(ASL)" -va xxx | grep "Compiler version"`; \ -+ x=`"$(ASL)" -va xxx | grep "Compiler/Disassembler version"`; \ - echo "---- iASL version: $$x"; \ - if [ -z "$$x" ]; then \ - echo "Bad iASL 2: bad signon <$(ASL)>"; exit 1; \ diff --git a/debian-big_endian.patch b/debian-big_endian.patch index 42e1142..19ac6cc 100644 --- a/debian-big_endian.patch +++ b/debian-big_endian.patch @@ -18,11 +18,11 @@ support source/include/platform/aclinux.h | 8 ++ 12 files changed, 487 insertions(+), 283 deletions(-) -Index: acpica-unix2-20170119/source/compiler/aslcodegen.c +Index: acpica-unix2-20170224/source/compiler/aslcodegen.c =================================================================== ---- acpica-unix2-20170119.orig/source/compiler/aslcodegen.c -+++ acpica-unix2-20170119/source/compiler/aslcodegen.c -@@ -243,16 +243,12 @@ CgWriteAmlOpcode ( +--- acpica-unix2-20170224.orig/source/compiler/aslcodegen.c ++++ acpica-unix2-20170224/source/compiler/aslcodegen.c +@@ -238,16 +238,12 @@ CgWriteAmlOpcode ( ACPI_PARSE_OBJECT *Op) { UINT8 PkgLenFirstByte; @@ -45,7 +45,7 @@ Index: acpica-unix2-20170119/source/compiler/aslcodegen.c /* We expect some DEFAULT_ARGs, just ignore them */ -@@ -276,51 +272,52 @@ CgWriteAmlOpcode ( +@@ -280,51 +276,52 @@ CgWriteAmlOpcode ( /* Special opcodes for within a field definition */ @@ -109,7 +109,7 @@ Index: acpica-unix2-20170119/source/compiler/aslcodegen.c break; } -@@ -331,8 +328,8 @@ CgWriteAmlOpcode ( +@@ -335,8 +332,8 @@ CgWriteAmlOpcode ( if (Op->Asl.AmlPkgLenBytes == 1) { /* Simplest case -- no bytes to follow, just write the count */ @@ -120,7 +120,7 @@ Index: acpica-unix2-20170119/source/compiler/aslcodegen.c } else if (Op->Asl.AmlPkgLenBytes != 0) { -@@ -342,7 +339,7 @@ CgWriteAmlOpcode ( +@@ -346,7 +343,7 @@ CgWriteAmlOpcode ( */ PkgLenFirstByte = (UINT8) (((UINT32) (Op->Asl.AmlPkgLenBytes - 1) << 6) | @@ -129,7 +129,7 @@ Index: acpica-unix2-20170119/source/compiler/aslcodegen.c CgLocalWriteAmlData (Op, &PkgLenFirstByte, 1); -@@ -350,39 +347,47 @@ CgWriteAmlOpcode ( +@@ -354,39 +351,47 @@ CgWriteAmlOpcode ( * Shift the length over by the 4 bits we just stuffed * in the first byte */ @@ -189,15 +189,15 @@ Index: acpica-unix2-20170119/source/compiler/aslcodegen.c break; case AML_STRING_OP: -@@ -416,6 +421,7 @@ CgWriteTableHeader ( +@@ -420,6 +425,7 @@ CgWriteTableHeader ( ACPI_PARSE_OBJECT *Op) { ACPI_PARSE_OBJECT *Child; -+ UINT32 DWord; - ++ UINT32 DWord; + UINT32 CommentLength; + ACPI_COMMENT_NODE *Current; - /* AML filename */ -@@ -452,7 +458,7 @@ CgWriteTableHeader ( +@@ -473,7 +479,7 @@ CgWriteTableHeader ( /* OEM Revision */ Child = Child->Asl.Next; @@ -206,7 +206,7 @@ Index: acpica-unix2-20170119/source/compiler/aslcodegen.c /* Compiler ID */ -@@ -460,12 +466,13 @@ CgWriteTableHeader ( +@@ -481,12 +487,13 @@ CgWriteTableHeader ( /* Compiler version */ @@ -220,10 +220,10 @@ Index: acpica-unix2-20170119/source/compiler/aslcodegen.c - Op->Asl.AmlSubtreeLength; + DWord = sizeof (ACPI_TABLE_HEADER) + Op->Asl.AmlSubtreeLength; + ACPI_MOVE_32_TO_32(&TableHeader.Length, &DWord); - TableHeader.Checksum = 0; - Op->Asl.FinalAmlOffset = ftell (Gbl_Files[ASL_FILE_AML_OUTPUT].Handle); -@@ -578,7 +585,10 @@ CgWriteNode ( + /* Calculate the comment lengths for this definition block parseOp */ + +@@ -643,7 +650,10 @@ CgWriteNode ( ACPI_PARSE_OBJECT *Op) { ASL_RESOURCE_NODE *Rnode; @@ -233,9 +233,9 @@ Index: acpica-unix2-20170119/source/compiler/aslcodegen.c + UINT32 DWord; + UINT64 QWord; - /* Always check for DEFAULT_ARG and other "Noop" nodes */ - /* TBD: this may not be the best place for this check */ -@@ -601,13 +611,24 @@ CgWriteNode ( + /* Write all comments here. */ + if (Gbl_CaptureComments) +@@ -672,13 +682,24 @@ CgWriteNode ( switch (Op->Asl.AmlOpcode) { case AML_RAW_DATA_BYTE: @@ -263,10 +263,10 @@ Index: acpica-unix2-20170119/source/compiler/aslcodegen.c case AML_RAW_DATA_BUFFER: -Index: acpica-unix2-20170119/source/compiler/aslopcodes.c +Index: acpica-unix2-20170224/source/compiler/aslopcodes.c =================================================================== ---- acpica-unix2-20170119.orig/source/compiler/aslopcodes.c -+++ acpica-unix2-20170119/source/compiler/aslopcodes.c +--- acpica-unix2-20170224.orig/source/compiler/aslopcodes.c ++++ acpica-unix2-20170224/source/compiler/aslopcodes.c @@ -485,6 +485,7 @@ OpcDoUnicode ( UINT32 i; UINT8 *AsciiString; @@ -285,10 +285,10 @@ Index: acpica-unix2-20170119/source/compiler/aslopcodes.c } /* -Index: acpica-unix2-20170119/source/compiler/aslrestype1.c +Index: acpica-unix2-20170224/source/compiler/aslrestype1.c =================================================================== ---- acpica-unix2-20170119.orig/source/compiler/aslrestype1.c -+++ acpica-unix2-20170119/source/compiler/aslrestype1.c +--- acpica-unix2-20170224.orig/source/compiler/aslrestype1.c ++++ acpica-unix2-20170224/source/compiler/aslrestype1.c @@ -142,6 +142,11 @@ RsDoMemory24Descriptor ( ACPI_PARSE_OBJECT *LengthOp = NULL; ASL_RESOURCE_NODE *Rnode; @@ -485,10 +485,10 @@ Index: acpica-unix2-20170119/source/compiler/aslrestype1.c RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH, CurrentByteOffset + ASL_RESDESC_OFFSET (FixedMemory32.AddressLength)); break; -Index: acpica-unix2-20170119/source/compiler/aslrestype1i.c +Index: acpica-unix2-20170224/source/compiler/aslrestype1i.c =================================================================== ---- acpica-unix2-20170119.orig/source/compiler/aslrestype1i.c -+++ acpica-unix2-20170119/source/compiler/aslrestype1i.c +--- acpica-unix2-20170224.orig/source/compiler/aslrestype1i.c ++++ acpica-unix2-20170224/source/compiler/aslrestype1i.c @@ -198,6 +198,8 @@ RsDoFixedDmaDescriptor ( ACPI_PARSE_OBJECT *InitializerOp; ASL_RESOURCE_NODE *Rnode; @@ -625,10 +625,10 @@ Index: acpica-unix2-20170119/source/compiler/aslrestype1i.c + ACPI_MOVE_16_TO_16(&Descriptor->Irq.IrqMask, &IrqMask); return (Rnode); } -Index: acpica-unix2-20170119/source/compiler/aslrestype2.c +Index: acpica-unix2-20170224/source/compiler/aslrestype2.c =================================================================== ---- acpica-unix2-20170119.orig/source/compiler/aslrestype2.c -+++ acpica-unix2-20170119/source/compiler/aslrestype2.c +--- acpica-unix2-20170224.orig/source/compiler/aslrestype2.c ++++ acpica-unix2-20170224/source/compiler/aslrestype2.c @@ -76,6 +76,7 @@ RsDoGeneralRegisterDescriptor ( ACPI_PARSE_OBJECT *InitializerOp; ASL_RESOURCE_NODE *Rnode; @@ -725,10 +725,10 @@ Index: acpica-unix2-20170119/source/compiler/aslrestype2.c /* Point to end-of-descriptor for vendor data */ -Index: acpica-unix2-20170119/source/compiler/aslrestype2d.c +Index: acpica-unix2-20170224/source/compiler/aslrestype2d.c =================================================================== ---- acpica-unix2-20170119.orig/source/compiler/aslrestype2d.c -+++ acpica-unix2-20170119/source/compiler/aslrestype2d.c +--- acpica-unix2-20170224.orig/source/compiler/aslrestype2d.c ++++ acpica-unix2-20170224/source/compiler/aslrestype2d.c @@ -79,7 +79,13 @@ RsDoDwordIoDescriptor ( ACPI_PARSE_OBJECT *GranOp = NULL; ASL_RESOURCE_NODE *Rnode; @@ -1084,10 +1084,10 @@ Index: acpica-unix2-20170119/source/compiler/aslrestype2d.c Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS32) + OptionIndex + StringLength; return (Rnode); -Index: acpica-unix2-20170119/source/compiler/aslrestype2e.c +Index: acpica-unix2-20170224/source/compiler/aslrestype2e.c =================================================================== ---- acpica-unix2-20170119.orig/source/compiler/aslrestype2e.c -+++ acpica-unix2-20170119/source/compiler/aslrestype2e.c +--- acpica-unix2-20170224.orig/source/compiler/aslrestype2e.c ++++ acpica-unix2-20170224/source/compiler/aslrestype2e.c @@ -78,6 +78,13 @@ RsDoExtendedIoDescriptor ( ACPI_PARSE_OBJECT *GranOp = NULL; ASL_RESOURCE_NODE *Rnode; @@ -1193,10 +1193,10 @@ Index: acpica-unix2-20170119/source/compiler/aslrestype2e.c Rnode->BufferLength = sizeof (AML_RESOURCE_EXTENDED_ADDRESS64) + StringLength; return (Rnode); -Index: acpica-unix2-20170119/source/compiler/aslrestype2q.c +Index: acpica-unix2-20170224/source/compiler/aslrestype2q.c =================================================================== ---- acpica-unix2-20170119.orig/source/compiler/aslrestype2q.c -+++ acpica-unix2-20170119/source/compiler/aslrestype2q.c +--- acpica-unix2-20170224.orig/source/compiler/aslrestype2q.c ++++ acpica-unix2-20170224/source/compiler/aslrestype2q.c @@ -80,7 +80,13 @@ RsDoQwordIoDescriptor ( ASL_RESOURCE_NODE *Rnode; UINT8 *OptionalFields; @@ -1535,10 +1535,10 @@ Index: acpica-unix2-20170119/source/compiler/aslrestype2q.c Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS64) + OptionIndex + StringLength; return (Rnode); -Index: acpica-unix2-20170119/source/compiler/aslrestype2s.c +Index: acpica-unix2-20170224/source/compiler/aslrestype2s.c =================================================================== ---- acpica-unix2-20170119.orig/source/compiler/aslrestype2s.c -+++ acpica-unix2-20170119/source/compiler/aslrestype2s.c +--- acpica-unix2-20170224.orig/source/compiler/aslrestype2s.c ++++ acpica-unix2-20170224/source/compiler/aslrestype2s.c @@ -290,6 +290,9 @@ RsDoGpioIntDescriptor ( UINT16 VendorLength; UINT16 InterruptLength; @@ -1852,10 +1852,10 @@ Index: acpica-unix2-20170119/source/compiler/aslrestype2s.c MpSaveSerialInfo (Info->MappingOp, Descriptor, ResourceSource); return (Rnode); } -Index: acpica-unix2-20170119/source/compiler/aslrestype2w.c +Index: acpica-unix2-20170224/source/compiler/aslrestype2w.c =================================================================== ---- acpica-unix2-20170119.orig/source/compiler/aslrestype2w.c -+++ acpica-unix2-20170119/source/compiler/aslrestype2w.c +--- acpica-unix2-20170224.orig/source/compiler/aslrestype2w.c ++++ acpica-unix2-20170224/source/compiler/aslrestype2w.c @@ -81,6 +81,12 @@ RsDoWordIoDescriptor ( UINT8 *OptionalFields; UINT16 StringLength = 0; @@ -2199,10 +2199,10 @@ Index: acpica-unix2-20170119/source/compiler/aslrestype2w.c Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS16) + OptionIndex + StringLength; return (Rnode); -Index: acpica-unix2-20170119/source/include/acmacros.h +Index: acpica-unix2-20170224/source/include/acmacros.h =================================================================== ---- acpica-unix2-20170119.orig/source/include/acmacros.h -+++ acpica-unix2-20170119/source/include/acmacros.h +--- acpica-unix2-20170224.orig/source/include/acmacros.h ++++ acpica-unix2-20170224/source/include/acmacros.h @@ -100,7 +100,8 @@ /* 32-bit source, 16/32/64 destination */ @@ -2240,10 +2240,10 @@ Index: acpica-unix2-20170119/source/include/acmacros.h #define ACPI_MOVE_32_TO_32(d, s) *(UINT32 *)(void *)(d) = *(UINT32 *)(void *)(s) #define ACPI_MOVE_32_TO_64(d, s) *(UINT64 *)(void *)(d) = *(UINT32 *)(void *)(s) -Index: acpica-unix2-20170119/source/include/platform/aclinux.h +Index: acpica-unix2-20170224/source/include/platform/aclinux.h =================================================================== ---- acpica-unix2-20170119.orig/source/include/platform/aclinux.h -+++ acpica-unix2-20170119/source/include/platform/aclinux.h +--- acpica-unix2-20170224.orig/source/include/platform/aclinux.h ++++ acpica-unix2-20170224/source/include/platform/aclinux.h @@ -185,6 +185,7 @@ #ifdef ACPI_USE_STANDARD_HEADERS diff --git a/debian-unaligned.patch b/debian-unaligned.patch index 7a6c261..e6de0bd 100644 --- a/debian-unaligned.patch +++ b/debian-unaligned.patch @@ -18,11 +18,11 @@ Signed-off-by: Paolo Bonzini source/include/actypes.h | 26 +++++++++++++------------- 3 files changed, 32 insertions(+), 21 deletions(-) -Index: acpica-unix2-20161222/source/compiler/asltree.c +Index: acpica-unix2-20170224/source/compiler/asltree.c =================================================================== ---- acpica-unix2-20161222.orig/source/compiler/asltree.c -+++ acpica-unix2-20161222/source/compiler/asltree.c -@@ -913,28 +913,31 @@ TrCreateValuedLeafNode ( +--- acpica-unix2-20170224.orig/source/compiler/asltree.c ++++ acpica-unix2-20170224/source/compiler/asltree.c +@@ -998,28 +998,31 @@ TrCreateValuedLeafNode ( "Op %s Value %8.8X%8.8X ", Op->Asl.LineNumber, Op->Asl.Column, Op, UtGetOpName(ParseOpcode), ACPI_FORMAT_UINT64 (Value)); @@ -59,7 +59,7 @@ Index: acpica-unix2-20161222/source/compiler/asltree.c break; case PARSEOP_METHOD: -@@ -944,12 +947,14 @@ TrCreateValuedLeafNode ( +@@ -1029,12 +1032,14 @@ TrCreateValuedLeafNode ( case PARSEOP_INTEGER: @@ -74,10 +74,10 @@ Index: acpica-unix2-20161222/source/compiler/asltree.c break; } -Index: acpica-unix2-20161222/source/components/executer/exoparg2.c +Index: acpica-unix2-20170224/source/components/executer/exoparg2.c =================================================================== ---- acpica-unix2-20161222.orig/source/components/executer/exoparg2.c -+++ acpica-unix2-20161222/source/components/executer/exoparg2.c +--- acpica-unix2-20170224.orig/source/components/executer/exoparg2.c ++++ acpica-unix2-20170224/source/components/executer/exoparg2.c @@ -172,6 +172,8 @@ AcpiExOpcode_2A_2T_1R ( ACPI_OPERAND_OBJECT **Operand = &WalkState->Operands[0]; ACPI_OPERAND_OBJECT *ReturnDesc1 = NULL; @@ -117,11 +117,11 @@ Index: acpica-unix2-20161222/source/components/executer/exoparg2.c + ReturnDesc->Integer.Value = ReturnValue; break; - case AML_CONCAT_OP: /* Concatenate (Data1, Data2, Result) */ -Index: acpica-unix2-20161222/source/include/actypes.h + case AML_CONCATENATE_OP: /* Concatenate (Data1, Data2, Result) */ +Index: acpica-unix2-20170224/source/include/actypes.h =================================================================== ---- acpica-unix2-20161222.orig/source/include/actypes.h -+++ acpica-unix2-20161222/source/include/actypes.h +--- acpica-unix2-20170224.orig/source/include/actypes.h ++++ acpica-unix2-20170224/source/include/actypes.h @@ -143,6 +143,19 @@ typedef COMPILER_DEPENDENT_INT64 */ #define ACPI_THREAD_ID UINT64 diff --git a/f23-harden.patch b/f23-harden.patch index a8369c6..3396ed1 100644 --- a/f23-harden.patch +++ b/f23-harden.patch @@ -8,10 +8,10 @@ From: Al Stone generate/unix/iasl/Makefile | 13 +++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) -Index: acpica-unix2-20161222/generate/unix/Makefile.config +Index: acpica-unix2-20170224/generate/unix/Makefile.config =================================================================== ---- acpica-unix2-20161222.orig/generate/unix/Makefile.config -+++ acpica-unix2-20161222/generate/unix/Makefile.config +--- acpica-unix2-20170224.orig/generate/unix/Makefile.config ++++ acpica-unix2-20170224/generate/unix/Makefile.config @@ -171,6 +171,8 @@ ifneq ($(NOFORTIFY),TRUE) OPT_CFLAGS += -D_FORTIFY_SOURCE=2 endif @@ -21,11 +21,11 @@ Index: acpica-unix2-20161222/generate/unix/Makefile.config CFLAGS += \ -D$(HOST)\ -D_GNU_SOURCE\ -Index: acpica-unix2-20161222/generate/unix/iasl/Makefile +Index: acpica-unix2-20170224/generate/unix/iasl/Makefile =================================================================== ---- acpica-unix2-20161222.orig/generate/unix/iasl/Makefile -+++ acpica-unix2-20161222/generate/unix/iasl/Makefile -@@ -319,20 +319,21 @@ $(OBJDIR)/prparserparse.c $(OBJDIR)/prpa +--- acpica-unix2-20170224.orig/generate/unix/iasl/Makefile ++++ acpica-unix2-20170224/generate/unix/iasl/Makefile +@@ -322,20 +322,21 @@ $(OBJDIR)/prparserparse.c $(OBJDIR)/prpa # Cannot use the common compile warning flags since the C files are created # by the utilities above and they are not necessarily ANSI C, etc. # diff --git a/int-format.patch b/int-format.patch index d14cbf0..3d94243 100644 --- a/int-format.patch +++ b/int-format.patch @@ -24,11 +24,11 @@ From: Al Stone source/tools/acpiexec/aemain.c | 2 +- 18 files changed, 28 insertions(+), 28 deletions(-) -Index: acpica-unix2-20161222/source/compiler/aslcompile.c +Index: acpica-unix2-20170224/source/compiler/aslcompile.c =================================================================== ---- acpica-unix2-20161222.orig/source/compiler/aslcompile.c -+++ acpica-unix2-20161222/source/compiler/aslcompile.c -@@ -729,7 +729,7 @@ CmCleanupAndExit ( +--- acpica-unix2-20170224.orig/source/compiler/aslcompile.c ++++ acpica-unix2-20170224/source/compiler/aslcompile.c +@@ -750,7 +750,7 @@ CmCleanupAndExit ( if (Gbl_ExceptionCount[ASL_ERROR] > ASL_MAX_ERROR_COUNT) { @@ -37,10 +37,10 @@ Index: acpica-unix2-20161222/source/compiler/aslcompile.c ASL_MAX_ERROR_COUNT); } -Index: acpica-unix2-20161222/source/compiler/aslerror.c +Index: acpica-unix2-20170224/source/compiler/aslerror.c =================================================================== ---- acpica-unix2-20161222.orig/source/compiler/aslerror.c -+++ acpica-unix2-20161222/source/compiler/aslerror.c +--- acpica-unix2-20170224.orig/source/compiler/aslerror.c ++++ acpica-unix2-20170224/source/compiler/aslerror.c @@ -687,7 +687,7 @@ AslCommonError ( Gbl_ExceptionCount[Level]++; if (Gbl_ExceptionCount[ASL_ERROR] > ASL_MAX_ERROR_COUNT) @@ -59,10 +59,10 @@ Index: acpica-unix2-20161222/source/compiler/aslerror.c ASL_MAX_DISABLED_MESSAGES); return (AE_LIMIT); } -Index: acpica-unix2-20161222/source/compiler/aslopt.c +Index: acpica-unix2-20170224/source/compiler/aslopt.c =================================================================== ---- acpica-unix2-20161222.orig/source/compiler/aslopt.c -+++ acpica-unix2-20161222/source/compiler/aslopt.c +--- acpica-unix2-20170224.orig/source/compiler/aslopt.c ++++ acpica-unix2-20170224/source/compiler/aslopt.c @@ -584,7 +584,7 @@ OptOptimizeNamePath ( } @@ -72,10 +72,10 @@ Index: acpica-unix2-20161222/source/compiler/aslopt.c Op->Asl.LogicalLineNumber, AcpiPsGetOpcodeName (Op->Common.Parent->Common.AmlOpcode), AcpiPsGetOpcodeName (Op->Common.AmlOpcode))); -Index: acpica-unix2-20161222/source/compiler/aslpredef.c +Index: acpica-unix2-20170224/source/compiler/aslpredef.c =================================================================== ---- acpica-unix2-20161222.orig/source/compiler/aslpredef.c -+++ acpica-unix2-20161222/source/compiler/aslpredef.c +--- acpica-unix2-20170224.orig/source/compiler/aslpredef.c ++++ acpica-unix2-20170224/source/compiler/aslpredef.c @@ -114,7 +114,7 @@ ApCheckForPredefinedMethod ( if (MethodInfo->NumArguments != 0) @@ -85,10 +85,10 @@ Index: acpica-unix2-20161222/source/compiler/aslpredef.c AslError (ASL_WARNING, ASL_MSG_RESERVED_ARG_COUNT_HI, Op, MsgBuffer); -Index: acpica-unix2-20161222/source/compiler/aslprepkg.c +Index: acpica-unix2-20170224/source/compiler/aslprepkg.c =================================================================== ---- acpica-unix2-20161222.orig/source/compiler/aslprepkg.c -+++ acpica-unix2-20161222/source/compiler/aslprepkg.c +--- acpica-unix2-20170224.orig/source/compiler/aslprepkg.c ++++ acpica-unix2-20170224/source/compiler/aslprepkg.c @@ -309,7 +309,7 @@ ApCheckPackage ( if (Count & 1) @@ -98,10 +98,10 @@ Index: acpica-unix2-20161222/source/compiler/aslprepkg.c Predefined->Info.Name, Count); AslError (ASL_ERROR, ASL_MSG_RESERVED_PACKAGE_LENGTH, -Index: acpica-unix2-20161222/source/components/debugger/dbexec.c +Index: acpica-unix2-20170224/source/components/debugger/dbexec.c =================================================================== ---- acpica-unix2-20161222.orig/source/components/debugger/dbexec.c -+++ acpica-unix2-20161222/source/components/debugger/dbexec.c +--- acpica-unix2-20170224.orig/source/components/debugger/dbexec.c ++++ acpica-unix2-20170224/source/components/debugger/dbexec.c @@ -214,7 +214,7 @@ AcpiDbExecuteMethod ( ACPI_ERROR ((AE_INFO, "Possible overflow of internal debugger " @@ -111,10 +111,10 @@ Index: acpica-unix2-20161222/source/components/debugger/dbexec.c } } -Index: acpica-unix2-20161222/source/components/dispatcher/dsmthdat.c +Index: acpica-unix2-20170224/source/components/dispatcher/dsmthdat.c =================================================================== ---- acpica-unix2-20161222.orig/source/components/dispatcher/dsmthdat.c -+++ acpica-unix2-20161222/source/components/dispatcher/dsmthdat.c +--- acpica-unix2-20170224.orig/source/components/dispatcher/dsmthdat.c ++++ acpica-unix2-20170224/source/components/dispatcher/dsmthdat.c @@ -291,7 +291,7 @@ AcpiDsMethodDataGetNode ( if (Index > ACPI_METHOD_MAX_LOCAL) { @@ -133,10 +133,10 @@ Index: acpica-unix2-20161222/source/components/dispatcher/dsmthdat.c Index, ACPI_METHOD_MAX_ARG)); return_ACPI_STATUS (AE_AML_INVALID_INDEX); } -Index: acpica-unix2-20161222/source/components/dispatcher/dsutils.c +Index: acpica-unix2-20170224/source/components/dispatcher/dsutils.c =================================================================== ---- acpica-unix2-20161222.orig/source/components/dispatcher/dsutils.c -+++ acpica-unix2-20161222/source/components/dispatcher/dsutils.c +--- acpica-unix2-20170224.orig/source/components/dispatcher/dsutils.c ++++ acpica-unix2-20170224/source/components/dispatcher/dsutils.c @@ -793,7 +793,7 @@ AcpiDsCreateOperands ( } @@ -146,10 +146,10 @@ Index: acpica-unix2-20161222/source/components/dispatcher/dsutils.c WalkState->NumOperands, ArgCount, Index)); /* Create the interpreter arguments, in reverse order */ -Index: acpica-unix2-20161222/source/components/dispatcher/dswscope.c +Index: acpica-unix2-20170224/source/components/dispatcher/dswscope.c =================================================================== ---- acpica-unix2-20161222.orig/source/components/dispatcher/dswscope.c -+++ acpica-unix2-20161222/source/components/dispatcher/dswscope.c +--- acpica-unix2-20170224.orig/source/components/dispatcher/dswscope.c ++++ acpica-unix2-20170224/source/components/dispatcher/dswscope.c @@ -149,7 +149,7 @@ AcpiDsScopeStackPush ( WalkState->ScopeDepth++; @@ -168,10 +168,10 @@ Index: acpica-unix2-20161222/source/components/dispatcher/dswscope.c (UINT32) WalkState->ScopeDepth, AcpiUtGetNodeName (ScopeInfo->Scope.Node), AcpiUtGetTypeName (ScopeInfo->Common.Value))); -Index: acpica-unix2-20161222/source/components/events/evgpe.c +Index: acpica-unix2-20170224/source/components/events/evgpe.c =================================================================== ---- acpica-unix2-20161222.orig/source/components/events/evgpe.c -+++ acpica-unix2-20161222/source/components/events/evgpe.c +--- acpica-unix2-20170224.orig/source/components/events/evgpe.c ++++ acpica-unix2-20170224/source/components/events/evgpe.c @@ -494,7 +494,7 @@ AcpiEvGpeDetect ( "Ignore disabled registers for GPE %02X-%02X: " "RunEnable=%02X, WakeEnable=%02X\n", @@ -190,10 +190,10 @@ Index: acpica-unix2-20161222/source/components/events/evgpe.c StatusReg, EnableReg, GpeRegisterInfo->EnableForRun, GpeRegisterInfo->EnableForWake)); -Index: acpica-unix2-20161222/source/components/executer/exdump.c +Index: acpica-unix2-20170224/source/components/executer/exdump.c =================================================================== ---- acpica-unix2-20161222.orig/source/components/executer/exdump.c -+++ acpica-unix2-20161222/source/components/executer/exdump.c +--- acpica-unix2-20170224.orig/source/components/executer/exdump.c ++++ acpica-unix2-20170224/source/components/executer/exdump.c @@ -668,7 +668,7 @@ AcpiExDumpOperand ( if (Depth > 0) { @@ -203,10 +203,10 @@ Index: acpica-unix2-20161222/source/components/executer/exdump.c } else { -Index: acpica-unix2-20161222/source/components/executer/exfldio.c +Index: acpica-unix2-20170224/source/components/executer/exfldio.c =================================================================== ---- acpica-unix2-20161222.orig/source/components/executer/exfldio.c -+++ acpica-unix2-20161222/source/components/executer/exfldio.c +--- acpica-unix2-20170224.orig/source/components/executer/exfldio.c ++++ acpica-unix2-20170224/source/components/executer/exfldio.c @@ -681,8 +681,8 @@ AcpiExWriteWithUpdateRule ( ACPI_ERROR ((AE_INFO, @@ -218,10 +218,10 @@ Index: acpica-unix2-20161222/source/components/executer/exfldio.c return_ACPI_STATUS (AE_AML_OPERAND_VALUE); } } -Index: acpica-unix2-20161222/source/components/executer/exnames.c +Index: acpica-unix2-20170224/source/components/executer/exnames.c =================================================================== ---- acpica-unix2-20161222.orig/source/components/executer/exnames.c -+++ acpica-unix2-20161222/source/components/executer/exnames.c +--- acpica-unix2-20170224.orig/source/components/executer/exnames.c ++++ acpica-unix2-20170224/source/components/executer/exnames.c @@ -240,7 +240,7 @@ AcpiExNameSegment ( */ ACPI_DEBUG_PRINT ((ACPI_DB_INFO, @@ -240,10 +240,10 @@ Index: acpica-unix2-20161222/source/components/executer/exnames.c } *InAmlAddress = ACPI_CAST_PTR (UINT8, AmlAddress); -Index: acpica-unix2-20161222/source/components/hardware/hwregs.c +Index: acpica-unix2-20170224/source/components/hardware/hwregs.c =================================================================== ---- acpica-unix2-20161222.orig/source/components/hardware/hwregs.c -+++ acpica-unix2-20161222/source/components/hardware/hwregs.c +--- acpica-unix2-20170224.orig/source/components/hardware/hwregs.c ++++ acpica-unix2-20170224/source/components/hardware/hwregs.c @@ -464,7 +464,7 @@ AcpiHwClearAcpiStatus ( @@ -253,10 +253,10 @@ Index: acpica-unix2-20161222/source/components/hardware/hwregs.c ACPI_FORMAT_UINT64 (AcpiGbl_XPm1aStatus.Address))); LockFlags = AcpiOsAcquireLock (AcpiGbl_HardwareLock); -Index: acpica-unix2-20161222/source/components/tables/tbfadt.c +Index: acpica-unix2-20170224/source/components/tables/tbfadt.c =================================================================== ---- acpica-unix2-20161222.orig/source/components/tables/tbfadt.c -+++ acpica-unix2-20161222/source/components/tables/tbfadt.c +--- acpica-unix2-20170224.orig/source/components/tables/tbfadt.c ++++ acpica-unix2-20170224/source/components/tables/tbfadt.c @@ -233,7 +233,7 @@ AcpiTbInitGenericAddress ( if (!(Flags & ACPI_FADT_GPE_REGISTER)) { @@ -284,10 +284,10 @@ Index: acpica-unix2-20161222/source/components/tables/tbfadt.c Name, Address32, ACPI_FORMAT_UINT64 (Address64->Address), AcpiGbl_Use32BitFadtAddresses ? 32 : 64)); -Index: acpica-unix2-20161222/source/components/tables/tbxfroot.c +Index: acpica-unix2-20170224/source/components/tables/tbxfroot.c =================================================================== ---- acpica-unix2-20161222.orig/source/components/tables/tbxfroot.c -+++ acpica-unix2-20161222/source/components/tables/tbxfroot.c +--- acpica-unix2-20170224.orig/source/components/tables/tbxfroot.c ++++ acpica-unix2-20170224/source/components/tables/tbxfroot.c @@ -177,7 +177,7 @@ AcpiFindRootPointer ( { ACPI_ERROR ((AE_INFO, @@ -315,10 +315,10 @@ Index: acpica-unix2-20161222/source/components/tables/tbxfroot.c return_ACPI_STATUS (AE_NO_MEMORY); } -Index: acpica-unix2-20161222/source/components/utilities/utownerid.c +Index: acpica-unix2-20170224/source/components/utilities/utownerid.c =================================================================== ---- acpica-unix2-20161222.orig/source/components/utilities/utownerid.c -+++ acpica-unix2-20161222/source/components/utilities/utownerid.c +--- acpica-unix2-20170224.orig/source/components/utilities/utownerid.c ++++ acpica-unix2-20170224/source/components/utilities/utownerid.c @@ -231,7 +231,7 @@ AcpiUtReleaseOwnerId ( else { @@ -328,10 +328,10 @@ Index: acpica-unix2-20161222/source/components/utilities/utownerid.c } (void) AcpiUtReleaseMutex (ACPI_MTX_CACHES); -Index: acpica-unix2-20161222/source/tools/acpiexec/aemain.c +Index: acpica-unix2-20170224/source/tools/acpiexec/aemain.c =================================================================== ---- acpica-unix2-20161222.orig/source/tools/acpiexec/aemain.c -+++ acpica-unix2-20161222/source/tools/acpiexec/aemain.c +--- acpica-unix2-20170224.orig/source/tools/acpiexec/aemain.c ++++ acpica-unix2-20170224/source/tools/acpiexec/aemain.c @@ -203,7 +203,7 @@ AeDoOptions ( if (strlen (AcpiGbl_Optarg) > (AE_BUFFER_SIZE -1)) diff --git a/sources b/sources index 2d710e8..47e7ee4 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (acpica-unix2-20170119.tar.gz) = 0b4b471e41c8aa157683dc6685d561aee8837afd21e3f6733f2ea7c98a9eda459c01aa6570d6f89b893f37bc568805c66c051cb1a29dafb9ed012d48e96f5660 -SHA512 (acpitests-unix-20170119.tar.gz) = 38b8c4de1afb50bb75f1ed38109b35d44fe8ed312caa412f955c51534d9f64e0828d815a7af44423f59ea54950c9d2ad9687c2cef473aac53679f5894b978155 +SHA512 (acpica-unix2-20170224.tar.gz) = a3ed492d4589d5b760df4fd6bc12feb244f772ee8a9be67fc99c31c3ca2231024c1f6d9f05f14a138482dc4fc19c75fe84edb84c9f0bbb01818caddac9fa5203 +SHA512 (acpitests-unix-20170224.tar.gz) = fdbe0a0a73299c2cf94bf3f70d584884af629378913329de502213dcaa8cd802bb21a8285bd4a88f8b83b19dbab120618de0d06b336de714d40ef0d154c80a41 diff --git a/update-big-endian.patch b/update-big-endian.patch index 885e41f..cb06a58 100644 --- a/update-big-endian.patch +++ b/update-big-endian.patch @@ -1,7 +1,7 @@ -Index: acpica-unix2-20170119/source/common/acfileio.c +Index: acpica-unix2-20170224/source/common/acfileio.c =================================================================== ---- acpica-unix2-20170119.orig/source/common/acfileio.c -+++ acpica-unix2-20170119/source/common/acfileio.c +--- acpica-unix2-20170224.orig/source/common/acfileio.c ++++ acpica-unix2-20170224/source/common/acfileio.c @@ -250,6 +250,7 @@ AcGetOneTableFromFile ( ACPI_TABLE_HEADER *Table; INT32 Count; @@ -63,10 +63,10 @@ Index: acpica-unix2-20170119/source/common/acfileio.c (UINT32) (FileSize - TableOffset)); return (AE_BAD_HEADER); } -Index: acpica-unix2-20170119/source/common/ahpredef.c +Index: acpica-unix2-20170224/source/common/ahpredef.c =================================================================== ---- acpica-unix2-20170119.orig/source/common/ahpredef.c -+++ acpica-unix2-20170119/source/common/ahpredef.c +--- acpica-unix2-20170224.orig/source/common/ahpredef.c ++++ acpica-unix2-20170224/source/common/ahpredef.c @@ -358,7 +358,7 @@ AcpiAhMatchPredefinedName ( char *Nameseg) { @@ -76,10 +76,10 @@ Index: acpica-unix2-20170119/source/common/ahpredef.c for (Info = AslPredefinedInfo; Info->Name; Info++) { -Index: acpica-unix2-20170119/source/common/dmtable.c +Index: acpica-unix2-20170224/source/common/dmtable.c =================================================================== ---- acpica-unix2-20170119.orig/source/common/dmtable.c -+++ acpica-unix2-20170119/source/common/dmtable.c +--- acpica-unix2-20170224.orig/source/common/dmtable.c ++++ acpica-unix2-20170224/source/common/dmtable.c @@ -499,7 +499,7 @@ AcpiDmDumpDataTable ( */ if (ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_FACS)) @@ -178,11 +178,11 @@ Index: acpica-unix2-20170119/source/common/dmtable.c AcpiDmNfitSubnames[Temp16]); break; -Index: acpica-unix2-20170119/source/common/dmtables.c +Index: acpica-unix2-20170224/source/common/dmtables.c =================================================================== ---- acpica-unix2-20170119.orig/source/common/dmtables.c -+++ acpica-unix2-20170119/source/common/dmtables.c -@@ -140,7 +140,9 @@ AdCreateTableHeader ( +--- acpica-unix2-20170224.orig/source/common/dmtables.c ++++ acpica-unix2-20170224/source/common/dmtables.c +@@ -142,7 +142,9 @@ AdCreateTableHeader ( ACPI_TABLE_HEADER *Table) { UINT8 Checksum; @@ -193,7 +193,7 @@ Index: acpica-unix2-20170119/source/common/dmtables.c /* Reset globals for External statements */ -@@ -152,9 +154,10 @@ AdCreateTableHeader ( +@@ -154,9 +156,10 @@ AdCreateTableHeader ( */ AdDisassemblerHeader (Filename, ACPI_IS_AML_TABLE); @@ -205,7 +205,7 @@ Index: acpica-unix2-20170119/source/common/dmtables.c /* Print and validate the revision */ -@@ -186,7 +189,7 @@ AdCreateTableHeader ( +@@ -188,7 +191,7 @@ AdCreateTableHeader ( AcpiOsPrintf ("\n * Checksum 0x%2.2X", Table->Checksum); @@ -214,7 +214,7 @@ Index: acpica-unix2-20170119/source/common/dmtables.c if (Checksum) { AcpiOsPrintf (" **** Incorrect checksum, should be 0x%2.2X", -@@ -196,9 +199,11 @@ AdCreateTableHeader ( +@@ -198,9 +201,11 @@ AdCreateTableHeader ( AcpiOsPrintf ("\n"); AcpiOsPrintf (" * OEM ID \"%.6s\"\n", Table->OemId); AcpiOsPrintf (" * OEM Table ID \"%.8s\"\n", Table->OemTableId); @@ -228,7 +228,7 @@ Index: acpica-unix2-20170119/source/common/dmtables.c AcpiOsPrintf (" */\n"); /* -@@ -211,7 +216,7 @@ AdCreateTableHeader ( +@@ -221,7 +226,7 @@ AdCreateTableHeader ( AcpiOsPrintf ( "DefinitionBlock (\"\", \"%4.4s\", %hu, \"%.6s\", \"%.8s\", 0x%8.8X)\n", Table->Signature, Table->Revision, @@ -237,7 +237,7 @@ Index: acpica-unix2-20170119/source/common/dmtables.c } -@@ -386,7 +391,8 @@ AdParseTable ( +@@ -396,7 +401,8 @@ AdParseTable ( fprintf (stderr, "Pass 1 parse of [%4.4s]\n", (char *) Table->Signature); @@ -245,12 +245,12 @@ Index: acpica-unix2-20170119/source/common/dmtables.c + ACPI_MOVE_32_TO_32(&AmlLength, &Table->Length); + AmlLength -= sizeof (ACPI_TABLE_HEADER); AmlStart = ((UINT8 *) Table + sizeof (ACPI_TABLE_HEADER)); + ASL_CV_INIT_FILETREE(Table, AmlStart, AmlLength); - /* Create the root object */ -Index: acpica-unix2-20170119/source/common/dmtbdump.c +Index: acpica-unix2-20170224/source/common/dmtbdump.c =================================================================== ---- acpica-unix2-20170119.orig/source/common/dmtbdump.c -+++ acpica-unix2-20170119/source/common/dmtbdump.c +--- acpica-unix2-20170224.orig/source/common/dmtbdump.c ++++ acpica-unix2-20170224/source/common/dmtbdump.c @@ -277,6 +277,8 @@ AcpiDmDumpRsdt ( UINT32 Entries; UINT32 Offset; @@ -2064,10 +2064,10 @@ Index: acpica-unix2-20170119/source/common/dmtbdump.c + (void) AcpiDmDumpTable (Length, 0, Table, ArgumentsLength, AcpiDmTableInfoWpbt0); } -Index: acpica-unix2-20170119/source/compiler/aslrestype2.c +Index: acpica-unix2-20170224/source/compiler/aslrestype2.c =================================================================== ---- acpica-unix2-20170119.orig/source/compiler/aslrestype2.c -+++ acpica-unix2-20170119/source/compiler/aslrestype2.c +--- acpica-unix2-20170224.orig/source/compiler/aslrestype2.c ++++ acpica-unix2-20170224/source/compiler/aslrestype2.c @@ -98,21 +98,33 @@ RsDoGeneralRegisterDescriptor ( { case 0: /* Address space */ @@ -2114,10 +2114,10 @@ Index: acpica-unix2-20170119/source/compiler/aslrestype2.c RsCreateByteField (InitializerOp, ACPI_RESTAG_ACCESSSIZE, CurrentByteOffset + ASL_RESDESC_OFFSET (GenericReg.AccessSize)); -Index: acpica-unix2-20170119/source/compiler/dtfield.c +Index: acpica-unix2-20170224/source/compiler/dtfield.c =================================================================== ---- acpica-unix2-20170119.orig/source/compiler/dtfield.c -+++ acpica-unix2-20170119/source/compiler/dtfield.c +--- acpica-unix2-20170224.orig/source/compiler/dtfield.c ++++ acpica-unix2-20170224/source/compiler/dtfield.c @@ -360,7 +360,27 @@ DtCompileInteger ( DtError (ASL_ERROR, ASL_MSG_INTEGER_SIZE, Field, MsgBuffer); } @@ -2147,10 +2147,10 @@ Index: acpica-unix2-20170119/source/compiler/dtfield.c return; } -Index: acpica-unix2-20170119/source/compiler/dtsubtable.c +Index: acpica-unix2-20170224/source/compiler/dtsubtable.c =================================================================== ---- acpica-unix2-20170119.orig/source/compiler/dtsubtable.c -+++ acpica-unix2-20170119/source/compiler/dtsubtable.c +--- acpica-unix2-20170224.orig/source/compiler/dtsubtable.c ++++ acpica-unix2-20170224/source/compiler/dtsubtable.c @@ -379,6 +379,21 @@ DtSetSubtableLength ( return; } @@ -2175,10 +2175,10 @@ Index: acpica-unix2-20170119/source/compiler/dtsubtable.c + Subtable->SizeOfLengthField); + } } -Index: acpica-unix2-20170119/source/compiler/dttable1.c +Index: acpica-unix2-20170224/source/compiler/dttable1.c =================================================================== ---- acpica-unix2-20170119.orig/source/compiler/dttable1.c -+++ acpica-unix2-20170119/source/compiler/dttable1.c +--- acpica-unix2-20170224.orig/source/compiler/dttable1.c ++++ acpica-unix2-20170224/source/compiler/dttable1.c @@ -282,6 +282,8 @@ DtCompileCsrt ( DT_FIELD **PFieldList = (DT_FIELD **) List; UINT32 DescriptorCount; @@ -2540,10 +2540,10 @@ Index: acpica-unix2-20170119/source/compiler/dttable1.c - IortNode->MappingCount = IdMappingNumber; + ACPI_MOVE_32_TO_32(&IortNode->MappingCount, &IdMappingNumber); - - /* - * Node length can be determined by DT_LENGTH option -@@ -1528,7 +1558,7 @@ DtCompileIort ( + if (!IdMappingNumber) + { + IortNode->MappingOffset = 0; +@@ -1532,7 +1562,7 @@ DtCompileIort ( NodeNumber++; } @@ -2552,10 +2552,10 @@ Index: acpica-unix2-20170119/source/compiler/dttable1.c return (AE_OK); } -Index: acpica-unix2-20170119/source/compiler/dttable2.c +Index: acpica-unix2-20170224/source/compiler/dttable2.c =================================================================== ---- acpica-unix2-20170119.orig/source/compiler/dttable2.c -+++ acpica-unix2-20170119/source/compiler/dttable2.c +--- acpica-unix2-20170224.orig/source/compiler/dttable2.c ++++ acpica-unix2-20170224/source/compiler/dttable2.c @@ -346,7 +346,7 @@ DtCompileMpst ( DtPushSubtable (Subtable); @@ -2712,10 +2712,10 @@ Index: acpica-unix2-20170119/source/compiler/dttable2.c ParentTable = DtPeekSubtable (); DtInsertSubtable (ParentTable, Subtable); -Index: acpica-unix2-20170119/source/components/disassembler/dmbuffer.c +Index: acpica-unix2-20170224/source/components/disassembler/dmbuffer.c =================================================================== ---- acpica-unix2-20170119.orig/source/components/disassembler/dmbuffer.c -+++ acpica-unix2-20170119/source/components/disassembler/dmbuffer.c +--- acpica-unix2-20170224.orig/source/components/disassembler/dmbuffer.c ++++ acpica-unix2-20170224/source/components/disassembler/dmbuffer.c @@ -204,7 +204,7 @@ AcpiDmByteList ( @@ -2791,11 +2791,11 @@ Index: acpica-unix2-20170119/source/components/disassembler/dmbuffer.c NextOp = AcpiPsGetDepthNext (NULL, Op); if (!NextOp) -Index: acpica-unix2-20170119/source/components/disassembler/dmopcode.c +Index: acpica-unix2-20170224/source/components/disassembler/dmopcode.c =================================================================== ---- acpica-unix2-20170119.orig/source/components/disassembler/dmopcode.c -+++ acpica-unix2-20170119/source/components/disassembler/dmopcode.c -@@ -251,6 +251,7 @@ AcpiDmPredefinedDescription ( +--- acpica-unix2-20170224.orig/source/components/disassembler/dmopcode.c ++++ acpica-unix2-20170224/source/components/disassembler/dmopcode.c +@@ -253,6 +253,7 @@ AcpiDmPredefinedDescription ( char *NameString; int LastCharIsDigit; int LastCharsAreHex; @@ -2803,7 +2803,7 @@ Index: acpica-unix2-20170119/source/components/disassembler/dmopcode.c if (!Op) -@@ -268,7 +269,9 @@ AcpiDmPredefinedDescription ( +@@ -270,7 +271,9 @@ AcpiDmPredefinedDescription ( /* Predefined name must start with an underscore */ @@ -2814,7 +2814,7 @@ Index: acpica-unix2-20170119/source/components/disassembler/dmopcode.c if (NameString[0] != '_') { return; -@@ -878,21 +881,26 @@ AcpiDmDisassembleOneOp ( +@@ -881,25 +884,27 @@ AcpiDmDisassembleOneOp ( AcpiDmNamestring (Op->Common.Value.Name); break; @@ -2823,33 +2823,34 @@ Index: acpica-unix2-20170119/source/components/disassembler/dmopcode.c - Length = AcpiDmDumpName (Op->Named.Name); + UINT32 TmpName; -+ + + AcpiOsPrintf (","); + ASL_CV_PRINT_ONE_COMMENT (Op, AML_NAMECOMMENT, NULL, 0); + ACPI_MOVE_32_TO_32(&TmpName, &Op->Named.Name); + Length = AcpiDmDumpName (TmpName); - AcpiOsPrintf (",%*.s %u", (unsigned) (5 - Length), " ", + AcpiOsPrintf ("%*.s %u", (unsigned) (5 - Length), " ", - (UINT32) Op->Common.Value.Integer); + (UINT32) Op->Common.Value.Size); + AcpiDmCommaIfFieldMember (Op); - Info->BitOffset += (UINT32) Op->Common.Value.Integer; + Info->BitOffset += (UINT32) Op->Common.Value.Size; break; -+ } case AML_INT_RESERVEDFIELD_OP: /* Offset() -- Must account for previous offsets */ - Offset = (UINT32) Op->Common.Value.Integer; -+ //DEBUG + Offset = Op->Common.Value.Size; Info->BitOffset += Offset; if (Info->BitOffset % 8 == 0) -Index: acpica-unix2-20170119/source/components/disassembler/dmresrcl2.c +Index: acpica-unix2-20170224/source/components/disassembler/dmresrcl2.c =================================================================== ---- acpica-unix2-20170119.orig/source/components/disassembler/dmresrcl2.c -+++ acpica-unix2-20170119/source/components/disassembler/dmresrcl2.c +--- acpica-unix2-20170224.orig/source/components/disassembler/dmresrcl2.c ++++ acpica-unix2-20170224/source/components/disassembler/dmresrcl2.c @@ -191,22 +191,24 @@ AcpiDmGpioCommon ( char *DeviceName = NULL; UINT32 PinCount; @@ -3071,10 +3072,10 @@ Index: acpica-unix2-20170119/source/components/disassembler/dmresrcl2.c DeviceName = ACPI_ADD_PTR (char, Resource, ResourceSourceOffset); AcpiUtPrintString (DeviceName, ACPI_UINT16_MAX); -Index: acpica-unix2-20170119/source/components/disassembler/dmresrcl.c +Index: acpica-unix2-20170224/source/components/disassembler/dmresrcl.c =================================================================== ---- acpica-unix2-20170119.orig/source/components/disassembler/dmresrcl.c -+++ acpica-unix2-20170119/source/components/disassembler/dmresrcl.c +--- acpica-unix2-20170224.orig/source/components/disassembler/dmresrcl.c ++++ acpica-unix2-20170224/source/components/disassembler/dmresrcl.c @@ -141,7 +141,8 @@ AcpiDmMemoryFields ( UINT32 Level) { @@ -3223,10 +3224,10 @@ Index: acpica-unix2-20170119/source/components/disassembler/dmresrcl.c } AcpiDmIndent (Level); -Index: acpica-unix2-20170119/source/components/disassembler/dmresrcs.c +Index: acpica-unix2-20170224/source/components/disassembler/dmresrcs.c =================================================================== ---- acpica-unix2-20170119.orig/source/components/disassembler/dmresrcs.c -+++ acpica-unix2-20170119/source/components/disassembler/dmresrcs.c +--- acpica-unix2-20170224.orig/source/components/disassembler/dmresrcs.c ++++ acpica-unix2-20170224/source/components/disassembler/dmresrcs.c @@ -72,6 +72,7 @@ AcpiDmIrqDescriptor ( UINT32 Length, UINT32 Level) @@ -3283,10 +3284,10 @@ Index: acpica-unix2-20170119/source/components/disassembler/dmresrcs.c AcpiDmIndent (Level + 1); AcpiDmDumpInteger8 (Resource->FixedIo.AddressLength, "Length"); -Index: acpica-unix2-20170119/source/components/dispatcher/dsfield.c +Index: acpica-unix2-20170224/source/components/dispatcher/dsfield.c =================================================================== ---- acpica-unix2-20170119.orig/source/components/dispatcher/dsfield.c -+++ acpica-unix2-20170119/source/components/dispatcher/dsfield.c +--- acpica-unix2-20170224.orig/source/components/dispatcher/dsfield.c ++++ acpica-unix2-20170224/source/components/dispatcher/dsfield.c @@ -318,6 +318,7 @@ AcpiDsGetFieldNames ( ACPI_STATUS Status; UINT64 Position; @@ -3331,10 +3332,10 @@ Index: acpica-unix2-20170119/source/components/dispatcher/dsfield.c if (ACPI_FAILURE (Status)) { ACPI_ERROR_NAMESPACE ((char *) &Arg->Named.Name, Status); -Index: acpica-unix2-20170119/source/components/events/evgpeblk.c +Index: acpica-unix2-20170224/source/components/events/evgpeblk.c =================================================================== ---- acpica-unix2-20170119.orig/source/components/events/evgpeblk.c -+++ acpica-unix2-20170119/source/components/events/evgpeblk.c +--- acpica-unix2-20170224.orig/source/components/events/evgpeblk.c ++++ acpica-unix2-20170224/source/components/events/evgpeblk.c @@ -376,6 +376,7 @@ AcpiEvCreateGpeBlock ( ACPI_STATUS Status; ACPI_GPE_BLOCK_INFO *GpeBlock; @@ -3367,10 +3368,10 @@ Index: acpica-unix2-20170119/source/components/events/evgpeblk.c InterruptNumber == AcpiGbl_FADT.SciInterrupt ? " (SCI)" : "")); /* Update global count of currently available GPEs */ -Index: acpica-unix2-20170119/source/components/hardware/hwregs.c +Index: acpica-unix2-20170224/source/components/hardware/hwregs.c =================================================================== ---- acpica-unix2-20170119.orig/source/components/hardware/hwregs.c -+++ acpica-unix2-20170119/source/components/hardware/hwregs.c +--- acpica-unix2-20170224.orig/source/components/hardware/hwregs.c ++++ acpica-unix2-20170224/source/components/hardware/hwregs.c @@ -197,7 +197,7 @@ AcpiHwValidateRegister ( * Address must not be null. A null address also indicates an optional * ACPI register that is not supported, so no error message. @@ -3380,10 +3381,10 @@ Index: acpica-unix2-20170119/source/components/hardware/hwregs.c if (!(*Address)) { return (AE_BAD_ADDRESS); -Index: acpica-unix2-20170119/source/components/hardware/hwvalid.c +Index: acpica-unix2-20170224/source/components/hardware/hwvalid.c =================================================================== ---- acpica-unix2-20170119.orig/source/components/hardware/hwvalid.c -+++ acpica-unix2-20170119/source/components/hardware/hwvalid.c +--- acpica-unix2-20170224.orig/source/components/hardware/hwvalid.c ++++ acpica-unix2-20170224/source/components/hardware/hwvalid.c @@ -135,6 +135,8 @@ AcpiHwValidateIoRequest ( UINT32 ByteWidth; ACPI_IO_ADDRESS LastAddress; @@ -3392,7 +3393,7 @@ Index: acpica-unix2-20170119/source/components/hardware/hwvalid.c + UINT64 Tmp64; - ACPI_FUNCTION_TRACE (HwValidateIoRequest); + ACPI_FUNCTION_NAME (HwValidateIoRequest); @@ -161,7 +163,10 @@ AcpiHwValidateIoRequest ( /* Maximum 16-bit address in I/O space */ @@ -3405,10 +3406,10 @@ Index: acpica-unix2-20170119/source/components/hardware/hwvalid.c { ACPI_ERROR ((AE_INFO, "Illegal I/O port address/length above 64K: %8.8X%8.8X/0x%X", -Index: acpica-unix2-20170119/source/components/namespace/nsaccess.c +Index: acpica-unix2-20170224/source/components/namespace/nsaccess.c =================================================================== ---- acpica-unix2-20170119.orig/source/components/namespace/nsaccess.c -+++ acpica-unix2-20170119/source/components/namespace/nsaccess.c +--- acpica-unix2-20170224.orig/source/components/namespace/nsaccess.c ++++ acpica-unix2-20170224/source/components/namespace/nsaccess.c @@ -309,6 +309,7 @@ AcpiNsLookup ( ACPI_OBJECT_TYPE ThisSearchType; UINT32 SearchParentFlag = ACPI_NS_SEARCH_PARENT; @@ -3429,10 +3430,10 @@ Index: acpica-unix2-20170119/source/components/namespace/nsaccess.c AcpiUtGetTypeName (ThisNode->Type), AcpiUtGetTypeName (TypeToCheckFor))); } -Index: acpica-unix2-20170119/source/components/namespace/nsparse.c +Index: acpica-unix2-20170224/source/components/namespace/nsparse.c =================================================================== ---- acpica-unix2-20170119.orig/source/components/namespace/nsparse.c -+++ acpica-unix2-20170119/source/components/namespace/nsparse.c +--- acpica-unix2-20170224.orig/source/components/namespace/nsparse.c ++++ acpica-unix2-20170224/source/components/namespace/nsparse.c @@ -196,13 +196,14 @@ AcpiNsOneCompleteParse ( /* Table must consist of at least a complete header */ @@ -3450,10 +3451,10 @@ Index: acpica-unix2-20170119/source/components/namespace/nsparse.c Status = AcpiTbGetOwnerId (TableIndex, &OwnerId); if (ACPI_FAILURE (Status)) -Index: acpica-unix2-20170119/source/components/tables/tbdata.c +Index: acpica-unix2-20170224/source/components/tables/tbdata.c =================================================================== ---- acpica-unix2-20170119.orig/source/components/tables/tbdata.c -+++ acpica-unix2-20170119/source/components/tables/tbdata.c +--- acpica-unix2-20170224.orig/source/components/tables/tbdata.c ++++ acpica-unix2-20170224/source/components/tables/tbdata.c @@ -407,6 +407,7 @@ AcpiTbVerifyTempTable ( char *Signature) { @@ -3472,10 +3473,10 @@ Index: acpica-unix2-20170119/source/components/tables/tbdata.c if (ACPI_FAILURE (Status)) { ACPI_EXCEPTION ((AE_INFO, AE_NO_MEMORY, -Index: acpica-unix2-20170119/source/components/tables/tbfadt.c +Index: acpica-unix2-20170224/source/components/tables/tbfadt.c =================================================================== ---- acpica-unix2-20170119.orig/source/components/tables/tbfadt.c -+++ acpica-unix2-20170119/source/components/tables/tbfadt.c +--- acpica-unix2-20170224.orig/source/components/tables/tbfadt.c ++++ acpica-unix2-20170224/source/components/tables/tbfadt.c @@ -520,6 +520,8 @@ AcpiTbConvertFadt ( UINT8 Length; UINT8 Flags; @@ -3555,10 +3556,10 @@ Index: acpica-unix2-20170119/source/components/tables/tbfadt.c "PmRegisters", 0); } } -Index: acpica-unix2-20170119/source/components/tables/tbfind.c +Index: acpica-unix2-20170224/source/components/tables/tbfind.c =================================================================== ---- acpica-unix2-20170119.orig/source/components/tables/tbfind.c -+++ acpica-unix2-20170119/source/components/tables/tbfind.c +--- acpica-unix2-20170224.orig/source/components/tables/tbfind.c ++++ acpica-unix2-20170224/source/components/tables/tbfind.c @@ -108,8 +108,11 @@ AcpiTbFindTable ( (void) AcpiUtAcquireMutex (ACPI_MTX_TABLES); for (i = 0; i < AcpiGbl_RootTableList.CurrentTableCount; ++i) @@ -3572,10 +3573,10 @@ Index: acpica-unix2-20170119/source/components/tables/tbfind.c { /* Not the requested table */ -Index: acpica-unix2-20170119/source/components/tables/tbprint.c +Index: acpica-unix2-20170224/source/components/tables/tbprint.c =================================================================== ---- acpica-unix2-20170119.orig/source/components/tables/tbprint.c -+++ acpica-unix2-20170119/source/components/tables/tbprint.c +--- acpica-unix2-20170224.orig/source/components/tables/tbprint.c ++++ acpica-unix2-20170224/source/components/tables/tbprint.c @@ -143,15 +143,18 @@ AcpiTbPrintTableHeader ( ACPI_TABLE_HEADER *Header) { @@ -3617,10 +3618,10 @@ Index: acpica-unix2-20170119/source/components/tables/tbprint.c } } -Index: acpica-unix2-20170119/source/components/tables/tbutils.c +Index: acpica-unix2-20170224/source/components/tables/tbutils.c =================================================================== ---- acpica-unix2-20170119.orig/source/components/tables/tbutils.c -+++ acpica-unix2-20170119/source/components/tables/tbutils.c +--- acpica-unix2-20170224.orig/source/components/tables/tbutils.c ++++ acpica-unix2-20170224/source/components/tables/tbutils.c @@ -238,7 +238,7 @@ AcpiTbGetRootTableEntry ( * 64-bit platform, XSDT: Move (unaligned) 64-bit to local, * return 64-bit @@ -3680,10 +3681,10 @@ Index: acpica-unix2-20170119/source/components/tables/tbutils.c { AcpiGbl_FadtIndex = TableIndex; AcpiTbParseFadt (); -Index: acpica-unix2-20170119/source/components/tables/tbxface.c +Index: acpica-unix2-20170224/source/components/tables/tbxface.c =================================================================== ---- acpica-unix2-20170119.orig/source/components/tables/tbxface.c -+++ acpica-unix2-20170119/source/components/tables/tbxface.c +--- acpica-unix2-20170224.orig/source/components/tables/tbxface.c ++++ acpica-unix2-20170224/source/components/tables/tbxface.c @@ -263,8 +263,11 @@ AcpiGetTableHeader ( for (i = 0, j = 0; i < AcpiGbl_RootTableList.CurrentTableCount; i++) @@ -3697,10 +3698,10 @@ Index: acpica-unix2-20170119/source/components/tables/tbxface.c { continue; } -Index: acpica-unix2-20170119/source/components/tables/tbxfload.c +Index: acpica-unix2-20170224/source/components/tables/tbxfload.c =================================================================== ---- acpica-unix2-20170119.orig/source/components/tables/tbxfload.c -+++ acpica-unix2-20170119/source/components/tables/tbxfload.c +--- acpica-unix2-20170224.orig/source/components/tables/tbxfload.c ++++ acpica-unix2-20170224/source/components/tables/tbxfload.c @@ -156,6 +156,7 @@ AcpiTbLoadNamespace ( ACPI_TABLE_DESC *Table; UINT32 TablesLoaded = 0; @@ -3720,10 +3721,10 @@ Index: acpica-unix2-20170119/source/components/tables/tbxfload.c ACPI_FAILURE (AcpiTbValidateTable (Table))) { Status = AE_NO_ACPI_TABLES; -Index: acpica-unix2-20170119/source/include/acmacros.h +Index: acpica-unix2-20170224/source/include/acmacros.h =================================================================== ---- acpica-unix2-20170119.orig/source/include/acmacros.h -+++ acpica-unix2-20170119/source/include/acmacros.h +--- acpica-unix2-20170224.orig/source/include/acmacros.h ++++ acpica-unix2-20170224/source/include/acmacros.h @@ -98,7 +98,9 @@ ((UINT8 *)(void *)(d))[6] = ((UINT8 *)(void *)(s))[1];\ ((UINT8 *)(void *)(d))[7] = ((UINT8 *)(void *)(s))[0];} @@ -3787,10 +3788,10 @@ Index: acpica-unix2-20170119/source/include/acmacros.h #define ACPI_MOVE_32_TO_16(d, s) ACPI_MOVE_16_TO_16(d, s) /* Truncate to 16 */ -Index: acpica-unix2-20170119/source/include/platform/aclinux.h +Index: acpica-unix2-20170224/source/include/platform/aclinux.h =================================================================== ---- acpica-unix2-20170119.orig/source/include/platform/aclinux.h -+++ acpica-unix2-20170119/source/include/platform/aclinux.h +--- acpica-unix2-20170224.orig/source/include/platform/aclinux.h ++++ acpica-unix2-20170224/source/include/platform/aclinux.h @@ -219,6 +219,10 @@ #define __cdecl #endif @@ -3802,10 +3803,10 @@ Index: acpica-unix2-20170119/source/include/platform/aclinux.h #endif /* __KERNEL__ */ #endif /* __ACLINUX_H__ */ -Index: acpica-unix2-20170119/source/tools/acpiexec/aetables.c +Index: acpica-unix2-20170224/source/tools/acpiexec/aetables.c =================================================================== ---- acpica-unix2-20170119.orig/source/tools/acpiexec/aetables.c -+++ acpica-unix2-20170119/source/tools/acpiexec/aetables.c +--- acpica-unix2-20170224.orig/source/tools/acpiexec/aetables.c ++++ acpica-unix2-20170224/source/tools/acpiexec/aetables.c @@ -146,21 +146,25 @@ AeInitializeTableHeader ( char *Signature, UINT32 Length)