From 85642ba08c459bb2f9d1e7beffa1871c9a93ca66 Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Wed, 11 Mar 2015 14:20:06 +0100 Subject: [PATCH] Add objfile-progspace to Guile interface This commit adds an objfile-progspace accessor to the (gdb) Guile module. gdb/testsuite/ChangeLog: * gdb.guile/scm-objfile.exp: Add objfile-progspace test. gdb/doc/ChangeLog: * guile.texi (Objfiles In Guile): Document objfile-progspace. gdb/ChangeLog: * guile/scm-objfile.c (gdbscm_objfile_progspace): New function. (objfile_functions): Bind gdbscm_objfile_progspace to objfile-progspace. * guile/lib/gdb.scm: Add objfile-progspace to exports. --- gdb/ChangeLog | 7 +++++++ gdb/doc/ChangeLog | 4 ++++ gdb/doc/guile.texi | 5 +++++ gdb/guile/lib/gdb.scm | 1 + gdb/guile/scm-objfile.c | 17 +++++++++++++++++ gdb/testsuite/ChangeLog | 4 ++++ gdb/testsuite/gdb.guile/scm-objfile.exp | 3 +++ 7 files changed, 41 insertions(+) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 4a943f9758b..38d30051e6d 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2015-03-11 Andy Wingo + + * guile/scm-objfile.c (gdbscm_objfile_progspace): New function. + (objfile_functions): Bind gdbscm_objfile_progspace to + objfile-progspace. + * guile/lib/gdb.scm: Add objfile-progspace to exports. + 2015-03-11 Andy Wingo * guile/guile.c (_initialize_guile): Disable automatic diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog index 92d1d451a78..0a1db360864 100644 --- a/gdb/doc/ChangeLog +++ b/gdb/doc/ChangeLog @@ -1,3 +1,7 @@ +2015-03-11 Andy Wingo + + * guile.texi (Objfiles In Guile): Document objfile-progspace. + 2015-03-04 Pedro Alves * gdb.texinfo (Remote Configuration): Document the "set/show diff --git a/gdb/doc/guile.texi b/gdb/doc/guile.texi index 53e69f27960..4a4365c9ba2 100644 --- a/gdb/doc/guile.texi +++ b/gdb/doc/guile.texi @@ -2250,6 +2250,11 @@ Return the file name of @var{objfile} as a string, with symbolic links resolved. @end deffn +@deffn {Scheme Procedure} objfile-progspace objfile +Return the @code{} that this object file lives in. +@xref{Progspaces In Guile}, for more on progspaces. +@end deffn + @deffn {Scheme Procedure} objfile-pretty-printers objfile Return the list of registered @code{} objects for @var{objfile}. @xref{Guile Pretty Printing API}, for more information. diff --git a/gdb/guile/lib/gdb.scm b/gdb/guile/lib/gdb.scm index e95914adb5a..8f238be776c 100644 --- a/gdb/guile/lib/gdb.scm +++ b/gdb/guile/lib/gdb.scm @@ -271,6 +271,7 @@ objfile? objfile-valid? objfile-filename + objfile-progspace objfile-pretty-printers set-objfile-pretty-printers! current-objfile diff --git a/gdb/guile/scm-objfile.c b/gdb/guile/scm-objfile.c index 8e94b9645c9..080b90539e6 100644 --- a/gdb/guile/scm-objfile.c +++ b/gdb/guile/scm-objfile.c @@ -252,6 +252,19 @@ gdbscm_objfile_filename (SCM self) return gdbscm_scm_from_c_string (objfile_name (o_smob->objfile)); } +/* (objfile-progspace ) -> + Returns the objfile's progspace. + Throw's an exception if the underlying objfile is invalid. */ + +static SCM +gdbscm_objfile_progspace (SCM self) +{ + objfile_smob *o_smob + = ofscm_get_valid_objfile_smob_arg_unsafe (self, SCM_ARG1, FUNC_NAME); + + return psscm_scm_from_pspace (o_smob->objfile->pspace); +} + /* (objfile-pretty-printers ) -> list Returns the list of pretty-printers for this objfile. */ @@ -388,6 +401,10 @@ Return #t if the objfile is valid (hasn't been deleted from gdb)." }, "\ Return the file name of the objfile." }, + { "objfile-progspace", 1, 0, 0, gdbscm_objfile_progspace, + "\ +Return the progspace that the objfile lives in." }, + { "objfile-pretty-printers", 1, 0, 0, gdbscm_objfile_pretty_printers, "\ Return a list of pretty-printers of the objfile." }, diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 6497aa938f7..76dcde5d591 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2015-03-11 Andy Wingo + + * gdb.guile/scm-objfile.exp: Add objfile-progspace test. + 2015-03-11 Yao Qi * gdb.base/catch-syscall.exp: Fix typo in comments. diff --git a/gdb/testsuite/gdb.guile/scm-objfile.exp b/gdb/testsuite/gdb.guile/scm-objfile.exp index c58f4c4df39..8edda94a72e 100644 --- a/gdb/testsuite/gdb.guile/scm-objfile.exp +++ b/gdb/testsuite/gdb.guile/scm-objfile.exp @@ -48,6 +48,9 @@ gdb_test "gu (print (->bool (or-map (lambda (o) (string-contains (objfile-filena gdb_test "gu (print (objfile-pretty-printers objfile))" \ "= \\(\\)" +gdb_test "gu (print (eq? (current-progspace) (objfile-progspace objfile)))" \ + "= #t" + gdb_test "guile (set-objfile-pretty-printers! objfile 0)" \ "ERROR: .*: Wrong type argument in position 2 \\(expecting list\\): 0.*" -- 2.30.2