mirrors/acpica
1
0
Fork 0
mirror of https://github.com/acpica/acpica/ synced 2025-02-23 08:54:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Indexing into a Buffer. Allows an Index into a buffer to accept

Browse Source 
a store from a Buffer, String or Number type.  Also, ObjectType(Index(NAME, #))
returns a BufferField type (14)


date	2000.04.20.22.39.00;	author mwalz;	state Exp;
This commit is contained in:
aystarik 2005-06-29 17:47:31 +00:00
parent 1cd630a9fd
commit 2bc93ec15a
2 changed files with 61 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source/components/executer/exresolv.c
View File

@ -391,24 +391,8 @@ AmlResolveObjectToValue (
switch (StackDesc->Reference.TargetType)
{
case ACPI_TYPE_Buffer:
ObjDesc = StackDesc->Reference.Object;
if (ObjDesc)
{
/*
* Valid obj descriptor, copy pointer to return value
*/
*StackPtr = ObjDesc;
Status = AE_OK;
}
else
{
/* Invalid obj descriptor */
DEBUG_PRINT (ACPI_ERROR, ("AmlResolveObjectToValue: Null buffer ptr in obj %p\n", StackDesc));
Status = AE_AML_INTERNAL;
}
case ACPI_TYPE_BufferField:
/* Just return - leave the Reference on the stack */
break;
case ACPI_TYPE_Package:

97
source/components/executer/exstore.c
View File

@ -690,6 +690,7 @@ AmlExecStore (
ACPI_OBJECT_INTERNAL *DeleteDestDesc = NULL;
ACPI_OBJECT_INTERNAL *TmpDesc;
NAME_TABLE_ENTRY *Entry = NULL;
UINT8 Value = 0;
FUNCTION_TRACE ("AmlExecStore");
@ -799,25 +800,65 @@ AmlExecStore (
break;
}
/*
* Check that the destination is a Buffer Field type
*/
if (DestDesc->Reference.TargetType != ACPI_TYPE_BufferField)
{
DeleteDestDesc = DestDesc;
Status = AE_AML_OPERAND_TYPE;
break;
}
/*
* Storing a number into a buffer at a location defined by an Index.
* Storing into a buffer at a location defined by an Index.
* This is a little more complex than the package case.
*
* If value is not a Number, try to resolve it to one.
*/
if ((ValDesc->Common.Type != ACPI_TYPE_Number) &&
((Status = AmlResolveToValue (&ValDesc)) != AE_OK))
switch (ValDesc->Common.Type)
{
DeleteDestDesc = DestDesc;
/*
* TBD: Verify that this truncation behavior is correct
*/
case ACPI_TYPE_Number:
Value = (UINT8)ValDesc->Number.Value;
break;
/*
* TBD: Should the buffer replace only the single element?
*/
case ACPI_TYPE_Buffer:
case ACPI_TYPE_String:
Value = *(ValDesc->Buffer.Pointer);
break;
/*
* If value is not a Number, try to resolve it to one.
*/
default:
if ((ValDesc->Common.Type != ACPI_TYPE_Number) &&
((Status = AmlResolveToValue (&ValDesc)) != AE_OK))
{
DeleteDestDesc = DestDesc;
}
else if (ValDesc->Common.Type != ACPI_TYPE_Number)
{
DEBUG_PRINT (ACPI_ERROR, ("AmlExecStore/Index: Index value must be Number, not %d\n",
ValDesc->Common.Type));
DeleteDestDesc = DestDesc;
Status = AE_AML_OPERAND_TYPE;
}
break;
}
else if (ValDesc->Common.Type != ACPI_TYPE_Number)
/*
* If we had an error, break out of this case statement.
*/
if(AE_OK != Status)
{
DEBUG_PRINT (ACPI_ERROR, ("AmlExecStore/Index: Index value must be Number, not %d\n",
ValDesc->Common.Type));
DeleteDestDesc = DestDesc;
Status = AE_AML_OPERAND_TYPE;
break;
}
@ -828,21 +869,6 @@ AmlExecStore (
DeleteDestDesc = DestDesc;
DestDesc = NsGetAttachedObject (Entry);
if (!DestDesc)
{
DEBUG_PRINT (ACPI_ERROR, ("AmlExecStore/Index: Internal error - null old-value pointer\n"));
Status = AE_AML_INTERNAL;
break;
}
else
{
DEBUG_PRINT (ACPI_INFO, ("AmlExecStore/Index: Value DestDesc=%p, Type=0x%X\n",
DestDesc, DestDesc->Common.Type));
}
/*
* Valid source value and destination reference pointer.
*
@ -850,25 +876,20 @@ AmlExecStore (
* Destination should point to either a buffer or a package
*/
if (DestDesc->Common.Type == ACPI_TYPE_Any)
{
DestDesc->Common.Type = ACPI_TYPE_Number;
}
/*
* Dereference the Buffer Field and set it equal to the ValDesc value
*/
TmpDesc = DestDesc->Reference.Object;
if (DestDesc->Common.Type != ACPI_TYPE_Number)
if (TmpDesc->Common.Type != ACPI_TYPE_Buffer)
{
DEBUG_PRINT (ACPI_INFO, ("AmlExecStore/Index: Dest type must be a number - DestDesc=%p, Type=0x%X\n",
DestDesc, DestDesc->Common.Type));
Status = AE_AML_OPERAND_TYPE;
break;
}
else
{
/* Destination is a number, as it should be. Store the value */
TmpDesc->Buffer.Pointer[DestDesc->Reference.Offset] = Value;
DestDesc->Number.Value = ValDesc->Number.Value;
}
DestDesc = TmpDesc;
break;