[gnumach] 01/01: patches/git-gdb_hw_watch.patch: New patch

[Samuel Thibault]

This is an automated email from the git hooks/post-receive script.

sthibault pushed a commit to branch master
in repository gnumach.

commit 501a85aa1bfb869a5828fed17f28fa386cfe3fae
Author: Samuel Thibault <address@hidden>
Date:   Wed Sep 17 01:52:28 2014 +0200

    patches/git-gdb_hw_watch.patch: New patch
    
    to fix gdb using hardware watches.
---
 debian/changelog                      |  7 +++++++
 debian/patches/git-gdb_hw_watch.patch | 25 +++++++++++++++++++++++++
 debian/patches/series                 |  1 +
 3 files changed, 33 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a3a82b2..36af69d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gnumach (2:1.4-13) UNRELEASED; urgency=medium
+
+  * patches/git-gdb_hw_watch.patch: New patch to fix gdb using hardware
+    watches.
+
+ -- Samuel Thibault <address@hidden>  Wed, 17 Sep 2014 01:51:31 +0200
+
 gnumach (2:1.4-12) unstable; urgency=medium
 
   * rules: Rebuild info documentation once (in the source tree) before building
diff --git a/debian/patches/git-gdb_hw_watch.patch 
b/debian/patches/git-gdb_hw_watch.patch
new file mode 100644
index 0000000..fa8aa2d
--- /dev/null
+++ b/debian/patches/git-gdb_hw_watch.patch
@@ -0,0 +1,25 @@
+commit 96cec60d956bfb27f135d4e932a1c319cbc878df
+Author: Samuel Thibault <address@hidden>
+Date:   Wed Sep 17 01:50:05 2014 +0200
+
+    Report DR6 to userland
+    
+    * i386/i386/trap.c (user_trap): On T_DEBUG, record the content of dr6 in
+    PCB, and clear it.
+
+diff --git a/i386/i386/trap.c b/i386/i386/trap.c
+index 200cbcc..9d4d43d 100644
+--- a/i386/i386/trap.c
++++ b/i386/i386/trap.c
+@@ -395,6 +395,11 @@ printf("user trap %d error %d sub %08x\n", type, code, 
subcode);
+                       return 0;
+               }
+ #endif /* MACH_KDB */
++              /* Make the content of the debug status register (DR6)
++                 available to user space.  */
++              if (thread->pcb)
++                  thread->pcb->ims.ids.dr[6] = get_dr6() & 0x600F;
++              set_dr6(0);
+               exc = EXC_BREAKPOINT;
+               code = EXC_I386_SGL;
+               break;
diff --git a/debian/patches/series b/debian/patches/series
index 29a2c52..c6e15ba 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -24,3 +24,4 @@ git-halt.patch
 git-xen_races.patch
 git-vm-tune.patch
 git-vm_map.patch
+git-gdb_hw_watch.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-hurd/gnumach.git