From: Ulrich Weigand <uweigand@de.ibm.com>
Date: Sun, 6 May 2007 14:10:15 +0000 (+0000)
Subject: 	* m32r-linux-nat.c (supply_gregset): Do not modify contents
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d817e0835325df6f30475004ac1e59bff863088a;p=binutils-gdb.git

	* m32r-linux-nat.c (supply_gregset): Do not modify contents
	pointed to by GREGSETP.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index bd8acfd4422..4190c4ba623 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-06  Ulrich Weigand  <uweigand@de.ibm.com>
+
+	* m32r-linux-nat.c (supply_gregset): Do not modify contents
+	pointed to by GREGSETP.
+
 2007-05-06  Ulrich Weigand  <uweigand@de.ibm.com>
 
 	* irix5-nat.c (fill_gregset): Use regcache_raw_collect instead
diff --git a/gdb/m32r-linux-nat.c b/gdb/m32r-linux-nat.c
index 86b20bda29e..2b17aadf2fe 100644
--- a/gdb/m32r-linux-nat.c
+++ b/gdb/m32r-linux-nat.c
@@ -80,19 +80,23 @@ supply_gregset (elf_gregset_t * gregsetp)
 
   for (i = 0; i < M32R_LINUX_NUM_REGS; i++)
     {
+      elf_greg_t regval;
+
       switch (i)
 	{
 	case PSW_REGNUM:
-	  *(regp + regmap[i]) =
-	    ((0x00c1 & bbpsw) << 8) | ((0xc100 & psw) >> 8);
+	  regval = ((0x00c1 & bbpsw) << 8) | ((0xc100 & psw) >> 8);
 	  break;
 	case CBR_REGNUM:
-	  *(regp + regmap[i]) = ((psw >> 8) & 1);
+	  regval = ((psw >> 8) & 1);
+	  break;
+	default:
+	  regval = *(regp + regmap[i]);
 	  break;
 	}
 
       if (i != M32R_SP_REGNUM)
-	regcache_raw_supply (current_regcache, i, regp + regmap[i]);
+	regcache_raw_supply (current_regcache, i, &regval);
       else if (psw & 0x8000)
 	regcache_raw_supply (current_regcache, i, regp + SPU_REGMAP);
       else