projects
/
external
/
binutils.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move test_target_ops to a separate file
[external/binutils.git]
/
gdb
/
regcache.c
diff --git
a/gdb/regcache.c
b/gdb/regcache.c
index
f3f845a
..
69e42a2
100644
(file)
--- a/
gdb/regcache.c
+++ b/
gdb/regcache.c
@@
-21,6
+21,7
@@
#include "inferior.h"
#include "gdbthread.h"
#include "target.h"
#include "inferior.h"
#include "gdbthread.h"
#include "target.h"
+#include "test-target.h"
#include "gdbarch.h"
#include "gdbcmd.h"
#include "regcache.h"
#include "gdbarch.h"
#include "gdbcmd.h"
#include "regcache.h"
@@
-86,8
+87,7
@@
init_regcache_descr (struct gdbarch *gdbarch)
/* Total size of the register space. The raw registers are mapped
directly onto the raw register cache while the pseudo's are
either mapped onto raw-registers or memory. */
/* Total size of the register space. The raw registers are mapped
directly onto the raw register cache while the pseudo's are
either mapped onto raw-registers or memory. */
- descr->nr_cooked_registers = gdbarch_num_regs (gdbarch)
- + gdbarch_num_pseudo_regs (gdbarch);
+ descr->nr_cooked_registers = gdbarch_num_cooked_regs (gdbarch);
/* Fill in a table of register types. */
descr->register_type
/* Fill in a table of register types. */
descr->register_type
@@
-163,9
+163,7
@@
register_size (struct gdbarch *gdbarch, int regnum)
struct regcache_descr *descr = regcache_descr (gdbarch);
int size;
struct regcache_descr *descr = regcache_descr (gdbarch);
int size;
- gdb_assert (regnum >= 0
- && regnum < (gdbarch_num_regs (gdbarch)
- + gdbarch_num_pseudo_regs (gdbarch)));
+ gdb_assert (regnum >= 0 && regnum < gdbarch_num_cooked_regs (gdbarch));
size = descr->sizeof_register[regnum];
return size;
}
size = descr->sizeof_register[regnum];
return size;
}
@@
-1311,8
+1309,7
@@
register_dump::dump (ui_file *file)
long register_offset = 0;
gdb_assert (descr->nr_cooked_registers
long register_offset = 0;
gdb_assert (descr->nr_cooked_registers
- == (gdbarch_num_regs (m_gdbarch)
- + gdbarch_num_pseudo_regs (m_gdbarch)));
+ == gdbarch_num_cooked_regs (m_gdbarch));
for (regnum = -1; regnum < descr->nr_cooked_registers; regnum++)
{
for (regnum = -1; regnum < descr->nr_cooked_registers; regnum++)
{
@@
-1577,9
+1574,6
@@
cooked_read_test (struct gdbarch *gdbarch)
mock_inferior.aspace = &mock_aspace;
thread_info mock_thread (&mock_inferior, mock_ptid);
mock_inferior.aspace = &mock_aspace;
thread_info mock_thread (&mock_inferior, mock_ptid);
- scoped_restore restore_thread_list
- = make_scoped_restore (&thread_list, &mock_thread);
-
/* Add the mock inferior to the inferior list so that look ups by
target+ptid can find it. */
scoped_restore restore_inferior_list
/* Add the mock inferior to the inferior list so that look ups by
target+ptid can find it. */
scoped_restore restore_inferior_list
@@
-1609,19
+1603,21
@@
cooked_read_test (struct gdbarch *gdbarch)
/* Test that read one raw register from regcache_no_target will go
to the target layer. */
/* Test that read one raw register from regcache_no_target will go
to the target layer. */
- int regnum;
/* Find a raw register which size isn't zero. */
/* Find a raw register which size isn't zero. */
- for (regnum = 0; regnum < gdbarch_num_regs (gdbarch); regnum++)
+ int nonzero_regnum;
+ for (nonzero_regnum = 0;
+ nonzero_regnum < gdbarch_num_regs (gdbarch);
+ nonzero_regnum++)
{
{
- if (register_size (gdbarch, regnum) != 0)
+ if (register_size (gdbarch,
nonzero_
regnum) != 0)
break;
}
readwrite_regcache readwrite (gdbarch);
break;
}
readwrite_regcache readwrite (gdbarch);
- gdb::def_vector<gdb_byte> buf (register_size (gdbarch, regnum));
+ gdb::def_vector<gdb_byte> buf (register_size (gdbarch,
nonzero_
regnum));
- readwrite.raw_read (regnum, buf.data ());
+ readwrite.raw_read (
nonzero_
regnum, buf.data ());
/* raw_read calls target_fetch_registers. */
SELF_CHECK (mock_target.fetch_registers_called > 0);
/* raw_read calls target_fetch_registers. */
SELF_CHECK (mock_target.fetch_registers_called > 0);
@@
-1635,16
+1631,15
@@
cooked_read_test (struct gdbarch *gdbarch)
mock_target.reset ();
/* Then, read all raw and pseudo registers, and don't expect calling
to_{fetch,store}_registers. */
mock_target.reset ();
/* Then, read all raw and pseudo registers, and don't expect calling
to_{fetch,store}_registers. */
- for (int regnum = 0;
- regnum < gdbarch_num_regs (gdbarch) + gdbarch_num_pseudo_regs (gdbarch);
- regnum++)
+ for (int regnum = 0; regnum < gdbarch_num_cooked_regs (gdbarch); regnum++)
{
if (register_size (gdbarch, regnum) == 0)
continue;
{
if (register_size (gdbarch, regnum) == 0)
continue;
- gdb::def_vector<gdb_byte> buf (register_size (gdbarch, regnum));
+ gdb::def_vector<gdb_byte>
inner_
buf (register_size (gdbarch, regnum));
- SELF_CHECK (REG_VALID == readwrite.cooked_read (regnum, buf.data ()));
+ SELF_CHECK (REG_VALID == readwrite.cooked_read (regnum,
+ inner_buf.data ()));
SELF_CHECK (mock_target.fetch_registers_called == 0);
SELF_CHECK (mock_target.store_registers_called == 0);
SELF_CHECK (mock_target.fetch_registers_called == 0);
SELF_CHECK (mock_target.store_registers_called == 0);
@@
-1662,16
+1657,14
@@
cooked_read_test (struct gdbarch *gdbarch)
readonly regcache. */
mock_target.reset ();
readonly regcache. */
mock_target.reset ();
- for (int regnum = 0;
- regnum < gdbarch_num_regs (gdbarch) + gdbarch_num_pseudo_regs (gdbarch);
- regnum++)
+ for (int regnum = 0; regnum < gdbarch_num_cooked_regs (gdbarch); regnum++)
{
if (register_size (gdbarch, regnum) == 0)
continue;
{
if (register_size (gdbarch, regnum) == 0)
continue;
- gdb::def_vector<gdb_byte> buf (register_size (gdbarch, regnum));
+ gdb::def_vector<gdb_byte>
inner_
buf (register_size (gdbarch, regnum));
enum register_status status = readonly.cooked_read (regnum,
enum register_status status = readonly.cooked_read (regnum,
- buf.data ());
+
inner_
buf.data ());
if (regnum < gdbarch_num_regs (gdbarch))
{
if (regnum < gdbarch_num_regs (gdbarch))
{
@@
-1684,7
+1677,7
@@
cooked_read_test (struct gdbarch *gdbarch)
|| bfd_arch == bfd_arch_mips || bfd_arch == bfd_arch_v850_rh850
|| bfd_arch == bfd_arch_tic6x || bfd_arch == bfd_arch_mn10300
|| bfd_arch == bfd_arch_rl78 || bfd_arch == bfd_arch_score
|| bfd_arch == bfd_arch_mips || bfd_arch == bfd_arch_v850_rh850
|| bfd_arch == bfd_arch_tic6x || bfd_arch == bfd_arch_mn10300
|| bfd_arch == bfd_arch_rl78 || bfd_arch == bfd_arch_score
- || bfd_arch == bfd_arch_riscv)
+ || bfd_arch == bfd_arch_riscv
|| bfd_arch == bfd_arch_csky
)
{
/* Raw registers. If raw registers are not in save_reggroup,
their status are unknown. */
{
/* Raw registers. If raw registers are not in save_reggroup,
their status are unknown. */
@@
-1759,8
+1752,7
@@
cooked_write_test (struct gdbarch *gdbarch)
readwrite_regcache readwrite (gdbarch);
readwrite_regcache readwrite (gdbarch);
- const int num_regs = (gdbarch_num_regs (gdbarch)
- + gdbarch_num_pseudo_regs (gdbarch));
+ const int num_regs = gdbarch_num_cooked_regs (gdbarch);
for (auto regnum = 0; regnum < num_regs; regnum++)
{
for (auto regnum = 0; regnum < num_regs; regnum++)
{