* mep-asm.c: Regenerate.

* mep-opc.c: Regenerate.

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 045f0fd5c4d8088e5a52cad921dd3f60e20da559..1c6af47cd4daf3d72968173b8c1dff7458247b0b 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-19  DJ Delorie  <dj@redhat.com>
+
+       * mep-asm.c: Regenerate.
+       * mep-opc.c: Regenerate.
+
 2009-04-30  DJ Delorie  <dj@redhat.com>
 
        * mep-asm.c: Regenerate.

diff --git a/opcodes/mep-asm.c b/opcodes/mep-asm.c
index 1603872f210f573ce110155c78d661e259e29b2c..4f92cbdcd61a373b211eec4ce521a2ca4dd178e2 100644 (file)
--- a/opcodes/mep-asm.c
+++ b/opcodes/mep-asm.c
@@ -489,7 +489,7 @@ parse_cdisp10 (CGEN_CPU_DESC cd,
       break;
     }
 
-  if (MEP_CPU == EF_MEP_CPU_C5)
+  if ((MEP_CPU & EF_MEP_CPU_MASK) == EF_MEP_CPU_C5)
     wide = 1;
 
   if (strncmp (*strp, "0x0", 3) == 0 

diff --git a/opcodes/mep-opc.c b/opcodes/mep-opc.c
index 6aa36a50d8a16df7545fd70f95bdbb02bb362f95..7bf92b62fab110d116704890e2cb3a45a8c565b0 100644 (file)
--- a/opcodes/mep-opc.c
+++ b/opcodes/mep-opc.c
@@ -91,8 +91,8 @@ mep_insn_supported_by_isa (const CGEN_INSN *insn, CGEN_ATTR_VALUE_BITSET_TYPE *i
 mep_config_map_struct mep_config_map[] =
 {
   /* config-map-start */
-  /* Default entry: mep core only, all options enabled. */
-  { "", 0, EF_MEP_CPU_C5, 1, 0, {1,"\x0"}, {1,"\x0"}, {1,"\x0"}, {1,"\x0"}, {1,"\x0"}, {1,"\x80"}, OPTION_MASK },
+  /* Default entry: first module, with all options enabled. */
+  { "", 0,  EF_MEP_COP_IVC2 | EF_MEP_CPU_C5,1, 0, { 1, "\x20" }, { 1, "\x10" }, { 1, "\x8" }, { 1, "\x4" }, { 1, "\x3c" }, { 1, "\xc0" }, OPTION_MASK | (1 << CGEN_INSN_OPTIONAL_DSP_INSN) | (1 << CGEN_INSN_OPTIONAL_UCI_INSN) },
   { "default", CONFIG_DEFAULT, EF_MEP_COP_IVC2 | EF_MEP_CPU_C5, 0, 64, { 1, "\x20" }, { 1, "\x10" }, { 1, "\x8" }, { 1, "\x4" }, { 1, "\x3c" }, { 1, "\xc0" },
          0
        | (1 << CGEN_INSN_OPTIONAL_CP_INSN)
@@ -117,7 +117,7 @@ check_configured_mach (int machs)
 {
   /* All base insns are supported.  */
   int mach = 1 << MACH_BASE;
-  switch (MEP_CPU)
+  switch (MEP_CPU & EF_MEP_CPU_MASK)
     {
     case EF_MEP_CPU_C2:
     case EF_MEP_CPU_C3: