summaryrefslogtreecommitdiffstats
path: root/compiler
diff options
context:
space:
mode:
Diffstat (limited to 'compiler')
-rw-r--r--compiler/aslanalyze.c10
-rw-r--r--compiler/aslcodegen.c2
-rw-r--r--compiler/aslcompile.c2
-rw-r--r--compiler/aslcompiler.h6
-rw-r--r--compiler/aslcompiler.l2
-rw-r--r--compiler/aslcompiler.y4
-rw-r--r--compiler/asldefine.h4
-rw-r--r--compiler/aslerror.c16
-rw-r--r--compiler/aslfiles.c2
-rw-r--r--compiler/aslfold.c2
-rw-r--r--compiler/aslglobal.h10
-rw-r--r--compiler/asllength.c2
-rw-r--r--compiler/asllisting.c2
-rw-r--r--compiler/aslload.c14
-rw-r--r--compiler/asllookup.c2
-rw-r--r--compiler/aslmain.c5
-rw-r--r--compiler/aslmap.c2
-rw-r--r--compiler/aslopcodes.c10
-rw-r--r--compiler/asloperands.c6
-rw-r--r--compiler/aslopt.c2
-rw-r--r--compiler/aslresource.c4
-rw-r--r--compiler/aslrestype1.c2
-rw-r--r--compiler/aslrestype2.c2
-rw-r--r--compiler/aslstartup.c2
-rw-r--r--compiler/aslstubs.c2
-rw-r--r--compiler/asltransform.c20
-rw-r--r--compiler/asltree.c4
-rw-r--r--compiler/asltypes.h9
-rw-r--r--compiler/aslutils.c28
29 files changed, 85 insertions, 93 deletions
diff --git a/compiler/aslanalyze.c b/compiler/aslanalyze.c
index d44adda..4cbfcd6 100644
--- a/compiler/aslanalyze.c
+++ b/compiler/aslanalyze.c
@@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
@@ -667,8 +667,8 @@ AnCheckForReservedName (
{
/* The next two characters must be hex digits */
- if ((isxdigit (Name[2])) &&
- (isxdigit (Name[3])))
+ if ((isxdigit ((int) Name[2])) &&
+ (isxdigit ((int) Name[3])))
{
return (ACPI_EVENT_RESERVED_NAME);
}
@@ -1236,7 +1236,7 @@ AnMethodAnalysisWalkBegin (
*/
for (i = 0; Next->Asl.Value.String[i]; i++)
{
- if (!isalnum (Next->Asl.Value.String[i]))
+ if (!isalnum ((int) Next->Asl.Value.String[i]))
{
AslError (ASL_ERROR, ASL_MSG_ALPHANUMERIC_STRING,
Next, Next->Asl.Value.String);
@@ -2157,7 +2157,7 @@ AnOtherSemanticAnalysisWalkBegin (
*/
if (((ArgNode->Asl.ParseOpcode == PARSEOP_WORDCONST) ||
(ArgNode->Asl.ParseOpcode == PARSEOP_INTEGER)) &&
- (ArgNode->Asl.Value.Integer >= (ACPI_INTEGER) ACPI_WAIT_FOREVER))
+ (ArgNode->Asl.Value.Integer >= (UINT64) ACPI_WAIT_FOREVER))
{
break;
}
diff --git a/compiler/aslcodegen.c b/compiler/aslcodegen.c
index af3f292..dcd6997 100644
--- a/compiler/aslcodegen.c
+++ b/compiler/aslcodegen.c
@@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
diff --git a/compiler/aslcompile.c b/compiler/aslcompile.c
index bdff08c..90e9099 100644
--- a/compiler/aslcompile.c
+++ b/compiler/aslcompile.c
@@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
diff --git a/compiler/aslcompiler.h b/compiler/aslcompiler.h
index 2678c59..76bf51a 100644
--- a/compiler/aslcompiler.h
+++ b/compiler/aslcompiler.h
@@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
@@ -511,7 +511,7 @@ TrCreateLeafNode (
ACPI_PARSE_OBJECT *
TrCreateValuedLeafNode (
UINT32 ParseOpcode,
- ACPI_INTEGER Value);
+ UINT64 Value);
ACPI_PARSE_OBJECT *
TrLinkChildren (
@@ -718,7 +718,7 @@ UtCheckIntegerRange (
UINT32 LowValue,
UINT32 HighValue);
-ACPI_INTEGER
+UINT64
UtDoConstant (
char *String);
diff --git a/compiler/aslcompiler.l b/compiler/aslcompiler.l
index d64dbf6..dd0473c 100644
--- a/compiler/aslcompiler.l
+++ b/compiler/aslcompiler.l
@@ -10,7 +10,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
diff --git a/compiler/aslcompiler.y b/compiler/aslcompiler.y
index 1d89f2c..3c12a3d 100644
--- a/compiler/aslcompiler.y
+++ b/compiler/aslcompiler.y
@@ -10,7 +10,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
@@ -2388,7 +2388,7 @@ QWordConstExpr
ConstExprTerm
: PARSEOP_ZERO {$$ = TrCreateValuedLeafNode (PARSEOP_ZERO, 0);}
| PARSEOP_ONE {$$ = TrCreateValuedLeafNode (PARSEOP_ONE, 1);}
- | PARSEOP_ONES {$$ = TrCreateValuedLeafNode (PARSEOP_ONES, ACPI_INTEGER_MAX);}
+ | PARSEOP_ONES {$$ = TrCreateValuedLeafNode (PARSEOP_ONES, ACPI_UINT64_MAX);}
;
/* OptionalCount must appear before ByteList or an incorrect reduction will result */
diff --git a/compiler/asldefine.h b/compiler/asldefine.h
index aeb368f..75345a5 100644
--- a/compiler/asldefine.h
+++ b/compiler/asldefine.h
@@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
@@ -127,7 +127,7 @@
#define IntelAcpiCA "Intel ACPI Component Architecture"
#define CompilerId "ASL Optimizing Compiler"
#define DisassemblerId "AML Disassembler"
-#define CompilerCopyright "Copyright (C) 2000 - 2009 Intel Corporation"
+#define CompilerCopyright "Copyright (c) 2000 - 2010 Intel Corporation"
#define CompilerCompliance "Supports ACPI Specification Revision 4.0"
#define CompilerName "iasl"
#define CompilerCreatorId "INTL"
diff --git a/compiler/aslerror.c b/compiler/aslerror.c
index 5aa9e8c..f90df38 100644
--- a/compiler/aslerror.c
+++ b/compiler/aslerror.c
@@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
@@ -169,13 +169,7 @@ AeAddToErrorLog (
ASL_ERROR_MSG *Prev;
- if (!Gbl_ErrorLog)
- {
- Gbl_ErrorLog = Enode;
- return;
- }
-
- /* List is sorted according to line number */
+ /* If Gbl_ErrorLog is null, this is the first error node */
if (!Gbl_ErrorLog)
{
@@ -183,8 +177,10 @@ AeAddToErrorLog (
return;
}
- /* Walk error list until we find a line number greater than ours */
-
+ /*
+ * Walk error list until we find a line number greater than ours.
+ * List is sorted according to line number.
+ */
Prev = NULL;
Next = Gbl_ErrorLog;
diff --git a/compiler/aslfiles.c b/compiler/aslfiles.c
index 3d24ab3..ebf59a4 100644
--- a/compiler/aslfiles.c
+++ b/compiler/aslfiles.c
@@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
diff --git a/compiler/aslfold.c b/compiler/aslfold.c
index 4bb305e..c0644aa 100644
--- a/compiler/aslfold.c
+++ b/compiler/aslfold.c
@@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
diff --git a/compiler/aslglobal.h b/compiler/aslglobal.h
index 6aecfb6..69fcf84 100644
--- a/compiler/aslglobal.h
+++ b/compiler/aslglobal.h
@@ -10,7 +10,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
@@ -165,7 +165,6 @@ ASL_EXTERN char ASL_INIT_GLOBAL (*Gbl_LineBufPtr, Gbl_Curren
ASL_EXTERN ASL_ERROR_MSG ASL_INIT_GLOBAL (*Gbl_ErrorLog,NULL);
ASL_EXTERN ASL_ERROR_MSG ASL_INIT_GLOBAL (*Gbl_NextError,NULL);
-extern UINT32 Gbl_ExceptionCount[];
/* Option flags */
@@ -278,5 +277,12 @@ ASL_EXTERN char MsgBuffer[ASL_MSG_BUFFER_SIZE];
ASL_EXTERN char StringBuffer[ASL_MSG_BUFFER_SIZE];
ASL_EXTERN char StringBuffer2[ASL_MSG_BUFFER_SIZE];
+
+#ifdef _DECLARE_GLOBALS
+UINT32 Gbl_ExceptionCount[ASL_NUM_REPORT_LEVELS] = {0,0,0,0,0,0};
+#else
+extern UINT32 Gbl_ExceptionCount[ASL_NUM_REPORT_LEVELS];
+#endif
+
#endif /* __ASLGLOBAL_H */
diff --git a/compiler/asllength.c b/compiler/asllength.c
index bd222e6..5a9d1ce 100644
--- a/compiler/asllength.c
+++ b/compiler/asllength.c
@@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
diff --git a/compiler/asllisting.c b/compiler/asllisting.c
index f229d5f..c4253c2 100644
--- a/compiler/asllisting.c
+++ b/compiler/asllisting.c
@@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
diff --git a/compiler/aslload.c b/compiler/aslload.c
index fab67cc..5e9fa1b 100644
--- a/compiler/aslload.c
+++ b/compiler/aslload.c
@@ -8,7 +8,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
@@ -534,7 +534,7 @@ LdNamespace1Begin (
if (Op->Asl.CompileFlags == NODE_IS_RESOURCE_DESC)
{
Status = LdLoadResourceElements (Op, WalkState);
- goto Exit;
+ return_ACPI_STATUS (Status);
}
ObjectType = AslMapNamedOpcodeToDataType (Op->Asl.AmlOpcode);
@@ -578,7 +578,7 @@ LdNamespace1Begin (
AslCoreSubsystemError (Op, Status,
"Failure from namespace lookup", FALSE);
- goto Exit;
+ return_ACPI_STATUS (Status);
}
/* We found a node with this name, now check the type */
@@ -713,15 +713,14 @@ LdNamespace1Begin (
AslError (ASL_ERROR, ASL_MSG_NAME_EXISTS, Op,
Op->Asl.ExternalName);
- Status = AE_OK;
- goto Exit;
+ return_ACPI_STATUS (AE_OK);
}
}
else
{
AslCoreSubsystemError (Op, Status,
"Failure from namespace lookup", FALSE);
- goto Exit;
+ return_ACPI_STATUS (Status);
}
}
@@ -759,8 +758,7 @@ FinishNode:
Node->Value = (UINT32) Op->Asl.Extra;
}
-Exit:
- return (Status);
+ return_ACPI_STATUS (Status);
}
diff --git a/compiler/asllookup.c b/compiler/asllookup.c
index b99d037..2c1253d 100644
--- a/compiler/asllookup.c
+++ b/compiler/asllookup.c
@@ -8,7 +8,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
diff --git a/compiler/aslmain.c b/compiler/aslmain.c
index aa29ab8..45d7252 100644
--- a/compiler/aslmain.c
+++ b/compiler/aslmain.c
@@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
@@ -165,9 +165,6 @@ static int
AslDoResponseFile (
char *Filename);
-extern int AcpiGbl_Opterr;
-extern int AcpiGbl_Optind;
-
#define ASL_TOKEN_SEPARATORS " \t\n"
#define ASL_SUPPORTED_OPTIONS "@:2b:cd^e:fgh^i^I:l^o:p:r:s:t:v:w:x:"
diff --git a/compiler/aslmap.c b/compiler/aslmap.c
index 4c1fdf0..6b3019a 100644
--- a/compiler/aslmap.c
+++ b/compiler/aslmap.c
@@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
diff --git a/compiler/aslopcodes.c b/compiler/aslopcodes.c
index e386266..1c6eef7 100644
--- a/compiler/aslopcodes.c
+++ b/compiler/aslopcodes.c
@@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
@@ -328,7 +328,7 @@ OpcSetOptimalIntegerSize (
}
break;
- case ACPI_INTEGER_MAX:
+ case ACPI_UINT64_MAX:
/* Check for table integer width (32 or 64) */
@@ -568,7 +568,7 @@ OpcDoEisaId (
if (i < 3)
{
- if (!isupper (InString[i]))
+ if (!isupper ((int) InString[i]))
{
Status = AE_BAD_PARAMETER;
}
@@ -576,7 +576,7 @@ OpcDoEisaId (
/* Last 4 characters must be hex digits */
- else if (!isxdigit (InString[i]))
+ else if (!isxdigit ((int) InString[i]))
{
Status = AE_BAD_PARAMETER;
}
@@ -666,7 +666,7 @@ OpcDoUuId (
}
else
{
- if (!isxdigit (InString[i]))
+ if (!isxdigit ((int) InString[i]))
{
Status = AE_BAD_PARAMETER;
}
diff --git a/compiler/asloperands.c b/compiler/asloperands.c
index 8f2388e..bf6dcf2 100644
--- a/compiler/asloperands.c
+++ b/compiler/asloperands.c
@@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
@@ -604,7 +604,7 @@ OpnDoRegion (
}
else
{
- Op->Asl.Value.Integer = ACPI_INTEGER_MAX;
+ Op->Asl.Value.Integer = ACPI_UINT64_MAX;
}
}
@@ -1007,7 +1007,7 @@ OpnDoDefinitionBlock (
for (i = 0; i < 4; i++)
{
- if (!isalnum (Gbl_TableSignature[i]))
+ if (!isalnum ((int) Gbl_TableSignature[i]))
{
AslError (ASL_ERROR, ASL_MSG_TABLE_SIGNATURE, Child,
"Contains non-alphanumeric characters");
diff --git a/compiler/aslopt.c b/compiler/aslopt.c
index 3013f4c..6f0b756 100644
--- a/compiler/aslopt.c
+++ b/compiler/aslopt.c
@@ -8,7 +8,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
diff --git a/compiler/aslresource.c b/compiler/aslresource.c
index ceebd9c..421fde3 100644
--- a/compiler/aslresource.c
+++ b/compiler/aslresource.c
@@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
@@ -184,7 +184,7 @@ RsCreateBitField (
{
Op->Asl.ExternalName = Name;
- Op->Asl.Value.Integer = ((ACPI_INTEGER) ByteOffset * 8) + BitOffset;
+ Op->Asl.Value.Integer = ((UINT64) ByteOffset * 8) + BitOffset;
Op->Asl.CompileFlags |= (NODE_IS_RESOURCE_FIELD | NODE_IS_BIT_OFFSET);
}
diff --git a/compiler/aslrestype1.c b/compiler/aslrestype1.c
index edc8405..1dbff031 100644
--- a/compiler/aslrestype1.c
+++ b/compiler/aslrestype1.c
@@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
diff --git a/compiler/aslrestype2.c b/compiler/aslrestype2.c
index 7074a55..7ca8eeb 100644
--- a/compiler/aslrestype2.c
+++ b/compiler/aslrestype2.c
@@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
diff --git a/compiler/aslstartup.c b/compiler/aslstartup.c
index 87e102b..ea61c9e 100644
--- a/compiler/aslstartup.c
+++ b/compiler/aslstartup.c
@@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
diff --git a/compiler/aslstubs.c b/compiler/aslstubs.c
index b352a68..66e3c0c 100644
--- a/compiler/aslstubs.c
+++ b/compiler/aslstubs.c
@@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
diff --git a/compiler/asltransform.c b/compiler/asltransform.c
index b6b22c5..5327a90 100644
--- a/compiler/asltransform.c
+++ b/compiler/asltransform.c
@@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
@@ -554,7 +554,7 @@ TrDoSwitch (
NewOp = NewOp2;
NewOp2 = TrCreateValuedLeafNode (PARSEOP_NAMESTRING,
- (ACPI_INTEGER) ACPI_TO_INTEGER (PredicateValueName));
+ (UINT64) ACPI_TO_INTEGER (PredicateValueName));
NewOp->Asl.Next = NewOp2;
TrAmlInitLineNumbers (NewOp2, Predicate);
@@ -612,7 +612,7 @@ TrDoSwitch (
* CaseOp->Child->Peer is the beginning of the case block
*/
NewOp = TrCreateValuedLeafNode (PARSEOP_NAMESTRING,
- (ACPI_INTEGER) ACPI_TO_INTEGER (PredicateValueName));
+ (UINT64) ACPI_TO_INTEGER (PredicateValueName));
NewOp->Asl.Next = Predicate;
TrAmlInitLineNumbers (NewOp, Predicate);
@@ -761,7 +761,7 @@ TrDoSwitch (
/* Create the NameSeg child for the Name node */
NewOp2 = TrCreateValuedLeafNode (PARSEOP_NAMESEG,
- (ACPI_INTEGER) ACPI_TO_INTEGER (PredicateValueName));
+ (UINT64) ACPI_TO_INTEGER (PredicateValueName));
NewOp2->Asl.CompileFlags |= NODE_IS_NAME_DECLARATION;
NewOp->Asl.Child = NewOp2;
@@ -771,22 +771,22 @@ TrDoSwitch (
{
case ACPI_BTYPE_INTEGER:
NewOp2->Asl.Next = TrCreateValuedLeafNode (PARSEOP_ZERO,
- (ACPI_INTEGER) 0);
+ (UINT64) 0);
break;
case ACPI_BTYPE_STRING:
NewOp2->Asl.Next = TrCreateValuedLeafNode (PARSEOP_STRING_LITERAL,
- (ACPI_INTEGER) ACPI_TO_INTEGER (""));
+ (UINT64) ACPI_TO_INTEGER (""));
break;
case ACPI_BTYPE_BUFFER:
(void) TrLinkPeerNode (NewOp2, TrCreateValuedLeafNode (PARSEOP_BUFFER,
- (ACPI_INTEGER) 0));
+ (UINT64) 0));
Next = NewOp2->Asl.Next;
(void) TrLinkChildren (Next, 1, TrCreateValuedLeafNode (PARSEOP_ZERO,
- (ACPI_INTEGER) 1));
+ (UINT64) 1));
(void) TrLinkPeerNode (Next->Asl.Child,
- TrCreateValuedLeafNode (PARSEOP_DEFAULT_ARG, (ACPI_INTEGER) 0));
+ TrCreateValuedLeafNode (PARSEOP_DEFAULT_ARG, (UINT64) 0));
TrAmlSetSubtreeParent (Next->Asl.Child, Next);
break;
@@ -821,7 +821,7 @@ TrDoSwitch (
Predicate->Asl.Parent = StoreOp;
NewOp = TrCreateValuedLeafNode (PARSEOP_NAMESEG,
- (ACPI_INTEGER) ACPI_TO_INTEGER (PredicateValueName));
+ (UINT64) ACPI_TO_INTEGER (PredicateValueName));
NewOp->Asl.Parent = StoreOp;
Predicate->Asl.Next = NewOp;
diff --git a/compiler/asltree.c b/compiler/asltree.c
index 30f59ee..1167f51 100644
--- a/compiler/asltree.c
+++ b/compiler/asltree.c
@@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
@@ -490,7 +490,7 @@ TrCreateLeafNode (
ACPI_PARSE_OBJECT *
TrCreateValuedLeafNode (
UINT32 ParseOpcode,
- ACPI_INTEGER Value)
+ UINT64 Value)
{
ACPI_PARSE_OBJECT *Op;
diff --git a/compiler/asltypes.h b/compiler/asltypes.h
index 0500ba9..9e1d426 100644
--- a/compiler/asltypes.h
+++ b/compiler/asltypes.h
@@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
@@ -571,11 +571,6 @@ char *AslErrorLevel [ASL_NUM_REPORT_LEVELS] = {
#define ASL_ERROR_LEVEL_LENGTH 8 /* Length of strings above */
-/* Exception counters */
-
-UINT32 Gbl_ExceptionCount[ASL_NUM_REPORT_LEVELS] = {0,0,0,0,0,0};
-
-#endif
-
+#endif /* ASL_EXCEPTIONS */
#endif /* __ASLTYPES_H */
diff --git a/compiler/aslutils.c b/compiler/aslutils.c
index ecba7c3..01db90a 100644
--- a/compiler/aslutils.c
+++ b/compiler/aslutils.c
@@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
@@ -142,7 +142,7 @@ static ACPI_STATUS
UtStrtoul64 (
char *String,
UINT32 Base,
- ACPI_INTEGER *RetInteger);
+ UINT64 *RetInteger);
static void
UtPadNameWithUnderscores (
@@ -846,12 +846,12 @@ UtAttachNamepathToOwner (
*
******************************************************************************/
-ACPI_INTEGER
+UINT64
UtDoConstant (
char *String)
{
ACPI_STATUS Status;
- ACPI_INTEGER Converted;
+ UINT64 Converted;
char ErrBuf[64];
@@ -888,11 +888,11 @@ static ACPI_STATUS
UtStrtoul64 (
char *String,
UINT32 Base,
- ACPI_INTEGER *RetInteger)
+ UINT64 *RetInteger)
{
UINT32 Index;
UINT32 Sign;
- ACPI_INTEGER ReturnValue = 0;
+ UINT64 ReturnValue = 0;
ACPI_STATUS Status = AE_OK;
@@ -916,7 +916,7 @@ UtStrtoul64 (
/* Skip over any white space in the buffer: */
- while (isspace (*String) || *String == '\t')
+ while (isspace ((int) *String) || *String == '\t')
{
++String;
}
@@ -948,7 +948,7 @@ UtStrtoul64 (
{
if (*String == '0')
{
- if (tolower (*(++String)) == 'x')
+ if (tolower ((int) *(++String)) == 'x')
{
Base = 16;
++String;
@@ -975,7 +975,7 @@ UtStrtoul64 (
if (Base == 16 &&
*String == '0' &&
- tolower (*(++String)) == 'x')
+ tolower ((int) *(++String)) == 'x')
{
String++;
}
@@ -984,14 +984,14 @@ UtStrtoul64 (
while (*String)
{
- if (isdigit (*String))
+ if (isdigit ((int) *String))
{
Index = ((UINT8) *String) - '0';
}
else
{
- Index = (UINT8) toupper (*String);
- if (isupper ((char) Index))
+ Index = (UINT8) toupper ((int) *String);
+ if (isupper ((int) Index))
{
Index = Index - 'A' + 10;
}
@@ -1008,8 +1008,8 @@ UtStrtoul64 (
/* Check to see if value is out of range: */
- if (ReturnValue > ((ACPI_INTEGER_MAX - (ACPI_INTEGER) Index) /
- (ACPI_INTEGER) Base))
+ if (ReturnValue > ((ACPI_UINT64_MAX - (UINT64) Index) /
+ (UINT64) Base))
{
goto ErrorExit;
}
OpenPOWER on IntegriCloud