diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-07-09 15:00:37 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-07-09 15:00:37 +0100 |
| commit | 032624868df264d395ee9900331f08bad1431022 (patch) | |
| tree | 3c265b22c87638dec3e52948428d70e5fe67484e /bsd-user | |
| parent | 5a2db89615c8efabbeca74fe5e0f14f312d3bbe3 (diff) | |
| parent | 6b625fde5eb8d1c969969392f1c92b58beed2183 (diff) | |
| download | qemu-032624868df264d395ee9900331f08bad1431022.zip qemu-032624868df264d395ee9900331f08bad1431022.tar.gz qemu-032624868df264d395ee9900331f08bad1431022.tar.bz2 | |
Merge remote-tracking branch 'remotes/afaerber/tags/qom-cpu-for-peter' into staging
QOM CPUState and X86CPU
* Further QOM'ification of CPU initialization
* Propagation of CPUState arguments and elimination of ENV_GET_CPU() usage
* cpu_set_pc() abstraction
* CPUClass::disas_set_info() hook
# gpg: Signature made Thu Jul 9 14:23:12 2015 BST using RSA key ID 3E7E013F
# gpg: Good signature from "Andreas Färber <afaerber@suse.de>"
# gpg: aka "Andreas Färber <afaerber@suse.com>"
* remotes/afaerber/tags/qom-cpu-for-peter: (22 commits)
disas: cris: QOMify target specific disas setup
disas: cris: Fix 0 buffer length case
disas: microblaze: QOMify target specific disas setup
disas: arm: QOMify target specific disas setup
disas: arm-a64: Make printfer and stream variable
disas: QOMify target specific setup
disas: Add print_insn to disassemble info
microblaze: boot: Use cpu_set_pc()
hw/arm/boot: Use cpu_set_pc()
gdbstub: Use cpu_set_pc() helper
cpu: Add wrapper for the set_pc() hook
cpu-exec: Purge all uses of ENV_GET_CPU()
cpu: Change cpu_exec_init() arg to cpu, not env
cpu: Change tcg_cpu_exec() arg to cpu, not env
gdbstub: Change gdbserver_fork() to accept cpu instead of env
translate-all: Change tb_flush() env argument to cpu
target-ppc: Move cpu_exec_init() call to realize function
cpu: Convert cpu_index into a bitmap
cpu: Add Error argument to cpu_exec_init()
cpu: Reorder cpu->as, cpu->thread_id, cpu->memory_dispatch init
...
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'bsd-user')
| -rw-r--r-- | bsd-user/main.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/bsd-user/main.c b/bsd-user/main.c index ba0b998..f46728b 100644 --- a/bsd-user/main.c +++ b/bsd-user/main.c @@ -92,7 +92,7 @@ void fork_start(void) void fork_end(int child) { if (child) { - gdbserver_fork((CPUArchState *)thread_cpu->env_ptr); + gdbserver_fork(thread_cpu); } } @@ -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 |