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/8a947fb12f3f
branches: trunk
changeset: 746332:8a947fb12f3f
user: christos <christos%NetBSD.org@localhost>
date: Sat Mar 28 19:49:25 2020 +0000
description:
merge conflicts
diffstat:
sys/external/bsd/acpica/dist/common/dmtables.c | 3 +-
sys/external/bsd/acpica/dist/common/dmtbdump.c | 2 +-
sys/external/bsd/acpica/dist/common/dmtbinfo.c | 2 +-
sys/external/bsd/acpica/dist/compiler/aslanalyze.c | 16 +-
sys/external/bsd/acpica/dist/compiler/aslcompile.c | 19 +-
sys/external/bsd/acpica/dist/compiler/aslcompiler.h | 27 +-
sys/external/bsd/acpica/dist/compiler/aslcompiler.l | 22 +-
sys/external/bsd/acpica/dist/compiler/aslerror.c | 136 +++-
sys/external/bsd/acpica/dist/compiler/aslfileio.c | 2 +-
sys/external/bsd/acpica/dist/compiler/aslfiles.c | 2 +-
sys/external/bsd/acpica/dist/compiler/aslload.c | 329 ++++++++-
sys/external/bsd/acpica/dist/compiler/asllookup.c | 2 +-
sys/external/bsd/acpica/dist/compiler/aslopcodes.c | 2 +-
sys/external/bsd/acpica/dist/compiler/aslopt.c | 2 +-
sys/external/bsd/acpica/dist/compiler/asloptions.c | 4 +-
sys/external/bsd/acpica/dist/compiler/aslpredef.c | 2 +-
sys/external/bsd/acpica/dist/compiler/aslprepkg.c | 2 +-
sys/external/bsd/acpica/dist/compiler/aslsupport.l | 2 +-
sys/external/bsd/acpica/dist/compiler/asltree.c | 2 +-
sys/external/bsd/acpica/dist/compiler/aslutils.c | 43 +-
sys/external/bsd/acpica/dist/compiler/aslwalks.c | 2 +-
sys/external/bsd/acpica/dist/compiler/aslxref.c | 59 +-
sys/external/bsd/acpica/dist/compiler/dtcompile.c | 2 +-
sys/external/bsd/acpica/dist/compiler/dtcompilerparser.y | 3 +-
sys/external/bsd/acpica/dist/compiler/dtfield.c | 2 +-
sys/external/bsd/acpica/dist/compiler/dtparser.y | 2 +-
sys/external/bsd/acpica/dist/compiler/dtsubtable.c | 2 +-
sys/external/bsd/acpica/dist/compiler/dttable.c | 2 +-
sys/external/bsd/acpica/dist/compiler/dtutils.c | 5 +-
sys/external/bsd/acpica/dist/compiler/prparser.y | 2 +-
sys/external/bsd/acpica/dist/compiler/prutils.c | 2 +-
sys/external/bsd/acpica/dist/debugger/dbcmds.c | 2 +-
sys/external/bsd/acpica/dist/debugger/dbdisply.c | 2 +-
sys/external/bsd/acpica/dist/debugger/dbexec.c | 2 +-
sys/external/bsd/acpica/dist/debugger/dbinput.c | 21 +-
sys/external/bsd/acpica/dist/debugger/dbmethod.c | 2 +-
sys/external/bsd/acpica/dist/debugger/dbnames.c | 2 +-
sys/external/bsd/acpica/dist/debugger/dbtest.c | 2 +-
sys/external/bsd/acpica/dist/debugger/dbutils.c | 2 +-
sys/external/bsd/acpica/dist/disassembler/dmbuffer.c | 2 +-
sys/external/bsd/acpica/dist/disassembler/dmcstyle.c | 2 +-
sys/external/bsd/acpica/dist/disassembler/dmresrc.c | 2 +-
sys/external/bsd/acpica/dist/disassembler/dmresrcl.c | 2 +-
sys/external/bsd/acpica/dist/disassembler/dmresrcl2.c | 2 +-
sys/external/bsd/acpica/dist/disassembler/dmwalk.c | 2 +-
sys/external/bsd/acpica/dist/dispatcher/dscontrol.c | 2 +-
sys/external/bsd/acpica/dist/dispatcher/dsopcode.c | 2 +-
sys/external/bsd/acpica/dist/dispatcher/dspkginit.c | 2 +-
sys/external/bsd/acpica/dist/dispatcher/dsutils.c | 2 +-
sys/external/bsd/acpica/dist/events/evregion.c | 2 +-
sys/external/bsd/acpica/dist/events/evrgnini.c | 2 +-
sys/external/bsd/acpica/dist/events/evxface.c | 2 +-
sys/external/bsd/acpica/dist/executer/exconfig.c | 2 +-
sys/external/bsd/acpica/dist/executer/exdebug.c | 2 +-
sys/external/bsd/acpica/dist/executer/exdump.c | 2 +-
sys/external/bsd/acpica/dist/hardware/hwesleep.c | 2 +-
sys/external/bsd/acpica/dist/hardware/hwregs.c | 2 +-
sys/external/bsd/acpica/dist/hardware/hwsleep.c | 12 +-
sys/external/bsd/acpica/dist/hardware/hwxfsleep.c | 2 +-
sys/external/bsd/acpica/dist/include/acapps.h | 4 +-
sys/external/bsd/acpica/dist/include/acdebug.h | 2 +-
sys/external/bsd/acpica/dist/include/acdisasm.h | 3 +-
sys/external/bsd/acpica/dist/include/acexcep.h | 2 +-
sys/external/bsd/acpica/dist/include/acglobal.h | 2 +-
sys/external/bsd/acpica/dist/include/acinterp.h | 2 +-
sys/external/bsd/acpica/dist/include/aclocal.h | 2 +-
sys/external/bsd/acpica/dist/include/acmacros.h | 6 +-
sys/external/bsd/acpica/dist/include/acnamesp.h | 6 +-
sys/external/bsd/acpica/dist/include/acoutput.h | 2 +-
sys/external/bsd/acpica/dist/include/acpiosxf.h | 2 +-
sys/external/bsd/acpica/dist/include/acpixf.h | 8 +-
sys/external/bsd/acpica/dist/include/acresrc.h | 2 +-
sys/external/bsd/acpica/dist/include/actables.h | 2 +-
sys/external/bsd/acpica/dist/include/actbl1.h | 4 +-
sys/external/bsd/acpica/dist/include/actypes.h | 9 +-
sys/external/bsd/acpica/dist/include/acutils.h | 2 +-
sys/external/bsd/acpica/dist/include/amlresrc.h | 2 +-
sys/external/bsd/acpica/dist/include/platform/acgcc.h | 2 +-
sys/external/bsd/acpica/dist/include/platform/acnetbsd.h | 4 +-
sys/external/bsd/acpica/dist/namespace/nsaccess.c | 2 +-
sys/external/bsd/acpica/dist/namespace/nsdump.c | 2 +-
sys/external/bsd/acpica/dist/namespace/nseval.c | 2 +-
sys/external/bsd/acpica/dist/namespace/nsinit.c | 2 +-
sys/external/bsd/acpica/dist/namespace/nsrepair2.c | 2 +-
sys/external/bsd/acpica/dist/namespace/nsxfeval.c | 2 +-
sys/external/bsd/acpica/dist/namespace/nsxfname.c | 4 +-
sys/external/bsd/acpica/dist/os_specific/service_layers/oslinuxtbl.c | 2 +-
sys/external/bsd/acpica/dist/parser/psopcode.c | 2 +-
sys/external/bsd/acpica/dist/parser/psopinfo.c | 2 +-
sys/external/bsd/acpica/dist/resources/rsdump.c | 2 +-
sys/external/bsd/acpica/dist/resources/rsdumpinfo.c | 2 +-
sys/external/bsd/acpica/dist/resources/rsutils.c | 2 +-
sys/external/bsd/acpica/dist/resources/rsxface.c | 2 +-
sys/external/bsd/acpica/dist/tables/tbdata.c | 2 +-
sys/external/bsd/acpica/dist/tables/tbfadt.c | 2 +-
sys/external/bsd/acpica/dist/tables/tbinstal.c | 2 +-
sys/external/bsd/acpica/dist/tables/tbutils.c | 2 +-
sys/external/bsd/acpica/dist/tables/tbxface.c | 11 +-
sys/external/bsd/acpica/dist/tables/tbxfload.c | 2 +-
sys/external/bsd/acpica/dist/tables/tbxfroot.c | 2 +-
sys/external/bsd/acpica/dist/tools/acpidump/apfiles.c | 2 +-
sys/external/bsd/acpica/dist/tools/acpixtract/acpixtract.c | 2 +-
sys/external/bsd/acpica/dist/utilities/utcache.c | 2 +-
sys/external/bsd/acpica/dist/utilities/utdebug.c | 2 +-
sys/external/bsd/acpica/dist/utilities/utdecode.c | 4 +-
sys/external/bsd/acpica/dist/utilities/utdelete.c | 11 +-
sys/external/bsd/acpica/dist/utilities/uteval.c | 2 +-
sys/external/bsd/acpica/dist/utilities/utglobal.c | 2 +-
sys/external/bsd/acpica/dist/utilities/utmisc.c | 2 +-
sys/external/bsd/acpica/dist/utilities/utmutex.c | 2 +-
sys/external/bsd/acpica/dist/utilities/utnonansi.c | 2 +-
sys/external/bsd/acpica/dist/utilities/utobject.c | 4 +-
sys/external/bsd/acpica/dist/utilities/utosi.c | 2 +-
sys/external/bsd/acpica/dist/utilities/utprint.c | 10 +-
sys/external/bsd/acpica/dist/utilities/uttrack.c | 2 +-
sys/external/bsd/acpica/dist/utilities/utuuid.c | 2 +-
116 files changed, 676 insertions(+), 287 deletions(-)
diffs (truncated from 2712 to 300 lines):
diff -r 80eb41c85b64 -r 8a947fb12f3f sys/external/bsd/acpica/dist/common/dmtables.c
--- a/sys/external/bsd/acpica/dist/common/dmtables.c Sat Mar 28 19:46:32 2020 +0000
+++ b/sys/external/bsd/acpica/dist/common/dmtables.c Sat Mar 28 19:49:25 2020 +0000
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -398,7 +398,6 @@
AmlLength = Table->Length - sizeof (ACPI_TABLE_HEADER);
AmlStart = ((UINT8 *) Table + sizeof (ACPI_TABLE_HEADER));
- ASL_CV_INIT_FILETREE(Table, AmlStart, AmlLength);
AcpiUtSetIntegerWidth (Table->Revision);
diff -r 80eb41c85b64 -r 8a947fb12f3f sys/external/bsd/acpica/dist/common/dmtbdump.c
--- a/sys/external/bsd/acpica/dist/common/dmtbdump.c Sat Mar 28 19:46:32 2020 +0000
+++ b/sys/external/bsd/acpica/dist/common/dmtbdump.c Sat Mar 28 19:49:25 2020 +0000
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff -r 80eb41c85b64 -r 8a947fb12f3f sys/external/bsd/acpica/dist/common/dmtbinfo.c
--- a/sys/external/bsd/acpica/dist/common/dmtbinfo.c Sat Mar 28 19:46:32 2020 +0000
+++ b/sys/external/bsd/acpica/dist/common/dmtbinfo.c Sat Mar 28 19:49:25 2020 +0000
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff -r 80eb41c85b64 -r 8a947fb12f3f sys/external/bsd/acpica/dist/compiler/aslanalyze.c
--- a/sys/external/bsd/acpica/dist/compiler/aslanalyze.c Sat Mar 28 19:46:32 2020 +0000
+++ b/sys/external/bsd/acpica/dist/compiler/aslanalyze.c Sat Mar 28 19:49:25 2020 +0000
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -43,6 +43,7 @@
#include "aslcompiler.h"
#include "aslcompiler.y.h"
+#include "acnamesp.h"
#include <string.h>
@@ -313,6 +314,7 @@
{
ACPI_PARSE_OBJECT *OwningOp;
ACPI_NAMESPACE_NODE *Node;
+ char *ExternalPath;
Node = ArgOp->Asl.Node;
@@ -327,18 +329,19 @@
/* Examine the parent op of this method */
OwningOp = Node->Op;
+ ExternalPath = AcpiNsGetNormalizedPathname (Node, TRUE);
+
if (OwningOp->Asl.CompileFlags & OP_METHOD_NO_RETVAL)
{
/* Method NEVER returns a value */
- AslError (ASL_ERROR, ASL_MSG_NO_RETVAL, Op, Op->Asl.ExternalName);
+ AslError (ASL_ERROR, ASL_MSG_NO_RETVAL, Op, ExternalPath);
}
else if (OwningOp->Asl.CompileFlags & OP_METHOD_SOME_NO_RETVAL)
{
/* Method SOMETIMES returns a value, SOMETIMES not */
- AslError (ASL_WARNING, ASL_MSG_SOME_NO_RETVAL,
- Op, Op->Asl.ExternalName);
+ AslError (ASL_WARNING, ASL_MSG_SOME_NO_RETVAL, Op, ExternalPath);
}
else if (!(ThisNodeBtype & RequiredBtypes))
{
@@ -362,6 +365,11 @@
AslError (ASL_ERROR, ASL_MSG_INVALID_TYPE, ArgOp, AslGbl_MsgBuffer);
}
}
+
+ if (ExternalPath)
+ {
+ ACPI_FREE (ExternalPath);
+ }
}
diff -r 80eb41c85b64 -r 8a947fb12f3f sys/external/bsd/acpica/dist/compiler/aslcompile.c
--- a/sys/external/bsd/acpica/dist/compiler/aslcompile.c Sat Mar 28 19:46:32 2020 +0000
+++ b/sys/external/bsd/acpica/dist/compiler/aslcompile.c Sat Mar 28 19:49:25 2020 +0000
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -175,6 +175,7 @@
LsDumpParseTree ();
+ UtEndEvent (Event);
UtEndEvent (FullCompile);
return (AE_OK);
@@ -539,7 +540,7 @@
AslCompilerFileHeader (
UINT32 FileId)
{
- struct tm *NewTime;
+ char *NewTime;
time_t Aclock;
char *Prefix = "";
@@ -583,13 +584,17 @@
/* Compilation header with timestamp */
- (void) time (&Aclock);
- NewTime = localtime (&Aclock);
+ Aclock = time (NULL);
+ NewTime = ctime (&Aclock);
FlPrintFile (FileId,
- "%sCompilation of \"%s\" - %s%s\n",
- Prefix, AslGbl_Files[ASL_FILE_INPUT].Filename, asctime (NewTime),
- Prefix);
+ "%sCompilation of \"%s\" -",
+ Prefix, AslGbl_Files[ASL_FILE_INPUT].Filename);
+
+ if (NewTime)
+ {
+ FlPrintFile (FileId, " %s%s\n", NewTime, Prefix);
+ }
switch (FileId)
{
diff -r 80eb41c85b64 -r 8a947fb12f3f sys/external/bsd/acpica/dist/compiler/aslcompiler.h
--- a/sys/external/bsd/acpica/dist/compiler/aslcompiler.h Sat Mar 28 19:46:32 2020 +0000
+++ b/sys/external/bsd/acpica/dist/compiler/aslcompiler.h Sat Mar 28 19:49:25 2020 +0000
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -265,6 +265,15 @@
UINT32 Level,
void *Context);
+UINT32
+MtProcessTypeOp (
+ ACPI_PARSE_OBJECT *TypeOp);
+
+UINT8
+MtProcessParameterTypeList (
+ ACPI_PARSE_OBJECT *ParamTypeOp,
+ UINT32 *TypeList);
+
/*
* aslbtypes - bitfield data types
@@ -371,7 +380,7 @@
void);
ACPI_STATUS
-AslExpectException (
+AslLogExpectedException (
char *MessageIdString);
ACPI_STATUS
@@ -384,10 +393,16 @@
BOOLEAN
AslIsExceptionIgnored (
+ char *Filename,
+ UINT32 LineNumber,
UINT8 Level,
UINT16 MessageId);
void
+AslLogExpectedExceptionByLine (
+ char *MessageIdString);
+
+void
AslCoreSubsystemError (
ACPI_PARSE_OBJECT *Op,
ACPI_STATUS Status,
@@ -1125,10 +1140,14 @@
ACPI_PARSE_OBJECT *Op,
UINT32 Level);
-void *
-UtGetParentMethod (
+ACPI_NAMESPACE_NODE *
+UtGetParentMethodNode (
ACPI_NAMESPACE_NODE *Node);
+ACPI_PARSE_OBJECT *
+UtGetParentMethodOp (
+ ACPI_PARSE_OBJECT *Op);
+
BOOLEAN
UtNodeIsDescendantOf (
ACPI_NAMESPACE_NODE *Node1,
diff -r 80eb41c85b64 -r 8a947fb12f3f sys/external/bsd/acpica/dist/compiler/aslcompiler.l
--- a/sys/external/bsd/acpica/dist/compiler/aslcompiler.l Sat Mar 28 19:46:32 2020 +0000
+++ b/sys/external/bsd/acpica/dist/compiler/aslcompiler.l Sat Mar 28 19:49:25 2020 +0000
@@ -6,7 +6,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,6 @@
#include <stdlib.h>
#include <string.h>
-YYSTYPE AslCompilerlval;
/*
* Generation: Use the following command line:
@@ -87,6 +86,7 @@
LeadNameChar [A-Za-z_]
DigitChar [0-9]
+ErrorCode [(][ ]*[1-9][0-9][0-9][0-9][ ]*[)]
OctalChar [0-7]
HexDigitChar [A-Fa-f0-9]
RootChar [\\]
@@ -584,7 +584,7 @@
"IPMI" { count (0); return (PARSEOP_REGIONSPACE_IPMI); }
"GeneralPurposeIo" { count (0); return (PARSEOP_REGIONSPACE_GPIO); } /* ACPI 5.0 */
"GenericSerialBus" { count (0); return (PARSEOP_REGIONSPACE_GSBUS); } /* ACPI 5.0 */
-"PlatformCommChannel" { count (0); return (PARSEOP_REGIONSPACE_PCC); } /* ACPI 5.0 */
+"PCC" { count (0); return (PARSEOP_REGIONSPACE_PCC); } /* ACPI 5.0 */
"FFixedHW" { count (0); return (PARSEOP_REGIONSPACE_FFIXEDHW); }
/* ResourceTypeKeyword: Resource Usage - Resource Descriptors */
@@ -702,6 +702,22 @@
"__LINE__" { count (0); return (PARSEOP___LINE__); }
"__PATH__" { count (0); return (PARSEOP___PATH__); }
"__METHOD__" { count (0); return (PARSEOP___METHOD__); }
+"__EXPECT__"{ErrorCode} { char *s;
+ int index = 0;
+ count (0);
+ while (!isdigit (AslCompilertext[index]))
+ {
+ index++;
+ }
+
+ /*
+ * The eror code is contained inside the
+ * {ErrorCode} pattern. Extract it and log it
+ * as the expected error code.
+ */
+ s = UtLocalCacheCalloc (ASL_ERROR_CODE_LENGTH + 1);
+ memcpy (s, AslCompilertext + index, ASL_ERROR_CODE_LENGTH);
+ AslLogExpectedExceptionByLine (s); }
{NameSeg} { char *s;
count (0);
diff -r 80eb41c85b64 -r 8a947fb12f3f sys/external/bsd/acpica/dist/compiler/aslerror.c
--- a/sys/external/bsd/acpica/dist/compiler/aslerror.c Sat Mar 28 19:46:32 2020 +0000
+++ b/sys/external/bsd/acpica/dist/compiler/aslerror.c Sat Mar 28 19:49:25 2020 +0000
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2019, Intel Corp.
+ * Copyright (C) 2000 - 2020, Intel Corp.
* All rights reserved.
Home |
Main Index |
Thread Index |
Old Index