5c5
< * $Revision: 1.120 $
---
> * $Revision: 1.134 $
13c13
< * Some or all of this work - Copyright (c) 1999 - 2005, Intel Corp.
---
> * Some or all of this work - Copyright (c) 1999 - 2007, Intel Corp.
127d126
< #include <contrib/dev/acpica/acdisasm.h>
136,148c135,149
< static ACPI_EXECUTE_OP AcpiGbl_OpTypeDispatch [] = {
< AcpiExOpcode_0A_0T_1R,
< AcpiExOpcode_1A_0T_0R,
< AcpiExOpcode_1A_0T_1R,
< AcpiExOpcode_1A_1T_0R,
< AcpiExOpcode_1A_1T_1R,
< AcpiExOpcode_2A_0T_0R,
< AcpiExOpcode_2A_0T_1R,
< AcpiExOpcode_2A_1T_1R,
< AcpiExOpcode_2A_2T_1R,
< AcpiExOpcode_3A_0T_0R,
< AcpiExOpcode_3A_1T_1R,
< AcpiExOpcode_6A_0T_1R};
---
> static ACPI_EXECUTE_OP AcpiGbl_OpTypeDispatch [] =
> {
> AcpiExOpcode_0A_0T_1R,
> AcpiExOpcode_1A_0T_0R,
> AcpiExOpcode_1A_0T_1R,
> AcpiExOpcode_1A_1T_0R,
> AcpiExOpcode_1A_1T_1R,
> AcpiExOpcode_2A_0T_0R,
> AcpiExOpcode_2A_0T_1R,
> AcpiExOpcode_2A_1T_1R,
> AcpiExOpcode_2A_2T_1R,
> AcpiExOpcode_3A_0T_0R,
> AcpiExOpcode_3A_1T_1R,
> AcpiExOpcode_6A_0T_1R
> };
174c175
< ACPI_FUNCTION_TRACE_PTR ("DsGetPredicateValue", WalkState);
---
> ACPI_FUNCTION_TRACE_PTR (DsGetPredicateValue, WalkState);
184,186c185,186
< ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
< "Could not get result from predicate evaluation, %s\n",
< AcpiFormatException (Status)));
---
> ACPI_EXCEPTION ((AE_INFO, Status,
> "Could not get result from predicate evaluation"));
210,211c210,211
< ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
< "No predicate ObjDesc=%p State=%p\n",
---
> ACPI_ERROR ((AE_INFO,
> "No predicate ObjDesc=%p State=%p",
229,230c229,230
< ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
< "Bad predicate (not an integer) ObjDesc=%p State=%p Type=%X\n",
---
> ACPI_ERROR ((AE_INFO,
> "Bad predicate (not an integer) ObjDesc=%p State=%p Type=%X",
309c309
< ACPI_FUNCTION_TRACE_PTR ("DsExecBeginOp", WalkState);
---
> ACPI_FUNCTION_TRACE_PTR (DsExecBeginOp, WalkState);
318c318
< return_ACPI_STATUS (Status);
---
> goto ErrorExit;
335c335
< return_ACPI_STATUS (Status);
---
> goto ErrorExit;
386,391d385
< Status = AcpiDsResultStackPush (WalkState);
< if (ACPI_FAILURE (Status))
< {
< return_ACPI_STATUS (Status);
< }
<
398c392
< if (WalkState->WalkType == ACPI_WALK_METHOD)
---
> if (WalkState->WalkType & ACPI_WALK_METHOD)
409,412d402
< if (Op->Common.AmlOpcode == AML_REGION_OP)
< {
< Status = AcpiDsResultStackPush (WalkState);
< }
419,423d408
< /*
< * Most operators with arguments.
< * Start a new result/operand state
< */
< Status = AcpiDsResultStackPush (WalkState);
433a419,423
>
>
> ErrorExit:
> Status = AcpiDsMethodError (Status, WalkState);
> return_ACPI_STATUS (Status);
463c453
< ACPI_FUNCTION_TRACE_PTR ("DsExecEndOp", WalkState);
---
> ACPI_FUNCTION_TRACE_PTR (DsExecEndOp, WalkState);
472c462
< ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Unknown opcode %X\n", Op->Common.AmlOpcode));
---
> ACPI_ERROR ((AE_INFO, "Unknown opcode %X", Op->Common.AmlOpcode));
480a471
> WalkState->OperandIndex = 0;
493c484,493
< case AML_CLASS_ARGUMENT: /* constants, literals, etc. - do nothing */
---
> case AML_CLASS_ARGUMENT: /* Constants, literals, etc. */
>
> if (WalkState->Opcode == AML_INT_NAMEPATH_OP)
> {
> Status = AcpiDsEvaluateNamePath (WalkState);
> if (ACPI_FAILURE (Status))
> {
> goto Cleanup;
> }
> }
497c497
< case AML_CLASS_EXECUTE: /* most operators with arguments */
---
> case AML_CLASS_EXECUTE: /* Most operators with arguments */
507,514d506
< /* Done with this result state (Now that operand stack is built) */
<
< Status = AcpiDsResultStackPop (WalkState);
< if (ACPI_FAILURE (Status))
< {
< goto Cleanup;
< }
<
562,565c554,556
< ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
< "[%s]: Could not resolve operands, %s\n",
< AcpiPsGetOpcodeName (WalkState->Opcode),
< AcpiFormatException (Status)));
---
> ACPI_EXCEPTION ((AE_INFO, Status,
> "While resolving operands for [%s]",
> AcpiPsGetOpcodeName (WalkState->Opcode)));
582d572
<
596,609d585
< /* Make sure to properly pop the result stack */
<
< if (ACPI_SUCCESS (Status))
< {
< Status = AcpiDsResultStackPop (WalkState);
< }
< else if (Status == AE_CTRL_PENDING)
< {
< Status = AcpiDsResultStackPop (WalkState);
< if (ACPI_SUCCESS (Status))
< {
< Status = AE_CTRL_PENDING;
< }
< }
625a602
>
735,742d711
< /* Done with result state (Now that operand stack is built) */
<
< Status = AcpiDsResultStackPop (WalkState);
< if (ACPI_FAILURE (Status))
< {
< goto Cleanup;
< }
<
775,776d743
<
< Status = AcpiDsResultStackPop (WalkState);
778d744
<
784,785c750,751
< ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
< "Undefined opcode type Op=%p\n", Op));
---
> ACPI_ERROR ((AE_INFO,
> "Undefined opcode type Op=%p", Op));
799,800c765,766
< ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
< "Unimplemented opcode, class=%X type=%X Opcode=%X Op=%p\n",
---
> ACPI_ERROR ((AE_INFO,
> "Unimplemented opcode, class=%X type=%X Opcode=%X Op=%p",
818d783
<
832,844d796
< /* Invoke exception handler on error */
<
< if (ACPI_FAILURE (Status) &&
< AcpiGbl_ExceptionHandler &&
< !(Status & AE_CODE_CONTROL))
< {
< AcpiExExitInterpreter ();
< Status = AcpiGbl_ExceptionHandler (Status,
< WalkState->MethodNode->Name.Integer, WalkState->Opcode,
< WalkState->AmlOffset, NULL);
< (void) AcpiExEnterInterpreter ();
< }
<
868c820
< /* Always clear the object stack */
---
> /* Invoke exception handler on error */
870,875d821
< WalkState->NumOperands = 0;
<
< #ifdef ACPI_DISASSEMBLER
<
< /* On error, display method locals/args */
<
878c824
< AcpiDmDumpMethodInfo (Status, WalkState, Op);
---
> Status = AcpiDsMethodError (Status, WalkState);
880d825
< #endif
881a827,829
> /* Always clear the object stack */
>
> WalkState->NumOperands = 0;