* aoutx.h (NAME): Add case statements for bfd_mach_mips14000,

	bfd_mach_mips16000.
	* archures.c (bfd_architecture): Add .#defines for bfd_mach_mips14000,
	bfd_mach_mips16000.
	* bfd-in2.h: Regenerate.
	* cpu-mips.c: Add enums I_mips14000, I_mips16000.
	(arch_info_struct): Add refs to R14000, R16000.
	* elfxx-mips.c (mips_set_isa_flags): Handle bfd_mach_mips14000,
	bfd_mach_mips16000.
	(mips_mach_extensions): Map R14000, R16000 to R10000.

	* config/tc-mips.c (hilo_interlocks): Handle CPU_R14000, CPU_R16000.
	(mips_cpu_info_table): Add r14000, r16000.
	* doc/c-mips.texi: Add entries for 14000, 16000.

	* mips-dis.c (mips_arch_choices): Add r14000, r16000.

	* mips.h: Define CPU_R14000, CPU_R16000.
        (OPCODE_IS_MEMBER): Include R14000, R16000 in test.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 1e4fe71eca89ba4b291ebe367218161780218e4f..4f54f36e2d869bd490ea3ed20b1c69f59b16826c 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,16 @@
+2008-11-28  Joshua Kinard  <kumba@gentoo.org>
+
+       * aoutx.h (NAME): Add case statements for bfd_mach_mips14000,
+       bfd_mach_mips16000.
+       * archures.c (bfd_architecture): Add .#defines for bfd_mach_mips14000,
+       bfd_mach_mips16000.
+       * bfd-in2.h: Regenerate.
+       * cpu-mips.c: Add enums I_mips14000, I_mips16000.
+       (arch_info_struct): Add refs to R14000, R16000.
+       * elfxx-mips.c (mips_set_isa_flags): Handle bfd_mach_mips14000,
+       bfd_mach_mips16000.
+       (mips_mach_extensions): Map R14000, R16000 to R10000.
+
 2008-11-27   M R Swami Reddy <MR.Swami.Reddy@nsc.com>
 
        * Add PIC support for CR16 target.

