OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

target/cris: Mark static arrays const

Browse Source 
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Tested-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2021-06-19 20:57:31 -07:00
parent 71fc4615c6
commit 5899ce683e
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
target/cris/translate.c
View File

@ -137,14 +137,15 @@ static void gen_BUG(DisasContext *dc, const char *file, int line)
cpu_abort(CPU(dc->cpu), "%s:%d pc=%x\n", file, line, dc->pc); cpu_abort(CPU(dc->cpu), "%s:%d pc=%x\n", file, line, dc->pc);
} }
static const char *regnames_v32[] = static const char * const regnames_v32[] =
{ {
"$r0", "$r1", "$r2", "$r3", "$r0", "$r1", "$r2", "$r3",
"$r4", "$r5", "$r6", "$r7", "$r4", "$r5", "$r6", "$r7",
"$r8", "$r9", "$r10", "$r11", "$r8", "$r9", "$r10", "$r11",
"$r12", "$r13", "$sp", "$acr", "$r12", "$r13", "$sp", "$acr",
}; };
static const char *pregnames_v32[] =
static const char * const pregnames_v32[] =
{ {
"$bz", "$vr", "$pid", "$srs", "$bz", "$vr", "$pid", "$srs",
"$wz", "$exs", "$eda", "$mof", "$wz", "$exs", "$eda", "$mof",
@ -153,7 +154,7 @@ static const char *pregnames_v32[] =
}; };
/* We need this table to handle preg-moves with implicit width. */ /* We need this table to handle preg-moves with implicit width. */
static int preg_sizes[] = { static const int preg_sizes[] = {
1, /* bz. */ 1, /* bz. */
1, /* vr. */ 1, /* vr. */
4, /* pid. */ 4, /* pid. */
@ -475,9 +476,9 @@ static inline void t_gen_swapw(TCGv d, TCGv s)
((T0 >> 5) & 0x02020202) | ((T0 >> 5) & 0x02020202) |
((T0 >> 7) & 0x01010101)); ((T0 >> 7) & 0x01010101));
*/ */
static inline void t_gen_swapr(TCGv d, TCGv s) static void t_gen_swapr(TCGv d, TCGv s)
{ {
struct { static const struct {
int shift; /* LSL when positive, LSR when negative. */ int shift; /* LSL when positive, LSR when negative. */
uint32_t mask; uint32_t mask;
} bitrev[] = { } bitrev[] = {
@ -1279,7 +1280,7 @@ static int dec_prep_alu_m(CPUCRISState *env, DisasContext *dc,
#if DISAS_CRIS #if DISAS_CRIS
static const char *cc_name(int cc) static const char *cc_name(int cc)
{ {
static const char *cc_names[16] = { static const char * const cc_names[16] = {
"cc", "cs", "ne", "eq", "vc", "vs", "pl", "mi", "cc", "cs", "ne", "eq", "vc", "vs", "pl", "mi",
"ls", "hi", "ge", "lt", "gt", "le", "a", "p" "ls", "hi", "ge", "lt", "gt", "le", "a", "p"
}; };
@ -2926,7 +2927,7 @@ static int dec_null(CPUCRISState *env, DisasContext *dc)
return 2; return 2;
} }
static struct decoder_info { static const struct decoder_info {
struct { struct {
uint32_t bits; uint32_t bits;
uint32_t mask; uint32_t mask;
@ -3363,8 +3364,8 @@ void cris_cpu_dump_state(CPUState *cs, FILE *f, int flags)
{ {
CRISCPU *cpu = CRIS_CPU(cs); CRISCPU *cpu = CRIS_CPU(cs);
CPUCRISState *env = &cpu->env; CPUCRISState *env = &cpu->env;
const char **regnames; const char * const *regnames;
const char **pregnames; const char * const *pregnames;
int i; int i;
if (!env) { if (!env) {

6
target/cris/translate_v10.c.inc
View File

@ -21,7 +21,7 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "crisv10-decode.h" #include "crisv10-decode.h"
static const char *regnames_v10[] = static const char * const regnames_v10[] =
{ {
"$r0", "$r1", "$r2", "$r3", "$r0", "$r1", "$r2", "$r3",
"$r4", "$r5", "$r6", "$r7", "$r4", "$r5", "$r6", "$r7",
@ -29,7 +29,7 @@ static const char *regnames_v10[] =
"$r12", "$r13", "$sp", "$pc", "$r12", "$r13", "$sp", "$pc",
}; };
static const char *pregnames_v10[] = static const char * const pregnames_v10[] =
{ {
"$bz", "$vr", "$p2", "$p3", "$bz", "$vr", "$p2", "$p3",
"$wz", "$ccr", "$p6-prefix", "$mof", "$wz", "$ccr", "$p6-prefix", "$mof",
@ -38,7 +38,7 @@ static const char *pregnames_v10[] =
}; };
/* We need this table to handle preg-moves with implicit width. */ /* We need this table to handle preg-moves with implicit width. */
static int preg_sizes_v10[] = { static const int preg_sizes_v10[] = {
1, /* bz. */ 1, /* bz. */
1, /* vr. */ 1, /* vr. */
1, /* pid. */ 1, /* pid. */