6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-06-24 08:24:33 +00:00
Code Issues Projects Releases Wiki Activity

Implement .rel relocation for R_ARM_ABS32 in MCJIT.

Browse Source 
Patch by Amara Emerson.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@165128 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Tim Northover
2012-10-03 16:29:42 +00:00
parent fcf0628d93
commit 565ebde5fe
2 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp
View File

@ -264,14 +264,19 @@ void RuntimeDyldELF::resolveARMRelocation(uint8_t *LocalAddress,
default: default:
llvm_unreachable("Not implemented relocation type!"); llvm_unreachable("Not implemented relocation type!");
// Just write 32bit value to relocation address // Write a 32bit value to relocation address, taking into account the
// implicit addend encoded in the target.
case ELF::R_ARM_ABS32 : case ELF::R_ARM_ABS32 :
*TargetPtr = Value; *TargetPtr += Value;
break; break;
// Write first 16 bit of 32 bit value to the mov instruction. // Write first 16 bit of 32 bit value to the mov instruction.
// Last 4 bit should be shifted. // Last 4 bit should be shifted.
case ELF::R_ARM_MOVW_ABS_NC : case ELF::R_ARM_MOVW_ABS_NC :
// We are not expecting any other addend in the relocation address.
// Using 0x000F0FFF because MOVW has its 16 bit immediate split into 2
// non-contiguous fields.
assert((*TargetPtr & 0x000F0FFF) == 0);
Value = Value & 0xFFFF; Value = Value & 0xFFFF;
*TargetPtr |= Value & 0xFFF; *TargetPtr |= Value & 0xFFF;
*TargetPtr |= ((Value >> 12) & 0xF) << 16; *TargetPtr |= ((Value >> 12) & 0xF) << 16;
@ -280,6 +285,9 @@ void RuntimeDyldELF::resolveARMRelocation(uint8_t *LocalAddress,
// Write last 16 bit of 32 bit value to the mov instruction. // Write last 16 bit of 32 bit value to the mov instruction.
// Last 4 bit should be shifted. // Last 4 bit should be shifted.
case ELF::R_ARM_MOVT_ABS : case ELF::R_ARM_MOVT_ABS :
// We are not expecting any other addend in the relocation address.
// Use 0x000F0FFF for the same reason as R_ARM_MOVW_ABS_NC.
assert((*TargetPtr & 0x000F0FFF) == 0);
Value = (Value >> 16) & 0xFFFF; Value = (Value >> 16) & 0xFFFF;
*TargetPtr |= Value & 0xFFF; *TargetPtr |= Value & 0xFFF;
*TargetPtr |= ((Value >> 12) & 0xF) << 16; *TargetPtr |= ((Value >> 12) & 0xF) << 16;

16
test/ExecutionEngine/MCJIT/test-ptr-reloc.ll Normal file
View File

@ -0,0 +1,16 @@
; RUN: %lli -mtriple=%mcjit_triple -use-mcjit -O0 %s
@.str = private unnamed_addr constant [6 x i8] c"data1\00", align 1
@ptr = global i8* getelementptr inbounds ([6 x i8]* @.str, i32 0, i32 0), align 4
@.str1 = private unnamed_addr constant [6 x i8] c"data2\00", align 1
@ptr2 = global i8* getelementptr inbounds ([6 x i8]* @.str1, i32 0, i32 0), align 4
define i32 @main(i32 %argc, i8** nocapture %argv) nounwind readonly {
entry:
%0 = load i8** @ptr, align 4
%1 = load i8** @ptr2, align 4
%cmp = icmp eq i8* %0, %1
%. = zext i1 %cmp to i32
ret i32 %.
}