3 files changed, 54 insertions, 45 deletions

diff --git a/usr.sbin/acpi/acpidb/Makefile b/usr.sbin/acpi/acpidb/Makefile
index 8d13e77..3f6cbb4 100644
--- a/usr.sbin/acpi/acpidb/Makefile
+++ b/usr.sbin/acpi/acpidb/Makefile
@@ -4,7 +4,7 @@ PROG=	acpidb
 SRCS=	acpidb.c
 
 # common
-SRCS+=	acgetline.c ahids.c ahuuids.c cmfsize.c
+SRCS+=	acfileio.c acgetline.c ahids.c ahuuids.c cmfsize.c
 
 # components/debugger
 SRCS+=	dbcmds.c dbconvert.c dbdisply.c dbexec.c dbfileio.c	\
@@ -27,11 +27,12 @@ SRCS+=	evevent.c evglock.c evgpe.c evgpeblk.c evgpeinit.c	\
 	evsci.c evxface.c evxfevnt.c evxfregn.c
 
 # components/executer
-SRCS+=	exconfig.c exconvrt.c excreate.c exdebug.c exdump.c	\
-	exfield.c exfldio.c exmisc.c exmutex.c exnames.c	\
-	exoparg1.c exoparg2.c exoparg3.c exoparg6.c exprep.c	\
-	exregion.c exresnte.c exresolv.c exresop.c exstore.c	\
-	exstoren.c exstorob.c exsystem.c exutils.c
+SRCS+=	exconcat.c exconfig.c exconvrt.c excreate.c exdebug.c	\
+	exdump.c exfield.c exfldio.c exmisc.c exmutex.c		\
+	exnames.c exoparg1.c exoparg2.c exoparg3.c exoparg6.c	\
+	exprep.c exregion.c exresnte.c exresolv.c exresop.c	\
+	exstore.c exstoren.c exstorob.c exsystem.c extrace.c	\
+	exutils.c
 
 # components/hardware
 SRCS+=	hwacpi.c hwesleep.c hwgpe.c hwpci.c hwregs.c hwsleep.c	\
@@ -59,13 +60,13 @@ SRCS+=	tbdata.c tbfadt.c tbfind.c tbinstal.c tbprint.c		\
 	tbutils.c tbxface.c tbxfload.c
 
 # components/utilities
-SRCS+=	utaddress.c utalloc.c utbuffer.c utcache.c utcopy.c	\
-	utdebug.c utdecode.c utdelete.c uterror.c uteval.c	\
-	utexcep.c utfileio.c utglobal.c uthex.c utids.c		\
-	utinit.c utlock.c utmath.c utmisc.c utmutex.c		\
-	utnonansi.c utobject.c utosi.c utownerid.c utpredef.c	\
-	utprint.c utresrc.c utstate.c utstring.c uttrack.c	\
-	utuuid.c utxface.c utxferror.c utxfinit.c
+SRCS+=	utaddress.c utalloc.c utascii.c utbuffer.c utcache.c	\
+	utcopy.c utdebug.c utdecode.c utdelete.c uterror.c	\
+	uteval.c utexcep.c utglobal.c uthex.c utids.c utinit.c	\
+	utlock.c utmath.c utmisc.c utmutex.c utnonansi.c	\
+	utobject.c utosi.c utownerid.c utpredef.c utprint.c	\
+	utresrc.c utstate.c utstring.c uttrack.c utuuid.c	\
+	utxface.c utxferror.c utxfinit.c
 
 # os_specific/service_layers
 SRCS+=	oslibcfs.c osunixxf.c
diff --git a/usr.sbin/acpi/acpidb/acpidb.c b/usr.sbin/acpi/acpidb/acpidb.c
index 6b71961..cc14177 100644
--- a/usr.sbin/acpi/acpidb/acpidb.c
+++ b/usr.sbin/acpi/acpidb/acpidb.c
@@ -44,6 +44,7 @@
 
 #include <contrib/dev/acpica/include/acpi.h>
 #include <contrib/dev/acpica/include/accommon.h>
