summaryrefslogtreecommitdiff
path: root/src/arch/arm/v7/thumb_32.c
diff options
context:
space:
mode:
authorCyrille Bagard <nocbos@gmail.com>2014-12-05 22:32:21 (GMT)
committerCyrille Bagard <nocbos@gmail.com>2014-12-05 22:32:21 (GMT)
commit0a7b9b66bdcf386a36ec13ec480b52aa17406385 (patch)
tree95b9cfac29b50aa92eac9cbc9e754c9787f55438 /src/arch/arm/v7/thumb_32.c
parent12154652c576144405011b5bd267c15c9667f223 (diff)
Defined a new kind of operands for memory accesses.
git-svn-id: svn://svn.gna.org/svn/chrysalide/trunk@436 abbe820e-26c8-41b2-8c08-b7b2b41f8b0a
Diffstat (limited to 'src/arch/arm/v7/thumb_32.c')
-rw-r--r--src/arch/arm/v7/thumb_32.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/arch/arm/v7/thumb_32.c b/src/arch/arm/v7/thumb_32.c
index 87233b4..00b3171 100644
--- a/src/arch/arm/v7/thumb_32.c
+++ b/src/arch/arm/v7/thumb_32.c
@@ -182,7 +182,7 @@ GArchInstruction *process_armv7_thumb_32_instruction_set_encoding(uint32_t raw)
else if ((op2 & b1100111) == b0000011)
result = process_armv7_thumb_32_load_halfword_memory_hints(raw);
- else if ((op2 & b1100111) == b1100111)
+ else if ((op2 & b1100111) == b0000101)
result = process_armv7_thumb_32_load_word(raw);
/*
@@ -772,7 +772,7 @@ static GArchInstruction *process_armv7_thumb_32_load_word(uint32_t raw)
* ยง A6.3.7 Load word
*/
- if (((raw >> 22) & 0xfe700000) != 0xf8500000) return NULL;
+ if ((raw & 0xfe700000) != 0xf8500000) return NULL;
result = NULL;