s390-protos.h (s390_load_got): Update prototype.

	* config/s390/s390-protos.h (s390_load_got): Update prototype.
	* config/s390/s390.c (struct machine_function): Add member base_reg.
	(s390_decompose_address): Accept UNSPEC_LTREF.  Simplify logic.
	(s390_split_branches): Annotate late pool references.
	(annotate_constant_pool_refs): New function.
	(find_constant_pool_ref): Work on annotated pool references.
	(replace_constant_pool_ref): Likewise.  Use explicit base.
	(replace_ltrel_base): Use explicit base.
	(s390_mainpool_start): Reflect main_pool pattern change.
	(s390_mainpool_finish): Use base register from main_pool.
	Update calls to replace_ltrel_base and replace_constant_pool_ref.
	(s390_chunkify_start): Use base_reg from struct machine_function.
	(s390_chunkify_finish): Remove base_reg argument.  Update calls
	to replace_ltrel_base and replace_constant_pool_ref.
	(s390_reorg): Don't decide upon base register.  Update calls.
	(s390_load_got): Remove MAYBE_DEAD handling.  Do not emit insns
	but return sequence instead.
	(s390_emit_prologue): Decide upon base register to use.  Annotate
	all literal pool references.  Adapt to main_pool pattern change.
	Update s390_load_got call; move MAYBE_DEAD handling here.
	(s390_emit_epilogue): Annotate late literal pool references.
	Remove barrier before register restore instruction.
	* config/s390/s390.md (UNSPEC_LTREF): New constant.
	("builtin_setjmp_receiver"): Update s390_load_got call.
	("main_pool"): Explicitly reference base register.

From-SVN: r83735

gcc/ChangeLog

+2004-06-27  Ulrich Weigand  <uweigand@de.ibm.com>
+
+	* config/s390/s390-protos.h (s390_load_got): Update prototype.
+	* config/s390/s390.c (struct machine_function): Add member base_reg.
+	(s390_decompose_address): Accept UNSPEC_LTREF.  Simplify logic.
+	(s390_split_branches): Annotate late pool references.
+	(annotate_constant_pool_refs): New function.
+	(find_constant_pool_ref): Work on annotated pool references.
+	(replace_constant_pool_ref): Likewise.  Use explicit base.
+	(replace_ltrel_base): Use explicit base.
+	(s390_mainpool_start): Reflect main_pool pattern change.
+	(s390_mainpool_finish): Use base register from main_pool.
+	Update calls to replace_ltrel_base and replace_constant_pool_ref.
+	(s390_chunkify_start): Use base_reg from struct machine_function.
+	(s390_chunkify_finish): Remove base_reg argument.  Update calls
+	to replace_ltrel_base and replace_constant_pool_ref.
+	(s390_reorg): Don't decide upon base register.  Update calls.
+	(s390_load_got): Remove MAYBE_DEAD handling.  Do not emit insns
+	but return sequence instead.
+	(s390_emit_prologue): Decide upon base register to use.  Annotate
+	all literal pool references.  Adapt to main_pool pattern change.
+	Update s390_load_got call; move MAYBE_DEAD handling here.
+	(s390_emit_epilogue): Annotate late literal pool references.
+	Remove barrier before register restore instruction.
+	* config/s390/s390.md (UNSPEC_LTREF): New constant.
+	("builtin_setjmp_receiver"): Update s390_load_got call.
+	("main_pool"): Explicitly reference base register.
+
 2004-06-27  Roger Sayle  <roger@eyesopen.com>
 
 	* fold-const.c (fold) <BIT_IOR_EXPR>: Optimize ~X|X and X|~X as -1.

gcc/config/s390/s390-protos.h

@@ -24,7 +24,6 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 extern void optimization_options (int, int);
 extern void override_options (void);
 extern HOST_WIDE_INT s390_arg_frame_offset (void);
-extern void s390_load_got (int);
 extern void s390_emit_prologue (void);
 extern void s390_emit_epilogue (bool);
 extern void s390_function_profiler (FILE *, int);
@@ -92,6 +91,7 @@ extern void s390_initialize_trampoline (rtx, rtx, rtx);
 extern rtx s390_gen_rtx_const_DI (int, int);
 extern void s390_output_dwarf_dtprel (FILE*, int, rtx);
 extern int s390_agen_dep_p (rtx, rtx);
+extern rtx s390_load_got (void);
 
 #endif /* RTX_CODE */
 

gcc/config/s390/s390.md

@@ -92,6 +92,7 @@
    ; Literal pool
    (UNSPEC_RELOAD_BASE		210)
    (UNSPEC_MAIN_BASE		211)
+   (UNSPEC_LTREF		212)
 
    ; TLS relocation specifiers
    (UNSPEC_TLSGD		500)
@@ -7394,7 +7395,7 @@
   [(match_operand 0 "" "")]
   "flag_pic"
 {
-  s390_load_got (false);
+  emit_insn (s390_load_got ());
   emit_insn (gen_rtx_USE (VOIDmode, pic_offset_table_rtx));
   DONE;
 })
@@ -7561,8 +7562,9 @@
    (set_attr "type"    "larl")])
 
 (define_insn "main_pool"
-  [(unspec_volatile [(const_int 0)] UNSPECV_MAIN_POOL)]
-  ""
+  [(set (match_operand 0 "register_operand" "=a")
+        (unspec_volatile [(const_int 0)] UNSPECV_MAIN_POOL))]
+  "GET_MODE (operands[0]) == Pmode"
   "* abort ();"
   [(set_attr "op_type" "NN")])