+#include <contrib/dev/acpica/include/acapps.h>
 #include <contrib/dev/acpica/include/acdebug.h>
 #include <contrib/dev/acpica/include/amlresrc.h>
 
@@ -381,6 +382,7 @@ static int
 load_dsdt(const char *dsdtfile)
 {
 	char			filetmp[PATH_MAX];
+	ACPI_NEW_TABLE_DESC	*list;
 	u_int8_t		*code;
 	struct stat		sb;
 	int			fd, fd2;
@@ -478,7 +480,8 @@ load_dsdt(const char *dsdtfile)
 		return (-1);
 	}
 
-	AcpiDbGetTableFromFile(filetmp, NULL, TRUE);
+	list = NULL;
+	AcGetAllTablesFromFile(filetmp, TRUE, &list);
 
 	AcpiInitializeDebugger();
 	AcpiGbl_DebuggerConfiguration = 0;
diff --git a/usr.sbin/acpi/iasl/Makefile b/usr.sbin/acpi/iasl/Makefile
index b4385c7..7ba08ff 100644
--- a/usr.sbin/acpi/iasl/Makefile
+++ b/usr.sbin/acpi/iasl/Makefile
@@ -3,29 +3,31 @@
 PROG=	iasl
 
 # common
-SRCS=	adfile.c adisasm.c adwalk.c ahids.c ahpredef.c		\
-	ahtable.c ahuuids.c cmfsize.c dmextern.c dmrestag.c	\
-	dmtable.c dmtbdump.c dmtbinfo.c getopt.c
+SRCS=	acfileio.c adfile.c adisasm.c adwalk.c ahids.c		\
+	ahpredef.c ahtable.c ahuuids.c cmfsize.c dmextern.c	\
+	dmrestag.c dmtable.c dmtables.c dmtbdump.c dmtbinfo.c	\
+	getopt.c
 
 # compiler
 SRCS+=	aslanalyze.c aslascii.c aslbtypes.c aslcodegen.c	\
 	aslcompile.c aslcompiler.y.h aslcompilerlex.c		\
-	aslcompilerparse.c aslerror.c aslfileio.c aslfiles.c	\
-	aslfold.c aslhex.c asllength.c asllisting.c		\
-	asllistsup.c aslload.c asllookup.c aslmain.c aslmap.c	\
-	aslmapenter.c aslmapoutput.c aslmaputils.c		\
-	aslmessages.c aslmethod.c aslnamesp.c asloffset.c	\
-	aslopcodes.c asloperands.c aslopt.c asloptions.c	\
-	aslpredef.c aslprepkg.c aslprintf.c aslprune.c		\
-	aslresource.c aslrestype1.c aslrestype1i.c		\
-	aslrestype2.c aslrestype2d.c aslrestype2e.c		\
-	aslrestype2q.c aslrestype2s.c aslrestype2w.c		\
-	aslstartup.c aslstubs.c asltransform.c asltree.c	\
-	aslutils.c asluuid.c aslwalks.c aslxref.c dtcompile.c	\
-	dtexpress.c dtfield.c dtio.c dtparser.y.h dtparserlex.c	\
-	dtparserparse.c dtsubtable.c dttable.c dttemplate.c	\
-	dtutils.c prexpress.c prmacros.c prparser.y.h		\
-	prparserlex.c prparserparse.c prscan.c prutils.c
+	aslcompilerparse.c asldebug.c aslerror.c aslexternal.c	\
+	aslfileio.c aslfiles.c aslfold.c aslhex.c asllength.c	\
+	asllisting.c asllistsup.c aslload.c asllookup.c		\
+	aslmain.c aslmap.c aslmapenter.c aslmapoutput.c		\
+	aslmaputils.c aslmessages.c aslmethod.c aslnamesp.c	\
+	asloffset.c aslopcodes.c asloperands.c aslopt.c		\
+	asloptions.c aslpld.c aslpredef.c aslprepkg.c		\
+	aslprintf.c aslprune.c aslresource.c aslrestype1.c	\
+	aslrestype1i.c aslrestype2.c aslrestype2d.c		\
+	aslrestype2e.c aslrestype2q.c aslrestype2s.c		\
+	aslrestype2w.c aslstartup.c aslstubs.c asltransform.c	\
+	asltree.c aslutils.c asluuid.c aslwalks.c aslxref.c	\
+	aslxrefout.c dtcompile.c dtexpress.c dtfield.c dtio.c	\
+	dtparser.y.h dtparserlex.c dtparserparse.c dtsubtable.c	\
+	dttable.c dttable1.c dttable2.c dttemplate.c dtutils.c	\
+	prexpress.c prmacros.c prparser.y.h prparserlex.c	\
+	prparserparse.c prscan.c prutils.c
 
 # components/debugger
 SRCS+=	dbfileio.c
