ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

s390x/ioinst: Rework memory access in SSCH instruction 

Change the handler for SSCH 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:34 +01:00 committed by Christian Borntraeger
parent 14b4e13d4c
commit 234d9b1d3c
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
target-s390x/ioinst.c
View File

@ -210,11 +210,10 @@ void ioinst_handle_ssch(S390CPU *cpu, uint64_t reg1, uint32_t ipb)
{ {
int cssid, ssid, schid, m; int cssid, ssid, schid, m;
SubchDev *sch; SubchDev *sch;
ORB *orig_orb, orb; ORB orig_orb, orb;
uint64_t addr; uint64_t addr;
int ret = -ENODEV; int ret = -ENODEV;
int cc; int cc;
hwaddr len = sizeof(*orig_orb);
CPUS390XState *env = &cpu->env; CPUS390XState *env = &cpu->env;
addr = decode_basedisp_s(env, ipb); addr = decode_basedisp_s(env, ipb);
@ -222,16 +221,14 @@ void ioinst_handle_ssch(S390CPU *cpu, uint64_t reg1, uint32_t ipb)
program_interrupt(env, PGM_SPECIFICATION, 2); program_interrupt(env, PGM_SPECIFICATION, 2);
return; return;
} }
orig_orb = s390_cpu_physical_memory_map(env, addr, &len, 0); if (s390_cpu_virt_mem_read(cpu, addr, &orig_orb, sizeof(orb))) {
if (!orig_orb || len != sizeof(*orig_orb)) { return;
program_interrupt(env, PGM_ADDRESSING, 2);
goto out;
} }
copy_orb_from_guest(&orb, orig_orb); copy_orb_from_guest(&orb, &orig_orb);
if (ioinst_disassemble_sch_ident(reg1, &m, &cssid, &ssid, &schid) || if (ioinst_disassemble_sch_ident(reg1, &m, &cssid, &ssid, &schid) ||
!ioinst_orb_valid(&orb)) { !ioinst_orb_valid(&orb)) {
program_interrupt(env, PGM_OPERAND, 2); program_interrupt(env, PGM_OPERAND, 2);
goto out; return;
} }
trace_ioinst_sch_id("ssch", cssid, ssid, schid); trace_ioinst_sch_id("ssch", cssid, ssid, schid);
sch = css_find_subch(m, cssid, ssid, schid); sch = css_find_subch(m, cssid, ssid, schid);
@ -253,9 +250,6 @@ void ioinst_handle_ssch(S390CPU *cpu, uint64_t reg1, uint32_t ipb)
break; break;
} }
setcc(cpu, cc); setcc(cpu, cc);
out:
s390_cpu_physical_memory_unmap(env, orig_orb, len, 0);
} }
void ioinst_handle_stcrw(S390CPU *cpu, uint32_t ipb) void ioinst_handle_stcrw(S390CPU *cpu, uint32_t ipb)