mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

target-alpha: Let cpu_alpha_init() return AlphaCPU

Browse Source 
Replace cpu_init() macro with inline function for backwards
compatibility.

Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Richard Henderson <rth@twiddle.net>
This commit is contained in:
Andreas Färber 2012-10-15 17:52:00 +02:00
parent 914606d26e
commit 5f5e335088
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
target-alpha/cpu.h
View File

@ -290,7 +290,6 @@ struct CPUAlphaState {
int implver; int implver;
}; };
#define cpu_init cpu_alpha_init
#define cpu_exec cpu_alpha_exec #define cpu_exec cpu_alpha_exec
#define cpu_gen_code cpu_alpha_gen_code #define cpu_gen_code cpu_alpha_gen_code
#define cpu_signal_handler cpu_alpha_signal_handler #define cpu_signal_handler cpu_alpha_signal_handler
@ -427,7 +426,17 @@ enum {
IR_ZERO = 31, IR_ZERO = 31,
}; };
CPUAlphaState * cpu_alpha_init (const char *cpu_model); AlphaCPU *cpu_alpha_init(const char *cpu_model);
static inline CPUAlphaState *cpu_init(const char *cpu_model)
{
AlphaCPU *cpu = cpu_alpha_init(cpu_model);
if (cpu == NULL) {
return NULL;
}
return &cpu->env;
}
int cpu_alpha_exec(CPUAlphaState *s); int cpu_alpha_exec(CPUAlphaState *s);
/* you can call this signal handler from your SIGBUS and SIGSEGV /* you can call this signal handler from your SIGBUS and SIGSEGV
signal handlers to inform the virtual CPU of exceptions. non zero signal handlers to inform the virtual CPU of exceptions. non zero

4
target-alpha/translate.c
View File

@ -3517,7 +3517,7 @@ static const struct cpu_def_t cpu_defs[] = {
| AMASK_MVI | AMASK_TRAP | AMASK_PREFETCH), } | AMASK_MVI | AMASK_TRAP | AMASK_PREFETCH), }
}; };
CPUAlphaState * cpu_alpha_init (const char *cpu_model) AlphaCPU *cpu_alpha_init(const char *cpu_model)
{ {
AlphaCPU *cpu; AlphaCPU *cpu;
CPUAlphaState *env; CPUAlphaState *env;
@ -3546,7 +3546,7 @@ CPUAlphaState * cpu_alpha_init (const char *cpu_model)
env->cpu_model_str = cpu_model; env->cpu_model_str = cpu_model;
qemu_init_vcpu(env); qemu_init_vcpu(env);
return env; return cpu;
} }
void restore_state_to_opc(CPUAlphaState *env, TranslationBlock *tb, int pc_pos) void restore_state_to_opc(CPUAlphaState *env, TranslationBlock *tb, int pc_pos)