Merge from head

5 files changed, 51 insertions, 46 deletions

diff --git a/usr.sbin/acpi/acpidb/Makefile b/usr.sbin/acpi/acpidb/Makefile
index 5ee3d47..c08c70b 100644
--- a/usr.sbin/acpi/acpidb/Makefile
+++ b/usr.sbin/acpi/acpidb/Makefile
@@ -35,10 +35,11 @@ SRCS+=	hwacpi.c hwesleep.c hwgpe.c hwpci.c hwregs.c hwsleep.c	\
 	hwvalid.c hwxface.c hwxfsleep.c
 
 # components/namespace
-SRCS+=	nsaccess.c nsalloc.c nsconvert.c nsdump.c nseval.c	\
-	nsinit.c nsload.c nsnames.c nsobject.c nsparse.c	\
-	nspredef.c nsprepkg.c nsrepair.c nsrepair2.c nssearch.c	\
-	nsutils.c nswalk.c nsxfeval.c nsxfname.c nsxfobj.c
+SRCS+=	nsaccess.c nsalloc.c nsarguments.c nsconvert.c nsdump.c	\
+	nseval.c nsinit.c nsload.c nsnames.c nsobject.c		\
+	nsparse.c nspredef.c nsprepkg.c nsrepair.c nsrepair2.c	\
+	nssearch.c nsutils.c nswalk.c nsxfeval.c nsxfname.c	\
+	nsxfobj.c
 
 # components/parser
 SRCS+=	psargs.c psloop.c psobject.c psopcode.c psopinfo.c	\
@@ -54,19 +55,19 @@ SRCS+=	rsaddr.c rscalc.c rscreate.c rsdump.c rsdumpinfo.c	\
 	rsserial.c rsutils.c rsxface.c
 
 # components/tables
-SRCS+=	tbfadt.c tbfind.c tbinstal.c tbutils.c tbxface.c	\
-	tbxfload.c
+SRCS+=	tbfadt.c tbfind.c tbinstal.c tbprint.c tbutils.c	\
+	tbxface.c tbxfload.c
 
 # components/utilities
-SRCS+=	utaddress.c utalloc.c utcache.c utcopy.c utdebug.c	\
-	utdecode.c utdelete.c uteval.c utexcep.c utglobal.c	\
-	utids.c	utinit.c utlock.c utmath.c utmisc.c utmutex.c	\
-	utobject.c utosi.c utownerid.c utpredef.c utresrc.c	\
-	utstate.c utstring.c uttrack.c utxface.c utxferror.c	\
-	utxfinit.c
+SRCS+=	utaddress.c utalloc.c utbuffer.c utcache.c utcopy.c	\
+	utdebug.c utdecode.c utdelete.c uterror.c uteval.c	\
+	utexcep.c utglobal.c utids.c utinit.c utlock.c utmath.c	\
+	utmisc.c utmutex.c utobject.c utosi.c utownerid.c	\
+	utpredef.c utresrc.c utstate.c utstring.c uttrack.c	\
+	utxface.c utxferror.c utxfinit.c
 
 MAN=	acpidb.8
-WARNS?=	2
+WARNS?=	3
 
 CFLAGS+= -DACPI_EXEC_APP -fno-strict-aliasing
 DPADD=	${LIBPTHREAD}
diff --git a/usr.sbin/acpi/acpidb/acpidb.c b/usr.sbin/acpi/acpidb/acpidb.c
index 4095252..3cd8d3f 100644
--- a/usr.sbin/acpi/acpidb/acpidb.c
+++ b/usr.sbin/acpi/acpidb/acpidb.c
@@ -50,7 +50,7 @@
  * Dummy DSDT Table Header
  */
 
