aboutsummaryrefslogtreecommitdiffstats
path: root/lib/Target/Mips/MipsJITInfo.cpp
diff options
context:
space:
mode:
authorBruno Cardoso Lopes <bruno.cardoso@gmail.com>2011-11-08 12:47:11 +0000
committerStephen Hines <srhines@google.com>2011-11-14 09:12:00 -0800
commitcf81b6149036a370292475699044054a1ca03a06 (patch)
treeea1c6ae90416d36b669a22279c8265913add4794 /lib/Target/Mips/MipsJITInfo.cpp
parente4b800b5a2b91b1ba008aba6af93cebea9e18676 (diff)
downloadexternal_llvm-cf81b6149036a370292475699044054a1ca03a06.zip
external_llvm-cf81b6149036a370292475699044054a1ca03a06.tar.gz
external_llvm-cf81b6149036a370292475699044054a1ca03a06.tar.bz2
This patch handles unaligned loads and stores in Mips JIT. Mips backend
implements unaligned loads and stores with assembler macro-instructions ulw, usw, ulh, ulhu, ush, and this patch emits corresponding instructions instead of these macros. Since each unaligned load/store is expanded into two corresponding loads/stores where offset for second load/store is modified by +3 (for words) or +1 (for halfwords). Patch by Petar Jovanovic and Sasa Stankovic. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@144081 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Target/Mips/MipsJITInfo.cpp')
-rw-r--r--lib/Target/Mips/MipsJITInfo.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/Target/Mips/MipsJITInfo.cpp b/lib/Target/Mips/MipsJITInfo.cpp
index e3f6a75..a0ee722 100644
--- a/lib/Target/Mips/MipsJITInfo.cpp
+++ b/lib/Target/Mips/MipsJITInfo.cpp
@@ -218,10 +218,16 @@ void MipsJITInfo::relocate(void *Function, MachineRelocation *MR,
*((unsigned*) RelocPos) |= (unsigned) ResultPtr;
break;
- case Mips::reloc_mips_lo:
- ResultPtr = ResultPtr & 0xffff;
+ case Mips::reloc_mips_lo: {
+ // Addend is needed for unaligned load/store instructions, where offset
+ // for the second load/store in the expanded instruction sequence must
+ // be modified by +1 or +3. Otherwise, Addend is 0.
+ int Addend = *((unsigned*) RelocPos) & 0xffff;
+ ResultPtr = (ResultPtr + Addend) & 0xffff;
+ *((unsigned*) RelocPos) &= 0xffff0000;
*((unsigned*) RelocPos) |= (unsigned) ResultPtr;
break;
+ }
default:
llvm_unreachable("ERROR: Unknown Mips relocation.");