dwarf2cfi.c (DW_STACK_POINTER_REGNUM): New.

        * dwarf2cfi.c (DW_STACK_POINTER_REGNUM): New.
        (DW_FRAME_POINTER_REGNUM): New.
        (expand_builtin_init_dwarf_reg_sizes): Use unsigned for rnum.
        (def_cfa_1): Do not convert reg to DWARF_FRAME_REGNUM here.
        (dwf_regno): New.
        (dwarf2out_flush_queued_reg_saves, dwarf2out_frame_debug_def_cfa,
        dwarf2out_frame_debug_adjust_cfa, dwarf2out_frame_debug_cfa_register,
        dwarf2out_frame_debug_cfa_expression, dwarf2out_frame_debug_expr):
        Use it.
        * dwarf2out.c (based_loc_descr): Use dwarf_frame_regnum.
        * dwarf2out.h (dwarf_frame_regnum): New.
        (struct cfa_loc): Document the domain of the reg member.

From-SVN: r176178

gcc/ChangeLog

+2011-07-11  Richard Henderson  <rth@redhat.com>
+
+	* dwarf2cfi.c (DW_STACK_POINTER_REGNUM): New.
+	(DW_FRAME_POINTER_REGNUM): New.
+	(expand_builtin_init_dwarf_reg_sizes): Use unsigned for rnum.
+	(def_cfa_1): Do not convert reg to DWARF_FRAME_REGNUM here.
+	(dwf_regno): New.
+	(dwarf2out_flush_queued_reg_saves, dwarf2out_frame_debug_def_cfa,
+	dwarf2out_frame_debug_adjust_cfa, dwarf2out_frame_debug_cfa_register,
+	dwarf2out_frame_debug_cfa_expression, dwarf2out_frame_debug_expr):
+	Use it.
+	* dwarf2out.c (based_loc_descr): Use dwarf_frame_regnum.
+	* dwarf2out.h (dwarf_frame_regnum): New.
+	(struct cfa_loc): Document the domain of the reg member.
+
 2011-07-11  Uros Bizjak  <ubizjak@gmail.com>
 
 	* config/i386/i386.c (ix86_trampoline_init): Switch arms of if expr.

gcc/dwarf2out.c

@@ -10408,8 +10408,8 @@ based_loc_descr (rtx reg, HOST_WIDE_INT offset,
     }
   else if (!optimize
 	   && fde
-	   && (fde->drap_reg == REGNO (reg)
-	       || fde->vdrap_reg == REGNO (reg)))
+	   && (fde->drap_reg == dwarf_frame_regnum (REGNO (reg))
+	       || fde->vdrap_reg == dwarf_frame_regnum (REGNO (reg))))
     {
       /* Use cfa+offset to represent the location of arguments passed
 	 on the stack when drap is used to align stack.

gcc/dwarf2out.h

@@ -121,6 +121,7 @@ dw_fde_node;
 typedef struct cfa_loc {
   HOST_WIDE_INT offset;
   HOST_WIDE_INT base_offset;
+  /* REG is in DWARF_FRAME_REGNUM space, *not* normal REGNO space.  */
   unsigned int reg;
   BOOL_BITFIELD indirect : 1;  /* 1 if CFA is accessed via a dereference.  */
   BOOL_BITFIELD in_use : 1;    /* 1 if a saved cfa is stored here.  */
@@ -261,6 +262,15 @@ extern void dwarf2out_set_demangle_name_func (const char *(*) (const char *));
 extern void dwarf2out_vms_debug_main_pointer (void);
 #endif
 
+/* Unfortunately, DWARF_FRAME_REGNUM is not universally defined in such a
+   way as to force an unsigned return type.  Do that via inline wrapper.  */
+
+static inline unsigned
+dwarf_frame_regnum (unsigned regnum)
+{
+  return DWARF_FRAME_REGNUM (regnum);
+}
+  
 struct array_descr_info
 {
   int ndimensions;