mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-29 00:10:21 +02:00
Code Activity

gdb: Delay type lookups.

Browse source 
This avoids errors while loading the file when types are not in scope.

* libguile/libguile-3.0-gdb.scm (%gdb-memory-backend)[void*]: Turn into
a promise and adjust user accordingly.
(ip-type, fp-type, sp-type, uint-type): Remove.
(vm-frame)[ip-type, uint-type]: New variables.
This commit is contained in:
Ludovic Courtès 2020-03-14 18:21:07 +01:00
parent 77f9c49eaf
commit 40f9a44c1b
1 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
libguile/libguile-3.0-gdb.scm
View file

@ -1,6 +1,6 @@
;;; GDB debugging support for Guile. ;;; GDB debugging support for Guile.
;;; ;;;
;;; Copyright 2014, 2015, 2017 Free Software Foundation, Inc. ;;; Copyright 2014, 2015, 2017, 2020 Free Software Foundation, Inc.
;;; ;;;
;;; This program is free software; you can redistribute it and/or modify it ;;; This program is free software; you can redistribute it and/or modify it
;;; under the terms of the GNU General Public License as published by ;;; under the terms of the GNU General Public License as published by
@ -70,12 +70,15 @@ if the information is not available."
(define %gdb-memory-backend (define %gdb-memory-backend
;; The GDB back-end to access the inferior's memory. ;; The GDB back-end to access the inferior's memory.
(let ((void* (type-pointer (lookup-type "void"))))
;; When run through 'rr replay', even the 'void' type is initially
;; unavailable. Thus, delay lookup until it's actually needed.
(let ((void* (delay (type-pointer (lookup-type "void")))))
(define (dereference-word address) (define (dereference-word address)
;; Return the word at ADDRESS. ;; Return the word at ADDRESS.
(value->integer (value->integer
(value-dereference (value-cast (make-value address) (value-dereference (value-cast (make-value address)
(type-pointer void*))))) (type-pointer (force void*))))))
(define (open address size) (define (open address size)
;; Return a port to the SIZE bytes starting at ADDRESS. ;; Return a port to the SIZE bytes starting at ADDRESS.
@ -167,11 +170,6 @@ if the information is not available."
;;; VM stack walking. ;;; VM stack walking.
;;; ;;;
(define ip-type (type-pointer (lookup-type "scm_t_uint32")))
(define fp-type (type-pointer (lookup-type "SCM")))
(define sp-type (type-pointer (lookup-type "SCM")))
(define uint-type (type-pointer (lookup-type "scm_t_uintptr")))
(define-record-type <vm-frame> (define-record-type <vm-frame>
(make-vm-frame ip sp fp saved-ip saved-fp) (make-vm-frame ip sp fp saved-ip saved-fp)
vm-frame? vm-frame?
@ -184,6 +182,9 @@ if the information is not available."
;; See libguile/frames.h. ;; See libguile/frames.h.
(define* (vm-frame ip sp fp #:optional (backend %gdb-memory-backend)) (define* (vm-frame ip sp fp #:optional (backend %gdb-memory-backend))
"Return the components of the stack frame at FP." "Return the components of the stack frame at FP."
(define ip-type (type-pointer (lookup-type "scm_t_uint32")))
(define uint-type (type-pointer (lookup-type "scm_t_uintptr")))
(make-vm-frame ip (make-vm-frame ip
sp sp
fp fp