OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

arm.h (enum floating_point_type): Delete.

Browse Source 
* arm.h (enum floating_point_type): Delete.  Replace with...
(enum fputype): ... new.
(FPUTYPE_DEFAULT): Renamed from FP_DEFAULT.  Values reworked.
* linux-elf.h (FPUTYPE_DEFAULT): Likewise.
* arm.md (attr fpu): Reworked for new underlying enum values.
* arm.c	(arm_fpu_arch): Now enum fputype.
(arm_fpu_tune): Renamed from arm_fpu.  Now enum fputype.
(arm_override_options, arm_output_epilogue, arm_expand_prologue):
Update uses of arm_fpu_arch and arm_fpu_tune.

From-SVN: r64099
This commit is contained in:
Richard Earnshaw 2003-03-10 17:53:19 +00:00 committed by Richard Earnshaw
parent c94432c550
commit 29ad969430
5 changed files with 57 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gcc/ChangeLog
View File

@ -1,3 +1,15 @@
2003-03-10 Richard Earnshaw <rearnsha@arm.com>
* arm.h (enum floating_point_type): Delete. Replace with...
(enum fputype): ... new.
(FPUTYPE_DEFAULT): Renamed from FP_DEFAULT. Values reworked.
* linux-elf.h (FPUTYPE_DEFAULT): Likewise.
* arm.md (attr fpu): Reworked for new underlying enum values.
* arm.c (arm_fpu_arch): Now enum fputype.
(arm_fpu_tune): Renamed from arm_fpu. Now enum fputype.
(arm_override_options, arm_output_epilogue, arm_expand_prologue):
Update uses of arm_fpu_arch and arm_fpu_tune.
2003-03-10 Josef Zlomek <zlomekj@suse.cz>
* cfgcleanup.c (outgoing_edges_match): Compare the jump tables.

44
gcc/config/arm/arm.c
View File

