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

Update to 20181031 upstream, refreshing patches

Browse Source 
Signed-off-by: Al Stone <ahs3@redhat.com>
This commit is contained in:
Al Stone 2018-12-13 15:37:44 -07:00
parent 7e299474d5
commit 9de27dbc7e
6 changed files with 254 additions and 304 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

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

37
acpica-tools.spec
View File

@ -1,5 +1,5 @@
Name: acpica-tools
Version: 20181003
Version: 20181031
Release: 1%{?dist}
Summary: ACPICA tools for the development and debug of ACPI tables
@ -36,14 +36,13 @@ Patch7: ppc64le.patch
Patch8: arm7hl.patch
Patch9: big-endian-v2.patch
Patch10: simple-64bit.patch
Patch11: be-tpm2.patch
Patch12: mips-be-fix.patch
Patch13: cve-2017-13693.patch
Patch14: cve-2017-13694.patch
Patch15: cve-2017-13695.patch
Patch16: str-trunc-warn.patch
Patch17: ptr-cast.patch
Patch18: aslcodegen.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
BuildRequires: bison patchutils flex gcc
@ -104,14 +103,13 @@ gzip -dc %{SOURCE1} | tar -x --strip-components=1 -f -
%patch8 -p1 -b .arm7hl
%patch9 -p1 -b .big-endian-v2
%patch10 -p1 -b .simple-64bit
%patch11 -p1 -b .be-tpm2
%patch12 -p1 -b .mips-be-fix
%patch13 -p1 -b .cve-2017-13693
%patch14 -p1 -b .cve-2017-13694
%patch15 -p1 -b .cve-2017-13695
%patch16 -p1 -b .str-trunc-warn
%patch17 -p1 -b .ptr-cast
%patch18 -p1 -b .aslcodegen
%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
cp -p %{SOURCE2} README.Fedora
cp -p %{SOURCE3} iasl.1
@ -240,6 +238,11 @@ fi
%changelog
* Thu Dec 13 2018 Al Stone <ahs3@redhat.com> - 20181031-1
- Update to 20181031 source tree, including patch refeshes. Closes BZ#1656229
- Refresh patches; folded be-tpm2 into the larger big-endian patch after
cleaning it up a bit
* 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

40
be-tpm2.patch
View File

@ -1,40 +0,0 @@
diff -Naur acpica-unix2-20171110/source/compiler/dttable2.c acpica-unix2-20171110.patched/source/compiler/dttable2.c
--- acpica-unix2-20171110/source/compiler/dttable2.c 2017-11-27 15:20:04.705226128 -0700
+++ acpica-unix2-20171110.patched/source/compiler/dttable2.c 2017-11-27 15:26:29.121734421 -0700
@@ -1797,6 +1797,7 @@
ACPI_TABLE_TPM2 *Tpm2Header;
DT_SUBTABLE *ParentTable;
ACPI_STATUS Status = AE_OK;
+ UINT32 Tmp32;
/* Compile the main table */
@@ -1831,7 +1832,8 @@
/* Subtable type depends on the StartMethod */
- switch (Tpm2Header->StartMethod)
+ ACPI_MOVE_32_TO_32(&Tmp32, &Tpm2Header->StartMethod);
+ switch (Tmp32)
{
case ACPI_TPM2_COMMAND_BUFFER_WITH_ARM_SMC:
@@ -1861,16 +1863,14 @@
case ACPI_TPM2_RESERVED9:
case ACPI_TPM2_RESERVED10:
- AcpiOsPrintf ("\n**** Reserved TPM2 Start Method type 0x%X\n",
- Tpm2Header->StartMethod);
+ AcpiOsPrintf ("\n**** Reserved TPM2 Start Method type 0x%X\n", Tmp32);
Status = AE_ERROR;
break;
case ACPI_TPM2_NOT_ALLOWED:
default:
- AcpiOsPrintf ("\n**** Unknown TPM2 Start Method type 0x%X\n",
- Tpm2Header->StartMethod);
+ AcpiOsPrintf ("\n**** Unknown TPM2 Start Method type 0x%X\n", Tmp32);
Status = AE_ERROR;
break;
}

334
big-endian.patch
View File

