PERFORCE change 52907 for review

[Peter Wemm]

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

Change 52907 by peter at 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);