+2020-04-02 Tankut Baris Aktemur <tankut.baris.aktemur@intel.com>
+
+ Turn the 'arch_setup' linux target op into a method of
+ linux_process_target.
+
+ * linux-low.h (struct linux_target_ops) <arch_setup>: Delete.
+ (class linux_process_target) <arch_setup_thread>
+ <low_arch_setup>: New declarations.
+ * linux-low.cc (linux_arch_setup): Delete.
+ (linux_arch_setup_thread): Turn into...
+ (linux_process_target::arch_setup_thread): ... this.
+
+ Update the callers below.
+
+ (linux_process_target::handle_extended_wait)
+ (linux_process_target::post_create_inferior)
+ (linux_process_target::filter_event)
+
+ * linux-x86-low.cc (class x86_target) <low_arch_setup>: New
+ declaration.
+ (x86_linux_update_xmltarget): Turn into...
+ (x86_target::update_xmltarget): ...this.
+ (x86_linux_process_qsupported): Update the call to
+ x86_linux_update_xmltarget.
+ (x86_arch_setup): Turn into ...
+ (x86_target::low_arch_setup): ...this.
+ (the_low_target): Remove the op field.
+ * linux-aarch64-low.cc (class aarch64_target) <low_arch_setup>: New
+ declaration.
+ (aarch64_arch_setup): Turn into ...
+ (aarch64_target::low_arch_setup): ...this.
+ (the_low_target): Remove the op field.
+ * linux-arm-low.cc (class arm_target) <low_arch_setup>: New
+ declaration.
+ (arm_arch_setup): Turn into ...
+ (arm_target::low_arch_setup): ...this.
+ (the_low_target): Remove the op field.
+ * linux-bfin-low.cc (class bfin_target) <low_arch_setup>: New
+ declaration.
+ (bfin_arch_setup): Turn into ...
+ (bfin_target::low_arch_setup): ...this.
+ (the_low_target): Remove the op field.
+ * linux-cris-low.cc (class cris_target) <low_arch_setup>: New
+ declaration.
+ (cris_arch_setup): Turn into ...
+ (cris_target::low_arch_setup): ...this.
+ (the_low_target): Remove the op field.
+ * linux-crisv32-low.cc (class crisv32_target) <low_arch_setup>: New
+ declaration.
+ (crisv32_arch_setup): Turn into ...
+ (crisv32_target::low_arch_setup): ...this.
+ (the_low_target): Remove the op field.
+ * linux-ia64-low.cc (class ia64_target) <low_arch_setup>: New
+ declaration.
+ (ia64_arch_setup): Turn into ...
+ (ia64_target::low_arch_setup): ...this.
+ (the_low_target): Remove the op field.
+ * linux-m32r-low.cc (class m32r_target) <low_arch_setup>: New
+ declaration.
+ (m32r_arch_setup): Turn into ...
+ (m32r_target::low_arch_setup): ...this.
+ (the_low_target): Remove the op field.
+ * linux-m68k-low.cc (class m68k_target) <low_arch_setup>: New
+ declaration.
+ (m68k_arch_setup): Turn into ...
+ (m68k_target::low_arch_setup): ...this.
+ (the_low_target): Remove the op field.
+ * linux-mips-low.cc (class mips_target) <low_arch_setup>: New
+ declaration.
+ (mips_arch_setup): Turn into ...
+ (mips_target::low_arch_setup): ...this.
+ (the_low_target): Remove the op field.
+ * linux-nios2-low.cc (class nios2_target) <low_arch_setup>: New
+ declaration.
+ (nios2_arch_setup): Turn into ...
+ (nios2_target::low_arch_setup): ...this.
+ (the_low_target): Remove the op field.
+ * linux-ppc-low.cc (class ppc_target) <low_arch_setup>: New
+ declaration.
+ (ppc_arch_setup): Turn into ...
+ (ppc_target::low_arch_setup): ...this.
+ (the_low_target): Remove the op field.
+ * linux-riscv-low.cc (class riscv_target) <low_arch_setup>: New
+ declaration.
+ (riscv_arch_setup): Turn into ...
+ (riscv_target::low_arch_setup): ...this.
+ (the_low_target): Remove the op field.
+ * linux-s390-low.cc (class s390_target) <low_arch_setup>: New
+ declaration.
+ (s390_arch_setup): Turn into ...
+ (s390_target::low_arch_setup): ...this.
+ (the_low_target): Remove the op field.
+ * linux-sh-low.cc (class sh_target) <low_arch_setup>: New
+ declaration.
+ (sh_arch_setup): Turn into ...
+ (sh_target::low_arch_setup): ...this.
+ (the_low_target): Remove the op field.
+ * linux-sparc-low.cc (class sparc_target) <low_arch_setup>: New
+ declaration.
+ (sparc_arch_setup): Turn into ...
+ (sparc_target::low_arch_setup): ...this.
+ (the_low_target): Remove the op field.
+ * linux-tic6x-low.cc (class tic6x_target) <low_arch_setup>: New
+ declaration.
+ (tic6x_arch_setup): Turn into ...
+ (tic6x_target::low_arch_setup): ...this.
+ (the_low_target): Remove the op field.
+ * linux-tile-low.cc (class tile_target) <low_arch_setup>: New
+ declaration.
+ (tile_arch_setup): Turn into ...
+ (tile_target::low_arch_setup): ...this.
+ (the_low_target): Remove the op field.
+ * linux-xtensa-low.cc (class xtensa_target) <low_arch_setup>: New
+ declaration.
+ (xtensa_arch_setup): Turn into ...
+ (xtensa_target::low_arch_setup): ...this.
+ (the_low_target): Remove the op field.
+
2020-04-02 Tankut Baris Aktemur <tankut.baris.aktemur@intel.com>
* linux-low.h (the_linux_target): New extern declaration.
{
public:
+protected:
+
+ void low_arch_setup () override;
};
/* The singleton target ops object. */
/* Matches HWCAP_PACA in kernel header arch/arm64/include/uapi/asm/hwcap.h. */
#define AARCH64_HWCAP_PACA (1 << 30)
-/* Implementation of linux_target_ops method "arch_setup". */
+/* Implementation of linux target ops method "low_arch_setup". */
-static void
-aarch64_arch_setup (void)
+void
+aarch64_target::low_arch_setup ()
{
unsigned int machine;
int is_elf64;
struct linux_target_ops the_low_target =
{
- aarch64_arch_setup,
aarch64_regs_info,
NULL, /* cannot_fetch_register */
NULL, /* cannot_store_register */
{
public:
+protected:
+
+ void low_arch_setup () override;
};
/* The singleton target ops object. */
return arm_linux_read_description (ARM_FP_TYPE_NONE);
}
-static void
-arm_arch_setup (void)
+void
+arm_target::low_arch_setup ()
{
int tid = lwpid_of (current_thread);
int gpregs[18];
}
struct linux_target_ops the_low_target = {
- arm_arch_setup,
arm_regs_info,
arm_cannot_fetch_register,
arm_cannot_store_register,
{
public:
+protected:
+
+ void low_arch_setup () override;
};
/* The singleton target ops object. */
return 0;
}
-static void
-bfin_arch_setup (void)
+void
+bfin_target::low_arch_setup ()
{
current_process ()->tdesc = tdesc_bfin;
}
}
struct linux_target_ops the_low_target = {
- bfin_arch_setup,
bfin_regs_info,
bfin_cannot_fetch_register,
bfin_cannot_store_register,
{
public:
+protected:
+
+ void low_arch_setup () override;
};
/* The singleton target ops object. */
return 0;
}
-static void
-cris_arch_setup (void)
+void
+cris_target::low_arch_setup ()
{
current_process ()->tdesc = tdesc_cris;
}
}
struct linux_target_ops the_low_target = {
- cris_arch_setup,
cris_regs_info,
cris_cannot_fetch_register,
cris_cannot_store_register,
{
public:
+protected:
+
+ void low_arch_setup () override;
};
/* The singleton target ops object. */
}
}
-static void
-cris_arch_setup (void)
+void
+crisv32_target::low_arch_setup ()
{
current_process ()->tdesc = tdesc_crisv32;
}
}
struct linux_target_ops the_low_target = {
- cris_arch_setup,
cris_regs_info,
NULL,
NULL,
{
public:
+protected:
+
+ void low_arch_setup () override;
};
/* The singleton target ops object. */
return ®s_info;
}
-static void
-ia64_arch_setup (void)
+void
+ia64_target::low_arch_setup ()
{
current_process ()->tdesc = tdesc_ia64;
}
struct linux_target_ops the_low_target = {
- ia64_arch_setup,
ia64_regs_info,
ia64_cannot_fetch_register,
ia64_cannot_store_register,
static CORE_ADDR get_pc (struct lwp_info *lwp);
-/* Call the target arch_setup function on the current thread. */
-
-static void
-linux_arch_setup (void)
-{
- the_low_target.arch_setup ();
-}
-
-/* Call the target arch_setup function on THREAD. */
-
-static void
-linux_arch_setup_thread (struct thread_info *thread)
+void
+linux_process_target::arch_setup_thread (thread_info *thread)
{
struct thread_info *saved_thread;
saved_thread = current_thread;
current_thread = thread;
- linux_arch_setup ();
+ low_arch_setup ();
current_thread = saved_thread;
}
event_lwp = add_lwp (event_ptid);
event_thr = get_lwp_thread (event_lwp);
gdb_assert (current_thread == event_thr);
- linux_arch_setup_thread (event_thr);
+ arch_setup_thread (event_thr);
/* Set the event status. */
event_lwp->waitstatus.kind = TARGET_WAITKIND_EXECD;
{
struct lwp_info *lwp = get_thread_lwp (current_thread);
- linux_arch_setup ();
+ low_arch_setup ();
if (lwp->must_set_ptrace_flags)
{
/* This needs to happen after we have attached to the
inferior and it is stopped for the first time, but
before we access any inferior registers. */
- linux_arch_setup_thread (thread);
+ arch_setup_thread (thread);
}
else
{
struct linux_target_ops
{
- /* Architecture-specific setup. */
- void (*arch_setup) (void);
-
const struct regs_info *(*regs_info) (void);
/* Return 0 if we can fetch/store the register, 1 if we cannot
/* Move THREAD out of the jump pad. */
void move_out_of_jump_pad (thread_info *thread);
+ /* Call low_arch_setup on THREAD. */
+ void arch_setup_thread (thread_info *thread);
+
protected:
/* The architecture-specific "low" methods are listed below. */
+
+ /* Architecture-specific setup for the current thread. */
+ virtual void low_arch_setup () = 0;
};
extern linux_process_target *the_linux_target;
{
public:
+protected:
+
+ void low_arch_setup () override;
};
/* The singleton target ops object. */
return 0;
}
-static void
-m32r_arch_setup (void)
+void
+m32r_target::low_arch_setup ()
{
current_process ()->tdesc = tdesc_m32r;
}
}
struct linux_target_ops the_low_target = {
- m32r_arch_setup,
m32r_regs_info,
m32r_cannot_fetch_register,
m32r_cannot_store_register,
{
public:
+protected:
+
+ void low_arch_setup () override;
};
/* The singleton target ops object. */
return ®s_info;
}
-static void
-m68k_arch_setup (void)
+void
+m68k_target::low_arch_setup ()
{
current_process ()->tdesc = tdesc_m68k;
}
}
struct linux_target_ops the_low_target = {
- m68k_arch_setup,
m68k_regs_info,
m68k_cannot_fetch_register,
m68k_cannot_store_register,
{
public:
+protected:
+
+ void low_arch_setup () override;
};
/* The singleton target ops object. */
return have_dsp ? tdesc_mips_dsp_linux : tdesc_mips_linux;
}
-static void
-mips_arch_setup (void)
+void
+mips_target::low_arch_setup ()
{
current_process ()->tdesc = mips_read_description ();
}
}
struct linux_target_ops the_low_target = {
- mips_arch_setup,
mips_regs_info,
mips_cannot_fetch_register,
mips_cannot_store_register,
{
public:
+protected:
+
+ void low_arch_setup () override;
};
/* The singleton target ops object. */
0
};
-/* Implement the arch_setup linux_target_ops method. */
+/* Implement the low_arch_setup linux target ops method. */
-static void
-nios2_arch_setup (void)
+void
+nios2_target::low_arch_setup ()
{
current_process ()->tdesc = tdesc_nios2_linux;
}
struct linux_target_ops the_low_target =
{
- nios2_arch_setup,
nios2_regs_info,
nios2_cannot_fetch_register,
nios2_cannot_store_register,
{
public:
+protected:
+
+ void low_arch_setup () override;
};
/* The singleton target ops object. */
return ®s_info;
}
-static void
-ppc_arch_setup (void)
+void
+ppc_target::low_arch_setup ()
{
const struct target_desc *tdesc;
struct regset_info *regset;
}
struct linux_target_ops the_low_target = {
- ppc_arch_setup,
ppc_regs_info,
ppc_cannot_fetch_register,
ppc_cannot_store_register,
{
public:
+protected:
+
+ void low_arch_setup () override;
};
/* The singleton target ops object. */
static riscv_target the_riscv_target;
-/* Implementation of linux_target_ops method "arch_setup". */
+/* Implementation of linux target ops method "low_arch_setup". */
-static void
-riscv_arch_setup ()
+void
+riscv_target::low_arch_setup ()
{
static const char *expedite_regs[] = { "sp", "pc", NULL };
/* RISC-V/Linux target operations. */
struct linux_target_ops the_low_target =
{
- riscv_arch_setup,
riscv_regs_info,
NULL, /* cannot_fetch_register */
NULL, /* cannot_store_register */
{
public:
+protected:
+
+ void low_arch_setup () override;
};
/* The singleton target ops object. */
static int have_hwcap_s390_high_gprs = 0;
static int have_hwcap_s390_vx = 0;
-static void
-s390_arch_setup (void)
+void
+s390_target::low_arch_setup ()
{
const struct target_desc *tdesc;
struct regset_info *regset;
}
struct linux_target_ops the_low_target = {
- s390_arch_setup,
s390_regs_info,
s390_cannot_fetch_register,
s390_cannot_store_register,
{
public:
+protected:
+
+ void low_arch_setup () override;
};
/* The singleton target ops object. */
return ®s_info;
}
-static void
-sh_arch_setup (void)
+void
+sh_target::low_arch_setup ()
{
current_process ()->tdesc = tdesc_sh;
}
struct linux_target_ops the_low_target = {
- sh_arch_setup,
sh_regs_info,
sh_cannot_fetch_register,
sh_cannot_store_register,
{
public:
+protected:
+
+ void low_arch_setup () override;
};
/* The singleton target ops object. */
return 0;
}
-static void
-sparc_arch_setup (void)
+void
+sparc_target::low_arch_setup ()
{
current_process ()->tdesc = tdesc_sparc64;
}
}
struct linux_target_ops the_low_target = {
- sparc_arch_setup,
sparc_regs_info,
sparc_cannot_fetch_register,
sparc_cannot_store_register,
{
public:
+protected:
+
+ void low_arch_setup () override;
};
/* The singleton target ops object. */
NULL_REGSET
};
-static void
-tic6x_arch_setup (void)
+void
+tic6x_target::low_arch_setup ()
{
register unsigned int csr asm ("B2");
unsigned int cpuid;
}
struct linux_target_ops the_low_target = {
- tic6x_arch_setup,
tic6x_regs_info,
tic6x_cannot_fetch_register,
tic6x_cannot_store_register,
{
public:
+protected:
+
+ void low_arch_setup () override;
};
/* The singleton target ops object. */
return ®s_info;
}
-static void
-tile_arch_setup (void)
+void
+tile_target::low_arch_setup ()
{
int pid = pid_of (current_thread);
unsigned int machine;
struct linux_target_ops the_low_target =
{
- tile_arch_setup,
tile_regs_info,
tile_cannot_fetch_register,
tile_cannot_store_register,
{
public:
+ /* Update all the target description of all processes; a new GDB
+ connected, and it may or not support xml target descriptions. */
+ void update_xmltarget ();
+
+protected:
+
+ void low_arch_setup () override;
};
/* The singleton target ops object. */
/* Update all the target description of all processes; a new GDB
connected, and it may or not support xml target descriptions. */
-static void
-x86_linux_update_xmltarget (void)
+void
+x86_target::update_xmltarget ()
{
struct thread_info *saved_thread = current_thread;
release the current regcache objects. */
regcache_release ();
- for_each_process ([] (process_info *proc) {
+ for_each_process ([this] (process_info *proc) {
int pid = proc->pid;
/* Look up any thread of this process. */
current_thread = find_any_thread_of_pid (pid);
- the_low_target.arch_setup ();
+ low_arch_setup ();
});
current_thread = saved_thread;
free (copy);
}
}
- x86_linux_update_xmltarget ();
+ the_x86_target.update_xmltarget ();
}
/* Common for x86/x86-64. */
/* Initialize the target description for the architecture of the
inferior. */
-static void
-x86_arch_setup (void)
+void
+x86_target::low_arch_setup ()
{
current_process ()->tdesc = x86_linux_read_description ();
}
struct linux_target_ops the_low_target =
{
- x86_arch_setup,
x86_linux_regs_info,
x86_cannot_fetch_register,
x86_cannot_store_register,
{
public:
+protected:
+
+ void low_arch_setup () override;
};
/* The singleton target ops object. */
&xtensa_regsets_info
};
-static void
-xtensa_arch_setup (void)
+void
+xtensa_target::low_arch_setup ()
{
current_process ()->tdesc = tdesc_xtensa;
}
}
struct linux_target_ops the_low_target = {
- xtensa_arch_setup,
xtensa_regs_info,
0,
0,