2009-11-10 Tristan Gingold <gingold@adacore.com>

	* avr-tdep.c (avr_make_saddr): Return 0 for NULL.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index f532d4b..b7b8d56 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,9 @@
 2009-11-10  Tristan Gingold  <gingold@adacore.com>
 
+       * avr-tdep.c (avr_make_saddr): Return 0 for NULL.
+
+2009-11-10  Tristan Gingold  <gingold@adacore.com>
+
        * avr-tdep.c (avr_dwarf_reg_to_regnum): New function.
        (avr_gdbarch_init): Call set_gdbarch_dwarf2_reg_to_regnum.
 

diff --git a/gdb/avr-tdep.c b/gdb/avr-tdep.c
index 6d04e56..6de10f2 100644 (file)
--- a/gdb/avr-tdep.c
+++ b/gdb/avr-tdep.c
@@ -240,6 +240,10 @@ avr_convert_iaddr_to_raw (CORE_ADDR x)
 static CORE_ADDR
 avr_make_saddr (CORE_ADDR x)
 {
+  /* Return 0 for NULL.  */
+  if (x == 0)
+    return 0;
+
   return ((x) | AVR_SMEM_START);
 }