* mep-tdep.c (current_me_module): Read from current regcache

	instead of calling read_register.
	(current_options): Likewise.

2 files changed, 18 insertions, 2 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6860ae9..2bd14bf 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,11 @@
 2007-06-15  Ulrich Weigand  <uweigand@de.ibm.com>
 
+	* mep-tdep.c (current_me_module): Read from current regcache
+	instead of calling read_register.
+	(current_options): Likewise.
+
+2007-06-15  Ulrich Weigand  <uweigand@de.ibm.com>
+
 	* cris-tdep.c (cris_stopped_data_address): Read register values
 	from current frame instead of calling read_register.
 	* frv-tdep.c (frv_stopped_data_address): Likewise.
diff --git a/gdb/mep-tdep.c b/gdb/mep-tdep.c
index 632172e..0f1ec47 100644
--- a/gdb/mep-tdep.c
+++ b/gdb/mep-tdep.c
@@ -850,7 +850,12 @@ static CONFIG_ATTR
 current_me_module ()
 {
   if (target_has_registers)
-    return read_register (MEP_MODULE_REGNUM);
+    {
+      ULONGEST regval;
+      regcache_cooked_read_unsigned (current_regcache,
+				     MEP_MODULE_REGNUM, &regval);
+      return regval;
+    }
   else
     return gdbarch_tdep (current_gdbarch)->me_module;
 }
@@ -868,7 +873,12 @@ static unsigned int
 current_options ()
 {
   if (target_has_registers)
-    return read_register (MEP_OPT_REGNUM);
+    {
+      ULONGEST regval;
+      regcache_cooked_read_unsigned (current_regcache,
+				     MEP_OPT_REGNUM, &regval);
+      return regval;
+    }
   else
     return me_module_opt (current_me_module ());
 }