Make dcache multi-target-safe
By inspection, I noticed that this code in dcache.c is not multi-target-aware: /* If this is a different inferior from what we've recorded, flush the cache. */ if (inferior_ptid != dcache->ptid) This doesn't take into account that threads of different targets may have the same ptid. Fixed by also storing/comparing the process_stratum_target. Tested on x86-64-linux-gnu, native and gdbserver. Change-Id: I4d9d74052c696b72d28cb1c77b697b911725c8d3
This commit is contained in:
parent
a13af434cf
commit
604386598d
1 changed files with 11 additions and 3 deletions
14
gdb/dcache.c
14
gdb/dcache.c
|
@ -116,6 +116,10 @@ struct dcache_struct
|
|||
|
||||
/* The ptid of last inferior to use cache or null_ptid. */
|
||||
ptid_t ptid;
|
||||
|
||||
/* The process target of last inferior to use the cache or
|
||||
nullptr. */
|
||||
process_stratum_target *proc_target;
|
||||
};
|
||||
|
||||
typedef void (block_func) (struct dcache_block *block, void *param);
|
||||
|
@ -249,6 +253,7 @@ dcache_invalidate (DCACHE *dcache)
|
|||
dcache->oldest = NULL;
|
||||
dcache->size = 0;
|
||||
dcache->ptid = null_ptid;
|
||||
dcache->proc_target = nullptr;
|
||||
|
||||
if (dcache->line_size != dcache_line_size)
|
||||
{
|
||||
|
@ -453,6 +458,7 @@ dcache_init (void)
|
|||
dcache->size = 0;
|
||||
dcache->line_size = dcache_line_size;
|
||||
dcache->ptid = null_ptid;
|
||||
dcache->proc_target = nullptr;
|
||||
|
||||
return dcache;
|
||||
}
|
||||
|
@ -470,13 +476,15 @@ dcache_read_memory_partial (struct target_ops *ops, DCACHE *dcache,
|
|||
{
|
||||
ULONGEST i;
|
||||
|
||||
/* If this is a different inferior from what we've recorded,
|
||||
flush the cache. */
|
||||
/* If this is a different thread from what we've recorded, flush the
|
||||
cache. */
|
||||
|
||||
if (inferior_ptid != dcache->ptid)
|
||||
process_stratum_target *proc_target = current_inferior ()->process_target ();
|
||||
if (proc_target != dcache->proc_target || inferior_ptid != dcache->ptid)
|
||||
{
|
||||
dcache_invalidate (dcache);
|
||||
dcache->ptid = inferior_ptid;
|
||||
dcache->proc_target = proc_target;
|
||||
}
|
||||
|
||||
for (i = 0; i < len; i++)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue