mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

s390x/ioinst: Rework memory access in TPI instruction

Browse Source 
Change the handler for TPI 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>
Acked-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:40 +01:00 committed by Christian Borntraeger
parent 166f1bb796
commit 7781a492fa
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
target-s390x/ioinst.c
View File

@ -682,12 +682,13 @@ void ioinst_handle_chsc(S390CPU *cpu, uint32_t ipb)
} }
} }
int ioinst_handle_tpi(CPUS390XState *env, uint32_t ipb) int ioinst_handle_tpi(S390CPU *cpu, uint32_t ipb)
{ {
CPUS390XState *env = &cpu->env;
uint64_t addr; uint64_t addr;
int lowcore; int lowcore;
IOIntCode *int_code; IOIntCode int_code;
hwaddr len, orig_len; hwaddr len;
int ret; int ret;
trace_ioinst("tpi"); trace_ioinst("tpi");
@ -699,16 +700,10 @@ int ioinst_handle_tpi(CPUS390XState *env, uint32_t ipb)
lowcore = addr ? 0 : 1; lowcore = addr ? 0 : 1;
len = lowcore ? 8 /* two words */ : 12 /* three words */; len = lowcore ? 8 /* two words */ : 12 /* three words */;
orig_len = len; ret = css_do_tpi(&int_code, lowcore);
int_code = s390_cpu_physical_memory_map(env, addr, &len, 1); if (ret == 1) {
if (!int_code || (len != orig_len)) { s390_cpu_virt_mem_write(cpu, lowcore ? 184 : addr, &int_code, len);
program_interrupt(env, PGM_ADDRESSING, 2);
ret = -EIO;
goto out;
} }
ret = css_do_tpi(int_code, lowcore);
out:
s390_cpu_physical_memory_unmap(env, int_code, len, 1);
return ret; return ret;
} }

2
target-s390x/ioinst.h
View File

@ -236,7 +236,7 @@ void ioinst_handle_stcrw(S390CPU *cpu, uint32_t ipb);
void ioinst_handle_stsch(S390CPU *cpu, uint64_t reg1, uint32_t ipb); void ioinst_handle_stsch(S390CPU *cpu, uint64_t reg1, uint32_t ipb);
int ioinst_handle_tsch(S390CPU *cpu, uint64_t reg1, uint32_t ipb); int ioinst_handle_tsch(S390CPU *cpu, uint64_t reg1, uint32_t ipb);
void ioinst_handle_chsc(S390CPU *cpu, uint32_t ipb); void ioinst_handle_chsc(S390CPU *cpu, uint32_t ipb);
int ioinst_handle_tpi(CPUS390XState *env, uint32_t ipb); int ioinst_handle_tpi(S390CPU *cpu, uint32_t ipb);
void ioinst_handle_schm(S390CPU *cpu, uint64_t reg1, uint64_t reg2, void ioinst_handle_schm(S390CPU *cpu, uint64_t reg1, uint64_t reg2,
uint32_t ipb); uint32_t ipb);
void ioinst_handle_rsch(S390CPU *cpu, uint64_t reg1); void ioinst_handle_rsch(S390CPU *cpu, uint64_t reg1);