From 2b7992f5adbd37402b78d2d8dc07480c73780e28 Mon Sep 17 00:00:00 2001
From: Nathan Sidwell <nathan@codesourcery.com>
Date: Tue, 8 Nov 2005 11:15:12 +0000
Subject: [PATCH] bfd: 	Add ms2. 	* archures.c (bfd_mach_ms2): Define. 
 * cpu-ms1.c (arch_info_struct): Add ms2 stanza. 	* elf32-ms1.c
 (elf32_ms1_machine): Add ms2 case. 	(ms1_elf_merge_private_bfd_data):
 Remove unused variables.  Add 	correct merging logic, with workaround. 
 (ms1_elf_print_private_bfd_data): Add ms2 case. 	* reloc.c
 (BFD_RELOC_MS1_PCINSN8): Add ms2 specific reloc. 	* libbfd.h:
 Regenerated. 	* bfd-in2.h: Regenerated.

cpu:
	Add ms2
	* ms1.cpu (ms2, ms2bf): New architecture variant, cpu, machine and
	model.
	(f-uu8, f-uu1, f-imm16l, f-loopo, f-cb1sel, f-cb2sel, f-cb1incr,
	f-cb2incr, f-rc3): New fields.
	(LOOP): New instruction.
	(JAL-HAZARD): New hazard.
	(imm16o, loopsize, imm16l, rc3, cb1sel, cb2sel, cb1incr, cb2incr):
	New operands.
	(mul, muli, dbnz, iflush): Enable for ms2
	(jal, reti): Has JAL-HAZARD.
	(ldctxt, ldfb, stfb): Only ms1.
	(fbcb): Only ms1,ms1-003.
	(wfbinc, mefbinc, wfbincr, mwfbincr, fbcbincs, mfbcbincs,
	fbcbincrs, mfbcbincrs): Enable for ms2.
	(loop, loopu, dfbc, dwfb, fbwfb, dfbr): New ms2 insns.
	* ms1.opc (parse_loopsize): New.
	(parse_imm16): hi16/lo16 relocs are applicable to IMM16L.
	(print_pcrel): New.

gas:
	Add ms2.
	* config/tc-ms1.c (ms1_mach_bitmask): Initialize to MS1.
	(ms1_architectures): Add ms2.
	(md_parse_option): Add ms2.
	(md_show_usage): Add ms2.
	(md_assemble): Add JAL_HAZARD detection logic.
	(md_cgen_lookup_reloc): Add MS1_OPERAND_LOOPSIZE case.
	* doc/c-ms1.texi: New.
	* doc/all.texi: Add MS1.
	* doc/Makefile.am (CPU_DOCS): Add c-ms1.texi.
	* doc/Makefile.in: Rebuilt.
	* doc/Makefile: Rebuilt.

gas/testsuite:
	Add ms2.
	* gas/ms1/allinsn.d: Adjust pcrel disassembly.
	* gas/ms1/errors.exp: Fix target triplet.
	* gas/ms1/ms1-16-003.d: Adjust pcrel disassembly.
	* gas/ms1/ms1-16-003.s: Tweak label.
	* gas/ms1/ms1.exp: Adjust target triplet.  Add ms2 test.
	* gas/ms1/ms2.d, gas/ms1/ms2.s: New.
	* gas/ms1/relocs.d: Adjust expected machine name and pcrel
	disassembly.
	* gas/ms1/relocs.exp: Adjust target triplet.

include:
	Add ms2.
	* elf/ms1.h (EF_MS1_CPU_MS2): New.


opcodes:
	Add ms2.
	* ms1-asm.c, ms1-desc.c, ms1-desc.h, ms1-dis.c, ms1-ibld.c,
	ms1-opc.c, ms1-opc.h: Regenerated.
---
 include/ChangeLog | 5 +++++
 include/elf/ms1.h | 1 +
 2 files changed, 6 insertions(+)

diff --git a/include/ChangeLog b/include/ChangeLog
index 2b6103889..3b2f3efd8 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-07  Nathan Sidwell  <nathan@codesourcery.com>
+
+	Add ms2.
+	* elf/ms1.h (EF_MS1_CPU_MS2): New.
+
 2005-11-06  John David Anglin  <dave.anglin@nrc-crnc.gc.ca>
 
 	* elf/hppa.h (R_PARISC_DIR64WR, R_PARISC_DIR64DR): Remove relocs.
diff --git a/include/elf/ms1.h b/include/elf/ms1.h
index 747dc898d..1cb7ad6ee 100644
--- a/include/elf/ms1.h
+++ b/include/elf/ms1.h
@@ -35,6 +35,7 @@ END_RELOC_NUMBERS(R_MS1_max)
 
 #define EF_MS1_CPU_MRISC	0x00000001	/* default */
 #define EF_MS1_CPU_MRISC2	0x00000002	/* MRISC2 */
+#define EF_MS1_CPU_MS2		0x00000003      /* MS2 */
 #define EF_MS1_CPU_MASK		0x00000003	/* specific cpu bits */
 #define EF_MS1_ALL_FLAGS	(EF_MS1_CPU_MASK)