[Guile-commits] 01/01: Fix trap frame matching

[Andy Wingo]

wingo pushed a commit to branch master
in repository guile.

commit 374b88580c388af1e96ff82cedd2b6f9a708580b
Author: Andy Wingo <address@hidden>
Date:   Wed Mar 1 16:06:53 2017 +0100

    Fix trap frame matching
    
    * module/system/vm/traps.scm (program-last-ip): Actually return an
      absolute IP.  Fixes traps!
---
 module/system/vm/traps.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/module/system/vm/traps.scm b/module/system/vm/traps.scm
index db82a0a..c4861c9 100644
--- a/module/system/vm/traps.scm
+++ b/module/system/vm/traps.scm
@@ -110,7 +110,9 @@
 ;; Returns an absolute IP.
 (define (program-last-ip prog)
   (let ((pdi (find-program-debug-info (program-code prog))))
-    (and pdi (program-debug-info-size pdi))))
+    (and pdi
+         (+ (program-debug-info-addr pdi)
+            (program-debug-info-size pdi)))))
 
 (define (frame-matcher proc)
   (let ((proc (if (struct? proc)