summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--source/components/dispatcher/dsargs.c1
-rw-r--r--source/components/dispatcher/dsopcode.c4
-rw-r--r--source/components/dispatcher/dswload.c2
-rw-r--r--source/components/executer/exnames.c7
-rw-r--r--source/components/namespace/nsinit.c7
-rw-r--r--source/components/namespace/nsnames.c3
-rw-r--r--source/components/namespace/nsparse.c7
-rw-r--r--source/components/parser/psargs.c7
-rw-r--r--source/components/parser/psloop.c4
-rw-r--r--source/components/parser/psparse.c2
-rw-r--r--source/components/utilities/utcache.c5
-rw-r--r--source/components/utilities/utdelete.c16
12 files changed, 36 insertions, 29 deletions
diff --git a/source/components/dispatcher/dsargs.c b/source/components/dispatcher/dsargs.c
index 26adfb0b2..dd8c30f0f 100644
--- a/source/components/dispatcher/dsargs.c
+++ b/source/components/dispatcher/dsargs.c
@@ -481,6 +481,7 @@ AcpiDsGetPackageArguments (
Status = AcpiDsExecuteArguments (Node, Node,
ObjDesc->Package.AmlLength, ObjDesc->Package.AmlStart);
+
return_ACPI_STATUS (Status);
}
diff --git a/source/components/dispatcher/dsopcode.c b/source/components/dispatcher/dsopcode.c
index 71928fb77..038993c77 100644
--- a/source/components/dispatcher/dsopcode.c
+++ b/source/components/dispatcher/dsopcode.c
@@ -752,8 +752,8 @@ AcpiDsEvalDataObjectOperands (
if (!Op->Common.Value.Arg)
{
ACPI_ERROR ((AE_INFO,
- "Dispatch: Missing child while executing TermArg for %X",
- Op->Common.AmlOpcode));
+ "Missing child while evaluating opcode %4.4X, Op %p",
+ Op->Common.AmlOpcode, Op));
return_ACPI_STATUS (AE_OK);
}
diff --git a/source/components/dispatcher/dswload.c b/source/components/dispatcher/dswload.c
index 9a5da369d..91f5b3050 100644
--- a/source/components/dispatcher/dswload.c
+++ b/source/components/dispatcher/dswload.c
@@ -264,7 +264,7 @@ AcpiDsLoad1BeginOp (
UINT32 Flags;
- ACPI_FUNCTION_TRACE (DsLoad1BeginOp);
+ ACPI_FUNCTION_TRACE_PTR (DsLoad1BeginOp, WalkState->Op);
Op = WalkState->Op;
diff --git a/source/components/executer/exnames.c b/source/components/executer/exnames.c
index 3dc199863..ce000e5d0 100644
--- a/source/components/executer/exnames.c
+++ b/source/components/executer/exnames.c
@@ -309,14 +309,11 @@ AcpiExNameSegment (
return_ACPI_STATUS (AE_CTRL_PENDING);
}
- ACPI_DEBUG_PRINT ((ACPI_DB_LOAD, "Bytes from stream:\n"));
-
for (Index = 0;
(Index < ACPI_NAME_SIZE) && (AcpiUtValidNameChar (*AmlAddress, 0));
Index++)
{
CharBuf[Index] = *AmlAddress++;
- ACPI_DEBUG_PRINT ((ACPI_DB_LOAD, "%c\n", CharBuf[Index]));
}
@@ -330,9 +327,9 @@ AcpiExNameSegment (
if (NameString)
{
- strcat (NameString, CharBuf);
ACPI_DEBUG_PRINT ((ACPI_DB_NAMES,
- "Appended to - %s\n", NameString));
+ "Appending NameSeg %s\n", CharBuf));
+ strcat (NameString, CharBuf);
}
else
{
diff --git a/source/components/namespace/nsinit.c b/source/components/namespace/nsinit.c
index 4a075bed5..dc76db9f6 100644
--- a/source/components/namespace/nsinit.c
+++ b/source/components/namespace/nsinit.c
@@ -418,7 +418,7 @@ ErrorExit:
* RETURN: Status
*
* DESCRIPTION: Callback from AcpiWalkNamespace. Invoked for every object
- * within the namespace.
+ * within the namespace.
*
* Currently, the only objects that require initialization are:
* 1) Methods
@@ -540,6 +540,10 @@ AcpiNsInitOneObject (
break;
}
+ ACPI_DEBUG_PRINT_RAW ((ACPI_DB_PARSE,
+ "%s: Completing resolution of Package elements\n",
+ ACPI_GET_FUNCTION_NAME));
+
/*
* Resolve all named references in package objects (and all
* sub-packages). This action has been deferred until the entire
@@ -548,6 +552,7 @@ AcpiNsInitOneObject (
*/
Status = AcpiUtWalkPackageTree (ObjDesc, NULL,
AcpiDsInitPackageElement, NULL);
+
ObjDesc->Package.Flags |= AOPOBJ_DATA_VALID;
break;
diff --git a/source/components/namespace/nsnames.c b/source/components/namespace/nsnames.c
index b29eac421..097037cbe 100644
--- a/source/components/namespace/nsnames.c
+++ b/source/components/namespace/nsnames.c
@@ -511,6 +511,9 @@ AcpiNsGetNormalizedPathname (
(void) AcpiNsBuildNormalizedPath (Node, NameBuffer, Size, NoTrailing);
+ ACPI_DEBUG_PRINT_RAW ((ACPI_DB_NAMES, "%s: Path \"%s\"\n",
+ ACPI_GET_FUNCTION_NAME, NameBuffer));
+
return_PTR (NameBuffer);
}
diff --git a/source/components/namespace/nsparse.c b/source/components/namespace/nsparse.c
index baa37d268..e12583e56 100644
--- a/source/components/namespace/nsparse.c
+++ b/source/components/namespace/nsparse.c
@@ -232,8 +232,9 @@ AcpiNsExecuteTable (
goto Cleanup;
}
- ACPI_DEBUG_PRINT ((ACPI_DB_PARSE,
- "Create table code block: %p\n", MethodObj));
+ ACPI_DEBUG_PRINT_RAW ((ACPI_DB_PARSE,
+ "%s: Create table pseudo-method for [%4.4s] @%p, method %p\n",
+ ACPI_GET_FUNCTION_NAME, Table->Signature, Table, MethodObj));
MethodObj->Method.AmlStart = AmlStart;
MethodObj->Method.AmlLength = AmlLength;
@@ -404,7 +405,7 @@ AcpiNsParseTable (
if (AcpiGbl_ParseTableAsTermList)
{
- ACPI_DEBUG_PRINT ((ACPI_DB_PARSE, "**** Start load pass\n"));
+ ACPI_DEBUG_PRINT ((ACPI_DB_PARSE, "**** Start table execution pass\n"));
Status = AcpiNsExecuteTable (TableIndex, StartNode);
if (ACPI_FAILURE (Status))
diff --git a/source/components/parser/psargs.c b/source/components/parser/psargs.c
index 0e0b1002d..c9c173717 100644
--- a/source/components/parser/psargs.c
+++ b/source/components/parser/psargs.c
@@ -1067,10 +1067,9 @@ AcpiPsGetNextArg (
case ARGP_DATAOBJ:
case ARGP_TERMARG:
-
- ACPI_DEBUG_PRINT ((ACPI_DB_PARSE,
- "**** TermArg/DataObj: %s (%2.2X)\n",
- AcpiUtGetArgumentTypeName (ArgType), ArgType));
+ ACPI_DEBUG_PRINT ((ACPI_DB_PARSE,
+ "**** TermArg/DataObj: %s (%2.2X)\n",
+ AcpiUtGetArgumentTypeName (ArgType), ArgType));
/* Single complex argument, nothing returned */
diff --git a/source/components/parser/psloop.c b/source/components/parser/psloop.c
index fd868f50f..74e8f0d6e 100644
--- a/source/components/parser/psloop.c
+++ b/source/components/parser/psloop.c
@@ -283,7 +283,7 @@ AcpiPsGetArguments (
}
ACPI_DEBUG_PRINT ((ACPI_DB_PARSE,
- "Final argument count: %u pass %u\n",
+ "Final argument count: %8.8X pass %u\n",
WalkState->ArgCount, WalkState->PassNumber));
/*
@@ -697,7 +697,7 @@ AcpiPsParseLoop (
/* Check for arguments that need to be processed */
ACPI_DEBUG_PRINT ((ACPI_DB_PARSE,
- "Parseloop: argument count: %u\n", WalkState->ArgCount));
+ "Parseloop: argument count: %8.8X\n", WalkState->ArgCount));
if (WalkState->ArgCount)
{
diff --git a/source/components/parser/psparse.c b/source/components/parser/psparse.c
index ce7ae94a8..0ad62b771 100644
--- a/source/components/parser/psparse.c
+++ b/source/components/parser/psparse.c
@@ -576,7 +576,7 @@ AcpiPsParseAml (
if (!WalkState->ParserState.Aml)
{
- return_ACPI_STATUS (AE_NULL_OBJECT);
+ return_ACPI_STATUS (AE_BAD_ADDRESS);
}
/* Create and initialize a new thread state */
diff --git a/source/components/utilities/utcache.c b/source/components/utilities/utcache.c
index 881dbf350..b324f28cf 100644
--- a/source/components/utilities/utcache.c
+++ b/source/components/utilities/utcache.c
@@ -415,8 +415,9 @@ AcpiOsAcquireObject (
Cache->CurrentDepth--;
ACPI_MEM_TRACKING (Cache->Hits++);
- ACPI_DEBUG_PRINT ((ACPI_DB_EXEC,
- "Object %p from %s cache\n", Object, Cache->ListName));
+ ACPI_DEBUG_PRINT_RAW ((ACPI_DB_EXEC,
+ "%s: Object %p from %s cache\n",
+ ACPI_GET_FUNCTION_NAME, Object, Cache->ListName));
Status = AcpiUtReleaseMutex (ACPI_MTX_CACHES);
if (ACPI_FAILURE (Status))
diff --git a/source/components/utilities/utdelete.c b/source/components/utilities/utdelete.c
index 377ddfe5b..4565d8fa5 100644
--- a/source/components/utilities/utdelete.c
+++ b/source/components/utilities/utdelete.c
@@ -454,8 +454,8 @@ AcpiUtDeleteInternalObj (
/* Now the object can be safely deleted */
- ACPI_DEBUG_PRINT ((ACPI_DB_ALLOCATIONS, "Deleting Object %p [%s]\n",
- Object, AcpiUtGetObjectTypeName (Object)));
+ ACPI_DEBUG_PRINT_RAW ((ACPI_DB_ALLOCATIONS, "%s: Deleting Object %p [%s]\n",
+ ACPI_GET_FUNCTION_NAME, Object, AcpiUtGetObjectTypeName (Object)));
AcpiUtDeleteObjectDesc (Object);
return_VOID;
@@ -581,9 +581,9 @@ AcpiUtUpdateRefCount (
Object));
}
- ACPI_DEBUG_PRINT ((ACPI_DB_ALLOCATIONS,
- "Obj %p Type %.2X Refs %.2X [Decremented]\n",
- Object, Object->Common.Type, NewCount));
+ ACPI_DEBUG_PRINT_RAW ((ACPI_DB_ALLOCATIONS,
+ "%s: Obj %p Type %.2X Refs %.2X [Decremented]\n",
+ ACPI_GET_FUNCTION_NAME, Object, Object->Common.Type, NewCount));
/* Actually delete the object on a reference count of zero */
@@ -906,9 +906,9 @@ AcpiUtRemoveReference (
return;
}
- ACPI_DEBUG_PRINT ((ACPI_DB_ALLOCATIONS,
- "Obj %p Current Refs=%X [To Be Decremented]\n",
- Object, Object->Common.ReferenceCount));
+ ACPI_DEBUG_PRINT_RAW ((ACPI_DB_ALLOCATIONS,
+ "%s: Obj %p Current Refs=%X [To Be Decremented]\n",
+ ACPI_GET_FUNCTION_NAME, Object, Object->Common.ReferenceCount));
/*
* Decrement the reference count, and only actually delete the object
View Lorry Controller Status