Revision 0b7ade1d
b/hw/r2d.c | ||
---|---|---|
192 | 192 |
} |
193 | 193 |
|
194 | 194 |
typedef struct ResetData { |
195 |
CPUState *env; |
|
195 |
CPUSH4State *env;
|
|
196 | 196 |
uint32_t vector; |
197 | 197 |
} ResetData; |
198 | 198 |
|
199 | 199 |
static void main_cpu_reset(void *opaque) |
200 | 200 |
{ |
201 | 201 |
ResetData *s = (ResetData *)opaque; |
202 |
CPUState *env = s->env; |
|
202 |
CPUSH4State *env = s->env;
|
|
203 | 203 |
|
204 | 204 |
cpu_state_reset(env); |
205 | 205 |
env->pc = s->vector; |
... | ... | |
224 | 224 |
const char *kernel_filename, const char *kernel_cmdline, |
225 | 225 |
const char *initrd_filename, const char *cpu_model) |
226 | 226 |
{ |
227 |
CPUState *env; |
|
227 |
CPUSH4State *env;
|
|
228 | 228 |
ResetData *reset_info; |
229 | 229 |
struct SH7750State *s; |
230 | 230 |
MemoryRegion *sdram = g_new(MemoryRegion, 1); |
b/hw/sh.h | ||
---|---|---|
11 | 11 |
struct SH7750State; |
12 | 12 |
struct MemoryRegion; |
13 | 13 |
|
14 |
struct SH7750State *sh7750_init(CPUState * cpu, struct MemoryRegion *sysmem); |
|
14 |
struct SH7750State *sh7750_init(CPUSH4State * cpu, struct MemoryRegion *sysmem);
|
|
15 | 15 |
|
16 | 16 |
typedef struct { |
17 | 17 |
/* The callback will be triggered if any of the designated lines change */ |
b/hw/shix.c | ||
---|---|---|
43 | 43 |
const char *initrd_filename, const char *cpu_model) |
44 | 44 |
{ |
45 | 45 |
int ret; |
46 |
CPUState *env; |
|
46 |
CPUSH4State *env;
|
|
47 | 47 |
struct SH7750State *s; |
48 | 48 |
MemoryRegion *sysmem = get_system_memory(); |
49 | 49 |
MemoryRegion *rom = g_new(MemoryRegion, 1); |
Also available in: Unified diff