Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM:

Browse Source 
* Disable TRACE output of ELF relocation
* Implement R_ARM_RELATIVE (for kernel modules)

No more errors on 'loading' of kernel modules now!


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39220 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ithamar R. Adema 2010-10-30 23:10:36 +00:00
parent c9a4637342
commit e7682a8e3e
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/system/kernel/arch/arm/arch_elf.cpp
View File

@ -1,4 +1,7 @@
/*
* Copyright 2010, Ithamar R. Adema <ithamar.adema@team-embedded.nl>
* All rights reserved. Distributed under the terms of the MIT License.
*
* Copyright 2009, Johannes Wischert, johanneswi@gmail.com.
* All rights reserved. Distributed under the terms of the MIT License.
*
@ -19,7 +22,7 @@
#include <arch/elf.h>
#define TRACE_ARCH_ELF
//#define TRACE_ARCH_ELF
#ifdef TRACE_ARCH_ELF
# define TRACE(x) dprintf x
# define CHATTY 1
@ -210,9 +213,21 @@ arch_elf_relocate_rel(struct elf_image_info *image,
}
}
// calc A
switch (ELF32_R_TYPE(rel[i].r_info)) {
case R_ARM_RELATIVE:
A = *(addr_t *)(image->text_region.delta + rel[i].r_offset);
TRACE(("A %p\n", (void *)A));
break;
}
switch (ELF32_R_TYPE(rel[i].r_info)) {
case R_ARM_NONE:
continue;
case R_ARM_RELATIVE:
// B + A;
finalAddress = image->text_region.delta + A;
break;
case R_ARM_JMP_SLOT:
case R_ARM_GLOB_DAT:
finalAddress = S;