[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [FYI qom-cpu v2 1/5] target-alpha: Let cpu_alpha_init() ret
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [FYI qom-cpu v2 1/5] target-alpha: Let cpu_alpha_init() return AlphaCPU |
Date: |
Sun, 9 Dec 2012 02:40:12 +0100 |
Replace cpu_init() macro with inline function for backwards
compatibility.
Signed-off-by: Andreas Färber <address@hidden>
Acked-by: Richard Henderson <address@hidden>
---
target-alpha/cpu.h | 13 +++++++++++--
target-alpha/translate.c | 4 ++--
2 Dateien geändert, 13 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-)
diff --git a/target-alpha/cpu.h b/target-alpha/cpu.h
index 34221fb..853ea8e 100644
--- a/target-alpha/cpu.h
+++ b/target-alpha/cpu.h
@@ -297,7 +297,6 @@ struct CPUAlphaState {
int implver;
};
-#define cpu_init cpu_alpha_init
#define cpu_exec cpu_alpha_exec
#define cpu_gen_code cpu_alpha_gen_code
#define cpu_signal_handler cpu_alpha_signal_handler
@@ -434,7 +433,17 @@ enum {
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);
/* you can call this signal handler from your SIGBUS and SIGSEGV
signal handlers to inform the virtual CPU of exceptions. non zero
diff --git a/target-alpha/translate.c b/target-alpha/translate.c
index 4045f78..638a4a2 100644
--- a/target-alpha/translate.c
+++ b/target-alpha/translate.c
@@ -3517,7 +3517,7 @@ static const struct cpu_def_t cpu_defs[] = {
| AMASK_MVI | AMASK_TRAP | AMASK_PREFETCH), }
};
-CPUAlphaState * cpu_alpha_init (const char *cpu_model)
+AlphaCPU *cpu_alpha_init(const char *cpu_model)
{
AlphaCPU *cpu;
CPUAlphaState *env;
@@ -3546,7 +3546,7 @@ CPUAlphaState * cpu_alpha_init (const char *cpu_model)
env->cpu_model_str = cpu_model;
qemu_init_vcpu(env);
- return env;
+ return cpu;
}
void restore_state_to_opc(CPUAlphaState *env, TranslationBlock *tb, int pc_pos)
--
1.7.10.4
- [Qemu-devel] [PATCH qom-cpu v2 0/5] target-alpha: CPU subclasses, Andreas Färber, 2012/12/08
- [Qemu-devel] [FYI qom-cpu v2 1/5] target-alpha: Let cpu_alpha_init() return AlphaCPU,
Andreas Färber <=
- [Qemu-devel] [FYI qom-cpu v2 3/5] target-alpha: Avoid leaking the alarm timer over reset, Andreas Färber, 2012/12/08
- [Qemu-devel] [FYI qom-cpu v2 2/5] alpha: Pass AlphaCPU array to Typhoon, Andreas Färber, 2012/12/08
- [Qemu-devel] [PATCH qom-cpu v2 5/5] target-alpha: Add support for -cpu ?, Andreas Färber, 2012/12/08
- [Qemu-devel] [PATCH qom-cpu v2 4/5] target-alpha: Turn CPU definitions into subclasses, Andreas Färber, 2012/12/08
- Re: [Qemu-devel] [PATCH qom-cpu v2 0/5] target-alpha: CPU subclasses, Richard Henderson, 2012/12/10