Michael Bruck <mbruck@digenius.de> ARM11 cleanup stale dependencies with generic...

[openocd.git] / src / target / arm_disassembler.c

diff --git a/src/target/arm_disassembler.c b/src/target/arm_disassembler.c
index 2e87bb3c37f71d827eb1c601d6a34bd116739ca4..dcff7a743c6f6fa3d9e5424c6f340b8ed1c9b0a4 100644 (file)
--- a/src/target/arm_disassembler.c
+++ b/src/target/arm_disassembler.c
@@ -22,10 +22,8 @@
 #endif
 
 #include "arm_disassembler.h"
-
 #include "log.h"
 
-#include <string.h>
 
 /* textual represenation of the condition field */
 /* ALways (default) is ommitted (empty string) */
@@ -818,7 +816,7 @@ int evaluate_misc_instr(u32 opcode, u32 address, arm_instruction_t *instruction)
        }
        
        /* CLZ */
-       if ((opcode & 0x0060000f0) == 0x00300010)
+       if ((opcode & 0x006000f0) == 0x00600010)
        {
                u8 Rm, Rd;
                instruction->type = ARM_CLZ;
@@ -829,8 +827,8 @@ int evaluate_misc_instr(u32 opcode, u32 address, arm_instruction_t *instruction)
                                 address, opcode, COND(opcode), Rd, Rm);
        }
        
-       /* BLX */
-       if ((opcode & 0x0060000f0) == 0x00200030)
+       /* BLX(2) */
+       if ((opcode & 0x006000f0) == 0x00200030)
        {
                u8 Rm;
                instruction->type = ARM_BLX;