summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCyrille Bagard <nocbos@gmail.com>2016-05-27 21:27:13 (GMT)
committerCyrille Bagard <nocbos@gmail.com>2016-05-27 21:27:13 (GMT)
commitbfaf16a1957cdbc58f92ee8859551661c3c0dcce (patch)
treeabf55065b89288dd08bc3fc444290e56db94b303
parentac2906c17089d3f5fa3b7ef5988a3d24a8c6c542 (diff)
Fixed a mistake in a previous fix.
-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;
}