* [PATCH] opcodes: cleanup nds32 variables
@ 2021-06-27 6:18 Mike Frysinger
2021-07-01 10:10 ` Nick Clifton
0 siblings, 1 reply; 2+ messages in thread
From: Mike Frysinger @ 2021-06-27 6:18 UTC (permalink / raw)
To: binutils
For the variables that don't need to be exported, mark them static.
For the ones shared between modules, add a "nds32_" prefix to avoid
collisions with these common variable names.
---
opcodes/nds32-asm.c | 54 ++++++++++++++++++++++-----------------------
opcodes/nds32-dis.c | 26 +++++++++++-----------
2 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/opcodes/nds32-asm.c b/opcodes/nds32-asm.c
index f641c60f68c4..a513255c1c18 100644
--- a/opcodes/nds32-asm.c
+++ b/opcodes/nds32-asm.c
@@ -99,7 +99,7 @@ static int parse_im6_ms (struct nds32_asm_desc *, struct nds32_asm_insn *,
Field table for operands and bit-fields. */
-const field_t operand_fields[] =
+const field_t nds32_operand_fields[] =
{
{"rt", 20, 5, 0, HW_GPR, NULL},
{"ra", 15, 5, 0, HW_GPR, NULL},
@@ -1114,7 +1114,7 @@ struct nds32_opcode nds32_opcodes[] =
{NULL, NULL, 0, 0, 0, 0, NULL, 0, NULL},
};
-const keyword_t keyword_gpr[] =
+const keyword_t nds32_keyword_gpr[] =
{
/* Standard names. */
{"r0", 0, ATTR (RDREG)}, {"r1", 1, ATTR (RDREG)}, {"r2", 2, ATTR (RDREG)},
@@ -1160,7 +1160,7 @@ const keyword_t keyword_gpr[] =
{NULL, 0, 0}
};
-const keyword_t keyword_usr[] =
+static const keyword_t keyword_usr[] =
{
{"d0.lo", USRIDX (0, 0), 0},
{"d0.hi", USRIDX (0, 1), 0},
@@ -1195,12 +1195,12 @@ const keyword_t keyword_usr[] =
{NULL, 0, 0}
};
-const keyword_t keyword_dxr[] =
+static const keyword_t keyword_dxr[] =
{
{"d0", 0, 0}, {"d1", 1, 0}, {NULL, 0, 0}
};
-const keyword_t keyword_sr[] =
+static const keyword_t keyword_sr[] =
{
{"cpu_ver", SRIDX (0, 0, 0), 0}, {"cr0", SRIDX (0, 0, 0), 0},
{"icm_cfg", SRIDX (0, 1, 0), 0}, {"cr1", SRIDX (0, 1, 0), 0},
@@ -1351,12 +1351,12 @@ const keyword_t keyword_sr[] =
{NULL,0 ,0}
};
-const keyword_t keyword_cp[] =
+static const keyword_t keyword_cp[] =
{
{"cp0", 0, 0}, {"cp1", 1, 0}, {"cp2", 2, 0}, {"cp3", 3, 0}, {NULL, 0, 0}
};
-const keyword_t keyword_cpr[] =
+static const keyword_t keyword_cpr[] =
{
{"cpr0", 0, 0}, {"cpr1", 1, 0}, {"cpr2", 2, 0}, {"cpr3", 3, 0},
{"cpr4", 4, 0}, {"cpr5", 5, 0}, {"cpr6", 6, 0}, {"cpr7", 7, 0},
@@ -1369,7 +1369,7 @@ const keyword_t keyword_cpr[] =
{NULL, 0, 0}
};
-const keyword_t keyword_fsr[] =
+static const keyword_t keyword_fsr[] =
{
{"fs0", 0, 0}, {"fs1", 1, 0}, {"fs2", 2, 0}, {"fs3", 3, 0}, {"fs4", 4, 0},
{"fs5", 5, 0}, {"fs6", 6, 0}, {"fs7", 7, 0}, {"fs8", 8, 0}, {"fs9", 9, 0},
@@ -1381,7 +1381,7 @@ const keyword_t keyword_fsr[] =
{"fs30", 30, 0}, {"fs31", 31, 0}, {NULL, 0 ,0}
};
-const keyword_t keyword_fdr[] =
+static const keyword_t keyword_fdr[] =
{
{"fd0", 0, 0}, {"fd1", 1, 0}, {"fd2", 2, 0}, {"fd3", 3, 0}, {"fd4", 4, 0},
{"fd5", 5, 0}, {"fd6", 6, 0}, {"fd7", 7, 0}, {"fd8", 8, 0}, {"fd9", 9, 0},
@@ -1393,14 +1393,14 @@ const keyword_t keyword_fdr[] =
{"fd30", 30, 0}, {"fd31", 31, 0}, {NULL, 0, 0}
};
-const keyword_t keyword_abdim[] =
+static const keyword_t keyword_abdim[] =
{
{"bi", 0, 0}, {"bim", 1, 0}, {"bd", 2, 0}, {"bdm", 3, 0},
{"ai", 4, 0}, {"aim", 5, 0}, {"ad", 6, 0}, {"adm", 7, 0},
{NULL, 0, 0}
};
-const keyword_t keyword_abm[] =
+static const keyword_t keyword_abm[] =
{
{"b", 0, 0}, {"bm", 1, 0}, {"bx", 2, 0}, {"bmx", 3, 0},
{"a", 4, 0}, {"am", 5, 0}, {"ax", 6, 0}, {"amx", 7, 0},
@@ -1417,7 +1417,7 @@ static const keyword_t keyword_dtitoff[] =
{"itoff", 1, 0}, {"toff", 3, 0}, {NULL, 0, 0}
};
-const keyword_t keyword_dpref_st[] =
+static const keyword_t keyword_dpref_st[] =
{
{"srd", 0, 0}, {"mrd", 1, 0}, {"swr", 2, 0}, {"mwr", 3, 0},
{"pte", 4, 0}, {"clwr", 5, 0}, {NULL, 0, 0}
@@ -1468,7 +1468,7 @@ static const keyword_t keyword_cctl_st5[] =
{"l1d_wball", 0xf, 0}, {NULL, 0, 0}
};
-const keyword_t keyword_cctl_lv[] =
+static const keyword_t keyword_cctl_lv[] =
{
{"1level", 0, 0}, {"alevel", 1, 0}, {"0", 0, 0}, {"1", 1, 0},
{NULL, 0, 0},
@@ -1485,7 +1485,7 @@ static const keyword_t keyword_tlbop_st[] =
{NULL, 0, 0},
};
-const keyword_t keyword_standby_st[] =
+static const keyword_t keyword_standby_st[] =
{
{"no_wake_grant", 0, 0},
{"wake_grant", 1, 0},
@@ -1497,33 +1497,33 @@ const keyword_t keyword_standby_st[] =
{NULL, 0, 0},
};
-const keyword_t keyword_msync_st[] =
+static const keyword_t keyword_msync_st[] =
{
{"all", 0, 0}, {"store", 1, 0},
{NULL, 0, 0}
};
-const keyword_t keyword_im5_i[] =
+static const keyword_t keyword_im5_i[] =
{
{"i0", 0, 0}, {"i1", 1, 0}, {"i2", 2, 0}, {"i3", 3, 0},
{"i4", 4, 0}, {"i5", 5, 0}, {"i6", 6, 0}, {"i7", 7, 0},
{NULL, 0, 0}
};
-const keyword_t keyword_im5_m[] =
+static const keyword_t keyword_im5_m[] =
{
{"m0", 0, 0}, {"m1", 1, 0}, {"m2", 2, 0}, {"m3", 3, 0},
{"m4", 4, 0}, {"m5", 5, 0}, {"m6", 6, 0}, {"m7", 7, 0},
{NULL, 0, 0}
};
-const keyword_t keyword_accumulator[] =
+static const keyword_t keyword_accumulator[] =
{
{"d0.lo", 0, 0}, {"d0.hi", 1, 0}, {"d1.lo", 2, 0}, {"d1.hi", 3, 0},
{NULL, 0, 0}
};
-const keyword_t keyword_aridx[] =
+static const keyword_t keyword_aridx[] =
{
{"i0", 0, 0}, {"i1", 1, 0}, {"i2", 2, 0}, {"i3", 3, 0},
{"i4", 4, 0}, {"i5", 5, 0}, {"i6", 6, 0}, {"i7", 7, 0},
@@ -1535,7 +1535,7 @@ const keyword_t keyword_aridx[] =
{NULL, 0, 0}
};
-const keyword_t keyword_aridx2[] =
+static const keyword_t keyword_aridx2[] =
{
{"cbb0", 0, 0}, {"cbb1", 1, 0}, {"cbb2", 2, 0}, {"cbb3", 3, 0},
{"cbe0", 4, 0}, {"cbe1", 5, 0}, {"cbe2", 6, 0}, {"cbe3", 7, 0},
@@ -1543,7 +1543,7 @@ const keyword_t keyword_aridx2[] =
{NULL, 0, 0}
};
-const keyword_t keyword_aridxi[] =
+static const keyword_t keyword_aridxi[] =
{
{"i0", 0, 0}, {"i1", 1, 0}, {"i2", 2, 0}, {"i3", 3, 0},
{"i4", 4, 0}, {"i5", 5, 0}, {"i6", 6, 0}, {"i7", 7, 0},
@@ -1552,16 +1552,16 @@ const keyword_t keyword_aridxi[] =
{NULL, 0, 0}
};
-const keyword_t keyword_aridxi_mx[] =
+static const keyword_t keyword_aridxi_mx[] =
{
{"m1", 9, 0}, {"m2", 10, 0}, {"m3",11, 0},
{"m5",13, 0}, {"m6",14, 0}, {"m7",15, 0},
{NULL, 0, 0}
};
-const keyword_t *keywords[_HW_LAST] =
+const keyword_t *nds32_keywords[_HW_LAST] =
{
- keyword_gpr, keyword_usr, keyword_dxr, keyword_sr, keyword_fsr,
+ nds32_keyword_gpr, keyword_usr, keyword_dxr, keyword_sr, keyword_fsr,
keyword_fdr, keyword_cp, keyword_cpr, keyword_abdim, keyword_abm,
keyword_dtiton, keyword_dtitoff, keyword_dpref_st,
keyword_cctl_st0, keyword_cctl_st1, keyword_cctl_st2,
@@ -1774,7 +1774,7 @@ build_opcode_syntax (struct nds32_opcode *opc)
k = i;
}
}
- assert (fidx >= 0 && fidx < (int) ARRAY_SIZE (operand_fields));
+ assert (fidx >= 0 && fidx < (int) ARRAY_SIZE (nds32_operand_fields));
*plex |= LEX_SET_FIELD (k, fidx);
str += len;
@@ -1850,10 +1850,10 @@ nds32_asm_init (nds32_asm_desc_t *pdesc, int flags)
pdesc->mach = flags & NASM_OPEN_ARCH_MASK;
/* Setup main core. */
- nds32_keyword_table[NDS32_MAIN_CORE] = &keywords[0];
+ nds32_keyword_table[NDS32_MAIN_CORE] = &nds32_keywords[0];
nds32_keyword_count_table[NDS32_MAIN_CORE] = _HW_LAST;
nds32_opcode_table[NDS32_MAIN_CORE] = &nds32_opcodes[0];
- nds32_field_table[NDS32_MAIN_CORE] = &operand_fields[0];
+ nds32_field_table[NDS32_MAIN_CORE] = &nds32_operand_fields[0];
/* Build operand hash table. */
build_operand_hash_table ();
diff --git a/opcodes/nds32-dis.c b/opcodes/nds32-dis.c
index e501f2ad565c..c888487efa90 100644
--- a/opcodes/nds32-dis.c
+++ b/opcodes/nds32-dis.c
@@ -69,9 +69,9 @@ extern const field_t *nds32_field_table[NDS32_CORE_COUNT];
extern opcode_t *nds32_opcode_table[NDS32_CORE_COUNT];
extern keyword_t **nds32_keyword_table[NDS32_CORE_COUNT];
extern struct nds32_opcode nds32_opcodes[];
-extern const field_t operand_fields[];
-extern keyword_t *keywords[];
-extern const keyword_t keyword_gpr[];
+extern const field_t nds32_operand_fields[];
+extern keyword_t *nds32_keywords[];
+extern const keyword_t nds32_keyword_gpr[];
static uint32_t nds32_mask_opcode (uint32_t);
static void nds32_special_opcode (uint32_t, struct nds32_opcode **);
@@ -127,7 +127,7 @@ nds32_parse_audio_ext (const field_t *pfd,
int_value =
__GF (insn, pfd->bitpos, pfd->bitsize) << pfd->shift;
new_value = int_value;
- psys_reg = (keyword_t*) keywords[pfd->hw_res];
+ psys_reg = (keyword_t*) nds32_keywords[pfd->hw_res];
/* p = bit[4].bit[1:0], r = bit[4].bit[3:2]. */
if (strcmp (pfd->name, "im5_i") == 0)
@@ -264,7 +264,7 @@ nds32_parse_opcode (struct nds32_opcode *opc, bfd_vma pc ATTRIBUTE_UNUSED,
case '=':
case '&':
pstr_src++;
- /* Compare with operand_fields[].name. */
+ /* Compare with nds32_operand_fields[].name. */
pstr_tmp = &tmp_string[0];
while (*pstr_src)
{
@@ -301,7 +301,7 @@ nds32_parse_opcode (struct nds32_opcode *opc, bfd_vma pc ATTRIBUTE_UNUSED,
{
int_value = nds32_r45map[int_value];
}
- func (stream, "$%s", keyword_gpr[int_value].name);
+ func (stream, "$%s", nds32_keyword_gpr[int_value].name);
}
else if ((pfd->hw_res == HW_INT) || (pfd->hw_res == HW_UINT))
{
@@ -338,7 +338,7 @@ nds32_parse_opcode (struct nds32_opcode *opc, bfd_vma pc ATTRIBUTE_UNUSED,
{
func (stream, "#%d ! {$r6", int_value);
if (push25gpr != 6)
- func (stream, "~$%s", keyword_gpr[push25gpr].name);
+ func (stream, "~$%s", nds32_keyword_gpr[push25gpr].name);
func (stream, ", $fp, $gp, $lp}");
}
else if (pfd->hw_res == HW_INT)
@@ -431,9 +431,9 @@ nds32_parse_opcode (struct nds32_opcode *opc, bfd_vma pc ATTRIBUTE_UNUSED,
the convience comparing with bsp320. */
if (lsmwRb != 31 || lsmwRe != 31)
{
- func (stream, "$%s", keyword_gpr[lsmwRb].name);
+ func (stream, "$%s", nds32_keyword_gpr[lsmwRb].name);
if (lsmwRb != lsmwRe)
- func (stream, "~$%s", keyword_gpr[lsmwRe].name);
+ func (stream, "~$%s", nds32_keyword_gpr[lsmwRe].name);
ifthe1st = 0;
}
if (lsmwEnb4 != 0)
@@ -447,10 +447,10 @@ nds32_parse_opcode (struct nds32_opcode *opc, bfd_vma pc ATTRIBUTE_UNUSED,
if (ifthe1st == 1)
{
ifthe1st = 0;
- func (stream, "$%s", keyword_gpr[28 + i].name);
+ func (stream, "$%s", nds32_keyword_gpr[28 + i].name);
}
else
- func (stream, ", $%s", keyword_gpr[28 + i].name);
+ func (stream, ", $%s", nds32_keyword_gpr[28 + i].name);
}
checkbit >>= 1;
}
@@ -1257,9 +1257,9 @@ disassemble_init_nds32 (struct disassemble_info *info)
return;
/* Setup main core. */
- nds32_keyword_table[NDS32_MAIN_CORE] = &keywords[0];
+ nds32_keyword_table[NDS32_MAIN_CORE] = &nds32_keywords[0];
nds32_opcode_table[NDS32_MAIN_CORE] = &nds32_opcodes[0];
- nds32_field_table[NDS32_MAIN_CORE] = &operand_fields[0];
+ nds32_field_table[NDS32_MAIN_CORE] = &nds32_operand_fields[0];
/* Build opcode table. */
opcode_htab = htab_create_alloc (1024, htab_hash_hash, htab_hash_eq,
--
2.31.1
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] opcodes: cleanup nds32 variables
2021-06-27 6:18 [PATCH] opcodes: cleanup nds32 variables Mike Frysinger
@ 2021-07-01 10:10 ` Nick Clifton
0 siblings, 0 replies; 2+ messages in thread
From: Nick Clifton @ 2021-07-01 10:10 UTC (permalink / raw)
To: Mike Frysinger, binutils
Hi Mike,
> For the variables that don't need to be exported, mark them static.
> For the ones shared between modules, add a "nds32_" prefix to avoid
> collisions with these common variable names.
Approved - please apply - with a ChangeLog entry of course.
Cheers
Nick
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-07-01 10:10 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-27 6:18 [PATCH] opcodes: cleanup nds32 variables Mike Frysinger
2021-07-01 10:10 ` Nick Clifton
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).