From 231c0592639d6f5c1796feb4a6375eab202a4acb Mon Sep 17 00:00:00 2001 From: Yao Qi Date: Thu, 19 Nov 2015 13:58:29 +0000 Subject: [PATCH] Change argument opcode type from enum aarch64_opcodes to uint32_t The patch fixes the following errors in C++ build, gdb/gdbserver/linux-aarch64-low.c: In function 'int emit_data_processing(uint32_t*, aarch64_opcodes, aarch64_register, aarch64_register, aarch64_operand)': gdb/gdbserver/linux-aarch64-low.c:1071:52: error: invalid conversion from 'unsigned int' to 'aarch64_opcodes' [-fpermissive] return emit_data_processing_reg (buf, opcode | operand_opcode, rd, ^ gdb/gdbserver: 2015-11-19 Yao Qi * linux-aarch64-low.c (emit_data_processing_reg): Change opcode type to uint32_t. --- gdb/gdbserver/ChangeLog | 5 +++++ gdb/gdbserver/linux-aarch64-low.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 183f8a9b57..86e1b64c95 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,8 @@ +2015-11-19 Yao Qi + + * linux-aarch64-low.c (emit_data_processing_reg): Change opcode + type to uint32_t. + 2015-11-19 Yao Qi * linux-aarch64-low.c (enum aarch64_operand_type): New. diff --git a/gdb/gdbserver/linux-aarch64-low.c b/gdb/gdbserver/linux-aarch64-low.c index 7cd9b77e1a..cb78666462 100644 --- a/gdb/gdbserver/linux-aarch64-low.c +++ b/gdb/gdbserver/linux-aarch64-low.c @@ -1029,7 +1029,7 @@ emit_stlr (uint32_t *buf, struct aarch64_register rt, /* Helper function for data processing instructions with register sources. */ static int -emit_data_processing_reg (uint32_t *buf, enum aarch64_opcodes opcode, +emit_data_processing_reg (uint32_t *buf, uint32_t opcode, struct aarch64_register rd, struct aarch64_register rn, struct aarch64_register rm)