aboutsummaryrefslogtreecommitdiff
path: root/opcodes
diff options
context:
space:
mode:
Diffstat (limited to 'opcodes')
-rw-r--r--opcodes/ChangeLog6
-rw-r--r--opcodes/aarch64-opc.c17
2 files changed, 19 insertions, 4 deletions
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index c96df92..424c27f 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,9 @@
+2013-11-05 Yufeng Zhang <yufeng.zhang@arm.com>
+
+ * aarch64-opc.c (set_syntax_error): New function.
+ (operand_general_constraint_met_p): Replace set_other_error
+ with set_syntax_error.
+
2013-10-30 Andreas Arnez <arnez@linux.vnet.ibm.com>
* s390-dis.c (init_disasm): Default to full 'zarch' opcode
diff --git a/opcodes/aarch64-opc.c b/opcodes/aarch64-opc.c
index f32ee5e..0d16bd6 100644
--- a/opcodes/aarch64-opc.c
+++ b/opcodes/aarch64-opc.c
@@ -1122,6 +1122,15 @@ set_error (aarch64_operand_error *mismatch_detail,
}
static inline void
+set_syntax_error (aarch64_operand_error *mismatch_detail, int idx,
+ const char* error)
+{
+ if (mismatch_detail == NULL)
+ return;
+ set_error (mismatch_detail, AARCH64_OPDE_SYNTAX_ERROR, idx, error);
+}
+
+static inline void
set_out_of_range_error (aarch64_operand_error *mismatch_detail,
int idx, int lower_bound, int upper_bound,
const char* error)
@@ -1288,8 +1297,8 @@ operand_general_constraint_met_p (const aarch64_opnd_info *opnds, int idx,
case ldst_unpriv:
if (opnd->addr.writeback == 1)
{
- set_other_error (mismatch_detail, idx,
- _("unexpected address writeback"));
+ set_syntax_error (mismatch_detail, idx,
+ _("unexpected address writeback"));
return 0;
}
break;
@@ -1299,8 +1308,8 @@ operand_general_constraint_met_p (const aarch64_opnd_info *opnds, int idx,
case asisdlsop:
if (opnd->addr.writeback == 0)
{
- set_other_error (mismatch_detail, idx,
- _("address writeback expected"));
+ set_syntax_error (mismatch_detail, idx,
+ _("address writeback expected"));
return 0;
}
break;