Inline get_reg_value method of dwarf_expr_context

The get_reg_value method is a small function that is only called once,
so it can be inlined to simplify the dwarf_expr_context class.

gdb/ChangeLog:

	* dwarf2/expr.c (dwarf_expr_context::get_reg_value): Remove
	method.
	(dwarf_expr_context::execute_stack_op): Inline get_reg_value
	method.
	* dwarf2/expr.h (dwarf_expr_context::get_reg_value): Remove
	method.

Change-Id: I7bee8587d30983355d371f0769068f712cfbce1c

diff --git a/gdb/dwarf2/expr.c b/gdb/dwarf2/expr.c
index 33237e1f279d9ffa5af353130186ff3c399581a7..a7bc08475574f868f7f05c66897c6625695d21ea 100644 (file)
--- a/gdb/dwarf2/expr.c
+++ b/gdb/dwarf2/expr.c
@@ -180,19 +180,6 @@ dwarf_expr_context::fetch (int n)
 
 /* See expr.h.  */
 
-struct value *
-dwarf_expr_context::get_reg_value (struct type *type, int reg)
-{
-  ensure_have_frame (frame, "DW_OP_regval_type");
-
-  struct gdbarch *gdbarch = get_frame_arch (frame);
-  int regnum = dwarf_reg_to_regnum_or_error (gdbarch, reg);
-
-  return value_from_register (type, regnum, frame);
-}
-
-/* See expr.h.  */
-
 void
 dwarf_expr_context::get_frame_base (const gdb_byte **start,
                                    size_t * length)
@@ -1543,14 +1530,17 @@ dwarf_expr_context::execute_stack_op (const gdb_byte *op_ptr,
        case DW_OP_regval_type:
        case DW_OP_GNU_regval_type:
          {
-           struct type *type;
-
            op_ptr = safe_read_uleb128 (op_ptr, op_end, &reg);
            op_ptr = safe_read_uleb128 (op_ptr, op_end, &uoffset);
            cu_offset type_die_cu_off = (cu_offset) uoffset;
 
-           type = get_base_type (type_die_cu_off, 0);
-           result_val = this->get_reg_value (type, reg);
+           ensure_have_frame (this->frame, "DW_OP_regval_type");
+
+           struct type *type = get_base_type (type_die_cu_off, 0);
+           int regnum
+             = dwarf_reg_to_regnum_or_error (get_frame_arch (this->frame),
+                                             reg);
+           result_val = value_from_register (type, regnum, this->frame);
          }
          break;
 

diff --git a/gdb/dwarf2/expr.h b/gdb/dwarf2/expr.h
index 71c10ebe3bc08093c514aaba575273ec2ec24ad6..a04a67c0f86235454fdc7755e111224bbb7be86c 100644 (file)
--- a/gdb/dwarf2/expr.h
+++ b/gdb/dwarf2/expr.h
@@ -215,12 +215,6 @@ private:
   void execute_stack_op (const gdb_byte *op_ptr, const gdb_byte *op_end);
   void pop ();
 
-  /* Return a value of type TYPE, stored in register number REGNUM
-     of the frame associated to the given BATON.
-
-     REGNUM is a DWARF register number.  */
-  struct value *get_reg_value (struct type *type, int regnum);
-
   /* Return the location expression for the frame base attribute, in
      START and LENGTH.  The result must be live until the current
      expression evaluation is complete.  */