* config/tc-mn10200.c (md_relax_table): Define.
(md_convert_frag): Implement. (md_assemble): Handle relaxable operands/instructions correctly. (md_estimate_size_before_relax): Implement. * config/tc-mn10200.h (TC_GENERIC_RELAX_TABLE): Define. Some simple branch relaxing.
This commit is contained in:
parent
c9f649022e
commit
33a4c28dc0
|
@ -1,3 +1,11 @@
|
|||
Wed Jan 29 09:42:11 1997 Jeffrey A Law (law@cygnus.com)
|
||||
|
||||
* config/tc-mn10200.c (md_relax_table): Define.
|
||||
(md_convert_frag): Implement.
|
||||
(md_assemble): Handle relaxable operands/instructions correctly.
|
||||
(md_estimate_size_before_relax): Implement.
|
||||
* config/tc-mn10200.h (TC_GENERIC_RELAX_TABLE): Define.
|
||||
|
||||
Tue Jan 28 15:27:28 1997 Ian Lance Taylor <ian@cygnus.com>
|
||||
|
||||
* config/tc-mips.c (append_insn): Give an error for jumps to a
|
||||
|
|
|
@ -53,6 +53,20 @@ const char EXP_CHARS[] = "eE";
|
|||
const char FLT_CHARS[] = "dD";
|
||||
|
||||
|
||||
const relax_typeS md_relax_table[] = {
|
||||
/* bCC relaxing */
|
||||
{0x7f, -0x80, 2, 1},
|
||||
{0x7fff, -0x8000, 5, 2},
|
||||
{0x7fffff, -0x8000000, 7, 0},
|
||||
/* bCCx relaxing */
|
||||
{0x7f, -0x80, 3, 4},
|
||||
{0x7fff, -0x8000, 6, 5},
|
||||
{0x7fffff, -0x8000000, 8, 0},
|
||||
/* jmp/jsr relaxing, could have a bra variant too! */
|
||||
{0x7fff, -0x8000, 3, 7},
|
||||
{0x7fffff, -0x8000000, 5, 0},
|
||||
|
||||
};
|
||||
/* local functions */
|
||||
static void mn10200_insert_operand PARAMS ((unsigned long *, unsigned long *,
|
||||
const struct mn10200_operand *,
|
||||
|
@ -360,7 +374,320 @@ md_convert_frag (abfd, sec, fragP)
|
|||
asection *sec;
|
||||
fragS *fragP;
|
||||
{
|
||||
/* printf ("call to md_convert_frag \n"); */
|
||||
subseg_change (sec, 0);
|
||||
if (fragP->fr_subtype == 0)
|
||||
{
|
||||
fix_new (fragP, fragP->fr_fix + 1, 1, fragP->fr_symbol,
|
||||
fragP->fr_offset + 1, 1, BFD_RELOC_8_PCREL);
|
||||
fragP->fr_var = 0;
|
||||
fragP->fr_fix += 2;
|
||||
}
|
||||
else if (fragP->fr_subtype == 1)
|
||||
{
|
||||
/* Reverse the condition of the first branch. */
|
||||
int offset = fragP->fr_fix;
|
||||
int opcode = fragP->fr_literal[offset] & 0xff;
|
||||
|
||||
switch (opcode)
|
||||
{
|
||||
case 0xe8:
|
||||
opcode = 0xe9;
|
||||
break;
|
||||
case 0xe9:
|
||||
opcode = 0xe8;
|
||||
break;
|
||||
case 0xe0:
|
||||
opcode = 0xe2;
|
||||
break;
|
||||
case 0xe2:
|
||||
opcode = 0xe0;
|
||||
break;
|
||||
case 0xe3:
|
||||
opcode = 0xe1;
|
||||
break;
|
||||
case 0xe1:
|
||||
opcode = 0xe3;
|
||||
break;
|
||||
case 0xe4:
|
||||
opcode = 0xe6;
|
||||
break;
|
||||
case 0xe6:
|
||||
opcode = 0xe4;
|
||||
break;
|
||||
case 0xe7:
|
||||
opcode = 0xe5;
|
||||
break;
|
||||
case 0xe5:
|
||||
opcode = 0xe7;
|
||||
break;
|
||||
default:
|
||||
abort ();
|
||||
}
|
||||
fragP->fr_literal[offset] = opcode;
|
||||
|
||||
/* Set the displacement bits so that we branch around
|
||||
the unconditional branch. */
|
||||
fragP->fr_literal[offset + 1] = 0x5;
|
||||
|
||||
/* Now create the unconditional branch + fixup to the
|
||||
final target. */
|
||||
fragP->fr_literal[offset + 2] = 0xfc;
|
||||
fix_new (fragP, fragP->fr_fix + 3, 2, fragP->fr_symbol,
|
||||
fragP->fr_offset + 1, 1, BFD_RELOC_16_PCREL);
|
||||
fragP->fr_var = 0;
|
||||
fragP->fr_fix += 5;
|
||||
}
|
||||
else if (fragP->fr_subtype == 2)
|
||||
{
|
||||
/* Reverse the condition of the first branch. */
|
||||
int offset = fragP->fr_fix;
|
||||
int opcode = fragP->fr_literal[offset] & 0xff;
|
||||
|
||||
switch (opcode)
|
||||
{
|
||||
case 0xe8:
|
||||
opcode = 0xe9;
|
||||
break;
|
||||
case 0xe9:
|
||||
opcode = 0xe8;
|
||||
break;
|
||||
case 0xe0:
|
||||
opcode = 0xe2;
|
||||
break;
|
||||
case 0xe2:
|
||||
opcode = 0xe0;
|
||||
break;
|
||||
case 0xe3:
|
||||
opcode = 0xe1;
|
||||
break;
|
||||
case 0xe1:
|
||||
opcode = 0xe3;
|
||||
break;
|
||||
case 0xe4:
|
||||
opcode = 0xe6;
|
||||
break;
|
||||
case 0xe6:
|
||||
opcode = 0xe4;
|
||||
break;
|
||||
case 0xe7:
|
||||
opcode = 0xe5;
|
||||
break;
|
||||
case 0xe5:
|
||||
opcode = 0xe7;
|
||||
break;
|
||||
default:
|
||||
abort ();
|
||||
}
|
||||
fragP->fr_literal[offset] = opcode;
|
||||
|
||||
/* Set the displacement bits so that we branch around
|
||||
the unconditional branch. */
|
||||
fragP->fr_literal[offset + 1] = 0x7;
|
||||
|
||||
/* Now create the unconditional branch + fixup to the
|
||||
final target. */
|
||||
fragP->fr_literal[offset + 2] = 0xf4;
|
||||
fragP->fr_literal[offset + 3] = 0xe0;
|
||||
fix_new (fragP, fragP->fr_fix + 4, 4, fragP->fr_symbol,
|
||||
fragP->fr_offset + 2, 1, BFD_RELOC_24_PCREL);
|
||||
fragP->fr_var = 0;
|
||||
fragP->fr_fix += 7;
|
||||
}
|
||||
else if (fragP->fr_subtype == 3)
|
||||
{
|
||||
fix_new (fragP, fragP->fr_fix + 2, 1, fragP->fr_symbol,
|
||||
fragP->fr_offset + 2, 1, BFD_RELOC_8_PCREL);
|
||||
fragP->fr_var = 0;
|
||||
fragP->fr_fix += 3;
|
||||
}
|
||||
else if (fragP->fr_subtype == 4)
|
||||
{
|
||||
/* Reverse the condition of the first branch. */
|
||||
int offset = fragP->fr_fix;
|
||||
int opcode = fragP->fr_literal[offset + 1] & 0xff;
|
||||
|
||||
switch (opcode)
|
||||
{
|
||||
case 0xfc:
|
||||
opcode = 0xfd;
|
||||
break;
|
||||
case 0xfd:
|
||||
opcode = 0xfc;
|
||||
break;
|
||||
case 0xfe:
|
||||
opcode = 0xff;
|
||||
break;
|
||||
case 0xff:
|
||||
opcode = 0xfe;
|
||||
case 0xe8:
|
||||
opcode = 0xe9;
|
||||
break;
|
||||
case 0xe9:
|
||||
opcode = 0xe8;
|
||||
break;
|
||||
case 0xe0:
|
||||
opcode = 0xe2;
|
||||
break;
|
||||
case 0xe2:
|
||||
opcode = 0xe0;
|
||||
break;
|
||||
case 0xe3:
|
||||
opcode = 0xe1;
|
||||
break;
|
||||
case 0xe1:
|
||||
opcode = 0xe3;
|
||||
break;
|
||||
case 0xe4:
|
||||
opcode = 0xe6;
|
||||
break;
|
||||
case 0xe6:
|
||||
opcode = 0xe4;
|
||||
break;
|
||||
case 0xe7:
|
||||
opcode = 0xe5;
|
||||
break;
|
||||
case 0xe5:
|
||||
opcode = 0xe7;
|
||||
break;
|
||||
case 0xec:
|
||||
opcode = 0xed;
|
||||
break;
|
||||
case 0xed:
|
||||
opcode = 0xec;
|
||||
break;
|
||||
case 0xee:
|
||||
opcode = 0xef;
|
||||
break;
|
||||
case 0xef:
|
||||
opcode = 0xee;
|
||||
break;
|
||||
default:
|
||||
abort ();
|
||||
}
|
||||
fragP->fr_literal[offset + 1] = opcode;
|
||||
|
||||
/* Set the displacement bits so that we branch around
|
||||
the unconditional branch. */
|
||||
fragP->fr_literal[offset + 2] = 0x6;
|
||||
|
||||
/* Now create the unconditional branch + fixup to the
|
||||
final target. */
|
||||
fragP->fr_literal[offset + 3] = 0xfc;
|
||||
fix_new (fragP, fragP->fr_fix + 4, 2, fragP->fr_symbol,
|
||||
fragP->fr_offset + 1, 1, BFD_RELOC_16_PCREL);
|
||||
fragP->fr_var = 0;
|
||||
fragP->fr_fix += 6;
|
||||
}
|
||||
else if (fragP->fr_subtype == 5)
|
||||
{
|
||||
/* Reverse the condition of the first branch. */
|
||||
int offset = fragP->fr_fix;
|
||||
int opcode = fragP->fr_literal[offset + 1] & 0xff;
|
||||
|
||||
switch (opcode)
|
||||
{
|
||||
case 0xfc:
|
||||
opcode = 0xfd;
|
||||
break;
|
||||
case 0xfd:
|
||||
opcode = 0xfc;
|
||||
break;
|
||||
case 0xfe:
|
||||
opcode = 0xff;
|
||||
break;
|
||||
case 0xff:
|
||||
opcode = 0xfe;
|
||||
case 0xe8:
|
||||
opcode = 0xe9;
|
||||
break;
|
||||
case 0xe9:
|
||||
opcode = 0xe8;
|
||||
break;
|
||||
case 0xe0:
|
||||
opcode = 0xe2;
|
||||
break;
|
||||
case 0xe2:
|
||||
opcode = 0xe0;
|
||||
break;
|
||||
case 0xe3:
|
||||
opcode = 0xe1;
|
||||
break;
|
||||
case 0xe1:
|
||||
opcode = 0xe3;
|
||||
break;
|
||||
case 0xe4:
|
||||
opcode = 0xe6;
|
||||
break;
|
||||
case 0xe6:
|
||||
opcode = 0xe4;
|
||||
break;
|
||||
case 0xe7:
|
||||
opcode = 0xe5;
|
||||
break;
|
||||
case 0xe5:
|
||||
opcode = 0xe7;
|
||||
break;
|
||||
case 0xec:
|
||||
opcode = 0xed;
|
||||
break;
|
||||
case 0xed:
|
||||
opcode = 0xec;
|
||||
break;
|
||||
case 0xee:
|
||||
opcode = 0xef;
|
||||
break;
|
||||
case 0xef:
|
||||
opcode = 0xee;
|
||||
break;
|
||||
default:
|
||||
abort ();
|
||||
}
|
||||
fragP->fr_literal[offset + 1] = opcode;
|
||||
|
||||
/* Set the displacement bits so that we branch around
|
||||
the unconditional branch. */
|
||||
fragP->fr_literal[offset + 2] = 0x8;
|
||||
|
||||
/* Now create the unconditional branch + fixup to the
|
||||
final target. */
|
||||
fragP->fr_literal[offset + 3] = 0xf4;
|
||||
fragP->fr_literal[offset + 4] = 0xe0;
|
||||
fix_new (fragP, fragP->fr_fix + 5, 4, fragP->fr_symbol,
|
||||
fragP->fr_offset + 2, 1, BFD_RELOC_24_PCREL);
|
||||
fragP->fr_var = 0;
|
||||
fragP->fr_fix += 8;
|
||||
}
|
||||
else if (fragP->fr_subtype == 6)
|
||||
{
|
||||
fix_new (fragP, fragP->fr_fix + 1, 2, fragP->fr_symbol,
|
||||
fragP->fr_offset + 1, 1, BFD_RELOC_16_PCREL);
|
||||
fragP->fr_var = 0;
|
||||
fragP->fr_fix += 3;
|
||||
}
|
||||
else if (fragP->fr_subtype == 7)
|
||||
{
|
||||
int offset = fragP->fr_fix;
|
||||
int opcode = fragP->fr_literal[offset] & 0xff;
|
||||
|
||||
if (opcode == 0xfc)
|
||||
{
|
||||
fragP->fr_literal[offset] = 0xf4;
|
||||
fragP->fr_literal[offset + 1] = 0xe0;
|
||||
}
|
||||
else if (opcode == 0xfd)
|
||||
{
|
||||
fragP->fr_literal[offset] = 0xf4;
|
||||
fragP->fr_literal[offset + 1] = 0xe1;
|
||||
}
|
||||
else
|
||||
abort ();
|
||||
|
||||
fix_new (fragP, fragP->fr_fix + 2, 4, fragP->fr_symbol,
|
||||
fragP->fr_offset + 2, 1, BFD_RELOC_24_PCREL);
|
||||
fragP->fr_var = 0;
|
||||
fragP->fr_fix += 5;
|
||||
}
|
||||
else
|
||||
abort ();
|
||||
}
|
||||
|
||||
|
@ -411,7 +738,7 @@ md_assemble (str)
|
|||
struct mn10200_opcode *opcode;
|
||||
struct mn10200_opcode *next_opcode;
|
||||
const unsigned char *opindex_ptr;
|
||||
int next_opindex;
|
||||
int next_opindex, relaxable;
|
||||
unsigned long insn, extension, size = 0;
|
||||
char *f;
|
||||
int i;
|
||||
|
@ -444,6 +771,7 @@ md_assemble (str)
|
|||
char *hold;
|
||||
int extra_shift = 0;
|
||||
|
||||
relaxable = 0;
|
||||
fc = 0;
|
||||
match = 0;
|
||||
next_opindex = 0;
|
||||
|
@ -471,6 +799,9 @@ md_assemble (str)
|
|||
while (*str == ' ' || *str == ',')
|
||||
++str;
|
||||
|
||||
if (operand->flags & MN10200_OPERAND_RELAX)
|
||||
relaxable = 1;
|
||||
|
||||
/* Gather the operand. */
|
||||
hold = input_line_pointer;
|
||||
input_line_pointer = str;
|
||||
|
@ -684,6 +1015,33 @@ keep_going:
|
|||
|
||||
/* Write out the instruction. */
|
||||
|
||||
if (relaxable && fc > 0)
|
||||
{
|
||||
int type;
|
||||
|
||||
if (size == 2)
|
||||
type = 0;
|
||||
else if (size == 3
|
||||
&& opcode->opcode != 0xfd0000 && opcode->opcode != 0xfc0000)
|
||||
type = 3;
|
||||
else
|
||||
type = 6;
|
||||
f = frag_var (rs_machine_dependent, 8, 8 - size, type,
|
||||
fixups[0].exp.X_add_symbol,
|
||||
fixups[0].exp.X_add_number,
|
||||
(char *)fixups[0].opindex);
|
||||
number_to_chars_bigendian (f, insn, size);
|
||||
if (8 - size > 4)
|
||||
{
|
||||
number_to_chars_bigendian (f + size, 0, 4);
|
||||
number_to_chars_bigendian (f + size + 4, 0, 8 - size - 4);
|
||||
}
|
||||
else
|
||||
number_to_chars_bigendian (f + size, 0, 8 - size);
|
||||
}
|
||||
|
||||
else
|
||||
{
|
||||
f = frag_more (size);
|
||||
|
||||
/* Oh, what a mess. The instruction is in big endian format, but
|
||||
|
@ -733,7 +1091,8 @@ keep_going:
|
|||
abort();
|
||||
|
||||
offset = 4 - size;
|
||||
fixP = fix_new_exp (frag_now, f - frag_now->fr_literal + offset, size,
|
||||
fixP = fix_new_exp (frag_now, f - frag_now->fr_literal + offset,
|
||||
size,
|
||||
&fixups[i].exp,
|
||||
reloc_howto->pc_relative,
|
||||
fixups[i].reloc);
|
||||
|
@ -794,6 +1153,7 @@ keep_going:
|
|||
fixP->fx_offset += offset;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
@ -807,17 +1167,28 @@ tc_gen_reloc (seg, fixp)
|
|||
{
|
||||
arelent *reloc;
|
||||
reloc = (arelent *) bfd_alloc_by_size_t (stdoutput, sizeof (arelent));
|
||||
reloc->sym_ptr_ptr = &fixp->fx_addsy->bsym;
|
||||
reloc->address = fixp->fx_frag->fr_address + fixp->fx_where;
|
||||
|
||||
reloc->howto = bfd_reloc_type_lookup (stdoutput, fixp->fx_r_type);
|
||||
if (reloc->howto == (reloc_howto_type *) NULL)
|
||||
{
|
||||
as_bad_where (fixp->fx_file, fixp->fx_line,
|
||||
"reloc %d not supported by object file format", (int)fixp->fx_r_type);
|
||||
"reloc %d not supported by object file format",
|
||||
(int)fixp->fx_r_type);
|
||||
return NULL;
|
||||
}
|
||||
reloc->address = fixp->fx_frag->fr_address + fixp->fx_where;
|
||||
|
||||
if (fixp->fx_addsy && fixp->fx_subsy)
|
||||
{
|
||||
reloc->sym_ptr_ptr = &bfd_abs_symbol;
|
||||
reloc->addend = (S_GET_VALUE (fixp->fx_addsy)
|
||||
- S_GET_VALUE (fixp->fx_subsy) + fixp->fx_offset);
|
||||
}
|
||||
else
|
||||
{
|
||||
reloc->sym_ptr_ptr = &fixp->fx_addsy->bsym;
|
||||
reloc->addend = fixp->fx_offset;
|
||||
/* printf("tc_gen_reloc: addr=%x addend=%x\n", reloc->address, reloc->addend); */
|
||||
}
|
||||
return reloc;
|
||||
}
|
||||
|
||||
|
@ -826,7 +1197,19 @@ md_estimate_size_before_relax (fragp, seg)
|
|||
fragS *fragp;
|
||||
asection *seg;
|
||||
{
|
||||
return 0;
|
||||
if (fragp->fr_subtype == 0)
|
||||
return 2;
|
||||
if (fragp->fr_subtype == 3)
|
||||
return 3;
|
||||
if (fragp->fr_subtype == 6)
|
||||
{
|
||||
if (!S_IS_DEFINED (fragp->fr_symbol))
|
||||
{
|
||||
fragp->fr_subtype = 7;
|
||||
return 5;
|
||||
}
|
||||
}
|
||||
return 3;
|
||||
}
|
||||
|
||||
long
|
||||
|
|
|
@ -0,0 +1,55 @@
|
|||
/* tc-mn10200.h -- Header file for tc-mn10200.c.
|
||||
Copyright (C) 1996 Free Software Foundation, Inc.
|
||||
|
||||
This file is part of GAS, the GNU Assembler.
|
||||
|
||||
GAS is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2, or (at your option)
|
||||
any later version.
|
||||
|
||||
GAS is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with GAS; see the file COPYING. If not, write to
|
||||
the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
|
||||
|
||||
#define TC_MN10200
|
||||
|
||||
#ifndef BFD_ASSEMBLER
|
||||
#error MN10200 support requires BFD_ASSEMBLER
|
||||
#endif
|
||||
|
||||
/* The target BFD architecture. */
|
||||
#define TARGET_ARCH bfd_arch_mn10200
|
||||
|
||||
#define TARGET_FORMAT "elf32-mn10200"
|
||||
|
||||
#define MD_APPLY_FIX3
|
||||
#define md_operand(x)
|
||||
|
||||
/* Permit temporary numeric labels. */
|
||||
#define LOCAL_LABELS_FB 1
|
||||
|
||||
#define LOCAL_LABEL(name) ((name[0] == '.' \
|
||||
&& (name[1] == 'L' || name[1] == '.')) \
|
||||
|| (name[0] == '_' && name[1] == '.' && name[2] == 'L' \
|
||||
&& name[3] == '_'))
|
||||
|
||||
#define FAKE_LABEL_NAME ".L0\001"
|
||||
|
||||
/* We don't need to handle .word strangely. */
|
||||
#define WORKING_DOT_WORD
|
||||
|
||||
#define md_number_to_chars number_to_chars_littleendian
|
||||
|
||||
/* Don't bother to adjust relocs. */
|
||||
#define tc_fix_adjustable(FIX) 0
|
||||
|
||||
/* We do relaxing in the assembler as well as the linker. */
|
||||
extern const struct relax_type md_relax_table[];
|
||||
#define TC_GENERIC_RELAX_TABLE md_relax_table
|
||||
|
Loading…
Reference in New Issue