aboutsummaryrefslogtreecommitdiff
path: root/gdbserver
diff options
context:
space:
mode:
Diffstat (limited to 'gdbserver')
-rw-r--r--gdbserver/ChangeLog20
-rw-r--r--gdbserver/linux-low.cc5
-rw-r--r--gdbserver/linux-low.h2
-rw-r--r--gdbserver/lynx-low.cc1
-rw-r--r--gdbserver/nto-low.cc1
-rw-r--r--gdbserver/target.cc6
-rw-r--r--gdbserver/target.h10
-rw-r--r--gdbserver/win32-low.cc1
8 files changed, 35 insertions, 11 deletions
diff --git a/gdbserver/ChangeLog b/gdbserver/ChangeLog
index 3aaf02a..fc01891 100644
--- a/gdbserver/ChangeLog
+++ b/gdbserver/ChangeLog
@@ -1,5 +1,25 @@
2020-02-20 Tankut Baris Aktemur <tankut.baris.aktemur@intel.com>
+ Turn process_stratum_target's emit_ops op into a method of
+ process_target.
+
+ * target.h (struct process_stratum_target): Remove the target op.
+ (class process_target): Add the target op.
+ (target_emit_ops): Update the macro.
+ * target.cc (process_target::emit_ops): Define.
+
+ Update the derived classes and callers below.
+
+ * linux-low.cc (linux_target_ops): Update.
+ (linux_emit_ops): Turn into ...
+ (linux_process_target::emit_ops): ... this.
+ * linux-low.h (class linux_process_target): Update.
+ * lynx-low.cc (lynx_target_ops): Update.
+ * nto-low.cc (nto_target_ops): Update.
+ * win32-low.cc (win32_target_ops): Update.
+
+2020-02-20 Tankut Baris Aktemur <tankut.baris.aktemur@intel.com>
+
Turn process_stratum_target's install_fast_tracepoint_jump_pad
and get_min_fast_tracepoint_insn_len ops into methods of
process_target.
diff --git a/gdbserver/linux-low.cc b/gdbserver/linux-low.cc
index ecd892b..f93d66a 100644
--- a/gdbserver/linux-low.cc
+++ b/gdbserver/linux-low.cc
@@ -6643,8 +6643,8 @@ linux_process_target::install_fast_tracepoint_jump_pad
err);
}
-static struct emit_ops *
-linux_emit_ops (void)
+emit_ops *
+linux_process_target::emit_ops ()
{
if (the_low_target.emit_ops != NULL)
return (*the_low_target.emit_ops) ();
@@ -7456,7 +7456,6 @@ linux_get_hwcap2 (int wordsize)
static linux_process_target the_linux_target;
static process_stratum_target linux_target_ops = {
- linux_emit_ops,
linux_supports_disable_randomization,
linux_qxfer_libraries_svr4,
linux_supports_agent,
diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h
index 35e30ed..3a6d2d0 100644
--- a/gdbserver/linux-low.h
+++ b/gdbserver/linux-low.h
@@ -420,6 +420,8 @@ public:
char *err) override;
int get_min_fast_tracepoint_insn_len () override;
+
+ struct emit_ops *emit_ops () override;
};
#define get_thread_lwp(thr) ((struct lwp_info *) (thread_target_data (thr)))
diff --git a/gdbserver/lynx-low.cc b/gdbserver/lynx-low.cc
index 4089b26..1c71c60 100644
--- a/gdbserver/lynx-low.cc
+++ b/gdbserver/lynx-low.cc
@@ -735,7 +735,6 @@ static lynx_process_target the_lynx_target;
/* The LynxOS target_ops vector. */
static process_stratum_target lynx_target_ops = {
- NULL, /* emit_ops */
NULL, /* supports_disable_randomization */
NULL, /* qxfer_libraries_svr4 */
NULL, /* support_agent */
diff --git a/gdbserver/nto-low.cc b/gdbserver/nto-low.cc
index e0d3d49..502e610 100644
--- a/gdbserver/nto-low.cc
+++ b/gdbserver/nto-low.cc
@@ -947,7 +947,6 @@ nto_sw_breakpoint_from_kind (int kind, int *size)
static nto_process_target the_nto_target;
static process_stratum_target nto_target_ops = {
- NULL, /* emit_ops */
NULL, /* supports_disable_randomization */
NULL, /* qxfer_libraries_svr4 */
NULL, /* support_agent */
diff --git a/gdbserver/target.cc b/gdbserver/target.cc
index 29b5bbc..44069f1 100644
--- a/gdbserver/target.cc
+++ b/gdbserver/target.cc
@@ -693,3 +693,9 @@ process_target::get_min_fast_tracepoint_insn_len ()
{
return 0;
}
+
+struct emit_ops *
+process_target::emit_ops ()
+{
+ return nullptr;
+}
diff --git a/gdbserver/target.h b/gdbserver/target.h
index 21f22a4..0d51af7 100644
--- a/gdbserver/target.h
+++ b/gdbserver/target.h
@@ -70,10 +70,6 @@ class process_target;
shared code. */
struct process_stratum_target
{
- /* Return the bytecode operations vector for the current inferior.
- Returns NULL if bytecode compilation is not supported. */
- struct emit_ops *(*emit_ops) (void);
-
/* Returns true if the target supports disabling randomization. */
int (*supports_disable_randomization) (void);
@@ -493,6 +489,10 @@ public:
/* Return the minimum length of an instruction that can be safely
overwritten for use as a fast tracepoint. */
virtual int get_min_fast_tracepoint_insn_len ();
+
+ /* Return the bytecode operations vector for the current inferior.
+ Returns nullptr if bytecode compilation is not supported. */
+ virtual struct emit_ops *emit_ops ();
};
extern process_stratum_target *the_target;
@@ -597,7 +597,7 @@ int kill_inferior (process_info *proc);
err)
#define target_emit_ops() \
- (the_target->emit_ops ? (*the_target->emit_ops) () : NULL)
+ the_target->pt->emit_ops ()
#define target_supports_disable_randomization() \
(the_target->supports_disable_randomization ? \
diff --git a/gdbserver/win32-low.cc b/gdbserver/win32-low.cc
index 9c715fe..297882b 100644
--- a/gdbserver/win32-low.cc
+++ b/gdbserver/win32-low.cc
@@ -1858,7 +1858,6 @@ win32_sw_breakpoint_from_kind (int kind, int *size)
static win32_process_target the_win32_target;
static process_stratum_target win32_target_ops = {
- NULL, /* emit_ops */
NULL, /* supports_disable_randomization */
NULL, /* qxfer_libraries_svr4 */
NULL, /* support_agent */