svn commit: r225768 - in vendor-sys/acpica/dist: . common compiler
generate/unix generate/unix/acpibin generate/unix/acpiexec
generate/unix/acpihelp generate/unix/acpinames
generate/unix/acpisrc ge...
Jung-uk Kim
jkim at FreeBSD.org
Mon Sep 26 21:40:22 UTC 2011
Author: jkim
Date: Mon Sep 26 21:40:21 2011
New Revision: 225768
URL: http://svn.freebsd.org/changeset/base/225768
Log:
Import ACPICA 20110922.
Added:
vendor-sys/acpica/dist/tools/acpixtract/axmain.c (contents, props changed)
Modified:
vendor-sys/acpica/dist/changes.txt
vendor-sys/acpica/dist/common/dmtable.c
vendor-sys/acpica/dist/compiler/Makefile
vendor-sys/acpica/dist/compiler/aslcompile.c
vendor-sys/acpica/dist/compiler/aslcompiler.h
vendor-sys/acpica/dist/compiler/asldefine.h
vendor-sys/acpica/dist/compiler/aslfiles.c
vendor-sys/acpica/dist/compiler/aslglobal.h
vendor-sys/acpica/dist/compiler/asllisting.c
vendor-sys/acpica/dist/compiler/aslload.c
vendor-sys/acpica/dist/compiler/asllookup.c
vendor-sys/acpica/dist/compiler/aslmain.c
vendor-sys/acpica/dist/compiler/aslmessages.h
vendor-sys/acpica/dist/compiler/asloperands.c
vendor-sys/acpica/dist/compiler/aslpredef.c
vendor-sys/acpica/dist/compiler/aslresource.c
vendor-sys/acpica/dist/compiler/aslrestype1.c
vendor-sys/acpica/dist/compiler/aslrestype1i.c
vendor-sys/acpica/dist/compiler/aslrestype2.c
vendor-sys/acpica/dist/compiler/aslrestype2d.c
vendor-sys/acpica/dist/compiler/aslrestype2e.c
vendor-sys/acpica/dist/compiler/aslrestype2q.c
vendor-sys/acpica/dist/compiler/aslrestype2w.c
vendor-sys/acpica/dist/compiler/asltree.c
vendor-sys/acpica/dist/compiler/asltypes.h
vendor-sys/acpica/dist/compiler/aslutils.c
vendor-sys/acpica/dist/compiler/dtcompile.c
vendor-sys/acpica/dist/generate/unix/Makefile.config
vendor-sys/acpica/dist/generate/unix/acpibin/Makefile
vendor-sys/acpica/dist/generate/unix/acpiexec/Makefile
vendor-sys/acpica/dist/generate/unix/acpihelp/Makefile
vendor-sys/acpica/dist/generate/unix/acpinames/Makefile
vendor-sys/acpica/dist/generate/unix/acpisrc/Makefile
vendor-sys/acpica/dist/generate/unix/acpixtract/Makefile
vendor-sys/acpica/dist/generate/unix/iasl/Makefile
vendor-sys/acpica/dist/include/acapps.h
vendor-sys/acpica/dist/include/acconfig.h
vendor-sys/acpica/dist/include/aclocal.h
vendor-sys/acpica/dist/include/acpixf.h
vendor-sys/acpica/dist/include/platform/acenv.h
vendor-sys/acpica/dist/tools/acpibin/Makefile
vendor-sys/acpica/dist/tools/acpibin/abmain.c
vendor-sys/acpica/dist/tools/acpiexec/Makefile
vendor-sys/acpica/dist/tools/acpiexec/aemain.c
vendor-sys/acpica/dist/tools/acpihelp/Makefile
vendor-sys/acpica/dist/tools/acpihelp/ahaslops.c
vendor-sys/acpica/dist/tools/acpihelp/ahmain.c
vendor-sys/acpica/dist/tools/acpihelp/ahpredef.c
vendor-sys/acpica/dist/tools/acpinames/Makefile
vendor-sys/acpica/dist/tools/acpinames/anmain.c
vendor-sys/acpica/dist/tools/acpisrc/Makefile
vendor-sys/acpica/dist/tools/acpisrc/asmain.c
vendor-sys/acpica/dist/tools/acpisrc/astable.c
vendor-sys/acpica/dist/tools/acpixtract/Makefile
vendor-sys/acpica/dist/tools/acpixtract/acpixtract.c
Modified: vendor-sys/acpica/dist/changes.txt
==============================================================================
--- vendor-sys/acpica/dist/changes.txt Mon Sep 26 15:26:59 2011 (r225767)
+++ vendor-sys/acpica/dist/changes.txt Mon Sep 26 21:40:21 2011 (r225768)
@@ -1,4 +1,81 @@
----------------------------------------
+22 September 2011. Summary of changes for version 20110922:
+
+This release is available at www.acpica.org/downloads
+
+0) ACPI 5.0 News:
+
+Support for ACPI 5.0 in ACPICA has been underway for several months and will
+be released at the same time that ACPI 5.0 is officially released.
+
+The ACPI 5.0 specification is on track for release in the next few months.
+
+1) ACPICA Core Subsystem:
+
+Fixed a problem where the maximum sleep time for the Sleep() operator was
+intended to be limited to two seconds, but was inadvertently limited to 20
+seconds instead.
+
+Linux and Unix makefiles: Added header file dependencies to ensure correct
+generation of ACPICA core code and utilities. Also simplified the makefiles
+considerably through the use of the vpath variable to specify search paths.
+ACPICA BZ 924.
+
+2) iASL Compiler/Disassembler and Tools:
+
+iASL: Implemented support to check the access length for all fields created to
+access named Resource Descriptor fields. For example, if a resource field is
+defined to be two bits, a warning is issued if a CreateXxxxField() is used
+with an incorrect bit length. This is implemented for all current resource
+descriptor names. ACPICA BZ 930.
+
+Disassembler: Fixed a byte ordering problem with the output of 24-bit and 56-
+bit integers.
+
+iASL: Fixed a couple of issues associated with variable-length package
+objects. 1) properly handle constants like One, Ones, Zero -- do not make a
+VAR_PACKAGE when these are used as a package length. 2) Allow the VAR_PACKAGE
+opcode (in addition to PACKAGE) when validating object types for predefined
+names.
+
+iASL: Emit statistics for all output files (instead of just the ASL input and
+AML output). Includes listings, hex files, etc.
+
+iASL: Added -G option to the table compiler to allow the compilation of custom
+ACPI tables. The only part of a table that is required is the standard 36-byte
+ACPI header.
+
+AcpiXtract: Ported to the standard ACPICA environment (with ACPICA headers),
+which also adds correct 64-bit support. Also, now all output filenames are
+completely lower case.
+
+AcpiExec: Ignore any non-AML tables (tables other than DSDT or SSDT) when
+loading table files. A warning is issued for any such tables. The only
+exception is an FADT. This also fixes a possible fault when attempting to load
+non-AML tables. ACPICA BZ 932.
+
+AcpiHelp: Added the AccessAs and Offset operators. Fixed a problem where a
+missing table terminator could cause a fault when using the -p option.
+
+AcpiSrc: Fixed a possible divide-by-zero fault when generating file
+statistics.
+
+3) Example Code and Data Size
+
+These are the sizes for the OS-independent acpica.lib produced by the
+Microsoft Visual C++ 9.0 32-bit compiler. The debug version of the code
+includes the debug output trace mechanism and has a much larger code and data
+size.
+
+ Previous Release (VC 9.0):
+ Non-Debug Version: 90.2K Code, 23.9K Data, 114.1K Total
+ Debug Version: 165.6K Code, 68.4K Data, 234.0K Total
+ Current Release (VC 9.0):
+ Non-Debug Version: 90.2K Code, 23.9K Data, 114.1K Total
+ Debug Version: 165.6K Code, 68.4K Data, 234.0K Total
+
+
+----------------------------------------
23 June 2011. Summary of changes for version 20110623:
1) ACPI CA Core Subsystem:
Modified: vendor-sys/acpica/dist/common/dmtable.c
==============================================================================
--- vendor-sys/acpica/dist/common/dmtable.c Mon Sep 26 15:26:59 2011 (r225767)
+++ vendor-sys/acpica/dist/common/dmtable.c Mon Sep 26 21:40:21 2011 (r225768)
@@ -750,44 +750,25 @@ AcpiDmDumpTable (
AcpiOsPrintf ("%1.1X\n", (*Target >> 2) & 0x03);
break;
- /* Standard Data Types */
+ /* Integer Data Types */
case ACPI_DMT_UINT8:
-
- AcpiOsPrintf ("%2.2X\n", *Target);
- break;
-
case ACPI_DMT_UINT16:
-
- AcpiOsPrintf ("%4.4X\n", ACPI_GET16 (Target));
- break;
-
case ACPI_DMT_UINT24:
-
- AcpiOsPrintf ("%2.2X%2.2X%2.2X\n",
- *Target, *(Target + 1), *(Target + 2));
- break;
-
case ACPI_DMT_UINT32:
-
- AcpiOsPrintf ("%8.8X\n", ACPI_GET32 (Target));
- break;
-
case ACPI_DMT_UINT56:
-
- for (Temp8 = 0; Temp8 < 7; Temp8++)
+ case ACPI_DMT_UINT64:
+ /*
+ * Dump bytes - high byte first, low byte last.
+ * Note: All ACPI tables are little-endian.
+ */
+ for (Temp8 = (UINT8) ByteLength; Temp8 > 0; Temp8--)
{
- AcpiOsPrintf ("%2.2X", Target[Temp8]);
+ AcpiOsPrintf ("%2.2X", Target[Temp8 - 1]);
}
AcpiOsPrintf ("\n");
break;
- case ACPI_DMT_UINT64:
-
- AcpiOsPrintf ("%8.8X%8.8X\n",
- ACPI_FORMAT_UINT64 (ACPI_GET64 (Target)));
- break;
-
case ACPI_DMT_BUF7:
case ACPI_DMT_BUF16:
case ACPI_DMT_BUF128:
Modified: vendor-sys/acpica/dist/compiler/Makefile
==============================================================================
--- vendor-sys/acpica/dist/compiler/Makefile Mon Sep 26 15:26:59 2011 (r225767)
+++ vendor-sys/acpica/dist/compiler/Makefile Mon Sep 26 21:40:21 2011 (r225768)
@@ -19,50 +19,57 @@ PROG = iasl
HOST = _LINUX
NOMAN = YES
-COMPILE = $(CC) -c $(CFLAGS) $(CWARNINGFLAGS) -o$@ $?
+COMPILE = $(CC) -c $(CFLAGS) $(CWARNINGFLAGS) -o$@ $<
ACPICA_COMPONENTS =
-ACPICA_SRC = ..
-ACPICA_COMMON = $(ACPICA_SRC)/common
-ACPICA_CORE = $(ACPICA_SRC)$(ACPICA_COMPONENTS)
-ACPICA_TOOLS = $(ACPICA_SRC)/tools
-ACPICA_OSL = $(ACPICA_SRC)/os_specific/service_layers
-ASL_COMPILER = $(ACPICA_SRC)/compiler
-INSTALLDIR = /usr/bin
-INSTALLPROG = cp --remove-destination $(PROG) $(INSTALLDIR)
+ACPICA_SRC = ..
+ACPICA_INCLUDE = $(ACPICA_SRC)/include
+ACPICA_COMMON = $(ACPICA_SRC)/common
+ACPICA_CORE = $(ACPICA_SRC)$(ACPICA_COMPONENTS)
+ACPICA_TOOLS = $(ACPICA_SRC)/tools
+ACPICA_OSL = $(ACPICA_SRC)/os_specific/service_layers
+ACPICA_DEBUGGER = $(ACPICA_CORE)/debugger
+ACPICA_DISASSEMBLER = $(ACPICA_CORE)/disassembler
+ACPICA_DISPATCHER = $(ACPICA_CORE)/dispatcher
+ACPICA_EXECUTER = $(ACPICA_CORE)/executer
+ACPICA_NAMESPACE = $(ACPICA_CORE)/namespace
+ACPICA_PARSER = $(ACPICA_CORE)/parser
+ACPICA_TABLES = $(ACPICA_CORE)/tables
+ACPICA_UTILITIES = $(ACPICA_CORE)/utilities
+ASL_COMPILER = $(ACPICA_SRC)/compiler
+INSTALLDIR = /usr/bin
+INSTALLPROG = cp --remove-destination $(PROG) $(INSTALLDIR)
+
+ACPICA_HEADERS = \
+ $(wildcard $(ACPICA_INCLUDE)/*.h) \
+ $(wildcard $(ACPICA_INCLUDE)/platform/*.h)
+
+#
+# Search paths for source files
+#
+vpath %.c \
+ $(ASL_COMPILER) \
+ $(ACPICA_DEBUGGER) \
+ $(ACPICA_DISASSEMBLER) \
+ $(ACPICA_DISPATCHER) \
+ $(ACPICA_EXECUTER) \
+ $(ACPICA_NAMESPACE) \
+ $(ACPICA_PARSER) \
+ $(ACPICA_TABLES) \
+ $(ACPICA_UTILITIES) \
+ $(ACPICA_COMMON) \
+ $(ACPICA_OSL)
+
+HEADERS = \
+ $(wildcard $(ASL_COMPILER)/*.h) \
+ aslcompiler.y.h \
+ dtparser.y.h
-CFLAGS+= \
- -D$(HOST) \
- -D_GNU_SOURCE \
- -DACPI_ASL_COMPILER \
- -I$(ACPICA_SRC)/include \
- -I$(ASL_COMPILER)
-
-CWARNINGFLAGS = \
- -ansi \
- -Wall \
- -Wbad-function-cast \
- -Wdeclaration-after-statement \
- -Werror \
- -Wformat=2 \
- -Wmissing-declarations \
- -Wmissing-prototypes \
- -Wstrict-aliasing=0 \
- -Wstrict-prototypes \
- -Wswitch-default \
- -Wpointer-arith \
- -Wundef
-
-#
-# Bison/Flex configuration
-#
-YACC= bison
-YFLAGS+= -v -d -y
-
-LEX= flex
-LFLAGS+= -i -s
-
-OBJS = \
+OBJECTS = \
+ aslcompilerlex.o \
+ aslcompilerparse.o \
+ dtparserlex.o \
+ dtparserparse.o \
adfile.o \
adisasm.o \
adwalk.o \
@@ -70,8 +77,6 @@ OBJS = \
aslbtypes.o \
aslcodegen.o \
aslcompile.o \
- aslcompilerlex.o \
- aslcompilerparse.o \
aslerror.o \
aslfiles.o \
aslfold.o \
@@ -104,8 +109,6 @@ OBJS = \
dtexpress.o \
dtfield.o \
dtio.o \
- dtparserlex.o \
- dtparserparse.o \
dtsubtable.o \
dttable.o \
dttemplate.o \
@@ -205,18 +208,67 @@ INTERMEDIATES = \
dtparserparse.c
MISC = \
+ aslcompilerparse.h \
aslcompiler.y.h \
aslcompilerparse.output \
+ dtparserparse.h \
dtparser.y.h \
dtparserparse.output
+CFLAGS+= \
+ -D$(HOST) \
+ -D_GNU_SOURCE \
+ -DACPI_ASL_COMPILER \
+ -I$(ACPICA_INCLUDE) \
+ -I$(ASL_COMPILER)
+
+CWARNINGFLAGS = \
+ -ansi \
+ -Wall \
+ -Wbad-function-cast \
+ -Wdeclaration-after-statement \
+ -Werror \
+ -Wformat=2 \
+ -Wmissing-declarations \
+ -Wmissing-prototypes \
+ -Wstrict-aliasing=0 \
+ -Wstrict-prototypes \
+ -Wswitch-default \
+ -Wpointer-arith \
+ -Wundef
#
-# Root rule
+# gcc 4+ flags
#
-$(PROG) : $(INTERMEDIATES) $(OBJS)
- $(CC) $(OBJS) $(LDFLAGS) -o $(PROG)
+CWARNINGFLAGS += \
+ -Waddress \
+ -Waggregate-return \
+ -Wchar-subscripts \
+ -Wempty-body \
+ -Wlogical-op \
+ -Wmissing-declarations \
+ -Wmissing-field-initializers \
+ -Wmissing-parameter-type \
+ -Wnested-externs \
+ -Wold-style-declaration \
+ -Wold-style-definition \
+ -Wredundant-decls \
+ -Wtype-limits
+#
+# Bison/Flex configuration
+#
+YACC= bison
+YFLAGS+= -v -d -y
+
+LEX= flex
+LFLAGS+= -i -s
+
+#
+# Root rule
+#
+$(PROG) : $(INTERMEDIATES) $(MISC) $(OBJECTS)
+ $(CC) $(OBJECTS) $(LDFLAGS) -o $(PROG)
#
# Parser and Lexer - intermediate C files
@@ -224,16 +276,24 @@ $(PROG) : $(INTERMEDIATES) $(OBJS)
aslcompilerlex.c : $(ASL_COMPILER)/aslcompiler.l
${LEX} ${LFLAGS} -PAslCompiler -o$@ $?
-aslcompilerparse.c : $(ASL_COMPILER)/aslcompiler.y
+aslcompilerparse.c aslcompilerparse.h : $(ASL_COMPILER)/aslcompiler.y
${YACC} ${YFLAGS} -pAslCompiler -o$@ $?
- @mv -f aslcompilerparse.h aslcompiler.y.h
dtparserlex.c : $(ASL_COMPILER)/dtparser.l
${LEX} ${LFLAGS} -PDtParser -o$@ $?
-dtparserparse.c : $(ASL_COMPILER)/dtparser.y
+dtparserparse.c dtparserparse.h : $(ASL_COMPILER)/dtparser.y
${YACC} ${YFLAGS} -pDtParser -o$@ $?
- @mv -f dtparserparse.h dtparser.y.h
+
+# Rename headers produced by bison/yacc
+
+dtparser.y.h: dtparserparse.h
+ @echo Copy intermediate file:
+ @cp -f -v dtparserparse.h dtparser.y.h
+
+aslcompiler.y.h : aslcompilerparse.h
+ @echo Copy intermediate file:
+ @cp -f -v aslcompilerparse.h aslcompiler.y.h
#
@@ -255,418 +315,11 @@ dtparserparse.o : dtparserparse.c
$(CC) -c $(CFLAGS) -Wall -Werror -Wstrict-aliasing=0 -o$@ $?
-#
-# Compiler source
-#
-aslanalyze.o : $(ASL_COMPILER)/aslanalyze.c
- $(COMPILE)
-
-aslbtypes.o : $(ASL_COMPILER)/aslbtypes.c
- $(COMPILE)
-
-aslcodegen.o : $(ASL_COMPILER)/aslcodegen.c
- $(COMPILE)
-
-aslcompile.o : $(ASL_COMPILER)/aslcompile.c
- $(COMPILE)
-
-aslerror.o : $(ASL_COMPILER)/aslerror.c
- $(COMPILE)
-
-aslfiles.o : $(ASL_COMPILER)/aslfiles.c
- $(COMPILE)
-
-aslfold.o : $(ASL_COMPILER)/aslfold.c
- $(COMPILE)
-
-asllength.o : $(ASL_COMPILER)/asllength.c
- $(COMPILE)
-
-asllisting.o : $(ASL_COMPILER)/asllisting.c
- $(COMPILE)
-
-aslload.o : $(ASL_COMPILER)/aslload.c
- $(COMPILE)
-
-asllookup.o : $(ASL_COMPILER)/asllookup.c
- $(COMPILE)
-
-aslmain.o : $(ASL_COMPILER)/aslmain.c
- $(COMPILE)
-
-aslmap.o : $(ASL_COMPILER)/aslmap.c
- $(COMPILE)
-
-aslopcodes.o : $(ASL_COMPILER)/aslopcodes.c
- $(COMPILE)
-
-asloperands.o : $(ASL_COMPILER)/asloperands.c
- $(COMPILE)
-
-aslopt.o : $(ASL_COMPILER)/aslopt.c
- $(COMPILE)
-
-aslpredef.o : $(ASL_COMPILER)/aslpredef.c
- $(COMPILE)
-
-aslresource.o : $(ASL_COMPILER)/aslresource.c
- $(COMPILE)
-
-aslrestype1.o : $(ASL_COMPILER)/aslrestype1.c
- $(COMPILE)
-
-aslrestype1i.o : $(ASL_COMPILER)/aslrestype1i.c
- $(COMPILE)
-
-aslrestype2.o : $(ASL_COMPILER)/aslrestype2.c
- $(COMPILE)
-
-aslrestype2d.o : $(ASL_COMPILER)/aslrestype2d.c
- $(COMPILE)
-
-aslrestype2e.o : $(ASL_COMPILER)/aslrestype2e.c
- $(COMPILE)
-
-aslrestype2q.o : $(ASL_COMPILER)/aslrestype2q.c
- $(COMPILE)
-
-aslrestype2w.o : $(ASL_COMPILER)/aslrestype2w.c
- $(COMPILE)
-
-aslstartup.o : $(ASL_COMPILER)/aslstartup.c
- $(COMPILE)
-
-aslstubs.o : $(ASL_COMPILER)/aslstubs.c
- $(COMPILE)
-
-asltransform.o : $(ASL_COMPILER)/asltransform.c
- $(COMPILE)
-
-asltree.o : $(ASL_COMPILER)/asltree.c
- $(COMPILE)
-
-aslutils.o : $(ASL_COMPILER)/aslutils.c
- $(COMPILE)
-
-asluuid.o : $(ASL_COMPILER)/asluuid.c
- $(COMPILE)
-
-aslwalks.o : $(ASL_COMPILER)/aslwalks.c
- $(COMPILE)
-
-
-#
-# Data Table Compiler
-#
-dtcompile.o : $(ASL_COMPILER)/dtcompile.c
- $(COMPILE)
-
-dtexpress.o : $(ASL_COMPILER)/dtexpress.c
- $(COMPILE)
-
-dtfield.o : $(ASL_COMPILER)/dtfield.c
- $(COMPILE)
-
-dtio.o : $(ASL_COMPILER)/dtio.c
- $(COMPILE)
-
-dtsubtable.o : $(ASL_COMPILER)/dtsubtable.c
- $(COMPILE)
-
-dttable.o : $(ASL_COMPILER)/dttable.c
- $(COMPILE)
-
-dttemplate.o : $(ASL_COMPILER)/dttemplate.c
- $(COMPILE)
-
-dtutils.o : $(ASL_COMPILER)/dtutils.c
- $(COMPILE)
-
-
-#
-# ACPICA core source - common
-#
-adfile.o : $(ACPICA_COMMON)/adfile.c
- $(COMPILE)
-
-adisasm.o : $(ACPICA_COMMON)/adisasm.c
- $(COMPILE)
-
-adwalk.o : $(ACPICA_COMMON)/adwalk.c
- $(COMPILE)
-
-dmextern.o : $(ACPICA_COMMON)/dmextern.c
- $(COMPILE)
-
-dmrestag.o : $(ACPICA_COMMON)/dmrestag.c
- $(COMPILE)
-
-dmtable.o : $(ACPICA_COMMON)/dmtable.c
- $(COMPILE)
-
-dmtbdump.o : $(ACPICA_COMMON)/dmtbdump.c
+%.o : %.c $(HEADERS) $(ACPICA_HEADERS)
$(COMPILE)
-dmtbinfo.o : $(ACPICA_COMMON)/dmtbinfo.c
- $(COMPILE)
-
-getopt.o : $(ACPICA_COMMON)/getopt.c
- $(COMPILE)
-
-
-#
-# ACPICA core source
-#
-dbfileio.o : $(ACPICA_CORE)/debugger/dbfileio.c
- $(COMPILE)
-
-dmbuffer.o : $(ACPICA_CORE)/disassembler/dmbuffer.c
- $(COMPILE)
-
-dmnames.o : $(ACPICA_CORE)/disassembler/dmnames.c
- $(COMPILE)
-
-dmobject.o : $(ACPICA_CORE)/disassembler/dmobject.c
- $(COMPILE)
-
-dmopcode.o : $(ACPICA_CORE)/disassembler/dmopcode.c
- $(COMPILE)
-
-dmresrc.o : $(ACPICA_CORE)/disassembler/dmresrc.c
- $(COMPILE)
-
-dmresrcl.o : $(ACPICA_CORE)/disassembler/dmresrcl.c
- $(COMPILE)
-
-dmresrcs.o : $(ACPICA_CORE)/disassembler/dmresrcs.c
- $(COMPILE)
-
-dmutils.o : $(ACPICA_CORE)/disassembler/dmutils.c
- $(COMPILE)
-
-dmwalk.o : $(ACPICA_CORE)/disassembler/dmwalk.c
- $(COMPILE)
-
-dsargs.o : $(ACPICA_CORE)/dispatcher/dsargs.c
- $(COMPILE)
-
-dscontrol.o : $(ACPICA_CORE)/dispatcher/dscontrol.c
- $(COMPILE)
-
-dsfield.o : $(ACPICA_CORE)/dispatcher/dsfield.c
- $(COMPILE)
-
-dsobject.o : $(ACPICA_CORE)/dispatcher/dsobject.c
- $(COMPILE)
-
-dsopcode.o : $(ACPICA_CORE)/dispatcher/dsopcode.c
- $(COMPILE)
-
-dsutils.o : $(ACPICA_CORE)/dispatcher/dsutils.c
- $(COMPILE)
-
-dswexec.o : $(ACPICA_CORE)/dispatcher/dswexec.c
- $(COMPILE)
-
-dswload.o : $(ACPICA_CORE)/dispatcher/dswload.c
- $(COMPILE)
-
-dswload2.o : $(ACPICA_CORE)/dispatcher/dswload2.c
- $(COMPILE)
-
-dswscope.o : $(ACPICA_CORE)/dispatcher/dswscope.c
- $(COMPILE)
-
-dswstate.o : $(ACPICA_CORE)/dispatcher/dswstate.c
- $(COMPILE)
-
-exconvrt.o : $(ACPICA_CORE)/executer/exconvrt.c
- $(COMPILE)
-
-excreate.o : $(ACPICA_CORE)/executer/excreate.c
- $(COMPILE)
-
-exdump.o : $(ACPICA_CORE)/executer/exdump.c
- $(COMPILE)
-
-exmisc.o : $(ACPICA_CORE)/executer/exmisc.c
- $(COMPILE)
-
-exmutex.o : $(ACPICA_CORE)/executer/exmutex.c
- $(COMPILE)
-
-exnames.o : $(ACPICA_CORE)/executer/exnames.c
- $(COMPILE)
-
-exoparg1.o : $(ACPICA_CORE)/executer/exoparg1.c
- $(COMPILE)
-
-exoparg2.o : $(ACPICA_CORE)/executer/exoparg2.c
- $(COMPILE)
-
-exoparg3.o : $(ACPICA_CORE)/executer/exoparg3.c
- $(COMPILE)
-
-exoparg6.o : $(ACPICA_CORE)/executer/exoparg6.c
- $(COMPILE)
-
-exprep.o : $(ACPICA_CORE)/executer/exprep.c
- $(COMPILE)
-
-exregion.o : $(ACPICA_CORE)/executer/exregion.c
- $(COMPILE)
-
-exresnte.o : $(ACPICA_CORE)/executer/exresnte.c
- $(COMPILE)
-
-exresolv.o : $(ACPICA_CORE)/executer/exresolv.c
- $(COMPILE)
-
-exresop.o : $(ACPICA_CORE)/executer/exresop.c
- $(COMPILE)
-
-exstore.o : $(ACPICA_CORE)/executer/exstore.c
- $(COMPILE)
-
-exstoren.o : $(ACPICA_CORE)/executer/exstoren.c
- $(COMPILE)
-
-exstorob.o : $(ACPICA_CORE)/executer/exstorob.c
- $(COMPILE)
-
-exsystem.o : $(ACPICA_CORE)/executer/exsystem.c
- $(COMPILE)
-
-exutils.o : $(ACPICA_CORE)/executer/exutils.c
- $(COMPILE)
-
-nsaccess.o : $(ACPICA_CORE)/namespace/nsaccess.c
- $(COMPILE)
-
-nsalloc.o : $(ACPICA_CORE)/namespace/nsalloc.c
- $(COMPILE)
-
-nsdump.o : $(ACPICA_CORE)/namespace/nsdump.c
- $(COMPILE)
-
-nsnames.o : $(ACPICA_CORE)/namespace/nsnames.c
- $(COMPILE)
-
-nsobject.o : $(ACPICA_CORE)/namespace/nsobject.c
- $(COMPILE)
-
-nsparse.o : $(ACPICA_CORE)/namespace/nsparse.c
- $(COMPILE)
-
-nssearch.o : $(ACPICA_CORE)/namespace/nssearch.c
- $(COMPILE)
-
-nsutils.o : $(ACPICA_CORE)/namespace/nsutils.c
- $(COMPILE)
-
-nswalk.o : $(ACPICA_CORE)/namespace/nswalk.c
- $(COMPILE)
-
-nsxfobj.o : $(ACPICA_CORE)/namespace/nsxfobj.c
- $(COMPILE)
-
-psargs.o : $(ACPICA_CORE)/parser/psargs.c
- $(COMPILE)
-
-psloop.o : $(ACPICA_CORE)/parser/psloop.c
- $(COMPILE)
-
-psopcode.o : $(ACPICA_CORE)/parser/psopcode.c
- $(COMPILE)
-
-psparse.o : $(ACPICA_CORE)/parser/psparse.c
- $(COMPILE)
-
-psscope.o : $(ACPICA_CORE)/parser/psscope.c
- $(COMPILE)
-
-pstree.o : $(ACPICA_CORE)/parser/pstree.c
- $(COMPILE)
-
-psutils.o : $(ACPICA_CORE)/parser/psutils.c
- $(COMPILE)
-
-pswalk.o : $(ACPICA_CORE)/parser/pswalk.c
- $(COMPILE)
-
-tbfadt.o : $(ACPICA_CORE)/tables/tbfadt.c
- $(COMPILE)
-
-tbinstal.o : $(ACPICA_CORE)/tables/tbinstal.c
- $(COMPILE)
-
-tbutils.o : $(ACPICA_CORE)/tables/tbutils.c
- $(COMPILE)
-
-tbxface.o : $(ACPICA_CORE)/tables/tbxface.c
- $(COMPILE)
-
-utalloc.o : $(ACPICA_CORE)/utilities/utalloc.c
- $(COMPILE)
-
-utcache.o : $(ACPICA_CORE)/utilities/utcache.c
- $(COMPILE)
-
-utcopy.o : $(ACPICA_CORE)/utilities/utcopy.c
- $(COMPILE)
-
-utdebug.o : $(ACPICA_CORE)/utilities/utdebug.c
- $(COMPILE)
-
-utdecode.o : $(ACPICA_CORE)/utilities/utdecode.c
- $(COMPILE)
-
-utdelete.o : $(ACPICA_CORE)/utilities/utdelete.c
- $(COMPILE)
-
-utglobal.o : $(ACPICA_CORE)/utilities/utglobal.c
- $(COMPILE)
-
-utinit.o : $(ACPICA_CORE)/utilities/utinit.c
- $(COMPILE)
-
-utlock.o : $(ACPICA_CORE)/utilities/utlock.c
- $(COMPILE)
-
-utmath.o : $(ACPICA_CORE)/utilities/utmath.c
- $(COMPILE)
-
-utmisc.o : $(ACPICA_CORE)/utilities/utmisc.c
- $(COMPILE)
-
-utmutex.o : $(ACPICA_CORE)/utilities/utmutex.c
- $(COMPILE)
-
-utobject.o : $(ACPICA_CORE)/utilities/utobject.c
- $(COMPILE)
-
-utresrc.o : $(ACPICA_CORE)/utilities/utresrc.c
- $(COMPILE)
-
-utstate.o : $(ACPICA_CORE)/utilities/utstate.c
- $(COMPILE)
-
-utxferror.o : $(ACPICA_CORE)/utilities/utxferror.c
- $(COMPILE)
-
-utxface.o : $(ACPICA_CORE)/utilities/utxface.c
- $(COMPILE)
-
-
-#
-# Unix OS services layer (OSL)
-#
-osunixxf.o : $(ACPICA_OSL)/osunixxf.c
- $(COMPILE)
-
-
clean :
- rm -f $(PROG) $(PROG).exe $(OBJS) $(INTERMEDIATES) $(MISC)
+ rm -f $(PROG) $(PROG).exe $(OBJECTS) $(INTERMEDIATES) $(MISC)
install :
$(INSTALLPROG)
Modified: vendor-sys/acpica/dist/compiler/aslcompile.c
==============================================================================
--- vendor-sys/acpica/dist/compiler/aslcompile.c Mon Sep 26 15:26:59 2011 (r225767)
+++ vendor-sys/acpica/dist/compiler/aslcompile.c Mon Sep 26 21:40:21 2011 (r225768)
@@ -472,6 +472,8 @@ CmDoCompile (
if (!RootNode)
{
+ AslError (ASL_ERROR, ASL_MSG_COMPILER_INTERNAL,
+ NULL, "- Could not resolve parse tree root node");
CmCleanupAndExit ();
return -1;
}
Modified: vendor-sys/acpica/dist/compiler/aslcompiler.h
==============================================================================
--- vendor-sys/acpica/dist/compiler/aslcompiler.h Mon Sep 26 15:26:59 2011 (r225767)
+++ vendor-sys/acpica/dist/compiler/aslcompiler.h Mon Sep 26 21:40:21 2011 (r225768)
@@ -829,17 +829,12 @@ RsAllocateResourceNode (
UINT32 Size);
void
-RsCreateBitField (
+RsCreateResourceField (
ACPI_PARSE_OBJECT *Op,
char *Name,
UINT32 ByteOffset,
- UINT32 BitOffset);
-
-void
-RsCreateByteField (
- ACPI_PARSE_OBJECT *Op,
- char *Name,
- UINT32 ByteOffset);
+ UINT32 BitOffset,
+ UINT32 BitLength);
void
RsSetFlagBits (
Modified: vendor-sys/acpica/dist/compiler/asldefine.h
==============================================================================
--- vendor-sys/acpica/dist/compiler/asldefine.h Mon Sep 26 15:26:59 2011 (r225767)
+++ vendor-sys/acpica/dist/compiler/asldefine.h Mon Sep 26 21:40:21 2011 (r225768)
@@ -153,5 +153,25 @@
#define POSITIVE 0
+/* Helper macros for resource tag creation */
+
+#define RsCreateMultiBitField \
+ RsCreateResourceField
+
+#define RsCreateBitField(Op, Name, ByteOffset, BitOffset) \
+ RsCreateResourceField (Op, Name, ByteOffset, BitOffset, 1)
+
+#define RsCreateByteField(Op, Name, ByteOffset) \
+ RsCreateResourceField (Op, Name, ByteOffset, 0, 8);
+
+#define RsCreateWordField(Op, Name, ByteOffset) \
+ RsCreateResourceField (Op, Name, ByteOffset, 0, 16);
+
+#define RsCreateDwordField(Op, Name, ByteOffset) \
+ RsCreateResourceField (Op, Name, ByteOffset, 0, 32);
+
+#define RsCreateQwordField(Op, Name, ByteOffset) \
+ RsCreateResourceField (Op, Name, ByteOffset, 0, 64);
+
#endif /* ASLDEFINE.H */
Modified: vendor-sys/acpica/dist/compiler/aslfiles.c
==============================================================================
--- vendor-sys/acpica/dist/compiler/aslfiles.c Mon Sep 26 15:26:59 2011 (r225767)
+++ vendor-sys/acpica/dist/compiler/aslfiles.c Mon Sep 26 21:40:21 2011 (r225768)
@@ -174,14 +174,18 @@ FlGetFileSize (
{
FILE *fp;
UINT32 FileSize;
+ long Offset;
fp = Gbl_Files[FileId].Handle;
+ Offset = ftell (fp);
fseek (fp, 0, SEEK_END);
FileSize = (UINT32) ftell (fp);
- fseek (fp, 0, SEEK_SET);
+ /* Restore file pointer */
+
+ fseek (fp, Offset, SEEK_SET);
return (FileSize);
}
Modified: vendor-sys/acpica/dist/compiler/aslglobal.h
==============================================================================
--- vendor-sys/acpica/dist/compiler/aslglobal.h Mon Sep 26 15:26:59 2011 (r225767)
+++ vendor-sys/acpica/dist/compiler/aslglobal.h Mon Sep 26 21:40:21 2011 (r225768)
@@ -128,6 +128,7 @@ ASL_EXTERN UINT8 ASL_
ASL_EXTERN BOOLEAN ASL_INIT_GLOBAL (Gbl_UseOriginalCompilerId, FALSE);
ASL_EXTERN BOOLEAN ASL_INIT_GLOBAL (Gbl_VerboseTemplates, FALSE);
ASL_EXTERN BOOLEAN ASL_INIT_GLOBAL (Gbl_DoTemplates, FALSE);
+ASL_EXTERN BOOLEAN ASL_INIT_GLOBAL (Gbl_CompileGeneric, FALSE);
#define HEX_OUTPUT_NONE 0
Modified: vendor-sys/acpica/dist/compiler/asllisting.c
==============================================================================
--- vendor-sys/acpica/dist/compiler/asllisting.c Mon Sep 26 15:26:59 2011 (r225767)
+++ vendor-sys/acpica/dist/compiler/asllisting.c Mon Sep 26 21:40:21 2011 (r225768)
@@ -850,9 +850,9 @@ LsFinishSourceListing (
FlPrintFile (FileId, "\n\nSummary of errors and warnings\n\n");
AePrintErrorLog (FileId);
- FlPrintFile (FileId, "\n\n");
+ FlPrintFile (FileId, "\n");
UtDisplaySummary (FileId);
- FlPrintFile (FileId, "\n\n");
+ FlPrintFile (FileId, "\n");
}
}
@@ -1309,6 +1309,7 @@ LsDoHexOutputC (
/* Get AML size, seek back to start */
AmlFileSize = FlGetFileSize (ASL_FILE_AML_OUTPUT);
+ FlSeekFile (ASL_FILE_AML_OUTPUT, 0);
FlPrintFile (ASL_FILE_HEX_OUTPUT, " * C source code output\n");
FlPrintFile (ASL_FILE_HEX_OUTPUT, " * AML code block contains 0x%X bytes\n *\n */\n",
@@ -1365,7 +1366,6 @@ LsDoHexOutputC (
}
FlPrintFile (ASL_FILE_HEX_OUTPUT, "};\n");
- FlCloseFile (ASL_FILE_HEX_OUTPUT);
}
@@ -1397,6 +1397,7 @@ LsDoHexOutputAsl (
/* Get AML size, seek back to start */
AmlFileSize = FlGetFileSize (ASL_FILE_AML_OUTPUT);
+ FlSeekFile (ASL_FILE_AML_OUTPUT, 0);
FlPrintFile (ASL_FILE_HEX_OUTPUT, " * ASL source code output\n");
FlPrintFile (ASL_FILE_HEX_OUTPUT, " * AML code block contains 0x%X bytes\n *\n */\n",
@@ -1453,7 +1454,6 @@ LsDoHexOutputAsl (
}
FlPrintFile (ASL_FILE_HEX_OUTPUT, " })\n");
- FlCloseFile (ASL_FILE_HEX_OUTPUT);
}
@@ -1485,6 +1485,7 @@ LsDoHexOutputAsm (
/* Get AML size, seek back to start */
AmlFileSize = FlGetFileSize (ASL_FILE_AML_OUTPUT);
+ FlSeekFile (ASL_FILE_AML_OUTPUT, 0);
FlPrintFile (ASL_FILE_HEX_OUTPUT, "; Assembly code source output\n");
FlPrintFile (ASL_FILE_HEX_OUTPUT, "; AML code block contains 0x%X bytes\n;\n",
@@ -1536,7 +1537,6 @@ LsDoHexOutputAsm (
}
FlPrintFile (ASL_FILE_HEX_OUTPUT, "\n");
- FlCloseFile (ASL_FILE_HEX_OUTPUT);
}
Modified: vendor-sys/acpica/dist/compiler/aslload.c
==============================================================================
--- vendor-sys/acpica/dist/compiler/aslload.c Mon Sep 26 15:26:59 2011 (r225767)
+++ vendor-sys/acpica/dist/compiler/aslload.c Mon Sep 26 21:40:21 2011 (r225768)
@@ -290,7 +290,6 @@ LdLoadResourceElements (
InitializerOp = ASL_GET_CHILD_NODE (Op);
while (InitializerOp)
{
-
if (InitializerOp->Asl.ExternalName)
{
Status = AcpiNsLookup (WalkState->ScopeInfo,
@@ -305,20 +304,15 @@ LdLoadResourceElements (
}
/*
- * Store the field offset in the namespace node so it
- * can be used when the field is referenced
+ * Store the field offset and length in the namespace node
+ * so it can be used when the field is referenced
*/
- Node->Value = (UINT32) InitializerOp->Asl.Value.Integer;
+ Node->Value = InitializerOp->Asl.Value.Tag.BitOffset;
+ Node->Length = InitializerOp->Asl.Value.Tag.BitLength;
InitializerOp->Asl.Node = Node;
Node->Op = InitializerOp;
-
- /* Pass thru the field type (Bitfield or Bytefield) */
-
- if (InitializerOp->Asl.CompileFlags & NODE_IS_BIT_OFFSET)
- {
- Node->Flags |= ANOBJ_IS_BIT_OFFSET;
- }
}
+
InitializerOp = ASL_GET_PEER_NODE (InitializerOp);
}
Modified: vendor-sys/acpica/dist/compiler/asllookup.c
==============================================================================
--- vendor-sys/acpica/dist/compiler/asllookup.c Mon Sep 26 15:26:59 2011 (r225767)
+++ vendor-sys/acpica/dist/compiler/asllookup.c Mon Sep 26 21:40:21 2011 (r225768)
@@ -822,7 +822,10 @@ LkNamespaceLocateBegin (
ACPI_PARSE_OBJECT *OwningOp;
ACPI_PARSE_OBJECT *SpaceIdOp;
UINT32 MinimumLength;
- UINT32 Temp;
+ UINT32 Offset;
+ UINT32 FieldBitLength;
+ UINT32 TagBitLength;
+ UINT8 Message = 0;
const ACPI_OPCODE_INFO *OpInfo;
UINT32 Flags;
@@ -1026,74 +1029,106 @@ LkNamespaceLocateBegin (
/* 2) Check for a reference to a resource descriptor */
if ((Node->Type == ACPI_TYPE_LOCAL_RESOURCE_FIELD) ||
- (Node->Type == ACPI_TYPE_LOCAL_RESOURCE))
+ (Node->Type == ACPI_TYPE_LOCAL_RESOURCE))
{
/*
- * This was a reference to a field within a resource descriptor. Extract
- * the associated field offset (either a bit or byte offset depending on
- * the field type) and change the named reference into an integer for
- * AML code generation
+ * This was a reference to a field within a resource descriptor.
+ * Extract the associated field offset (either a bit or byte
+ * offset depending on the field type) and change the named
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-vendor
mailing list