bfd macro conversion to inline functions

[deliverable/binutils-gdb.git] / sim / ppc / corefile-n.h

diff --git a/sim/ppc/corefile-n.h b/sim/ppc/corefile-n.h
index 58895769d48cd58e692afd886066130a94a1201a..36a152b716808debbf6b73880af18b2e0ac72356 100644 (file)
--- a/sim/ppc/corefile-n.h
+++ b/sim/ppc/corefile-n.h
@@ -1,10 +1,10 @@
 /*  This file is part of the program psim.
 
-    Copyright (C) 1994-1995, Andrew Cagney <cagney@highland.com.au>
+    Copyright (C) 1994-1996, Andrew Cagney <cagney@highland.com.au>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
+    the Free Software Foundation; either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
     GNU General Public License for more details.
  
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+    along with this program; if not, see <http://www.gnu.org/licenses/>.
  
     */
 
@@ -31,7 +30,7 @@
 #define core_map_read_N XCONCAT2(core_map_read_,N)
 #define core_map_write_N XCONCAT2(core_map_write_,N)
 
-unsigned_N INLINE_CORE
+INLINE_CORE(unsigned_N)
 core_map_read_N(core_map *map,
                unsigned_word addr,
                cpu *processor,
@@ -48,11 +47,11 @@ core_map_read_N(core_map *map,
     if (device_io_read_buffer(mapping->device,
                              &data,
                              mapping->space,
-                             addr - mapping->base,
+                             addr,
                              sizeof(unsigned_N), /* nr_bytes */
                              processor,
                              cia) != sizeof(unsigned_N))
-      error("core_read_,N() reader should not fail\n");
+      device_error(mapping->device, "internal error - core_read_N() - io_read_buffer should not fail");
     return T2H_N(data);
   }
   else
@@ -61,7 +60,7 @@ core_map_read_N(core_map *map,
 
 
 
-void INLINE_CORE
+INLINE_CORE(void)
 core_map_write_N(core_map *map,
                 unsigned_word addr,
                 unsigned_N val,
@@ -79,11 +78,11 @@ core_map_write_N(core_map *map,
     if (device_io_write_buffer(mapping->device,
                               &data,
                               mapping->space,
-                              addr - mapping->base,
+                              addr,
                               sizeof(unsigned_N), /* nr_bytes */
                               processor,
                               cia) != sizeof(unsigned_N))
-      error("core_read_,N() writer should not fail\n");
+      device_error(mapping->device, "internal error - core_write_N() - io_write_buffer should not fail");
   }
   else
     *(unsigned_N*)core_translate(mapping, addr) = H2T_N(val);