#include "langhooks.h"
#include "ggc.h"
#include "basic-block.h"
-#include "output.h"
#include "tm_p.h"
static bool prefer_and_bit_test (enum machine_mode, int);
static bool
prefer_and_bit_test (enum machine_mode mode, int bitnum)
{
+ bool speed_p;
+
if (and_test == 0)
{
/* Set up rtxes for the two variations. Use NULL as a placeholder
/* Fill in the integers. */
XEXP (and_test, 1)
- = immed_double_int_const (double_int_setbit (double_int_zero, bitnum),
- mode);
+ = immed_double_int_const (double_int_zero.set_bit (bitnum), mode);
XEXP (XEXP (shift_test, 0), 1) = GEN_INT (bitnum);
- return (rtx_cost (and_test, IF_THEN_ELSE, optimize_insn_for_speed_p ())
- <= rtx_cost (shift_test, IF_THEN_ELSE, optimize_insn_for_speed_p ()));
+ speed_p = optimize_insn_for_speed_p ();
+ return (rtx_cost (and_test, IF_THEN_ELSE, 0, speed_p)
+ <= rtx_cost (shift_test, IF_THEN_ELSE, 0, speed_p));
}
/* Subroutine of do_jump, dealing with exploded comparisons of the type
/* Lowered by gimplify.c. */
gcc_unreachable ();
- case COMPONENT_REF:
- case BIT_FIELD_REF:
- case ARRAY_REF:
- case ARRAY_RANGE_REF:
- {
- HOST_WIDE_INT bitsize, bitpos;
- int unsignedp;
- enum machine_mode mode;
- tree type;
- tree offset;
- int volatilep = 0;
-
- /* Get description of this reference. We don't actually care
- about the underlying object here. */
- get_inner_reference (exp, &bitsize, &bitpos, &offset, &mode,
- &unsignedp, &volatilep, false);
-
- type = lang_hooks.types.type_for_size (bitsize, unsignedp);
- if (! SLOW_BYTE_ACCESS
- && type != 0 && bitsize >= 0
- && TYPE_PRECISION (type) < TYPE_PRECISION (TREE_TYPE (exp))
- && have_insn_for (COMPARE, TYPE_MODE (type)))
- {
- do_jump (fold_convert (type, exp), if_false_label, if_true_label,
- prob);
- break;
- }
- goto normal;
- }
-
case MINUS_EXPR:
/* Nonzero iff operands of minus differ. */
code = NE_EXPR;
}
else
{
- if (GET_MODE_CLASS (mode) == MODE_FLOAT
+ if (SCALAR_FLOAT_MODE_P (mode)
&& ! can_compare_p (code, mode, ccp_jump)
&& can_compare_p (swap_condition (code), mode, ccp_jump))
{
op0 = op1;
op1 = tmp;
}
-
- else if (GET_MODE_CLASS (mode) == MODE_FLOAT
+ else if (SCALAR_FLOAT_MODE_P (mode)
&& ! can_compare_p (code, mode, ccp_jump)
-
- /* Never split ORDERED and UNORDERED. These must be implemented. */
+ /* Never split ORDERED and UNORDERED.
+ These must be implemented. */
&& (code != ORDERED && code != UNORDERED)
-
- /* Split a floating-point comparison if we can jump on other
- conditions... */
+ /* Split a floating-point comparison if
+ we can jump on other conditions... */
&& (have_insn_for (COMPARE, mode)
-
/* ... or if there is no libcall for it. */
- || code_to_optab[code] == NULL))
+ || code_to_optab (code) == unknown_optab))
{
enum rtx_code first_code;
bool and_them = split_comparison (code, mode, &first_code, &code);
last = NEXT_INSN (last))
if (JUMP_P (last))
break;
- if (!last
- || !JUMP_P (last)
- || NEXT_INSN (last)
- || !any_condjump_p (last))
- {
- if (dump_file)
- fprintf (dump_file, "Failed to add probability note\n");
- }
- else
+ if (last
+ && JUMP_P (last)
+ && ! NEXT_INSN (last)
+ && any_condjump_p (last))
{
gcc_assert (!find_reg_note (last, REG_BR_PROB, 0));
add_reg_note (last, REG_BR_PROB, GEN_INT (prob));