diff options
| -rw-r--r-- | sim/d10v/ChangeLog | 5 | ||||
| -rw-r--r-- | sim/d10v/interp.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/sim/d10v/ChangeLog b/sim/d10v/ChangeLog index e45bd38..e633352 100644 --- a/sim/d10v/ChangeLog +++ b/sim/d10v/ChangeLog @@ -1,3 +1,8 @@ +2021-05-22 John Baldwin <jhb@FreeBSD.org> + + * interp.c (sim_create_inferior): Use offsetof in static + assertion. + 2021-05-17 Mike Frysinger <vapier@gentoo.org> * sim-main.h (SIM_HAVE_COMMON_SIM_STATE): Delete. diff --git a/sim/d10v/interp.c b/sim/d10v/interp.c index b56b204..b587cc1 100644 --- a/sim/d10v/interp.c +++ b/sim/d10v/interp.c @@ -1146,8 +1146,8 @@ sim_create_inferior (SIM_DESC sd, struct bfd *abfd, bfd_vma start_address; /* Make sure we have the right structure for the following memset. */ - static_assert ((uintptr_t) &State == (uintptr_t) &State.regs, - "&State != &State.regs"); + static_assert (offsetof (struct _state, regs) == 0, + "State.regs is not at offset 0"); /* Reset state from the regs field until the mem field. */ memset (&State, 0, (uintptr_t) &State.mem - (uintptr_t) &State.regs); |