1993-08-31 22:13:29 +00:00
|
|
|
/* Caching code. Typically used by remote back ends for
|
|
|
|
caching remote memory.
|
|
|
|
|
1995-06-21 21:47:06 +00:00
|
|
|
Copyright 1992, 1993, 1995 Free Software Foundation, Inc.
|
1993-08-31 22:13:29 +00:00
|
|
|
|
1995-06-21 21:47:06 +00:00
|
|
|
This file is part of GDB.
|
1993-08-31 22:13:29 +00:00
|
|
|
|
1995-06-21 21:47:06 +00:00
|
|
|
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 2 of the License, or
|
|
|
|
(at your option) any later version.
|
1993-08-31 22:13:29 +00:00
|
|
|
|
1995-06-21 21:47:06 +00:00
|
|
|
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.
|
1993-08-31 22:13:29 +00:00
|
|
|
|
1995-06-21 21:47:06 +00:00
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
along with this program; if not, write to the Free Software
|
1995-08-02 03:41:12 +00:00
|
|
|
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
|
1993-08-31 22:13:29 +00:00
|
|
|
|
|
|
|
#include "defs.h"
|
|
|
|
#include "dcache.h"
|
1993-09-01 00:43:09 +00:00
|
|
|
#include "gdbcmd.h"
|
* configure.in: Check for working mmap, ansi headers, string.h,
strings.h, and memory.h.
* configure: Regenerated.
* gdb_stat.h: New file, "portable" <sys/stat.h>.
* gdb_string.h: New file, "portable" <string.h>.
* altos-xdep.c, arm-tdep.c, arm-xdep.c, convex-tdep.c,
convex-xdep.c, coredep.c, cxux-nat.c, dbxread.c, exec.c,
gould-xdep.c, hppa-tdep.c, i386aix-nat.c, i386b-nat.c,
i386mach-nat.c, i386v-nat.c, infptrace.c, m88k-nat.c, main.c,
mdebugread.c, objfiles.c, os9kread.c, procfs.c, pyr-xdep.c,
rs6000-nat.c, source.c, standalone.c, stuff.c, sun386-nat.c,
symfile.c, symm-nat.c, symm-tdep.c, symtab.c, top.c, ultra3-nat.c,
ultra3-xdep.c, umax-xdep.c, xcoffread.c: Include "gdb_stat.h"
instead of <sys/stat.h>.
* alpha-tdep.c, breakpoint.c, buildsym.c, c-typeprint.c,
ch-typeprint.c, coffread.c, command.c, core-sol2.c, core-svr4.c,
core.c, corelow.c, cp-valprint.c, dbxread.c, dcache.c, demangle.c,
dpx2-nat.c, dstread.c, dwarfread.c, elfread.c, environ.c, eval.c,
exec.c, f-lang.c, f-typeprint.c, f-valprint.c, findvar.c,
fork-child.c, gdbtypes.c, hpread.c, i386-tdep.c, infcmd.c,
inflow.c, infptrace.c, infrun.c, irix5-nat.c, language.c,
m2-typeprint.c, main.c, mdebugread.c, minsyms.c, mipsread.c,
monitor.c, nlmread.c, objfiles.c, os9kread.c, osfsolib.c, parse.c,
printcmd.c, procfs.c, regex.c, remote-adapt.c, remote-arc.c,
remote-array.c, remote-bug.c, remote-e7000.c, remote-eb.c,
remote-es.c, remote-hms.c, remote-mm.c, remote-os9k.c,
remote-pa.c, remote-sim.c, remote-st.c, remote-udi.c,
remote-utils.c, remote-vx.c, remote-vx29k.c, remote-vx68.c,
remote-vx960.c, remote-vxmips.c, remote-vxsparc.c, remote.c,
solib.c, somread.c, source.c, stabsread.c, stack.c, symfile.c,
symmisc.c, symtab.c, target.c, top.c, typeprint.c, utils.c,
valarith.c, valops.c, valprint.c, values.c, xcoffread.c: Include
"gdb_string.h" instead of <string.h>.
* gdbtk.c: Likewise.
* config/xm-sysv4.h, i386/xm-ptx.h, m68k/xm-sun3os4.h,
sparc/xm-sun4os4.h (HAVE_MMAP): Removed.
* config/xm-lynx.h, config/i386/xm-ptx.h,
config/m68k/nm-apollo68b.h, config/m68k/xm-hp300hpux.h,
config/mips/xm-irix3.h, config/mips/xm-mips.h,
config/mips/xm-news-mips.h, config/mips/xm-riscos.h,
config/pa/hppah.h, config/rs6000/xm-rs6000.h,
config/sparc/xm-sun4os4.h, config/sparc/xm-sun4sol2.h,
config/vax/xm-vaxbsd.h, config/vax/xm-vaxult.h,
config/vax/xm-vaxult2.h (MEM_FNS_DECLARED): Removed.
* config/mips/xm-irix3.h, config/mips/xm-mips.h,
config/pa/xm-hppah.h (memcpy, memset): Removed declarations.
1995-08-01 20:14:27 +00:00
|
|
|
#include "gdb_string.h"
|
1993-08-31 22:13:29 +00:00
|
|
|
|
1995-02-16 21:09:22 +00:00
|
|
|
|
1995-06-21 21:47:06 +00:00
|
|
|
/*
|
|
|
|
The data cache could lead to incorrect results because it doesn't know
|
|
|
|
about volatile variables, thus making it impossible to debug
|
|
|
|
functions which use memory mapped I/O devices.
|
1995-02-15 18:51:31 +00:00
|
|
|
|
1995-06-21 21:47:06 +00:00
|
|
|
set remotecache 0
|
1993-08-31 22:13:29 +00:00
|
|
|
|
1995-06-21 21:47:06 +00:00
|
|
|
In those cases.
|
|
|
|
|
|
|
|
In general the dcache speeds up performance, some speed improvement
|
|
|
|
comes from the actual caching mechanism, but the major gain is in
|
|
|
|
the reduction of the remote protocol overhead; instead of reading
|
|
|
|
or writing a large area of memory in 4 byte requests, the cache
|
|
|
|
bundles up the requests into 32 byte (actually LINE_SIZE) chunks.
|
|
|
|
Reducing the overhead to an eighth of what it was. This is very
|
|
|
|
obvious when displaying a large amount of data,
|
|
|
|
|
|
|
|
eg, x/200x 0
|
|
|
|
|
|
|
|
caching | no yes
|
|
|
|
----------------------------
|
|
|
|
first time | 4 sec 2 sec improvement due to chunking
|
|
|
|
second time | 4 sec 0 sec improvement due to caching
|
|
|
|
|
|
|
|
The cache structure is unusual, we keep a number of cache blocks
|
|
|
|
(DCACHE_SIZE) and each one caches a LINE_SIZEed area of memory.
|
|
|
|
Within each line we remember the address of the line (always a
|
|
|
|
multiple of the LINE_SIZE) and a vector of bytes over the range.
|
|
|
|
There's another vector which contains the state of the bytes.
|
|
|
|
|
|
|
|
ENTRY_BAD means that the byte is just plain wrong, and has no
|
|
|
|
correspondence with anything else (as it would when the cache is
|
|
|
|
turned on, but nothing has been done to it.
|
|
|
|
|
|
|
|
ENTRY_DIRTY means that the byte has some data in it which should be
|
|
|
|
written out to the remote target one day, but contains correct
|
|
|
|
data. ENTRY_OK means that the data is the same in the cache as it
|
|
|
|
is in remote memory.
|
|
|
|
|
|
|
|
|
|
|
|
The ENTRY_DIRTY state is necessary because GDB likes to write large
|
|
|
|
lumps of memory in small bits. If the caching mechanism didn't
|
|
|
|
maintain the DIRTY information, then something like a two byte
|
|
|
|
write would mean that the entire cache line would have to be read,
|
|
|
|
the two bytes modified and then written out again. The alternative
|
|
|
|
would be to not read in the cache line in the first place, and just
|
|
|
|
write the two bytes directly into target memory. The trouble with
|
|
|
|
that is that it really nails performance, because of the remote
|
|
|
|
protocol overhead. This way, all those little writes are bundled
|
|
|
|
up into an entire cache line write in one go, without having to
|
|
|
|
read the cache line in the first place.
|
|
|
|
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
/* This value regulates the number of cache blocks stored.
|
|
|
|
Smaller values reduce the time spent searching for a cache
|
|
|
|
line, and reduce memory requirements, but increase the risk
|
|
|
|
of a line not being in memory */
|
|
|
|
|
|
|
|
#define DCACHE_SIZE 64
|
|
|
|
|
|
|
|
/* This value regulates the size of a cache line. Smaller values
|
|
|
|
reduce the time taken to read a single byte, but reduce overall
|
|
|
|
throughput. */
|
|
|
|
|
|
|
|
#define LINE_SIZE_POWER (5)
|
|
|
|
#define LINE_SIZE (1 << LINE_SIZE_POWER)
|
|
|
|
|
|
|
|
/* Each cache block holds LINE_SIZE bytes of data
|
1993-08-31 22:26:48 +00:00
|
|
|
starting at a multiple-of-LINE_SIZE address. */
|
1993-08-31 22:13:29 +00:00
|
|
|
|
1995-06-21 21:47:06 +00:00
|
|
|
#define LINE_SIZE_MASK ((LINE_SIZE - 1))
|
|
|
|
#define XFORM(x) ((x) & LINE_SIZE_MASK)
|
|
|
|
#define MASK(x) ((x) & ~LINE_SIZE_MASK)
|
|
|
|
|
|
|
|
|
|
|
|
#define ENTRY_BAD 0 /* data at this byte is wrong */
|
|
|
|
#define ENTRY_DIRTY 1 /* data at this byte needs to be written back */
|
|
|
|
#define ENTRY_OK 2 /* data at this byte is same as in memory */
|
|
|
|
|
|
|
|
|
|
|
|
struct dcache_block
|
|
|
|
{
|
|
|
|
struct dcache_block *p; /* next in list */
|
|
|
|
unsigned int addr; /* Address for which data is recorded. */
|
* dache.c (struct dcache_block): Change data member from unsigned char
to char, since everything passed in and out of dcache is char or casted
to appropriate type anyway.
(dcache_alloc): Move assignment of db out of test and combine separate
tests into if-else.
(dcache_peek_byte): Change ptr from unsigned char* to char*.
(dcache_peek_byte): Remove now unnecessary cast in read_memory call.
(dcache_peek): Change cast of incoming data arg.
(dcache_poke): Change cast of addr of incoming data arg.
(dcache_info): Mask data passed to printf_filtered to lsbyte only.
(dcache_info): Change printf_filtered arg from "% 2x" to " %2x".
* target.c (debug_to_thread_alive): Change return type to int and
return zero, for type compatibility with other *_thread_alive funcs.
(cleanup_target): Change cast of ignore function to match type of the
to_thread_alive member.
* defs.h (error_hook): Add ATTR_NORETURN.
* defs.h (NORETURN, ATTR_NORETURN): Switch from volatile to
__attribute__ method with gcc 2.7, to avoid gcc 2.6.3 bug.
* remote.c (remote_wait): Cast first arg to strtol, strchr, and strncmp
to "const char *" from "unsigned char *".
(remote_wait): Cast arg to putpkt and strcpy from "unsigned char *" to
"char *".
(remote_wait): Change printf format for long arg from "%d" to "%ld".
(getpkt): Remove unused variable "bp".
(remote_fetch_word, remote_store_word): Ifdef out apparently unused
functions.
* breakpoint.c (watchpoint_check): Removed unused variables
"saved_level" and "saved_frame".
* valops.c (value_arg_coerce): Add other enum TYPE_CODE_* and
default cases to switch for completeness.
* infrun.c (wait_for_inferior): Enclose "have_waited" label
in #ifdef that matches the one in which it is referenced.
* ser-unix.c (hardwire_noflush_set_tty_state): Enclose otherwise
unused variable "state" in #ifdef that matches one in which it is
referenced.
* eval.c (evaluate_subexp_standard): Remove unused variable "var".
* eval.c (evaluate_subexp_standard): Remove unused variable "tmp_symbol".
* valarith.c (value_subscript): Remove unused variable "lowerbound",
which is redeclared in a nested scope prior to use.
* printcmd.c (print_frame_nameless_args): Use "%ld" to print long
arg, not "%d".
* {mem-break.c, remote-pa.c, remote.c, saber.suppress}:
Remove unused static var "check_break_insn_size".
* buildsym.c (finish_block): Add other enum LOC_* and default
cases to switch for completeness.
ch-lang.c (type_lower_upper): Removed unused label "retry".
Add other enum TYPE_* and default cases to switch for completeness.
* f-typeprint.c (f_type_print_args): Ifdef out unused function
that may be used someday when Fortran support is complete.
* ch-valprint.c (chill_print_type_scalar): Add other enum
TYPE_* and default cases to switch for completeness.
(chill_val_print): Remove unused local var "high_bound" that
is redeclared in a nested scope prior to use.
(chill_var_print): Use "%ld" to print long arg, not "%d".
* regex.c (re_compile_fastmap, re_match_2): Add remaining enum types
and default to switches for completeness.
* minsyms.c (lookup_minimal_symbol_text): Delete unused variable
"trampoline_symbol".
(prim_record_minimal_symbol_and_info): Return NULL rather than trash.
* elfread.c (elf_symtab_read): Don't dereference NULL returns from
record_minimal_symbol_and_info.
* f-lang.c (saved_function_list_end): Ifdef out unused variable
that may be used someday.
* f-valprint.c (f_val_print): Remove unused local variable "straddr".
1995-07-18 04:38:06 +00:00
|
|
|
char data[LINE_SIZE]; /* bytes at given address */
|
1995-06-21 21:47:06 +00:00
|
|
|
unsigned char state[LINE_SIZE]; /* what state the data is in */
|
|
|
|
|
|
|
|
/* whether anything in state is dirty - used to speed up the
|
|
|
|
dirty scan. */
|
|
|
|
int anydirty;
|
|
|
|
|
|
|
|
int refs;
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
struct dcache_struct
|
|
|
|
{
|
|
|
|
/* Function to actually read the target memory. */
|
|
|
|
memxferfunc read_memory;
|
|
|
|
|
|
|
|
/* Function to actually write the target memory */
|
|
|
|
memxferfunc write_memory;
|
|
|
|
|
|
|
|
/* free list */
|
|
|
|
struct dcache_block *free_head;
|
|
|
|
struct dcache_block *free_tail;
|
|
|
|
|
|
|
|
/* in use list */
|
|
|
|
struct dcache_block *valid_head;
|
|
|
|
struct dcache_block *valid_tail;
|
|
|
|
|
|
|
|
/* The cache itself. */
|
|
|
|
struct dcache_block *the_cache;
|
|
|
|
|
|
|
|
/* potentially, if the cache was enabled, and then turned off, and
|
|
|
|
then turned on again, the stuff in it could be stale, so this is
|
|
|
|
used to mark it */
|
|
|
|
int cache_has_stuff;
|
|
|
|
} ;
|
|
|
|
|
1996-04-11 21:17:45 +00:00
|
|
|
static int
|
|
|
|
dcache_poke_byte PARAMS ((DCACHE *dcache, CORE_ADDR addr, char *ptr));
|
|
|
|
|
|
|
|
static int
|
|
|
|
dcache_peek_byte PARAMS ((DCACHE *dcache, CORE_ADDR addr, char *ptr));
|
|
|
|
|
|
|
|
static struct dcache_block *
|
|
|
|
dcache_hit PARAMS ((DCACHE *dcache, unsigned int addr));
|
|
|
|
|
|
|
|
static int dcache_write_line PARAMS ((DCACHE *dcache,struct dcache_block *db));
|
|
|
|
|
|
|
|
static struct dcache_block *dcache_alloc PARAMS ((DCACHE *dcache));
|
|
|
|
|
|
|
|
static int dcache_writeback PARAMS ((DCACHE *dcache));
|
|
|
|
|
|
|
|
static void dcache_info PARAMS ((char *exp, int tty));
|
|
|
|
|
1995-10-16 18:25:19 +00:00
|
|
|
int remote_dcache = 0;
|
1995-06-21 21:47:06 +00:00
|
|
|
|
|
|
|
DCACHE *last_cache; /* Used by info dcache */
|
|
|
|
|
|
|
|
|
1993-08-31 22:13:29 +00:00
|
|
|
|
|
|
|
/* Free all the data cache blocks, thus discarding all cached data. */
|
1995-06-21 21:47:06 +00:00
|
|
|
|
1993-08-31 22:13:29 +00:00
|
|
|
void
|
|
|
|
dcache_flush (dcache)
|
|
|
|
DCACHE *dcache;
|
|
|
|
{
|
1995-06-21 21:47:06 +00:00
|
|
|
int i;
|
|
|
|
dcache->valid_head = 0;
|
|
|
|
dcache->valid_tail = 0;
|
|
|
|
|
|
|
|
dcache->free_head = 0;
|
|
|
|
dcache->free_tail = 0;
|
|
|
|
|
|
|
|
for (i = 0; i < DCACHE_SIZE; i++)
|
|
|
|
{
|
|
|
|
struct dcache_block *db = dcache->the_cache + i;
|
|
|
|
|
|
|
|
if (!dcache->free_head)
|
|
|
|
dcache->free_head = db;
|
|
|
|
else
|
|
|
|
dcache->free_tail->p = db;
|
|
|
|
dcache->free_tail = db;
|
|
|
|
db->p = 0;
|
|
|
|
}
|
1993-08-31 22:13:29 +00:00
|
|
|
|
1995-06-21 21:47:06 +00:00
|
|
|
dcache->cache_has_stuff = 0;
|
1993-09-01 00:43:09 +00:00
|
|
|
|
|
|
|
return;
|
1993-08-31 22:13:29 +00:00
|
|
|
}
|
|
|
|
|
1995-06-21 21:47:06 +00:00
|
|
|
/* If addr is present in the dcache, return the address of the block
|
|
|
|
containing it. */
|
1996-04-11 21:17:45 +00:00
|
|
|
|
|
|
|
static struct dcache_block *
|
1993-08-31 22:13:29 +00:00
|
|
|
dcache_hit (dcache, addr)
|
|
|
|
DCACHE *dcache;
|
|
|
|
unsigned int addr;
|
|
|
|
{
|
|
|
|
register struct dcache_block *db;
|
|
|
|
|
|
|
|
/* Search all cache blocks for one that is at this address. */
|
1995-06-21 21:47:06 +00:00
|
|
|
db = dcache->valid_head;
|
|
|
|
|
|
|
|
while (db)
|
1993-08-31 22:13:29 +00:00
|
|
|
{
|
1995-06-21 21:47:06 +00:00
|
|
|
if (MASK(addr) == db->addr)
|
|
|
|
{
|
|
|
|
db->refs++;
|
|
|
|
return db;
|
|
|
|
}
|
|
|
|
db = db->p;
|
1993-08-31 22:13:29 +00:00
|
|
|
}
|
1993-09-01 00:43:09 +00:00
|
|
|
|
1993-08-31 22:13:29 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
1995-06-21 21:47:06 +00:00
|
|
|
/* Make sure that anything in this line which needs to
|
|
|
|
be written is. */
|
|
|
|
|
|
|
|
static int
|
|
|
|
dcache_write_line (dcache, db)
|
|
|
|
DCACHE *dcache;
|
|
|
|
register struct dcache_block *db;
|
1993-08-31 22:13:29 +00:00
|
|
|
{
|
1995-06-21 21:47:06 +00:00
|
|
|
int s;
|
|
|
|
int e;
|
|
|
|
s = 0;
|
|
|
|
if (db->anydirty)
|
|
|
|
{
|
|
|
|
for (s = 0; s < LINE_SIZE; s++)
|
|
|
|
{
|
|
|
|
if (db->state[s] == ENTRY_DIRTY)
|
|
|
|
{
|
|
|
|
int len = 0;
|
|
|
|
for (e = s ; e < LINE_SIZE; e++, len++)
|
|
|
|
if (db->state[e] != ENTRY_DIRTY)
|
1995-08-19 00:54:12 +00:00
|
|
|
break;
|
|
|
|
{
|
|
|
|
/* all bytes from s..s+len-1 need to
|
|
|
|
be written out */
|
|
|
|
int done = 0;
|
|
|
|
while (done < len) {
|
|
|
|
int t = dcache->write_memory (db->addr + s + done,
|
|
|
|
db->data + s + done,
|
|
|
|
len - done);
|
|
|
|
if (t == 0)
|
|
|
|
return 0;
|
|
|
|
done += t;
|
|
|
|
}
|
|
|
|
memset (db->state + s, ENTRY_OK, len);
|
|
|
|
s = e;
|
|
|
|
}
|
1995-06-21 21:47:06 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
db->anydirty = 0;
|
|
|
|
}
|
|
|
|
return 1;
|
1993-08-31 22:13:29 +00:00
|
|
|
}
|
|
|
|
|
1995-06-21 21:47:06 +00:00
|
|
|
|
1993-08-31 22:13:29 +00:00
|
|
|
/* Get a free cache block, put or keep it on the valid list,
|
|
|
|
and return its address. The caller should store into the block
|
|
|
|
the address and data that it describes, then remque it from the
|
|
|
|
free list and insert it into the valid list. This procedure
|
1993-08-31 22:26:48 +00:00
|
|
|
prevents errors from creeping in if a memory retrieval is
|
|
|
|
interrupted (which used to put garbage blocks in the valid
|
|
|
|
list...). */
|
1996-04-11 21:17:45 +00:00
|
|
|
|
|
|
|
static struct dcache_block *
|
1993-08-31 22:13:29 +00:00
|
|
|
dcache_alloc (dcache)
|
|
|
|
DCACHE *dcache;
|
|
|
|
{
|
|
|
|
register struct dcache_block *db;
|
|
|
|
|
1993-09-01 00:43:09 +00:00
|
|
|
if (remote_dcache == 0)
|
1995-06-21 21:47:06 +00:00
|
|
|
abort ();
|
1993-09-01 00:43:09 +00:00
|
|
|
|
1995-06-21 21:47:06 +00:00
|
|
|
/* Take something from the free list */
|
* dache.c (struct dcache_block): Change data member from unsigned char
to char, since everything passed in and out of dcache is char or casted
to appropriate type anyway.
(dcache_alloc): Move assignment of db out of test and combine separate
tests into if-else.
(dcache_peek_byte): Change ptr from unsigned char* to char*.
(dcache_peek_byte): Remove now unnecessary cast in read_memory call.
(dcache_peek): Change cast of incoming data arg.
(dcache_poke): Change cast of addr of incoming data arg.
(dcache_info): Mask data passed to printf_filtered to lsbyte only.
(dcache_info): Change printf_filtered arg from "% 2x" to " %2x".
* target.c (debug_to_thread_alive): Change return type to int and
return zero, for type compatibility with other *_thread_alive funcs.
(cleanup_target): Change cast of ignore function to match type of the
to_thread_alive member.
* defs.h (error_hook): Add ATTR_NORETURN.
* defs.h (NORETURN, ATTR_NORETURN): Switch from volatile to
__attribute__ method with gcc 2.7, to avoid gcc 2.6.3 bug.
* remote.c (remote_wait): Cast first arg to strtol, strchr, and strncmp
to "const char *" from "unsigned char *".
(remote_wait): Cast arg to putpkt and strcpy from "unsigned char *" to
"char *".
(remote_wait): Change printf format for long arg from "%d" to "%ld".
(getpkt): Remove unused variable "bp".
(remote_fetch_word, remote_store_word): Ifdef out apparently unused
functions.
* breakpoint.c (watchpoint_check): Removed unused variables
"saved_level" and "saved_frame".
* valops.c (value_arg_coerce): Add other enum TYPE_CODE_* and
default cases to switch for completeness.
* infrun.c (wait_for_inferior): Enclose "have_waited" label
in #ifdef that matches the one in which it is referenced.
* ser-unix.c (hardwire_noflush_set_tty_state): Enclose otherwise
unused variable "state" in #ifdef that matches one in which it is
referenced.
* eval.c (evaluate_subexp_standard): Remove unused variable "var".
* eval.c (evaluate_subexp_standard): Remove unused variable "tmp_symbol".
* valarith.c (value_subscript): Remove unused variable "lowerbound",
which is redeclared in a nested scope prior to use.
* printcmd.c (print_frame_nameless_args): Use "%ld" to print long
arg, not "%d".
* {mem-break.c, remote-pa.c, remote.c, saber.suppress}:
Remove unused static var "check_break_insn_size".
* buildsym.c (finish_block): Add other enum LOC_* and default
cases to switch for completeness.
ch-lang.c (type_lower_upper): Removed unused label "retry".
Add other enum TYPE_* and default cases to switch for completeness.
* f-typeprint.c (f_type_print_args): Ifdef out unused function
that may be used someday when Fortran support is complete.
* ch-valprint.c (chill_print_type_scalar): Add other enum
TYPE_* and default cases to switch for completeness.
(chill_val_print): Remove unused local var "high_bound" that
is redeclared in a nested scope prior to use.
(chill_var_print): Use "%ld" to print long arg, not "%d".
* regex.c (re_compile_fastmap, re_match_2): Add remaining enum types
and default to switches for completeness.
* minsyms.c (lookup_minimal_symbol_text): Delete unused variable
"trampoline_symbol".
(prim_record_minimal_symbol_and_info): Return NULL rather than trash.
* elfread.c (elf_symtab_read): Don't dereference NULL returns from
record_minimal_symbol_and_info.
* f-lang.c (saved_function_list_end): Ifdef out unused variable
that may be used someday.
* f-valprint.c (f_val_print): Remove unused local variable "straddr".
1995-07-18 04:38:06 +00:00
|
|
|
db = dcache->free_head;
|
|
|
|
if (db)
|
1993-08-31 22:13:29 +00:00
|
|
|
{
|
1995-06-21 21:47:06 +00:00
|
|
|
dcache->free_head = db->p;
|
|
|
|
}
|
* dache.c (struct dcache_block): Change data member from unsigned char
to char, since everything passed in and out of dcache is char or casted
to appropriate type anyway.
(dcache_alloc): Move assignment of db out of test and combine separate
tests into if-else.
(dcache_peek_byte): Change ptr from unsigned char* to char*.
(dcache_peek_byte): Remove now unnecessary cast in read_memory call.
(dcache_peek): Change cast of incoming data arg.
(dcache_poke): Change cast of addr of incoming data arg.
(dcache_info): Mask data passed to printf_filtered to lsbyte only.
(dcache_info): Change printf_filtered arg from "% 2x" to " %2x".
* target.c (debug_to_thread_alive): Change return type to int and
return zero, for type compatibility with other *_thread_alive funcs.
(cleanup_target): Change cast of ignore function to match type of the
to_thread_alive member.
* defs.h (error_hook): Add ATTR_NORETURN.
* defs.h (NORETURN, ATTR_NORETURN): Switch from volatile to
__attribute__ method with gcc 2.7, to avoid gcc 2.6.3 bug.
* remote.c (remote_wait): Cast first arg to strtol, strchr, and strncmp
to "const char *" from "unsigned char *".
(remote_wait): Cast arg to putpkt and strcpy from "unsigned char *" to
"char *".
(remote_wait): Change printf format for long arg from "%d" to "%ld".
(getpkt): Remove unused variable "bp".
(remote_fetch_word, remote_store_word): Ifdef out apparently unused
functions.
* breakpoint.c (watchpoint_check): Removed unused variables
"saved_level" and "saved_frame".
* valops.c (value_arg_coerce): Add other enum TYPE_CODE_* and
default cases to switch for completeness.
* infrun.c (wait_for_inferior): Enclose "have_waited" label
in #ifdef that matches the one in which it is referenced.
* ser-unix.c (hardwire_noflush_set_tty_state): Enclose otherwise
unused variable "state" in #ifdef that matches one in which it is
referenced.
* eval.c (evaluate_subexp_standard): Remove unused variable "var".
* eval.c (evaluate_subexp_standard): Remove unused variable "tmp_symbol".
* valarith.c (value_subscript): Remove unused variable "lowerbound",
which is redeclared in a nested scope prior to use.
* printcmd.c (print_frame_nameless_args): Use "%ld" to print long
arg, not "%d".
* {mem-break.c, remote-pa.c, remote.c, saber.suppress}:
Remove unused static var "check_break_insn_size".
* buildsym.c (finish_block): Add other enum LOC_* and default
cases to switch for completeness.
ch-lang.c (type_lower_upper): Removed unused label "retry".
Add other enum TYPE_* and default cases to switch for completeness.
* f-typeprint.c (f_type_print_args): Ifdef out unused function
that may be used someday when Fortran support is complete.
* ch-valprint.c (chill_print_type_scalar): Add other enum
TYPE_* and default cases to switch for completeness.
(chill_val_print): Remove unused local var "high_bound" that
is redeclared in a nested scope prior to use.
(chill_var_print): Use "%ld" to print long arg, not "%d".
* regex.c (re_compile_fastmap, re_match_2): Add remaining enum types
and default to switches for completeness.
* minsyms.c (lookup_minimal_symbol_text): Delete unused variable
"trampoline_symbol".
(prim_record_minimal_symbol_and_info): Return NULL rather than trash.
* elfread.c (elf_symtab_read): Don't dereference NULL returns from
record_minimal_symbol_and_info.
* f-lang.c (saved_function_list_end): Ifdef out unused variable
that may be used someday.
* f-valprint.c (f_val_print): Remove unused local variable "straddr".
1995-07-18 04:38:06 +00:00
|
|
|
else
|
1995-06-21 21:47:06 +00:00
|
|
|
{
|
* dache.c (struct dcache_block): Change data member from unsigned char
to char, since everything passed in and out of dcache is char or casted
to appropriate type anyway.
(dcache_alloc): Move assignment of db out of test and combine separate
tests into if-else.
(dcache_peek_byte): Change ptr from unsigned char* to char*.
(dcache_peek_byte): Remove now unnecessary cast in read_memory call.
(dcache_peek): Change cast of incoming data arg.
(dcache_poke): Change cast of addr of incoming data arg.
(dcache_info): Mask data passed to printf_filtered to lsbyte only.
(dcache_info): Change printf_filtered arg from "% 2x" to " %2x".
* target.c (debug_to_thread_alive): Change return type to int and
return zero, for type compatibility with other *_thread_alive funcs.
(cleanup_target): Change cast of ignore function to match type of the
to_thread_alive member.
* defs.h (error_hook): Add ATTR_NORETURN.
* defs.h (NORETURN, ATTR_NORETURN): Switch from volatile to
__attribute__ method with gcc 2.7, to avoid gcc 2.6.3 bug.
* remote.c (remote_wait): Cast first arg to strtol, strchr, and strncmp
to "const char *" from "unsigned char *".
(remote_wait): Cast arg to putpkt and strcpy from "unsigned char *" to
"char *".
(remote_wait): Change printf format for long arg from "%d" to "%ld".
(getpkt): Remove unused variable "bp".
(remote_fetch_word, remote_store_word): Ifdef out apparently unused
functions.
* breakpoint.c (watchpoint_check): Removed unused variables
"saved_level" and "saved_frame".
* valops.c (value_arg_coerce): Add other enum TYPE_CODE_* and
default cases to switch for completeness.
* infrun.c (wait_for_inferior): Enclose "have_waited" label
in #ifdef that matches the one in which it is referenced.
* ser-unix.c (hardwire_noflush_set_tty_state): Enclose otherwise
unused variable "state" in #ifdef that matches one in which it is
referenced.
* eval.c (evaluate_subexp_standard): Remove unused variable "var".
* eval.c (evaluate_subexp_standard): Remove unused variable "tmp_symbol".
* valarith.c (value_subscript): Remove unused variable "lowerbound",
which is redeclared in a nested scope prior to use.
* printcmd.c (print_frame_nameless_args): Use "%ld" to print long
arg, not "%d".
* {mem-break.c, remote-pa.c, remote.c, saber.suppress}:
Remove unused static var "check_break_insn_size".
* buildsym.c (finish_block): Add other enum LOC_* and default
cases to switch for completeness.
ch-lang.c (type_lower_upper): Removed unused label "retry".
Add other enum TYPE_* and default cases to switch for completeness.
* f-typeprint.c (f_type_print_args): Ifdef out unused function
that may be used someday when Fortran support is complete.
* ch-valprint.c (chill_print_type_scalar): Add other enum
TYPE_* and default cases to switch for completeness.
(chill_val_print): Remove unused local var "high_bound" that
is redeclared in a nested scope prior to use.
(chill_var_print): Use "%ld" to print long arg, not "%d".
* regex.c (re_compile_fastmap, re_match_2): Add remaining enum types
and default to switches for completeness.
* minsyms.c (lookup_minimal_symbol_text): Delete unused variable
"trampoline_symbol".
(prim_record_minimal_symbol_and_info): Return NULL rather than trash.
* elfread.c (elf_symtab_read): Don't dereference NULL returns from
record_minimal_symbol_and_info.
* f-lang.c (saved_function_list_end): Ifdef out unused variable
that may be used someday.
* f-valprint.c (f_val_print): Remove unused local variable "straddr".
1995-07-18 04:38:06 +00:00
|
|
|
/* Nothing left on free list, so grab one from the valid list */
|
1995-06-21 21:47:06 +00:00
|
|
|
db = dcache->valid_head;
|
|
|
|
dcache->valid_head = db->p;
|
|
|
|
|
|
|
|
dcache_write_line (dcache, db);
|
1993-08-31 22:13:29 +00:00
|
|
|
}
|
|
|
|
|
1995-06-21 21:47:06 +00:00
|
|
|
/* append this line to end of valid list */
|
|
|
|
if (!dcache->valid_head)
|
|
|
|
dcache->valid_head = db;
|
|
|
|
else
|
|
|
|
dcache->valid_tail->p = db;
|
|
|
|
dcache->valid_tail = db;
|
|
|
|
db->p = 0;
|
|
|
|
|
|
|
|
return db;
|
1993-08-31 22:13:29 +00:00
|
|
|
}
|
|
|
|
|
1995-06-21 21:47:06 +00:00
|
|
|
/* Using the data cache DCACHE return the contents of the byte at
|
|
|
|
address ADDR in the remote machine.
|
|
|
|
|
|
|
|
Returns 0 on error. */
|
|
|
|
|
1996-04-11 21:17:45 +00:00
|
|
|
static int
|
1995-06-21 21:47:06 +00:00
|
|
|
dcache_peek_byte (dcache, addr, ptr)
|
1993-08-31 22:13:29 +00:00
|
|
|
DCACHE *dcache;
|
|
|
|
CORE_ADDR addr;
|
* dache.c (struct dcache_block): Change data member from unsigned char
to char, since everything passed in and out of dcache is char or casted
to appropriate type anyway.
(dcache_alloc): Move assignment of db out of test and combine separate
tests into if-else.
(dcache_peek_byte): Change ptr from unsigned char* to char*.
(dcache_peek_byte): Remove now unnecessary cast in read_memory call.
(dcache_peek): Change cast of incoming data arg.
(dcache_poke): Change cast of addr of incoming data arg.
(dcache_info): Mask data passed to printf_filtered to lsbyte only.
(dcache_info): Change printf_filtered arg from "% 2x" to " %2x".
* target.c (debug_to_thread_alive): Change return type to int and
return zero, for type compatibility with other *_thread_alive funcs.
(cleanup_target): Change cast of ignore function to match type of the
to_thread_alive member.
* defs.h (error_hook): Add ATTR_NORETURN.
* defs.h (NORETURN, ATTR_NORETURN): Switch from volatile to
__attribute__ method with gcc 2.7, to avoid gcc 2.6.3 bug.
* remote.c (remote_wait): Cast first arg to strtol, strchr, and strncmp
to "const char *" from "unsigned char *".
(remote_wait): Cast arg to putpkt and strcpy from "unsigned char *" to
"char *".
(remote_wait): Change printf format for long arg from "%d" to "%ld".
(getpkt): Remove unused variable "bp".
(remote_fetch_word, remote_store_word): Ifdef out apparently unused
functions.
* breakpoint.c (watchpoint_check): Removed unused variables
"saved_level" and "saved_frame".
* valops.c (value_arg_coerce): Add other enum TYPE_CODE_* and
default cases to switch for completeness.
* infrun.c (wait_for_inferior): Enclose "have_waited" label
in #ifdef that matches the one in which it is referenced.
* ser-unix.c (hardwire_noflush_set_tty_state): Enclose otherwise
unused variable "state" in #ifdef that matches one in which it is
referenced.
* eval.c (evaluate_subexp_standard): Remove unused variable "var".
* eval.c (evaluate_subexp_standard): Remove unused variable "tmp_symbol".
* valarith.c (value_subscript): Remove unused variable "lowerbound",
which is redeclared in a nested scope prior to use.
* printcmd.c (print_frame_nameless_args): Use "%ld" to print long
arg, not "%d".
* {mem-break.c, remote-pa.c, remote.c, saber.suppress}:
Remove unused static var "check_break_insn_size".
* buildsym.c (finish_block): Add other enum LOC_* and default
cases to switch for completeness.
ch-lang.c (type_lower_upper): Removed unused label "retry".
Add other enum TYPE_* and default cases to switch for completeness.
* f-typeprint.c (f_type_print_args): Ifdef out unused function
that may be used someday when Fortran support is complete.
* ch-valprint.c (chill_print_type_scalar): Add other enum
TYPE_* and default cases to switch for completeness.
(chill_val_print): Remove unused local var "high_bound" that
is redeclared in a nested scope prior to use.
(chill_var_print): Use "%ld" to print long arg, not "%d".
* regex.c (re_compile_fastmap, re_match_2): Add remaining enum types
and default to switches for completeness.
* minsyms.c (lookup_minimal_symbol_text): Delete unused variable
"trampoline_symbol".
(prim_record_minimal_symbol_and_info): Return NULL rather than trash.
* elfread.c (elf_symtab_read): Don't dereference NULL returns from
record_minimal_symbol_and_info.
* f-lang.c (saved_function_list_end): Ifdef out unused variable
that may be used someday.
* f-valprint.c (f_val_print): Remove unused local variable "straddr".
1995-07-18 04:38:06 +00:00
|
|
|
char *ptr;
|
1993-08-31 22:13:29 +00:00
|
|
|
{
|
1995-06-21 21:47:06 +00:00
|
|
|
register struct dcache_block *db = dcache_hit (dcache, addr);
|
|
|
|
int ok=1;
|
|
|
|
int done = 0;
|
|
|
|
if (db == 0
|
|
|
|
|| db->state[XFORM (addr)] == ENTRY_BAD)
|
1993-08-31 22:13:29 +00:00
|
|
|
{
|
1995-06-21 21:47:06 +00:00
|
|
|
if (db)
|
|
|
|
{
|
|
|
|
dcache_write_line (dcache, db);
|
|
|
|
}
|
|
|
|
else
|
1993-08-31 22:13:29 +00:00
|
|
|
db = dcache_alloc (dcache);
|
|
|
|
immediate_quit++;
|
1995-06-21 21:47:06 +00:00
|
|
|
db->addr = MASK (addr);
|
|
|
|
while (done < LINE_SIZE)
|
|
|
|
{
|
|
|
|
int try =
|
|
|
|
(*dcache->read_memory)
|
|
|
|
(db->addr + done,
|
* dache.c (struct dcache_block): Change data member from unsigned char
to char, since everything passed in and out of dcache is char or casted
to appropriate type anyway.
(dcache_alloc): Move assignment of db out of test and combine separate
tests into if-else.
(dcache_peek_byte): Change ptr from unsigned char* to char*.
(dcache_peek_byte): Remove now unnecessary cast in read_memory call.
(dcache_peek): Change cast of incoming data arg.
(dcache_poke): Change cast of addr of incoming data arg.
(dcache_info): Mask data passed to printf_filtered to lsbyte only.
(dcache_info): Change printf_filtered arg from "% 2x" to " %2x".
* target.c (debug_to_thread_alive): Change return type to int and
return zero, for type compatibility with other *_thread_alive funcs.
(cleanup_target): Change cast of ignore function to match type of the
to_thread_alive member.
* defs.h (error_hook): Add ATTR_NORETURN.
* defs.h (NORETURN, ATTR_NORETURN): Switch from volatile to
__attribute__ method with gcc 2.7, to avoid gcc 2.6.3 bug.
* remote.c (remote_wait): Cast first arg to strtol, strchr, and strncmp
to "const char *" from "unsigned char *".
(remote_wait): Cast arg to putpkt and strcpy from "unsigned char *" to
"char *".
(remote_wait): Change printf format for long arg from "%d" to "%ld".
(getpkt): Remove unused variable "bp".
(remote_fetch_word, remote_store_word): Ifdef out apparently unused
functions.
* breakpoint.c (watchpoint_check): Removed unused variables
"saved_level" and "saved_frame".
* valops.c (value_arg_coerce): Add other enum TYPE_CODE_* and
default cases to switch for completeness.
* infrun.c (wait_for_inferior): Enclose "have_waited" label
in #ifdef that matches the one in which it is referenced.
* ser-unix.c (hardwire_noflush_set_tty_state): Enclose otherwise
unused variable "state" in #ifdef that matches one in which it is
referenced.
* eval.c (evaluate_subexp_standard): Remove unused variable "var".
* eval.c (evaluate_subexp_standard): Remove unused variable "tmp_symbol".
* valarith.c (value_subscript): Remove unused variable "lowerbound",
which is redeclared in a nested scope prior to use.
* printcmd.c (print_frame_nameless_args): Use "%ld" to print long
arg, not "%d".
* {mem-break.c, remote-pa.c, remote.c, saber.suppress}:
Remove unused static var "check_break_insn_size".
* buildsym.c (finish_block): Add other enum LOC_* and default
cases to switch for completeness.
ch-lang.c (type_lower_upper): Removed unused label "retry".
Add other enum TYPE_* and default cases to switch for completeness.
* f-typeprint.c (f_type_print_args): Ifdef out unused function
that may be used someday when Fortran support is complete.
* ch-valprint.c (chill_print_type_scalar): Add other enum
TYPE_* and default cases to switch for completeness.
(chill_val_print): Remove unused local var "high_bound" that
is redeclared in a nested scope prior to use.
(chill_var_print): Use "%ld" to print long arg, not "%d".
* regex.c (re_compile_fastmap, re_match_2): Add remaining enum types
and default to switches for completeness.
* minsyms.c (lookup_minimal_symbol_text): Delete unused variable
"trampoline_symbol".
(prim_record_minimal_symbol_and_info): Return NULL rather than trash.
* elfread.c (elf_symtab_read): Don't dereference NULL returns from
record_minimal_symbol_and_info.
* f-lang.c (saved_function_list_end): Ifdef out unused variable
that may be used someday.
* f-valprint.c (f_val_print): Remove unused local variable "straddr".
1995-07-18 04:38:06 +00:00
|
|
|
db->data + done,
|
1995-06-21 21:47:06 +00:00
|
|
|
LINE_SIZE - done);
|
|
|
|
if (try == 0)
|
|
|
|
return 0;
|
|
|
|
done += try;
|
|
|
|
}
|
1993-08-31 22:13:29 +00:00
|
|
|
immediate_quit--;
|
1995-06-21 21:47:06 +00:00
|
|
|
|
|
|
|
memset (db->state, ENTRY_OK, sizeof (db->data));
|
|
|
|
db->anydirty = 0;
|
1993-08-31 22:13:29 +00:00
|
|
|
}
|
1995-06-21 21:47:06 +00:00
|
|
|
*ptr = db->data[XFORM (addr)];
|
|
|
|
return ok;
|
1993-08-31 22:13:29 +00:00
|
|
|
}
|
|
|
|
|
1995-06-21 21:47:06 +00:00
|
|
|
/* Writeback any dirty lines to the remote. */
|
|
|
|
static int
|
|
|
|
dcache_writeback (dcache)
|
|
|
|
DCACHE *dcache;
|
|
|
|
{
|
|
|
|
struct dcache_block *db;
|
|
|
|
|
|
|
|
db = dcache->valid_head;
|
|
|
|
|
|
|
|
while (db)
|
1993-09-01 00:43:09 +00:00
|
|
|
{
|
1995-06-21 21:47:06 +00:00
|
|
|
if (!dcache_write_line (dcache, db))
|
|
|
|
return 0;
|
|
|
|
db = db->p;
|
1993-09-01 00:43:09 +00:00
|
|
|
}
|
1995-06-21 21:47:06 +00:00
|
|
|
return 1;
|
|
|
|
}
|
1993-09-01 00:43:09 +00:00
|
|
|
|
1995-06-21 21:47:06 +00:00
|
|
|
|
|
|
|
/* Using the data cache DCACHE return the contents of the word at
|
|
|
|
address ADDR in the remote machine. */
|
|
|
|
int
|
|
|
|
dcache_fetch (dcache, addr)
|
|
|
|
DCACHE *dcache;
|
|
|
|
CORE_ADDR addr;
|
|
|
|
{
|
|
|
|
int res;
|
1996-04-11 21:17:45 +00:00
|
|
|
|
|
|
|
if (dcache_xfer_memory (dcache, addr, (char *)&res, sizeof res, 0) != sizeof res)
|
|
|
|
memory_error (EIO, addr);
|
|
|
|
|
1995-06-21 21:47:06 +00:00
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Write the byte at PTR into ADDR in the data cache.
|
|
|
|
Return zero on write error.
|
|
|
|
*/
|
|
|
|
|
1996-04-11 21:17:45 +00:00
|
|
|
static int
|
1995-06-21 21:47:06 +00:00
|
|
|
dcache_poke_byte (dcache, addr, ptr)
|
|
|
|
DCACHE *dcache;
|
|
|
|
CORE_ADDR addr;
|
|
|
|
char *ptr;
|
|
|
|
{
|
|
|
|
register struct dcache_block *db = dcache_hit (dcache, addr);
|
|
|
|
|
|
|
|
if (!db)
|
1993-08-31 22:13:29 +00:00
|
|
|
{
|
|
|
|
db = dcache_alloc (dcache);
|
1995-06-21 21:47:06 +00:00
|
|
|
db->addr = MASK (addr);
|
|
|
|
memset (db->state, ENTRY_BAD, sizeof (db->data));
|
1993-08-31 22:13:29 +00:00
|
|
|
}
|
|
|
|
|
1995-06-21 21:47:06 +00:00
|
|
|
db->data[XFORM (addr)] = *ptr;
|
|
|
|
db->state[XFORM (addr)] = ENTRY_DIRTY;
|
|
|
|
db->anydirty = 1;
|
|
|
|
return 1;
|
|
|
|
}
|
1993-08-31 22:13:29 +00:00
|
|
|
|
1995-06-21 21:47:06 +00:00
|
|
|
/* Write the word at ADDR both in the data cache and in the remote machine.
|
|
|
|
Return zero on write error.
|
|
|
|
*/
|
|
|
|
|
|
|
|
int
|
|
|
|
dcache_poke (dcache, addr, data)
|
|
|
|
DCACHE *dcache;
|
|
|
|
CORE_ADDR addr;
|
|
|
|
int data;
|
|
|
|
{
|
1996-04-11 21:17:45 +00:00
|
|
|
if (dcache_xfer_memory (dcache, addr, (char *)&data, sizeof data, 1) != sizeof data)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
return dcache_writeback (dcache);
|
1993-08-31 22:13:29 +00:00
|
|
|
}
|
|
|
|
|
1995-06-21 21:47:06 +00:00
|
|
|
|
1993-08-31 22:13:29 +00:00
|
|
|
/* Initialize the data cache. */
|
|
|
|
DCACHE *
|
|
|
|
dcache_init (reading, writing)
|
|
|
|
memxferfunc reading;
|
|
|
|
memxferfunc writing;
|
|
|
|
{
|
1995-06-21 21:47:06 +00:00
|
|
|
int csize = sizeof (struct dcache_block) * DCACHE_SIZE;
|
1993-08-31 22:13:29 +00:00
|
|
|
DCACHE *dcache;
|
|
|
|
|
1993-09-03 14:26:29 +00:00
|
|
|
dcache = (DCACHE *) xmalloc (sizeof (*dcache));
|
1993-08-31 22:13:29 +00:00
|
|
|
dcache->read_memory = reading;
|
|
|
|
dcache->write_memory = writing;
|
|
|
|
|
1995-06-21 21:47:06 +00:00
|
|
|
dcache->the_cache = (struct dcache_block *) xmalloc (csize);
|
|
|
|
memset (dcache->the_cache, 0, csize);
|
|
|
|
|
|
|
|
dcache_flush (dcache);
|
|
|
|
|
|
|
|
last_cache = dcache;
|
|
|
|
return dcache;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Read or write LEN bytes from inferior memory at MEMADDR, transferring
|
|
|
|
to or from debugger address MYADDR. Write to inferior if SHOULD_WRITE is
|
|
|
|
nonzero.
|
|
|
|
|
|
|
|
Returns length of data written or read; 0 for error.
|
|
|
|
|
|
|
|
This routine is indended to be called by remote_xfer_ functions. */
|
|
|
|
|
|
|
|
int
|
|
|
|
dcache_xfer_memory (dcache, memaddr, myaddr, len, should_write)
|
|
|
|
DCACHE *dcache;
|
|
|
|
CORE_ADDR memaddr;
|
|
|
|
char *myaddr;
|
|
|
|
int len;
|
|
|
|
int should_write;
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if (remote_dcache)
|
|
|
|
{
|
|
|
|
int (*xfunc) ()
|
|
|
|
= should_write ? dcache_poke_byte : dcache_peek_byte;
|
|
|
|
|
|
|
|
for (i = 0; i < len; i++)
|
|
|
|
{
|
|
|
|
if (!xfunc (dcache, memaddr + i, myaddr + i))
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
dcache->cache_has_stuff = 1;
|
|
|
|
dcache_writeback (dcache);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
int (*xfunc) ()
|
|
|
|
= should_write ? dcache->write_memory : dcache->read_memory;
|
|
|
|
|
|
|
|
if (dcache->cache_has_stuff)
|
|
|
|
dcache_flush (dcache);
|
1993-08-31 22:13:29 +00:00
|
|
|
|
1995-06-21 21:47:06 +00:00
|
|
|
len = xfunc (memaddr, myaddr, len);
|
|
|
|
}
|
|
|
|
return len;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
dcache_info (exp, tty)
|
|
|
|
char *exp;
|
|
|
|
int tty;
|
|
|
|
{
|
|
|
|
struct dcache_block *p;
|
|
|
|
|
|
|
|
if (!remote_dcache)
|
|
|
|
{
|
|
|
|
printf_filtered ("Dcache not enabled\n");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
printf_filtered ("Dcache enabled, line width %d, depth %d\n",
|
|
|
|
LINE_SIZE, DCACHE_SIZE);
|
|
|
|
|
|
|
|
printf_filtered ("Cache state:\n");
|
|
|
|
|
|
|
|
for (p = last_cache->valid_head; p; p = p->p)
|
|
|
|
{
|
|
|
|
int j;
|
|
|
|
printf_filtered ("Line at %08xd, referenced %d times\n",
|
|
|
|
p->addr, p->refs);
|
|
|
|
|
|
|
|
for (j = 0; j < LINE_SIZE; j++)
|
* dache.c (struct dcache_block): Change data member from unsigned char
to char, since everything passed in and out of dcache is char or casted
to appropriate type anyway.
(dcache_alloc): Move assignment of db out of test and combine separate
tests into if-else.
(dcache_peek_byte): Change ptr from unsigned char* to char*.
(dcache_peek_byte): Remove now unnecessary cast in read_memory call.
(dcache_peek): Change cast of incoming data arg.
(dcache_poke): Change cast of addr of incoming data arg.
(dcache_info): Mask data passed to printf_filtered to lsbyte only.
(dcache_info): Change printf_filtered arg from "% 2x" to " %2x".
* target.c (debug_to_thread_alive): Change return type to int and
return zero, for type compatibility with other *_thread_alive funcs.
(cleanup_target): Change cast of ignore function to match type of the
to_thread_alive member.
* defs.h (error_hook): Add ATTR_NORETURN.
* defs.h (NORETURN, ATTR_NORETURN): Switch from volatile to
__attribute__ method with gcc 2.7, to avoid gcc 2.6.3 bug.
* remote.c (remote_wait): Cast first arg to strtol, strchr, and strncmp
to "const char *" from "unsigned char *".
(remote_wait): Cast arg to putpkt and strcpy from "unsigned char *" to
"char *".
(remote_wait): Change printf format for long arg from "%d" to "%ld".
(getpkt): Remove unused variable "bp".
(remote_fetch_word, remote_store_word): Ifdef out apparently unused
functions.
* breakpoint.c (watchpoint_check): Removed unused variables
"saved_level" and "saved_frame".
* valops.c (value_arg_coerce): Add other enum TYPE_CODE_* and
default cases to switch for completeness.
* infrun.c (wait_for_inferior): Enclose "have_waited" label
in #ifdef that matches the one in which it is referenced.
* ser-unix.c (hardwire_noflush_set_tty_state): Enclose otherwise
unused variable "state" in #ifdef that matches one in which it is
referenced.
* eval.c (evaluate_subexp_standard): Remove unused variable "var".
* eval.c (evaluate_subexp_standard): Remove unused variable "tmp_symbol".
* valarith.c (value_subscript): Remove unused variable "lowerbound",
which is redeclared in a nested scope prior to use.
* printcmd.c (print_frame_nameless_args): Use "%ld" to print long
arg, not "%d".
* {mem-break.c, remote-pa.c, remote.c, saber.suppress}:
Remove unused static var "check_break_insn_size".
* buildsym.c (finish_block): Add other enum LOC_* and default
cases to switch for completeness.
ch-lang.c (type_lower_upper): Removed unused label "retry".
Add other enum TYPE_* and default cases to switch for completeness.
* f-typeprint.c (f_type_print_args): Ifdef out unused function
that may be used someday when Fortran support is complete.
* ch-valprint.c (chill_print_type_scalar): Add other enum
TYPE_* and default cases to switch for completeness.
(chill_val_print): Remove unused local var "high_bound" that
is redeclared in a nested scope prior to use.
(chill_var_print): Use "%ld" to print long arg, not "%d".
* regex.c (re_compile_fastmap, re_match_2): Add remaining enum types
and default to switches for completeness.
* minsyms.c (lookup_minimal_symbol_text): Delete unused variable
"trampoline_symbol".
(prim_record_minimal_symbol_and_info): Return NULL rather than trash.
* elfread.c (elf_symtab_read): Don't dereference NULL returns from
record_minimal_symbol_and_info.
* f-lang.c (saved_function_list_end): Ifdef out unused variable
that may be used someday.
* f-valprint.c (f_val_print): Remove unused local variable "straddr".
1995-07-18 04:38:06 +00:00
|
|
|
printf_filtered ("%02x", p->data[j] & 0xFF);
|
1995-06-21 21:47:06 +00:00
|
|
|
printf_filtered ("\n");
|
|
|
|
|
|
|
|
for (j = 0; j < LINE_SIZE; j++)
|
* dache.c (struct dcache_block): Change data member from unsigned char
to char, since everything passed in and out of dcache is char or casted
to appropriate type anyway.
(dcache_alloc): Move assignment of db out of test and combine separate
tests into if-else.
(dcache_peek_byte): Change ptr from unsigned char* to char*.
(dcache_peek_byte): Remove now unnecessary cast in read_memory call.
(dcache_peek): Change cast of incoming data arg.
(dcache_poke): Change cast of addr of incoming data arg.
(dcache_info): Mask data passed to printf_filtered to lsbyte only.
(dcache_info): Change printf_filtered arg from "% 2x" to " %2x".
* target.c (debug_to_thread_alive): Change return type to int and
return zero, for type compatibility with other *_thread_alive funcs.
(cleanup_target): Change cast of ignore function to match type of the
to_thread_alive member.
* defs.h (error_hook): Add ATTR_NORETURN.
* defs.h (NORETURN, ATTR_NORETURN): Switch from volatile to
__attribute__ method with gcc 2.7, to avoid gcc 2.6.3 bug.
* remote.c (remote_wait): Cast first arg to strtol, strchr, and strncmp
to "const char *" from "unsigned char *".
(remote_wait): Cast arg to putpkt and strcpy from "unsigned char *" to
"char *".
(remote_wait): Change printf format for long arg from "%d" to "%ld".
(getpkt): Remove unused variable "bp".
(remote_fetch_word, remote_store_word): Ifdef out apparently unused
functions.
* breakpoint.c (watchpoint_check): Removed unused variables
"saved_level" and "saved_frame".
* valops.c (value_arg_coerce): Add other enum TYPE_CODE_* and
default cases to switch for completeness.
* infrun.c (wait_for_inferior): Enclose "have_waited" label
in #ifdef that matches the one in which it is referenced.
* ser-unix.c (hardwire_noflush_set_tty_state): Enclose otherwise
unused variable "state" in #ifdef that matches one in which it is
referenced.
* eval.c (evaluate_subexp_standard): Remove unused variable "var".
* eval.c (evaluate_subexp_standard): Remove unused variable "tmp_symbol".
* valarith.c (value_subscript): Remove unused variable "lowerbound",
which is redeclared in a nested scope prior to use.
* printcmd.c (print_frame_nameless_args): Use "%ld" to print long
arg, not "%d".
* {mem-break.c, remote-pa.c, remote.c, saber.suppress}:
Remove unused static var "check_break_insn_size".
* buildsym.c (finish_block): Add other enum LOC_* and default
cases to switch for completeness.
ch-lang.c (type_lower_upper): Removed unused label "retry".
Add other enum TYPE_* and default cases to switch for completeness.
* f-typeprint.c (f_type_print_args): Ifdef out unused function
that may be used someday when Fortran support is complete.
* ch-valprint.c (chill_print_type_scalar): Add other enum
TYPE_* and default cases to switch for completeness.
(chill_val_print): Remove unused local var "high_bound" that
is redeclared in a nested scope prior to use.
(chill_var_print): Use "%ld" to print long arg, not "%d".
* regex.c (re_compile_fastmap, re_match_2): Add remaining enum types
and default to switches for completeness.
* minsyms.c (lookup_minimal_symbol_text): Delete unused variable
"trampoline_symbol".
(prim_record_minimal_symbol_and_info): Return NULL rather than trash.
* elfread.c (elf_symtab_read): Don't dereference NULL returns from
record_minimal_symbol_and_info.
* f-lang.c (saved_function_list_end): Ifdef out unused variable
that may be used someday.
* f-valprint.c (f_val_print): Remove unused local variable "straddr".
1995-07-18 04:38:06 +00:00
|
|
|
printf_filtered (" %2x", p->state[j]);
|
1995-06-21 21:47:06 +00:00
|
|
|
printf_filtered ("\n");
|
|
|
|
}
|
1993-08-31 22:13:29 +00:00
|
|
|
}
|
|
|
|
|
1993-09-01 00:43:09 +00:00
|
|
|
void
|
1995-06-21 21:47:06 +00:00
|
|
|
_initialize_dcache ()
|
1993-09-01 00:43:09 +00:00
|
|
|
{
|
|
|
|
add_show_from_set
|
|
|
|
(add_set_cmd ("remotecache", class_support, var_boolean,
|
|
|
|
(char *) &remote_dcache,
|
|
|
|
"\
|
|
|
|
Set cache use for remote targets.\n\
|
|
|
|
When on, use data caching for remote targets. For many remote targets\n\
|
|
|
|
this option can offer better throughput for reading target memory.\n\
|
|
|
|
Unfortunately, gdb does not currently know anything about volatile\n\
|
|
|
|
registers and thus data caching will produce incorrect results with\n\
|
1995-06-21 21:47:06 +00:00
|
|
|
volatile registers are in use. By default, this option is on.",
|
1993-09-01 00:43:09 +00:00
|
|
|
&setlist),
|
|
|
|
&showlist);
|
1995-06-21 21:47:06 +00:00
|
|
|
|
|
|
|
add_info ("dcache", dcache_info,
|
|
|
|
"Print information on the dcache performance.");
|
|
|
|
|
1993-09-01 00:43:09 +00:00
|
|
|
}
|