diff options
| -rw-r--r-- | opcodes/ChangeLog | 5 | ||||
| -rw-r--r-- | opcodes/mep-asm.c | 2 | ||||
| -rw-r--r-- | opcodes/mep-opc.c | 6 |
3 files changed, 9 insertions, 4 deletions
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 045f0fd..1c6af47 100644 --- 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 1603872..4f92cbd 100644 --- 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 6aa36a5..7bf92b6 100644 --- 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: |