Module Name: src
Committed By: christos
Date: Sat May 5 00:12:16 UTC 2018
Modified Files:
src/sys/external/bsd/acpica/dist/compiler: aslcompiler.h aslload.c
aslutils.c aslxref.c
src/sys/external/bsd/acpica/dist/debugger: dbnames.c dbtest.c
src/sys/external/bsd/acpica/dist/include: acapps.h acpixf.h
src/sys/external/bsd/acpica/dist/resources: rsdump.c
src/sys/external/bsd/acpica/dist/tables: tbinstal.c
src/sys/external/bsd/acpica/dist/utilities: utprint.c
Log Message:
merge acpica 20180427
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
src/sys/external/bsd/acpica/dist/compiler/aslcompiler.h \
src/sys/external/bsd/acpica/dist/compiler/aslxref.c
cvs rdiff -u -r1.10 -r1.11 \
src/sys/external/bsd/acpica/dist/compiler/aslload.c
cvs rdiff -u -r1.20 -r1.21 \
src/sys/external/bsd/acpica/dist/compiler/aslutils.c
cvs rdiff -u -r1.9 -r1.10 src/sys/external/bsd/acpica/dist/debugger/dbnames.c
cvs rdiff -u -r1.7 -r1.8 src/sys/external/bsd/acpica/dist/debugger/dbtest.c
cvs rdiff -u -r1.13 -r1.14 src/sys/external/bsd/acpica/dist/include/acapps.h
cvs rdiff -u -r1.18 -r1.19 src/sys/external/bsd/acpica/dist/include/acpixf.h
cvs rdiff -u -r1.11 -r1.12 \
src/sys/external/bsd/acpica/dist/resources/rsdump.c
cvs rdiff -u -r1.12 -r1.13 src/sys/external/bsd/acpica/dist/tables/tbinstal.c
cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/acpica/dist/utilities/utprint.c
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.h
diff -u src/sys/external/bsd/acpica/dist/compiler/aslcompiler.h:1.11 src/sys/external/bsd/acpica/dist/compiler/aslcompiler.h:1.12
--- src/sys/external/bsd/acpica/dist/compiler/aslcompiler.h:1.11 Sat Apr 7 11:49:50 2018
+++ src/sys/external/bsd/acpica/dist/compiler/aslcompiler.h Fri May 4 20:12:15 2018
@@ -1079,6 +1079,15 @@ UtDumpBasicOp (
ACPI_PARSE_OBJECT *Op,
UINT32 Level);
+void *
+UtGetParentMethod (
+ ACPI_NAMESPACE_NODE *Node);
+
+BOOLEAN
+UtNodeIsDescendantOf (
+ ACPI_NAMESPACE_NODE *Node1,
+ ACPI_NAMESPACE_NODE *Node2);
+
void
UtDisplaySupportedTables (
void);
Index: src/sys/external/bsd/acpica/dist/compiler/aslxref.c
diff -u src/sys/external/bsd/acpica/dist/compiler/aslxref.c:1.11 src/sys/external/bsd/acpica/dist/compiler/aslxref.c:1.12
--- src/sys/external/bsd/acpica/dist/compiler/aslxref.c:1.11 Sat Apr 7 11:49:50 2018
+++ src/sys/external/bsd/acpica/dist/compiler/aslxref.c Fri May 4 20:12:15 2018
@@ -89,22 +89,6 @@ XfCheckFieldRange (
UINT32 FieldBitLength,
UINT32 AccessBitWidth);
-#ifdef __UNDER_DEVELOPMENT
-static ACPI_PARSE_OBJECT *
-XfGetParentMethod (
- ACPI_PARSE_OBJECT *Op);
-
-static void
-XfCheckIllegalReference (
- ACPI_PARSE_OBJECT *Op,
- ACPI_NAMESPACE_NODE *Node);
-
-static BOOLEAN
-XfIsObjectParental (
- ACPI_PARSE_OBJECT *MethodOp1,
- ACPI_PARSE_OBJECT *MethodOp2);
-#endif
-
/*******************************************************************************
*
@@ -594,7 +578,7 @@ XfNamespaceLocateBegin (
Gbl_NsLookupCount++;
Status = AcpiNsLookup (WalkState->ScopeInfo, Path, ObjectType,
- ACPI_IMODE_EXECUTE, Flags, WalkState, &(Node));
+ ACPI_IMODE_EXECUTE, Flags, WalkState, &Node);
if (ACPI_FAILURE (Status))
{
if (Status == AE_NOT_FOUND)
@@ -652,6 +636,26 @@ XfNamespaceLocateBegin (
return_ACPI_STATUS (Status);
}
+ /* Object was found above, check for an illegal forward reference */
+
+ if (Op->Asl.CompileFlags & OP_NOT_FOUND_DURING_LOAD)
+ {
+ /*
+ * During the load phase, this Op was flagged as a possible
+ * illegal forward reference
+ *
+ * Note: Allow "forward references" from within a method to an
+ * object that is not within any method (module-level code)
+ */
+ if (!WalkState->ScopeInfo || (UtGetParentMethod (Node) &&
+ !UtNodeIsDescendantOf (WalkState->ScopeInfo->Scope.Node,
+ UtGetParentMethod (Node))))
+ {
+ AslError (ASL_ERROR, ASL_MSG_ILLEGAL_FORWARD_REF, Op,
+ Op->Asl.ExternalName);
+ }
+ }
+
/* Check for a reference vs. name declaration */
if (!(OpInfo->Flags & AML_NAMED) &&
@@ -660,13 +664,6 @@ XfNamespaceLocateBegin (
/* This node has been referenced, mark it for reference check */
Node->Flags |= ANOBJ_IS_REFERENCED;
-
-#ifdef __UNDER_DEVELOPMENT
-
- /* Check for an illegal reference */
-
- XfCheckIllegalReference (Op, Node);
-#endif
}
/* Attempt to optimize the NamePath */
@@ -1097,178 +1094,3 @@ XfNamespaceLocateEnd (
return_ACPI_STATUS (AE_OK);
}
-
-
-#ifdef __UNDER_DEVELOPMENT
-/*******************************************************************************
- *
- * FUNCTION: XfIsObjectParental
- *
- * PARAMETERS: ChildOp - Op to be checked
- * PossibleParentOp - Determine if this op is in the family
- *
- * RETURN: TRUE if ChildOp is a descendent of PossibleParentOp
- *
- * DESCRIPTION: Determine if an Op is a descendent of another Op. Used to
- * detect if a method is declared within another method.
- *
- ******************************************************************************/
-
-static BOOLEAN
-XfIsObjectParental (
- ACPI_PARSE_OBJECT *ChildOp,
- ACPI_PARSE_OBJECT *PossibleParentOp)
-{
- ACPI_PARSE_OBJECT *ParentOp;
-
-
- /* Search upwards through the tree for possible parent */
-
- ParentOp = ChildOp;
- while (ParentOp)
- {
- if (ParentOp == PossibleParentOp)
- {
- return (TRUE);
- }
-
- ParentOp = ParentOp->Asl.Parent;
- }
-
- return (FALSE);
-}
-
-
-/*******************************************************************************
- *
- * FUNCTION: XfGetParentMethod
- *
- * PARAMETERS: Op - Op to be checked
- *
- * RETURN: Op for parent method. NULL if object is not within a method.
- *
- * DESCRIPTION: Determine if an object is within a control method. Used to
- * implement special rules for named references from within a
- * control method.
- *
- * NOTE: It would be better to have the parser set a flag in the Op if possible.
- *
- ******************************************************************************/
-
-static ACPI_PARSE_OBJECT *
-XfGetParentMethod (
- ACPI_PARSE_OBJECT *Op)
-{
- ACPI_PARSE_OBJECT *ParentOp;
-
-
- if (!Op)
- {
- return (NULL);
- }
-
- if (Op->Asl.ParseOpcode == PARSEOP_METHOD)
- {
- return (NULL);
- }
-
- /* Walk upwards through the parse tree, up to the root if necessary */
-
- ParentOp = Op;
- while (ParentOp)
- {
- if (ParentOp->Asl.ParseOpcode == PARSEOP_METHOD)
- {
- return (ParentOp);
- }
-
- ParentOp = ParentOp->Asl.Parent;
- }
-
- /* Object is not within a method */
-
- return (NULL);
-}
-
-
-/*******************************************************************************
- *
- * FUNCTION: XfCheckIllegalReference
- *
- * PARAMETERS: Op - Op referring to the target
- * TargetNode - Target of the reference
- *
- * RETURN: None. Emits error message for an illegal reference
- *
- * DESCRIPTION: Determine if a named reference is legal. A "named" reference
- * is something like: Store(ABCD, ...), where ABCD is an AML
- * Nameseg or Namepath.
- *
- * NOTE: Caller must ensure that the name Op is in fact a reference, and not
- * an actual name declaration (creation of a named object).
- *
- ******************************************************************************/
-
-static void
-XfCheckIllegalReference (
- ACPI_PARSE_OBJECT *Op,
- ACPI_NAMESPACE_NODE *TargetNode)
-{
- ACPI_PARSE_OBJECT *MethodOp1;
- ACPI_PARSE_OBJECT *MethodOp2;
- ACPI_PARSE_OBJECT *TargetOp;
-
-
- /*
- * Check for an illegal reference to a named object:
- *
- * 1) References from one control method to another, non-parent
- * method are not allowed, they will fail at runtime.
- *
- * 2) Forward references within a control method are not allowed.
- * AML interpreters use a one-pass parse of control methods
- * so these forward references will fail at runtime.
- */
- TargetOp = TargetNode->Op;
-
- MethodOp1 = XfGetParentMethod (Op);
- MethodOp2 = XfGetParentMethod (TargetOp);
-
- /* Are both objects within control method(s)? */
-
- if (!MethodOp1 || !MethodOp2)
- {
- return;
- }
-
- /* Objects not in the same method? */
-
- if (MethodOp1 != MethodOp2)
- {
- /*
- * 1) Cross-method named reference
- *
- * This is OK if and only if the target reference is within in a
- * method that is a parent of current method
- */
- if (!XfIsObjectParental (MethodOp1, MethodOp2))
- {
- AslError (ASL_ERROR, ASL_MSG_ILLEGAL_METHOD_REF, Op,
- Op->Asl.ExternalName);
- }
- }
-
- /*
- * 2) Both reference and target are in the same method. Check if this is
- * an (illegal) forward reference by examining the exact source code
- * location of each (the referenced object and the object declaration).
- * This is a bit nasty, yet effective.
- */
- else if (Op->Asl.LogicalByteOffset < TargetOp->Asl.LogicalByteOffset)
- {
- AslError (ASL_ERROR, ASL_MSG_ILLEGAL_FORWARD_REF, Op,
- Op->Asl.ExternalName);
- }
-
-}
-#endif
Index: src/sys/external/bsd/acpica/dist/compiler/aslload.c
diff -u src/sys/external/bsd/acpica/dist/compiler/aslload.c:1.10 src/sys/external/bsd/acpica/dist/compiler/aslload.c:1.11
--- src/sys/external/bsd/acpica/dist/compiler/aslload.c:1.10 Sat Apr 7 11:49:50 2018
+++ src/sys/external/bsd/acpica/dist/compiler/aslload.c Fri May 4 20:12:15 2018
@@ -45,9 +45,10 @@
#include "amlcode.h"
#include "acdispat.h"
#include "acnamesp.h"
-
+#include "acparser.h"
#include "aslcompiler.y.h"
+
#define _COMPONENT ACPI_COMPILER
ACPI_MODULE_NAME ("aslload")
@@ -362,9 +363,13 @@ LdNamespace1Begin (
UINT32 i;
BOOLEAN ForceNewScope = FALSE;
ACPI_OWNER_ID OwnerId = 0;
+ const ACPI_OPCODE_INFO *OpInfo;
+ ACPI_PARSE_OBJECT *ParentOp;
ACPI_FUNCTION_NAME (LdNamespace1Begin);
+
+
ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH, "Op %p [%s]\n",
Op, Op->Asl.ParseOpName));
@@ -440,6 +445,69 @@ LdNamespace1Begin (
return (AE_OK);
}
+ /* Check for a possible illegal forward reference */
+
+ if ((Op->Asl.ParseOpcode == PARSEOP_NAMESEG) ||
+ (Op->Asl.ParseOpcode == PARSEOP_NAMESTRING))
+ {
+ /*
+ * Op->Asl.Namepath will be NULL for these opcodes.
+ * These opcodes are guaranteed to have a parent.
+ * Examine the parent opcode.
+ */
+ Status = AE_OK;
+ ParentOp = Op->Asl.Parent;
+ OpInfo = AcpiPsGetOpcodeInfo (ParentOp->Asl.AmlOpcode);
+
+ /*
+ * Exclude all operators that actually declare a new name:
+ * Name (ABCD, 1) -> Ignore (AML_CLASS_NAMED_OBJECT)
+ * We only want references to named objects:
+ * Store (2, WXYZ) -> Attempt to resolve the name
+ */
+ if (OpInfo->Class == AML_CLASS_NAMED_OBJECT)
+ {
+ return (AE_OK);
+ }
+
+ /*
+ * Check if the referenced object exists at this point during
+ * the load:
+ * 1) If it exists, then this cannot be a forward reference.
+ * 2) If it does not exist, it could be a forward reference or
+ * it truly does not exist (and no external declaration).
+ */
+ Status = AcpiNsLookup (WalkState->ScopeInfo,
+ Op->Asl.Value.Name, ACPI_TYPE_ANY, ACPI_IMODE_EXECUTE,
+ ACPI_NS_SEARCH_PARENT | ACPI_NS_DONT_OPEN_SCOPE,
+ WalkState, &Node);
+ if (Status == AE_NOT_FOUND)
+ {
+ /*
+ * This is either a foward reference or the object truly
+ * does not exist. The two cases can only be differentiated
+ * during the cross-reference stage later. Mark the Op/Name
+ * as not-found for now to indicate the need for further
+ * processing.
+ *
+ * Special case: Allow forward references from elements of
+ * Package objects. This provides compatibility with other
+ * ACPI implementations. To correctly implement this, the
+ * ACPICA table load defers package resolution until the entire
+ * namespace has been loaded.
+ */
+ if ((ParentOp->Asl.ParseOpcode != PARSEOP_PACKAGE) &&
+ (ParentOp->Asl.ParseOpcode != PARSEOP_VAR_PACKAGE))
+ {
+ Op->Asl.CompileFlags |= OP_NOT_FOUND_DURING_LOAD;
+ }
+
+ return (AE_OK);
+ }
+
+ return (Status);
+ }
+
Path = Op->Asl.Namepath;
if (!Path)
{
@@ -476,7 +544,6 @@ LdNamespace1Begin (
}
break;
-
case PARSEOP_EXTERNAL:
/*
* "External" simply enters a name and type into the namespace.
@@ -658,7 +725,6 @@ LdNamespace1Begin (
Status = AE_OK;
goto FinishNode;
-
default:
ObjectType = AslMapNamedOpcodeToDataType (Op->Asl.AmlOpcode);
Index: src/sys/external/bsd/acpica/dist/compiler/aslutils.c
diff -u src/sys/external/bsd/acpica/dist/compiler/aslutils.c:1.20 src/sys/external/bsd/acpica/dist/compiler/aslutils.c:1.21
--- src/sys/external/bsd/acpica/dist/compiler/aslutils.c:1.20 Sat Apr 7 11:49:50 2018
+++ src/sys/external/bsd/acpica/dist/compiler/aslutils.c Fri May 4 20:12:15 2018
@@ -130,6 +130,97 @@ UtQueryForOverwrite (
/*******************************************************************************
*
+ * FUNCTION: UtNodeIsDescendantOf
+ *
+ * PARAMETERS: Node1 - Child node
+ * Node2 - Possible parent node
+ *
+ * RETURN: Boolean
+ *
+ * DESCRIPTION: Returns TRUE if Node1 is a descendant of Node2. Otherwise,
+ * return FALSE. Note, we assume a NULL Node2 element to be the
+ * topmost (root) scope. All nodes are descendants of the root.
+ * Note: Nodes at the same level (siblings) are not considered
+ * descendants.
+ *
+ ******************************************************************************/
+
+BOOLEAN
+UtNodeIsDescendantOf (
+ ACPI_NAMESPACE_NODE *Node1,
+ ACPI_NAMESPACE_NODE *Node2)
+{
+
+ if (Node1 == Node2)
+ {
+ return (FALSE);
+ }
+
+ if (!Node2)
+ {
+ return (TRUE); /* All nodes descend from the root */
+ }
+
+ /* Walk upward until the root is reached or parent is found */
+
+ while (Node1)
+ {
+ if (Node1 == Node2)
+ {
+ return (TRUE);
+ }
+
+ Node1 = Node1->Parent;
+ }
+
+ return (FALSE);
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION: UtGetParentMethod
+ *
+ * PARAMETERS: Node - Namespace node for any object
+ *
+ * RETURN: Namespace node for the parent method
+ * NULL - object is not within a method
+ *
+ * DESCRIPTION: Find the parent (owning) method node for a namespace object
+ *
+ ******************************************************************************/
+
+void *
+UtGetParentMethod (
+ ACPI_NAMESPACE_NODE *Node)
+{
+ ACPI_NAMESPACE_NODE *ParentNode;
+
+
+ if (!Node)
+ {
+ return (NULL);
+ }
+
+ /* Walk upward until a method is found, or the root is reached */
+
+ ParentNode = Node->Parent;
+ while (ParentNode)
+ {
+ if (ParentNode->Type == ACPI_TYPE_METHOD)
+ {
+ return (ParentNode);
+ }
+
+ ParentNode = ParentNode->Parent;
+ }
+
+ return (NULL); /* Object is not within a control method */
+}
+
+
+/*******************************************************************************
+ *
* FUNCTION: UtDisplaySupportedTables
*
* PARAMETERS: None
Index: src/sys/external/bsd/acpica/dist/debugger/dbnames.c
diff -u src/sys/external/bsd/acpica/dist/debugger/dbnames.c:1.9 src/sys/external/bsd/acpica/dist/debugger/dbnames.c:1.10
--- src/sys/external/bsd/acpica/dist/debugger/dbnames.c:1.9 Sat Apr 7 11:49:50 2018
+++ src/sys/external/bsd/acpica/dist/debugger/dbnames.c Fri May 4 20:12:15 2018
@@ -264,8 +264,17 @@ AcpiDbDumpNamespace (
}
AcpiDbSetOutputDestination (ACPI_DB_DUPLICATE_OUTPUT);
- AcpiOsPrintf ("ACPI Namespace (from %4.4s (%p) subtree):\n",
- ((ACPI_NAMESPACE_NODE *) SubtreeEntry)->Name.Ascii, SubtreeEntry);
+
+ if (((ACPI_NAMESPACE_NODE *) SubtreeEntry)->Parent)
+ {
+ AcpiOsPrintf ("ACPI Namespace (from %4.4s (%p) subtree):\n",
+ ((ACPI_NAMESPACE_NODE *) SubtreeEntry)->Name.Ascii, SubtreeEntry);
+ }
+ else
+ {
+ AcpiOsPrintf ("ACPI Namespace (from %s):\n",
+ ACPI_NAMESPACE_ROOT);
+ }
/* Display the subtree */
Index: src/sys/external/bsd/acpica/dist/debugger/dbtest.c
diff -u src/sys/external/bsd/acpica/dist/debugger/dbtest.c:1.7 src/sys/external/bsd/acpica/dist/debugger/dbtest.c:1.8
--- src/sys/external/bsd/acpica/dist/debugger/dbtest.c:1.7 Sat Apr 7 11:49:50 2018
+++ src/sys/external/bsd/acpica/dist/debugger/dbtest.c Fri May 4 20:12:15 2018
@@ -81,6 +81,10 @@ AcpiDbTestStringType (
UINT32 ByteLength);
static ACPI_STATUS
+AcpiDbTestPackageType (
+ ACPI_NAMESPACE_NODE *Node);
+
+static ACPI_STATUS
AcpiDbReadFromObject (
ACPI_NAMESPACE_NODE *Node,
ACPI_OBJECT_TYPE ExpectedType,
@@ -348,6 +352,11 @@ AcpiDbTestOneObject (
BitLength = ByteLength * 8;
break;
+ case ACPI_TYPE_PACKAGE:
+
+ LocalType = ACPI_TYPE_PACKAGE;
+ break;
+
case ACPI_TYPE_FIELD_UNIT:
case ACPI_TYPE_BUFFER_FIELD:
case ACPI_TYPE_LOCAL_REGION_FIELD:
@@ -382,6 +391,7 @@ AcpiDbTestOneObject (
AcpiOsPrintf ("%14s: %4.4s",
AcpiUtGetTypeName (Node->Type), Node->Name.Ascii);
+
if (!ObjDesc)
{
AcpiOsPrintf (" Ignoring, no attached object\n");
@@ -402,13 +412,12 @@ AcpiDbTestOneObject (
case ACPI_ADR_SPACE_SYSTEM_MEMORY:
case ACPI_ADR_SPACE_SYSTEM_IO:
case ACPI_ADR_SPACE_PCI_CONFIG:
- case ACPI_ADR_SPACE_EC:
break;
default:
- AcpiOsPrintf (" %s space is not supported [%4.4s]\n",
+ AcpiOsPrintf (" %s space is not supported in this command [%4.4s]\n",
AcpiUtGetRegionName (RegionObj->Region.SpaceId),
RegionObj->Region.Node->Name.Ascii);
return (AE_OK);
@@ -438,6 +447,11 @@ AcpiDbTestOneObject (
Status = AcpiDbTestBufferType (Node, BitLength);
break;
+ case ACPI_TYPE_PACKAGE:
+
+ Status = AcpiDbTestPackageType (Node);
+ break;
+
default:
AcpiOsPrintf (" Ignoring, type not implemented (%2.2X)",
@@ -445,6 +459,14 @@ AcpiDbTestOneObject (
break;
}
+ /* Exit on error, but don't abort the namespace walk */
+
+ if (ACPI_FAILURE (Status))
+ {
+ Status = AE_OK;
+ goto Exit;
+ }
+
switch (Node->Type)
{
case ACPI_TYPE_LOCAL_REGION_FIELD:
@@ -452,12 +474,14 @@ AcpiDbTestOneObject (
RegionObj = ObjDesc->Field.RegionObj;
AcpiOsPrintf (" (%s)",
AcpiUtGetRegionName (RegionObj->Region.SpaceId));
+
break;
default:
break;
}
+Exit:
AcpiOsPrintf ("\n");
return (Status);
}
@@ -516,7 +540,6 @@ AcpiDbTestIntegerType (
{
ValueToWrite = 0;
}
-
/* Write a new value */
WriteValue.Type = ACPI_TYPE_INTEGER;
@@ -809,6 +832,40 @@ Exit:
/*******************************************************************************
*
+ * FUNCTION: AcpiDbTestPackageType
+ *
+ * PARAMETERS: Node - Parent NS node for the object
+ *
+ * RETURN: Status
+ *
+ * DESCRIPTION: Test read for a Package object.
+ *
+ ******************************************************************************/
+
+static ACPI_STATUS
+AcpiDbTestPackageType (
+ ACPI_NAMESPACE_NODE *Node)
+{
+ ACPI_OBJECT *Temp1 = NULL;
+ ACPI_STATUS Status;
+
+
+ /* Read the original value */
+
+ Status = AcpiDbReadFromObject (Node, ACPI_TYPE_PACKAGE, &Temp1);
+ if (ACPI_FAILURE (Status))
+ {
+ return (Status);
+ }
+
+ AcpiOsPrintf (" %8.8X Elements", Temp1->Package.Count);
+ AcpiOsFree (Temp1);
+ return (Status);
+}
+
+
+/*******************************************************************************
+ *
* FUNCTION: AcpiDbReadFromObject
*
* PARAMETERS: Node - Parent NS node for the object
@@ -849,8 +906,8 @@ AcpiDbReadFromObject (
AcpiGbl_MethodExecuting = TRUE;
Status = AcpiEvaluateObject (ReadHandle, NULL,
&ParamObjects, &ReturnObj);
- AcpiGbl_MethodExecuting = FALSE;
+ AcpiGbl_MethodExecuting = FALSE;
if (ACPI_FAILURE (Status))
{
AcpiOsPrintf ("Could not read from object, %s",
@@ -865,6 +922,7 @@ AcpiDbReadFromObject (
case ACPI_TYPE_INTEGER:
case ACPI_TYPE_BUFFER:
case ACPI_TYPE_STRING:
+ case ACPI_TYPE_PACKAGE:
/*
* Did we receive the type we wanted? Most important for the
* Integer/Buffer case (when a field is larger than an Integer,
@@ -876,6 +934,7 @@ AcpiDbReadFromObject (
AcpiUtGetTypeName (ExpectedType),
AcpiUtGetTypeName (RetValue->Type));
+ AcpiOsFree (ReturnObj.Pointer);
return (AE_TYPE);
}
Index: src/sys/external/bsd/acpica/dist/include/acapps.h
diff -u src/sys/external/bsd/acpica/dist/include/acapps.h:1.13 src/sys/external/bsd/acpica/dist/include/acapps.h:1.14
--- src/sys/external/bsd/acpica/dist/include/acapps.h:1.13 Sat Apr 7 11:49:51 2018
+++ src/sys/external/bsd/acpica/dist/include/acapps.h Fri May 4 20:12:15 2018
@@ -224,6 +224,10 @@ FlSplitInputPathname (
char **OutFilename);
char *
+FlGetFileBasename (
+ char *FilePathname);
+
+char *
AdGenerateFilename (
char *Prefix,
char *TableId);
Index: src/sys/external/bsd/acpica/dist/include/acpixf.h
diff -u src/sys/external/bsd/acpica/dist/include/acpixf.h:1.18 src/sys/external/bsd/acpica/dist/include/acpixf.h:1.19
--- src/sys/external/bsd/acpica/dist/include/acpixf.h:1.18 Sat Apr 7 11:49:51 2018
+++ src/sys/external/bsd/acpica/dist/include/acpixf.h Fri May 4 20:12:15 2018
@@ -46,7 +46,7 @@
/* Current ACPICA subsystem version in YYYYMMDD format */
-#define ACPI_CA_VERSION 0x20180313
+#define ACPI_CA_VERSION 0x20180427
#include "acconfig.h"
#include "actypes.h"
Index: src/sys/external/bsd/acpica/dist/resources/rsdump.c
diff -u src/sys/external/bsd/acpica/dist/resources/rsdump.c:1.11 src/sys/external/bsd/acpica/dist/resources/rsdump.c:1.12
--- src/sys/external/bsd/acpica/dist/resources/rsdump.c:1.11 Sat Apr 7 11:49:51 2018
+++ src/sys/external/bsd/acpica/dist/resources/rsdump.c Fri May 4 20:12:15 2018
@@ -660,7 +660,7 @@ AcpiRsDumpByteList (
UINT16 Length,
UINT8 *Data)
{
- UINT8 i;
+ UINT16 i;
for (i = 0; i < Length; i++)
Index: src/sys/external/bsd/acpica/dist/tables/tbinstal.c
diff -u src/sys/external/bsd/acpica/dist/tables/tbinstal.c:1.12 src/sys/external/bsd/acpica/dist/tables/tbinstal.c:1.13
--- src/sys/external/bsd/acpica/dist/tables/tbinstal.c:1.12 Sat Apr 7 11:49:51 2018
+++ src/sys/external/bsd/acpica/dist/tables/tbinstal.c Fri May 4 20:12:16 2018
@@ -128,7 +128,7 @@ AcpiTbInstallTableWithOverride (
* DESCRIPTION: This function is called to verify and install an ACPI table.
* When this function is called by "Load" or "LoadTable" opcodes,
* or by AcpiLoadTable() API, the "Reload" parameter is set.
- * After sucessfully returning from this function, table is
+ * After successfully returning from this function, table is
* "INSTALLED" but not "VALIDATED".
*
******************************************************************************/
Index: src/sys/external/bsd/acpica/dist/utilities/utprint.c
diff -u src/sys/external/bsd/acpica/dist/utilities/utprint.c:1.5 src/sys/external/bsd/acpica/dist/utilities/utprint.c:1.6
--- src/sys/external/bsd/acpica/dist/utilities/utprint.c:1.5 Sat Apr 7 11:49:52 2018
+++ src/sys/external/bsd/acpica/dist/utilities/utprint.c Fri May 4 20:12:16 2018
@@ -617,6 +617,7 @@ vsnprintf (
case 'X':
Type |= ACPI_FORMAT_UPPER;
+ /* FALLTHROUGH */
case 'x':
