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

Update to 20181003 upstream source

Browse Source 
Signed-off-by: Al Stone <ahs3@redhat.com>
This commit is contained in:
Al Stone 2018-10-24 14:19:27 -06:00
parent e9dea8a3ac
commit ae6f250891
8 changed files with 277 additions and 270 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -99,3 +99,5 @@ series
/acpitests-unix-20180629.tar.gz /acpitests-unix-20180629.tar.gz
/acpica-unix2-20180810.tar.gz /acpica-unix2-20180810.tar.gz
/acpitests-unix-20180810.tar.gz /acpitests-unix-20180810.tar.gz
/acpica-unix2-20181003.tar.gz
/acpitests-unix-20181003.tar.gz

6
acpica-tools.spec
View File

@ -1,5 +1,5 @@
Name: acpica-tools Name: acpica-tools
Version: 20180810 Version: 20181003
Release: 1%{?dist} Release: 1%{?dist}
Summary: ACPICA tools for the development and debug of ACPI tables Summary: ACPICA tools for the development and debug of ACPI tables
@ -240,6 +240,10 @@ fi
%changelog %changelog
* Wed Oct 24 2018 Al Stone <ahs3@redhat.com> - 20181003-1
- Update to 20181003 source tree, including patch refeshes. Closes BZ#1634207
- Merge in dump-tables PR
* Mon Sep 17 2018 Al Stone <ahs3@redhat.com> - 20180810-1 * Mon Sep 17 2018 Al Stone <ahs3@redhat.com> - 20180810-1
- Update to 20180810 source tree, including patch refeshes. Closes BZ#1614986 - Update to 20180810 source tree, including patch refeshes. Closes BZ#1614986

25
aslcodegen.patch
View File

@ -4,25 +4,26 @@ support; this patch repairs that adaptation.
Signed-off-by: Al Stone <ahs3@redhat.com> Signed-off-by: Al Stone <ahs3@redhat.com>
diff -Naur acpica-unix2-20180531.orig/source/compiler/aslcodegen.c acpica-unix2-20180531/source/compiler/aslcodegen.c Index: acpica-unix2-20181003/source/compiler/aslcodegen.c
--- acpica-unix2-20180531.orig/source/compiler/aslcodegen.c 2018-07-06 20:28:35.255546578 -0400 ===================================================================
+++ acpica-unix2-20180531/source/compiler/aslcodegen.c 2018-07-06 20:32:10.373797644 -0400 --- acpica-unix2-20181003.orig/source/compiler/aslcodegen.c
@@ -494,8 +494,7 @@ +++ acpica-unix2-20181003/source/compiler/aslcodegen.c
@@ -494,8 +494,7 @@ CgWriteTableHeader (
/* Table length. Checksum zero for now, will rewrite later */ /* Table length. Checksum zero for now, will rewrite later */
- DWord = sizeof (ACPI_TABLE_HEADER) + Op->Asl.AmlSubtreeLength; - DWord = sizeof (ACPI_TABLE_HEADER) + Op->Asl.AmlSubtreeLength;
- ACPI_MOVE_32_TO_32(&TableHeader.Length, &DWord); - ACPI_MOVE_32_TO_32(&AslGbl_TableHeader.Length, &DWord);
+ TableHeader.Length = sizeof (ACPI_TABLE_HEADER) + Op->Asl.AmlSubtreeLength; + AslGbl_TableHeader.Length = sizeof (ACPI_TABLE_HEADER) + Op->Asl.AmlSubtreeLength;
/* Calculate the comment lengths for this definition block parseOp */ /* Calculate the comment lengths for this definition block parseOp */
@@ -539,6 +538,8 @@ @@ -541,6 +540,8 @@ CgWriteTableHeader (
CvDbgPrint (" Length: %u\n", CommentLength); CvDbgPrint (" Length: %u\n", CommentLength);
} }
} }
+ DWord = TableHeader.Length; + DWord = AslGbl_TableHeader.Length;
+ ACPI_MOVE_32_TO_32(&TableHeader.Length, &DWord); + ACPI_MOVE_32_TO_32(&AslGbl_TableHeader.Length, &DWord);
TableHeader.Checksum = 0;
AslGbl_TableHeader.Checksum = 0;
Op->Asl.FinalAmlOffset = ftell (AslGbl_Files[ASL_FILE_AML_OUTPUT].Handle);

300
big-endian.patch
View File