@ -239,10 +239,10 @@ int making_const_table;
rtx arm_compare_op0, arm_compare_op1;
/* What type of floating point are we tuning for? */
enum floating_point_type arm_fpu;
enum fputype arm_fpu_tune;
/* What type of floating point instructions are available? */
enum floating_point_type arm_fpu_arch;
enum fputype arm_fpu_arch;
/* What program mode is the cpu running in? 26-bit mode or 32-bit mode. */
enum prog_mode_type arm_prgmode;
@ -726,7 +726,7 @@ arm_override_options ()
if (arm_is_cirrus)
{
arm_fpu = FP_CIRRUS;
arm_fpu_tune = FPUTYPE_MAVERICK;
/* Ignore -mhard-float if -mcpu=ep9312. */
if (TARGET_HARD_FLOAT)
@ -738,34 +738,34 @@ arm_override_options ()
assume the user has an FPA.
Note: this does not prevent use of floating point instructions,
-msoft-float does that. */
arm_fpu = (tune_flags & FL_CO_PROC) ? FP_HARD : FP_SOFT3;
arm_fpu_tune = (tune_flags & FL_CO_PROC) ? FPUTYPE_FPA : FPUTYPE_FPA_EMU3;
if (target_fp_name)
{
if (streq (target_fp_name, "2"))
arm_fpu_arch = FP_SOFT2;
arm_fpu_arch = FPUTYPE_FPA_EMU2;
else if (streq (target_fp_name, "3"))
arm_fpu_arch = FP_SOFT3;
arm_fpu_arch = FPUTYPE_FPA_EMU3;
else
error ("invalid floating point emulation option: -mfpe-%s",
target_fp_name);
}
else
arm_fpu_arch = FP_DEFAULT;
arm_fpu_arch = FPUTYPE_DEFAULT;
if (TARGET_FPE)
{
if (arm_fpu == FP_SOFT3)
arm_fpu = FP_SOFT2;
else if (arm_fpu == FP_CIRRUS)
warning ("-mpfpe switch not supported by ep9312 target cpu - ignored.");
else if (arm_fpu != FP_HARD)
arm_fpu = FP_SOFT2;
if (arm_fpu_tune == FPUTYPE_FPA_EMU3)
arm_fpu_tune = FPUTYPE_FPA_EMU2;
else if (arm_fpu_tune == FPUTYPE_MAVERICK)
warning ("-mfpe switch not supported by ep9312 target cpu - ignored.");
else if (arm_fpu_tune != FPUTYPE_FPA)
arm_fpu_tune = FPUTYPE_FPA_EMU2;
}
/* For arm2/3 there is no need to do any scheduling if there is only
a floating point emulator, or we are doing software floating-point. */
if ((TARGET_SOFT_FLOAT || arm_fpu != FP_HARD)
if ((TARGET_SOFT_FLOAT || arm_fpu_tune != FPUTYPE_FPA)
&& (tune_flags & FL_MODE32) == 0)
flag_schedule_insns = flag_schedule_insns_after_reload = 0;
@ -8452,7 +8452,7 @@ arm_output_epilogue (really_return)
{
int vfp_offset = 4;
if (arm_fpu_arch == FP_SOFT2)
if (arm_fpu_arch == FPUTYPE_FPA_EMU2)
{
for (reg = LAST_ARM_FP_REGNUM; reg >= FIRST_ARM_FP_REGNUM; reg--)
if (regs_ever_live[reg] && !call_used_regs[reg])
@ -8535,7 +8535,7 @@ arm_output_epilogue (really_return)
output_add_immediate (operands);
}
if (arm_fpu_arch == FP_SOFT2)
if (arm_fpu_arch == FPUTYPE_FPA_EMU2)
{
for (reg = FIRST_ARM_FP_REGNUM; reg <= LAST_ARM_FP_REGNUM; reg++)
if (regs_ever_live[reg] && !call_used_regs[reg])
@ -9294,10 +9294,11 @@ arm_expand_prologue ()
if (! IS_VOLATILE (func_type))
{
/* Save any floating point call-saved registers used by this function. */
if (arm_fpu_arch == FP_SOFT2)
/* Save any floating point call-saved registers used by this
function. */
if (arm_fpu_arch == FPUTYPE_FPA_EMU2)
{
for (reg = LAST_ARM_FP_REGNUM; reg >= FIRST_ARM_FP_REGNUM; reg --)
for (reg = LAST_ARM_FP_REGNUM; reg >= FIRST_ARM_FP_REGNUM; reg--)
if (regs_ever_live[reg] && !call_used_regs[reg])
{
insn = gen_rtx_PRE_DEC (XFmode, stack_pointer_rtx);
@ -9311,7 +9312,7 @@ arm_expand_prologue ()
{
int start_reg = LAST_ARM_FP_REGNUM;
for (reg = LAST_ARM_FP_REGNUM; reg >= FIRST_ARM_FP_REGNUM; reg --)
for (reg = LAST_ARM_FP_REGNUM; reg >= FIRST_ARM_FP_REGNUM; reg--)
{
if (regs_ever_live[reg] && !call_used_regs[reg])
{
@ -9356,7 +9357,8 @@ arm_expand_prologue ()
insn = gen_rtx_REG (SImode, 3);
else /* if (current_function_pretend_args_size == 0) */
{
insn = gen_rtx_PLUS (SImode, hard_frame_pointer_rtx, GEN_INT (4));
insn = gen_rtx_PLUS (SImode, hard_frame_pointer_rtx,
GEN_INT (4));
insn = gen_rtx_MEM (SImode, insn);
}

30
gcc/config/arm/arm.h
View File

@ -550,32 +550,38 @@ extern enum prog_mode_type arm_prgmode;
/* What sort of floating point unit do we have? Hardware or software.
If software, is it issue 2 or issue 3? */
enum floating_point_type
enum fputype
{
FP_HARD,
FP_SOFT2,
FP_SOFT3,
FP_CIRRUS
/* Software floating point, FPA style double fmt. */
FPUTYPE_SOFT_FPA,
/* Full FPA support. */
FPUTYPE_FPA,
/* Emulated FPA hardware, Issue 2 emulator (no LFM/SFM). */
FPUTYPE_FPA_EMU2,
/* Emulated FPA hardware, Issue 3 emulator. */
FPUTYPE_FPA_EMU3,
/* Cirrus Maverick floating point co-processor. */
FPUTYPE_MAVERICK
};
/* Recast the floating point class to be the floating point attribute. */
#define arm_fpu_attr ((enum attr_fpu) arm_fpu)
#define arm_fpu_attr ((enum attr_fpu) arm_fpu_tune)
/* What type of floating point to tune for */
extern enum floating_point_type arm_fpu;
extern enum fputype arm_fpu_tune;
/* What type of floating point instructions are available */
extern enum floating_point_type arm_fpu_arch;
extern enum fputype arm_fpu_arch;
/* Default floating point architecture. Override in sub-target if
necessary. */
#ifndef FP_DEFAULT
#define FP_DEFAULT FP_SOFT2
#ifndef FPUTYPE_DEFAULT
#define FPUTYPE_DEFAULT FPUTYPE_FPA_EMU2
#endif
#if TARGET_CPU_DEFAULT == TARGET_CPU_ep9312
#undef FP_DEFAULT
#define FP_DEFAULT FP_CIRRUS
#undef FPUTYPE_DEFAULT
#define FPUTYPE_DEFAULT FPUTYPE_MAVERICK
#endif
/* Nonzero if the processor has a fast multiply insn, and one that does

3
gcc/config/arm/arm.md
View File

@ -116,7 +116,8 @@
; Floating Point Unit. If we only have floating point emulation, then there
; is no point in scheduling the floating point insns. (Well, for best
; performance we should try and group them together).
(define_attr "fpu" "fpa,fpe2,fpe3" (const (symbol_ref "arm_fpu_attr")))
(define_attr "fpu" "softfpa,fpa,fpe2,fpe3,maverick"
(const (symbol_ref "arm_fpu_attr")))
; LENGTH of an instruction (in bytes)
(define_attr "length" "" (const_int 4))

4
gcc/config/arm/linux-elf.h
View File

@ -111,8 +111,8 @@
while (0)
/* NWFPE always understands FPA instructions. */
#undef FP_DEFAULT
#define FP_DEFAULT FP_SOFT3
#undef FPUTYPE_DEFAULT
#define FPUTYPE_DEFAULT FPUTYPE_FPA_EMU3
/* Call the function profiler with a given profile label. */
#undef ARM_FUNCTION_PROFILER