* main.c: Move entire file except for #ifndef MAIN_OVERRIDE code

[binutils.git] / gas / config / tc-a29k.c

diff --git a/gas/config/tc-a29k.c b/gas/config/tc-a29k.c
index 0a9c22af61d1b378a039c1ceeeb85ffa1a8ee9ba..5fa85bbc1c83333da87c6afff80516f5c01ac23e 100644 (file)
--- a/gas/config/tc-a29k.c
+++ b/gas/config/tc-a29k.c
@@ -1,5 +1,5 @@
 /* tc-a29k.c -- Assemble for the AMD 29000.
 /* tc-a29k.c -- Assemble for the AMD 29000.

-   Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+   Copyright (C) 1989, 1990, 1991, 1992, 1993 Free Software Foundation, Inc.

 
    This file is part of GAS, the GNU Assembler.
 
 
    This file is part of GAS, the GNU Assembler.
 


@@ -33,7 +33,9 @@
 #define        machine_it      a29k_it
 
 const relax_typeS md_relax_table[] =
 #define        machine_it      a29k_it
 
 const relax_typeS md_relax_table[] =

-{0};
+{
+  { 0, 0, 0, 0 }
+};

 
 #define        IMMEDIATE_BIT   0x01000000      /* Turns RB into Immediate */
 #define        ABSOLUTE_BIT    0x01000000      /* Turns PC-relative to Absolute */
 
 #define        IMMEDIATE_BIT   0x01000000      /* Turns RB into Immediate */
 #define        ABSOLUTE_BIT    0x01000000      /* Turns PC-relative to Absolute */


@@ -53,32 +55,18 @@ struct machine_it
     int reloc_offset;          /* Offset of reloc within insn */
 
     int reloc;
     int reloc_offset;          /* Offset of reloc within insn */
 
     int reloc;

-
-

   }
   }

-

 the_insn;
 
 the_insn;
 

-#if __STDC__ == 1
-
-/* static int getExpression(char *str); */
-static void machine_ip (char *str);
-/* static void print_insn(struct machine_it *insn); */
-static void s_data1 (void);
-static void s_use (void);
-
-#else /* not __STDC__ */
-
-/* static int getExpression(); */
-static void machine_ip ();
-/* static void print_insn(); */
-static void s_data1 ();
-static void s_use ();
-
-#endif /* not __STDC__ */
+static void machine_ip PARAMS ((char *str));
+/* static void print_insn PARAMS ((struct machine_it *insn)); */
+#ifndef OBJ_COFF
+static void s_data1 PARAMS ((void));
+static void s_use PARAMS ((int));
+#endif

 
 const pseudo_typeS
 
 const pseudo_typeS

-  md_pseudo_table[] =
+md_pseudo_table[] =

 {
   {"align", s_align_bytes, 4},
   {"block", s_space, 0},
 {
   {"align", s_align_bytes, 4},
   {"block", s_space, 0},


@@ -87,7 +75,7 @@ const pseudo_typeS
   {"space", s_ignore, 0},      /* Listing control */
   {"sect", s_ignore, 0},       /* Creation of coff sections */
 #ifndef OBJ_COFF
   {"space", s_ignore, 0},      /* Listing control */
   {"sect", s_ignore, 0},       /* Creation of coff sections */
 #ifndef OBJ_COFF

-/* We can do this right with coff */
+  /* We can do this right with coff.  */

   {"use", s_use, 0},
 #endif
   {"word", cons, 4},
   {"use", s_use, 0},
 #endif
   {"word", cons, 4},


@@ -132,9 +120,8 @@ const char EXP_CHARS[] = "eE";
 const char FLT_CHARS[] = "rRsSfFdDxXpP";
 
 /* Also be aware that MAXIMUM_NUMBER_OF_CHARS_FOR_FLOAT may have to be
 const char FLT_CHARS[] = "rRsSfFdDxXpP";
 
 /* Also be aware that MAXIMUM_NUMBER_OF_CHARS_FOR_FLOAT may have to be

-   changed in read.c .  Ideally it shouldn't have to know about it at all,
-   but nothing is ideal around here.
-   */
+   changed in read.c.  Ideally it shouldn't have to know about it at
+   all, but nothing is ideal around here.  */

 
 static unsigned char octal[256];
 #define isoctal(c)  octal[c]
 
 static unsigned char octal[256];
 #define isoctal(c)  octal[c]


@@ -145,20 +132,22 @@ static unsigned char toHex[256];
  */
 #define ANNUL       (1 << 29)
 
  */
 #define ANNUL       (1 << 29)
 

+#ifndef OBJ_COFF
+

 static void
 static void

-s_use ()
+s_use (ignore)
+     int ignore;

 {
 {

-

   if (strncmp (input_line_pointer, ".text", 5) == 0)
     {
       input_line_pointer += 5;
   if (strncmp (input_line_pointer, ".text", 5) == 0)
     {
       input_line_pointer += 5;

-      s_text ();
+      s_text (0);

       return;
     }
   if (strncmp (input_line_pointer, ".data", 5) == 0)
     {
       input_line_pointer += 5;
       return;
     }
   if (strncmp (input_line_pointer, ".data", 5) == 0)
     {
       input_line_pointer += 5;

-      s_data ();
+      s_data (0);

       return;
     }
   if (strncmp (input_line_pointer, ".data1", 6) == 0)
       return;
     }
   if (strncmp (input_line_pointer, ".data1", 6) == 0)


@@ -167,29 +156,29 @@ s_use ()
       s_data1 ();
       return;
     }
       s_data1 ();
       return;
     }

-  /* Literals can't go in the text segment because you can't read
-          from instruction memory on some 29k's.  So, into initialized data. */
+  /* Literals can't go in the text segment because you can't read from
+     instruction memory on some 29k's.  So, into initialized data. */

   if (strncmp (input_line_pointer, ".lit", 4) == 0)
     {
       input_line_pointer += 4;
   if (strncmp (input_line_pointer, ".lit", 4) == 0)
     {
       input_line_pointer += 4;

-      subseg_new (SEG_DATA, 200);
+      subseg_set (SEG_DATA, 200);

       demand_empty_rest_of_line ();
       return;
     }
 
   as_bad ("Unknown segment type");
   demand_empty_rest_of_line ();
       demand_empty_rest_of_line ();
       return;
     }
 
   as_bad ("Unknown segment type");
   demand_empty_rest_of_line ();

-  return;

 }
 
 static void
 s_data1 ()
 {
 }
 
 static void
 s_data1 ()
 {

-  subseg_new (SEG_DATA, 1);
+  subseg_set (SEG_DATA, 1);

   demand_empty_rest_of_line ();
   demand_empty_rest_of_line ();

-  return;

 }
 
 }
 

