/* m88k.c -- Assembler for the Motorola 88000
Contributed by Devon Bowen of Buffalo University
and Torbjorn Granlund of the Swedish Institute of Computer Science.
- Copyright (C) 1989, 1990, 1991 Free Software Foundation, Inc.
+ Copyright 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1999,
+ 2000, 2001
+ 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 1, or (at your option)
+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,
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, 675 Mass Ave, Cambridge, MA 02139, USA. */
+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. */
-#include <ctype.h>
#include "as.h"
+#include "safe-ctype.h"
+#include "subsegs.h"
#include "m88k-opcode.h"
-char *getval ();
-char *get_reg ();
-char *get_imm16 ();
-char *get_bf ();
-char *get_pcr ();
-char *get_cmp ();
-char *get_cnd ();
-char *get_cr ();
-char *get_fcr ();
-char *get_vec9 ();
-
struct field_val_assoc
{
char *name;
enum reloc_type reloc;
};
+static char *get_bf PARAMS ((char *param, unsigned *valp));
+static char *get_cmp PARAMS ((char *param, unsigned *valp));
+static char *get_cnd PARAMS ((char *param, unsigned *valp));
+static char *get_cr PARAMS ((char *param, unsigned *regnop));
+static char *get_fcr PARAMS ((char *param, unsigned *regnop));
+static char *get_imm16 PARAMS ((char *param, struct m88k_insn *insn));
+static char *get_o6 PARAMS ((char *param, unsigned *valp));
+static char *get_reg PARAMS ((char *param, unsigned *regnop, int reg_prefix));
+static char *get_vec9 PARAMS ((char *param, unsigned *valp));
+static char *getval PARAMS ((char *param, unsigned int *valp));
+
+static char *get_pcr PARAMS ((char *param, struct m88k_insn *insn,
+ enum reloc_type reloc));
+
+static int calcop PARAMS ((struct m88k_opcode *format,
+ char *param, struct m88k_insn *insn));
+
extern char *myname;
static struct hash_control *op_hash = NULL;
/* These bits should be turned off in the first address of every segment */
int md_seg_align = 7;
-/* This is the number to put at the beginning of the a.out file */
-long omagic = OMAGIC;
-
/* These chars start a comment anywhere in a source file (except inside
- another comment */
+ another comment. */
const char comment_chars[] = ";";
-/* These chars only start a comment at the beginning of a line. */
+/* These chars only start a comment at the beginning of a line. */
const char line_comment_chars[] = "#";
const char line_separator_chars[] = "";
/* or 0H1.234E-12 (see exp chars above) */
const char FLT_CHARS[] = "dDfF";
-extern void float_cons (), cons (), s_globl (), s_line (), s_space (),
+extern void float_cons (), cons (), s_globl (), s_space (),
s_set (), s_lcomm ();
-static void s_file ();
-static void s_bss ();
const pseudo_typeS md_pseudo_table[] =
{
+ {"align", s_align_bytes, 4},
{"def", s_set, 0},
{"dfloat", float_cons, 'd'},
{"ffloat", float_cons, 'f'},
- {"global", s_globl, 0},
{"half", cons, 2},
- {"bss", s_bss, 0},
- {"ln", s_line, 0},
+ {"bss", s_lcomm, 1},
{"string", stringer, 0},
{"word", cons, 4},
- {"zero", s_space, 0},
- {0}
+ /* Force set to be treated as an instruction. */
+ {"set", NULL, 0},
+ {".set", s_set, 0},
+ {NULL, NULL, 0}
};
void
md_begin ()
{
- char *retval = NULL;
+ const char *retval = NULL;
unsigned int i = 0;
- /* initialize hash table */
-
+ /* Initialize hash table. */
op_hash = hash_new ();
- if (op_hash == NULL)
- as_fatal ("Could not initialize hash table");
-
- /* loop until you see the end of the list */
while (*m88k_opcodes[i].name)
{
char *name = m88k_opcodes[i].name;
- /* hash each mnemonic and record its position */
-
+ /* Hash each mnemonic and record its position. */
retval = hash_insert (op_hash, name, &m88k_opcodes[i]);
- if (retval != NULL && *retval != '\0')
- as_fatal ("Can't hash instruction '%s':%s",
+ if (retval != NULL)
+ as_fatal (_("Can't hash instruction '%s':%s"),
m88k_opcodes[i].name, retval);
- /* skip to next unique mnemonic or end of list */
-
+ /* Skip to next unique mnemonic or end of list. */
for (i++; !strcmp (m88k_opcodes[i].name, name); i++)
;
}
}
+\f
+CONST char *md_shortopts = "";
+struct option md_longopts[] = {
+ {NULL, no_argument, NULL, 0}
+};
+size_t md_longopts_size = sizeof (md_longopts);
-void
-md_parse_option (argP, cntP, vecP)
- char **argP;
- int *cntP;
- char ***vecP;
+int
+md_parse_option (c, arg)
+ int c ATTRIBUTE_UNUSED;
+ char *arg ATTRIBUTE_UNUSED;
{
- as_warn ("unknown option: -%s", *argP);
+ return 0;
}
+void
+md_show_usage (stream)
+ FILE *stream ATTRIBUTE_UNUSED;
+{
+}
+\f
void
md_assemble (op)
char *op;
{
char *param, *thisfrag;
+ char c;
struct m88k_opcode *format;
struct m88k_insn insn;
assert (op);
- /* skip over instruction to find parameters */
-
- for (param = op; *param != 0 && !isspace (*param); param++)
+ /* Skip over instruction to find parameters. */
+ for (param = op; *param != 0 && !ISSPACE (*param); param++)
;
- if (*param != 0)
- *param++ = 0;
-
- /* try to find the instruction in the hash table */
+ c = *param;
+ *param++ = '\0';
+ /* Try to find the instruction in the hash table. */
if ((format = (struct m88k_opcode *) hash_find (op_hash, op)) == NULL)
{
- as_fatal ("Invalid mnemonic '%s'", op);
+ as_bad (_("Invalid mnemonic '%s'"), op);
return;
}
- /* try parsing this instruction into insn */
-
+ /* Try parsing this instruction into insn. */
insn.exp.X_add_symbol = 0;
- insn.exp.X_subtract_symbol = 0;
+ insn.exp.X_op_symbol = 0;
insn.exp.X_add_number = 0;
- insn.exp.X_seg = 0;
+ insn.exp.X_op = O_illegal;
insn.reloc = NO_RELOC;
while (!calcop (format, param, &insn))
{
- /* if it doesn't parse try the next instruction */
-
+ /* If it doesn't parse try the next instruction. */
if (!strcmp (format[0].name, format[1].name))
format++;
else
{
- as_fatal ("Parameter syntax error");
+ as_fatal (_("Parameter syntax error"));
return;
}
}
- /* grow the current frag and plop in the opcode */
-
+ /* Grow the current frag and plop in the opcode. */
thisfrag = frag_more (4);
md_number_to_chars (thisfrag, insn.opcode, 4);
- /* if this instruction requires labels mark it for later */
-
+ /* If this instruction requires labels mark it for later. */
switch (insn.reloc)
{
case NO_RELOC:
case RELOC_LO16:
case RELOC_HI16:
- fix_new (frag_now,
- thisfrag - frag_now->fr_literal + 2,
- 2,
- insn.exp.X_add_symbol,
- insn.exp.X_subtract_symbol,
- insn.exp.X_add_number,
- 0,
- insn.reloc);
+ fix_new_exp (frag_now,
+ thisfrag - frag_now->fr_literal + 2,
+ 2,
+ &insn.exp,
+ 0,
+ insn.reloc);
break;
case RELOC_IW16:
- fix_new (frag_now,
- thisfrag - frag_now->fr_literal,
- 4,
- insn.exp.X_add_symbol,
- insn.exp.X_subtract_symbol,
- insn.exp.X_add_number,
- 0,
- insn.reloc);
+ fix_new_exp (frag_now,
+ thisfrag - frag_now->fr_literal,
+ 4,
+ &insn.exp,
+ 0,
+ insn.reloc);
break;
case RELOC_PC16:
- fix_new (frag_now,
- thisfrag - frag_now->fr_literal + 2,
- 2,
- insn.exp.X_add_symbol,
- insn.exp.X_subtract_symbol,
- insn.exp.X_add_number,
- 1,
- insn.reloc);
+ fix_new_exp (frag_now,
+ thisfrag - frag_now->fr_literal + 2,
+ 2,
+ &insn.exp,
+ 1,
+ insn.reloc);
break;
case RELOC_PC26:
- fix_new (frag_now,
- thisfrag - frag_now->fr_literal,
- 4,
- insn.exp.X_add_symbol,
- insn.exp.X_subtract_symbol,
- insn.exp.X_add_number,
- 1,
- insn.reloc);
+ fix_new_exp (frag_now,
+ thisfrag - frag_now->fr_literal,
+ 4,
+ &insn.exp,
+ 1,
+ insn.reloc);
break;
default:
- as_fatal ("Unknown relocation type");
+ as_fatal (_("Unknown relocation type"));
break;
}
}
-int
+static int
calcop (format, param, insn)
struct m88k_opcode *format;
char *param;
{
case 0:
insn->opcode |= opcode;
- return *param == 0;
+ return (*param == 0 || *param == '\n');
default:
if (f != *param++)
opcode |= val << 21;
break;
+ case 'o':
+ param = get_o6 (param, &val);
+ opcode |= ((val >> 2) << 7);
+ break;
+
case 'x':
reg_prefix = 'x';
break;
case '?':
/* Having this here repeats the warning somtimes.
But can't we stand that? */
- as_warn ("Use of obsolete instruction");
+ as_warn (_("Use of obsolete instruction"));
break;
}
}
}
-char *
+static char *
match_name (param, assoc_tab, valp)
char *param;
struct field_val_assoc *assoc_tab;
}
}
-char *
+static char *
get_reg (param, regnop, reg_prefix)
char *param;
unsigned *regnop;
return 0;
}
-char *
+static char *
get_imm16 (param, insn)
char *param;
struct m88k_insn *insn;
{
enum reloc_type reloc = NO_RELOC;
unsigned int val;
- segT seg;
char *save_ptr;
- if (!strncmp (param, "hi16", 4) && !isalnum (param[4]))
+ if (!strncmp (param, "hi16", 4) && !ISALNUM (param[4]))
{
reloc = RELOC_HI16;
param += 4;
}
- else if (!strncmp (param, "lo16", 4) && !isalnum (param[4]))
+ else if (!strncmp (param, "lo16", 4) && !ISALNUM (param[4]))
{
reloc = RELOC_LO16;
param += 4;
}
- else if (!strncmp (param, "iw16", 4) && !isalnum (param[4]))
+ else if (!strncmp (param, "iw16", 4) && !ISALNUM (param[4]))
{
reloc = RELOC_IW16;
param += 4;
save_ptr = input_line_pointer;
input_line_pointer = param;
- seg = expression (&insn->exp);
+ expression (&insn->exp);
param = input_line_pointer;
input_line_pointer = save_ptr;
val = insn->exp.X_add_number;
- if (seg == SEG_ABSOLUTE)
+ if (insn->exp.X_op == O_constant)
{
/* Insert the value now, and reset reloc to NO_RELOC. */
if (reloc == NO_RELOC)
{
/* Warn about too big expressions if not surrounded by xx16. */
if (val > 0xffff)
- as_warn ("Expression truncated to 16 bits");
+ as_warn (_("Expression truncated to 16 bits"));
}
if (reloc == RELOC_HI16)
return param;
}
-char *
+static char *
get_pcr (param, insn, reloc)
char *param;
struct m88k_insn *insn;
enum reloc_type reloc;
{
char *saveptr, *saveparam;
- segT seg;
saveptr = input_line_pointer;
input_line_pointer = param;
- seg = expression (&insn->exp);
+ expression (&insn->exp);
saveparam = input_line_pointer;
input_line_pointer = saveptr;
- /* Botch: We should relocate now if SEG_ABSOLUTE. */
+ /* Botch: We should relocate now if O_constant. */
insn->reloc = reloc;
return saveparam;
}
-char *
+static char *
get_cmp (param, valp)
char *param;
unsigned *valp;
if (val >= 32)
{
- as_warn ("Expression truncated to 5 bits");
+ as_warn (_("Expression truncated to 5 bits"));
val %= 32;
}
}
return param;
}
-char *
+static char *
get_cnd (param, valp)
char *param;
unsigned *valp;
{
unsigned int val;
- if (isdigit (*param))
+ if (ISDIGIT (*param))
{
param = getval (param, &val);
if (val >= 32)
{
- as_warn ("Expression truncated to 5 bits");
+ as_warn (_("Expression truncated to 5 bits"));
val %= 32;
}
}
else
{
- if (isupper (*param))
- *param = tolower (*param);
-
- if (isupper (param[1]))
- param[1] = tolower (param[1]);
+ param[0] = TOLOWER (param[0]);
+ param[1] = TOLOWER (param[1]);
param = match_name (param, cndmsk, valp);
return param;
}
-char *
+static char *
get_bf2 (param, bc)
char *param;
int bc;
}
}
-char *
+static char *
get_bf_offset_expression (param, offsetp)
char *param;
unsigned *offsetp;
{
unsigned offset;
- if (isalpha (param[0]))
+ if (ISALPHA (param[0]))
{
- if (isupper (param[0]))
- param[0] = tolower (param[0]);
- if (isupper (param[1]))
- param[1] = tolower (param[1]);
+ param[0] = TOLOWER (param[0]);
+ param[1] = TOLOWER (param[1]);
param = match_name (param, cmpslot, offsetp);
return param;
}
-char *
+static char *
get_bf (param, valp)
char *param;
unsigned *valp;
return param;
}
-char *
+static char *
get_cr (param, regnop)
char *param;
unsigned *regnop;
{
unsigned regno;
unsigned c;
- int i;
- int name_len;
if (!strncmp (param, "cr", 2))
{
return param;
}
-char *
+static char *
get_fcr (param, regnop)
char *param;
unsigned *regnop;
{
unsigned regno;
unsigned c;
- int i;
- int name_len;
if (!strncmp (param, "fcr", 3))
{
return param;
}
-char *
+static char *
get_vec9 (param, valp)
char *param;
unsigned *valp;
input_line_pointer = save_ptr;
if (val >= 1 << 9)
- as_warn ("Expression truncated to 9 bits");
+ as_warn (_("Expression truncated to 9 bits"));
*valp = val % (1 << 9);
return param;
}
+static char *
+get_o6 (param, valp)
+ char *param;
+ unsigned *valp;
+{
+ unsigned val;
+ char *save_ptr;
+
+ save_ptr = input_line_pointer;
+ input_line_pointer = param;
+ val = get_absolute_expression ();
+ param = input_line_pointer;
+ input_line_pointer = save_ptr;
+
+ if (val & 0x3)
+ as_warn (_("Removed lower 2 bits of expression"));
+
+ *valp = val;
+
+ return (param);
+}
+
#define hexval(z) \
- (isdigit (z) ? (z) - '0' : \
- islower (z) ? (z) - 'a' + 10 : \
- isupper (z) ? (z) - 'A' + 10 : -1)
+ (ISDIGIT (z) ? (z) - '0' : \
+ ISLOWER (z) ? (z) - 'a' + 10 : \
+ ISUPPER (z) ? (z) - 'A' + 10 : -1)
-char *
+static char *
getval (param, valp)
char *param;
unsigned int *valp;
void
md_number_to_chars (buf, val, nbytes)
char *buf;
- int val;
- int nbytes;
-{
- switch (nbytes)
- {
- case 4:
- *buf++ = val >> 24;
- *buf++ = val >> 16;
- case 2:
- *buf++ = val >> 8;
- case 1:
- *buf = val;
- break;
-
- default:
- abort ();
- }
-}
-
-void
-md_number_to_imm (buf, val, nbytes, fixP, seg_type)
- unsigned char *buf;
- unsigned int val;
+ valueT val;
int nbytes;
- fixS *fixP;
- int seg_type;
{
- if (seg_type != N_TEXT || fixP->fx_r_type == NO_RELOC)
- {
- switch (nbytes)
- {
- case 4:
- *buf++ = val >> 24;
- *buf++ = val >> 16;
- case 2:
- *buf++ = val >> 8;
- case 1:
- *buf = val;
- break;
-
- default:
- abort ();
- }
- return;
- }
-
- switch (fixP->fx_r_type)
- {
- case RELOC_IW16:
- buf[2] = val >> 8;
- buf[3] = val;
- break;
-
- case RELOC_LO16:
- buf[0] = val >> 8;
- buf[1] = val;
- break;
-
- case RELOC_HI16:
- buf[0] = val >> 24;
- buf[1] = val >> 16;
- break;
-
- case RELOC_PC16:
- val += 4;
- buf[0] = val >> 10;
- buf[1] = val >> 2;
- break;
-
- case RELOC_PC26:
- val += 4;
- buf[0] |= (val >> 26) & 0x03;
- buf[1] = val >> 18;
- buf[2] = val >> 10;
- buf[3] = val >> 2;
- break;
-
- case RELOC_32:
- buf[0] = val >> 24;
- buf[1] = val >> 16;
- buf[2] = val >> 8;
- buf[3] = val;
- break;
-
- default:
- as_fatal ("Bad relocation type");
- break;
- }
+ number_to_chars_bigendian (buf, val, nbytes);
}
void
int val;
int nbytes;
{
- as_fatal ("md_number_to_disp not defined");
+ as_fatal (_("md_number_to_disp not defined"));
md_number_to_chars (buf, val, nbytes);
}
int val;
int nbytes;
{
- as_fatal ("md_number_to_field not defined");
+ as_fatal (_("md_number_to_field not defined"));
md_number_to_chars (buf, val, nbytes);
}
LITTLENUM_TYPE words[MAX_LITTLENUMS];
LITTLENUM_TYPE *wordP;
char *t;
- char *atof_ieee ();
switch (type)
{
default:
*sizeP = 0;
- return "Bad call to MD_ATOF()";
+ return _("Bad call to MD_ATOF()");
}
t = atof_ieee (input_line_pointer, type, words);
if (t)
md_number_to_chars (litP, (long) (*wordP++), sizeof (LITTLENUM_TYPE));
litP += sizeof (LITTLENUM_TYPE);
}
- return ""; /* Someone should teach Dean about null pointers */
+ return 0;
}
int md_short_jump_size = 4;
void
md_create_short_jump (ptr, from_addr, to_addr, frag, to_symbol)
char *ptr;
- long from_addr, to_addr;
+ addressT from_addr ATTRIBUTE_UNUSED;
+ addressT to_addr ATTRIBUTE_UNUSED;
fragS *frag;
symbolS *to_symbol;
{
- ptr[0] = 0xc0;
+ ptr[0] = (char) 0xc0;
ptr[1] = 0x00;
ptr[2] = 0x00;
ptr[3] = 0x00;
ptr - frag->fr_literal,
4,
to_symbol,
- (symbolS *) 0,
- (long int) 0,
+ (offsetT) 0,
0,
RELOC_PC26); /* Botch: Shouldn't this be RELOC_PC16? */
}
void
md_create_long_jump (ptr, from_addr, to_addr, frag, to_symbol)
char *ptr;
- long from_addr, to_addr;
+ addressT from_addr ATTRIBUTE_UNUSED;
+ addressT to_addr ATTRIBUTE_UNUSED;
fragS *frag;
symbolS *to_symbol;
{
- ptr[0] = 0xc0;
+ ptr[0] = (char) 0xc0;
ptr[1] = 0x00;
ptr[2] = 0x00;
ptr[3] = 0x00;
ptr - frag->fr_literal,
4,
to_symbol,
- (symbolS *) 0,
- (long int) 0,
+ (offsetT) 0,
0,
RELOC_PC26);
}
int
md_estimate_size_before_relax (fragP, segment_type)
- fragS *fragP;
- int segment_type;
+ fragS *fragP ATTRIBUTE_UNUSED;
+ segT segment_type ATTRIBUTE_UNUSED;
{
- as_fatal ("Relaxation should never occur");
+ as_fatal (_("Relaxation should never occur"));
+ return (-1);
}
-const relax_typeS md_relax_table[] =
-{0};
+#ifdef M88KCOFF
-void
-md_convert_frag (fragP)
- fragS *fragP;
-{
- as_fatal ("Relaxation should never occur");
-}
+/* These functions are needed if we are linking with obj-coffbfd.c.
+ That file may be replaced by a more BFD oriented version at some
+ point. If that happens, these functions should be rexamined.
-void
-md_end ()
+ Ian Lance Taylor, Cygnus Support, 13 July 1993. */
+
+/* Given a fixS structure (created by a call to fix_new, above),
+ return the BFD relocation type to use for it. */
+
+short
+tc_coff_fix2rtype (fixp)
+ fixS *fixp;
{
+ switch (fixp->fx_r_type)
+ {
+ case RELOC_LO16:
+ return R_LVRT16;
+ case RELOC_HI16:
+ return R_HVRT16;
+ case RELOC_PC16:
+ return R_PCR16L;
+ case RELOC_PC26:
+ return R_PCR26L;
+ case RELOC_32:
+ return R_VRT32;
+ case RELOC_IW16:
+ return R_VRT16;
+ default:
+ abort ();
+ }
}
-/*
- * Risc relocations are completely different, so it needs
- * this machine dependent routine to emit them.
- */
+/* Apply a fixS to the object file. Since COFF does not use addends
+ in relocs, the addend is actually stored directly in the object
+ file itself. */
+
void
-emit_relocations (fixP, segment_address_in_file)
+md_apply_fix3 (fixP, valP, seg)
fixS *fixP;
- relax_addressT segment_address_in_file;
+ valueT * valP;
+ segT seg ATTRIBUTE_UNUSED;
{
- struct reloc_info_m88k ri;
- symbolS *symbolP;
- extern char *next_object_file_charP;
+ long val = * (long *) valP;
+ char *buf;
- bzero ((char *) &ri, sizeof (ri));
- for (; fixP; fixP = fixP->fx_next)
+ buf = fixP->fx_frag->fr_literal + fixP->fx_where;
+ fixP->fx_offset = 0;
+
+ switch (fixP->fx_r_type)
{
- if (fixP->fx_r_type >= NO_RELOC)
- {
- fprintf (stderr, "fixP->fx_r_type = %d\n", fixP->fx_r_type);
- abort ();
- }
+ case RELOC_IW16:
+ fixP->fx_offset = val >> 16;
+ buf[2] = val >> 8;
+ buf[3] = val;
+ break;
- if ((symbolP = fixP->fx_addsy) != NULL)
- {
- ri.r_address = fixP->fx_frag->fr_address +
- fixP->fx_where - segment_address_in_file;
- if ((symbolP->sy_type & N_TYPE) == N_UNDF)
- {
- ri.r_extern = 1;
- ri.r_symbolnum = symbolP->sy_number;
- }
- else
- {
- ri.r_extern = 0;
- ri.r_symbolnum = symbolP->sy_type & N_TYPE;
- }
- if (symbolP && symbolP->sy_frag)
- {
- ri.r_addend = symbolP->sy_frag->fr_address;
- }
- ri.r_type = fixP->fx_r_type;
- if (fixP->fx_pcrel)
- {
- ri.r_addend -= ri.r_address;
- }
- else
- {
- ri.r_addend = fixP->fx_addnumber;
- }
+ case RELOC_LO16:
+ fixP->fx_offset = val >> 16;
+ buf[0] = val >> 8;
+ buf[1] = val;
+ break;
- append (&next_object_file_charP, (char *) &ri, sizeof (ri));
- }
+ case RELOC_HI16:
+ fixP->fx_offset = val >> 16;
+ buf[0] = val >> 8;
+ buf[1] = val;
+ break;
+
+ case RELOC_PC16:
+ buf[0] = val >> 10;
+ buf[1] = val >> 2;
+ break;
+
+ case RELOC_PC26:
+ buf[0] |= (val >> 26) & 0x03;
+ buf[1] = val >> 18;
+ buf[2] = val >> 10;
+ buf[3] = val >> 2;
+ break;
+
+ case RELOC_32:
+ buf[0] = val >> 24;
+ buf[1] = val >> 16;
+ buf[2] = val >> 8;
+ buf[3] = val;
+ break;
+
+ default:
+ abort ();
}
- return;
+
+ if (fixP->fx_addsy == NULL && fixP->fx_pcrel == 0)
+ fixP->fx_done = 1;
}
-static void
-s_bss ()
+/* Where a PC relative offset is calculated from. On the m88k they
+ are calculated from just after the instruction. */
+
+long
+md_pcrel_from (fixp)
+ fixS *fixp;
{
- char *name;
- char c;
- char *p;
- int temp, bss_align;
- symbolS *symbolP;
- extern const char is_end_of_line[256];
-
- name = input_line_pointer;
- c = get_symbol_end ();
- p = input_line_pointer;
- *p = c;
- SKIP_WHITESPACE ();
- if (*input_line_pointer != ',')
- {
- as_warn ("Expected comma after name");
- ignore_rest_of_line ();
- return;
- }
- input_line_pointer++;
- if ((temp = get_absolute_expression ()) < 0)
- {
- as_warn ("BSS length (%d.) <0! Ignored.", temp);
- ignore_rest_of_line ();
- return;
- }
- *p = 0;
- symbolP = symbol_find_or_make (name);
- *p = c;
- if (*input_line_pointer == ',')
+ switch (fixp->fx_r_type)
{
- input_line_pointer++;
- bss_align = get_absolute_expression ();
+ case RELOC_PC16:
+ return fixp->fx_frag->fr_address + fixp->fx_where - 2;
+ case RELOC_PC26:
+ return fixp->fx_frag->fr_address + fixp->fx_where;
+ default:
+ abort ();
}
- else
- bss_align = 0;
+ /*NOTREACHED*/
+}
- if (!S_IS_DEFINED(symbolP)
- || S_GET_SEGMENT(symbolP) == SEG_BSS)
- {
- if (! need_pass_2)
- {
- char *p;
- segT current_seg = now_seg;
- subsegT current_subseg = now_subseg;
+/* Fill in rs_align_code fragments. */
- subseg_new (SEG_BSS, 1); /* switch to bss */
+void
+m88k_handle_align (fragp)
+ fragS *fragp;
+{
+ static const unsigned char nop_pattern[] = { 0xf4, 0x00, 0x58, 0x00 };
- if (bss_align)
- frag_align (bss_align, 0);
+ int bytes;
+ char *p;
- /* detach from old frag */
- if (symbolP->sy_type == N_BSS && symbolP->sy_frag != NULL)
- symbolP->sy_frag->fr_symbol = NULL;
+ if (fragp->fr_type != rs_align_code)
+ return;
- symbolP->sy_frag = frag_now;
- p = frag_var (rs_org, 1, 1, (relax_substateT)0, symbolP,
- temp, (char *)0);
- *p = 0;
- S_SET_SEGMENT (symbolP, SEG_BSS);
+ bytes = fragp->fr_next->fr_address - fragp->fr_address - fragp->fr_fix;
+ p = fragp->fr_literal + fragp->fr_fix;
- subseg_new (current_seg, current_subseg);
- }
- }
- else
- {
- as_warn ("Ignoring attempt to re-define symbol %s.", name);
- }
-
- while (!is_end_of_line[*input_line_pointer])
+ if (bytes & 3)
{
- input_line_pointer++;
+ int fix = bytes & 3;
+ memset (p, 0, fix);
+ p += fix;
+ bytes -= fix;
+ fragp->fr_fix += fix;
}
- return;
+ memcpy (p, nop_pattern, 4);
+ fragp->fr_var = 4;
}
+
+#endif /* M88KCOFF */
projects / deliverable / binutils-gdb.git / blobdiff