Re: [RFA] sh-tdep.c: optimize and rename virtual register conversion functions

[Corinna Vinschen <vinschen@redhat.com>]

On Feb 16 11:16, Elena Zannoni wrote:
> Corinna Vinschen writes:
>  > So, if you think that the test should be kept in that function, that's
>  > fine with me.  The only remaining bit is the naming of the function then. 
>  > The new cpu is not a sh4 type, but it's using the same pseudo register
>  > functions as the sh4.  The function would just not be sh4 specific anymore.
> 
> Ok, thanks. Just rename the function for now, we can revisit later.

OK, thank you.  I've applied the below patch.

Corinna

Index: sh-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/sh-tdep.c,v
retrieving revision 1.160
diff -u -p -r1.160 sh-tdep.c
--- sh-tdep.c	16 Feb 2004 16:04:18 -0000	1.160
+++ sh-tdep.c	16 Feb 2004 16:51:45 -0000
@@ -1519,8 +1519,8 @@ sh_default_register_type (struct gdbarch
    because they are stored as 4 individual FP elements. */
 
 static void
-sh_sh4_register_convert_to_virtual (int regnum, struct type *type,
-				    char *from, char *to)
+sh_register_convert_to_virtual (int regnum, struct type *type,
+				char *from, char *to)
 {
   if (regnum >= DR0_REGNUM && regnum <= DR_LAST_REGNUM)
     {
@@ -1535,8 +1535,8 @@ sh_sh4_register_convert_to_virtual (int 
 }
 
 static void
-sh_sh4_register_convert_to_raw (struct type *type, int regnum,
-				const void *from, void *to)
+sh_register_convert_to_raw (struct type *type, int regnum,
+			    const void *from, void *to)
 {
   if (regnum >= DR0_REGNUM && regnum <= DR_LAST_REGNUM)
     {
@@ -1587,10 +1587,9 @@ sh_pseudo_register_read (struct gdbarch 
 			    + register_size (gdbarch,
 					     base_regnum) * portion));
       /* We must pay attention to the endiannes. */
-      sh_sh4_register_convert_to_virtual (reg_nr,
-					  gdbarch_register_type (gdbarch,
-								 reg_nr),
-					  temp_buffer, buffer);
+      sh_register_convert_to_virtual (reg_nr,
+				      gdbarch_register_type (gdbarch, reg_nr),
+				      temp_buffer, buffer);
     }
   else if (reg_nr >= FV0_REGNUM && reg_nr <= FV_LAST_REGNUM)
     {
@@ -1617,8 +1616,8 @@ sh_pseudo_register_write (struct gdbarch
       base_regnum = dr_reg_base_num (reg_nr);
 
       /* We must pay attention to the endiannes. */
-      sh_sh4_register_convert_to_raw (gdbarch_register_type (gdbarch, reg_nr),
-				      reg_nr, buffer, temp_buffer);
+      sh_register_convert_to_raw (gdbarch_register_type (gdbarch, reg_nr),
+				  reg_nr, buffer, temp_buffer);
 
       /* Write the real regs for which this one is an alias.  */
       for (portion = 0; portion < 2; portion++)

-- 
Corinna Vinschen
Cygwin Developer
Red Hat, Inc.