commit 24d25e18bfd9963916a96fdc94b195446cd356de
author Andrew Hsieh <andrewhsieh@google.com> Mon Sep 24 16:23:25 2012 -0700
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Sep 24 16:23:26 2012 -0700
tree b8343097b43e535d29db95a5e50241f51c3b39b1
parent 0f809250987b64f491bd3b4b73c0f0d33036a786
parent 3d781249996e548010a28caae437257d91f66001

Merge "[MIPS] Avoid splitting TB's at page boundary for branch instructions."

target-mips/translate.c

diff --git a/target-mips/translate.c b/target-mips/translate.c
old mode 100644
new mode 100755
index 27a8df7..ebbebc8
--- a/target-mips/translate.c
+++ b/target-mips/translate.c
@@ -8357,7 +8357,10 @@
         if (env->singlestep_enabled && (ctx.hflags & MIPS_HFLAG_BMASK) == 0)
             break;
 
-        if ((ctx.pc & (TARGET_PAGE_SIZE - 1)) == 0)
+        /* Do not split a branch instruction and its delay slot into two
+           TB's when a page boundary is crossed. This causes TB's to be
+           invalidated incorrectly if branch target is patched.  */
+        if ((ctx.pc & (TARGET_PAGE_SIZE - 1)) == 0 && (ctx.hflags & MIPS_HFLAG_BMASK) == 0)
             break;
 
         if (gen_opc_ptr >= gen_opc_end)