-ACPI_TABLE_HEADER	dummy_dsdt_table = {
+static ACPI_TABLE_HEADER dummy_dsdt_table = {
 	"DSDT", 123, 1, 123, "OEMID", "OEMTBLID", 1, "CRID", 1
 };
 
@@ -58,7 +58,7 @@ ACPI_TABLE_HEADER	dummy_dsdt_table = {
  * Region space I/O routines on virtual machine
  */
 
-int	aml_debug_prompt = 1;
+static int	aml_debug_prompt = 1;
 
 struct ACPIRegionContent {
 	TAILQ_ENTRY(ACPIRegionContent) links;
@@ -68,10 +68,13 @@ struct ACPIRegionContent {
 };
 
 TAILQ_HEAD(ACPIRegionContentList, ACPIRegionContent);
-struct	ACPIRegionContentList RegionContentList;
+static struct	ACPIRegionContentList RegionContentList;
 
 static int		 aml_simulation_initialized = 0;
 
+ACPI_PHYSICAL_ADDRESS	 AeLocalGetRootPointer(void);
+void			 AeTableOverride(ACPI_TABLE_HEADER *, ACPI_TABLE_HEADER **);
+
 static void		 aml_simulation_init(void);
 static int		 aml_simulate_regcontent_add(int regtype,
 			     ACPI_PHYSICAL_ADDRESS addr,
@@ -87,11 +90,11 @@ static void		 aml_simulation_regload(const char *dumpfile);
 static void		 aml_simulation_regdump(const char *dumpfile);
 
 /* Stubs to simplify linkage to the ACPI CA core subsystem. */
-ACPI_STATUS
+ACPI_PHYSICAL_ADDRESS
 AeLocalGetRootPointer(void)
 {
 
-	return (AE_ERROR);
+	return (0);
 }
 
 void
@@ -173,8 +176,8 @@ aml_simulate_prompt(char *msg, UINT64 def_val)
 	if (msg != NULL) {
 		printf("%s", msg);
 	}
-	printf("(default: 0x%jx ", val);
-	printf(" / %ju) >>", val);
+	printf("(default: 0x%jx ", (uintmax_t)val);
+	printf(" / %ju) >>", (uintmax_t)val);
 	fflush(stdout);
 
 	bzero(buf, sizeof buf);
diff --git a/usr.sbin/acpi/acpidump/acpi.c b/usr.sbin/acpi/acpidump/acpi.c
index c7f5bd8..d3f9685 100644
--- a/usr.sbin/acpi/acpidump/acpi.c
+++ b/usr.sbin/acpi/acpidump/acpi.c
@@ -537,7 +537,7 @@ acpi_handle_mcfg(ACPI_TABLE_HEADER *sdp)
 	alloc = (ACPI_MCFG_ALLOCATION *)(mcfg + 1);
 	for (i = 0; i < entries; i++, alloc++) {
 		printf("\n");
-		printf("\tBase Address=0x%016jx\n", alloc->Address);
+		printf("\tBase Address=0x%016jx\n", (uintmax_t)alloc->Address);
 		printf("\tSegment Group=0x%04x\n", alloc->PciSegment);
 		printf("\tStart Bus=%d\n", alloc->StartBusNumber);
 		printf("\tEnd Bus=%d\n", alloc->EndBusNumber);
@@ -554,16 +554,16 @@ acpi_handle_slit(ACPI_TABLE_HEADER *sdp)
 	printf(BEGIN_COMMENT);
 	acpi_print_sdt(sdp);
 	slit = (ACPI_TABLE_SLIT *)sdp;
-	printf("\tLocality Count=%jd\n", slit->LocalityCount);
+	printf("\tLocality Count=%ju\n", (uintmax_t)slit->LocalityCount);
 	printf("\n\t      ");
 	for (i = 0; i < slit->LocalityCount; i++)
-		printf(" %3jd", i);
+		printf(" %3ju", (uintmax_t)i);
 	printf("\n\t     +");
 	for (i = 0; i < slit->LocalityCount; i++)
 		printf("----");
 	printf("\n");
 	for (i = 0; i < slit->LocalityCount; i++) {
-		printf("\t %3jd |", i);
+		printf("\t %3ju |", (uintmax_t)i);
 		for (j = 0; j < slit->LocalityCount; j++)
 			printf(" %3d",
 			    slit->Entry[i * slit->LocalityCount + j]);
@@ -830,7 +830,7 @@ acpi_handle_dmar_drhd(ACPI_DMAR_HARDWARE_UNIT *drhd)
 #undef PRINTFLAG
 
 	printf("\tSegment=%d\n", drhd->Segment);
-	printf("\tAddress=0x%0jx\n", drhd->Address);
+	printf("\tAddress=0x%0jx\n", (uintmax_t)drhd->Address);
 
 	remaining = drhd->Header.Length - sizeof(ACPI_DMAR_HARDWARE_UNIT);
 	if (remaining > 0)
@@ -855,8 +855,8 @@ acpi_handle_dmar_rmrr(ACPI_DMAR_RESERVED_MEMORY *rmrr)
 	printf("\tType=RMRR\n");
 	printf("\tLength=%d\n", rmrr->Header.Length);
 	printf("\tSegment=%d\n", rmrr->Segment);
-	printf("\tBaseAddress=0x%0jx\n", rmrr->BaseAddress);
-	printf("\tLimitAddress=0x%0jx\n", rmrr->EndAddress);
+	printf("\tBaseAddress=0x%0jx\n", (uintmax_t)rmrr->BaseAddress);
+	printf("\tLimitAddress=0x%0jx\n", (uintmax_t)rmrr->EndAddress);
 
 	remaining = rmrr->Header.Length - sizeof(ACPI_DMAR_RESERVED_MEMORY);
 	if (remaining > 0)
@@ -911,7 +911,7 @@ acpi_handle_dmar_rhsa(ACPI_DMAR_RHSA *rhsa)
 	printf("\n");
 	printf("\tType=RHSA\n");
 	printf("\tLength=%d\n", rhsa->Header.Length);
-	printf("\tBaseAddress=0x%0jx\n", rhsa->BaseAddress);
+	printf("\tBaseAddress=0x%0jx\n", (uintmax_t)rhsa->BaseAddress);
 	printf("\tProximityDomain=0x%08x\n", rhsa->ProximityDomain);
 }
 
diff --git a/usr.sbin/acpi/acpidump/acpi_user.c b/usr.sbin/acpi/acpidump/acpi_user.c
index 0b2beb2..d759ea7 100644
--- a/usr.sbin/acpi/acpidump/acpi_user.c
+++ b/usr.sbin/acpi/acpidump/acpi_user.c
@@ -172,7 +172,7 @@ acpi_find_rsd_ptr(void)
 	addr = 0;
 
 	/* Attempt to use kenv or sysctl to find RSD PTR record. */
-	if (kenv(KENV_GET, hint_acpi_0_rsdp, buf, 20) == 0)
+	if (kenv(KENV_GET, hint_acpi_0_rsdp, buf, 20) > 0)
 		addr = strtoul(buf, NULL, 0);
 	if (addr == 0) {
 		len = sizeof(addr);
diff --git a/usr.sbin/acpi/iasl/Makefile b/usr.sbin/acpi/iasl/Makefile
index 973b63d..161b2f4 100644
--- a/usr.sbin/acpi/iasl/Makefile
+++ b/usr.sbin/acpi/iasl/Makefile
@@ -14,16 +14,16 @@ SRCS+=	aslanalyze.c aslbtypes.c aslcodegen.c aslcompile.c	\
 	asllength.c asllisting.c asllistsup.c aslload.c		\
 	asllookup.c aslmain.c aslmap.c aslmethod.c aslnamesp.c	\
 	asloffset.c aslopcodes.c asloperands.c aslopt.c		\
-	aslpredef.c aslprepkg.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
+	asloptions.c aslpredef.c aslprepkg.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
 
 # components/debugger
 SRCS+=	dbfileio.c
@@ -52,14 +52,14 @@ SRCS+=	nsaccess.c nsalloc.c nsdump.c nsnames.c nsobject.c	\
 	nsparse.c nssearch.c nsutils.c nswalk.c
 
 # components/tables
-SRCS+=	tbfadt.c tbinstal.c tbutils.c tbxface.c
+SRCS+=	tbfadt.c tbinstal.c tbprint.c tbutils.c tbxface.c
 
 # components/utilities
-SRCS+=	utaddress.c utalloc.c utcache.c utcopy.c utdebug.c	\
-	utdecode.c utdelete.c utexcep.c utglobal.c utinit.c	\
-	utlock.c utmath.c utmisc.c utmutex.c utobject.c		\
-	utownerid.c utpredef.c utresrc.c utstate.c utstring.c	\
-	utxface.c utxferror.c
+SRCS+=	utaddress.c utalloc.c utbuffer.c utcache.c utcopy.c	\
+	utdebug.c utdecode.c utdelete.c uterror.c utexcep.c	\
+	utglobal.c utinit.c utlock.c utmath.c utmisc.c		\
+	utmutex.c utobject.c utownerid.c utpredef.c utresrc.c	\
+	utstate.c utstring.c utxface.c utxferror.c
 
 # os_specific/service_layers
 SRCS+=	osunixxf.c
@@ -74,7 +74,8 @@ YFLAGS= -d
 
 CLEANFILES= aslcompiler.y.h aslcompilerlex.c aslcompilerparse.c	\
 	aslcompilerparse.h dtparser.y.h dtparserlex.c		\
-	dtparserparse.c dtparserparse.h
+	dtparserparse.c dtparserparse.h prparser.y.h		\
+	prparserlex.c prparserparse.c prparserparse.h
 
 aslcompilerlex.c: aslcompiler.l aslsupport.l
 	${LEX} ${LFLAGS} -PAslCompiler -o${.TARGET} \