diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2011-05-05 16:39:47 +0300 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2011-05-05 16:39:47 +0300 |
| commit | 5300f1a5487f67f0bde8ee1081b799108668cb1d (patch) | |
| tree | 5274ff496f2665487736a4eec23bf76601e4da44 /translate-all.c | |
| parent | 8d4c78e7c8adf0a4440a8de92738b3820fc8215a (diff) | |
| parent | d2d979c628e4b2c4a3cb71a31841875795c79043 (diff) | |
Merge remote branch 'origin/master' into pci
Conflicts:
exec.c
Diffstat (limited to 'translate-all.c')
| -rw-r--r-- | translate-all.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/translate-all.c b/translate-all.c index efcfb9adcd..2ca190ca8f 100644 --- a/translate-all.c +++ b/translate-all.c @@ -112,8 +112,7 @@ int cpu_gen_code(CPUState *env, TranslationBlock *tb, int *gen_code_size_ptr) /* The cpu state corresponding to 'searched_pc' is restored. */ int cpu_restore_state(TranslationBlock *tb, - CPUState *env, unsigned long searched_pc, - void *puc) + CPUState *env, unsigned long searched_pc) { TCGContext *s = &tcg_ctx; int j; @@ -157,7 +156,7 @@ int cpu_restore_state(TranslationBlock *tb, j--; env->icount_decr.u16.low -= gen_opc_icount[j]; - gen_pc_load(env, tb, searched_pc, j, puc); + restore_state_to_opc(env, tb, j); #ifdef CONFIG_PROFILER s->restore_time += profile_getclock() - ti; |