[RFA] sh-tdep.*: Rename DSP bank registers

[RFA] sh-tdep.*: Rename DSP bank registers

[Corinna Vinschen]

Hi,

sh-tdep.h defines two bank register numbers, R0_BANK_REGNUM and
R7_BANK_REGNUM.  Their values only make sense on DSP CPUs, while
other CPUs with register banks have the registers beginning at
another regnum.

I'd like to propose the below patch, which renames the used enum
values from R0_BANK_REGNUM and R7_BANK_REGNUM to DSP_R0_BANK_REGNUM
and DSP_R7_BANK_REGNUM respectively.  IMHO, that's less confusing
and allows to use the register bank numbering scheme of non-dsp
CPUs at a later point.


Thanks,
Corinna


ChangeLog:

	* sh-tdep.c (sh_dsp_register_sim_regno): Use DSP_Rx_BANK_REGNUM.
	* sh-tdep.h: Rename R0_BANK_REGNUM and R7_BANK_REGNUM to
	DSP_R0_BANK_REGNUM and DSP_R7_BANK_REGNUM.

Index: sh-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/sh-tdep.c,v
retrieving revision 1.159
diff -u -p -r1.159 sh-tdep.c
--- sh-tdep.c	14 Feb 2004 15:46:33 -0000	1.159
+++ sh-tdep.c	16 Feb 2004 15:34:42 -0000
@@ -1895,8 +1895,8 @@ sh_dsp_register_sim_regno (int nr)
     return SIM_SH_RS_REGNUM;
   if (nr == RE_REGNUM)
     return SIM_SH_RE_REGNUM;
-  if (nr >= R0_BANK_REGNUM && nr <= R7_BANK_REGNUM)
-    return nr - R0_BANK_REGNUM + SIM_SH_R0_BANK_REGNUM;
+  if (nr >= DSP_R0_BANK_REGNUM && nr <= DSP_R7_BANK_REGNUM)
+    return nr - DSP_R0_BANK_REGNUM + SIM_SH_R0_BANK_REGNUM;
   return nr;
 }
 
Index: sh-tdep.h
===================================================================
RCS file: /cvs/src/src/gdb/sh-tdep.h,v
retrieving revision 1.7
diff -u -p -r1.7 sh-tdep.h
--- sh-tdep.h	10 Oct 2003 07:13:11 -0000	1.7
+++ sh-tdep.h	16 Feb 2004 15:34:42 -0000
@@ -62,8 +62,8 @@ enum
     MOD_REGNUM = 40,
     RS_REGNUM = 43,
     RE_REGNUM = 44,
-    R0_BANK_REGNUM = 51,
-    R7_BANK_REGNUM = 58,
+    DSP_R0_BANK_REGNUM = 51,
+    DSP_R7_BANK_REGNUM = 58,
     /* Floating point pseudo registers */
     DR0_REGNUM = 59,
     DR_LAST_REGNUM = 66,

-- 
Corinna Vinschen
Cygwin Developer
Red Hat, Inc.

Re: [RFA] sh-tdep.*: Rename DSP bank registers

[Elena Zannoni]

Corinna Vinschen writes:
 > Hi,
 > 
 > sh-tdep.h defines two bank register numbers, R0_BANK_REGNUM and
 > R7_BANK_REGNUM.  Their values only make sense on DSP CPUs, while
 > other CPUs with register banks have the registers beginning at
 > another regnum.
 > 
 > I'd like to propose the below patch, which renames the used enum
 > values from R0_BANK_REGNUM and R7_BANK_REGNUM to DSP_R0_BANK_REGNUM
 > and DSP_R7_BANK_REGNUM respectively.  IMHO, that's less confusing
 > and allows to use the register bank numbering scheme of non-dsp
 > CPUs at a later point.
 > 

Interesting, this is what it was originally before your change:
-  if (nr >= DSP_R0_BANK_REGNUM && nr <= DSP_R7_BANK_REGNUM)
-    return nr - DSP_R0_BANK_REGNUM + SIM_SH_R0_BANK_REGNUM;
+  if (nr >= R0_BANK_REGNUM && nr <= R7_BANK_REGNUM)
+    return nr - R0_BANK_REGNUM + SIM_SH_R0_BANK_REGNUM;
 

