3 files changed, 19 insertions, 2 deletions
diff --git a/source/tools/acpihelp/acpihelp.h b/source/tools/acpihelp/acpihelp.h
index 637f274720abd..1ce8b0bf372ee 100644
--- a/source/tools/acpihelp/acpihelp.h
+++ b/source/tools/acpihelp/acpihelp.h
@@ -225,7 +225,8 @@ typedef enum
     AH_DISPLAY_DEVICE_IDS,
     AH_DISPLAY_UUIDS,
     AH_DISPLAY_TABLES,
-    AH_DISPLAY_DIRECTIVES
+    AH_DISPLAY_DIRECTIVES,
+    AH_DECODE_ASL_EXCEPTION
 
 } AH_OPTION_TYPES;
 
@@ -297,6 +298,10 @@ AhDecodeException (
     char                    *Name);
 
 void
+AhDecodeAslException (
+    char                    *Name);
+
+void
 AhFindPredefinedNames (
     char                    *Name);
 
diff --git a/source/tools/acpihelp/ahdecode.c b/source/tools/acpihelp/ahdecode.c
index 7a1497c4a8d64..b72db2a800d29 100644
--- a/source/tools/acpihelp/ahdecode.c
+++ b/source/tools/acpihelp/ahdecode.c
@@ -155,6 +155,7 @@
 #include "acpihelp.h"
 #include "acpredef.h"
 
+BOOLEAN                  AslGbl_VerboseErrors = TRUE;
 
 /* Local prototypes */
 
diff --git a/source/tools/acpihelp/ahmain.c b/source/tools/acpihelp/ahmain.c
index 0d69385682b8d..86fcc8d38a7c1 100644
--- a/source/tools/acpihelp/ahmain.c
+++ b/source/tools/acpihelp/ahmain.c
@@ -160,7 +160,7 @@ AhDisplayUsage (
     void);
 
 #define AH_UTILITY_NAME             "ACPI Help Utility"
-#define AH_SUPPORTED_OPTIONS        "adeghikmopstuv^"
+#define AH_SUPPORTED_OPTIONS        "adeghikmopstuvx^"
 
 
 #if defined ACPI_OPTION
@@ -197,6 +197,7 @@ AhDisplayUsage (
     ACPI_USAGE_TEXT ("\nACPI Values:\n");
     ACPI_OPTION ("-e [HexValue]",           "Decode ACPICA exception code");
     ACPI_OPTION ("-o [HexValue]",           "Decode hex AML opcode");
+    ACPI_OPTION ("-x [HexValue]",           "Decode iASL exception code");
 
     ACPI_USAGE_TEXT ("\nASL Names and Symbols (ACPI Source Language):\n");
     ACPI_OPTION ("-k [Name/Prefix | *]",    "Display ASL non-operator keyword(s)");
@@ -309,6 +310,11 @@ main (
         DecodeType = AH_DISPLAY_UUIDS;
         break;
 
+    case 'x':
+
+        DecodeType = AH_DECODE_ASL_EXCEPTION;
+        break;
+
     case 'v': /* -v: (Version): signon already emitted, just exit */
 
         switch (AcpiGbl_Optarg[0])
@@ -402,6 +408,11 @@ main (
         AhDisplayDirectives ();
         break;
 
+    case AH_DECODE_ASL_EXCEPTION:
+
+        AhDecodeAslException (Name);
+        break;
+
    default:
 
         if (!Name)