Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/external/bsd/acpica/dist - merge conflicts
details: https://anonhg.NetBSD.org/src/rev/2f61168202f8
branches: trunk
changeset: 447260:2f61168202f8
user: christos <christos%NetBSD.org@localhost>
date: Sat Jan 05 20:39:48 2019 +0000
description:
- merge conflicts
- change default debug level to normal; the evaluation trace is too noisy
diffstat:
sys/external/bsd/acpica/dist/compiler/aslanalyze.c | 10 +-
sys/external/bsd/acpica/dist/compiler/aslcompile.c | 158 ++++-----
sys/external/bsd/acpica/dist/compiler/aslcompiler.h | 4 +
sys/external/bsd/acpica/dist/compiler/aslcompiler.l | 8 +-
sys/external/bsd/acpica/dist/compiler/aslerror.c | 201 +++++++++---
sys/external/bsd/acpica/dist/compiler/aslfileio.c | 40 +-
sys/external/bsd/acpica/dist/compiler/aslfiles.c | 109 +++---
sys/external/bsd/acpica/dist/compiler/aslload.c | 111 ++++--
sys/external/bsd/acpica/dist/compiler/asllookup.c | 16 +-
sys/external/bsd/acpica/dist/compiler/aslopcodes.c | 25 +-
sys/external/bsd/acpica/dist/compiler/aslopt.c | 5 +-
sys/external/bsd/acpica/dist/compiler/asloptions.c | 199 ++++++-----
sys/external/bsd/acpica/dist/compiler/aslpredef.c | 44 +-
sys/external/bsd/acpica/dist/compiler/aslprepkg.c | 18 +-
sys/external/bsd/acpica/dist/compiler/aslsupport.l | 178 +++++-----
sys/external/bsd/acpica/dist/compiler/asltree.c | 32 +-
sys/external/bsd/acpica/dist/compiler/aslutils.c | 64 ++--
sys/external/bsd/acpica/dist/compiler/aslwalks.c | 14 +-
sys/external/bsd/acpica/dist/compiler/aslxref.c | 64 +++-
sys/external/bsd/acpica/dist/compiler/dtcompile.c | 54 +-
sys/external/bsd/acpica/dist/compiler/dtfield.c | 16 +-
sys/external/bsd/acpica/dist/compiler/dtparser.y | 6 +-
sys/external/bsd/acpica/dist/compiler/dtsubtable.c | 14 +-
sys/external/bsd/acpica/dist/compiler/dttable.c | 12 +-
sys/external/bsd/acpica/dist/compiler/dtutils.c | 22 +-
sys/external/bsd/acpica/dist/compiler/prparser.y | 6 +-
sys/external/bsd/acpica/dist/compiler/prutils.c | 60 +-
sys/external/bsd/acpica/dist/debugger/dbinput.c | 2 +-
sys/external/bsd/acpica/dist/dispatcher/dsopcode.c | 3 +
sys/external/bsd/acpica/dist/dispatcher/dspkginit.c | 26 +
sys/external/bsd/acpica/dist/dispatcher/dsutils.c | 2 -
sys/external/bsd/acpica/dist/events/evregion.c | 18 +-
sys/external/bsd/acpica/dist/events/evrgnini.c | 8 +-
sys/external/bsd/acpica/dist/hardware/hwsleep.c | 12 +-
sys/external/bsd/acpica/dist/include/acdisasm.h | 4 +-
sys/external/bsd/acpica/dist/include/acexcep.h | 8 +-
sys/external/bsd/acpica/dist/include/acglobal.h | 4 -
sys/external/bsd/acpica/dist/include/acinterp.h | 31 ++
sys/external/bsd/acpica/dist/include/aclocal.h | 2 +-
sys/external/bsd/acpica/dist/include/acnamesp.h | 1 +
sys/external/bsd/acpica/dist/include/acoutput.h | 6 +-
sys/external/bsd/acpica/dist/include/acpixf.h | 11 +-
sys/external/bsd/acpica/dist/include/actypes.h | 6 +
sys/external/bsd/acpica/dist/namespace/nsaccess.c | 21 +-
sys/external/bsd/acpica/dist/namespace/nseval.c | 12 +
sys/external/bsd/acpica/dist/tables/tbxfload.c | 2 +-
sys/external/bsd/acpica/dist/tools/acpixtract/acpixtract.c | 27 +-
sys/external/bsd/acpica/dist/utilities/utglobal.c | 3 -
sys/external/bsd/acpica/dist/utilities/utmisc.c | 3 +-
sys/external/bsd/acpica/dist/utilities/utosi.c | 2 +
50 files changed, 988 insertions(+), 716 deletions(-)
diffs (truncated from 4746 to 300 lines):
diff -r 48d19f09f4e8 -r 2f61168202f8 sys/external/bsd/acpica/dist/compiler/aslanalyze.c
--- a/sys/external/bsd/acpica/dist/compiler/aslanalyze.c Sat Jan 05 20:37:15 2019 +0000
+++ b/sys/external/bsd/acpica/dist/compiler/aslanalyze.c Sat Jan 05 20:39:48 2019 +0000
@@ -344,8 +344,8 @@
{
/* Method returns a value, but the type is wrong */
- AnFormatBtype (StringBuffer, ThisNodeBtype);
- AnFormatBtype (StringBuffer2, RequiredBtypes);
+ AnFormatBtype (AslGbl_StringBuffer, ThisNodeBtype);
+ AnFormatBtype (AslGbl_StringBuffer2, RequiredBtypes);
/*
* The case where the method does not return any value at all
@@ -355,11 +355,11 @@
*/
if (ThisNodeBtype != 0)
{
- snprintf (MsgBuffer, sizeof(MsgBuffer),
+ snprintf (AslGbl_MsgBuffer, sizeof(AslGbl_MsgBuffer),
"Method returns [%s], %s operator requires [%s]",
- StringBuffer, OpInfo->Name, StringBuffer2);
+ AslGbl_StringBuffer, OpInfo->Name, AslGbl_StringBuffer2);
- AslError (ASL_ERROR, ASL_MSG_INVALID_TYPE, ArgOp, MsgBuffer);
+ AslError (ASL_ERROR, ASL_MSG_INVALID_TYPE, ArgOp, AslGbl_MsgBuffer);
}
}
}
diff -r 48d19f09f4e8 -r 2f61168202f8 sys/external/bsd/acpica/dist/compiler/aslcompile.c
--- a/sys/external/bsd/acpica/dist/compiler/aslcompile.c Sat Jan 05 20:37:15 2019 +0000
+++ b/sys/external/bsd/acpica/dist/compiler/aslcompile.c Sat Jan 05 20:39:48 2019 +0000
@@ -97,7 +97,7 @@
UtEndEvent (Event);
Event = UtBeginEvent ("Preprocess input file");
- if (Gbl_PreprocessFlag)
+ if (AslGbl_PreprocessFlag)
{
/* Enter compiler name as a #define */
@@ -106,10 +106,10 @@
/* Preprocessor */
PrDoPreprocess ();
- Gbl_CurrentLineNumber = 1;
- Gbl_LogicalLineNumber = 1;
+ AslGbl_CurrentLineNumber = 1;
+ AslGbl_LogicalLineNumber = 1;
- if (Gbl_PreprocessOnly)
+ if (AslGbl_PreprocessOnly)
{
UtEndEvent (Event);
CmCleanupAndExit ();
@@ -127,7 +127,7 @@
/* Check for parser-detected syntax errors */
- if (Gbl_SyntaxError)
+ if (AslGbl_SyntaxError)
{
fprintf (stderr,
"Compiler aborting due to parser-detected syntax error(s)\n");
@@ -137,7 +137,7 @@
/* Did the parse tree get successfully constructed? */
- if (!Gbl_ParseTreeRoot)
+ if (!AslGbl_ParseTreeRoot)
{
/*
* If there are no errors, then we have some sort of
@@ -156,23 +156,23 @@
/* Prune the parse tree if requested (debug purposes only) */
- if (Gbl_PruneParseTree)
+ if (AslGbl_PruneParseTree)
{
- AslPruneParseTree (Gbl_PruneDepth, Gbl_PruneType);
+ AslPruneParseTree (AslGbl_PruneDepth, AslGbl_PruneType);
}
/* Optional parse tree dump, compiler debug output only */
LsDumpParseTree ();
- OpcGetIntegerWidth (Gbl_ParseTreeRoot->Asl.Child);
+ OpcGetIntegerWidth (AslGbl_ParseTreeRoot->Asl.Child);
UtEndEvent (Event);
/* Pre-process parse tree for any operator transforms */
Event = UtBeginEvent ("Parse tree transforms");
DbgPrint (ASL_DEBUG_OUTPUT, "\nParse tree transforms\n\n");
- TrWalkParseTree (Gbl_ParseTreeRoot, ASL_WALK_VISIT_TWICE,
+ TrWalkParseTree (AslGbl_ParseTreeRoot, ASL_WALK_VISIT_TWICE,
TrAmlTransformWalkBegin, TrAmlTransformWalkEnd, NULL);
UtEndEvent (Event);
@@ -180,7 +180,7 @@
Event = UtBeginEvent ("Generate AML opcodes");
DbgPrint (ASL_DEBUG_OUTPUT, "Generating AML opcodes\n\n");
- TrWalkParseTree (Gbl_ParseTreeRoot, ASL_WALK_VISIT_UPWARD, NULL,
+ TrWalkParseTree (AslGbl_ParseTreeRoot, ASL_WALK_VISIT_UPWARD, NULL,
OpcAmlOpcodeWalk, NULL);
UtEndEvent (Event);
@@ -190,7 +190,7 @@
* descriptor within the input file.
*/
Event = UtBeginEvent ("Open AML output file");
- Status = FlOpenAmlOutputFile (Gbl_OutputFilenamePrefix);
+ Status = FlOpenAmlOutputFile (AslGbl_OutputFilenamePrefix);
UtEndEvent (Event);
if (ACPI_FAILURE (Status))
{
@@ -204,9 +204,9 @@
DbgPrint (ASL_DEBUG_OUTPUT,
"Interpreting compile-time constant expressions\n\n");
- if (Gbl_FoldConstants)
+ if (AslGbl_FoldConstants)
{
- TrWalkParseTree (Gbl_ParseTreeRoot, ASL_WALK_VISIT_UPWARD,
+ TrWalkParseTree (AslGbl_ParseTreeRoot, ASL_WALK_VISIT_UPWARD,
NULL, OpcAmlConstantWalk, NULL);
}
else
@@ -220,7 +220,7 @@
Event = UtBeginEvent ("Updating AML opcodes after constant folding");
DbgPrint (ASL_DEBUG_OUTPUT,
"Updating AML opcodes after constant folding\n\n");
- TrWalkParseTree (Gbl_ParseTreeRoot, ASL_WALK_VISIT_UPWARD,
+ TrWalkParseTree (AslGbl_ParseTreeRoot, ASL_WALK_VISIT_UPWARD,
NULL, OpcAmlOpcodeUpdateWalk, NULL);
UtEndEvent (Event);
@@ -228,15 +228,15 @@
Event = UtBeginEvent ("Generate AML package lengths");
DbgPrint (ASL_DEBUG_OUTPUT, "Generating Package lengths\n\n");
- TrWalkParseTree (Gbl_ParseTreeRoot, ASL_WALK_VISIT_UPWARD, NULL,
+ TrWalkParseTree (AslGbl_ParseTreeRoot, ASL_WALK_VISIT_UPWARD, NULL,
LnPackageLengthWalk, NULL);
UtEndEvent (Event);
- if (Gbl_ParseOnlyFlag)
+ if (AslGbl_ParseOnlyFlag)
{
AePrintErrorLog (ASL_FILE_STDERR);
UtDisplaySummary (ASL_FILE_STDERR);
- if (Gbl_DebugFlag)
+ if (AslGbl_DebugFlag)
{
/* Print error summary to the stdout also */
@@ -255,7 +255,7 @@
Event = UtBeginEvent ("Create ACPI Namespace");
DbgPrint (ASL_DEBUG_OUTPUT, "Creating ACPI Namespace\n\n");
- Status = LdLoadNamespace (Gbl_ParseTreeRoot);
+ Status = LdLoadNamespace (AslGbl_ParseTreeRoot);
UtEndEvent (Event);
if (ACPI_FAILURE (Status))
{
@@ -280,23 +280,20 @@
/* Resolve External Declarations */
- if (Gbl_DoExternals)
- {
- Event = UtBeginEvent ("Resolve all Externals");
- DbgPrint (ASL_DEBUG_OUTPUT, "\nResolve Externals\n\n");
+ Event = UtBeginEvent ("Resolve all Externals");
+ DbgPrint (ASL_DEBUG_OUTPUT, "\nResolve Externals\n\n");
- if (Gbl_DoExternalsInPlace)
- {
- TrWalkParseTree (Gbl_ParseTreeRoot, ASL_WALK_VISIT_DOWNWARD,
- ExAmlExternalWalkBegin, NULL, NULL);
- }
- else
- {
- TrWalkParseTree (Gbl_ParseTreeRoot, ASL_WALK_VISIT_TWICE,
- ExAmlExternalWalkBegin, ExAmlExternalWalkEnd, NULL);
- }
- UtEndEvent (Event);
+ if (AslGbl_DoExternalsInPlace)
+ {
+ TrWalkParseTree (AslGbl_ParseTreeRoot, ASL_WALK_VISIT_DOWNWARD,
+ ExAmlExternalWalkBegin, NULL, NULL);
}
+ else
+ {
+ TrWalkParseTree (AslGbl_ParseTreeRoot, ASL_WALK_VISIT_TWICE,
+ ExAmlExternalWalkBegin, ExAmlExternalWalkEnd, NULL);
+ }
+ UtEndEvent (Event);
/*
* Semantic analysis. This can happen only after the
@@ -305,19 +302,19 @@
* part one - check control methods
*/
Event = UtBeginEvent ("Analyze control method return types");
- AnalysisWalkInfo.MethodStack = NULL;
+ AslGbl_AnalysisWalkInfo.MethodStack = NULL;
DbgPrint (ASL_DEBUG_OUTPUT, "Semantic analysis - Method analysis\n\n");
- if (Gbl_CrossReferenceOutput)
+ if (AslGbl_CrossReferenceOutput)
{
OtPrintHeaders ("Part 1: Object Reference Map "
"(Object references from within each control method)");
}
- TrWalkParseTree (Gbl_ParseTreeRoot, ASL_WALK_VISIT_TWICE,
+ TrWalkParseTree (AslGbl_ParseTreeRoot, ASL_WALK_VISIT_TWICE,
MtMethodAnalysisWalkBegin,
- MtMethodAnalysisWalkEnd, &AnalysisWalkInfo);
+ MtMethodAnalysisWalkEnd, &AslGbl_AnalysisWalkInfo);
UtEndEvent (Event);
/* Generate the object cross-reference file if requested */
@@ -330,7 +327,7 @@
Event = UtBeginEvent ("Determine object types returned by methods");
DbgPrint (ASL_DEBUG_OUTPUT, "Semantic analysis - Method typing\n\n");
- TrWalkParseTree (Gbl_ParseTreeRoot, ASL_WALK_VISIT_UPWARD,
+ TrWalkParseTree (AslGbl_ParseTreeRoot, ASL_WALK_VISIT_UPWARD,
NULL, AnMethodTypingWalkEnd, NULL);
UtEndEvent (Event);
@@ -339,10 +336,10 @@
Event = UtBeginEvent ("Analyze AML operand types");
DbgPrint (ASL_DEBUG_OUTPUT,
"Semantic analysis - Operand type checking\n\n");
- if (Gbl_DoTypechecking)
+ if (AslGbl_DoTypechecking)
{
- TrWalkParseTree (Gbl_ParseTreeRoot, ASL_WALK_VISIT_UPWARD,
- NULL, AnOperandTypecheckWalkEnd, &AnalysisWalkInfo);
+ TrWalkParseTree (AslGbl_ParseTreeRoot, ASL_WALK_VISIT_UPWARD,
+ NULL, AnOperandTypecheckWalkEnd, &AslGbl_AnalysisWalkInfo);
}
UtEndEvent (Event);
@@ -350,9 +347,9 @@
Event = UtBeginEvent ("Miscellaneous analysis");
DbgPrint (ASL_DEBUG_OUTPUT, "Semantic analysis - miscellaneous\n\n");
- TrWalkParseTree (Gbl_ParseTreeRoot, ASL_WALK_VISIT_DOWNWARD,
+ TrWalkParseTree (AslGbl_ParseTreeRoot, ASL_WALK_VISIT_DOWNWARD,
AnOtherSemanticAnalysisWalkBegin,
- NULL, &AnalysisWalkInfo);
+ NULL, &AslGbl_AnalysisWalkInfo);
UtEndEvent (Event);
/*
@@ -363,17 +360,17 @@
*/
if (AcpiGbl_CaptureComments)
{
- AcpiGbl_LastListHead = Gbl_ParseTreeRoot->Asl.CommentList;
- Gbl_ParseTreeRoot->Asl.CommentList = NULL;
+ AcpiGbl_LastListHead = AslGbl_ParseTreeRoot->Asl.CommentList;
+ AslGbl_ParseTreeRoot->Asl.CommentList = NULL;
}
/* Calculate all AML package lengths */
Event = UtBeginEvent ("Finish AML package length generation");
DbgPrint (ASL_DEBUG_OUTPUT, "Generating Package lengths\n\n");
- TrWalkParseTree (Gbl_ParseTreeRoot, ASL_WALK_VISIT_UPWARD, NULL,
+ TrWalkParseTree (AslGbl_ParseTreeRoot, ASL_WALK_VISIT_UPWARD, NULL,
LnInitLengthsWalk, NULL);
- TrWalkParseTree (Gbl_ParseTreeRoot, ASL_WALK_VISIT_UPWARD, NULL,
+ TrWalkParseTree (AslGbl_ParseTreeRoot, ASL_WALK_VISIT_UPWARD, NULL,
LnPackageLengthWalk, NULL);
UtEndEvent (Event);
@@ -431,12 +428,12 @@
case ASL_FILE_HEX_OUTPUT:
- if (Gbl_HexOutputFlag == HEX_OUTPUT_ASM)
+ if (AslGbl_HexOutputFlag == HEX_OUTPUT_ASM)
{
Prefix = "; ";
}
- else if ((Gbl_HexOutputFlag == HEX_OUTPUT_C) ||
- (Gbl_HexOutputFlag == HEX_OUTPUT_ASL))
+ else if ((AslGbl_HexOutputFlag == HEX_OUTPUT_C) ||
+ (AslGbl_HexOutputFlag == HEX_OUTPUT_ASL))
{
FlPrintFile (ASL_FILE_HEX_OUTPUT, "/*\n");
Home |
Main Index |
Thread Index |
Old Index