patch-2.4.22 linux-2.4.22/drivers/acpi/executer/exoparg1.c
Next file: linux-2.4.22/drivers/acpi/executer/exoparg2.c
Previous file: linux-2.4.22/drivers/acpi/executer/exnames.c
Back to the patch index
Back to the overall index
- Lines: 1127
- Date:
2003-08-25 04:44:41.000000000 -0700
- Orig file:
linux-2.4.21/drivers/acpi/executer/exoparg1.c
- Orig date:
2001-10-24 14:06:22.000000000 -0700
diff -urN linux-2.4.21/drivers/acpi/executer/exoparg1.c linux-2.4.22/drivers/acpi/executer/exoparg1.c
@@ -2,39 +2,57 @@
/******************************************************************************
*
* Module Name: exoparg1 - AML execution - opcodes with 1 argument
- * $Revision: 120 $
*
*****************************************************************************/
/*
- * Copyright (C) 2000, 2001 R. Byron Moore
+ * Copyright (C) 2000 - 2003, R. Byron Moore
+ * All rights reserved.
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions, and the following disclaimer,
+ * without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ * substantially similar to the "NO WARRANTY" disclaimer below
+ * ("Disclaimer") and any redistribution must be conditioned upon
+ * including a substantially similar Disclaimer requirement for further
+ * binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ * of any contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
*/
-#include "acpi.h"
-#include "acparser.h"
-#include "acdispat.h"
-#include "acinterp.h"
-#include "amlcode.h"
-#include "acnamesp.h"
+#include <acpi/acpi.h>
+#include <acpi/acparser.h>
+#include <acpi/acdispat.h>
+#include <acpi/acinterp.h>
+#include <acpi/amlcode.h>
+#include <acpi/acnamesp.h>
#define _COMPONENT ACPI_EXECUTER
- MODULE_NAME ("exoparg1")
+ ACPI_MODULE_NAME ("exoparg1")
/*!
@@ -59,12 +77,11 @@
* fully resolved operands.
!*/
-
/*******************************************************************************
*
- * FUNCTION: Acpi_ex_opcode_1A_0T_0R
+ * FUNCTION: acpi_ex_opcode_1A_0T_0R
*
- * PARAMETERS: Walk_state - Current state (contains AML opcode)
+ * PARAMETERS: walk_state - Current state (contains AML opcode)
*
* RETURN: Status
*
@@ -75,45 +92,45 @@
acpi_status
acpi_ex_opcode_1A_0T_0R (
- acpi_walk_state *walk_state)
+ struct acpi_walk_state *walk_state)
{
- acpi_operand_object **operand = &walk_state->operands[0];
- acpi_status status = AE_OK;
+ union acpi_operand_object **operand = &walk_state->operands[0];
+ acpi_status status = AE_OK;
- FUNCTION_TRACE_STR ("Ex_opcode_1A_0T_0R", acpi_ps_get_opcode_name (walk_state->opcode));
+ ACPI_FUNCTION_TRACE_STR ("ex_opcode_1A_0T_0R", acpi_ps_get_opcode_name (walk_state->opcode));
- /* Examine the opcode */
+ /* Examine the AML opcode */
switch (walk_state->opcode) {
- case AML_RELEASE_OP: /* Release (Mutex_object) */
+ case AML_RELEASE_OP: /* Release (mutex_object) */
status = acpi_ex_release_mutex (operand[0], walk_state);
break;
- case AML_RESET_OP: /* Reset (Event_object) */
+ case AML_RESET_OP: /* Reset (event_object) */
status = acpi_ex_system_reset_event (operand[0]);
break;
- case AML_SIGNAL_OP: /* Signal (Event_object) */
+ case AML_SIGNAL_OP: /* Signal (event_object) */
status = acpi_ex_system_signal_event (operand[0]);
break;
- case AML_SLEEP_OP: /* Sleep (Msec_time) */
+ case AML_SLEEP_OP: /* Sleep (msec_time) */
- acpi_ex_system_do_suspend ((u32) operand[0]->integer.value);
+ status = acpi_ex_system_do_suspend ((u32) operand[0]->integer.value);
break;
- case AML_STALL_OP: /* Stall (Usec_time) */
+ case AML_STALL_OP: /* Stall (usec_time) */
- acpi_ex_system_do_stall ((u32) operand[0]->integer.value);
+ status = acpi_ex_system_do_stall ((u32) operand[0]->integer.value);
break;
@@ -125,7 +142,7 @@
default: /* Unknown opcode */
- REPORT_ERROR (("Acpi_ex_opcode_1A_0T_0R: Unknown opcode %X\n",
+ ACPI_REPORT_ERROR (("acpi_ex_opcode_1A_0T_0R: Unknown opcode %X\n",
walk_state->opcode));
status = AE_AML_BAD_OPCODE;
break;
@@ -137,9 +154,9 @@
/*******************************************************************************
*
- * FUNCTION: Acpi_ex_opcode_1A_1T_0R
+ * FUNCTION: acpi_ex_opcode_1A_1T_0R
*
- * PARAMETERS: Walk_state - Current state (contains AML opcode)
+ * PARAMETERS: walk_state - Current state (contains AML opcode)
*
* RETURN: Status
*
@@ -150,25 +167,26 @@
acpi_status
acpi_ex_opcode_1A_1T_0R (
- acpi_walk_state *walk_state)
+ struct acpi_walk_state *walk_state)
{
- acpi_status status = AE_OK;
- acpi_operand_object **operand = &walk_state->operands[0];
+ acpi_status status = AE_OK;
+ union acpi_operand_object **operand = &walk_state->operands[0];
- FUNCTION_TRACE_STR ("Ex_opcode_1A_1T_0R", acpi_ps_get_opcode_name (walk_state->opcode));
+ ACPI_FUNCTION_TRACE_STR ("ex_opcode_1A_1T_0R", acpi_ps_get_opcode_name (walk_state->opcode));
- switch (walk_state->opcode) {
+ /* Examine the AML opcode */
+ switch (walk_state->opcode) {
case AML_LOAD_OP:
- status = acpi_ex_load_op (operand[0], operand[1]);
+ status = acpi_ex_load_op (operand[0], operand[1], walk_state);
break;
default: /* Unknown opcode */
- REPORT_ERROR (("Acpi_ex_opcode_1A_1T_0R: Unknown opcode %X\n",
+ ACPI_REPORT_ERROR (("acpi_ex_opcode_1A_1T_0R: Unknown opcode %X\n",
walk_state->opcode));
status = AE_AML_BAD_OPCODE;
goto cleanup;
@@ -183,9 +201,9 @@
/*******************************************************************************
*
- * FUNCTION: Acpi_ex_opcode_1A_1T_1R
+ * FUNCTION: acpi_ex_opcode_1A_1T_1R
*
- * PARAMETERS: Walk_state - Current state (contains AML opcode)
+ * PARAMETERS: walk_state - Current state (contains AML opcode)
*
* RETURN: Status
*
@@ -196,22 +214,22 @@
acpi_status
acpi_ex_opcode_1A_1T_1R (
- acpi_walk_state *walk_state)
+ struct acpi_walk_state *walk_state)
{
- acpi_status status = AE_OK;
- acpi_operand_object **operand = &walk_state->operands[0];
- acpi_operand_object *return_desc = NULL;
- acpi_operand_object *return_desc2 = NULL;
- u32 temp32;
- u32 i;
- u32 j;
- acpi_integer digit;
+ acpi_status status = AE_OK;
+ union acpi_operand_object **operand = &walk_state->operands[0];
+ union acpi_operand_object *return_desc = NULL;
+ union acpi_operand_object *return_desc2 = NULL;
+ u32 temp32;
+ u32 i;
+ u32 power_of_ten;
+ acpi_integer digit;
- FUNCTION_TRACE_STR ("Ex_opcode_1A_1T_1R", acpi_ps_get_opcode_name (walk_state->opcode));
+ ACPI_FUNCTION_TRACE_STR ("ex_opcode_1A_1T_1R", acpi_ps_get_opcode_name (walk_state->opcode));
- /* Create a return object of type Integer for most opcodes */
+ /* Examine the AML opcode */
switch (walk_state->opcode) {
case AML_BIT_NOT_OP:
@@ -221,156 +239,162 @@
case AML_TO_BCD_OP:
case AML_COND_REF_OF_OP:
+ /* Create a return object of type Integer for these opcodes */
+
return_desc = acpi_ut_create_internal_object (ACPI_TYPE_INTEGER);
if (!return_desc) {
status = AE_NO_MEMORY;
goto cleanup;
}
- break;
- }
+ switch (walk_state->opcode) {
+ case AML_BIT_NOT_OP: /* Not (Operand, Result) */
+ return_desc->integer.value = ~operand[0]->integer.value;
+ break;
- switch (walk_state->opcode) {
- case AML_BIT_NOT_OP: /* Not (Operand, Result) */
+ case AML_FIND_SET_LEFT_BIT_OP: /* find_set_left_bit (Operand, Result) */
- return_desc->integer.value = ~operand[0]->integer.value;
- break;
+ return_desc->integer.value = operand[0]->integer.value;
+ /*
+ * Acpi specification describes Integer type as a little
+ * endian unsigned value, so this boundary condition is valid.
+ */
+ for (temp32 = 0; return_desc->integer.value && temp32 < ACPI_INTEGER_BIT_SIZE; ++temp32) {
+ return_desc->integer.value >>= 1;
+ }
- case AML_FIND_SET_LEFT_BIT_OP: /* Find_set_left_bit (Operand, Result) */
+ return_desc->integer.value = temp32;
+ break;
- return_desc->integer.value = operand[0]->integer.value;
+ case AML_FIND_SET_RIGHT_BIT_OP: /* find_set_right_bit (Operand, Result) */
- /*
- * Acpi specification describes Integer type as a little
- * endian unsigned value, so this boundary condition is valid.
- */
- for (temp32 = 0; return_desc->integer.value && temp32 < ACPI_INTEGER_BIT_SIZE; ++temp32) {
- return_desc->integer.value >>= 1;
- }
+ return_desc->integer.value = operand[0]->integer.value;
- return_desc->integer.value = temp32;
- break;
+ /*
+ * The Acpi specification describes Integer type as a little
+ * endian unsigned value, so this boundary condition is valid.
+ */
+ for (temp32 = 0; return_desc->integer.value && temp32 < ACPI_INTEGER_BIT_SIZE; ++temp32) {
+ return_desc->integer.value <<= 1;
+ }
+ /* Since the bit position is one-based, subtract from 33 (65) */
- case AML_FIND_SET_RIGHT_BIT_OP: /* Find_set_right_bit (Operand, Result) */
+ return_desc->integer.value = temp32 == 0 ? 0 : (ACPI_INTEGER_BIT_SIZE + 1) - temp32;
+ break;
- return_desc->integer.value = operand[0]->integer.value;
+ case AML_FROM_BCD_OP: /* from_bcd (BCDValue, Result) */
- /*
- * The Acpi specification describes Integer type as a little
- * endian unsigned value, so this boundary condition is valid.
- */
- for (temp32 = 0; return_desc->integer.value && temp32 < ACPI_INTEGER_BIT_SIZE; ++temp32) {
- return_desc->integer.value <<= 1;
- }
+ /*
+ * The 64-bit ACPI integer can hold 16 4-bit BCD characters
+ * (if table is 32-bit, integer can hold 8 BCD characters)
+ * Convert each 4-bit BCD value
+ */
+ power_of_ten = 1;
+ return_desc->integer.value = 0;
+ digit = operand[0]->integer.value;
- /* Since the bit position is one-based, subtract from 33 (65) */
+ /* Convert each BCD digit (each is one nybble wide) */
- return_desc->integer.value = temp32 == 0 ? 0 : (ACPI_INTEGER_BIT_SIZE + 1) - temp32;
- break;
+ for (i = 0; (i < acpi_gbl_integer_nybble_width) && (digit > 0); i++) {
+ /* Get the least significant 4-bit BCD digit */
+ temp32 = ((u32) digit) & 0xF;
- case AML_FROM_BCD_OP: /* From_bcd (BCDValue, Result) */
+ /* Check the range of the digit */
- /*
- * The 64-bit ACPI integer can hold 16 4-bit BCD integers
- */
- return_desc->integer.value = 0;
- for (i = 0; i < ACPI_MAX_BCD_DIGITS; i++) {
- /* Get one BCD digit */
+ if (temp32 > 9) {
+ ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
+ "BCD digit too large (not decimal): 0x%X\n",
+ temp32));
- digit = (acpi_integer) ((operand[0]->integer.value >> (i * 4)) & 0xF);
+ status = AE_AML_NUMERIC_OVERFLOW;
+ goto cleanup;
+ }
- /* Check the range of the digit */
+ /* Sum the digit into the result with the current power of 10 */
- if (digit > 9) {
- ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "BCD digit too large: %d\n",
- (u32) digit));
- status = AE_AML_NUMERIC_OVERFLOW;
- goto cleanup;
- }
+ return_desc->integer.value += (((acpi_integer) temp32) * power_of_ten);
- if (digit > 0) {
- /* Sum into the result with the appropriate power of 10 */
+ /* Shift to next BCD digit */
- for (j = 0; j < i; j++) {
- digit *= 10;
- }
+ digit >>= 4;
- return_desc->integer.value += digit;
+ /* Next power of 10 */
+
+ power_of_ten *= 10;
}
- }
- break;
+ break;
- case AML_TO_BCD_OP: /* To_bcd (Operand, Result) */
+ case AML_TO_BCD_OP: /* to_bcd (Operand, Result) */
- if (operand[0]->integer.value > ACPI_MAX_BCD_VALUE) {
- ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "BCD overflow: %8.8X%8.8X\n",
- HIDWORD(operand[0]->integer.value), LODWORD(operand[0]->integer.value)));
- status = AE_AML_NUMERIC_OVERFLOW;
- goto cleanup;
- }
+ return_desc->integer.value = 0;
+ digit = operand[0]->integer.value;
- return_desc->integer.value = 0;
- for (i = 0; i < ACPI_MAX_BCD_DIGITS; i++) {
- /* Divide by nth factor of 10 */
+ /* Each BCD digit is one nybble wide */
- temp32 = 0;
- digit = operand[0]->integer.value;
- for (j = 0; j < i; j++) {
- acpi_ut_short_divide (&digit, 10, &digit, &temp32);
+ for (i = 0; (i < acpi_gbl_integer_nybble_width) && (digit > 0); i++) {
+ (void) acpi_ut_short_divide (&digit, 10, &digit, &temp32);
+
+ /* Insert the BCD digit that resides in the remainder from above */
+
+ return_desc->integer.value |= (((acpi_integer) temp32) << (i * 4));
}
- /* Create the BCD digit from the remainder above */
+ /* Overflow if there is any data left in Digit */
if (digit > 0) {
- return_desc->integer.value += (temp32 << (i * 4));
+ ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Integer too large to convert to BCD: %8.8X%8.8X\n",
+ ACPI_HIDWORD(operand[0]->integer.value),
+ ACPI_LODWORD(operand[0]->integer.value)));
+ status = AE_AML_NUMERIC_OVERFLOW;
+ goto cleanup;
}
- }
- break;
+ break;
- case AML_COND_REF_OF_OP: /* Cond_ref_of (Source_object, Result) */
+ case AML_COND_REF_OF_OP: /* cond_ref_of (source_object, Result) */
- /*
- * This op is a little strange because the internal return value is
- * different than the return value stored in the result descriptor
- * (There are really two return values)
- */
- if ((acpi_namespace_node *) operand[0] == acpi_gbl_root_node) {
/*
- * This means that the object does not exist in the namespace,
- * return FALSE
+ * This op is a little strange because the internal return value is
+ * different than the return value stored in the result descriptor
+ * (There are really two return values)
*/
- return_desc->integer.value = 0;
+ if ((struct acpi_namespace_node *) operand[0] == acpi_gbl_root_node) {
+ /*
+ * This means that the object does not exist in the namespace,
+ * return FALSE
+ */
+ return_desc->integer.value = 0;
+ goto cleanup;
+ }
- /*
- * Must delete the result descriptor since there is no reference
- * being returned
- */
- acpi_ut_remove_reference (operand[1]);
- goto cleanup;
- }
+ /* Get the object reference, store it, and remove our reference */
- /* Get the object reference and store it */
+ status = acpi_ex_get_object_reference (operand[0], &return_desc2, walk_state);
+ if (ACPI_FAILURE (status)) {
+ goto cleanup;
+ }
- status = acpi_ex_get_object_reference (operand[0], &return_desc2, walk_state);
- if (ACPI_FAILURE (status)) {
- goto cleanup;
- }
+ status = acpi_ex_store (return_desc2, operand[1], walk_state);
+ acpi_ut_remove_reference (return_desc2);
- status = acpi_ex_store (return_desc2, operand[1], walk_state);
+ /* The object exists in the namespace, return TRUE */
- /* The object exists in the namespace, return TRUE */
+ return_desc->integer.value = ACPI_INTEGER_MAX;
+ goto cleanup;
- return_desc->integer.value = ACPI_INTEGER_MAX;
- goto cleanup;
+
+ default:
+ /* No other opcodes get here */
+ break;
+ }
break;
@@ -386,16 +410,19 @@
return_ACPI_STATUS (status);
}
- /*
- * Normally, we would remove a reference on the Operand[0] parameter;
- * But since it is being used as the internal return object
- * (meaning we would normally increment it), the two cancel out,
- * and we simply don't do anything.
- */
- walk_state->result_obj = operand[0];
- walk_state->operands[0] = NULL; /* Prevent deletion */
+ /* It is possible that the Store already produced a return object */
+
+ if (!walk_state->result_obj) {
+ /*
+ * Normally, we would remove a reference on the Operand[0] parameter;
+ * But since it is being used as the internal return object
+ * (meaning we would normally increment it), the two cancel out,
+ * and we simply don't do anything.
+ */
+ walk_state->result_obj = operand[0];
+ walk_state->operands[0] = NULL; /* Prevent deletion */
+ }
return_ACPI_STATUS (status);
- break;
/*
@@ -403,58 +430,54 @@
*/
case AML_COPY_OP: /* Copy (Source, Target) */
- status = AE_NOT_IMPLEMENTED;
- goto cleanup;
+ status = acpi_ut_copy_iobject_to_iobject (operand[0], &return_desc, walk_state);
break;
- case AML_TO_DECSTRING_OP: /* To_decimal_string (Data, Result) */
+ case AML_TO_DECSTRING_OP: /* to_decimal_string (Data, Result) */
status = acpi_ex_convert_to_string (operand[0], &return_desc, 10, ACPI_UINT32_MAX, walk_state);
break;
- case AML_TO_HEXSTRING_OP: /* To_hex_string (Data, Result) */
+ case AML_TO_HEXSTRING_OP: /* to_hex_string (Data, Result) */
status = acpi_ex_convert_to_string (operand[0], &return_desc, 16, ACPI_UINT32_MAX, walk_state);
break;
- case AML_TO_BUFFER_OP: /* To_buffer (Data, Result) */
+ case AML_TO_BUFFER_OP: /* to_buffer (Data, Result) */
status = acpi_ex_convert_to_buffer (operand[0], &return_desc, walk_state);
break;
- case AML_TO_INTEGER_OP: /* To_integer (Data, Result) */
+ case AML_TO_INTEGER_OP: /* to_integer (Data, Result) */
status = acpi_ex_convert_to_integer (operand[0], &return_desc, walk_state);
break;
- /*
- * These are two obsolete opcodes
- */
- case AML_SHIFT_LEFT_BIT_OP: /* Shift_left_bit (Source, Bit_num) */
- case AML_SHIFT_RIGHT_BIT_OP: /* Shift_right_bit (Source, Bit_num) */
-
+ case AML_SHIFT_LEFT_BIT_OP: /* shift_left_bit (Source, bit_num) */
+ case AML_SHIFT_RIGHT_BIT_OP: /* shift_right_bit (Source, bit_num) */
+ /*
+ * These are two obsolete opcodes
+ */
ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "%s is obsolete and not implemented\n",
acpi_ps_get_opcode_name (walk_state->opcode)));
status = AE_SUPPORT;
goto cleanup;
- break;
default: /* Unknown opcode */
- REPORT_ERROR (("Acpi_ex_opcode_1A_1T_1R: Unknown opcode %X\n",
+ ACPI_REPORT_ERROR (("acpi_ex_opcode_1A_1T_1R: Unknown opcode %X\n",
walk_state->opcode));
status = AE_AML_BAD_OPCODE;
goto cleanup;
}
-
/*
* Store the return value computed above into the target object
*/
@@ -463,7 +486,9 @@
cleanup:
- walk_state->result_obj = return_desc;
+ if (!walk_state->result_obj) {
+ walk_state->result_obj = return_desc;
+ }
/* Delete return object on error */
@@ -477,9 +502,9 @@
/*******************************************************************************
*
- * FUNCTION: Acpi_ex_opcode_1A_0T_1R
+ * FUNCTION: acpi_ex_opcode_1A_0T_1R
*
- * PARAMETERS: Walk_state - Current state (contains AML opcode)
+ * PARAMETERS: walk_state - Current state (contains AML opcode)
*
* RETURN: Status
*
@@ -489,23 +514,22 @@
acpi_status
acpi_ex_opcode_1A_0T_1R (
- acpi_walk_state *walk_state)
+ struct acpi_walk_state *walk_state)
{
- acpi_operand_object **operand = &walk_state->operands[0];
- acpi_operand_object *temp_desc;
- acpi_operand_object *return_desc = NULL;
- acpi_status status = AE_OK;
- u32 type;
- acpi_integer value;
+ union acpi_operand_object **operand = &walk_state->operands[0];
+ union acpi_operand_object *temp_desc;
+ union acpi_operand_object *return_desc = NULL;
+ acpi_status status = AE_OK;
+ u32 type;
+ acpi_integer value;
- FUNCTION_TRACE_STR ("Ex_opcode_1A_0T_0R", acpi_ps_get_opcode_name (walk_state->opcode));
+ ACPI_FUNCTION_TRACE_STR ("ex_opcode_1A_0T_0R", acpi_ps_get_opcode_name (walk_state->opcode));
- /* Get the operand and decode the opcode */
+ /* Examine the AML opcode */
switch (walk_state->opcode) {
-
case AML_LNOT_OP: /* LNot (Operand) */
return_desc = acpi_ut_create_internal_object (ACPI_TYPE_INTEGER);
@@ -523,18 +547,18 @@
/*
* Since we are expecting a Reference operand, it
- * can be either a Node or an internal object.
+ * can be either a NS Node or an internal object.
*/
return_desc = operand[0];
- if (VALID_DESCRIPTOR_TYPE (operand[0], ACPI_DESC_TYPE_INTERNAL)) {
+ if (ACPI_GET_DESCRIPTOR_TYPE (operand[0]) == ACPI_DESC_TYPE_OPERAND) {
/* Internal reference object - prevent deletion */
acpi_ut_add_reference (return_desc);
}
/*
- * Convert the Return_desc Reference to a Number
- * (This removes a reference on the Return_desc object)
+ * Convert the return_desc Reference to a Number
+ * (This removes a reference on the return_desc object)
*/
status = acpi_ex_resolve_operands (AML_LNOT_OP, &return_desc, walk_state);
if (ACPI_FAILURE (status)) {
@@ -545,7 +569,7 @@
}
/*
- * Return_desc is now guaranteed to be an Integer object
+ * return_desc is now guaranteed to be an Integer object
* Do the actual increment or decrement
*/
if (AML_INCREMENT_OP == walk_state->opcode) {
@@ -561,83 +585,13 @@
break;
- case AML_TYPE_OP: /* Object_type (Source_object) */
-
- if (INTERNAL_TYPE_REFERENCE == operand[0]->common.type) {
- /*
- * Not a Name -- an indirect name pointer would have
- * been converted to a direct name pointer in Resolve_operands
- */
- switch (operand[0]->reference.opcode) {
- case AML_ZERO_OP:
- case AML_ONE_OP:
- case AML_ONES_OP:
- case AML_REVISION_OP:
-
- /* Constants are of type Integer */
-
- type = ACPI_TYPE_INTEGER;
- break;
-
+ case AML_TYPE_OP: /* object_type (source_object) */
- case AML_DEBUG_OP:
-
- /* Per 1.0b spec, Debug object is of type "Debug_object" */
-
- type = ACPI_TYPE_DEBUG_OBJECT;
- break;
-
-
- case AML_INDEX_OP:
-
- /* Get the type of this reference (index into another object) */
-
- type = operand[0]->reference.target_type;
- if (type == ACPI_TYPE_PACKAGE) {
- /*
- * The main object is a package, we want to get the type
- * of the individual package element that is referenced by
- * the index.
- */
- type = (*(operand[0]->reference.where))->common.type;
- }
-
- break;
-
-
- case AML_LOCAL_OP:
- case AML_ARG_OP:
-
- type = acpi_ds_method_data_get_type (operand[0]->reference.opcode,
- operand[0]->reference.offset, walk_state);
- break;
-
-
- default:
-
- REPORT_ERROR (("Acpi_ex_opcode_1A_0T_1R/Type_op: Internal error - Unknown Reference subtype %X\n",
- operand[0]->reference.opcode));
- status = AE_AML_INTERNAL;
- goto cleanup;
- }
- }
-
- else {
- /*
- * It's not a Reference, so it must be a direct name pointer.
- */
- type = acpi_ns_get_type ((acpi_namespace_node *) operand[0]);
-
- /* Convert internal types to external types */
-
- switch (type) {
- case INTERNAL_TYPE_REGION_FIELD:
- case INTERNAL_TYPE_BANK_FIELD:
- case INTERNAL_TYPE_INDEX_FIELD:
-
- type = ACPI_TYPE_FIELD_UNIT;
- }
+ /* Get the type of the base object */
+ status = acpi_ex_resolve_multiple (walk_state, operand[0], &type, NULL);
+ if (ACPI_FAILURE (status)) {
+ goto cleanup;
}
/* Allocate a descriptor to hold the type. */
@@ -652,44 +606,38 @@
break;
- case AML_SIZE_OF_OP: /* Size_of (Source_object) */
+ case AML_SIZE_OF_OP: /* size_of (source_object) */
- temp_desc = operand[0];
- if (VALID_DESCRIPTOR_TYPE (operand[0], ACPI_DESC_TYPE_NAMED)) {
- temp_desc = acpi_ns_get_attached_object ((acpi_namespace_node *) operand[0]);
- }
+ /* Get the base object */
- if (!temp_desc) {
- value = 0;
+ status = acpi_ex_resolve_multiple (walk_state, operand[0], &type, &temp_desc);
+ if (ACPI_FAILURE (status)) {
+ goto cleanup;
}
- else {
- switch (temp_desc->common.type) {
- case ACPI_TYPE_BUFFER:
- value = temp_desc->buffer.length;
- break;
-
- case ACPI_TYPE_STRING:
- value = temp_desc->string.length;
- break;
-
- case ACPI_TYPE_PACKAGE:
- value = temp_desc->package.count;
- break;
-
- case INTERNAL_TYPE_REFERENCE:
-
- /* TBD: this must be a reference to a buf/str/pkg?? */
-
- value = 4;
- break;
-
- default:
- ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Not Buf/Str/Pkg - found type %X\n",
- temp_desc->common.type));
- status = AE_AML_OPERAND_TYPE;
- goto cleanup;
- }
+ /*
+ * Type is guaranteed to be a buffer, string, or package at this
+ * point (even if the original operand was an object reference, it
+ * will be resolved and typechecked during operand resolution.)
+ */
+ switch (type) {
+ case ACPI_TYPE_BUFFER:
+ value = temp_desc->buffer.length;
+ break;
+
+ case ACPI_TYPE_STRING:
+ value = temp_desc->string.length;
+ break;
+
+ case ACPI_TYPE_PACKAGE:
+ value = temp_desc->package.count;
+ break;
+
+ default:
+ ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "size_of, Not Buf/Str/Pkg - found type %s\n",
+ acpi_ut_get_type_name (type)));
+ status = AE_AML_OPERAND_TYPE;
+ goto cleanup;
}
/*
@@ -706,7 +654,7 @@
break;
- case AML_REF_OF_OP: /* Ref_of (Source_object) */
+ case AML_REF_OF_OP: /* ref_of (source_object) */
status = acpi_ex_get_object_reference (operand[0], &return_desc, walk_state);
if (ACPI_FAILURE (status)) {
@@ -715,79 +663,113 @@
break;
- case AML_DEREF_OF_OP: /* Deref_of (Obj_reference) */
+ case AML_DEREF_OF_OP: /* deref_of (obj_reference | String) */
- /* Check for a method local or argument */
+ /* Check for a method local or argument, or standalone String */
- if (!VALID_DESCRIPTOR_TYPE (operand[0], ACPI_DESC_TYPE_NAMED)) {
- /*
- * Must resolve/dereference the local/arg reference first
- */
- switch (operand[0]->reference.opcode) {
- /* Set Operand[0] to the value of the local/arg */
+ if (ACPI_GET_DESCRIPTOR_TYPE (operand[0]) != ACPI_DESC_TYPE_NAMED) {
+ switch (ACPI_GET_OBJECT_TYPE (operand[0])) {
+ case ACPI_TYPE_LOCAL_REFERENCE:
+ /*
+ * This is a deref_of (local_x | arg_x)
+ *
+ * Must resolve/dereference the local/arg reference first
+ */
+ switch (operand[0]->reference.opcode) {
+ case AML_LOCAL_OP:
+ case AML_ARG_OP:
+
+ /* Set Operand[0] to the value of the local/arg */
+
+ status = acpi_ds_method_data_get_value (operand[0]->reference.opcode,
+ operand[0]->reference.offset, walk_state, &temp_desc);
+ if (ACPI_FAILURE (status)) {
+ goto cleanup;
+ }
- case AML_LOCAL_OP:
- case AML_ARG_OP:
+ /*
+ * Delete our reference to the input object and
+ * point to the object just retrieved
+ */
+ acpi_ut_remove_reference (operand[0]);
+ operand[0] = temp_desc;
+ break;
- acpi_ds_method_data_get_value (operand[0]->reference.opcode,
- operand[0]->reference.offset, walk_state, &temp_desc);
+ case AML_REF_OF_OP:
- /*
- * Delete our reference to the input object and
- * point to the object just retrieved
- */
- acpi_ut_remove_reference (operand[0]);
- operand[0] = temp_desc;
- break;
+ /* Get the object to which the reference refers */
- default:
+ temp_desc = operand[0]->reference.object;
+ acpi_ut_remove_reference (operand[0]);
+ operand[0] = temp_desc;
+ break;
- /* Index op - handled below */
- break;
- }
- }
+ default:
+ /* Must be an Index op - handled below */
+ break;
+ }
+ break;
- /* Operand[0] may have changed from the code above */
- if (VALID_DESCRIPTOR_TYPE (operand[0], ACPI_DESC_TYPE_NAMED)) {
- /* Get the actual object from the Node (This is the dereference) */
+ case ACPI_TYPE_STRING:
- return_desc = ((acpi_namespace_node *) operand[0])->object;
+ /*
+ * This is a deref_of (String). The string is a reference to a named ACPI object.
+ *
+ * 1) Find the owning Node
+ * 2) Dereference the node to an actual object. Could be a Field, so we nee
+ * to resolve the node to a value.
+ */
+ status = acpi_ns_get_node_by_path (operand[0]->string.pointer,
+ walk_state->scope_info->scope.node, ACPI_NS_SEARCH_PARENT,
+ ACPI_CAST_INDIRECT_PTR (struct acpi_namespace_node, &return_desc));
+ if (ACPI_FAILURE (status)) {
+ goto cleanup;
+ }
- /* Returning a pointer to the object, add another reference! */
+ status = acpi_ex_resolve_node_to_value (
+ ACPI_CAST_INDIRECT_PTR (struct acpi_namespace_node, &return_desc), walk_state);
+ goto cleanup;
- acpi_ut_add_reference (return_desc);
- }
- else {
- /*
- * This must be a reference object produced by the Index
- * ASL operation -- check internal opcode
- */
- if ((operand[0]->reference.opcode != AML_INDEX_OP) &&
- (operand[0]->reference.opcode != AML_REF_OF_OP)) {
- ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Unknown opcode in ref(%p) - %X\n",
- operand[0], operand[0]->reference.opcode));
+ default:
- status = AE_TYPE;
+ status = AE_AML_OPERAND_TYPE;
goto cleanup;
}
+ }
+ /* Operand[0] may have changed from the code above */
+ if (ACPI_GET_DESCRIPTOR_TYPE (operand[0]) == ACPI_DESC_TYPE_NAMED) {
+ /*
+ * This is a deref_of (object_reference)
+ * Get the actual object from the Node (This is the dereference).
+ * -- This case may only happen when a local_x or arg_x is dereferenced above.
+ */
+ return_desc = acpi_ns_get_attached_object ((struct acpi_namespace_node *) operand[0]);
+ }
+ else {
+ /*
+ * This must be a reference object produced by either the Index() or
+ * ref_of() operator
+ */
switch (operand[0]->reference.opcode) {
case AML_INDEX_OP:
/*
- * Supported target types for the Index operator are
- * 1) A Buffer
- * 2) A Package
+ * The target type for the Index operator must be
+ * either a Buffer or a Package
*/
- if (operand[0]->reference.target_type == ACPI_TYPE_BUFFER_FIELD) {
+ switch (operand[0]->reference.target_type) {
+ case ACPI_TYPE_BUFFER_FIELD:
+
+ temp_desc = operand[0]->reference.object;
+
/*
- * The target is a buffer, we must create a new object that
- * contains one element of the buffer, the element pointed
- * to by the index.
+ * Create a new object that contains one element of the
+ * buffer -- the element pointed to by the index.
*
* NOTE: index into a buffer is NOT a pointer to a
* sub-buffer of the main buffer, it is only a pointer to a
@@ -799,20 +781,21 @@
goto cleanup;
}
- temp_desc = operand[0]->reference.object;
+ /*
+ * Since we are returning the value of the buffer at the
+ * indexed location, we don't need to add an additional
+ * reference to the buffer itself.
+ */
return_desc->integer.value =
temp_desc->buffer.pointer[operand[0]->reference.offset];
+ break;
- /* TBD: [Investigate] (see below) Don't add an additional
- * ref!
- */
- }
- else if (operand[0]->reference.target_type == ACPI_TYPE_PACKAGE) {
+ case ACPI_TYPE_PACKAGE:
+
/*
- * The target is a package, we want to return the referenced
- * element of the package. We must add another reference to
- * this object, however.
+ * Return the referenced element of the package. We must add
+ * another reference to the referenced object, however.
*/
return_desc = *(operand[0]->reference.where);
if (!return_desc) {
@@ -821,7 +804,6 @@
* an uninitialized package element and is thus a
* severe error.
*/
-
ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "NULL package element obj %p\n",
operand[0]));
status = AE_AML_UNINITIALIZED_ELEMENT;
@@ -829,15 +811,16 @@
}
acpi_ut_add_reference (return_desc);
- }
+ break;
+
+
+ default:
- else {
- ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Unknown Target_type %X in obj %p\n",
+ ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Unknown Index target_type %X in obj %p\n",
operand[0]->reference.target_type, operand[0]));
status = AE_AML_OPERAND_TYPE;
goto cleanup;
}
-
break;
@@ -845,19 +828,31 @@
return_desc = operand[0]->reference.object;
+ if (ACPI_GET_DESCRIPTOR_TYPE (return_desc) == ACPI_DESC_TYPE_NAMED) {
+
+ return_desc = acpi_ns_get_attached_object ((struct acpi_namespace_node *) return_desc);
+ }
+
/* Add another reference to the object! */
acpi_ut_add_reference (return_desc);
break;
+
+
+ default:
+ ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Unknown opcode in ref(%p) - %X\n",
+ operand[0], operand[0]->reference.opcode));
+
+ status = AE_TYPE;
+ goto cleanup;
}
}
-
break;
default:
- REPORT_ERROR (("Acpi_ex_opcode_1A_0T_1R: Unknown opcode %X\n",
+ ACPI_REPORT_ERROR (("acpi_ex_opcode_1A_0T_1R: Unknown opcode %X\n",
walk_state->opcode));
status = AE_AML_BAD_OPCODE;
goto cleanup;
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)