@ -23,10 +23,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
source/include/platform/aclinux.h | 8 ++
12 files changed, 487 insertions(+), 283 deletions(-)
Index: acpica-unix2-20181003/source/compiler/aslcodegen.c
Index: acpica-unix2-20181031/source/compiler/aslcodegen.c
===================================================================
--- acpica-unix2-20181003.orig/source/compiler/aslcodegen.c
+++ acpica-unix2-20181003/source/compiler/aslcodegen.c
--- acpica-unix2-20181031.orig/source/compiler/aslcodegen.c
+++ acpica-unix2-20181031/source/compiler/aslcodegen.c
@@ -240,16 +240,12 @@ CgWriteAmlOpcode (
ACPI_PARSE_OBJECT *Op)
{
@ -268,10 +268,10 @@ Index: acpica-unix2-20181003/source/compiler/aslcodegen.c
case AML_RAW_DATA_BUFFER:
Index: acpica-unix2-20181003/source/compiler/aslopcodes.c
Index: acpica-unix2-20181031/source/compiler/aslopcodes.c
===================================================================
--- acpica-unix2-20181003.orig/source/compiler/aslopcodes.c
+++ acpica-unix2-20181003/source/compiler/aslopcodes.c
--- acpica-unix2-20181031.orig/source/compiler/aslopcodes.c
+++ acpica-unix2-20181031/source/compiler/aslopcodes.c
@@ -485,6 +485,7 @@ OpcDoUnicode (
UINT32 i;
UINT8 *AsciiString;
@ -290,10 +290,10 @@ Index: acpica-unix2-20181003/source/compiler/aslopcodes.c
}
/*
Index: acpica-unix2-20181003/source/compiler/aslrestype1.c
Index: acpica-unix2-20181031/source/compiler/aslrestype1.c
===================================================================
--- acpica-unix2-20181003.orig/source/compiler/aslrestype1.c
+++ acpica-unix2-20181003/source/compiler/aslrestype1.c
--- acpica-unix2-20181031.orig/source/compiler/aslrestype1.c
+++ acpica-unix2-20181031/source/compiler/aslrestype1.c
@@ -142,6 +142,11 @@ RsDoMemory24Descriptor (
ACPI_PARSE_OBJECT *LengthOp = NULL;
ASL_RESOURCE_NODE *Rnode;
@ -490,10 +490,10 @@ Index: acpica-unix2-20181003/source/compiler/aslrestype1.c
RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH,
CurrentByteOffset + ASL_RESDESC_OFFSET (FixedMemory32.AddressLength));
break;
Index: acpica-unix2-20181003/source/compiler/aslrestype1i.c
Index: acpica-unix2-20181031/source/compiler/aslrestype1i.c
===================================================================
--- acpica-unix2-20181003.orig/source/compiler/aslrestype1i.c
+++ acpica-unix2-20181003/source/compiler/aslrestype1i.c
--- acpica-unix2-20181031.orig/source/compiler/aslrestype1i.c
+++ acpica-unix2-20181031/source/compiler/aslrestype1i.c
@@ -198,6 +198,8 @@ RsDoFixedDmaDescriptor (
ACPI_PARSE_OBJECT *InitializerOp;
ASL_RESOURCE_NODE *Rnode;
@ -630,10 +630,10 @@ Index: acpica-unix2-20181003/source/compiler/aslrestype1i.c
+ ACPI_MOVE_16_TO_16(&Descriptor->Irq.IrqMask, &IrqMask);
return (Rnode);
}
Index: acpica-unix2-20181003/source/compiler/aslrestype2.c
Index: acpica-unix2-20181031/source/compiler/aslrestype2.c
===================================================================
--- acpica-unix2-20181003.orig/source/compiler/aslrestype2.c
+++ acpica-unix2-20181003/source/compiler/aslrestype2.c
--- acpica-unix2-20181031.orig/source/compiler/aslrestype2.c
+++ acpica-unix2-20181031/source/compiler/aslrestype2.c
@@ -76,6 +76,7 @@ RsDoGeneralRegisterDescriptor (
ACPI_PARSE_OBJECT *InitializerOp;
ASL_RESOURCE_NODE *Rnode;
@ -774,10 +774,10 @@ Index: acpica-unix2-20181003/source/compiler/aslrestype2.c
/* Point to end-of-descriptor for vendor data */
Index: acpica-unix2-20181003/source/compiler/aslrestype2d.c
Index: acpica-unix2-20181031/source/compiler/aslrestype2d.c
===================================================================
--- acpica-unix2-20181003.orig/source/compiler/aslrestype2d.c
+++ acpica-unix2-20181003/source/compiler/aslrestype2d.c
--- acpica-unix2-20181031.orig/source/compiler/aslrestype2d.c
+++ acpica-unix2-20181031/source/compiler/aslrestype2d.c
@@ -79,7 +79,13 @@ RsDoDwordIoDescriptor (
ACPI_PARSE_OBJECT *GranOp = NULL;
ASL_RESOURCE_NODE *Rnode;
@ -1133,10 +1133,10 @@ Index: acpica-unix2-20181003/source/compiler/aslrestype2d.c
Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS32) +
OptionIndex + StringLength;
return (Rnode);
Index: acpica-unix2-20181003/source/compiler/aslrestype2e.c
Index: acpica-unix2-20181031/source/compiler/aslrestype2e.c
===================================================================
--- acpica-unix2-20181003.orig/source/compiler/aslrestype2e.c
+++ acpica-unix2-20181003/source/compiler/aslrestype2e.c
--- acpica-unix2-20181031.orig/source/compiler/aslrestype2e.c
+++ acpica-unix2-20181031/source/compiler/aslrestype2e.c
@@ -78,6 +78,13 @@ RsDoExtendedIoDescriptor (
ACPI_PARSE_OBJECT *GranOp = NULL;
ASL_RESOURCE_NODE *Rnode;
@ -1242,10 +1242,10 @@ Index: acpica-unix2-20181003/source/compiler/aslrestype2e.c
Rnode->BufferLength = sizeof (AML_RESOURCE_EXTENDED_ADDRESS64) +
StringLength;
return (Rnode);
Index: acpica-unix2-20181003/source/compiler/aslrestype2q.c
Index: acpica-unix2-20181031/source/compiler/aslrestype2q.c
===================================================================
--- acpica-unix2-20181003.orig/source/compiler/aslrestype2q.c
+++ acpica-unix2-20181003/source/compiler/aslrestype2q.c
--- acpica-unix2-20181031.orig/source/compiler/aslrestype2q.c
+++ acpica-unix2-20181031/source/compiler/aslrestype2q.c
@@ -80,7 +80,13 @@ RsDoQwordIoDescriptor (
ASL_RESOURCE_NODE *Rnode;
UINT8 *OptionalFields;
@ -1584,10 +1584,10 @@ Index: acpica-unix2-20181003/source/compiler/aslrestype2q.c
Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS64) +
OptionIndex + StringLength;
return (Rnode);
Index: acpica-unix2-20181003/source/compiler/aslrestype2s.c
Index: acpica-unix2-20181031/source/compiler/aslrestype2s.c
===================================================================
--- acpica-unix2-20181003.orig/source/compiler/aslrestype2s.c
+++ acpica-unix2-20181003/source/compiler/aslrestype2s.c
--- acpica-unix2-20181031.orig/source/compiler/aslrestype2s.c
+++ acpica-unix2-20181031/source/compiler/aslrestype2s.c
@@ -340,9 +340,14 @@ RsDoGpioIntDescriptor (
UINT16 VendorLength;
UINT16 InterruptLength;
@ -2053,10 +2053,10 @@ Index: acpica-unix2-20181003/source/compiler/aslrestype2s.c
MpSaveSerialInfo (Info->MappingOp, Descriptor, ResourceSource);
return (Rnode);
}
Index: acpica-unix2-20181003/source/compiler/aslrestype2w.c
Index: acpica-unix2-20181031/source/compiler/aslrestype2w.c
===================================================================
--- acpica-unix2-20181003.orig/source/compiler/aslrestype2w.c
+++ acpica-unix2-20181003/source/compiler/aslrestype2w.c
--- acpica-unix2-20181031.orig/source/compiler/aslrestype2w.c
+++ acpica-unix2-20181031/source/compiler/aslrestype2w.c
@@ -81,6 +81,12 @@ RsDoWordIoDescriptor (
UINT8 *OptionalFields;
UINT16 StringLength = 0;
@ -2400,10 +2400,10 @@ Index: acpica-unix2-20181003/source/compiler/aslrestype2w.c
Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS16) +
OptionIndex + StringLength;
return (Rnode);
Index: acpica-unix2-20181003/source/include/acmacros.h
Index: acpica-unix2-20181031/source/include/acmacros.h
===================================================================
--- acpica-unix2-20181003.orig/source/include/acmacros.h
+++ acpica-unix2-20181003/source/include/acmacros.h
--- acpica-unix2-20181031.orig/source/include/acmacros.h
+++ acpica-unix2-20181031/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-unix2-20181003/source/include/acmacros.h
#define ACPI_MOVE_32_TO_16(d, s) ACPI_MOVE_16_TO_16(d, s) /* Truncate to 16 */
Index: acpica-unix2-20181003/source/include/platform/aclinux.h
Index: acpica-unix2-20181031/source/include/platform/aclinux.h
===================================================================
--- acpica-unix2-20181003.orig/source/include/platform/aclinux.h
+++ acpica-unix2-20181003/source/include/platform/aclinux.h
--- acpica-unix2-20181031.orig/source/include/platform/aclinux.h
+++ acpica-unix2-20181031/source/include/platform/aclinux.h
@@ -193,6 +193,7 @@
#ifdef ACPI_USE_STANDARD_HEADERS
@ -2505,10 +2505,10 @@ Index: acpica-unix2-20181003/source/include/platform/aclinux.h
#endif /* __KERNEL__ */
#endif /* __ACLINUX_H__ */
Index: acpica-unix2-20181003/source/compiler/aslanalyze.c
Index: acpica-unix2-20181031/source/compiler/aslanalyze.c
===================================================================
--- acpica-unix2-20181003.orig/source/compiler/aslanalyze.c
+++ acpica-unix2-20181003/source/compiler/aslanalyze.c
--- acpica-unix2-20181031.orig/source/compiler/aslanalyze.c
+++ acpica-unix2-20181031/source/compiler/aslanalyze.c
@@ -461,7 +461,7 @@ ApCheckForGpeNameConflict (
/* Need a null-terminated string version of NameSeg */
@ -2527,10 +2527,10 @@ Index: acpica-unix2-20181003/source/compiler/aslanalyze.c
/* Inject opposite letter ("L" versus "E") */
Index: acpica-unix2-20181003/source/compiler/asllookup.c
Index: acpica-unix2-20181031/source/compiler/asllookup.c
===================================================================
--- acpica-unix2-20181003.orig/source/compiler/asllookup.c
+++ acpica-unix2-20181003/source/compiler/asllookup.c
--- acpica-unix2-20181031.orig/source/compiler/asllookup.c
+++ acpica-unix2-20181031/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-unix2-20181003/source/compiler/asllookup.c
AslError (ASL_REMARK, ASL_MSG_NOT_REFERENCED,
LkGetNameOp (Node->Op), AslGbl_MsgBuffer);
return (AE_OK);
Index: acpica-unix2-20181003/source/compiler/aslmain.c
Index: acpica-unix2-20181031/source/compiler/aslmain.c
===================================================================
--- acpica-unix2-20181003.orig/source/compiler/aslmain.c
+++ acpica-unix2-20181003/source/compiler/aslmain.c
--- acpica-unix2-20181031.orig/source/compiler/aslmain.c
+++ acpica-unix2-20181031/source/compiler/aslmain.c
@@ -101,18 +101,6 @@ main (
signal (SIGINT, AslSignalHandler);
@ -2584,10 +2584,10 @@ Index: acpica-unix2-20181003/source/compiler/aslmain.c
AcpiOsInitialize ();
ACPI_DEBUG_INITIALIZE (); /* For debug version only */
Index: acpica-unix2-20181003/source/common/acfileio.c
Index: acpica-unix2-20181031/source/common/acfileio.c
===================================================================
--- acpica-unix2-20181003.orig/source/common/acfileio.c
+++ acpica-unix2-20181003/source/common/acfileio.c
--- acpica-unix2-20181031.orig/source/common/acfileio.c
+++ acpica-unix2-20181031/source/common/acfileio.c
@@ -280,6 +280,7 @@ AcGetOneTableFromFile (
ACPI_TABLE_HEADER *Table;
INT32 Count;
@ -2654,10 +2654,10 @@ Index: acpica-unix2-20181003/source/common/acfileio.c
(UINT32) (FileSize - TableOffset));
return (AE_BAD_HEADER);
}
Index: acpica-unix2-20181003/source/common/dmtable.c
Index: acpica-unix2-20181031/source/common/dmtable.c
===================================================================
--- acpica-unix2-20181003.orig/source/common/dmtable.c
+++ acpica-unix2-20181003/source/common/dmtable.c
--- acpica-unix2-20181031.orig/source/common/dmtable.c
+++ acpica-unix2-20181031/source/common/dmtable.c
@@ -550,7 +550,7 @@ AcpiDmDumpDataTable (
*/
if (ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_FACS))
@ -2756,10 +2756,10 @@ Index: acpica-unix2-20181003/source/common/dmtable.c
AcpiDmNfitSubnames[Temp16]);
break;
Index: acpica-unix2-20181003/source/common/dmtables.c
Index: acpica-unix2-20181031/source/common/dmtables.c
===================================================================
--- acpica-unix2-20181003.orig/source/common/dmtables.c
+++ acpica-unix2-20181003/source/common/dmtables.c
--- acpica-unix2-20181031.orig/source/common/dmtables.c
+++ acpica-unix2-20181031/source/common/dmtables.c
@@ -142,7 +142,9 @@ AdCreateTableHeader (
ACPI_TABLE_HEADER *Table)
{
@ -2825,10 +2825,10 @@ Index: acpica-unix2-20181003/source/common/dmtables.c
AmlStart = ((UINT8 *) Table + sizeof (ACPI_TABLE_HEADER));
ASL_CV_INIT_FILETREE(Table, AmlStart, AmlLength);
Index: acpica-unix2-20181003/source/common/dmtbdump.c
Index: acpica-unix2-20181031/source/common/dmtbdump.c
===================================================================
--- acpica-unix2-20181003.orig/source/common/dmtbdump.c
+++ acpica-unix2-20181003/source/common/dmtbdump.c
--- acpica-unix2-20181031.orig/source/common/dmtbdump.c
+++ acpica-unix2-20181031/source/common/dmtbdump.c
@@ -277,6 +277,8 @@ AcpiDmDumpRsdt (
UINT32 Entries;
UINT32 Offset;
@ -2987,10 +2987,10 @@ Index: acpica-unix2-20181003/source/common/dmtbdump.c
- Revision, Length, ExpectedLength);
+ Revision, Tmp32, ExpectedLength);
}
Index: acpica-unix2-20181003/source/common/dmtbdump1.c
Index: acpica-unix2-20181031/source/common/dmtbdump1.c
===================================================================
--- acpica-unix2-20181003.orig/source/common/dmtbdump1.c
+++ acpica-unix2-20181003/source/common/dmtbdump1.c
--- acpica-unix2-20181031.orig/source/common/dmtbdump1.c
+++ acpica-unix2-20181031/source/common/dmtbdump1.c
@@ -79,17 +79,21 @@ AcpiDmDumpAsf (
UINT32 DataOffset = 0;
UINT32 i;
@ -3624,10 +3624,10 @@ Index: acpica-unix2-20181003/source/common/dmtbdump1.c
{
case ACPI_HEST_TYPE_IA32_CHECK:
Index: acpica-unix2-20181003/source/common/dmtbdump2.c
Index: acpica-unix2-20181031/source/common/dmtbdump2.c
===================================================================
--- acpica-unix2-20181003.orig/source/common/dmtbdump2.c
+++ acpica-unix2-20181003/source/common/dmtbdump2.c
--- acpica-unix2-20181031.orig/source/common/dmtbdump2.c
+++ acpica-unix2-20181031/source/common/dmtbdump2.c
@@ -75,15 +75,21 @@ AcpiDmDumpIort (
ACPI_IORT_SMMU *IortSmmu = NULL;
UINT32 Offset;
@ -4510,10 +4510,10 @@ Index: acpica-unix2-20181003/source/common/dmtbdump2.c
Subtable->Length, InfoTable);
if (ACPI_FAILURE (Status))
{
Index: acpica-unix2-20181003/source/common/dmtbdump3.c
Index: acpica-unix2-20181031/source/common/dmtbdump3.c
===================================================================
--- acpica-unix2-20181003.orig/source/common/dmtbdump3.c
+++ acpica-unix2-20181003/source/common/dmtbdump3.c
--- acpica-unix2-20181031.orig/source/common/dmtbdump3.c
+++ acpica-unix2-20181031/source/common/dmtbdump3.c
@@ -68,9 +68,11 @@ void
AcpiDmDumpSlic (
ACPI_TABLE_HEADER *Table)
@ -4672,7 +4672,7 @@ Index: acpica-unix2-20181003/source/common/dmtbdump3.c
break;
default:
@@ -455,11 +468,13 @@ AcpiDmDumpVrtc (
@@ -507,11 +520,13 @@ AcpiDmDumpVrtc (
ACPI_STATUS Status;
UINT32 Offset = sizeof (ACPI_TABLE_VRTC);
ACPI_VRTC_ENTRY *Subtable;
@ -4687,7 +4687,7 @@ Index: acpica-unix2-20181003/source/common/dmtbdump3.c
if (ACPI_FAILURE (Status))
{
return;
@@ -468,12 +483,12 @@ AcpiDmDumpVrtc (
@@ -520,12 +535,12 @@ AcpiDmDumpVrtc (
/* Subtables */
Subtable = ACPI_ADD_PTR (ACPI_VRTC_ENTRY, Table, Offset);
@ -4702,7 +4702,7 @@ Index: acpica-unix2-20181003/source/common/dmtbdump3.c
sizeof (ACPI_VRTC_ENTRY), AcpiDmTableInfoVrtc0);
if (ACPI_FAILURE (Status))
{
@@ -508,11 +523,13 @@ AcpiDmDumpWdat (
@@ -560,11 +575,13 @@ AcpiDmDumpWdat (
ACPI_STATUS Status;
UINT32 Offset = sizeof (ACPI_TABLE_WDAT);
ACPI_WDAT_ENTRY *Subtable;
@ -4717,7 +4717,7 @@ Index: acpica-unix2-20181003/source/common/dmtbdump3.c
if (ACPI_FAILURE (Status))
{
return;
@@ -521,12 +538,12 @@ AcpiDmDumpWdat (
@@ -573,12 +590,12 @@ AcpiDmDumpWdat (
/* Subtables */
Subtable = ACPI_ADD_PTR (ACPI_WDAT_ENTRY, Table, Offset);
@ -4732,7 +4732,7 @@ Index: acpica-unix2-20181003/source/common/dmtbdump3.c
sizeof (ACPI_WDAT_ENTRY), AcpiDmTableInfoWdat0);
if (ACPI_FAILURE (Status))
{
@@ -561,12 +578,13 @@ AcpiDmDumpWpbt (
@@ -613,12 +630,13 @@ AcpiDmDumpWpbt (
{
ACPI_STATUS Status;
ACPI_TABLE_WPBT *Subtable;
@ -4747,7 +4747,7 @@ Index: acpica-unix2-20181003/source/common/dmtbdump3.c
Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoWpbt);
if (ACPI_FAILURE (Status))
{
@@ -576,10 +594,10 @@ AcpiDmDumpWpbt (
@@ -628,10 +646,10 @@ AcpiDmDumpWpbt (
/* Extract the arguments buffer length from the main table */
Subtable = ACPI_CAST_PTR (ACPI_TABLE_WPBT, Table);
@ -4760,10 +4760,10 @@ Index: acpica-unix2-20181003/source/common/dmtbdump3.c
+ (void) AcpiDmDumpTable (Length, 0, Table, ArgumentsLength,
AcpiDmTableInfoWpbt0);
}
Index: acpica-unix2-20181003/source/compiler/dtfield.c
Index: acpica-unix2-20181031/source/compiler/dtfield.c
===================================================================
--- acpica-unix2-20181003.orig/source/compiler/dtfield.c
+++ acpica-unix2-20181003/source/compiler/dtfield.c
--- acpica-unix2-20181031.orig/source/compiler/dtfield.c
+++ acpica-unix2-20181031/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-unix2-20181003/source/compiler/dtfield.c
return;
}
Index: acpica-unix2-20181003/source/compiler/dtsubtable.c
Index: acpica-unix2-20181031/source/compiler/dtsubtable.c
===================================================================
--- acpica-unix2-20181003.orig/source/compiler/dtsubtable.c
+++ acpica-unix2-20181003/source/compiler/dtsubtable.c
--- acpica-unix2-20181031.orig/source/compiler/dtsubtable.c
+++ acpica-unix2-20181031/source/compiler/dtsubtable.c
@@ -378,6 +378,21 @@ DtSetSubtableLength (
return;
}
@ -4821,10 +4821,10 @@ Index: acpica-unix2-20181003/source/compiler/dtsubtable.c
+ Subtable->SizeOfLengthField);
+ }
}
Index: acpica-unix2-20181003/source/compiler/dttable1.c
Index: acpica-unix2-20181031/source/compiler/dttable1.c
===================================================================
--- acpica-unix2-20181003.orig/source/compiler/dttable1.c
+++ acpica-unix2-20181003/source/compiler/dttable1.c
--- acpica-unix2-20181031.orig/source/compiler/dttable1.c
+++ acpica-unix2-20181031/source/compiler/dttable1.c
@@ -281,6 +281,8 @@ DtCompileCsrt (
DT_FIELD **PFieldList = (DT_FIELD **) List;
UINT32 DescriptorCount;
@ -5196,10 +5196,10 @@ Index: acpica-unix2-20181003/source/compiler/dttable1.c
return (AE_OK);
}
Index: acpica-unix2-20181003/source/compiler/dttable2.c
Index: acpica-unix2-20181031/source/compiler/dttable2.c
===================================================================
--- acpica-unix2-20181003.orig/source/compiler/dttable2.c
+++ acpica-unix2-20181003/source/compiler/dttable2.c
--- acpica-unix2-20181031.orig/source/compiler/dttable2.c
+++ acpica-unix2-20181031/source/compiler/dttable2.c
@@ -345,7 +345,7 @@ DtCompileMpst (
DtPushSubtable (Subtable);
@ -5328,7 +5328,43 @@ Index: acpica-unix2-20181003/source/compiler/dttable2.c
{
case ACPI_TCPA_CLIENT_TABLE:
@@ -2039,6 +2047,9 @@ DtCompileWpbt (
@@ -1788,6 +1796,7 @@ DtCompileTpm2Rev3 (
ACPI_TABLE_TPM23 *Tpm23Header;
DT_SUBTABLE *ParentTable;
ACPI_STATUS Status = AE_OK;
+ UINT32 Tmp32;
Status = DtCompileTable (PFieldList, AcpiDmTableInfoTpm23,
@@ -1799,7 +1808,8 @@ DtCompileTpm2Rev3 (
/* Subtable type depends on the StartMethod */
- switch (Tpm23Header->StartMethod)
+ ACPI_MOVE_32_TO_32(&Tmp32, &Tpm23Header->StartMethod);
+ switch (Tmp32)
{
case ACPI_TPM23_ACPI_START_METHOD:
@@ -1846,6 +1856,7 @@ DtCompileTpm2 (
DT_SUBTABLE *ParentTable;
ACPI_STATUS Status = AE_OK;
ACPI_TABLE_HEADER *Header;
+ UINT32 Tmp32;
ParentTable = DtPeekSubtable ();
@@ -1889,7 +1900,8 @@ DtCompileTpm2 (
/* Subtable type depends on the StartMethod */
- switch (Tpm2Header->StartMethod)
+ ACPI_MOVE_32_TO_32(&Tmp32, &Tpm2Header->StartMethod);
+ switch (Tmp32)
{
case ACPI_TPM2_COMMAND_BUFFER_WITH_ARM_SMC:
@@ -2105,6 +2117,9 @@ DtCompileWpbt (
ACPI_TABLE_WPBT *Table;
ACPI_STATUS Status;
UINT16 Length;
@ -5338,7 +5374,7 @@ Index: acpica-unix2-20181003/source/compiler/dttable2.c
/* Compile the main table */
@@ -2066,7 +2077,16 @@ DtCompileWpbt (
@@ -2132,7 +2147,16 @@ DtCompileWpbt (
Length = (UINT16) Subtable->TotalLength;
Table = ACPI_CAST_PTR (ACPI_TABLE_WPBT, ParentTable->Buffer);
@ -5356,10 +5392,10 @@ Index: acpica-unix2-20181003/source/compiler/dttable2.c
ParentTable = DtPeekSubtable ();
DtInsertSubtable (ParentTable, Subtable);
Index: acpica-unix2-20181003/source/components/disassembler/dmbuffer.c
Index: acpica-unix2-20181031/source/components/disassembler/dmbuffer.c
===================================================================
--- acpica-unix2-20181003.orig/source/components/disassembler/dmbuffer.c
+++ acpica-unix2-20181003/source/components/disassembler/dmbuffer.c
--- acpica-unix2-20181031.orig/source/components/disassembler/dmbuffer.c
+++ acpica-unix2-20181031/source/components/disassembler/dmbuffer.c
@@ -204,7 +204,7 @@ AcpiDmByteList (
@ -5435,10 +5471,10 @@ Index: acpica-unix2-20181003/source/components/disassembler/dmbuffer.c
NextOp = AcpiPsGetDepthNext (NULL, Op);
if (!NextOp)
Index: acpica-unix2-20181003/source/components/disassembler/dmopcode.c
Index: acpica-unix2-20181031/source/components/disassembler/dmopcode.c
===================================================================
--- acpica-unix2-20181003.orig/source/components/disassembler/dmopcode.c
+++ acpica-unix2-20181003/source/components/disassembler/dmopcode.c
--- acpica-unix2-20181031.orig/source/components/disassembler/dmopcode.c
+++ acpica-unix2-20181031/source/components/disassembler/dmopcode.c
@@ -244,6 +244,7 @@ AcpiDmPredefinedDescription (
char *NameString;
int LastCharIsDigit;
@ -5509,10 +5545,10 @@ Index: acpica-unix2-20181003/source/components/disassembler/dmopcode.c
Info->Level += 1;
Info->MappingOp = Op;
Index: acpica-unix2-20181003/source/components/disassembler/dmresrcl.c
Index: acpica-unix2-20181031/source/components/disassembler/dmresrcl.c
===================================================================
--- acpica-unix2-20181003.orig/source/components/disassembler/dmresrcl.c
+++ acpica-unix2-20181003/source/components/disassembler/dmresrcl.c
--- acpica-unix2-20181031.orig/source/components/disassembler/dmresrcl.c
+++ acpica-unix2-20181031/source/components/disassembler/dmresrcl.c
@@ -141,7 +141,8 @@ AcpiDmMemoryFields (
UINT32 Level)
{
@ -5661,10 +5697,10 @@ Index: acpica-unix2-20181003/source/components/disassembler/dmresrcl.c
}
AcpiDmIndent (Level);
Index: acpica-unix2-20181003/source/components/disassembler/dmresrcl2.c
Index: acpica-unix2-20181031/source/components/disassembler/dmresrcl2.c
===================================================================
--- acpica-unix2-20181003.orig/source/components/disassembler/dmresrcl2.c
+++ acpica-unix2-20181003/source/components/disassembler/dmresrcl2.c
--- acpica-unix2-20181031.orig/source/components/disassembler/dmresrcl2.c
+++ acpica-unix2-20181031/source/components/disassembler/dmresrcl2.c
@@ -191,22 +191,24 @@ AcpiDmGpioCommon (
char *DeviceName = NULL;
UINT32 PinCount;
@ -5888,10 +5924,10 @@ Index: acpica-unix2-20181003/source/components/disassembler/dmresrcl2.c
DeviceName = ACPI_ADD_PTR (char, Resource, ResourceSourceOffset);
AcpiUtPrintString (DeviceName, ACPI_UINT16_MAX);
Index: acpica-unix2-20181003/source/components/disassembler/dmresrcs.c
Index: acpica-unix2-20181031/source/components/disassembler/dmresrcs.c
===================================================================
--- acpica-unix2-20181003.orig/source/components/disassembler/dmresrcs.c
+++ acpica-unix2-20181003/source/components/disassembler/dmresrcs.c
--- acpica-unix2-20181031.orig/source/components/disassembler/dmresrcs.c
+++ acpica-unix2-20181031/source/components/disassembler/dmresrcs.c
@@ -72,6 +72,7 @@ AcpiDmIrqDescriptor (
UINT32 Length,
UINT32 Level)
@ -5948,10 +5984,10 @@ Index: acpica-unix2-20181003/source/components/disassembler/dmresrcs.c
AcpiDmIndent (Level + 1);
AcpiDmDumpInteger8 (Resource->FixedIo.AddressLength, "Length");
Index: acpica-unix2-20181003/source/components/dispatcher/dsfield.c
Index: acpica-unix2-20181031/source/components/dispatcher/dsfield.c
===================================================================
--- acpica-unix2-20181003.orig/source/components/dispatcher/dsfield.c
+++ acpica-unix2-20181003/source/components/dispatcher/dsfield.c
--- acpica-unix2-20181031.orig/source/components/dispatcher/dsfield.c
+++ acpica-unix2-20181031/source/components/dispatcher/dsfield.c
@@ -325,6 +325,7 @@ AcpiDsGetFieldNames (
ACPI_STATUS Status;
UINT64 Position;
@ -5996,10 +6032,10 @@ Index: acpica-unix2-20181003/source/components/dispatcher/dsfield.c
if (ACPI_FAILURE (Status))
{
ACPI_ERROR_NAMESPACE (WalkState->ScopeInfo,
Index: acpica-unix2-20181003/source/components/events/evgpeblk.c
Index: acpica-unix2-20181031/source/components/events/evgpeblk.c
===================================================================
--- acpica-unix2-20181003.orig/source/components/events/evgpeblk.c
+++ acpica-unix2-20181003/source/components/events/evgpeblk.c
--- acpica-unix2-20181031.orig/source/components/events/evgpeblk.c
+++ acpica-unix2-20181031/source/components/events/evgpeblk.c
@@ -376,6 +376,7 @@ AcpiEvCreateGpeBlock (
ACPI_STATUS Status;
ACPI_GPE_BLOCK_INFO *GpeBlock;
@ -6032,10 +6068,10 @@ Index: acpica-unix2-20181003/source/components/events/evgpeblk.c
InterruptNumber == AcpiGbl_FADT.SciInterrupt ? " (SCI)" : ""));
/* Update global count of currently available GPEs */
Index: acpica-unix2-20181003/source/components/hardware/hwregs.c
Index: acpica-unix2-20181031/source/components/hardware/hwregs.c
===================================================================
--- acpica-unix2-20181003.orig/source/components/hardware/hwregs.c
+++ acpica-unix2-20181003/source/components/hardware/hwregs.c
--- acpica-unix2-20181031.orig/source/components/hardware/hwregs.c
+++ acpica-unix2-20181031/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.
@ -6045,10 +6081,10 @@ Index: acpica-unix2-20181003/source/components/hardware/hwregs.c
if (!(*Address))
{
return (AE_BAD_ADDRESS);
Index: acpica-unix2-20181003/source/components/hardware/hwvalid.c
Index: acpica-unix2-20181031/source/components/hardware/hwvalid.c
===================================================================
--- acpica-unix2-20181003.orig/source/components/hardware/hwvalid.c
+++ acpica-unix2-20181003/source/components/hardware/hwvalid.c
--- acpica-unix2-20181031.orig/source/components/hardware/hwvalid.c
+++ acpica-unix2-20181031/source/components/hardware/hwvalid.c
@@ -135,6 +135,8 @@ AcpiHwValidateIoRequest (
UINT32 ByteWidth;
ACPI_IO_ADDRESS LastAddress;
@ -6070,19 +6106,19 @@ Index: acpica-unix2-20181003/source/components/hardware/hwvalid.c
{
ACPI_ERROR ((AE_INFO,
"Illegal I/O port address/length above 64K: %8.8X%8.8X/0x%X",
Index: acpica-unix2-20181003/source/components/namespace/nsaccess.c
Index: acpica-unix2-20181031/source/components/namespace/nsaccess.c
===================================================================
--- acpica-unix2-20181003.orig/source/components/namespace/nsaccess.c
+++ acpica-unix2-20181003/source/components/namespace/nsaccess.c
@@ -313,6 +313,7 @@ AcpiNsLookup (
ACPI_OBJECT_TYPE ThisSearchType;
--- acpica-unix2-20181031.orig/source/components/namespace/nsaccess.c
+++ acpica-unix2-20181031/source/components/namespace/nsaccess.c
@@ -314,6 +314,7 @@ AcpiNsLookup (
UINT32 SearchParentFlag = ACPI_NS_SEARCH_PARENT;
UINT32 LocalFlags;
ACPI_INTERPRETER_MODE LocalInterpreterMode;
+ UINT32 Tmp32;
ACPI_FUNCTION_TRACE (NsLookup);
@@ -704,9 +705,10 @@ AcpiNsLookup (
@@ -723,9 +724,10 @@ AcpiNsLookup (
{
/* Complain about a type mismatch */
@ -6094,10 +6130,10 @@ Index: acpica-unix2-20181003/source/components/namespace/nsaccess.c
AcpiUtGetTypeName (ThisNode->Type),
AcpiUtGetTypeName (TypeToCheckFor)));
}
Index: acpica-unix2-20181003/source/components/namespace/nsparse.c
Index: acpica-unix2-20181031/source/components/namespace/nsparse.c
===================================================================
--- acpica-unix2-20181003.orig/source/components/namespace/nsparse.c
+++ acpica-unix2-20181003/source/components/namespace/nsparse.c
--- acpica-unix2-20181031.orig/source/components/namespace/nsparse.c
+++ acpica-unix2-20181031/source/components/namespace/nsparse.c
@@ -206,13 +206,14 @@ AcpiNsOneCompleteParse (
/* Table must consist of at least a complete header */
@ -6115,10 +6151,10 @@ Index: acpica-unix2-20181003/source/components/namespace/nsparse.c
Status = AcpiTbGetOwnerId (TableIndex, &OwnerId);
if (ACPI_FAILURE (Status))
Index: acpica-unix2-20181003/source/components/tables/tbdata.c
Index: acpica-unix2-20181031/source/components/tables/tbdata.c
===================================================================
--- acpica-unix2-20181003.orig/source/components/tables/tbdata.c
+++ acpica-unix2-20181003/source/components/tables/tbdata.c
--- acpica-unix2-20181031.orig/source/components/tables/tbdata.c
+++ acpica-unix2-20181031/source/components/tables/tbdata.c
@@ -552,6 +552,7 @@ AcpiTbVerifyTempTable (
UINT32 *TableIndex)
{
@ -6137,10 +6173,10 @@ Index: acpica-unix2-20181003/source/components/tables/tbdata.c
if (ACPI_FAILURE (Status))
{
ACPI_EXCEPTION ((AE_INFO, AE_NO_MEMORY,
Index: acpica-unix2-20181003/source/components/tables/tbfadt.c
Index: acpica-unix2-20181031/source/components/tables/tbfadt.c
===================================================================
--- acpica-unix2-20181003.orig/source/components/tables/tbfadt.c
+++ acpica-unix2-20181003/source/components/tables/tbfadt.c
--- acpica-unix2-20181031.orig/source/components/tables/tbfadt.c
+++ acpica-unix2-20181031/source/components/tables/tbfadt.c
@@ -424,18 +424,20 @@ AcpiTbCreateLocalFadt (
ACPI_TABLE_HEADER *Table,
UINT32 Length)
@ -6252,10 +6288,10 @@ Index: acpica-unix2-20181003/source/components/tables/tbfadt.c
"PmRegisters", 0);
}
}
Index: acpica-unix2-20181003/source/components/tables/tbfind.c
Index: acpica-unix2-20181031/source/components/tables/tbfind.c
===================================================================
--- acpica-unix2-20181003.orig/source/components/tables/tbfind.c
+++ acpica-unix2-20181003/source/components/tables/tbfind.c
--- acpica-unix2-20181031.orig/source/components/tables/tbfind.c
+++ acpica-unix2-20181031/source/components/tables/tbfind.c
@@ -108,8 +108,11 @@ AcpiTbFindTable (
(void) AcpiUtAcquireMutex (ACPI_MTX_TABLES);
for (i = 0; i < AcpiGbl_RootTableList.CurrentTableCount; ++i)
@ -6269,10 +6305,10 @@ Index: acpica-unix2-20181003/source/components/tables/tbfind.c
{
/* Not the requested table */
Index: acpica-unix2-20181003/source/components/tables/tbprint.c
Index: acpica-unix2-20181031/source/components/tables/tbprint.c
===================================================================
--- acpica-unix2-20181003.orig/source/components/tables/tbprint.c
+++ acpica-unix2-20181003/source/components/tables/tbprint.c
--- acpica-unix2-20181031.orig/source/components/tables/tbprint.c
+++ acpica-unix2-20181031/source/components/tables/tbprint.c
@@ -143,15 +143,18 @@ AcpiTbPrintTableHeader (
ACPI_TABLE_HEADER *Header)
{
@ -6314,10 +6350,10 @@ Index: acpica-unix2-20181003/source/components/tables/tbprint.c
}
}
Index: acpica-unix2-20181003/source/components/tables/tbutils.c
Index: acpica-unix2-20181031/source/components/tables/tbutils.c
===================================================================
--- acpica-unix2-20181003.orig/source/components/tables/tbutils.c
+++ acpica-unix2-20181003/source/components/tables/tbutils.c
--- acpica-unix2-20181031.orig/source/components/tables/tbutils.c
+++ acpica-unix2-20181031/source/components/tables/tbutils.c
@@ -238,7 +238,7 @@ AcpiTbGetRootTableEntry (
* 64-bit platform, XSDT: Move (unaligned) 64-bit to local,
* return 64-bit
@ -6377,10 +6413,10 @@ Index: acpica-unix2-20181003/source/components/tables/tbutils.c
{
AcpiGbl_FadtIndex = TableIndex;
AcpiTbParseFadt ();
Index: acpica-unix2-20181003/source/components/tables/tbxface.c
Index: acpica-unix2-20181031/source/components/tables/tbxface.c
===================================================================
--- acpica-unix2-20181003.orig/source/components/tables/tbxface.c
+++ acpica-unix2-20181003/source/components/tables/tbxface.c
--- acpica-unix2-20181031.orig/source/components/tables/tbxface.c
+++ acpica-unix2-20181031/source/components/tables/tbxface.c
@@ -293,8 +293,11 @@ AcpiGetTableHeader (
for (i = 0, j = 0; i < AcpiGbl_RootTableList.CurrentTableCount; i++)
@ -6394,10 +6430,10 @@ Index: acpica-unix2-20181003/source/components/tables/tbxface.c
{
continue;
}
Index: acpica-unix2-20181003/source/components/tables/tbxfload.c
Index: acpica-unix2-20181031/source/components/tables/tbxfload.c
===================================================================
--- acpica-unix2-20181003.orig/source/components/tables/tbxfload.c
+++ acpica-unix2-20181003/source/components/tables/tbxfload.c
--- acpica-unix2-20181031.orig/source/components/tables/tbxfload.c
+++ acpica-unix2-20181031/source/components/tables/tbxfload.c
@@ -159,6 +159,7 @@ AcpiTbLoadNamespace (
ACPI_TABLE_DESC *Table;
UINT32 TablesLoaded = 0;
@ -6417,10 +6453,10 @@ Index: acpica-unix2-20181003/source/components/tables/tbxfload.c
ACPI_FAILURE (AcpiTbValidateTable (Table)))
{
Status = AE_NO_ACPI_TABLES;
Index: acpica-unix2-20181003/source/tools/acpiexec/aetables.c
Index: acpica-unix2-20181031/source/tools/acpiexec/aetables.c
===================================================================
--- acpica-unix2-20181003.orig/source/tools/acpiexec/aetables.c
+++ acpica-unix2-20181003/source/tools/acpiexec/aetables.c
--- acpica-unix2-20181031.orig/source/tools/acpiexec/aetables.c
+++ acpica-unix2-20181031/source/tools/acpiexec/aetables.c
@@ -146,21 +146,25 @@ AeInitializeTableHeader (
char *Signature,
UINT32 Length)
@ -6572,10 +6608,10 @@ Index: acpica-unix2-20181003/source/tools/acpiexec/aetables.c
}
return (AE_OK);
Index: acpica-unix2-20181003/source/common/dmswitch.c
Index: acpica-unix2-20181031/source/common/dmswitch.c
===================================================================
--- acpica-unix2-20181003.orig/source/common/dmswitch.c
+++ acpica-unix2-20181003/source/common/dmswitch.c
--- acpica-unix2-20181031.orig/source/common/dmswitch.c
+++ acpica-unix2-20181031/source/common/dmswitch.c
@@ -88,13 +88,15 @@ AcpiDmProcessSwitch (
ACPI_PARSE_OBJECT_LIST *Current;
ACPI_PARSE_OBJECT_LIST *Previous;

141
int-format.patch
View File

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

4
sources
View File

@ -1,2 +1,2 @@
SHA512 (acpica-unix2-20181003.tar.gz) = 800a666786712d5bb4cea9340e55567b88445b468e25b082b052813111fb7df77f8af5c48ccfc0cb079dd2b17a839c13d99ee6792dffea8be074bb63fde1faf9
SHA512 (acpitests-unix-20181003.tar.gz) = efd4a0adb08371f8afe725a47aa4fe335250033ae1a37a54157d08ff17de8dd2186e50ea522befcb71ac02d9a52845a825eed15c3bc5da9b825fbc2379120e1d
SHA512 (acpica-unix2-20181031.tar.gz) = 6842f2a13e9012c1d5e1371182e68eb369ae58eae506e2bab128b83aa77af598142aa2672ed6ecd91dd6be8591c8e06d2d7e3a537ea3613b8df8a5c9dd32e608
SHA512 (acpitests-unix-20181031.tar.gz) = 421fa200aa750b289a88f70d0a5c799c6cb7491077303744b1723426564f34dd1aad94767dd09d368f7f33af6f79ef1f13f79734f0bac421ad7d6ef968b554c7