From owner-p4-projects@FreeBSD.ORG  Mon Apr 28 14:03:16 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id ED64D37B401; Mon, 28 Apr 2003 14:03:15 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 8A77D37B404
	for <perforce@freebsd.org>; Mon, 28 Apr 2003 14:03:15 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id BACC243F85
	for <perforce@freebsd.org>; Mon, 28 Apr 2003 14:03:14 -0700 (PDT)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h3SL3E0U083875
	for <perforce@freebsd.org>; Mon, 28 Apr 2003 14:03:14 -0700 (PDT)
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3SL3Eep083867
	for perforce@freebsd.org; Mon, 28 Apr 2003 14:03:14 -0700 (PDT)
Date: Mon, 28 Apr 2003 14:03:14 -0700 (PDT)
Message-Id: <200304282103.h3SL3Eep083867@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 29975 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 28 Apr 2003 21:03:17 -0000

http://perforce.freebsd.org/chv.cgi?CH=29975

Change 29975 by marcel@marcel_nfs on 2003/04/28 14:02:44

	Use the endian encoding/decoding functions to get 64-bit
	values out of the XSDT. They are very likely misaligned
	and handling of misaligned memory accesses by the kernel
	must not be depended upon. In other words: we coredump
	on ia64 because handling of unaligned memory access has
	a bug (a kernel from HEAD -- No EPC related fodder :-)
	
	This makes acpidump usable again on my bigsur. I can't
	recall having seen coredumps on pluto, which is where I
	would expect to see them...

Affected files ...

.. //depot/projects/ia64/usr.sbin/acpi/acpidump/acpi.c#11 edit

Differences ...

==== //depot/projects/ia64/usr.sbin/acpi/acpidump/acpi.c#11 (text+ko) ====

@@ -28,6 +28,7 @@
  *	$FreeBSD: src/usr.sbin/acpi/acpidump/acpi.c,v 1.7 2003/04/15 05:15:50 njl Exp $
  */
 
+#include <sys/endian.h>
 #include <sys/param.h>
 #include <sys/stat.h>
 
@@ -474,7 +475,7 @@
 {
 	struct	ACPIsdt *sp;
 
-	sp = acpi_map_physical(pa, sizeof(struct ACPIsdt));
+	sp = acpi_map_physical(pa, SIZEOF_SDT_HDR);
 	sp = acpi_map_physical(pa, sp->len);
 	return (sp);
 }
@@ -506,7 +507,7 @@
 		if (p != (void*)rsdp->body)
 			printf(", ");
 		if (rsdp->signature[0] == 'X') {
-			printf("0x%016x", *((u_int64_t*)p));
+			printf("0x%016x", le64dec(p));
 			p += sizeof(u_int64_t);
 		} else {
 			printf("0x%08x", *((u_int32_t*)p));
@@ -521,7 +522,7 @@
 	p = (void*)rsdp->body;
 	while (p < end) {
 		if (rsdp->signature[0] == 'X') {
-			sdp = acpi_map_sdt(*((u_int64_t*)p));
+			sdp = acpi_map_sdt(le64dec(p));
 			p += sizeof(u_int64_t);
 		} else {
 			sdp = acpi_map_sdt(*((u_int32_t*)p));