Re: [7/10] Remove unused builtin_type_frame_reg

["Ulrich Weigand" <uweigand@de.ibm.com>]

Oops, wrong file attached.  This is the right one:


Hello,

std-regs.c contains another gdbarch-swapped type, but this is actually nowhere
used (the code that uses it is disabled).  This patch removes that disable code
completely; if at any time in the future we want to re-enable it, that type
needs to implemented properly.

Bye,
Ulrich


ChangeLog:

	* std-regs.c (builtin_type_frame_reg, build_builtin_type_frame_reg,
	value_of_builtin_frame_reg): Remove.
	(_initialize_frame_reg): Do not swap builtin_type_frame_reg.  Remove
	inactive call to value_of_builtin_frame_reg.


diff -urNp gdb-orig/gdb/std-regs.c gdb-head/gdb/std-regs.c
--- gdb-orig/gdb/std-regs.c	2007-06-06 17:19:37.000000000 +0200
+++ gdb-head/gdb/std-regs.c	2007-06-08 18:38:09.209782869 +0200
@@ -28,48 +28,6 @@
 #include "value.h"
 #include "gdb_string.h"
 
-/* Types that describe the various builtin registers.  */
-
-static struct type *builtin_type_frame_reg;
-
-/* Constructors for those types.  */
-
-static void
-build_builtin_type_frame_reg (void)
-{
-  /* $frame.  */
-  if (builtin_type_frame_reg == NULL)
-    {
-#if 0
-      struct frame
-      {
-	void *base;
-      };
-#endif
-      builtin_type_frame_reg = init_composite_type ("frame", TYPE_CODE_STRUCT);
-      append_composite_type_field (builtin_type_frame_reg, "base",
-				   builtin_type_void_data_ptr);
-    }
-}
-
-static struct value *
-value_of_builtin_frame_reg (struct frame_info *frame, const void *baton)
-{
-  struct value *val;
-  gdb_byte *buf;
-  build_builtin_type_frame_reg ();
-  val = allocate_value (builtin_type_frame_reg);
-  VALUE_LVAL (val) = not_lval;
-  buf = value_contents_raw (val);
-  memset (buf, 0, TYPE_LENGTH (value_type (val)));
-  /* frame.base.  */
-  if (frame != NULL)
-    gdbarch_address_to_pointer (current_gdbarch, builtin_type_void_data_ptr,
-				buf, get_frame_base (frame));
-  buf += TYPE_LENGTH (builtin_type_void_data_ptr);
-  /* frame.XXX.  */
-  return val;
-}
 
 static struct value *
 value_of_builtin_frame_fp_reg (struct frame_info *frame, const void *baton)
@@ -138,12 +96,6 @@ extern initialize_file_ftype _initialize
 void
 _initialize_frame_reg (void)
 {
-  /* FIXME: cagney/2002-02-08: At present the local builtin types
-     can't be initialized using _initialize*() or gdbarch.  Due mainly
-     to non-multi-arch targets, GDB initializes things piece meal and,
-     as a consequence can leave these types NULL.  */
-  DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_frame_reg);
-
   /* Frame based $fp, $pc, $sp and $ps.  These only come into play
      when the target does not define its own version of these
      registers.  */
@@ -151,10 +103,4 @@ _initialize_frame_reg (void)
   user_reg_add_builtin ("pc", value_of_builtin_frame_pc_reg, NULL);
   user_reg_add_builtin ("sp", value_of_builtin_frame_sp_reg, NULL);
   user_reg_add_builtin ("ps", value_of_builtin_frame_ps_reg, NULL);
-
-  /* NOTE: cagney/2002-04-05: For moment leave the $frame / $gdbframe
-     / $gdb.frame disabled.  It isn't yet clear which of the many
-     options is the best.  */
-  if (0)
-    user_reg_add_builtin ("frame", value_of_builtin_frame_reg, NULL);
 }

-- 
  Dr. Ulrich Weigand
  GNU Toolchain for Linux on System z and Cell BE
  Ulrich.Weigand@de.ibm.com