Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/gpl3/gdb.old/dist/gdb merge conflicts
details: https://anonhg.NetBSD.org/src/rev/d22446a47f9e
branches: trunk
changeset: 976180:d22446a47f9e
user: christos <christos%NetBSD.org@localhost>
date: Mon Sep 14 00:40:02 2020 +0000
description:
merge conflicts
diffstat:
external/gpl3/gdb.old/dist/gdb/system-gdbinit/elinos.py | 2 +-
external/gpl3/gdb.old/dist/gdb/system-gdbinit/wrs-linux.py | 2 +-
external/gpl3/gdb.old/dist/gdb/target/resume.h | 8 +-
external/gpl3/gdb.old/dist/gdb/target/target.h | 122 +-
external/gpl3/gdb.old/dist/gdb/target/wait.h | 8 +-
external/gpl3/gdb.old/dist/gdb/target/waitstatus.c | 52 +-
external/gpl3/gdb.old/dist/gdb/target/waitstatus.h | 15 +-
external/gpl3/gdb.old/dist/gdb/testsuite/.gitignore | 9 -
external/gpl3/gdb.old/dist/gdb/testsuite/ChangeLog | 3904 +++++++++-
external/gpl3/gdb.old/dist/gdb/testsuite/ChangeLog-1993-2013 | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/Makefile.in | 43 +-
external/gpl3/gdb.old/dist/gdb/testsuite/README | 84 +
external/gpl3/gdb.old/dist/gdb/testsuite/boards/cc-with-tweaks.exp | 11 +-
external/gpl3/gdb.old/dist/gdb/testsuite/boards/dwarf4-gdb-index.exp | 11 +-
external/gpl3/gdb.old/dist/gdb/testsuite/boards/fission-dwp.exp | 6 +-
external/gpl3/gdb.old/dist/gdb/testsuite/boards/fission.exp | 8 +-
external/gpl3/gdb.old/dist/gdb/testsuite/boards/gdbserver-base.exp | 24 +-
external/gpl3/gdb.old/dist/gdb/testsuite/boards/local-remote-host-native.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/boards/local-remote-host-notty.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/boards/local-remote-host.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/boards/native-extended-gdbserver.exp | 55 +-
external/gpl3/gdb.old/dist/gdb/testsuite/boards/native-gdbserver.exp | 28 +-
external/gpl3/gdb.old/dist/gdb/testsuite/boards/native-stdio-gdbserver.exp | 73 +-
external/gpl3/gdb.old/dist/gdb/testsuite/boards/remote-stdio-gdbserver.exp | 35 +-
external/gpl3/gdb.old/dist/gdb/testsuite/boards/stabs.exp | 8 +-
external/gpl3/gdb.old/dist/gdb/testsuite/config/cfdbug.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/config/d10v.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/config/default.exp | 4 +-
external/gpl3/gdb.old/dist/gdb/testsuite/config/dve.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/config/extended-gdbserver.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/config/gdbserver.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/config/i960.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/config/m32r.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/config/mips-idt.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/config/mips.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/config/mn10300-eval.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/config/monitor.exp | 5 +-
external/gpl3/gdb.old/dist/gdb/testsuite/config/proelf.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/config/rom68k.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/config/sh.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/config/sid.exp | 6 +-
external/gpl3/gdb.old/dist/gdb/testsuite/config/sim.exp | 17 +-
external/gpl3/gdb.old/dist/gdb/testsuite/config/slite.exp | 4 +-
external/gpl3/gdb.old/dist/gdb/testsuite/config/unix.exp | 4 +-
external/gpl3/gdb.old/dist/gdb/testsuite/config/vr4300.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/config/vr5000.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/configure | 712 +-
external/gpl3/gdb.old/dist/gdb/testsuite/configure.ac | 3 +-
external/gpl3/gdb.old/dist/gdb/testsuite/dg-extract-results.sh | 453 -
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/O2_float_param.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/addr_arith.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/aliased_array.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/arr_arr.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/array_bounds.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/array_char_idx.exp | 5 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/array_return.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/array_subscript_addr.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/arraydim.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/arrayidx.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/arrayparam.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/arrayptr.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/assign_1.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/atomic_enum.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/bad-task-bp-keyword.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/boolean_expr.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/bp_enum_homonym.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/bp_on_var.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/bp_range_type.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/bp_reset.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/call_pn.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/catch_ex.exp | 10 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/char_enum.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/char_param.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/complete.exp | 33 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/cond_lang.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/dot_all.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/dyn_arrayidx.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/dyn_loc.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/enum_idx_packed.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/exec_changed.exp | 4 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/expr_delims.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/exprs.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/fixed_cmp.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/fixed_points.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/float_param.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/formatted_ref.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/frame_args.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/fullname_bp.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/fun_addr.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/fun_in_declare.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/funcall_param.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/homonym.exp | 4 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/info_exc.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/info_locals_renaming.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/info_types.c | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/info_types.exp | 4 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/int_deref.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/interface.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/iwide.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/lang_switch.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/mi_catch_ex.exp | 14 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/mi_dyn_arr.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/mi_ex_cond.exp | 4 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/mi_exc_info.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/mi_interface.exp | 6 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/mi_task_arg.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/mi_task_info.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/mod_from_name.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/n_arr_bound.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/nested.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/null_array.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/null_record.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/operator_bp.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/optim_drec.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/packed_array.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/packed_tagged.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/pckd_arr_ren.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/pkd_arr_elem.exp | 16 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/pp-rec-component.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/pp-rec-component.py | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/print_chars.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/print_pc.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/ptr_typedef.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/ptype_arith_binop.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/ptype_field.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/ptype_tagged_param.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/py_range.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/rdv_wait.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/rec_return.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/ref_param.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/ref_tick_size.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/same_enum.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/set_pckd_arr_elt.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/set_wstr.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/small_reg_param.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/start.exp | 4 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/str_ref_cmp.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/str_uninit.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/sym_print_name.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/taft_type.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/tagged.exp | 2 +-
external/gpl3/gdb.old/dist/gdb/testsuite/gdb.ada/tagged_access.exp | 2 +-
142 files changed, 4801 insertions(+), 1221 deletions(-)
diffs (truncated from 8576 to 300 lines):
diff -r 6f6ced7ed278 -r d22446a47f9e external/gpl3/gdb.old/dist/gdb/system-gdbinit/elinos.py
--- a/external/gpl3/gdb.old/dist/gdb/system-gdbinit/elinos.py Mon Sep 14 00:40:01 2020 +0000
+++ b/external/gpl3/gdb.old/dist/gdb/system-gdbinit/elinos.py Mon Sep 14 00:40:02 2020 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2017 Free Software Foundation, Inc.
+# Copyright (C) 2011-2019 Free Software Foundation, Inc.
# 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
diff -r 6f6ced7ed278 -r d22446a47f9e external/gpl3/gdb.old/dist/gdb/system-gdbinit/wrs-linux.py
--- a/external/gpl3/gdb.old/dist/gdb/system-gdbinit/wrs-linux.py Mon Sep 14 00:40:01 2020 +0000
+++ b/external/gpl3/gdb.old/dist/gdb/system-gdbinit/wrs-linux.py Mon Sep 14 00:40:02 2020 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2017 Free Software Foundation, Inc.
+# Copyright (C) 2011-2019 Free Software Foundation, Inc.
# 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
diff -r 6f6ced7ed278 -r d22446a47f9e external/gpl3/gdb.old/dist/gdb/target/resume.h
--- a/external/gpl3/gdb.old/dist/gdb/target/resume.h Mon Sep 14 00:40:01 2020 +0000
+++ b/external/gpl3/gdb.old/dist/gdb/target/resume.h Mon Sep 14 00:40:02 2020 +0000
@@ -1,6 +1,6 @@
/* Target resumption definitions and prototypes.
- Copyright (C) 1990-2017 Free Software Foundation, Inc.
+ Copyright (C) 1990-2019 Free Software Foundation, Inc.
This file is part of GDB.
@@ -17,8 +17,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef RESUME_H
-#define RESUME_H
+#ifndef TARGET_RESUME_H
+#define TARGET_RESUME_H
/* Ways to "resume" a thread. */
@@ -34,4 +34,4 @@
resume_stop
};
-#endif /* RESUME_H */
+#endif /* TARGET_RESUME_H */
diff -r 6f6ced7ed278 -r d22446a47f9e external/gpl3/gdb.old/dist/gdb/target/target.h
--- a/external/gpl3/gdb.old/dist/gdb/target/target.h Mon Sep 14 00:40:01 2020 +0000
+++ b/external/gpl3/gdb.old/dist/gdb/target/target.h Mon Sep 14 00:40:02 2020 +0000
@@ -1,6 +1,6 @@
/* Declarations for common target functions.
- Copyright (C) 1986-2017 Free Software Foundation, Inc.
+ Copyright (C) 1986-2019 Free Software Foundation, Inc.
This file is part of GDB.
@@ -17,8 +17,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef TARGET_COMMON_H
-#define TARGET_COMMON_H
+#ifndef TARGET_TARGET_H
+#define TARGET_TARGET_H
#include "target/waitstatus.h"
/* This header is a stopgap until more code is shared. */
@@ -95,4 +95,118 @@
extern int target_supports_multi_process (void);
-#endif /* TARGET_COMMON_H */
+/* Possible terminal states. */
+
+enum class target_terminal_state
+ {
+ /* The inferior's terminal settings are in effect. */
+ is_inferior = 0,
+
+ /* Some of our terminal settings are in effect, enough to get
+ proper output. */
+ is_ours_for_output = 1,
+
+ /* Our terminal settings are in effect, for output and input. */
+ is_ours = 2
+ };
+
+/* Represents the state of the target terminal. */
+class target_terminal
+{
+public:
+
+ target_terminal () = delete;
+ ~target_terminal () = delete;
+ DISABLE_COPY_AND_ASSIGN (target_terminal);
+
+ /* Initialize the terminal settings we record for the inferior,
+ before we actually run the inferior. */
+ static void init ();
+
+ /* Put the current inferior's terminal settings into effect. This
+ is preparation for starting or resuming the inferior. This is a
+ no-op unless called with the main UI as current UI. */
+ static void inferior ();
+
+ /* Put our terminal settings into effect. First record the inferior's
+ terminal settings so they can be restored properly later. This is
+ a no-op unless called with the main UI as current UI. */
+ static void ours ();
+
+ /* Put some of our terminal settings into effect, enough to get proper
+ results from our output, but do not change into or out of RAW mode
+ so that no input is discarded. This is a no-op if terminal_ours
+ was most recently called. This is a no-op unless called with the main
+ UI as current UI. */
+ static void ours_for_output ();
+
+ /* Restore terminal settings of inferiors that are in
+ is_ours_for_output state back to "inferior". Used when we need
+ to temporarily switch to is_ours_for_output state. */
+ static void restore_inferior ();
+
+ /* Returns true if the terminal settings of the inferior are in
+ effect. */
+ static bool is_inferior ()
+ {
+ return m_terminal_state == target_terminal_state::is_inferior;
+ }
+
+ /* Returns true if our terminal settings are in effect. */
+ static bool is_ours ()
+ {
+ return m_terminal_state == target_terminal_state::is_ours;
+ }
+
+ /* Returns true if our terminal settings are in effect. */
+ static bool is_ours_for_output ()
+ {
+ return m_terminal_state == target_terminal_state::is_ours_for_output;
+ }
+
+ /* Print useful information about our terminal status, if such a thing
+ exists. */
+ static void info (const char *arg, int from_tty);
+
+public:
+
+ /* A class that restores the state of the terminal to the current
+ state. */
+ class scoped_restore_terminal_state
+ {
+ public:
+
+ scoped_restore_terminal_state ()
+ : m_state (m_terminal_state)
+ {
+ }
+
+ ~scoped_restore_terminal_state ()
+ {
+ switch (m_state)
+ {
+ case target_terminal_state::is_ours:
+ ours ();
+ break;
+ case target_terminal_state::is_ours_for_output:
+ ours_for_output ();
+ break;
+ case target_terminal_state::is_inferior:
+ restore_inferior ();
+ break;
+ }
+ }
+
+ DISABLE_COPY_AND_ASSIGN (scoped_restore_terminal_state);
+
+ private:
+
+ target_terminal_state m_state;
+ };
+
+private:
+
+ static target_terminal_state m_terminal_state;
+};
+
+#endif /* TARGET_TARGET_H */
diff -r 6f6ced7ed278 -r d22446a47f9e external/gpl3/gdb.old/dist/gdb/target/wait.h
--- a/external/gpl3/gdb.old/dist/gdb/target/wait.h Mon Sep 14 00:40:01 2020 +0000
+++ b/external/gpl3/gdb.old/dist/gdb/target/wait.h Mon Sep 14 00:40:02 2020 +0000
@@ -1,6 +1,6 @@
/* Target wait definitions and prototypes.
- Copyright (C) 1990-2017 Free Software Foundation, Inc.
+ Copyright (C) 1990-2019 Free Software Foundation, Inc.
This file is part of GDB.
@@ -17,8 +17,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef WAIT_H
-#define WAIT_H
+#ifndef TARGET_WAIT_H
+#define TARGET_WAIT_H
/* Options that can be passed to target_wait. */
@@ -27,4 +27,4 @@
event. */
#define TARGET_WNOHANG 1
-#endif /* WAIT_H */
+#endif /* TARGET_WAIT_H */
diff -r 6f6ced7ed278 -r d22446a47f9e external/gpl3/gdb.old/dist/gdb/target/waitstatus.c
--- a/external/gpl3/gdb.old/dist/gdb/target/waitstatus.c Mon Sep 14 00:40:01 2020 +0000
+++ b/external/gpl3/gdb.old/dist/gdb/target/waitstatus.c Mon Sep 14 00:40:02 2020 +0000
@@ -1,6 +1,6 @@
/* Target waitstatus implementations.
- Copyright (C) 1990-2017 Free Software Foundation, Inc.
+ Copyright (C) 1990-2019 Free Software Foundation, Inc.
This file is part of GDB.
@@ -17,13 +17,13 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#include "common-defs.h"
+#include "common/common-defs.h"
#include "waitstatus.h"
/* Return a pretty printed form of target_waitstatus.
Space for the result is malloc'd, caller must free. */
-char *
+std::string
target_waitstatus_to_string (const struct target_waitstatus *ws)
{
const char *kind_str = "status->kind = ";
@@ -31,44 +31,44 @@
switch (ws->kind)
{
case TARGET_WAITKIND_EXITED:
- return xstrprintf ("%sexited, status = %d",
- kind_str, ws->value.integer);
+ return string_printf ("%sexited, status = %d",
+ kind_str, ws->value.integer);
case TARGET_WAITKIND_STOPPED:
- return xstrprintf ("%sstopped, signal = %s",
- kind_str,
- gdb_signal_to_symbol_string (ws->value.sig));
+ return string_printf ("%sstopped, signal = %s",
+ kind_str,
+ gdb_signal_to_symbol_string (ws->value.sig));
case TARGET_WAITKIND_SIGNALLED:
- return xstrprintf ("%ssignalled, signal = %s",
- kind_str,
- gdb_signal_to_symbol_string (ws->value.sig));
+ return string_printf ("%ssignalled, signal = %s",
+ kind_str,
+ gdb_signal_to_symbol_string (ws->value.sig));
case TARGET_WAITKIND_LOADED:
- return xstrprintf ("%sloaded", kind_str);
+ return string_printf ("%sloaded", kind_str);
case TARGET_WAITKIND_FORKED:
- return xstrprintf ("%sforked", kind_str);
+ return string_printf ("%sforked", kind_str);
case TARGET_WAITKIND_VFORKED:
- return xstrprintf ("%svforked", kind_str);
+ return string_printf ("%svforked", kind_str);
case TARGET_WAITKIND_EXECD:
- return xstrprintf ("%sexecd", kind_str);
+ return string_printf ("%sexecd", kind_str);
case TARGET_WAITKIND_VFORK_DONE:
- return xstrprintf ("%svfork-done", kind_str);
+ return string_printf ("%svfork-done", kind_str);
case TARGET_WAITKIND_SYSCALL_ENTRY:
- return xstrprintf ("%sentered syscall", kind_str);
+ return string_printf ("%sentered syscall", kind_str);
case TARGET_WAITKIND_SYSCALL_RETURN:
- return xstrprintf ("%sexited syscall", kind_str);
+ return string_printf ("%sexited syscall", kind_str);
case TARGET_WAITKIND_SPURIOUS:
- return xstrprintf ("%sspurious", kind_str);
+ return string_printf ("%sspurious", kind_str);
case TARGET_WAITKIND_IGNORE:
- return xstrprintf ("%signore", kind_str);
+ return string_printf ("%signore", kind_str);
case TARGET_WAITKIND_NO_HISTORY:
- return xstrprintf ("%sno-history", kind_str);
+ return string_printf ("%sno-history", kind_str);
case TARGET_WAITKIND_NO_RESUMED:
- return xstrprintf ("%sno-resumed", kind_str);
+ return string_printf ("%sno-resumed", kind_str);
case TARGET_WAITKIND_THREAD_CREATED:
- return xstrprintf ("%sthread created", kind_str);
Home |
Main Index |
Thread Index |
Old Index