[patch] i386-nto-tdep.c - sigcontext

[patch] i386-nto-tdep.c - sigcontext

[Aleksandar Ristovski]

[-- Attachment #1: Type: text/plain, Size: 450 bytes --]

Hello,

This is another cleanup patch for nto target (part of the 
ongoing effort to get my local changes into mainline).

Thanks,

-- 
Aleksandar Ristovski
QNX Software Systems


ChangeLog:
	* i386-nto-tdep.c (I386_NTO_SIGCONTEXT_OFFSET): Remove define.
	(i386nto_sigcontext_addr): Change the way context address 
is calculated.
	(i386nto_init_abi): Remove usage of deprecated 
sc_reg_offset and
	sc_sp_offset and set sc_reg_offset and sc_num_regs.

[-- Attachment #2: i386-nto-tdep.c-sigcontext_addr-20090611.patch --]
[-- Type: text/plain, Size: 1586 bytes --]

Index: gdb/i386-nto-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/i386-nto-tdep.c,v
retrieving revision 1.33
diff -u -p -r1.33 i386-nto-tdep.c
--- gdb/i386-nto-tdep.c	11 Jun 2009 17:12:11 -0000	1.33
+++ gdb/i386-nto-tdep.c	11 Jun 2009 18:45:30 -0000
@@ -290,8 +290,6 @@ i386nto_sigtramp_p (struct frame_info *t
   return name && strcmp ("__signalstub", name) == 0;
 }
 
-#define I386_NTO_SIGCONTEXT_OFFSET 136
-
 /* Assuming THIS_FRAME is a QNX Neutrino sigtramp routine, return the
    address of the associated sigcontext structure.  */
 
@@ -299,12 +297,14 @@ static CORE_ADDR
 i386nto_sigcontext_addr (struct frame_info *this_frame)
 {
   char buf[4];
-  CORE_ADDR sp;
+  CORE_ADDR ptrctx;
 
-  get_frame_register (this_frame, I386_ESP_REGNUM, buf);
-  sp = extract_unsigned_integer (buf, 4);
+  /* We store __ucontext_t addr in EDI register.  */
+  get_frame_register (this_frame, I386_EDI_REGNUM, buf);
+  ptrctx = extract_unsigned_integer (buf, 4);
+  ptrctx += 24 /* Context pointer is at this offset.  */;
 
-  return sp + I386_NTO_SIGCONTEXT_OFFSET;
+  return ptrctx;
 }
 
 static void
@@ -343,8 +343,8 @@ i386nto_init_abi (struct gdbarch_info in
 
   tdep->sigtramp_p = i386nto_sigtramp_p;
   tdep->sigcontext_addr = i386nto_sigcontext_addr;
-  tdep->sc_pc_offset = 56;
-  tdep->sc_sp_offset = 68;
+  tdep->sc_reg_offset = i386nto_gregset_reg_offset;
+  tdep->sc_num_regs = ARRAY_SIZE (i386nto_gregset_reg_offset);
 
   /* Setjmp()'s return PC saved in EDX (5).  */
   tdep->jb_pc_offset = 20;	/* 5x32 bit ints in.  */

Re: [patch] i386-nto-tdep.c - sigcontext

[Mark Kettenis]

> From: Aleksandar Ristovski <aristovski@qnx.com>
> Date:  Thu, 11 Jun 2009 14:53:19 -0400
> 
> Hello,
> 
> This is another cleanup patch for nto target (part of the 
> ongoing effort to get my local changes into mainline).
> 
> ChangeLog:
> 	* i386-nto-tdep.c (I386_NTO_SIGCONTEXT_OFFSET): Remove define.
> 	(i386nto_sigcontext_addr): Change the way context address 
> is calculated.
> 	(i386nto_init_abi): Remove usage of deprecated 
> sc_reg_offset and
> 	sc_sp_offset and set sc_reg_offset and sc_num_regs.

Hard for me to check the correctness of this diff, but the mechanism
you're using does look correct.

Re: [patch] i386-nto-tdep.c - sigcontext

[Aleksandar Ristovski]

Mark Kettenis wrote:
>> From: Aleksandar Ristovski <aristovski@qnx.com>
>> Date:  Thu, 11 Jun 2009 14:53:19 -0400
>>
>> Hello,
>>
>> This is another cleanup patch for nto target (part of the 
>> ongoing effort to get my local changes into mainline).
>>
>> ChangeLog:
>> 	* i386-nto-tdep.c (I386_NTO_SIGCONTEXT_OFFSET): Remove define.
>> 	(i386nto_sigcontext_addr): Change the way context address 
>> is calculated.
>> 	(i386nto_init_abi): Remove usage of deprecated 
>> sc_reg_offset and
>> 	sc_sp_offset and set sc_reg_offset and sc_num_regs.
> 
> Hard for me to check the correctness of this diff, but the mechanism
> you're using does look correct.
> 

Thanks for looking at this Mark. I take your reply as 
approval? (correct me if I am wrong).

I should have probably added that the series of patches have 
been functionally tested (extensively) by QNX. I am just 
moving those changes to mainline.

(This is not to say that review is not necessary.)

Thank you,

-- 
Aleksandar Ristovski
QNX Software Systems

Re: [patch] i386-nto-tdep.c - sigcontext

[Aleksandar Ristovski]

Aleksandar Ristovski wrote:
> Mark Kettenis wrote:
>>> From: Aleksandar Ristovski <aristovski@qnx.com>
>>> Date:  Thu, 11 Jun 2009 14:53:19 -0400
>>>
>>> Hello,
>>>
>>> This is another cleanup patch for nto target (part of the ongoing 
>>> effort to get my local changes into mainline).
>>>
>>> ChangeLog:
>>>     * i386-nto-tdep.c (I386_NTO_SIGCONTEXT_OFFSET): Remove define.
>>>     (i386nto_sigcontext_addr): Change the way context address is 
>>> calculated.
>>>     (i386nto_init_abi): Remove usage of deprecated sc_reg_offset and
>>>     sc_sp_offset and set sc_reg_offset and sc_num_regs.
>>
>> Hard for me to check the correctness of this diff, but the mechanism
>> you're using does look correct.
>>

Committed.

Thanks,

-- 
Aleksandar Ristovski
QNX Software Systems