+#endif /* OBJ_COFF */
+

 /* Install symbol definition that maps REGNAME to REGNO.
    FIXME-SOON:  These are not recognized in mixed case.  */
 
 /* Install symbol definition that maps REGNAME to REGNO.
    FIXME-SOON:  These are not recognized in mixed case.  */
 


@@ -198,20 +187,22 @@ insert_sreg (regname, regnum)
      char *regname;
      int regnum;
 {
      char *regname;
      int regnum;
 {

-  /* FIXME-SOON, put something in these syms so they won't be output to the symbol
-          table of the resulting object file.  */
+  /* FIXME-SOON, put something in these syms so they won't be output
+     to the symbol table of the resulting object file.  */

 
   /* Must be large enough to hold the names of the special registers.  */
   char buf[80];
   int i;
 
 
   /* Must be large enough to hold the names of the special registers.  */
   char buf[80];
   int i;
 

-  symbol_table_insert (symbol_new (regname, SEG_REGISTER, regnum, &zero_address_frag));
+  symbol_table_insert (symbol_new (regname, SEG_REGISTER, (valueT) regnum,
+                                  &zero_address_frag));

   for (i = 0; regname[i]; i++)
     buf[i] = islower (regname[i]) ? toupper (regname[i]) : regname[i];
   buf[i] = '\0';
 
   for (i = 0; regname[i]; i++)
     buf[i] = islower (regname[i]) ? toupper (regname[i]) : regname[i];
   buf[i] = '\0';
 

-  symbol_table_insert (symbol_new (buf, SEG_REGISTER, regnum, &zero_address_frag));
-}                              /* insert_sreg() */
+  symbol_table_insert (symbol_new (buf, SEG_REGISTER, (valueT) regnum,
+                                  &zero_address_frag));
+}

 
 /* Install symbol definitions for assorted special registers.
    See ASM29K Ref page 2-9.  */
 
 /* Install symbol definitions for assorted special registers.
    See ASM29K Ref page 2-9.  */


@@ -266,14 +257,15 @@ define_some_regs ()
   insert_sreg ("fps", SREG + 162);
   /*  "",    SREG+163);          Reserved */
   insert_sreg ("exop", SREG + 164);
   insert_sreg ("fps", SREG + 162);
   /*  "",    SREG+163);          Reserved */
   insert_sreg ("exop", SREG + 164);