@ -23,10 +23,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
source/include/platform/aclinux.h | 8 ++ source/include/platform/aclinux.h | 8 ++
12 files changed, 487 insertions(+), 283 deletions(-) 12 files changed, 487 insertions(+), 283 deletions(-)
Index: acpica-unix-20180810/source/compiler/aslcodegen.c Index: acpica-unix2-20181003/source/compiler/aslcodegen.c
=================================================================== ===================================================================
--- acpica-unix-20180810.orig/source/compiler/aslcodegen.c --- acpica-unix2-20181003.orig/source/compiler/aslcodegen.c
+++ acpica-unix-20180810/source/compiler/aslcodegen.c +++ acpica-unix2-20181003/source/compiler/aslcodegen.c
@@ -240,16 +240,12 @@ CgWriteAmlOpcode ( @@ -240,16 +240,12 @@ CgWriteAmlOpcode (
ACPI_PARSE_OBJECT *Op) ACPI_PARSE_OBJECT *Op)
{ {
@ -206,8 +206,8 @@ Index: acpica-unix-20180810/source/compiler/aslcodegen.c
/* OEM Revision */ /* OEM Revision */
Child = Child->Asl.Next; Child = Child->Asl.Next;
- TableHeader.OemRevision = (UINT32) Child->Asl.Value.Integer; - AslGbl_TableHeader.OemRevision = (UINT32) Child->Asl.Value.Integer;
+ ACPI_MOVE_64_TO_32(&TableHeader.OemRevision, &Child->Asl.Value.Integer); + ACPI_MOVE_64_TO_32(&AslGbl_TableHeader.OemRevision, &Child->Asl.Value.Integer);
/* Compiler ID */ /* Compiler ID */
@ -215,20 +215,20 @@ Index: acpica-unix-20180810/source/compiler/aslcodegen.c
/* Compiler version */ /* Compiler version */
- TableHeader.AslCompilerRevision = ACPI_CA_VERSION; - AslGbl_TableHeader.AslCompilerRevision = ACPI_CA_VERSION;
+ DWord = ACPI_CA_VERSION; + DWord = ACPI_CA_VERSION;
+ ACPI_MOVE_32_TO_32(&TableHeader.AslCompilerRevision, &DWord); + ACPI_MOVE_32_TO_32(&AslGbl_TableHeader.AslCompilerRevision, &DWord);
/* Table length. Checksum zero for now, will rewrite later */ /* Table length. Checksum zero for now, will rewrite later */
- TableHeader.Length = sizeof (ACPI_TABLE_HEADER) + - AslGbl_TableHeader.Length = sizeof (ACPI_TABLE_HEADER) +
- Op->Asl.AmlSubtreeLength; - Op->Asl.AmlSubtreeLength;
+ DWord = sizeof (ACPI_TABLE_HEADER) + Op->Asl.AmlSubtreeLength; + DWord = sizeof (ACPI_TABLE_HEADER) + Op->Asl.AmlSubtreeLength;
+ ACPI_MOVE_32_TO_32(&TableHeader.Length, &DWord); + ACPI_MOVE_32_TO_32(&AslGbl_TableHeader.Length, &DWord);
/* Calculate the comment lengths for this definition block parseOp */ /* Calculate the comment lengths for this definition block parseOp */
@@ -645,7 +652,10 @@ CgWriteNode ( @@ -646,7 +653,10 @@ CgWriteNode (
ACPI_PARSE_OBJECT *Op) ACPI_PARSE_OBJECT *Op)
{ {
ASL_RESOURCE_NODE *Rnode; ASL_RESOURCE_NODE *Rnode;
@ -240,7 +240,7 @@ Index: acpica-unix-20180810/source/compiler/aslcodegen.c
/* Write all comments here. */ /* Write all comments here. */
@@ -675,13 +685,24 @@ CgWriteNode ( @@ -676,13 +686,24 @@ CgWriteNode (
switch (Op->Asl.AmlOpcode) switch (Op->Asl.AmlOpcode)
{ {
case AML_RAW_DATA_BYTE: case AML_RAW_DATA_BYTE:
@ -268,10 +268,10 @@ Index: acpica-unix-20180810/source/compiler/aslcodegen.c
case AML_RAW_DATA_BUFFER: case AML_RAW_DATA_BUFFER:
Index: acpica-unix-20180810/source/compiler/aslopcodes.c Index: acpica-unix2-20181003/source/compiler/aslopcodes.c
=================================================================== ===================================================================
--- acpica-unix-20180810.orig/source/compiler/aslopcodes.c --- acpica-unix2-20181003.orig/source/compiler/aslopcodes.c
+++ acpica-unix-20180810/source/compiler/aslopcodes.c +++ acpica-unix2-20181003/source/compiler/aslopcodes.c
@@ -485,6 +485,7 @@ OpcDoUnicode ( @@ -485,6 +485,7 @@ OpcDoUnicode (
UINT32 i; UINT32 i;
UINT8 *AsciiString; UINT8 *AsciiString;
@ -290,10 +290,10 @@ Index: acpica-unix-20180810/source/compiler/aslopcodes.c
} }
/* /*
Index: acpica-unix-20180810/source/compiler/aslrestype1.c Index: acpica-unix2-20181003/source/compiler/aslrestype1.c
=================================================================== ===================================================================
--- acpica-unix-20180810.orig/source/compiler/aslrestype1.c --- acpica-unix2-20181003.orig/source/compiler/aslrestype1.c
+++ acpica-unix-20180810/source/compiler/aslrestype1.c +++ acpica-unix2-20181003/source/compiler/aslrestype1.c
@@ -142,6 +142,11 @@ RsDoMemory24Descriptor ( @@ -142,6 +142,11 @@ RsDoMemory24Descriptor (
ACPI_PARSE_OBJECT *LengthOp = NULL; ACPI_PARSE_OBJECT *LengthOp = NULL;
ASL_RESOURCE_NODE *Rnode; ASL_RESOURCE_NODE *Rnode;
@ -490,10 +490,10 @@ Index: acpica-unix-20180810/source/compiler/aslrestype1.c
RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH, RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH,
CurrentByteOffset + ASL_RESDESC_OFFSET (FixedMemory32.AddressLength)); CurrentByteOffset + ASL_RESDESC_OFFSET (FixedMemory32.AddressLength));
break; break;
Index: acpica-unix-20180810/source/compiler/aslrestype1i.c Index: acpica-unix2-20181003/source/compiler/aslrestype1i.c
=================================================================== ===================================================================
--- acpica-unix-20180810.orig/source/compiler/aslrestype1i.c --- acpica-unix2-20181003.orig/source/compiler/aslrestype1i.c
+++ acpica-unix-20180810/source/compiler/aslrestype1i.c +++ acpica-unix2-20181003/source/compiler/aslrestype1i.c
@@ -198,6 +198,8 @@ RsDoFixedDmaDescriptor ( @@ -198,6 +198,8 @@ RsDoFixedDmaDescriptor (
ACPI_PARSE_OBJECT *InitializerOp; ACPI_PARSE_OBJECT *InitializerOp;
ASL_RESOURCE_NODE *Rnode; ASL_RESOURCE_NODE *Rnode;
@ -630,10 +630,10 @@ Index: acpica-unix-20180810/source/compiler/aslrestype1i.c
+ ACPI_MOVE_16_TO_16(&Descriptor->Irq.IrqMask, &IrqMask); + ACPI_MOVE_16_TO_16(&Descriptor->Irq.IrqMask, &IrqMask);
return (Rnode); return (Rnode);
} }
Index: acpica-unix-20180810/source/compiler/aslrestype2.c Index: acpica-unix2-20181003/source/compiler/aslrestype2.c
=================================================================== ===================================================================
--- acpica-unix-20180810.orig/source/compiler/aslrestype2.c --- acpica-unix2-20181003.orig/source/compiler/aslrestype2.c
+++ acpica-unix-20180810/source/compiler/aslrestype2.c +++ acpica-unix2-20181003/source/compiler/aslrestype2.c
@@ -76,6 +76,7 @@ RsDoGeneralRegisterDescriptor ( @@ -76,6 +76,7 @@ RsDoGeneralRegisterDescriptor (
ACPI_PARSE_OBJECT *InitializerOp; ACPI_PARSE_OBJECT *InitializerOp;
ASL_RESOURCE_NODE *Rnode; ASL_RESOURCE_NODE *Rnode;
@ -774,10 +774,10 @@ Index: acpica-unix-20180810/source/compiler/aslrestype2.c
/* Point to end-of-descriptor for vendor data */ /* Point to end-of-descriptor for vendor data */
Index: acpica-unix-20180810/source/compiler/aslrestype2d.c Index: acpica-unix2-20181003/source/compiler/aslrestype2d.c
=================================================================== ===================================================================
--- acpica-unix-20180810.orig/source/compiler/aslrestype2d.c --- acpica-unix2-20181003.orig/source/compiler/aslrestype2d.c
+++ acpica-unix-20180810/source/compiler/aslrestype2d.c +++ acpica-unix2-20181003/source/compiler/aslrestype2d.c
@@ -79,7 +79,13 @@ RsDoDwordIoDescriptor ( @@ -79,7 +79,13 @@ RsDoDwordIoDescriptor (
ACPI_PARSE_OBJECT *GranOp = NULL; ACPI_PARSE_OBJECT *GranOp = NULL;
ASL_RESOURCE_NODE *Rnode; ASL_RESOURCE_NODE *Rnode;
@ -1133,10 +1133,10 @@ Index: acpica-unix-20180810/source/compiler/aslrestype2d.c
Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS32) + Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS32) +
OptionIndex + StringLength; OptionIndex + StringLength;
return (Rnode); return (Rnode);
Index: acpica-unix-20180810/source/compiler/aslrestype2e.c Index: acpica-unix2-20181003/source/compiler/aslrestype2e.c
=================================================================== ===================================================================
--- acpica-unix-20180810.orig/source/compiler/aslrestype2e.c --- acpica-unix2-20181003.orig/source/compiler/aslrestype2e.c
+++ acpica-unix-20180810/source/compiler/aslrestype2e.c +++ acpica-unix2-20181003/source/compiler/aslrestype2e.c
@@ -78,6 +78,13 @@ RsDoExtendedIoDescriptor ( @@ -78,6 +78,13 @@ RsDoExtendedIoDescriptor (
ACPI_PARSE_OBJECT *GranOp = NULL; ACPI_PARSE_OBJECT *GranOp = NULL;
ASL_RESOURCE_NODE *Rnode; ASL_RESOURCE_NODE *Rnode;
@ -1242,10 +1242,10 @@ Index: acpica-unix-20180810/source/compiler/aslrestype2e.c
Rnode->BufferLength = sizeof (AML_RESOURCE_EXTENDED_ADDRESS64) + Rnode->BufferLength = sizeof (AML_RESOURCE_EXTENDED_ADDRESS64) +
StringLength; StringLength;
return (Rnode); return (Rnode);
Index: acpica-unix-20180810/source/compiler/aslrestype2q.c Index: acpica-unix2-20181003/source/compiler/aslrestype2q.c
=================================================================== ===================================================================
--- acpica-unix-20180810.orig/source/compiler/aslrestype2q.c --- acpica-unix2-20181003.orig/source/compiler/aslrestype2q.c
+++ acpica-unix-20180810/source/compiler/aslrestype2q.c +++ acpica-unix2-20181003/source/compiler/aslrestype2q.c
@@ -80,7 +80,13 @@ RsDoQwordIoDescriptor ( @@ -80,7 +80,13 @@ RsDoQwordIoDescriptor (
ASL_RESOURCE_NODE *Rnode; ASL_RESOURCE_NODE *Rnode;
UINT8 *OptionalFields; UINT8 *OptionalFields;
@ -1584,10 +1584,10 @@ Index: acpica-unix-20180810/source/compiler/aslrestype2q.c
Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS64) + Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS64) +
OptionIndex + StringLength; OptionIndex + StringLength;
return (Rnode); return (Rnode);
Index: acpica-unix-20180810/source/compiler/aslrestype2s.c Index: acpica-unix2-20181003/source/compiler/aslrestype2s.c
=================================================================== ===================================================================
--- acpica-unix-20180810.orig/source/compiler/aslrestype2s.c --- acpica-unix2-20181003.orig/source/compiler/aslrestype2s.c
+++ acpica-unix-20180810/source/compiler/aslrestype2s.c +++ acpica-unix2-20181003/source/compiler/aslrestype2s.c
@@ -340,9 +340,14 @@ RsDoGpioIntDescriptor ( @@ -340,9 +340,14 @@ RsDoGpioIntDescriptor (
UINT16 VendorLength; UINT16 VendorLength;
UINT16 InterruptLength; UINT16 InterruptLength;
@ -2053,10 +2053,10 @@ Index: acpica-unix-20180810/source/compiler/aslrestype2s.c
MpSaveSerialInfo (Info->MappingOp, Descriptor, ResourceSource); MpSaveSerialInfo (Info->MappingOp, Descriptor, ResourceSource);
return (Rnode); return (Rnode);
} }
Index: acpica-unix-20180810/source/compiler/aslrestype2w.c Index: acpica-unix2-20181003/source/compiler/aslrestype2w.c
=================================================================== ===================================================================
--- acpica-unix-20180810.orig/source/compiler/aslrestype2w.c --- acpica-unix2-20181003.orig/source/compiler/aslrestype2w.c
+++ acpica-unix-20180810/source/compiler/aslrestype2w.c +++ acpica-unix2-20181003/source/compiler/aslrestype2w.c
@@ -81,6 +81,12 @@ RsDoWordIoDescriptor ( @@ -81,6 +81,12 @@ RsDoWordIoDescriptor (
UINT8 *OptionalFields; UINT8 *OptionalFields;
UINT16 StringLength = 0; UINT16 StringLength = 0;
@ -2400,10 +2400,10 @@ Index: acpica-unix-20180810/source/compiler/aslrestype2w.c
Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS16) + Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS16) +
OptionIndex + StringLength; OptionIndex + StringLength;
return (Rnode); return (Rnode);
Index: acpica-unix-20180810/source/include/acmacros.h Index: acpica-unix2-20181003/source/include/acmacros.h
=================================================================== ===================================================================
--- acpica-unix-20180810.orig/source/include/acmacros.h --- acpica-unix2-20181003.orig/source/include/acmacros.h
+++ acpica-unix-20180810/source/include/acmacros.h +++ acpica-unix2-20181003/source/include/acmacros.h
@@ -98,9 +98,12 @@ @@ -98,9 +98,12 @@
((UINT8 *)(void *)(d))[6] = ((UINT8 *)(void *)(s))[1];\ ((UINT8 *)(void *)(d))[6] = ((UINT8 *)(void *)(s))[1];\
((UINT8 *)(void *)(d))[7] = ((UINT8 *)(void *)(s))[0];} ((UINT8 *)(void *)(d))[7] = ((UINT8 *)(void *)(s))[0];}
@ -2482,10 +2482,10 @@ Index: acpica-unix-20180810/source/include/acmacros.h
#define ACPI_MOVE_32_TO_16(d, s) ACPI_MOVE_16_TO_16(d, s) /* Truncate to 16 */ #define ACPI_MOVE_32_TO_16(d, s) ACPI_MOVE_16_TO_16(d, s) /* Truncate to 16 */
Index: acpica-unix-20180810/source/include/platform/aclinux.h Index: acpica-unix2-20181003/source/include/platform/aclinux.h
=================================================================== ===================================================================
--- acpica-unix-20180810.orig/source/include/platform/aclinux.h --- acpica-unix2-20181003.orig/source/include/platform/aclinux.h
+++ acpica-unix-20180810/source/include/platform/aclinux.h +++ acpica-unix2-20181003/source/include/platform/aclinux.h
@@ -193,6 +193,7 @@ @@ -193,6 +193,7 @@
#ifdef ACPI_USE_STANDARD_HEADERS #ifdef ACPI_USE_STANDARD_HEADERS
@ -2505,10 +2505,10 @@ Index: acpica-unix-20180810/source/include/platform/aclinux.h
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* __ACLINUX_H__ */ #endif /* __ACLINUX_H__ */
Index: acpica-unix-20180810/source/compiler/aslanalyze.c Index: acpica-unix2-20181003/source/compiler/aslanalyze.c
=================================================================== ===================================================================
--- acpica-unix-20180810.orig/source/compiler/aslanalyze.c --- acpica-unix2-20181003.orig/source/compiler/aslanalyze.c
+++ acpica-unix-20180810/source/compiler/aslanalyze.c +++ acpica-unix2-20181003/source/compiler/aslanalyze.c
@@ -461,7 +461,7 @@ ApCheckForGpeNameConflict ( @@ -461,7 +461,7 @@ ApCheckForGpeNameConflict (
/* Need a null-terminated string version of NameSeg */ /* Need a null-terminated string version of NameSeg */
@ -2527,10 +2527,10 @@ Index: acpica-unix-20180810/source/compiler/aslanalyze.c
/* Inject opposite letter ("L" versus "E") */ /* Inject opposite letter ("L" versus "E") */
Index: acpica-unix-20180810/source/compiler/asllookup.c Index: acpica-unix2-20181003/source/compiler/asllookup.c
=================================================================== ===================================================================
--- acpica-unix-20180810.orig/source/compiler/asllookup.c --- acpica-unix2-20181003.orig/source/compiler/asllookup.c
+++ acpica-unix-20180810/source/compiler/asllookup.c +++ acpica-unix2-20181003/source/compiler/asllookup.c
@@ -119,6 +119,7 @@ LkIsObjectUsed ( @@ -119,6 +119,7 @@ LkIsObjectUsed (
{ {
ACPI_NAMESPACE_NODE *Node = ACPI_CAST_PTR (ACPI_NAMESPACE_NODE, ObjHandle); ACPI_NAMESPACE_NODE *Node = ACPI_CAST_PTR (ACPI_NAMESPACE_NODE, ObjHandle);
@ -2548,23 +2548,23 @@ Index: acpica-unix-20180810/source/compiler/asllookup.c
+ if ((tmp.Ascii[0] != '_') && + if ((tmp.Ascii[0] != '_') &&
(!(MethodArgs[i].Flags & ASL_ARG_REFERENCED))) (!(MethodArgs[i].Flags & ASL_ARG_REFERENCED)))
{ {
sprintf (MsgBuffer, "Arg%u", i); sprintf (AslGbl_MsgBuffer, "Arg%u", i);
@@ -228,8 +230,10 @@ LkIsObjectUsed ( @@ -228,8 +230,10 @@ LkIsObjectUsed (
* Issue a remark even if it is a reserved name (starts * Issue a remark even if it is a reserved name (starts
* with an underscore). * with an underscore).
*/ */
+ ACPI_MOVE_32_TO_32(&tmp.Ascii, Node->Name.Ascii); + ACPI_MOVE_32_TO_32(&tmp.Ascii, Node->Name.Ascii);
+ ACPI_MOVE_32_TO_32(&tmp2.Ascii, Next->Name.Ascii); + ACPI_MOVE_32_TO_32(&tmp2.Ascii, Next->Name.Ascii);
sprintf (MsgBuffer, "Name [%4.4s] is within a method [%4.4s]", sprintf (AslGbl_MsgBuffer, "Name [%4.4s] is within a method [%4.4s]",
- Node->Name.Ascii, Next->Name.Ascii); - Node->Name.Ascii, Next->Name.Ascii);
+ tmp.Ascii, tmp2.Ascii); + tmp.Ascii, tmp2.Ascii);
AslError (ASL_REMARK, ASL_MSG_NOT_REFERENCED, AslError (ASL_REMARK, ASL_MSG_NOT_REFERENCED,
LkGetNameOp (Node->Op), MsgBuffer); LkGetNameOp (Node->Op), AslGbl_MsgBuffer);
return (AE_OK); return (AE_OK);
Index: acpica-unix-20180810/source/compiler/aslmain.c Index: acpica-unix2-20181003/source/compiler/aslmain.c
=================================================================== ===================================================================
--- acpica-unix-20180810.orig/source/compiler/aslmain.c --- acpica-unix2-20181003.orig/source/compiler/aslmain.c
+++ acpica-unix-20180810/source/compiler/aslmain.c +++ acpica-unix2-20181003/source/compiler/aslmain.c
@@ -101,18 +101,6 @@ main ( @@ -101,18 +101,6 @@ main (
signal (SIGINT, AslSignalHandler); signal (SIGINT, AslSignalHandler);
@ -2584,10 +2584,10 @@ Index: acpica-unix-20180810/source/compiler/aslmain.c
AcpiOsInitialize (); AcpiOsInitialize ();
ACPI_DEBUG_INITIALIZE (); /* For debug version only */ ACPI_DEBUG_INITIALIZE (); /* For debug version only */
Index: acpica-unix-20180810/source/common/acfileio.c Index: acpica-unix2-20181003/source/common/acfileio.c
=================================================================== ===================================================================
--- acpica-unix-20180810.orig/source/common/acfileio.c --- acpica-unix2-20181003.orig/source/common/acfileio.c
+++ acpica-unix-20180810/source/common/acfileio.c +++ acpica-unix2-20181003/source/common/acfileio.c
@@ -280,6 +280,7 @@ AcGetOneTableFromFile ( @@ -280,6 +280,7 @@ AcGetOneTableFromFile (
ACPI_TABLE_HEADER *Table; ACPI_TABLE_HEADER *Table;
INT32 Count; INT32 Count;
@ -2654,10 +2654,10 @@ Index: acpica-unix-20180810/source/common/acfileio.c
(UINT32) (FileSize - TableOffset)); (UINT32) (FileSize - TableOffset));
return (AE_BAD_HEADER); return (AE_BAD_HEADER);
} }
Index: acpica-unix-20180810/source/common/dmtable.c Index: acpica-unix2-20181003/source/common/dmtable.c
=================================================================== ===================================================================
--- acpica-unix-20180810.orig/source/common/dmtable.c --- acpica-unix2-20181003.orig/source/common/dmtable.c
+++ acpica-unix-20180810/source/common/dmtable.c +++ acpica-unix2-20181003/source/common/dmtable.c
@@ -550,7 +550,7 @@ AcpiDmDumpDataTable ( @@ -550,7 +550,7 @@ AcpiDmDumpDataTable (
*/ */
if (ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_FACS)) if (ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_FACS))
@ -2756,10 +2756,10 @@ Index: acpica-unix-20180810/source/common/dmtable.c
AcpiDmNfitSubnames[Temp16]); AcpiDmNfitSubnames[Temp16]);
break; break;
Index: acpica-unix-20180810/source/common/dmtables.c Index: acpica-unix2-20181003/source/common/dmtables.c
=================================================================== ===================================================================
--- acpica-unix-20180810.orig/source/common/dmtables.c --- acpica-unix2-20181003.orig/source/common/dmtables.c
+++ acpica-unix-20180810/source/common/dmtables.c +++ acpica-unix2-20181003/source/common/dmtables.c
@@ -142,7 +142,9 @@ AdCreateTableHeader ( @@ -142,7 +142,9 @@ AdCreateTableHeader (
ACPI_TABLE_HEADER *Table) ACPI_TABLE_HEADER *Table)
{ {
@ -2825,10 +2825,10 @@ Index: acpica-unix-20180810/source/common/dmtables.c
AmlStart = ((UINT8 *) Table + sizeof (ACPI_TABLE_HEADER)); AmlStart = ((UINT8 *) Table + sizeof (ACPI_TABLE_HEADER));
ASL_CV_INIT_FILETREE(Table, AmlStart, AmlLength); ASL_CV_INIT_FILETREE(Table, AmlStart, AmlLength);
Index: acpica-unix-20180810/source/common/dmtbdump.c Index: acpica-unix2-20181003/source/common/dmtbdump.c
=================================================================== ===================================================================
--- acpica-unix-20180810.orig/source/common/dmtbdump.c --- acpica-unix2-20181003.orig/source/common/dmtbdump.c
+++ acpica-unix-20180810/source/common/dmtbdump.c +++ acpica-unix2-20181003/source/common/dmtbdump.c
@@ -277,6 +277,8 @@ AcpiDmDumpRsdt ( @@ -277,6 +277,8 @@ AcpiDmDumpRsdt (
UINT32 Entries; UINT32 Entries;
UINT32 Offset; UINT32 Offset;
@ -2987,10 +2987,10 @@ Index: acpica-unix-20180810/source/common/dmtbdump.c
- Revision, Length, ExpectedLength); - Revision, Length, ExpectedLength);
+ Revision, Tmp32, ExpectedLength); + Revision, Tmp32, ExpectedLength);
} }
Index: acpica-unix-20180810/source/common/dmtbdump1.c Index: acpica-unix2-20181003/source/common/dmtbdump1.c
=================================================================== ===================================================================
--- acpica-unix-20180810.orig/source/common/dmtbdump1.c --- acpica-unix2-20181003.orig/source/common/dmtbdump1.c
+++ acpica-unix-20180810/source/common/dmtbdump1.c +++ acpica-unix2-20181003/source/common/dmtbdump1.c
@@ -79,17 +79,21 @@ AcpiDmDumpAsf ( @@ -79,17 +79,21 @@ AcpiDmDumpAsf (
UINT32 DataOffset = 0; UINT32 DataOffset = 0;
UINT32 i; UINT32 i;
@ -3624,10 +3624,10 @@ Index: acpica-unix-20180810/source/common/dmtbdump1.c
{ {
case ACPI_HEST_TYPE_IA32_CHECK: case ACPI_HEST_TYPE_IA32_CHECK:
Index: acpica-unix-20180810/source/common/dmtbdump2.c Index: acpica-unix2-20181003/source/common/dmtbdump2.c
=================================================================== ===================================================================
--- acpica-unix-20180810.orig/source/common/dmtbdump2.c --- acpica-unix2-20181003.orig/source/common/dmtbdump2.c
+++ acpica-unix-20180810/source/common/dmtbdump2.c +++ acpica-unix2-20181003/source/common/dmtbdump2.c
@@ -75,15 +75,21 @@ AcpiDmDumpIort ( @@ -75,15 +75,21 @@ AcpiDmDumpIort (
ACPI_IORT_SMMU *IortSmmu = NULL; ACPI_IORT_SMMU *IortSmmu = NULL;
UINT32 Offset; UINT32 Offset;
@ -4510,10 +4510,10 @@ Index: acpica-unix-20180810/source/common/dmtbdump2.c
Subtable->Length, InfoTable); Subtable->Length, InfoTable);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
Index: acpica-unix-20180810/source/common/dmtbdump3.c Index: acpica-unix2-20181003/source/common/dmtbdump3.c
=================================================================== ===================================================================
--- acpica-unix-20180810.orig/source/common/dmtbdump3.c --- acpica-unix2-20181003.orig/source/common/dmtbdump3.c
+++ acpica-unix-20180810/source/common/dmtbdump3.c +++ acpica-unix2-20181003/source/common/dmtbdump3.c
@@ -68,9 +68,11 @@ void @@ -68,9 +68,11 @@ void
AcpiDmDumpSlic ( AcpiDmDumpSlic (
ACPI_TABLE_HEADER *Table) ACPI_TABLE_HEADER *Table)
@ -4760,12 +4760,12 @@ Index: acpica-unix-20180810/source/common/dmtbdump3.c
+ (void) AcpiDmDumpTable (Length, 0, Table, ArgumentsLength, + (void) AcpiDmDumpTable (Length, 0, Table, ArgumentsLength,
AcpiDmTableInfoWpbt0); AcpiDmTableInfoWpbt0);
} }
Index: acpica-unix-20180810/source/compiler/dtfield.c Index: acpica-unix2-20181003/source/compiler/dtfield.c
=================================================================== ===================================================================
--- acpica-unix-20180810.orig/source/compiler/dtfield.c --- acpica-unix2-20181003.orig/source/compiler/dtfield.c
+++ acpica-unix-20180810/source/compiler/dtfield.c +++ acpica-unix2-20181003/source/compiler/dtfield.c
@@ -359,7 +359,27 @@ DtCompileInteger ( @@ -359,7 +359,27 @@ DtCompileInteger (
DtError (ASL_ERROR, ASL_MSG_INTEGER_SIZE, Field, MsgBuffer); DtError (ASL_ERROR, ASL_MSG_INTEGER_SIZE, Field, AslGbl_MsgBuffer);
} }
- memcpy (Buffer, &Value, ByteLength); - memcpy (Buffer, &Value, ByteLength);
@ -4793,10 +4793,10 @@ Index: acpica-unix-20180810/source/compiler/dtfield.c
return; return;
} }
Index: acpica-unix-20180810/source/compiler/dtsubtable.c Index: acpica-unix2-20181003/source/compiler/dtsubtable.c
=================================================================== ===================================================================
--- acpica-unix-20180810.orig/source/compiler/dtsubtable.c --- acpica-unix2-20181003.orig/source/compiler/dtsubtable.c
+++ acpica-unix-20180810/source/compiler/dtsubtable.c +++ acpica-unix2-20181003/source/compiler/dtsubtable.c
@@ -378,6 +378,21 @@ DtSetSubtableLength ( @@ -378,6 +378,21 @@ DtSetSubtableLength (
return; return;
} }
@ -4821,10 +4821,10 @@ Index: acpica-unix-20180810/source/compiler/dtsubtable.c
+ Subtable->SizeOfLengthField); + Subtable->SizeOfLengthField);
+ } + }
} }
Index: acpica-unix-20180810/source/compiler/dttable1.c Index: acpica-unix2-20181003/source/compiler/dttable1.c
=================================================================== ===================================================================
--- acpica-unix-20180810.orig/source/compiler/dttable1.c --- acpica-unix2-20181003.orig/source/compiler/dttable1.c
+++ acpica-unix-20180810/source/compiler/dttable1.c +++ acpica-unix2-20181003/source/compiler/dttable1.c
@@ -281,6 +281,8 @@ DtCompileCsrt ( @@ -281,6 +281,8 @@ DtCompileCsrt (
DT_FIELD **PFieldList = (DT_FIELD **) List; DT_FIELD **PFieldList = (DT_FIELD **) List;
UINT32 DescriptorCount; UINT32 DescriptorCount;
@ -5196,10 +5196,10 @@ Index: acpica-unix-20180810/source/compiler/dttable1.c
return (AE_OK); return (AE_OK);
} }
Index: acpica-unix-20180810/source/compiler/dttable2.c Index: acpica-unix2-20181003/source/compiler/dttable2.c
=================================================================== ===================================================================
--- acpica-unix-20180810.orig/source/compiler/dttable2.c --- acpica-unix2-20181003.orig/source/compiler/dttable2.c
+++ acpica-unix-20180810/source/compiler/dttable2.c +++ acpica-unix2-20181003/source/compiler/dttable2.c
@@ -345,7 +345,7 @@ DtCompileMpst ( @@ -345,7 +345,7 @@ DtCompileMpst (
DtPushSubtable (Subtable); DtPushSubtable (Subtable);
@ -5356,10 +5356,10 @@ Index: acpica-unix-20180810/source/compiler/dttable2.c
ParentTable = DtPeekSubtable (); ParentTable = DtPeekSubtable ();
DtInsertSubtable (ParentTable, Subtable); DtInsertSubtable (ParentTable, Subtable);
Index: acpica-unix-20180810/source/components/disassembler/dmbuffer.c Index: acpica-unix2-20181003/source/components/disassembler/dmbuffer.c
=================================================================== ===================================================================
--- acpica-unix-20180810.orig/source/components/disassembler/dmbuffer.c --- acpica-unix2-20181003.orig/source/components/disassembler/dmbuffer.c
+++ acpica-unix-20180810/source/components/disassembler/dmbuffer.c +++ acpica-unix2-20181003/source/components/disassembler/dmbuffer.c
@@ -204,7 +204,7 @@ AcpiDmByteList ( @@ -204,7 +204,7 @@ AcpiDmByteList (
@ -5435,10 +5435,10 @@ Index: acpica-unix-20180810/source/components/disassembler/dmbuffer.c
NextOp = AcpiPsGetDepthNext (NULL, Op); NextOp = AcpiPsGetDepthNext (NULL, Op);
if (!NextOp) if (!NextOp)
Index: acpica-unix-20180810/source/components/disassembler/dmopcode.c Index: acpica-unix2-20181003/source/components/disassembler/dmopcode.c
=================================================================== ===================================================================
--- acpica-unix-20180810.orig/source/components/disassembler/dmopcode.c --- acpica-unix2-20181003.orig/source/components/disassembler/dmopcode.c
+++ acpica-unix-20180810/source/components/disassembler/dmopcode.c +++ acpica-unix2-20181003/source/components/disassembler/dmopcode.c
@@ -244,6 +244,7 @@ AcpiDmPredefinedDescription ( @@ -244,6 +244,7 @@ AcpiDmPredefinedDescription (
char *NameString; char *NameString;
int LastCharIsDigit; int LastCharIsDigit;
@ -5509,10 +5509,10 @@ Index: acpica-unix-20180810/source/components/disassembler/dmopcode.c
Info->Level += 1; Info->Level += 1;
Info->MappingOp = Op; Info->MappingOp = Op;
Index: acpica-unix-20180810/source/components/disassembler/dmresrcl.c Index: acpica-unix2-20181003/source/components/disassembler/dmresrcl.c
=================================================================== ===================================================================
--- acpica-unix-20180810.orig/source/components/disassembler/dmresrcl.c --- acpica-unix2-20181003.orig/source/components/disassembler/dmresrcl.c
+++ acpica-unix-20180810/source/components/disassembler/dmresrcl.c +++ acpica-unix2-20181003/source/components/disassembler/dmresrcl.c
@@ -141,7 +141,8 @@ AcpiDmMemoryFields ( @@ -141,7 +141,8 @@ AcpiDmMemoryFields (
UINT32 Level) UINT32 Level)
{ {
@ -5661,10 +5661,10 @@ Index: acpica-unix-20180810/source/components/disassembler/dmresrcl.c
} }
AcpiDmIndent (Level); AcpiDmIndent (Level);
Index: acpica-unix-20180810/source/components/disassembler/dmresrcl2.c Index: acpica-unix2-20181003/source/components/disassembler/dmresrcl2.c
=================================================================== ===================================================================
--- acpica-unix-20180810.orig/source/components/disassembler/dmresrcl2.c --- acpica-unix2-20181003.orig/source/components/disassembler/dmresrcl2.c
+++ acpica-unix-20180810/source/components/disassembler/dmresrcl2.c +++ acpica-unix2-20181003/source/components/disassembler/dmresrcl2.c
@@ -191,22 +191,24 @@ AcpiDmGpioCommon ( @@ -191,22 +191,24 @@ AcpiDmGpioCommon (
char *DeviceName = NULL; char *DeviceName = NULL;
UINT32 PinCount; UINT32 PinCount;
@ -5888,10 +5888,10 @@ Index: acpica-unix-20180810/source/components/disassembler/dmresrcl2.c
DeviceName = ACPI_ADD_PTR (char, Resource, ResourceSourceOffset); DeviceName = ACPI_ADD_PTR (char, Resource, ResourceSourceOffset);
AcpiUtPrintString (DeviceName, ACPI_UINT16_MAX); AcpiUtPrintString (DeviceName, ACPI_UINT16_MAX);
Index: acpica-unix-20180810/source/components/disassembler/dmresrcs.c Index: acpica-unix2-20181003/source/components/disassembler/dmresrcs.c
=================================================================== ===================================================================
--- acpica-unix-20180810.orig/source/components/disassembler/dmresrcs.c --- acpica-unix2-20181003.orig/source/components/disassembler/dmresrcs.c
+++ acpica-unix-20180810/source/components/disassembler/dmresrcs.c +++ acpica-unix2-20181003/source/components/disassembler/dmresrcs.c
@@ -72,6 +72,7 @@ AcpiDmIrqDescriptor ( @@ -72,6 +72,7 @@ AcpiDmIrqDescriptor (
UINT32 Length, UINT32 Length,
UINT32 Level) UINT32 Level)
@ -5948,10 +5948,10 @@ Index: acpica-unix-20180810/source/components/disassembler/dmresrcs.c
AcpiDmIndent (Level + 1); AcpiDmIndent (Level + 1);
AcpiDmDumpInteger8 (Resource->FixedIo.AddressLength, "Length"); AcpiDmDumpInteger8 (Resource->FixedIo.AddressLength, "Length");
Index: acpica-unix-20180810/source/components/dispatcher/dsfield.c Index: acpica-unix2-20181003/source/components/dispatcher/dsfield.c
=================================================================== ===================================================================
--- acpica-unix-20180810.orig/source/components/dispatcher/dsfield.c --- acpica-unix2-20181003.orig/source/components/dispatcher/dsfield.c
+++ acpica-unix-20180810/source/components/dispatcher/dsfield.c +++ acpica-unix2-20181003/source/components/dispatcher/dsfield.c
@@ -325,6 +325,7 @@ AcpiDsGetFieldNames ( @@ -325,6 +325,7 @@ AcpiDsGetFieldNames (
ACPI_STATUS Status; ACPI_STATUS Status;
UINT64 Position; UINT64 Position;
@ -5996,10 +5996,10 @@ Index: acpica-unix-20180810/source/components/dispatcher/dsfield.c
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
ACPI_ERROR_NAMESPACE (WalkState->ScopeInfo, ACPI_ERROR_NAMESPACE (WalkState->ScopeInfo,
Index: acpica-unix-20180810/source/components/events/evgpeblk.c Index: acpica-unix2-20181003/source/components/events/evgpeblk.c
=================================================================== ===================================================================
--- acpica-unix-20180810.orig/source/components/events/evgpeblk.c --- acpica-unix2-20181003.orig/source/components/events/evgpeblk.c
+++ acpica-unix-20180810/source/components/events/evgpeblk.c +++ acpica-unix2-20181003/source/components/events/evgpeblk.c
@@ -376,6 +376,7 @@ AcpiEvCreateGpeBlock ( @@ -376,6 +376,7 @@ AcpiEvCreateGpeBlock (
ACPI_STATUS Status; ACPI_STATUS Status;
ACPI_GPE_BLOCK_INFO *GpeBlock; ACPI_GPE_BLOCK_INFO *GpeBlock;
@ -6032,10 +6032,10 @@ Index: acpica-unix-20180810/source/components/events/evgpeblk.c
InterruptNumber == AcpiGbl_FADT.SciInterrupt ? " (SCI)" : "")); InterruptNumber == AcpiGbl_FADT.SciInterrupt ? " (SCI)" : ""));
/* Update global count of currently available GPEs */ /* Update global count of currently available GPEs */
Index: acpica-unix-20180810/source/components/hardware/hwregs.c Index: acpica-unix2-20181003/source/components/hardware/hwregs.c
=================================================================== ===================================================================
--- acpica-unix-20180810.orig/source/components/hardware/hwregs.c --- acpica-unix2-20181003.orig/source/components/hardware/hwregs.c
+++ acpica-unix-20180810/source/components/hardware/hwregs.c +++ acpica-unix2-20181003/source/components/hardware/hwregs.c
@@ -197,7 +197,7 @@ AcpiHwValidateRegister ( @@ -197,7 +197,7 @@ AcpiHwValidateRegister (
* Address must not be null. A null address also indicates an optional * Address must not be null. A null address also indicates an optional
* ACPI register that is not supported, so no error message. * ACPI register that is not supported, so no error message.
@ -6045,10 +6045,10 @@ Index: acpica-unix-20180810/source/components/hardware/hwregs.c
if (!(*Address)) if (!(*Address))
{ {
return (AE_BAD_ADDRESS); return (AE_BAD_ADDRESS);
Index: acpica-unix-20180810/source/components/hardware/hwvalid.c Index: acpica-unix2-20181003/source/components/hardware/hwvalid.c
=================================================================== ===================================================================
--- acpica-unix-20180810.orig/source/components/hardware/hwvalid.c --- acpica-unix2-20181003.orig/source/components/hardware/hwvalid.c
+++ acpica-unix-20180810/source/components/hardware/hwvalid.c +++ acpica-unix2-20181003/source/components/hardware/hwvalid.c
@@ -135,6 +135,8 @@ AcpiHwValidateIoRequest ( @@ -135,6 +135,8 @@ AcpiHwValidateIoRequest (
UINT32 ByteWidth; UINT32 ByteWidth;
ACPI_IO_ADDRESS LastAddress; ACPI_IO_ADDRESS LastAddress;
@ -6070,10 +6070,10 @@ Index: acpica-unix-20180810/source/components/hardware/hwvalid.c
{ {
ACPI_ERROR ((AE_INFO, ACPI_ERROR ((AE_INFO,
"Illegal I/O port address/length above 64K: %8.8X%8.8X/0x%X", "Illegal I/O port address/length above 64K: %8.8X%8.8X/0x%X",
Index: acpica-unix-20180810/source/components/namespace/nsaccess.c Index: acpica-unix2-20181003/source/components/namespace/nsaccess.c
=================================================================== ===================================================================
--- acpica-unix-20180810.orig/source/components/namespace/nsaccess.c --- acpica-unix2-20181003.orig/source/components/namespace/nsaccess.c
+++ acpica-unix-20180810/source/components/namespace/nsaccess.c +++ acpica-unix2-20181003/source/components/namespace/nsaccess.c
@@ -313,6 +313,7 @@ AcpiNsLookup ( @@ -313,6 +313,7 @@ AcpiNsLookup (
ACPI_OBJECT_TYPE ThisSearchType; ACPI_OBJECT_TYPE ThisSearchType;
UINT32 SearchParentFlag = ACPI_NS_SEARCH_PARENT; UINT32 SearchParentFlag = ACPI_NS_SEARCH_PARENT;
@ -6094,10 +6094,10 @@ Index: acpica-unix-20180810/source/components/namespace/nsaccess.c
AcpiUtGetTypeName (ThisNode->Type), AcpiUtGetTypeName (ThisNode->Type),
AcpiUtGetTypeName (TypeToCheckFor))); AcpiUtGetTypeName (TypeToCheckFor)));
} }
Index: acpica-unix-20180810/source/components/namespace/nsparse.c Index: acpica-unix2-20181003/source/components/namespace/nsparse.c
=================================================================== ===================================================================
--- acpica-unix-20180810.orig/source/components/namespace/nsparse.c --- acpica-unix2-20181003.orig/source/components/namespace/nsparse.c
+++ acpica-unix-20180810/source/components/namespace/nsparse.c +++ acpica-unix2-20181003/source/components/namespace/nsparse.c
@@ -206,13 +206,14 @@ AcpiNsOneCompleteParse ( @@ -206,13 +206,14 @@ AcpiNsOneCompleteParse (
/* Table must consist of at least a complete header */ /* Table must consist of at least a complete header */
@ -6115,10 +6115,10 @@ Index: acpica-unix-20180810/source/components/namespace/nsparse.c
Status = AcpiTbGetOwnerId (TableIndex, &OwnerId); Status = AcpiTbGetOwnerId (TableIndex, &OwnerId);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
Index: acpica-unix-20180810/source/components/tables/tbdata.c Index: acpica-unix2-20181003/source/components/tables/tbdata.c
=================================================================== ===================================================================
--- acpica-unix-20180810.orig/source/components/tables/tbdata.c --- acpica-unix2-20181003.orig/source/components/tables/tbdata.c
+++ acpica-unix-20180810/source/components/tables/tbdata.c +++ acpica-unix2-20181003/source/components/tables/tbdata.c
@@ -552,6 +552,7 @@ AcpiTbVerifyTempTable ( @@ -552,6 +552,7 @@ AcpiTbVerifyTempTable (
UINT32 *TableIndex) UINT32 *TableIndex)
{ {
@ -6137,10 +6137,10 @@ Index: acpica-unix-20180810/source/components/tables/tbdata.c
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
ACPI_EXCEPTION ((AE_INFO, AE_NO_MEMORY, ACPI_EXCEPTION ((AE_INFO, AE_NO_MEMORY,
Index: acpica-unix-20180810/source/components/tables/tbfadt.c Index: acpica-unix2-20181003/source/components/tables/tbfadt.c
=================================================================== ===================================================================
--- acpica-unix-20180810.orig/source/components/tables/tbfadt.c --- acpica-unix2-20181003.orig/source/components/tables/tbfadt.c
+++ acpica-unix-20180810/source/components/tables/tbfadt.c +++ acpica-unix2-20181003/source/components/tables/tbfadt.c
@@ -424,18 +424,20 @@ AcpiTbCreateLocalFadt ( @@ -424,18 +424,20 @@ AcpiTbCreateLocalFadt (
ACPI_TABLE_HEADER *Table, ACPI_TABLE_HEADER *Table,
UINT32 Length) UINT32 Length)
@ -6252,10 +6252,10 @@ Index: acpica-unix-20180810/source/components/tables/tbfadt.c
"PmRegisters", 0); "PmRegisters", 0);
} }
} }
Index: acpica-unix-20180810/source/components/tables/tbfind.c Index: acpica-unix2-20181003/source/components/tables/tbfind.c
=================================================================== ===================================================================
--- acpica-unix-20180810.orig/source/components/tables/tbfind.c --- acpica-unix2-20181003.orig/source/components/tables/tbfind.c
+++ acpica-unix-20180810/source/components/tables/tbfind.c +++ acpica-unix2-20181003/source/components/tables/tbfind.c
@@ -108,8 +108,11 @@ AcpiTbFindTable ( @@ -108,8 +108,11 @@ AcpiTbFindTable (
(void) AcpiUtAcquireMutex (ACPI_MTX_TABLES); (void) AcpiUtAcquireMutex (ACPI_MTX_TABLES);
for (i = 0; i < AcpiGbl_RootTableList.CurrentTableCount; ++i) for (i = 0; i < AcpiGbl_RootTableList.CurrentTableCount; ++i)
@ -6269,10 +6269,10 @@ Index: acpica-unix-20180810/source/components/tables/tbfind.c
{ {
/* Not the requested table */ /* Not the requested table */
Index: acpica-unix-20180810/source/components/tables/tbprint.c Index: acpica-unix2-20181003/source/components/tables/tbprint.c
=================================================================== ===================================================================
--- acpica-unix-20180810.orig/source/components/tables/tbprint.c --- acpica-unix2-20181003.orig/source/components/tables/tbprint.c
+++ acpica-unix-20180810/source/components/tables/tbprint.c +++ acpica-unix2-20181003/source/components/tables/tbprint.c
@@ -143,15 +143,18 @@ AcpiTbPrintTableHeader ( @@ -143,15 +143,18 @@ AcpiTbPrintTableHeader (
ACPI_TABLE_HEADER *Header) ACPI_TABLE_HEADER *Header)
{ {
@ -6314,10 +6314,10 @@ Index: acpica-unix-20180810/source/components/tables/tbprint.c
} }
} }
Index: acpica-unix-20180810/source/components/tables/tbutils.c Index: acpica-unix2-20181003/source/components/tables/tbutils.c
=================================================================== ===================================================================
--- acpica-unix-20180810.orig/source/components/tables/tbutils.c --- acpica-unix2-20181003.orig/source/components/tables/tbutils.c
+++ acpica-unix-20180810/source/components/tables/tbutils.c +++ acpica-unix2-20181003/source/components/tables/tbutils.c
@@ -238,7 +238,7 @@ AcpiTbGetRootTableEntry ( @@ -238,7 +238,7 @@ AcpiTbGetRootTableEntry (
* 64-bit platform, XSDT: Move (unaligned) 64-bit to local, * 64-bit platform, XSDT: Move (unaligned) 64-bit to local,
* return 64-bit * return 64-bit
@ -6377,10 +6377,10 @@ Index: acpica-unix-20180810/source/components/tables/tbutils.c
{ {
AcpiGbl_FadtIndex = TableIndex; AcpiGbl_FadtIndex = TableIndex;
AcpiTbParseFadt (); AcpiTbParseFadt ();
Index: acpica-unix-20180810/source/components/tables/tbxface.c Index: acpica-unix2-20181003/source/components/tables/tbxface.c
=================================================================== ===================================================================
--- acpica-unix-20180810.orig/source/components/tables/tbxface.c --- acpica-unix2-20181003.orig/source/components/tables/tbxface.c
+++ acpica-unix-20180810/source/components/tables/tbxface.c +++ acpica-unix2-20181003/source/components/tables/tbxface.c
@@ -293,8 +293,11 @@ AcpiGetTableHeader ( @@ -293,8 +293,11 @@ AcpiGetTableHeader (
for (i = 0, j = 0; i < AcpiGbl_RootTableList.CurrentTableCount; i++) for (i = 0, j = 0; i < AcpiGbl_RootTableList.CurrentTableCount; i++)
@ -6394,10 +6394,10 @@ Index: acpica-unix-20180810/source/components/tables/tbxface.c
{ {
continue; continue;
} }
Index: acpica-unix-20180810/source/components/tables/tbxfload.c Index: acpica-unix2-20181003/source/components/tables/tbxfload.c
=================================================================== ===================================================================
--- acpica-unix-20180810.orig/source/components/tables/tbxfload.c --- acpica-unix2-20181003.orig/source/components/tables/tbxfload.c
+++ acpica-unix-20180810/source/components/tables/tbxfload.c +++ acpica-unix2-20181003/source/components/tables/tbxfload.c
@@ -159,6 +159,7 @@ AcpiTbLoadNamespace ( @@ -159,6 +159,7 @@ AcpiTbLoadNamespace (
ACPI_TABLE_DESC *Table; ACPI_TABLE_DESC *Table;
UINT32 TablesLoaded = 0; UINT32 TablesLoaded = 0;
@ -6417,10 +6417,10 @@ Index: acpica-unix-20180810/source/components/tables/tbxfload.c
ACPI_FAILURE (AcpiTbValidateTable (Table))) ACPI_FAILURE (AcpiTbValidateTable (Table)))
{ {
Status = AE_NO_ACPI_TABLES; Status = AE_NO_ACPI_TABLES;
Index: acpica-unix-20180810/source/tools/acpiexec/aetables.c Index: acpica-unix2-20181003/source/tools/acpiexec/aetables.c
=================================================================== ===================================================================
--- acpica-unix-20180810.orig/source/tools/acpiexec/aetables.c --- acpica-unix2-20181003.orig/source/tools/acpiexec/aetables.c
+++ acpica-unix-20180810/source/tools/acpiexec/aetables.c +++ acpica-unix2-20181003/source/tools/acpiexec/aetables.c
@@ -146,21 +146,25 @@ AeInitializeTableHeader ( @@ -146,21 +146,25 @@ AeInitializeTableHeader (
char *Signature, char *Signature,
UINT32 Length) UINT32 Length)
@ -6572,10 +6572,10 @@ Index: acpica-unix-20180810/source/tools/acpiexec/aetables.c
} }
return (AE_OK); return (AE_OK);
Index: acpica-unix-20180810/source/common/dmswitch.c Index: acpica-unix2-20181003/source/common/dmswitch.c
=================================================================== ===================================================================
--- acpica-unix-20180810.orig/source/common/dmswitch.c --- acpica-unix2-20181003.orig/source/common/dmswitch.c
+++ acpica-unix-20180810/source/common/dmswitch.c +++ acpica-unix2-20181003/source/common/dmswitch.c
@@ -88,13 +88,15 @@ AcpiDmProcessSwitch ( @@ -88,13 +88,15 @@ AcpiDmProcessSwitch (
ACPI_PARSE_OBJECT_LIST *Current; ACPI_PARSE_OBJECT_LIST *Current;
ACPI_PARSE_OBJECT_LIST *Previous; ACPI_PARSE_OBJECT_LIST *Previous;

8
free.patch
View File

@ -1,10 +1,10 @@
This prevents a segfault when an Include file does not exist. This prevents a segfault when an Include file does not exist.
Index: acpica-unix2-20170929/source/compiler/aslfiles.c Index: acpica-unix2-20181003/source/compiler/aslfiles.c
=================================================================== ===================================================================
--- acpica-unix2-20170929.orig/source/compiler/aslfiles.c --- acpica-unix2-20181003.orig/source/compiler/aslfiles.c
+++ acpica-unix2-20170929/source/compiler/aslfiles.c +++ acpica-unix2-20181003/source/compiler/aslfiles.c
@@ -318,7 +318,7 @@ FlOpenIncludeWithPrefix ( @@ -319,7 +319,7 @@ FlOpenIncludeWithPrefix (
if (!IncludeFile) if (!IncludeFile)
{ {
fprintf (stderr, "Could not open include file %s\n", Pathname); fprintf (stderr, "Could not open include file %s\n", Pathname);

132
int-format.patch
View File

@ -24,46 +24,46 @@ From: Al Stone <ahs3@redhat.com>
source/tools/acpiexec/aemain.c | 2 +- source/tools/acpiexec/aemain.c | 2 +-
18 files changed, 28 insertions(+), 28 deletions(-) 18 files changed, 28 insertions(+), 28 deletions(-)
Index: acpica-unix2-20180810/source/compiler/aslcompile.c Index: acpica-unix2-20181003/source/compiler/aslcompile.c
=================================================================== ===================================================================
--- acpica-unix2-20180810.orig/source/compiler/aslcompile.c --- acpica-unix2-20181003.orig/source/compiler/aslcompile.c
+++ acpica-unix2-20180810/source/compiler/aslcompile.c +++ acpica-unix2-20181003/source/compiler/aslcompile.c
@@ -750,7 +750,7 @@ CmCleanupAndExit ( @@ -750,7 +750,7 @@ CmCleanupAndExit (
if (Gbl_ExceptionCount[ASL_ERROR] > ASL_MAX_ERROR_COUNT) if (AslGbl_ExceptionCount[ASL_ERROR] > ASL_MAX_ERROR_COUNT)
{ {
- printf ("\nMaximum error count (%u) exceeded\n", - printf ("\nMaximum error count (%u) exceeded\n",
+ printf ("\nMaximum error count (%d) exceeded\n", + printf ("\nMaximum error count (%d) exceeded\n",
ASL_MAX_ERROR_COUNT); ASL_MAX_ERROR_COUNT);
} }
Index: acpica-unix2-20180810/source/compiler/aslerror.c Index: acpica-unix2-20181003/source/compiler/aslerror.c
=================================================================== ===================================================================
--- acpica-unix2-20180810.orig/source/compiler/aslerror.c --- acpica-unix2-20181003.orig/source/compiler/aslerror.c
+++ acpica-unix2-20180810/source/compiler/aslerror.c +++ acpica-unix2-20181003/source/compiler/aslerror.c
@@ -880,7 +880,7 @@ AslLogNewError ( @@ -880,7 +880,7 @@ AslLogNewError (
Gbl_ExceptionCount[Level]++; AslGbl_ExceptionCount[Level]++;
if (Gbl_ExceptionCount[ASL_ERROR] > ASL_MAX_ERROR_COUNT) if (AslGbl_ExceptionCount[ASL_ERROR] > ASL_MAX_ERROR_COUNT)
{ {
- printf ("\nMaximum error count (%u) exceeded\n", 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); + printf ("\nMaximum error count (%d) exceeded\n", ASL_MAX_ERROR_COUNT);
Gbl_SourceLine = 0; AslGbl_SourceLine = 0;
Gbl_NextError = Gbl_ErrorLog; AslGbl_NextError = AslGbl_ErrorLog;
@@ -1036,7 +1036,7 @@ AslDisableException ( @@ -1036,7 +1036,7 @@ AslDisableException (
if (Gbl_DisabledMessagesIndex >= ASL_MAX_DISABLED_MESSAGES) if (AslGbl_DisabledMessagesIndex >= ASL_MAX_DISABLED_MESSAGES)
{ {
- printf ("Too many messages have been disabled (max %u)\n", - printf ("Too many messages have been disabled (max %u)\n",
+ printf ("Too many messages have been disabled (max %d)\n", + printf ("Too many messages have been disabled (max %d)\n",
ASL_MAX_DISABLED_MESSAGES); ASL_MAX_DISABLED_MESSAGES);
return (AE_LIMIT); return (AE_LIMIT);
} }
Index: acpica-unix2-20180810/source/compiler/aslopt.c Index: acpica-unix2-20181003/source/compiler/aslopt.c
=================================================================== ===================================================================
--- acpica-unix2-20180810.orig/source/compiler/aslopt.c --- acpica-unix2-20181003.orig/source/compiler/aslopt.c
+++ acpica-unix2-20180810/source/compiler/aslopt.c +++ acpica-unix2-20181003/source/compiler/aslopt.c
@@ -584,7 +584,7 @@ OptOptimizeNamePath ( @@ -583,7 +583,7 @@ OptOptimizeNamePath (
} }
ACPI_DEBUG_PRINT_RAW ((ACPI_DB_OPTIMIZATIONS, ACPI_DEBUG_PRINT_RAW ((ACPI_DB_OPTIMIZATIONS,
@ -72,36 +72,36 @@ Index: acpica-unix2-20180810/source/compiler/aslopt.c
Op->Asl.LogicalLineNumber, Op->Asl.LogicalLineNumber,
AcpiPsGetOpcodeName (Op->Common.Parent->Common.AmlOpcode), AcpiPsGetOpcodeName (Op->Common.Parent->Common.AmlOpcode),
AcpiPsGetOpcodeName (Op->Common.AmlOpcode))); AcpiPsGetOpcodeName (Op->Common.AmlOpcode)));
Index: acpica-unix2-20180810/source/compiler/aslpredef.c Index: acpica-unix2-20181003/source/compiler/aslpredef.c
=================================================================== ===================================================================
--- acpica-unix2-20180810.orig/source/compiler/aslpredef.c --- acpica-unix2-20181003.orig/source/compiler/aslpredef.c
+++ acpica-unix2-20180810/source/compiler/aslpredef.c +++ acpica-unix2-20181003/source/compiler/aslpredef.c
@@ -114,7 +114,7 @@ ApCheckForPredefinedMethod ( @@ -114,7 +114,7 @@ ApCheckForPredefinedMethod (
if (MethodInfo->NumArguments != 0) if (MethodInfo->NumArguments != 0)
{ {
- sprintf (MsgBuffer, "%s requires %u", Op->Asl.ExternalName, 0); - sprintf (AslGbl_MsgBuffer, "%s requires %u", Op->Asl.ExternalName, 0);
+ sprintf (MsgBuffer, "%s requires %d", Op->Asl.ExternalName, 0); + sprintf (AslGbl_MsgBuffer, "%s requires %d", Op->Asl.ExternalName, 0);
AslError (ASL_WARNING, ASL_MSG_RESERVED_ARG_COUNT_HI, Op, AslError (ASL_WARNING, ASL_MSG_RESERVED_ARG_COUNT_HI, Op,
MsgBuffer); AslGbl_MsgBuffer);
Index: acpica-unix2-20180810/source/compiler/aslprepkg.c Index: acpica-unix2-20181003/source/compiler/aslprepkg.c
=================================================================== ===================================================================
--- acpica-unix2-20180810.orig/source/compiler/aslprepkg.c --- acpica-unix2-20181003.orig/source/compiler/aslprepkg.c
+++ acpica-unix2-20180810/source/compiler/aslprepkg.c +++ acpica-unix2-20181003/source/compiler/aslprepkg.c
@@ -309,7 +309,7 @@ ApCheckPackage ( @@ -309,7 +309,7 @@ ApCheckPackage (
if (Count & 1) if (Count & 1)
{ {
- sprintf (MsgBuffer, "%4.4s: Package length, %d, must be even.", - sprintf (AslGbl_MsgBuffer, "%4.4s: Package length, %d, must be even.",
+ sprintf (MsgBuffer, "%4.4s: Package length, %u, must be even.", + sprintf (AslGbl_MsgBuffer, "%4.4s: Package length, %u, must be even.",
Predefined->Info.Name, Count); Predefined->Info.Name, Count);
AslError (ASL_ERROR, ASL_MSG_RESERVED_PACKAGE_LENGTH, AslError (ASL_ERROR, ASL_MSG_RESERVED_PACKAGE_LENGTH,
Index: acpica-unix2-20180810/source/components/debugger/dbexec.c Index: acpica-unix2-20181003/source/components/debugger/dbexec.c
=================================================================== ===================================================================
--- acpica-unix2-20180810.orig/source/components/debugger/dbexec.c --- acpica-unix2-20181003.orig/source/components/debugger/dbexec.c
+++ acpica-unix2-20180810/source/components/debugger/dbexec.c +++ acpica-unix2-20181003/source/components/debugger/dbexec.c
@@ -230,7 +230,7 @@ AcpiDbExecuteMethod ( @@ -230,7 +230,7 @@ AcpiDbExecuteMethod (
ACPI_ERROR ((AE_INFO, ACPI_ERROR ((AE_INFO,
"Possible overflow of internal debugger " "Possible overflow of internal debugger "
@ -111,10 +111,10 @@ Index: acpica-unix2-20180810/source/components/debugger/dbexec.c
} }
} }
Index: acpica-unix2-20180810/source/components/dispatcher/dsmthdat.c Index: acpica-unix2-20181003/source/components/dispatcher/dsmthdat.c
=================================================================== ===================================================================
--- acpica-unix2-20180810.orig/source/components/dispatcher/dsmthdat.c --- acpica-unix2-20181003.orig/source/components/dispatcher/dsmthdat.c
+++ acpica-unix2-20180810/source/components/dispatcher/dsmthdat.c +++ acpica-unix2-20181003/source/components/dispatcher/dsmthdat.c
@@ -291,7 +291,7 @@ AcpiDsMethodDataGetNode ( @@ -291,7 +291,7 @@ AcpiDsMethodDataGetNode (
if (Index > ACPI_METHOD_MAX_LOCAL) if (Index > ACPI_METHOD_MAX_LOCAL)
{ {
@ -133,10 +133,10 @@ Index: acpica-unix2-20180810/source/components/dispatcher/dsmthdat.c
Index, ACPI_METHOD_MAX_ARG)); Index, ACPI_METHOD_MAX_ARG));
return_ACPI_STATUS (AE_AML_INVALID_INDEX); return_ACPI_STATUS (AE_AML_INVALID_INDEX);
} }
Index: acpica-unix2-20180810/source/components/dispatcher/dsutils.c Index: acpica-unix2-20181003/source/components/dispatcher/dsutils.c
=================================================================== ===================================================================
--- acpica-unix2-20180810.orig/source/components/dispatcher/dsutils.c --- acpica-unix2-20181003.orig/source/components/dispatcher/dsutils.c
+++ acpica-unix2-20180810/source/components/dispatcher/dsutils.c +++ acpica-unix2-20181003/source/components/dispatcher/dsutils.c
@@ -788,7 +788,7 @@ AcpiDsCreateOperands ( @@ -788,7 +788,7 @@ AcpiDsCreateOperands (
} }
@ -146,10 +146,10 @@ Index: acpica-unix2-20180810/source/components/dispatcher/dsutils.c
WalkState->NumOperands, ArgCount, Index)); WalkState->NumOperands, ArgCount, Index));
/* Create the interpreter arguments, in reverse order */ /* Create the interpreter arguments, in reverse order */
Index: acpica-unix2-20180810/source/components/dispatcher/dswscope.c Index: acpica-unix2-20181003/source/components/dispatcher/dswscope.c
=================================================================== ===================================================================
--- acpica-unix2-20180810.orig/source/components/dispatcher/dswscope.c --- acpica-unix2-20181003.orig/source/components/dispatcher/dswscope.c
+++ acpica-unix2-20180810/source/components/dispatcher/dswscope.c +++ acpica-unix2-20181003/source/components/dispatcher/dswscope.c
@@ -149,7 +149,7 @@ AcpiDsScopeStackPush ( @@ -149,7 +149,7 @@ AcpiDsScopeStackPush (
WalkState->ScopeDepth++; WalkState->ScopeDepth++;
@ -168,10 +168,10 @@ Index: acpica-unix2-20180810/source/components/dispatcher/dswscope.c
(UINT32) WalkState->ScopeDepth, (UINT32) WalkState->ScopeDepth,
AcpiUtGetNodeName (ScopeInfo->Scope.Node), AcpiUtGetNodeName (ScopeInfo->Scope.Node),
AcpiUtGetTypeName (ScopeInfo->Common.Value))); AcpiUtGetTypeName (ScopeInfo->Common.Value)));
Index: acpica-unix2-20180810/source/components/events/evgpe.c Index: acpica-unix2-20181003/source/components/events/evgpe.c
=================================================================== ===================================================================
--- acpica-unix2-20180810.orig/source/components/events/evgpe.c --- acpica-unix2-20181003.orig/source/components/events/evgpe.c
+++ acpica-unix2-20180810/source/components/events/evgpe.c +++ acpica-unix2-20181003/source/components/events/evgpe.c
@@ -481,7 +481,7 @@ AcpiEvGpeDetect ( @@ -481,7 +481,7 @@ AcpiEvGpeDetect (
"Ignore disabled registers for GPE %02X-%02X: " "Ignore disabled registers for GPE %02X-%02X: "
"RunEnable=%02X, WakeEnable=%02X\n", "RunEnable=%02X, WakeEnable=%02X\n",
@ -181,10 +181,10 @@ Index: acpica-unix2-20180810/source/components/events/evgpe.c
GpeRegisterInfo->EnableForRun, GpeRegisterInfo->EnableForRun,
GpeRegisterInfo->EnableForWake)); GpeRegisterInfo->EnableForWake));
continue; continue;
Index: acpica-unix2-20180810/source/components/executer/exdump.c Index: acpica-unix2-20181003/source/components/executer/exdump.c
=================================================================== ===================================================================
--- acpica-unix2-20180810.orig/source/components/executer/exdump.c --- acpica-unix2-20181003.orig/source/components/executer/exdump.c
+++ acpica-unix2-20180810/source/components/executer/exdump.c +++ acpica-unix2-20181003/source/components/executer/exdump.c
@@ -678,7 +678,7 @@ AcpiExDumpOperand ( @@ -678,7 +678,7 @@ AcpiExDumpOperand (
if (Depth > 0) if (Depth > 0)
{ {
@ -194,10 +194,10 @@ Index: acpica-unix2-20180810/source/components/executer/exdump.c
} }
else else
{ {
Index: acpica-unix2-20180810/source/components/executer/exfldio.c Index: acpica-unix2-20181003/source/components/executer/exfldio.c
=================================================================== ===================================================================
--- acpica-unix2-20180810.orig/source/components/executer/exfldio.c --- acpica-unix2-20181003.orig/source/components/executer/exfldio.c
+++ acpica-unix2-20180810/source/components/executer/exfldio.c +++ acpica-unix2-20181003/source/components/executer/exfldio.c
@@ -681,8 +681,8 @@ AcpiExWriteWithUpdateRule ( @@ -681,8 +681,8 @@ AcpiExWriteWithUpdateRule (
ACPI_ERROR ((AE_INFO, ACPI_ERROR ((AE_INFO,
@ -209,10 +209,10 @@ Index: acpica-unix2-20180810/source/components/executer/exfldio.c
return_ACPI_STATUS (AE_AML_OPERAND_VALUE); return_ACPI_STATUS (AE_AML_OPERAND_VALUE);
} }
} }
Index: acpica-unix2-20180810/source/components/executer/exnames.c Index: acpica-unix2-20181003/source/components/executer/exnames.c
=================================================================== ===================================================================
--- acpica-unix2-20180810.orig/source/components/executer/exnames.c --- acpica-unix2-20181003.orig/source/components/executer/exnames.c
+++ acpica-unix2-20180810/source/components/executer/exnames.c +++ acpica-unix2-20181003/source/components/executer/exnames.c
@@ -237,7 +237,7 @@ AcpiExNameSegment ( @@ -237,7 +237,7 @@ AcpiExNameSegment (
*/ */
ACPI_DEBUG_PRINT ((ACPI_DB_INFO, ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
@ -231,10 +231,10 @@ Index: acpica-unix2-20180810/source/components/executer/exnames.c
} }
*InAmlAddress = ACPI_CAST_PTR (UINT8, AmlAddress); *InAmlAddress = ACPI_CAST_PTR (UINT8, AmlAddress);
Index: acpica-unix2-20180810/source/components/hardware/hwregs.c Index: acpica-unix2-20181003/source/components/hardware/hwregs.c
=================================================================== ===================================================================
--- acpica-unix2-20180810.orig/source/components/hardware/hwregs.c --- acpica-unix2-20181003.orig/source/components/hardware/hwregs.c
+++ acpica-unix2-20180810/source/components/hardware/hwregs.c +++ acpica-unix2-20181003/source/components/hardware/hwregs.c
@@ -460,7 +460,7 @@ AcpiHwClearAcpiStatus ( @@ -460,7 +460,7 @@ AcpiHwClearAcpiStatus (
@ -244,10 +244,10 @@ Index: acpica-unix2-20180810/source/components/hardware/hwregs.c
ACPI_FORMAT_UINT64 (AcpiGbl_XPm1aStatus.Address))); ACPI_FORMAT_UINT64 (AcpiGbl_XPm1aStatus.Address)));
LockFlags = AcpiOsAcquireLock (AcpiGbl_HardwareLock); LockFlags = AcpiOsAcquireLock (AcpiGbl_HardwareLock);
Index: acpica-unix2-20180810/source/components/tables/tbfadt.c Index: acpica-unix2-20181003/source/components/tables/tbfadt.c
=================================================================== ===================================================================
--- acpica-unix2-20180810.orig/source/components/tables/tbfadt.c --- acpica-unix2-20181003.orig/source/components/tables/tbfadt.c
+++ acpica-unix2-20180810/source/components/tables/tbfadt.c +++ acpica-unix2-20181003/source/components/tables/tbfadt.c
@@ -233,7 +233,7 @@ AcpiTbInitGenericAddress ( @@ -233,7 +233,7 @@ AcpiTbInitGenericAddress (
if (!(Flags & ACPI_FADT_GPE_REGISTER)) if (!(Flags & ACPI_FADT_GPE_REGISTER))
{ {
@ -275,10 +275,10 @@ Index: acpica-unix2-20180810/source/components/tables/tbfadt.c
Name, Address32, Name, Address32,
ACPI_FORMAT_UINT64 (Address64->Address), ACPI_FORMAT_UINT64 (Address64->Address),
AcpiGbl_Use32BitFadtAddresses ? 32 : 64)); AcpiGbl_Use32BitFadtAddresses ? 32 : 64));
Index: acpica-unix2-20180810/source/components/tables/tbxfroot.c Index: acpica-unix2-20181003/source/components/tables/tbxfroot.c
=================================================================== ===================================================================
--- acpica-unix2-20180810.orig/source/components/tables/tbxfroot.c --- acpica-unix2-20181003.orig/source/components/tables/tbxfroot.c
+++ acpica-unix2-20180810/source/components/tables/tbxfroot.c +++ acpica-unix2-20181003/source/components/tables/tbxfroot.c
@@ -177,7 +177,7 @@ AcpiFindRootPointer ( @@ -177,7 +177,7 @@ AcpiFindRootPointer (
{ {
ACPI_ERROR ((AE_INFO, ACPI_ERROR ((AE_INFO,
@ -306,10 +306,10 @@ Index: acpica-unix2-20180810/source/components/tables/tbxfroot.c
return_ACPI_STATUS (AE_NO_MEMORY); return_ACPI_STATUS (AE_NO_MEMORY);
} }
Index: acpica-unix2-20180810/source/components/utilities/utownerid.c Index: acpica-unix2-20181003/source/components/utilities/utownerid.c
=================================================================== ===================================================================
--- acpica-unix2-20180810.orig/source/components/utilities/utownerid.c --- acpica-unix2-20181003.orig/source/components/utilities/utownerid.c
+++ acpica-unix2-20180810/source/components/utilities/utownerid.c +++ acpica-unix2-20181003/source/components/utilities/utownerid.c
@@ -237,7 +237,7 @@ AcpiUtReleaseOwnerId ( @@ -237,7 +237,7 @@ AcpiUtReleaseOwnerId (
else else
{ {
@ -319,10 +319,10 @@ Index: acpica-unix2-20180810/source/components/utilities/utownerid.c
} }
(void) AcpiUtReleaseMutex (ACPI_MTX_CACHES); (void) AcpiUtReleaseMutex (ACPI_MTX_CACHES);
Index: acpica-unix2-20180810/source/tools/acpiexec/aemain.c Index: acpica-unix2-20181003/source/tools/acpiexec/aemain.c
=================================================================== ===================================================================
--- acpica-unix2-20180810.orig/source/tools/acpiexec/aemain.c --- acpica-unix2-20181003.orig/source/tools/acpiexec/aemain.c
+++ acpica-unix2-20180810/source/tools/acpiexec/aemain.c +++ acpica-unix2-20181003/source/tools/acpiexec/aemain.c
@@ -211,7 +211,7 @@ AeDoOptions ( @@ -211,7 +211,7 @@ AeDoOptions (
if (strlen (AcpiGbl_Optarg) > (AE_BUFFER_SIZE -1)) if (strlen (AcpiGbl_Optarg) > (AE_BUFFER_SIZE -1))

4
sources
View File

@ -1,2 +1,2 @@
SHA512 (acpica-unix2-20180810.tar.gz) = 2a20a3253ba597b81ddf12c02edd1bb30aa61d7d2f61bb7851517efd6fba8f0a535b681ed5122bfcd52eed64617a36d94bd20015d40e38cbcc5eea7e37383117 SHA512 (acpica-unix2-20181003.tar.gz) = 800a666786712d5bb4cea9340e55567b88445b468e25b082b052813111fb7df77f8af5c48ccfc0cb079dd2b17a839c13d99ee6792dffea8be074bb63fde1faf9
SHA512 (acpitests-unix-20180810.tar.gz) = 36c2527e8d670ccfb9a537b4944cfb8432c9638c1427e3c59f614c2ca43a66089228ecb74392301a07f266870e2d79bf0e2c671c6c7af06a4683bf97ac01ba54 SHA512 (acpitests-unix-20181003.tar.gz) = efd4a0adb08371f8afe725a47aa4fe335250033ae1a37a54157d08ff17de8dd2186e50ea522befcb71ac02d9a52845a825eed15c3bc5da9b825fbc2379120e1d

70
str-trunc-warn.patch
View File

@ -1,30 +1,30 @@
Index: acpica-unix2-20180209/source/compiler/aslanalyze.c Index: acpica-unix2-20181003/source/compiler/aslanalyze.c
=================================================================== ===================================================================
--- acpica-unix2-20180209.orig/source/compiler/aslanalyze.c --- acpica-unix2-20181003.orig/source/compiler/aslanalyze.c
+++ acpica-unix2-20180209/source/compiler/aslanalyze.c +++ acpica-unix2-20181003/source/compiler/aslanalyze.c
@@ -355,11 +355,16 @@ AnCheckMethodReturnValue ( @@ -355,11 +355,16 @@ AnCheckMethodReturnValue (
*/ */
if (ThisNodeBtype != 0) if (ThisNodeBtype != 0)
{ {
- sprintf (MsgBuffer, - sprintf (AslGbl_MsgBuffer,
+ int cnt; + int cnt;
+ char *strp; + char *strp;
+ +
+ cnt = asprintf (&strp, + cnt = asprintf (&strp,
"Method returns [%s], %s operator requires [%s]", "Method returns [%s], %s operator requires [%s]",
StringBuffer, OpInfo->Name, StringBuffer2); AslGbl_StringBuffer, OpInfo->Name, AslGbl_StringBuffer2);
- AslError (ASL_ERROR, ASL_MSG_INVALID_TYPE, ArgOp, MsgBuffer); - AslError (ASL_ERROR, ASL_MSG_INVALID_TYPE, ArgOp, AslGbl_MsgBuffer);
+ AslError (ASL_ERROR, ASL_MSG_INVALID_TYPE, ArgOp, strp); + AslError (ASL_ERROR, ASL_MSG_INVALID_TYPE, ArgOp, strp);
+ if (cnt > 0) + if (cnt > 0)
+ free(strp); + free(strp);
} }
} }
} }
Index: acpica-unix2-20180209/source/compiler/aslpredef.c Index: acpica-unix2-20181003/source/compiler/aslpredef.c
=================================================================== ===================================================================
--- acpica-unix2-20180209.orig/source/compiler/aslpredef.c --- acpica-unix2-20181003.orig/source/compiler/aslpredef.c
+++ acpica-unix2-20180209/source/compiler/aslpredef.c +++ acpica-unix2-20181003/source/compiler/aslpredef.c
@@ -159,14 +159,19 @@ ApCheckForPredefinedMethod ( @@ -159,14 +159,19 @@ ApCheckForPredefinedMethod (
if (MethodInfo->NumReturnNoValue && if (MethodInfo->NumReturnNoValue &&
ThisName->Info.ExpectedBtypes) ThisName->Info.ExpectedBtypes)
@ -32,16 +32,16 @@ Index: acpica-unix2-20180209/source/compiler/aslpredef.c
+ int cnt; + int cnt;
+ char *strp; + char *strp;
+ +
AcpiUtGetExpectedReturnTypes (StringBuffer, AcpiUtGetExpectedReturnTypes (AslGbl_StringBuffer,
ThisName->Info.ExpectedBtypes); ThisName->Info.ExpectedBtypes);
- sprintf (MsgBuffer, "%s required for %4.4s", - sprintf (AslGbl_MsgBuffer, "%s required for %4.4s",
- StringBuffer, ThisName->Info.Name); - AslGbl_StringBuffer, ThisName->Info.Name);
+ cnt = asprintf (&strp, "%s required for %4.4s", + cnt = asprintf (&strp, "%s required for %4.4s",
+ StringBuffer, ThisName->Info.Name); + AslGbl_StringBuffer, ThisName->Info.Name);
AslError (ASL_WARNING, ASL_MSG_RESERVED_RETURN_VALUE, Op, AslError (ASL_WARNING, ASL_MSG_RESERVED_RETURN_VALUE, Op,
- MsgBuffer); - AslGbl_MsgBuffer);
+ strp); + strp);
+ if (cnt > 0) + if (cnt > 0)
+ free(strp); + free(strp);
@ -50,44 +50,44 @@ Index: acpica-unix2-20180209/source/compiler/aslpredef.c
} }
@@ -698,18 +703,26 @@ TypeErrorExit: @@ -698,18 +703,26 @@ TypeErrorExit:
AcpiUtGetExpectedReturnTypes (StringBuffer, ExpectedBtypes); AcpiUtGetExpectedReturnTypes (AslGbl_StringBuffer, ExpectedBtypes);
- if (PackageIndex == ACPI_NOT_PACKAGE_ELEMENT) - if (PackageIndex == ACPI_NOT_PACKAGE_ELEMENT)
- { - {
- sprintf (MsgBuffer, "%4.4s: found %s, %s required", - sprintf (AslGbl_MsgBuffer, "%4.4s: found %s, %s required",
- PredefinedName, TypeName, StringBuffer); - PredefinedName, TypeName, AslGbl_StringBuffer);
- } - }
- else - else
{ {
- sprintf (MsgBuffer, "%4.4s: found %s at index %u, %s required", - sprintf (AslGbl_MsgBuffer, "%4.4s: found %s at index %u, %s required",
- PredefinedName, TypeName, PackageIndex, StringBuffer); - PredefinedName, TypeName, PackageIndex, AslGbl_StringBuffer);
+ int cnt; + int cnt;
+ char *strp; + char *strp;
+ +
+ if (PackageIndex == ACPI_NOT_PACKAGE_ELEMENT) + if (PackageIndex == ACPI_NOT_PACKAGE_ELEMENT)
+ { + {
+ cnt = asprintf (&strp, "%4.4s: found %s, %s required", + cnt = asprintf (&strp, "%4.4s: found %s, %s required",
+ PredefinedName, TypeName, StringBuffer); + PredefinedName, TypeName, AslGbl_StringBuffer);
+ } + }
+ else + else
+ { + {
+ cnt = asprintf (&strp, "%4.4s: found %s at index %u, %s required", + cnt = asprintf (&strp, "%4.4s: found %s at index %u, %s required",
+ PredefinedName, TypeName, PackageIndex, StringBuffer); + PredefinedName, TypeName, PackageIndex, AslGbl_StringBuffer);
+ } + }
+ +
+ AslError (ASL_ERROR, ASL_MSG_RESERVED_OPERAND_TYPE, Op, strp); + AslError (ASL_ERROR, ASL_MSG_RESERVED_OPERAND_TYPE, Op, strp);
+ if (cnt > 0) + if (cnt > 0)
+ free(strp); + free(strp);
} }
- AslError (ASL_ERROR, ASL_MSG_RESERVED_OPERAND_TYPE, Op, MsgBuffer); - AslError (ASL_ERROR, ASL_MSG_RESERVED_OPERAND_TYPE, Op, AslGbl_MsgBuffer);
return (AE_TYPE); return (AE_TYPE);
} }
Index: acpica-unix2-20180209/source/compiler/aslwalks.c Index: acpica-unix2-20181003/source/compiler/aslwalks.c
=================================================================== ===================================================================
--- acpica-unix2-20180209.orig/source/compiler/aslwalks.c --- acpica-unix2-20181003.orig/source/compiler/aslwalks.c
+++ acpica-unix2-20180209/source/compiler/aslwalks.c +++ acpica-unix2-20181003/source/compiler/aslwalks.c
@@ -507,15 +507,19 @@ AnOperandTypecheckWalkEnd ( @@ -507,15 +507,19 @@ AnOperandTypecheckWalkEnd (
else if (!CommonBtypes) else if (!CommonBtypes)
{ {
@ -95,15 +95,15 @@ Index: acpica-unix2-20180209/source/compiler/aslwalks.c
+ int cnt; + int cnt;
+ char *strp; + char *strp;
AnFormatBtype (StringBuffer, ThisNodeBtype); AnFormatBtype (AslGbl_StringBuffer, ThisNodeBtype);
AnFormatBtype (StringBuffer2, RequiredBtypes); AnFormatBtype (AslGbl_StringBuffer2, RequiredBtypes);
- sprintf (MsgBuffer, "[%s] found, %s operator requires [%s]", - sprintf (AslGbl_MsgBuffer, "[%s] found, %s operator requires [%s]",
+ cnt = asprintf (&strp, "[%s] found, %s operator requires [%s]", + cnt = asprintf (&strp, "[%s] found, %s operator requires [%s]",
StringBuffer, OpInfo->Name, StringBuffer2); AslGbl_StringBuffer, OpInfo->Name, AslGbl_StringBuffer2);
AslError (ASL_ERROR, ASL_MSG_INVALID_TYPE, AslError (ASL_ERROR, ASL_MSG_INVALID_TYPE,
- ArgOp, MsgBuffer); - ArgOp, AslGbl_MsgBuffer);
+ ArgOp, strp); + ArgOp, strp);
+ if (cnt > 0) + if (cnt > 0)
+ free(strp); + free(strp);