Apply Dmitry Diky's patches to add relaxation to msp430.

2 files changed, 1219 insertions, 655 deletions

diff --git a/gas/config/tc-msp430.c b/gas/config/tc-msp430.c
index 2c3d81e..03346f6 100644
--- a/gas/config/tc-msp430.c
+++ b/gas/config/tc-msp430.c
@@ -42,30 +42,67 @@ extern LITTLENUM_TYPE generic_bignum[];
 
 static struct hash_control *msp430_hash;
 
-static unsigned int msp430_operands
-  PARAMS ((struct msp430_opcode_s *, char *));
-static int msp430_srcoperand
-  PARAMS ((struct msp430_operand_s *, char *, int, int *));
-static int msp430_dstoperand
-  PARAMS ((struct msp430_operand_s *, char *, int));
-static char *parse_exp
-  PARAMS ((char *, expressionS *));
-static inline char *skip_space
-  PARAMS ((char *));
-static int check_reg
-  PARAMS ((char *));
-static void msp430_set_arch
-  PARAMS ((int));
-static void show_mcu_list
-  PARAMS ((FILE *));
-static void del_spaces
-  PARAMS ((char *));
+/* Relaxations.  */
+#define STATE_UNCOND_BRANCH	1	/* jump */
+#define STATE_NOOV_BRANCH	3	/* bltn */
+#define STATE_SIMPLE_BRANCH	2	/* bne, beq, etc... */
+#define STATE_EMUL_BRANCH	4
+
+#define CNRL	2
+#define CUBL	4
+#define CNOL	8
+#define CSBL	6
+#define CEBL	4
+
+/* Length.  */
+#define STATE_BITS10	1	/* wild guess. short jump */
+#define STATE_WORD	2	/* 2 bytes pc rel. addr. more */
+#define STATE_UNDEF	3	/* cannot handle this yet. convert to word mode */
+
+#define ENCODE_RELAX(what,length) (((what) << 2) + (length))
+#define RELAX_STATE(s)            ((s) & 3)
+#define RELAX_LEN(s)	          ((s) >> 2)
+#define RELAX_NEXT(a,b)	          ENCODE_RELAX (a, b + 1)
+
+relax_typeS md_relax_table[] =
+{
+  /* Unused.  */
+  {1, 1, 0, 0},
+  {1, 1, 0, 0},
+  {1, 1, 0, 0},
+  {1, 1, 0, 0},
+
+  /* Unconditional jump.  */
+  {1, 1, 8, 5},
+  {1024, -1024, CNRL, RELAX_NEXT (STATE_UNCOND_BRANCH, STATE_BITS10)},	/* state 10 bits displ */
+  {0, 0, CUBL, RELAX_NEXT (STATE_UNCOND_BRANCH, STATE_WORD)},		/* state word */
+  {1, 1, CUBL, 0},							/* state undef */
+
+  /* Simple branches.  */
+  {0, 0, 8, 9},
+  {1024, -1024, CNRL, RELAX_NEXT (STATE_SIMPLE_BRANCH, STATE_BITS10)},	/* state 10 bits displ */
+  {0, 0, CSBL, RELAX_NEXT (STATE_SIMPLE_BRANCH, STATE_WORD)},		/* state word */
+  {1, 1, CSBL, 0},
+
+  /* blt no overflow branch.  */
+  {1, 1, 8, 13},
+  {1024, -1024, CNRL, RELAX_NEXT (STATE_NOOV_BRANCH, STATE_BITS10)},	/* state 10 bits displ */
+  {0, 0, CNOL, RELAX_NEXT (STATE_NOOV_BRANCH, STATE_WORD)},		/* state word */
+  {1, 1, CNOL, 0},
+
+  /* Emulated branches.  */
+  {1, 1, 8, 17},
+  {1020, -1020, CEBL, RELAX_NEXT (STATE_EMUL_BRANCH, STATE_BITS10)},	/* state 10 bits displ */
+  {0, 0, CNOL, RELAX_NEXT (STATE_EMUL_BRANCH, STATE_WORD)},		/* state word */
+  {1, 1, CNOL, 0}
+};
+
 
 #define MAX_OP_LEN	256
 
 struct mcu_type_s
 {
-  char *name;
+  char * name;
   int isa;
   int mach;
 };
@@ -90,53 +127,53 @@ struct mcu_type_s
 
 static struct mcu_type_s mcu_types[] =
 {
-  {"msp1",       MSP430_ISA_11, bfd_mach_msp11},
-  {"msp2",       MSP430_ISA_14, bfd_mach_msp14},
-  {"msp430x110", MSP430_ISA_11, bfd_mach_msp11},
-  {"msp430x112", MSP430_ISA_11, bfd_mach_msp11},
-  {"msp430x1101",MSP430_ISA_110, bfd_mach_msp110},
-  {"msp430x1111",MSP430_ISA_110, bfd_mach_msp110},
-  {"msp430x1121",MSP430_ISA_110, bfd_mach_msp110},
-  {"msp430x1122",MSP430_ISA_11, bfd_mach_msp110},
-  {"msp430x1132",MSP430_ISA_11, bfd_mach_msp110},
-
-  {"msp430x122", MSP430_ISA_12, bfd_mach_msp12},
-  {"msp430x123", MSP430_ISA_12, bfd_mach_msp12},
-  {"msp430x1222",MSP430_ISA_12, bfd_mach_msp12},
-  {"msp430x1232",MSP430_ISA_12, bfd_mach_msp12},
-
-  {"msp430x133", MSP430_ISA_13, bfd_mach_msp13},
-  {"msp430x135", MSP430_ISA_13, bfd_mach_msp13},
-  {"msp430x1331",MSP430_ISA_13, bfd_mach_msp13},
-  {"msp430x1351",MSP430_ISA_13, bfd_mach_msp13},
-  {"msp430x147", MSP430_ISA_14, bfd_mach_msp14},
-  {"msp430x148", MSP430_ISA_14, bfd_mach_msp14},
-  {"msp430x149", MSP430_ISA_14, bfd_mach_msp14},
-
-  {"msp430x155", MSP430_ISA_15, bfd_mach_msp15},
-  {"msp430x156", MSP430_ISA_15, bfd_mach_msp15},
-  {"msp430x157", MSP430_ISA_15, bfd_mach_msp15},
-  {"msp430x167", MSP430_ISA_16, bfd_mach_msp16},
-  {"msp430x168", MSP430_ISA_16, bfd_mach_msp16},
-  {"msp430x169", MSP430_ISA_16, bfd_mach_msp16},
+  {"msp1",        MSP430_ISA_11, bfd_mach_msp11},
+  {"msp2",        MSP430_ISA_14, bfd_mach_msp14},
+  {"msp430x110",  MSP430_ISA_11, bfd_mach_msp11},
+  {"msp430x112",  MSP430_ISA_11, bfd_mach_msp11},
+  {"msp430x1101", MSP430_ISA_110, bfd_mach_msp110},
+  {"msp430x1111", MSP430_ISA_110, bfd_mach_msp110},
+  {"msp430x1121", MSP430_ISA_110, bfd_mach_msp110},
+  {"msp430x1122", MSP430_ISA_11, bfd_mach_msp110},
+  {"msp430x1132", MSP430_ISA_11, bfd_mach_msp110},
+
+  {"msp430x122",  MSP430_ISA_12, bfd_mach_msp12},
+  {"msp430x123",  MSP430_ISA_12, bfd_mach_msp12},
+  {"msp430x1222", MSP430_ISA_12, bfd_mach_msp12},
+  {"msp430x1232", MSP430_ISA_12, bfd_mach_msp12},
+
+  {"msp430x133",  MSP430_ISA_13, bfd_mach_msp13},
+  {"msp430x135",  MSP430_ISA_13, bfd_mach_msp13},
+  {"msp430x1331", MSP430_ISA_13, bfd_mach_msp13},
+  {"msp430x1351", MSP430_ISA_13, bfd_mach_msp13},
+  {"msp430x147",  MSP430_ISA_14, bfd_mach_msp14},
+  {"msp430x148",  MSP430_ISA_14, bfd_mach_msp14},
+  {"msp430x149",  MSP430_ISA_14, bfd_mach_msp14},
+
+  {"msp430x155",  MSP430_ISA_15, bfd_mach_msp15},
+  {"msp430x156",  MSP430_ISA_15, bfd_mach_msp15},
+  {"msp430x157",  MSP430_ISA_15, bfd_mach_msp15},
+  {"msp430x167",  MSP430_ISA_16, bfd_mach_msp16},
+  {"msp430x168",  MSP430_ISA_16, bfd_mach_msp16},
+  {"msp430x169",  MSP430_ISA_16, bfd_mach_msp16},
   {"msp430x1610", MSP430_ISA_16, bfd_mach_msp16},
   {"msp430x1611", MSP430_ISA_16, bfd_mach_msp16},
   {"msp430x1612", MSP430_ISA_16, bfd_mach_msp16},
 
-  {"msp430x311", MSP430_ISA_31, bfd_mach_msp31},
-  {"msp430x312", MSP430_ISA_31, bfd_mach_msp31},
-  {"msp430x313", MSP430_ISA_31, bfd_mach_msp31},
-  {"msp430x314", MSP430_ISA_31, bfd_mach_msp31},
-  {"msp430x315", MSP430_ISA_31, bfd_mach_msp31},
-  {"msp430x323", MSP430_ISA_32, bfd_mach_msp32},
-  {"msp430x325", MSP430_ISA_32, bfd_mach_msp32},
-  {"msp430x336", MSP430_ISA_33, bfd_mach_msp33},
-  {"msp430x337", MSP430_ISA_33, bfd_mach_msp33},
-
-  {"msp430x412", MSP430_ISA_41, bfd_mach_msp41},
-  {"msp430x413", MSP430_ISA_41, bfd_mach_msp41},
-  {"msp430x415", MSP430_ISA_41, bfd_mach_msp41},
-  {"msp430x417", MSP430_ISA_41, bfd_mach_msp41},
+  {"msp430x311",  MSP430_ISA_31, bfd_mach_msp31},
+  {"msp430x312",  MSP430_ISA_31, bfd_mach_msp31},
+  {"msp430x313",  MSP430_ISA_31, bfd_mach_msp31},
+  {"msp430x314",  MSP430_ISA_31, bfd_mach_msp31},
+  {"msp430x315",  MSP430_ISA_31, bfd_mach_msp31},
+  {"msp430x323",  MSP430_ISA_32, bfd_mach_msp32},
+  {"msp430x325",  MSP430_ISA_32, bfd_mach_msp32},
+  {"msp430x336",  MSP430_ISA_33, bfd_mach_msp33},
+  {"msp430x337",  MSP430_ISA_33, bfd_mach_msp33},
+
+  {"msp430x412",  MSP430_ISA_41, bfd_mach_msp41},
+  {"msp430x413",  MSP430_ISA_41, bfd_mach_msp41},
+  {"msp430x415",  MSP430_ISA_41, bfd_mach_msp41},
+  {"msp430x417",  MSP430_ISA_41, bfd_mach_msp41},
 
   {"msp430xE423", MSP430_ISA_42, bfd_mach_msp42},
   {"msp430xE425", MSP430_ISA_42, bfd_mach_msp42},
@@ -150,12 +187,12 @@ static struct mcu_type_s mcu_types[] =
   {"msp430xG438", MSP430_ISA_43, bfd_mach_msp43},
   {"msp430xG439", MSP430_ISA_43, bfd_mach_msp43},
 
-  {"msp430x435", MSP430_ISA_43, bfd_mach_msp43},
-  {"msp430x436", MSP430_ISA_43, bfd_mach_msp43},
-  {"msp430x437", MSP430_ISA_43, bfd_mach_msp43},
-  {"msp430x447", MSP430_ISA_44, bfd_mach_msp44},
-  {"msp430x448", MSP430_ISA_44, bfd_mach_msp44},
-  {"msp430x449", MSP430_ISA_44, bfd_mach_msp44},
+  {"msp430x435",  MSP430_ISA_43, bfd_mach_msp43},
+  {"msp430x436",  MSP430_ISA_43, bfd_mach_msp43},
+  {"msp430x437",  MSP430_ISA_43, bfd_mach_msp43},
+  {"msp430x447",  MSP430_ISA_44, bfd_mach_msp44},
+  {"msp430x448",  MSP430_ISA_44, bfd_mach_msp44},
+  {"msp430x449",  MSP430_ISA_44, bfd_mach_msp44},
 
   {NULL, 0, 0}
 };
@@ -164,72 +201,346 @@ static struct mcu_type_s mcu_types[] =
 static struct mcu_type_s default_mcu =
     { "msp430x11", MSP430_ISA_11, bfd_mach_msp11 };
 
-static struct mcu_type_s *msp430_mcu = &default_mcu;
+static struct mcu_type_s * msp430_mcu = & default_mcu;
+
+/* Profiling capability:
+   It is a performance hit to use gcc's profiling approach for this tiny target.
+   Even more -- jtag hardware facility does not perform any profiling functions.
+   However we've got gdb's built-in simulator where we can do anything.
+   Therefore my suggestion is:
+
+   We define new section ".profiler" which holds all profiling information.
+   We define new pseudo operation .profiler which will instruct assembler to
+   add new profile entry to the object file. Profile should take place at the
+   present address.
+
+   Pseudo-op format:
+
+      .profiler flags,function_to_profile [, cycle_corrector, extra]
+
+   where 'flags' is a combination of the following chars:
+	    s - function Start
+	    x - function eXit
+	    i - function is in Init section
+	    f - function is in Fini section
+	    l - Library call
+	    c - libC standard call
+	    d - stack value Demand (saved at run-time in simulator)
+	    I - Interrupt service routine
+	    P - Prologue start
+	    p - Prologue end
+	    E - Epilogue start
+	    e - Epilogue end
+	    j - long Jump/ sjlj unwind
+	    a - an Arbitrary code fragment
+	    t - exTra parameter saved (constant value like frame size)
+	  '""' optional: "sil" == sil
+
+      function_to_profile - function's address
+      cycle_corrector     - a value which should be added to the cycle
+			      counter, zero if omitted
+      extra - some extra parameter, zero if omitted.
+
+      For example:
+      ------------------------------
+	.global fxx
+	.type fxx,@function
+      fxx:
+      .LFrameOffset_fxx=0x08
+      .profiler "scdP", fxx	; function entry.
+				; we also demand stack value to be displayed
+	push r11
+	push r10
+	push r9
+	push r8
+      .profiler "cdp",fxx,0, .LFrameOffset_fxx	; check stack value at this point
+						; (this is a prologue end)
+						; note, that spare var filled with the farme size
+	mov r15,r8
+	....
+      .profiler cdE,fxx		; check stack
+	pop r8
+	pop r9
+	pop r10
+	pop r11
+      .profiler xcde,fxx,3	; exit adds 3 to the cycle counter
+      ret			; cause 'ret' insn takes 3 cycles
+      -------------------------------
+
+      This profiling approach does not produce any overhead and
+      absolutely harmless.
+      So, even profiled code can be uploaded to the MCU.  */
+#define MSP430_PROFILER_FLAG_ENTRY	1	/* s */
+#define MSP430_PROFILER_FLAG_EXIT	2	/* x */
+#define MSP430_PROFILER_FLAG_INITSECT	4	/* i */
+#define MSP430_PROFILER_FLAG_FINISECT	8	/* f */
+#define MSP430_PROFILER_FLAG_LIBCALL	0x10	/* l */
+#define MSP430_PROFILER_FLAG_STDCALL	0x20	/* c */
+#define MSP430_PROFILER_FLAG_STACKDMD	0x40	/* d */
+#define MSP430_PROFILER_FLAG_ISR	0x80	/* I */
+#define MSP430_PROFILER_FLAG_PROLSTART	0x100	/* P */
+#define MSP430_PROFILER_FLAG_PROLEND	0x200	/* p */
+#define MSP430_PROFILER_FLAG_EPISTART	0x400	/* E */
+#define MSP430_PROFILER_FLAG_EPIEND	0x800	/* e */
+#define MSP430_PROFILER_FLAG_JUMP	0x1000	/* j */
+#define MSP430_PROFILER_FLAG_FRAGMENT	0x2000	/* a */
+#define MSP430_PROFILER_FLAG_EXTRA	0x4000	/* t */
+#define MSP430_PROFILER_FLAG_notyet	0x8000	/* ? */
 
-const pseudo_typeS md_pseudo_table[] =
+static int
+pow2value (int y)
 {
-  {"arch", msp430_set_arch, 0},
-  {NULL, NULL, 0}
-};
+  int n = 0;
+  unsigned int x;
 
-#define OPTION_MMCU 'm'
+  x = y;
 
-const char *md_shortopts = "m:";
+  if (!x)
+    return 1;
 
-struct option md_longopts[] =
+  for (; x; x = x >> 1)
+    if (x & 1)
+      n++;
+
+  return n == 1;
+}
+
+/* Parse ordinary expression.  */
+
+static char *
+parse_exp (char * s, expressionS * op)
 {
-  {"mmcu", required_argument, NULL, OPTION_MMCU},
-  {NULL, no_argument, NULL, 0}
-};
+  input_line_pointer = s;
+  expression (op);
+  if (op->X_op == O_absent)
+    as_bad (_("missing operand"));
+  return input_line_pointer;
+}
 
-size_t md_longopts_size = sizeof (md_longopts);
+
+/* Delete spaces from s: X ( r 1  2)  => X(r12).  */
 
 static void
-show_mcu_list (stream)
-     FILE *stream;
+del_spaces (char * s)
 {
-  int i;
+  while (*s)
+    {
+      if (ISSPACE (*s))
+	{
+	  char *m = s + 1;
 
-  fprintf (stream, _("Known MCU names:\n"));
+	  while (ISSPACE (*m) && *m)
+	    m++;
+	  memmove (s, m, strlen (m) + 1);
+	}
+      else
+	s++;
+    }
+}
 
-  for (i = 0; mcu_types[i].name; i++)
-    fprintf (stream, _("\t %s\n"), mcu_types[i].name);
+static inline char *
+skip_space (char * s)
+{
+  while (ISSPACE (*s))
+    ++s;
+  return s;
+}
 
-  fprintf (stream, "\n");
+/* Extract one word from FROM and copy it to TO. Delimeters are ",;\n"  */
+
+static char *
+extract_operand (char * from, char * to, int limit)
+{
+  int size = 0;
+
+  /* Drop leading whitespace.  */
+  from = skip_space (from);
+
+  while (size < limit && *from)
+    {
+      *(to + size) = *from;
+      if (*from == ',' || *from == ';' || *from == '\n')
+	break;
+      from++;
+      size++;
+    }
+
+  *(to + size) = 0;
+  del_spaces (to);
+
+  from++;
+
+  return from;
 }
 
