* sim-core.c (sim_core_signal): Use CIA_ADDR to fetch value.

diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 768333a..4d47224 100644 (file)
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -3,6 +3,7 @@ Tue Nov 18 15:53:45 1997  Doug Evans  <devans@canuck.cygnus.com>
        * Make-common.in (SIM_NEW_COMMON_OBJS): New variable.
 
        * sim-base.h (CIA_ADDR): Provide default definition.
+       * sim-core.c (sim_core_signal): Use CIA_ADDR to fetch value.
 
 Mon Nov 17 14:15:31 1997  Doug Evans  <devans@seba.cygnus.com>
 

diff --git a/sim/common/sim-core.c b/sim/common/sim-core.c
index c140dd6..82ba245 100644 (file)
--- a/sim/common/sim-core.c
+++ b/sim/common/sim-core.c
@@ -108,9 +108,7 @@ sim_core_signal (SIM_DESC sd,
                 sim_core_signals sig)
 {
   const char *copy = (transfer == read_transfer ? "read" : "write");
-  /* The CIA could either be a struct or a simple type.  Regardless,
-     the address of the instruction is found in the first word. */
-  address_word ip = *(address_word*)&cia;
+  address_word ip = CIA_ADDR (cia);
   switch (sig)
     {
     case sim_core_unmapped_signal: