projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RISC-V: Gate opcode tables by enum rather than string.
[deliverable/binutils-gdb.git]
/
gas
/
config
/
tc-crx.c
diff --git
a/gas/config/tc-crx.c
b/gas/config/tc-crx.c
index 40a28064fa14cbe09fc62fa118e5c66075f5254b..cb31c616ba0b56b106adac257a18a66ed4e63127 100644
(file)
--- a/
gas/config/tc-crx.c
+++ b/
gas/config/tc-crx.c
@@
-1,5
+1,5
@@
/* tc-crx.c -- Assembler code for the CRX CPU core.
/* tc-crx.c -- Assembler code for the CRX CPU core.
- Copyright (C) 2004-201
6
Free Software Foundation, Inc.
+ Copyright (C) 2004-201
9
Free Software Foundation, Inc.
Contributed by Tomer Levi, NSC, Israel.
Originally written for GAS 2.12 by Tomer Levi, NSC, Israel.
Contributed by Tomer Levi, NSC, Israel.
Originally written for GAS 2.12 by Tomer Levi, NSC, Israel.
@@
-69,21
+69,21
@@
static struct hash_control *reg_hash;
/* CRX coprocessor registers hash table. */
static struct hash_control *copreg_hash;
/* Current instruction we're assembling. */
/* CRX coprocessor registers hash table. */
static struct hash_control *copreg_hash;
/* Current instruction we're assembling. */
-const inst *instruction;
+
static
const inst *instruction;
/* Global variables. */
/* Array to hold an instruction encoding. */
/* Global variables. */
/* Array to hold an instruction encoding. */
-long output_opcode[2];
+
static
long output_opcode[2];
/* Nonzero means a relocatable symbol. */
/* Nonzero means a relocatable symbol. */
-int relocatable;
+
static
int relocatable;
/* A copy of the original instruction (used in error messages). */
/* A copy of the original instruction (used in error messages). */
-char ins_parse[MAX_INST_LEN];
+
static
char ins_parse[MAX_INST_LEN];
/* The current processed argument number. */
/* The current processed argument number. */
-int cur_arg_num;
+
static
int cur_arg_num;
/* Generic assembler global variables which must be defined by all targets. */
/* Generic assembler global variables which must be defined by all targets. */
@@
-308,8
+308,8
@@
tc_gen_reloc (asection *section ATTRIBUTE_UNUSED, fixS * fixP)
{
arelent * reloc;
{
arelent * reloc;
- reloc =
xmalloc (sizeof (arelent)
);
- reloc->sym_ptr_ptr =
xmalloc (sizeof (asymbol *)
);
+ reloc =
XNEW (arelent
);
+ reloc->sym_ptr_ptr =
XNEW (asymbol *
);
*reloc->sym_ptr_ptr = symbol_get_bfdsym (fixP->fx_addsy);
reloc->address = fixP->fx_frag->fr_address + fixP->fx_where;
reloc->addend = fixP->fx_offset;
*reloc->sym_ptr_ptr = symbol_get_bfdsym (fixP->fx_addsy);
reloc->address = fixP->fx_frag->fr_address + fixP->fx_where;
reloc->addend = fixP->fx_offset;
@@
-464,7
+464,7
@@
md_show_usage (FILE *stream ATTRIBUTE_UNUSED)
return;
}
return;
}
-char *
+c
onst c
har *
md_atof (int type, char *litP, int *sizeP)
{
return ieee_md_atof (type, litP, sizeP, target_big_endian);
md_atof (int type, char *litP, int *sizeP)
{
return ieee_md_atof (type, litP, sizeP, target_big_endian);
@@
-569,7
+569,7
@@
md_begin (void)
{
hashret = hash_insert (reg_hash, regtab->name, (void *) regtab);
if (hashret)
{
hashret = hash_insert (reg_hash, regtab->name, (void *) regtab);
if (hashret)
- as_fatal (_("Internal
Error:
Can't hash %s: %s"),
+ as_fatal (_("Internal
error:
Can't hash %s: %s"),
regtab->name,
hashret);
}
regtab->name,
hashret);
}
@@
-588,7
+588,7
@@
md_begin (void)
hashret = hash_insert (copreg_hash, copregtab->name,
(void *) copregtab);
if (hashret)
hashret = hash_insert (copreg_hash, copregtab->name,
(void *) copregtab);
if (hashret)
- as_fatal (_("Internal
Error:
Can't hash %s: %s"),
+ as_fatal (_("Internal
error:
Can't hash %s: %s"),
copregtab->name,
hashret);
}
copregtab->name,
hashret);
}
@@
-715,8
+715,8
@@
exponent2scale (int val)
static void
set_operand (char *operand, ins * crx_ins)
{
static void
set_operand (char *operand, ins * crx_ins)
{
- char *operandS; /* Pointer to start of sub-ope
a
rand. */
- char *operandE; /* Pointer to end of sub-ope
a
rand. */
+ char *operandS; /* Pointer to start of sub-operand. */
+ char *operandE; /* Pointer to end of sub-operand. */
expressionS scale;
int scale_val;
char *input_save, c;
expressionS scale;
int scale_val;
char *input_save, c;
@@
-730,6
+730,7
@@
set_operand (char *operand, ins * crx_ins)
case arg_sc: /* Case *+0x18. */
case arg_ic: /* Case $0x18. */
operandS++;
case arg_sc: /* Case *+0x18. */
case arg_ic: /* Case $0x18. */
operandS++;
+ /* Fall through. */
case arg_c: /* Case 0x18. */
/* Set constant. */
process_label_constant (operandS, crx_ins);
case arg_c: /* Case 0x18. */
/* Set constant. */
process_label_constant (operandS, crx_ins);
@@
-747,6
+748,7
@@
set_operand (char *operand, ins * crx_ins)
*operandE = '\0';
process_label_constant (operandS, crx_ins);
operandS = operandE;
*operandE = '\0';
process_label_constant (operandS, crx_ins);
operandS = operandE;
+ /* Fall through. */
case arg_rbase: /* Case (r1). */
operandS++;
/* Set register base. */
case arg_rbase: /* Case (r1). */
operandS++;
/* Set register base. */
@@
-754,7
+756,7
@@
set_operand (char *operand, ins * crx_ins)
operandE++;
*operandE = '\0';
if ((cur_arg->r = get_register (operandS)) == nullregister)
operandE++;
*operandE = '\0';
if ((cur_arg->r = get_register (operandS)) == nullregister)
- as_bad (_("Illegal register `%s' in
I
nstruction `%s'"),
+ as_bad (_("Illegal register `%s' in
i
nstruction `%s'"),
operandS, ins_parse);
if (cur_arg->type != arg_rbase)
operandS, ins_parse);
if (cur_arg->type != arg_rbase)
@@
-774,7
+776,7
@@
set_operand (char *operand, ins * crx_ins)
operandE++;
*operandE++ = '\0';
if ((cur_arg->r = get_register (operandS)) == nullregister)
operandE++;
*operandE++ = '\0';
if ((cur_arg->r = get_register (operandS)) == nullregister)
- as_bad (_("Illegal register `%s' in
I
nstruction `%s'"),
+ as_bad (_("Illegal register `%s' in
i
nstruction `%s'"),
operandS, ins_parse);
/* Skip leading white space. */
operandS, ins_parse);
/* Skip leading white space. */
@@
-789,7
+791,7
@@
set_operand (char *operand, ins * crx_ins)
*operandE++ = '\0';
if ((cur_arg->i_r = get_register (operandS)) == nullregister)
*operandE++ = '\0';
if ((cur_arg->i_r = get_register (operandS)) == nullregister)
- as_bad (_("Illegal register `%s' in
I
nstruction `%s'"),
+ as_bad (_("Illegal register `%s' in
i
nstruction `%s'"),
operandS, ins_parse);
/* Skip leading white space. */
operandS, ins_parse);
/* Skip leading white space. */
@@
-1041,9
+1043,9
@@
parse_insn (ins *insn, char *operands)
int i;
/* Handle instructions with no operands. */
int i;
/* Handle instructions with no operands. */
- for (i = 0; no_op_insn[i] != NULL; i++)
+ for (i = 0;
crx_
no_op_insn[i] != NULL; i++)
{
{
- if (streq (no_op_insn[i], instruction->mnemonic))
+ if (streq (
crx_
no_op_insn[i], instruction->mnemonic))
{
insn->nargs = 0;
return;
{
insn->nargs = 0;
return;
@@
-1132,9
+1134,8
@@
getreg_image (reg r)
/* Issue a error message when register is illegal. */
#define IMAGE_ERR \
/* Issue a error message when register is illegal. */
#define IMAGE_ERR \
- as_bad (_("Illegal register (`%s') in Instruction: `%s'"), \
- reg_name, ins_parse); \
- break;
+ as_bad (_("Illegal register (`%s') in instruction: `%s'"), \
+ reg_name, ins_parse);
switch (rreg->type)
{
switch (rreg->type)
{
@@
-1143,18
+1144,21
@@
getreg_image (reg r)
return rreg->image;
else
IMAGE_ERR;
return rreg->image;
else
IMAGE_ERR;
+ break;
case CRX_CFG_REGTYPE:
if (is_procreg)
return rreg->image;
else
IMAGE_ERR;
case CRX_CFG_REGTYPE:
if (is_procreg)
return rreg->image;
else
IMAGE_ERR;
+ break;
case CRX_R_REGTYPE:
if (! is_procreg)
return rreg->image;
else
IMAGE_ERR;
case CRX_R_REGTYPE:
if (! is_procreg)
return rreg->image;
else
IMAGE_ERR;
+ break;
case CRX_C_REGTYPE:
case CRX_CS_REGTYPE:
case CRX_C_REGTYPE:
case CRX_CS_REGTYPE:
@@
-1163,6
+1167,7
@@
getreg_image (reg r)
default:
IMAGE_ERR;
default:
IMAGE_ERR;
+ break;
}
return 0;
}
return 0;
@@
-1259,14
+1264,14
@@
print_operand (int nbits, int shift, argument *arg)
case arg_copr:
if (arg->cr < c0 || arg->cr > c15)
case arg_copr:
if (arg->cr < c0 || arg->cr > c15)
- as_bad (_("Illegal
Co-processor register in Instruction `%s'
"),
+ as_bad (_("Illegal
co-processor register in instruction `%s'
"),
ins_parse);
CRX_PRINT (0, getreg_image (arg->cr), shift);
break;
case arg_copsr:
if (arg->cr < cs0 || arg->cr > cs15)
ins_parse);
CRX_PRINT (0, getreg_image (arg->cr), shift);
break;
case arg_copsr:
if (arg->cr < cs0 || arg->cr > cs15)
- as_bad (_("Illegal
Co-processor special register in Instruction `%s'
"),
+ as_bad (_("Illegal
co-processor special register in instruction `%s'
"),
ins_parse);
CRX_PRINT (0, getreg_image (arg->cr), shift);
break;
ins_parse);
CRX_PRINT (0, getreg_image (arg->cr), shift);
break;
@@
-1279,6
+1284,7
@@
print_operand (int nbits, int shift, argument *arg)
CRX_PRINT (0, getreg_image (arg->r), 12);
CRX_PRINT (0, getreg_image (arg->i_r), 8);
CRX_PRINT (0, arg->scale, 6);
CRX_PRINT (0, getreg_image (arg->r), 12);
CRX_PRINT (0, getreg_image (arg->i_r), 8);
CRX_PRINT (0, arg->scale, 6);
+ /* Fall through. */
case arg_ic:
case arg_c:
print_constant (nbits, shift, arg);
case arg_ic:
case arg_c:
print_constant (nbits, shift, arg);
@@
-1325,7
+1331,7
@@
static op_err
check_range (long *num, int bits, int unsigned flags, int update)
{
uint32_t max;
check_range (long *num, int bits, int unsigned flags, int update)
{
uint32_t max;
-
int
retval = OP_LEGAL;
+
op_err
retval = OP_LEGAL;
int bin;
uint32_t upper_64kb = 0xffff0000;
uint32_t value = *num;
int bin;
uint32_t upper_64kb = 0xffff0000;
uint32_t value = *num;
@@
-1384,7
+1390,7
@@
check_range (long *num, int bits, int unsigned flags, int update)
: instruction->flags & DISPUD4 ? 4
: 0);
: instruction->flags & DISPUD4 ? 4
: 0);
- for (bin = 0; bin < cst4_maps; bin++)
+ for (bin = 0; bin < c
rx_c
st4_maps; bin++)
{
if (value == mul * bin)
{
{
if (value == mul * bin)
{
@@
-1401,9
+1407,9
@@
check_range (long *num, int bits, int unsigned flags, int update)
{
int is_cst4 = 0;
{
int is_cst4 = 0;
- for (bin = 0; bin < cst4_maps; bin++)
+ for (bin = 0; bin < c
rx_c
st4_maps; bin++)
{
{
- if (value == (uint32_t) cst4_map[bin])
+ if (value == (uint32_t) c
rx_c
st4_map[bin])
{
is_cst4 = 1;
if (update)
{
is_cst4 = 1;
if (update)
@@
-1607,7
+1613,7
@@
next_insn:
else
/* Full match - print the encoding to output file. */
{
else
/* Full match - print the encoding to output file. */
{
- /* Make further checking
s
(such that couldn't be made earlier).
+ /* Make further checking (such that couldn't be made earlier).
Warn the user if necessary. */
warn_if_needed (insn);
Warn the user if necessary. */
warn_if_needed (insn);
@@
-1645,7
+1651,7
@@
next_insn:
return 1;
}
return 1;
}
-/* Bunch of error checking
s
.
+/* Bunch of error checking.
The checks are made after a matching instruction was found. */
void
The checks are made after a matching instruction was found. */
void
@@
-1730,7
+1736,7
@@
mask_reg (int r, unsigned short int *mask)
{
if ((reg)r > (reg)sp)
{
{
if ((reg)r > (reg)sp)
{
- as_bad (_("Invalid
Register in Register L
ist"));
+ as_bad (_("Invalid
register in register l
ist"));
return;
}
return;
}
@@
-1749,7
+1755,7
@@
preprocess_reglist (char *param, int *allocated)
int reg_counter = 0; /* Count number of parsed registers. */
unsigned short int mask = 0; /* Mask for 16 general purpose registers. */
char *new_param; /* New created operands string. */
int reg_counter = 0; /* Count number of parsed registers. */
unsigned short int mask = 0; /* Mask for 16 general purpose registers. */
char *new_param; /* New created operands string. */
- char *paramP = param; /* Pointer to original ope
a
rands string. */
+ char *paramP = param; /* Pointer to original operands string. */
char maskstring[10]; /* Array to print the mask as a string. */
int hi_found = 0, lo_found = 0; /* Boolean flags for hi/lo registers. */
reg r;
char maskstring[10]; /* Array to print the mask as a string. */
int hi_found = 0, lo_found = 0; /* Boolean flags for hi/lo registers. */
reg r;
@@
-1765,7
+1771,7
@@
preprocess_reglist (char *param, int *allocated)
while (*paramP++ != '{');
while (*paramP++ != '{');
- new_param =
(char *)xcalloc (MAX_INST_LEN, sizeof (char)
);
+ new_param =
XCNEWVEC (char, MAX_INST_LEN
);
*allocated = 1;
strncpy (new_param, param, paramP - param - 1);
*allocated = 1;
strncpy (new_param, param, paramP - param - 1);
@@
-1894,7
+1900,7
@@
print_insn (ins *insn)
words[j++] = output_opcode[i] & 0xFFFF;
}
words[j++] = output_opcode[i] & 0xFFFF;
}
- /* Handle relaxtion. */
+ /* Handle relax
a
tion. */
if ((instruction->flags & RELAXABLE) && relocatable)
{
int relax_subtype;
if ((instruction->flags & RELAXABLE) && relocatable)
{
int relax_subtype;
This page took
0.028325 seconds
and
4
git commands to generate.
projects / deliverable / binutils-gdb.git / blobdiff