Deleted Added
sdiff udiff text old ( 114237 ) new ( 126372 )
full compact
exoparg2.c (114237) exoparg2.c (126372)
1/******************************************************************************
2 *
3 * Module Name: exoparg2 - AML execution - opcodes with 2 arguments
1/******************************************************************************
2 *
3 * Module Name: exoparg2 - AML execution - opcodes with 2 arguments
4 * $Revision: 117 $
4 * $Revision: 119 $
5 *
6 *****************************************************************************/
7
8/******************************************************************************
9 *
10 * 1. Copyright Notice
11 *
5 *
6 *****************************************************************************/
7
8/******************************************************************************
9 *
10 * 1. Copyright Notice
11 *
12 * Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
12 * Some or all of this work - Copyright (c) 1999 - 2004, Intel Corp.
13 * All rights reserved.
14 *
15 * 2. License
16 *
17 * 2.1. This is your license from Intel Corp. under its intellectual property
18 * rights. You may have additional license terms from the party that provided
19 * you this software, covering your right to use that party's intellectual
20 * property rights.

--- 392 unchanged lines hidden (view full) ---

413 Status = AcpiExConvertToString (Operand[1], &TempDesc, 16, ACPI_UINT32_MAX, WalkState);
414 break;
415
416 case ACPI_TYPE_BUFFER:
417 Status = AcpiExConvertToBuffer (Operand[1], &TempDesc, WalkState);
418 break;
419
420 default:
13 * All rights reserved.
14 *
15 * 2. License
16 *
17 * 2.1. This is your license from Intel Corp. under its intellectual property
18 * rights. You may have additional license terms from the party that provided
19 * you this software, covering your right to use that party's intellectual
20 * property rights.

--- 392 unchanged lines hidden (view full) ---

413 Status = AcpiExConvertToString (Operand[1], &TempDesc, 16, ACPI_UINT32_MAX, WalkState);
414 break;
415
416 case ACPI_TYPE_BUFFER:
417 Status = AcpiExConvertToBuffer (Operand[1], &TempDesc, WalkState);
418 break;
419
420 default:
421 ACPI_REPORT_ERROR (("Concat - invalid obj type: %X\n",
422 ACPI_GET_OBJECT_TYPE (Operand[0])));
421 Status = AE_AML_INTERNAL;
422 }
423
424 if (ACPI_FAILURE (Status))
425 {
426 goto Cleanup;
427 }
428

--- 98 unchanged lines hidden (view full) ---

527 {
528 ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Index value (%X) beyond package end (%X)\n",
529 Index, Operand[0]->Package.Count));
530 Status = AE_AML_PACKAGE_LIMIT;
531 goto Cleanup;
532 }
533
534 ReturnDesc->Reference.TargetType = ACPI_TYPE_PACKAGE;
423 Status = AE_AML_INTERNAL;
424 }
425
426 if (ACPI_FAILURE (Status))
427 {
428 goto Cleanup;
429 }
430

--- 98 unchanged lines hidden (view full) ---

529 {
530 ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Index value (%X) beyond package end (%X)\n",
531 Index, Operand[0]->Package.Count));
532 Status = AE_AML_PACKAGE_LIMIT;
533 goto Cleanup;
534 }
535
536 ReturnDesc->Reference.TargetType = ACPI_TYPE_PACKAGE;
535 ReturnDesc->Reference.Object = Operand[0]->Package.Elements [Index];
537 ReturnDesc->Reference.Object = Operand[0];
536 ReturnDesc->Reference.Where = &Operand[0]->Package.Elements [Index];
537 }
538 else
539 {
540 /* Object to be indexed is a Buffer */
541
542 if (Index >= Operand[0]->Buffer.Length)
543 {

--- 173 unchanged lines hidden --- 		538 ReturnDesc->Reference.Where = &Operand[0]->Package.Elements [Index];
539 }
540 else
541 {
542 /* Object to be indexed is a Buffer */
543
544 if (Index >= Operand[0]->Buffer.Length)
545 {

--- 173 unchanged lines hidden ---