/* 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
#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,
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
-void INLINE_CORE
+INLINE_CORE(void)
core_map_write_N(core_map *map,
unsigned_word addr,
unsigned_N val,
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);