Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/external/bsd/acpica/dist merge conflicts
details: https://anonhg.NetBSD.org/src/rev/1da38a7e7f65
branches: trunk
changeset: 936740:1da38a7e7f65
user: christos <christos%NetBSD.org@localhost>
date: Sun Aug 02 20:25:54 2020 +0000
description:
merge conflicts
diffstat:
sys/external/bsd/acpica/dist/compiler/aslcompiler.l | 1 +
sys/external/bsd/acpica/dist/compiler/aslerror.c | 2 +-
sys/external/bsd/acpica/dist/compiler/aslload.c | 10 +-
sys/external/bsd/acpica/dist/compiler/aslxref.c | 25 +-
sys/external/bsd/acpica/dist/debugger/dbdisply.c | 2 +
sys/external/bsd/acpica/dist/generate/unix/acpinames/Makefile | 178 ----
sys/external/bsd/acpica/dist/include/acpixf.h | 2 +-
sys/external/bsd/acpica/dist/include/actypes.h | 5 +-
sys/external/bsd/acpica/dist/os_specific/service_layers/oslinuxtbl.c | 9 +-
sys/external/bsd/acpica/dist/tools/acpinames/acpinames.h | 66 -
sys/external/bsd/acpica/dist/tools/acpinames/anmain.c | 308 -------
sys/external/bsd/acpica/dist/tools/acpinames/anstubs.c | 400 ----------
sys/external/bsd/acpica/dist/tools/acpinames/antables.c | 356 --------
sys/external/bsd/acpica/dist/utilities/utdecode.c | 23 +-
sys/external/bsd/acpica/dist/utilities/utdelete.c | 6 +-
15 files changed, 51 insertions(+), 1342 deletions(-)
diffs (truncated from 1589 to 300 lines):
diff -r df50e3953a5d -r 1da38a7e7f65 sys/external/bsd/acpica/dist/compiler/aslcompiler.l
--- a/sys/external/bsd/acpica/dist/compiler/aslcompiler.l Sun Aug 02 20:23:09 2020 +0000
+++ b/sys/external/bsd/acpica/dist/compiler/aslcompiler.l Sun Aug 02 20:25:54 2020 +0000
@@ -585,6 +585,7 @@
"GeneralPurposeIo" { count (0); return (PARSEOP_REGIONSPACE_GPIO); } /* ACPI 5.0 */
"GenericSerialBus" { count (0); return (PARSEOP_REGIONSPACE_GSBUS); } /* ACPI 5.0 */
"PCC" { count (0); return (PARSEOP_REGIONSPACE_PCC); } /* ACPI 5.0 */
+"PlatformRtMechanism" { count (0); return (PARSEOP_REGIONSPACE_PRM); }
"FFixedHW" { count (0); return (PARSEOP_REGIONSPACE_FFIXEDHW); }
/* ResourceTypeKeyword: Resource Usage - Resource Descriptors */
diff -r df50e3953a5d -r 1da38a7e7f65 sys/external/bsd/acpica/dist/compiler/aslerror.c
--- a/sys/external/bsd/acpica/dist/compiler/aslerror.c Sun Aug 02 20:23:09 2020 +0000
+++ b/sys/external/bsd/acpica/dist/compiler/aslerror.c Sun Aug 02 20:25:54 2020 +0000
@@ -948,7 +948,7 @@
UINT8 Level,
UINT16 MessageId)
{
- UINT16 i;
+ UINT32 i;
UINT16 ExceptionCode;
diff -r df50e3953a5d -r 1da38a7e7f65 sys/external/bsd/acpica/dist/compiler/aslload.c
--- a/sys/external/bsd/acpica/dist/compiler/aslload.c Sun Aug 02 20:23:09 2020 +0000
+++ b/sys/external/bsd/acpica/dist/compiler/aslload.c Sun Aug 02 20:25:54 2020 +0000
@@ -1069,13 +1069,13 @@
* previously declared External
*/
Node->Flags &= ~ANOBJ_IS_EXTERNAL;
- Node->Type = (UINT8) ExternalOpType;
+ Node->Type = (UINT8) ActualOpType;
/* Just retyped a node, probably will need to open a scope */
- if (AcpiNsOpensScope (ExternalOpType))
+ if (AcpiNsOpensScope (ActualOpType))
{
- Status = AcpiDsScopeStackPush (Node, ExternalOpType, WalkState);
+ Status = AcpiDsScopeStackPush (Node, ActualOpType, WalkState);
if (ACPI_FAILURE (Status))
{
return (Status);
@@ -1096,11 +1096,11 @@
}
else if ((Node->Flags & ANOBJ_IS_EXTERNAL) &&
(Op->Asl.ParseOpcode == PARSEOP_EXTERNAL) &&
- (ExternalOpType == ACPI_TYPE_ANY))
+ (ActualOpType == ACPI_TYPE_ANY))
{
/* Allow update of externals of unknown type. */
- Node->Type = (UINT8) ExternalOpType;
+ Node->Type = (UINT8) ActualExternalOpType;
Status = AE_OK;
}
diff -r df50e3953a5d -r 1da38a7e7f65 sys/external/bsd/acpica/dist/compiler/aslxref.c
--- a/sys/external/bsd/acpica/dist/compiler/aslxref.c Sun Aug 02 20:23:09 2020 +0000
+++ b/sys/external/bsd/acpica/dist/compiler/aslxref.c Sun Aug 02 20:25:54 2020 +0000
@@ -713,9 +713,24 @@
Node->Flags |= ANOBJ_IS_REFERENCED;
}
- /* Attempt to optimize the NamePath */
-
- OptOptimizeNamePath (Op, OpInfo->Flags, WalkState, Path, Node);
+ /*
+ * Attempt to optimize the NamePath
+ *
+ * One special case: CondRefOf operator - not all AML interpreter
+ * implementations expect optimized namepaths as a parameter to this
+ * operator. They require relative name paths with prefix operators or
+ * namepaths starting with the root scope.
+ *
+ * Other AML interpreter implementations do not perform the namespace
+ * search that starts at the current scope and recursively searching the
+ * parent scope until the root scope. The lack of search is only known to
+ * occur for the namestring parameter for the CondRefOf operator.
+ */
+ if ((Op->Asl.Parent) &&
+ (Op->Asl.Parent->Asl.ParseOpcode != PARSEOP_CONDREFOF))
+ {
+ OptOptimizeNamePath (Op, OpInfo->Flags, WalkState, Path, Node);
+ }
/*
* 1) Dereference an alias (A name reference that is an alias)
@@ -871,12 +886,14 @@
* invocation of the method, it is simply a reference to the method.
*
* September 2016: Removed DeRefOf from this list
+ * July 2020: Added Alias to this list
*/
if ((Op->Asl.Parent) &&
((Op->Asl.Parent->Asl.ParseOpcode == PARSEOP_REFOF) ||
(Op->Asl.Parent->Asl.ParseOpcode == PARSEOP_PACKAGE) ||
(Op->Asl.Parent->Asl.ParseOpcode == PARSEOP_VAR_PACKAGE)||
- (Op->Asl.Parent->Asl.ParseOpcode == PARSEOP_OBJECTTYPE)))
+ (Op->Asl.Parent->Asl.ParseOpcode == PARSEOP_OBJECTTYPE) ||
+ (Op->Asl.Parent->Asl.ParseOpcode == PARSEOP_ALIAS)))
{
return_ACPI_STATUS (AE_OK);
}
diff -r df50e3953a5d -r 1da38a7e7f65 sys/external/bsd/acpica/dist/debugger/dbdisply.c
--- a/sys/external/bsd/acpica/dist/debugger/dbdisply.c Sun Aug 02 20:23:09 2020 +0000
+++ b/sys/external/bsd/acpica/dist/debugger/dbdisply.c Sun Aug 02 20:25:54 2020 +0000
@@ -96,6 +96,8 @@
ACPI_ADR_SPACE_IPMI,
ACPI_ADR_SPACE_GPIO,
ACPI_ADR_SPACE_GSBUS,
+ ACPI_ADR_SPACE_PLATFORM_COMM,
+ ACPI_ADR_SPACE_PLATFORM_RT,
ACPI_ADR_SPACE_DATA_TABLE,
ACPI_ADR_SPACE_FIXED_HARDWARE
};
diff -r df50e3953a5d -r 1da38a7e7f65 sys/external/bsd/acpica/dist/generate/unix/acpinames/Makefile
--- a/sys/external/bsd/acpica/dist/generate/unix/acpinames/Makefile Sun Aug 02 20:23:09 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,178 +0,0 @@
-#
-# acpinames - Load ACPI table and dump namespace. This is a subset
-# of the AcpiExec functionality, it is intended to demonstrate
-# the configurability of ACPICA.
-#
-
-#
-# Note: This makefile is intended to be used from within the native
-# ACPICA directory structure, from under generate/unix. It specifically
-# places all object files in a generate/unix subdirectory, not within
-# the various ACPICA source directories. This prevents collisions
-# between different compilations of the same source file with different
-# compile options, and prevents pollution of the source code.
-#
-include ../Makefile.config
-FINAL_PROG = ../$(BINDIR)/acpinames
-PROG = $(OBJDIR)/acpinames
-
-#
-# Search paths for source files
-#
-vpath %.c \
- $(ACPINAMES)\
- $(ACPICA_DISPATCHER)\
- $(ACPICA_EVENTS)\
- $(ACPICA_EXECUTER)\
- $(ACPICA_HARDWARE)\
- $(ACPICA_NAMESPACE)\
- $(ACPICA_PARSER)\
- $(ACPICA_TABLES)\
- $(ACPICA_UTILITIES)\
- $(ACPICA_COMMON)\
- $(ACPICA_OSL)
-
-HEADERS = \
- $(wildcard $(ACPINAMES)/*.h)
-
-OBJECTS = \
- $(OBJDIR)/acfileio.o\
- $(OBJDIR)/anmain.o\
- $(OBJDIR)/anstubs.o\
- $(OBJDIR)/antables.o\
- $(OBJDIR)/cmfsize.o\
- $(OBJDIR)/dscontrol.o\
- $(OBJDIR)/dsdebug.o\
- $(OBJDIR)/dsfield.o\
- $(OBJDIR)/dsinit.o\
- $(OBJDIR)/dsmethod.o\
- $(OBJDIR)/dsmthdat.o\
- $(OBJDIR)/dsobject.o\
- $(OBJDIR)/dsopcode.o\
- $(OBJDIR)/dspkginit.o\
- $(OBJDIR)/dsutils.o\
- $(OBJDIR)/dswexec.o\
- $(OBJDIR)/dswload.o\
- $(OBJDIR)/dswload2.o\
- $(OBJDIR)/dswscope.o\
- $(OBJDIR)/dswstate.o\
- $(OBJDIR)/evhandler.o\
- $(OBJDIR)/evmisc.o\
- $(OBJDIR)/evregion.o\
- $(OBJDIR)/evrgnini.o\
- $(OBJDIR)/evxfregn.o\
- $(OBJDIR)/exconcat.o\
- $(OBJDIR)/exconfig.o\
- $(OBJDIR)/exconvrt.o\
- $(OBJDIR)/excreate.o\
- $(OBJDIR)/exdump.o\
- $(OBJDIR)/exfield.o\
- $(OBJDIR)/exfldio.o\
- $(OBJDIR)/exmisc.o\
- $(OBJDIR)/exmutex.o\
- $(OBJDIR)/exnames.o\
- $(OBJDIR)/exoparg1.o\
- $(OBJDIR)/exoparg2.o\
- $(OBJDIR)/exoparg3.o\
- $(OBJDIR)/exoparg6.o\
- $(OBJDIR)/exprep.o\
- $(OBJDIR)/exregion.o\
- $(OBJDIR)/exresnte.o\
- $(OBJDIR)/exresolv.o\
- $(OBJDIR)/exresop.o\
- $(OBJDIR)/exserial.o\
- $(OBJDIR)/exstore.o\
- $(OBJDIR)/exstoren.o\
- $(OBJDIR)/exstorob.o\
- $(OBJDIR)/exsystem.o\
- $(OBJDIR)/exutils.o\
- $(OBJDIR)/getopt.o\
- $(OBJDIR)/hwpci.o\
- $(OBJDIR)/hwvalid.o\
- $(OBJDIR)/nsaccess.o\
- $(OBJDIR)/nsalloc.o\
- $(OBJDIR)/nsarguments.o\
- $(OBJDIR)/nsconvert.o\
- $(OBJDIR)/nsdump.o\
- $(OBJDIR)/nseval.o\
- $(OBJDIR)/nsinit.o\
- $(OBJDIR)/nsload.o\
- $(OBJDIR)/nsnames.o\
- $(OBJDIR)/nsobject.o\
- $(OBJDIR)/nsparse.o\
- $(OBJDIR)/nspredef.o\
- $(OBJDIR)/nsprepkg.o\
- $(OBJDIR)/nsrepair.o\
- $(OBJDIR)/nsrepair2.o\
- $(OBJDIR)/nssearch.o\
- $(OBJDIR)/nsutils.o\
- $(OBJDIR)/nswalk.o\
- $(OBJDIR)/nsxfeval.o\
- $(OBJDIR)/nsxfname.o\
- $(OBJDIR)/nsxfobj.o\
- $(OBJDIR)/osunixxf.o\
- $(OBJDIR)/psargs.o\
- $(OBJDIR)/psloop.o\
- $(OBJDIR)/psobject.o\
- $(OBJDIR)/psopcode.o\
- $(OBJDIR)/psopinfo.o\
- $(OBJDIR)/psparse.o\
- $(OBJDIR)/psscope.o\
- $(OBJDIR)/pstree.o\
- $(OBJDIR)/psutils.o\
- $(OBJDIR)/pswalk.o\
- $(OBJDIR)/psxface.o\
- $(OBJDIR)/tbdata.o\
- $(OBJDIR)/tbfadt.o\
- $(OBJDIR)/tbfind.o\
- $(OBJDIR)/tbinstal.o\
- $(OBJDIR)/tbprint.o\
- $(OBJDIR)/tbutils.o\
- $(OBJDIR)/tbxface.o\
- $(OBJDIR)/tbxfload.o\
- $(OBJDIR)/tbxfroot.o\
- $(OBJDIR)/utaddress.o\
- $(OBJDIR)/utalloc.o\
- $(OBJDIR)/utascii.o\
- $(OBJDIR)/utbuffer.o\
- $(OBJDIR)/utcache.o\
- $(OBJDIR)/utcopy.o\
- $(OBJDIR)/utdebug.o\
- $(OBJDIR)/utdecode.o\
- $(OBJDIR)/utdelete.o\
- $(OBJDIR)/uterror.o\
- $(OBJDIR)/uteval.o\
- $(OBJDIR)/utexcep.o\
- $(OBJDIR)/utglobal.o\
- $(OBJDIR)/uthex.o\
- $(OBJDIR)/utids.o\
- $(OBJDIR)/utinit.o\
- $(OBJDIR)/utlock.o\
- $(OBJDIR)/utmath.o\
- $(OBJDIR)/utmisc.o\
- $(OBJDIR)/utmutex.o\
- $(OBJDIR)/utnonansi.o\
- $(OBJDIR)/utobject.o\
- $(OBJDIR)/utosi.o\
- $(OBJDIR)/utownerid.o\
- $(OBJDIR)/utpredef.o\
- $(OBJDIR)/utresrc.o\
- $(OBJDIR)/utstate.o\
- $(OBJDIR)/utstring.o\
- $(OBJDIR)/utstrsuppt.o\
- $(OBJDIR)/utstrtoul64.o\
- $(OBJDIR)/utxface.o\
- $(OBJDIR)/utxferror.o\
- $(OBJDIR)/utxfinit.o
-
-#
-# Flags specific to acpinames utility
-#
-CFLAGS += \
- -DACPI_NAMES_APP\
- -I$(ACPINAMES)
-
-#
-# Common Rules
-#
-include ../Makefile.rules
diff -r df50e3953a5d -r 1da38a7e7f65 sys/external/bsd/acpica/dist/include/acpixf.h
--- a/sys/external/bsd/acpica/dist/include/acpixf.h Sun Aug 02 20:23:09 2020 +0000
Home |
Main Index |
Thread Index |
Old Index