summaryrefslogtreecommitdiff
path: root/plugins/arm/v7
diff options
context:
space:
mode:
authorCyrille Bagard <nocbos@gmail.com>2018-05-29 07:28:39 (GMT)
committerCyrille Bagard <nocbos@gmail.com>2018-05-29 07:28:39 (GMT)
commit5fcd066f1e23041207f78e10c87c9c8560a815f7 (patch)
treee2dacb42024ebe172f8e2018c3ee540c1b706a96 /plugins/arm/v7
parent85f8cfc150a9cbb07136863bc1ec379b29c723ab (diff)
Fixed function names for some Thumb32 decoding calls.
Diffstat (limited to 'plugins/arm/v7')
-rw-r--r--plugins/arm/v7/opcodes/opcodes_tmp_thumb_32.h9
-rw-r--r--plugins/arm/v7/thumb_32.c20
2 files changed, 10 insertions, 19 deletions
diff --git a/plugins/arm/v7/opcodes/opcodes_tmp_thumb_32.h b/plugins/arm/v7/opcodes/opcodes_tmp_thumb_32.h
index ce803c6..e98a523 100644
--- a/plugins/arm/v7/opcodes/opcodes_tmp_thumb_32.h
+++ b/plugins/arm/v7/opcodes/opcodes_tmp_thumb_32.h
@@ -1,16 +1,7 @@
#ifndef thumb_32_def_tmp_h
#define thumb_32_def_tmp_h
#define armv7_read_thumb_32_instr_a8_isb(r) NULL
-#define armv7_read_thumb_32_instr_a8_pld_immediate(r) NULL
-#define armv7_read_thumb_32_instr_a8_pld_register(r) NULL
#define armv7_read_thumb_32_instr_a8_pli_immediate_literal(r) NULL
-#define armv7_read_thumb_32_instr_a8_sqadd16(r) NULL
-#define armv7_read_thumb_32_instr_a8_sqadd8(r) NULL
-#define armv7_read_thumb_32_instr_a8_sqasx(r) NULL
-#define armv7_read_thumb_32_instr_a8_sqsax(r) NULL
-#define armv7_read_thumb_32_instr_a8_sqsub16(r) NULL
-#define armv7_read_thumb_32_instr_a8_sqsub8(r) NULL
-#define armv7_read_thumb_32_instr_a8_sub_register_thumb(r) NULL
#define armv7_read_thumb_32_instr_a8_tbb_tbh(r) NULL
#define armv7_read_thumb_32_instr_a9_enterx_leavex(r) NULL
#endif
diff --git a/plugins/arm/v7/thumb_32.c b/plugins/arm/v7/thumb_32.c
index fe06465..9f5a00a 100644
--- a/plugins/arm/v7/thumb_32.c
+++ b/plugins/arm/v7/thumb_32.c
@@ -1107,7 +1107,7 @@ static GArchInstruction *process_armv7_thumb_32_load_byte_memory_hints(uint32_t
result = armv7_read_thumb_32_instr_a8_ldrb_register(raw);
else /*if (rt == b1111) */
- result = armv7_read_thumb_32_instr_a8_pld_register(raw);
+ result = armv7_read_thumb_32_instr_a8_pld_pldw_register(raw);
}
@@ -1130,7 +1130,7 @@ static GArchInstruction *process_armv7_thumb_32_load_byte_memory_hints(uint32_t
result = armv7_read_thumb_32_instr_a8_ldrb_immediate_thumb(raw);
else /*if (rt == b1111) */
- result = armv7_read_thumb_32_instr_a8_pld_immediate(raw);
+ result = armv7_read_thumb_32_instr_a8_pld_pldw_immediate(raw);
}
@@ -1143,7 +1143,7 @@ static GArchInstruction *process_armv7_thumb_32_load_byte_memory_hints(uint32_t
result = armv7_read_thumb_32_instr_a8_ldrb_immediate_thumb(raw);
else /*if (rt == b1111) */
- result = armv7_read_thumb_32_instr_a8_pld_immediate(raw);
+ result = armv7_read_thumb_32_instr_a8_pld_pldw_immediate(raw);
}
@@ -1401,7 +1401,7 @@ static GArchInstruction *process_armv7_thumb_32_data_processing_shifted_register
result = armv7_read_thumb_32_instr_a8_cmp_register(raw);
else
- result = armv7_read_thumb_32_instr_a8_sub_register_thumb(raw);
+ result = armv7_read_thumb_32_instr_a8_sub_register(raw);
break;
@@ -1668,27 +1668,27 @@ static GArchInstruction *process_armv7_thumb_32_parallel_addition_and_subtractio
switch (op1)
{
case b001:
- result = armv7_read_thumb_32_instr_a8_sqadd16(raw);
+ result = armv7_read_thumb_32_instr_a8_qadd16(raw);
break;
case b010:
- result = armv7_read_thumb_32_instr_a8_sqasx(raw);
+ result = armv7_read_thumb_32_instr_a8_qasx(raw);
break;
case b110:
- result = armv7_read_thumb_32_instr_a8_sqsax(raw);
+ result = armv7_read_thumb_32_instr_a8_qsax(raw);
break;
case b101:
- result = armv7_read_thumb_32_instr_a8_sqsub16(raw);
+ result = armv7_read_thumb_32_instr_a8_qsub16(raw);
break;
case b000:
- result = armv7_read_thumb_32_instr_a8_sqadd8(raw);
+ result = armv7_read_thumb_32_instr_a8_qadd8(raw);
break;
case b100:
- result = armv7_read_thumb_32_instr_a8_sqsub8(raw);
+ result = armv7_read_thumb_32_instr_a8_qsub8(raw);
break;
}