rpms/acpica-tools
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 20190405 version of the upstream source

Browse Source 
Signed-off-by: Al Stone <ahs3@redhat.com>
This commit is contained in:
Al Stone 2019-05-11 16:52:39 -06:00
parent b07847bae5
commit c4eca0e1b7
10 changed files with 247 additions and 355 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -111,3 +111,5 @@ series
/acpitests-unix-20190215.tar.gz
/acpica-unix2-20190329.tar.gz
/acpitests-unix-20190329.tar.gz
/acpica-unix2-20190405.tar.gz
/acpitests-unix-20190405.tar.gz

55
acpica-tools.spec
View File

@ -1,5 +1,5 @@
Name: acpica-tools
Version: 20190329
Version: 20190405
Release: 1%{?dist}
Summary: ACPICA tools for the development and debug of ACPI tables
@ -30,19 +30,18 @@ Patch2: OPT_LDFLAGS.patch
Patch3: int-format.patch
Patch4: f23-harden.patch
Patch5: template.patch
Patch6: free.patch
Patch7: ppc64le.patch
Patch8: arm7hl.patch
Patch9: big-endian-v2.patch
Patch10: simple-64bit.patch
Patch11: mips-be-fix.patch
Patch12: cve-2017-13693.patch
Patch13: cve-2017-13694.patch
Patch14: cve-2017-13695.patch
Patch15: str-trunc-warn.patch
Patch16: ptr-cast.patch
Patch17: aslcodegen.patch
Patch18: facp.patch
Patch6: ppc64le.patch
Patch7: arm7hl.patch
Patch8: big-endian-v2.patch
Patch9: simple-64bit.patch
Patch10: mips-be-fix.patch
Patch11: cve-2017-13693.patch
Patch12: cve-2017-13694.patch
Patch13: cve-2017-13695.patch
Patch14: str-trunc-warn.patch
Patch15: ptr-cast.patch
Patch16: aslcodegen.patch
Patch17: facp.patch
BuildRequires: bison patchutils flex gcc
@ -98,19 +97,18 @@ gzip -dc %{SOURCE1} | tar -x --strip-components=1 -f -
%patch3 -p1 -b .int-format
%patch4 -p1 -b .f23-harden
%patch5 -p1 -b .template
%patch6 -p1 -b .free
%patch7 -p1 -b .ppc64le
%patch8 -p1 -b .arm7hl
%patch9 -p1 -b .big-endian-v2
%patch10 -p1 -b .simple-64bit
%patch11 -p1 -b .mips-be-fix
%patch12 -p1 -b .cve-2017-13693
%patch13 -p1 -b .cve-2017-13694
%patch14 -p1 -b .cve-2017-13695
%patch15 -p1 -b .str-trunc-warn
%patch16 -p1 -b .ptr-cast
%patch17 -p1 -b .aslcodegen
%patch18 -p1 -b .facp
%patch6 -p1 -b .ppc64le
%patch7 -p1 -b .arm7hl
%patch8 -p1 -b .big-endian-v2
%patch9 -p1 -b .simple-64bit
%patch10 -p1 -b .mips-be-fix
%patch11 -p1 -b .cve-2017-13693
%patch12 -p1 -b .cve-2017-13694
%patch13 -p1 -b .cve-2017-13695
%patch14 -p1 -b .str-trunc-warn
%patch15 -p1 -b .ptr-cast
%patch16 -p1 -b .aslcodegen
%patch17 -p1 -b .facp
cp -p %{SOURCE2} README.Fedora
cp -p %{SOURCE3} iasl.1
@ -239,6 +237,9 @@ fi
%changelog
* Fri May 10 2019 Al Stone <ahs3@redhat.com> - 20190405-1
- Update to 20190405 source tree, including patch refeshes.
* Fri May 10 2019 Al Stone <ahs3@redhat.com> - 20190329-1
- Update to 20190329 source tree, including patch refeshes.

10
aslcodegen.patch
View File

