/* 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, 90, 91, 92, 93, 94, 95, 96, 97, 98, 1999
+ 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.
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"
static int calcop PARAMS ((struct m88k_opcode *format,
char *param, struct m88k_insn *insn));
-
extern char *myname;
static struct hash_control *op_hash = NULL;
int md_seg_align = 7;
/* 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[] = "";
{"def", s_set, 0},
{"dfloat", float_cons, 'd'},
{"ffloat", float_cons, 'f'},
- {"global", s_globl, 0},
{"half", cons, 2},
{"bss", s_lcomm, 1},
{"string", stringer, 0},
/* Force set to be treated as an instruction. */
{"set", NULL, 0},
{".set", s_set, 0},
- {0}
+ {NULL, NULL, 0}
};
void
const char *retval = NULL;
unsigned int i = 0;
- /* initialize hash table */
-
+ /* Initialize hash table. */
op_hash = hash_new ();
- /* 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)
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++)
;
}
struct option md_longopts[] = {
{NULL, no_argument, NULL, 0}
};
-size_t md_longopts_size = sizeof(md_longopts);
+size_t md_longopts_size = sizeof (md_longopts);
int
md_parse_option (c, arg)
- int c;
- char *arg;
+ int c ATTRIBUTE_UNUSED;
+ char *arg ATTRIBUTE_UNUSED;
{
return 0;
}
void
md_show_usage (stream)
- FILE *stream;
+ FILE *stream ATTRIBUTE_UNUSED;
{
}
\f
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++)
;
c = *param;
*param++ = '\0';
- /* try to find the instruction in the hash table */
-
+ /* Try to find the instruction in the hash table. */
if ((format = (struct m88k_opcode *) hash_find (op_hash, op)) == NULL)
{
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_op_symbol = 0;
insn.exp.X_add_number = 0;
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
}
}
- /* 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:
unsigned int val;
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;
{
unsigned int val;
- if (isdigit (*param))
+ if (ISDIGIT (*param))
{
param = getval (param, &val);
}
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);
{
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);
*valp = val;
- return(param);
+ 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)
static char *
getval (param, valp)
number_to_chars_bigendian (buf, val, nbytes);
}
-#if 0
-
-/* This routine is never called. What is it for?
- Ian Taylor, Cygnus Support 13 Jul 1993 */
-
-void
-md_number_to_imm (buf, val, nbytes, fixP, seg_type)
- unsigned char *buf;
- unsigned int 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;
- }
-}
-
-#endif /* 0 */
-
void
md_number_to_disp (buf, val, nbytes)
char *buf;
void
md_create_short_jump (ptr, from_addr, to_addr, frag, to_symbol)
char *ptr;
- addressT from_addr, to_addr;
+ addressT from_addr ATTRIBUTE_UNUSED;
+ addressT to_addr ATTRIBUTE_UNUSED;
fragS *frag;
symbolS *to_symbol;
{
void
md_create_long_jump (ptr, from_addr, to_addr, frag, to_symbol)
char *ptr;
- addressT from_addr, to_addr;
+ addressT from_addr ATTRIBUTE_UNUSED;
+ addressT to_addr ATTRIBUTE_UNUSED;
fragS *frag;
symbolS *to_symbol;
{
int
md_estimate_size_before_relax (fragP, segment_type)
- fragS *fragP;
- segT segment_type;
+ fragS *fragP ATTRIBUTE_UNUSED;
+ segT segment_type ATTRIBUTE_UNUSED;
{
as_fatal (_("Relaxation should never occur"));
return (-1);
}
-#if 0
-
-/* As far as I can tell, this routine is never called. What is it
- doing here?
- Ian Taylor, Cygnus Support 13 Jul 1993 */
-
-
-/*
- * Risc relocations are completely different, so it needs
- * this machine dependent routine to emit them.
- */
-void
-emit_relocations (fixP, segment_address_in_file)
- fixS *fixP;
- relax_addressT segment_address_in_file;
-{
- struct reloc_info_m88k ri;
- symbolS *symbolP;
- extern char *next_object_file_charP;
-
- bzero ((char *) &ri, sizeof (ri));
- for (; fixP; fixP = fixP->fx_next)
- {
- if (fixP->fx_r_type >= NO_RELOC)
- {
- fprintf (stderr, "fixP->fx_r_type = %d\n", fixP->fx_r_type);
- abort ();
- }
-
- 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 && symbol_get_frag (symbolP))
- {
- ri.r_addend = symbol_get_frag (symbolP)->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;
- }
-
- append (&next_object_file_charP, (char *) &ri, sizeof (ri));
- }
- }
-}
-
-#endif /* 0 */
-
-#if 0
-
-/* This routine can be subsumed by s_lcomm in read.c.
- Ian Taylor, Cygnus Support 13 Jul 1993 */
-
-
-static void
-s_bss ()
-{
- char *name;
- char c;
- char *p;
- int temp, bss_align;
- symbolS *symbolP;
-
- 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 == ',')
- {
- input_line_pointer++;
- bss_align = get_absolute_expression ();
- }
- else
- bss_align = 0;
-
- 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;
-
- subseg_set (SEG_BSS, 1); /* switch to bss */
-
- if (bss_align)
- frag_align (bss_align, 0, 0);
-
- /* detach from old frag */
- if (symbolP->sy_type == N_BSS && symbol_get_frag (symbolP) != NULL)
- symbol_get_frag (symbolP)->fr_symbol = NULL;
-
- symbol_set_frag (symbolP, frag_now);
- p = frag_var (rs_org, 1, 1, (relax_substateT)0, symbolP,
- (offsetT) temp, (char *)0);
- *p = 0;
- S_SET_SEGMENT (symbolP, SEG_BSS);
-
- subseg_set (current_seg, current_subseg);
- }
- }
- else
- {
- as_warn (_("Ignoring attempt to re-define symbol %s."), name);
- }
-
- while (!is_end_of_line[(unsigned char) *input_line_pointer])
- {
- input_line_pointer++;
- }
-}
-
-#endif /* 0 */
-
#ifdef M88KCOFF
/* These functions are needed if we are linking with obj-coffbfd.c.
/*NOTREACHED*/
}
-/* When we align the .init section, insert the correct NOP pattern. */
+/* Fill in rs_align_code fragments. */
-int
-m88k_do_align (n, fill, max, len)
- int n;
- const char *fill;
- int len;
- int max;
+void
+m88k_handle_align (fragp)
+ fragS *fragp;
{
- if (fill == NULL
- && strcmp (obj_segment_name (now_seg), ".init") == 0)
+ static const unsigned char nop_pattern[] = { 0xf4, 0x00, 0x58, 0x00 };
+
+ int bytes;
+ char *p;
+
+ if (fragp->fr_type != rs_align_code)
+ return;
+
+ bytes = fragp->fr_next->fr_address - fragp->fr_address - fragp->fr_fix;
+ p = fragp->fr_literal + fragp->fr_fix;
+
+ if (bytes & 3)
{
- static const unsigned char nop_pattern[] = { 0xf4, 0x00, 0x58, 0x00 };
- frag_align_pattern (n, nop_pattern, sizeof (nop_pattern), max);
- return 1;
+ int fix = bytes & 3;
+ memset (p, 0, fix);
+ p += fix;
+ bytes -= fix;
+ fragp->fr_fix += fix;
}
- return 0;
+
+ memcpy (p, nop_pattern, 4);
+ fragp->fr_var = 4;
}
#endif /* M88KCOFF */
projects / deliverable / binutils-gdb.git / blobdiff