diff options
| author | Peter Crosthwaite <crosthwaitepeter@gmail.com> | 2015-06-18 10:24:55 -0700 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2015-07-09 15:20:40 +0200 |
| commit | ea3e9847408131abc840240bd61e892d28459452 (patch) | |
| tree | c0406bdfc85a826a63430162127841fcd38373e7 /bsd-user | |
| parent | 4bad9e392e788a218967167a38ce2ae7a32a6231 (diff) | |
cpu-exec: Purge all uses of ENV_GET_CPU()
Remove un-needed usages of ENV_GET_CPU() by converting the APIs to use
CPUState pointers and retrieving the env_ptr as minimally needed.
Scripted conversion for target-* change:
for I in target-*/cpu.h; do
sed -i \
's/\(^int cpu_[^_]*_exec(\)[^ ][^ ]* \*s);$/\1CPUState *cpu);/' \
$I;
done
Signed-off-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'bsd-user')
| -rw-r--r-- | bsd-user/main.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/bsd-user/main.c b/bsd-user/main.c index 45a1436dd1..f46728bad8 100644 --- a/bsd-user/main.c +++ b/bsd-user/main.c @@ -166,6 +166,8 @@ static void set_idt(int n, unsigned int dpl) void cpu_loop(CPUX86State *env) { + X86CPU *cpu = x86_env_get_cpu(env); + CPUState *cs = CPU(cpu); int trapnr; abi_ulong pc; //target_siginfo_t info; @@ -512,7 +514,7 @@ void cpu_loop(CPUSPARCState *env) //target_siginfo_t info; while (1) { - trapnr = cpu_sparc_exec (env); + trapnr = cpu_sparc_exec(cs); switch (trapnr) { #ifndef TARGET_SPARC64 |