OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

gdbstub: Simplify gdb_get_cpu_pid() to use cpu->cluster_index

Browse Source 
Now we're keeping the cluster index in the CPUState, we don't
need to jump through hoops in gdb_get_cpu_pid() to find the
associated cluster object.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Luc Michel <luc.michel@greensocs.com>
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Message-id: 20190121152218.9592-5-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2019-01-29 11:46:06 +00:00
parent f7b78602fd
commit 46f5abc0a2
1 changed files with 5 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
gdbstub.c
View File

@ -644,50 +644,12 @@ static int memtox(char *buf, const char *mem, int len)
static uint32_t gdb_get_cpu_pid(const GDBState *s, CPUState *cpu) static uint32_t gdb_get_cpu_pid(const GDBState *s, CPUState *cpu)
{ {
#ifndef CONFIG_USER_ONLY
gchar *path, *name = NULL;
Object *obj;
CPUClusterState *cluster;
uint32_t ret;
path = object_get_canonical_path(OBJECT(cpu));
if (path == NULL) {
/* Return the default process' PID */
ret = s->processes[s->process_num - 1].pid;
goto out;
}
name = object_get_canonical_path_component(OBJECT(cpu));
assert(name != NULL);
/*
* Retrieve the CPU parent path by removing the last '/' and the CPU name
* from the CPU canonical path.
*/
path[strlen(path) - strlen(name) - 1] = '\0';
obj = object_resolve_path_type(path, TYPE_CPU_CLUSTER, NULL);
if (obj == NULL) {
/* Return the default process' PID */
ret = s->processes[s->process_num - 1].pid;
goto out;
}
cluster = CPU_CLUSTER(obj);
ret = cluster->cluster_id + 1;
out:
g_free(name);
g_free(path);
return ret;
#else
/* TODO: In user mode, we should use the task state PID */ /* TODO: In user mode, we should use the task state PID */
return s->processes[s->process_num - 1].pid; if (cpu->cluster_index == UNASSIGNED_CLUSTER_INDEX) {
#endif /* Return the default process' PID */
return s->processes[s->process_num - 1].pid;
}
return cpu->cluster_index + 1;
} }
static GDBProcess *gdb_get_process(const GDBState *s, uint32_t pid) static GDBProcess *gdb_get_process(const GDBState *s, uint32_t pid)