diff --git a/source/components/debugger/dbcmds.c b/source/components/debugger/dbcmds.c index 500eb8d64..84742645f 100644 --- a/source/components/debugger/dbcmds.c +++ b/source/components/debugger/dbcmds.c @@ -1,7 +1,7 @@ /******************************************************************************* * * Module Name: dbcmds - debug commands and output routines - * $Revision: 1.48 $ + * $Revision: 1.49 $ * ******************************************************************************/ @@ -128,7 +128,7 @@ #ifdef ENABLE_DEBUGGER -#define _COMPONENT DEBUGGER +#define _COMPONENT ACPI_DEBUGGER MODULE_NAME ("dbcmds") diff --git a/source/components/debugger/dbdisply.c b/source/components/debugger/dbdisply.c index 7ceae0cc4..42ae2b571 100644 --- a/source/components/debugger/dbdisply.c +++ b/source/components/debugger/dbdisply.c @@ -1,7 +1,7 @@ /******************************************************************************* * * Module Name: dbdisply - debug display commands - * $Revision: 1.41 $ + * $Revision: 1.43 $ * ******************************************************************************/ @@ -129,7 +129,7 @@ #ifdef ENABLE_DEBUGGER -#define _COMPONENT DEBUGGER +#define _COMPONENT ACPI_DEBUGGER MODULE_NAME ("dbdisply") @@ -498,7 +498,7 @@ AcpiDbDisplayInternalObject ( switch (ObjDesc->Common.Type) { case INTERNAL_TYPE_REFERENCE: - switch (ObjDesc->Reference.OpCode) + switch (ObjDesc->Reference.Opcode) { case AML_ZERO_OP: AcpiOsPrintf ("[Const] Number %.8X", 0); diff --git a/source/components/debugger/dbexec.c b/source/components/debugger/dbexec.c index d16407e04..223bdf27f 100644 --- a/source/components/debugger/dbexec.c +++ b/source/components/debugger/dbexec.c @@ -1,7 +1,7 @@ /******************************************************************************* * * Module Name: dbexec - debugger control method execution - * $Revision: 1.21 $ + * $Revision: 1.23 $ * ******************************************************************************/ @@ -128,7 +128,7 @@ #ifdef ENABLE_DEBUGGER -#define _COMPONENT DEBUGGER +#define _COMPONENT ACPI_DEBUGGER MODULE_NAME ("dbexec") @@ -342,7 +342,8 @@ AcpiDbExecute ( if (ReturnObj.Length) { - AcpiOsPrintf ("Execution of %s returned object %p\n", Info.Pathname, ReturnObj.Pointer); + AcpiOsPrintf ("Execution of %s returned object %p Buflen %X\n", + Info.Pathname, ReturnObj.Pointer, ReturnObj.Length); AcpiDbDumpObject (ReturnObj.Pointer, 1); } } @@ -381,7 +382,8 @@ AcpiDbMethodThread ( { if (ReturnObj.Length) { - AcpiOsPrintf ("Execution of %s returned object %p\n", Info->Pathname, ReturnObj.Pointer); + AcpiOsPrintf ("Execution of %s returned object %p Buflen %X\n", + Info->Pathname, ReturnObj.Pointer, ReturnObj.Length); AcpiDbDumpObject (ReturnObj.Pointer, 1); } } diff --git a/source/components/debugger/dbfileio.c b/source/components/debugger/dbfileio.c index 4628503d1..24b1984ae 100644 --- a/source/components/debugger/dbfileio.c +++ b/source/components/debugger/dbfileio.c @@ -2,7 +2,7 @@ * * Module Name: dbfileio - Debugger file I/O commands. These can't usually * be used when running the debugger in Ring 0 (Kernel mode) - * $Revision: 1.37 $ + * $Revision: 1.39 $ * ******************************************************************************/ @@ -125,7 +125,7 @@ #ifdef ENABLE_DEBUGGER -#define _COMPONENT DEBUGGER +#define _COMPONENT ACPI_DEBUGGER MODULE_NAME ("dbfileio") @@ -240,6 +240,10 @@ AcpiDbOpenDebugFile ( STRCPY (DebugFilename, Name); OutputToFile = TRUE; } + else + { + AcpiOsPrintf ("Could not open debug file %s\n", Name); + } #endif } diff --git a/source/components/debugger/dbhistry.c b/source/components/debugger/dbhistry.c index 045661bd7..2340aa215 100644 --- a/source/components/debugger/dbhistry.c +++ b/source/components/debugger/dbhistry.c @@ -1,7 +1,7 @@ /****************************************************************************** * * Module Name: dbhistry - debugger HISTORY command - * $Revision: 1.17 $ + * $Revision: 1.18 $ * *****************************************************************************/ @@ -128,7 +128,7 @@ #ifdef ENABLE_DEBUGGER -#define _COMPONENT DEBUGGER +#define _COMPONENT ACPI_DEBUGGER MODULE_NAME ("dbhistry") diff --git a/source/components/debugger/dbinput.c b/source/components/debugger/dbinput.c index 60b93fff5..4d18dadfc 100644 --- a/source/components/debugger/dbinput.c +++ b/source/components/debugger/dbinput.c @@ -1,7 +1,7 @@ /******************************************************************************* * * Module Name: dbinput - user front-end to the AML debugger - * $Revision: 1.54 $ + * $Revision: 1.58 $ * ******************************************************************************/ @@ -125,7 +125,7 @@ #ifdef ENABLE_DEBUGGER -#define _COMPONENT DEBUGGER +#define _COMPONENT ACPI_DEBUGGER MODULE_NAME ("dbinput") @@ -153,6 +153,7 @@ BOOLEAN opt_disasm = FALSE; BOOLEAN opt_stats = FALSE; BOOLEAN opt_parse_jit = FALSE; BOOLEAN opt_verbose = TRUE; +BOOLEAN opt_ini_methods = TRUE; /* @@ -190,6 +191,7 @@ enum AcpiAmlDebuggerCommands CMD_LIST, CMD_LOAD, CMD_LOCALS, + CMD_LOCKS, CMD_METHODS, CMD_NAMESPACE, CMD_NOTIFY, @@ -199,6 +201,7 @@ enum AcpiAmlDebuggerCommands CMD_PREFIX, CMD_QUIT, CMD_REFERENCES, + CMD_RESOURCES, CMD_RESULTS, CMD_SET, CMD_STATS, @@ -242,6 +245,7 @@ COMMAND_INFO Commands[] = {"LIST", 0}, {"LOAD", 1}, {"LOCALS", 0}, + {"LOCKS", 0}, {"METHODS", 0}, {"NAMESPACE", 0}, {"NOTIFY", 2}, @@ -251,6 +255,7 @@ COMMAND_INFO Commands[] = {"PREFIX", 0}, {"QUIT", 0}, {"REFERENCES", 1}, + {"RESOURCES", 1}, {"RESULTS", 0}, {"SET", 3}, {"STATS", 0}, @@ -315,6 +320,7 @@ AcpiDbDisplayHelp ( AcpiOsPrintf ("Help This help screen\n"); AcpiOsPrintf ("History Display command history buffer\n"); AcpiOsPrintf ("Level [] [console] Get/Set debug level for file or console\n"); + AcpiOsPrintf ("Locks Current status of internal mutexes\n"); AcpiOsPrintf ("Quit or Exit Exit this command\n"); AcpiOsPrintf ("Stats [Allocations|Memory|Misc\n"); AcpiOsPrintf (" |Objects|Tables] Display namespace and memory statistics\n"); @@ -337,6 +343,7 @@ AcpiDbDisplayHelp ( AcpiOsPrintf ("Owner [Depth] Display loaded namespace by object owner\n"); AcpiOsPrintf ("Prefix [] Set or Get current execution prefix\n"); AcpiOsPrintf ("References Find all references to object at addr\n"); + AcpiOsPrintf ("Resources xxx Get and display resources\n"); AcpiOsPrintf ("Terminate Delete namespace and all internal objects\n"); AcpiOsPrintf ("Thread Spawn threads to execute method(s)\n"); return; @@ -728,6 +735,10 @@ AcpiDbCommandDispatch ( } break; + case CMD_LOCKS: + AcpiDbDisplayLocks (); + break; + case CMD_LOCALS: AcpiDbDisplayLocals (); break; @@ -765,6 +776,10 @@ AcpiDbCommandDispatch ( AcpiDbFindReferences (Args[1]); break; + case CMD_RESOURCES: + AcpiDbDisplayResources (Args[1]); + break; + case CMD_RESULTS: AcpiDbDisplayResults (); break; @@ -810,7 +825,8 @@ AcpiDbCommandDispatch ( case CMD_QUIT: if (Op) { - return (AE_AML_ERROR); + AcpiOsPrintf ("Method execution terminated\n"); + return (AE_CTRL_TERMINATE); } if (!OutputToFile) diff --git a/source/components/debugger/dbstats.c b/source/components/debugger/dbstats.c index ea4428700..c145773ce 100644 --- a/source/components/debugger/dbstats.c +++ b/source/components/debugger/dbstats.c @@ -1,7 +1,7 @@ /******************************************************************************* * * Module Name: dbstats - Generation and display of ACPI table statistics - * $Revision: 1.37 $ + * $Revision: 1.38 $ * ******************************************************************************/ @@ -123,7 +123,7 @@ #ifdef ENABLE_DEBUGGER -#define _COMPONENT DEBUGGER +#define _COMPONENT ACPI_DEBUGGER MODULE_NAME ("dbstats") /* diff --git a/source/components/debugger/dbutils.c b/source/components/debugger/dbutils.c index dd03eaadd..f4ac132da 100644 --- a/source/components/debugger/dbutils.c +++ b/source/components/debugger/dbutils.c @@ -1,7 +1,7 @@ /******************************************************************************* * * Module Name: dbutils - AML debugger utilities - * $Revision: 1.35 $ + * $Revision: 1.36 $ * ******************************************************************************/ @@ -128,7 +128,7 @@ #ifdef ENABLE_DEBUGGER -#define _COMPONENT DEBUGGER +#define _COMPONENT ACPI_DEBUGGER MODULE_NAME ("dbutils") diff --git a/source/components/debugger/dbxface.c b/source/components/debugger/dbxface.c index fba408894..21c950b12 100644 --- a/source/components/debugger/dbxface.c +++ b/source/components/debugger/dbxface.c @@ -1,7 +1,7 @@ /******************************************************************************* * * Module Name: dbxface - AML Debugger external interfaces - * $Revision: 1.34 $ + * $Revision: 1.35 $ * ******************************************************************************/ @@ -127,7 +127,7 @@ #ifdef ENABLE_DEBUGGER -#define _COMPONENT DEBUGGER +#define _COMPONENT ACPI_DEBUGGER MODULE_NAME ("dbxface") diff --git a/source/components/disassembler/dmopcode.c b/source/components/disassembler/dmopcode.c index e0c620ec3..487c63aa3 100644 --- a/source/components/disassembler/dmopcode.c +++ b/source/components/disassembler/dmopcode.c @@ -1,7 +1,7 @@ /******************************************************************************* * * Module Name: dbdisasm - parser op tree display routines - * $Revision: 1.37 $ + * $Revision: 1.38 $ * ******************************************************************************/ @@ -124,7 +124,7 @@ #ifdef ENABLE_DEBUGGER -#define _COMPONENT DEBUGGER +#define _COMPONENT ACPI_DEBUGGER MODULE_NAME ("dbdisasm")