GDB copyright headers update after running GDB's copyright.py script.

[thirdparty/binutils-gdb.git] / gdb / compile / compile-loc2c.c

diff --git a/gdb/compile/compile-loc2c.c b/gdb/compile/compile-loc2c.c
index b201d136314bb9979befca0c371087ef103c9d4c..1a267b852374b42cdeb7fac9d425da80023cb759 100644 (file)
--- a/gdb/compile/compile-loc2c.c
+++ b/gdb/compile/compile-loc2c.c
@@ -1,6 +1,6 @@
 /* Convert a DWARF location expression to C
 
-   Copyright (C) 2014-2015 Free Software Foundation, Inc.
+   Copyright (C) 2014-2016 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -636,7 +636,7 @@ do_compile_dwarf_expr_to_c (int indent, struct ui_file *stream,
                 "there is no selected frame"),
               SYMBOL_PRINT_NAME (sym));
 
-      val = read_var_value (sym, frame);
+      val = read_var_value (sym, NULL, frame);
       if (VALUE_LVAL (val) != lval_memory)
        error (_("Symbol \"%s\" cannot be used for compilation evaluation "
                 "as its address has not been found."),
@@ -817,15 +817,15 @@ do_compile_dwarf_expr_to_c (int indent, struct ui_file *stream,
        case DW_OP_reg31:
          dwarf_expr_require_composition (op_ptr, op_end, "DW_OP_regx");
          pushf_register_address (indent, stream, registers_used, arch,
-                                 dwarf2_reg_to_regnum_or_error (arch,
-                                                             op - DW_OP_reg0));
+                                 dwarf_reg_to_regnum_or_error
+                                   (arch, op - DW_OP_reg0));
          break;
 
        case DW_OP_regx:
          op_ptr = safe_read_uleb128 (op_ptr, op_end, &reg);
          dwarf_expr_require_composition (op_ptr, op_end, "DW_OP_regx");
          pushf_register_address (indent, stream, registers_used, arch,
-                                 dwarf2_reg_to_regnum_or_error (arch, reg));
+                                 dwarf_reg_to_regnum_or_error (arch, reg));
          break;
 
        case DW_OP_breg0:
@@ -862,8 +862,8 @@ do_compile_dwarf_expr_to_c (int indent, struct ui_file *stream,
        case DW_OP_breg31:
          op_ptr = safe_read_sleb128 (op_ptr, op_end, &offset);
          pushf_register (indent, stream, registers_used, arch,
-                         dwarf2_reg_to_regnum_or_error (arch,
-                                                        op - DW_OP_breg0),
+                         dwarf_reg_to_regnum_or_error (arch,
+                                                       op - DW_OP_breg0),
                          offset);
          break;
        case DW_OP_bregx:
@@ -871,7 +871,7 @@ do_compile_dwarf_expr_to_c (int indent, struct ui_file *stream,
            op_ptr = safe_read_uleb128 (op_ptr, op_end, &reg);
            op_ptr = safe_read_sleb128 (op_ptr, op_end, &offset);
            pushf_register (indent, stream, registers_used, arch,
-                           dwarf2_reg_to_regnum_or_error (arch, reg), offset);
+                           dwarf_reg_to_regnum_or_error (arch, reg), offset);
          }
          break;
        case DW_OP_fbreg: