#include "tree-pass.h"
#include "except.h"
#include "flags.h"
+
+
+/* Expand variables in the unexpanded_var_list. */
+
+static void
+expand_used_vars (void)
+{
+ tree cell;
+
+ cfun->unexpanded_var_list = nreverse (cfun->unexpanded_var_list);
+
+ for (cell = cfun->unexpanded_var_list; cell; cell = TREE_CHAIN (cell))
+ expand_var (TREE_VALUE (cell));
+
+ cfun->unexpanded_var_list = NULL_TREE;
+}
+
+
+/* A subroutine of expand_gimple_basic_block. Expand one COND_EXPR.
+ Returns a new basic block if we've terminated the current basic
+ block and created a new one. */
+
+static basic_block
+expand_gimple_cond_expr (basic_block bb, tree stmt)
+{
+ basic_block new_bb, dest;
+ edge new_edge;
+ edge true_edge;
+ edge false_edge;
+ tree pred = COND_EXPR_COND (stmt);
+ tree then_exp = COND_EXPR_THEN (stmt);
+ tree else_exp = COND_EXPR_ELSE (stmt);
+ rtx last;
+
+ extract_true_false_edges_from_block (bb, &true_edge, &false_edge);
+ if (EXPR_LOCUS (stmt))
+ {
+ emit_line_note (*(EXPR_LOCUS (stmt)));
+ record_block_change (TREE_BLOCK (stmt));
+ }
+
+ /* These flags have no purpose in RTL land. */
+ true_edge->flags &= ~EDGE_TRUE_VALUE;
+ false_edge->flags &= ~EDGE_FALSE_VALUE;
+
+ /* We can either have a pure conditional jump with one fallthru edge or
+ two-way jump that needs to be decomposed into two basic blocks. */
+ if (TREE_CODE (then_exp) == GOTO_EXPR && IS_EMPTY_STMT (else_exp))
+ {
+ jumpif (pred, label_rtx (GOTO_DESTINATION (then_exp)));
+ return NULL;
+ }
+ if (TREE_CODE (else_exp) == GOTO_EXPR && IS_EMPTY_STMT (then_exp))
+ {
+ jumpifnot (pred, label_rtx (GOTO_DESTINATION (else_exp)));
+ return NULL;
+ }
+ if (TREE_CODE (then_exp) != GOTO_EXPR || TREE_CODE (else_exp) != GOTO_EXPR)
+ abort ();
+
+ jumpif (pred, label_rtx (GOTO_DESTINATION (then_exp)));
+ last = get_last_insn ();
+ expand_expr (else_exp, const0_rtx, VOIDmode, 0);
+
+ BB_END (bb) = last;
+ if (BARRIER_P (BB_END (bb)))
+ BB_END (bb) = PREV_INSN (BB_END (bb));
+ update_bb_for_insn (bb);
+
+ new_bb = create_basic_block (NEXT_INSN (last), get_last_insn (), bb);
+ dest = false_edge->dest;
+ redirect_edge_succ (false_edge, new_bb);
+ false_edge->flags |= EDGE_FALLTHRU;
+ new_bb->count = false_edge->count;
+ new_bb->frequency = EDGE_FREQUENCY (false_edge);
+ new_edge = make_edge (new_bb, dest, 0);
+ new_edge->probability = REG_BR_PROB_BASE;
+ new_edge->count = new_bb->count;
+ if (BARRIER_P (BB_END (new_bb)))
+ BB_END (new_bb) = PREV_INSN (BB_END (new_bb));
+ update_bb_for_insn (new_bb);
+
+ if (dump_file)
+ {
+ dump_bb (bb, dump_file, 0);
+ dump_bb (new_bb, dump_file, 0);
+ }
+
+ return new_bb;
+}
+
+/* A subroutine of expand_gimple_basic_block. Expand one CALL_EXPR
+ that has CALL_EXPR_TAILCALL set. Returns non-null if we actually
+ generated a tail call (something that might be denied by the ABI
+ rules governing the call; see calls.c). */
+
+static basic_block
+expand_gimple_tailcall (basic_block bb, tree stmt)
+{
+ rtx last = get_last_insn ();
+ edge e;
+ int probability;
+ gcov_type count;
+
+ expand_expr_stmt (stmt);
+
+ for (last = NEXT_INSN (last); last; last = NEXT_INSN (last))
+ if (CALL_P (last) && SIBLING_CALL_P (last))
+ goto found;
+
+ return NULL;
+
+ found:
+ /* ??? Wouldn't it be better to just reset any pending stack adjust?
+ Any instructions emitted here are about to be deleted. */
+ do_pending_stack_adjust ();
+
+ /* Remove any non-eh, non-abnormal edges that don't go to exit. */
+ /* ??? I.e. the fallthrough edge. HOWEVER! If there were to be
+ EH or abnormal edges, we shouldn't have created a tail call in
+ the first place. So it seems to me we should just be removing
+ all edges here, or redirecting the existing fallthru edge to
+ the exit block. */
+
+ e = bb->succ;
+ probability = 0;
+ count = 0;
+ while (e)
+ {
+ edge next = e->succ_next;
+
+ if (!(e->flags & (EDGE_ABNORMAL | EDGE_EH)))
+ {
+ if (e->dest != EXIT_BLOCK_PTR)
+ {
+ e->dest->count -= e->count;
+ e->dest->frequency -= EDGE_FREQUENCY (e);
+ if (e->dest->count < 0)
+ e->dest->count = 0;
+ if (e->dest->frequency < 0)
+ e->dest->frequency = 0;
+ }
+ count += e->count;
+ probability += e->probability;
+ remove_edge (e);
+ }
+
+ e = next;
+ }
+
+ /* This is somewhat ugly: the call_expr expander often emits instructions
+ after the sibcall (to perform the function return). These confuse the
+ find_sub_basic_blocks code, so we need to get rid of these. */
+ last = NEXT_INSN (last);
+ if (!BARRIER_P (last))
+ abort ();
+ while (NEXT_INSN (last))
+ {
+ /* For instance an sqrt builtin expander expands if with
+ sibcall in the then and label for `else`. */
+ if (LABEL_P (NEXT_INSN (last)))
+ break;
+ delete_insn (NEXT_INSN (last));
+ }
+
+ e = make_edge (bb, EXIT_BLOCK_PTR, EDGE_ABNORMAL | EDGE_SIBCALL);
+ e->probability += probability;
+ e->count += count;
+ BB_END (bb) = last;
+ update_bb_for_insn (bb);
+
+ if (NEXT_INSN (last))
+ {
+ bb = create_basic_block (NEXT_INSN (last), get_last_insn (), bb);
+
+ last = BB_END (bb);
+ if (BARRIER_P (last))
+ BB_END (bb) = PREV_INSN (last);
+ }
+
+ return bb;
+}
+
/* Expand basic block BB from GIMPLE trees to RTL. */
static basic_block
-expand_block (basic_block bb, FILE * dump_file)
+expand_gimple_basic_block (basic_block bb, FILE * dump_file)
{
block_stmt_iterator bsi = bsi_start (bb);
tree stmt = NULL;
{
last = get_last_insn ();
- expand_expr_stmt_value (stmt, 0, 0);
+ expand_expr_stmt (stmt);
- /* Java emits line number notes in the top of labels.
+ /* Java emits line number notes in the top of labels.
??? Make this go away once line number notes are obsoleted. */
BB_HEAD (bb) = NEXT_INSN (last);
- if (GET_CODE (BB_HEAD (bb)) == NOTE)
+ if (NOTE_P (BB_HEAD (bb)))
BB_HEAD (bb) = NEXT_INSN (BB_HEAD (bb));
bsi_next (&bsi);
note = emit_note_after (NOTE_INSN_BASIC_BLOCK, BB_HEAD (bb));
for (; !bsi_end_p (bsi); bsi_next (&bsi))
{
tree stmt = bsi_stmt (bsi);
-
- last = get_last_insn ();
+ basic_block new_bb = NULL;
if (!stmt)
continue;
/* Expand this statement, then evaluate the resulting RTL and
fixup the CFG accordingly. */
- switch (TREE_CODE (stmt))
+ if (TREE_CODE (stmt) == COND_EXPR)
+ new_bb = expand_gimple_cond_expr (bb, stmt);
+ else
{
- case COND_EXPR:
- {
- basic_block new_bb, dest;
- edge new_edge;
- edge true_edge;
- edge false_edge;
- tree pred = COND_EXPR_COND (stmt);
- tree then_exp = COND_EXPR_THEN (stmt);
- tree else_exp = COND_EXPR_ELSE (stmt);
- rtx last = get_last_insn ();
-
- extract_true_false_edges_from_block (bb, &true_edge, &false_edge);
- if (EXPR_LOCUS (stmt))
- {
- emit_line_note (*(EXPR_LOCUS (stmt)));
- if (cfun->dont_emit_block_notes)
- record_block_change (TREE_BLOCK (stmt));
- }
-
- /* These flags have no purpose in RTL land. */
- true_edge->flags &= ~EDGE_TRUE_VALUE;
- false_edge->flags &= ~EDGE_FALSE_VALUE;
-
- /* We can either have a pure conditional jump with one fallthru
- edge or two-way jump that needs to be decomposed into two
- basic blocks. */
- if (TREE_CODE (then_exp) == GOTO_EXPR
- && TREE_CODE (else_exp) == NOP_EXPR)
- {
- jumpif (pred, label_rtx (GOTO_DESTINATION (then_exp)));
- break;
- }
- if (TREE_CODE (else_exp) == GOTO_EXPR
- && TREE_CODE (then_exp) == NOP_EXPR)
- {
- jumpifnot (pred, label_rtx (GOTO_DESTINATION (else_exp)));
- break;
- }
- if (TREE_CODE (then_exp) != GOTO_EXPR
- || TREE_CODE (else_exp) != GOTO_EXPR)
- abort ();
-
- jumpif (pred, label_rtx (GOTO_DESTINATION (then_exp)));
- last = get_last_insn ();
- expand_expr (else_exp, const0_rtx, VOIDmode, 0);
-
- BB_END (bb) = last;
- if (GET_CODE (BB_END (bb)) == BARRIER)
- BB_END (bb) = PREV_INSN (BB_END (bb));
- update_bb_for_insn (bb);
-
- new_bb = create_basic_block (NEXT_INSN (last), get_last_insn (), bb);
- dest = false_edge->dest;
- redirect_edge_succ (false_edge, new_bb);
- false_edge->flags |= EDGE_FALLTHRU;
- new_bb->count = false_edge->count;
- new_bb->frequency = EDGE_FREQUENCY (false_edge);
- new_edge = make_edge (new_bb, dest, 0);
- new_edge->probability = REG_BR_PROB_BASE;
- new_edge->count = new_bb->count;
- if (GET_CODE (BB_END (new_bb)) == BARRIER)
- BB_END (new_bb) = PREV_INSN (BB_END (new_bb));
- update_bb_for_insn (new_bb);
-
- if (dump_file)
- {
- dump_bb (bb, dump_file, 0);
- dump_bb (new_bb, dump_file, 0);
- }
- return new_bb;
- }
-
- /* Update after expansion of sibling call. */
- case CALL_EXPR:
- case MODIFY_EXPR:
- case RETURN_EXPR:
- expand_expr_stmt_value (stmt, 0, 0);
- for (last = NEXT_INSN (last); last; last = NEXT_INSN (last))
- {
- if (GET_CODE (last) == CALL_INSN && SIBLING_CALL_P (last))
- {
- edge e;
- int probability = 0;
- gcov_type count = 0;
-
- do_pending_stack_adjust ();
- e = bb->succ;
- while (e)
- {
- edge next = e->succ_next;
-
- if (!(e->flags & (EDGE_ABNORMAL | EDGE_EH)))
- {
- if (e->dest != EXIT_BLOCK_PTR)
- {
- e->dest->count -= e->count;
- e->dest->frequency -= EDGE_FREQUENCY (e);
- if (e->dest->count < 0)
- e->dest->count = 0;
- if (e->dest->frequency < 0)
- e->dest->frequency = 0;
- }
- count += e->count;
- probability += e->probability;
- remove_edge (e);
- }
-
- e = next;
- }
-
- /* This is somewhat ugly: the call_expr expander often emits instructions
- after the sibcall (to perform the function return). These confuse the
- find_sub_basic_blocks code, so we need to get rid of these. */
- last = NEXT_INSN (last);
- if (GET_CODE (last) != BARRIER)
- abort ();
- while (NEXT_INSN (last))
- {
- /* For instance an sqrt builtin expander expands if with
- sibcall in the then and label for `else`. */
- if (GET_CODE (NEXT_INSN (last)) == CODE_LABEL)
- break;
- delete_insn (NEXT_INSN (last));
- }
- e = make_edge (bb, EXIT_BLOCK_PTR,
- EDGE_ABNORMAL | EDGE_SIBCALL);
- e->probability += probability;
- e->count += count;
- BB_END (bb) = last;
- update_bb_for_insn (bb);
- if (NEXT_INSN (last))
- bb = create_basic_block (NEXT_INSN (last), get_last_insn (), bb);
- else
- return bb;
- }
- }
- break;
-
- default:
- expand_expr_stmt_value (stmt, 0, 0);
- break;
+ tree call = get_call_expr_in (stmt);
+ if (call && CALL_EXPR_TAILCALL (call))
+ new_bb = expand_gimple_tailcall (bb, stmt);
+ else
+ expand_expr_stmt (stmt);
}
+
+ if (new_bb)
+ return new_bb;
}
do_pending_stack_adjust ();
/* Find the the block tail. The last insn is the block is the insn
before a barrier and/or table jump insn. */
last = get_last_insn ();
- if (GET_CODE (last) == BARRIER)
+ if (BARRIER_P (last))
last = PREV_INSN (last);
if (JUMP_TABLE_DATA_P (last))
last = PREV_INSN (PREV_INSN (last));
BB_END (bb) = last;
-
+
if (dump_file)
dump_bb (bb, dump_file, 0);
update_bb_for_insn (bb);
+
return bb;
}
basic_block init_block, first_block;
edge e;
- expand_start_bindings_and_block (0, NULL_TREE);
-
for (e = ENTRY_BLOCK_PTR->succ; e; e = e->succ_next)
if (e->dest == ENTRY_BLOCK_PTR->next_bb)
break;
basic_block exit_block;
edge e, e2, next;
- /* Make sure the locus is set to the end of the function, so that
+ /* Make sure the locus is set to the end of the function, so that
epilogue line numbers and warnings are set properly. */
#ifdef USE_MAPPED_LOCATION
if (cfun->function_end_locus != UNKNOWN_LOCATION)
/* The following insns belong to the top scope. */
record_block_change (DECL_INITIAL (current_function_decl));
- expand_end_bindings (NULL_TREE, 1, 0);
-
/* Generate rtl for function exit. */
expand_function_end ();
end = get_last_insn ();
if (head == end)
return;
- while (NEXT_INSN (head) && GET_CODE (NEXT_INSN (head)) == NOTE)
+ while (NEXT_INSN (head) && NOTE_P (NEXT_INSN (head)))
head = NEXT_INSN (head);
- exit_block = create_basic_block (NEXT_INSN (head), end, EXIT_BLOCK_PTR->prev_bb);
+ exit_block = create_basic_block (NEXT_INSN (head), end,
+ EXIT_BLOCK_PTR->prev_bb);
exit_block->frequency = EXIT_BLOCK_PTR->frequency;
exit_block->count = EXIT_BLOCK_PTR->count;
for (e = EXIT_BLOCK_PTR->pred; e; e = next)
update_bb_for_insn (exit_block);
}
-/* Called to move the SAVE_EXPRs for parameter declarations in a
- nested function into the nested function. DATA is really the
- nested FUNCTION_DECL. */
-
-static tree
-set_save_expr_context (tree *tp,
- int *walk_subtrees,
- void *data)
-{
- if (TREE_CODE (*tp) == SAVE_EXPR && !SAVE_EXPR_CONTEXT (*tp))
- SAVE_EXPR_CONTEXT (*tp) = (tree) data;
- /* Do not walk back into the SAVE_EXPR_CONTEXT; that will cause
- circularity. */
- else if (DECL_P (*tp))
- *walk_subtrees = 0;
-
- return NULL;
-}
-
-
/* Translate the intermediate representation contained in the CFG
from GIMPLE trees to RTL.
IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (current_function_decl)));
}
- /* If the function has a variably modified type, there may be
- SAVE_EXPRs in the parameter types. Their context must be set to
- refer to this function; they cannot be expanded in the containing
- function. */
- if (decl_function_context (current_function_decl) == current_function_decl
- && variably_modified_type_p (TREE_TYPE (current_function_decl)))
- walk_tree (&TREE_TYPE (current_function_decl), set_save_expr_context,
- current_function_decl, NULL);
-
- /* Expand the variables recorded during gimple lowering. This must
- occur before the call to expand_function_start to ensure that
- all used variables are expanded before we expand anything on the
- PENDING_SIZES list. */
+ /* Some backends want to know that we are expanding to RTL. */
+ currently_expanding_to_rtl = 1;
+
+ /* Prepare the rtl middle end to start recording block changes. */
+ reset_block_changes ();
+
+ /* Expand the variables recorded during gimple lowering. */
expand_used_vars ();
/* Set up parameters and prepare for return, for the function. */
- expand_function_start (current_function_decl, 0);
+ expand_function_start (current_function_decl);
/* If this function is `main', emit a call to `__main'
to run global initializers, etc. */
&& DECL_FILE_SCOPE_P (current_function_decl))
expand_main_function ();
- /* Write the flowgraph to a dot file. */
+ /* Register rtl specific functions for cfg. */
rtl_register_cfg_hooks ();
init_block = construct_init_block ();
FOR_BB_BETWEEN (bb, init_block->next_bb, EXIT_BLOCK_PTR, next_bb)
- bb = expand_block (bb, dump_file);
+ bb = expand_gimple_basic_block (bb, dump_file);
construct_exit_block ();
+ /* We're done expanding trees to RTL. */
+ currently_expanding_to_rtl = 0;
+
/* Convert from NOTE_INSN_EH_REGION style notes, and do other
sorts of eh initialization. Delay this until after the
initial rtl dump so that we can see the original nesting. */
0, /* todo_flags_start */
0 /* todo_flags_finish */
};
-
OSDN Git Service