-void
-md_show_usage (FILE *stream)
+static void
+msp430_profiler (int dummy ATTRIBUTE_UNUSED)
 {
-  fprintf (stream,
-	   _("MSP430 options:\n"
-	     "  -mmcu=[msp430-name] select microcontroller type\n"
-	     "                  msp430x110  msp430x112\n"
-	     "                  msp430x1101 msp430x1111\n"
-	     "                  msp430x1121 msp430x1122 msp430x1132\n"
-	     "                  msp430x122  msp430x123\n"
-	     "                  msp430x1222 msp430x1232\n"
-	     "                  msp430x133  msp430x135\n"
-	     "                  msp430x1331 msp430x1351\n"
-	     "                  msp430x147  msp430x148  msp430x149\n"
-	     "                  msp430x155  msp430x156  msp430x157\n"
-	     "                  msp430x167  msp430x168  msp430x169\n"
-	     "                  msp430x1610 msp430x1611 msp430x1612\n"
-	     "                  msp430x311  msp430x312  msp430x313  msp430x314  msp430x315\n"
-	     "                  msp430x323  msp430x325\n"
-	     "                  msp430x336  msp430x337\n"
-	     "                  msp430x412  msp430x413  msp430x415  msp430x417\n"
-	     "                  msp430xE423 msp430xE425 msp430E427\n"
-	     "                  msp430xW423 msp430xW425 msp430W427\n"
-	     "                  msp430xG437 msp430xG438 msp430G439\n"
-	     "                  msp430x435  msp430x436  msp430x437\n"
-	     "                  msp430x447  msp430x448  msp430x449\n"));
+  char   buffer[1024];
+  char   f[32];
+  char * str = buffer;
+  char * flags = f;
+  int    p_flags = 0;
+  char * halt;
+  int    ops = 0;
+  int    left;
+  char * s;
+  segT   seg;
+  int    subseg;
+  char * end = 0;
+  expressionS exp;
+  expressionS exp1;
+
+  s = input_line_pointer;
+  end = input_line_pointer;
+
+  while (*end && *end != '\n')
+    end++;
+
+  while (*s && *s != '\n')
+    {
+      if (*s == ',')
+	ops++;
+      s++;
+    }
 
-  show_mcu_list (stream);
+  left = 3 - ops;
+
+  if (ops < 1)
+    {
+      as_bad (_(".profiler pseudo requires at least two operands."));
+      input_line_pointer = end;
+      return;
+    }
+
+  input_line_pointer = extract_operand (input_line_pointer, flags, 32);
+
+  while (*flags)
+    {
+      switch (*flags)
+	{
+	case '"':
+	  break;
+	case 'a':
+	  p_flags |= MSP430_PROFILER_FLAG_FRAGMENT;
+	  break;
+	case 'j':
+	  p_flags |= MSP430_PROFILER_FLAG_JUMP;
+	  break;
+	case 'P':
+	  p_flags |= MSP430_PROFILER_FLAG_PROLSTART;
+	  break;
+	case 'p':
+	  p_flags |= MSP430_PROFILER_FLAG_PROLEND;
+	  break;
+	case 'E':
+	  p_flags |= MSP430_PROFILER_FLAG_EPISTART;
+	  break;
+	case 'e':
+	  p_flags |= MSP430_PROFILER_FLAG_EPIEND;
+	  break;
+	case 's':
+	  p_flags |= MSP430_PROFILER_FLAG_ENTRY;
+	  break;
+	case 'x':
+	  p_flags |= MSP430_PROFILER_FLAG_EXIT;
+	  break;
+	case 'i':
+	  p_flags |= MSP430_PROFILER_FLAG_INITSECT;
+	  break;
+	case 'f':
+	  p_flags |= MSP430_PROFILER_FLAG_FINISECT;
+	  break;
+	case 'l':
+	  p_flags |= MSP430_PROFILER_FLAG_LIBCALL;
+	  break;
+	case 'c':
+	  p_flags |= MSP430_PROFILER_FLAG_STDCALL;
+	  break;
+	case 'd':
+	  p_flags |= MSP430_PROFILER_FLAG_STACKDMD;
+	  break;
+	case 'I':
+	  p_flags |= MSP430_PROFILER_FLAG_ISR;
+	  break;
+	case 't':
+	  p_flags |= MSP430_PROFILER_FLAG_EXTRA;
+	  break;
+	default:
+	  as_warn (_("unknown profiling flag - ignored."));
+	  break;
+	}
+      flags++;
+    }
+
+  if (p_flags
+      && (   ! pow2value (p_flags & (  MSP430_PROFILER_FLAG_ENTRY
+				     | MSP430_PROFILER_FLAG_EXIT))
+	  || ! pow2value (p_flags & (  MSP430_PROFILER_FLAG_PROLSTART
+				     | MSP430_PROFILER_FLAG_PROLEND
+				     | MSP430_PROFILER_FLAG_EPISTART
+				     | MSP430_PROFILER_FLAG_EPIEND))
+	  || ! pow2value (p_flags & (  MSP430_PROFILER_FLAG_INITSECT
+				     | MSP430_PROFILER_FLAG_FINISECT))))
+    {
+      as_bad (_("ambigious flags combination - '.profiler' directive ignored."));
+      input_line_pointer = end;
+      return;
+    }
+
+  /* Generate temp symbol which denotes current location.  */
+  if (now_seg == absolute_section)	/* Paranoja ?  */
+    {
+      exp1.X_op = O_constant;
+      exp1.X_add_number = abs_section_offset;
+      as_warn (_("profiling in absolute section? Hm..."));
+    }
+  else
+    {
+      exp1.X_op = O_symbol;
+      exp1.X_add_symbol = symbol_temp_new_now ();
+      exp1.X_add_number = 0;
+    }
+
+  /* Generate a symbol which holds flags value.  */
+  exp.X_op = O_constant;
+  exp.X_add_number = p_flags;
+
+  /* Save current section.  */
+  seg = now_seg;
+  subseg = now_subseg;
+
+  /* Now go to .profiler section.  */
+  obj_elf_change_section (".profiler", SHT_PROGBITS, 0, 0, 0, 0, 0);
+
+  /* Save flags.  */
+  emit_expr (& exp, 2);
+
+  /* Save label value.  */
+  emit_expr (& exp1, 2);
+
+  while (ops--)
+    {
+      /* Now get profiling info.  */
+      halt = extract_operand (input_line_pointer, str, 1024);
+      /* Process like ".word xxx" directive.  */
+      parse_exp (str, & exp);
+      emit_expr (& exp, 2);
+      input_line_pointer = halt;
+    }
+
+  /* Fill the rest with zeros.  */
+  exp.X_op = O_constant;
+  exp.X_add_number = 0;
+  while (left--)
+    emit_expr (& exp, 2);
+
+  /* Return to current section.  */
+  subseg_set (seg, subseg);
 }
 
 static char *
-extract_word (char *from, char *to, int limit)
+extract_word (char * from, char * to, int limit)
 {
   char *op_start;
   char *op_end;
@@ -251,9 +562,10 @@ extract_word (char *from, char *to, int limit)
   return op_end;
 }
 
+#define OPTION_MMCU 'm'
+
 static void
-msp430_set_arch (dummy)
-     int dummy ATTRIBUTE_UNUSED;
+msp430_set_arch (int dummy ATTRIBUTE_UNUSED)
 {
   char *str = (char *) alloca (32);	/* 32 for good measure.  */
 
@@ -263,10 +575,21 @@ msp430_set_arch (dummy)
   bfd_set_arch_mach (stdoutput, TARGET_ARCH, msp430_mcu->mach);
 }
 
+static void
+show_mcu_list (FILE * stream)
+{
+  int i;
+
+  fprintf (stream, _("Known MCU names:\n"));
+
+  for (i = 0; mcu_types[i].name; i++)
+    fprintf (stream, _("\t %s\n"), mcu_types[i].name);
+
+  fprintf (stream, "\n");
+}
+
 int
-md_parse_option (c, arg)
-     int c;
-     char *arg;
+md_parse_option (int c, char * arg)
 {
   int i;
 
@@ -294,72 +617,62 @@ md_parse_option (c, arg)
   return 0;
 }
 
-symbolS *
-md_undefined_symbol (name)
-     char *name ATTRIBUTE_UNUSED;
-{
-  return 0;
-}
 
-static inline char *
-skip_space (s)
-     char *s;
+const pseudo_typeS md_pseudo_table[] =
 {
-  while (ISSPACE (*s))
-    ++s;
-  return s;
-}
+  {"arch", msp430_set_arch, 0},
+  {"profiler", msp430_profiler, 0},
+  {NULL, NULL, 0}
+};
 
-/* Delete spaces from s: X ( r 1  2)  => X(r12).  */
+const char *md_shortopts = "m:";
 
-static void
-del_spaces (s)
-     char *s;
+struct option md_longopts[] =
 {
-  while (*s)
-    {
-      if (ISSPACE (*s))
-	{
-	  char *m = s + 1;
-
-	  while (ISSPACE (*m) && *m)
-	    m++;
-	  memmove (s, m, strlen (m) + 1);
-	}
-      else
-	s++;
-    }
-}
+  {"mmcu", required_argument, NULL, OPTION_MMCU},
+  {NULL, no_argument, NULL, 0}
+};
 
-/* Extract one word from FROM and copy it to TO. Delimeters are ",;\n"  */
+size_t md_longopts_size = sizeof (md_longopts);
 
-static char *
-extract_operand (char *from, char *to, int limit)
+void
+md_show_usage (FILE * stream)
 {
-  int size = 0;
-
-  /* Drop leading whitespace.  */
-  from = skip_space (from);
-
-  while (size < limit && *from)
-    {
-      *(to + size) = *from;
-      if (*from == ',' || *from == ';' || *from == '\n')
-	break;
-      from++;
-      size++;
-    }
-
-  *(to + size) = 0;
-  del_spaces (to);
+  fprintf (stream,
+	   _("MSP430 options:\n"
+	     "  -mmcu=[msp430-name] select microcontroller type\n"
+	     "                  msp430x110  msp430x112\n"
+	     "                  msp430x1101 msp430x1111\n"
+	     "                  msp430x1121 msp430x1122 msp430x1132\n"
+	     "                  msp430x122  msp430x123\n"
+	     "                  msp430x1222 msp430x1232\n"
+	     "                  msp430x133  msp430x135\n"
+	     "                  msp430x1331 msp430x1351\n"
+	     "                  msp430x147  msp430x148  msp430x149\n"
+	     "                  msp430x155  msp430x156  msp430x157\n"
+	     "                  msp430x167  msp430x168  msp430x169\n"
+	     "                  msp430x1610 msp430x1611 msp430x1612\n"
+	     "                  msp430x311  msp430x312  msp430x313  msp430x314  msp430x315\n"
+	     "                  msp430x323  msp430x325\n"
+	     "                  msp430x336  msp430x337\n"
+	     "                  msp430x412  msp430x413  msp430x415  msp430x417\n"
+	     "                  msp430xE423 msp430xE425 msp430E427\n"
+	     "                  msp430xW423 msp430xW425 msp430W427\n"
+	     "                  msp430xG437 msp430xG438 msp430G439\n"
+	     "                  msp430x435  msp430x436  msp430x437\n"
+	     "                  msp430x447  msp430x448  msp430x449\n"));
 
-  from++;
+  show_mcu_list (stream);
+}
 
-  return from;
+symbolS *
+md_undefined_symbol (char * name ATTRIBUTE_UNUSED)
+{
+  return 0;
 }
 
 static char *
-extract_cmd (char *from, char *to, int limit)
+extract_cmd (char * from, char * to, int limit)
 {
   int size = 0;
 
@@ -381,10 +694,7 @@ extract_cmd (char *from, char *to, int limit)
    returned, or NULL on OK.  */
 
 char *
-md_atof (type, litP, sizeP)
-     int type;
-     char *litP;
-     int *sizeP;
+md_atof (int type, char * litP, int * sizeP)
 {
   int prec;
   LITTLENUM_TYPE words[4];
@@ -421,18 +731,9 @@ md_atof (type, litP, sizeP)
 }
 
 void
-md_convert_frag (abfd, sec, fragP)
-     bfd *abfd ATTRIBUTE_UNUSED;
-     asection *sec ATTRIBUTE_UNUSED;
-     fragS *fragP ATTRIBUTE_UNUSED;
-{
-  abort ();
-}
-
-void
-md_begin ()
+md_begin (void)
 {
-  struct msp430_opcode_s *opcode;
+  struct msp430_opcode_s * opcode;
   msp430_hash = hash_new ();
 
   for (opcode = msp430_opcodes; opcode->name; opcode++)
@@ -441,424 +742,8 @@ md_begin ()
   bfd_set_arch_mach (stdoutput, TARGET_ARCH, msp430_mcu->mach);
 }
 
-void
-md_assemble (str)
-     char *str;
-{
-  struct msp430_opcode_s *opcode;
-  char cmd[32];
-  unsigned int i = 0;
-
-  str = skip_space (str);	/* Skip leading spaces.  */
-  str = extract_cmd (str, cmd, sizeof (cmd));
-
-  while (cmd[i] && i < sizeof (cmd))
-    {
-      char a = TOLOWER (cmd[i]);
-      cmd[i] = a;
-      i++;
-    }
-
-  if (!cmd[0])
-    {
-      as_bad (_("can't find opcode "));
-      return;
-    }
-
-  opcode = (struct msp430_opcode_s *) hash_find (msp430_hash, cmd);
-
-  if (opcode == NULL)
-    {
-      as_bad (_("unknown opcode `%s'"), cmd);
-      return;
-    }
-
-  {
-    char *__t = input_line_pointer;
-    msp430_operands (opcode, str);
-    input_line_pointer = __t;
-  }
-}
-
-/* Parse instruction operands.
-   Return binary opcode.  */
-
-static unsigned int
-msp430_operands (opcode, line)
-     struct msp430_opcode_s *opcode;
-     char *line;
-{
-  int bin = opcode->bin_opcode;	/* opcode mask.  */
-  int __is;
-  char l1[MAX_OP_LEN], l2[MAX_OP_LEN];
-  char *frag;
-  int where;
-  struct msp430_operand_s op1, op2;
-  int res = 0;
-  static short ZEROS = 0;
-  int byte_op, imm_op;
-
-  /* opcode is the one from opcodes table
-     line contains something like
-     [.w] @r2+, 5(R1)
-     or
-     .b @r2+, 5(R1).  */
-
-  /* Check if byte or word operation.  */
-  if (*line == '.' && TOLOWER (*(line + 1)) == 'b')
-    {
-      bin |= BYTE_OPERATION;
-      byte_op = 1;
-    }
-  else
-    byte_op = 0;
-
-  /* skip .[bwBW].  */
-  while (! ISSPACE (*line) && *line)
-    line++;
-
-  if (opcode->insn_opnumb && (!*line || *line == '\n'))
-    {
-      as_bad (_("instruction %s requires %d operand(s)"),
-	      opcode->name, opcode->insn_opnumb);
-      return 0;
-    }
-
-  memset (l1, 0, sizeof (l1));
-  memset (l2, 0, sizeof (l2));
-  memset (&op1, 0, sizeof (op1));
-  memset (&op2, 0, sizeof (op2));
-
-  imm_op = 0;
-
-  switch (opcode->fmt)
-    {
-    case 0:			/* Emulated.  */
-      switch (opcode->insn_opnumb)
-	{
-	case 0:
-	  /* Set/clear bits instructions.  */
-	  __is = 2;
-	  frag = frag_more (__is);
-	  bfd_putl16 ((bfd_vma) bin, frag);
-	  break;
-	case 1:
-	  /* Something which works with destination operand.  */
-	  line = extract_operand (line, l1, sizeof (l1));
-	  res = msp430_dstoperand (&op1, l1, opcode->bin_opcode);
-	  if (res)
-	    break;
-
-	  bin |= (op1.reg | (op1.am << 7));
-	  __is = 1 + op1.ol;
-	  frag = frag_more (2 * __is);
-	  where = frag - frag_now->fr_literal;
-	  bfd_putl16 ((bfd_vma) bin, frag);
-
-	  if (op1.mode == OP_EXP)
-	    {
-	      where += 2;
-	      bfd_putl16 ((bfd_vma) ZEROS, frag + 2);
-
-	      if (op1.reg)
-		fix_new_exp (frag_now, where, 2,
-			     &(op1.exp), FALSE, CHECK_RELOC_MSP430);
-	      else
-		fix_new_exp (frag_now, where, 2,
-			     &(op1.exp), TRUE, CHECK_RELOC_MSP430_PCREL);
-	    }
-	  break;
-
-	case 2:
-	  {
-	    /* Shift instruction.  */
-	    line = extract_operand (line, l1, sizeof (l1));
-	    strncpy (l2, l1, sizeof (l2));
-	    l2[sizeof (l2) - 1] = '\0';
-	    res = msp430_srcoperand (&op1, l1, opcode->bin_opcode, &imm_op);
-	    res += msp430_dstoperand (&op2, l2, opcode->bin_opcode);
-
-	    if (res)
-	      break;	/* An error occurred.  All warnings were done before.  */
-
-	    bin |= (op2.reg | (op1.reg << 8) | (op1.am << 4) | (op2.am << 7));
-
-	    __is = 1 + op1.ol + op2.ol;	/* insn size in words.  */
-	    frag = frag_more (2 * __is);
-	    where = frag - frag_now->fr_literal;
-	    bfd_putl16 ((bfd_vma) bin, frag);
-
-	    if (op1.mode == OP_EXP)
-	      {
-		where += 2;	/* Advance 'where' as we do not know _where_.  */
-		bfd_putl16 ((bfd_vma) ZEROS, frag + 2);
-
-		if (op1.reg || (op1.reg == 0 && op1.am == 3))	/* Not PC relative.  */
-		  fix_new_exp (frag_now, where, 2,
-			       &(op1.exp), FALSE, CHECK_RELOC_MSP430);
-		else
-		  fix_new_exp (frag_now, where, 2,
-			       &(op1.exp), TRUE, CHECK_RELOC_MSP430_PCREL);
-	      }
-
-	    if (op2.mode == OP_EXP)
-	      {
-		imm_op = 0;
-		bfd_putl16 ((bfd_vma) ZEROS, frag + 2 + ((__is == 3) ? 2 : 0));
-
-		if (op2.reg)	/* Not PC relative.  */
-		  fix_new_exp (frag_now, where + 2, 2,
-			       &(op2.exp), FALSE, CHECK_RELOC_MSP430);
-		else
-		  fix_new_exp (frag_now, where + 2, 2,
-			       &(op2.exp), TRUE, CHECK_RELOC_MSP430_PCREL);
-	      }
-	    break;
-	  }
-	case 3:
-	  /* Branch instruction => mov dst, r0.  */
-	  line = extract_operand (line, l1, sizeof (l1));
-
-	  res = msp430_srcoperand (&op1, l1, opcode->bin_opcode, &imm_op);
-	  if (res)
-	    break;
-
-	  byte_op = 0;
-	  imm_op = 0;
-
-	  bin |= ((op1.reg << 8) | (op1.am << 4));
-	  __is = 1 + op1.ol;
-	  frag = frag_more (2 * __is);
-	  where = frag - frag_now->fr_literal;
-	  bfd_putl16 ((bfd_vma) bin, frag);
-
-	  if (op1.mode == OP_EXP)
-	    {
-	      where += 2;
-	      bfd_putl16 ((bfd_vma) ZEROS, frag + 2);
-
-	      if (op1.reg || (op1.reg == 0 && op1.am == 3))
-		fix_new_exp (frag_now, where, 2,
-			     &(op1.exp), FALSE, CHECK_RELOC_MSP430);
-	      else
-		fix_new_exp (frag_now, where, 2,
-			     &(op1.exp), TRUE, CHECK_RELOC_MSP430_PCREL);
-	    }
-	  break;
-	}
-      break;
-
-    case 1:			/* Format 1, double operand.  */
-      line = extract_operand (line, l1, sizeof (l1));
-      line = extract_operand (line, l2, sizeof (l2));
-      res = msp430_srcoperand (&op1, l1, opcode->bin_opcode, &imm_op);
-      res += msp430_dstoperand (&op2, l2, opcode->bin_opcode);
-
-      if (res)
-	break;			/* Error occurred.  All warnings were done before.  */
-
-      bin |= (op2.reg | (op1.reg << 8) | (op1.am << 4) | (op2.am << 7));
-
-      __is = 1 + op1.ol + op2.ol;	/* insn size in words.  */
-      frag = frag_more (2 * __is);
-      where = frag - frag_now->fr_literal;
-      bfd_putl16 ((bfd_vma) bin, frag);
-
-      if (op1.mode == OP_EXP)
-	{
-	  where += 2;		/* Advance where as we do not know _where_.  */
-	  bfd_putl16 ((bfd_vma) ZEROS, frag + 2);
-
-	  if (op1.reg || (op1.reg == 0 && op1.am == 3))	/* Not PC relative.  */
-	    fix_new_exp (frag_now, where, 2,
-			 &(op1.exp), FALSE, CHECK_RELOC_MSP430);
-	  else
-	    fix_new_exp (frag_now, where, 2,
-			 &(op1.exp), TRUE, CHECK_RELOC_MSP430_PCREL);
-	}
-
-      if (op2.mode == OP_EXP)
-	{
-	  imm_op = 0;
-	  bfd_putl16 ((bfd_vma) ZEROS, frag + 2 + ((__is == 3) ? 2 : 0));
-
-	  if (op2.reg)		/* Not PC relative.  */
-	    fix_new_exp (frag_now, where + 2, 2,
-			 &(op2.exp), FALSE, CHECK_RELOC_MSP430);
-	  else
-	    fix_new_exp (frag_now, where + 2, 2,
-			 &(op2.exp), TRUE, CHECK_RELOC_MSP430_PCREL);
-	}
-      break;
-
-    case 2:			/* Single-operand mostly instr.  */
-      if (opcode->insn_opnumb == 0)
-	{
-	  /* reti instruction.  */
-	  frag = frag_more (2);
-	  bfd_putl16 ((bfd_vma) bin, frag);
-	  break;
-	}
-
-      line = extract_operand (line, l1, sizeof (l1));
-      res = msp430_srcoperand (&op1, l1, opcode->bin_opcode, &imm_op);
-      if (res)
-	break;		/* Error in operand.  */
-
-      bin |= op1.reg | (op1.am << 4);
-      __is = 1 + op1.ol;
-      frag = frag_more (2 * __is);
-      where = frag - frag_now->fr_literal;
-      bfd_putl16 ((bfd_vma) bin, frag);
-
-      if (op1.mode == OP_EXP)
-	{
-	  bfd_putl16 ((bfd_vma) ZEROS, frag + 2);
-
-	  if (op1.reg || (op1.reg == 0 && op1.am == 3))	/* Not PC relative.  */
-	    fix_new_exp (frag_now, where + 2, 2,
-			 &(op1.exp), FALSE, CHECK_RELOC_MSP430);
-	  else
-	    fix_new_exp (frag_now, where + 2, 2,
-			 &(op1.exp), TRUE, CHECK_RELOC_MSP430_PCREL);
-	}
-      break;
-
-    case 3:			/* Conditional jumps instructions.  */
-      line = extract_operand (line, l1, sizeof (l1));
-      /* l1 is a label.  */
-      if (l1[0])
-	{
-	  char *m = l1;
-	  expressionS exp;
-
-	  if (*m == '$')
-	    m++;
-
-	  parse_exp (m, &exp);
-	  frag = frag_more (2);	/* Instr size is 1 word.  */
-
-	  /* In order to handle something like:
-
-	     and #0x8000, r5
-	     tst r5
-	     jz   4     ;       skip next 4 bytes
-	     inv r5
-	     inc r5
-	     nop        ;       will jump here if r5 positive or zero
-
-	     jCOND      -n      ;assumes jump n bytes backward:
-
-	     mov r5,r6
-	     jmp -2
-
-	     is equal to:
-	     lab:
-	     mov r5,r6
-	     jmp lab
-
-	     jCOND      $n      ; jump from PC in either direction.  */
-
-	  if (exp.X_op == O_constant)
-	    {
-	      int x = exp.X_add_number;
-
-	      if (x & 1)
-		{
-		  as_warn (_("Even number required. Rounded to %d"), x + 1);
-		  x++;
-		}
-
-	      if ((*l1 == '$' && x > 0) || x < 0)
-		x -= 2;
-
-	      x >>= 1;
-
-	      if (x > 512 || x < -511)
-		{
-		  as_bad (_("Wrong displacement  %d"), x << 1);
-		  break;
-		}
-
-	      bin |= x & 0x3ff;
-	      bfd_putl16 ((bfd_vma) bin, frag);
-	    }
-	  else if (exp.X_op == O_symbol && *l1 != '$')
-	    {
-	      where = frag - frag_now->fr_literal;
-	      fix_new_exp (frag_now, where, 2,
-			   &exp, TRUE, BFD_RELOC_MSP430_10_PCREL);
-
-	      bfd_putl16 ((bfd_vma) bin, frag);
-	    }
-	  else if (*l1 == '$')
-	    {
-	      as_bad (_("instruction requires label sans '$'"));
-	      break;
-	    }
-	  else
-	    {
-	      as_bad (_
-		      ("instruction requires label or value in range -511:512"));
-	      break;
-	    }
-	}
-      else
-	{
-	  as_bad (_("instruction requires label"));
-	  break;
-	}
-      break;
-
-    default:
-      as_bad (_("Ilegal instruction or not implmented opcode."));
-    }
-
-  input_line_pointer = line;
-  return 0;
-}
-
-static int
-msp430_dstoperand (op, l, bin)
-     struct msp430_operand_s *op;
-     char *l;
-     int bin;
-{
-  int dummy;
-  int ret = msp430_srcoperand (op, l, bin, &dummy);
-  if (ret)
-    return ret;
-
-  if (op->am == 2)
-    {
-      char *__tl = "0";
-
-      op->mode = OP_EXP;
-      op->am = 1;
-      op->ol = 1;
-      parse_exp (__tl, &(op->exp));
-      if (op->exp.X_op != O_constant || op->exp.X_add_number != 0)
-	{
-	  as_bad (_("Internal bug. Try to use 0(r%d) instead of @r%d"),
-		  op->reg, op->reg);
-	  return 1;
-	}
-      return 0;
-    }
-
-  if (op->am > 1)
-    {
-      as_bad (_
-	      ("this addressing mode is not applicable for destination operand"));
-      return 1;
-    }
-  return 0;
-}
-
-
 static int
-check_reg (t)
-     char *t;
+check_reg (char * t)
 {
   /* If this is a reg numb, str 't' must be a number from 0 - 15.  */
 
@@ -880,11 +765,8 @@ check_reg (t)
 
 
 static int
-msp430_srcoperand (op, l, bin, imm_op)
-     struct msp430_operand_s *op;
-     char *l;
-     int bin;
-     int *imm_op;
+msp430_srcoperand (struct msp430_operand_s * op,
+		   char * l, int bin, int * imm_op)
 {
   char *__tl = l;
 
@@ -940,6 +822,7 @@ msp430_srcoperand (op, l, bin, imm_op)
       op->ol = 1;		/* Immediate  will follow an instruction.  */
       __tl = h + 1 + rval;
       op->mode = OP_EXP;
+
       parse_exp (__tl, &(op->exp));
       if (op->exp.X_op == O_constant)
 	{
@@ -966,7 +849,7 @@ msp430_srcoperand (op, l, bin, imm_op)
 
 	  if (op->exp.X_add_number > 65535 || op->exp.X_add_number < -32768)
 	    {
-	      as_bad (_("value %ld out of range. Use #lo() or #hi()"), x);
+	      as_bad (_("value %d out of range. Use #lo() or #hi()"), x);
 	      return 1;
 	    }
 
@@ -1102,10 +985,13 @@ msp430_srcoperand (op, l, bin, imm_op)
 	      op->mode = OP_REG;
 	    }
 	}
+      /* Redudant (yet) check.  */
+      else if (op->exp.X_op == O_register)
+	as_bad
+	  (_("Registers cannot be used within immediate expression [%s]"), l);
       else
-	{
-	  as_bad (_("unknown operand %s"), l);
-	}
+	as_bad (_("unknown operand %s"), l);
+
       return 0;
     }
 
@@ -1123,6 +1009,7 @@ msp430_srcoperand (op, l, bin, imm_op)
       if (op->exp.X_op == O_constant)
 	{
 	  int x = op->exp.X_add_number;
+
 	  if (x > 65535 || x < -32768)
 	    {
 	      as_bad (_("value out of range: %d"), x);
@@ -1130,11 +1017,15 @@ msp430_srcoperand (op, l, bin, imm_op)
 	    }
 	}
       else if (op->exp.X_op == O_symbol)
-	{
-	}
+	;
       else
 	{
-	  as_bad (_("unknown expression in operand %s"), l);
+	  /* Redudant (yet) check.  */
+	  if (op->exp.X_op == O_register)
+	    as_bad
+	      (_("Registers cannot be used within absolute expression [%s]"), l);
+	  else
+	    as_bad (_("unknown expression in operand %s"), l);
 	  return 1;
 	}
       return 0;
@@ -1269,11 +1160,15 @@ msp430_srcoperand (op, l, bin, imm_op)
 	    }
 	}
       else if (op->exp.X_op == O_symbol)
