aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2020-12-09 23:09:20 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2020-12-09 23:09:20 +0000
commit63bfcadf03cd1e0d6a98fe7a4cee189063668162 (patch)
tree77186b57607dc40631fd2973f9f42486cb7f8e37
parent05891acf7df8cfc22fd474376464a60b846a5e7d (diff)
parent4857b506edcaa1b7ed68d3b441c004a228f109c0 (diff)
downloadcapstone-63bfcadf03cd1e0d6a98fe7a4cee189063668162.tar.gz
Merge "Upgrade capstone to 8984920722733400e93f695a0c37a80158341103"
-rw-r--r--METADATA6
-rw-r--r--arch/M68K/M68KDisassembler.c10
2 files changed, 11 insertions, 5 deletions
diff --git a/METADATA b/METADATA
index abcc5540..993f8a99 100644
--- a/METADATA
+++ b/METADATA
@@ -9,11 +9,11 @@ third_party {
type: GIT
value: "https://github.com/aquynh/capstone"
}
- version: "2bc4e7cae793d4ef186c0cbd456dfd3e30c3b098"
+ version: "8984920722733400e93f695a0c37a80158341103"
license_type: NOTICE
last_upgrade_date {
year: 2020
- month: 11
- day: 23
+ month: 12
+ day: 8
}
}
diff --git a/arch/M68K/M68KDisassembler.c b/arch/M68K/M68KDisassembler.c
index 4b26e02c..78b7022a 100644
--- a/arch/M68K/M68KDisassembler.c
+++ b/arch/M68K/M68KDisassembler.c
@@ -2062,8 +2062,14 @@ static void d68020_cpgen(m68k_info *info)
ext->op_size.type = M68K_SIZE_TYPE_CPU;
ext->op_size.cpu_size = 0;
- op0 = &ext->operands[0];
- op1 = &ext->operands[1];
+ // Special case - adjust direction of fmove
+ if ((opmode == 0x00) && ((next >> 13) & 0x1) != 0) {
+ op0 = &ext->operands[1];
+ op1 = &ext->operands[0];
+ } else {
+ op0 = &ext->operands[0];
+ op1 = &ext->operands[1];
+ }
if (rm == 0 && supports_single_op && src == dst) {
ext->op_count = 1;