This is the mail archive of the mailing list for the GDB project.

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[commit] Fix merge error (Re: [04/15] Per-thread architecture support)


it seems this chunk got lost due to a merge reject I must have overlooked:
> 	* remote.c (remote_wait): Access target registers in target_gdbarch.
The following patch re-applies it at the proper location.

Tested on powerpc64-linux, committed to mainline.



	* remote.c (process_stop_reply): Access expedited target registers
	in target_gdbarch.

Index: src/gdb/remote.c
--- src.orig/gdb/remote.c
+++ src/gdb/remote.c
@@ -4591,14 +4591,15 @@ process_stop_reply (struct stop_reply *s
       /* Expedited registers.  */
       if (stop_reply->regcache)
+	  struct regcache *regcache
+	    = get_thread_arch_regcache (ptid, target_gdbarch);
 	  cached_reg_t *reg;
 	  int ix;
 	  for (ix = 0;
 	       VEC_iterate(cached_reg_t, stop_reply->regcache, ix, reg);
-	    regcache_raw_supply (get_thread_regcache (ptid),
-				 reg->num, reg->data);
+	    regcache_raw_supply (regcache, reg->num, reg->data);
 	  VEC_free (cached_reg_t, stop_reply->regcache);

  Dr. Ulrich Weigand
  GNU Toolchain for Linux on System z and Cell BE

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]