This is the mail archive of the
cgen@sourceware.org
mailing list for the CGEN project.
[patch] fix MeP CPU detection and defaults
- From: DJ Delorie <dj at redhat dot com>
- To: cgen at sourceware dot org
- Date: Tue, 19 May 2009 19:34:38 -0400
- Subject: [patch] fix MeP CPU detection and defaults
Committed.
2009-05-19 DJ Delorie <dj@redhat.com>
* cpu/mep.opc: Regenerate configuration.
(parse_cdisp10): Only check CPU flags, not COP flags.
(check_configured_mach): Likewise.
Index: cpu/mep.opc
===================================================================
RCS file: /cvs/src/src/cgen/cpu/mep.opc,v
retrieving revision 1.4
diff -p -U3 -r1.4 cpu/mep.opc
--- cpu/mep.opc 30 Apr 2009 21:07:57 -0000 1.4
+++ cpu/mep.opc 19 May 2009 23:32:53 -0000
@@ -516,7 +516,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
@@ -1527,8 +1527,8 @@ mep_insn_supported_by_isa (const CGEN_IN
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)
@@ -1553,7 +1553,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: