[2/2] gdb: Move get_frame_language from stack.c to frame.c.
Commit Message
The get_frame_language feels like it would be more at home in frame.c
rather than in stack.c, while the declaration, that is currently in
language.h can be moved into frame.h to match.
A couple of new includes are added, but otherwise no substantial change
here.
gdb/ChangeLog:
* stack.c (get_frame_language): Moved ...
* frame.c (get_frame_language): ... to here.
* language.h (get_frame_language): Declaration moved ...
* frame.h (get_frame_language): ... to here.
(enum language): Add declaration.
* language.c: Add frame.h include.
* top.c: Add frame.h include.
---
gdb/ChangeLog | 10 ++++++++++
gdb/frame.c | 42 ++++++++++++++++++++++++++++++++++++++++++
gdb/frame.h | 6 ++++++
gdb/language.c | 1 +
gdb/language.h | 2 --
gdb/stack.c | 42 ------------------------------------------
gdb/top.c | 1 +
7 files changed, 60 insertions(+), 44 deletions(-)
Comments
On 08/04/2015 04:40 PM, Andrew Burgess wrote:
> --- a/gdb/frame.h
> +++ b/gdb/frame.h
> @@ -814,4 +814,10 @@ extern struct frame_info *create_new_frame (CORE_ADDR base, CORE_ADDR pc);
> extern int frame_unwinder_is (struct frame_info *fi,
> const struct frame_unwind *unwinder);
>
> +/* Return the language of FRAME. */
> +
> +enum language;
No new forward declarations of enums please. That doesn't work in C++.
Thanks,
Pedro Alves
@@ -1,5 +1,15 @@
2015-08-04 Andrew Burgess <andrew.burgess@embecosm.com>
+ * stack.c (get_frame_language): Moved ...
+ * frame.c (get_frame_language): ... to here.
+ * language.h (get_frame_language): Declaration moved ...
+ * frame.h (get_frame_language): ... to here.
+ (enum language): Add declaration.
+ * language.c: Add frame.h include.
+ * top.c: Add frame.h include.
+
+2015-08-04 Andrew Burgess <andrew.burgess@embecosm.com>
+
* language.c (show_language_command): Find selected frame before
asking for the language of that frame.
(set_language_command): Likewise.
@@ -2571,6 +2571,48 @@ frame_unwind_caller_arch (struct frame_info *next_frame)
return frame_unwind_arch (skip_artificial_frames (next_frame));
}
+/* Gets the language of FRAME. */
+
+enum language
+get_frame_language (struct frame_info *frame)
+{
+ CORE_ADDR pc = 0;
+ int pc_p = 0;
+
+ gdb_assert (frame!= NULL);
+
+ /* We determine the current frame language by looking up its
+ associated symtab. To retrieve this symtab, we use the frame
+ PC. However we cannot use the frame PC as is, because it
+ usually points to the instruction following the "call", which
+ is sometimes the first instruction of another function. So
+ we rely on get_frame_address_in_block(), it provides us with
+ a PC that is guaranteed to be inside the frame's code
+ block. */
+
+ TRY
+ {
+ pc = get_frame_address_in_block (frame);
+ pc_p = 1;
+ }
+ CATCH (ex, RETURN_MASK_ERROR)
+ {
+ if (ex.error != NOT_AVAILABLE_ERROR)
+ throw_exception (ex);
+ }
+ END_CATCH
+
+ if (pc_p)
+ {
+ struct compunit_symtab *cust = find_pc_compunit_symtab (pc);
+
+ if (cust != NULL)
+ return compunit_language (cust);
+ }
+
+ return language_unknown;
+}
+
/* Stack pointer methods. */
CORE_ADDR
@@ -814,4 +814,10 @@ extern struct frame_info *create_new_frame (CORE_ADDR base, CORE_ADDR pc);
extern int frame_unwinder_is (struct frame_info *fi,
const struct frame_unwind *unwinder);
+/* Return the language of FRAME. */
+
+enum language;
+extern enum language get_frame_language (struct frame_info *frame);
+
+
#endif /* !defined (FRAME_H) */
@@ -43,6 +43,7 @@
#include "demangle.h"
#include "symfile.h"
#include "cp-support.h"
+#include "frame.h"
extern void _initialize_language (void);
@@ -544,8 +544,6 @@ extern const char *language_str (enum language);
extern void add_language (const struct language_defn *);
-extern enum language get_frame_language (struct frame_info *frame); /* In stack.c */
-
/* Check for a language-specific trampoline. */
extern CORE_ADDR skip_language_trampoline (struct frame_info *, CORE_ADDR pc);
@@ -2559,48 +2559,6 @@ func_command (char *arg, int from_tty)
else if (frame != get_selected_frame (NULL))
select_and_print_frame (frame);
}
-
-/* Gets the language of FRAME. */
-
-enum language
-get_frame_language (struct frame_info *frame)
-{
- CORE_ADDR pc = 0;
- int pc_p = 0;
-
- gdb_assert (frame!= NULL);
-
- /* We determine the current frame language by looking up its
- associated symtab. To retrieve this symtab, we use the frame
- PC. However we cannot use the frame PC as is, because it
- usually points to the instruction following the "call", which
- is sometimes the first instruction of another function. So
- we rely on get_frame_address_in_block(), it provides us with
- a PC that is guaranteed to be inside the frame's code
- block. */
-
- TRY
- {
- pc = get_frame_address_in_block (frame);
- pc_p = 1;
- }
- CATCH (ex, RETURN_MASK_ERROR)
- {
- if (ex.error != NOT_AVAILABLE_ERROR)
- throw_exception (ex);
- }
- END_CATCH
-
- if (pc_p)
- {
- struct compunit_symtab *cust = find_pc_compunit_symtab (pc);
-
- if (cust != NULL)
- return compunit_language (cust);
- }
-
- return language_unknown;
-}
/* Provide a prototype to silence -Wmissing-prototypes. */
@@ -49,6 +49,7 @@
#include "observer.h"
#include "maint.h"
#include "filenames.h"
+#include "frame.h"
/* readline include files. */
#include "readline/readline.h"