From owner-svn-src-projects@FreeBSD.ORG Sun Feb 10 10:17:42 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 73C72B93; Sun, 10 Feb 2013 10:17:42 +0000 (UTC) (envelope-from benno@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 4E9D5294; Sun, 10 Feb 2013 10:17:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1AAHgG8016442; Sun, 10 Feb 2013 10:17:42 GMT (envelope-from benno@svn.freebsd.org) Received: (from benno@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1AAHg2g016440; Sun, 10 Feb 2013 10:17:42 GMT (envelope-from benno@svn.freebsd.org) Message-Id: <201302101017.r1AAHg2g016440@svn.freebsd.org> From: Benno Rice Date: Sun, 10 Feb 2013 10:17:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246613 - projects/uefi/sys/boot/common X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Feb 2013 10:17:42 -0000 Author: benno Date: Sun Feb 10 10:17:41 2013 New Revision: 246613 URL: http://svnweb.freebsd.org/changeset/base/246613 Log: Make it possible to load 32-bit kernels/modules from a 64-bit loader. Sponsored by: FreeBSD Foundation Modified: projects/uefi/sys/boot/common/load_elf.c Modified: projects/uefi/sys/boot/common/load_elf.c ============================================================================== --- projects/uefi/sys/boot/common/load_elf.c Sun Feb 10 10:17:33 2013 (r246612) +++ projects/uefi/sys/boot/common/load_elf.c Sun Feb 10 10:17:41 2013 (r246613) @@ -50,6 +50,13 @@ __FBSDID("$FreeBSD$"); #define ELF_TARG_MACH EM_X86_64 #endif +#if defined(__amd64__) && __ELF_WORD_SIZE == 32 +#undef ELF_TARG_CLASS +#undef ELF_TARG_MACH +#define ELF_TARG_CLASS ELFCLASS32 +#define ELF_TARG_MACH EM_386 +#endif + typedef struct elf_file { Elf_Phdr *ph; Elf_Ehdr *ehdr; @@ -595,6 +602,13 @@ struct mod_metadata64 { u_int64_t md_data; /* specific data */ u_int64_t md_cval; /* common string label */ }; +#elif defined(__amd64__) && __ELF_WORD_SIZE == 32 +struct mod_metadata32 { + int md_version; /* structure version MDTV_* */ + int md_type; /* type of entry MDT_* */ + u_int32_t md_data; /* specific data */ + u_int32_t md_cval; /* common string label */ +}; #endif int @@ -603,6 +617,8 @@ __elfN(parse_modmetadata)(struct preload struct mod_metadata md; #if (defined(__i386__) || defined(__powerpc__)) && __ELF_WORD_SIZE == 64 struct mod_metadata64 md64; +#elif defined(__amd64__) && __ELF_WORD_SIZE == 32 + struct mod_metadata32 md32; #endif struct mod_depend *mdepend; struct mod_version mver; @@ -638,6 +654,18 @@ __elfN(parse_modmetadata)(struct preload md.md_type = md64.md_type; md.md_cval = (const char *)(uintptr_t)md64.md_cval; md.md_data = (void *)(uintptr_t)md64.md_data; +#elif defined(__amd64__) && __ELF_WORD_SIZE == 32 + COPYOUT(v, &md32, sizeof(md32)); + error = __elfN(reloc_ptr)(fp, ef, v, &md32, sizeof(md32)); + if (error == EOPNOTSUPP) { + md32.md_cval += ef->off; + md32.md_data += ef->off; + } else if (error != 0) + return (error); + md.md_version = md32.md_version; + md.md_type = md32.md_type; + md.md_cval = (const char *)(uintptr_t)md32.md_cval; + md.md_data = (void *)(uintptr_t)md32.md_data; #else COPYOUT(v, &md, sizeof(md)); error = __elfN(reloc_ptr)(fp, ef, v, &md, sizeof(md));