aboutsummaryrefslogtreecommitdiff
path: root/target-s390x/helper.c
diff options
context:
space:
mode:
authorBlue Swirl <blauwirbel@gmail.com>2012-09-02 07:33:40 +0000
committerAlexander Graf <agraf@suse.de>2012-09-10 13:38:33 +0200
commit19b0516fb4fd22b08c6ee42ea4162aaf3b9c8ee1 (patch)
treea07d0e71ec514a4302b50105b3efa04c0acc6824 /target-s390x/helper.c
parent089f5c06926105a35df461003ae32b7387ed4236 (diff)
downloadqemu-19b0516fb4fd22b08c6ee42ea4162aaf3b9c8ee1.zip
qemu-19b0516fb4fd22b08c6ee42ea4162aaf3b9c8ee1.tar.gz
qemu-19b0516fb4fd22b08c6ee42ea4162aaf3b9c8ee1.tar.bz2
target-s390x: switch to AREG0 free mode
Add an explicit CPUState parameter instead of relying on AREG0. Remove temporary wrappers and switch to AREG0 free mode. Signed-off-by: Blue Swirl <blauwirbel@gmail.com> [agraf: fix conflicts] Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'target-s390x/helper.c')
-rw-r--r--target-s390x/helper.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/target-s390x/helper.c b/target-s390x/helper.c
index d98e6d9..a5741ec 100644
--- a/target-s390x/helper.c
+++ b/target-s390x/helper.c
@@ -499,14 +499,14 @@ static void do_program_interrupt(CPUS390XState *env)
switch (ilc) {
case ILC_LATER:
- ilc = get_ilc(ldub_code(env->psw.addr));
+ ilc = get_ilc(cpu_ldub_code(env, env->psw.addr));
break;
case ILC_LATER_INC:
- ilc = get_ilc(ldub_code(env->psw.addr));
+ ilc = get_ilc(cpu_ldub_code(env, env->psw.addr));
env->psw.addr += ilc * 2;
break;
case ILC_LATER_INC_2:
- ilc = get_ilc(ldub_code(env->psw.addr)) * 2;
+ ilc = get_ilc(cpu_ldub_code(env, env->psw.addr)) * 2;
env->psw.addr += ilc;
break;
}