2005-05-03 Andrew MacLeod <amacleod@redhat.com>

	* lambda-code.c (gcc_loop_to_lambda_loop,
	lambda_loopnest_to_gcc_loopnest, phi_loop_edge_uses_def,
	stmt_is_bumper_for_loop, perfect_nest_p, replace_uses_of_x_with_y): Use
	generic operand interface.
	* tree-data-ref.c (find_data_references_in_loop): Use generic interface.
	* tree-dfa.c (collect_dfa_stats_r, mark_new_vars_to_rename): Use
	generic operand interface.
	* tree-flow-inline.h (delink_imm_use, link_imm_use_to_list,
	link_imm_use, link_imm_use_stmt, relink_imm_use, relink_imm_use_stmt,
	next_safe_imm_use, has_zero_uses, has_single_use, single_imm_use,
	num_imm_uses): Use ssa_use_operand_t.
	(get_def_ops, get_use_ops, get_v_may_def_ops, get_vuse_ops,
	get_v_must_def_ops): Delete.
	(get_def_from_ptr, get_phi_result_ptr): Get def directly now.
	(get_use_op_ptr, get_def_op_ptr, get_v_may_def_result_ptr,
	get_v_may_def_op_ptr, get_vuse_op_ptr, get_v_must_def_result_ptr,
	get_v_must_def_kill_ptr): Delete.
	(delink_stmt_imm_use): Move and use new operand interface.
	(op_iter_next_use, op_iter_next_def, op_iter_next_tree, op_iter_init,
	op_iter_next_tree): Use new operand implementation.
	(clear_and_done_ssa_iter): New.  Initialize a blank operand iterator.
	(op_iter_init_use, op_iter_init_def, op_iter_init_tree): Add iterator
	type check.
	(op_iter_next_mustdef, op_iter_next_maydef,
	op_iter_next_must_and_may_def): Delete. Replace with...
	(op_iter_next_maymustdef): New.  Combine must and may next operations.
	(op_iter_init_maydef, op_iter_init_mustdef,
	op_iter_init_must_and_may_def): Use new interface.
	(single_ssa_tree_operand ): New.  Process single operands only as trees.
	(single_ssa_use_operand): New.  Process single operands only as uses.
	(single_ssa_def_operand): New.  Process single operands only as defs.
	(zero_ssa_operands): New.  Return TRUE if there are zero operands of the
	specified types.
	(num_ssa_operands): New.  Count the number of specified operands.
	(compare_ssa_operands_equal): New.  Compare two statements' operands.
	(single_phi_def): New.  Return true if PHI has one def of the specified
	operand type.
	(op_iter_init_phiuse): New.  Initialize the iterator for PHI arguments.
	(op_iter_init_phidef): New.  Initialize the iterator for the PHI def.
	* tree-flow.h (struct immediate_use_iterator_d): Use ssa_use_operand_t.
	(struct stmt_ann_d): Operands field no longer require GTY().
	(vn_compute, vn_lookup_or_add, vn_add, vn_lookup): Change prototype.
	* tree-into-ssa.c (mark_def_sites): Use SSA_OP_VMUSTKILL.
	* tree-outof-ssa.c (check_replaceable, find_replaceable_in_bb,
	dump_replaceable_exprs, rewrite_trees): Use generic interface.
	* tree-phinodes.c (make_phi_node, release_phi_node, resize_phi_node):
	Use use_operand_p instead of ssa_imm_use_t *.
	* tree-pretty-print.c (dump_vops): check if operands are active before
	dumping virtual operands.
	* tree-sra.c (sra_walk_function): Use ZERO_SSA_OPERANDS.
	* tree-ssa-ccp.c (likely_value): Use ZERO_SSA_OPERANDS.
	(ccp_fold): Use new interface.
	(ccp_visit_stmt): Remove unused variables and code.
	(convert_to_gimple_builtin): Insert statements before calling
	mark_new_vars_to_rename.
	* tree-ssa-copy.c (stmt_may_generate_copy): Use ZERO_SSA_OPERANDS.
	(copy_prop_visit_cond_stmt): Use generic interface.
	* tree-ssa-dom.c (struct expr_hash_elt): Use stmt pointer, not the
	annotation in table.
	(thread_across_edge): Use generic interface.
	(initialize_hash_element): Initialzie with stmt, not annotation.
	(eliminate_redundant_computations): Use generic interface.
	(record_equivalences_from_stmt): Pass stmt, not annotation.
	(avail_expr_hash, real_avail_expr_hash, avail_expr_eq): Use generic
	interface.
	* tree-ssa-dse.c (dse_optimize_stmt): Use ZERO_SSA_OPERANDS.
	* tree-ssa-loop-ivopts.c (find_invariants_stmt,
	find_interesting_uses_stmt, protect_loop_closed_ssa_form_use): Use
	generic operand interface.
	* tree-ssa-loop-niter.c (chain_of_csts_start, get_val_for): Use generic
	interface.
	* tree-ssa-loop-unswitch.c (tree_may_unswitch_on): Use Generic operand
	Interface.
	* tree-ssa-operands.c (struct opbuild_list_d): New.  Operand build type.
	(build_defs, build_uses, build_v_may_defs, build_vuses,
	build_v_must_defs): Change type to struct opbuild_list_d.
	(ops_active): New.  Operands active boolean.
	(operand_memory, operand_memory_index): New.  Operand memory managers.
	(allocate_def_optype, allocate_use_optype, allocate_v_may_def_optype,
	allocate_vuse_optype, allocate_v_must_def_optype): Delete.
	(free_uses, free_defs, free_vuses, free_v_may_defs, free_v_must_defs):
	Change from functions to static variable list heads.
	(opbuild_initialize_virtual): New.  Initialize a virtual build list.
	(opbuild_initialize_real): New.  Initialize a virtual build list.
	(opbuild_free): New.  Free a build list.
	(opbuild_num_elems): New.  Number of items in a list.
	(opbuild_append_real): New.  Add a real (tree *) operand.
	(opbuild_append_virtual): New.  Add and sort a virtual (tree) operand.
	(opbuild_first): New.  Return first element index in a list.
	(opbuild_next): New.  Return next element in a list.
	(opbuild_elem_real): New.  Return real element.
	(opbuild_elem_virtual): New.  Return virtual element.
	(opbuild_elem_uid): New.  Return UID of virtual element.
	(opbuild_clear): New.  Reset an operand list.
	(opbuild_remove_elem): New.  Remove an element form a list.
	(ssa_operands_active): New.  Return true if operand cache is active.
	(init_ssa_operands, fini_ssa_operands): Initialize new implementation.
	(ssa_operand_alloc): New.  Allocate memory from an operand chunk.
	(correct_use_link): Use use_operand_p.
	(finalize_ssa_uses, finalize_ssa_v_may_defs, finalize_ssa_defs,
	finalize_ssa_vuses, finalize_ssa_v_must_defs): New implmentation.
	(cleanup_v_may_defs): Use new implmentation.
	(finalize_ssa_stmt_operands, start_ssa_stmt_operands): New
	implementation.
	(append_def, append_use, append_v_may_def, append_vuse,
	append_v_must_def): Call opbuild_append routine instead of using varray.
	(build_ssa_operands): Simplify to simply use stmt, don't maintain a
	global parse_old_ops variable.
	(free_ssa_operands): New implementation.
	(update_stmt_operands): Move.  Change argument to build_ssa_operands.
	(copy_virtual_operands): Move. New generic implementation.
	(create_ssa_artficial_load_stmt): Move. New implementation.
	(swap_tree_operands): Update for new implementation.
	(get_expr_operands): Add stmt parameter to calls to swap_tree_operands.
	(add_call_clobber_ops, add_call_read_ops): Initialize opbuild list
	rather than a varray.
	(verify_imm_links): Use use_operand_p.
	(dump_immediate_uses_for): If the immediate use variable is a virtual
	variable, show the virtual ops in the stmt.
	* tree-ssa-operands.h (def_operand_p): No longer a structure.
	(NULL_DEF_OPERAND_P): Now a #define.
	(def_optype_d, use_optype_d, v_def_use_operand_type, v_may_def_optype_d,
	vuse_operand_type, vuse_optype_d, v_must_def_optype_d): Delete.
	(def_optype_d, use_optype_d, maydef_optype_d, vuse_optype_d,
	mustdef_optype_d): New.  Use Linked list representation.
	(SSA_OPERAND_MEMORY_SIZE): New.  Size of operand memory chunk.
	(struct ssa_operand_memory_d): New.  Allocated Chunk node.
	(struct stmt_operands_d): Change to new pointers that are not GTY.
	(STMT_USE_OPS, NUM_USES, SET_USE_OP, STMT_DEF_OPS, NUM_DEFS, SET_DEF_OP,
	STMT_V_MAY_DEF_OPS, NUM_V_MAY_DEFS, SET_V_MAY_DEF_RESULT,
	SET_V_MAY_DEF_OP, STMT_VUSE_OPS, NUM_VUSES, SET_VUSE_OP,
	STMT_V_MUST_DEF_OPS, NUM_V_MUST_DEFS, SET_V_MUST_DEF_RESULT,
	SET_V_MUST_DEF_KILL): Delete.
	(V_MAY_DEF_OPS, V_MAY_DEF_RESULT_PTR, V_MAY_DEF_RESULT,
	V_MAY_DEF_OP_PTR, V_MAY_DEF_OP): Rename to MAYDEF_*.
	(V_MUST_DEF_OPS, V_MUST_DEF_RESULT_PTR, V_MUST_DEF_RESULT,
	V_MUST_DEF_KILL_PTR, V_MUST_DEF_KILL): Rename to MUSTDEF_*.
	(enum ssa_op_iter_type): Operand iterator typechecking values.
	(struct ssa_operand_iterator_d): Use linked lists of operands.
	(SSA_OP_VMUSTDEFKILL): Rename to SSA_OP_VMUSTKILL.
	(FOR_EACH_SSA_MAYDEF_OPERAND, FOR_EACH_SSA_MUSTDEF_OPERAND,
	FOR_EACH_SSA_MUST_AND_MAY_DEF_OPERAND): Use op_iter_next_maymustdef.
	(FOR_EACH_PHI_ARG): New.  Iterate over PHI arguments.
	(FOR_EACH_PHI_OR_STMT_USE): New.  Iterate over PHI or stmt uses.
	(FOR_EACH_PHI_OR_STMT_DEF): New.  Iterate over PHI or stmt defs.
	(SINGLE_SSA_TREE_OPERAND, SINGLE_SSA_USE_OPERAND,
	SINGLE_SSA_DEF_OPERAND, ZERO_SSA_OPERANDS, NUM_SSA_OPERANDS): New.
	* tree-ssa-opfinalize.h: New.  Function templates for expansion.
	(FINALIZE_ALLOC): Expands into alloc_def, alloc_use, alloc_maydef,
	alloc_vuse, and alloc_mustdef.
	(FINALIZE_FUNC): Expands into finalize_ssa_def_ops,
	finalize_ssa_use_ops, finalize_ssa_v_may_def_ops, finalize_ssa_vuse_ops,
	and finalize_ssa_v_must_def_ops.
	* tree-ssa-pre.c (add_to_sets): Pass tree to vn_add.
	(create_value_expr_from): Use stmt not vuse_optype as a parameter. Pass
	stmt around.
	(compute_avail): Use generic iterator interface.
	* tree-ssa-propagate.c (first_vdef): Use generic operand interface.
	(stmt_makes_single_load, stmt_makes_single_store): Use
	ZERO_SSA_OPERANDS.
	* tree-ssa-sink.c (is_hidden_global_store): Use ZERO_SSA_OPERANDS.
	(statement_sink_location): Use generic interface.
	* tree-ssa.c (verify_ssa):  Use %p in fprintf.  Use generic interface.
	(delete_tree_ssa): Don't call release_defs.  Call release_ssa_name and
	reset the immediate use link nodes.
	(stmt_references_memory_p): Use ZERO_SSA_OPERANDS.
	* tree-ssanames.c (make_ssa_name): Use use_operand_p.
	* tree-tailcall.c (find_tail_calls): Use ZERO_SSA_OPERANDS.
	(eliminate_tail_call): Use generic operand interface.
	* tree-vect-analyze.c (vect_analyze_data_refs): Use ZERO_SSA_OPERANDS.
	(vect_mark_relevant, vect_mark_stmts_to_be_vectorized): Use generic
	interface.
	* tree-vect-transform.c (update_vuses_to_preheader): Use generic
	interface.
	* tree-vectorizer.c (rename_variables_in_bb): Use generic interface.
	* tree-vn.c (struct val_expr_pair_d): Cache statment pointer instead of
	vuse_optype.
	(vn_compute, val_expr_pair_hash, vn_add, vn_lookup, vn_lookup_or_add):
	Use statement pointer instead of vuse_optype.  Use generic interface.
	* tree-vrp.c (maybe_add_assert_expr): Use generic interface.
	(stmt_interesting_for_vrp, vrp_visit_stmt): Use ZERO_SSA_OPERANDS.
	* tree.h (struct ssa_imm_use_d): Renamed to ssa_use_operand_d.
	(tree_ssa_name, phi_arg_d): Use ssa_use_operand_d.
	* doc/tree-ssa.texi: Update documentation for operand interface.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@99155 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 166 insertions, 147 deletions