-	{
-	}
+	;
       else
 	{
-	  as_bad (_("unknown expression in operand %s"), l);
+	  /* Redudant (yet) check.  */
+	  if (op->exp.X_op == O_register)
+	    as_bad
+	      (_("Registers cannot be used as a prefix of indexed expression [%s]"), l);
+	  else
+	    as_bad (_("unknown expression in operand %s"), l);
 	  return 1;
 	}
 
@@ -1309,6 +1204,7 @@ msp430_srcoperand (op, l, bin, imm_op)
   /* Symbolic mode 'mov a, b' == 'mov x(pc), y(pc)'.  */
   do
     {
+#if 0  /* Allow expression in operand like 'a+123*(1|2)'.  */
       char *t = l;
 
       __tl = l;
@@ -1323,7 +1219,7 @@ msp430_srcoperand (op, l, bin, imm_op)
 	    }
 	  t++;
 	}
-
+#endif
       op->mode = OP_EXP;
       op->reg = 0;		/* PC relative... be careful.  */
       op->am = 1;
@@ -1340,13 +1236,486 @@ msp430_srcoperand (op, l, bin, imm_op)
 }
 
 
+static int
+msp430_dstoperand (struct msp430_operand_s * op, char * l, int bin)
+{
+  int dummy;
+  int ret = msp430_srcoperand (op, l, bin, & dummy);
+
+  if (ret)
+    return ret;
+
+  if (op->am == 2)
+    {
+      char *__tl = "0";
+
+      op->mode = OP_EXP;
+      op->am = 1;
+      op->ol = 1;
+      parse_exp (__tl, &(op->exp));
+
+      if (op->exp.X_op != O_constant || op->exp.X_add_number != 0)
+	{
+	  as_bad (_("Internal bug. Try to use 0(r%d) instead of @r%d"),
+		  op->reg, op->reg);
+	  return 1;
+	}
+      return 0;
+    }
+
+  if (op->am > 1)
+    {
+      as_bad (_
+	      ("this addressing mode is not applicable for destination operand"));
+      return 1;
+    }
+  return 0;
+}
+
+
+/* Parse instruction operands.
+   Return binary opcode.  */
+
+static unsigned int
+msp430_operands (struct msp430_opcode_s * opcode, char * line)
+{
+  int bin = opcode->bin_opcode;	/* Opcode mask.  */
+  int __is;
+  char l1[MAX_OP_LEN], l2[MAX_OP_LEN];
+  char *frag;
+  int where;
+  struct msp430_operand_s op1, op2;
+  int res = 0;
+  static short ZEROS = 0;
+  int byte_op, imm_op;
+
+  /* Opcode is the one from opcodes table
+     line contains something like
+     [.w] @r2+, 5(R1)
+     or
+     .b @r2+, 5(R1).  */
+
+  /* Check if byte or word operation.  */
+  if (*line == '.' && TOLOWER (*(line + 1)) == 'b')
+    {
+      bin |= BYTE_OPERATION;
+      byte_op = 1;
+    }
+  else
+    byte_op = 0;
+
+  /* skip .[bwBW].  */
+  while (! ISSPACE (*line) && *line)
+    line++;
+
+  if (opcode->insn_opnumb && (!*line || *line == '\n'))
+    {
+      as_bad (_("instruction %s requires %d operand(s)"),
+	      opcode->name, opcode->insn_opnumb);
+      return 0;
+    }
+
+  memset (l1, 0, sizeof (l1));
+  memset (l2, 0, sizeof (l2));
+  memset (&op1, 0, sizeof (op1));
+  memset (&op2, 0, sizeof (op2));
+
+  imm_op = 0;
+
+  switch (opcode->fmt)
+    {
+    case 0:			/* Emulated.  */
+      switch (opcode->insn_opnumb)
+	{
+	case 0:
+	  /* Set/clear bits instructions.  */
+	  __is = 2;
+	  frag = frag_more (__is);
+	  bfd_putl16 ((bfd_vma) bin, frag);
+	  break;
+	case 1:
+	  /* Something which works with destination operand.  */
+	  line = extract_operand (line, l1, sizeof (l1));
+	  res = msp430_dstoperand (&op1, l1, opcode->bin_opcode);
+	  if (res)
+	    break;
+
+	  bin |= (op1.reg | (op1.am << 7));
+	  __is = 1 + op1.ol;
+	  frag = frag_more (2 * __is);
+	  where = frag - frag_now->fr_literal;
+	  bfd_putl16 ((bfd_vma) bin, frag);
+
+	  if (op1.mode == OP_EXP)
+	    {
+	      where += 2;
+	      bfd_putl16 ((bfd_vma) ZEROS, frag + 2);
+
+	      if (op1.reg)
+		fix_new_exp (frag_now, where, 2,
+			     &(op1.exp), FALSE, CHECK_RELOC_MSP430);
+	      else
+		fix_new_exp (frag_now, where, 2,
+			     &(op1.exp), TRUE, CHECK_RELOC_MSP430_PCREL);
+	    }
+	  break;
+
+	case 2:
+	  {
+	    /* Shift instruction.  */
+	    line = extract_operand (line, l1, sizeof (l1));
+	    strncpy (l2, l1, sizeof (l2));
+	    l2[sizeof (l2) - 1] = '\0';
+	    res = msp430_srcoperand (&op1, l1, opcode->bin_opcode, &imm_op);
+	    res += msp430_dstoperand (&op2, l2, opcode->bin_opcode);
+
+	    if (res)
+	      break;	/* An error occurred.  All warnings were done before.  */
+
+	    bin |= (op2.reg | (op1.reg << 8) | (op1.am << 4) | (op2.am << 7));
+
+	    __is = 1 + op1.ol + op2.ol;	/* insn size in words.  */
+	    frag = frag_more (2 * __is);
+	    where = frag - frag_now->fr_literal;
+	    bfd_putl16 ((bfd_vma) bin, frag);
+
+	    if (op1.mode == OP_EXP)
+	      {
+		where += 2;	/* Advance 'where' as we do not know _where_.  */
+		bfd_putl16 ((bfd_vma) ZEROS, frag + 2);
+
+		if (op1.reg || (op1.reg == 0 && op1.am == 3))	/* Not PC relative.  */
+		  fix_new_exp (frag_now, where, 2,
+			       &(op1.exp), FALSE, CHECK_RELOC_MSP430);
+		else
+		  fix_new_exp (frag_now, where, 2,
+			       &(op1.exp), TRUE, CHECK_RELOC_MSP430_PCREL);
+	      }
+
+	    if (op2.mode == OP_EXP)
+	      {
+		imm_op = 0;
+		bfd_putl16 ((bfd_vma) ZEROS, frag + 2 + ((__is == 3) ? 2 : 0));
+
+		if (op2.reg)	/* Not PC relative.  */
+		  fix_new_exp (frag_now, where + 2, 2,
+			       &(op2.exp), FALSE, CHECK_RELOC_MSP430);
+		else
+		  fix_new_exp (frag_now, where + 2, 2,
+			       &(op2.exp), TRUE, CHECK_RELOC_MSP430_PCREL);
+	      }
+	    break;
+	  }
+	case 3:
+	  /* Branch instruction => mov dst, r0.  */
+	  line = extract_operand (line, l1, sizeof (l1));
+
+	  res = msp430_srcoperand (&op1, l1, opcode->bin_opcode, &imm_op);
+	  if (res)
+	    break;
+
+	  byte_op = 0;
+	  imm_op = 0;
+
+	  bin |= ((op1.reg << 8) | (op1.am << 4));
+	  __is = 1 + op1.ol;
+	  frag = frag_more (2 * __is);
+	  where = frag - frag_now->fr_literal;
+	  bfd_putl16 ((bfd_vma) bin, frag);
+
+	  if (op1.mode == OP_EXP)
+	    {
+	      where += 2;
+	      bfd_putl16 ((bfd_vma) ZEROS, frag + 2);
+
+	      if (op1.reg || (op1.reg == 0 && op1.am == 3))
+		fix_new_exp (frag_now, where, 2,
+			     &(op1.exp), FALSE, CHECK_RELOC_MSP430);
+	      else
+		fix_new_exp (frag_now, where, 2,
+			     &(op1.exp), TRUE, CHECK_RELOC_MSP430_PCREL);
+	    }
+	  break;
+	}
+      break;
+
+    case 1:			/* Format 1, double operand.  */
+      line = extract_operand (line, l1, sizeof (l1));
+      line = extract_operand (line, l2, sizeof (l2));
+      res = msp430_srcoperand (&op1, l1, opcode->bin_opcode, &imm_op);
+      res += msp430_dstoperand (&op2, l2, opcode->bin_opcode);
+
+      if (res)
+	break;			/* Error occurred.  All warnings were done before.  */
+
+      bin |= (op2.reg | (op1.reg << 8) | (op1.am << 4) | (op2.am << 7));
+
+      __is = 1 + op1.ol + op2.ol;	/* insn size in words.  */
+      frag = frag_more (2 * __is);
+      where = frag - frag_now->fr_literal;
+      bfd_putl16 ((bfd_vma) bin, frag);
+
+      if (op1.mode == OP_EXP)
+	{
+	  where += 2;		/* Advance where as we do not know _where_.  */
+	  bfd_putl16 ((bfd_vma) ZEROS, frag + 2);
+
+	  if (op1.reg || (op1.reg == 0 && op1.am == 3))	/* Not PC relative.  */
+	    fix_new_exp (frag_now, where, 2,
+			 &(op1.exp), FALSE, CHECK_RELOC_MSP430);
+	  else
+	    fix_new_exp (frag_now, where, 2,
+			 &(op1.exp), TRUE, CHECK_RELOC_MSP430_PCREL);
+	}
+
+      if (op2.mode == OP_EXP)
+	{
+	  imm_op = 0;
+	  bfd_putl16 ((bfd_vma) ZEROS, frag + 2 + ((__is == 3) ? 2 : 0));
+
+	  if (op2.reg)		/* Not PC relative.  */
+	    fix_new_exp (frag_now, where + 2, 2,
+			 &(op2.exp), FALSE, CHECK_RELOC_MSP430);
+	  else
+	    fix_new_exp (frag_now, where + 2, 2,
+			 &(op2.exp), TRUE, CHECK_RELOC_MSP430_PCREL);
+	}
+      break;
+
+    case 2:			/* Single-operand mostly instr.  */
+      if (opcode->insn_opnumb == 0)
+	{
+	  /* reti instruction.  */
+	  frag = frag_more (2);
+	  bfd_putl16 ((bfd_vma) bin, frag);
+	  break;
+	}
+
+      line = extract_operand (line, l1, sizeof (l1));
+      res = msp430_srcoperand (&op1, l1, opcode->bin_opcode, &imm_op);
+      if (res)
+	break;		/* Error in operand.  */
+
+      bin |= op1.reg | (op1.am << 4);
+      __is = 1 + op1.ol;
+      frag = frag_more (2 * __is);
+      where = frag - frag_now->fr_literal;
+      bfd_putl16 ((bfd_vma) bin, frag);
+
+      if (op1.mode == OP_EXP)
+	{
+	  bfd_putl16 ((bfd_vma) ZEROS, frag + 2);
+
+	  if (op1.reg || (op1.reg == 0 && op1.am == 3))	/* Not PC relative.  */
+	    fix_new_exp (frag_now, where + 2, 2,
+			 &(op1.exp), FALSE, CHECK_RELOC_MSP430);
+	  else
+	    fix_new_exp (frag_now, where + 2, 2,
+			 &(op1.exp), TRUE, CHECK_RELOC_MSP430_PCREL);
+	}
+      break;
+
+    case 3:			/* Conditional jumps instructions.  */
+      line = extract_operand (line, l1, sizeof (l1));
+      /* l1 is a label.  */
+      if (l1[0])
+	{
+	  char *m = l1;
+	  expressionS exp;
+
+	  if (*m == '$')
+	    m++;
+
+	  parse_exp (m, &exp);
+	  frag = frag_more (2);	/* Instr size is 1 word.  */
+
+	  /* In order to handle something like:
+
+	     and #0x8000, r5
+	     tst r5
+	     jz   4     ;       skip next 4 bytes
+	     inv r5
+	     inc r5
+	     nop        ;       will jump here if r5 positive or zero
+
+	     jCOND      -n      ;assumes jump n bytes backward:
+
+	     mov r5,r6
+	     jmp -2
+
+	     is equal to:
+	     lab:
+	     mov r5,r6
+	     jmp lab
+
+	     jCOND      $n      ; jump from PC in either direction.  */
+
+	  if (exp.X_op == O_constant)
+	    {
+	      int x = exp.X_add_number;
+
+	      if (x & 1)
+		{
+		  as_warn (_("Even number required. Rounded to %d"), x + 1);
+		  x++;
+		}
+
+	      if ((*l1 == '$' && x > 0) || x < 0)
+		x -= 2;
+
+	      x >>= 1;
+
+	      if (x > 512 || x < -511)
+		{
+		  as_bad (_("Wrong displacement  %d"), x << 1);
+		  break;
+		}
+
+	      bin |= x & 0x3ff;
+	      bfd_putl16 ((bfd_vma) bin, frag);
+	    }
+	  else if (exp.X_op == O_symbol && *l1 != '$')
+	    {
+	      where = frag - frag_now->fr_literal;
+	      fix_new_exp (frag_now, where, 2,
+			   &exp, TRUE, BFD_RELOC_MSP430_10_PCREL);
+
+	      bfd_putl16 ((bfd_vma) bin, frag);
+	    }
+	  else if (*l1 == '$')
+	    {
+	      as_bad (_("instruction requires label sans '$'"));
+	      break;
+	    }
+	  else
+	    {
+	      as_bad (_
+		      ("instruction requires label or value in range -511:512"));
+	      break;
+	    }
+	}
+      else
+	{
+	  as_bad (_("instruction requires label"));
+	  break;
+	}
+      break;
+
+    case 4:	/* Extended jumps.  */
+      line = extract_operand (line, l1, sizeof (l1));
+      if (l1[0])
+	{
+	  char *m = l1;
+	  expressionS exp;
+
+	  /* Ignore absolute addressing. make it PC relative anyway.  */
+	  if (*m == '#' || *m == '$')
+	    m++;
+
+	  parse_exp (m, & exp);
+	  if (exp.X_op == O_symbol)
+	    {
+	      /* Relaxation required.  */
+	      struct rcodes_s rc = msp430_rcodes[opcode->insn_opnumb];
+
+	      frag = frag_more (8);
+	      bfd_putl16 ((bfd_vma) rc.sop, frag);
+	      frag = frag_variant (rs_machine_dependent, 8, 2,
+				   ENCODE_RELAX (rc.lpos, STATE_BITS10), /* Wild guess.  */
+				   exp.X_add_symbol,
+				   0,	/* Offset is zero if jump dist less than 1K.  */
+				   (char *) frag);
+	      break;
+	    }
+	}
+
+      as_bad (_("instruction requires label"));
+      break;
+
+    case 5:	/* Emulated extended branches.  */
+      line = extract_operand (line, l1, sizeof (l1));
+      if (l1[0])
+	{
+	  char * m = l1;
+	  expressionS exp;
+
+	  /* Ignore absolute addressing. make it PC relative anyway.  */
+	  if (*m == '#' || *m == '$')
+	    m++;
+
+	  parse_exp (m, & exp);
+	  if (exp.X_op == O_symbol)
+	    {
+	      /* Relaxation required.  */
+	      struct hcodes_s hc = msp430_hcodes[opcode->insn_opnumb];
+
+	      frag = frag_more (8);
+	      bfd_putl16 ((bfd_vma) hc.op0, frag);
+	      bfd_putl16 ((bfd_vma) hc.op1, frag+2);
+	      frag = frag_variant (rs_machine_dependent, 8, 2,
+				   ENCODE_RELAX (STATE_EMUL_BRANCH, STATE_BITS10), /* Wild guess.  */
+				   exp.X_add_symbol,
+				   0,	/* Offset is zero if jump dist less than 1K.  */
+				   (char *) frag);
+	      break;
+	    }
+	}
+
+      as_bad (_("instruction requires label"));
+      break;
+
+    default:
+      as_bad (_("Ilegal instruction or not implmented opcode."));
+    }
+
+  input_line_pointer = line;
+  return 0;
+}
+
+void
+md_assemble (char * str)
+{
+  struct msp430_opcode_s * opcode;
+  char cmd[32];
+  unsigned int i = 0;
+
+  str = skip_space (str);	/* Skip leading spaces.  */
+  str = extract_cmd (str, cmd, sizeof (cmd));
+
+  while (cmd[i] && i < sizeof (cmd))
+    {
+      char a = TOLOWER (cmd[i]);
+      cmd[i] = a;
+      i++;
+    }
+
+  if (!cmd[0])
+    {
+      as_bad (_("can't find opcode "));
+      return;
+    }
+
+  opcode = (struct msp430_opcode_s *) hash_find (msp430_hash, cmd);
+
+  if (opcode == NULL)
+    {
+      as_bad (_("unknown opcode `%s'"), cmd);
+      return;
+    }
+
+  {
+    char *__t = input_line_pointer;
+
+    msp430_operands (opcode, str);
+    input_line_pointer = __t;
+  }
+}
+
 /* GAS will call this function for each section at the end of the assembly,
    to permit the CPU backend to adjust the alignment of a section.  */
 
 valueT
