diff options
| author | Max Filippov <jcmvbkbc@gmail.com> | 2017-05-12 11:17:01 -0700 |
|---|---|---|
| committer | Max Filippov <jcmvbkbc@gmail.com> | 2017-06-06 02:34:04 -0700 |
| commit | 30c2afd151cbc38c012f7b441088980807183da6 (patch) | |
| tree | c43261343f128d4e138acb65de61bac6ca985286 | |
| parent | a0d4aac7467dd02e5657b79e867f067330266a24 (diff) | |
| download | focaccia-qemu-30c2afd151cbc38c012f7b441088980807183da6.tar.gz focaccia-qemu-30c2afd151cbc38c012f7b441088980807183da6.zip | |
target/xtensa: fix mapping direction in read/write simcalls
Read and write simcalls map physical memory to access I/O buffers, but 'read' simcall need to map it for writing and 'write' simcall need to map it for reading, i.e. the opposite of what they do now. Fix that. Cc: qemu-stable@nongnu.org Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
| -rw-r--r-- | target/xtensa/xtensa-semi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/xtensa/xtensa-semi.c b/target/xtensa/xtensa-semi.c index a888a9dc7b..98ae28ce71 100644 --- a/target/xtensa/xtensa-semi.c +++ b/target/xtensa/xtensa-semi.c @@ -173,7 +173,7 @@ void HELPER(simcall)(CPUXtensaState *env) TARGET_PAGE_SIZE - (vaddr & (TARGET_PAGE_SIZE - 1)); uint32_t io_sz = page_left < len ? page_left : len; hwaddr sz = io_sz; - void *buf = cpu_physical_memory_map(paddr, &sz, is_write); + void *buf = cpu_physical_memory_map(paddr, &sz, !is_write); if (buf) { vaddr += io_sz; @@ -182,7 +182,7 @@ void HELPER(simcall)(CPUXtensaState *env) write(fd, buf, io_sz) : read(fd, buf, io_sz); regs[3] = errno_h2g(errno); - cpu_physical_memory_unmap(buf, sz, is_write, sz); + cpu_physical_memory_unmap(buf, sz, !is_write, sz); if (regs[2] == -1) { break; } |