ACPICA 20050408 from Bob Moore

Fixed three cases in the interpreter where an "index"
argument to an ASL function was still (internally) 32
bits instead of the required 64 bits.  This was the Index
argument to the Index, Mid, and Match operators.

The "strupr" function is now permanently local
(acpi_ut_strupr), since this is not a POSIX-defined
function and not present in most kernel-level C
libraries. References to the C library strupr function
have been removed from the headers.

Completed the deployment of static
functions/prototypes. All prototypes with the static
attribute have been moved from the headers to the owning
C file.

ACPICA 20050329 from Bob Moore

An error is now generated if an attempt is made to create
a Buffer Field of length zero (A CreateField with a length
operand of zero.)

The interpreter now issues a warning whenever executable
code at the module level is detected during ACPI table
load. This will give some idea of the prevalence of this
type of code.

Implemented support for references to named objects (other
than control methods) within package objects.

Enhanced package object output for the debug
object. Package objects are now completely dumped, showing
all elements.

Enhanced miscellaneous object output for the debug
object. Any object can now be written to the debug object
(for example, a device object can be written, and the type
of the object will be displayed.)

The "static" qualifier has been added to all local
functions across the core subsystem.

The number of "long" lines (> 80 chars) within the source
has been significantly reduced, by about 1/3.

Cleaned up all header files to ensure that all CA/iASL
functions are prototyped (even static functions) and the
formatting is consistent.

Two new header files have been added, acopcode.h and
acnames.h.

Removed several obsolete functions that were no longer
used.

Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 36 insertions, 33 deletions

