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

target/xtensa: fix return value of read/write simcalls

Browse Source 
Return value of read/write simcalls is not calculated correctly in case
of operations crossing page boundary and in case of short reads/writes.
Read and write simcalls should return the size of data actually
read/written or -1 in case of error.

Cc: qemu-stable@nongnu.org
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
This commit is contained in:
Max Filippov 2017-05-12 12:05:23 -07:00
parent 30c2afd151
commit 347ec03093
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
target/xtensa/xtensa-semi.c
View File

@ -166,6 +166,7 @@ void HELPER(simcall)(CPUXtensaState *env)
uint32_t fd = regs[3]; uint32_t fd = regs[3];
uint32_t vaddr = regs[4]; uint32_t vaddr = regs[4];
uint32_t len = regs[5]; uint32_t len = regs[5];
uint32_t len_done = 0;
while (len > 0) { while (len > 0) {
hwaddr paddr = cpu_get_phys_page_debug(cs, vaddr); hwaddr paddr = cpu_get_phys_page_debug(cs, vaddr);
@ -174,24 +175,38 @@ void HELPER(simcall)(CPUXtensaState *env)
uint32_t io_sz = page_left < len ? page_left : len; uint32_t io_sz = page_left < len ? page_left : len;
hwaddr sz = io_sz; hwaddr sz = io_sz;
void *buf = cpu_physical_memory_map(paddr, &sz, !is_write); void *buf = cpu_physical_memory_map(paddr, &sz, !is_write);
uint32_t io_done;
bool error = false;
if (buf) { if (buf) {
vaddr += io_sz; vaddr += io_sz;
len -= io_sz; len -= io_sz;
regs[2] = is_write ? io_done = is_write ?
write(fd, buf, io_sz) : write(fd, buf, io_sz) :
read(fd, buf, io_sz); read(fd, buf, io_sz);
regs[3] = errno_h2g(errno); regs[3] = errno_h2g(errno);
cpu_physical_memory_unmap(buf, sz, !is_write, sz); if (io_done == -1) {
if (regs[2] == -1) { error = true;
break; io_done = 0;
} }
cpu_physical_memory_unmap(buf, sz, !is_write, io_done);
} else { } else {
regs[2] = -1; error = true;
regs[3] = TARGET_EINVAL; regs[3] = TARGET_EINVAL;
break; break;
} }
if (error) {
if (!len_done) {
len_done = -1;
}
break;
}
len_done += io_done;
if (io_done < io_sz) {
break;
}
} }
regs[2] = len_done;
} }
break; break;