From cdc2256b769c1183177bf92cb22c34311ce8e6de Mon Sep 17 00:00:00 2001 From: Nathan Sidwell Date: Tue, 28 Mar 2006 07:19:16 +0000 Subject: [PATCH] gas: * config/tc-m68k.c (m68000_control_regs, m68010_control_regs, m68020_control_regs, m68040_control_regs, m68060_control_regs, mcf_control_regs, mcf5208_control_regs, mcf5213_control_regs, mcf5329_control_regs, mcf5249_control_regs, mcf528x_control_regs, mcfv4e_control_regs, m68010_control_regs): Rename and reorder to ... (m68000_ctrl, m68010_ctrl, m68020_ctrl, m68040_ctrl, m68060_ctrl, mcf_ctrl, mcf5208_ctrl, mcf5213_ctrl, mcf5235_ctrl, mcf5249_ctrl, mcf5216_ctrl, mcf5250_ctrl, mcf5271_ctrl, mcf5272_ctrl, mcf5282_ctrl, mcfv4e_ctrl): ... these. (mcf5275_ctrl, mcf5329_ctrl, mcf5373_ctrl): New. (struct m68k_cpu): Change chip field to control_regs. (current_chip): Remove. (control_regs): New. (m68k_archs, m68k_extensions): Adjust. (m68k_cpus): Reorder to be in cpu number order. Adjust. (CPU_ALLOW_MC, CPU_ALLOW_NEGATION): Remove. (find_cf_chip): Reimplement for new organization of cpu table. (select_control_regs): Remove. (mri_chip): Adjust. (struct save_opts): Save control regs, not chip. (s_save, s_restore): Adjust. (m68k_lookup_cpu): Give deprecated warning when necessary. (m68k_init_arch): Adjust. (md_show_usage): Adjust for new cpu table organization. include/opcodes: * m68k.h (cpu_m68k, cpu_cf, cpu_m68000, cpu_m68008, cpu_m68010, cpu_m68020, cpu_m68ec030, cpu_m68040, cpu_m68060, cpu_m68851, cpu_m68881, cpu_m68882, cpu_cpu32, cpu_cf5200, cpu_cf5206e, cpu_cf5208, cpu_cf521x, cpu_cf5213, cpu_cf5249, cpu_cf528x, cpu_cf5307, cpu_cf5329, cpu_cf5407, cpu_cf547x, cpu_cf548x): Remove. --- include/opcode/ChangeLog | 8 ++++++++ include/opcode/m68k.h | 38 -------------------------------------- 2 files changed, 8 insertions(+), 38 deletions(-) diff --git a/include/opcode/ChangeLog b/include/opcode/ChangeLog index 158c55ce9..90bf23faf 100644 --- a/include/opcode/ChangeLog +++ b/include/opcode/ChangeLog @@ -1,3 +1,11 @@ +2006-03-28 Nathan Sidwell + + * m68k.h (cpu_m68k, cpu_cf, cpu_m68000, cpu_m68008, cpu_m68010, + cpu_m68020, cpu_m68ec030, cpu_m68040, cpu_m68060, cpu_m68851, + cpu_m68881, cpu_m68882, cpu_cpu32, cpu_cf5200, cpu_cf5206e, + cpu_cf5208, cpu_cf521x, cpu_cf5213, cpu_cf5249, cpu_cf528x, + cpu_cf5307, cpu_cf5329, cpu_cf5407, cpu_cf547x, cpu_cf548x): Remove. + 2006-03-10 Paul Brook * arm.h (ARM_AEXT_V7_ARM): Include v6ZK extensions. diff --git a/include/opcode/m68k.h b/include/opcode/m68k.h index 0d21658e9..d137d9d62 100644 --- a/include/opcode/m68k.h +++ b/include/opcode/m68k.h @@ -53,44 +53,6 @@ #define mfloat (m68881 | m68040 | m68060) #define mmmu (m68851 | m68030 | m68040 | m68060) -/* CPU numbering. There are too many of these to use a bit vector. - These are a one-of-many selection. Choose a numbering scheme that - simply maps onto manufacturer's part numbers. */ - -/* All m68k cpus */ -#define cpu_m68k 0 -/* All coldfire cpus */ -#define cpu_cf 1000000 - -#define cpu_m68000 (cpu_m68k + 68000) -#define cpu_m68008 cpu_m68000 /* Synonym for -m68000. otherwise unused. */ -#define cpu_m68010 (cpu_m68k + 68010) -#define cpu_m68020 (cpu_m68k + 68020) -#define cpu_m68030 (cpu_m68k + 68030) -#define cpu_m68ec030 cpu_m68030 /* Similar enough to -m68030 to ignore - differences; gas will deal with the few - differences. */ -#define cpu_m68040 (cpu_m68k + 68040) -/* There is no 68050. */ -#define cpu_m68060 (cpu_m68k + 68060) -#define cpu_m68851 (cpu_m68k + 68851) -#define cpu_m68881 (cpu_m68k + 68881) -#define cpu_m68882 cpu_m68881 /* Synonym for -m68881. otherwise unused. */ -#define cpu_cpu32 (cpu_m68k + 32) - -#define cpu_cf5200 (cpu_cf + 5200) -#define cpu_cf5206e (cpu_cf + 5206) -#define cpu_cf5208 (cpu_cf + 5208) -#define cpu_cf521x (cpu_cf + 5210) -#define cpu_cf5213 (cpu_cf + 5213) -#define cpu_cf5249 (cpu_cf + 5249) -#define cpu_cf528x (cpu_cf + 5280) -#define cpu_cf5307 (cpu_cf + 5307) -#define cpu_cf5329 (cpu_cf + 5329) -#define cpu_cf5407 (cpu_cf + 5407) -#define cpu_cf547x (cpu_cf + 5470) -#define cpu_cf548x (cpu_cf + 5480) - /* The structure used to hold information for an opcode. */ struct m68k_opcode