xemu-project/xemu
1
0
Fork 0
mirror of https://github.com/xemu-project/xemu.git synced 2024-11-27 13:30:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cpu: Move gdb_regs field from CPU_COMMON to CPUState

Browse Source 
Prepares for changing gdb_register_coprocessor() argument to CPUState.

Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Andreas Färber 2013-06-28 21:11:37 +02:00
parent 2e0f2cfba6
commit eac8b355f0
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gdbstub.c
View File

@ -1840,7 +1840,7 @@ static const char *get_feature_xml(const char *p, const char **newp)
/* Generate the XML description for this CPU. */ /* Generate the XML description for this CPU. */
if (!target_xml[0]) { if (!target_xml[0]) {
GDBRegisterState *r; GDBRegisterState *r;
CPUArchState *env = first_cpu->env_ptr; CPUState *cpu = first_cpu;
snprintf(target_xml, sizeof(target_xml), snprintf(target_xml, sizeof(target_xml),
"<?xml version=\"1.0\"?>" "<?xml version=\"1.0\"?>"
@ -1849,7 +1849,7 @@ static const char *get_feature_xml(const char *p, const char **newp)
"<xi:include href=\"%s\"/>", "<xi:include href=\"%s\"/>",
GDB_CORE_XML); GDB_CORE_XML);
for (r = env->gdb_regs; r; r = r->next) { for (r = cpu->gdb_regs; r; r = r->next) {
pstrcat(target_xml, sizeof(target_xml), "<xi:include href=\""); pstrcat(target_xml, sizeof(target_xml), "<xi:include href=\"");
pstrcat(target_xml, sizeof(target_xml), r->xml); pstrcat(target_xml, sizeof(target_xml), r->xml);
pstrcat(target_xml, sizeof(target_xml), "\"/>"); pstrcat(target_xml, sizeof(target_xml), "\"/>");
@ -1875,7 +1875,7 @@ static int gdb_read_register(CPUState *cpu, uint8_t *mem_buf, int reg)
if (reg < NUM_CORE_REGS) if (reg < NUM_CORE_REGS)
return cpu_gdb_read_register(env, mem_buf, reg); return cpu_gdb_read_register(env, mem_buf, reg);
for (r = env->gdb_regs; r; r = r->next) { for (r = cpu->gdb_regs; r; r = r->next) {
if (r->base_reg <= reg && reg < r->base_reg + r->num_regs) { if (r->base_reg <= reg && reg < r->base_reg + r->num_regs) {
return r->get_reg(env, mem_buf, reg - r->base_reg); return r->get_reg(env, mem_buf, reg - r->base_reg);
} }
@ -1891,7 +1891,7 @@ static int gdb_write_register(CPUState *cpu, uint8_t *mem_buf, int reg)
if (reg < NUM_CORE_REGS) if (reg < NUM_CORE_REGS)
return cpu_gdb_write_register(env, mem_buf, reg); return cpu_gdb_write_register(env, mem_buf, reg);
for (r = env->gdb_regs; r; r = r->next) { for (r = cpu->gdb_regs; r; r = r->next) {
if (r->base_reg <= reg && reg < r->base_reg + r->num_regs) { if (r->base_reg <= reg && reg < r->base_reg + r->num_regs) {
return r->set_reg(env, mem_buf, reg - r->base_reg); return r->set_reg(env, mem_buf, reg - r->base_reg);
} }
@ -1910,11 +1910,12 @@ void gdb_register_coprocessor(CPUArchState * env,
gdb_reg_cb get_reg, gdb_reg_cb set_reg, gdb_reg_cb get_reg, gdb_reg_cb set_reg,
int num_regs, const char *xml, int g_pos) int num_regs, const char *xml, int g_pos)
{ {
CPUState *cpu = ENV_GET_CPU(env);
GDBRegisterState *s; GDBRegisterState *s;
GDBRegisterState **p; GDBRegisterState **p;
static int last_reg = NUM_CORE_REGS; static int last_reg = NUM_CORE_REGS;
p = &env->gdb_regs; p = &cpu->gdb_regs;
while (*p) { while (*p) {
/* Check for duplicates. */ /* Check for duplicates. */
if (strcmp((*p)->xml, xml) == 0) if (strcmp((*p)->xml, xml) == 0)

2
include/exec/cpu-defs.h
View File

@ -174,8 +174,6 @@ typedef struct CPUWatchpoint {
QTAILQ_HEAD(watchpoints_head, CPUWatchpoint) watchpoints; \ QTAILQ_HEAD(watchpoints_head, CPUWatchpoint) watchpoints; \
CPUWatchpoint *watchpoint_hit; \ CPUWatchpoint *watchpoint_hit; \
\ \
struct GDBRegisterState *gdb_regs; \
\
/* Core interrupt code */ \ /* Core interrupt code */ \
sigjmp_buf jmp_env; \ sigjmp_buf jmp_env; \
int exception_index; \ int exception_index; \

2
include/qom/cpu.h
View File

@ -141,6 +141,7 @@ struct kvm_run;
* @singlestep_enabled: Flags for single-stepping. * @singlestep_enabled: Flags for single-stepping.
* @env_ptr: Pointer to subclass-specific CPUArchState field. * @env_ptr: Pointer to subclass-specific CPUArchState field.
* @current_tb: Currently executing TB. * @current_tb: Currently executing TB.
* @gdb_regs: Additional GDB registers.
* @next_cpu: Next CPU sharing TB cache. * @next_cpu: Next CPU sharing TB cache.
* @kvm_fd: vCPU file descriptor for KVM. * @kvm_fd: vCPU file descriptor for KVM.
* *
@ -175,6 +176,7 @@ struct CPUState {
void *env_ptr; /* CPUArchState */ void *env_ptr; /* CPUArchState */
struct TranslationBlock *current_tb; struct TranslationBlock *current_tb;
struct GDBRegisterState *gdb_regs;
CPUState *next_cpu; CPUState *next_cpu;
int kvm_fd; int kvm_fd;