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/c0ccda92c85c
branches: trunk
changeset: 847194:c0ccda92c85c
user: christos <christos%NetBSD.org@localhost>
date: Sat Dec 14 16:56:32 2019 +0000
description:
merge conflicts
diffstat:
sys/external/bsd/acpica/dist/common/dmtables.c | 7 +-
sys/external/bsd/acpica/dist/compiler/aslanalyze.c | 2 +-
sys/external/bsd/acpica/dist/compiler/aslcompile.c | 39 ++--
sys/external/bsd/acpica/dist/compiler/aslerror.c | 45 +++--
sys/external/bsd/acpica/dist/compiler/aslfiles.c | 24 +-
sys/external/bsd/acpica/dist/compiler/aslload.c | 28 +-
sys/external/bsd/acpica/dist/compiler/asloptions.c | 2 +-
sys/external/bsd/acpica/dist/compiler/aslprepkg.c | 2 +-
sys/external/bsd/acpica/dist/compiler/aslutils.c | 7 +-
sys/external/bsd/acpica/dist/compiler/aslxref.c | 32 +++-
sys/external/bsd/acpica/dist/compiler/dtcompile.c | 34 +--
sys/external/bsd/acpica/dist/compiler/dtcompilerparser.y | 57 +++---
sys/external/bsd/acpica/dist/compiler/dtfield.c | 127 +++++++++++++++
sys/external/bsd/acpica/dist/debugger/dbdisply.c | 2 -
sys/external/bsd/acpica/dist/debugger/dbinput.c | 36 ++++-
sys/external/bsd/acpica/dist/debugger/dbmethod.c | 5 +
sys/external/bsd/acpica/dist/debugger/dbnames.c | 121 ++++++++++++++
sys/external/bsd/acpica/dist/disassembler/dmresrc.c | 1 -
sys/external/bsd/acpica/dist/disassembler/dmwalk.c | 1 -
sys/external/bsd/acpica/dist/dispatcher/dscontrol.c | 2 +-
sys/external/bsd/acpica/dist/dispatcher/dsopcode.c | 1 +
sys/external/bsd/acpica/dist/events/evregion.c | 4 +-
sys/external/bsd/acpica/dist/events/evrgnini.c | 1 -
sys/external/bsd/acpica/dist/hardware/hwxfsleep.c | 6 +-
sys/external/bsd/acpica/dist/include/acdebug.h | 4 +
sys/external/bsd/acpica/dist/include/acpixf.h | 10 +-
sys/external/bsd/acpica/dist/include/acutils.h | 9 +-
sys/external/bsd/acpica/dist/namespace/nsdump.c | 6 +-
sys/external/bsd/acpica/dist/namespace/nsxfname.c | 2 +-
sys/external/bsd/acpica/dist/tables/tbdata.c | 4 +
sys/external/bsd/acpica/dist/tables/tbxfload.c | 49 +++++-
sys/external/bsd/acpica/dist/utilities/uttrack.c | 2 +-
32 files changed, 527 insertions(+), 145 deletions(-)
diffs (truncated from 1380 to 300 lines):
diff -r 0ba95ffaacad -r c0ccda92c85c sys/external/bsd/acpica/dist/common/dmtables.c
--- a/sys/external/bsd/acpica/dist/common/dmtables.c Sat Dec 14 16:33:12 2019 +0000
+++ b/sys/external/bsd/acpica/dist/common/dmtables.c Sat Dec 14 16:56:32 2019 +0000
@@ -219,7 +219,7 @@
* makes it easier to rename the disassembled ASL file if needed.
*/
AcpiOsPrintf (
- "DefinitionBlock (\"\", \"%4.4s\", %hhu, \"%.6s\", \"%.8s\", 0x%8.8X)\n",
+ "DefinitionBlock (\"\", \"%4.4s\", %u, \"%.6s\", \"%.8s\", 0x%8.8X)\n",
Table->Signature, Table->Revision,
Table->OemId, Table->OemTableId, Table->OemRevision);
}
@@ -400,6 +400,8 @@
AmlStart = ((UINT8 *) Table + sizeof (ACPI_TABLE_HEADER));
ASL_CV_INIT_FILETREE(Table, AmlStart, AmlLength);
+ AcpiUtSetIntegerWidth (Table->Revision);
+
/* Create the root object */
AcpiGbl_ParseOpRoot = AcpiPsCreateScopeOp (AmlStart);
@@ -435,7 +437,6 @@
}
WalkState->ParseFlags &= ~ACPI_PARSE_DELETE_TREE;
- WalkState->ParseFlags |= ACPI_PARSE_DISASSEMBLE;
Status = AcpiPsParseAml (WalkState);
if (ACPI_FAILURE (Status))
@@ -493,7 +494,7 @@
fprintf (stderr,
"Parsing Deferred Opcodes (Methods/Buffers/Packages/Regions)\n");
- Status = AcpiDmParseDeferredOps (AcpiGbl_ParseOpRoot);
+ (void) AcpiDmParseDeferredOps (AcpiGbl_ParseOpRoot);
fprintf (stderr, "\n");
/* Process Resource Templates */
diff -r 0ba95ffaacad -r c0ccda92c85c sys/external/bsd/acpica/dist/compiler/aslanalyze.c
--- a/sys/external/bsd/acpica/dist/compiler/aslanalyze.c Sat Dec 14 16:33:12 2019 +0000
+++ b/sys/external/bsd/acpica/dist/compiler/aslanalyze.c Sat Dec 14 16:56:32 2019 +0000
@@ -461,7 +461,7 @@
/* Need a null-terminated string version of NameSeg */
- ACPI_MOVE_32_TO_32 (Name, &Op->Asl.NameSeg);
+ ACPI_MOVE_32_TO_32 (Name, Op->Asl.NameSeg);
Name[ACPI_NAMESEG_SIZE] = 0;
/*
diff -r 0ba95ffaacad -r c0ccda92c85c sys/external/bsd/acpica/dist/compiler/aslcompile.c
--- a/sys/external/bsd/acpica/dist/compiler/aslcompile.c Sat Dec 14 16:33:12 2019 +0000
+++ b/sys/external/bsd/acpica/dist/compiler/aslcompile.c Sat Dec 14 16:56:32 2019 +0000
@@ -112,6 +112,7 @@
PrDoPreprocess ();
AslGbl_CurrentLineNumber = 1;
AslGbl_LogicalLineNumber = 1;
+ AslGbl_CurrentLineOffset = 0;
if (AslGbl_PreprocessOnly)
{
@@ -174,25 +175,6 @@
LsDumpParseTree ();
- 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 (AslGbl_ParseTreeRoot, ASL_WALK_VISIT_TWICE,
- TrAmlTransformWalkBegin, TrAmlTransformWalkEnd, NULL);
- UtEndEvent (Event);
-
- /* Generate AML opcodes corresponding to the parse tokens */
-
- Event = UtBeginEvent ("Generate AML opcodes");
- DbgPrint (ASL_DEBUG_OUTPUT, "Generating AML opcodes\n\n");
- TrWalkParseTree (AslGbl_ParseTreeRoot, ASL_WALK_VISIT_UPWARD, NULL,
- OpcAmlOpcodeWalk, NULL);
- UtEndEvent (Event);
-
UtEndEvent (FullCompile);
return (AE_OK);
@@ -223,6 +205,25 @@
ACPI_STATUS Status;
+ OpcGetIntegerWidth (AslGbl_ParseTreeRoot->Asl.Child);
+
+ /* Pre-process parse tree for any operator transforms */
+
+ Event = UtBeginEvent ("Parse tree transforms");
+ DbgPrint (ASL_DEBUG_OUTPUT, "\nParse tree transforms\n\n");
+ TrWalkParseTree (AslGbl_ParseTreeRoot, ASL_WALK_VISIT_TWICE,
+ TrAmlTransformWalkBegin, TrAmlTransformWalkEnd, NULL);
+ UtEndEvent (Event);
+
+ /* Generate AML opcodes corresponding to the parse tokens */
+
+ Event = UtBeginEvent ("Generate AML opcodes");
+ DbgPrint (ASL_DEBUG_OUTPUT, "Generating AML opcodes\n\n");
+ TrWalkParseTree (AslGbl_ParseTreeRoot, ASL_WALK_VISIT_UPWARD,
+ NULL, OpcAmlOpcodeWalk, NULL);
+ UtEndEvent (Event);
+
+
/* Interpret and generate all compile-time constants */
Event = UtBeginEvent ("Constant folding via AML interpreter");
diff -r 0ba95ffaacad -r c0ccda92c85c sys/external/bsd/acpica/dist/compiler/aslerror.c
--- a/sys/external/bsd/acpica/dist/compiler/aslerror.c Sat Dec 14 16:33:12 2019 +0000
+++ b/sys/external/bsd/acpica/dist/compiler/aslerror.c Sat Dec 14 16:56:32 2019 +0000
@@ -227,7 +227,7 @@
* PARAMETERS: OutputFile - Output file
* Enode - Error node to print
* PrematureEOF - True = PrematureEOF has been reached
- * Total - Total legth of line
+ * Total - Total length of line
*
* RETURN: None
*
@@ -337,7 +337,7 @@
* PARAMETERS: OutputFile - Output file
* Enode - Error node to print
* PrematureEOF - True = PrematureEOF has been reached
- * Total - amount of characters printed so far
+ * Total - Number of characters printed so far
*
*
* RETURN: Status
@@ -419,6 +419,7 @@
fprintf (OutputFile, "\n");
return AE_OK;
}
+
/*
* Seek to the offset in the combined source file,
* read the source line, and write it to the output.
@@ -442,7 +443,8 @@
AslGbl_Files[ASL_FILE_SOURCE_OUTPUT].Filename);
return AE_IO_ERROR;
}
- /* Read/write the source line, up to the maximum line length */
+
+ /* Read/write the source line, up to the maximum line length */
while (RActual && SourceByte && (SourceByte != '\n'))
{
@@ -624,7 +626,7 @@
*
* RETURN: None
*
- * DESCRIPTION: Print the contents of an error nodes. This function is tailored
+ * DESCRIPTION: Print the contents of an error node. This function is tailored
* to print error nodes that are SubErrors within ASL_ERROR_MSG
*
******************************************************************************/
@@ -687,8 +689,8 @@
* LogicalLineNumber - Cumulative line number
* LogicalByteOffset - Byte offset in source file
* Column - Column in current line
- * Filename - source filename
- * ExtraMessage - additional error message
+ * Filename - Source filename
+ * ExtraMessage - Additional error message
* SourceLine - Line of error source code
* SubError - SubError of this InputEnode
*
@@ -755,10 +757,17 @@
Enode->FilenameLength = 6;
}
- FileNode = FlGetCurrentFileNode ();
+ /*
+ * Attempt to get the file node of the filename listed in the parse
+ * node. If the name doesn't exist in the global file node, it is
+ * because the file is included by #include or ASL include. In this
+ * case, get the current file node. The source output of the current
+ * file will contain the contents of the file listed in the parse node.
+ */
+ FileNode = FlGetFileNode (ASL_FILE_INPUT, Filename);
if (!FileNode)
{
- return;
+ FileNode = FlGetCurrentFileNode ();
}
Enode->SourceFilename =
@@ -776,8 +785,8 @@
* LineNumber - Actual file line number
* Column - Column in current line
* SourceLine - Actual source code line
- * Filename - source filename
- * ExtraMessage - additional error message
+ * Filename - Source filename
+ * ExtraMessage - Additional error message
*
* RETURN: None
*
@@ -810,8 +819,8 @@
* LogicalLineNumber - Cumulative line number
* LogicalByteOffset - Byte offset in source file
* Column - Column in current line
- * Filename - source filename
- * ExtraMessage - additional error message
+ * Filename - Source filename
+ * ExtraMessage - Additional error message
*
* RETURN: None
*
@@ -853,8 +862,8 @@
* LogicalLineNumber - Cumulative line number
* LogicalByteOffset - Byte offset in source file
* Column - Column in current line
- * Filename - source filename
- * Message - additional error message
+ * Filename - Source filename
+ * Message - Additional error message
* SourceLine - Actual line of source code
* SubError - Sub-error associated with this error
*
@@ -917,7 +926,7 @@
* PARAMETERS: Level - Seriousness (Warning/error, etc.)
* MessageId - Index into global message buffer
*
- * RETURN: UINT8 - modified level
+ * RETURN: UINT8 - Modified level
*
* DESCRIPTION: Get the modified level of exception codes that are reported as
* errors from the -ww option.
@@ -1261,7 +1270,7 @@
* MainMsg - Message pertaining to the MainOp
* SubMsgId - Index into global message buffer
* SubOp - Additional parse node for better message
- * SubMsg - Message pertainint to SubOp
+ * SubMsg - Message pertaining to SubOp
*
*
* RETURN: None
@@ -1313,7 +1322,7 @@
* PARAMETERS: Level - Seriousness (Warning/error, etc.)
* MessageId - Index into global message buffer
* Op - Parse node where error happened
- * ExtraMessage - additional error message
+ * ExtraMessage - Additional error message
*
* RETURN: None
*
@@ -1351,7 +1360,7 @@
*
* PARAMETERS: Op - Parse node where error happened
* Status - The ACPICA Exception
- * ExtraMessage - additional error message
+ * ExtraMessage - Additional error message
* Abort - TRUE -> Abort compilation
*
* RETURN: None
diff -r 0ba95ffaacad -r c0ccda92c85c sys/external/bsd/acpica/dist/compiler/aslfiles.c
--- a/sys/external/bsd/acpica/dist/compiler/aslfiles.c Sat Dec 14 16:33:12 2019 +0000
+++ b/sys/external/bsd/acpica/dist/compiler/aslfiles.c Sat Dec 14 16:56:32 2019 +0000
@@ -99,12 +99,6 @@
NewFileNode = ACPI_CAST_PTR (ASL_GLOBAL_FILE_NODE,
UtLocalCacheCalloc (sizeof (ASL_GLOBAL_FILE_NODE)));
- if (!NewFileNode)
- {
- AslError (ASL_ERROR, ASL_MSG_MEMORY_ALLOCATION, NULL, NULL);
- return (AE_NO_MEMORY);
- }
-
NewFileNode->ParserErrorDetected = FALSE;
NewFileNode->Next = AslGbl_FilesList;
@@ -312,8 +306,22 @@
FlGetCurrentFileNode (
void)
{
- return (FlGetFileNode (
- ASL_FILE_INPUT,AslGbl_Files[ASL_FILE_INPUT].Filename));
+ ASL_GLOBAL_FILE_NODE *FileNode =
+ FlGetFileNode (ASL_FILE_INPUT,AslGbl_Files[ASL_FILE_INPUT].Filename);
+
+
+ if (!FileNode)
+ {
+ /*
+ * If the current file node does not exist after initializing the file
+ * node structures, something went wrong and this is an unrecoverable
+ * condition.
+ */
+ FlFileError (ASL_FILE_INPUT, ASL_MSG_COMPILER_INTERNAL);
+ AslAbort ();
+ }
+
+ return (FileNode);
}
Home |
Main Index |
Thread Index |
Old Index