Module Name: src
Committed By: matt
Date: Thu May 28 02:22:37 UTC 2015
Modified Files:
src/sys/arch/arm/include: locore.h
Log Message:
Fix ldrht
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 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.21 src/sys/arch/arm/include/locore.h:1.22
--- src/sys/arch/arm/include/locore.h:1.21 Mon Mar 30 05:43:55 2015
+++ src/sys/arch/arm/include/locore.h Thu May 28 02:22:37 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.h,v 1.21 2015/03/30 05:43:55 matt Exp $ */
+/* $NetBSD: locore.h,v 1.22 2015/05/28 02:22:37 matt Exp $ */
/*
* Copyright (c) 1994-1996 Mark Brinicombe.
@@ -227,7 +227,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], #0" : "=&r"(insn) : "r"(va));
+ __asm __volatile("ldrht %0, [%1]" : "=&r"(insn) : "r"(va));
#else
__asm __volatile("ldrt %0, [%1]" : "=&r"(insn) : "r"(va & ~3));
#ifdef __ARMEB__
