Module Name: src
Committed By: christos
Date: Mon May 25 23:19:28 UTC 2020
Modified Files:
src/sys/external/bsd/acpica/dist/compiler: aslcompiler.l aslload.c
aslpredef.c aslxref.c dtutils.c
src/sys/external/bsd/acpica/dist/disassembler: dmbuffer.c
src/sys/external/bsd/acpica/dist/include: acglobal.h acpixf.h
Log Message:
merge conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 \
src/sys/external/bsd/acpica/dist/compiler/aslcompiler.l
cvs rdiff -u -r1.17 -r1.18 \
src/sys/external/bsd/acpica/dist/compiler/aslload.c \
src/sys/external/bsd/acpica/dist/compiler/aslxref.c
cvs rdiff -u -r1.12 -r1.13 \
src/sys/external/bsd/acpica/dist/compiler/aslpredef.c
cvs rdiff -u -r1.14 -r1.15 \
src/sys/external/bsd/acpica/dist/compiler/dtutils.c
cvs rdiff -u -r1.11 -r1.12 \
src/sys/external/bsd/acpica/dist/disassembler/dmbuffer.c
cvs rdiff -u -r1.21 -r1.22 \
src/sys/external/bsd/acpica/dist/include/acglobal.h
cvs rdiff -u -r1.25 -r1.26 src/sys/external/bsd/acpica/dist/include/acpixf.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/acpica/dist/compiler/aslcompiler.l
diff -u src/sys/external/bsd/acpica/dist/compiler/aslcompiler.l:1.15 src/sys/external/bsd/acpica/dist/compiler/aslcompiler.l:1.16
--- src/sys/external/bsd/acpica/dist/compiler/aslcompiler.l:1.15 Sat Mar 28 15:49:26 2020
+++ src/sys/external/bsd/acpica/dist/compiler/aslcompiler.l Mon May 25 19:19:28 2020
@@ -711,7 +711,7 @@ NamePathTail [.]{NameSeg}
}
/*
- * The eror code is contained inside the
+ * The error code is contained inside the
* {ErrorCode} pattern. Extract it and log it
* as the expected error code.
*/
Index: src/sys/external/bsd/acpica/dist/compiler/aslload.c
diff -u src/sys/external/bsd/acpica/dist/compiler/aslload.c:1.17 src/sys/external/bsd/acpica/dist/compiler/aslload.c:1.18
--- src/sys/external/bsd/acpica/dist/compiler/aslload.c:1.17 Sat Mar 28 15:49:26 2020
+++ src/sys/external/bsd/acpica/dist/compiler/aslload.c Mon May 25 19:19:28 2020
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * Module Name: dswload - Dispatcher namespace load callbacks
+ * Module Name: aslload - compiler namespace load callbacks
*
*****************************************************************************/
@@ -93,7 +93,6 @@ LdAnalyzeExternals (
ACPI_NAMESPACE_NODE *Node,
ACPI_PARSE_OBJECT *Op,
ACPI_OBJECT_TYPE ExternalOpType,
- ACPI_OBJECT_TYPE ObjectType,
ACPI_WALK_STATE *WalkState);
@@ -407,7 +406,6 @@ LdNamespace1Begin (
ACPI_PARSE_OBJECT *MethodOp;
ACPI_STATUS Status;
ACPI_OBJECT_TYPE ObjectType;
- ACPI_OBJECT_TYPE ActualObjectType = ACPI_TYPE_ANY;
char *Path;
UINT32 Flags = ACPI_NS_NO_UPSEARCH;
ACPI_PARSE_OBJECT *Arg;
@@ -581,8 +579,7 @@ LdNamespace1Begin (
*
* first child is name, next child is ObjectType
*/
- ActualObjectType = (UINT8) Op->Asl.Child->Asl.Next->Asl.Value.Integer;
- ObjectType = ACPI_TYPE_ANY;
+ ObjectType = (UINT8) Op->Asl.Child->Asl.Next->Asl.Value.Integer;
/*
* We will mark every new node along the path as "External". This
@@ -601,7 +598,7 @@ LdNamespace1Begin (
* Store (\_SB_.PCI0.ABCD, Local0)
* }
*/
- Flags |= ACPI_NS_EXTERNAL;
+ Flags |= ACPI_NS_EXTERNAL | ACPI_NS_DONT_OPEN_SCOPE;
break;
case PARSEOP_DEFAULT_ARG:
@@ -805,8 +802,7 @@ LdNamespace1Begin (
else if ((Node->Flags & ANOBJ_IS_EXTERNAL) ||
(Op->Asl.ParseOpcode == PARSEOP_EXTERNAL))
{
- Status = LdAnalyzeExternals (Node, Op, ActualObjectType,
- ObjectType, WalkState);
+ Status = LdAnalyzeExternals (Node, Op, ObjectType, WalkState);
if (ACPI_FAILURE (Status))
{
if (Status == AE_ERROR)
@@ -821,6 +817,19 @@ LdNamespace1Begin (
}
return_ACPI_STATUS (Status);
}
+
+ if (!(Node->Flags & ANOBJ_IS_EXTERNAL) &&
+ (Op->Asl.ParseOpcode == PARSEOP_EXTERNAL))
+ {
+ /*
+ * If we get to here, it means that an actual definition of
+ * the object declared external exists. Meaning that Op
+ * loading this this Op should have no change to the ACPI
+ * namespace. By going to FinishNode, we skip the
+ * assignment of Node->Op = Op.
+ */
+ goto FinishNode;
+ }
}
else
{
@@ -872,30 +881,15 @@ LdNamespace1Begin (
}
}
-FinishNode:
- /*
- * Point the parse node to the new namespace node, and point
- * the Node back to the original Parse node
- */
- Op->Asl.Node = Node;
+ /* Point the Node back to the original Parse node */
+
Node->Op = Op;
- /*
- * Set the actual data type if appropriate (EXTERNAL term only)
- * As of 11/19/2019, ASL External() does not support parameter
- * counts. When an External method is loaded, the parameter count is
- * recorded in the external's arg count parameter. The parameter count may
- * or may not be known in the declaration. If the value of this node turns
- * out to be ASL_EXTERNAL_METHOD_UNKNOWN_PARAMS, it indicates that
- * we do not know the parameter count and that we must look at the usage of
- * the External method call to get this information.
- */
- if (ActualObjectType != ACPI_TYPE_ANY)
- {
- Node->Type = (UINT8) ActualObjectType;
- Node->Value = (UINT32)
- Op->Asl.Child->Asl.Next->Asl.Next->Asl.Value.Integer;
- }
+FinishNode:
+
+ /* Point the parse node to the new namespace node */
+
+ Op->Asl.Node = Node;
if (Op->Asl.ParseOpcode == PARSEOP_METHOD)
{
@@ -905,6 +899,13 @@ FinishNode:
*/
Node->Value = (UINT32) Op->Asl.Extra;
}
+ else if (Op->Asl.ParseOpcode == PARSEOP_EXTERNAL &&
+ Node->Type == ACPI_TYPE_METHOD &&
+ (Node->Flags & ANOBJ_IS_EXTERNAL))
+ {
+ Node->Value =
+ (UINT32) Op->Asl.Child->Asl.Next->Asl.Next->Asl.Value.Integer;
+ }
return_ACPI_STATUS (Status);
}
@@ -912,7 +913,7 @@ FinishNode:
/*******************************************************************************
*
- * FUNCTION: LdAnalyzeExternals
+ * FUNCTION: LdMatchExternType
*
* PARAMETERS: Type1
* Type2
@@ -929,7 +930,7 @@ FinishNode:
******************************************************************************/
static BOOLEAN
-LdTypesMatchExternType (
+LdMatchExternType (
ACPI_OBJECT_TYPE Type1,
ACPI_OBJECT_TYPE Type2)
{
@@ -985,7 +986,6 @@ LdTypesMatchExternType (
* PARAMETERS: Node - Node that represents the named object
* Op - Named object declaring this named object
* ExternalOpType - Type of ExternalOp
- * ObjectType - Type of Declared object
* WalkState - Current WalkState
*
* RETURN: Status
@@ -1003,7 +1003,6 @@ LdAnalyzeExternals (
ACPI_NAMESPACE_NODE *Node,
ACPI_PARSE_OBJECT *Op,
ACPI_OBJECT_TYPE ExternalOpType,
- ACPI_OBJECT_TYPE ObjectType,
ACPI_WALK_STATE *WalkState)
{
ACPI_STATUS Status = AE_OK;
@@ -1027,12 +1026,12 @@ LdAnalyzeExternals (
else
{
ActualExternalOpType = Node->Type;
- ActualOpType = ObjectType;
+ ActualOpType = ExternalOpType;
}
if ((ActualOpType != ACPI_TYPE_ANY) &&
(ActualExternalOpType != ACPI_TYPE_ANY) &&
- !LdTypesMatchExternType (ActualExternalOpType, ActualOpType))
+ !LdMatchExternType (ActualExternalOpType, ActualOpType))
{
if (Op->Asl.ParseOpcode == PARSEOP_EXTERNAL &&
Node->Op->Asl.ParseOpcode == PARSEOP_EXTERNAL)
@@ -1060,6 +1059,8 @@ LdAnalyzeExternals (
}
}
+ /* Set the object type of the external */
+
if ((Node->Flags & ANOBJ_IS_EXTERNAL) &&
(Op->Asl.ParseOpcode != PARSEOP_EXTERNAL))
{
@@ -1068,13 +1069,13 @@ LdAnalyzeExternals (
* previously declared External
*/
Node->Flags &= ~ANOBJ_IS_EXTERNAL;
- Node->Type = (UINT8) ObjectType;
+ Node->Type = (UINT8) ExternalOpType;
/* Just retyped a node, probably will need to open a scope */
- if (AcpiNsOpensScope (ObjectType))
+ if (AcpiNsOpensScope (ExternalOpType))
{
- Status = AcpiDsScopeStackPush (Node, ObjectType, WalkState);
+ Status = AcpiDsScopeStackPush (Node, ExternalOpType, WalkState);
if (ACPI_FAILURE (Status))
{
return (Status);
@@ -1095,7 +1096,7 @@ LdAnalyzeExternals (
}
else if ((Node->Flags & ANOBJ_IS_EXTERNAL) &&
(Op->Asl.ParseOpcode == PARSEOP_EXTERNAL) &&
- (ObjectType == ACPI_TYPE_ANY))
+ (ExternalOpType == ACPI_TYPE_ANY))
{
/* Allow update of externals of unknown type. */
Index: src/sys/external/bsd/acpica/dist/compiler/aslxref.c
diff -u src/sys/external/bsd/acpica/dist/compiler/aslxref.c:1.17 src/sys/external/bsd/acpica/dist/compiler/aslxref.c:1.18
--- src/sys/external/bsd/acpica/dist/compiler/aslxref.c:1.17 Sat Mar 28 15:49:26 2020
+++ src/sys/external/bsd/acpica/dist/compiler/aslxref.c Mon May 25 19:19:28 2020
@@ -91,6 +91,16 @@ XfCheckFieldRange (
UINT32 FieldBitLength,
UINT32 AccessBitWidth);
+static BOOLEAN
+XfFindCondRefOfName (
+ ACPI_NAMESPACE_NODE *Node,
+ ACPI_PARSE_OBJECT *Op);
+
+static BOOLEAN
+XfRefIsGuardedByIfCondRefOf (
+ ACPI_NAMESPACE_NODE *Node,
+ ACPI_PARSE_OBJECT *Op);
+
/*******************************************************************************
*
@@ -474,17 +484,6 @@ XfNamespaceLocateBegin (
}
/*
- * One special case: CondRefOf operator - we don't care if the name exists
- * or not at this point, just ignore it, the point of the operator is to
- * determine if the name exists at runtime.
- */
- if ((Op->Asl.Parent) &&
- (Op->Asl.Parent->Asl.ParseOpcode == PARSEOP_CONDREFOF))
- {
- return_ACPI_STATUS (AE_OK);
- }
-
- /*
* We must enable the "search-to-root" for single NameSegs, but
* we have to be very careful about opening up scopes
*/
@@ -492,7 +491,8 @@ XfNamespaceLocateBegin (
if ((Op->Asl.ParseOpcode == PARSEOP_NAMESTRING) ||
(Op->Asl.ParseOpcode == PARSEOP_NAMESEG) ||
(Op->Asl.ParseOpcode == PARSEOP_METHODCALL) ||
- (Op->Asl.ParseOpcode == PARSEOP_EXTERNAL))
+ (Op->Asl.ParseOpcode == PARSEOP_EXTERNAL) ||
+ (Op->Asl.ParseOpcode == PARSEOP_CONDREFOF))
{
/*
* These are name references, do not push the scope stack
@@ -557,7 +557,22 @@ XfNamespaceLocateBegin (
* We didn't find the name reference by path -- we can qualify this
* a little better before we print an error message
*/
- if (strlen (Path) == ACPI_NAMESEG_SIZE)
+
+ if ((Op->Asl.Parent) &&
+ (Op->Asl.Parent->Asl.ParseOpcode == PARSEOP_CONDREFOF))
+ {
+ /*
+ * One special case: CondRefOf operator - if the name doesn't
+ * exist at this point, it means that there's no actual or
+ * external declaration. If the name is not found, just ignore
+ * it, the point of the operator is to determine if the name
+ * exists at runtime. We wanted to see if this named object
+ * exists to facilitate analysis to allow protected usage of
+ * undeclared externals.
+ */
+ return_ACPI_STATUS (AE_OK);
+ }
+ else if (strlen (Path) == ACPI_NAMESEG_SIZE)
{
/* A simple, one-segment ACPI name */
@@ -1083,6 +1098,7 @@ XfNamespaceLocateBegin (
/*
* 5) Check for external resolution
+ *
* By this point, everything should be loaded in the namespace. If a
* namespace lookup results in a namespace node that is an external, it
* means that this named object was not defined in the input ASL. This
@@ -1090,11 +1106,38 @@ XfNamespaceLocateBegin (
* use the external keyword to suppress compiler errors about undefined
* objects. Note: this only applies when compiling multiple definition
* blocks.
+ *
+ * Do not check for external resolution in the following cases:
+ *
+ * case 1) External (ABCD)
+ *
+ * This declares ABCD as an external so there is no requirement for
+ * ABCD to be loaded in the namespace when analyzing the actual
+ * External() statement.
+ *
+ * case 2) CondRefOf (ABCD)
+ *
+ * This operator will query the ACPI namespace on the existence of
+ * ABCD. If ABCD does not exist, this operator will return a 0
+ * without incurring AML runtime errors. Therefore, ABCD is allowed
+ * to not exist when analyzing the CondRefOf operator.
+ *
+ * case 3) External (ABCD)
+ * if (CondRefOf (ABCD))
+ * {
+ * Store (0, ABCD)
+ * }
+ *
+ * In this case, ABCD is accessed only if it exists due to the if
+ * statement so there is no need to flag the ABCD nested in the
+ * store operator.
*/
if (AslGbl_ParseTreeRoot->Asl.Child && AslGbl_ParseTreeRoot->Asl.Child->Asl.Next &&
- (Op->Asl.ParseOpcode != PARSEOP_EXTERNAL &&
- Op->Asl.Parent->Asl.ParseOpcode != PARSEOP_EXTERNAL) &&
- (Node->Flags & ANOBJ_IS_EXTERNAL))
+ (Node->Flags & ANOBJ_IS_EXTERNAL) &&
+ Op->Asl.Parent->Asl.ParseOpcode != PARSEOP_EXTERNAL &&
+ Op->Asl.ParseOpcode != PARSEOP_EXTERNAL &&
+ Op->Asl.Parent->Asl.ParseOpcode != PARSEOP_CONDREFOF &&
+ !XfRefIsGuardedByIfCondRefOf (Node, Op))
{
AslError (ASL_ERROR, ASL_MSG_UNDEFINED_EXTERNAL, Op, NULL);
}
@@ -1114,6 +1157,96 @@ XfNamespaceLocateBegin (
/*******************************************************************************
*
+ * FUNCTION: XfRefIsGuardedByIfCondRefOf
+ *
+ * PARAMETERS: Node - Named object reference node
+ * Op - Named object reference parse node
+ *
+ * RETURN: BOOLEAN
+ *
+ * DESCRIPTION: returns true if Op checked inside if (CondRefOf (...))
+ * refers to Node.
+ *
+ ******************************************************************************/
+
+static BOOLEAN
+XfRefIsGuardedByIfCondRefOf (
+ ACPI_NAMESPACE_NODE *Node,
+ ACPI_PARSE_OBJECT *Op)
+{
+ ACPI_PARSE_OBJECT *Parent = Op->Asl.Parent;
+
+
+ while (Parent)
+ {
+ if (Parent->Asl.ParseOpcode == PARSEOP_IF &&
+ XfFindCondRefOfName (Node, Parent->Asl.Child))
+ {
+ return (TRUE);
+ }
+
+ Parent = Parent->Asl.Parent;
+ }
+
+ return (FALSE);
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION: XfRefIsGuardedByIfCondRefOf
+ *
+ * PARAMETERS: Node - Named object reference node
+ * Op - Named object reference parse node
+ *
+ * RETURN: BOOLEAN
+ *
+ * DESCRIPTION: returns true if Op checked inside if (CondRefOf (...))
+ * refers to Node.
+ *
+ ******************************************************************************/
+
+static BOOLEAN
+XfFindCondRefOfName (
+ ACPI_NAMESPACE_NODE *Node,
+ ACPI_PARSE_OBJECT *Op)
+{
+ BOOLEAN CondRefOfFound = FALSE;
+
+
+ if (!Op)
+ {
+ return (FALSE);
+ }
+
+ switch (Op->Asl.ParseOpcode)
+ {
+ case PARSEOP_CONDREFOF:
+
+ return (Op->Asl.Child->Common.Node == Node);
+ break;
+
+ case PARSEOP_LAND:
+
+ CondRefOfFound = XfFindCondRefOfName (Node, Op->Asl.Child);
+ if (CondRefOfFound)
+ {
+ return (TRUE);
+ }
+
+ return (XfFindCondRefOfName (Node, Op->Asl.Child->Asl.Next));
+ break;
+
+ default:
+
+ return (FALSE);
+ break;
+ }
+}
+
+
+/*******************************************************************************
+ *
* FUNCTION: XfNamespaceLocateEnd
*
* PARAMETERS: ASL_WALK_CALLBACK
Index: src/sys/external/bsd/acpica/dist/compiler/aslpredef.c
diff -u src/sys/external/bsd/acpica/dist/compiler/aslpredef.c:1.12 src/sys/external/bsd/acpica/dist/compiler/aslpredef.c:1.13
--- src/sys/external/bsd/acpica/dist/compiler/aslpredef.c:1.12 Sat Mar 28 15:49:26 2020
+++ src/sys/external/bsd/acpica/dist/compiler/aslpredef.c Mon May 25 19:19:28 2020
@@ -566,7 +566,7 @@ ApCheckForSpecialName (
/*
* Was not actually emitted by the compiler. This is a special case,
* however. If the ASL code being compiled was the result of a
- * dissasembly, it may possibly contain valid compiler-emitted names
+ * disassembly, it may possibly contain valid compiler-emitted names
* of the form "_T_x". We don't want to issue an error or even a
* warning and force the user to manually change the names. So, we
* will issue a remark instead.
Index: src/sys/external/bsd/acpica/dist/compiler/dtutils.c
diff -u src/sys/external/bsd/acpica/dist/compiler/dtutils.c:1.14 src/sys/external/bsd/acpica/dist/compiler/dtutils.c:1.15
--- src/sys/external/bsd/acpica/dist/compiler/dtutils.c:1.14 Sat Mar 28 15:49:26 2020
+++ src/sys/external/bsd/acpica/dist/compiler/dtutils.c Mon May 25 19:19:28 2020
@@ -78,11 +78,20 @@ DtError (
DT_FIELD *FieldObject,
char *ExtraMessage)
{
+ UINT32 Line = 0;
+
+
+ /* Field object could be NULL */
+
+ if (FieldObject)
+ {
+ Line = FieldObject->Line;
+ }
/* Check if user wants to ignore this exception */
if (AslIsExceptionIgnored (AslGbl_Files[ASL_FILE_INPUT].Filename,
- FieldObject->Line, Level, MessageId))
+ Line, Level, MessageId))
{
return;
}
Index: src/sys/external/bsd/acpica/dist/disassembler/dmbuffer.c
diff -u src/sys/external/bsd/acpica/dist/disassembler/dmbuffer.c:1.11 src/sys/external/bsd/acpica/dist/disassembler/dmbuffer.c:1.12
--- src/sys/external/bsd/acpica/dist/disassembler/dmbuffer.c:1.11 Sat Mar 28 15:49:26 2020
+++ src/sys/external/bsd/acpica/dist/disassembler/dmbuffer.c Mon May 25 19:19:28 2020
@@ -292,6 +292,10 @@ AcpiDmIsUuidBuffer (
/* Buffer size is the buffer argument */
SizeOp = Op->Common.Value.Arg;
+ if (!SizeOp)
+ {
+ return (FALSE);
+ }
/* Next, the initializer byte list to examine */
@@ -412,6 +416,10 @@ AcpiDmIsUnicodeBuffer (
/* Buffer size is the buffer argument */
SizeOp = Op->Common.Value.Arg;
+ if (!SizeOp)
+ {
+ return (FALSE);
+ }
/* Next, the initializer byte list to examine */
@@ -488,6 +496,10 @@ AcpiDmIsStringBuffer (
/* Buffer size is the buffer argument */
SizeOp = Op->Common.Value.Arg;
+ if (!SizeOp)
+ {
+ return (FALSE);
+ }
/* Next, the initializer byte list to examine */
@@ -567,13 +579,18 @@ AcpiDmIsPldBuffer (
UINT64 InitializerSize;
+ if (!Op)
+ {
+ return (FALSE);
+ }
+
/*
* Get the BufferSize argument - Buffer(BufferSize)
* If the buffer was generated by the ToPld macro, it must
* be a BYTE constant.
*/
SizeOp = Op->Common.Value.Arg;
- if (SizeOp->Common.AmlOpcode != AML_BYTE_OP)
+ if (!SizeOp || SizeOp->Common.AmlOpcode != AML_BYTE_OP)
{
return (FALSE);
}
Index: src/sys/external/bsd/acpica/dist/include/acglobal.h
diff -u src/sys/external/bsd/acpica/dist/include/acglobal.h:1.21 src/sys/external/bsd/acpica/dist/include/acglobal.h:1.22
--- src/sys/external/bsd/acpica/dist/include/acglobal.h:1.21 Sat Mar 28 15:49:27 2020
+++ src/sys/external/bsd/acpica/dist/include/acglobal.h Mon May 25 19:19:28 2020
@@ -328,6 +328,7 @@ ACPI_GLOBAL (ACPI_EXTERNAL_FILE *,
#ifdef ACPI_DEBUGGER
ACPI_INIT_GLOBAL (BOOLEAN, AcpiGbl_AbortMethod, FALSE);
ACPI_INIT_GLOBAL (ACPI_THREAD_ID, AcpiGbl_DbThreadId, ACPI_INVALID_THREAD_ID);
+ACPI_INIT_GLOBAL (UINT32, AcpiGbl_NextCmdNum, 1);
ACPI_GLOBAL (BOOLEAN, AcpiGbl_DbOpt_NoIniMethods);
ACPI_GLOBAL (BOOLEAN, AcpiGbl_DbOpt_NoRegionSupport);
Index: src/sys/external/bsd/acpica/dist/include/acpixf.h
diff -u src/sys/external/bsd/acpica/dist/include/acpixf.h:1.25 src/sys/external/bsd/acpica/dist/include/acpixf.h:1.26
--- src/sys/external/bsd/acpica/dist/include/acpixf.h:1.25 Sat Mar 28 15:49:27 2020
+++ src/sys/external/bsd/acpica/dist/include/acpixf.h Mon May 25 19:19:28 2020
@@ -46,7 +46,7 @@
/* Current ACPICA subsystem version in YYYYMMDD format */
-#define ACPI_CA_VERSION 0x20200326
+#define ACPI_CA_VERSION 0x20200430
#include "acconfig.h"
#include "actypes.h"
