Commit 68f4730c authored by Wen Congyang's avatar Wen Congyang Committed by Luiz Capitulino
Browse files

make gdb_id() generally avialable and rename it to cpu_index() 



The following patch also needs this API, so make it generally avialable.
The function gdb_id() will not be used in gdbstub.c now, so its name is
not suitable, and rename it to cpu_index()

Signed-off-by: default avatarWen Congyang <wency@cn.fujitsu.com>
Signed-off-by: default avatarLuiz Capitulino <lcapitulino@redhat.com>
parent 0038ffb0

gdbstub.c

+5 −14
Original line number Diff line number Diff line
@@ -1937,21 +1937,12 @@ static void gdb_set_cpu_pc(GDBState *s, target_ulong pc) 
#endif

}



static inline int gdb_id(CPUArchState *env)

{

#if defined(CONFIG_USER_ONLY) && defined(CONFIG_USE_NPTL)

    return env->host_tid;

#else

    return env->cpu_index + 1;

#endif

}



static CPUArchState *find_cpu(uint32_t thread_id)

{

    CPUArchState *env;



    for (env = first_cpu; env != NULL; env = env->next_cpu) {

        if (gdb_id(env) == thread_id) {

        if (cpu_index(env) == thread_id) {

            return env;

        }

    }
@@ -1979,7 +1970,7 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf) 
    case '?':

        /* TODO: Make this return the correct value for user-mode.  */

        snprintf(buf, sizeof(buf), "T%02xthread:%02x;", GDB_SIGNAL_TRAP,

                 gdb_id(s->c_cpu));

                 cpu_index(s->c_cpu));

        put_packet(s, buf);

        /* Remove all the breakpoints when this query is issued,

         * because gdb is doing and initial connect and the state
@@ -2274,7 +2265,7 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf) 
        } else if (strcmp(p,"sThreadInfo") == 0) {

        report_cpuinfo:

            if (s->query_cpu) {

                snprintf(buf, sizeof(buf), "m%x", gdb_id(s->query_cpu));

                snprintf(buf, sizeof(buf), "m%x", cpu_index(s->query_cpu));

                put_packet(s, buf);

                s->query_cpu = s->query_cpu->next_cpu;

            } else
@@ -2422,7 +2413,7 @@ static void gdb_vm_state_change(void *opaque, int running, RunState state) 
            }

            snprintf(buf, sizeof(buf),

                     "T%02xthread:%02x;%swatch:" TARGET_FMT_lx ";",

                     GDB_SIGNAL_TRAP, gdb_id(env), type,

                     GDB_SIGNAL_TRAP, cpu_index(env), type,

                     env->watchpoint_hit->vaddr);

            env->watchpoint_hit = NULL;

            goto send_packet;
@@ -2455,7 +2446,7 @@ static void gdb_vm_state_change(void *opaque, int running, RunState state) 
        ret = GDB_SIGNAL_UNKNOWN;

        break;

    }

    snprintf(buf, sizeof(buf), "T%02xthread:%02x;", ret, gdb_id(env));

    snprintf(buf, sizeof(buf), "T%02xthread:%02x;", ret, cpu_index(env));



send_packet:

    put_packet(s, buf);

gdbstub.h

+9 −0
Original line number Diff line number Diff line
@@ -30,6 +30,15 @@ void gdb_register_coprocessor(CPUArchState *env, 
                              gdb_reg_cb get_reg, gdb_reg_cb set_reg,

                              int num_regs, const char *xml, int g_pos);



static inline int cpu_index(CPUArchState *env)

{

#if defined(CONFIG_USER_ONLY) && defined(CONFIG_USE_NPTL)

    return env->host_tid;

#else

    return env->cpu_index + 1;

#endif

}



#endif



#ifdef CONFIG_USER_ONLY