@@ -41,10 +43,10 @@ SRCS+=	dsargs.c dscontrol.c dsfield.c dsobject.c dsopcode.c	\
 	dswstate.c
 
 # components/executer
-SRCS+=	exconvrt.c excreate.c exdump.c exmisc.c exmutex.c	\
-	exnames.c exoparg1.c exoparg2.c exoparg3.c exoparg6.c	\
-	exprep.c exresnte.c exresolv.c exresop.c exstore.c	\
-	exstoren.c exstorob.c exsystem.c exutils.c
+SRCS+=	exconcat.c exconvrt.c excreate.c exdump.c exmisc.c	\
+	exmutex.c exnames.c exoparg1.c exoparg2.c exoparg3.c	\
+	exoparg6.c exprep.c exresnte.c exresolv.c exresop.c	\
+	exstore.c exstoren.c exstorob.c exsystem.c exutils.c
 
 # components/parser
 SRCS+=	psargs.c psloop.c psobject.c psopcode.c psopinfo.c	\
@@ -56,15 +58,15 @@ SRCS+=	nsaccess.c nsalloc.c nsdump.c nsnames.c nsobject.c	\
 
 # components/tables
 SRCS+=	tbdata.c tbfadt.c tbinstal.c tbprint.c tbutils.c	\
-	tbxface.c
+	tbxface.c tbxfload.c
 
 # components/utilities
-SRCS+=	utaddress.c utalloc.c utbuffer.c utcache.c utcopy.c	\
-	utdebug.c utdecode.c utdelete.c uterror.c utexcep.c	\
-	utfileio.c utglobal.c uthex.c utinit.c utlock.c		\
-	utmath.c utmisc.c utmutex.c utnonansi.c utobject.c	\
-	utownerid.c utpredef.c utprint.c utresrc.c utstate.c	\
-	utstring.c utuuid.c utxface.c utxferror.c
+SRCS+=	utaddress.c utalloc.c utascii.c utbuffer.c utcache.c	\
+	utcopy.c utdebug.c utdecode.c utdelete.c uterror.c	\
+	utexcep.c utglobal.c uthex.c utinit.c utlock.c utmath.c	\
+	utmisc.c utmutex.c utnonansi.c utobject.c utownerid.c	\
+	utpredef.c utprint.c utresrc.c utstate.c utstring.c	\
+	utuuid.c utxface.c utxferror.c
 
 # os_specific/service_layers
 SRCS+=	oslibcfs.c osunixxf.c
@@ -83,11 +85,14 @@ CLEANFILES= aslcompiler.y aslcompiler.y.h aslcompilerlex.c	\
 	prparser.y.h prparserlex.c prparserparse.c		\
 	prparserparse.h
 
+PARSER=	aslcstyle.y aslparser.y aslresources.y aslrules.y	\
+	aslsupport.y asltokens.y asltypes.y
+
 aslcompilerlex.c: aslcompiler.l aslsupport.l
 	${LEX} ${LFLAGS} -PAslCompiler -o${.TARGET} \
 	    ${ACPICA_DIR}/compiler/aslcompiler.l
 
-aslcompiler.y: aslparser.y aslrules.y aslsupport.y asltokens.y asltypes.y
+aslcompiler.y: ${PARSER}
 	m4 -P -I${ACPICA_DIR}/compiler \
 	    ${ACPICA_DIR}/compiler/aslparser.y > ${.TARGET}