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 resolve conflicts.
details: https://anonhg.NetBSD.org/src/rev/de13eb92d0e6
branches: trunk
changeset: 337382:de13eb92d0e6
user: christos <christos%NetBSD.org@localhost>
date: Mon Apr 13 17:23:15 2015 +0000
description:
resolve conflicts.
diffstat:
sys/external/bsd/acpica/dist/common/dmtbinfo.c | 44 +-
sys/external/bsd/acpica/dist/compiler/aslanalyze.c | 2 +-
sys/external/bsd/acpica/dist/compiler/aslcompile.c | 26 +-
sys/external/bsd/acpica/dist/compiler/aslcompiler.l | 86 +-
sys/external/bsd/acpica/dist/compiler/aslerror.c | 4 +-
sys/external/bsd/acpica/dist/compiler/aslfileio.c | 12 +-
sys/external/bsd/acpica/dist/compiler/aslfiles.c | 35 +-
sys/external/bsd/acpica/dist/compiler/aslload.c | 4 +-
sys/external/bsd/acpica/dist/compiler/asllookup.c | 2 +-
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 | 103 +-
sys/external/bsd/acpica/dist/compiler/asltree.c | 394 +++-
sys/external/bsd/acpica/dist/compiler/aslutils.c | 39 +-
sys/external/bsd/acpica/dist/compiler/aslwalks.c | 19 +-
sys/external/bsd/acpica/dist/compiler/aslxref.c | 4 +-
sys/external/bsd/acpica/dist/compiler/dtcompile.c | 20 +-
sys/external/bsd/acpica/dist/compiler/dtfield.c | 4 +-
sys/external/bsd/acpica/dist/compiler/dtparser.y | 2 +-
sys/external/bsd/acpica/dist/compiler/dtsubtable.c | 4 +-
sys/external/bsd/acpica/dist/compiler/dttable.c | 39 +-
sys/external/bsd/acpica/dist/compiler/dtutils.c | 7 +-
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 | 14 +-
sys/external/bsd/acpica/dist/debugger/dbexec.c | 2 +-
sys/external/bsd/acpica/dist/debugger/dbinput.c | 2 +-
sys/external/bsd/acpica/dist/debugger/dbmethod.c | 6 +-
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 | 14 +-
sys/external/bsd/acpica/dist/disassembler/dmcstyle.c | 8 +-
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/dispatcher/dscontrol.c | 4 +-
sys/external/bsd/acpica/dist/dispatcher/dsopcode.c | 10 +-
sys/external/bsd/acpica/dist/events/evrgnini.c | 4 +-
sys/external/bsd/acpica/dist/events/evxface.c | 140 +-
sys/external/bsd/acpica/dist/executer/exconfig.c | 4 +-
sys/external/bsd/acpica/dist/executer/exdebug.c | 4 +-
sys/external/bsd/acpica/dist/executer/exdump.c | 6 +-
sys/external/bsd/acpica/dist/hardware/hwesleep.c | 2 +-
sys/external/bsd/acpica/dist/hardware/hwsleep.c | 2 +-
sys/external/bsd/acpica/dist/hardware/hwxfsleep.c | 2 +-
sys/external/bsd/acpica/dist/include/acapps.h | 12 +-
sys/external/bsd/acpica/dist/include/acdebug.h | 4 +-
sys/external/bsd/acpica/dist/include/acdisasm.h | 34 +-
sys/external/bsd/acpica/dist/include/acexcep.h | 2 +-
sys/external/bsd/acpica/dist/include/acglobal.h | 12 +-
sys/external/bsd/acpica/dist/include/acinterp.h | 2 +-
sys/external/bsd/acpica/dist/include/aclocal.h | 8 +-
sys/external/bsd/acpica/dist/include/acmacros.h | 15 +-
sys/external/bsd/acpica/dist/include/acnamesp.h | 2 +-
sys/external/bsd/acpica/dist/include/acpiosxf.h | 2 +-
sys/external/bsd/acpica/dist/include/acpixf.h | 20 +-
sys/external/bsd/acpica/dist/include/acresrc.h | 6 +-
sys/external/bsd/acpica/dist/include/actables.h | 15 +-
sys/external/bsd/acpica/dist/include/actbl1.h | 2 +-
sys/external/bsd/acpica/dist/include/actypes.h | 64 +-
sys/external/bsd/acpica/dist/include/acutils.h | 29 +-
sys/external/bsd/acpica/dist/include/platform/acnetbsd.h | 10 +-
sys/external/bsd/acpica/dist/namespace/nsaccess.c | 4 +-
sys/external/bsd/acpica/dist/namespace/nsdump.c | 10 +-
sys/external/bsd/acpica/dist/namespace/nseval.c | 4 +-
sys/external/bsd/acpica/dist/namespace/nsinit.c | 4 +-
sys/external/bsd/acpica/dist/namespace/nsrepair2.c | 4 +-
sys/external/bsd/acpica/dist/namespace/nsxfeval.c | 3 +-
sys/external/bsd/acpica/dist/namespace/nsxfname.c | 3 +-
sys/external/bsd/acpica/dist/os_specific/service_layers/osfreebsdtbl.c | 898 ----------
sys/external/bsd/acpica/dist/os_specific/service_layers/oslinuxtbl.c | 4 +-
sys/external/bsd/acpica/dist/parser/psopcode.c | 8 +-
sys/external/bsd/acpica/dist/parser/psopinfo.c | 4 +-
sys/external/bsd/acpica/dist/resources/rsdump.c | 283 +-
sys/external/bsd/acpica/dist/resources/rsdumpinfo.c | 49 +-
sys/external/bsd/acpica/dist/resources/rsutils.c | 4 +-
sys/external/bsd/acpica/dist/resources/rsxface.c | 13 +-
sys/external/bsd/acpica/dist/tables/tbdata.c | 37 +-
sys/external/bsd/acpica/dist/tables/tbfadt.c | 4 +-
sys/external/bsd/acpica/dist/tables/tbinstal.c | 72 +-
sys/external/bsd/acpica/dist/tables/tbutils.c | 4 +-
sys/external/bsd/acpica/dist/tables/tbxface.c | 3 +-
sys/external/bsd/acpica/dist/tables/tbxfroot.c | 10 +-
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 | 4 +-
sys/external/bsd/acpica/dist/utilities/utdebug.c | 3 +-
sys/external/bsd/acpica/dist/utilities/utdecode.c | 4 +-
sys/external/bsd/acpica/dist/utilities/uteval.c | 4 +-
sys/external/bsd/acpica/dist/utilities/utglobal.c | 16 +-
sys/external/bsd/acpica/dist/utilities/utmisc.c | 6 +-
sys/external/bsd/acpica/dist/utilities/utmutex.c | 4 +-
sys/external/bsd/acpica/dist/utilities/utosi.c | 5 +-
sys/external/bsd/acpica/dist/utilities/uttrack.c | 4 +-
sys/external/bsd/acpica/dist/utilities/utuuid.c | 6 +-
97 files changed, 1203 insertions(+), 1617 deletions(-)
diffs (truncated from 5394 to 300 lines):
diff -r ebbebae2d095 -r de13eb92d0e6 sys/external/bsd/acpica/dist/common/dmtbinfo.c
--- a/sys/external/bsd/acpica/dist/common/dmtbinfo.c Mon Apr 13 17:21:01 2015 +0000
+++ b/sys/external/bsd/acpica/dist/common/dmtbinfo.c Mon Apr 13 17:23:15 2015 +0000
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2014, Intel Corp.
+ * Copyright (C) 2000 - 2015, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -200,9 +200,7 @@
#define ACPI_S3PTH_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_S3PT_HEADER,f)
#define ACPI_S3PT0_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_S3PT_RESUME,f)
#define ACPI_S3PT1_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_S3PT_SUSPEND,f)
-#define ACPI_SLICH_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_SLIC_HEADER,f)
-#define ACPI_SLIC0_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_SLIC_KEY,f)
-#define ACPI_SLIC1_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_SLIC_MARKER,f)
+#define ACPI_SLIC_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_SLIC,f)
#define ACPI_SRATH_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_SUBTABLE_HEADER,f)
#define ACPI_SRAT0_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_SRAT_CPU_AFFINITY,f)
#define ACPI_SRAT1_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_SRAT_MEM_AFFINITY,f)
@@ -2043,42 +2041,16 @@
/*******************************************************************************
*
- * SLIC - Software Licensing Description Table. There is no common table, just
- * the standard ACPI header and then subtables.
+ * SLIC - Software Licensing Description Table. This table contains the standard
+ * ACPI header followed by proprietary data structures
*
******************************************************************************/
-/* Common Subtable header (one per Subtable) */
+/* Single subtable, a proprietary format, so treat it as a buffer */
-ACPI_DMTABLE_INFO AcpiDmTableInfoSlicHdr[] =
-{
- {ACPI_DMT_SLIC, ACPI_SLICH_OFFSET (Type), "Subtable Type", 0},
- {ACPI_DMT_UINT32, ACPI_SLICH_OFFSET (Length), "Length", DT_LENGTH},
- ACPI_DMT_TERMINATOR
-};
-
-ACPI_DMTABLE_INFO AcpiDmTableInfoSlic0[] =
+ACPI_DMTABLE_INFO AcpiDmTableInfoSlic[] =
{
- {ACPI_DMT_UINT8, ACPI_SLIC0_OFFSET (KeyType), "Key Type", 0},
- {ACPI_DMT_UINT8, ACPI_SLIC0_OFFSET (Version), "Version", 0},
- {ACPI_DMT_UINT16, ACPI_SLIC0_OFFSET (Reserved), "Reserved", 0},
- {ACPI_DMT_UINT32, ACPI_SLIC0_OFFSET (Algorithm), "Algorithm", 0},
- {ACPI_DMT_NAME4, ACPI_SLIC0_OFFSET (Magic), "Magic", 0},
- {ACPI_DMT_UINT32, ACPI_SLIC0_OFFSET (BitLength), "BitLength", 0},
- {ACPI_DMT_UINT32, ACPI_SLIC0_OFFSET (Exponent), "Exponent", 0},
- {ACPI_DMT_BUF128, ACPI_SLIC0_OFFSET (Modulus[0]), "Modulus", 0},
- ACPI_DMT_TERMINATOR
-};
-
-ACPI_DMTABLE_INFO AcpiDmTableInfoSlic1[] =
-{
- {ACPI_DMT_UINT32, ACPI_SLIC1_OFFSET (Version), "Version", 0},
- {ACPI_DMT_NAME6, ACPI_SLIC1_OFFSET (OemId[0]), "Oem ID", 0},
- {ACPI_DMT_NAME8, ACPI_SLIC1_OFFSET (OemTableId[0]), "Oem Table ID", 0},
- {ACPI_DMT_NAME8, ACPI_SLIC1_OFFSET (WindowsFlag[0]), "Windows Flag", 0},
- {ACPI_DMT_UINT32, ACPI_SLIC1_OFFSET (SlicVersion), "SLIC Version", 0},
- {ACPI_DMT_BUF16, ACPI_SLIC1_OFFSET (Reserved[0]), "Reserved", 0},
- {ACPI_DMT_BUF128, ACPI_SLIC1_OFFSET (Signature[0]), "Signature", 0},
+ {ACPI_DMT_RAW_BUFFER, 0, "Software Licensing Structure", 0},
ACPI_DMT_TERMINATOR
};
@@ -2091,7 +2063,7 @@
ACPI_DMTABLE_INFO AcpiDmTableInfoSlit[] =
{
- {ACPI_DMT_UINT64, ACPI_SLIT_OFFSET (LocalityCount), "Localities", 0},
+ {ACPI_DMT_UINT64, ACPI_SLIT_OFFSET (LocalityCount), "Localities", 0},
ACPI_DMT_TERMINATOR
};
diff -r ebbebae2d095 -r de13eb92d0e6 sys/external/bsd/acpica/dist/compiler/aslanalyze.c
--- a/sys/external/bsd/acpica/dist/compiler/aslanalyze.c Mon Apr 13 17:21:01 2015 +0000
+++ b/sys/external/bsd/acpica/dist/compiler/aslanalyze.c Mon Apr 13 17:23:15 2015 +0000
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2014, Intel Corp.
+ * Copyright (C) 2000 - 2015, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff -r ebbebae2d095 -r de13eb92d0e6 sys/external/bsd/acpica/dist/compiler/aslcompile.c
--- a/sys/external/bsd/acpica/dist/compiler/aslcompile.c Mon Apr 13 17:21:01 2015 +0000
+++ b/sys/external/bsd/acpica/dist/compiler/aslcompile.c Mon Apr 13 17:23:15 2015 +0000
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2014, Intel Corp.
+ * Copyright (C) 2000 - 2015, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -118,10 +118,9 @@
AslCompilerparse();
UtEndEvent (Event);
- /* Check for parse errors */
+ /* Check for parser-detected syntax errors */
- Status = AslCheckForErrorExit ();
- if (ACPI_FAILURE (Status))
+ if (Gbl_SyntaxError)
{
fprintf (stderr, "Compiler aborting due to parser-detected syntax error(s)\n");
LsDumpParseTree ();
@@ -147,6 +146,13 @@
Event = UtBeginEvent ("Flush source input");
CmFlushSourceCode ();
+ /* Prune the parse tree if requested (debug purposes only) */
+
+ if (Gbl_PruneParseTree)
+ {
+ AslPruneParseTree (Gbl_PruneDepth, Gbl_PruneType);
+ }
+
/* Optional parse tree dump, compiler debug output only */
LsDumpParseTree ();
@@ -189,8 +195,16 @@
Event = UtBeginEvent ("Constant folding via AML interpreter");
DbgPrint (ASL_DEBUG_OUTPUT,
"\nInterpreting compile-time constant expressions\n\n");
- TrWalkParseTree (RootNode, ASL_WALK_VISIT_DOWNWARD,
- OpcAmlConstantWalk, NULL, NULL);
+
+ if (Gbl_FoldConstants)
+ {
+ TrWalkParseTree (RootNode, ASL_WALK_VISIT_DOWNWARD,
+ OpcAmlConstantWalk, NULL, NULL);
+ }
+ else
+ {
+ DbgPrint (ASL_PARSE_OUTPUT, " Optional folding disabled\n");
+ }
UtEndEvent (Event);
/* Update AML opcodes if necessary, after constant folding */
diff -r ebbebae2d095 -r de13eb92d0e6 sys/external/bsd/acpica/dist/compiler/aslcompiler.l
--- a/sys/external/bsd/acpica/dist/compiler/aslcompiler.l Mon Apr 13 17:21:01 2015 +0000
+++ b/sys/external/bsd/acpica/dist/compiler/aslcompiler.l Mon Apr 13 17:23:15 2015 +0000
@@ -6,7 +6,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2014, Intel Corp.
+ * Copyright (C) 2000 - 2015, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -117,7 +117,49 @@
else {yyterminate ();} }
";" { count (0); return(';'); }
+ /* ASL Extension: Standard C operators */
+"~" { count (3); return (PARSEOP_EXP_NOT); }
+"!" { count (3); return (PARSEOP_EXP_LOGICAL_NOT); }
+"*" { count (3); return (PARSEOP_EXP_MULTIPLY); }
+"/" { count (3); return (PARSEOP_EXP_DIVIDE); }
+"%" { count (3); return (PARSEOP_EXP_MODULO); }
+"+" { count (3); return (PARSEOP_EXP_ADD); }
+"-" { count (3); return (PARSEOP_EXP_SUBTRACT); }
+">>" { count (3); return (PARSEOP_EXP_SHIFT_RIGHT); }
+"<<" { count (3); return (PARSEOP_EXP_SHIFT_LEFT); }
+"<" { count (3); return (PARSEOP_EXP_LESS); }
+">" { count (3); return (PARSEOP_EXP_GREATER); }
+"&" { count (3); return (PARSEOP_EXP_AND); }
+"<=" { count (3); return (PARSEOP_EXP_LESS_EQUAL); }
+">=" { count (3); return (PARSEOP_EXP_GREATER_EQUAL); }
+"==" { count (3); return (PARSEOP_EXP_EQUAL); }
+"!=" { count (3); return (PARSEOP_EXP_NOT_EQUAL); }
+"|" { count (3); return (PARSEOP_EXP_OR); }
+"&&" { count (3); return (PARSEOP_EXP_LOGICAL_AND); }
+"||" { count (3); return (PARSEOP_EXP_LOGICAL_OR); }
+"++" { count (3); return (PARSEOP_EXP_INCREMENT); }
+"--" { count (3); return (PARSEOP_EXP_DECREMENT); }
+"^ " { count (3); return (PARSEOP_EXP_XOR); }
+
+ /* ASL Extension: Standard C assignment operators */
+
+"=" { count (3); return (PARSEOP_EXP_EQUALS); }
+"+=" { count (3); return (PARSEOP_EXP_ADD_EQ); }
+"-=" { count (3); return (PARSEOP_EXP_SUB_EQ); }
+"*=" { count (3); return (PARSEOP_EXP_MUL_EQ); }
+"/=" { count (3); return (PARSEOP_EXP_DIV_EQ); }
+"%=" { count (3); return (PARSEOP_EXP_MOD_EQ); }
+"<<=" { count (3); return (PARSEOP_EXP_SHL_EQ); }
+">>=" { count (3); return (PARSEOP_EXP_SHR_EQ); }
+"&=" { count (3); return (PARSEOP_EXP_AND_EQ); }
+"^=" { count (3); return (PARSEOP_EXP_XOR_EQ); }
+"|=" { count (3); return (PARSEOP_EXP_OR_EQ); }
+
+
+ /*
+ * Begin standard ASL grammar
+ */
0[xX]{HexDigitChar}+ |
{DigitChar}+ { AslCompilerlval.i = UtDoConstant ((char *) AslCompilertext);
count (1); return (PARSEOP_INTEGER); }
@@ -592,6 +634,44 @@
"Transfer8_16" { count (0); return (PARSEOP_XFERTYPE_8_16); }
"Transfer16" { count (0); return (PARSEOP_XFERTYPE_16); }
+ /* ToPld macro */
+
+"ToPLD" { count (0); return (PARSEOP_TOPLD); }
+
+"PLD_Revision" { count (0); return (PARSEOP_PLD_REVISION); }
+"PLD_IgnoreColor" { count (0); return (PARSEOP_PLD_IGNORECOLOR); }
+"PLD_Red" { count (0); return (PARSEOP_PLD_RED); }
+"PLD_Green" { count (0); return (PARSEOP_PLD_GREEN); }
+"PLD_Blue" { count (0); return (PARSEOP_PLD_BLUE); }
+"PLD_Width" { count (0); return (PARSEOP_PLD_WIDTH); }
+"PLD_Height" { count (0); return (PARSEOP_PLD_HEIGHT); }
+"PLD_UserVisible" { count (0); return (PARSEOP_PLD_USERVISIBLE); }
+"PLD_Dock" { count (0); return (PARSEOP_PLD_DOCK); }
+"PLD_Lid" { count (0); return (PARSEOP_PLD_LID); }
+"PLD_Panel" { count (0); return (PARSEOP_PLD_PANEL); }
+"PLD_VerticalPosition" { count (0); return (PARSEOP_PLD_VERTICALPOSITION); }
+"PLD_HorizontalPosition" { count (0); return (PARSEOP_PLD_HORIZONTALPOSITION); }
+"PLD_Shape" { count (0); return (PARSEOP_PLD_SHAPE); }
+"PLD_GroupOrientation" { count (0); return (PARSEOP_PLD_GROUPORIENTATION); }
+"PLD_GroupToken" { count (0); return (PARSEOP_PLD_GROUPTOKEN); }
+"PLD_GroupPosition" { count (0); return (PARSEOP_PLD_GROUPPOSITION); }
+"PLD_Bay" { count (0); return (PARSEOP_PLD_BAY); }
+"PLD_Ejectable" { count (0); return (PARSEOP_PLD_EJECTABLE); }
+"PLD_EjectRequired" { count (0); return (PARSEOP_PLD_EJECTREQUIRED); }
+"PLD_CabinetNumber" { count (0); return (PARSEOP_PLD_CABINETNUMBER); }
+"PLD_CardCageNumber" { count (0); return (PARSEOP_PLD_CARDCAGENUMBER); }
+"PLD_Reference" { count (0); return (PARSEOP_PLD_REFERENCE); }
+"PLD_Rotation" { count (0); return (PARSEOP_PLD_ROTATION); }
+"PLD_Order" { count (0); return (PARSEOP_PLD_ORDER); }
+"PLD_Reserved" { count (0); return (PARSEOP_PLD_RESERVED); }
+"PLD_VerticalOffset" { count (0); return (PARSEOP_PLD_VERTICALOFFSET); }
+"PLD_HorizontalOffset" { count (0); return (PARSEOP_PLD_HORIZONTALOFFSET); }
+
+
+ /* printf debug macros */
+"printf" { count (0); return (PARSEOP_PRINTF); }
+"fprintf" { count (0); return (PARSEOP_FPRINTF); }
+
/* Predefined compiler names */
"__DATE__" { count (0); return (PARSEOP___DATE__); }
@@ -628,10 +708,6 @@
DbgPrint (ASL_PARSE_OUTPUT, "NameString: %s\n", s);
return (PARSEOP_NAMESTRING); }
-"*" |
-"/" { count (1);
- AslCompilererror ("Parse error, expecting ASL keyword or name");}
-
. { count (1);
snprintf (MsgBuffer, sizeof(MsgBuffer),
"Invalid character (0x%2.2X), expecting ASL keyword or name",
diff -r ebbebae2d095 -r de13eb92d0e6 sys/external/bsd/acpica/dist/compiler/aslerror.c
--- a/sys/external/bsd/acpica/dist/compiler/aslerror.c Mon Apr 13 17:21:01 2015 +0000
+++ b/sys/external/bsd/acpica/dist/compiler/aslerror.c Mon Apr 13 17:23:15 2015 +0000
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2014, Intel Corp.
+ * Copyright (C) 2000 - 2015, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -918,6 +918,8 @@
const char *CompilerMessage)
{
+ Gbl_SyntaxError++;
+
AslCommonError (ASL_ERROR, ASL_MSG_SYNTAX, Gbl_CurrentLineNumber,
Gbl_LogicalLineNumber, Gbl_CurrentLineOffset,
Gbl_CurrentColumn, Gbl_Files[ASL_FILE_INPUT].Filename,
diff -r ebbebae2d095 -r de13eb92d0e6 sys/external/bsd/acpica/dist/compiler/aslfileio.c
--- a/sys/external/bsd/acpica/dist/compiler/aslfileio.c Mon Apr 13 17:21:01 2015 +0000
+++ b/sys/external/bsd/acpica/dist/compiler/aslfileio.c Mon Apr 13 17:23:15 2015 +0000
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2014, Intel Corp.
+ * Copyright (C) 2000 - 2015, Intel Corp.
* All rights reserved.
*
Home |
Main Index |
Thread Index |
Old Index