-}                              /* define_some_regs() */
+}

 
 /* This function is called once, at assembler startup time.  It should
 
 /* This function is called once, at assembler startup time.  It should

-   set up all the tables, etc. that the MD part of the assembler will need.  */
+   set up all the tables, etc., that the MD part of the assembler will
+   need.  */

 void
 md_begin ()
 {
 void
 md_begin ()
 {

-  register char *retval = NULL;
+  register const char *retval = NULL;

   int lose = 0;
   register int skipnext = 0;
   register unsigned int i;
   int lose = 0;
   register int skipnext = 0;
   register unsigned int i;


@@ -282,8 +274,6 @@ md_begin ()
   /* Hash up all the opcodes for fast use later.  */
 
   op_hash = hash_new ();
   /* Hash up all the opcodes for fast use later.  */
 
   op_hash = hash_new ();

-  if (op_hash == NULL)
-    as_fatal ("Virtual memory exhausted");

 
   for (i = 0; i < num_opcodes; i++)
     {
 
   for (i = 0; i < num_opcodes; i++)
     {


@@ -296,12 +286,14 @@ md_begin ()
        }
 
       /* Hack to avoid multiple opcode entries.  We pre-locate all the
        }
 
       /* Hack to avoid multiple opcode entries.  We pre-locate all the

-                      variations (b/i field and P/A field) and handle them. */
+        variations (b/i field and P/A field) and handle them. */

 
       if (!strcmp (name, machine_opcodes[i + 1].name))
        {
 
       if (!strcmp (name, machine_opcodes[i + 1].name))
        {

-         if ((machine_opcodes[i].opcode ^ machine_opcodes[i + 1].opcode)
-             != 0x01000000)
+         if ((machine_opcodes[i].opcode & 0x01000000) != 0
+             || (machine_opcodes[i + 1].opcode & 0x01000000) == 0
+             || ((machine_opcodes[i].opcode | 0x01000000)
+                 != machine_opcodes[i + 1].opcode))

            goto bad_table;
          strend = machine_opcodes[i].args + strlen (machine_opcodes[i].args) - 1;
          strend2 = machine_opcodes[i + 1].args + strlen (machine_opcodes[i + 1].args) - 1;
            goto bad_table;
          strend = machine_opcodes[i].args + strlen (machine_opcodes[i].args) - 1;
          strend2 = machine_opcodes[i + 1].args + strlen (machine_opcodes[i + 1].args) - 1;


@@ -311,34 +303,25 @@ md_begin ()
              if (*strend2 != 'i')
                goto bad_table;
              break;
              if (*strend2 != 'i')
                goto bad_table;
              break;

-           case 'i':
-             if (*strend2 != 'b')
-               goto bad_table;
-             break;

            case 'P':
              if (*strend2 != 'A')
                goto bad_table;
              break;
            case 'P':
              if (*strend2 != 'A')
                goto bad_table;
              break;

-           case 'A':
-             if (*strend2 != 'P')
-               goto bad_table;
-             break;

            default:
            bad_table:
            default:
            bad_table:

-             fprintf (stderr, "internal error: can't handle opcode %s\n", name);
+             fprintf (stderr, "internal error: can't handle opcode %s\n",
+                      name);

              lose = 1;
            }
 
              lose = 1;
            }
 

-         /* OK, this is an i/b or A/P pair.  We skip the higher-valued one,
-                              and let the code for operand checking handle OR-ing in the bit.  */
-         if (machine_opcodes[i].opcode & 1)
-           continue;
-         else
-           skipnext = 1;
+         /* OK, this is an i/b or A/P pair.  We skip the
+            higher-valued one, and let the code for operand checking
+            handle OR-ing in the bit.  */
+         skipnext = 1;

        }
 
        }
 

-      retval = hash_insert (op_hash, name, &machine_opcodes[i]);
-      if (retval != NULL && *retval != '\0')
+      retval = hash_insert (op_hash, name, (PTR) &machine_opcodes[i]);
+      if (retval != NULL)

        {
          fprintf (stderr, "internal error: can't hash `%s': %s\n",
                   machine_opcodes[i].name, retval);
        {
          fprintf (stderr, "internal error: can't hash `%s': %s\n",
                   machine_opcodes[i].name, retval);


@@ -361,12 +344,6 @@ md_begin ()
   define_some_regs ();
 }
 
   define_some_regs ();
 }
 

-void
-md_end ()
-{
-  return;
-}
-

 /* Assemble a single instruction.  Its label has already been handled
    by the generic front end.  We just parse opcode and operands, and
    produce the bytes of data and relocation.  */
 /* Assemble a single instruction.  Its label has already been handled
    by the generic front end.  We just parse opcode and operands, and
    produce the bytes of data and relocation.  */


@@ -376,7 +353,6 @@ md_assemble (str)
      char *str;
 {
   char *toP;
      char *str;
 {
   char *toP;

-  /* !!!!    int rsd; */

 
   know (str);
   machine_ip (str);
 
   know (str);
   machine_ip (str);


@@ -387,16 +363,12 @@ md_assemble (str)
   /* put out the symbol-dependent stuff */
   if (the_insn.reloc != NO_RELOC)
     {
   /* put out the symbol-dependent stuff */
   if (the_insn.reloc != NO_RELOC)
     {

-      fix_new (
-               frag_now,       /* which frag */
-               (toP - frag_now->fr_literal + the_insn.reloc_offset),   /* where */
-               4,              /* size */
-               the_insn.exp.X_add_symbol,
-               the_insn.exp.X_subtract_symbol,
-               the_insn.exp.X_add_number,
-               the_insn.pcrel,
-               the_insn.reloc
-       );
+      fix_new_exp (frag_now,
+                  (toP - frag_now->fr_literal + the_insn.reloc_offset),
+                  4,           /* size */
+                  &the_insn.exp,
+                  the_insn.pcrel,
+                  the_insn.reloc);

     }
 }
 
     }
 }
 


@@ -407,15 +379,13 @@ parse_operand (s, operandp)
 {
   char *save = input_line_pointer;
   char *new;
 {
   char *save = input_line_pointer;
   char *new;

-  segT seg;

 
   input_line_pointer = s;
 
   input_line_pointer = s;

-  seg = expr (0, operandp);
+  expression (operandp);
+  if (operandp->X_op == O_absent)
+    as_bad ("missing operand");

   new = input_line_pointer;
   input_line_pointer = save;
   new = input_line_pointer;
   input_line_pointer = save;

-
-  if (seg == SEG_ABSENT)
-    as_bad ("Missing operand");

   return new;
 }
 
   return new;
 }
 


@@ -429,12 +399,9 @@ machine_ip (str)
 {
   char *s;
   const char *args;
 {
   char *s;
   const char *args;

-  /* !!!!    char c; */
-  /* !!!!    unsigned long i; */

   struct machine_opcode *insn;
   char *argsStart;
   unsigned long opcode;
   struct machine_opcode *insn;
   char *argsStart;
   unsigned long opcode;

-  /* !!!!    unsigned int mask; */

   expressionS the_operand;
   expressionS *operand = &the_operand;
   unsigned int reg;
   expressionS the_operand;
   expressionS *operand = &the_operand;
   unsigned int reg;


@@ -469,13 +436,12 @@ machine_ip (str)
   memset (&the_insn, '\0', sizeof (the_insn));
   the_insn.reloc = NO_RELOC;
 
   memset (&the_insn, '\0', sizeof (the_insn));
   the_insn.reloc = NO_RELOC;
 

-  /*
-        * Build the opcode, checking as we go to make
-        * sure that the operands match.
-        *
-        * If an operand matches, we modify the_insn or opcode appropriately,
-        * and do a "continue".  If an operand fails to match, we "break".
-        */
+  /* Build the opcode, checking as we go to make sure that the
+     operands match.
+   
+     If an operand matches, we modify the_insn or opcode appropriately,
+     and do a "continue".  If an operand fails to match, we "break".  */
+

   if (insn->args[0] != '\0')
     s = parse_operand (s, operand);    /* Prime the pump */
 
   if (insn->args[0] != '\0')
     s = parse_operand (s, operand);    /* Prime the pump */
 


@@ -503,7 +469,7 @@ machine_ip (str)
          break;
 
        case 'v':               /* Trap numbers (immediate field) */
          break;
 
        case 'v':               /* Trap numbers (immediate field) */

-         if (operand->X_seg == SEG_ABSOLUTE)
+         if (operand->X_op == O_constant)

            {
              if (operand->X_add_number < 256)
                {
            {
              if (operand->X_add_number < 256)
                {


@@ -512,8 +478,8 @@ machine_ip (str)
                }
              else
                {
                }
              else
                {

-                 as_bad ("Immediate value of %d is too large",
-                         operand->X_add_number);
+                 as_bad ("Immediate value of %ld is too large",
+                         (long) operand->X_add_number);

                  continue;
                }
            }
                  continue;
                }
            }


@@ -525,12 +491,16 @@ machine_ip (str)
        case 'b':               /* A general register or 8-bit immediate */
        case 'i':
          /* We treat the two cases identically since we mashed
        case 'b':               /* A general register or 8-bit immediate */
        case 'i':
          /* We treat the two cases identically since we mashed

-                          them together in the opcode table.  */
-         if (operand->X_seg == SEG_REGISTER)
+            them together in the opcode table.  */
+         if (operand->X_op == O_register)

            goto general_reg;
 
            goto general_reg;
 

+         /* Make sure the 'i' case really exists.  */
+         if ((insn->opcode | IMMEDIATE_BIT) != (insn + 1)->opcode)
+           break;
+

          opcode |= IMMEDIATE_BIT;
          opcode |= IMMEDIATE_BIT;

-         if (operand->X_seg == SEG_ABSOLUTE)
+         if (operand->X_op == O_constant)

            {
              if (operand->X_add_number < 256)
                {
            {
              if (operand->X_add_number < 256)
                {


@@ -539,8 +509,8 @@ machine_ip (str)
                }
              else
                {
                }
              else
                {

-                 as_bad ("Immediate value of %d is too large",
-                         operand->X_add_number);
+                 as_bad ("Immediate value of %ld is too large",
+                         (long) operand->X_add_number);

                  continue;
                }
            }
                  continue;
                }
            }


@@ -553,18 +523,16 @@ machine_ip (str)
        case 'c':
        general_reg:
          /* lrNNN or grNNN or %%expr or a user-def register name */
        case 'c':
        general_reg:
          /* lrNNN or grNNN or %%expr or a user-def register name */

-         if (operand->X_seg != SEG_REGISTER)
+         if (operand->X_op != O_register)

            break;              /* Only registers */
          know (operand->X_add_symbol == 0);
            break;              /* Only registers */
          know (operand->X_add_symbol == 0);

-         know (operand->X_subtract_symbol == 0);
+         know (operand->X_op_symbol == 0);

          reg = operand->X_add_number;
          if (reg >= SREG)
            break;              /* No special registers */
 
          reg = operand->X_add_number;
          if (reg >= SREG)
            break;              /* No special registers */
 

-         /*
-                        * Got the register, now figure out where
-                        * it goes in the opcode.
-                        */
+         /* Got the register, now figure out where it goes in the
+            opcode.  */

          switch (*args)
            {
            case 'a':
          switch (*args)
            {
            case 'a':


@@ -585,7 +553,7 @@ machine_ip (str)
 
        case 'x':               /* 16 bit constant, zero-extended */
        case 'X':               /* 16 bit constant, one-extended */
 
        case 'x':               /* 16 bit constant, zero-extended */
        case 'X':               /* 16 bit constant, one-extended */

-         if (operand->X_seg == SEG_ABSOLUTE)
+         if (operand->X_op == O_constant)

            {
              opcode |= (operand->X_add_number & 0xFF) << 0 |
                ((operand->X_add_number & 0xFF00) << 8);
            {
              opcode |= (operand->X_add_number & 0xFF) << 0 |
                ((operand->X_add_number & 0xFF00) << 8);


@@ -596,7 +564,7 @@ machine_ip (str)
          continue;
 
        case 'h':
          continue;
 
        case 'h':

-         if (operand->X_seg == SEG_ABSOLUTE)
+         if (operand->X_op == O_constant)

            {
              opcode |= (operand->X_add_number & 0x00FF0000) >> 16 |
                (((unsigned long) operand->X_add_number
            {
              opcode |= (operand->X_add_number & 0x00FF0000) >> 16 |
                (((unsigned long) operand->X_add_number


@@ -610,9 +578,12 @@ machine_ip (str)
        case 'P':               /* PC-relative jump address */
        case 'A':               /* Absolute jump address */
          /* These two are treated together since we folded the
        case 'P':               /* PC-relative jump address */
        case 'A':               /* Absolute jump address */
          /* These two are treated together since we folded the

-                          opcode table entries together.  */
-         if (operand->X_seg == SEG_ABSOLUTE)
+            opcode table entries together.  */
+         if (operand->X_op == O_constant)

            {
            {

+             /* Make sure the 'A' case really exists.  */
+             if ((insn->opcode | ABSOLUTE_BIT) != (insn + 1)->opcode)
+               break;

              opcode |= ABSOLUTE_BIT |
                (operand->X_add_number & 0x0003FC00) << 6 |
                ((operand->X_add_number & 0x000003FC) >> 2);
              opcode |= ABSOLUTE_BIT |
                (operand->X_add_number & 0x0003FC00) << 6 |
                ((operand->X_add_number & 0x000003FC) >> 2);


@@ -621,11 +592,12 @@ machine_ip (str)
          the_insn.reloc = RELOC_JUMPTARG;
          the_insn.exp = *operand;
          the_insn.pcrel = 1;   /* Assume PC-relative jump */
          the_insn.reloc = RELOC_JUMPTARG;
          the_insn.exp = *operand;
          the_insn.pcrel = 1;   /* Assume PC-relative jump */

-         /* FIXME-SOON, Do we figure out whether abs later, after know sym val? */
+         /* FIXME-SOON, Do we figure out whether abs later, after
+             know sym val? */

          continue;
 
        case 'e':               /* Coprocessor enable bit for LOAD/STORE insn */
          continue;
 
        case 'e':               /* Coprocessor enable bit for LOAD/STORE insn */

-         if (operand->X_seg == SEG_ABSOLUTE)
+         if (operand->X_op == O_constant)

            {
              if (operand->X_add_number == 0)
                continue;
            {
              if (operand->X_add_number == 0)
                continue;


@@ -638,7 +610,7 @@ machine_ip (str)
          break;
 
        case 'n':               /* Control bits for LOAD/STORE instructions */
          break;
 
        case 'n':               /* Control bits for LOAD/STORE instructions */

-         if (operand->X_seg == SEG_ABSOLUTE &&
+         if (operand->X_op == O_constant &&

              operand->X_add_number < 128)
            {
              opcode |= (operand->X_add_number << 16);
              operand->X_add_number < 128)
            {
              opcode |= (operand->X_add_number << 16);


@@ -647,7 +619,7 @@ machine_ip (str)
          break;
 
        case 's':               /* Special register number */
          break;
 
        case 's':               /* Special register number */

-         if (operand->X_seg != SEG_REGISTER)
+         if (operand->X_op != O_register)

            break;              /* Only registers */
          if (operand->X_add_number < SREG)
            break;              /* Not a special register */
            break;              /* Only registers */
          if (operand->X_add_number < SREG)
            break;              /* Not a special register */


@@ -655,7 +627,7 @@ machine_ip (str)
          continue;
 
        case 'u':               /* UI bit of CONVERT */
          continue;
 
        case 'u':               /* UI bit of CONVERT */

-         if (operand->X_seg == SEG_ABSOLUTE)
+         if (operand->X_op == O_constant)

            {
              if (operand->X_add_number == 0)
                continue;
            {
              if (operand->X_add_number == 0)
                continue;


@@ -668,7 +640,7 @@ machine_ip (str)
          break;
 
        case 'r':               /* RND bits of CONVERT */
          break;
 
        case 'r':               /* RND bits of CONVERT */

-         if (operand->X_seg == SEG_ABSOLUTE &&
+         if (operand->X_op == O_constant &&

              operand->X_add_number < 8)
            {
              opcode |= operand->X_add_number << 4;
              operand->X_add_number < 8)
            {
              opcode |= operand->X_add_number << 4;


@@ -677,7 +649,7 @@ machine_ip (str)
          break;
 
        case 'd':               /* FD bits of CONVERT */
          break;
 
        case 'd':               /* FD bits of CONVERT */

-         if (operand->X_seg == SEG_ABSOLUTE &&
+         if (operand->X_op == O_constant &&

              operand->X_add_number < 4)
            {
              opcode |= operand->X_add_number << 2;
              operand->X_add_number < 4)
            {
              opcode |= operand->X_add_number << 2;


@@ -687,7 +659,7 @@ machine_ip (str)
 
 
        case 'f':               /* FS bits of CONVERT */
 
 
        case 'f':               /* FS bits of CONVERT */

-         if (operand->X_seg == SEG_ABSOLUTE &&
+         if (operand->X_op == O_constant &&

              operand->X_add_number < 4)
            {
              opcode |= operand->X_add_number << 0;
              operand->X_add_number < 4)
            {
              opcode |= operand->X_add_number << 0;


@@ -696,7 +668,7 @@ machine_ip (str)
          break;
 
        case 'C':
          break;
 
        case 'C':

-         if (operand->X_seg == SEG_ABSOLUTE &&
+         if (operand->X_op == O_constant &&

              operand->X_add_number < 4)
            {
              opcode |= operand->X_add_number << 16;
              operand->X_add_number < 4)
            {
              opcode |= operand->X_add_number << 16;


@@ -705,7 +677,7 @@ machine_ip (str)
          break;
 
        case 'F':
          break;
 
        case 'F':

-         if (operand->X_seg == SEG_ABSOLUTE &&
+         if (operand->X_op == O_constant &&

              operand->X_add_number < 16)
            {
              opcode |= operand->X_add_number << 18;
              operand->X_add_number < 16)
            {
              opcode |= operand->X_add_number << 18;


@@ -722,14 +694,13 @@ machine_ip (str)
     }
 }
 
     }
 }
 

-/*
-  This is identical to the md_atof in m68k.c.  I think this is right,
-  but I'm not sure.
+/* This is identical to the md_atof in m68k.c.  I think this is right,
+   but I'm not sure.

 
 

-  Turn a string in input_line_pointer into a floating point constant of type
-  type, and store the appropriate bytes in *litP.  The number of LITTLENUMS
-  emitted is stored in *sizeP .  An error message is returned, or NULL on OK.
-  */
+   Turn a string in input_line_pointer into a floating point constant
+   of type type, and store the appropriate bytes in *litP.  The number
+   of LITTLENUMS emitted is stored in *sizeP .  An error message is
+   returned, or NULL on OK.  */

 
 /* Equal to MAX_PRECISION in atof-ieee.c */
 #define MAX_LITTLENUMS 6
 
 /* Equal to MAX_PRECISION in atof-ieee.c */
 #define MAX_LITTLENUMS 6


@@ -782,10 +753,10 @@ md_atof (type, litP, sizeP)
   *sizeP = prec * sizeof (LITTLENUM_TYPE);
   for (wordP = words; prec--;)
     {
   *sizeP = prec * sizeof (LITTLENUM_TYPE);
   for (wordP = words; prec--;)
     {

-      md_number_to_chars (litP, (long) (*wordP++), sizeof (LITTLENUM_TYPE));
+      md_number_to_chars (litP, (valueT) (*wordP++), sizeof (LITTLENUM_TYPE));

       litP += sizeof (LITTLENUM_TYPE);
     }
       litP += sizeof (LITTLENUM_TYPE);
     }

-  return "";                   /* Someone should teach Dean about null pointers */
+  return 0;

 }
 
 /*
 }
 
 /*


@@ -794,26 +765,10 @@ md_atof (type, litP, sizeP)
 void
 md_number_to_chars (buf, val, n)
      char *buf;
 void
 md_number_to_chars (buf, val, n)
      char *buf;

-     long val;
+     valueT val;

      int n;
 {
      int n;
 {

-
-  switch (n)
-    {
-
-    case 4:
-      *buf++ = val >> 24;
-      *buf++ = val >> 16;
-    case 2:
-      *buf++ = val >> 8;
-    case 1:
-      *buf = val;
-      break;
-
-    default:
-      as_fatal ("failed sanity check.");
-    }
-  return;
+  number_to_chars_bigendian (buf, val, n);

 }
 
 void
 }
 
 void


@@ -829,10 +784,7 @@ md_apply_fix (fixP, val)
   know (fixP->fx_size == 4);
   know (fixP->fx_r_type < NO_RELOC);
 
   know (fixP->fx_size == 4);
   know (fixP->fx_r_type < NO_RELOC);
 

-  /*
-        * This is a hack.  There should be a better way to
-        * handle this.
-        */
+  /* This is a hack.  There should be a better way to handle this.  */

   if (fixP->fx_r_type == RELOC_WDISP30 && fixP->fx_addsy)
     {
       val += fixP->fx_where + fixP->fx_frag->fr_address;
   if (fixP->fx_r_type == RELOC_WDISP30 && fixP->fx_addsy)
     {
       val += fixP->fx_where + fixP->fx_frag->fr_address;


@@ -914,7 +866,6 @@ md_apply_fix (fixP, val)
       as_bad ("bad relocation type: 0x%02x", fixP->fx_r_type);
       break;
     }
       as_bad ("bad relocation type: 0x%02x", fixP->fx_r_type);
       break;
     }

-  return;

 }
 
 #ifdef OBJ_COFF
 }
 
 #ifdef OBJ_COFF


@@ -941,15 +892,15 @@ tc_coff_fix2rtype (fixP)
     }                          /* switch on type */
 
   return (0);
     }                          /* switch on type */
 
   return (0);

-}                              /* tc_coff_fix2rtype() */
+}

 
 #endif /* OBJ_COFF */
 
 
 #endif /* OBJ_COFF */
 

-/* should never be called for sparc */
+/* should never be called for 29k */

 void
 md_create_short_jump (ptr, from_addr, to_addr, frag, to_symbol)
      char *ptr;
 void
 md_create_short_jump (ptr, from_addr, to_addr, frag, to_symbol)
      char *ptr;

-     long from_addr, to_addr;
+     addressT from_addr, to_addr;

      fragS *frag;
      symbolS *to_symbol;
 {
      fragS *frag;
      symbolS *to_symbol;
 {


@@ -962,19 +913,19 @@ md_convert_frag (headers, fragP)
      object_headers *headers;
      register fragS *fragP;
 {
      object_headers *headers;
      register fragS *fragP;
 {

-  as_fatal ("sparc_convert_frag\n");
+  as_fatal ("a29k_convert_frag\n");

 }
 
 /* should never be called for 29k */
 void
 md_create_long_jump (ptr, from_addr, to_addr, frag, to_symbol)
      char *ptr;
 }
 
 /* should never be called for 29k */
 void
 md_create_long_jump (ptr, from_addr, to_addr, frag, to_symbol)
      char *ptr;

-     long from_addr;
-     long to_addr;
+     addressT from_addr;
+     addressT to_addr;

      fragS *frag;
      symbolS *to_symbol;
 {
      fragS *frag;
      symbolS *to_symbol;
 {

-  as_fatal ("sparc_create_long_jump\n");
+  as_fatal ("a29k_create_long_jump\n");

 }
 
 /* should never be called for a29k */
 }
 
 /* should never be called for a29k */


@@ -983,8 +934,8 @@ md_estimate_size_before_relax (fragP, segtype)
      register fragS *fragP;
      segT segtype;
 {
      register fragS *fragP;
      segT segtype;
 {

-  as_fatal ("sparc_estimate_size_before_relax\n");
-  return (0);
+  as_fatal ("a29k_estimate_size_before_relax\n");
+  return 0;

 }
 
 #if 0
 }
 
 #if 0


@@ -1033,14 +984,13 @@ print_insn (insn)
           insn->exp.X_add_symbol ?
           (S_GET_NAME (insn->exp.X_add_symbol) ?
            S_GET_NAME (insn->exp.X_add_symbol) : "???") : "0");
           insn->exp.X_add_symbol ?
           (S_GET_NAME (insn->exp.X_add_symbol) ?
            S_GET_NAME (insn->exp.X_add_symbol) : "???") : "0");

-  fprintf (stderr, "\t\tX_sub_symbol = %s\n",
-          insn->exp.X_subtract_symbol ?
-          (S_GET_NAME (insn->exp.X_subtract_symbol) ?
-           S_GET_NAME (insn->exp.X_subtract_symbol) : "???") : "0");
+  fprintf (stderr, "\t\tX_op_symbol = %s\n",
+          insn->exp.X_op_symbol ?
+          (S_GET_NAME (insn->exp.X_op_symbol) ?
+           S_GET_NAME (insn->exp.X_op_symbol) : "???") : "0");

   fprintf (stderr, "\t\tX_add_number = %d\n",
           insn->exp.X_add_number);
   fprintf (stderr, "}\n");
   fprintf (stderr, "\t\tX_add_number = %d\n",
           insn->exp.X_add_number);
   fprintf (stderr, "}\n");

-  return;

 }
 
 #endif
 }
 
 #endif


@@ -1080,9 +1030,7 @@ tc_aout_fix_to_chars (where, fixP, segment_address_in_file)
   where[7] = (((!S_IS_DEFINED (fixP->fx_addsy)) << 7) & 0x80) | (0 & 0x60) | (fixP->fx_r_type & 0x1F);
   /* Also easy */
   md_number_to_chars (&where[8], fixP->fx_addnumber, 4);
   where[7] = (((!S_IS_DEFINED (fixP->fx_addsy)) << 7) & 0x80) | (0 & 0x60) | (fixP->fx_r_type & 0x1F);
   /* Also easy */
   md_number_to_chars (&where[8], fixP->fx_addnumber, 4);

-
-  return;
-}                              /* tc_aout_fix_to_chars() */
+}

 
 #endif /* OBJ_AOUT */
 
 
 #endif /* OBJ_AOUT */
 


@@ -1092,7 +1040,7 @@ md_parse_option (argP, cntP, vecP)
      int *cntP;
      char ***vecP;
 {
      int *cntP;
      char ***vecP;
 {

-  return (0);
+  return 0;

 }
 
 
 }
 
 


@@ -1124,7 +1072,8 @@ md_undefined_symbol (name)
          /* We have a wiener!  Define and return a new symbol for it.  */
          if (name[0] == 'l' || name[0] == 'L')
            regnum += 128;
          /* We have a wiener!  Define and return a new symbol for it.  */
          if (name[0] == 'l' || name[0] == 'L')
            regnum += 128;

-         return (symbol_new (name, SEG_REGISTER, regnum, &zero_address_frag));
+         return (symbol_new (name, SEG_REGISTER, (valueT) regnum,
+                             &zero_address_frag));

        }
     }
 
        }
     }
 


@@ -1143,30 +1092,30 @@ md_operand (expressionP)
       /* We have a numeric register expression.  No biggy.  */
       input_line_pointer += 2; /* Skip %% */
       (void) expression (expressionP);
       /* We have a numeric register expression.  No biggy.  */
       input_line_pointer += 2; /* Skip %% */
       (void) expression (expressionP);

-      if (expressionP->X_seg != SEG_ABSOLUTE
+      if (expressionP->X_op != O_constant

          || expressionP->X_add_number > 255)
        as_bad ("Invalid expression after %%%%\n");
          || expressionP->X_add_number > 255)
        as_bad ("Invalid expression after %%%%\n");

-      expressionP->X_seg = SEG_REGISTER;
+      expressionP->X_op = O_register;

     }
   else if (input_line_pointer[0] == '&')
     {
       /* We are taking the 'address' of a register...this one is not
     }
   else if (input_line_pointer[0] == '&')
     {
       /* We are taking the 'address' of a register...this one is not

-                      in the manual, but it *is* in traps/fpsymbol.h!  What they
-                      seem to want is the register number, as an absolute number.  */
+        in the manual, but it *is* in traps/fpsymbol.h!  What they
+        seem to want is the register number, as an absolute number.  */

       input_line_pointer++;    /* Skip & */
       (void) expression (expressionP);
       input_line_pointer++;    /* Skip & */
       (void) expression (expressionP);

-      if (expressionP->X_seg != SEG_REGISTER)
+      if (expressionP->X_op != O_register)

        as_bad ("Invalid register in & expression");
       else
        as_bad ("Invalid register in & expression");
       else

-       expressionP->X_seg = SEG_ABSOLUTE;
+       expressionP->X_op = O_constant;

     }
 }
 
 /* Round up a section size to the appropriate boundary.  */
     }
 }
 
 /* Round up a section size to the appropriate boundary.  */

-long
+valueT

 md_section_align (segment, size)
      segT segment;
 md_section_align (segment, size)
      segT segment;

-     long size;
+     valueT size;

 {
   return size;                 /* Byte alignment is fine */
 }
 {
   return size;                 /* Byte alignment is fine */
 }


@@ -1181,10 +1130,4 @@ md_pcrel_from (fixP)
   return fixP->fx_where + fixP->fx_frag->fr_address;
 }
 
   return fixP->fx_where + fixP->fx_frag->fr_address;
 }
 

-/*
- * Local Variables:
- * comment-column: 0
- * End:
- */
-

 /* end of tc-a29k.c */
 /* end of tc-a29k.c */