aboutsummaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
authorDavid Hildenbrand <david@redhat.com>2018-01-29 13:56:21 +0100
committerCornelia Huck <cohuck@redhat.com>2018-02-09 09:37:13 +0100
commitf68ecdd4f3584130cf0cb8f545b7359fae150fe0 (patch)
tree2f3f4a7b5c17dc1cd3b7aa3a17c63282124da43c /target
parent63685bc489f68530d50f381a241d8fef5924f41c (diff)
s390x/tcg: cache the qemu flic in a central function
This avoids tons of conversions when handling interrupts. Signed-off-by: David Hildenbrand <david@redhat.com> Message-Id: <20180129125623.21729-17-david@redhat.com> Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Diffstat (limited to 'target')
-rw-r--r--target/s390x/interrupt.c6
-rw-r--r--target/s390x/misc_helper.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/target/s390x/interrupt.c b/target/s390x/interrupt.c
index 61691aa3a4..1947012b25 100644
--- a/target/s390x/interrupt.c
+++ b/target/s390x/interrupt.c
@@ -158,7 +158,7 @@ void s390_crw_mchk(void)
bool s390_cpu_has_mcck_int(S390CPU *cpu)
{
- QEMUS390FLICState *flic = QEMU_S390_FLIC(s390_get_flic());
+ QEMUS390FLICState *flic = s390_get_qemu_flic(s390_get_flic());
CPUS390XState *env = &cpu->env;
if (!(env->psw.mask & PSW_MASK_MCHECK)) {
@@ -176,7 +176,7 @@ bool s390_cpu_has_mcck_int(S390CPU *cpu)
bool s390_cpu_has_ext_int(S390CPU *cpu)
{
- QEMUS390FLICState *flic = QEMU_S390_FLIC(s390_get_flic());
+ QEMUS390FLICState *flic = s390_get_qemu_flic(s390_get_flic());
CPUS390XState *env = &cpu->env;
if (!(env->psw.mask & PSW_MASK_EXT)) {
@@ -218,7 +218,7 @@ bool s390_cpu_has_ext_int(S390CPU *cpu)
bool s390_cpu_has_io_int(S390CPU *cpu)
{
- QEMUS390FLICState *flic = QEMU_S390_FLIC(s390_get_flic());
+ QEMUS390FLICState *flic = s390_get_qemu_flic(s390_get_flic());
CPUS390XState *env = &cpu->env;
if (!(env->psw.mask & PSW_MASK_IO)) {
diff --git a/target/s390x/misc_helper.c b/target/s390x/misc_helper.c
index c1ff152571..45cab8c463 100644
--- a/target/s390x/misc_helper.c
+++ b/target/s390x/misc_helper.c
@@ -452,7 +452,7 @@ uint32_t HELPER(tpi)(CPUS390XState *env, uint64_t addr)
{
const uintptr_t ra = GETPC();
S390CPU *cpu = s390_env_get_cpu(env);
- QEMUS390FLICState *flic = QEMU_S390_FLIC(s390_get_flic());
+ QEMUS390FLICState *flic = s390_get_qemu_flic(s390_get_flic());
QEMUS390FlicIO *io = NULL;
LowCore *lowcore;