2002-09-25 Andrew Cagney <cagney@redhat.com>

[deliverable/binutils-gdb.git] / gdb / x86-64-linux-nat.c

diff --git a/gdb/x86-64-linux-nat.c b/gdb/x86-64-linux-nat.c
index 4c4f64382c402e97d051573744538105a412e243..7e6417b1cc9225d09198137d5a6125db9af91884 100644 (file)
--- a/gdb/x86-64-linux-nat.c
+++ b/gdb/x86-64-linux-nat.c
@@ -26,6 +26,7 @@
 #include "gdbcore.h"
 #include "regcache.h"
 #include "gdb_assert.h"
+#include "gdb_string.h"
 #include "x86-64-tdep.h"
 
 #include <sys/ptrace.h>
@@ -42,7 +43,7 @@ static int x86_64_regmap[] = {
   RSI, RDI, RBP, RSP,
   R8, R9, R10, R11,
   R12, R13, R14, R15,
-  RIP, EFLAGS,
+  RIP, EFLAGS, CS, SS, 
   DS, ES, FS, GS
 };
 
@@ -197,12 +198,12 @@ store_regs (int tid, int regno)
 static void *
 x86_64_fxsave_offset (elf_fpregset_t * fxsave, int regnum)
 {
-  char *reg_name;
+  const char *reg_name;
   int reg_index;
 
   gdb_assert (x86_64_num_gregs - 1 < regnum && regnum < x86_64_num_regs);
 
-  reg_name = x86_64_register_nr2name (regnum);
+  reg_name = x86_64_register_name (regnum);
 
   if (reg_name[0] == 's' && reg_name[1] == 't')
     {
@@ -231,8 +232,8 @@ supply_fpregset (elf_fpregset_t * fxsave)
 {
   int i, reg_st0, reg_mxcsr;
 
-  reg_st0 = x86_64_register_name2nr ("st0");
-  reg_mxcsr = x86_64_register_name2nr ("mxcsr");
+  reg_st0 = x86_64_register_number ("st0");
+  reg_mxcsr = x86_64_register_number ("mxcsr");
 
   gdb_assert (reg_st0 > 0 && reg_mxcsr > reg_st0);