Enable the i386 loader to load and run an amd64 kernel. If this puts

things over floppy size limits, I can exclude it for release builds or
something like that.  Most of the changes are to get the load_elf.c file
into a seperate elf32_ or elf64_ namespace so that you can have two
ELF loaders present at once.  Note that for 64 bit kernels, it actually
starts up the kernel already in 64 bit mode with paging enabled.  This
is really easy because we have a known minimum feature set.

Of note is that for amd64, we have to pass in the bios int 15 0xe821
memory map because once in long mode, you absolutely cannot make VM86
calls.  amd64 does not use 'struct bootinfo' at all.  It is a pure loader
metadata startup, just like sparc64 and powerpc.  Much of the
infrastructure to support this was adapted from sparc64.

1 files changed, 5 insertions, 5 deletions

diff --git a/sys/boot/ofw/libofw/elf_freebsd.c b/sys/boot/ofw/libofw/elf_freebsd.c
index 95d4a90..7fa7586 100644
--- a/sys/boot/ofw/libofw/elf_freebsd.c
+++ b/sys/boot/ofw/libofw/elf_freebsd.c
@@ -42,13 +42,13 @@ extern char		end[];
 extern vm_offset_t	reloc;	/* From <arch>/conf.c */
 
 int
-ofw_elf_loadfile(char *filename, vm_offset_t dest,
+__elfN(ofw_loadfile)(char *filename, vm_offset_t dest,
     struct preloaded_file **result)
 {
 	int	r;
 	void	*addr;
 
-	r = elf_loadfile(filename, dest, result);
+	r = __elfN(loadfile)(filename, dest, result);
 	if (r != 0)
 		return (r);
 
@@ -56,7 +56,7 @@ ofw_elf_loadfile(char *filename, vm_offset_t dest,
 }
 
 int
-ofw_elf_exec(struct preloaded_file *fp)
+__elfN(ofw_exec)(struct preloaded_file *fp)
 {
 	struct file_metadata	*fmp;
 	vm_offset_t		mdp;
@@ -83,6 +83,6 @@ ofw_elf_exec(struct preloaded_file *fp)
 
 struct file_format	ofw_elf =
 {
-	ofw_elf_loadfile,
-	ofw_elf_exec
+	__elfN(ofw_loadfile),
+	__elfN(ofw_exec)
 };