Commit 9b32fbf88ba4a6e2b35c0cd1714d10bb83a676a3
1 parent
a1aebcb8
CRIS: Make local objects static.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5446 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
1 changed file
with
24 additions
and
24 deletions
target-cris/translate.c
... | ... | @@ -61,21 +61,21 @@ |
61 | 61 | #define CC_MASK_NZVC 0xf |
62 | 62 | #define CC_MASK_RNZV 0x10e |
63 | 63 | |
64 | -TCGv cpu_env; | |
65 | -TCGv cpu_T[2]; | |
66 | -TCGv cpu_R[16]; | |
67 | -TCGv cpu_PR[16]; | |
68 | -TCGv cc_x; | |
69 | -TCGv cc_src; | |
70 | -TCGv cc_dest; | |
71 | -TCGv cc_result; | |
72 | -TCGv cc_op; | |
73 | -TCGv cc_size; | |
74 | -TCGv cc_mask; | |
75 | - | |
76 | -TCGv env_btaken; | |
77 | -TCGv env_btarget; | |
78 | -TCGv env_pc; | |
64 | +static TCGv cpu_env; | |
65 | +static TCGv cpu_T[2]; | |
66 | +static TCGv cpu_R[16]; | |
67 | +static TCGv cpu_PR[16]; | |
68 | +static TCGv cc_x; | |
69 | +static TCGv cc_src; | |
70 | +static TCGv cc_dest; | |
71 | +static TCGv cc_result; | |
72 | +static TCGv cc_op; | |
73 | +static TCGv cc_size; | |
74 | +static TCGv cc_mask; | |
75 | + | |
76 | +static TCGv env_btaken; | |
77 | +static TCGv env_btarget; | |
78 | +static TCGv env_pc; | |
79 | 79 | |
80 | 80 | #include "gen-icount.h" |
81 | 81 | |
... | ... | @@ -130,14 +130,14 @@ static void gen_BUG(DisasContext *dc, const char *file, int line) |
130 | 130 | cpu_abort(dc->env, "%s:%d\n", file, line); |
131 | 131 | } |
132 | 132 | |
133 | -const char *regnames[] = | |
133 | +static const char *regnames[] = | |
134 | 134 | { |
135 | 135 | "$r0", "$r1", "$r2", "$r3", |
136 | 136 | "$r4", "$r5", "$r6", "$r7", |
137 | 137 | "$r8", "$r9", "$r10", "$r11", |
138 | 138 | "$r12", "$r13", "$sp", "$acr", |
139 | 139 | }; |
140 | -const char *pregnames[] = | |
140 | +static const char *pregnames[] = | |
141 | 141 | { |
142 | 142 | "$bz", "$vr", "$pid", "$srs", |
143 | 143 | "$wz", "$exs", "$eda", "$mof", |
... | ... | @@ -146,7 +146,7 @@ const char *pregnames[] = |
146 | 146 | }; |
147 | 147 | |
148 | 148 | /* We need this table to handle preg-moves with implicit width. */ |
149 | -int preg_sizes[] = { | |
149 | +static int preg_sizes[] = { | |
150 | 150 | 1, /* bz. */ |
151 | 151 | 1, /* vr. */ |
152 | 152 | 4, /* pid. */ |
... | ... | @@ -1203,8 +1203,8 @@ static inline void cris_prepare_jmp (DisasContext *dc, unsigned int type) |
1203 | 1203 | tcg_gen_movi_tl(env_btaken, 1); |
1204 | 1204 | } |
1205 | 1205 | |
1206 | -void gen_load(DisasContext *dc, TCGv dst, TCGv addr, | |
1207 | - unsigned int size, int sign) | |
1206 | +static void gen_load(DisasContext *dc, TCGv dst, TCGv addr, | |
1207 | + unsigned int size, int sign) | |
1208 | 1208 | { |
1209 | 1209 | int mem_index = cpu_mmu_index(dc->env); |
1210 | 1210 | |
... | ... | @@ -1233,8 +1233,8 @@ void gen_load(DisasContext *dc, TCGv dst, TCGv addr, |
1233 | 1233 | } |
1234 | 1234 | } |
1235 | 1235 | |
1236 | -void gen_store (DisasContext *dc, TCGv addr, TCGv val, | |
1237 | - unsigned int size) | |
1236 | +static void gen_store (DisasContext *dc, TCGv addr, TCGv val, | |
1237 | + unsigned int size) | |
1238 | 1238 | { |
1239 | 1239 | int mem_index = cpu_mmu_index(dc->env); |
1240 | 1240 | |
... | ... | @@ -1409,7 +1409,7 @@ static int dec_prep_alu_m(DisasContext *dc, int s_ext, int memsize) |
1409 | 1409 | #if DISAS_CRIS |
1410 | 1410 | static const char *cc_name(int cc) |
1411 | 1411 | { |
1412 | - static char *cc_names[16] = { | |
1412 | + static const char *cc_names[16] = { | |
1413 | 1413 | "cc", "cs", "ne", "eq", "vc", "vs", "pl", "mi", |
1414 | 1414 | "ls", "hi", "ge", "lt", "gt", "le", "a", "p" |
1415 | 1415 | }; |
... | ... | @@ -2854,7 +2854,7 @@ static unsigned int dec_null(DisasContext *dc) |
2854 | 2854 | return 2; |
2855 | 2855 | } |
2856 | 2856 | |
2857 | -struct decoder_info { | |
2857 | +static struct decoder_info { | |
2858 | 2858 | struct { |
2859 | 2859 | uint32_t bits; |
2860 | 2860 | uint32_t mask; | ... | ... |