From: Mark Kettenis Date: Sun, 1 Jun 2003 16:45:02 +0000 (+0000) Subject: * i386-linux-nat.c (child_resume): Use I386_ESP_REGNUM instead of X-Git-Url: http://git.sourceforge.jp/view?a=commitdiff_plain;h=136d20bd901dd01c05c3a2d3c156132e1487d96c;p=pf3gnuchains%2Fpf3gnuchains3x.git * i386-linux-nat.c (child_resume): Use I386_ESP_REGNUM instead of SP_REGNUM. * i386-linux-tdep.c (i386_linux_sigcontext_addr): Likewise. * i386bsd-tdep.c (i386bsd_sigcontext_addr): Likewise. --- diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 7e35d40b66..1425635917 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2003-06-01 Mark Kettenis + + * i386-linux-nat.c (child_resume): Use I386_ESP_REGNUM instead of + SP_REGNUM. + * i386-linux-tdep.c (i386_linux_sigcontext_addr): Likewise. + * i386bsd-tdep.c (i386bsd_sigcontext_addr): Likewise. + 2003-06-01 Richard Henderson * dwarf2-frame.c (struct dwarf2_cie): Add saw_z_augmentation. diff --git a/gdb/i386-linux-nat.c b/gdb/i386-linux-nat.c index cf769d87ed..1928a551db 100644 --- a/gdb/i386-linux-nat.c +++ b/gdb/i386-linux-nat.c @@ -852,7 +852,7 @@ child_resume (ptid_t ptid, int step, enum target_signal signal) /* Then check the system call number. */ if (syscall == SYS_sigreturn || syscall == SYS_rt_sigreturn) { - CORE_ADDR sp = read_register (SP_REGNUM); + CORE_ADDR sp = read_register (I386_ESP_REGNUM); CORE_ADDR addr = sp; unsigned long int eflags; diff --git a/gdb/i386-linux-tdep.c b/gdb/i386-linux-tdep.c index 13ed1ffd17..6d284f1ea9 100644 --- a/gdb/i386-linux-tdep.c +++ b/gdb/i386-linux-tdep.c @@ -252,7 +252,7 @@ i386_linux_sigcontext_addr (struct frame_info *next_frame) CORE_ADDR sp; char buf[4]; - frame_unwind_register (next_frame, SP_REGNUM, buf); + frame_unwind_register (next_frame, I386_ESP_REGNUM, buf); sp = extract_unsigned_integer (buf, 4); pc = i386_linux_sigtramp_start (frame_pc_unwind (next_frame)); @@ -291,7 +291,7 @@ i386_linux_sigcontext_addr (struct frame_info *next_frame) static void i386_linux_write_pc (CORE_ADDR pc, ptid_t ptid) { - write_register_pid (PC_REGNUM, pc, ptid); + write_register_pid (I386_EIP_REGNUM, pc, ptid); /* We must be careful with modifying the program counter. If we just interrupted a system call, the kernel might try to restart diff --git a/gdb/i386bsd-tdep.c b/gdb/i386bsd-tdep.c index 80e057b4fa..94d68600fe 100644 --- a/gdb/i386bsd-tdep.c +++ b/gdb/i386bsd-tdep.c @@ -50,7 +50,7 @@ i386bsd_sigcontext_addr (struct frame_info *next_frame) char buf[4]; CORE_ADDR sp; - frame_unwind_register (next_frame, SP_REGNUM, buf); + frame_unwind_register (next_frame, I386_ESP_REGNUM, buf); sp = extract_unsigned_integer (buf, 4); return read_memory_unsigned_integer (sp + 8, 4);