From owner-p4-projects@FreeBSD.ORG  Sun May 16 20:08:25 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D62D716A4D0; Sun, 16 May 2004 20:08:24 -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 8EB8316A4CE
	for <perforce@freebsd.org>; Sun, 16 May 2004 20:08:24 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4E33943D2D
	for <perforce@freebsd.org>; Sun, 16 May 2004 20:08:24 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i4H38OGe001003
	for <perforce@freebsd.org>; Sun, 16 May 2004 20:08:24 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i4H38Nfc001000
	for perforce@freebsd.org; Sun, 16 May 2004 20:08:23 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Date: Sun, 16 May 2004 20:08:23 -0700 (PDT)
Message-Id: <200405170308.i4H38Nfc001000@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52907 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, 17 May 2004 03:08:25 -0000

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

Change 52907 by peter@peter_hammer on 2004/05/16 20:07:46

	oops, update the offset calculations.  Correct a debug printf.

Affected files ...

.. //depot/projects/hammer/sys/kern/link_elf_obj.c#31 edit

Differences ...

==== //depot/projects/hammer/sys/kern/link_elf_obj.c#31 (text+ko) ====

@@ -502,7 +502,7 @@
 			if (ef->shstrtab && shdr[i].sh_name != 0)
 				ef->progtab[pb].name =
 				    ef->shstrtab + shdr[i].sh_name;
-			mapsize += shdr[i].sh_size;
+			mapbase += shdr[i].sh_size;
 			pb++;
 			break;
 		case SHT_REL:
@@ -550,8 +550,8 @@
 		panic("lost rel");
 	if (ra != ef->nrela)
 		panic("lost rela");
-	if (mapbase != mapsize)
-		printf("mapbase 0x%lx != mapsize 0x%lx\n", mapbase, mapsize);
+	if (mapbase != (vm_offset_t)ef->address + mapsize)
+		printf("mapbase 0x%lx != address %p + mapsize 0x%lx (0x%lx)\n", mapbase, ef->address, mapsize, (vm_offset_t)ef->address + mapsize);
 
 	/* Local intra-module relocations */
 	link_elf_reloc_local(lf);