diff --git a/gcc/tree-ssa-operands.h b/gcc/tree-ssa-operands.h
index 2d531c8b64c..2fb8d97f084 100644
--- a/gcc/tree-ssa-operands.h
+++ b/gcc/tree-ssa-operands.h
@@ -25,155 +25,116 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 
 /* This represents a pointer to a DEF operand.  */
-typedef struct def_operand_ptr GTY(())
-{
-  tree * GTY((skip(""))) def;
-} def_operand_p;
+typedef tree *def_operand_p;
 
 /* This represents a pointer to a USE operand.  */
-typedef ssa_imm_use_t *use_operand_p;
+typedef ssa_use_operand_t *use_operand_p;
 
+/* NULL operand types.  */
 #define NULL_USE_OPERAND_P 		NULL
-extern def_operand_p NULL_DEF_OPERAND_P;
+#define NULL_DEF_OPERAND_P 		NULL
 
 /* This represents the DEF operands of a stmt.  */
-typedef struct def_optype_d GTY(())
+struct def_optype_d
 {
-  unsigned num_defs; 
-  struct def_operand_ptr GTY((length("%h.num_defs"))) defs[1];
-} def_optype_t;
-
-typedef def_optype_t *def_optype;
-
-/* Operand type which uses a pointer to a tree ihn an immediate use.  */
-typedef ssa_imm_use_t use_operand_type_t;
+  struct def_optype_d *next;
+  tree *def_ptr;
+};
+typedef struct def_optype_d *def_optype_p;
 
 /* This represents the USE operands of a stmt.  */
