[RFA] x86_64_skip_prologue again...

[RFA] x86_64_skip_prologue again...

[Michal Ludvig]

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

Hi all,
now x86_64_skip_prologue() works even on functions without debug 
information.

2002-06-05  Michal Ludvig  <mludvig@suse.cz>

	* x86-64-tdep.c (x86_64_skip_prologue): Fix to work on functions
	 without debug information too.

Easy one. Can I commit?

Michal Ludvig
-- 
* SuSE CR, s.r.o     * mludvig@suse.cz
* +420 2 9654 5373   * http://www.suse.cz

[-- Attachment #2: skip-prologue2.diff --]
[-- Type: text/plain, Size: 1961 bytes --]

Index: x86-64-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/x86-64-tdep.c,v
retrieving revision 1.20
diff -c -3 -p -r1.20 x86-64-tdep.c
*** x86-64-tdep.c	27 May 2002 13:37:38 -0000	1.20
--- x86-64-tdep.c	5 Jun 2002 11:55:18 -0000
*************** x86_64_frameless_function_invocation (st
*** 845,854 ****
  CORE_ADDR
  x86_64_skip_prologue (CORE_ADDR pc)
  {
!   int i, firstline, currline;
    struct symtab_and_line v_sal;
    struct symbol *v_function;
!   CORE_ADDR salendaddr = 0, endaddr = 0;
  
    /* We will handle only functions beginning with:
       55          pushq %rbp
--- 845,854 ----
  CORE_ADDR
  x86_64_skip_prologue (CORE_ADDR pc)
  {
!   int i;
    struct symtab_and_line v_sal;
    struct symbol *v_function;
!   CORE_ADDR endaddr;
  
    /* We will handle only functions beginning with:
       55          pushq %rbp
*************** x86_64_skip_prologue (CORE_ADDR pc)
*** 876,893 ****
    if (!v_function || !v_function->ginfo.value.block || !v_sal.symtab)
      return pc;
  
-   firstline = v_sal.line;
-   currline = firstline;
-   salendaddr = v_sal.end;
    endaddr = v_function->ginfo.value.block->endaddr;
  
    for (i = 0; i < v_sal.symtab->linetable->nitems; i++)
!     if (v_sal.symtab->linetable->item[i].line > firstline
! 	&& v_sal.symtab->linetable->item[i].pc >= salendaddr
  	&& v_sal.symtab->linetable->item[i].pc < endaddr)
        {
  	pc = v_sal.symtab->linetable->item[i].pc;
- 	currline = v_sal.symtab->linetable->item[i].line;
  	break;
        }
  
--- 876,888 ----
    if (!v_function || !v_function->ginfo.value.block || !v_sal.symtab)
      return pc;
  
    endaddr = v_function->ginfo.value.block->endaddr;
  
    for (i = 0; i < v_sal.symtab->linetable->nitems; i++)
!     if (v_sal.symtab->linetable->item[i].pc >= pc
  	&& v_sal.symtab->linetable->item[i].pc < endaddr)
        {
  	pc = v_sal.symtab->linetable->item[i].pc;
  	break;
        }
  

Re: [RFA] x86_64_skip_prologue again...

[Michal Ludvig]

Michal Ludvig wrote:
> Hi all,
> now x86_64_skip_prologue() works even on functions without debug 
> information.
> 
> 2002-06-05  Michal Ludvig  <mludvig@suse.cz>
> 
>     * x86-64-tdep.c (x86_64_skip_prologue): Fix to work on functions
>      without debug information too.
> 
> Easy one. Can I commit?

This is rather simple one. If noone objects I'll commit this on monday 
as obvious. OK?

Michal Ludvig

> Michal Ludvig
> 
> 
> ------------------------------------------------------------------------
> 
> Index: x86-64-tdep.c
> ===================================================================
> RCS file: /cvs/src/src/gdb/x86-64-tdep.c,v
> retrieving revision 1.20
> diff -c -3 -p -r1.20 x86-64-tdep.c
> *** x86-64-tdep.c	27 May 2002 13:37:38 -0000	1.20
> --- x86-64-tdep.c	5 Jun 2002 11:55:18 -0000
> *************** x86_64_frameless_function_invocation (st
> *** 845,854 ****
>   CORE_ADDR
>   x86_64_skip_prologue (CORE_ADDR pc)
>   {
> !   int i, firstline, currline;
>     struct symtab_and_line v_sal;
>     struct symbol *v_function;
> !   CORE_ADDR salendaddr = 0, endaddr = 0;
>   
>     /* We will handle only functions beginning with:
>        55          pushq %rbp
> --- 845,854 ----
>   CORE_ADDR
>   x86_64_skip_prologue (CORE_ADDR pc)
>   {
> !   int i;
>     struct symtab_and_line v_sal;
>     struct symbol *v_function;
> !   CORE_ADDR endaddr;
>   
>     /* We will handle only functions beginning with:
>        55          pushq %rbp
> *************** x86_64_skip_prologue (CORE_ADDR pc)
> *** 876,893 ****
>     if (!v_function || !v_function->ginfo.value.block || !v_sal.symtab)
>       return pc;
>   
> -   firstline = v_sal.line;
> -   currline = firstline;
> -   salendaddr = v_sal.end;
>     endaddr = v_function->ginfo.value.block->endaddr;
>   
>     for (i = 0; i < v_sal.symtab->linetable->nitems; i++)
> !     if (v_sal.symtab->linetable->item[i].line > firstline
> ! 	&& v_sal.symtab->linetable->item[i].pc >= salendaddr
>   	&& v_sal.symtab->linetable->item[i].pc < endaddr)
>         {
>   	pc = v_sal.symtab->linetable->item[i].pc;
> - 	currline = v_sal.symtab->linetable->item[i].line;
>   	break;
>         }
>   
> --- 876,888 ----
>     if (!v_function || !v_function->ginfo.value.block || !v_sal.symtab)
>       return pc;
>   
>     endaddr = v_function->ginfo.value.block->endaddr;
>   
>     for (i = 0; i < v_sal.symtab->linetable->nitems; i++)
> !     if (v_sal.symtab->linetable->item[i].pc >= pc
>   	&& v_sal.symtab->linetable->item[i].pc < endaddr)
>         {
>   	pc = v_sal.symtab->linetable->item[i].pc;
>   	break;
>         }
>   


-- 
Michal Ludvig
-- 
* SuSE CR, s.r.o     * mludvig@suse.cz
* +420 2 9654 5373   * http://www.suse.cz

Re: [RFA] x86_64_skip_prologue again...

[Andreas Schwab]

Michal Ludvig <mludvig@suse.cz> writes:

|> Michal Ludvig wrote:
|> > Hi all,
|> > now x86_64_skip_prologue() works even on functions without debug
|> > information.
|> > 2002-06-05  Michal Ludvig  <mludvig@suse.cz>
|> >     * x86-64-tdep.c (x86_64_skip_prologue): Fix to work on functions
|> >      without debug information too.
|> > Easy one. Can I commit?
|> 
|> This is rather simple one. If noone objects I'll commit this on monday as
|> obvious. OK?

OK.

Andreas.

-- 
Andreas Schwab, SuSE Labs, schwab@suse.de
SuSE Linux AG, Deutschherrnstr. 15-19, D-90429 Nürnberg
Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."