X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Fstmt.c;h=330ae5f2b539709ab8dfce262d1799f76d4c56f7;hb=4aaa352fdbf8d0672c30ddf3e6ea61a84f1ae95f;hp=ce11895e6351fdca0898076bc75f18053427face;hpb=60b8c5b34ab84501de6a513517a9e78e3e2c4d00;p=pf3gnuchains%2Fgcc-fork.git diff --git a/gcc/stmt.c b/gcc/stmt.c index ce11895e635..330ae5f2b53 100644 --- a/gcc/stmt.c +++ b/gcc/stmt.c @@ -1,6 +1,6 @@ /* Expands front end tree to back end RTL for GCC Copyright (C) 1987, 1988, 1989, 1992, 1993, 1994, 1995, 1996, 1997, - 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. + 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. This file is part of GCC. @@ -57,11 +57,8 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include "langhooks.h" #include "predict.h" #include "optabs.h" - -/* Assume that case vectors are not pc-relative. */ -#ifndef CASE_VECTOR_PC_RELATIVE -#define CASE_VECTOR_PC_RELATIVE 0 -#endif +#include "target.h" +#include "regs.h" /* Functions and data structures for expanding case statements. */ @@ -127,7 +124,7 @@ static int cost_table_initialized; The position of an entry on `nesting_stack' is in its `depth' field. Each type of construct has its own individual stack. - For example, loops have `loop_stack'. Each object points to the + For example, loops have `cond_stack'. Each object points to the next object of the same type through the `next' field. Some constructs are visible to `break' exit-statements and others @@ -145,7 +142,6 @@ struct nesting GTY(()) rtx exit_label; enum nesting_desc { COND_NESTING, - LOOP_NESTING, BLOCK_NESTING, CASE_NESTING } desc; @@ -162,17 +158,6 @@ struct nesting GTY(()) This may be the end of the if or the next else/elseif. */ rtx next_label; } GTY ((tag ("COND_NESTING"))) cond; - /* For loops. */ - struct nesting_loop - { - /* Label at the top of the loop; place to loop back to. */ - rtx start_label; - /* Label at the end of the whole construct. */ - rtx end_label; - /* Label for `continue' statement to jump to; - this is in front of the stepper of the loop. */ - rtx continue_label; - } GTY ((tag ("LOOP_NESTING"))) loop; /* For variable binding contours. */ struct nesting_block { @@ -223,8 +208,7 @@ struct nesting GTY(()) conditional branch points. */ rtx last_unconditional_cleanup; } GTY ((tag ("BLOCK_NESTING"))) block; - /* For switch (C) or case (Pascal) statements, - and also for dummies (see `expand_start_case_dummy'). */ + /* For switch (C) or case (Pascal) statements. */ struct nesting_case { /* The insn after which the case dispatch should finally @@ -252,8 +236,7 @@ struct nesting GTY(()) /* Allocate and return a new `struct nesting'. */ -#define ALLOC_NESTING() \ - (struct nesting *) ggc_alloc (sizeof (struct nesting)) +#define ALLOC_NESTING() ggc_alloc (sizeof (struct nesting)) /* Pop the nesting stack element by element until we pop off the element which is at the top of STACK. @@ -264,8 +247,6 @@ struct nesting GTY(()) do { struct nesting *target = STACK; \ struct nesting *this; \ do { this = nesting_stack; \ - if (loop_stack == this) \ - loop_stack = loop_stack->next; \ if (cond_stack == this) \ cond_stack = cond_stack->next; \ if (block_stack == this) \ @@ -341,9 +322,6 @@ struct stmt_status GTY(()) /* Chain of all pending conditional statements. */ struct nesting * x_cond_stack; - /* Chain of all pending loops. */ - struct nesting * x_loop_stack; - /* Chain of all pending case or switch statements. */ struct nesting * x_case_stack; @@ -361,6 +339,7 @@ struct stmt_status GTY(()) record the expr's type and its RTL value here. */ tree x_last_expr_type; rtx x_last_expr_value; + rtx x_last_expr_alt_rtl; /* Nonzero if within a ({...}) grouping, in which case we must always compute a value for each expr-stmt in case it is the last one. */ @@ -376,35 +355,32 @@ struct stmt_status GTY(()) #define block_stack (cfun->stmt->x_block_stack) #define stack_block_stack (cfun->stmt->x_stack_block_stack) #define cond_stack (cfun->stmt->x_cond_stack) -#define loop_stack (cfun->stmt->x_loop_stack) #define case_stack (cfun->stmt->x_case_stack) #define nesting_stack (cfun->stmt->x_nesting_stack) #define nesting_depth (cfun->stmt->x_nesting_depth) #define current_block_start_count (cfun->stmt->x_block_start_count) #define last_expr_type (cfun->stmt->x_last_expr_type) #define last_expr_value (cfun->stmt->x_last_expr_value) +#define last_expr_alt_rtl (cfun->stmt->x_last_expr_alt_rtl) #define expr_stmts_for_value (cfun->stmt->x_expr_stmts_for_value) #define emit_locus (cfun->stmt->x_emit_locus) #define goto_fixup_chain (cfun->stmt->x_goto_fixup_chain) /* Nonzero if we are using EH to handle cleanups. */ -static int using_eh_for_cleanups_p = 0; +int using_eh_for_cleanups_p = 0; static int n_occurrences (int, const char *); -static bool parse_input_constraint (const char **, int, int, int, int, - const char * const *, bool *, bool *); static bool decl_conflicts_with_clobbers_p (tree, const HARD_REG_SET); static void expand_goto_internal (tree, rtx, rtx); static int expand_fixup (tree, rtx, rtx); -static rtx expand_nl_handler_label (rtx, rtx); static void expand_nl_goto_receiver (void); -static void expand_nl_goto_receivers (struct nesting *); static void fixup_gotos (struct nesting *, rtx, tree, rtx, int); static bool check_operand_nalternatives (tree, tree); static bool check_unique_operand_names (tree, tree); static char *resolve_operand_name_1 (char *, tree, tree); static void expand_null_return_1 (rtx); static enum br_predictor return_prediction (rtx); +static rtx shift_return_value (rtx); static void expand_value_return (rtx); static int tail_recursion_args (tree, tree); static void expand_cleanups (tree, int, int); @@ -434,39 +410,19 @@ using_eh_for_cleanups (void) void init_stmt_for_function (void) { - cfun->stmt = ((struct stmt_status *)ggc_alloc (sizeof (struct stmt_status))); - - /* We are not currently within any block, conditional, loop or case. */ - block_stack = 0; - stack_block_stack = 0; - loop_stack = 0; - case_stack = 0; - cond_stack = 0; - nesting_stack = 0; - nesting_depth = 0; - - current_block_start_count = 0; - - /* No gotos have been expanded yet. */ - goto_fixup_chain = 0; - - /* We are not processing a ({...}) grouping. */ - expr_stmts_for_value = 0; - clear_last_expr (); + cfun->stmt = ggc_alloc_cleared (sizeof (struct stmt_status)); } /* Record the current file and line. Called from emit_line_note. */ + void -set_file_and_line_for_stmt (const char *file, int line) +set_file_and_line_for_stmt (location_t location) { /* If we're outputting an inline function, and we add a line note, there may be no CFUN->STMT information. So, there's no need to update it. */ if (cfun->stmt) - { - emit_locus.file = file; - emit_locus.line = line; - } + emit_locus = location; } /* Emit a no-op instruction. */ @@ -494,7 +450,12 @@ label_rtx (tree label) abort (); if (!DECL_RTL_SET_P (label)) - SET_DECL_RTL (label, gen_label_rtx ()); + { + rtx r = gen_label_rtx (); + SET_DECL_RTL (label, r); + if (FORCED_LABEL (label) || DECL_NONLOCAL (label)) + LABEL_PRESERVE_P (r) = 1; + } return DECL_RTL (label); } @@ -511,8 +472,7 @@ force_label_rtx (tree label) if (!function) abort (); - if (function != current_function_decl - && function != inline_function_decl) + if (function != current_function_decl) p = find_function_data (function); else p = cfun; @@ -540,10 +500,7 @@ expand_computed_goto (tree exp) { rtx x = expand_expr (exp, NULL_RTX, VOIDmode, 0); -#ifdef POINTERS_EXTEND_UNSIGNED - if (GET_MODE (x) != Pmode) - x = convert_memory_address (Pmode, x); -#endif + x = convert_memory_address (Pmode, x); emit_queue (); @@ -551,9 +508,9 @@ expand_computed_goto (tree exp) { cfun->computed_goto_common_reg = copy_to_mode_reg (Pmode, x); cfun->computed_goto_common_label = gen_label_rtx (); - emit_label (cfun->computed_goto_common_label); do_pending_stack_adjust (); + emit_label (cfun->computed_goto_common_label); emit_indirect_jump (cfun->computed_goto_common_reg); current_function_has_computed_jump = 1; @@ -582,39 +539,34 @@ void expand_label (tree label) { struct label_chain *p; + rtx label_r = label_rtx (label); do_pending_stack_adjust (); - emit_label (label_rtx (label)); + emit_label (label_r); if (DECL_NAME (label)) LABEL_NAME (DECL_RTL (label)) = IDENTIFIER_POINTER (DECL_NAME (label)); - if (stack_block_stack != 0) + if (DECL_NONLOCAL (label)) { - p = (struct label_chain *) ggc_alloc (sizeof (struct label_chain)); - p->next = stack_block_stack->data.block.label_chain; - stack_block_stack->data.block.label_chain = p; - p->label = label; + expand_nl_goto_receiver (); + nonlocal_goto_handler_labels + = gen_rtx_EXPR_LIST (VOIDmode, label_r, + nonlocal_goto_handler_labels); } -} -/* Declare that LABEL (a LABEL_DECL) may be used for nonlocal gotos - from nested functions. */ + if (FORCED_LABEL (label)) + forced_labels = gen_rtx_EXPR_LIST (VOIDmode, label_r, forced_labels); + + if (DECL_NONLOCAL (label) || FORCED_LABEL (label)) + maybe_set_first_label_num (label_r); -void -declare_nonlocal_label (tree label) -{ - rtx slot = assign_stack_local (Pmode, GET_MODE_SIZE (Pmode), 0); - - nonlocal_labels = tree_cons (NULL_TREE, label, nonlocal_labels); - LABEL_PRESERVE_P (label_rtx (label)) = 1; - if (nonlocal_goto_handler_slots == 0) + if (stack_block_stack != 0) { - emit_stack_save (SAVE_NONLOCAL, - &nonlocal_goto_stack_level, - PREV_INSN (tail_recursion_reentry)); + p = ggc_alloc (sizeof (struct label_chain)); + p->next = stack_block_stack->data.block.label_chain; + stack_block_stack->data.block.label_chain = p; + p->label = label; } - nonlocal_goto_handler_slots - = gen_rtx_EXPR_LIST (VOIDmode, slot, nonlocal_goto_handler_slots); } /* Generate RTL code for a `goto' statement with target label LABEL. @@ -624,84 +576,15 @@ declare_nonlocal_label (tree label) void expand_goto (tree label) { - tree context; - - /* Check for a nonlocal goto to a containing function. */ - context = decl_function_context (label); +#ifdef ENABLE_CHECKING + /* Check for a nonlocal goto to a containing function. Should have + gotten translated to __builtin_nonlocal_goto. */ + tree context = decl_function_context (label); if (context != 0 && context != current_function_decl) - { - struct function *p = find_function_data (context); - rtx label_ref = gen_rtx_LABEL_REF (Pmode, label_rtx (label)); - rtx handler_slot, static_chain, save_area, insn; - tree link; - - /* Find the corresponding handler slot for this label. */ - handler_slot = p->x_nonlocal_goto_handler_slots; - for (link = p->x_nonlocal_labels; TREE_VALUE (link) != label; - link = TREE_CHAIN (link)) - handler_slot = XEXP (handler_slot, 1); - handler_slot = XEXP (handler_slot, 0); - - p->has_nonlocal_label = 1; - current_function_has_nonlocal_goto = 1; - LABEL_REF_NONLOCAL_P (label_ref) = 1; - - /* Copy the rtl for the slots so that they won't be shared in - case the virtual stack vars register gets instantiated differently - in the parent than in the child. */ - - static_chain = copy_to_reg (lookup_static_chain (label)); - - /* Get addr of containing function's current nonlocal goto handler, - which will do any cleanups and then jump to the label. */ - handler_slot = copy_to_reg (replace_rtx (copy_rtx (handler_slot), - virtual_stack_vars_rtx, - static_chain)); - - /* Get addr of containing function's nonlocal save area. */ - save_area = p->x_nonlocal_goto_stack_level; - if (save_area) - save_area = replace_rtx (copy_rtx (save_area), - virtual_stack_vars_rtx, static_chain); - -#if HAVE_nonlocal_goto - if (HAVE_nonlocal_goto) - emit_insn (gen_nonlocal_goto (static_chain, handler_slot, - save_area, label_ref)); - else + abort (); #endif - { - /* Restore frame pointer for containing function. - This sets the actual hard register used for the frame pointer - to the location of the function's incoming static chain info. - The non-local goto handler will then adjust it to contain the - proper value and reload the argument pointer, if needed. */ - emit_move_insn (hard_frame_pointer_rtx, static_chain); - emit_stack_restore (SAVE_NONLOCAL, save_area, NULL_RTX); - - /* USE of hard_frame_pointer_rtx added for consistency; - not clear if really needed. */ - emit_insn (gen_rtx_USE (VOIDmode, hard_frame_pointer_rtx)); - emit_insn (gen_rtx_USE (VOIDmode, stack_pointer_rtx)); - emit_indirect_jump (handler_slot); - } - /* Search backwards to the jump insn and mark it as a - non-local goto. */ - for (insn = get_last_insn (); insn; insn = PREV_INSN (insn)) - { - if (GET_CODE (insn) == JUMP_INSN) - { - REG_NOTES (insn) = alloc_EXPR_LIST (REG_NON_LOCAL_GOTO, - const0_rtx, REG_NOTES (insn)); - break; - } - else if (GET_CODE (insn) == CALL_INSN) - break; - } - } - else - expand_goto_internal (label, label_rtx (label), NULL_RTX); + expand_goto_internal (label, label_rtx (label), NULL_RTX); } /* Generate RTL code for a `goto' statement with target label BODY. @@ -807,14 +690,6 @@ expand_fixup (tree tree_label, rtx rtl_label, rtx last_insn) && (rtl_label == cond_stack->data.cond.endif_label || rtl_label == cond_stack->data.cond.next_label)) end_block = cond_stack; - /* If we are in a loop, recognize certain labels which - are likely targets. This reduces the number of fixups - we need to create. */ - else if (loop_stack - && (rtl_label == loop_stack->data.loop.start_label - || rtl_label == loop_stack->data.loop.end_label - || rtl_label == loop_stack->data.loop.continue_label)) - end_block = loop_stack; else end_block = 0; @@ -853,8 +728,7 @@ expand_fixup (tree tree_label, rtx rtl_label, rtx last_insn) if (block != end_block) { /* Ok, a fixup is needed. Add a fixup to the list of such. */ - struct goto_fixup *fixup - = (struct goto_fixup *) ggc_alloc (sizeof (struct goto_fixup)); + struct goto_fixup *fixup = ggc_alloc (sizeof (struct goto_fixup)); /* In case an old stack level is restored, make sure that comes after any pending stack adjust. */ /* ?? If the fixup isn't to come at the present position, @@ -874,9 +748,8 @@ expand_fixup (tree tree_label, rtx rtl_label, rtx last_insn) `SUPERBLOCK') of any other BLOCK nodes which we might create later on when we are expanding the fixup code. - Note that optimization passes (including expand_end_loop) - might move the *_BLOCK notes away, so we use a NOTE_INSN_DELETED - as a placeholder. */ + Note that optimization passes might move the *_BLOCK notes away, + so we use a NOTE_INSN_DELETED as a placeholder. */ { rtx original_before_jump @@ -889,7 +762,7 @@ expand_fixup (tree tree_label, rtx rtl_label, rtx last_insn) TREE_USED (block) = 1; if (!cfun->x_whole_function_mode_p) - (*lang_hooks.decls.insert_block) (block); + lang_hooks.decls.insert_block (block); else { BLOCK_CHAIN (block) @@ -990,8 +863,8 @@ fixup_gotos (struct nesting *thisblock, rtx stack_level, && INSN_UID (first_insn) > INSN_UID (f->before_jump) && ! DECL_ERROR_ISSUED (f->target)) { - error_with_decl (f->target, - "label `%s' used before containing binding contour"); + error ("%Jlabel '%D' used before containing binding contour", + f->target, f->target); /* Prevent multiple errors for one label. */ DECL_ERROR_ISSUED (f->target) = 1; } @@ -1006,8 +879,8 @@ fixup_gotos (struct nesting *thisblock, rtx stack_level, logically be inserting the fixup code. We do this for the sake of getting the debugging information right. */ - (*lang_hooks.decls.pushlevel) (0); - (*lang_hooks.decls.set_block) (f->context); + lang_hooks.decls.pushlevel (0); + lang_hooks.decls.set_block (f->context); /* Expand the cleanups for blocks this jump exits. */ if (f->cleanup_list_list) @@ -1046,7 +919,7 @@ fixup_gotos (struct nesting *thisblock, rtx stack_level, destructed are still "in scope". */ cleanup_insns = get_insns (); - (*lang_hooks.decls.poplevel) (1, 0, 0); + lang_hooks.decls.poplevel (1, 0, 0); end_sequence (); emit_insn_after (cleanup_insns, f->before_jump); @@ -1080,12 +953,12 @@ fixup_gotos (struct nesting *thisblock, rtx stack_level, if (TREE_CHAIN (lists) == thisblock->data.block.outer_cleanups) { start_sequence (); - (*lang_hooks.decls.pushlevel) (0); - (*lang_hooks.decls.set_block) (f->context); + lang_hooks.decls.pushlevel (0); + lang_hooks.decls.set_block (f->context); expand_cleanups (TREE_VALUE (lists), 1, 1); do_pending_stack_adjust (); cleanup_insns = get_insns (); - (*lang_hooks.decls.poplevel) (1, 0, 0); + lang_hooks.decls.poplevel (1, 0, 0); end_sequence (); if (cleanup_insns != 0) f->before_jump @@ -1277,7 +1150,7 @@ parse_output_constraint (const char **constraint_p, int operand_num, /* Similar, but for input constraints. */ -static bool +bool parse_input_constraint (const char **constraint_p, int input_num, int ninputs, int noutputs, int ninout, const char * const * constraints, @@ -1287,6 +1160,7 @@ parse_input_constraint (const char **constraint_p, int input_num, const char *orig_constraint = constraint; size_t c_len = strlen (constraint); size_t j; + bool saw_match = false; /* Assume the constraint doesn't allow the use of either a register or memory. */ @@ -1338,6 +1212,8 @@ parse_input_constraint (const char **constraint_p, int input_num, char *end; unsigned long match; + saw_match = true; + match = strtoul (constraint + j, &end, 10); if (match >= (unsigned long) noutputs) { @@ -1402,9 +1278,39 @@ parse_input_constraint (const char **constraint_p, int input_num, break; } + if (saw_match && !*allows_reg) + warning ("matching constraint does not allow a register"); + return true; } +/* INPUT is one of the input operands from EXPR, an ASM_EXPR. Returns true + if it is an operand which must be passed in memory (i.e. an "m" + constraint), false otherwise. */ + +bool +asm_op_is_mem_input (tree input, tree expr) +{ + const char *constraint = TREE_STRING_POINTER (TREE_VALUE (TREE_PURPOSE (input))); + tree outputs = ASM_OUTPUTS (expr); + int noutputs = list_length (outputs); + const char **constraints + = (const char **) alloca ((noutputs) * sizeof (const char *)); + int i = 0; + bool allows_mem, allows_reg; + tree t; + + /* Collect output constraints. */ + for (t = outputs; t ; t = TREE_CHAIN (t), i++) + constraints[i] = TREE_STRING_POINTER (TREE_VALUE (TREE_PURPOSE (t))); + + /* We pass 0 for input_num, ninputs and ninout; they are only used for + error checking which will be done at expand time. */ + parse_input_constraint (&constraint, 0, 0, noutputs, 0, constraints, + &allows_mem, &allows_reg); + return (!allows_reg && allows_mem); +} + /* Check for overlap between registers marked in CLOBBERED_REGS and anything inappropriate in DECL. Emit error and return TRUE for error, FALSE for ok. */ @@ -1424,7 +1330,7 @@ decl_conflicts_with_clobbers_p (tree decl, const HARD_REG_SET clobbered_regs) for (regno = REGNO (reg); regno < (REGNO (reg) - + HARD_REGNO_NREGS (REGNO (reg), GET_MODE (reg))); + + hard_regno_nregs[REGNO (reg)][GET_MODE (reg)]); regno++) if (TEST_HARD_REG_BIT (clobbered_regs, regno)) { @@ -1459,7 +1365,7 @@ decl_conflicts_with_clobbers_p (tree decl, const HARD_REG_SET clobbered_regs) void expand_asm_operands (tree string, tree outputs, tree inputs, - tree clobbers, int vol, const char *filename, int line) + tree clobbers, int vol, location_t locus) { rtvec argvec, constraintvec; rtx body; @@ -1473,13 +1379,13 @@ expand_asm_operands (tree string, tree outputs, tree inputs, tree t; int i; /* Vector of RTX's of evaluated output operands. */ - rtx *output_rtx = (rtx *) alloca (noutputs * sizeof (rtx)); - int *inout_opnum = (int *) alloca (noutputs * sizeof (int)); - rtx *real_output_rtx = (rtx *) alloca (noutputs * sizeof (rtx)); + rtx *output_rtx = alloca (noutputs * sizeof (rtx)); + int *inout_opnum = alloca (noutputs * sizeof (int)); + rtx *real_output_rtx = alloca (noutputs * sizeof (rtx)); enum machine_mode *inout_mode - = (enum machine_mode *) alloca (noutputs * sizeof (enum machine_mode)); + = alloca (noutputs * sizeof (enum machine_mode)); const char **constraints - = (const char **) alloca ((noutputs + ninputs) * sizeof (const char *)); + = alloca ((noutputs + ninputs) * sizeof (const char *)); int old_generating_concat_p = generating_concat_p; /* An ASM with no outputs needs to be treated as volatile, for now. */ @@ -1489,9 +1395,6 @@ expand_asm_operands (tree string, tree outputs, tree inputs, if (! check_operand_nalternatives (outputs, inputs)) return; - if (! check_unique_operand_names (outputs, inputs)) - return; - string = resolve_asm_operand_names (string, outputs, inputs); /* Collect constraints. */ @@ -1501,13 +1404,11 @@ expand_asm_operands (tree string, tree outputs, tree inputs, for (t = inputs; t ; t = TREE_CHAIN (t), i++) constraints[i] = TREE_STRING_POINTER (TREE_VALUE (TREE_PURPOSE (t))); -#ifdef MD_ASM_CLOBBERS /* Sometimes we wish to automatically clobber registers across an asm. Case in point is when the i386 backend moved from cc0 to a hard reg -- maintaining source-level compatibility means automatically clobbering the flags register. */ - MD_ASM_CLOBBERS (clobbers); -#endif + clobbers = targetm.md_asm_clobbers (clobbers); /* Count the number of meaningful clobbered registers, ignoring what we would ignore later. */ @@ -1569,7 +1470,7 @@ expand_asm_operands (tree string, tree outputs, tree inputs, || (DECL_P (val) && GET_CODE (DECL_RTL (val)) == REG && GET_MODE (DECL_RTL (val)) != TYPE_MODE (type)))) - (*lang_hooks.mark_addressable) (val); + lang_hooks.mark_addressable (val); if (is_inout) ninout++; @@ -1598,7 +1499,7 @@ expand_asm_operands (tree string, tree outputs, tree inputs, return; if (! allows_reg && allows_mem) - (*lang_hooks.mark_addressable) (TREE_VALUE (tail)); + lang_hooks.mark_addressable (TREE_VALUE (tail)); } /* Second pass evaluates arguments. */ @@ -1680,7 +1581,7 @@ expand_asm_operands (tree string, tree outputs, tree inputs, : GET_MODE (output_rtx[0])), TREE_STRING_POINTER (string), empty_string, 0, argvec, constraintvec, - filename, line); + locus.file, locus.line); MEM_VOLATILE_P (body) = vol; @@ -1733,13 +1634,16 @@ expand_asm_operands (tree string, tree outputs, tree inputs, if (CONSTANT_P (op)) { - op = force_const_mem (TYPE_MODE (type), op); - op = validize_mem (op); + rtx mem = force_const_mem (TYPE_MODE (type), op); + if (mem) + op = validize_mem (mem); + else + op = force_reg (TYPE_MODE (type), op); } - else if (GET_CODE (op) == REG - || GET_CODE (op) == SUBREG - || GET_CODE (op) == ADDRESSOF - || GET_CODE (op) == CONCAT) + if (GET_CODE (op) == REG + || GET_CODE (op) == SUBREG + || GET_CODE (op) == ADDRESSOF + || GET_CODE (op) == CONCAT) { tree qual_type = build_qualified_type (type, (TYPE_QUALS (type) @@ -1827,7 +1731,7 @@ expand_asm_operands (tree string, tree outputs, tree inputs, (GET_MODE (output_rtx[i]), TREE_STRING_POINTER (string), constraints[i], i, argvec, constraintvec, - filename, line)); + locus.file, locus.line)); MEM_VOLATILE_P (SET_SRC (XVECEXP (body, 0, i))) = vol; } @@ -1903,6 +1807,52 @@ expand_asm_operands (tree string, tree outputs, tree inputs, free_temp_slots (); } +void +expand_asm_expr (tree exp) +{ + int noutputs, i; + tree outputs, tail; + tree *o; + + if (ASM_INPUT_P (exp)) + { + expand_asm (ASM_STRING (exp), ASM_VOLATILE_P (exp)); + return; + } + + outputs = ASM_OUTPUTS (exp); + noutputs = list_length (outputs); + /* o[I] is the place that output number I should be written. */ + o = (tree *) alloca (noutputs * sizeof (tree)); + + /* Record the contents of OUTPUTS before it is modified. */ + for (i = 0, tail = outputs; tail; tail = TREE_CHAIN (tail), i++) + o[i] = TREE_VALUE (tail); + + /* Generate the ASM_OPERANDS insn; store into the TREE_VALUEs of + OUTPUTS some trees for where the values were actually stored. */ + expand_asm_operands (ASM_STRING (exp), outputs, ASM_INPUTS (exp), + ASM_CLOBBERS (exp), ASM_VOLATILE_P (exp), + input_location); + + /* Copy all the intermediate outputs into the specified outputs. */ + for (i = 0, tail = outputs; tail; tail = TREE_CHAIN (tail), i++) + { + if (o[i] != TREE_VALUE (tail)) + { + expand_assignment (o[i], TREE_VALUE (tail), 0); + free_temp_slots (); + + /* Restore the original value so that it's correct the next + time we expand this function. */ + TREE_VALUE (tail) = o[i]; + } + } + + /* Those MODIFY_EXPRs could do autoincrements. */ + emit_queue (); +} + /* A subroutine of expand_asm_operands. Check that all operands have the same number of alternatives. Return true if so. */ @@ -1996,13 +1946,16 @@ resolve_asm_operand_names (tree string, tree outputs, tree inputs) { char *buffer; char *p; + const char *c; tree t; + check_unique_operand_names (outputs, inputs); + /* Substitute [] in input constraint strings. There should be no named operands in output constraints. */ for (t = inputs; t ; t = TREE_CHAIN (t)) { - const char *c = TREE_STRING_POINTER (TREE_VALUE (TREE_PURPOSE (t))); + c = TREE_STRING_POINTER (TREE_VALUE (TREE_PURPOSE (t))); if (strchr (c, '[') != NULL) { p = buffer = xstrdup (c); @@ -2014,31 +1967,48 @@ resolve_asm_operand_names (tree string, tree outputs, tree inputs) } } - if (strchr (TREE_STRING_POINTER (string), '[') == NULL) - return string; - - /* Assume that we will not need extra space to perform the substitution. - This because we get to remove '[' and ']', which means we cannot have - a problem until we have more than 999 operands. */ - - p = buffer = xstrdup (TREE_STRING_POINTER (string)); - while ((p = strchr (p, '%')) != NULL) + /* Now check for any needed substitutions in the template. */ + c = TREE_STRING_POINTER (string); + while ((c = strchr (c, '%')) != NULL) { - if (p[1] == '[') - p += 1; - else if (ISALPHA (p[1]) && p[2] == '[') - p += 2; + if (c[1] == '[') + break; + else if (ISALPHA (c[1]) && c[2] == '[') + break; else { - p += 1; + c += 1; continue; } - - p = resolve_operand_name_1 (p, outputs, inputs); } - string = build_string (strlen (buffer), buffer); - free (buffer); + if (c) + { + /* OK, we need to make a copy so we can perform the substitutions. + Assume that we will not need extra space--we get to remove '[' + and ']', which means we cannot have a problem until we have more + than 999 operands. */ + buffer = xstrdup (TREE_STRING_POINTER (string)); + p = buffer + (c - TREE_STRING_POINTER (string)); + + while ((p = strchr (p, '%')) != NULL) + { + if (p[1] == '[') + p += 1; + else if (ISALPHA (p[1]) && p[2] == '[') + p += 2; + else + { + p += 1; + continue; + } + + p = resolve_operand_name_1 (p, outputs, inputs); + } + + string = build_string (strlen (buffer), buffer); + free (buffer); + } return string; } @@ -2129,6 +2099,7 @@ expand_expr_stmt_value (tree exp, int want_value, int maybe_last) { rtx value; tree type; + rtx alt_rtl = NULL; if (want_value == -1) want_value = expr_stmts_for_value != 0; @@ -2138,17 +2109,13 @@ expand_expr_stmt_value (tree exp, int want_value, int maybe_last) except for last statement in ({...}) where they may be useful. */ if (! want_value && (expr_stmts_for_value == 0 || ! maybe_last) - && exp != error_mark_node) + && exp != error_mark_node + && warn_unused_value) { - if (! TREE_SIDE_EFFECTS (exp)) - { - if (warn_unused_value - && !(TREE_CODE (exp) == CONVERT_EXPR - && VOID_TYPE_P (TREE_TYPE (exp)))) - warning ("%Hstatement with no effect", &emit_locus); - } - else if (warn_unused_value) + if (TREE_SIDE_EFFECTS (exp)) warn_if_unused_value (exp); + else if (!VOID_TYPE_P (TREE_TYPE (exp)) && !TREE_NO_WARNING (exp)) + warning ("%Hstatement with no effect", &emit_locus); } /* If EXP is of function type and we are expanding statements for @@ -2159,8 +2126,8 @@ expand_expr_stmt_value (tree exp, int want_value, int maybe_last) /* The call to `expand_expr' could cause last_expr_type and last_expr_value to get reset. Therefore, we set last_expr_value and last_expr_type *after* calling expand_expr. */ - value = expand_expr (exp, want_value ? NULL_RTX : const0_rtx, - VOIDmode, 0); + value = expand_expr_real (exp, want_value ? NULL_RTX : const0_rtx, + VOIDmode, 0, &alt_rtl); type = TREE_TYPE (exp); /* If all we do is reference a volatile value in memory, @@ -2196,6 +2163,7 @@ expand_expr_stmt_value (tree exp, int want_value, int maybe_last) if (want_value) { last_expr_value = value; + last_expr_alt_rtl = alt_rtl; last_expr_type = type; } @@ -2227,7 +2195,6 @@ warn_if_unused_value (tree exp) case INIT_EXPR: case TARGET_EXPR: case CALL_EXPR: - case METHOD_CALL_EXPR: case RTL_EXPR: case TRY_CATCH_EXPR: case WITH_CLEANUP_EXPR: @@ -2239,7 +2206,7 @@ warn_if_unused_value (tree exp) return warn_if_unused_value (TREE_OPERAND (exp, 1)); case SAVE_EXPR: - return warn_if_unused_value (TREE_OPERAND (exp, 1)); + return warn_if_unused_value (TREE_OPERAND (exp, 0)); case TRUTH_ORIF_EXPR: case TRUTH_ANDIF_EXPR: @@ -2247,7 +2214,7 @@ warn_if_unused_value (tree exp) return warn_if_unused_value (TREE_OPERAND (exp, 1)); case COMPOUND_EXPR: - if (TREE_NO_UNUSED_WARNING (exp)) + if (TREE_NO_WARNING (exp)) return 0; if (warn_if_unused_value (TREE_OPERAND (exp, 0))) return 1; @@ -2260,7 +2227,7 @@ warn_if_unused_value (tree exp) case CONVERT_EXPR: case NON_LVALUE_EXPR: /* Don't warn about conversions not explicit in the user's program. */ - if (TREE_NO_UNUSED_WARNING (exp)) + if (TREE_NO_WARNING (exp)) return 0; /* Assignment to a cast usually results in a cast of a modify. Don't complain about that. There can be an arbitrary number of @@ -2316,6 +2283,7 @@ clear_last_expr (void) { last_expr_type = NULL_TREE; last_expr_value = NULL_RTX; + last_expr_alt_rtl = NULL_RTX; } /* Begin a statement-expression, i.e., a series of statements which @@ -2363,6 +2331,7 @@ expand_end_stmt_expr (tree t) if (! last_expr_value || ! last_expr_type) { last_expr_value = const0_rtx; + last_expr_alt_rtl = NULL_RTX; last_expr_type = void_type_node; } else if (GET_CODE (last_expr_value) != REG && ! CONSTANT_P (last_expr_value)) @@ -2373,6 +2342,7 @@ expand_end_stmt_expr (tree t) TREE_TYPE (t) = last_expr_type; RTL_EXPR_RTL (t) = last_expr_value; + RTL_EXPR_ALT_RTL (t) = last_expr_alt_rtl; RTL_EXPR_SEQUENCE (t) = get_insns (); rtl_expr_chain = tree_cons (NULL_TREE, t, rtl_expr_chain); @@ -2475,400 +2445,22 @@ expand_end_cond (void) clear_last_expr (); } -/* Generate RTL for the start of a loop. EXIT_FLAG is nonzero if this - loop should be exited by `exit_something'. This is a loop for which - `expand_continue' will jump to the top of the loop. - - Make an entry on loop_stack to record the labels associated with - this loop. */ - -struct nesting * -expand_start_loop (int exit_flag) -{ - struct nesting *thisloop = ALLOC_NESTING (); - - /* Make an entry on loop_stack for the loop we are entering. */ - - thisloop->desc = LOOP_NESTING; - thisloop->next = loop_stack; - thisloop->all = nesting_stack; - thisloop->depth = ++nesting_depth; - thisloop->data.loop.start_label = gen_label_rtx (); - thisloop->data.loop.end_label = gen_label_rtx (); - thisloop->data.loop.continue_label = thisloop->data.loop.start_label; - thisloop->exit_label = exit_flag ? thisloop->data.loop.end_label : 0; - loop_stack = thisloop; - nesting_stack = thisloop; - - do_pending_stack_adjust (); - emit_queue (); - emit_note (NOTE_INSN_LOOP_BEG); - emit_label (thisloop->data.loop.start_label); - - return thisloop; -} - -/* Like expand_start_loop but for a loop where the continuation point - (for expand_continue_loop) will be specified explicitly. */ - -struct nesting * -expand_start_loop_continue_elsewhere (int exit_flag) -{ - struct nesting *thisloop = expand_start_loop (exit_flag); - loop_stack->data.loop.continue_label = gen_label_rtx (); - return thisloop; -} - -/* Begin a null, aka do { } while (0) "loop". But since the contents - of said loop can still contain a break, we must frob the loop nest. */ - -struct nesting * -expand_start_null_loop (void) -{ - struct nesting *thisloop = ALLOC_NESTING (); - - /* Make an entry on loop_stack for the loop we are entering. */ - - thisloop->desc = LOOP_NESTING; - thisloop->next = loop_stack; - thisloop->all = nesting_stack; - thisloop->depth = ++nesting_depth; - thisloop->data.loop.start_label = emit_note (NOTE_INSN_DELETED); - thisloop->data.loop.end_label = gen_label_rtx (); - thisloop->data.loop.continue_label = thisloop->data.loop.end_label; - thisloop->exit_label = thisloop->data.loop.end_label; - loop_stack = thisloop; - nesting_stack = thisloop; - - return thisloop; -} - -/* Specify the continuation point for a loop started with - expand_start_loop_continue_elsewhere. - Use this at the point in the code to which a continue statement - should jump. */ - -void -expand_loop_continue_here (void) -{ - do_pending_stack_adjust (); - emit_note (NOTE_INSN_LOOP_CONT); - emit_label (loop_stack->data.loop.continue_label); -} - -/* Finish a loop. Generate a jump back to the top and the loop-exit label. - Pop the block off of loop_stack. */ - -void -expand_end_loop (void) -{ - rtx start_label = loop_stack->data.loop.start_label; - rtx etc_note; - int eh_regions, debug_blocks; - bool empty_test; - - /* Mark the continue-point at the top of the loop if none elsewhere. */ - if (start_label == loop_stack->data.loop.continue_label) - emit_note_before (NOTE_INSN_LOOP_CONT, start_label); - - do_pending_stack_adjust (); - - /* If the loop starts with a loop exit, roll that to the end where - it will optimize together with the jump back. - - If the loop presently looks like this (in pseudo-C): - - LOOP_BEG - start_label: - if (test) goto end_label; - LOOP_END_TOP_COND - body; - goto start_label; - end_label: - - transform it to look like: - - LOOP_BEG - goto start_label; - top_label: - body; - start_label: - if (test) goto end_label; - goto top_label; - end_label: - - We rely on the presence of NOTE_INSN_LOOP_END_TOP_COND to mark - the end of the entry conditional. Without this, our lexical scan - can't tell the difference between an entry conditional and a - body conditional that exits the loop. Mistaking the two means - that we can misplace the NOTE_INSN_LOOP_CONT note, which can - screw up loop unrolling. - - Things will be oh so much better when loop optimization is done - off of a proper control flow graph... */ - - /* Scan insns from the top of the loop looking for the END_TOP_COND note. */ - - empty_test = true; - eh_regions = debug_blocks = 0; - for (etc_note = start_label; etc_note ; etc_note = NEXT_INSN (etc_note)) - if (GET_CODE (etc_note) == NOTE) - { - if (NOTE_LINE_NUMBER (etc_note) == NOTE_INSN_LOOP_END_TOP_COND) - break; - - /* We must not walk into a nested loop. */ - else if (NOTE_LINE_NUMBER (etc_note) == NOTE_INSN_LOOP_BEG) - { - etc_note = NULL_RTX; - break; - } - - /* At the same time, scan for EH region notes, as we don't want - to scrog region nesting. This shouldn't happen, but... */ - else if (NOTE_LINE_NUMBER (etc_note) == NOTE_INSN_EH_REGION_BEG) - eh_regions++; - else if (NOTE_LINE_NUMBER (etc_note) == NOTE_INSN_EH_REGION_END) - { - if (--eh_regions < 0) - /* We've come to the end of an EH region, but never saw the - beginning of that region. That means that an EH region - begins before the top of the loop, and ends in the middle - of it. The existence of such a situation violates a basic - assumption in this code, since that would imply that even - when EH_REGIONS is zero, we might move code out of an - exception region. */ - abort (); - } - - /* Likewise for debug scopes. In this case we'll either (1) move - all of the notes if they are properly nested or (2) leave the - notes alone and only rotate the loop at high optimization - levels when we expect to scrog debug info. */ - else if (NOTE_LINE_NUMBER (etc_note) == NOTE_INSN_BLOCK_BEG) - debug_blocks++; - else if (NOTE_LINE_NUMBER (etc_note) == NOTE_INSN_BLOCK_END) - debug_blocks--; - } - else if (INSN_P (etc_note)) - empty_test = false; - - if (etc_note - && optimize - && ! empty_test - && eh_regions == 0 - && (debug_blocks == 0 || optimize >= 2) - && NEXT_INSN (etc_note) != NULL_RTX - && ! any_condjump_p (get_last_insn ())) - { - /* We found one. Move everything from START to ETC to the end - of the loop, and add a jump from the top of the loop. */ - rtx top_label = gen_label_rtx (); - rtx start_move = start_label; - - /* If the start label is preceded by a NOTE_INSN_LOOP_CONT note, - then we want to move this note also. */ - if (GET_CODE (PREV_INSN (start_move)) == NOTE - && NOTE_LINE_NUMBER (PREV_INSN (start_move)) == NOTE_INSN_LOOP_CONT) - start_move = PREV_INSN (start_move); - - emit_label_before (top_label, start_move); - - /* Actually move the insns. If the debug scopes are nested, we - can move everything at once. Otherwise we have to move them - one by one and squeeze out the block notes. */ - if (debug_blocks == 0) - reorder_insns (start_move, etc_note, get_last_insn ()); - else - { - rtx insn, next_insn; - for (insn = start_move; insn; insn = next_insn) - { - /* Figure out which insn comes after this one. We have - to do this before we move INSN. */ - next_insn = (insn == etc_note ? NULL : NEXT_INSN (insn)); - - if (GET_CODE (insn) == NOTE - && (NOTE_LINE_NUMBER (insn) == NOTE_INSN_BLOCK_BEG - || NOTE_LINE_NUMBER (insn) == NOTE_INSN_BLOCK_END)) - continue; - - reorder_insns (insn, insn, get_last_insn ()); - } - } - - /* Add the jump from the top of the loop. */ - emit_jump_insn_before (gen_jump (start_label), top_label); - emit_barrier_before (top_label); - start_label = top_label; - } - - emit_jump (start_label); - emit_note (NOTE_INSN_LOOP_END); - emit_label (loop_stack->data.loop.end_label); - - POPSTACK (loop_stack); - - clear_last_expr (); -} - -/* Finish a null loop, aka do { } while (0). */ - -void -expand_end_null_loop (void) -{ - do_pending_stack_adjust (); - emit_label (loop_stack->data.loop.end_label); - - POPSTACK (loop_stack); - - clear_last_expr (); -} - -/* Generate a jump to the current loop's continue-point. - This is usually the top of the loop, but may be specified - explicitly elsewhere. If not currently inside a loop, - return 0 and do nothing; caller will print an error message. */ - -int -expand_continue_loop (struct nesting *whichloop) -{ - /* Emit information for branch prediction. */ - rtx note; - - if (flag_guess_branch_prob) - { - note = emit_note (NOTE_INSN_PREDICTION); - NOTE_PREDICTION (note) = NOTE_PREDICT (PRED_CONTINUE, IS_TAKEN); - } - clear_last_expr (); - if (whichloop == 0) - whichloop = loop_stack; - if (whichloop == 0) - return 0; - expand_goto_internal (NULL_TREE, whichloop->data.loop.continue_label, - NULL_RTX); - return 1; -} - -/* Generate a jump to exit the current loop. If not currently inside a loop, - return 0 and do nothing; caller will print an error message. */ - -int -expand_exit_loop (struct nesting *whichloop) -{ - clear_last_expr (); - if (whichloop == 0) - whichloop = loop_stack; - if (whichloop == 0) - return 0; - expand_goto_internal (NULL_TREE, whichloop->data.loop.end_label, NULL_RTX); - return 1; -} - -/* Generate a conditional jump to exit the current loop if COND - evaluates to zero. If not currently inside a loop, - return 0 and do nothing; caller will print an error message. */ - -int -expand_exit_loop_if_false (struct nesting *whichloop, tree cond) -{ - rtx label; - clear_last_expr (); - - if (whichloop == 0) - whichloop = loop_stack; - if (whichloop == 0) - return 0; - - if (integer_nonzerop (cond)) - return 1; - if (integer_zerop (cond)) - return expand_exit_loop (whichloop); - - /* Check if we definitely won't need a fixup. */ - if (whichloop == nesting_stack) - { - jumpifnot (cond, whichloop->data.loop.end_label); - return 1; - } - - /* In order to handle fixups, we actually create a conditional jump - around an unconditional branch to exit the loop. If fixups are - necessary, they go before the unconditional branch. */ - - label = gen_label_rtx (); - jumpif (cond, label); - expand_goto_internal (NULL_TREE, whichloop->data.loop.end_label, - NULL_RTX); - emit_label (label); - - return 1; -} - -/* Like expand_exit_loop_if_false except also emit a note marking - the end of the conditional. Should only be used immediately - after expand_loop_start. */ - -int -expand_exit_loop_top_cond (struct nesting *whichloop, tree cond) -{ - if (! expand_exit_loop_if_false (whichloop, cond)) - return 0; - - emit_note (NOTE_INSN_LOOP_END_TOP_COND); - return 1; -} - /* Return nonzero if we should preserve sub-expressions as separate pseudos. We never do so if we aren't optimizing. We always do so - if -fexpensive-optimizations. - - Otherwise, we only do so if we are in the "early" part of a loop. I.e., - the loop may still be a small one. */ + if -fexpensive-optimizations. */ int preserve_subexpressions_p (void) { - rtx insn; - if (flag_expensive_optimizations) return 1; - if (optimize == 0 || cfun == 0 || cfun->stmt == 0 || loop_stack == 0) + if (optimize == 0 || cfun == 0 || cfun->stmt == 0) return 0; - insn = get_last_insn_anywhere (); - - return (insn - && (INSN_UID (insn) - INSN_UID (loop_stack->data.loop.start_label) - < n_non_fixed_regs * 3)); - + return 1; } -/* Generate a jump to exit the current loop, conditional, binding contour - or case statement. Not all such constructs are visible to this function, - only those started with EXIT_FLAG nonzero. Individual languages use - the EXIT_FLAG parameter to control which kinds of constructs you can - exit this way. - - If not currently inside anything that can be exited, - return 0 and do nothing; caller will print an error message. */ - -int -expand_exit_something (void) -{ - struct nesting *n; - clear_last_expr (); - for (n = nesting_stack; n; n = n->all) - if (n->exit_label != 0) - { - expand_goto_internal (NULL_TREE, n->exit_label, NULL_RTX); - return 1; - } - - return 0; -} /* Generate RTL to return from the current function, with no value. (That is, we do not do anything about returning any value.) */ @@ -2888,6 +2480,26 @@ expand_null_return (void) expand_null_return_1 (last_insn); } +/* Generate RTL to return directly from the current function. + (That is, we bypass any return value.) */ + +void +expand_naked_return (void) +{ + rtx last_insn, end_label; + + last_insn = get_last_insn (); + end_label = naked_return_label; + + clear_pending_stack_adjust (); + do_pending_stack_adjust (); + clear_last_expr (); + + if (end_label == 0) + end_label = naked_return_label = gen_label_rtx (); + expand_goto_internal (NULL_TREE, end_label, last_insn); +} + /* Try to guess whether the value of return means error code. */ static enum br_predictor return_prediction (rtx val) @@ -2916,6 +2528,34 @@ return_prediction (rtx val) return PRED_NO_PREDICTION; } + +/* If the current function returns values in the most significant part + of a register, shift return value VAL appropriately. The mode of + the function's return type is known not to be BLKmode. */ + +static rtx +shift_return_value (rtx val) +{ + tree type; + + type = TREE_TYPE (DECL_RESULT (current_function_decl)); + if (targetm.calls.return_in_msb (type)) + { + rtx target; + HOST_WIDE_INT shift; + + target = DECL_RTL (DECL_RESULT (current_function_decl)); + shift = (GET_MODE_BITSIZE (GET_MODE (target)) + - BITS_PER_UNIT * int_size_in_bytes (type)); + if (shift > 0) + val = expand_binop (GET_MODE (target), ashl_optab, + gen_lowpart (GET_MODE (target), val), + GEN_INT (shift), target, 1, OPTAB_WIDEN); + } + return val; +} + + /* Generate RTL to return from the current function, with value VAL. */ static void @@ -2946,18 +2586,19 @@ expand_value_return (rtx val) if (return_reg != val) { tree type = TREE_TYPE (DECL_RESULT (current_function_decl)); -#ifdef PROMOTE_FUNCTION_RETURN - int unsignedp = TREE_UNSIGNED (type); - enum machine_mode old_mode - = DECL_MODE (DECL_RESULT (current_function_decl)); - enum machine_mode mode - = promote_mode (type, old_mode, &unsignedp, 1); - - if (mode != old_mode) - val = convert_modes (mode, old_mode, val, unsignedp); -#endif + if (targetm.calls.promote_function_return (TREE_TYPE (current_function_decl))) + { + int unsignedp = TYPE_UNSIGNED (type); + enum machine_mode old_mode + = DECL_MODE (DECL_RESULT (current_function_decl)); + enum machine_mode mode + = promote_mode (type, old_mode, &unsignedp, 1); + + if (mode != old_mode) + val = convert_modes (mode, old_mode, val, unsignedp); + } if (GET_CODE (return_reg) == PARALLEL) - emit_group_load (return_reg, val, int_size_in_bytes (type)); + emit_group_load (return_reg, val, type, int_size_in_bytes (type)); else emit_move_insn (return_reg, val); } @@ -3022,11 +2663,8 @@ expand_return (tree retval) else if ((TREE_CODE (retval) == MODIFY_EXPR || TREE_CODE (retval) == INIT_EXPR) && TREE_CODE (TREE_OPERAND (retval, 0)) == RESULT_DECL) retval_rhs = TREE_OPERAND (retval, 1); - else if (VOID_TYPE_P (TREE_TYPE (retval))) - /* Recognize tail-recursive call to void function. */ - retval_rhs = retval; else - retval_rhs = NULL_TREE; + retval_rhs = retval; last_insn = get_last_insn (); @@ -3079,13 +2717,13 @@ expand_return (tree retval) { int i; unsigned HOST_WIDE_INT bitpos, xbitpos; - unsigned HOST_WIDE_INT big_endian_correction = 0; + unsigned HOST_WIDE_INT padding_correction = 0; unsigned HOST_WIDE_INT bytes = int_size_in_bytes (TREE_TYPE (retval_rhs)); int n_regs = (bytes + UNITS_PER_WORD - 1) / UNITS_PER_WORD; unsigned int bitsize = MIN (TYPE_ALIGN (TREE_TYPE (retval_rhs)), BITS_PER_WORD); - rtx *result_pseudos = (rtx *) alloca (sizeof (rtx) * n_regs); + rtx *result_pseudos = alloca (sizeof (rtx) * n_regs); rtx result_reg, src = NULL_RTX, dst = NULL_RTX; rtx result_val = expand_expr (retval_rhs, NULL_RTX, VOIDmode, 0); enum machine_mode tmpmode, result_reg_mode; @@ -3096,25 +2734,33 @@ expand_return (tree retval) return; } - /* Structures whose size is not a multiple of a word are aligned - to the least significant byte (to the right). On a BYTES_BIG_ENDIAN - machine, this means we must skip the empty high order bytes when - calculating the bit offset. */ - if (BYTES_BIG_ENDIAN - && bytes % UNITS_PER_WORD) - big_endian_correction = (BITS_PER_WORD - ((bytes % UNITS_PER_WORD) - * BITS_PER_UNIT)); + /* If the structure doesn't take up a whole number of words, see + whether the register value should be padded on the left or on + the right. Set PADDING_CORRECTION to the number of padding + bits needed on the left side. + + In most ABIs, the structure will be returned at the least end of + the register, which translates to right padding on little-endian + targets and left padding on big-endian targets. The opposite + holds if the structure is returned at the most significant + end of the register. */ + if (bytes % UNITS_PER_WORD != 0 + && (targetm.calls.return_in_msb (TREE_TYPE (retval_rhs)) + ? !BYTES_BIG_ENDIAN + : BYTES_BIG_ENDIAN)) + padding_correction = (BITS_PER_WORD - ((bytes % UNITS_PER_WORD) + * BITS_PER_UNIT)); /* Copy the structure BITSIZE bits at a time. */ - for (bitpos = 0, xbitpos = big_endian_correction; + for (bitpos = 0, xbitpos = padding_correction; bitpos < bytes * BITS_PER_UNIT; bitpos += bitsize, xbitpos += bitsize) { /* We need a new destination pseudo each time xbitpos is - on a word boundary and when xbitpos == big_endian_correction + on a word boundary and when xbitpos == padding_correction (the first time through). */ if (xbitpos % BITS_PER_WORD == 0 - || xbitpos == big_endian_correction) + || xbitpos == padding_correction) { /* Generate an appropriate register. */ dst = gen_reg_rtx (word_mode); @@ -3141,21 +2787,25 @@ expand_return (tree retval) BITS_PER_WORD); } - /* Find the smallest integer mode large enough to hold the - entire structure and use that mode instead of BLKmode - on the USE insn for the return register. */ - for (tmpmode = GET_CLASS_NARROWEST_MODE (MODE_INT); - tmpmode != VOIDmode; - tmpmode = GET_MODE_WIDER_MODE (tmpmode)) - /* Have we found a large enough mode? */ - if (GET_MODE_SIZE (tmpmode) >= bytes) - break; + tmpmode = GET_MODE (result_rtl); + if (tmpmode == BLKmode) + { + /* Find the smallest integer mode large enough to hold the + entire structure and use that mode instead of BLKmode + on the USE insn for the return register. */ + for (tmpmode = GET_CLASS_NARROWEST_MODE (MODE_INT); + tmpmode != VOIDmode; + tmpmode = GET_MODE_WIDER_MODE (tmpmode)) + /* Have we found a large enough mode? */ + if (GET_MODE_SIZE (tmpmode) >= bytes) + break; - /* No suitable mode found. */ - if (tmpmode == VOIDmode) - abort (); + /* No suitable mode found. */ + if (tmpmode == VOIDmode) + abort (); - PUT_MODE (result_rtl, tmpmode); + PUT_MODE (result_rtl, tmpmode); + } if (GET_MODE_SIZE (tmpmode) < GET_MODE_SIZE (word_mode)) result_reg_mode = word_mode; @@ -3188,7 +2838,7 @@ expand_return (tree retval) val = force_not_mem (val); emit_queue (); /* Return the calculated value, doing cleanups first. */ - expand_value_return (val); + expand_value_return (shift_return_value (val)); } else { @@ -3249,8 +2899,8 @@ tail_recursion_args (tree actuals, tree formals) for (a = actuals, f = formals, i = 0; a && f; a = TREE_CHAIN (a), f = TREE_CHAIN (f), i++) { - if (TYPE_MAIN_VARIANT (TREE_TYPE (TREE_VALUE (a))) - != TYPE_MAIN_VARIANT (TREE_TYPE (f))) + if (!lang_hooks.types_compatible_p (TREE_TYPE (TREE_VALUE (a)), + TREE_TYPE (f))) return 0; if (GET_CODE (DECL_RTL (f)) != REG || DECL_MODE (f) == BLKmode) return 0; @@ -3260,7 +2910,7 @@ tail_recursion_args (tree actuals, tree formals) /* Compute all the actuals. */ - argvec = (rtx *) alloca (i * sizeof (rtx)); + argvec = alloca (i * sizeof (rtx)); for (a = actuals, i = 0; a; a = TREE_CHAIN (a), i++) argvec[i] = expand_expr (TREE_VALUE (a), NULL_RTX, VOIDmode, 0); @@ -3292,7 +2942,7 @@ tail_recursion_args (tree actuals, tree formals) else { rtx tmp = argvec[i]; - int unsignedp = TREE_UNSIGNED (TREE_TYPE (TREE_VALUE (a))); + int unsignedp = TYPE_UNSIGNED (TREE_TYPE (TREE_VALUE (a))); promote_mode(TREE_TYPE (TREE_VALUE (a)), GET_MODE (tmp), &unsignedp, 0); if (DECL_MODE (f) != GET_MODE (DECL_RTL (f))) @@ -3342,7 +2992,7 @@ expand_start_bindings_and_block (int flags, tree block) abort (); /* Create a note to mark the beginning of the block. */ - if (block_flag) + if (block_flag && !cfun->dont_emit_block_notes) { note = emit_note (NOTE_INSN_BLOCK_BEG); NOTE_BLOCK (note) = block; @@ -3472,34 +3122,19 @@ current_nesting_level (void) return cfun ? block_stack : 0; } -/* Emit a handler label for a nonlocal goto handler. - Also emit code to store the handler label in SLOT before BEFORE_INSN. */ - -static rtx -expand_nl_handler_label (rtx slot, rtx before_insn) -{ - rtx insns; - rtx handler_label = gen_label_rtx (); - - /* Don't let cleanup_cfg delete the handler. */ - LABEL_PRESERVE_P (handler_label) = 1; - - start_sequence (); - emit_move_insn (slot, gen_rtx_LABEL_REF (Pmode, handler_label)); - insns = get_insns (); - end_sequence (); - emit_insn_before (insns, before_insn); - - emit_label (handler_label); - - return handler_label; -} - /* Emit code to restore vital registers at the beginning of a nonlocal goto handler. */ static void expand_nl_goto_receiver (void) { + /* Clobber the FP when we get here, so we have to make sure it's + marked as used by this function. */ + emit_insn (gen_rtx_USE (VOIDmode, hard_frame_pointer_rtx)); + + /* Mark the static chain as clobbered here so life information + doesn't get messed up for it. */ + emit_insn (gen_rtx_CLOBBER (VOIDmode, static_chain_rtx)); + #ifdef HAVE_nonlocal_goto if (! HAVE_nonlocal_goto) #endif @@ -3548,82 +3183,13 @@ expand_nl_goto_receiver (void) if (HAVE_nonlocal_goto_receiver) emit_insn (gen_nonlocal_goto_receiver ()); #endif -} - -/* Make handlers for nonlocal gotos taking place in the function calls in - block THISBLOCK. */ - -static void -expand_nl_goto_receivers (struct nesting *thisblock) -{ - tree link; - rtx afterward = gen_label_rtx (); - rtx insns, slot; - rtx label_list; - int any_invalid; - - /* Record the handler address in the stack slot for that purpose, - during this block, saving and restoring the outer value. */ - if (thisblock->next != 0) - for (slot = nonlocal_goto_handler_slots; slot; slot = XEXP (slot, 1)) - { - rtx save_receiver = gen_reg_rtx (Pmode); - emit_move_insn (XEXP (slot, 0), save_receiver); - - start_sequence (); - emit_move_insn (save_receiver, XEXP (slot, 0)); - insns = get_insns (); - end_sequence (); - emit_insn_before (insns, thisblock->data.block.first_insn); - } - - /* Jump around the handlers; they run only when specially invoked. */ - emit_jump (afterward); - - /* Make a separate handler for each label. */ - link = nonlocal_labels; - slot = nonlocal_goto_handler_slots; - label_list = NULL_RTX; - for (; link; link = TREE_CHAIN (link), slot = XEXP (slot, 1)) - /* Skip any labels we shouldn't be able to jump to from here, - we generate one special handler for all of them below which just calls - abort. */ - if (! DECL_TOO_LATE (TREE_VALUE (link))) - { - rtx lab; - lab = expand_nl_handler_label (XEXP (slot, 0), - thisblock->data.block.first_insn); - label_list = gen_rtx_EXPR_LIST (VOIDmode, lab, label_list); - - expand_nl_goto_receiver (); - - /* Jump to the "real" nonlocal label. */ - expand_goto (TREE_VALUE (link)); - } - - /* A second pass over all nonlocal labels; this time we handle those - we should not be able to jump to at this point. */ - link = nonlocal_labels; - slot = nonlocal_goto_handler_slots; - any_invalid = 0; - for (; link; link = TREE_CHAIN (link), slot = XEXP (slot, 1)) - if (DECL_TOO_LATE (TREE_VALUE (link))) - { - rtx lab; - lab = expand_nl_handler_label (XEXP (slot, 0), - thisblock->data.block.first_insn); - label_list = gen_rtx_EXPR_LIST (VOIDmode, lab, label_list); - any_invalid = 1; - } - - if (any_invalid) - { - expand_nl_goto_receiver (); - expand_builtin_trap (); - } - nonlocal_goto_handler_labels = label_list; - emit_label (afterward); + /* @@@ This is a kludge. Not all machine descriptions define a blockage + insn, but we must not allow the code we just generated to be reordered + by scheduling. Specifically, the update of the frame pointer must + happen immediately, not later. So emit an ASM_INPUT to act as blockage + insn. */ + emit_insn (gen_rtx_ASM_INPUT (VOIDmode, "")); } /* Warn about any unused VARS (which may contain nodes other than @@ -3641,7 +3207,7 @@ warn_about_unused_variables (tree vars) && ! TREE_USED (decl) && ! DECL_IN_SYSTEM_HEADER (decl) && DECL_NAME (decl) && ! DECL_ARTIFICIAL (decl)) - warning_with_decl (decl, "unused variable `%s'"); + warning ("%Junused variable '%D'", decl, decl); } /* Generate RTL code to terminate a binding contour. @@ -3673,18 +3239,6 @@ expand_end_bindings (tree vars, int mark_ends, int dont_jump_in) emit_label (thisblock->exit_label); } - /* If necessary, make handlers for nonlocal gotos taking - place in the function calls in this block. */ - if (function_call_count != 0 && nonlocal_labels - /* Make handler for outermost block - if there were any nonlocal gotos to this function. */ - && (thisblock->next == 0 ? current_function_has_nonlocal_label - /* Make handler for inner block if it has something - special to do when you jump out of it. */ - : (thisblock->data.block.cleanups != 0 - || thisblock->data.block.stack_level != 0))) - expand_nl_goto_receivers (thisblock); - /* Don't allow jumping into a block that has a stack level. Cleanups are allowed, though. */ if (dont_jump_in > 0 @@ -3701,8 +3255,8 @@ expand_end_bindings (tree vars, int mark_ends, int dont_jump_in) that must be an error, because gotos without fixups come from outside all saved stack-levels. */ if (TREE_ADDRESSABLE (chain->label)) - error_with_decl (chain->label, - "label `%s' used before containing binding contour"); + error ("%Jlabel '%D' used before containing binding contour", + chain->label, chain->label); } } @@ -3719,6 +3273,7 @@ expand_end_bindings (tree vars, int mark_ends, int dont_jump_in) /* Don't let cleanups affect ({...}) constructs. */ int old_expr_stmts_for_value = expr_stmts_for_value; rtx old_last_expr_value = last_expr_value; + rtx old_last_expr_alt_rtl = last_expr_alt_rtl; tree old_last_expr_type = last_expr_type; expr_stmts_for_value = 0; @@ -3735,6 +3290,7 @@ expand_end_bindings (tree vars, int mark_ends, int dont_jump_in) expr_stmts_for_value = old_expr_stmts_for_value; last_expr_value = old_last_expr_value; + last_expr_alt_rtl = old_last_expr_alt_rtl; last_expr_type = old_last_expr_type; /* Restore the stack level. */ @@ -3743,9 +3299,8 @@ expand_end_bindings (tree vars, int mark_ends, int dont_jump_in) { emit_stack_restore (thisblock->next ? SAVE_BLOCK : SAVE_FUNCTION, thisblock->data.block.stack_level, NULL_RTX); - if (nonlocal_goto_handler_slots != 0) - emit_stack_save (SAVE_NONLOCAL, &nonlocal_goto_stack_level, - NULL_RTX); + if (cfun->nonlocal_goto_save_area) + update_nonlocal_goto_save_area (); } /* Any gotos out of this block must also do these things. @@ -3762,7 +3317,7 @@ expand_end_bindings (tree vars, int mark_ends, int dont_jump_in) We do this now, after running cleanups on the variables just going out of scope, so they are in scope for their cleanups. */ - if (mark_ends) + if (mark_ends && !cfun->dont_emit_block_notes) { rtx note = emit_note (NOTE_INSN_BLOCK_END); NOTE_BLOCK (note) = NOTE_BLOCK (thisblock->data.block.first_insn); @@ -3861,7 +3416,7 @@ expand_decl (tree decl) && (DECL_REGISTER (decl) || DECL_ARTIFICIAL (decl) || optimize)) { /* Automatic variable that can go in a register. */ - int unsignedp = TREE_UNSIGNED (type); + int unsignedp = TYPE_UNSIGNED (type); enum machine_mode reg_mode = promote_mode (type, DECL_MODE (decl), &unsignedp, 0); @@ -3929,13 +3484,8 @@ expand_decl (tree decl) do_pending_stack_adjust (); save_stack_pointer (); - /* In function-at-a-time mode, variable_size doesn't expand this, - so do it now. */ - if (TREE_CODE (type) == ARRAY_TYPE && TYPE_DOMAIN (type)) - expand_expr (TYPE_MAX_VALUE (TYPE_DOMAIN (type)), - const0_rtx, VOIDmode, 0); - - /* Compute the variable's size, in bytes. */ + /* Compute the variable's size, in bytes. This will expand any + needed SAVE_EXPRs for the first time. */ size = expand_expr (DECL_SIZE_UNIT (decl), NULL_RTX, VOIDmode, 0); free_temp_slots (); @@ -3962,6 +3512,66 @@ expand_decl (tree decl) } } +/* Emit code to allocate T_SIZE bytes of dynamic stack space for ALLOC. */ +void +expand_stack_alloc (tree alloc, tree t_size) +{ + rtx address, dest, size; + tree var, type; + + if (TREE_CODE (alloc) != ADDR_EXPR) + abort (); + var = TREE_OPERAND (alloc, 0); + if (TREE_CODE (var) != VAR_DECL) + abort (); + + type = TREE_TYPE (var); + + /* In function-at-a-time mode, variable_size doesn't expand this, + so do it now. */ + if (TREE_CODE (type) == ARRAY_TYPE && TYPE_DOMAIN (type)) + expand_expr (TYPE_MAX_VALUE (TYPE_DOMAIN (type)), + const0_rtx, VOIDmode, 0); + + /* Compute the variable's size, in bytes. */ + size = expand_expr (t_size, NULL_RTX, VOIDmode, 0); + free_temp_slots (); + + /* Allocate space on the stack for the variable. */ + address = XEXP (DECL_RTL (var), 0); + dest = allocate_dynamic_stack_space (size, address, TYPE_ALIGN (type)); + if (dest != address) + emit_move_insn (address, dest); + + /* Indicate the alignment we actually gave this variable. */ +#ifdef STACK_BOUNDARY + DECL_ALIGN (var) = STACK_BOUNDARY; +#else + DECL_ALIGN (var) = BIGGEST_ALIGNMENT; +#endif + DECL_USER_ALIGN (var) = 0; +} + +/* Emit code to save the current value of stack. */ +rtx +expand_stack_save (void) +{ + rtx ret = NULL_RTX; + + do_pending_stack_adjust (); + emit_stack_save (SAVE_BLOCK, &ret, NULL_RTX); + return ret; +} + +/* Emit code to restore the current value of stack. */ +void +expand_stack_restore (tree var) +{ + rtx sa = DECL_RTL (var); + + emit_stack_restore (SAVE_BLOCK, sa, NULL_RTX); +} + /* Emit code to perform the initialization of a declaration DECL. */ void @@ -3986,13 +3596,13 @@ expand_decl_init (tree decl) if (code == INTEGER_TYPE || code == REAL_TYPE || code == ENUMERAL_TYPE || code == POINTER_TYPE || code == REFERENCE_TYPE) expand_assignment (decl, convert (TREE_TYPE (decl), integer_zero_node), - 0, 0); + 0); emit_queue (); } else if (DECL_INITIAL (decl) && TREE_CODE (DECL_INITIAL (decl)) != TREE_LIST) { - emit_line_note (DECL_SOURCE_FILE (decl), DECL_SOURCE_LINE (decl)); - expand_assignment (decl, DECL_INITIAL (decl), 0, 0); + emit_line_note (DECL_SOURCE_LOCATION (decl)); + expand_assignment (decl, DECL_INITIAL (decl), 0); emit_queue (); } @@ -4054,12 +3664,12 @@ expand_decl_cleanup (tree decl, tree cleanup) emit_move_insn (flag, const1_rtx); cond = build_decl (VAR_DECL, NULL_TREE, - (*lang_hooks.types.type_for_mode) (word_mode, 1)); + lang_hooks.types.type_for_mode (word_mode, 1)); SET_DECL_RTL (cond, flag); /* Conditionalize the cleanup. */ cleanup = build (COND_EXPR, void_type_node, - (*lang_hooks.truthvalue_conversion) (cond), + lang_hooks.truthvalue_conversion (cond), cleanup, integer_zero_node); cleanup = fold (cleanup); @@ -4285,6 +3895,23 @@ last_cleanup_this_contour (void) return block_stack->data.block.cleanups; } + +/* Return nonzero if any containing block has a stack level or + cleanups. */ + +int +containing_blocks_have_cleanups_or_stack_level (void) +{ + struct nesting *block; + + for (block = block_stack; block; block = block->next) + if (block->data.block.stack_level != 0 + || block->data.block.cleanups != 0) + return 1; + + return 0; +} + /* Return 1 if there are any pending cleanups at this point. Check the current contour as well as contours that enclose the current contour. */ @@ -4356,32 +3983,6 @@ expand_start_case (int exit_flag, tree expr, tree type, start_cleanup_deferral (); } - -/* Start a "dummy case statement" within which case labels are invalid - and are not connected to any larger real case statement. - This can be used if you don't want to let a case statement jump - into the middle of certain kinds of constructs. */ - -void -expand_start_case_dummy (void) -{ - struct nesting *thiscase = ALLOC_NESTING (); - - /* Make an entry on case_stack for the dummy. */ - - thiscase->desc = CASE_NESTING; - thiscase->next = case_stack; - thiscase->all = nesting_stack; - thiscase->depth = ++nesting_depth; - thiscase->exit_label = 0; - thiscase->data.case_stmt.case_list = 0; - thiscase->data.case_stmt.start = 0; - thiscase->data.case_stmt.nominal_type = 0; - thiscase->data.case_stmt.default_label = 0; - case_stack = thiscase; - nesting_stack = thiscase; - start_cleanup_deferral (); -} static void check_seenlabel (void) @@ -4473,7 +4074,7 @@ pushcase (tree value, tree (*converter) (tree, tree), tree label, || ! int_fits_type_p (value, index_type))) return 3; - return add_case_node (value, value, label, duplicate); + return add_case_node (value, value, label, duplicate, false); } /* Like pushcase but this case applies to all values between VALUE1 and @@ -4539,7 +4140,7 @@ pushcase_range (tree value1, tree value2, tree (*converter) (tree, tree), || ! int_fits_type_p (value2, index_type)) return 3; - return add_case_node (value1, value2, label, duplicate); + return add_case_node (value1, value2, label, duplicate, false); } /* Do the actual insertion of a case label for pushcase and pushcase_range @@ -4547,7 +4148,8 @@ pushcase_range (tree value1, tree value2, tree (*converter) (tree, tree), slowdown for large switch statements. */ int -add_case_node (tree low, tree high, tree label, tree *duplicate) +add_case_node (tree low, tree high, tree label, tree *duplicate, + bool dont_expand_label) { struct case_node *p, **q, *r; @@ -4566,7 +4168,8 @@ add_case_node (tree low, tree high, tree label, tree *duplicate) return 2; } case_stack->data.case_stmt.default_label = label; - expand_label (label); + if (!dont_expand_label) + expand_label (label); return 0; } @@ -4595,7 +4198,7 @@ add_case_node (tree low, tree high, tree label, tree *duplicate) /* Add this label to the chain, and succeed. */ - r = (struct case_node *) ggc_alloc (sizeof (struct case_node)); + r = ggc_alloc (sizeof (struct case_node)); r->low = low; /* If the bounds are equal, turn this into the one-value case. */ @@ -4605,7 +4208,8 @@ add_case_node (tree low, tree high, tree label, tree *duplicate) r->high = high; r->code_label = label; - expand_label (label); + if (!dont_expand_label) + expand_label (label); *q = r; r->parent = p; @@ -4782,327 +4386,6 @@ add_case_node (tree low, tree high, tree label, tree *duplicate) return 0; } -/* Returns the number of possible values of TYPE. - Returns -1 if the number is unknown, variable, or if the number does not - fit in a HOST_WIDE_INT. - Sets *SPARSENESS to 2 if TYPE is an ENUMERAL_TYPE whose values - do not increase monotonically (there may be duplicates); - to 1 if the values increase monotonically, but not always by 1; - otherwise sets it to 0. */ - -HOST_WIDE_INT -all_cases_count (tree type, int *sparseness) -{ - tree t; - HOST_WIDE_INT count, minval, lastval; - - *sparseness = 0; - - switch (TREE_CODE (type)) - { - case BOOLEAN_TYPE: - count = 2; - break; - - case CHAR_TYPE: - count = 1 << BITS_PER_UNIT; - break; - - default: - case INTEGER_TYPE: - if (TYPE_MAX_VALUE (type) != 0 - && 0 != (t = fold (build (MINUS_EXPR, type, TYPE_MAX_VALUE (type), - TYPE_MIN_VALUE (type)))) - && 0 != (t = fold (build (PLUS_EXPR, type, t, - convert (type, integer_zero_node)))) - && host_integerp (t, 1)) - count = tree_low_cst (t, 1); - else - return -1; - break; - - case ENUMERAL_TYPE: - /* Don't waste time with enumeral types with huge values. */ - if (! host_integerp (TYPE_MIN_VALUE (type), 0) - || TYPE_MAX_VALUE (type) == 0 - || ! host_integerp (TYPE_MAX_VALUE (type), 0)) - return -1; - - lastval = minval = tree_low_cst (TYPE_MIN_VALUE (type), 0); - count = 0; - - for (t = TYPE_VALUES (type); t != NULL_TREE; t = TREE_CHAIN (t)) - { - HOST_WIDE_INT thisval = tree_low_cst (TREE_VALUE (t), 0); - - if (*sparseness == 2 || thisval <= lastval) - *sparseness = 2; - else if (thisval != minval + count) - *sparseness = 1; - - lastval = thisval; - count++; - } - } - - return count; -} - -#define BITARRAY_TEST(ARRAY, INDEX) \ - ((ARRAY)[(unsigned) (INDEX) / HOST_BITS_PER_CHAR]\ - & (1 << ((unsigned) (INDEX) % HOST_BITS_PER_CHAR))) -#define BITARRAY_SET(ARRAY, INDEX) \ - ((ARRAY)[(unsigned) (INDEX) / HOST_BITS_PER_CHAR]\ - |= 1 << ((unsigned) (INDEX) % HOST_BITS_PER_CHAR)) - -/* Set the elements of the bitstring CASES_SEEN (which has length COUNT), - with the case values we have seen, assuming the case expression - has the given TYPE. - SPARSENESS is as determined by all_cases_count. - - The time needed is proportional to COUNT, unless - SPARSENESS is 2, in which case quadratic time is needed. */ - -void -mark_seen_cases (tree type, unsigned char *cases_seen, HOST_WIDE_INT count, - int sparseness) -{ - tree next_node_to_try = NULL_TREE; - HOST_WIDE_INT next_node_offset = 0; - - struct case_node *n, *root = case_stack->data.case_stmt.case_list; - tree val = make_node (INTEGER_CST); - - TREE_TYPE (val) = type; - if (! root) - /* Do nothing. */ - ; - else if (sparseness == 2) - { - tree t; - unsigned HOST_WIDE_INT xlo; - - /* This less efficient loop is only needed to handle - duplicate case values (multiple enum constants - with the same value). */ - TREE_TYPE (val) = TREE_TYPE (root->low); - for (t = TYPE_VALUES (type), xlo = 0; t != NULL_TREE; - t = TREE_CHAIN (t), xlo++) - { - TREE_INT_CST_LOW (val) = TREE_INT_CST_LOW (TREE_VALUE (t)); - TREE_INT_CST_HIGH (val) = TREE_INT_CST_HIGH (TREE_VALUE (t)); - n = root; - do - { - /* Keep going past elements distinctly greater than VAL. */ - if (tree_int_cst_lt (val, n->low)) - n = n->left; - - /* or distinctly less than VAL. */ - else if (tree_int_cst_lt (n->high, val)) - n = n->right; - - else - { - /* We have found a matching range. */ - BITARRAY_SET (cases_seen, xlo); - break; - } - } - while (n); - } - } - else - { - if (root->left) - case_stack->data.case_stmt.case_list = root = case_tree2list (root, 0); - - for (n = root; n; n = n->right) - { - TREE_INT_CST_LOW (val) = TREE_INT_CST_LOW (n->low); - TREE_INT_CST_HIGH (val) = TREE_INT_CST_HIGH (n->low); - while (! tree_int_cst_lt (n->high, val)) - { - /* Calculate (into xlo) the "offset" of the integer (val). - The element with lowest value has offset 0, the next smallest - element has offset 1, etc. */ - - unsigned HOST_WIDE_INT xlo; - HOST_WIDE_INT xhi; - tree t; - - if (sparseness && TYPE_VALUES (type) != NULL_TREE) - { - /* The TYPE_VALUES will be in increasing order, so - starting searching where we last ended. */ - t = next_node_to_try; - xlo = next_node_offset; - xhi = 0; - for (;;) - { - if (t == NULL_TREE) - { - t = TYPE_VALUES (type); - xlo = 0; - } - if (tree_int_cst_equal (val, TREE_VALUE (t))) - { - next_node_to_try = TREE_CHAIN (t); - next_node_offset = xlo + 1; - break; - } - xlo++; - t = TREE_CHAIN (t); - if (t == next_node_to_try) - { - xlo = -1; - break; - } - } - } - else - { - t = TYPE_MIN_VALUE (type); - if (t) - neg_double (TREE_INT_CST_LOW (t), TREE_INT_CST_HIGH (t), - &xlo, &xhi); - else - xlo = xhi = 0; - add_double (xlo, xhi, - TREE_INT_CST_LOW (val), TREE_INT_CST_HIGH (val), - &xlo, &xhi); - } - - if (xhi == 0 && xlo < (unsigned HOST_WIDE_INT) count) - BITARRAY_SET (cases_seen, xlo); - - add_double (TREE_INT_CST_LOW (val), TREE_INT_CST_HIGH (val), - 1, 0, - &TREE_INT_CST_LOW (val), &TREE_INT_CST_HIGH (val)); - } - } - } -} - -/* Given a switch statement with an expression that is an enumeration - type, warn if any of the enumeration type's literals are not - covered by the case expressions of the switch. Also, warn if there - are any extra switch cases that are *not* elements of the - enumerated type. - - Historical note: - - At one stage this function would: ``If all enumeration literals - were covered by the case expressions, turn one of the expressions - into the default expression since it should not be possible to fall - through such a switch.'' - - That code has since been removed as: ``This optimization is - disabled because it causes valid programs to fail. ANSI C does not - guarantee that an expression with enum type will have a value that - is the same as one of the enumeration literals.'' */ - -void -check_for_full_enumeration_handling (tree type) -{ - struct case_node *n; - tree chain; - - /* True iff the selector type is a numbered set mode. */ - int sparseness = 0; - - /* The number of possible selector values. */ - HOST_WIDE_INT size; - - /* For each possible selector value. a one iff it has been matched - by a case value alternative. */ - unsigned char *cases_seen; - - /* The allocated size of cases_seen, in chars. */ - HOST_WIDE_INT bytes_needed; - - size = all_cases_count (type, &sparseness); - bytes_needed = (size + HOST_BITS_PER_CHAR) / HOST_BITS_PER_CHAR; - - if (size > 0 && size < 600000 - /* We deliberately use calloc here, not cmalloc, so that we can suppress - this optimization if we don't have enough memory rather than - aborting, as xmalloc would do. */ - && (cases_seen = - (unsigned char *) really_call_calloc (bytes_needed, 1)) != NULL) - { - HOST_WIDE_INT i; - tree v = TYPE_VALUES (type); - - /* The time complexity of this code is normally O(N), where - N being the number of members in the enumerated type. - However, if type is an ENUMERAL_TYPE whose values do not - increase monotonically, O(N*log(N)) time may be needed. */ - - mark_seen_cases (type, cases_seen, size, sparseness); - - for (i = 0; v != NULL_TREE && i < size; i++, v = TREE_CHAIN (v)) - if (BITARRAY_TEST (cases_seen, i) == 0) - warning ("enumeration value `%s' not handled in switch", - IDENTIFIER_POINTER (TREE_PURPOSE (v))); - - free (cases_seen); - } - - /* Now we go the other way around; we warn if there are case - expressions that don't correspond to enumerators. This can - occur since C and C++ don't enforce type-checking of - assignments to enumeration variables. */ - - if (case_stack->data.case_stmt.case_list - && case_stack->data.case_stmt.case_list->left) - case_stack->data.case_stmt.case_list - = case_tree2list (case_stack->data.case_stmt.case_list, 0); - for (n = case_stack->data.case_stmt.case_list; n; n = n->right) - { - for (chain = TYPE_VALUES (type); - chain && !tree_int_cst_equal (n->low, TREE_VALUE (chain)); - chain = TREE_CHAIN (chain)) - ; - - if (!chain) - { - if (TYPE_NAME (type) == 0) - warning ("case value `%ld' not in enumerated type", - (long) TREE_INT_CST_LOW (n->low)); - else - warning ("case value `%ld' not in enumerated type `%s'", - (long) TREE_INT_CST_LOW (n->low), - IDENTIFIER_POINTER ((TREE_CODE (TYPE_NAME (type)) - == IDENTIFIER_NODE) - ? TYPE_NAME (type) - : DECL_NAME (TYPE_NAME (type)))); - } - if (!tree_int_cst_equal (n->low, n->high)) - { - for (chain = TYPE_VALUES (type); - chain && !tree_int_cst_equal (n->high, TREE_VALUE (chain)); - chain = TREE_CHAIN (chain)) - ; - - if (!chain) - { - if (TYPE_NAME (type) == 0) - warning ("case value `%ld' not in enumerated type", - (long) TREE_INT_CST_LOW (n->high)); - else - warning ("case value `%ld' not in enumerated type `%s'", - (long) TREE_INT_CST_LOW (n->high), - IDENTIFIER_POINTER ((TREE_CODE (TYPE_NAME (type)) - == IDENTIFIER_NODE) - ? TYPE_NAME (type) - : DECL_NAME (TYPE_NAME (type)))); - } - } - } -} - - /* Maximum number of case bit tests. */ #define MAX_CASE_BIT_TESTS 3 @@ -5130,7 +4413,8 @@ struct case_bit_test /* Determine whether "1 << x" is relatively cheap in word_mode. */ -static bool lshift_cheap_p () +static +bool lshift_cheap_p (void) { static bool init = false; static bool cheap = true; @@ -5150,9 +4434,8 @@ static bool lshift_cheap_p () number of case nodes, i.e. the node with the most cases gets tested first. */ -static int case_bit_test_cmp (p1, p2) - const void *p1; - const void *p2; +static +int case_bit_test_cmp (const void *p1, const void *p2) { const struct case_bit_test *d1 = p1; const struct case_bit_test *d2 = p2; @@ -5249,6 +4532,14 @@ emit_case_bit_tests (tree index_type, tree index_expr, tree minval, emit_jump (default_label); } +#ifndef HAVE_casesi +#define HAVE_casesi 0 +#endif + +#ifndef HAVE_tablejump +#define HAVE_tablejump 0 +#endif + /* Terminate a case (Pascal) or switch (C) statement in which ORIG_INDEX is the expression to be tested. If ORIG_TYPE is not NULL, it is the original ORIG_INDEX @@ -5279,7 +4570,7 @@ expand_end_case_type (tree orig_index, tree orig_type) index_expr = thiscase->data.case_stmt.index_expr; index_type = TREE_TYPE (index_expr); - unsignedp = TREE_UNSIGNED (index_type); + unsignedp = TYPE_UNSIGNED (index_type); if (orig_type == NULL) orig_type = TREE_TYPE (orig_index); @@ -5297,19 +4588,6 @@ expand_end_case_type (tree orig_index, tree orig_type) /* An ERROR_MARK occurs for various reasons including invalid data type. */ if (index_type != error_mark_node) { - /* If the switch expression was an enumerated type, check that - exactly all enumeration literals are covered by the cases. - The check is made when -Wswitch was specified and there is no - default case, or when -Wswitch-enum was specified. */ - if (((warn_switch && !thiscase->data.case_stmt.default_label) - || warn_switch_enum) - && TREE_CODE (orig_type) == ENUMERAL_TYPE - && TREE_CODE (index_expr) != INTEGER_CST) - check_for_full_enumeration_handling (orig_type); - - if (warn_switch_default && !thiscase->data.case_stmt.default_label) - warning ("switch missing default case"); - /* If we don't have a default-label, create one here, after the body of the switch. */ if (thiscase->data.case_stmt.default_label == 0) @@ -5429,14 +4707,18 @@ expand_end_case_type (tree orig_index, tree orig_type) because we can optimize it. */ else if (count < case_values_threshold () - || compare_tree_int (range, 10 * count) > 0 + || compare_tree_int (range, + (optimize_size ? 3 : 10) * count) > 0 /* RANGE may be signed, and really large ranges will show up as negative numbers. */ || compare_tree_int (range, 0) < 0 #ifndef ASM_OUTPUT_ADDR_DIFF_ELT || flag_pic #endif - || TREE_CONSTANT (index_expr)) + || TREE_CONSTANT (index_expr) + /* If neither casesi or tablejump is available, we can + only go this way. */ + || (!HAVE_casesi && !HAVE_tablejump)) { index = expand_expr (index_expr, NULL_RTX, VOIDmode, 0); @@ -5543,8 +4825,8 @@ expand_end_case_type (tree orig_index, tree orig_type) /* Get table of labels to jump to, in order of case index. */ ncases = tree_low_cst (range, 0) + 1; - labelvec = (rtx *) alloca (ncases * sizeof (rtx)); - memset ((char *) labelvec, 0, ncases * sizeof (rtx)); + labelvec = alloca (ncases * sizeof (rtx)); + memset (labelvec, 0, ncases * sizeof (rtx)); for (n = thiscase->data.case_stmt.case_list; n; n = n->right) { @@ -5732,6 +5014,7 @@ estimate_case_costs (case_node_ptr node) static bool same_case_target_p (rtx l1, rtx l2) { +#if 0 rtx i1, i2; if (l1 == l2) @@ -5751,6 +5034,11 @@ same_case_target_p (rtx l1, rtx l2) { l2 = XEXP (SET_SRC (PATTERN (i2)), 0); } +#endif + /* When coming from gimple, we usually won't have emitted either + the labels or the body of the switch statement. The job being + done here should be done via jump threading at the tree level. + Cases that go the same place should have the same label. */ return l1 == l2; } @@ -5784,9 +5072,11 @@ group_case_nodes (case_node_ptr head) while (node) { - rtx lab = label_rtx (node->code_label); + rtx lab; case_node_ptr np = node; + lab = label_rtx (node->code_label); + /* Try to group the successors of NODE with NODE. */ while (((np = np->right) != 0) /* Do they jump to the same place? */ @@ -6076,7 +5366,7 @@ emit_case_nodes (rtx index, case_node_ptr node, rtx default_label, tree index_type) { /* If INDEX has an unsigned type, we must make unsigned branches. */ - int unsignedp = TREE_UNSIGNED (index_type); + int unsignedp = TYPE_UNSIGNED (index_type); enum machine_mode mode = GET_MODE (index); enum machine_mode imode = TYPE_MODE (index_type); @@ -6131,6 +5421,42 @@ emit_case_nodes (rtx index, case_node_ptr node, rtx default_label, emit_case_nodes (index, node->right, default_label, index_type); } + /* If both children are single-valued cases with no + children, finish up all the work. This way, we can save + one ordered comparison. */ + else if (tree_int_cst_equal (node->right->low, node->right->high) + && node->right->left == 0 + && node->right->right == 0 + && tree_int_cst_equal (node->left->low, node->left->high) + && node->left->left == 0 + && node->left->right == 0) + { + /* Neither node is bounded. First distinguish the two sides; + then emit the code for one side at a time. */ + + /* See if the value matches what the right hand side + wants. */ + do_jump_if_equal (index, + convert_modes (mode, imode, + expand_expr (node->right->low, + NULL_RTX, + VOIDmode, 0), + unsignedp), + label_rtx (node->right->code_label), + unsignedp); + + /* See if the value matches what the left hand side + wants. */ + do_jump_if_equal (index, + convert_modes (mode, imode, + expand_expr (node->left->low, + NULL_RTX, + VOIDmode, 0), + unsignedp), + label_rtx (node->left->code_label), + unsignedp); + } + else { /* Neither node is bounded. First distinguish the two sides; @@ -6395,7 +5721,7 @@ emit_case_nodes (rtx index, case_node_ptr node, rtx default_label, else if (!low_bound && !high_bound) { /* Widen LOW and HIGH to the same width as INDEX. */ - tree type = (*lang_hooks.types.type_for_mode) (mode, unsignedp); + tree type = lang_hooks.types.type_for_mode (mode, unsignedp); tree low = build1 (CONVERT_EXPR, type, node->low); tree high = build1 (CONVERT_EXPR, type, node->high); rtx low_rtx, new_index, new_bound;