Re: [PATCH v2 10/23] target/i386: USe DISAS_EOB_ONLY

2022-09-21 Thread Paolo Bonzini
On Tue, Sep 6, 2022 at 12:09 PM Richard Henderson
 wrote:
>
> Replace lone calls to gen_eob() with the new enumerator.
>
> Signed-off-by: Richard Henderson 

Reviewed-by: Paolo Bonzini 

> ---
>  target/i386/tcg/translate.c | 12 ++--
>  1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/target/i386/tcg/translate.c b/target/i386/tcg/translate.c
> index a7e5bcdec7..5b77414a0a 100644
> --- a/target/i386/tcg/translate.c
> +++ b/target/i386/tcg/translate.c
> @@ -6800,7 +6800,7 @@ static bool disas_insn(DisasContext *s, CPUState *cpu)
>  /* add stack offset */
>  gen_stack_update(s, val + (2 << dflag));
>  }
> -gen_eob(s);
> +s->base.is_jmp = DISAS_EOB_ONLY;
>  break;
>  case 0xcb: /* lret */
>  val = 0;
> @@ -6818,7 +6818,7 @@ static bool disas_insn(DisasContext *s, CPUState *cpu)
>tcg_const_i32(s->pc - s->cs_base));
>  }
>  set_cc_op(s, CC_OP_EFLAGS);
> -gen_eob(s);
> +s->base.is_jmp = DISAS_EOB_ONLY;
>  break;
>  case 0xe8: /* call im */
>  {
> @@ -7404,7 +7404,7 @@ static bool disas_insn(DisasContext *s, CPUState *cpu)
>  gen_set_label(l1);
>  gen_jmp_im(s, tval);
>  gen_set_label(l2);
> -gen_eob(s);
> +s->base.is_jmp = DISAS_EOB_ONLY;
>  }
>  break;
>  case 0x130: /* wrmsr */
> @@ -7445,7 +7445,7 @@ static bool disas_insn(DisasContext *s, CPUState *cpu)
>  gen_exception_gpf(s);
>  } else {
>  gen_helper_sysenter(cpu_env);
> -gen_eob(s);
> +s->base.is_jmp = DISAS_EOB_ONLY;
>  }
>  break;
>  case 0x135: /* sysexit */
> @@ -7456,7 +7456,7 @@ static bool disas_insn(DisasContext *s, CPUState *cpu)
>  gen_exception_gpf(s);
>  } else {
>  gen_helper_sysexit(cpu_env, tcg_const_i32(dflag - 1));
> -gen_eob(s);
> +s->base.is_jmp = DISAS_EOB_ONLY;
>  }
>  break;
>  #ifdef TARGET_X86_64
> @@ -8539,7 +8539,7 @@ static bool disas_insn(DisasContext *s, CPUState *cpu)
>  gen_update_eip_next(s);
>  gen_helper_rsm(cpu_env);
>  #endif /* CONFIG_USER_ONLY */
> -gen_eob(s);
> +s->base.is_jmp = DISAS_EOB_ONLY;
>  break;
>  case 0x1b8: /* SSE4.2 popcnt */
>  if ((prefixes & (PREFIX_REPZ | PREFIX_LOCK | PREFIX_REPNZ)) !=
> --
> 2.34.1
>




[PATCH v2 10/23] target/i386: USe DISAS_EOB_ONLY

2022-09-06 Thread Richard Henderson
Replace lone calls to gen_eob() with the new enumerator.

Signed-off-by: Richard Henderson 
---
 target/i386/tcg/translate.c | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/target/i386/tcg/translate.c b/target/i386/tcg/translate.c
index a7e5bcdec7..5b77414a0a 100644
--- a/target/i386/tcg/translate.c
+++ b/target/i386/tcg/translate.c
@@ -6800,7 +6800,7 @@ static bool disas_insn(DisasContext *s, CPUState *cpu)
 /* add stack offset */
 gen_stack_update(s, val + (2 << dflag));
 }
-gen_eob(s);
+s->base.is_jmp = DISAS_EOB_ONLY;
 break;
 case 0xcb: /* lret */
 val = 0;
@@ -6818,7 +6818,7 @@ static bool disas_insn(DisasContext *s, CPUState *cpu)
   tcg_const_i32(s->pc - s->cs_base));
 }
 set_cc_op(s, CC_OP_EFLAGS);
-gen_eob(s);
+s->base.is_jmp = DISAS_EOB_ONLY;
 break;
 case 0xe8: /* call im */
 {
@@ -7404,7 +7404,7 @@ static bool disas_insn(DisasContext *s, CPUState *cpu)
 gen_set_label(l1);
 gen_jmp_im(s, tval);
 gen_set_label(l2);
-gen_eob(s);
+s->base.is_jmp = DISAS_EOB_ONLY;
 }
 break;
 case 0x130: /* wrmsr */
@@ -7445,7 +7445,7 @@ static bool disas_insn(DisasContext *s, CPUState *cpu)
 gen_exception_gpf(s);
 } else {
 gen_helper_sysenter(cpu_env);
-gen_eob(s);
+s->base.is_jmp = DISAS_EOB_ONLY;
 }
 break;
 case 0x135: /* sysexit */
@@ -7456,7 +7456,7 @@ static bool disas_insn(DisasContext *s, CPUState *cpu)
 gen_exception_gpf(s);
 } else {
 gen_helper_sysexit(cpu_env, tcg_const_i32(dflag - 1));
-gen_eob(s);
+s->base.is_jmp = DISAS_EOB_ONLY;
 }
 break;
 #ifdef TARGET_X86_64
@@ -8539,7 +8539,7 @@ static bool disas_insn(DisasContext *s, CPUState *cpu)
 gen_update_eip_next(s);
 gen_helper_rsm(cpu_env);
 #endif /* CONFIG_USER_ONLY */
-gen_eob(s);
+s->base.is_jmp = DISAS_EOB_ONLY;
 break;
 case 0x1b8: /* SSE4.2 popcnt */
 if ((prefixes & (PREFIX_REPZ | PREFIX_LOCK | PREFIX_REPNZ)) !=
-- 
2.34.1