From 62836bf48e1a5312afa895ec7730a332e0928e0a Mon Sep 17 00:00:00 2001 From: Doug Evans Date: Mon, 23 Nov 2009 09:37:09 +0000 Subject: * cgen-engine.h (EXTRACT_MSB0_SINT): Renamed from EXTRACT_MSB0_INT. (EXTRACT_LSB0_SINT): Renamed from EXTRACT_LSB0_INT. plus regenerate cgen files --- sim/cris/cpuv10.h | 10 +++++----- sim/cris/cpuv32.h | 8 ++++---- sim/cris/decodev10.c | 14 +++++++------- sim/cris/decodev32.c | 12 ++++++------ 4 files changed, 22 insertions(+), 22 deletions(-) (limited to 'sim/cris') diff --git a/sim/cris/cpuv10.h b/sim/cris/cpuv10.h index d4d7528..858c5ae 100644 --- a/sim/cris/cpuv10.h +++ b/sim/cris/cpuv10.h @@ -596,7 +596,7 @@ struct scache { f_operand2 = EXTRACT_LSB0_UINT (insn, 16, 15, 4); \ f_mode = EXTRACT_LSB0_UINT (insn, 16, 11, 2); \ f_opcode = EXTRACT_LSB0_UINT (insn, 16, 9, 4); \ - f_s6 = EXTRACT_LSB0_INT (insn, 16, 5, 6); \ + f_s6 = EXTRACT_LSB0_SINT (insn, 16, 5, 6); \ #define EXTRACT_IFMT_MOVECBR_VARS \ UINT f_operand2; \ @@ -924,7 +924,7 @@ struct scache { f_operand2 = EXTRACT_LSB0_UINT (insn, 16, 15, 4); \ f_mode = EXTRACT_LSB0_UINT (insn, 16, 11, 2); \ f_opcode_hi = EXTRACT_LSB0_UINT (insn, 16, 9, 2); \ - f_disp9_hi = EXTRACT_LSB0_INT (insn, 16, 0, 1); \ + f_disp9_hi = EXTRACT_LSB0_SINT (insn, 16, 0, 1); \ f_disp9_lo = EXTRACT_LSB0_UINT (insn, 16, 7, 7); \ {\ SI tmp_abslo;\ @@ -947,7 +947,7 @@ struct scache { f_operand2 = EXTRACT_LSB0_UINT (insn, 16, 15, 4); \ f_mode = EXTRACT_LSB0_UINT (insn, 16, 11, 2); \ f_opcode_hi = EXTRACT_LSB0_UINT (insn, 16, 9, 2); \ - f_disp9_hi = EXTRACT_LSB0_INT (insn, 16, 0, 1); \ + f_disp9_hi = EXTRACT_LSB0_SINT (insn, 16, 0, 1); \ f_disp9_lo = EXTRACT_LSB0_UINT (insn, 16, 7, 7); \ {\ SI tmp_abslo;\ @@ -1058,7 +1058,7 @@ struct scache { f_operand2 = EXTRACT_LSB0_UINT (insn, 16, 15, 4); \ f_mode = EXTRACT_LSB0_UINT (insn, 16, 11, 2); \ f_opcode_hi = EXTRACT_LSB0_UINT (insn, 16, 9, 2); \ - f_s8 = EXTRACT_LSB0_INT (insn, 16, 7, 8); \ + f_s8 = EXTRACT_LSB0_SINT (insn, 16, 7, 8); \ #define EXTRACT_IFMT_BDAPQPC_VARS \ UINT f_operand2; \ @@ -1071,7 +1071,7 @@ struct scache { f_operand2 = EXTRACT_LSB0_UINT (insn, 16, 15, 4); \ f_mode = EXTRACT_LSB0_UINT (insn, 16, 11, 2); \ f_opcode_hi = EXTRACT_LSB0_UINT (insn, 16, 9, 2); \ - f_s8 = EXTRACT_LSB0_INT (insn, 16, 7, 8); \ + f_s8 = EXTRACT_LSB0_SINT (insn, 16, 7, 8); \ /* Collection of various things for the trace handler to use. */ diff --git a/sim/cris/cpuv32.h b/sim/cris/cpuv32.h index 421a5ce..b89fa2e 100644 --- a/sim/cris/cpuv32.h +++ b/sim/cris/cpuv32.h @@ -709,7 +709,7 @@ struct scache { f_operand2 = EXTRACT_LSB0_UINT (insn, 16, 15, 4); \ f_mode = EXTRACT_LSB0_UINT (insn, 16, 11, 2); \ f_opcode = EXTRACT_LSB0_UINT (insn, 16, 9, 4); \ - f_s6 = EXTRACT_LSB0_INT (insn, 16, 5, 6); \ + f_s6 = EXTRACT_LSB0_SINT (insn, 16, 5, 6); \ #define EXTRACT_IFMT_MOVECBR_VARS \ UINT f_operand2; \ @@ -1082,7 +1082,7 @@ struct scache { f_operand2 = EXTRACT_LSB0_UINT (insn, 16, 15, 4); \ f_mode = EXTRACT_LSB0_UINT (insn, 16, 11, 2); \ f_opcode_hi = EXTRACT_LSB0_UINT (insn, 16, 9, 2); \ - f_disp9_hi = EXTRACT_LSB0_INT (insn, 16, 0, 1); \ + f_disp9_hi = EXTRACT_LSB0_SINT (insn, 16, 0, 1); \ f_disp9_lo = EXTRACT_LSB0_UINT (insn, 16, 7, 7); \ {\ SI tmp_abslo;\ @@ -1105,7 +1105,7 @@ struct scache { f_operand2 = EXTRACT_LSB0_UINT (insn, 16, 15, 4); \ f_mode = EXTRACT_LSB0_UINT (insn, 16, 11, 2); \ f_opcode_hi = EXTRACT_LSB0_UINT (insn, 16, 9, 2); \ - f_disp9_hi = EXTRACT_LSB0_INT (insn, 16, 0, 1); \ + f_disp9_hi = EXTRACT_LSB0_SINT (insn, 16, 0, 1); \ f_disp9_lo = EXTRACT_LSB0_UINT (insn, 16, 7, 7); \ {\ SI tmp_abslo;\ @@ -1251,7 +1251,7 @@ struct scache { f_operand2 = EXTRACT_LSB0_UINT (insn, 16, 15, 4); \ f_mode = EXTRACT_LSB0_UINT (insn, 16, 11, 2); \ f_opcode_hi = EXTRACT_LSB0_UINT (insn, 16, 9, 2); \ - f_s8 = EXTRACT_LSB0_INT (insn, 16, 7, 8); \ + f_s8 = EXTRACT_LSB0_SINT (insn, 16, 7, 8); \ #define EXTRACT_IFMT_FIDXI_VARS \ UINT f_operand2; \ diff --git a/sim/cris/decodev10.c b/sim/cris/decodev10.c index 516bb48..303e4cb 100644 --- a/sim/cris/decodev10.c +++ b/sim/cris/decodev10.c @@ -2499,7 +2499,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, INT f_s6; f_operand2 = EXTRACT_LSB0_UINT (insn, 16, 15, 4); - f_s6 = EXTRACT_LSB0_INT (insn, 16, 5, 6); + f_s6 = EXTRACT_LSB0_SINT (insn, 16, 5, 6); /* Record the fields for the semantic handler. */ FLD (f_s6) = f_s6; @@ -3006,7 +3006,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, INT f_s6; f_operand2 = EXTRACT_LSB0_UINT (insn, 16, 15, 4); - f_s6 = EXTRACT_LSB0_INT (insn, 16, 5, 6); + f_s6 = EXTRACT_LSB0_SINT (insn, 16, 5, 6); /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; @@ -4634,7 +4634,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, INT f_s6; f_operand2 = EXTRACT_LSB0_UINT (insn, 16, 15, 4); - f_s6 = EXTRACT_LSB0_INT (insn, 16, 5, 6); + f_s6 = EXTRACT_LSB0_SINT (insn, 16, 5, 6); /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; @@ -4855,7 +4855,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, f_operand2 = EXTRACT_LSB0_UINT (insn, 16, 15, 4); f_disp9_lo = EXTRACT_LSB0_UINT (insn, 16, 7, 7); - f_disp9_hi = EXTRACT_LSB0_INT (insn, 16, 0, 1); + f_disp9_hi = EXTRACT_LSB0_SINT (insn, 16, 0, 1); { SI tmp_abslo; SI tmp_absval; @@ -4889,7 +4889,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, INT f_disp9; f_disp9_lo = EXTRACT_LSB0_UINT (insn, 16, 7, 7); - f_disp9_hi = EXTRACT_LSB0_INT (insn, 16, 0, 1); + f_disp9_hi = EXTRACT_LSB0_SINT (insn, 16, 0, 1); { SI tmp_abslo; SI tmp_absval; @@ -5308,7 +5308,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, INT f_s8; f_operand2 = EXTRACT_LSB0_UINT (insn, 16, 15, 4); - f_s8 = EXTRACT_LSB0_INT (insn, 16, 7, 8); + f_s8 = EXTRACT_LSB0_SINT (insn, 16, 7, 8); /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; @@ -5333,7 +5333,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc, #define FLD(f) abuf->fields.sfmt_addoq.f INT f_s8; - f_s8 = EXTRACT_LSB0_INT (insn, 16, 7, 8); + f_s8 = EXTRACT_LSB0_SINT (insn, 16, 7, 8); /* Record the fields for the semantic handler. */ FLD (f_s8) = f_s8; diff --git a/sim/cris/decodev32.c b/sim/cris/decodev32.c index 5e580d9..6fb0c7a 100644 --- a/sim/cris/decodev32.c +++ b/sim/cris/decodev32.c @@ -1985,7 +1985,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, INT f_s6; f_operand2 = EXTRACT_LSB0_UINT (insn, 16, 15, 4); - f_s6 = EXTRACT_LSB0_INT (insn, 16, 5, 6); + f_s6 = EXTRACT_LSB0_SINT (insn, 16, 5, 6); /* Record the fields for the semantic handler. */ FLD (f_s6) = f_s6; @@ -2492,7 +2492,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, INT f_s6; f_operand2 = EXTRACT_LSB0_UINT (insn, 16, 15, 4); - f_s6 = EXTRACT_LSB0_INT (insn, 16, 5, 6); + f_s6 = EXTRACT_LSB0_SINT (insn, 16, 5, 6); /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; @@ -4110,7 +4110,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, INT f_s6; f_operand2 = EXTRACT_LSB0_UINT (insn, 16, 15, 4); - f_s6 = EXTRACT_LSB0_INT (insn, 16, 5, 6); + f_s6 = EXTRACT_LSB0_SINT (insn, 16, 5, 6); /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; @@ -4432,7 +4432,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, f_operand2 = EXTRACT_LSB0_UINT (insn, 16, 15, 4); f_disp9_lo = EXTRACT_LSB0_UINT (insn, 16, 7, 7); - f_disp9_hi = EXTRACT_LSB0_INT (insn, 16, 0, 1); + f_disp9_hi = EXTRACT_LSB0_SINT (insn, 16, 0, 1); { SI tmp_abslo; SI tmp_absval; @@ -4466,7 +4466,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, INT f_disp9; f_disp9_lo = EXTRACT_LSB0_UINT (insn, 16, 7, 7); - f_disp9_hi = EXTRACT_LSB0_INT (insn, 16, 0, 1); + f_disp9_hi = EXTRACT_LSB0_SINT (insn, 16, 0, 1); { SI tmp_abslo; SI tmp_absval; @@ -4836,7 +4836,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc, INT f_s8; f_operand2 = EXTRACT_LSB0_UINT (insn, 16, 15, 4); - f_s8 = EXTRACT_LSB0_INT (insn, 16, 7, 8); + f_s8 = EXTRACT_LSB0_SINT (insn, 16, 7, 8); /* Record the fields for the semantic handler. */ FLD (f_operand2) = f_operand2; -- cgit v1.1