diff options
Diffstat (limited to 'source/components/disassembler/dmwalk.c')
| -rw-r--r-- | source/components/disassembler/dmwalk.c | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/source/components/disassembler/dmwalk.c b/source/components/disassembler/dmwalk.c index 77d24a18e99c..750e639898aa 100644 --- a/source/components/disassembler/dmwalk.c +++ b/source/components/disassembler/dmwalk.c @@ -161,8 +161,6 @@ ACPI_MODULE_NAME ("dmwalk") -#define DB_FULL_OP_INFO "[%4.4s] @%5.5X #%4.4X: " - /* Stub for non-compiler code */ #ifndef ACPI_ASL_COMPILER @@ -584,13 +582,6 @@ AcpiDmDescendingOp ( return (AE_CTRL_DEPTH); } - if (AcpiDmIsTempName(Op)) - { - /* Ignore compiler generated temporary names */ - - return (AE_CTRL_DEPTH); - } - if (Op->Common.DisasmOpcode == ACPI_DASM_IGNORE_SINGLE) { /* Ignore this op, but not it's children */ @@ -642,10 +633,16 @@ AcpiDmDescendingOp ( Info->WalkState->ParserState.AmlStart); if (AcpiGbl_DmOpt_Verbose) { - AcpiOsPrintf (DB_FULL_OP_INFO, - (Info->WalkState->MethodNode ? - Info->WalkState->MethodNode->Name.Ascii : " "), - AmlOffset, (UINT32) Op->Common.AmlOpcode); + if (AcpiGbl_CmSingleStep) + { + AcpiOsPrintf ("%5.5X/%4.4X: ", + AmlOffset, (UINT32) Op->Common.AmlOpcode); + } + else + { + AcpiOsPrintf ("AML Offset %5.5X, Opcode %4.4X: ", + AmlOffset, (UINT32) Op->Common.AmlOpcode); + } } } @@ -782,7 +779,7 @@ AcpiDmDescendingOp ( Name = AcpiPsGetName (Op); if (Op->Named.Path) { - AcpiDmNamestring ((char *) Op->Named.Path); + AcpiDmNamestring (Op->Named.Path); } else { |