From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 18174 invoked by alias); 6 Aug 2008 20:04:12 -0000 Received: (qmail 18159 invoked by uid 22791); 6 Aug 2008 20:04:11 -0000 X-Spam-Check-By: sourceware.org Received: from sibelius.xs4all.nl (HELO sibelius.xs4all.nl) (82.92.89.47) by sourceware.org (qpsmtpd/0.31) with ESMTP; Wed, 06 Aug 2008 20:03:25 +0000 Received: from brahms.sibelius.xs4all.nl (kettenis@localhost.sibelius.xs4all.nl [127.0.0.1]) by brahms.sibelius.xs4all.nl (8.14.3/8.14.3) with ESMTP id m76JvJTS006774; Wed, 6 Aug 2008 21:57:19 +0200 (CEST) Received: (from kettenis@localhost) by brahms.sibelius.xs4all.nl (8.14.3/8.14.3/Submit) id m76JvJeq017688; Wed, 6 Aug 2008 21:57:19 +0200 (CEST) Date: Wed, 06 Aug 2008 20:04:00 -0000 Message-Id: <200808061957.m76JvJeq017688@brahms.sibelius.xs4all.nl> From: Mark Kettenis To: pedro@codesourcery.com CC: gdb-patches@sourceware.org In-reply-to: <200808061632.58245.pedro@codesourcery.com> (message from Pedro Alves on Wed, 6 Aug 2008 16:32:57 +0100) Subject: Re: Fix building on x86 OpenBSD 4.3 References: <200808061610.44404.pedro@codesourcery.com> <200808061523.m76FNAW2028555@brahms.sibelius.xs4all.nl> <200808061632.58245.pedro@codesourcery.com> Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2008-08/txt/msg00138.txt.bz2 > From: Pedro Alves > Date: Wed, 6 Aug 2008 16:32:57 +0100 > > > > And I can see it being set to != 0 in that files' history at: > > ^^^ Of course, I meant *can't* here. :-) > > > http://opengrok.creo.hu/openbsd/history/src/sys/arch/i386/i386/vm_machdep.c > > > Thanks for pointing this out, I'll fix it ASAP. > > Thanks! I just comitted the attached patch. Index: ChangeLog from Mark Kettenis * i386obsd-nat.c (i386obsd_supply_pcb): Adjust for changes in OpenBSD 4.3. Index: i386obsd-nat.c =================================================================== RCS file: /cvs/src/src/gdb/i386obsd-nat.c,v retrieving revision 1.11 diff -u -p -r1.11 i386obsd-nat.c --- i386obsd-nat.c 1 Jan 2008 22:53:11 -0000 1.11 +++ i386obsd-nat.c 6 Aug 2008 19:34:38 -0000 @@ -60,10 +60,11 @@ i386obsd_supply_pcb (struct regcache *re /* Read the stack frame, and check its validity. We do this by checking if the saved interrupt priority level in the stack frame looks reasonable.. */ - read_memory (pcb->pcb_esp, (char *) &sf, sizeof sf); - if ((unsigned int) sf.sf_ppl < 0x100 && (sf.sf_ppl & 0xf) == 0) +#ifdef PCB_SAVECTX + if ((pcb->pcb_flags & PCB_SAVECTX) == 0) { /* Yes, we have a frame that matches cpu_switch(). */ + read_memory (pcb->pcb_esp, (char *) &sf, sizeof sf); pcb->pcb_esp += sizeof (struct switchframe); regcache_raw_supply (regcache, I386_EDI_REGNUM, &sf.sf_edi); regcache_raw_supply (regcache, I386_ESI_REGNUM, &sf.sf_esi); @@ -71,9 +72,12 @@ i386obsd_supply_pcb (struct regcache *re regcache_raw_supply (regcache, I386_EIP_REGNUM, &sf.sf_eip); } else +#endif { /* No, the pcb must have been last updated by savectx(). */ - pcb->pcb_esp += 4; + pcb->pcb_esp = pcb->pcb_ebp; + pcb->pcb_ebp = read_memory_integer(pcb->pcb_esp, 4); + sf.sf_eip = read_memory_integer(pcb->pcb_esp + 4, 4); regcache_raw_supply (regcache, I386_EIP_REGNUM, &sf); }