diff --git a/bfd/aoutx.h b/bfd/aoutx.h
index b469b77c6263e38cb336541c8d31e43c16ca9b9a..e808716d6404f8573a7c6002320dffe201782b1c 100644 (file)
--- a/bfd/aoutx.h
+++ b/bfd/aoutx.h
@@ -786,6 +786,8 @@ NAME (aout, machine_type) (enum bfd_architecture arch,
        case bfd_mach_mips9000:
        case bfd_mach_mips10000:
        case bfd_mach_mips12000:
+       case bfd_mach_mips14000:
+       case bfd_mach_mips16000:
        case bfd_mach_mips16:
        case bfd_mach_mipsisa32:
        case bfd_mach_mipsisa32r2:

diff --git a/bfd/archures.c b/bfd/archures.c
index aa494999120b03bb1d718f5dc3f236dd858e1986..1156e094623c39daa04e203f2f6540dfddfedbe8 100644 (file)
--- a/bfd/archures.c
+++ b/bfd/archures.c
@@ -167,6 +167,8 @@ DESCRIPTION
 .#define bfd_mach_mips9000             9000
 .#define bfd_mach_mips10000            10000
 .#define bfd_mach_mips12000            12000
+.#define bfd_mach_mips14000            14000
+.#define bfd_mach_mips16000            16000
 .#define bfd_mach_mips16               16
 .#define bfd_mach_mips5                 5
 .#define bfd_mach_mips_loongson_2e      3001

diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index 226bbf07eb2294858022e066e46ba9259339f5f9..917b8bc205c0e2cc87fdfd141fd60c13647dfca2 100644 (file)
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -1793,6 +1793,8 @@ enum bfd_architecture
 #define bfd_mach_mips9000              9000
 #define bfd_mach_mips10000             10000
 #define bfd_mach_mips12000             12000
+#define bfd_mach_mips14000             14000
+#define bfd_mach_mips16000             16000
 #define bfd_mach_mips16                16
 #define bfd_mach_mips5                 5
 #define bfd_mach_mips_loongson_2e      3001

diff --git a/bfd/cpu-mips.c b/bfd/cpu-mips.c
index 07f966b88dae2ea0584678ffe904a953cb448e38..1102467a57641f3ba89967e7d07b605ff76cc980 100644 (file)
--- a/bfd/cpu-mips.c
+++ b/bfd/cpu-mips.c
@@ -80,6 +80,8 @@ enum
   I_mips9000,
   I_mips10000,
   I_mips12000,
+  I_mips14000,
+  I_mips16000,
   I_mips16,
   I_mips5,
   I_mipsisa32,
@@ -116,6 +118,8 @@ static const bfd_arch_info_type arch_info_struct[] =
   N (64, 64, bfd_mach_mips9000, "mips:9000",      FALSE, NN(I_mips9000)),
   N (64, 64, bfd_mach_mips10000,"mips:10000",     FALSE, NN(I_mips10000)),
   N (64, 64, bfd_mach_mips12000,"mips:12000",     FALSE, NN(I_mips12000)),
+  N (64, 64, bfd_mach_mips14000,"mips:14000",     FALSE, NN(I_mips14000)),
+  N (64, 64, bfd_mach_mips16000,"mips:16000",     FALSE, NN(I_mips16000)),
   N (64, 64, bfd_mach_mips16,   "mips:16",        FALSE, NN(I_mips16)),
   N (64, 64, bfd_mach_mips5,    "mips:mips5",     FALSE, NN(I_mips5)),
   N (32, 32, bfd_mach_mipsisa32,  "mips:isa32",   FALSE, NN(I_mipsisa32)),

diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c
index b49593b42866908af70e129d189091826c626589..24dcd4b4c822818c9af4e9e1bc56f2b7ea88d4ce 100644 (file)
--- a/bfd/elfxx-mips.c
+++ b/bfd/elfxx-mips.c
@@ -10400,6 +10400,8 @@ mips_set_isa_flags (bfd *abfd)
     case bfd_mach_mips8000:
     case bfd_mach_mips10000:
     case bfd_mach_mips12000:
+    case bfd_mach_mips14000:
+    case bfd_mach_mips16000:
       val = E_MIPS_ARCH_4;
       break;
 
@@ -12124,6 +12126,8 @@ static const struct mips_mach_extension mips_mach_extensions[] = {
 
   /* R10000 extensions.  */
   { bfd_mach_mips12000, bfd_mach_mips10000 },
+  { bfd_mach_mips14000, bfd_mach_mips10000 },
+  { bfd_mach_mips16000, bfd_mach_mips10000 },
 
   /* R5000 extensions.  Note: the vr5500 ISA is an extension of the core
      vr5400 ISA, but doesn't include the multimedia stuff.  It seems

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 81daee010bb5693b08152e4a8129d2d349983075..a3b9384470720dfbdce7a2c98da1d58511189b7e 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2008-11-28  Joshua Kinard  <kumba@gentoo.org>
+
+       * config/tc-mips.c (hilo_interlocks): Handle CPU_R14000, CPU_R16000.
+       (mips_cpu_info_table): Add r14000, r16000.
+       * doc/c-mips.texi: Add entries for 14000, 16000.
+
 2008-11-27  M R Swami Reddy <MR.Swami.Reddy@nsc.com>
 
        * config/tc-cr16.h (GLOBAL_OFFSET_TABLE_NAME): Defined

diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index 17ee8d108645dd2a30e42a7f258815492539539f..c472509069f8b97b992af65439172fa74536034a 100644 (file)
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -472,6 +472,8 @@ static int mips_32bitmode = 0;
    || mips_opts.arch == CPU_R4010                     \
    || mips_opts.arch == CPU_R10000                    \
    || mips_opts.arch == CPU_R12000                    \
+   || mips_opts.arch == CPU_R14000                    \
+   || mips_opts.arch == CPU_R16000                    \
    || mips_opts.arch == CPU_RM7000                    \
    || mips_opts.arch == CPU_VR5500                    \
    )
@@ -15090,6 +15092,8 @@ static const struct mips_cpu_info mips_cpu_info_table[] =
   { "r8000",          0,                       ISA_MIPS4,      CPU_R8000 },
   { "r10000",         0,                       ISA_MIPS4,      CPU_R10000 },
   { "r12000",         0,                       ISA_MIPS4,      CPU_R12000 },
+  { "r14000",         0,                       ISA_MIPS4,      CPU_R14000 },
+  { "r16000",         0,                       ISA_MIPS4,      CPU_R16000 },
   { "vr5000",         0,                       ISA_MIPS4,      CPU_R5000 },
   { "vr5400",         0,                       ISA_MIPS4,      CPU_VR5400 },
   { "vr5500",         0,                       ISA_MIPS4,      CPU_VR5500 },

diff --git a/gas/doc/c-mips.texi b/gas/doc/c-mips.texi
index 136d2d22bff1a8d538c8134ef1c0ca6bc20db137..2acdbf3d4969f85e30e1f094cd8fd3e0041aec93 100644 (file)
--- a/gas/doc/c-mips.texi
+++ b/gas/doc/c-mips.texi
@@ -239,6 +239,8 @@ rm7000,
 rm9000,
 10000,
 12000,
+14000,
+16000,
 4kc,
 4km,
 4kp,

diff --git a/include/opcode/ChangeLog b/include/opcode/ChangeLog
index b64a8b6dd92c24d7b79422668339ba730bcfe258..bda9ca193bac966e6a40d07d54902ebc14cf4e0b 100644 (file)
--- a/include/opcode/ChangeLog
+++ b/include/opcode/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-28  Joshua Kinard  <kumba@gentoo.org>
+
+       * mips.h: Define CPU_R14000, CPU_R16000.
+        (OPCODE_IS_MEMBER): Include R14000, R16000 in test.
+
 2008-11-18  Catherine Moore  <clm@codesourcery.com>
 
        * arm.h (FPU_NEON_FP16): New.

diff --git a/include/opcode/mips.h b/include/opcode/mips.h
index 9af9ea15b691c68d9828c57de4948e1a8a9ee876..e7cfdb97908c4b593df1e1a36668904875c504f3 100644 (file)
--- a/include/opcode/mips.h
+++ b/include/opcode/mips.h
@@ -632,6 +632,8 @@ static const unsigned int mips_isa_table[] =
 #define CPU_RM9000     9000
 #define CPU_R10000     10000
 #define CPU_R12000     12000
+#define CPU_R14000     14000
+#define CPU_R16000     16000
 #define CPU_MIPS16     16
 #define CPU_MIPS32     32
 #define CPU_MIPS32R2   33
@@ -661,7 +663,8 @@ static const unsigned int mips_isa_table[] =
      || (cpu == CPU_R4010 && ((insn)->membership & INSN_4010) != 0)    \
      || (cpu == CPU_VR4100 && ((insn)->membership & INSN_4100) != 0)   \
      || (cpu == CPU_R3900 && ((insn)->membership & INSN_3900) != 0)    \
-     || ((cpu == CPU_R10000 || cpu == CPU_R12000)                      \
+     || ((cpu == CPU_R10000 || cpu == CPU_R12000 || cpu == CPU_R14000  \
+         || cpu == CPU_R16000)                                         \
         && ((insn)->membership & INSN_10000) != 0)                     \
      || (cpu == CPU_SB1 && ((insn)->membership & INSN_SB1) != 0)       \
      || (cpu == CPU_R4111 && ((insn)->membership & INSN_4111) != 0)    \

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index cb072c73d5e5203320fef0fb61f3135d0b86fbbd..dc62aa20927a8f7ceadc444e62ffe3c224146c2e 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,7 @@
+2008-11-28  Joshua Kinard  <kumba@gentoo.org>
+
+       * mips-dis.c (mips_arch_choices): Add r14000, r16000.
+
 2008-11-27  M R Swami Reddy <MR.Swami.Reddy@nsc.com>
 
        * cr16-dis.c (match_opcode): Truncate mcode to 32 bit and

diff --git a/opcodes/mips-dis.c b/opcodes/mips-dis.c
index 7c38589824807c8b9dd6035c3d24a1ba7ec22fa7..759e2aa66d7cf9e7386911b56c508b098f82d93d 100644 (file)
--- a/opcodes/mips-dis.c
+++ b/opcodes/mips-dis.c
@@ -409,6 +409,10 @@ const struct mips_arch_choice mips_arch_choices[] =
     mips_cp0_names_numeric, NULL, 0, mips_hwr_names_numeric },
   { "r12000",  1, bfd_mach_mips12000, CPU_R12000, ISA_MIPS4,
     mips_cp0_names_numeric, NULL, 0, mips_hwr_names_numeric },
+  { "r14000",  1, bfd_mach_mips14000, CPU_R14000, ISA_MIPS4,
+    mips_cp0_names_numeric, NULL, 0, mips_hwr_names_numeric },
+  { "r16000",  1, bfd_mach_mips16000, CPU_R16000, ISA_MIPS4,
+    mips_cp0_names_numeric, NULL, 0, mips_hwr_names_numeric },
   { "mips5",   1, bfd_mach_mips5, CPU_MIPS5, ISA_MIPS5,
     mips_cp0_names_numeric, NULL, 0, mips_hwr_names_numeric },