diff options
| -rw-r--r-- | gas/config/tc-i386.c | 19 | ||||
| -rw-r--r-- | opcodes/i386-gen.c | 11 |
2 files changed, 26 insertions, 4 deletions
diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c index 172b051..f4feca0 100644 --- a/gas/config/tc-i386.c +++ b/gas/config/tc-i386.c @@ -1702,21 +1702,34 @@ static i386_cpu_flags cpu_flags_from_attr (i386_cpu_attr a) const unsigned int bps = sizeof (a.array[0]) * CHAR_BIT; i386_cpu_flags f = { .array[0] = 0 }; - switch (ARRAY_SIZE(a.array)) + switch (ARRAY_SIZE (a.array)) { case 1: f.array[CpuAttrEnums / bps] - |= (a.array[0] >> CpuIsaBits) << (CpuAttrEnums % bps); - if (CpuAttrEnums % bps > CpuIsaBits) +#ifndef WORDS_BIGENDIAN + |= (a.array[0] >> CpuIsaBits) << (CpuAttrEnums % bps); +#else + |= (a.array[0] << CpuIsaBits) >> (CpuAttrEnums % bps); +#endif + if (CpuMax / bps > CpuAttrEnums / bps) f.array[CpuAttrEnums / bps + 1] +#ifndef WORDS_BIGENDIAN = (a.array[0] >> CpuIsaBits) >> (bps - CpuAttrEnums % bps); +#else + = (a.array[0] << CpuIsaBits) << (bps - CpuAttrEnums % bps); +#endif break; + default: abort (); } if (a.bitfield.isa) +#ifndef WORDS_BIGENDIAN f.array[(a.bitfield.isa - 1) / bps] |= 1u << ((a.bitfield.isa - 1) % bps); +#else + f.array[(a.bitfield.isa - 1) / bps] |= 1u << (~(a.bitfield.isa - 1) % bps); +#endif return f; } diff --git a/opcodes/i386-gen.c b/opcodes/i386-gen.c index 09b0ccc..a54635e 100644 --- a/opcodes/i386-gen.c +++ b/opcodes/i386-gen.c @@ -856,7 +856,16 @@ output_cpu_flags (FILE *table, bitfield *flags, unsigned int size, active_cpu_flags.array[i / 32] |= 1U << (i % 32); } - fprintf (table, "%d } }%s\n", flags[i].value, comma); +#if defined(CpuAttrUnused) != defined(CpuUnused) + if (mode <= 0) +# ifdef CpuUnused + fprintf (table, " } }%s\n", comma); +# else + fprintf (table, "%d, 0 } }%s\n", flags[i].value, comma); +# endif + else +#endif + fprintf (table, "%d } }%s\n", flags[i].value, comma); } static void |