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

*** empty log message ***

Browse Source
This commit is contained in:
rmoore1 2005-11-07 23:46:52 +00:00
parent 8f38d09426
commit 4c00d409cb
7 changed files with 29 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/compiler/aslcompiler.l
View File

@ -3,7 +3,7 @@
/******************************************************************************
*
* Module Name: aslcompiler.l - Flex input file
* $Revision: 1.74 $
* $Revision: 1.75 $
*
*****************************************************************************/
@ -932,7 +932,6 @@ literal (void)
UINT32 State = ASL_NORMAL_CHAR;
UINT32 i = 0;
UINT8 Digit;
UINT8 StringLength = 0;
char ConvertBuffer[4];
@ -944,17 +943,6 @@ literal (void)
InsertLineBuffer ('\"');
while ((StringChar = (char) input()) != EOF)
{
StringLength++;
if (StringLength == ACPI_MAX_STRING_CONVERSION)
{
/* Emit error only once, but keep going */
AslCommonError (ASL_ERROR, ASL_MSG_STRING_LENGTH,
Gbl_CurrentLineNumber, Gbl_LogicalLineNumber,
Gbl_CurrentLineOffset, Gbl_CurrentColumn,
Gbl_Files[ASL_FILE_INPUT].Filename, NULL);
}
InsertLineBuffer (StringChar);
DoCharacter:

4
source/compiler/asltypes.h
View File

@ -2,7 +2,7 @@
/******************************************************************************
*
* Module Name: asltypes.h - compiler data types and struct definitions
* $Revision: 1.80 $
* $Revision: 1.81 $
*
*****************************************************************************/
@ -405,7 +405,6 @@ typedef enum
ASL_MSG_SEEK,
ASL_MSG_SINGLE_NAME_OPTIMIZATION,
ASL_MSG_SOME_NO_RETVAL,
ASL_MSG_STRING_LENGTH,
ASL_MSG_SWITCH_TYPE,
ASL_MSG_SYNC_LEVEL,
ASL_MSG_SYNTAX,
@ -513,7 +512,6 @@ char *AslMessages [] = {
/* ASL_MSG_SEEK */ "Could not seek file",
/* ASL_MSG_SINGLE_NAME_OPTIMIZATION */ "NamePath optimized to NameSeg (uses run-time search path)",
/* ASL_MSG_SOME_NO_RETVAL */ "Called method may not always return a value",
/* ASL_MSG_STRING_LENGTH */ "String constant too long (200 max)",
/* ASL_MSG_SWITCH_TYPE */ "Switch expression is not a static Integer/Buffer/String data type, defaulting to Integer",
/* ASL_MSG_SYNC_LEVEL */ "SyncLevel must be in the range 0-15",
/* ASL_MSG_SYNTAX */ "",

14
source/components/executer/exconvrt.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: exconvrt - Object conversion routines
* $Revision: 1.67 $
* $Revision: 1.68 $
*
*****************************************************************************/
@ -632,18 +632,10 @@ AcpiExConvertToString (
}
/*
* Perform the conversion.
* Create a new string object and string buffer
* (-1 because of extra separator included in StringLength from above)
*/
StringLength--;
if (StringLength > ACPI_MAX_STRING_CONVERSION) /* ACPI limit */
{
return_ACPI_STATUS (AE_AML_STRING_LIMIT);
}
/* Create a new string object and string buffer */
ReturnDesc = AcpiUtCreateStringObject ((ACPI_SIZE) StringLength);
ReturnDesc = AcpiUtCreateStringObject ((ACPI_SIZE) (StringLength - 1));
if (!ReturnDesc)
{
return_ACPI_STATUS (AE_NO_MEMORY);

32
source/components/executer/exmisc.c
View File

@ -2,7 +2,7 @@
/******************************************************************************
*
* Module Name: exmisc - ACPI AML (p-code) execution - specific opcodes
* $Revision: 1.134 $
* $Revision: 1.135 $
*
*****************************************************************************/
@ -340,7 +340,6 @@ AcpiExDoConcatenate (
ACPI_OPERAND_OBJECT *ReturnDesc;
char *NewBuf;
ACPI_STATUS Status;
ACPI_SIZE NewLength;
ACPI_FUNCTION_TRACE ("ExDoConcatenate");
@ -369,7 +368,7 @@ AcpiExDoConcatenate (
break;
default:
ACPI_REPORT_ERROR (("Concat - invalid obj type: %X\n",
ACPI_REPORT_ERROR (("Concatanate - invalid object type: %X\n",
ACPI_GET_OBJECT_TYPE (Operand0)));
Status = AE_AML_INTERNAL;
}
@ -411,8 +410,7 @@ AcpiExDoConcatenate (
/* Copy the first integer, LSB first */
ACPI_MEMCPY (NewBuf,
&Operand0->Integer.Value,
ACPI_MEMCPY (NewBuf, &Operand0->Integer.Value,
AcpiGbl_IntegerByteWidth);
/* Copy the second integer (LSB first) after the first */
@ -426,15 +424,9 @@ AcpiExDoConcatenate (
/* Result of two Strings is a String */
NewLength = (ACPI_SIZE) Operand0->String.Length +
(ACPI_SIZE) LocalOperand1->String.Length;
if (NewLength > ACPI_MAX_STRING_CONVERSION)
{
Status = AE_AML_STRING_LIMIT;
goto Cleanup;
}
ReturnDesc = AcpiUtCreateStringObject (NewLength);
ReturnDesc = AcpiUtCreateStringObject ((ACPI_SIZE)
(Operand0->String.Length +
LocalOperand1->String.Length));
if (!ReturnDesc)
{
Status = AE_NO_MEMORY;
@ -445,8 +437,7 @@ AcpiExDoConcatenate (
/* Concatenate the strings */
ACPI_STRCPY (NewBuf,
Operand0->String.Pointer);
ACPI_STRCPY (NewBuf, Operand0->String.Pointer);
ACPI_STRCPY (NewBuf + Operand0->String.Length,
LocalOperand1->String.Pointer);
break;
@ -455,9 +446,9 @@ AcpiExDoConcatenate (
/* Result of two Buffers is a Buffer */
ReturnDesc = AcpiUtCreateBufferObject (
(ACPI_SIZE) Operand0->Buffer.Length +
(ACPI_SIZE) LocalOperand1->Buffer.Length);
ReturnDesc = AcpiUtCreateBufferObject ((ACPI_SIZE)
(Operand0->Buffer.Length +
LocalOperand1->Buffer.Length));
if (!ReturnDesc)
{
Status = AE_NO_MEMORY;
@ -468,8 +459,7 @@ AcpiExDoConcatenate (
/* Concatenate the buffers */
ACPI_MEMCPY (NewBuf,
Operand0->Buffer.Pointer,
ACPI_MEMCPY (NewBuf, Operand0->Buffer.Pointer,
Operand0->Buffer.Length);
ACPI_MEMCPY (NewBuf + Operand0->Buffer.Length,
LocalOperand1->Buffer.Pointer,

24
source/components/executer/exoparg2.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: exoparg2 - AML execution - opcodes with 2 arguments
* $Revision: 1.134 $
* $Revision: 1.135 $
*
*****************************************************************************/
@ -459,11 +459,6 @@ AcpiExOpcode_2A_1T_1R (
(Operand[0]->Buffer.Pointer[Length]))
{
Length++;
if (Length > ACPI_MAX_STRING_CONVERSION)
{
Status = AE_AML_STRING_LIMIT;
goto Cleanup;
}
}
/* Allocate a new string object */
@ -475,8 +470,10 @@ AcpiExOpcode_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 (ReturnDesc->String.Pointer,
Operand[0]->Buffer.Pointer, Length);
break;
@ -520,9 +517,8 @@ AcpiExOpcode_2A_1T_1R (
}
ReturnDesc->Reference.TargetType = ACPI_TYPE_PACKAGE;
ReturnDesc->Reference.Object = Operand[0];
ReturnDesc->Reference.Where = &Operand[0]->Package.Elements [
Index];
ReturnDesc->Reference.Object = Operand[0];
ReturnDesc->Reference.Where = &Operand[0]->Package.Elements [Index];
}
else
{
@ -538,7 +534,7 @@ AcpiExOpcode_2A_1T_1R (
}
ReturnDesc->Reference.TargetType = ACPI_TYPE_BUFFER_FIELD;
ReturnDesc->Reference.Object = Operand[0];
ReturnDesc->Reference.Object = Operand[0];
}
/*
@ -549,8 +545,8 @@ AcpiExOpcode_2A_1T_1R (
/* Complete the Index reference object */
ReturnDesc->Reference.Opcode = AML_INDEX_OP;
ReturnDesc->Reference.Offset = (UINT32) Index;
ReturnDesc->Reference.Opcode = AML_INDEX_OP;
ReturnDesc->Reference.Offset = (UINT32) Index;
/* Store the reference to the Target */

11
source/include/acconfig.h
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: acconfig.h - Global configuration constants
* $Revision: 1.195 $
* $Revision: 1.196 $
*
*****************************************************************************/
@ -173,11 +173,6 @@
#define ACPI_CA_SUPPORT_LEVEL 3
/* String size constants */
#define ACPI_MAX_STRING_LENGTH 512
#define ACPI_PATHNAME_MAX 256 /* A full namespace pathname */
/* Maximum count for a semaphore object */
#define ACPI_MAX_SEMAPHORE_COUNT 256
@ -210,10 +205,6 @@
#define ACPI_METHOD_NUM_ARGS 7
#define ACPI_METHOD_MAX_ARG 6
/* Maximum length of resulting string when converting from a buffer */
#define ACPI_MAX_STRING_CONVERSION 200
/* Length of _HID, _UID, and _CID values */
#define ACPI_DEVICE_ID_LENGTH 0x09

4
source/include/acglobal.h
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: acglobal.h - Declarations for global variables
* $Revision: 1.168 $
* $Revision: 1.169 $
*
*****************************************************************************/
@ -187,7 +187,7 @@ ACPI_EXTERN UINT8 ACPI_INIT_GLOBAL (AcpiGbl_EnableInterpreterSlack, FALSE)
* Only change this if the ASL code is poorly written and cannot handle
* reentrancy even though methods are marked "NotSerialized".
*/
ACPI_EXTERN UINT8 ACPI_INIT_GLOBAL (AcpiGbl_AllMethodsSerialized, FALSE);
ACPI_EXTERN UINT8 ACPI_INIT_GLOBAL (AcpiGbl_AllMethodsSerialized, TRUE);
/*
* Create the predefined _OSI method in the namespace? Default is TRUE