 @@ -1,14 +1,14 @@
-/*	$NetBSD: kobj_machdep.c,v 1.2 2008/04/28 20:23:13 martin Exp $	*/
+/*	$NetBSD: kobj_machdep.c,v 1.3 2009/08/17 19:44:32 dsl Exp $	*/
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * 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.
 @@ -42,27 +42,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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>
-__KERNEL_RCSID(0, "$NetBSD: kobj_machdep.c,v 1.2 2008/04/28 20:23:13 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kobj_machdep.c,v 1.3 2009/08/17 19:44:32 dsl Exp $");
 #define	ELFSIZE		ARCH_ELFSIZE
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kobj.h>
 #include <sys/exec.h>
 #include <sys/exec_elf.h>
 #include <arm/cpufunc.h>
 int
 kobj_reloc(kobj_t ko, uintptr_t relocbase, const void *data,
 @@ -81,64 +81,84 @@ kobj_reloc(kobj_t ko, uintptr_t relocbas
 		addend = rela->r_addend;
 		rtype = ELF_R_TYPE(rela->r_info);
 		symidx = ELF_R_SYM(rela->r_info);
 	} else {
 		rel = (const Elf_Rel *)data;
 		where = (Elf_Addr *) (relocbase + rel->r_offset);
 		addend = *where;
 		rtype = ELF_R_TYPE(rel->r_info);
 		symidx = ELF_R_SYM(rel->r_info);
+	}
 	switch (rtype) {
 	case R_ARM_NONE:	/* none */
-		break;
+		return 0;
 	case R_ARM_ABS32:
 		addr = kobj_sym_lookup(ko, symidx);
 		if (addr == 0)
-			return -1;
+			break;
-		if (*where != addr)
+		*where = addr + addend;
-			*where = addr;
+		return 0;
 		break;
 	case R_ARM_COPY:	/* none */
-		/*
+		/* There shouldn't be copy relocations in kernel objects. */
-		 * There shouldn't be copy relocations in kernel
+		break;
 		 * objects.
 		 */
 		printf("kobj_reloc: unexpected R_COPY relocation\n");
 		return -1;
 	case R_ARM_JUMP_SLOT:
 		addr = kobj_sym_lookup(ko, symidx);
-		if (addr) {
+		if (addr == 0)
-			*where = addr;
+			break;
-			return 0;
+		*where = addr;
 		return 0;
 		return -1;
 	case R_ARM_RELATIVE:	/* A + B */
 		addr = relocbase + addend;
 		if (*where != addr)
 			*where = addr;
-		break;
+		return 0;
 	case R_ARM_PC24:
 		if (local)
 			return 0;
 		/* Remove the instruction from the 24 bit offset */
 		addend &= 0x00ffffff;
 		/* Sign extend if necessary */
 		if (addend & 0x00800000)
 			addend |= 0xff000000;
 		addr = kobj_sym_lookup(ko, symidx);
 		if (addr == 0)
 			break;
 		addend += ((uint32_t *)addr - (uint32_t *)where);
 		if ((addend & 0xff800000) != 0x00000000 &&
 		    (addend & 0xff800000) != 0xff800000) {
 			printf ("Relocation %x too far @ %p\n", addend, where);
 			return -1;
+		}
 		*where = (*where & 0xff000000) | (addend & 0x00ffffff);
 		return 0;
 	default:
-		printf("kobj_reloc: unexpected relocation type %d\n", rtype);
+		break;
 		return -1;
+	}
 	return 0;
 	printf("kobj_reloc: unexpected/invalid relocation type %d @ %p symidx %u\n",
 	    rtype, where, symidx);
 	return -1;
+}
 int
 kobj_machdep(kobj_t ko, void *base, size_t size, bool load)
+{
 	if (load) {
 		cpu_idcache_wbinv_all();
 		cpu_tlb_flushID();
+	}
 	return 0;
+}