Commit 30c2afd1 authored by Max Filippov's avatar Max Filippov
Browse files

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: default avatarMax Filippov <jcmvbkbc@gmail.com>
parent a0d4aac7

target/xtensa/xtensa-semi.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

                    }