-typedef struct use_optype_d GTY(())
-{
-  unsigned num_uses; 
-  struct ssa_imm_use_d GTY((length("%h.num_uses"))) uses[1];
-} use_optype_t;
-
-typedef use_optype_t *use_optype;
-
-/* Operand type which stores a def a use, and an immediate use.  */
-typedef struct v_def_use_operand_type GTY(())
+struct use_optype_d 
 {
-  tree def;
-  tree use;
-  ssa_imm_use_t imm_use;
-} v_def_use_operand_type_t;
+  struct use_optype_d *next;
+  struct ssa_use_operand_d use_ptr;
+};
+typedef struct use_optype_d *use_optype_p;
 
 /* This represents the MAY_DEFS for a stmt.  */
-typedef struct v_may_def_optype_d GTY(())
+struct maydef_optype_d
 {
-  unsigned num_v_may_defs; 
-  struct v_def_use_operand_type GTY((length ("%h.num_v_may_defs")))
-							      v_may_defs[1];
-} v_may_def_optype_t;
-
-typedef v_may_def_optype_t *v_may_def_optype;
-
-/* Operand type which stores a tree and an immeidate_use.  */
-typedef struct vuse_operand_type GTY(())
-{
-  tree use;
-  ssa_imm_use_t imm_use;
-} vuse_operand_type_t;
+  struct maydef_optype_d *next;
+  tree def_var;
+  tree use_var;
+  struct ssa_use_operand_d use_ptr;
+};
+typedef struct maydef_optype_d *maydef_optype_p;
 
 /* This represents the VUSEs for a stmt.  */
