diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2015-11-25 21:04:42 +0000 | 
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2015-11-25 21:04:42 +0000 | 
| commit | b9098066cd6284319bca922f13e59517f774a103 (patch) | |
| tree | f01fd6c9053cb01ed84c00cb42ee789adafceaf5 /source/components/executer/exoparg2.c | |
| parent | 1e24cf365bc9c8df179b145c90d52852724e54ee (diff) | |
Notes
Diffstat (limited to 'source/components/executer/exoparg2.c')
| -rw-r--r-- | source/components/executer/exoparg2.c | 41 | 
1 files changed, 23 insertions, 18 deletions
diff --git a/source/components/executer/exoparg2.c b/source/components/executer/exoparg2.c index a5b1513e4028..25b4be3b75d8 100644 --- a/source/components/executer/exoparg2.c +++ b/source/components/executer/exoparg2.c @@ -203,10 +203,11 @@ AcpiExOpcode_2A_2T_1R (          /* Quotient to ReturnDesc1, remainder to ReturnDesc2 */ -        Status = AcpiUtDivide (Operand[0]->Integer.Value, -                               Operand[1]->Integer.Value, -                               &ReturnDesc1->Integer.Value, -                               &ReturnDesc2->Integer.Value); +        Status = AcpiUtDivide ( +            Operand[0]->Integer.Value, +            Operand[1]->Integer.Value, +            &ReturnDesc1->Integer.Value, +            &ReturnDesc2->Integer.Value);          if (ACPI_FAILURE (Status))          {              goto Cleanup; @@ -217,6 +218,7 @@ AcpiExOpcode_2A_2T_1R (          ACPI_ERROR ((AE_INFO, "Unknown AML opcode 0x%X",              WalkState->Opcode)); +          Status = AE_AML_BAD_OPCODE;          goto Cleanup;      } @@ -301,9 +303,10 @@ AcpiExOpcode_2A_1T_1R (              goto Cleanup;          } -        ReturnDesc->Integer.Value = AcpiExDoMathOp (WalkState->Opcode, -                                                Operand[0]->Integer.Value, -                                                Operand[1]->Integer.Value); +        ReturnDesc->Integer.Value = AcpiExDoMathOp ( +            WalkState->Opcode, +            Operand[0]->Integer.Value, +            Operand[1]->Integer.Value);          goto StoreResultToTarget;      } @@ -320,16 +323,17 @@ AcpiExOpcode_2A_1T_1R (          /* ReturnDesc will contain the remainder */ -        Status = AcpiUtDivide (Operand[0]->Integer.Value, -                               Operand[1]->Integer.Value, -                               NULL, -                               &ReturnDesc->Integer.Value); +        Status = AcpiUtDivide ( +            Operand[0]->Integer.Value, +            Operand[1]->Integer.Value, +            NULL, +            &ReturnDesc->Integer.Value);          break;      case AML_CONCAT_OP: /* Concatenate (Data1, Data2, Result) */ -        Status = AcpiExDoConcatenate (Operand[0], Operand[1], -                    &ReturnDesc, WalkState); +        Status = AcpiExDoConcatenate ( +            Operand[0], Operand[1], &ReturnDesc, WalkState);          break;      case AML_TO_STRING_OP: /* ToString (Buffer, Length, Result) (ACPI 2.0) */ @@ -376,8 +380,8 @@ AcpiExOpcode_2A_1T_1R (          /* ConcatenateResTemplate (Buffer, Buffer, Result) (ACPI 2.0) */ -        Status = AcpiExConcatTemplate (Operand[0], Operand[1], -                    &ReturnDesc, WalkState); +        Status = AcpiExConcatTemplate ( +            Operand[0], Operand[1], &ReturnDesc, WalkState);          break;      case AML_INDEX_OP:              /* Index (Source Index Result) */ @@ -560,8 +564,8 @@ AcpiExOpcode_2A_0T_1R (          /* LogicalOp  (Operand0, Operand1) */          Status = AcpiExDoLogicalNumericOp (WalkState->Opcode, -                        Operand[0]->Integer.Value, Operand[1]->Integer.Value, -                        &LogicalResult); +            Operand[0]->Integer.Value, Operand[1]->Integer.Value, +            &LogicalResult);          goto StoreLogicalResult;      }      else if (WalkState->OpInfo->Flags & AML_LOGICAL) @@ -569,7 +573,7 @@ AcpiExOpcode_2A_0T_1R (          /* LogicalOp  (Operand0, Operand1) */          Status = AcpiExDoLogicalOp (WalkState->Opcode, Operand[0], -                    Operand[1], &LogicalResult); +            Operand[1], &LogicalResult);          goto StoreLogicalResult;      } @@ -600,6 +604,7 @@ AcpiExOpcode_2A_0T_1R (          ACPI_ERROR ((AE_INFO, "Unknown AML opcode 0x%X",              WalkState->Opcode)); +          Status = AE_AML_BAD_OPCODE;          goto Cleanup;      }  | 
