openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

s390x/ioinst: Rework memory access in STSCH instruction 

Change the handler for STSCH to use the new logical memory
access functions.

Signed-off-by: Thomas Huth <thuth@linux.vnet.ibm.com>
Signed-off-by: Jens Freimann <jfrei@linux.vnet.ibm.com>
Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
This commit is contained in:
Thomas Huth 2015-02-12 18:09:35 +01:00 committed by Christian Borntraeger
parent 234d9b1d3c
commit 57b22fc792
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
target-s390x/ioinst.c
View File

@ -284,8 +284,7 @@ void ioinst_handle_stsch(S390CPU *cpu, uint64_t reg1, uint32_t ipb)
SubchDev *sch; SubchDev *sch;
uint64_t addr; uint64_t addr;
int cc; int cc;
SCHIB *schib; SCHIB schib;
hwaddr len = sizeof(*schib);
CPUS390XState *env = &cpu->env; CPUS390XState *env = &cpu->env;
addr = decode_basedisp_s(env, ipb); addr = decode_basedisp_s(env, ipb);
@ -293,21 +292,23 @@ void ioinst_handle_stsch(S390CPU *cpu, uint64_t reg1, uint32_t ipb)
program_interrupt(env, PGM_SPECIFICATION, 2); program_interrupt(env, PGM_SPECIFICATION, 2);
return; return;
} }
schib = s390_cpu_physical_memory_map(env, addr, &len, 1);
if (!schib || len != sizeof(*schib)) {
program_interrupt(env, PGM_ADDRESSING, 2);
goto out;
}
if (ioinst_disassemble_sch_ident(reg1, &m, &cssid, &ssid, &schid)) { if (ioinst_disassemble_sch_ident(reg1, &m, &cssid, &ssid, &schid)) {
program_interrupt(env, PGM_OPERAND, 2); /*
goto out; * As operand exceptions have a lower priority than access exceptions,
* we check whether the memory area is writeable (injecting the
* access execption if it is not) first.
*/
if (!s390_cpu_virt_mem_check_write(cpu, addr, sizeof(schib))) {
program_interrupt(env, PGM_OPERAND, 2);
}
return;
} }
trace_ioinst_sch_id("stsch", cssid, ssid, schid); trace_ioinst_sch_id("stsch", cssid, ssid, schid);
sch = css_find_subch(m, cssid, ssid, schid); sch = css_find_subch(m, cssid, ssid, schid);
if (sch) { if (sch) {
if (css_subch_visible(sch)) { if (css_subch_visible(sch)) {
css_do_stsch(sch, schib); css_do_stsch(sch, &schib);
cc = 0; cc = 0;
} else { } else {
/* Indicate no more subchannels in this css/ss */ /* Indicate no more subchannels in this css/ss */
@ -318,14 +319,21 @@ void ioinst_handle_stsch(S390CPU *cpu, uint64_t reg1, uint32_t ipb)
cc = 3; /* No more subchannels in this css/ss */ cc = 3; /* No more subchannels in this css/ss */
} else { } else {
/* Store an empty schib. */ /* Store an empty schib. */
memset(schib, 0, sizeof(*schib)); memset(&schib, 0, sizeof(schib));
cc = 0; cc = 0;
} }
} }
if (cc != 3) {
if (s390_cpu_virt_mem_write(cpu, addr, &schib, sizeof(schib)) != 0) {
return;
}
} else {
/* Access exceptions have a higher priority than cc3 */
if (s390_cpu_virt_mem_check_write(cpu, addr, sizeof(schib)) != 0) {
return;
}
}
setcc(cpu, cc); setcc(cpu, cc);
out:
s390_cpu_physical_memory_unmap(env, schib, len, 1);
} }
int ioinst_handle_tsch(CPUS390XState *env, uint64_t reg1, uint32_t ipb) int ioinst_handle_tsch(CPUS390XState *env, uint64_t reg1, uint32_t ipb)