From owner-p4-projects@FreeBSD.ORG Wed Jun 29 22:57:51 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A15D416A420; Wed, 29 Jun 2005 22:57:50 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 64F7316A41C for ; Wed, 29 Jun 2005 22:57:50 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4AAB843D48 for ; Wed, 29 Jun 2005 22:57:50 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5TMvoTA050726 for ; Wed, 29 Jun 2005 22:57:50 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5TMvnvF050723 for perforce@freebsd.org; Wed, 29 Jun 2005 22:57:49 GMT (envelope-from peter@freebsd.org) Date: Wed, 29 Jun 2005 22:57:49 GMT Message-Id: <200506292257.j5TMvnvF050723@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 79208 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Jun 2005 22:57:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=79208 Change 79208 by peter@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 -__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 -__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 -__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 #include ==== //depot/projects/hammer/sys/i386/i386/dump_machdep.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__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 #include