aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeoffrey Keating <geoffk@apple.com>2006-10-17 03:59:43 +0000
committerGeoffrey Keating <geoffk@gcc.gnu.org>2006-10-17 03:59:43 +0000
commited1cf8ff80985e2bc036ffcf4a7f250a5f5970be (patch)
tree156a5b3fc5e284f59d25c61bc2934e71323920bd
parentfb8549a1d765f1c8c741c39b9022fefbc09be0de (diff)
downloadgcc-ed1cf8ff80985e2bc036ffcf4a7f250a5f5970be.zip
gcc-ed1cf8ff80985e2bc036ffcf4a7f250a5f5970be.tar.gz
gcc-ed1cf8ff80985e2bc036ffcf4a7f250a5f5970be.tar.bz2
sysv4.h (DBX_REGISTER_NUMBER): Move to rs6000.h.
* config/rs6000/sysv4.h (DBX_REGISTER_NUMBER): Move to rs6000.h. (DWARF2_FRAME_REG_OUT): Likewise. * config/rs6000/rs6000.h (DBX_REGISTER_NUMBER): Move from sysv4.h. (DWARF2_FRAME_REG_OUT): Likewise. From-SVN: r117816
-rw-r--r--gcc/ChangeLog7
-rw-r--r--gcc/config/rs6000/rs6000.h15
-rw-r--r--gcc/config/rs6000/sysv4.h14
3 files changed, 22 insertions, 14 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 15b1a70..aeb3dfd 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2006-10-16 Geoffrey Keating <geoffk@apple.com>
+
+ * config/rs6000/sysv4.h (DBX_REGISTER_NUMBER): Move to rs6000.h.
+ (DWARF2_FRAME_REG_OUT): Likewise.
+ * config/rs6000/rs6000.h (DBX_REGISTER_NUMBER): Move from sysv4.h.
+ (DWARF2_FRAME_REG_OUT): Likewise.
+
2006-10-17 Paul Brook <paul@codesourcery.com>
* config/arm/arm.c (arm_rtx_costs_1): Handle multiply-accumulate.
diff --git a/gcc/config/rs6000/rs6000.h b/gcc/config/rs6000/rs6000.h
index 12fbbbd..1edb097 100644
--- a/gcc/config/rs6000/rs6000.h
+++ b/gcc/config/rs6000/rs6000.h
@@ -612,9 +612,24 @@ extern enum rs6000_nop_insertion rs6000_sched_insert_nops;
#define DWARF_REG_TO_UNWIND_COLUMN(r) \
((r) > 1200 ? ((r) - 1200 + FIRST_PSEUDO_REGISTER - 1) : (r))
+/* Use standard DWARF numbering for DWARF debugging information. */
+#define DBX_REGISTER_NUMBER(REGNO) rs6000_dbx_register_number (REGNO)
+
/* Use gcc hard register numbering for eh_frame. */
#define DWARF_FRAME_REGNUM(REGNO) (REGNO)
+/* Map register numbers held in the call frame info that gcc has
+ collected using DWARF_FRAME_REGNUM to those that should be output in
+ .debug_frame and .eh_frame. We continue to use gcc hard reg numbers
+ for .eh_frame, but use the numbers mandated by the various ABIs for
+ .debug_frame. rs6000_emit_prologue has translated any combination of
+ CR2, CR3, CR4 saves to a save of CR2. The actual code emitted saves
+ the whole of CR, so we map CR2_REGNO to the DWARF reg for CR. */
+#define DWARF2_FRAME_REG_OUT(REGNO, FOR_EH) \
+ ((FOR_EH) ? (REGNO) \
+ : (REGNO) == CR2_REGNO ? 64 \
+ : DBX_REGISTER_NUMBER (REGNO))
+
/* 1 for registers that have pervasive standard uses
and are not available for the register allocator.
diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
index 55cf9ce..76c1d85 100644
--- a/gcc/config/rs6000/sysv4.h
+++ b/gcc/config/rs6000/sysv4.h
@@ -535,20 +535,6 @@ extern int fixuplabelno;
/* Historically we have also supported stabs debugging. */
#define DBX_DEBUGGING_INFO 1
-#define DBX_REGISTER_NUMBER(REGNO) rs6000_dbx_register_number (REGNO)
-
-/* Map register numbers held in the call frame info that gcc has
- collected using DWARF_FRAME_REGNUM to those that should be output in
- .debug_frame and .eh_frame. We continue to use gcc hard reg numbers
- for .eh_frame, but use the numbers mandated by the various ABIs for
- .debug_frame. rs6000_emit_prologue has translated any combination of
- CR2, CR3, CR4 saves to a save of CR2. The actual code emitted saves
- the whole of CR, so we map CR2_REGNO to the DWARF reg for CR. */
-#define DWARF2_FRAME_REG_OUT(REGNO, FOR_EH) \
- ((FOR_EH) ? (REGNO) \
- : (REGNO) == CR2_REGNO ? 64 \
- : DBX_REGISTER_NUMBER (REGNO))
-
#define TARGET_ENCODE_SECTION_INFO rs6000_elf_encode_section_info
#define TARGET_IN_SMALL_DATA_P rs6000_elf_in_small_data_p
#define TARGET_SECTION_TYPE_FLAGS rs6000_elf_section_type_flags