1 files changed, 19 insertions, 50 deletions

diff --git a/drivers/acpi/dispatcher/dswexec.c b/drivers/acpi/dispatcher/dswexec.c
index e522763bb692..5a9b91fe93d2 100644
--- a/drivers/acpi/dispatcher/dswexec.c
+++ b/drivers/acpi/dispatcher/dswexec.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -100,9 +100,7 @@ acpi_ds_get_predicate_value(struct acpi_walk_state *walk_state,
         if (result_obj) {
                 status = acpi_ds_result_pop(&obj_desc, walk_state);
                 if (ACPI_FAILURE(status)) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Could not get result from predicate evaluation, %s\n",
-                                          acpi_format_exception(status)));
+                        ACPI_REPORT_ERROR(("Could not get result from predicate evaluation, %s\n", acpi_format_exception(status)));
 
                         return_ACPI_STATUS(status);
                 }
@@ -123,9 +121,8 @@ acpi_ds_get_predicate_value(struct acpi_walk_state *walk_state,
         }
 
         if (!obj_desc) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "No predicate obj_desc=%p State=%p\n",
-                                  obj_desc, walk_state));
+                ACPI_REPORT_ERROR(("No predicate obj_desc=%p State=%p\n",
+                                   obj_desc, walk_state));
 
                 return_ACPI_STATUS(AE_AML_NO_OPERAND);
         }
@@ -140,10 +137,7 @@ acpi_ds_get_predicate_value(struct acpi_walk_state *walk_state,
         }
 
         if (ACPI_GET_OBJECT_TYPE(local_obj_desc) != ACPI_TYPE_INTEGER) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Bad predicate (not an integer) obj_desc=%p State=%p Type=%X\n",
-                                  obj_desc, walk_state,
-                                  ACPI_GET_OBJECT_TYPE(obj_desc)));
+                ACPI_REPORT_ERROR(("Bad predicate (not an integer) obj_desc=%p State=%p Type=%X\n", obj_desc, walk_state, ACPI_GET_OBJECT_TYPE(obj_desc)));
 
                 status = AE_AML_OPERAND_TYPE;
                 goto cleanup;
@@ -314,12 +308,13 @@ acpi_ds_exec_begin_op(struct acpi_walk_state *walk_state,
 
         case AML_CLASS_EXECUTE:
         case AML_CLASS_CREATE:
-
                 /*
                  * Most operators with arguments.
                  * Start a new result/operand state
                  */
-                status = acpi_ds_result_stack_push(walk_state);
+                if (walk_state->opcode != AML_CREATE_FIELD_OP) {
+                        status = acpi_ds_result_stack_push(walk_state);
+                }
                 break;
 
         default:
@@ -361,8 +356,8 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
         op_class = walk_state->op_info->class;
 
         if (op_class == AML_CLASS_UNKNOWN) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Unknown opcode %X\n",
-                                  op->common.aml_opcode));
+                ACPI_REPORT_ERROR(("Unknown opcode %X\n",
+                                   op->common.aml_opcode));
                 return_ACPI_STATUS(AE_NOT_IMPLEMENTED);
         }
 
@@ -452,12 +447,7 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
                                 walk_state->operands[1]->reference.offset)) {
                                 status = AE_OK;
                         } else {
-                                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                                  "[%s]: Could not resolve operands, %s\n",
-                                                  acpi_ps_get_opcode_name
-                                                  (walk_state->opcode),
-                                                  acpi_format_exception
-                                                  (status)));
+                                ACPI_REPORT_ERROR(("[%s]: Could not resolve operands, %s\n", acpi_ps_get_opcode_name(walk_state->opcode), acpi_format_exception(status)));
                         }
                 }
 
@@ -676,8 +666,8 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
 
                 case AML_TYPE_UNDEFINED:
 
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Undefined opcode type Op=%p\n", op));
+                        ACPI_REPORT_ERROR(("Undefined opcode type Op=%p\n",
+                                           op));
                         return_ACPI_STATUS(AE_NOT_IMPLEMENTED);
 
                 case AML_TYPE_BOGUS:
@@ -689,10 +679,7 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
 
                 default:
 
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Unimplemented opcode, class=%X type=%X Opcode=%X Op=%p\n",
-                                          op_class, op_type,
-                                          op->common.aml_opcode, op));
+                        ACPI_REPORT_ERROR(("Unimplemented opcode, class=%X type=%X Opcode=%X Op=%p\n", op_class, op_type, op->common.aml_opcode, op));
 
                         status = AE_NOT_IMPLEMENTED;
                         break;
@@ -723,20 +710,6 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
 
       cleanup:
 
-        /* Invoke exception handler on error */
-
-        if (ACPI_FAILURE(status) &&
-            acpi_gbl_exception_handler && !(status & AE_CODE_CONTROL)) {
-                acpi_ex_exit_interpreter();
-                status = acpi_gbl_exception_handler(status,
-                                                    walk_state->method_node->
-                                                    name.integer,
-                                                    walk_state->opcode,
-                                                    walk_state->aml_offset,
-                                                    NULL);
-                (void)acpi_ex_enter_interpreter();
-        }
-
         if (walk_state->result_obj) {
                 /* Break to debugger to display result */
 
@@ -758,18 +731,14 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
         }
 #endif
 
-        /* Always clear the object stack */
-
-        walk_state->num_operands = 0;
-
-#ifdef ACPI_DISASSEMBLER
-
-        /* On error, display method locals/args */
+        /* Invoke exception handler on error */
 
         if (ACPI_FAILURE(status)) {
-                acpi_dm_dump_method_info(status, walk_state, op);
+                status = acpi_ds_method_error(status, walk_state);
         }
-#endif
 
+        /* Always clear the object stack */
+
+        walk_state->num_operands = 0;
         return_ACPI_STATUS(status);
 }