bfd/

[deliverable/binutils-gdb.git] / gdb / dwarf2loc.c

diff --git a/gdb/dwarf2loc.c b/gdb/dwarf2loc.c
index 76a99fa8560ade67824cb880b30c339d80b55da0..1b29dc9a0b0dc1be92c5e4ae5348caee46c012eb 100644 (file)
--- a/gdb/dwarf2loc.c
+++ b/gdb/dwarf2loc.c
@@ -114,28 +114,18 @@ struct dwarf_expr_baton
 
 /* Helper functions for dwarf2_evaluate_loc_desc.  */
 
-/* Using the frame specified in BATON, read register REGNUM.  The lval
-   type will be returned in LVALP, and for lval_memory the register
-   save address will be returned in ADDRP.  */
+/* Using the frame specified in BATON, return the value of register
+   REGNUM, treated as a pointer.  */
 static CORE_ADDR
 dwarf_expr_read_reg (void *baton, int dwarf_regnum)
 {
   struct dwarf_expr_baton *debaton = (struct dwarf_expr_baton *) baton;
-  CORE_ADDR result, save_addr;
-  enum lval_type lval_type;
-  gdb_byte *buf;
-  int optimized, regnum, realnum, regsize;
+  CORE_ADDR result;
+  int regnum;
 
   regnum = DWARF2_REG_TO_REGNUM (dwarf_regnum);
-  regsize = register_size (current_gdbarch, regnum);
-  buf = alloca (regsize);
-
-  frame_register (debaton->frame, regnum, &optimized, &lval_type, &save_addr,
-                 &realnum, buf);
-  /* NOTE: cagney/2003-05-22: This extract is assuming that a DWARF 2
-     address is always unsigned.  That may or may not be true.  */
-  result = extract_unsigned_integer (buf, regsize);
-
+  result = address_from_register (builtin_type_void_data_ptr,
+                                 regnum, debaton->frame);
   return result;
 }
 
@@ -189,86 +179,8 @@ static CORE_ADDR
 dwarf_expr_tls_address (void *baton, CORE_ADDR offset)
 {
   struct dwarf_expr_baton *debaton = (struct dwarf_expr_baton *) baton;
-  volatile CORE_ADDR addr = 0;
-
-  if (target_get_thread_local_address_p ()
-      && gdbarch_fetch_tls_load_module_address_p (current_gdbarch))
-    {
-      ptid_t ptid = inferior_ptid;
-      struct objfile *objfile = debaton->objfile;
-      volatile struct gdb_exception ex;
-
-      TRY_CATCH (ex, RETURN_MASK_ALL)
-       {
-         CORE_ADDR lm_addr;
-         
-         /* Fetch the load module address for this objfile.  */
-         lm_addr = gdbarch_fetch_tls_load_module_address (current_gdbarch,
-                                                          objfile);
-         /* If it's 0, throw the appropriate exception.  */
-         if (lm_addr == 0)
-           throw_error (TLS_LOAD_MODULE_NOT_FOUND_ERROR,
-                        _("TLS load module not found"));
-
-         addr = target_get_thread_local_address (ptid, lm_addr, offset);
-       }
-      /* If an error occurred, print TLS related messages here.  Otherwise,
-         throw the error to some higher catcher.  */
-      if (ex.reason < 0)
-       {
-         int objfile_is_library = (objfile->flags & OBJF_SHARED);
-
-         switch (ex.error)
-           {
-           case TLS_NO_LIBRARY_SUPPORT_ERROR:
-             error (_("Cannot find thread-local variables in this thread library."));
-             break;
-           case TLS_LOAD_MODULE_NOT_FOUND_ERROR:
-             if (objfile_is_library)
-               error (_("Cannot find shared library `%s' in dynamic"
-                        " linker's load module list"), objfile->name);
-             else
-               error (_("Cannot find executable file `%s' in dynamic"
-                        " linker's load module list"), objfile->name);
-             break;
-           case TLS_NOT_ALLOCATED_YET_ERROR:
-             if (objfile_is_library)
-               error (_("The inferior has not yet allocated storage for"
-                        " thread-local variables in\n"
-                        "the shared library `%s'\n"
-                        "for %s"),
-                      objfile->name, target_pid_to_str (ptid));
-             else
-               error (_("The inferior has not yet allocated storage for"
-                        " thread-local variables in\n"
-                        "the executable `%s'\n"
-                        "for %s"),
-                      objfile->name, target_pid_to_str (ptid));
-             break;
-           case TLS_GENERIC_ERROR:
-             if (objfile_is_library)
-               error (_("Cannot find thread-local storage for %s, "
-                        "shared library %s:\n%s"),
-                      target_pid_to_str (ptid),
-                      objfile->name, ex.message);
-             else
-               error (_("Cannot find thread-local storage for %s, "
-                        "executable file %s:\n%s"),
-                      target_pid_to_str (ptid),
-                      objfile->name, ex.message);
-             break;
-           default:
-             throw_exception (ex);
-             break;
-           }
-       }
-    }
-  /* It wouldn't be wrong here to try a gdbarch method, too; finding
-     TLS is an ABI-specific thing.  But we don't do that yet.  */
-  else
-    error (_("Cannot find thread-local variables on this target"));
 
-  return addr;
+  return target_translate_tls_address (debaton->objfile, offset);
 }
 
 /* Evaluate a location description, starting at DATA and with length