From 3e974d6ccd0482504995732644632650155225cc Mon Sep 17 00:00:00 2001
From: Sebastian Sumpf <sebastian.sumpf@genode-labs.com>
Date: Fri, 11 Jan 2013 17:09:06 +0100
Subject: [PATCH] GDB monitor: Check for ARM breakpoint IP

Performed in 'slow_trapentry'. Was 'fix_exception_ip.patch'.
---
 kernel/fiasco/src/kern/arm/thread-arm.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/kernel/fiasco/src/kern/arm/thread-arm.cpp b/kernel/fiasco/src/kern/arm/thread-arm.cpp
index f73f2372..97fa6750 100644
--- a/kernel/fiasco/src/kern/arm/thread-arm.cpp
+++ b/kernel/fiasco/src/kern/arm/thread-arm.cpp
@@ -303,6 +303,10 @@ extern "C" {
             if (handle_copro_fault[copro](opcode, ts))
               return;
           }
+
+        /* check for ARM default GDB breakpoint */
+        if (!(ts->psr & Proc::Status_thumb) && opcode == 0xe7ffdefe)
+          ts->pc -= 4;
       }
 
 undef_insn: