Skip to content

Commit

Permalink
gdbstub: Expose gdb_get_process() and gdb_get_first_cpu_in_process()
Browse files Browse the repository at this point in the history
These functions will be needed by user-target.c in order to retrieve
the name of the executable.

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
Message-Id: <20230621203627.1808446-5-iii@linux.ibm.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20230630180423.558337-35-alex.bennee@linaro.org>
  • Loading branch information
iii-i authored and stsquad committed Jul 3, 2023
1 parent 77ae576 commit a3fcc11
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 8 deletions.
16 changes: 8 additions & 8 deletions gdbstub/gdbstub.c
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ static uint32_t gdb_get_cpu_pid(CPUState *cpu)
return cpu->cluster_index + 1;
}

static GDBProcess *gdb_get_process(uint32_t pid)
GDBProcess *gdb_get_process(uint32_t pid)
{
int i;

Expand Down Expand Up @@ -247,7 +247,7 @@ static CPUState *find_cpu(uint32_t thread_id)
return NULL;
}

static CPUState *get_first_cpu_in_process(GDBProcess *process)
CPUState *gdb_get_first_cpu_in_process(GDBProcess *process)
{
CPUState *cpu;

Expand Down Expand Up @@ -325,7 +325,7 @@ static CPUState *gdb_get_cpu(uint32_t pid, uint32_t tid)
return NULL;
}

return get_first_cpu_in_process(process);
return gdb_get_first_cpu_in_process(process);
} else {
/* a specific thread */
cpu = find_cpu(tid);
Expand Down Expand Up @@ -354,7 +354,7 @@ static const char *get_feature_xml(const char *p, const char **newp,
size_t len;
int i;
const char *name;
CPUState *cpu = get_first_cpu_in_process(process);
CPUState *cpu = gdb_get_first_cpu_in_process(process);
CPUClass *cc = CPU_GET_CLASS(cpu);

len = 0;
Expand Down Expand Up @@ -490,7 +490,7 @@ void gdb_register_coprocessor(CPUState *cpu,

static void gdb_process_breakpoint_remove_all(GDBProcess *p)
{
CPUState *cpu = get_first_cpu_in_process(p);
CPUState *cpu = gdb_get_first_cpu_in_process(p);

while (cpu) {
gdb_breakpoint_remove_all(cpu);
Expand Down Expand Up @@ -647,7 +647,7 @@ static int gdb_handle_vcont(const char *p)
return -EINVAL;
}

cpu = get_first_cpu_in_process(process);
cpu = gdb_get_first_cpu_in_process(process);
while (cpu) {
if (newstates[cpu->cpu_index] == 1) {
newstates[cpu->cpu_index] = cur_action;
Expand Down Expand Up @@ -1270,7 +1270,7 @@ static void handle_v_attach(GArray *params, void *user_ctx)
goto cleanup;
}

cpu = get_first_cpu_in_process(process);
cpu = gdb_get_first_cpu_in_process(process);
if (!cpu) {
goto cleanup;
}
Expand Down Expand Up @@ -1393,7 +1393,7 @@ static void handle_query_curr_tid(GArray *params, void *user_ctx)
* first thread).
*/
process = gdb_get_cpu_process(gdbserver_state.g_cpu);
cpu = get_first_cpu_in_process(process);
cpu = gdb_get_first_cpu_in_process(process);
g_string_assign(gdbserver_state.str_buf, "QC");
gdb_append_thread_id(cpu, gdbserver_state.str_buf);
gdb_put_strbuf();
Expand Down
2 changes: 2 additions & 0 deletions gdbstub/internals.h
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,8 @@ void gdb_read_byte(uint8_t ch);
*/
bool gdb_got_immediate_ack(void);
/* utility helpers */
GDBProcess *gdb_get_process(uint32_t pid);
CPUState *gdb_get_first_cpu_in_process(GDBProcess *process);
CPUState *gdb_first_attached_cpu(void);
void gdb_append_thread_id(CPUState *cpu, GString *buf);
int gdb_get_cpu_index(CPUState *cpu);
Expand Down

0 comments on commit a3fcc11

Please sign in to comment.