@ -4,11 +4,11 @@ support; this patch repairs that adaptation.
Signed-off-by: Al Stone <ahs3@redhat.com>
Index: acpica-unix-20190329/source/compiler/aslcodegen.c
Index: acpica-unix-20190405/source/compiler/aslcodegen.c
===================================================================
--- acpica-unix-20190329.orig/source/compiler/aslcodegen.c
+++ acpica-unix-20190329/source/compiler/aslcodegen.c
@@ -500,8 +500,7 @@ CgWriteTableHeader (
--- acpica-unix-20190405.orig/source/compiler/aslcodegen.c
+++ acpica-unix-20190405/source/compiler/aslcodegen.c
@@ -497,8 +497,7 @@ CgWriteTableHeader (
/* Table length. Checksum zero for now, will rewrite later */
@ -18,7 +18,7 @@ Index: acpica-unix-20190329/source/compiler/aslcodegen.c
/* Calculate the comment lengths for this definition block parseOp */
@@ -547,6 +546,8 @@ CgWriteTableHeader (
@@ -544,6 +543,8 @@ CgWriteTableHeader (
CvDbgPrint (" Length: %u\n", CommentLength);
}
}

84
badcode.asl.result
View File

@ -1,18 +1,6 @@
badcode.asl 25: Mutex (MTX1, 32)
Error 6125 - ^ SyncLevel must be in the range 0-15
badcode.asl 29: Name (BIG, 0x1234567887654321)
Warning 3038 - ^ Truncating 64-bit constant found in 32-bit table
badcode.asl 33: Name (PKG1, Package(5) {0,1})
Remark 2063 - ^ Initializer list shorter than declared package length
badcode.asl 37: Name (PATH, Buffer() {"\_SB_.PCI2._CRS"})
Warning 3046 - ^ Invalid or unknown escape sequence
badcode.asl 41: Name (ESC1, "abcdefg\x00hijklmn")
Warning 3055 - ^ Invalid Hex/Octal Escape - Non-ASCII or NULL
badcode.asl 49: FLD1, 8
Error 6030 - ^ Access width of Field Unit extends beyond region limit
@ -22,9 +10,6 @@ Error 6100 - ^ Host Operation Region requires ByteAcc access
badcode.asl 60: Field (OPR3, WordAcc, NoLock, Preserve)
Error 6099 - ^ Host Operation Region requires BufferAcc access
badcode.asl 67: Method (MTH1, 0, NotSerialized, 32)
Error 6125 - SyncLevel must be in the range 0-15 ^
badcode.asl 71: Store (Arg3, Local0)
Warning 3144 - ^ Method Local is set but never used (Local0)
@ -64,15 +49,9 @@ Error 6114 - ^ Result is not used, operator has no effect
badcode.asl 94: Store (5, INT1)
Warning 3134 - ^ Statement is unreachable
badcode.asl 97: Method (MTH2)
Remark 2119 - ^ Control Method marked Serialized (Due to use of Switch operator)
badcode.asl 97: Method (MTH2)
Warning 3115 - ^ Not all control paths return a value (MTH2)
badcode.asl 101: Switch (ToInteger (INT1))
Error 6078 - ^ No Case statements under Switch
badcode.asl 120: Store (MTH2 (), Local0)
Warning 3144 - ^ Method Local is set but never used (Local0)
@ -151,63 +130,6 @@ Warning 3141 - ^ Missing dependency (Device object requires a _
badcode.asl 205: Method (_REG, 2)
Warning 3079 - ^ _REG has no corresponding Operation Region
badcode.asl 219: StartDependentFn (0, 0)
Error 6019 - ^ Dependent function macros cannot be nested
badcode.asl 225: })
Error 6070 - ^ Missing EndDependentFn() macro in dependent resource list
badcode.asl 242: 0x00002000, // Length
Error 6049 - ^ Length is larger than Min/Max window
badcode.asl 247: 0x00001001, // Range Minimum
Error 6001 - ^ Must be a multiple of alignment/granularity value
badcode.asl 248: 0x00002002, // Range Maximum
Error 6001 - ^ Must be a multiple of alignment/granularity value
badcode.asl 255: 0xFFFF, // Address
Warning 3060 - ^ Maximum 10-bit ISA address (0x3FF)
badcode.asl 264: 0x05 // Access Size
Error 6042 - ^ Invalid AccessSize (Maximum is 4 - QWord access)
badcode.asl 268: QWordSpace (0xB0, ResourceConsumer, PosDecode, MinFixed, MaxFixed, 0xA5,
Error 6139 - Constant out of range ^ (0xB0, allowable: 0xC0-0xFF)
badcode.asl 279: 0x0200, // Range Minimum
Error 6051 - ^ Address Min is greater than Address Max
badcode.asl 291: 0x00001002, // Length
Error 6049 - ^ Length is larger than Min/Max window
badcode.asl 296: 0x00000010,
Error 6048 - ^ Granularity must be zero or a power of two minus one
badcode.asl 305: 0x0000000000000B02, // Range Minimum
Error 6001 - ^ Must be a multiple of alignment/granularity value
badcode.asl 315: 0x00000000002FFFFE, // Range Maximum
Error 6001 - ^ Must be a multiple of alignment/granularity value (-1)
badcode.asl 326: 0x00000000, // Length
Error 6043 - ^ Invalid combination of Length and Min/Max fixed flags
badcode.asl 335: 0x00000100, // Length
Error 6043 - ^ Invalid combination of Length and Min/Max fixed flags
badcode.asl 344: 0x00000200, // Length
Error 6043 - ^ Invalid combination of Length and Min/Max fixed flags
badcode.asl 349: 0x0000000F, // Granularity
Error 6047 - ^ Granularity must be zero for fixed Min/Max
badcode.asl 358: DWordIO (ResourceProducer, MinFixed, MaxFixed, PosDecode, EntireRange,
Error 6090 - ^ Min/Max/Length/Gran are all zero, but no resource tag
badcode.asl 368: EndDependentFn ()
Error 6071 - ^ Missing StartDependentFn() macro in dependent resource list
badcode.asl 388: CreateWordField (RSC3, \DWI1._LEN, LEN)
Warning 3128 - ResourceTag larger than Field ^ (Size mismatch, Tag: 32 bits, Field: 16 bits)
@ -260,7 +182,7 @@ Copyright (c) 2000 - 2019 Intel Corporation
Ignoring all errors, forcing AML file generation
ASL Input: badcode.asl - 408 lines, 11587 bytes, 81 keywords
AML Output: badcode.aml - 1195 bytes, 61 named objects, 20 executable opcodes
ASL Input: badcode.asl - 11587 bytes 81 keywords 408 source lines
AML Output: badcode.aml - 1195 bytes 20 opcodes 61 named objects
Compilation complete. 46 Errors, 28 Warnings, 11 Remarks, 16 Optimizations, 1 Constants Folded
Compilation successful. 46 Errors, 28 Warnings, 11 Remarks, 16 Optimizations, 1 Constants Folded

296
big-endian.patch
View File

@ -23,11 +23,11 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
source/include/platform/aclinux.h | 8 ++
12 files changed, 487 insertions(+), 283 deletions(-)
Index: acpica-unix-20190329/source/compiler/aslcodegen.c
Index: acpica-unix-20190405/source/compiler/aslcodegen.c
===================================================================
--- acpica-unix-20190329.orig/source/compiler/aslcodegen.c
+++ acpica-unix-20190329/source/compiler/aslcodegen.c
@@ -240,16 +240,12 @@ CgWriteAmlOpcode (
--- acpica-unix-20190405.orig/source/compiler/aslcodegen.c
+++ acpica-unix-20190405/source/compiler/aslcodegen.c
@@ -237,16 +237,12 @@ CgWriteAmlOpcode (
ACPI_PARSE_OBJECT *Op)
{
UINT8 PkgLenFirstByte;
@ -50,7 +50,7 @@ Index: acpica-unix-20190329/source/compiler/aslcodegen.c
/* We expect some DEFAULT_ARGs, just ignore them */
@@ -282,51 +278,52 @@ CgWriteAmlOpcode (
@@ -279,51 +275,52 @@ CgWriteAmlOpcode (
/* Special opcodes for within a field definition */
@ -114,7 +114,7 @@ Index: acpica-unix-20190329/source/compiler/aslcodegen.c
break;
}
@@ -337,8 +334,8 @@ CgWriteAmlOpcode (
@@ -334,8 +331,8 @@ CgWriteAmlOpcode (
if (Op->Asl.AmlPkgLenBytes == 1)
{
/* Simplest case -- no bytes to follow, just write the count */
@ -125,7 +125,7 @@ Index: acpica-unix-20190329/source/compiler/aslcodegen.c
}
else if (Op->Asl.AmlPkgLenBytes != 0)
{
@@ -348,7 +345,7 @@ CgWriteAmlOpcode (
@@ -345,7 +342,7 @@ CgWriteAmlOpcode (
*/
PkgLenFirstByte = (UINT8)
(((UINT32) (Op->Asl.AmlPkgLenBytes - 1) << 6) |
@ -134,7 +134,7 @@ Index: acpica-unix-20190329/source/compiler/aslcodegen.c
CgLocalWriteAmlData (Op, &PkgLenFirstByte, 1);
@@ -356,39 +353,47 @@ CgWriteAmlOpcode (
@@ -353,39 +350,47 @@ CgWriteAmlOpcode (
* Shift the length over by the 4 bits we just stuffed
* in the first byte
*/
@ -194,7 +194,7 @@ Index: acpica-unix-20190329/source/compiler/aslcodegen.c
break;
case AML_STRING_OP:
@@ -424,6 +429,7 @@ CgWriteTableHeader (
@@ -421,6 +426,7 @@ CgWriteTableHeader (
ACPI_PARSE_OBJECT *Op)
{
ACPI_PARSE_OBJECT *Child;
@ -202,7 +202,7 @@ Index: acpica-unix-20190329/source/compiler/aslcodegen.c
UINT32 CommentLength;
ACPI_COMMENT_NODE *Current;
@@ -481,7 +487,7 @@ CgWriteTableHeader (
@@ -478,7 +484,7 @@ CgWriteTableHeader (
/* OEM Revision */
Child = Child->Asl.Next;
@ -211,7 +211,7 @@ Index: acpica-unix-20190329/source/compiler/aslcodegen.c
/* Compiler ID */
@@ -489,12 +495,13 @@ CgWriteTableHeader (
@@ -486,12 +492,13 @@ CgWriteTableHeader (
/* Compiler version */
@ -228,7 +228,7 @@ Index: acpica-unix-20190329/source/compiler/aslcodegen.c
/* Calculate the comment lengths for this definition block parseOp */
@@ -652,7 +659,10 @@ CgWriteNode (
@@ -624,7 +631,10 @@ CgWriteNode (
ACPI_PARSE_OBJECT *Op)
{
ASL_RESOURCE_NODE *Rnode;
@ -240,7 +240,7 @@ Index: acpica-unix-20190329/source/compiler/aslcodegen.c
/* Write all comments here. */
@@ -676,13 +686,24 @@ CgWriteNode (
@@ -648,13 +658,24 @@ CgWriteNode (
switch (Op->Asl.AmlOpcode)
{
case AML_RAW_DATA_BYTE:
@ -268,10 +268,10 @@ Index: acpica-unix-20190329/source/compiler/aslcodegen.c
case AML_RAW_DATA_BUFFER:
Index: acpica-unix-20190329/source/compiler/aslopcodes.c
Index: acpica-unix-20190405/source/compiler/aslopcodes.c
===================================================================
--- acpica-unix-20190329.orig/source/compiler/aslopcodes.c
+++ acpica-unix-20190329/source/compiler/aslopcodes.c
--- acpica-unix-20190405.orig/source/compiler/aslopcodes.c
+++ acpica-unix-20190405/source/compiler/aslopcodes.c
@@ -485,6 +485,7 @@ OpcDoUnicode (
UINT32 i;
UINT8 *AsciiString;
@ -290,10 +290,10 @@ Index: acpica-unix-20190329/source/compiler/aslopcodes.c
}
/*
Index: acpica-unix-20190329/source/compiler/aslrestype1.c
Index: acpica-unix-20190405/source/compiler/aslrestype1.c
===================================================================
--- acpica-unix-20190329.orig/source/compiler/aslrestype1.c
+++ acpica-unix-20190329/source/compiler/aslrestype1.c
--- acpica-unix-20190405.orig/source/compiler/aslrestype1.c
+++ acpica-unix-20190405/source/compiler/aslrestype1.c
@@ -142,6 +142,11 @@ RsDoMemory24Descriptor (
ACPI_PARSE_OBJECT *LengthOp = NULL;
ASL_RESOURCE_NODE *Rnode;
@ -490,10 +490,10 @@ Index: acpica-unix-20190329/source/compiler/aslrestype1.c
RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH,
CurrentByteOffset + ASL_RESDESC_OFFSET (FixedMemory32.AddressLength));
break;
Index: acpica-unix-20190329/source/compiler/aslrestype1i.c
Index: acpica-unix-20190405/source/compiler/aslrestype1i.c
===================================================================
--- acpica-unix-20190329.orig/source/compiler/aslrestype1i.c
+++ acpica-unix-20190329/source/compiler/aslrestype1i.c
--- acpica-unix-20190405.orig/source/compiler/aslrestype1i.c
+++ acpica-unix-20190405/source/compiler/aslrestype1i.c
@@ -198,6 +198,8 @@ RsDoFixedDmaDescriptor (
ACPI_PARSE_OBJECT *InitializerOp;
ASL_RESOURCE_NODE *Rnode;
@ -630,10 +630,10 @@ Index: acpica-unix-20190329/source/compiler/aslrestype1i.c
+ ACPI_MOVE_16_TO_16(&Descriptor->Irq.IrqMask, &IrqMask);
return (Rnode);
}
Index: acpica-unix-20190329/source/compiler/aslrestype2.c
Index: acpica-unix-20190405/source/compiler/aslrestype2.c
===================================================================
--- acpica-unix-20190329.orig/source/compiler/aslrestype2.c
+++ acpica-unix-20190329/source/compiler/aslrestype2.c
--- acpica-unix-20190405.orig/source/compiler/aslrestype2.c
+++ acpica-unix-20190405/source/compiler/aslrestype2.c
@@ -76,6 +76,7 @@ RsDoGeneralRegisterDescriptor (
ACPI_PARSE_OBJECT *InitializerOp;
ASL_RESOURCE_NODE *Rnode;
@ -774,10 +774,10 @@ Index: acpica-unix-20190329/source/compiler/aslrestype2.c
/* Point to end-of-descriptor for vendor data */
Index: acpica-unix-20190329/source/compiler/aslrestype2d.c
Index: acpica-unix-20190405/source/compiler/aslrestype2d.c
===================================================================
--- acpica-unix-20190329.orig/source/compiler/aslrestype2d.c
+++ acpica-unix-20190329/source/compiler/aslrestype2d.c
--- acpica-unix-20190405.orig/source/compiler/aslrestype2d.c
+++ acpica-unix-20190405/source/compiler/aslrestype2d.c
@@ -79,7 +79,13 @@ RsDoDwordIoDescriptor (
ACPI_PARSE_OBJECT *GranOp = NULL;
ASL_RESOURCE_NODE *Rnode;
@ -1133,10 +1133,10 @@ Index: acpica-unix-20190329/source/compiler/aslrestype2d.c
Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS32) +
OptionIndex + StringLength;
return (Rnode);
Index: acpica-unix-20190329/source/compiler/aslrestype2e.c
Index: acpica-unix-20190405/source/compiler/aslrestype2e.c
===================================================================
--- acpica-unix-20190329.orig/source/compiler/aslrestype2e.c
+++ acpica-unix-20190329/source/compiler/aslrestype2e.c
--- acpica-unix-20190405.orig/source/compiler/aslrestype2e.c
+++ acpica-unix-20190405/source/compiler/aslrestype2e.c
@@ -78,6 +78,13 @@ RsDoExtendedIoDescriptor (
ACPI_PARSE_OBJECT *GranOp = NULL;
ASL_RESOURCE_NODE *Rnode;
@ -1242,10 +1242,10 @@ Index: acpica-unix-20190329/source/compiler/aslrestype2e.c
Rnode->BufferLength = sizeof (AML_RESOURCE_EXTENDED_ADDRESS64) +
StringLength;
return (Rnode);
Index: acpica-unix-20190329/source/compiler/aslrestype2q.c
Index: acpica-unix-20190405/source/compiler/aslrestype2q.c
===================================================================
--- acpica-unix-20190329.orig/source/compiler/aslrestype2q.c
+++ acpica-unix-20190329/source/compiler/aslrestype2q.c
--- acpica-unix-20190405.orig/source/compiler/aslrestype2q.c
+++ acpica-unix-20190405/source/compiler/aslrestype2q.c
@@ -80,7 +80,13 @@ RsDoQwordIoDescriptor (
ASL_RESOURCE_NODE *Rnode;
UINT8 *OptionalFields;
@ -1584,10 +1584,10 @@ Index: acpica-unix-20190329/source/compiler/aslrestype2q.c
Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS64) +
OptionIndex + StringLength;
return (Rnode);
Index: acpica-unix-20190329/source/compiler/aslrestype2s.c
Index: acpica-unix-20190405/source/compiler/aslrestype2s.c
===================================================================
--- acpica-unix-20190329.orig/source/compiler/aslrestype2s.c
+++ acpica-unix-20190329/source/compiler/aslrestype2s.c
--- acpica-unix-20190405.orig/source/compiler/aslrestype2s.c
+++ acpica-unix-20190405/source/compiler/aslrestype2s.c
@@ -340,9 +340,14 @@ RsDoGpioIntDescriptor (
UINT16 VendorLength;
UINT16 InterruptLength;
@ -2053,10 +2053,10 @@ Index: acpica-unix-20190329/source/compiler/aslrestype2s.c
MpSaveSerialInfo (Info->MappingOp, Descriptor, ResourceSource);
return (Rnode);
}
Index: acpica-unix-20190329/source/compiler/aslrestype2w.c
Index: acpica-unix-20190405/source/compiler/aslrestype2w.c
===================================================================
--- acpica-unix-20190329.orig/source/compiler/aslrestype2w.c
+++ acpica-unix-20190329/source/compiler/aslrestype2w.c
--- acpica-unix-20190405.orig/source/compiler/aslrestype2w.c
+++ acpica-unix-20190405/source/compiler/aslrestype2w.c
@@ -81,6 +81,12 @@ RsDoWordIoDescriptor (
UINT8 *OptionalFields;
UINT16 StringLength = 0;
@ -2400,10 +2400,10 @@ Index: acpica-unix-20190329/source/compiler/aslrestype2w.c
Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS16) +
OptionIndex + StringLength;
return (Rnode);
Index: acpica-unix-20190329/source/include/acmacros.h
Index: acpica-unix-20190405/source/include/acmacros.h
===================================================================
--- acpica-unix-20190329.orig/source/include/acmacros.h
+++ acpica-unix-20190329/source/include/acmacros.h
--- acpica-unix-20190405.orig/source/include/acmacros.h
+++ acpica-unix-20190405/source/include/acmacros.h
@@ -98,9 +98,12 @@
((UINT8 *)(void *)(d))[6] = ((UINT8 *)(void *)(s))[1];\
((UINT8 *)(void *)(d))[7] = ((UINT8 *)(void *)(s))[0];}
@ -2482,10 +2482,10 @@ Index: acpica-unix-20190329/source/include/acmacros.h
#define ACPI_MOVE_32_TO_16(d, s) ACPI_MOVE_16_TO_16(d, s) /* Truncate to 16 */
Index: acpica-unix-20190329/source/include/platform/aclinux.h
Index: acpica-unix-20190405/source/include/platform/aclinux.h
===================================================================
--- acpica-unix-20190329.orig/source/include/platform/aclinux.h
+++ acpica-unix-20190329/source/include/platform/aclinux.h
--- acpica-unix-20190405.orig/source/include/platform/aclinux.h
+++ acpica-unix-20190405/source/include/platform/aclinux.h
@@ -198,6 +198,7 @@
#ifdef ACPI_USE_STANDARD_HEADERS
@ -2505,10 +2505,10 @@ Index: acpica-unix-20190329/source/include/platform/aclinux.h
#endif /* __KERNEL__ */
#endif /* __ACLINUX_H__ */
Index: acpica-unix-20190329/source/compiler/aslanalyze.c
Index: acpica-unix-20190405/source/compiler/aslanalyze.c
===================================================================
--- acpica-unix-20190329.orig/source/compiler/aslanalyze.c
+++ acpica-unix-20190329/source/compiler/aslanalyze.c
--- acpica-unix-20190405.orig/source/compiler/aslanalyze.c
+++ acpica-unix-20190405/source/compiler/aslanalyze.c
@@ -461,7 +461,7 @@ ApCheckForGpeNameConflict (
/* Need a null-terminated string version of NameSeg */
@ -2527,10 +2527,10 @@ Index: acpica-unix-20190329/source/compiler/aslanalyze.c
/* Inject opposite letter ("L" versus "E") */
Index: acpica-unix-20190329/source/compiler/asllookup.c
Index: acpica-unix-20190405/source/compiler/asllookup.c
===================================================================
--- acpica-unix-20190329.orig/source/compiler/asllookup.c
+++ acpica-unix-20190329/source/compiler/asllookup.c
--- acpica-unix-20190405.orig/source/compiler/asllookup.c
+++ acpica-unix-20190405/source/compiler/asllookup.c
@@ -119,6 +119,7 @@ LkIsObjectUsed (
{
ACPI_NAMESPACE_NODE *Node = ACPI_CAST_PTR (ACPI_NAMESPACE_NODE, ObjHandle);
@ -2561,10 +2561,10 @@ Index: acpica-unix-20190329/source/compiler/asllookup.c
AslError (ASL_REMARK, ASL_MSG_NOT_REFERENCED,
LkGetNameOp (Node->Op), AslGbl_MsgBuffer);
return (AE_OK);
Index: acpica-unix-20190329/source/compiler/aslmain.c
Index: acpica-unix-20190405/source/compiler/aslmain.c
===================================================================
--- acpica-unix-20190329.orig/source/compiler/aslmain.c
+++ acpica-unix-20190329/source/compiler/aslmain.c
--- acpica-unix-20190405.orig/source/compiler/aslmain.c
+++ acpica-unix-20190405/source/compiler/aslmain.c
@@ -101,18 +101,6 @@ main (
signal (SIGINT, AslSignalHandler);
@ -2584,10 +2584,10 @@ Index: acpica-unix-20190329/source/compiler/aslmain.c
AcpiOsInitialize ();
ACPI_DEBUG_INITIALIZE (); /* For debug version only */
Index: acpica-unix-20190329/source/common/acfileio.c
Index: acpica-unix-20190405/source/common/acfileio.c
===================================================================
--- acpica-unix-20190329.orig/source/common/acfileio.c
+++ acpica-unix-20190329/source/common/acfileio.c
--- acpica-unix-20190405.orig/source/common/acfileio.c
+++ acpica-unix-20190405/source/common/acfileio.c
@@ -280,6 +280,7 @@ AcGetOneTableFromFile (
ACPI_TABLE_HEADER *Table;
INT32 Count;
@ -2654,10 +2654,10 @@ Index: acpica-unix-20190329/source/common/acfileio.c
(UINT32) (FileSize - TableOffset));
return (AE_BAD_HEADER);
}
Index: acpica-unix-20190329/source/common/dmtable.c
Index: acpica-unix-20190405/source/common/dmtable.c
===================================================================
--- acpica-unix-20190329.orig/source/common/dmtable.c
+++ acpica-unix-20190329/source/common/dmtable.c
--- acpica-unix-20190405.orig/source/common/dmtable.c
+++ acpica-unix-20190405/source/common/dmtable.c
@@ -551,7 +551,7 @@ AcpiDmDumpDataTable (
*/
if (ACPI_COMPARE_NAMESEG (Table->Signature, ACPI_SIG_FACS))
@ -2756,10 +2756,10 @@ Index: acpica-unix-20190329/source/common/dmtable.c
AcpiDmNfitSubnames[Temp16]);
break;
Index: acpica-unix-20190329/source/common/dmtables.c
Index: acpica-unix-20190405/source/common/dmtables.c
===================================================================
--- acpica-unix-20190329.orig/source/common/dmtables.c
+++ acpica-unix-20190329/source/common/dmtables.c
--- acpica-unix-20190405.orig/source/common/dmtables.c
+++ acpica-unix-20190405/source/common/dmtables.c
@@ -142,7 +142,9 @@ AdCreateTableHeader (
ACPI_TABLE_HEADER *Table)
{
@ -2825,10 +2825,10 @@ Index: acpica-unix-20190329/source/common/dmtables.c
AmlStart = ((UINT8 *) Table + sizeof (ACPI_TABLE_HEADER));
ASL_CV_INIT_FILETREE(Table, AmlStart, AmlLength);
Index: acpica-unix-20190329/source/common/dmtbdump.c
Index: acpica-unix-20190405/source/common/dmtbdump.c
===================================================================
--- acpica-unix-20190329.orig/source/common/dmtbdump.c
+++ acpica-unix-20190329/source/common/dmtbdump.c
--- acpica-unix-20190405.orig/source/common/dmtbdump.c
+++ acpica-unix-20190405/source/common/dmtbdump.c
@@ -277,6 +277,8 @@ AcpiDmDumpRsdt (
UINT32 Entries;
UINT32 Offset;
@ -2987,10 +2987,10 @@ Index: acpica-unix-20190329/source/common/dmtbdump.c
- Revision, Length, ExpectedLength);
+ Revision, Tmp32, ExpectedLength);
}
Index: acpica-unix-20190329/source/common/dmtbdump1.c
Index: acpica-unix-20190405/source/common/dmtbdump1.c
===================================================================
--- acpica-unix-20190329.orig/source/common/dmtbdump1.c
+++ acpica-unix-20190329/source/common/dmtbdump1.c
--- acpica-unix-20190405.orig/source/common/dmtbdump1.c
+++ acpica-unix-20190405/source/common/dmtbdump1.c
@@ -79,17 +79,21 @@ AcpiDmDumpAsf (
UINT32 DataOffset = 0;
UINT32 i;
@ -3624,10 +3624,10 @@ Index: acpica-unix-20190329/source/common/dmtbdump1.c
{
case ACPI_HEST_TYPE_IA32_CHECK:
Index: acpica-unix-20190329/source/common/dmtbdump2.c
Index: acpica-unix-20190405/source/common/dmtbdump2.c
===================================================================
--- acpica-unix-20190329.orig/source/common/dmtbdump2.c
+++ acpica-unix-20190329/source/common/dmtbdump2.c
--- acpica-unix-20190405.orig/source/common/dmtbdump2.c
+++ acpica-unix-20190405/source/common/dmtbdump2.c
@@ -75,15 +75,21 @@ AcpiDmDumpIort (
ACPI_IORT_SMMU *IortSmmu = NULL;
UINT32 Offset;
@ -4510,10 +4510,10 @@ Index: acpica-unix-20190329/source/common/dmtbdump2.c
Subtable->Length, InfoTable);
if (ACPI_FAILURE (Status))
{
Index: acpica-unix-20190329/source/common/dmtbdump3.c
Index: acpica-unix-20190405/source/common/dmtbdump3.c
===================================================================
--- acpica-unix-20190329.orig/source/common/dmtbdump3.c
+++ acpica-unix-20190329/source/common/dmtbdump3.c
--- acpica-unix-20190405.orig/source/common/dmtbdump3.c
+++ acpica-unix-20190405/source/common/dmtbdump3.c
@@ -68,9 +68,11 @@ void
AcpiDmDumpSlic (
ACPI_TABLE_HEADER *Table)
@ -4760,10 +4760,10 @@ Index: acpica-unix-20190329/source/common/dmtbdump3.c
+ (void) AcpiDmDumpTable (Length, 0, Table, ArgumentsLength,
AcpiDmTableInfoWpbt0);
}
Index: acpica-unix-20190329/source/compiler/dtfield.c
Index: acpica-unix-20190405/source/compiler/dtfield.c
===================================================================
--- acpica-unix-20190329.orig/source/compiler/dtfield.c
+++ acpica-unix-20190329/source/compiler/dtfield.c
--- acpica-unix-20190405.orig/source/compiler/dtfield.c
+++ acpica-unix-20190405/source/compiler/dtfield.c
@@ -359,7 +359,27 @@ DtCompileInteger (
DtError (ASL_ERROR, ASL_MSG_INTEGER_SIZE, Field, AslGbl_MsgBuffer);
}
@ -4793,10 +4793,10 @@ Index: acpica-unix-20190329/source/compiler/dtfield.c
return;
}
Index: acpica-unix-20190329/source/compiler/dtsubtable.c
Index: acpica-unix-20190405/source/compiler/dtsubtable.c
===================================================================
--- acpica-unix-20190329.orig/source/compiler/dtsubtable.c
+++ acpica-unix-20190329/source/compiler/dtsubtable.c
--- acpica-unix-20190405.orig/source/compiler/dtsubtable.c
+++ acpica-unix-20190405/source/compiler/dtsubtable.c
@@ -378,6 +378,21 @@ DtSetSubtableLength (
return;
}
@ -4821,10 +4821,10 @@ Index: acpica-unix-20190329/source/compiler/dtsubtable.c
+ Subtable->SizeOfLengthField);
+ }
}
Index: acpica-unix-20190329/source/compiler/dttable1.c
Index: acpica-unix-20190405/source/compiler/dttable1.c
===================================================================
--- acpica-unix-20190329.orig/source/compiler/dttable1.c
+++ acpica-unix-20190329/source/compiler/dttable1.c
--- acpica-unix-20190405.orig/source/compiler/dttable1.c
+++ acpica-unix-20190405/source/compiler/dttable1.c
@@ -281,6 +281,8 @@ DtCompileCsrt (
DT_FIELD **PFieldList = (DT_FIELD **) List;
UINT32 DescriptorCount;
@ -5196,10 +5196,10 @@ Index: acpica-unix-20190329/source/compiler/dttable1.c
return (AE_OK);
}
Index: acpica-unix-20190329/source/compiler/dttable2.c
Index: acpica-unix-20190405/source/compiler/dttable2.c
===================================================================
--- acpica-unix-20190329.orig/source/compiler/dttable2.c
+++ acpica-unix-20190329/source/compiler/dttable2.c
--- acpica-unix-20190405.orig/source/compiler/dttable2.c
+++ acpica-unix-20190405/source/compiler/dttable2.c
@@ -345,7 +345,7 @@ DtCompileMpst (
DtPushSubtable (Subtable);
@ -5392,10 +5392,10 @@ Index: acpica-unix-20190329/source/compiler/dttable2.c
ParentTable = DtPeekSubtable ();
DtInsertSubtable (ParentTable, Subtable);
Index: acpica-unix-20190329/source/components/disassembler/dmbuffer.c
Index: acpica-unix-20190405/source/components/disassembler/dmbuffer.c
===================================================================
--- acpica-unix-20190329.orig/source/components/disassembler/dmbuffer.c
+++ acpica-unix-20190329/source/components/disassembler/dmbuffer.c
--- acpica-unix-20190405.orig/source/components/disassembler/dmbuffer.c
+++ acpica-unix-20190405/source/components/disassembler/dmbuffer.c
@@ -204,7 +204,7 @@ AcpiDmByteList (
@ -5471,10 +5471,10 @@ Index: acpica-unix-20190329/source/components/disassembler/dmbuffer.c
NextOp = AcpiPsGetDepthNext (NULL, Op);
if (!NextOp)
Index: acpica-unix-20190329/source/components/disassembler/dmopcode.c
Index: acpica-unix-20190405/source/components/disassembler/dmopcode.c
===================================================================
--- acpica-unix-20190329.orig/source/components/disassembler/dmopcode.c
+++ acpica-unix-20190329/source/components/disassembler/dmopcode.c
--- acpica-unix-20190405.orig/source/components/disassembler/dmopcode.c
+++ acpica-unix-20190405/source/components/disassembler/dmopcode.c
@@ -244,6 +244,7 @@ AcpiDmPredefinedDescription (
char *NameString;
int LastCharIsDigit;
@ -5545,10 +5545,10 @@ Index: acpica-unix-20190329/source/components/disassembler/dmopcode.c
Info->Level += 1;
Info->MappingOp = Op;
Index: acpica-unix-20190329/source/components/disassembler/dmresrcl.c
Index: acpica-unix-20190405/source/components/disassembler/dmresrcl.c
===================================================================
--- acpica-unix-20190329.orig/source/components/disassembler/dmresrcl.c
+++ acpica-unix-20190329/source/components/disassembler/dmresrcl.c
--- acpica-unix-20190405.orig/source/components/disassembler/dmresrcl.c
+++ acpica-unix-20190405/source/components/disassembler/dmresrcl.c
@@ -141,7 +141,8 @@ AcpiDmMemoryFields (
UINT32 Level)
{
@ -5697,10 +5697,10 @@ Index: acpica-unix-20190329/source/components/disassembler/dmresrcl.c
}
AcpiDmIndent (Level);
Index: acpica-unix-20190329/source/components/disassembler/dmresrcl2.c
Index: acpica-unix-20190405/source/components/disassembler/dmresrcl2.c
===================================================================
--- acpica-unix-20190329.orig/source/components/disassembler/dmresrcl2.c
+++ acpica-unix-20190329/source/components/disassembler/dmresrcl2.c
--- acpica-unix-20190405.orig/source/components/disassembler/dmresrcl2.c
+++ acpica-unix-20190405/source/components/disassembler/dmresrcl2.c
@@ -191,22 +191,24 @@ AcpiDmGpioCommon (
char *DeviceName = NULL;
UINT32 PinCount;
@ -5924,10 +5924,10 @@ Index: acpica-unix-20190329/source/components/disassembler/dmresrcl2.c
DeviceName = ACPI_ADD_PTR (char, Resource, ResourceSourceOffset);
AcpiUtPrintString (DeviceName, ACPI_UINT16_MAX);
Index: acpica-unix-20190329/source/components/disassembler/dmresrcs.c
Index: acpica-unix-20190405/source/components/disassembler/dmresrcs.c
===================================================================
--- acpica-unix-20190329.orig/source/components/disassembler/dmresrcs.c
+++ acpica-unix-20190329/source/components/disassembler/dmresrcs.c
--- acpica-unix-20190405.orig/source/components/disassembler/dmresrcs.c
+++ acpica-unix-20190405/source/components/disassembler/dmresrcs.c
@@ -72,6 +72,7 @@ AcpiDmIrqDescriptor (
UINT32 Length,
UINT32 Level)
@ -5984,10 +5984,10 @@ Index: acpica-unix-20190329/source/components/disassembler/dmresrcs.c
AcpiDmIndent (Level + 1);
AcpiDmDumpInteger8 (Resource->FixedIo.AddressLength, "Length");
Index: acpica-unix-20190329/source/components/dispatcher/dsfield.c
Index: acpica-unix-20190405/source/components/dispatcher/dsfield.c
===================================================================
--- acpica-unix-20190329.orig/source/components/dispatcher/dsfield.c
+++ acpica-unix-20190329/source/components/dispatcher/dsfield.c
--- acpica-unix-20190405.orig/source/components/dispatcher/dsfield.c
+++ acpica-unix-20190405/source/components/dispatcher/dsfield.c
@@ -325,6 +325,7 @@ AcpiDsGetFieldNames (
ACPI_STATUS Status;
UINT64 Position;
@ -6032,10 +6032,10 @@ Index: acpica-unix-20190329/source/components/dispatcher/dsfield.c
if (ACPI_FAILURE (Status))
{
ACPI_ERROR_NAMESPACE (WalkState->ScopeInfo,
Index: acpica-unix-20190329/source/components/events/evgpeblk.c
Index: acpica-unix-20190405/source/components/events/evgpeblk.c
===================================================================
--- acpica-unix-20190329.orig/source/components/events/evgpeblk.c
+++ acpica-unix-20190329/source/components/events/evgpeblk.c
--- acpica-unix-20190405.orig/source/components/events/evgpeblk.c
+++ acpica-unix-20190405/source/components/events/evgpeblk.c
@@ -376,6 +376,7 @@ AcpiEvCreateGpeBlock (
ACPI_STATUS Status;
ACPI_GPE_BLOCK_INFO *GpeBlock;
@ -6068,10 +6068,10 @@ Index: acpica-unix-20190329/source/components/events/evgpeblk.c
InterruptNumber == AcpiGbl_FADT.SciInterrupt ? " (SCI)" : ""));
/* Update global count of currently available GPEs */
Index: acpica-unix-20190329/source/components/hardware/hwregs.c
Index: acpica-unix-20190405/source/components/hardware/hwregs.c
===================================================================
--- acpica-unix-20190329.orig/source/components/hardware/hwregs.c
+++ acpica-unix-20190329/source/components/hardware/hwregs.c
--- acpica-unix-20190405.orig/source/components/hardware/hwregs.c
+++ acpica-unix-20190405/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.
@ -6081,10 +6081,10 @@ Index: acpica-unix-20190329/source/components/hardware/hwregs.c
if (!(*Address))
{
return (AE_BAD_ADDRESS);
Index: acpica-unix-20190329/source/components/hardware/hwvalid.c
Index: acpica-unix-20190405/source/components/hardware/hwvalid.c
===================================================================
--- acpica-unix-20190329.orig/source/components/hardware/hwvalid.c
+++ acpica-unix-20190329/source/components/hardware/hwvalid.c
--- acpica-unix-20190405.orig/source/components/hardware/hwvalid.c
+++ acpica-unix-20190405/source/components/hardware/hwvalid.c
@@ -135,6 +135,8 @@ AcpiHwValidateIoRequest (
UINT32 ByteWidth;
ACPI_IO_ADDRESS LastAddress;
@ -6106,10 +6106,10 @@ Index: acpica-unix-20190329/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-unix-20190329/source/components/namespace/nsaccess.c
Index: acpica-unix-20190405/source/components/namespace/nsaccess.c
===================================================================
--- acpica-unix-20190329.orig/source/components/namespace/nsaccess.c
+++ acpica-unix-20190329/source/components/namespace/nsaccess.c
--- acpica-unix-20190405.orig/source/components/namespace/nsaccess.c
+++ acpica-unix-20190405/source/components/namespace/nsaccess.c
@@ -314,6 +314,7 @@ AcpiNsLookup (
UINT32 SearchParentFlag = ACPI_NS_SEARCH_PARENT;
UINT32 LocalFlags;
@ -6130,10 +6130,10 @@ Index: acpica-unix-20190329/source/components/namespace/nsaccess.c
AcpiUtGetTypeName (ThisNode->Type),
AcpiUtGetTypeName (TypeToCheckFor)));
}
Index: acpica-unix-20190329/source/components/namespace/nsparse.c
Index: acpica-unix-20190405/source/components/namespace/nsparse.c
===================================================================
--- acpica-unix-20190329.orig/source/components/namespace/nsparse.c
+++ acpica-unix-20190329/source/components/namespace/nsparse.c
--- acpica-unix-20190405.orig/source/components/namespace/nsparse.c
+++ acpica-unix-20190405/source/components/namespace/nsparse.c
@@ -216,13 +216,14 @@ AcpiNsOneCompleteParse (
/* Table must consist of at least a complete header */
@ -6151,10 +6151,10 @@ Index: acpica-unix-20190329/source/components/namespace/nsparse.c
Status = AcpiTbGetOwnerId (TableIndex, &OwnerId);
if (ACPI_FAILURE (Status))
Index: acpica-unix-20190329/source/components/tables/tbdata.c
Index: acpica-unix-20190405/source/components/tables/tbdata.c
===================================================================
--- acpica-unix-20190329.orig/source/components/tables/tbdata.c
+++ acpica-unix-20190329/source/components/tables/tbdata.c
--- acpica-unix-20190405.orig/source/components/tables/tbdata.c
+++ acpica-unix-20190405/source/components/tables/tbdata.c
@@ -552,6 +552,7 @@ AcpiTbVerifyTempTable (
UINT32 *TableIndex)
{
@ -6173,10 +6173,10 @@ Index: acpica-unix-20190329/source/components/tables/tbdata.c
if (ACPI_FAILURE (Status))
{
ACPI_EXCEPTION ((AE_INFO, AE_NO_MEMORY,
Index: acpica-unix-20190329/source/components/tables/tbfadt.c
Index: acpica-unix-20190405/source/components/tables/tbfadt.c
===================================================================
--- acpica-unix-20190329.orig/source/components/tables/tbfadt.c
+++ acpica-unix-20190329/source/components/tables/tbfadt.c
--- acpica-unix-20190405.orig/source/components/tables/tbfadt.c
+++ acpica-unix-20190405/source/components/tables/tbfadt.c
@@ -424,18 +424,20 @@ AcpiTbCreateLocalFadt (
ACPI_TABLE_HEADER *Table,
UINT32 Length)
@ -6288,10 +6288,10 @@ Index: acpica-unix-20190329/source/components/tables/tbfadt.c
"PmRegisters", 0);
}
}
Index: acpica-unix-20190329/source/components/tables/tbfind.c
Index: acpica-unix-20190405/source/components/tables/tbfind.c
===================================================================
--- acpica-unix-20190329.orig/source/components/tables/tbfind.c
+++ acpica-unix-20190329/source/components/tables/tbfind.c
--- acpica-unix-20190405.orig/source/components/tables/tbfind.c
+++ acpica-unix-20190405/source/components/tables/tbfind.c
@@ -108,8 +108,11 @@ AcpiTbFindTable (
(void) AcpiUtAcquireMutex (ACPI_MTX_TABLES);
for (i = 0; i < AcpiGbl_RootTableList.CurrentTableCount; ++i)
@ -6305,10 +6305,10 @@ Index: acpica-unix-20190329/source/components/tables/tbfind.c
{
/* Not the requested table */
Index: acpica-unix-20190329/source/components/tables/tbprint.c
Index: acpica-unix-20190405/source/components/tables/tbprint.c
===================================================================
--- acpica-unix-20190329.orig/source/components/tables/tbprint.c
+++ acpica-unix-20190329/source/components/tables/tbprint.c
--- acpica-unix-20190405.orig/source/components/tables/tbprint.c
+++ acpica-unix-20190405/source/components/tables/tbprint.c
@@ -143,15 +143,18 @@ AcpiTbPrintTableHeader (
ACPI_TABLE_HEADER *Header)
{
@ -6350,10 +6350,10 @@ Index: acpica-unix-20190329/source/components/tables/tbprint.c
}
}
Index: acpica-unix-20190329/source/components/tables/tbutils.c
Index: acpica-unix-20190405/source/components/tables/tbutils.c
===================================================================
--- acpica-unix-20190329.orig/source/components/tables/tbutils.c
+++ acpica-unix-20190329/source/components/tables/tbutils.c
--- acpica-unix-20190405.orig/source/components/tables/tbutils.c
+++ acpica-unix-20190405/source/components/tables/tbutils.c
@@ -238,7 +238,7 @@ AcpiTbGetRootTableEntry (
* 64-bit platform, XSDT: Move (unaligned) 64-bit to local,
* return 64-bit
@ -6413,10 +6413,10 @@ Index: acpica-unix-20190329/source/components/tables/tbutils.c
{
AcpiGbl_FadtIndex = TableIndex;
AcpiTbParseFadt ();
Index: acpica-unix-20190329/source/components/tables/tbxface.c
Index: acpica-unix-20190405/source/components/tables/tbxface.c
===================================================================
--- acpica-unix-20190329.orig/source/components/tables/tbxface.c
+++ acpica-unix-20190329/source/components/tables/tbxface.c
--- acpica-unix-20190405.orig/source/components/tables/tbxface.c
+++ acpica-unix-20190405/source/components/tables/tbxface.c
@@ -293,8 +293,11 @@ AcpiGetTableHeader (
for (i = 0, j = 0; i < AcpiGbl_RootTableList.CurrentTableCount; i++)
@ -6430,10 +6430,10 @@ Index: acpica-unix-20190329/source/components/tables/tbxface.c
{
continue;
}
Index: acpica-unix-20190329/source/components/tables/tbxfload.c
Index: acpica-unix-20190405/source/components/tables/tbxfload.c
===================================================================
--- acpica-unix-20190329.orig/source/components/tables/tbxfload.c
+++ acpica-unix-20190329/source/components/tables/tbxfload.c
--- acpica-unix-20190405.orig/source/components/tables/tbxfload.c
+++ acpica-unix-20190405/source/components/tables/tbxfload.c
@@ -153,6 +153,7 @@ AcpiTbLoadNamespace (
ACPI_TABLE_DESC *Table;
UINT32 TablesLoaded = 0;
@ -6453,10 +6453,10 @@ Index: acpica-unix-20190329/source/components/tables/tbxfload.c
ACPI_FAILURE (AcpiTbValidateTable (Table)))
{
Status = AE_NO_ACPI_TABLES;
Index: acpica-unix-20190329/source/tools/acpiexec/aetables.c
Index: acpica-unix-20190405/source/tools/acpiexec/aetables.c
===================================================================
--- acpica-unix-20190329.orig/source/tools/acpiexec/aetables.c
+++ acpica-unix-20190329/source/tools/acpiexec/aetables.c
--- acpica-unix-20190405.orig/source/tools/acpiexec/aetables.c
+++ acpica-unix-20190405/source/tools/acpiexec/aetables.c
@@ -146,21 +146,25 @@ AeInitializeTableHeader (
char *Signature,
UINT32 Length)
@ -6608,10 +6608,10 @@ Index: acpica-unix-20190329/source/tools/acpiexec/aetables.c
}
return (AE_OK);
Index: acpica-unix-20190329/source/common/dmswitch.c
Index: acpica-unix-20190405/source/common/dmswitch.c
===================================================================
--- acpica-unix-20190329.orig/source/common/dmswitch.c
+++ acpica-unix-20190329/source/common/dmswitch.c
--- acpica-unix-20190405.orig/source/common/dmswitch.c
+++ acpica-unix-20190405/source/common/dmswitch.c
@@ -88,13 +88,15 @@ AcpiDmProcessSwitch (
ACPI_PARSE_OBJECT_LIST *Current;
ACPI_PARSE_OBJECT_LIST *Previous;

17
converterSample.asl.result
View File

@ -1,24 +1,21 @@
converterSample.asl 37: Method(MAIN) {
converterSample.asl 37: ***********************************************************
Remark 2120 - ^ Control Method should be made Serialized (due to creation of named objects within)
converterSample.asl 48: Name(b,0);
converterSample.asl 48:
Remark 2089 - Object is not referenced ^ (Name [B___] is within a method [MAIN])
converterSample.asl 65: Method(SCOP)
converterSample.asl 65: Name (a1, 0x04)
Remark 2120 - ^ Control Method should be made Serialized (due to creation of named objects within)
converterSample.asl 68: Name (a1, 0x04)
converterSample.asl 68: ationRegion(GNVS,SystemMemory,0xFFFF0000,0xAA55)
Remark 2089 - Object is not referenced ^ (Name [A1__] is within a method [SCOP])
converterSample.asl 76: Offset(0),//c37
Remark 2158 - ^ Unnecessary/redundant use of Offset operator
Intel ACPI Component Architecture
ASL+ Optimizing Compiler/Disassembler version VVVVVVVV
Copyright (c) 2000 - 2019 Intel Corporation
ASL Input: converterSample.asl - 85 lines, 1968 bytes, 11 keywords
AML Output: converterSample.aml - 180 bytes, 9 named objects, 2 executable opcodes
ASL Input: converterSample.asl - 1968 bytes 11 keywords 85 source lines
AML Output: converterSample.aml - 180 bytes 2 opcodes 9 named objects
Compilation complete. 0 Errors, 0 Warnings, 5 Remarks, 12 Optimizations, 1 Constants Folded
Compilation successful. 0 Errors, 0 Warnings, 5 Remarks, 12 Optimizations, 1 Constants Folded

15
free.patch
View File

@ -1,15 +0,0 @@
This prevents a segfault when an Include file does not exist.
Index: acpica-unix2-20181003/source/compiler/aslfiles.c
===================================================================
--- acpica-unix2-20181003.orig/source/compiler/aslfiles.c
+++ acpica-unix2-20181003/source/compiler/aslfiles.c
@@ -319,7 +319,7 @@ FlOpenIncludeWithPrefix (
if (!IncludeFile)
{
fprintf (stderr, "Could not open include file %s\n", Pathname);
- ACPI_FREE (Pathname);
+ /* ACPI_FREE (Pathname); <-- forces free() segfault */
return (NULL);
}

23
grammar.asl.result
View File

@ -1,4 +1,4 @@
ACPI Warning: NsLookup: Type mismatch on OPR2 (Region), searching for (BankField) (20190329/nsaccess-728)
ACPI Warning: NsLookup: Type mismatch on OPR2 (Region), searching for (BankField) (20190405/nsaccess-728)
grammar.asl 120: Device (A1)
Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope)
@ -29,12 +29,6 @@ Remark 2089 - ^ Object is not referenced (Name [_STR] is w
grammar.asl 515: Store (MFLD, Local0)
Warning 3144 - ^ Method Local is set but never used (Local0)
grammar.asl 522: NAME (ESC1, "abcdefg\x00hijklmn")
Warning 3055 - ^ Invalid Hex/Octal Escape - Non-ASCII or NULL
grammar.asl 523: NAME (ESC2, "abcdefg\000hijklmn")
Warning 3055 - ^ Invalid Hex/Octal Escape - Non-ASCII or NULL
grammar.asl 620: RCIV (Subtract (Arg0, 1))
Remark 2098 - ^ Recursive method call (RCIV)
@ -101,12 +95,6 @@ Remark 2089 - Object is not referenced ^ (Name [MTX2] is within a method [O
grammar.asl 1329: CreateField (BUF2, 148, 96, FLD3)
Remark 2089 - Object is not referenced ^ (Name [FLD3] is within a method [FLDS])
grammar.asl 1394: Store (0x1234567887654321, QWD2)
Warning 3038 - ^ Truncating 64-bit constant found in 32-bit table
grammar.asl 1396: if (LNotEqual (Local0, 0x1234567887654321))
Warning 3038 - Truncating 64-bit constant found in 32-bit table ^
grammar.asl 1476: SizeOf (BUFO)
Error 6114 - ^ Result is not used, operator has no effect
@ -299,9 +287,6 @@ Warning 3144 - Method Local is set but never used ^ (Local6)
grammar.asl 6393: Device (IDX5)
Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope)
grammar.asl 6478: Name (_CRS, Buffer(26) {"\_SB_.PCI2._CRS..........."})
Warning 3046 - Invalid or unknown escape sequence ^
grammar.asl 6709: Device (BITI)
Warning 3141 - Missing dependency ^ (Device object requires a _HID or _ADR in same scope)
@ -369,7 +354,7 @@ Copyright (c) 2000 - 2019 Intel Corporation
Ignoring all errors, forcing AML file generation
ASL Input: grammar.asl - 10284 lines, 323653 bytes, 4818 keywords
AML Output: grammar.aml - 43758 bytes, 670 named objects, 4148 executable opcodes
ASL Input: grammar.asl - 323653 bytes 4818 keywords 10284 source lines
AML Output: grammar.aml - 43758 bytes 4148 opcodes 670 named objects
Compilation complete. 6 Errors, 88 Warnings, 27 Remarks, 1106 Optimizations
Compilation successful. 6 Errors, 88 Warnings, 27 Remarks, 1106 Optimizations

96
int-format.patch
View File

@ -21,23 +21,23 @@ From: Al Stone <ahs3@redhat.com>
source/components/utilities/utownerid.c | 2 +-
18 files changed, 28 insertions(+), 28 deletions(-)
Index: acpica-unix-20190215/source/compiler/aslerror.c
Index: acpica-unix-20190405/source/compiler/aslerror.c
===================================================================
--- acpica-unix-20190215.orig/source/compiler/aslerror.c
+++ acpica-unix-20190215/source/compiler/aslerror.c
@@ -886,7 +886,7 @@ AslLogNewError (
--- acpica-unix-20190405.orig/source/compiler/aslerror.c
+++ acpica-unix-20190405/source/compiler/aslerror.c
@@ -906,7 +906,7 @@ AslLogNewError (
AslGbl_ExceptionCount[ModifiedLevel]++;
if (AslGbl_ExceptionCount[ASL_ERROR] > ASL_MAX_ERROR_COUNT)
if (!AslGbl_IgnoreErrors && AslGbl_ExceptionCount[ASL_ERROR] > ASL_MAX_ERROR_COUNT)
{
- printf ("\nMaximum error count (%u) exceeded\n", ASL_MAX_ERROR_COUNT);
+ printf ("\nMaximum error count (%d) exceeded\n", ASL_MAX_ERROR_COUNT);
AslGbl_SourceLine = 0;
AslGbl_NextError = AslGbl_ErrorLog;
Index: acpica-unix-20190215/source/compiler/aslopt.c
Index: acpica-unix-20190405/source/compiler/aslopt.c
===================================================================
--- acpica-unix-20190215.orig/source/compiler/aslopt.c
+++ acpica-unix-20190215/source/compiler/aslopt.c
--- acpica-unix-20190405.orig/source/compiler/aslopt.c
+++ acpica-unix-20190405/source/compiler/aslopt.c
@@ -583,7 +583,7 @@ OptOptimizeNamePath (
}
@ -47,10 +47,10 @@ Index: acpica-unix-20190215/source/compiler/aslopt.c
Op->Asl.LogicalLineNumber,
AcpiPsGetOpcodeName (Op->Common.Parent->Common.AmlOpcode),
AcpiPsGetOpcodeName (Op->Common.AmlOpcode)));
Index: acpica-unix-20190215/source/compiler/aslprepkg.c
Index: acpica-unix-20190405/source/compiler/aslprepkg.c
===================================================================
--- acpica-unix-20190215.orig/source/compiler/aslprepkg.c
+++ acpica-unix-20190215/source/compiler/aslprepkg.c
--- acpica-unix-20190405.orig/source/compiler/aslprepkg.c
+++ acpica-unix-20190405/source/compiler/aslprepkg.c
@@ -309,7 +309,7 @@ ApCheckPackage (
if (Count & 1)
@ -60,10 +60,10 @@ Index: acpica-unix-20190215/source/compiler/aslprepkg.c
Predefined->Info.Name, Count);
AslError (ASL_ERROR, ASL_MSG_RESERVED_PACKAGE_LENGTH,
Index: acpica-unix-20190215/source/components/debugger/dbexec.c
Index: acpica-unix-20190405/source/components/debugger/dbexec.c
===================================================================
--- acpica-unix-20190215.orig/source/components/debugger/dbexec.c
+++ acpica-unix-20190215/source/components/debugger/dbexec.c
--- acpica-unix-20190405.orig/source/components/debugger/dbexec.c
+++ acpica-unix-20190405/source/components/debugger/dbexec.c
@@ -230,7 +230,7 @@ AcpiDbExecuteMethod (
ACPI_ERROR ((AE_INFO,
"Possible buffer overflow within AML Debugger "
@ -73,10 +73,10 @@ Index: acpica-unix-20190215/source/components/debugger/dbexec.c
}
}
Index: acpica-unix-20190215/source/components/dispatcher/dsmthdat.c
Index: acpica-unix-20190405/source/components/dispatcher/dsmthdat.c
===================================================================
--- acpica-unix-20190215.orig/source/components/dispatcher/dsmthdat.c
+++ acpica-unix-20190215/source/components/dispatcher/dsmthdat.c
--- acpica-unix-20190405.orig/source/components/dispatcher/dsmthdat.c
+++ acpica-unix-20190405/source/components/dispatcher/dsmthdat.c
@@ -291,7 +291,7 @@ AcpiDsMethodDataGetNode (
if (Index > ACPI_METHOD_MAX_LOCAL)
{
@ -95,10 +95,10 @@ Index: acpica-unix-20190215/source/components/dispatcher/dsmthdat.c
Index, ACPI_METHOD_MAX_ARG));
return_ACPI_STATUS (AE_AML_INVALID_INDEX);
}
Index: acpica-unix-20190215/source/components/dispatcher/dsutils.c
Index: acpica-unix-20190405/source/components/dispatcher/dsutils.c
===================================================================
--- acpica-unix-20190215.orig/source/components/dispatcher/dsutils.c
+++ acpica-unix-20190215/source/components/dispatcher/dsutils.c
--- acpica-unix-20190405.orig/source/components/dispatcher/dsutils.c
+++ acpica-unix-20190405/source/components/dispatcher/dsutils.c
@@ -786,7 +786,7 @@ AcpiDsCreateOperands (
}
@ -108,10 +108,10 @@ Index: acpica-unix-20190215/source/components/dispatcher/dsutils.c
WalkState->NumOperands, ArgCount, Index));
/* Create the interpreter arguments, in reverse order */
Index: acpica-unix-20190215/source/components/dispatcher/dswscope.c
Index: acpica-unix-20190405/source/components/dispatcher/dswscope.c
===================================================================
--- acpica-unix-20190215.orig/source/components/dispatcher/dswscope.c
+++ acpica-unix-20190215/source/components/dispatcher/dswscope.c
--- acpica-unix-20190405.orig/source/components/dispatcher/dswscope.c
+++ acpica-unix-20190405/source/components/dispatcher/dswscope.c
@@ -149,7 +149,7 @@ AcpiDsScopeStackPush (
WalkState->ScopeDepth++;
@ -130,11 +130,11 @@ Index: acpica-unix-20190215/source/components/dispatcher/dswscope.c
(UINT32) WalkState->ScopeDepth,
AcpiUtGetNodeName (ScopeInfo->Scope.Node),
AcpiUtGetTypeName (ScopeInfo->Common.Value)));
Index: acpica-unix-20190215/source/components/events/evgpe.c
Index: acpica-unix-20190405/source/components/events/evgpe.c
===================================================================
--- acpica-unix-20190215.orig/source/components/events/evgpe.c
+++ acpica-unix-20190215/source/components/events/evgpe.c
@@ -481,7 +481,7 @@ AcpiEvGpeDetect (
--- acpica-unix-20190405.orig/source/components/events/evgpe.c
+++ acpica-unix-20190405/source/components/events/evgpe.c
@@ -489,7 +489,7 @@ AcpiEvGpeDetect (
"Ignore disabled registers for GPE %02X-%02X: "
"RunEnable=%02X, WakeEnable=%02X\n",
GpeRegisterInfo->BaseGpeNumber,
@ -143,10 +143,10 @@ Index: acpica-unix-20190215/source/components/events/evgpe.c
GpeRegisterInfo->EnableForRun,
GpeRegisterInfo->EnableForWake));
continue;
Index: acpica-unix-20190215/source/components/executer/exdump.c
Index: acpica-unix-20190405/source/components/executer/exdump.c
===================================================================
--- acpica-unix-20190215.orig/source/components/executer/exdump.c
+++ acpica-unix-20190215/source/components/executer/exdump.c
--- acpica-unix-20190405.orig/source/components/executer/exdump.c
+++ acpica-unix-20190405/source/components/executer/exdump.c
@@ -678,7 +678,7 @@ AcpiExDumpOperand (
if (Depth > 0)
{
@ -156,10 +156,10 @@ Index: acpica-unix-20190215/source/components/executer/exdump.c
}
else
{
Index: acpica-unix-20190215/source/components/executer/exfldio.c
Index: acpica-unix-20190405/source/components/executer/exfldio.c
===================================================================
--- acpica-unix-20190215.orig/source/components/executer/exfldio.c
+++ acpica-unix-20190215/source/components/executer/exfldio.c
--- acpica-unix-20190405.orig/source/components/executer/exfldio.c
+++ acpica-unix-20190405/source/components/executer/exfldio.c
@@ -681,8 +681,8 @@ AcpiExWriteWithUpdateRule (
ACPI_ERROR ((AE_INFO,
@ -171,10 +171,10 @@ Index: acpica-unix-20190215/source/components/executer/exfldio.c
return_ACPI_STATUS (AE_AML_OPERAND_VALUE);
}
}
Index: acpica-unix-20190215/source/components/executer/exnames.c
Index: acpica-unix-20190405/source/components/executer/exnames.c
===================================================================
--- acpica-unix-20190215.orig/source/components/executer/exnames.c
+++ acpica-unix-20190215/source/components/executer/exnames.c
--- acpica-unix-20190405.orig/source/components/executer/exnames.c
+++ acpica-unix-20190405/source/components/executer/exnames.c
@@ -237,7 +237,7 @@ AcpiExNameSegment (
*/
ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
@ -193,10 +193,10 @@ Index: acpica-unix-20190215/source/components/executer/exnames.c
}
*InAmlAddress = ACPI_CAST_PTR (UINT8, AmlAddress);
Index: acpica-unix-20190215/source/components/hardware/hwregs.c
Index: acpica-unix-20190405/source/components/hardware/hwregs.c
===================================================================
--- acpica-unix-20190215.orig/source/components/hardware/hwregs.c
+++ acpica-unix-20190215/source/components/hardware/hwregs.c
--- acpica-unix-20190405.orig/source/components/hardware/hwregs.c
+++ acpica-unix-20190405/source/components/hardware/hwregs.c
@@ -460,7 +460,7 @@ AcpiHwClearAcpiStatus (
@ -206,10 +206,10 @@ Index: acpica-unix-20190215/source/components/hardware/hwregs.c
ACPI_FORMAT_UINT64 (AcpiGbl_XPm1aStatus.Address)));
LockFlags = AcpiOsAcquireLock (AcpiGbl_HardwareLock);
Index: acpica-unix-20190215/source/components/tables/tbfadt.c
Index: acpica-unix-20190405/source/components/tables/tbfadt.c
===================================================================
--- acpica-unix-20190215.orig/source/components/tables/tbfadt.c
+++ acpica-unix-20190215/source/components/tables/tbfadt.c
--- acpica-unix-20190405.orig/source/components/tables/tbfadt.c
+++ acpica-unix-20190405/source/components/tables/tbfadt.c
@@ -233,7 +233,7 @@ AcpiTbInitGenericAddress (
if (!(Flags & ACPI_FADT_GPE_REGISTER))
{
@ -237,10 +237,10 @@ Index: acpica-unix-20190215/source/components/tables/tbfadt.c
Name, Address32,
ACPI_FORMAT_UINT64 (Address64->Address),
AcpiGbl_Use32BitFadtAddresses ? 32 : 64));
Index: acpica-unix-20190215/source/components/tables/tbxfroot.c
Index: acpica-unix-20190405/source/components/tables/tbxfroot.c
===================================================================
--- acpica-unix-20190215.orig/source/components/tables/tbxfroot.c
+++ acpica-unix-20190215/source/components/tables/tbxfroot.c
--- acpica-unix-20190405.orig/source/components/tables/tbxfroot.c
+++ acpica-unix-20190405/source/components/tables/tbxfroot.c
@@ -177,7 +177,7 @@ AcpiFindRootPointer (
{
ACPI_ERROR ((AE_INFO,
@ -268,10 +268,10 @@ Index: acpica-unix-20190215/source/components/tables/tbxfroot.c
return_ACPI_STATUS (AE_NO_MEMORY);
}
Index: acpica-unix-20190215/source/components/utilities/utownerid.c
Index: acpica-unix-20190405/source/components/utilities/utownerid.c
===================================================================
--- acpica-unix-20190215.orig/source/components/utilities/utownerid.c
+++ acpica-unix-20190215/source/components/utilities/utownerid.c
--- acpica-unix-20190405.orig/source/components/utilities/utownerid.c
+++ acpica-unix-20190405/source/components/utilities/utownerid.c
@@ -237,7 +237,7 @@ AcpiUtReleaseOwnerId (
else
{

4
sources
View File

@ -1,2 +1,2 @@
SHA512 (acpica-unix2-20190329.tar.gz) = e2732703ec62595d37e7dae274fef751dfbaa5dd0acbef22bb4bc1d8285b7524f8b38b95cfb6a568d5c9bac38e1198a53998c742f7a494f055846a13e9f4b305
SHA512 (acpitests-unix-20190329.tar.gz) = 3d3f7d3381cdc7a7f76c5b4083dd6f3096a9a756d45098d7d4143ae52c6ca61c9e4d28ef852204b5f10f04367343cc638929cafa2063e86fda7e4418ecc2685d
SHA512 (acpica-unix2-20190405.tar.gz) = 341538f6830415f84f35d823ad80ae8fcb222f7404d9239e9fb2a326974416463ff2e175b8a442c452a974dc5411e8b86e1b8a007d799796138e41916c39a427
SHA512 (acpitests-unix-20190405.tar.gz) = 75c2b19c8c6fdb9a02260320e1edca611a5eaf775e635b1e2e38b84b7243237e5036e42d50b59b723038f2ac63c3f0b29b4258ac624b19b30a55537874dd27e3