The self-relocation code is not efi-specific, move it to boot/common.

The function was defined as taking 4 parameters and returning EFI_STATUS,
but all existing callers (in asm code) passed only two parameters and don't
use the return value. The function signature now matches that usage, and
doesn't refer to efi-specific types.

Parameters and variables now use the cannonical typenames set up by elf.h
(Elf_Word, Elf_Addr, etc) instead of raw C types. Hopefully this will
prevent suprises as new platforms come along and use this code.

The function was renamed from _reloc() to self_reloc() to emphasize its
difference from the other elf relocation code found in boot/common.

Differential Revision:	https://reviews.freebsd.org/D2490

6 files changed, 5 insertions, 133 deletions

diff --git a/sys/boot/efi/loader/Makefile b/sys/boot/efi/loader/Makefile
index 06e76a9..d11021e 100644
--- a/sys/boot/efi/loader/Makefile
+++ b/sys/boot/efi/loader/Makefile
@@ -20,7 +20,7 @@ SRCS=	autoload.c \
 	copy.c \
 	devicename.c \
 	main.c \
-	reloc.c \
+	self_reloc.c \
 	smbios.c \
 	vers.c
 
diff --git a/sys/boot/efi/loader/arch/amd64/start.S b/sys/boot/efi/loader/arch/amd64/start.S
index beaeeff..774ef4f 100644
--- a/sys/boot/efi/loader/arch/amd64/start.S
+++ b/sys/boot/efi/loader/arch/amd64/start.S
@@ -53,7 +53,7 @@ _start:
 	popq %rdx
 	pushq %rcx
 	pushq %rdx
-	call _reloc
+	call self_reloc
 
 	popq %rdi
 	popq %rsi
diff --git a/sys/boot/efi/loader/arch/arm/start.S b/sys/boot/efi/loader/arch/arm/start.S
index 4160655..443de4a 100644
--- a/sys/boot/efi/loader/arch/arm/start.S
+++ b/sys/boot/efi/loader/arch/arm/start.S
@@ -153,7 +153,7 @@ _start:
 	ldr	r1, .Ldynamic
 	add	r1, r1, r5
 
-	bl	_C_LABEL(_reloc)
+	bl	_C_LABEL(self_reloc)
 
 	/* Zero the BSS, _reloc fixed the values for us */
 	ldr	r0, .Lbss
diff --git a/sys/boot/efi/loader/arch/arm64/start.S b/sys/boot/efi/loader/arch/arm64/start.S
index a8002fa..cd9badb 100644
--- a/sys/boot/efi/loader/arch/arm64/start.S
+++ b/sys/boot/efi/loader/arch/arm64/start.S
@@ -156,7 +156,7 @@ _start:
 	adr	x0, ImageBase
 	adr	x1, _DYNAMIC
 
-	bl	_reloc
+	bl	self_reloc
 
 	ldp	x0, x1, [sp], #16
 
diff --git a/sys/boot/efi/loader/arch/i386/start.S b/sys/boot/efi/loader/arch/i386/start.S
index 2be2478..e9715da 100644
--- a/sys/boot/efi/loader/arch/i386/start.S
+++ b/sys/boot/efi/loader/arch/i386/start.S
@@ -53,7 +53,7 @@ ENTRY(_start)
 	addl	$_DYNAMIC-0b, %ebx
 	pushl	%ebx		/* dynamic */
 	pushl	%eax		/* ImageBase */
-	call	_reloc
+	call	self_reloc
 	cmpl	$EFI_SUCCESS, %eax
 	jne	1f
 	popl	%ebx		/* remove ImageBase from the stack */
diff --git a/sys/boot/efi/loader/reloc.c b/sys/boot/efi/loader/reloc.c
deleted file mode 100644
index fbe2043..0000000
--- a/sys/boot/efi/loader/reloc.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/*-
- * Copyright (c) 2008-2010 Rui Paulo <rpaulo@FreeBSD.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/types.h>
-#include <elf.h>
-#include <efi.h>
-#include <bootstrap.h>
-
-#if defined(__aarch64__)
-#define	ElfW_Rel	Elf64_Rela
-#define	ElfW_Dyn	Elf64_Dyn
-#define	ELFW_R_TYPE	ELF64_R_TYPE
-#define	ELF_RELA
-#elif defined(__arm__) || defined(__i386__)
-#define ElfW_Rel	Elf32_Rel
-#define	ElfW_Dyn	Elf32_Dyn
-#define	ELFW_R_TYPE	ELF32_R_TYPE
-#elif defined(__amd64__)
-#define ElfW_Rel	Elf64_Rel
-#define	ElfW_Dyn	Elf64_Dyn
-#define	ELFW_R_TYPE	ELF64_R_TYPE
-#else
-#error architecture not supported
-#endif
-#if defined(__aarch64__)
-#define	RELOC_TYPE_NONE		R_AARCH64_NONE
-#define	RELOC_TYPE_RELATIVE	R_AARCH64_RELATIVE
-#elif defined(__amd64__)
-#define	RELOC_TYPE_NONE		R_X86_64_NONE
-#define	RELOC_TYPE_RELATIVE	R_X86_64_RELATIVE
-#elif defined(__arm__)
-#define	RELOC_TYPE_NONE		R_ARM_NONE
-#define	RELOC_TYPE_RELATIVE	R_ARM_RELATIVE
-#elif defined(__i386__)
-#define	RELOC_TYPE_NONE		R_386_NONE
-#define	RELOC_TYPE_RELATIVE	R_386_RELATIVE
-#endif
-
-/*
- * A simple relocator for EFI binaries.
- */
-EFI_STATUS
-_reloc(unsigned long ImageBase, ElfW_Dyn *dynamic, EFI_HANDLE image_handle,
-    EFI_SYSTEM_TABLE *system_table)
-{
-	unsigned long relsz, relent;
-	unsigned long *newaddr;
-	ElfW_Rel *rel;
-	ElfW_Dyn *dynp;
-
-	/*
-	 * Find the relocation address, its size and the relocation entry.
-	 */
-	relsz = 0;
-	relent = 0;
-	for (dynp = dynamic; dynp->d_tag != DT_NULL; dynp++) {
-		switch (dynp->d_tag) {
-		case DT_REL:
-		case DT_RELA:
-			rel = (ElfW_Rel *) ((unsigned long) dynp->d_un.d_ptr +
-			    ImageBase);
-			break;
-		case DT_RELSZ:
-		case DT_RELASZ:
-			relsz = dynp->d_un.d_val;
-			break;
-		case DT_RELENT:
-		case DT_RELAENT:
-			relent = dynp->d_un.d_val;
-			break;
-		default:
-			break;
-		}
-	}
-
-	/*
-	 * Perform the actual relocation.
-	 */
-	for (; relsz > 0; relsz -= relent) {
-		switch (ELFW_R_TYPE(rel->r_info)) {
-		case RELOC_TYPE_NONE:
-			/* No relocation needs be performed. */
-			break;
-
-		case RELOC_TYPE_RELATIVE:
-			/* Address relative to the base address. */
-			newaddr = (unsigned long *)(ImageBase + rel->r_offset);
-			*newaddr += ImageBase;
-			/* Add the addend when the ABI uses them */ 
-#ifdef ELF_RELA
-			*newaddr += rel->r_addend;
-#endif
-			break;
-		default:
-			/* XXX: do we need other relocations ? */
-			break;
-		}
-		rel = (ElfW_Rel *) ((caddr_t) rel + relent);
-	}
-
-	return (EFI_SUCCESS);
-}