From: Max Filippov <jcmvbkbc@gmail.com>
Date: Fri, 27 Sep 2013 18:29:17 +0000 (+0400)
Subject: exec: fix breakpoint_invalidate when pc may not be translated
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~524^2~3^2~42^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e8262a1b5b7cfbcbc80c46e4ce6ff7c517b7b2f6;p=sdk%2Femulator%2Fqemu.git

exec: fix breakpoint_invalidate when pc may not be translated

This fixes qemu abort with the following message:

    include/qemu/int128.h:22: int128_get64: Assertion `!a.hi' failed.

which happens due to attempt to invalidate breakpoint by virtual address
for which get_phys_page_debug couldn't find mapping.

For more details see
http://lists.nongnu.org/archive/html/qemu-devel/2013-09/msg04582.html

Cc: qemu-stable@nongnu.org
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/exec.c b/exec.c
index 79610ce37a..6492b0c24c 100644
--- a/exec.c
+++ b/exec.c
@@ -409,8 +409,10 @@ static void breakpoint_invalidate(CPUState *cpu, target_ulong pc)
 #else
 static void breakpoint_invalidate(CPUState *cpu, target_ulong pc)
 {
-    tb_invalidate_phys_addr(cpu_get_phys_page_debug(cpu, pc) |
-            (pc & ~TARGET_PAGE_MASK));
+    hwaddr phys = cpu_get_phys_page_debug(cpu, pc);
+    if (phys != -1) {
+        tb_invalidate_phys_addr(phys | (pc & ~TARGET_PAGE_MASK));
+    }
 }
 #endif
 #endif /* TARGET_HAS_ICE */