summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--src/arch/arm/v7/pseudo.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 19758cd..adb58a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
16-05-27 Cyrille Bagard <nocbos@gmail.com>
+ * src/arch/arm/v7/pseudo.c:
+ Fix a mistake in a previous fix.
+
+16-05-27 Cyrille Bagard <nocbos@gmail.com>
+
* src/arch/arm/v7/opcodes/opcodes_tmp_arm.h:
* src/arch/arm/v7/opcodes/opcodes_tmp_thumb_16.h:
* src/arch/arm/v7/opcodes/opcodes_tmp_thumb_32.h:
diff --git a/src/arch/arm/v7/pseudo.c b/src/arch/arm/v7/pseudo.c
index 6f2451b..8487d6d 100644
--- a/src/arch/arm/v7/pseudo.c
+++ b/src/arch/arm/v7/pseudo.c
@@ -603,7 +603,7 @@ bool armv7_shift_c(uint32_t x, unsigned int n, SRType type, unsigned int amount,
if (amount == 0)
{
- *value = 0;
+ *value = x;
return true;
}