-typedef struct vuse_optype_d GTY(()) 
+struct vuse_optype_d
+{
+  struct vuse_optype_d *next;
+  tree use_var;
+  struct ssa_use_operand_d use_ptr;
+};
+typedef struct vuse_optype_d *vuse_optype_p;
+                                                                              
+/* This represents the V_MUST_DEFS for a stmt.  */
+struct mustdef_optype_d
 {
-  unsigned num_vuses; 
-  struct vuse_operand_type GTY((length ("%h.num_vuses"))) vuses[1];
-} vuse_optype_t;
+  struct mustdef_optype_d *next;
+  tree def_var;
+  tree kill_var;
+  struct ssa_use_operand_d use_ptr;
+};
+typedef struct mustdef_optype_d *mustdef_optype_p;
 
-typedef vuse_optype_t *vuse_optype;
 
-/* This represents the V_MUST_DEFS for a stmt.  */
-typedef struct v_must_def_optype_d GTY(())
+#define SSA_OPERAND_MEMORY_SIZE		(2048 - sizeof (void *))
+                                                                              
+struct ssa_operand_memory_d GTY((chain_next("%h.next")))
 {
-  unsigned num_v_must_defs; 
-  v_def_use_operand_type_t GTY((length("%h.num_v_must_defs"))) v_must_defs[1];
-} v_must_def_optype_t;
+  struct ssa_operand_memory_d *next;
+  char mem[SSA_OPERAND_MEMORY_SIZE];
+};
 
-typedef v_must_def_optype_t *v_must_def_optype;
 
 /* This represents the operand cache for a stmt.  */
-typedef struct stmt_operands_d GTY(())
+struct stmt_operands_d
 {
   /* Statement operands.  */
-  struct def_optype_d * GTY (()) def_ops;
-  struct use_optype_d * GTY (()) use_ops;
-
+  struct def_optype_d * def_ops;
+  struct use_optype_d * use_ops;
+                                                                              
   /* Virtual operands (V_MAY_DEF, VUSE, and V_MUST_DEF).  */
-  struct v_may_def_optype_d * GTY (()) v_may_def_ops;
-  struct vuse_optype_d * GTY (()) vuse_ops;
-  struct v_must_def_optype_d * GTY (()) v_must_def_ops;
-} stmt_operands_t;
-
-typedef stmt_operands_t *stmt_operands_p;
-
-#define USE_FROM_PTR(OP)	get_use_from_ptr (OP)
-#define DEF_FROM_PTR(OP)	get_def_from_ptr (OP)
-#define SET_USE(OP, V)		set_ssa_use_from_ptr (OP, V)
-#define SET_DEF(OP, V)		((*((OP).def)) = (V))
-
-#define USE_STMT(OP)		(OP)->stmt
-
-#define USE_OPS(ANN)		get_use_ops (ANN)
-#define STMT_USE_OPS(STMT)	get_use_ops (stmt_ann (STMT))
-#define NUM_USES(OPS)		((OPS) ? (OPS)->num_uses : 0)
-#define USE_OP_PTR(OPS, I)	get_use_op_ptr ((OPS), (I))
-#define USE_OP(OPS, I)		(USE_FROM_PTR (USE_OP_PTR ((OPS), (I))))
-#define SET_USE_OP(OPS, I, V)	(SET_USE (USE_OP_PTR ((OPS), (I)), (V)))
-
-
-
-#define DEF_OPS(ANN)		get_def_ops (ANN)
-#define STMT_DEF_OPS(STMT)	get_def_ops (stmt_ann (STMT))
-#define NUM_DEFS(OPS)		((OPS) ? (OPS)->num_defs : 0)
-#define DEF_OP_PTR(OPS, I)	get_def_op_ptr ((OPS), (I))
-#define DEF_OP(OPS, I)		(DEF_FROM_PTR (DEF_OP_PTR ((OPS), (I))))
-#define SET_DEF_OP(OPS, I, V)	(SET_DEF (DEF_OP_PTR ((OPS), (I)), (V)))
-
-
-
-#define V_MAY_DEF_OPS(ANN)		get_v_may_def_ops (ANN)
-#define STMT_V_MAY_DEF_OPS(STMT)	get_v_may_def_ops (stmt_ann(STMT))
-#define NUM_V_MAY_DEFS(OPS)		((OPS) ? (OPS)->num_v_may_defs : 0)
-#define V_MAY_DEF_RESULT_PTR(OPS, I)	get_v_may_def_result_ptr ((OPS), (I))
-#define V_MAY_DEF_RESULT(OPS, I)					\
-			    (DEF_FROM_PTR (V_MAY_DEF_RESULT_PTR ((OPS), (I))))
-#define SET_V_MAY_DEF_RESULT(OPS, I, V)					\
-			    (SET_DEF (V_MAY_DEF_RESULT_PTR ((OPS), (I)), (V)))
-#define V_MAY_DEF_OP_PTR(OPS, I)	get_v_may_def_op_ptr ((OPS), (I))
-#define V_MAY_DEF_OP(OPS, I)						\
-			    (USE_FROM_PTR (V_MAY_DEF_OP_PTR ((OPS), (I))))
-#define SET_V_MAY_DEF_OP(OPS, I, V)					\
-			    (SET_USE (V_MAY_DEF_OP_PTR ((OPS), (I)), (V)))
-
-
-#define VUSE_OPS(ANN)		get_vuse_ops (ANN)
-#define STMT_VUSE_OPS(STMT)	get_vuse_ops (stmt_ann(STMT))
-#define NUM_VUSES(OPS)		((OPS) ? (OPS)->num_vuses : 0)
-#define VUSE_OP_PTR(OPS, I)  	get_vuse_op_ptr ((OPS), (I))
-#define VUSE_OP(OPS, I)  	(USE_FROM_PTR (VUSE_OP_PTR ((OPS), (I))))
-#define SET_VUSE_OP(OPS, I, V)	(SET_USE (VUSE_OP_PTR ((OPS), (I)), (V)))
-
-
-#define V_MUST_DEF_OPS(ANN)		get_v_must_def_ops (ANN)
-#define STMT_V_MUST_DEF_OPS(STMT)	get_v_must_def_ops (stmt_ann (STMT))
-#define NUM_V_MUST_DEFS(OPS)		((OPS) ? (OPS)->num_v_must_defs : 0)
-#define V_MUST_DEF_RESULT_PTR(OPS, I)	get_v_must_def_result_ptr ((OPS), (I))
-#define V_MUST_DEF_RESULT(OPS, I) \
-				(DEF_FROM_PTR (V_MUST_DEF_RESULT_PTR ((OPS), (I))))
-#define SET_V_MUST_DEF_RESULT(OPS, I, V) \
-				(SET_DEF (V_MUST_DEF_RESULT_PTR ((OPS), (I)), (V)))
-#define V_MUST_DEF_KILL_PTR(OPS, I)  get_v_must_def_kill_ptr ((OPS), (I))
-#define V_MUST_DEF_KILL(OPS, I) (USE_FROM_PTR (V_MUST_DEF_KILL_PTR ((OPS), (I))))
-#define SET_V_MUST_DEF_KILL(OPS, I, V) (SET_USE (V_MUST_DEF_KILL_PTR ((OPS), (I)), (V)))
+  struct maydef_optype_d * maydef_ops;
+  struct vuse_optype_d * vuse_ops;
+  struct mustdef_optype_d * mustdef_ops;
+};
+                                                                              
+typedef struct stmt_operands_d *stmt_operands_p;
+                                                                              
+#define USE_FROM_PTR(PTR)	get_use_from_ptr (PTR)
+#define DEF_FROM_PTR(PTR)	get_def_from_ptr (PTR)
+#define SET_USE(USE, V)		set_ssa_use_from_ptr (USE, V)
+#define SET_DEF(DEF, V)		((*(DEF)) = (V))
+
+#define USE_STMT(USE)		(USE)->stmt
+
+#define DEF_OPS(STMT)		(stmt_ann (STMT)->operands.def_ops)
+#define USE_OPS(STMT)		(stmt_ann (STMT)->operands.use_ops)
+#define VUSE_OPS(STMT)		(stmt_ann (STMT)->operands.vuse_ops)
+#define MAYDEF_OPS(STMT)	(stmt_ann (STMT)->operands.maydef_ops)
+#define MUSTDEF_OPS(STMT)	(stmt_ann (STMT)->operands.mustdef_ops)
+
+#define USE_OP_PTR(OP)		(&((OP)->use_ptr))
+#define USE_OP(OP)		(USE_FROM_PTR (USE_OP_PTR (OP)))
+
+#define DEF_OP_PTR(OP)		((OP)->def_ptr)
+#define DEF_OP(OP)		(DEF_FROM_PTR (DEF_OP_PTR (OP)))
+
+#define VUSE_OP_PTR(OP)		USE_OP_PTR(OP)
+#define VUSE_OP(OP)		((OP)->use_var)
+
+#define MAYDEF_RESULT_PTR(OP)	(&((OP)->def_var))
+#define MAYDEF_RESULT(OP)	((OP)->def_var)
+#define MAYDEF_OP_PTR(OP)	USE_OP_PTR (OP)
+#define MAYDEF_OP(OP)		((OP)->use_var)
+
+#define MUSTDEF_RESULT_PTR(OP)	(&((OP)->def_var))
+#define MUSTDEF_RESULT(OP)	((OP)->def_var)
+#define MUSTDEF_KILL_PTR(OP)	USE_OP_PTR (OP)
+#define MUSTDEF_KILL(OP)	((OP)->kill_var)
 
 #define PHI_RESULT_PTR(PHI)	get_phi_result_ptr (PHI)
 #define PHI_RESULT(PHI)		DEF_FROM_PTR (PHI_RESULT_PTR (PHI))
