Module Name: src
Committed By: joerg
Date: Sat Feb 1 01:18:57 UTC 2014
Modified Files:
src/sys/arch/arm/include: locore.h
Log Message:
Be nice to LLVM and use an explicit immediate.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/include/locore.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/include/locore.h
diff -u src/sys/arch/arm/include/locore.h:1.9 src/sys/arch/arm/include/locore.h:1.10
--- src/sys/arch/arm/include/locore.h:1.9 Thu Jan 30 06:38:00 2014
+++ src/sys/arch/arm/include/locore.h Sat Feb 1 01:18:57 2014
@@ -198,7 +198,7 @@ read_thumb_insn(vaddr_t va, bool user_p)
uint32_t insn;
if (user_p) {
#ifdef _ARM_ARCH_T2
- __asm __volatile("ldrht %0, [%1]" : "=&r"(insn) : "r"(va));
+ __asm __volatile("ldrht %0, [%1], #0" : "=&r"(insn) : "r"(va));
#else
__asm __volatile("ldrt %0, [%1]" : "=&r"(insn) : "r"(va & ~3));
#ifdef __ARMEB__