diff --git a/drivers/acpi/executer/exoparg2.c b/drivers/acpi/executer/exoparg2.c
index 8be4d80ceed5..7429032c2b6c 100644
--- a/drivers/acpi/executer/exoparg2.c
+++ b/drivers/acpi/executer/exoparg2.c
@@ -118,7 +118,7 @@ acpi_ex_opcode_2A_0T_0R (
 
                 value = (u32) operand[1]->integer.value;
 
-                /* Notifies allowed on this object? */
+                /* Are notifies allowed on this object? */
 
                 if (!acpi_ev_is_notify_object (node)) {
                         ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
@@ -203,11 +203,12 @@ acpi_ex_opcode_2A_2T_1R (
                 acpi_ps_get_opcode_name (walk_state->opcode));
 
 
-        /*
-         * Execute the opcode
-         */
+        /* Execute the opcode */
+
         switch (walk_state->opcode) {
-        case AML_DIVIDE_OP:             /* Divide (Dividend, Divisor, remainder_result quotient_result) */
+        case AML_DIVIDE_OP:
+
+                /* Divide (Dividend, Divisor, remainder_result quotient_result) */
 
                 return_desc1 = acpi_ut_create_internal_object (ACPI_TYPE_INTEGER);
                 if (!return_desc1) {
@@ -241,7 +242,6 @@ acpi_ex_opcode_2A_2T_1R (
                 goto cleanup;
         }
 
-
         /* Store the results to the target reference operands */
 
         status = acpi_ex_store (return_desc2, operand[2], walk_state);
@@ -295,7 +295,7 @@ acpi_ex_opcode_2A_1T_1R (
 {
         union acpi_operand_object       **operand = &walk_state->operands[0];
         union acpi_operand_object       *return_desc = NULL;
-        u32                             index;
+        acpi_integer                    index;
         acpi_status                     status = AE_OK;
         acpi_size                       length;
 
@@ -304,9 +304,8 @@ acpi_ex_opcode_2A_1T_1R (
                 acpi_ps_get_opcode_name (walk_state->opcode));
 
 
-        /*
-         * Execute the opcode
-         */
+        /* Execute the opcode */
+
         if (walk_state->op_info->flags & AML_MATH) {
                 /* All simple math opcodes (add, etc.) */
 
@@ -322,9 +321,8 @@ acpi_ex_opcode_2A_1T_1R (
                 goto store_result_to_target;
         }
 
-
         switch (walk_state->opcode) {
-        case AML_MOD_OP:                /* Mod (Dividend, Divisor, remainder_result (ACPI 2.0) */
+        case AML_MOD_OP: /* Mod (Dividend, Divisor, remainder_result (ACPI 2.0) */
 
                 return_desc = acpi_ut_create_internal_object (ACPI_TYPE_INTEGER);
                 if (!return_desc) {
@@ -341,18 +339,19 @@ acpi_ex_opcode_2A_1T_1R (
                 break;
 
 
-        case AML_CONCAT_OP:             /* Concatenate (Data1, Data2, Result) */
+        case AML_CONCAT_OP: /* Concatenate (Data1, Data2, Result) */
 
                 status = acpi_ex_do_concatenate (operand[0], operand[1],
                                  &return_desc, walk_state);
                 break;
 
 
-        case AML_TO_STRING_OP:          /* to_string (Buffer, Length, Result) (ACPI 2.0) */
+        case AML_TO_STRING_OP: /* to_string (Buffer, Length, Result) (ACPI 2.0) */
 
                 /*
                  * Input object is guaranteed to be a buffer at this point (it may have
-                 * been converted.)  Copy the raw buffer data to a new object of type String.
+                 * been converted.)  Copy the raw buffer data to a new object of
+                 * type String.
                  */
 
                 /*
@@ -383,14 +382,16 @@ acpi_ex_opcode_2A_1T_1R (
                         goto cleanup;
                 }
 
-                /* Copy the raw buffer data with no transform. NULL terminated already. */
+                /* Copy the raw buffer data with no transform. NULL terminated already*/
 
                 ACPI_MEMCPY (return_desc->string.pointer,
                         operand[0]->buffer.pointer, length);
                 break;
 
 
-        case AML_CONCAT_RES_OP:         /* concatenate_res_template (Buffer, Buffer, Result) (ACPI 2.0) */
+        case AML_CONCAT_RES_OP:
+
+                /* concatenate_res_template (Buffer, Buffer, Result) (ACPI 2.0) */
 
                 status = acpi_ex_concat_template (operand[0], operand[1],
                                  &return_desc, walk_state);
@@ -407,33 +408,33 @@ acpi_ex_opcode_2A_1T_1R (
                         goto cleanup;
                 }
 
-                index = (u32) operand[1]->integer.value;
+                index = operand[1]->integer.value;
+
+                /* At this point, the Source operand is a Package, Buffer, or String */
 
-                /*
-                 * At this point, the Source operand is a Package, Buffer, or String
-                 */
                 if (ACPI_GET_OBJECT_TYPE (operand[0]) == ACPI_TYPE_PACKAGE) {
                         /* Object to be indexed is a Package */
 
                         if (index >= operand[0]->package.count) {
                                 ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
-                                        "Index value (%X) beyond package end (%X)\n",
-                                        index, operand[0]->package.count));
+                                        "Index value (%X%8.8X) beyond package end (%X)\n",
+                                        ACPI_FORMAT_UINT64 (index), operand[0]->package.count));
                                 status = AE_AML_PACKAGE_LIMIT;
                                 goto cleanup;
                         }
 
                         return_desc->reference.target_type = ACPI_TYPE_PACKAGE;
                         return_desc->reference.object    = operand[0];
-                        return_desc->reference.where     = &operand[0]->package.elements [index];
+                        return_desc->reference.where     = &operand[0]->package.elements [
+                                          index];
                 }
                 else {
                         /* Object to be indexed is a Buffer/String */
 
                         if (index >= operand[0]->buffer.length) {
                                 ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
-                                        "Index value (%X) beyond end of buffer (%X)\n",
-                                        index, operand[0]->buffer.length));
+                                        "Index value (%X%8.8X) beyond end of buffer (%X)\n",
+                                        ACPI_FORMAT_UINT64 (index), operand[0]->buffer.length));
                                 status = AE_AML_BUFFER_LIMIT;
                                 goto cleanup;
                         }
@@ -451,7 +452,7 @@ acpi_ex_opcode_2A_1T_1R (
                 /* Complete the Index reference object */
 
                 return_desc->reference.opcode    = AML_INDEX_OP;
-                return_desc->reference.offset    = index;
+                return_desc->reference.offset    = (u32) index;
 
                 /* Store the reference to the Target */
 
@@ -536,22 +537,24 @@ acpi_ex_opcode_2A_0T_1R (
                 goto cleanup;
         }
 
-        /*
-         * Execute the Opcode
-         */
-        if (walk_state->op_info->flags & AML_LOGICAL_NUMERIC) /* logical_op (Operand0, Operand1) */ {
+        /* Execute the Opcode */
+
+        if (walk_state->op_info->flags & AML_LOGICAL_NUMERIC) {
+                /* logical_op (Operand0, Operand1) */
+
                 status = acpi_ex_do_logical_numeric_op (walk_state->opcode,
                                   operand[0]->integer.value, operand[1]->integer.value,
                                   &logical_result);
                 goto store_logical_result;
         }
-        else if (walk_state->op_info->flags & AML_LOGICAL)  /* logical_op (Operand0, Operand1) */ {
+        else if (walk_state->op_info->flags & AML_LOGICAL) {
+                /* logical_op (Operand0, Operand1) */
+
                 status = acpi_ex_do_logical_op (walk_state->opcode, operand[0],
                                  operand[1], &logical_result);
                 goto store_logical_result;
         }
 
-
         switch (walk_state->opcode) {
         case AML_ACQUIRE_OP:            /* Acquire (mutex_object, Timeout) */