@@ -196,7 +157,7 @@ extern void update_stmt_operands (tree);
 extern bool verify_imm_links (FILE *f, tree var);
 
 extern void copy_virtual_operands (tree, tree);
-extern void create_ssa_artficial_load_stmt (stmt_operands_p, tree);
+extern void create_ssa_artficial_load_stmt (tree, tree);
 
 extern void dump_immediate_uses (FILE *file);
 extern void dump_immediate_uses_for (FILE *file, tree var);
@@ -206,6 +167,15 @@ extern void debug_immediate_uses_for (tree var);
 extern bool ssa_call_clobbered_cache_valid;
 extern bool ssa_ro_call_cache_valid;
 
+extern bool ssa_operands_active (void);
+
+enum ssa_op_iter_type {
+  ssa_op_iter_none = 0,
+  ssa_op_iter_tree,
+  ssa_op_iter_use,
+  ssa_op_iter_def,
+  ssa_op_iter_maymustdef
+};
 /* This structure is used in the operand iterator loops.  It contains the 
    items required to determine which operand is retrieved next.  During
    optimization, this structure is scalarized, and any unused fields are 
@@ -213,21 +183,17 @@ extern bool ssa_ro_call_cache_valid;
 
 typedef struct ssa_operand_iterator_d
 {
-  int num_use;
-  int num_def;
-  int num_vuse;
-  int num_v_mayu;
-  int num_v_mayd;
-  int num_v_mustu;
-  int num_v_mustd;
-  int use_i;
-  int def_i;
-  int vuse_i;
-  int v_mayu_i;
-  int v_mayd_i;
-  int v_mustu_i;
-  int v_mustd_i;
-  stmt_operands_p ops;
+  def_optype_p defs;
+  use_optype_p uses;
+  vuse_optype_p vuses;
+  maydef_optype_p maydefs;
+  maydef_optype_p mayuses;
+  mustdef_optype_p mustdefs;
+  mustdef_optype_p mustkills;
+  enum ssa_op_iter_type iter_type;
+  int phi_i;
+  int num_phi;
+  tree phi_stmt;
   bool done;
 } ssa_op_iter;
 
@@ -239,17 +205,19 @@ typedef struct ssa_operand_iterator_d
 #define SSA_OP_VMAYUSE		0x08	/* USE portion of V_MAY_DEFS.  */
 #define SSA_OP_VMAYDEF		0x10	/* DEF portion of V_MAY_DEFS.  */
 #define SSA_OP_VMUSTDEF		0x20	/* V_MUST_DEF definitions.  */
-#define SSA_OP_VMUSTDEFKILL     0x40    /* V_MUST_DEF kills.  */
+#define SSA_OP_VMUSTKILL     	0x40    /* V_MUST_DEF kills.  */
 
 /* These are commonly grouped operand flags.  */
 #define SSA_OP_VIRTUAL_USES	(SSA_OP_VUSE | SSA_OP_VMAYUSE)
 #define SSA_OP_VIRTUAL_DEFS	(SSA_OP_VMAYDEF | SSA_OP_VMUSTDEF)
-#define SSA_OP_VIRTUAL_KILLS    (SSA_OP_VMUSTDEFKILL)
-#define SSA_OP_ALL_VIRTUALS     (SSA_OP_VIRTUAL_USES | SSA_OP_VIRTUAL_KILLS | SSA_OP_VIRTUAL_DEFS)
+#define SSA_OP_VIRTUAL_KILLS    (SSA_OP_VMUSTKILL)
+#define SSA_OP_ALL_VIRTUALS     (SSA_OP_VIRTUAL_USES | SSA_OP_VIRTUAL_KILLS \
+				 | SSA_OP_VIRTUAL_DEFS)
 #define SSA_OP_ALL_USES		(SSA_OP_VIRTUAL_USES | SSA_OP_USE)
 #define SSA_OP_ALL_DEFS		(SSA_OP_VIRTUAL_DEFS | SSA_OP_DEF)
 #define SSA_OP_ALL_KILLS        (SSA_OP_VIRTUAL_KILLS)
