From 59f48f5a45d2300da401f1fccab31ba436217469 Mon Sep 17 00:00:00 2001 From: Denis Chertykov Date: Tue, 19 Jul 2016 09:47:23 +0300 Subject: [PATCH] Update PC when simulate break instruction. PR target/ 19401 * avr/interp.c (step_once): Pass break instruction address to sim_engine_halt function which writes that to PC. Remove code that follows that function call as it is unreachable. --- sim/ChangeLog | 7 +++++++ sim/avr/interp.c | 3 +-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/sim/ChangeLog b/sim/ChangeLog index 76c384d1a1..d7cc92c1bb 100644 --- a/sim/ChangeLog +++ b/sim/ChangeLog @@ -1,3 +1,10 @@ +2016-07-19 Pitchumani Sivanupandi + + PR target/ 19401 + * avr/interp.c (step_once): Pass break instruction address to + sim_engine_halt function which writes that to PC. Remove code that + follows that function call as it is unreachable. + 2016-02-03 Maciej W. Rozycki * MAINTAINERS (Past sim maintainers): Add Thiemo Seufer. diff --git a/sim/avr/interp.c b/sim/avr/interp.c index 31a99407bd..fcce9b298d 100644 --- a/sim/avr/interp.c +++ b/sim/avr/interp.c @@ -911,8 +911,7 @@ step_once (SIM_CPU *cpu) case OP_break: /* Stop on this address. */ - sim_engine_halt (CPU_STATE (cpu), cpu, NULL, cpu->pc, sim_stopped, SIM_SIGTRAP); - cpu->pc = ipc; + sim_engine_halt (CPU_STATE (cpu), cpu, NULL, ipc, sim_stopped, SIM_SIGTRAP); break; case OP_bld: