1 files changed, 60 insertions, 12 deletions
diff --git a/gdb/x86-64-tdep.h b/gdb/x86-64-tdep.h
index 608219c578f..4e013f88333 100644
--- a/gdb/x86-64-tdep.h
+++ b/gdb/x86-64-tdep.h
@@ -30,18 +30,66 @@ struct frame_info;
 
 #include "i386-tdep.h"
 
-/* Register numbers of various important registers.  */
-
-#define X86_64_RAX_REGNUM	0 /* %rax */
-#define X86_64_RDX_REGNUM	3 /* %rdx */
-#define X86_64_RDI_REGNUM	5 /* %rdi */
-#define X86_64_RBP_REGNUM	6 /* %rbp */
-#define X86_64_RSP_REGNUM	7 /* %rsp */
-#define X86_64_RIP_REGNUM	16 /* %rip */
-#define X86_64_EFLAGS_REGNUM	17 /* %eflags */
-#define X86_64_ST0_REGNUM	22 /* %st0 */
-#define X86_64_XMM0_REGNUM	38 /* %xmm0 */
-#define X86_64_XMM1_REGNUM	39 /* %xmm1 */
+/* Register numbers of x86-64 registers.  */
+
+enum x86_64_regnums
+{
+  X86_64_RAX_REGNUM,
+  X86_64_RBX_REGNUM,
+  X86_64_RCX_REGNUM,
+  X86_64_RDX_REGNUM,
+  X86_64_RSI_REGNUM,
+  X86_64_RDI_REGNUM,
+  X86_64_RBP_REGNUM,
+  X86_64_RSP_REGNUM,
+  X86_64_R8_REGNUM,
+  X86_64_R9_REGNUM,
+  X86_64_R10_REGNUM,
+  X86_64_R11_REGNUM,
+  X86_64_R12_REGNUM,
+  X86_64_R13_REGNUM,
+  X86_64_R14_REGNUM,
+  X86_64_R15_REGNUM,
+  X86_64_RIP_REGNUM,
+  X86_64_EFLAGS_REGNUM,
+  X86_64_DS_REGNUM,
+  X86_64_ES_REGNUM,
+  X86_64_FS_REGNUM,
+  X86_64_GS_REGNUM,
+  X86_64_ST0_REGNUM,
+  X86_64_ST1_REGNUM,
+  X86_64_ST2_REGNUM,
+  X86_64_ST3_REGNUM,
+  X86_64_ST4_REGNUM,
+  X86_64_ST5_REGNUM,
+  X86_64_ST6_REGNUM,
+  X86_64_ST7_REGNUM,
+  X86_64_FCTRL_REGNUM,
+  X86_64_FSTAT_REGNUM,
+  X86_64_FTAG_REGNUM,
+  X86_64_FISEG_REGNUM,
+  X86_64_FIOFF_REGNUM,
+  X86_64_FOSEG_REGNUM,
+  X86_64_FOOFF_REGNUM,
+  X86_64_FOP_REGNUM,
+  X86_64_XMM0_REGNUM,
+  X86_64_XMM1_REGNUM,
+  X86_64_XMM2_REGNUM,
+  X86_64_XMM3_REGNUM,
+  X86_64_XMM4_REGNUM,
+  X86_64_XMM5_REGNUM,
+  X86_64_XMM6_REGNUM,
+  X86_64_XMM7_REGNUM,
+  X86_64_XMM8_REGNUM,
+  X86_64_XMM9_REGNUM,
+  X86_64_XMM10_REGNUM,
+  X86_64_XMM11_REGNUM,
+  X86_64_XMM12_REGNUM,
+  X86_64_XMM13_REGNUM,
+  X86_64_XMM14_REGNUM,
+  X86_64_XMM15_REGNUM,
+  X86_64_MXCSR_REGNUM
+};
 
 /* Number of general purpose registers.  */
 #define X86_64_NUM_GREGS	22