OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

target-unicore32: Make uc32_cpu_init() return UniCore32CPU

Browse Source 
This way, the cpu_init() function in target-unicore32 will follow the
same pattern used on all other architectures.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Eduardo Habkost 2015-02-26 17:37:46 -03:00 committed by Andreas Färber
parent 6e8e265199
commit 41979669ab
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
target-unicore32/cpu.h
View File

@ -122,11 +122,9 @@ void cpu_asr_write(CPUUniCore32State *env1, target_ulong val, target_ulong mask)
#define UC32_HWCAP_CMOV 4 /* 1 << 2 */ #define UC32_HWCAP_CMOV 4 /* 1 << 2 */
#define UC32_HWCAP_UCF64 8 /* 1 << 3 */ #define UC32_HWCAP_UCF64 8 /* 1 << 3 */
#define cpu_init uc32_cpu_init
#define cpu_exec uc32_cpu_exec #define cpu_exec uc32_cpu_exec
#define cpu_signal_handler uc32_cpu_signal_handler #define cpu_signal_handler uc32_cpu_signal_handler
CPUUniCore32State *uc32_cpu_init(const char *cpu_model);
int uc32_cpu_exec(CPUUniCore32State *s); int uc32_cpu_exec(CPUUniCore32State *s);
int uc32_cpu_signal_handler(int host_signum, void *pinfo, void *puc); int uc32_cpu_signal_handler(int host_signum, void *pinfo, void *puc);
@ -143,6 +141,18 @@ static inline int cpu_mmu_index(CPUUniCore32State *env)
#include "cpu-qom.h" #include "cpu-qom.h"
#include "exec/exec-all.h" #include "exec/exec-all.h"
UniCore32CPU *uc32_cpu_init(const char *cpu_model);
static inline CPUUniCore32State *cpu_init(const char *cpu_model)
{
UniCore32CPU *cpu = uc32_cpu_init(cpu_model);
if (cpu == NULL) {
return NULL;
}
return &cpu->env;
}
static inline void cpu_get_tb_cpu_state(CPUUniCore32State *env, target_ulong *pc, static inline void cpu_get_tb_cpu_state(CPUUniCore32State *env, target_ulong *pc,
target_ulong *cs_base, int *flags) target_ulong *cs_base, int *flags)
{ {

10
target-unicore32/helper.c
View File

@ -25,15 +25,9 @@
#define DPRINTF(fmt, ...) do {} while (0) #define DPRINTF(fmt, ...) do {} while (0)
#endif #endif
CPUUniCore32State *uc32_cpu_init(const char *cpu_model) UniCore32CPU *uc32_cpu_init(const char *cpu_model)
{ {
UniCore32CPU *cpu; return UNICORE32_CPU(cpu_generic_init(TYPE_UNICORE32_CPU, cpu_model));
cpu = UNICORE32_CPU(cpu_generic_init(TYPE_UNICORE32_CPU, cpu_model));
if (cpu == NULL) {
return NULL;
}
return &cpu->env;
} }
uint32_t HELPER(clo)(uint32_t x) uint32_t HELPER(clo)(uint32_t x)