3 files changed, 16 insertions, 4 deletions
diff --git a/source/components/debugger/dbexec.c b/source/components/debugger/dbexec.c
index 83af8896598a..0a00be81e0ba 100644
--- a/source/components/debugger/dbexec.c
+++ b/source/components/debugger/dbexec.c
@@ -314,6 +314,18 @@ AcpiDbExecuteMethod (
 
     if (ACPI_FAILURE (Status))
     {
+        if ((Status == AE_ABORT_METHOD) || AcpiGbl_AbortMethod)
+        {
+            /* Clear the abort and fall back to the debugger prompt */
+
+            ACPI_EXCEPTION ((AE_INFO, Status,
+                "Aborting top-level method"));
+
+            AcpiGbl_AbortMethod = FALSE;
+            Status = AE_OK;
+            goto Cleanup;
+        }
+
         ACPI_EXCEPTION ((AE_INFO, Status,
             "while executing %s from debugger", Info->Pathname));
 
diff --git a/source/components/debugger/dbobject.c b/source/components/debugger/dbobject.c
index 81f6b6e86e08..66906ef84196 100644
--- a/source/components/debugger/dbobject.c
+++ b/source/components/debugger/dbobject.c
@@ -588,7 +588,7 @@ AcpiDbDecodeLocals (
 
     if (DisplayLocals)
     {
-        AcpiOsPrintf ("\nInitialized Local Variables for method [%4.4s]:\n",
+        AcpiOsPrintf ("\nInitialized Local Variables for Method [%4.4s]:\n",
             AcpiUtGetNodeName (Node));
 
         for (i = 0; i < ACPI_METHOD_NUM_LOCALS; i++)
@@ -604,7 +604,7 @@ AcpiDbDecodeLocals (
     else
     {
         AcpiOsPrintf (
-            "No Local Variables are initialized for method [%4.4s]\n",
+            "No Local Variables are initialized for Method [%4.4s]\n",
             AcpiUtGetNodeName (Node));
     }
 }
@@ -667,7 +667,7 @@ AcpiDbDecodeArguments (
         AcpiOsPrintf (
             "Initialized Arguments for Method [%4.4s]:  "
             "(%X arguments defined for method invocation)\n",
-            AcpiUtGetNodeName (Node), ObjDesc->Method.ParamCount);
+            AcpiUtGetNodeName (Node), Node->Object->Method.ParamCount);
 
         for (i = 0; i < ACPI_METHOD_NUM_ARGS; i++)
         {
diff --git a/source/components/debugger/dbxface.c b/source/components/debugger/dbxface.c
index 02c4e5dbb9d2..bfa7d7c7882d 100644
--- a/source/components/debugger/dbxface.c
+++ b/source/components/debugger/dbxface.c
@@ -379,7 +379,7 @@ AcpiDbSingleStep (
         if ((AcpiGbl_DbOutputToFile)        ||
             (AcpiDbgLevel & ACPI_LV_PARSE))
         {
-            AcpiOsPrintf ("\n[AmlDebug] Next AML Opcode to execute:\n");
+            AcpiOsPrintf ("\nAML Debug: Next AML Opcode to execute:\n");
         }
 
         /*