Commit 41d54dc0 authored by Pavel Dovgalyuk's avatar Pavel Dovgalyuk Committed by Paolo Bonzini
Browse files

target/i386: fix translation for icount mode 



This patch fixes the checking of boundary crossing instructions.
In icount mode only first instruction of the block may cross
the page boundary to keep the translation deterministic.
These conditions already existed, but compared the wrong variable.

Signed-off-by: default avatarPavel Dovgalyuk <Pavel.Dovgaluk@ispras.ru>
Message-Id: <20180920071702.22477.43980.stgit@pasha-VirtualBox>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 442c3b45

target/i386/translate.c

+3 −3
Original line number Diff line number Diff line
@@ -8538,10 +8538,10 @@ static void i386_tr_translate_insn(DisasContextBase *dcbase, CPUState *cpu) 
           chance to happen */

        dc->base.is_jmp = DISAS_TOO_MANY;

    } else if ((tb_cflags(dc->base.tb) & CF_USE_ICOUNT)

               && ((dc->base.pc_next & TARGET_PAGE_MASK)

                   != ((dc->base.pc_next + TARGET_MAX_INSN_SIZE - 1)

               && ((pc_next & TARGET_PAGE_MASK)

                   != ((pc_next + TARGET_MAX_INSN_SIZE - 1)

                       & TARGET_PAGE_MASK)

                   || (dc->base.pc_next & ~TARGET_PAGE_MASK) == 0)) {

                   || (pc_next & ~TARGET_PAGE_MASK) == 0)) {

        /* Do not cross the boundary of the pages in icount mode,

           it can cause an exception. Do it only when boundary is

           crossed by the first instruction in the block.