const char EXP_CHARS[] = "eE";
const char FLT_CHARS[] = "rRsSfFdDxXeEpP";
+/* Used to contain constructed error messages. */
+static char err_msg[255];
+
fragS *score_fragp = 0;
static int fix_data_dependency = 0;
static int warn_fix_data_dependency = 1;
static void do_rdsi16 (char *);
static void do_rdrssi14 (char *);
static void do_sub_rdsi16 (char *);
-static void do_sub_rdi16 (char *);
static void do_sub_rdrssi14 (char *);
static void do_rdrsi5 (char *);
static void do_rdrsi14 (char *);
{"addei!", 0x6000 , 0x7087, 0x02000001, Rd_I4, do16_rdi4},
{"subi", 0x02000000, 0x3e0e0001, 0x8000, Rd_SI16, do_sub_rdsi16},
{"subi.c", 0x02000001, 0x3e0e0001, 0x8000, Rd_SI16, do_sub_rdsi16},
- {"subis", 0x0a000000, 0x3e0e0001, 0x8000, Rd_SI16, do_sub_rdi16},
- {"subis.c", 0x0a000001, 0x3e0e0001, 0x8000, Rd_SI16, do_sub_rdi16},
{"subri", 0x10000000, 0x3e000001, 0x8000, Rd_Rs_SI14, do_sub_rdrssi14},
{"subri.c", 0x10000001, 0x3e000001, 0x8000, Rd_Rs_SI14, do_sub_rdrssi14},
{"and", 0x00000020, 0x3e0003ff, 0x8000, Rd_Rs_Rs, do_rdrsrs},
int lit_pool_num = 1;
symbolS *current_poolP = NULL;
+
static int
end_of_line (char *str)
{
/* Check if an immediate is valid. If so, convert it to the right format. */
static int
-validate_immediate (int val, unsigned int data_type)
+validate_immediate (int val, unsigned int data_type, int hex_p)
{
switch (data_type)
{
return val;
break;
+ case _SIMM14:
+ if (hex_p == 1)
+ {
+ if (!(val >= -0x2000 && val <= 0x3fff))
+ {
+ return (int) FAIL;
+ }
+ }
+ else
+ {
+ if (!(val >= -8192 && val <= 8191))
+ {
+ return (int) FAIL;
+ }
+ }
+
+ return val;
+ break;
+
+ case _SIMM16_NEG:
+ if (hex_p == 1)
+ {
+ if (!(val >= -0x7fff && val <= 0xffff && val != 0x8000))
+ {
+ return (int) FAIL;
+ }
+ }
+ else
+ {
+ if (!(val >= -32767 && val <= 32768))
+ {
+ return (int) FAIL;
+ }
+ }
+
+ val = -val;
+ return val;
+ break;
+
default:
- if (data_type == _SIMM14_NEG || data_type == _SIMM16_NEG || data_type == _IMM16_NEG)
+ if (data_type == _SIMM14_NEG || data_type == _IMM16_NEG)
val = -val;
if (score_df_range[data_type].range[0] <= val
inst.error = NULL;
dataptr = * str;
+ /* Set hex_p to zero. */
+ int hex_p = 0;
+
while ((*dataptr != '\0') && (*dataptr != '|') && (cnt <= MAX_LITERAL_POOL_SIZE)) /* 0x7c = ='|' */
{
data_exp[cnt] = *dataptr;
}
dataptr = (char *)data_exp;
- if ((*dataptr == '0') && (*(dataptr + 1) == 'x')
- && (data_type != _SIMM16_LA)
- && (data_type != _VALUE_HI16)
- && (data_type != _VALUE_LO16)
- && (data_type != _IMM16)
- && (data_type != _IMM15)
- && (data_type != _IMM14)
- && (data_type != _IMM4)
- && (data_type != _IMM5)
- && (data_type != _IMM8)
- && (data_type != _IMM5_RSHIFT_1)
- && (data_type != _IMM5_RSHIFT_2)
- && (data_type != _SIMM14_NEG)
- && (data_type != _IMM10_RSHIFT_2)
- && (data_type != _GP_IMM15))
+ if ((dataptr != NULL)
+ && (((strstr (dataptr, "0x")) != NULL)
+ || ((strstr (dataptr, "0X")) != NULL)))
{
- data_type += 24;
+ hex_p = 1;
+ if ((data_type != _SIMM16_LA)
+ && (data_type != _VALUE_HI16)
+ && (data_type != _VALUE_LO16)
+ && (data_type != _IMM16)
+ && (data_type != _IMM15)
+ && (data_type != _IMM14)
+ && (data_type != _IMM4)
+ && (data_type != _IMM5)
+ && (data_type != _IMM8)
+ && (data_type != _IMM5_RSHIFT_1)
+ && (data_type != _IMM5_RSHIFT_2)
+ && (data_type != _SIMM14)
+ && (data_type != _SIMM14_NEG)
+ && (data_type != _SIMM16_NEG)
+ && (data_type != _IMM10_RSHIFT_2)
+ && (data_type != _GP_IMM15))
+ {
+ data_type += 24;
+ }
}
if ((inst.reloc.exp.X_add_number == 0)
if (data_type == _SIMM16_LA && inst.reloc.exp.X_unsigned == 1)
{
- value = validate_immediate (inst.reloc.exp.X_add_number, _SIMM16_LA_POS);
+ value = validate_immediate (inst.reloc.exp.X_add_number, _SIMM16_LA_POS, hex_p);
if (value == (int) FAIL) /* for advance to check if this is ldis */
if ((inst.reloc.exp.X_add_number & 0xffff) == 0)
{
}
else
{
- value = validate_immediate (inst.reloc.exp.X_add_number, data_type);
+ value = validate_immediate (inst.reloc.exp.X_add_number, data_type, hex_p);
}
if (value == (int) FAIL)
{
- static char err_msg[100];
-
if ((data_type != _SIMM14_NEG) && (data_type != _SIMM16_NEG) && (data_type != _IMM16_NEG))
{
sprintf (err_msg,
-score_df_range[data_type].range[1], -score_df_range[data_type].range[0]);
}
- inst.error = _(err_msg);
+ inst.error = err_msg;
return (int) FAIL;
}
&& (((inst.instruction >> 20) & 0x1F) != 0x1e)
&& (((inst.instruction >> 20) & 0x1F) != 0x1f))
{
- static char err_msg[100];
-
- sprintf (err_msg, _("invalid constant: bit expression not defined"));
- inst.error = _(err_msg);
+ inst.error = _("invalid constant: bit expression not defined");
return (int) FAIL;
}
}
end_of_line (str);
}
-/* Handle subis/subis.c. */
-
-static void
-do_sub_rdi16 (char *str)
-{
- skip_whitespace (str);
-
- if (reg_required_here (&str, 20, REG_TYPE_SCORE) != (int) FAIL
- && skip_past_comma (&str) != (int) FAIL
- && data_op2 (&str, 1, _IMM16_NEG) != (int) FAIL)
- end_of_line (str);
-}
-
/* Handle addri/addri.c. */
static void
{
char append_str[MAX_LITERAL_POOL_SIZE];
- sprintf (append_str, _("mlfh! %s"), backupstr);
+ sprintf (append_str, "mlfh! %s", backupstr);
if (append_insn (append_str, TRUE) == (int) FAIL)
return;
/* Set bwarn as -1, so macro instruction itself will not be generated frag. */
{
char append_str[MAX_LITERAL_POOL_SIZE];
- sprintf (append_str, _("mhfl! %s"), backupstr);
+ sprintf (append_str, "mhfl! %s", backupstr);
if (append_insn (append_str, TRUE) == (int) FAIL)
return;
if (value == (int) FAIL)
return (int) FAIL;
- value = validate_immediate (inst.reloc.exp.X_add_number, data_type);
+ value = validate_immediate (inst.reloc.exp.X_add_number, data_type, 0);
if (value == (int) FAIL)
{
- static char err_msg[255];
-
if (data_type < 30)
sprintf (err_msg,
_("invalid constant: %d bit expression not in range %d..%d"),
_("invalid constant: %d bit expression not in range %d..%d"),
score_df_range[data_type - 24].bits,
score_df_range[data_type - 24].range[0], score_df_range[data_type - 24].range[1]);
- inst.error = _(err_msg);
+ inst.error = err_msg;
return (int) FAIL;
}
}
pre_inc = 1;
- value = validate_immediate (inst.reloc.exp.X_add_number, _SIMM12);
+ value = validate_immediate (inst.reloc.exp.X_add_number, _SIMM12, 0);
value &= (1 << score_df_range[_SIMM12].bits) - 1;
ldst_idx = inst.instruction & OPC_PSEUDOLDST_MASK;
inst.instruction &= ~OPC_PSEUDOLDST_MASK;
data_type += 24;
}
- value = validate_immediate (inst.reloc.exp.X_add_number, data_type);
+ value = validate_immediate (inst.reloc.exp.X_add_number, data_type, 0);
if (value == (int) FAIL)
{
- static char err_msg[255];
-
if (data_type < 30)
sprintf (err_msg,
_("invalid constant: %d bit expression not in range %d..%d"),
score_df_range[data_type - 24].bits,
score_df_range[data_type - 24].range[0],
score_df_range[data_type - 24].range[1]);
- inst.error = _(err_msg);
+ inst.error = err_msg;
return;
}
int cache_op;
cache_op = (inst.instruction >> 20) & 0x1F;
- sprintf (inst.name, _("cache %d"), cache_op);
+ sprintf (inst.name, "cache %d", cache_op);
}
if (*str == '[')
/* Fix part
For an external symbol: lw rD, <sym>($gp)
(BFD_RELOC_SCORE_GOT15 or BFD_RELOC_SCORE_CALL15) */
- sprintf (tmp, _("lw_pic r%d, %s"), reg_rd, add_symbol->bsym->name);
+ sprintf (tmp, "lw_pic r%d, %s", reg_rd, add_symbol->bsym->name);
if (append_insn (tmp, FALSE) == (int) FAIL)
return;
addi rD, <sym> (BFD_RELOC_GOT_LO16) */
inst.reloc.type = BFD_RELOC_SCORE_GOT15;
memcpy (&var_insts[0], &inst, sizeof (struct score_it));
- sprintf (tmp, _("addi_s_pic r%d, %s"), reg_rd, add_symbol->bsym->name);
+ sprintf (tmp, "addi_s_pic r%d, %s", reg_rd, add_symbol->bsym->name);
if (append_insn (tmp, FALSE) == (int) FAIL)
return;
else if (add_number >= -0x8000 && add_number <= 0x7fff)
{
/* Insn 1: lw rD, <sym>($gp) (BFD_RELOC_SCORE_GOT15) */
- sprintf (tmp, _("lw_pic r%d, %s"), reg_rd, add_symbol->bsym->name);
+ sprintf (tmp, "lw_pic r%d, %s", reg_rd, add_symbol->bsym->name);
if (append_insn (tmp, TRUE) == (int) FAIL)
return;
var_num = 1;
/* Fix part
For an external symbol: addi rD, <constant> */
- sprintf (tmp, _("addi r%d, %d"), reg_rd, (int)add_number);
+ sprintf (tmp, "addi r%d, %d", reg_rd, (int)add_number);
if (append_insn (tmp, FALSE) == (int) FAIL)
return;
/* Var part
For a local symbol: addi rD, <sym>+<constant> (BFD_RELOC_GOT_LO16) */
- sprintf (tmp, _("addi_s_pic r%d, %s + %d"), reg_rd, add_symbol->bsym->name, (int)add_number);
+ sprintf (tmp, "addi_s_pic r%d, %s + %d", reg_rd, add_symbol->bsym->name, (int)add_number);
if (append_insn (tmp, FALSE) == (int) FAIL)
return;
int lo = add_number & 0x0000FFFF;
/* Insn 1: lw rD, <sym>($gp) (BFD_RELOC_SCORE_GOT15) */
- sprintf (tmp, _("lw_pic r%d, %s"), reg_rd, add_symbol->bsym->name);
+ sprintf (tmp, "lw_pic r%d, %s", reg_rd, add_symbol->bsym->name);
if (append_insn (tmp, TRUE) == (int) FAIL)
return;
var_num = 1;
/* Fix part
For an external symbol: ldis r1, HI%<constant> */
- sprintf (tmp, _("ldis %s, %d"), _("r1"), hi);
+ sprintf (tmp, "ldis r1, %d", hi);
if (append_insn (tmp, FALSE) == (int) FAIL)
return;
{
hi += 1;
}
- sprintf (tmp, _("ldis_pic %s, %d"), _("r1"), hi);
+ sprintf (tmp, "ldis_pic r1, %d", hi);
if (append_insn (tmp, FALSE) == (int) FAIL)
return;
var_num = 1;
/* Fix part
For an external symbol: ori r1, LO%<constant> */
- sprintf (tmp, _("ori %s, %d"), _("r1"), lo);
+ sprintf (tmp, "ori r1, %d", lo);
if (append_insn (tmp, FALSE) == (int) FAIL)
return;
/* Var part
For a local symbol: addi r1, <sym>+LO%<constant> (BFD_RELOC_GOT_LO16) */
- sprintf (tmp, _("addi_u_pic %s, %s + %d"), _("r1"), add_symbol->bsym->name, lo);
+ sprintf (tmp, "addi_u_pic r1, %s + %d", add_symbol->bsym->name, lo);
if (append_insn (tmp, FALSE) == (int) FAIL)
return;
build_relax_frag (fix_insts, fix_num, var_insts, var_num, add_symbol);
/* Insn 4: add rD, rD, r1 */
- sprintf (tmp, _("add r%d, r%d, %s"), reg_rd, reg_rd, _("r1"));
+ sprintf (tmp, "add r%d, r%d, r1", reg_rd, reg_rd);
if (append_insn (tmp, TRUE) == (int) FAIL)
return;
{
if ((score_pic == NO_PIC) || (!inst.reloc.exp.X_add_symbol))
{
- sprintf (append_str, _("ld_i32hi r%d, %s"), reg_rd, keep_data);
+ sprintf (append_str, "ld_i32hi r%d, %s", reg_rd, keep_data);
if (append_insn (append_str, TRUE) == (int) FAIL)
return;
- sprintf (append_str, _("ld_i32lo r%d, %s"), reg_rd, keep_data);
+ sprintf (append_str, "ld_i32lo r%d, %s", reg_rd, keep_data);
if (append_insn (append_str, TRUE) == (int) FAIL)
return;
}
}
else
{
- sprintf (append_str, _("ld_i32hi r%d, %s"), reg_rd, keep_data);
+ sprintf (append_str, "ld_i32hi r%d, %s", reg_rd, keep_data);
if (append_insn (append_str, TRUE) == (int) FAIL)
return;
else
{
- sprintf (append_str, _("ld_i32lo r%d, %s"), reg_rd, keep_data);
+ sprintf (append_str, "ld_i32lo r%d, %s", reg_rd, keep_data);
if (append_insn (append_str, TRUE) == (int) FAIL)
return;
if (strcmp (inst.name, "rem") == 0)
{
- sprintf (append_str, _("%s r%d, r%d"), _("mul"), reg_rs1, reg_rs2);
- sprintf (append_str1, _("mfceh r%d"), reg_rd);
+ sprintf (append_str, "mul r%d, r%d", reg_rs1, reg_rs2);
+ sprintf (append_str1, "mfceh r%d", reg_rd);
}
else if (strcmp (inst.name, "remu") == 0)
{
- sprintf (append_str, _("%s r%d, r%d"), _("mulu"), reg_rs1, reg_rs2);
- sprintf (append_str1, _("mfceh r%d"), reg_rd);
+ sprintf (append_str, "mulu r%d, r%d", reg_rs1, reg_rs2);
+ sprintf (append_str1, "mfceh r%d", reg_rd);
}
else
{
- sprintf (append_str, _("%s r%d, r%d"), inst.name, reg_rs1, reg_rs2);
- sprintf (append_str1, _("mfcel r%d"), reg_rd);
+ sprintf (append_str, "%s r%d, r%d", inst.name, reg_rs1, reg_rs2);
+ sprintf (append_str1, "mfcel r%d", reg_rd);
}
/* Output mul/mulu or div/divu or rem/remu. */
return;
backupstr = tmp;
- sprintf (append_str, _("li r1 %s"), backupstr);
+ sprintf (append_str, "li r1 %s", backupstr);
append_insn (append_str, TRUE);
memcpy (&inst, &inst_backup, sizeof (struct score_it));
- sprintf (append_str, _(" r%d, [r1,0]"), reg_rd);
+ sprintf (append_str, " r%d, [r1,0]", reg_rd);
do_ldst_insn (append_str);
nor1 = r1_bak;
/* Fix part
For an external symbol: lw rD, <sym>($gp)
(BFD_RELOC_SCORE_GOT15) */
- sprintf (tmp, _("lw_pic %s, %s"), _("r1"), add_symbol->bsym->name);
+ sprintf (tmp, "lw_pic r1, %s", add_symbol->bsym->name);
if (append_insn (tmp, FALSE) == (int) FAIL)
return;
addi rD, <sym> (BFD_RELOC_GOT_LO16) */
inst.reloc.type = BFD_RELOC_SCORE_GOT15;
memcpy (&var_insts[0], &inst, sizeof (struct score_it));
- sprintf (tmp, _("addi_s_pic %s, %s"), _("r1"), add_symbol->bsym->name);
+ sprintf (tmp, "addi_s_pic r1, %s", add_symbol->bsym->name);
if (append_insn (tmp, FALSE) == (int) FAIL)
return;
build_relax_frag (fix_insts, fix_num, var_insts, var_num, add_symbol);
/* Insn 2 or Insn 3: lw/st rD, [r1, constant] */
- sprintf (tmp, _("%s r%d, [%s, %d]"), insn_name, reg_rd, _("r1"), add_number);
+ sprintf (tmp, "%s r%d, [r1, %d]", insn_name, reg_rd, add_number);
if (append_insn (tmp, TRUE) == (int) FAIL)
return;
absolute_value = backup_str;
inst.type = Rd_rvalueRs_SI15;
if ((my_get_expression (&inst.reloc.exp, &backup_str) == (int) FAIL)
- || (validate_immediate (inst.reloc.exp.X_add_number, _VALUE) == (int) FAIL)
+ || (validate_immediate (inst.reloc.exp.X_add_number, _VALUE, 0) == (int) FAIL)
|| (end_of_line (backup_str) == (int) FAIL))
{
return;
nor1 = 0;
/* Determine which instructions should be output. */
- sprintf (append_str[0], _("ld_i32hi r1, %s"), label_str);
- sprintf (append_str[1], _("ld_i32lo r1, %s"), label_str);
- sprintf (append_str[2], _("%s r%d, [r1, 0]"), inst_backup.name, reg_rd);
+ sprintf (append_str[0], "ld_i32hi r1, %s", label_str);
+ sprintf (append_str[1], "ld_i32lo r1, %s", label_str);
+ sprintf (append_str[2], "%s r%d, [r1, 0]", inst_backup.name, reg_rd);
/* Generate three instructions.
la r1, label
do_jump (char *str)
{
char *save_in;
- static char err_msg[100];
skip_whitespace (str);
if (my_get_expression (&inst.reloc.exp, &str) == (int) FAIL
if (((inst.reloc.exp.X_add_number & 0xff000000) != 0)
&& ((inst.reloc.exp.X_add_number & 0xff000000) != 0xff000000))
{
- sprintf (err_msg, _("invalid constant: 25 bit expression not in range -2^24..2^24"));
- inst.error = _(err_msg);
+ inst.error = _("invalid constant: 25 bit expression not in range -2^24..2^24");
return;
}
|| ((pec_part_1.size == INSN16_SIZE) && (inst.size == INSN_SIZE)))
{
inst.error = _("pce instruction error (16 bit || 16 bit)'");
- sprintf (inst.str, "%s", insnstr);
+ sprintf (inst.str, insnstr);
return;
}
demand_empty_rest_of_line ();
- sprintf (insn_str, _("ld_i32hi r%d, %s"), GP, GP_DISP_LABEL);
+ sprintf (insn_str, "ld_i32hi r%d, %s", GP, GP_DISP_LABEL);
if (append_insn (insn_str, TRUE) == (int) FAIL)
return;
- sprintf (insn_str, _("ld_i32lo r%d, %s"), GP, GP_DISP_LABEL);
+ sprintf (insn_str, "ld_i32lo r%d, %s", GP, GP_DISP_LABEL);
if (append_insn (insn_str, TRUE) == (int) FAIL)
return;
- sprintf (insn_str, _("add r%d, r%d, r%d"), GP, GP, reg);
+ sprintf (insn_str, "add r%d, r%d, r%d", GP, GP, reg);
if (append_insn (insn_str, TRUE) == (int) FAIL)
return;
}
if (cprestore_offset <= 0x3fff)
{
- sprintf (insn_str, _("sw r%d, [r%d, %d]"), GP, reg, cprestore_offset);
+ sprintf (insn_str, "sw r%d, [r%d, %d]", GP, reg, cprestore_offset);
if (append_insn (insn_str, TRUE) == (int) FAIL)
return;
}
r1_bak = nor1;
nor1 = 0;
- sprintf (insn_str, _("li r1, %d"), cprestore_offset);
+ sprintf (insn_str, "li r1, %d", cprestore_offset);
if (append_insn (insn_str, TRUE) == (int) FAIL)
return;
- sprintf (insn_str, _("add r1, r1, r%d"), reg);
+ sprintf (insn_str, "add r1, r1, r%d", reg);
if (append_insn (insn_str, TRUE) == (int) FAIL)
return;
- sprintf (insn_str, _("sw r%d, [r1]"), GP);
+ sprintf (insn_str, "sw r%d, [r1]", GP);
if (append_insn (insn_str, TRUE) == (int) FAIL)
return;
demand_empty_rest_of_line ();
/* Add $gp to the register named as an argument. */
- sprintf (insn_str, _("add r%d, r%d, r%d"), reg, reg, GP);
+ sprintf (insn_str, "add r%d, r%d, r%d", reg, reg, GP);
if (append_insn (insn_str, TRUE) == (int) FAIL)
return;
}
projects / deliverable / binutils-gdb.git / blobdiff