Move test_target_ops to a separate file
There's no need to have all target.h users seeing this type. Also helps with a follow up patch. gdb/ChangeLog: 2018-11-30 Pedro Alves <palves@redhat.com> * Makefile.in (COMMON_SFILES): Add test-target.c. * gdbarch-selftests.c: Include "test-target.h". * regcache.c: Include "test-target.h". * target.c (test_target_info, test_target_ops::info): Move to ... * test-target.c: ... this new file. * target.h (test_target_ops): Move to ... * test-target.h: ... this new file.
This commit is contained in:
parent
5f60af5d24
commit
c180496d2a
8 changed files with 121 additions and 66 deletions
|
@ -1,3 +1,13 @@
|
||||||
|
2018-11-30 Pedro Alves <palves@redhat.com>
|
||||||
|
|
||||||
|
* Makefile.in (COMMON_SFILES): Add test-target.c.
|
||||||
|
* gdbarch-selftests.c: Include "test-target.h".
|
||||||
|
* regcache.c: Include "test-target.h".
|
||||||
|
* target.c (test_target_info, test_target_ops::info): Move to ...
|
||||||
|
* test-target.c: ... this new file.
|
||||||
|
* target.h (test_target_ops): Move to ...
|
||||||
|
* test-target.h: ... this new file.
|
||||||
|
|
||||||
2018-11-29 Philippe Waroquiers <philippe.waroquiers@skynet.be>
|
2018-11-29 Philippe Waroquiers <philippe.waroquiers@skynet.be>
|
||||||
|
|
||||||
* source.c (forward_search_command): Fix leak by using
|
* source.c (forward_search_command): Fix leak by using
|
||||||
|
|
|
@ -1110,6 +1110,7 @@ COMMON_SFILES = \
|
||||||
target-dcache.c \
|
target-dcache.c \
|
||||||
target-descriptions.c \
|
target-descriptions.c \
|
||||||
target-memory.c \
|
target-memory.c \
|
||||||
|
test-target.c \
|
||||||
thread.c \
|
thread.c \
|
||||||
thread-iter.c \
|
thread-iter.c \
|
||||||
thread-fsm.c \
|
thread-fsm.c \
|
||||||
|
|
|
@ -24,6 +24,7 @@
|
||||||
#include "inferior.h"
|
#include "inferior.h"
|
||||||
#include "gdbthread.h"
|
#include "gdbthread.h"
|
||||||
#include "target.h"
|
#include "target.h"
|
||||||
|
#include "test-target.h"
|
||||||
#include "target-float.h"
|
#include "target-float.h"
|
||||||
#include "common/def-vector.h"
|
#include "common/def-vector.h"
|
||||||
|
|
||||||
|
|
|
@ -21,6 +21,7 @@
|
||||||
#include "inferior.h"
|
#include "inferior.h"
|
||||||
#include "gdbthread.h"
|
#include "gdbthread.h"
|
||||||
#include "target.h"
|
#include "target.h"
|
||||||
|
#include "test-target.h"
|
||||||
#include "gdbarch.h"
|
#include "gdbarch.h"
|
||||||
#include "gdbcmd.h"
|
#include "gdbcmd.h"
|
||||||
#include "regcache.h"
|
#include "regcache.h"
|
||||||
|
|
21
gdb/target.c
21
gdb/target.c
|
@ -192,27 +192,6 @@ target_command (const char *arg, int from_tty)
|
||||||
gdb_stdout);
|
gdb_stdout);
|
||||||
}
|
}
|
||||||
|
|
||||||
#if GDB_SELF_TEST
|
|
||||||
namespace selftests {
|
|
||||||
|
|
||||||
/* A mock process_stratum target_ops that doesn't read/write registers
|
|
||||||
anywhere. */
|
|
||||||
|
|
||||||
static const target_info test_target_info = {
|
|
||||||
"test",
|
|
||||||
N_("unit tests target"),
|
|
||||||
N_("You should never see this"),
|
|
||||||
};
|
|
||||||
|
|
||||||
const target_info &
|
|
||||||
test_target_ops::info () const
|
|
||||||
{
|
|
||||||
return test_target_info;
|
|
||||||
}
|
|
||||||
|
|
||||||
} /* namespace selftests */
|
|
||||||
#endif /* GDB_SELF_TEST */
|
|
||||||
|
|
||||||
/* Default target_has_* methods for process_stratum targets. */
|
/* Default target_has_* methods for process_stratum targets. */
|
||||||
|
|
||||||
int
|
int
|
||||||
|
|
45
gdb/target.h
45
gdb/target.h
|
@ -2574,49 +2574,4 @@ extern void target_prepare_to_generate_core (void);
|
||||||
/* See to_done_generating_core. */
|
/* See to_done_generating_core. */
|
||||||
extern void target_done_generating_core (void);
|
extern void target_done_generating_core (void);
|
||||||
|
|
||||||
#if GDB_SELF_TEST
|
|
||||||
namespace selftests {
|
|
||||||
|
|
||||||
/* A mock process_stratum target_ops that doesn't read/write registers
|
|
||||||
anywhere. */
|
|
||||||
|
|
||||||
class test_target_ops : public target_ops
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
test_target_ops ()
|
|
||||||
: target_ops {}
|
|
||||||
{
|
|
||||||
to_stratum = process_stratum;
|
|
||||||
}
|
|
||||||
|
|
||||||
const target_info &info () const override;
|
|
||||||
|
|
||||||
bool has_registers () override
|
|
||||||
{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool has_stack () override
|
|
||||||
{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool has_memory () override
|
|
||||||
{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
void prepare_to_store (regcache *regs) override
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void store_registers (regcache *regs, int regno) override
|
|
||||||
{
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
} // namespace selftests
|
|
||||||
#endif /* GDB_SELF_TEST */
|
|
||||||
|
|
||||||
#endif /* !defined (TARGET_H) */
|
#endif /* !defined (TARGET_H) */
|
||||||
|
|
39
gdb/test-target.c
Normal file
39
gdb/test-target.c
Normal file
|
@ -0,0 +1,39 @@
|
||||||
|
/* A mock process_stratum target_ops
|
||||||
|
|
||||||
|
Copyright (C) 2017-2018 Free Software Foundation, Inc.
|
||||||
|
|
||||||
|
This file is part of GDB.
|
||||||
|
|
||||||
|
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
|
||||||
|
the Free Software Foundation; either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
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 "defs.h"
|
||||||
|
#include "test-target.h"
|
||||||
|
|
||||||
|
#if GDB_SELF_TEST
|
||||||
|
namespace selftests {
|
||||||
|
|
||||||
|
static const target_info test_target_info = {
|
||||||
|
"test",
|
||||||
|
N_("unit tests target"),
|
||||||
|
N_("You should never see this"),
|
||||||
|
};
|
||||||
|
|
||||||
|
const target_info &
|
||||||
|
test_target_ops::info () const
|
||||||
|
{
|
||||||
|
return test_target_info;
|
||||||
|
}
|
||||||
|
|
||||||
|
} /* namespace selftests */
|
||||||
|
#endif /* GDB_SELF_TEST */
|
69
gdb/test-target.h
Normal file
69
gdb/test-target.h
Normal file
|
@ -0,0 +1,69 @@
|
||||||
|
/* A mock process_stratum target_ops
|
||||||
|
|
||||||
|
Copyright (C) 2017-2018 Free Software Foundation, Inc.
|
||||||
|
|
||||||
|
This file is part of GDB.
|
||||||
|
|
||||||
|
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
|
||||||
|
the Free Software Foundation; either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
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 TEST_TARGET_H
|
||||||
|
#define TEST_TARGET_H
|
||||||
|
|
||||||
|
#include "target.h"
|
||||||
|
|
||||||
|
#if GDB_SELF_TEST
|
||||||
|
namespace selftests {
|
||||||
|
|
||||||
|
/* A mock process_stratum target_ops that doesn't read/write registers
|
||||||
|
anywhere. */
|
||||||
|
|
||||||
|
class test_target_ops : public target_ops
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
test_target_ops ()
|
||||||
|
: target_ops {}
|
||||||
|
{
|
||||||
|
to_stratum = process_stratum;
|
||||||
|
}
|
||||||
|
|
||||||
|
const target_info &info () const override;
|
||||||
|
|
||||||
|
bool has_registers () override
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool has_stack () override
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool has_memory () override
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
void prepare_to_store (regcache *regs) override
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
void store_registers (regcache *regs, int regno) override
|
||||||
|
{
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace selftests
|
||||||
|
#endif /* GDB_SELF_TEST */
|
||||||
|
|
||||||
|
#endif /* !defined (TEST_TARGET_H) */
|
Loading…
Add table
Add a link
Reference in a new issue