Revision 81926f47 arm-semi.c
b/arm-semi.c | ||
---|---|---|
108 | 108 |
return code; |
109 | 109 |
} |
110 | 110 |
#else |
111 |
static inline uint32_t set_swi_errno(CPUState *env, uint32_t code) |
|
111 |
static inline uint32_t set_swi_errno(CPUARMState *env, uint32_t code)
|
|
112 | 112 |
{ |
113 | 113 |
return code; |
114 | 114 |
} |
... | ... | |
122 | 122 |
static target_ulong syscall_err; |
123 | 123 |
#endif |
124 | 124 |
|
125 |
static void arm_semi_cb(CPUState *env, target_ulong ret, target_ulong err) |
|
125 |
static void arm_semi_cb(CPUARMState *env, target_ulong ret, target_ulong err)
|
|
126 | 126 |
{ |
127 | 127 |
#ifdef CONFIG_USER_ONLY |
128 | 128 |
TaskState *ts = env->opaque; |
... | ... | |
152 | 152 |
} |
153 | 153 |
} |
154 | 154 |
|
155 |
static void arm_semi_flen_cb(CPUState *env, target_ulong ret, target_ulong err) |
|
155 |
static void arm_semi_flen_cb(CPUARMState *env, target_ulong ret, target_ulong err)
|
|
156 | 156 |
{ |
157 | 157 |
/* The size is always stored in big-endian order, extract |
158 | 158 |
the value. We assume the size always fit in 32 bits. */ |
... | ... | |
174 | 174 |
__arg; \ |
175 | 175 |
}) |
176 | 176 |
#define SET_ARG(n, val) put_user_ual(val, args + (n) * 4) |
177 |
uint32_t do_arm_semihosting(CPUState *env) |
|
177 |
uint32_t do_arm_semihosting(CPUARMState *env)
|
|
178 | 178 |
{ |
179 | 179 |
target_ulong args; |
180 | 180 |
char * s; |
... | ... | |
184 | 184 |
#ifdef CONFIG_USER_ONLY |
185 | 185 |
TaskState *ts = env->opaque; |
186 | 186 |
#else |
187 |
CPUState *ts = env; |
|
187 |
CPUARMState *ts = env;
|
|
188 | 188 |
#endif |
189 | 189 |
|
190 | 190 |
nr = env->regs[0]; |
Also available in: Unified diff