Commit f725a3ec by Kazu Hirata Committed by Jeff Law

* calls.c: Fix formatting.

From-SVN: r36219
parent f133a43e
2000-09-06 Kazu Hirata <kazu@hxi.com>
* calls.c: Fix formatting.
2000-09-06 Graham Stott <grahams@cygnus.co.uk> 2000-09-06 Graham Stott <grahams@cygnus.co.uk>
* config/i386/i386.h (ADDRESS_COST): Fix typo. * config/i386/i386.h (ADDRESS_COST): Fix typo.
......
...@@ -808,7 +808,6 @@ flags_from_decl_or_type (exp) ...@@ -808,7 +808,6 @@ flags_from_decl_or_type (exp)
return flags; return flags;
} }
/* Precompute all register parameters as described by ARGS, storing values /* Precompute all register parameters as described by ARGS, storing values
into fields within the ARGS array. into fields within the ARGS array.
...@@ -1381,7 +1380,7 @@ compute_argument_block_size (reg_parm_stack_space, args_size, ...@@ -1381,7 +1380,7 @@ compute_argument_block_size (reg_parm_stack_space, args_size,
to add the delta, round and substract the delta. to add the delta, round and substract the delta.
Currently no machine description requires this support. */ Currently no machine description requires this support. */
if (stack_pointer_delta & (preferred_stack_boundary - 1)) if (stack_pointer_delta & (preferred_stack_boundary - 1))
abort(); abort ();
args_size->var = round_up (args_size->var, preferred_stack_boundary); args_size->var = round_up (args_size->var, preferred_stack_boundary);
} }
#endif #endif
...@@ -1436,9 +1435,9 @@ compute_argument_block_size (reg_parm_stack_space, args_size, ...@@ -1436,9 +1435,9 @@ compute_argument_block_size (reg_parm_stack_space, args_size,
NUM_ACTUALS is the number of arguments. NUM_ACTUALS is the number of arguments.
ARGS is an array containing information for each argument; this routine ARGS is an array containing information for each argument; this
fills in the INITIAL_VALUE and VALUE fields for each precomputed argument. routine fills in the INITIAL_VALUE and VALUE fields for each
*/ precomputed argument. */
static void static void
precompute_arguments (flags, num_actuals, args) precompute_arguments (flags, num_actuals, args)
...@@ -1668,7 +1667,7 @@ rtx_for_function_call (fndecl, exp) ...@@ -1668,7 +1667,7 @@ rtx_for_function_call (fndecl, exp)
push_temp_slots (); push_temp_slots ();
funaddr = funexp = funaddr = funexp =
expand_expr (TREE_OPERAND (exp, 0), NULL_RTX, VOIDmode, 0); expand_expr (TREE_OPERAND (exp, 0), NULL_RTX, VOIDmode, 0);
pop_temp_slots (); /* FUNEXP can't be BLKmode */ pop_temp_slots (); /* FUNEXP can't be BLKmode. */
/* Check the function is executable. */ /* Check the function is executable. */
if (current_function_check_memory_usage) if (current_function_check_memory_usage)
...@@ -2007,7 +2006,6 @@ check_sibcall_argument_overlap_1 (x) ...@@ -2007,7 +2006,6 @@ check_sibcall_argument_overlap_1 (x)
} }
} }
return 0; return 0;
} }
/* Scan sequence after INSN if it does not dereference any argument slots /* Scan sequence after INSN if it does not dereference any argument slots
...@@ -2029,8 +2027,8 @@ check_sibcall_argument_overlap (insn, arg) ...@@ -2029,8 +2027,8 @@ check_sibcall_argument_overlap (insn, arg)
insn = NEXT_INSN (insn); insn = NEXT_INSN (insn);
for (; insn; insn = NEXT_INSN (insn)) for (; insn; insn = NEXT_INSN (insn))
if (INSN_P (insn) && if (INSN_P (insn)
check_sibcall_argument_overlap_1 (PATTERN (insn))) && check_sibcall_argument_overlap_1 (PATTERN (insn)))
break; break;
#ifdef ARGS_GROW_DOWNWARD #ifdef ARGS_GROW_DOWNWARD
...@@ -2213,7 +2211,7 @@ expand_call (exp, target, ignore) ...@@ -2213,7 +2211,7 @@ expand_call (exp, target, ignore)
&& TYPE_RETURNS_STACK_DEPRESSED (TREE_TYPE (TREE_TYPE (p)))) && TYPE_RETURNS_STACK_DEPRESSED (TREE_TYPE (TREE_TYPE (p))))
{ {
flags |= ECF_SP_DEPRESSED; flags |= ECF_SP_DEPRESSED;
flags &= ~ (ECF_PURE | ECF_CONST); flags &= ~(ECF_PURE | ECF_CONST);
} }
#ifdef REG_PARM_STACK_SPACE #ifdef REG_PARM_STACK_SPACE
...@@ -2377,10 +2375,8 @@ expand_call (exp, target, ignore) ...@@ -2377,10 +2375,8 @@ expand_call (exp, target, ignore)
or not. */ or not. */
INIT_CUMULATIVE_ARGS (args_so_far, funtype, NULL_RTX, (fndecl == 0)); INIT_CUMULATIVE_ARGS (args_so_far, funtype, NULL_RTX, (fndecl == 0));
/* Make a vector to hold all the information about each arg. */ /* Make a vector to hold all the information about each arg. */
args = (struct arg_data *) alloca (num_actuals args = (struct arg_data *) alloca (num_actuals * sizeof (struct arg_data));
* sizeof (struct arg_data));
bzero ((char *) args, num_actuals * sizeof (struct arg_data)); bzero ((char *) args, num_actuals * sizeof (struct arg_data));
/* Build up entries inthe ARGS array, compute the size of the arguments /* Build up entries inthe ARGS array, compute the size of the arguments
...@@ -2681,7 +2677,6 @@ expand_call (exp, target, ignore) ...@@ -2681,7 +2677,6 @@ expand_call (exp, target, ignore)
temporaries we make. */ temporaries we make. */
push_temp_slots (); push_temp_slots ();
#ifdef FINAL_REG_PARM_STACK_SPACE #ifdef FINAL_REG_PARM_STACK_SPACE
reg_parm_stack_space = FINAL_REG_PARM_STACK_SPACE (args_size.constant, reg_parm_stack_space = FINAL_REG_PARM_STACK_SPACE (args_size.constant,
args_size.var); args_size.var);
...@@ -2702,7 +2697,8 @@ expand_call (exp, target, ignore) ...@@ -2702,7 +2697,8 @@ expand_call (exp, target, ignore)
pattern, do not round up, since we'll be re-using whatever space our pattern, do not round up, since we'll be re-using whatever space our
caller provided. */ caller provided. */
unadjusted_args_size unadjusted_args_size
= compute_argument_block_size (reg_parm_stack_space, &adjusted_args_size, = compute_argument_block_size (reg_parm_stack_space,
&adjusted_args_size,
(pass == 0 ? 0 (pass == 0 ? 0
: preferred_stack_boundary)); : preferred_stack_boundary));
...@@ -3083,7 +3079,7 @@ expand_call (exp, target, ignore) ...@@ -3083,7 +3079,7 @@ expand_call (exp, target, ignore)
/* Verify that we've deallocated all the stack we used. */ /* Verify that we've deallocated all the stack we used. */
if (pass if (pass
&& old_stack_allocated != stack_pointer_delta - pending_stack_adjust) && old_stack_allocated != stack_pointer_delta - pending_stack_adjust)
abort(); abort ();
/* If call is cse'able, make appropriate pair of reg-notes around it. /* If call is cse'able, make appropriate pair of reg-notes around it.
Test valreg so we don't crash; may safely ignore `const' Test valreg so we don't crash; may safely ignore `const'
...@@ -3372,7 +3368,7 @@ expand_call (exp, target, ignore) ...@@ -3372,7 +3368,7 @@ expand_call (exp, target, ignore)
stack_pointer_delta = save_stack_pointer_delta; stack_pointer_delta = save_stack_pointer_delta;
/* Prepare arg structure for next iteration. */ /* Prepare arg structure for next iteration. */
for (i = 0 ; i < num_actuals ; i++) for (i = 0; i < num_actuals; i++)
{ {
args[i].value = 0; args[i].value = 0;
args[i].aligned_regs = 0; args[i].aligned_regs = 0;
...@@ -3485,8 +3481,16 @@ emit_library_call_value_1 (retval, orgfun, value, fn_type, outmode, nargs, p) ...@@ -3485,8 +3481,16 @@ emit_library_call_value_1 (retval, orgfun, value, fn_type, outmode, nargs, p)
struct args_size alignment_pad; struct args_size alignment_pad;
rtx argblock = 0; rtx argblock = 0;
CUMULATIVE_ARGS args_so_far; CUMULATIVE_ARGS args_so_far;
struct arg { rtx value; enum machine_mode mode; rtx reg; int partial; struct arg
struct args_size offset; struct args_size size; rtx save_area; }; {
rtx value;
enum machine_mode mode;
rtx reg;
int partial;
struct args_size offset;
struct args_size size;
rtx save_area;
};
struct arg *argvec; struct arg *argvec;
int old_inhibit_defer_pop = inhibit_defer_pop; int old_inhibit_defer_pop = inhibit_defer_pop;
rtx call_fusage = 0; rtx call_fusage = 0;
...@@ -3502,7 +3506,7 @@ emit_library_call_value_1 (retval, orgfun, value, fn_type, outmode, nargs, p) ...@@ -3502,7 +3506,7 @@ emit_library_call_value_1 (retval, orgfun, value, fn_type, outmode, nargs, p)
/* Define the boundary of the register parm stack space that needs to be /* Define the boundary of the register parm stack space that needs to be
save, if any. */ save, if any. */
int low_to_save = -1, high_to_save = 0; int low_to_save = -1, high_to_save = 0;
rtx save_area = 0; /* Place that it is saved */ rtx save_area = 0; /* Place that it is saved. */
#endif #endif
/* Size of the stack reserved for parameter registers. */ /* Size of the stack reserved for parameter registers. */
...@@ -3614,7 +3618,6 @@ emit_library_call_value_1 (retval, orgfun, value, fn_type, outmode, nargs, p) ...@@ -3614,7 +3618,6 @@ emit_library_call_value_1 (retval, orgfun, value, fn_type, outmode, nargs, p)
NULL_TREE, &args_size, &argvec[count].offset, NULL_TREE, &args_size, &argvec[count].offset,
&argvec[count].size, &alignment_pad); &argvec[count].size, &alignment_pad);
if (argvec[count].reg == 0 || argvec[count].partial != 0 if (argvec[count].reg == 0 || argvec[count].partial != 0
|| reg_parm_stack_space > 0) || reg_parm_stack_space > 0)
args_size.constant += argvec[count].size.constant; args_size.constant += argvec[count].size.constant;
...@@ -3767,8 +3770,7 @@ emit_library_call_value_1 (retval, orgfun, value, fn_type, outmode, nargs, p) ...@@ -3767,8 +3770,7 @@ emit_library_call_value_1 (retval, orgfun, value, fn_type, outmode, nargs, p)
/* The address of the outgoing argument list must not be copied to a /* The address of the outgoing argument list must not be copied to a
register here, because argblock would be left pointing to the register here, because argblock would be left pointing to the
wrong place after the call to allocate_dynamic_stack_space below. wrong place after the call to allocate_dynamic_stack_space below. */
*/
argblock = virtual_outgoing_args_rtx; argblock = virtual_outgoing_args_rtx;
} }
...@@ -3838,7 +3840,7 @@ emit_library_call_value_1 (retval, orgfun, value, fn_type, outmode, nargs, p) ...@@ -3838,7 +3840,7 @@ emit_library_call_value_1 (retval, orgfun, value, fn_type, outmode, nargs, p)
stack_area = gen_rtx_MEM (save_mode, stack_area = gen_rtx_MEM (save_mode,
memory_address (save_mode, memory_address (save_mode,
plus_constant (argblock, plus_constant (argblock,
- high_to_save))); -high_to_save)));
#else #else
stack_area = gen_rtx_MEM (save_mode, stack_area = gen_rtx_MEM (save_mode,
memory_address (save_mode, memory_address (save_mode,
...@@ -3997,7 +3999,7 @@ emit_library_call_value_1 (retval, orgfun, value, fn_type, outmode, nargs, p) ...@@ -3997,7 +3999,7 @@ emit_library_call_value_1 (retval, orgfun, value, fn_type, outmode, nargs, p)
#ifdef PREFERRED_STACK_BOUNDARY #ifdef PREFERRED_STACK_BOUNDARY
/* Stack must be properly aligned now. */ /* Stack must be properly aligned now. */
if (stack_pointer_delta & (PREFERRED_STACK_BOUNDARY / BITS_PER_UNIT - 1)) if (stack_pointer_delta & (PREFERRED_STACK_BOUNDARY / BITS_PER_UNIT - 1))
abort(); abort ();
#endif #endif
/* We pass the old value of inhibit_defer_pop + 1 to emit_call_1, which /* We pass the old value of inhibit_defer_pop + 1 to emit_call_1, which
...@@ -4261,8 +4263,7 @@ target_for_arg (type, size, args_addr, offset) ...@@ -4261,8 +4263,7 @@ target_for_arg (type, size, args_addr, offset)
zero otherwise. */ zero otherwise. */
static int static int
store_one_arg (arg, argblock, flags, variable_size, store_one_arg (arg, argblock, flags, variable_size, reg_parm_stack_space)
reg_parm_stack_space)
struct arg_data *arg; struct arg_data *arg;
rtx argblock; rtx argblock;
int flags; int flags;
...@@ -4532,7 +4533,6 @@ store_one_arg (arg, argblock, flags, variable_size, ...@@ -4532,7 +4533,6 @@ store_one_arg (arg, argblock, flags, variable_size,
ARGS_SIZE_RTX (arg->alignment_pad)); ARGS_SIZE_RTX (arg->alignment_pad));
} }
/* Unless this is a partially-in-register argument, the argument is now /* Unless this is a partially-in-register argument, the argument is now
in the stack. in the stack.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment