PERFORCE change 79208 for review

[Peter Wemm]

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

Change 79208 by peter at peter_daintree on 2005/06/29 22:57:19

	IFC @79206 (sync in favour of cvs version)

Affected files ...

.. //depot/projects/hammer/lib/libkvm/kvm_amd64.c#18 integrate
.. //depot/projects/hammer/lib/libkvm/kvm_i386.c#10 integrate
.. //depot/projects/hammer/sys/amd64/amd64/dump_machdep.c#22 integrate
.. //depot/projects/hammer/sys/i386/i386/dump_machdep.c#9 integrate

Differences ...

==== //depot/projects/hammer/lib/libkvm/kvm_amd64.c#18 (text+ko) ====

@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libkvm/kvm_amd64.c,v 1.17 2004/05/19 18:24:13 peter Exp $");
+__FBSDID("$FreeBSD: src/lib/libkvm/kvm_amd64.c,v 1.18 2005/06/29 22:39:41 peter Exp $");
 
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
@@ -101,7 +101,6 @@
 		_kvm_err(kd, kd->program, "cannot mmap corefile");
 		return (-1);
 	}
-
 	return (0);
 }
 
@@ -120,7 +119,6 @@
 		p++, n--;
 	if (n == 0)
 		return (0);
-
 	*ofs = (pa - p->p_paddr) + p->p_offset;
 	return (PAGE_SIZE - ((size_t)pa & PAGE_MASK));
 }
@@ -327,7 +325,7 @@
 		return (PAGE_SIZE - offset);
 
 invalid:
-	_kvm_err(kd, 0, "invalid address (0x%lx)", (unsigned long)va);
+	_kvm_err(kd, 0, "invalid address (0x%lx)", va);
 	return (0);
 }
 

==== //depot/projects/hammer/lib/libkvm/kvm_i386.c#10 (text+ko) ====

@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libkvm/kvm_i386.c,v 1.15 2001/10/10 17:48:43 bde Exp $");
+__FBSDID("$FreeBSD: src/lib/libkvm/kvm_i386.c,v 1.16 2005/06/29 22:39:41 peter Exp $");
 
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
@@ -121,13 +121,10 @@
 	Elf_Phdr *p = (Elf_Phdr*)((char*)e + e->e_phoff);
 	int n = e->e_phnum;
 
-	while (n && (pa < p->p_paddr || pa >= p->p_paddr + p->p_memsz)) {
+	while (n && (pa < p->p_paddr || pa >= p->p_paddr + p->p_memsz))
 		p++, n--;
-	}
-
 	if (n == 0)
 		return (0);
-
 	*ofs = (pa - p->p_paddr) + p->p_offset;
 	return (PAGE_SIZE - ((size_t)pa & PAGE_MASK));
 }
@@ -324,7 +321,7 @@
 		return (PAGE_SIZE - offset);
 
 invalid:
-	_kvm_err(kd, 0, "invalid address (%x)", va);
+	_kvm_err(kd, 0, "invalid address (0x%lx)", va);
 	return (0);
 }
 
@@ -421,7 +418,7 @@
 		return (PAGE_SIZE - offset);
 
 invalid:
-	_kvm_err(kd, 0, "invalid address (%x)", va);
+	_kvm_err(kd, 0, "invalid address (0x%lx)", va);
 	return (0);
 }
 
@@ -434,7 +431,7 @@
 		return (0);
 	}
 	if (kd->vmst->pae)
-		_kvm_vatop_pae(kd, va, pa);
+		return (_kvm_vatop_pae(kd, va, pa));
 	else
-		_kvm_vatop(kd, va, pa);
+		return (_kvm_vatop(kd, va, pa));
 }

==== //depot/projects/hammer/sys/amd64/amd64/dump_machdep.c#22 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/ia64/ia64/dump_machdep.c,v 1.12 2005/01/06 22:18:22 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.10 2005/06/29 22:28:45 peter Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>

==== //depot/projects/hammer/sys/i386/i386/dump_machdep.c#9 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/ia64/ia64/dump_machdep.c,v 1.12 2005/01/06 22:18:22 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/i386/dump_machdep.c,v 1.10 2005/06/29 22:28:45 peter Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>