Commit 3a9576ec authored by David Hildenbrand's avatar David Hildenbrand Committed by Richard Henderson
Browse files

mips/tcg: Call probe_write() for CONFIG_USER_ONLY as well 



Let's call it also for CONFIG_USER_ONLY. While at it, add a FIXME and get
rid of one local variable.

MIPS code probably needs a bigger refactoring in regards of
ensure_writable_pages(), similar to s390x, so for example, watchpoints
can be handled reliably later. The actually accessed addresses should
be probed only, not full pages.

Signed-off-by: default avatarDavid Hildenbrand <david@redhat.com>
Reviewed-by: default avatarAleksandar Markovic <amarkovic@wavecomp.com>
Message-Id: <20190826075112.25637-6-david@redhat.com>
Signed-off-by: default avatarRichard Henderson <richard.henderson@linaro.org>
parent ca86cf32

target/mips/op_helper.c

+3 −5
Original line number Diff line number Diff line
@@ -4537,16 +4537,14 @@ static inline void ensure_writable_pages(CPUMIPSState *env, 
                                         int mmu_idx,

                                         uintptr_t retaddr)

{

#if !defined(CONFIG_USER_ONLY)

    target_ulong page_addr;

    /* FIXME: Probe the actual accesses (pass and use a size) */

    if (unlikely(MSA_PAGESPAN(addr))) {

        /* first page */

        probe_write(env, addr, 0, mmu_idx, retaddr);

        /* second page */

        page_addr = (addr & TARGET_PAGE_MASK) + TARGET_PAGE_SIZE;

        probe_write(env, page_addr, 0, mmu_idx, retaddr);

        addr = (addr & TARGET_PAGE_MASK) + TARGET_PAGE_SIZE;

        probe_write(env, addr, 0, mmu_idx, retaddr);

    }

#endif

}



void helper_msa_st_b(CPUMIPSState *env, uint32_t wd,