-md_section_align (seg, addr)
-     asection *seg;
-     valueT addr;
+md_section_align (asection * seg, valueT addr)
 {
   int align = bfd_get_section_alignment (stdoutput, seg);
 
@@ -1360,9 +1729,7 @@ md_section_align (seg, addr)
    macro would return the length of an instruction.  */
 
 long
-md_pcrel_from_section (fixp, sec)
-     fixS *fixp;
-     segT sec;
+md_pcrel_from_section (fixS * fixp, segT sec)
 {
   if (fixp->fx_addsy != (symbolS *) NULL
       && (!S_IS_DEFINED (fixp->fx_addsy)
@@ -1376,12 +1743,9 @@ md_pcrel_from_section (fixp, sec)
    value in the object file.  */
 
 void
-md_apply_fix3 (fixp, valuep, seg)
-     fixS *fixp;
-     valueT *valuep;
-     segT seg;
+md_apply_fix3 (fixS * fixp, valueT * valuep, segT seg)
 {
-  unsigned char *where;
+  unsigned char * where;
   unsigned long insn;
   long value;
 
@@ -1459,6 +1823,7 @@ md_apply_fix3 (fixp, valuep, seg)
 	  bfd_putl16 ((bfd_vma) (value | insn), where);
 	  break;
 
+	case BFD_RELOC_MSP430_RL_PCREL:
 	case BFD_RELOC_MSP430_16_PCREL:
 	  if (value & 1)
 	    as_bad_where (fixp->fx_file, fixp->fx_line,
@@ -1517,15 +1882,13 @@ md_apply_fix3 (fixp, valuep, seg)
    then it is done here.  */
 
 arelent *
-tc_gen_reloc (seg, fixp)
-     asection *seg ATTRIBUTE_UNUSED;
-     fixS *fixp;
+tc_gen_reloc (asection * seg ATTRIBUTE_UNUSED, fixS * fixp)
 {
-  arelent *reloc;
+  arelent * reloc;
 
-  reloc = (arelent *) xmalloc (sizeof (arelent));
+  reloc = xmalloc (sizeof (arelent));
 
-  reloc->sym_ptr_ptr = (asymbol **) xmalloc (sizeof (asymbol *));
+  reloc->sym_ptr_ptr = xmalloc (sizeof (asymbol *));
   *reloc->sym_ptr_ptr = symbol_get_bfdsym (fixp->fx_addsy);
 
   reloc->address = fixp->fx_frag->fr_address + fixp->fx_where;
@@ -1547,26 +1910,223 @@ tc_gen_reloc (seg, fixp)
   return reloc;
 }
 
-/* Parse ordinary expression.  */
+int
+md_estimate_size_before_relax (fragS * fragP ATTRIBUTE_UNUSED,
+			       asection * segment_type ATTRIBUTE_UNUSED)
+{
+  if (fragP->fr_symbol && S_GET_SEGMENT (fragP->fr_symbol) == segment_type)
+    {
+      /* This is a jump -> pcrel mode. Nothing to do much here.
+         Return value == 2.  */
+      fragP->fr_subtype =
+	  ENCODE_RELAX (RELAX_LEN (fragP->fr_subtype), STATE_BITS10);
+    }
+  else if (fragP->fr_symbol)
+    {
+      /* Its got a segment, but its not ours.   Even if fr_symbol is in
+	 an absolute segment, we dont know a displacement until we link
+	 object files. So it will always be long. This also applies to
+	 labels in a subsegment of current. Liker may relax it to short
+	 jump later. Return value == 8.  */
+      fragP->fr_subtype =
+	  ENCODE_RELAX (RELAX_LEN (fragP->fr_subtype), STATE_WORD);
+    }
+  else
+    {
+      /* We know the abs value. may be it is a jump to fixed address.
+         Impossible in our case, cause all constants already handeled. */
+      fragP->fr_subtype =
+	  ENCODE_RELAX (RELAX_LEN (fragP->fr_subtype), STATE_UNDEF);
+    }
 
-static char *
-parse_exp (s, op)
-     char *s;
-     expressionS *op;
+  return md_relax_table[fragP->fr_subtype].rlx_length;
+}
+
+void
+md_convert_frag (bfd * abfd ATTRIBUTE_UNUSED,
+		 asection * sec ATTRIBUTE_UNUSED,
+		 fragS * fragP)
 {
-  input_line_pointer = s;
-  expression (op);
-  if (op->X_op == O_absent)
-    as_bad (_("missing operand"));
-  return input_line_pointer;
+  char * where = 0;
+  int rela = -1;
+  int i;
+  struct rcodes_s * cc = NULL;
+  struct hcodes_s * hc = NULL;
+
+  switch (fragP->fr_subtype)
+    {
+    case ENCODE_RELAX (STATE_UNCOND_BRANCH, STATE_BITS10):
+    case ENCODE_RELAX (STATE_SIMPLE_BRANCH, STATE_BITS10):
+    case ENCODE_RELAX (STATE_NOOV_BRANCH, STATE_BITS10):
+      /* We do not have to convert anything here.
+         Just apply a fix.  */
+      rela = BFD_RELOC_MSP430_10_PCREL;
+      break;
+
+    case ENCODE_RELAX (STATE_UNCOND_BRANCH, STATE_WORD):
+    case ENCODE_RELAX (STATE_UNCOND_BRANCH, STATE_UNDEF):
+      /* Convert uncond branch jmp lab -> br lab.  */
+      cc = & msp430_rcodes[7];
+      where = fragP->fr_literal + fragP->fr_fix;
+      bfd_putl16 (cc->lop0, where);
+      rela = BFD_RELOC_MSP430_RL_PCREL;
+      fragP->fr_fix += 2;
+      break;
+
+    case ENCODE_RELAX (STATE_SIMPLE_BRANCH, STATE_WORD):
+    case ENCODE_RELAX (STATE_SIMPLE_BRANCH, STATE_UNDEF):
+      {
+	/* Other simple branches.  */
+	int insn = bfd_getl16 (fragP->fr_opcode);
+
+	insn &= 0xffff;
+	/* Find actual instruction.  */
+	for (i = 0; i < 7 && !cc; i++)
+	  if (msp430_rcodes[i].sop == insn)
+	    cc = & msp430_rcodes[i];
+	if (!cc || !cc->name)
+	  as_fatal (_("internal inconsistency problem in %s: insn %04lx"),
+		    __FUNCTION__, (long) insn);
+	where = fragP->fr_literal + fragP->fr_fix;
+	bfd_putl16 (cc->lop0, where);
+	bfd_putl16 (cc->lop1, where + 2);
+	rela = BFD_RELOC_MSP430_RL_PCREL;
+	fragP->fr_fix += 4;
+      }
+      break;
+
+    case ENCODE_RELAX (STATE_NOOV_BRANCH, STATE_WORD):
+    case ENCODE_RELAX (STATE_NOOV_BRANCH, STATE_UNDEF):
+      cc = & msp430_rcodes[6];
+      where = fragP->fr_literal + fragP->fr_fix;
+      bfd_putl16 (cc->lop0, where);
+      bfd_putl16 (cc->lop1, where + 2);
+      bfd_putl16 (cc->lop2, where + 4);
+      rela = BFD_RELOC_MSP430_RL_PCREL;
+      fragP->fr_fix += 6;
+      break;
+
+    case ENCODE_RELAX (STATE_EMUL_BRANCH, STATE_BITS10):
+      {
+	int insn = bfd_getl16 (fragP->fr_opcode + 2);
+
+	insn &= 0xffff;
+	for (i = 0; i < 4 && !hc; i++)
+	  if (msp430_hcodes[i].op1 == insn)
+	    hc = &msp430_hcodes[i];
+	if (!hc || !hc->name)
+	  as_fatal (_("internal inconsistency problem in %s: ext. insn %04lx"),
+	      __FUNCTION__, (long) insn);
+	rela = BFD_RELOC_MSP430_10_PCREL;
+	/* Apply a fix for a first label if necessary.
+	   another fix will be applied to the next word of insn anyway.  */
+	if (hc->tlab == 2)
+	  fix_new (fragP, fragP->fr_fix, 2, fragP->fr_symbol,
+	      fragP->fr_offset, TRUE, rela);
+	fragP->fr_fix += 2;
+      }
+
+      break;
+
+    case ENCODE_RELAX (STATE_EMUL_BRANCH, STATE_WORD):
+    case ENCODE_RELAX (STATE_EMUL_BRANCH, STATE_UNDEF):
+      {
+	int insn = bfd_getl16 (fragP->fr_opcode + 2);
+
+	insn &= 0xffff;
+	for (i = 0; i < 4 && !hc; i++)
+	  if (msp430_hcodes[i].op1 == insn)
+	    hc = & msp430_hcodes[i];
+	if (!hc || !hc->name)
+	  as_fatal (_("internal inconsistency problem in %s: ext. insn %04lx"),
+	      __FUNCTION__, (long) insn);
+	rela = BFD_RELOC_MSP430_RL_PCREL;
+	where = fragP->fr_literal + fragP->fr_fix;
+	bfd_putl16 (hc->lop0, where);
+	bfd_putl16 (hc->lop1, where + 2);
+	bfd_putl16 (hc->lop2, where + 4);
+	fragP->fr_fix += 6;
+      }
+      break;
+
+    default:
+      as_fatal (_("internal inconsistency problem in %s:  %lx"),
+		__FUNCTION__, (long) fragP->fr_subtype);
+      break;
+    }
+
+  /* Now apply fix.  */
+  fix_new (fragP, fragP->fr_fix, 2, fragP->fr_symbol,
+	   fragP->fr_offset, TRUE, rela);
+  /* Just fixed 2 bytes.  */
+  fragP->fr_fix += 2;
 }
 
+/* Relax fragment. Mostly stolen from hc11 and mcore
+   which arches I think I know.  */
 
-int
-md_estimate_size_before_relax (fragp, seg)
-     fragS *fragp ATTRIBUTE_UNUSED;
-     asection *seg ATTRIBUTE_UNUSED;
+long
+msp430_relax_frag (segT seg ATTRIBUTE_UNUSED, fragS * fragP,
+		   long stretch ATTRIBUTE_UNUSED)
 {
-  abort ();
-  return 0;
+  long growth;
+  offsetT aim = 0;
+  symbolS *symbolP;
+  const relax_typeS *this_type;
+  const relax_typeS *start_type;
+  relax_substateT next_state;
+  relax_substateT this_state;
+  const relax_typeS *table = md_relax_table;
+
+  /* Nothing to be done if the frag has already max size.  */
+  if (RELAX_STATE (fragP->fr_subtype) == STATE_UNDEF
+      || RELAX_STATE (fragP->fr_subtype) == STATE_WORD)
+    return 0;
+
+  if (RELAX_STATE (fragP->fr_subtype) == STATE_BITS10)
+    {
+      symbolP = fragP->fr_symbol;
+      if (symbol_resolved_p (symbolP))
+	as_fatal (_("internal inconsistency problem in %s: resolved symbol"),
+		  __FUNCTION__);
+      /* We know the offset. calculate a distance.  */
+      aim = S_GET_VALUE (symbolP) - fragP->fr_address - fragP->fr_fix;
+    }
+
+  this_state = fragP->fr_subtype;
+  start_type = this_type = table + this_state;
+
+  if (aim < 0)
+    {
+      /* Look backwards.  */
+      for (next_state = this_type->rlx_more; next_state;)
+	if (aim >= this_type->rlx_backward)
+	  next_state = 0;
+	else
+	  {
+	    /* Grow to next state.  */
+	    this_state = next_state;
+	    this_type = table + this_state;
+	    next_state = this_type->rlx_more;
+	  }
+    }
+  else
+    {
+      /* Look forwards.  */
+      for (next_state = this_type->rlx_more; next_state;)
+	if (aim <= this_type->rlx_forward)
+	  next_state = 0;
+	else
+	  {
+	    /* Grow to next state.  */
+	    this_state = next_state;
+	    this_type = table + this_state;
+	    next_state = this_type->rlx_more;
+	  }
+    }
+
+  growth = this_type->rlx_length - start_type->rlx_length;
+  if (growth != 0)
+    fragP->fr_subtype = this_state;
+  return growth;
 }
diff --git a/gas/config/tc-msp430.h b/gas/config/tc-msp430.h
index e540124..c86e230 100644
--- a/gas/config/tc-msp430.h
+++ b/gas/config/tc-msp430.h
@@ -1,5 +1,5 @@
 /* This file is tc-msp430.h
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
    Contributed by Dmitry Diky <diwil@mail.ru>
 
@@ -93,7 +93,7 @@
      of a PC relative instruction is the next instruction, so this
      macro would return the length of an instruction.  */
 
-extern long md_pcrel_from_section PARAMS ((struct fix *, segT));
+extern long md_pcrel_from_section (struct fix *, segT);
 
 #define LISTING_WORD_SIZE 2
 /*   The number of bytes to put into a word in a listing.  This affects
@@ -112,3 +112,7 @@ extern long md_pcrel_from_section PARAMS ((struct fix *, segT));
      should do nothing.  Some targets define a `.bss' directive that is
      also affected by this macro.  The default definition will set
      P2VAR to the truncated power of two of sizes up to eight bytes.  */
+
+#define md_relax_frag(SEG, FRAGP, STRETCH)             \
+   msp430_relax_frag (SEG, FRAGP, STRETCH)
+extern long msp430_relax_frag (segT, fragS *, long);