From 42d085c1aa40b639b424f2b379eb4e464e3d86c8 Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Tue, 22 Mar 2011 16:08:16 -0700 Subject: [PATCH] Avoid !TARGET_ABI_OPEN_VMS in favor of a positive test for TARGET_ABI_OSF. From-SVN: r171331 --- gcc/ChangeLog | 12 ++++++++++++ gcc/config/alpha/alpha.c | 20 +++++++++++--------- gcc/config/alpha/alpha.md | 28 ++++++++++++++-------------- 3 files changed, 37 insertions(+), 23 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b0580ad7546..430f2932c04 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,15 @@ +2011-03-22 Richard Henderson + + * config/alpha/alpha.c (direct_return): Use TARGET_ABI_OSF instead + of !TARGET_ABI_OPEN_VMS. + (alpha_trampoline_init, alpha_start_function): Likewise. + (alpha_expand_epilogue, alpha_file_start): Likewise. + * config/alpha/alpha.md (divsi3, modsi3): Likewise. + (udivsi3, umodsi3, divdi3, moddi3, udivdi3, umoddi3): Likewise. + (*divmodsi_internal_er, *divmodsi_internal_er_1): Likewise. + (*divmodsi_internal, *divmoddi_internal_er): Likewise. + (*divmoddi_internal_er_1, *divmoddi_internal): Likewise. + 2011-03-22 Joseph Myers * config/s390/s390-opts.h: New. diff --git a/gcc/config/alpha/alpha.c b/gcc/config/alpha/alpha.c index 2b2c3dab682..d8d2f4126d1 100644 --- a/gcc/config/alpha/alpha.c +++ b/gcc/config/alpha/alpha.c @@ -607,7 +607,7 @@ alpha_vector_mode_supported_p (enum machine_mode mode) int direct_return (void) { - return (!TARGET_ABI_OPEN_VMS + return (TARGET_ABI_OSF && reload_completed && alpha_sa_size () == 0 && get_frame_size () == 0 @@ -5553,7 +5553,7 @@ alpha_trampoline_init (rtx m_tramp, tree fndecl, rtx chain_value) mem = adjust_address (m_tramp, Pmode, 24); emit_move_insn (mem, chain_value); - if (!TARGET_ABI_OPEN_VMS) + if (TARGET_ABI_OSF) { emit_insn (gen_imb ()); #ifdef ENABLE_EXECUTE_STACK @@ -8046,7 +8046,8 @@ alpha_start_function (FILE *file, const char *fnname, if (TARGET_ABI_OPEN_VMS) fprintf (file, "\t.base $%d\n", vms_base_regno); - if (!TARGET_ABI_OPEN_VMS && TARGET_IEEE_CONFORMANT + if (TARGET_ABI_OSF + && TARGET_IEEE_CONFORMANT && !flag_inhibit_size_directive) { /* Set flags in procedure descriptor to request IEEE-conformant @@ -8176,8 +8177,9 @@ alpha_expand_epilogue (void) alpha_sa_mask (&imask, &fmask); fp_is_frame_pointer - = ((TARGET_ABI_OPEN_VMS && alpha_procedure_type == PT_STACK) - || (!TARGET_ABI_OPEN_VMS && frame_pointer_needed)); + = (TARGET_ABI_OPEN_VMS + ? alpha_procedure_type == PT_STACK + : frame_pointer_needed); fp_offset = 0; sa_reg = stack_pointer_rtx; @@ -8189,9 +8191,9 @@ alpha_expand_epilogue (void) if (sa_size) { /* If we have a frame pointer, restore SP from it. */ - if ((TARGET_ABI_OPEN_VMS - && vms_unwind_regno == HARD_FRAME_POINTER_REGNUM) - || (!TARGET_ABI_OPEN_VMS && frame_pointer_needed)) + if (TARGET_ABI_OPEN_VMS + ? vms_unwind_regno == HARD_FRAME_POINTER_REGNUM + : frame_pointer_needed) emit_move_insn (stack_pointer_rtx, hard_frame_pointer_rtx); /* Cope with very large offsets to the register save area. */ @@ -9495,7 +9497,7 @@ alpha_file_start (void) fputs ("\t.set noreorder\n", asm_out_file); fputs ("\t.set volatile\n", asm_out_file); - if (!TARGET_ABI_OPEN_VMS) + if (TARGET_ABI_OSF) fputs ("\t.set noat\n", asm_out_file); if (TARGET_EXPLICIT_RELOCS) fputs ("\t.set nomacro\n", asm_out_file); diff --git a/gcc/config/alpha/alpha.md b/gcc/config/alpha/alpha.md index d25af88a114..38d40b55f7e 100644 --- a/gcc/config/alpha/alpha.md +++ b/gcc/config/alpha/alpha.md @@ -799,7 +799,7 @@ (clobber (reg:DI 28))]) (set (match_operand:SI 0 "nonimmediate_operand" "") (subreg:SI (match_dup 5) 0))] - "!TARGET_ABI_OPEN_VMS" + "TARGET_ABI_OSF" { operands[3] = gen_reg_rtx (DImode); operands[4] = gen_reg_rtx (DImode); @@ -817,7 +817,7 @@ (clobber (reg:DI 28))]) (set (match_operand:SI 0 "nonimmediate_operand" "") (subreg:SI (match_dup 5) 0))] - "!TARGET_ABI_OPEN_VMS" + "TARGET_ABI_OSF" { operands[3] = gen_reg_rtx (DImode); operands[4] = gen_reg_rtx (DImode); @@ -835,7 +835,7 @@ (clobber (reg:DI 28))]) (set (match_operand:SI 0 "nonimmediate_operand" "") (subreg:SI (match_dup 5) 0))] - "!TARGET_ABI_OPEN_VMS" + "TARGET_ABI_OSF" { operands[3] = gen_reg_rtx (DImode); operands[4] = gen_reg_rtx (DImode); @@ -853,7 +853,7 @@ (clobber (reg:DI 28))]) (set (match_operand:SI 0 "nonimmediate_operand" "") (subreg:SI (match_dup 5) 0))] - "!TARGET_ABI_OPEN_VMS" + "TARGET_ABI_OSF" { operands[3] = gen_reg_rtx (DImode); operands[4] = gen_reg_rtx (DImode); @@ -866,7 +866,7 @@ (match_operand:DI 2 "register_operand" ""))) (clobber (reg:DI 23)) (clobber (reg:DI 28))])] - "!TARGET_ABI_OPEN_VMS" + "TARGET_ABI_OSF" "") (define_expand "udivdi3" @@ -875,7 +875,7 @@ (match_operand:DI 2 "register_operand" ""))) (clobber (reg:DI 23)) (clobber (reg:DI 28))])] - "!TARGET_ABI_OPEN_VMS" + "TARGET_ABI_OSF" "") (define_expand "moddi3" @@ -884,7 +884,7 @@ (match_operand:DI 2 "register_operand" ""))) (clobber (reg:DI 23)) (clobber (reg:DI 28))])] - "!TARGET_ABI_OPEN_VMS" + "TARGET_ABI_OSF" "") (define_expand "umoddi3" @@ -893,7 +893,7 @@ (match_operand:DI 2 "register_operand" ""))) (clobber (reg:DI 23)) (clobber (reg:DI 28))])] - "!TARGET_ABI_OPEN_VMS" + "TARGET_ABI_OSF" "") ;; Lengths of 8 for ldq $t12,__divq($gp); jsr $t9,($t12),__divq as @@ -906,7 +906,7 @@ (match_operand:DI 2 "register_operand" "b")]))) (clobber (reg:DI 23)) (clobber (reg:DI 28))] - "TARGET_EXPLICIT_RELOCS && ! TARGET_ABI_OPEN_VMS" + "TARGET_EXPLICIT_RELOCS && TARGET_ABI_OSF" "#" "&& reload_completed" [(parallel [(set (match_dup 0) @@ -951,7 +951,7 @@ (use (match_operand 5 "const_int_operand" "")) (clobber (reg:DI 23)) (clobber (reg:DI 28))] - "TARGET_EXPLICIT_RELOCS && !TARGET_ABI_OPEN_VMS" + "TARGET_EXPLICIT_RELOCS && TARGET_ABI_OSF" "jsr $23,($27),__%E3%j5" [(set_attr "type" "jsr") (set_attr "length" "4")]) @@ -963,7 +963,7 @@ (match_operand:DI 2 "register_operand" "b")]))) (clobber (reg:DI 23)) (clobber (reg:DI 28))] - "!TARGET_ABI_OPEN_VMS" + "TARGET_ABI_OSF" "%E3 %1,%2,%0" [(set_attr "type" "jsr") (set_attr "length" "8")]) @@ -975,7 +975,7 @@ (match_operand:DI 2 "register_operand" "b")])) (clobber (reg:DI 23)) (clobber (reg:DI 28))] - "TARGET_EXPLICIT_RELOCS && ! TARGET_ABI_OPEN_VMS" + "TARGET_EXPLICIT_RELOCS && TARGET_ABI_OSF" "#" "&& reload_completed" [(parallel [(set (match_dup 0) (match_dup 3)) @@ -1019,7 +1019,7 @@ (use (match_operand 5 "const_int_operand" "")) (clobber (reg:DI 23)) (clobber (reg:DI 28))] - "TARGET_EXPLICIT_RELOCS && !TARGET_ABI_OPEN_VMS" + "TARGET_EXPLICIT_RELOCS && TARGET_ABI_OSF" "jsr $23,($27),__%E3%j5" [(set_attr "type" "jsr") (set_attr "length" "4")]) @@ -1031,7 +1031,7 @@ (match_operand:DI 2 "register_operand" "b")])) (clobber (reg:DI 23)) (clobber (reg:DI 28))] - "!TARGET_ABI_OPEN_VMS" + "TARGET_ABI_OSF" "%E3 %1,%2,%0" [(set_attr "type" "jsr") (set_attr "length" "8")]) -- 2.30.2