ACPICA: Parser: Updates/fixes for debug output.

Major changes in this patch are made to improve the debug output mode of
the compiler.

Linux kernel behaviour is not affected as the change only applies to
the compiler which is not shipped in the Linux kernel.

Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

1 files changed, 47 insertions, 2 deletions

diff --git a/drivers/acpi/acpica/psopinfo.c b/drivers/acpi/acpica/psopinfo.c
index 9ba5301e5751..d7bba3c7ce56 100644
--- a/drivers/acpi/acpica/psopinfo.c
+++ b/drivers/acpi/acpica/psopinfo.c
@@ -71,6 +71,8 @@ static const u8 acpi_gbl_argument_count[] =
 
 const struct acpi_opcode_info *acpi_ps_get_opcode_info(u16 opcode)
 {
+        const char *opcode_name = "Unknown AML opcode";
+
         ACPI_FUNCTION_NAME(ps_get_opcode_info);
 
         /*
@@ -92,11 +94,54 @@ const struct acpi_opcode_info *acpi_ps_get_opcode_info(u16 opcode)
                 return (&acpi_gbl_aml_op_info
                         [acpi_gbl_long_op_index[(u8)opcode]]);
         }
+#ifdef ACPI_ASL_COMPILER
+#include "asldefine.h"
+
+        switch (opcode) {
+        case AML_RAW_DATA_BYTE:
+                opcode_name = "-Raw Data Byte-";
+                break;
+
+        case AML_RAW_DATA_WORD:
+                opcode_name = "-Raw Data Word-";
+                break;
+
+        case AML_RAW_DATA_DWORD:
+                opcode_name = "-Raw Data Dword-";
+                break;
+
+        case AML_RAW_DATA_QWORD:
+                opcode_name = "-Raw Data Qword-";
+                break;
+
+        case AML_RAW_DATA_BUFFER:
+                opcode_name = "-Raw Data Buffer-";
+                break;
+
+        case AML_RAW_DATA_CHAIN:
+                opcode_name = "-Raw Data Buffer Chain-";
+                break;
+
+        case AML_PACKAGE_LENGTH:
+                opcode_name = "-Package Length-";
+                break;
+
+        case AML_UNASSIGNED_OPCODE:
+                opcode_name = "-Unassigned Opcode-";
+                break;
+
+        case AML_DEFAULT_ARG_OP:
+                opcode_name = "-Default Arg-";
+                break;
+
+        default:
+                break;
+        }
+#endif
 
         /* Unknown AML opcode */
 
-        ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
-                          "Unknown AML opcode [%4.4X]\n", opcode));
+        ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "%s [%4.4X]\n", opcode_name, opcode));
 
         return (&acpi_gbl_aml_op_info[_UNK]);
 }