Richard Henderson <richard.hender...@linaro.org> writes:
> Fix the i386 get_memio_eip function to use tb->cflags
> instead of cs->tcg_cflags.
>
> Signed-off-by: Richard Henderson <richard.hender...@linaro.org>
> ---
> include/exec/cpu-common.h | 9 +++++----
> accel/tcg/translate-all.c | 9 +++++----
> target/i386/helper.c | 6 ++++--
> 3 files changed, 14 insertions(+), 10 deletions(-)
>
<snip>
>
> /* Per x86_restore_state_to_opc. */
> - if (cs->tcg_cflags & CF_PCREL) {
> + if (tb->cflags & CF_PCREL) {
> return (env->eip & TARGET_PAGE_MASK) | data[0];
this has a merge conflict with subsequent changes.
> } else {
> return data[0] - env->segs[R_CS].base;
--
Alex Bennée
Virtualisation Tech Lead @ Linaro