-#define SSA_OP_ALL_OPERANDS	(SSA_OP_ALL_USES | SSA_OP_ALL_DEFS | SSA_OP_ALL_KILLS)
+#define SSA_OP_ALL_OPERANDS	(SSA_OP_ALL_USES | SSA_OP_ALL_DEFS	\
+				 | SSA_OP_ALL_KILLS)
 
 /* This macro executes a loop over the operands of STMT specified in FLAG, 
    returning each operand as a 'tree' in the variable TREEVAR.  ITER is an
@@ -281,7 +249,7 @@ typedef struct ssa_operand_iterator_d
 #define FOR_EACH_SSA_MAYDEF_OPERAND(DEFVAR, USEVAR, STMT, ITER)	\
   for (op_iter_init_maydef (&(ITER), STMT, &(USEVAR), &(DEFVAR));	\
        !op_iter_done (&(ITER));					\
-       op_iter_next_maydef (&(USEVAR), &(DEFVAR), &(ITER)))
+       op_iter_next_maymustdef (&(USEVAR), &(DEFVAR), &(ITER)))
 
 /* This macro executes a loop over the V_MUST_DEF operands of STMT.  The def
    and kill for each V_MUST_DEF is returned in DEFVAR and KILLVAR. 
@@ -289,7 +257,7 @@ typedef struct ssa_operand_iterator_d
 #define FOR_EACH_SSA_MUSTDEF_OPERAND(DEFVAR, KILLVAR, STMT, ITER)	\
   for (op_iter_init_mustdef (&(ITER), STMT, &(KILLVAR), &(DEFVAR));	\
        !op_iter_done (&(ITER));					\
-       op_iter_next_mustdef (&(KILLVAR), &(DEFVAR), &(ITER)))
+       op_iter_next_maymustdef (&(KILLVAR), &(DEFVAR), &(ITER)))
 
 /* This macro executes a loop over the V_{MUST,MAY}_DEF of STMT.  The def
    and kill for each V_{MUST,MAY}_DEF is returned in DEFVAR and KILLVAR. 
@@ -297,5 +265,56 @@ typedef struct ssa_operand_iterator_d
 #define FOR_EACH_SSA_MUST_AND_MAY_DEF_OPERAND(DEFVAR, KILLVAR, STMT, ITER)\
   for (op_iter_init_must_and_may_def (&(ITER), STMT, &(KILLVAR), &(DEFVAR));\
        !op_iter_done (&(ITER));					\
-       op_iter_next_must_and_may_def (&(KILLVAR), &(DEFVAR), &(ITER)))
+       op_iter_next_maymustdef (&(KILLVAR), &(DEFVAR), &(ITER)))
+
+/* This macro will execute a loop over all the arguemnts of a PHI which
+   match FLAGS.   A use_operand_p is alwasy returned via USEVAR.  FLAGS
+   can be eiother SSA_OP_USE or SSA_OP_VIRTUAL_USES or SSA_OP_ALL_USES.  */
+#define FOR_EACH_PHI_ARG (USEVAR, STMT, ITER, FLAGS)		\
+  for ((USEVAR) = op_iter_init_phiuse (&(ITER), STMT, FLAGS);	\
+       !op_iter_done (&(ITER));					\
+       (USEVAR) = op_iter_next_use (&(ITER)))
+
+
+/* This macro will execute a loop over a stmt, regardless of whether it is
+   a real stmt or a PHI node, looking at the USE nodes matching FLAGS.  */
+#define FOR_EACH_PHI_OR_STMT_USE(USEVAR, STMT, ITER, FLAGS)	\
+  for ((USEVAR) = (TREE_CODE (STMT) == PHI_NODE 		\
+		   ? op_iter_init_phiuse (&(ITER), STMT, FLAGS)	\
+		   : op_iter_init_use (&(ITER), STMT, FLAGS));	\
+       !op_iter_done (&(ITER));					\
+       (USEVAR) = op_iter_next_use (&(ITER)))
+
+/* This macro will execute a loop over a stmt, regardless of whether it is
+   a real stmt or a PHI node, looking at the DEF nodes matching FLAGS.  */
+#define FOR_EACH_PHI_OR_STMT_DEF(DEFVAR, STMT, ITER, FLAGS)	\
+  for ((DEFVAR) = (TREE_CODE (STMT) == PHI_NODE 		\
+		   ? op_iter_init_phidef (&(ITER), STMT, FLAGS)	\
+		   : op_iter_init_def (&(ITER), STMT, FLAGS));	\
+       !op_iter_done (&(ITER));					\
+       (DEFVAR) = op_iter_next_def (&(ITER)))
+  
+/* This macro returns an operand in STMT as a tree if it is the ONLY
+   operand matching FLAGS.  If there are 0 or more than 1 operand matching
+   FLAGS, then NULL_TREE is returned.  */
+#define SINGLE_SSA_TREE_OPERAND(STMT, FLAGS)			\
+  single_ssa_tree_operand (STMT, FLAGS)
+                                                                                
+/* This macro returns an operand in STMT as a use_operand_p if it is the ONLY
+   operand matching FLAGS.  If there are 0 or more than 1 operand matching
+   FLAGS, then NULL_USE_OPERAND_P is returned.  */
+#define SINGLE_SSA_USE_OPERAND(STMT, FLAGS)			\
+  single_ssa_use_operand (STMT, FLAGS)
+                                                                                
+/* This macro returns an operand in STMT as a def_operand_p if it is the ONLY
+   operand matching FLAGS.  If there are 0 or more than 1 operand matching
+   FLAGS, then NULL_DEF_OPERAND_P is returned.  */
+#define SINGLE_SSA_DEF_OPERAND(STMT, FLAGS)			\
+  single_ssa_def_operand (STMT, FLAGS)
+										/* This macro returns TRUE if there are no operands matching FLAGS in STMT.  */
+#define ZERO_SSA_OPERANDS(STMT, FLAGS) 	zero_ssa_operands (STMT, FLAGS)
+
+/* THis macro counts the number of operands in STMT matching FLAGS.  */
+#define NUM_SSA_OPERANDS(STMT, FLAGS)	num_ssa_operands (STMT, FLAGS)
+
 #endif  /* GCC_TREE_SSA_OPERANDS_H  */