svn commit: r209774 - in head/sys/boot/ia64: common efi

[Marcel Moolenaar]

Author: marcel
Date: Wed Jul  7 19:06:53 2010
New Revision: 209774
URL: http://svn.freebsd.org/changeset/base/209774

Log:
  Use the kernel's start address to determine what to map. This allows
  us to link the kernel at different addresses without needing to build
  a corresponding loader.

Modified:
  head/sys/boot/ia64/common/exec.c
  head/sys/boot/ia64/efi/version

Modified: head/sys/boot/ia64/common/exec.c
==============================================================================
--- head/sys/boot/ia64/common/exec.c	Wed Jul  7 17:52:13 2010	(r209773)
+++ head/sys/boot/ia64/common/exec.c	Wed Jul  7 19:06:53 2010	(r209774)
@@ -106,11 +106,12 @@ elf64_exec(struct preloaded_file *fp)
 
 	pte = PTE_PRESENT | PTE_MA_WB | PTE_ACCESSED | PTE_DIRTY |
 	    PTE_PL_KERN | PTE_AR_RWX | PTE_ED;
+	pte |= IA64_RR_MASK(hdr->e_entry) & PTE_PPN_MASK;
 
-	__asm __volatile("mov cr.ifa=%0" :: "r"(IA64_RR_BASE(7)));
+	__asm __volatile("mov cr.ifa=%0" :: "r"(hdr->e_entry));
 	__asm __volatile("mov cr.itir=%0" :: "r"(28 << 2));
-	__asm __volatile("ptr.i %0,%1" :: "r"(IA64_RR_BASE(7)), "r"(28<<2));
-	__asm __volatile("ptr.d %0,%1" :: "r"(IA64_RR_BASE(7)), "r"(28<<2));
+	__asm __volatile("ptr.i %0,%1" :: "r"(hdr->e_entry), "r"(28<<2));
+	__asm __volatile("ptr.d %0,%1" :: "r"(hdr->e_entry), "r"(28<<2));
 	__asm __volatile("srlz.i;;");
 	__asm __volatile("itr.i itr[%0]=%1;;" :: "r"(0), "r"(pte));
 	__asm __volatile("srlz.i;;");

Modified: head/sys/boot/ia64/efi/version
==============================================================================
--- head/sys/boot/ia64/efi/version	Wed Jul  7 17:52:13 2010	(r209773)
+++ head/sys/boot/ia64/efi/version	Wed Jul  7 19:06:53 2010	(r209774)
@@ -3,6 +3,8 @@ $FreeBSD$
 NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE.  The format of this
 file is important.  Make sure the current version number is on line 6.
 
+2.2:	Create direct mapping based on start address instead of mapping
+	first 256M.
 2.1:	Add support for "-dev <part>" argument parsing.
 2.0:	Provide devices based on the block I/O protocol, rather than the
 	simple file services protocol. Use the FreeBSD file system code