From d306ce58b4c7d544721ba328c447240cb2228fe5 Mon Sep 17 00:00:00 2001 From: Sandra Loosemore Date: Fri, 28 Nov 2014 14:41:32 -0800 Subject: Remove broken nios2 assembler dwim support. 2014-11-28 Sandra Loosemore include/opcode/ * nios2.h (NIOS2_INSN_ADDI, NIOS2_INSN_ANDI): Delete. (NIOS2_INSN_ORI, NIOS2_INSN_XORI): Delete. (NIOS2_INSN_OPTARG): Renumber. opcodes/ * nios2-opc.c (nios2_r1_opcodes): Remove deleted attributes from descriptors. gas/ * config/tc-nios2.c (can_evaluate_expr, get_expr_value): Delete. (output_addi, output_andi, output_ori, output_xori): Delete. (md_assemble): Remove calls to deleted functions. gas/testsuite/ * gas/nios2/nios2.exp: Make "movi" a list test. * gas/nios2/movi.s: Adjust comments, add another case. * gas/nios2/movi.l: New. * gas/nios2/movi.d: Delete. --- opcodes/ChangeLog | 5 +++++ opcodes/nios2-opc.c | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) (limited to 'opcodes') diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 9a1d68c..89fabdb 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,8 @@ +2014-11-28 Sandra Loosemore + + * nios2-opc.c (nios2_r1_opcodes): Remove deleted attributes + from descriptors. + 2014-11-28 Alan Modra * ppc-opc.c (powerpc_opcodes ): Don't deprecate for power7. diff --git a/opcodes/nios2-opc.c b/opcodes/nios2-opc.c index a12a2f8..4d24c79 100644 --- a/opcodes/nios2-opc.c +++ b/opcodes/nios2-opc.c @@ -179,13 +179,13 @@ const struct nios2_opcode nios2_r1_opcodes[] = {"add", "d,s,t", "d,s,t,E", 3, 4, iw_r_type, MATCH_R1_ADD, MASK_R1_ADD, 0, no_overflow}, {"addi", "t,s,i", "t,s,i,E", 3, 4, iw_i_type, - MATCH_R1_ADDI, MASK_R1_ADDI, NIOS2_INSN_ADDI, signed_immed16_overflow}, + MATCH_R1_ADDI, MASK_R1_ADDI, 0, signed_immed16_overflow}, {"and", "d,s,t", "d,s,t,E", 3, 4, iw_r_type, MATCH_R1_AND, MASK_R1_AND, 0, no_overflow}, {"andhi", "t,s,u", "t,s,u,E", 3, 4, iw_i_type, MATCH_R1_ANDHI, MASK_R1_ANDHI, 0, unsigned_immed16_overflow}, {"andi", "t,s,u", "t,s,u,E", 3, 4, iw_i_type, - MATCH_R1_ANDI, MASK_R1_ANDI, NIOS2_INSN_ANDI, unsigned_immed16_overflow}, + MATCH_R1_ANDI, MASK_R1_ANDI, 0, unsigned_immed16_overflow}, {"beq", "s,t,o", "s,t,o,E", 3, 4, iw_i_type, MATCH_R1_BEQ, MASK_R1_BEQ, NIOS2_INSN_CBRANCH, branch_target_overflow}, {"bge", "s,t,o", "s,t,o,E", 3, 4, iw_i_type, @@ -341,7 +341,7 @@ const struct nios2_opcode nios2_r1_opcodes[] = {"orhi", "t,s,u", "t,s,u,E", 3, 4, iw_i_type, MATCH_R1_ORHI, MASK_R1_ORHI, 0, unsigned_immed16_overflow}, {"ori", "t,s,u", "t,s,u,E", 3, 4, iw_i_type, - MATCH_R1_ORI, MASK_R1_ORI, NIOS2_INSN_ORI, unsigned_immed16_overflow}, + MATCH_R1_ORI, MASK_R1_ORI, 0, unsigned_immed16_overflow}, {"rdctl", "d,c", "d,c,E", 2, 4, iw_r_type, MATCH_R1_RDCTL, MASK_R1_RDCTL, 0, no_overflow}, {"rdprs", "t,s,i", "t,s,i,E", 3, 4, iw_i_type, @@ -395,7 +395,7 @@ const struct nios2_opcode nios2_r1_opcodes[] = {"xorhi", "t,s,u", "t,s,u,E", 3, 4, iw_i_type, MATCH_R1_XORHI, MASK_R1_XORHI, 0, unsigned_immed16_overflow}, {"xori", "t,s,u", "t,s,u,E", 3, 4, iw_i_type, - MATCH_R1_XORI, MASK_R1_XORI, NIOS2_INSN_XORI, unsigned_immed16_overflow} + MATCH_R1_XORI, MASK_R1_XORI, 0, unsigned_immed16_overflow} }; #define NIOS2_NUM_OPCODES \ -- cgit v1.1