ok.


 > 
 > ChangeLog:
 > 
 > 	* sh-tdep.c (sh_dsp_register_sim_regno): Use DSP_Rx_BANK_REGNUM.
 > 	* sh-tdep.h: Rename R0_BANK_REGNUM and R7_BANK_REGNUM to
 > 	DSP_R0_BANK_REGNUM and DSP_R7_BANK_REGNUM.
 > 
 > Index: sh-tdep.c
 > ===================================================================
 > RCS file: /cvs/src/src/gdb/sh-tdep.c,v
 > retrieving revision 1.159
 > diff -u -p -r1.159 sh-tdep.c
 > --- sh-tdep.c	14 Feb 2004 15:46:33 -0000	1.159
 > +++ sh-tdep.c	16 Feb 2004 15:34:42 -0000
 > @@ -1895,8 +1895,8 @@ sh_dsp_register_sim_regno (int nr)
 >      return SIM_SH_RS_REGNUM;
 >    if (nr == RE_REGNUM)
 >      return SIM_SH_RE_REGNUM;
 > -  if (nr >= R0_BANK_REGNUM && nr <= R7_BANK_REGNUM)
 > -    return nr - R0_BANK_REGNUM + SIM_SH_R0_BANK_REGNUM;
 > +  if (nr >= DSP_R0_BANK_REGNUM && nr <= DSP_R7_BANK_REGNUM)
 > +    return nr - DSP_R0_BANK_REGNUM + SIM_SH_R0_BANK_REGNUM;
 >    return nr;
 >  }
 >  
 > Index: sh-tdep.h
 > ===================================================================
 > RCS file: /cvs/src/src/gdb/sh-tdep.h,v
 > retrieving revision 1.7
 > diff -u -p -r1.7 sh-tdep.h
 > --- sh-tdep.h	10 Oct 2003 07:13:11 -0000	1.7
 > +++ sh-tdep.h	16 Feb 2004 15:34:42 -0000
 > @@ -62,8 +62,8 @@ enum
 >      MOD_REGNUM = 40,
 >      RS_REGNUM = 43,
 >      RE_REGNUM = 44,
 > -    R0_BANK_REGNUM = 51,
 > -    R7_BANK_REGNUM = 58,
 > +    DSP_R0_BANK_REGNUM = 51,
 > +    DSP_R7_BANK_REGNUM = 58,
 >      /* Floating point pseudo registers */
 >      DR0_REGNUM = 59,
 >      DR_LAST_REGNUM = 66,
 > 
 > -- 
 > Corinna Vinschen
 > Cygwin Developer
 > Red Hat, Inc.

Re: [RFA] sh-tdep.*: Rename DSP bank registers

[Corinna Vinschen]

On Feb 17 09:44, Elena Zannoni wrote:
> Corinna Vinschen writes:
>  > I'd like to propose the below patch, which renames the used enum
>  > values from R0_BANK_REGNUM and R7_BANK_REGNUM to DSP_R0_BANK_REGNUM
>  > and DSP_R7_BANK_REGNUM respectively.  IMHO, that's less confusing
>  > and allows to use the register bank numbering scheme of non-dsp
>  > CPUs at a later point.
> 
> Interesting, this is what it was originally before your change:
> -  if (nr >= DSP_R0_BANK_REGNUM && nr <= DSP_R7_BANK_REGNUM)
> -    return nr - DSP_R0_BANK_REGNUM + SIM_SH_R0_BANK_REGNUM;
> +  if (nr >= R0_BANK_REGNUM && nr <= R7_BANK_REGNUM)
> +    return nr - R0_BANK_REGNUM + SIM_SH_R0_BANK_REGNUM;

Half a year ago it seemed to be right.  Well... the world keeps turning.

Thanks, applied,
Corinna

-- 
Corinna Vinschen
Cygwin Developer
Red Hat, Inc.