make MSYMBOL_VALUE_ADDRESS an rvalue

This changes MSYMBOL_VALUE_ADDRESS to be an rvalue.  In a later patch
we change this macro to compute its value; this patch introduces a
setter to make the break a bit cleaner.

2014-02-26  Tom Tromey  <tromey@redhat.com>

	* minsyms.c (prim_record_minimal_symbol_full): Use
	SET_MSYMBOL_VALUE_ADDRESS.
	* objfiles.c (objfile_relocate1): Use SET_MSYMBOL_VALUE_ADDRESS.
	* sh64-tdep.c (sh64_elf_make_msymbol_special): Use
	SET_MSYMBOL_VALUE_ADDRESS.
	* symtab.h (MSYMBOL_VALUE_ADDRESS): Expand to an rvalue.
	(SET_MSYMBOL_VALUE_ADDRESS): New macro.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3d3140ca4d9c784b419d1d076b3596cb56d5ec44..0f44e5c2b7fe3fa6e56dfbab9adc10dd3c130ccd 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,13 @@
+2014-02-26  Tom Tromey  <tromey@redhat.com>
+
+       * minsyms.c (prim_record_minimal_symbol_full): Use
+       SET_MSYMBOL_VALUE_ADDRESS.
+       * objfiles.c (objfile_relocate1): Use SET_MSYMBOL_VALUE_ADDRESS.
+       * sh64-tdep.c (sh64_elf_make_msymbol_special): Use
+       SET_MSYMBOL_VALUE_ADDRESS.
+       * symtab.h (MSYMBOL_VALUE_ADDRESS): Expand to an rvalue.
+       (SET_MSYMBOL_VALUE_ADDRESS): New macro.
+
 2014-02-26  Tom Tromey  <tromey@redhat.com>
 
        * symtab.h (struct minimal_symbol) <mginfo>: Rename from ginfo.

diff --git a/gdb/minsyms.c b/gdb/minsyms.c
index aad7685f4d1652dd4a413e7d821dd8a54d18e11f..dde7d903fcf5d6e2c774a6c68edc5c7af038037c 100644 (file)
--- a/gdb/minsyms.c
+++ b/gdb/minsyms.c
@@ -944,7 +944,7 @@ prim_record_minimal_symbol_full (const char *name, int name_len, int copy_name,
   MSYMBOL_SET_LANGUAGE (msymbol, language_auto, &objfile->objfile_obstack);
   MSYMBOL_SET_NAMES (msymbol, name, name_len, copy_name, objfile);
 
-  MSYMBOL_VALUE_ADDRESS (msymbol) = address;
+  SET_MSYMBOL_VALUE_ADDRESS (msymbol, address);
   MSYMBOL_SECTION (msymbol) = section;
 
   MSYMBOL_TYPE (msymbol) = ms_type;

diff --git a/gdb/objfiles.c b/gdb/objfiles.c
index 89b8943bbf54880e43a8c9e3f796214ce91ab0f6..dba13fbbfba04728a4b67454918a3ef8ef292002 100644 (file)
--- a/gdb/objfiles.c
+++ b/gdb/objfiles.c
@@ -805,8 +805,9 @@ objfile_relocate1 (struct objfile *objfile,
 
     ALL_OBJFILE_MSYMBOLS (objfile, msym)
       if (MSYMBOL_SECTION (msym) >= 0)
-       MSYMBOL_VALUE_ADDRESS (msym) += ANOFFSET (delta,
-                                                 MSYMBOL_SECTION (msym));
+       SET_MSYMBOL_VALUE_ADDRESS (msym, (MSYMBOL_VALUE_ADDRESS (msym)
+                                         + ANOFFSET (delta,
+                                                     MSYMBOL_SECTION (msym))));
   }
   /* Relocating different sections by different amounts may cause the symbols
      to be out of order.  */

diff --git a/gdb/sh64-tdep.c b/gdb/sh64-tdep.c
index ab1c96d5e8a05b4616e7377fbe368e07c8eea665..cf93d53132eb7705da829e89f04b1d7c10920696 100644 (file)
--- a/gdb/sh64-tdep.c
+++ b/gdb/sh64-tdep.c
@@ -224,7 +224,7 @@ sh64_elf_make_msymbol_special (asymbol *sym, struct minimal_symbol *msym)
   if (((elf_symbol_type *)(sym))->internal_elf_sym.st_other == STO_SH5_ISA32)
     {
       MSYMBOL_TARGET_FLAG_1 (msym) = 1;
-      MSYMBOL_VALUE_ADDRESS (msym) |= 1;
+      SET_MSYMBOL_VALUE_ADDRESS (msym, MSYMBOL_VALUE_ADDRESS (msym) | 1);
     }
 }
 

diff --git a/gdb/symtab.h b/gdb/symtab.h
index 4bf30358e74076a19b2ba72d99dcc9677555ccf1..bf1ef74185d248658d47ea5fd6f5c05d2459d8e7 100644 (file)
--- a/gdb/symtab.h
+++ b/gdb/symtab.h
@@ -391,7 +391,9 @@ struct minimal_symbol
 #define MSYMBOL_TYPE(msymbol)          (msymbol)->type
 
 #define MSYMBOL_VALUE(symbol)          (symbol)->mginfo.value.ivalue
-#define MSYMBOL_VALUE_ADDRESS(symbol)  (symbol)->mginfo.value.address
+#define MSYMBOL_VALUE_ADDRESS(symbol)  ((symbol)->mginfo.value.address + 0)
+#define SET_MSYMBOL_VALUE_ADDRESS(symbol, new_value) \
+  ((symbol)->mginfo.value.address = (new_value))
 #define MSYMBOL_VALUE_BYTES(symbol)    (symbol)->mginfo.value.bytes
 #define MSYMBOL_BLOCK_VALUE(symbol)    (symbol)->mginfo.value.block
 #define MSYMBOL_VALUE_CHAIN(symbol)    (symbol)->mginfo.value.chain