Re: [Qemu-devel] [PATCH v2 18/45] target/m68k: check CF_PARALLEL instead of parallel_cpus

[Richard Henderson]

On 07/16/2017 10:04 AM, Emilio G. Cota wrote:
> Thereby decoupling the resulting translated code from the current state
> of the system.
>
> Signed-off-by: Emilio G. Cota <address@hidden>
> ---
>   target/m68k/helper.h    |  2 ++
>   target/m68k/op_helper.c | 32 ++++++++++++++++++++++++++++----
>   target/m68k/translate.c | 12 ++++++++++--
>   3 files changed, 40 insertions(+), 6 deletions(-)
>
> diff --git a/target/m68k/helper.h b/target/m68k/helper.h
> index 475a1f2..137ef48 100644
> --- a/target/m68k/helper.h
> +++ b/target/m68k/helper.h
> @@ -10,7 +10,9 @@ DEF_HELPER_4(divsll, void, env, int, int, s32)
>   DEF_HELPER_2(set_sr, void, env, i32)
>   DEF_HELPER_3(movec, void, env, i32, i32)
>   DEF_HELPER_4(cas2w, void, env, i32, i32, i32)
> +DEF_HELPER_4(cas2w_parallel, void, env, i32, i32, i32)
>   DEF_HELPER_4(cas2l, void, env, i32, i32, i32)
> +DEF_HELPER_4(cas2l_parallel, void, env, i32, i32, i32)
>   
>   #define dh_alias_fp ptr
>   #define dh_ctype_fp FPReg *
> diff --git a/target/m68k/op_helper.c b/target/m68k/op_helper.c
> index 7b5126c..061d468 100644
> --- a/target/m68k/op_helper.c
> +++ b/target/m68k/op_helper.c
> @@ -361,7 +361,8 @@ void HELPER(divsll)(CPUM68KState *env, int numr, int regr, 
> int32_t den)
>       env->dregs[numr] = quot;
>   }
>   
> -void HELPER(cas2w)(CPUM68KState *env, uint32_t regs, uint32_t a1, uint32_t a2)
> +static void do_cas2w(CPUM68KState *env, uint32_t regs, uint32_t a1, uint32_t 
> a2,
> +                     bool parallel)
>   {
>       uint32_t Dc1 = extract32(regs, 9, 3);
>       uint32_t Dc2 = extract32(regs, 6, 3);
> @@ -374,7 +375,7 @@ void HELPER(cas2w)(CPUM68KState *env, uint32_t regs, 
> uint32_t a1, uint32_t a2)
>       int16_t l1, l2;
>       uintptr_t ra = GETPC();
>   
> -    if (parallel_cpus) {
> +    if (parallel) {
>           /* Tell the main loop we need to serialize this insn.  */
>           cpu_loop_exit_atomic(ENV_GET_CPU(env), ra);
>       } else {
> @@ -399,7 +400,19 @@ void HELPER(cas2w)(CPUM68KState *env, uint32_t regs, 
> uint32_t a1, uint32_t a2)
>       env->dregs[Dc2] = deposit32(env->dregs[Dc2], 0, 16, l2);
>   }
>   
> -void HELPER(cas2l)(CPUM68KState *env, uint32_t regs, uint32_t a1, uint32_t a2)
> +void HELPER(cas2w)(CPUM68KState *env, uint32_t regs, uint32_t a1, uint32_t a2)
> +{
> +    do_cas2w(env, regs, a1, a2, false);
> +}
> +
> +void HELPER(cas2w_parallel)(CPUM68KState *env, uint32_t regs, uint32_t a1,
> +                            uint32_t a2)
> +{
> +    do_cas2w(env, regs, a1, a2, true);

Well, cas2w_parallel is now exactly equivalent to gen_helper_exit_atomic.
I probably should have done that parallel check in the translator to begin.


r~