[Qemu-devel] [PATCH v3 3/7] target-tricore: add add.f/sub.f instructions

[Bastian Koppelmann]

Reviewed-by: Richard Henderson <address@hidden>
Signed-off-by: Bastian Koppelmann <address@hidden>
---
v2 -> v3:
    - substitute f_get_excp_flags() with get_float_exception_flags()
    - remove float32_squash_input_denormal()

 target-tricore/fpu_helper.c | 29 ++++++++++++++++++++++++++++-
 target-tricore/helper.h     |  2 ++
 target-tricore/translate.c  |  6 ++++++
 3 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/target-tricore/fpu_helper.c b/target-tricore/fpu_helper.c
index 8e89979..f8d29b0 100644
--- a/target-tricore/fpu_helper.c
+++ b/target-tricore/fpu_helper.c
@@ -45,7 +45,7 @@ static inline bool f_is_denormal(float32 arg)
     return float32_is_zero_or_denormal(arg) && !float32_is_zero(arg);
 }
 
-static inline void f_update_psw_flags(CPUTriCoreState *env, uint8_t flags)
+static void f_update_psw_flags(CPUTriCoreState *env, uint8_t flags)
 {
     uint8_t some_excp = 0;
     set_float_exception_flags(0, &env->fp_status);
@@ -77,3 +77,30 @@ static inline void f_update_psw_flags(CPUTriCoreState *env, 
uint8_t flags)
 
     env->FPU_FS = some_excp;
 }
+
+#define FADD_SUB(op)                                                           
\
+uint32_t helper_f##op(CPUTriCoreState *env, uint32_t r1, uint32_t r2)          
\
+{                                                                              
\
+    float32 arg1 = make_float32(r1);                                           
\
+    float32 arg2 = make_float32(r2);                                           
\
+    uint32_t flags;                                                            
\
+    float32 f_result;                                                          
\
+                                                                               
\
+    f_result = float32_##op(arg2, arg1, &env->fp_status);                      
\
+    flags = get_float_exception_flags(&env->fp_status);                        
\
+    if (flags) {                                                               
\
+        /* If the output is a NaN, but the inputs aren't,                      
\
+           we return a unique value.  */                                       
\
+        if ((flags & float_flag_invalid)                                       
\
+            && !float32_is_any_nan(arg1)                                       
\
+            && !float32_is_any_nan(arg2)) {                                    
\
+            f_result = ADD_NAN;                                                
\
+        }                                                                      
\
+        f_update_psw_flags(env, flags);                                        
\
+    } else {                                                                   
\
+        env->FPU_FS = 0;                                                       
\
+    }                                                                          
\
+    return (uint32_t)f_result;                                                 
\
+}
+FADD_SUB(add)
+FADD_SUB(sub)
diff --git a/target-tricore/helper.h b/target-tricore/helper.h
index 2c8ed78..2f4a2bb 100644
--- a/target-tricore/helper.h
+++ b/target-tricore/helper.h
@@ -105,6 +105,8 @@ DEF_HELPER_FLAGS_1(parity, TCG_CALL_NO_RWG_SE, i32, i32)
 /* float */
 DEF_HELPER_FLAGS_4(pack, TCG_CALL_NO_RWG_SE, i32, i32, i32, i32, i32)
 DEF_HELPER_1(unpack, i64, i32)
+DEF_HELPER_3(fadd, i32, env, i32, i32)
+DEF_HELPER_3(fsub, i32, env, i32, i32)
 /* dvinit */
 DEF_HELPER_3(dvinit_b_13, i64, env, i32, i32)
 DEF_HELPER_3(dvinit_b_131, i64, env, i32, i32)
diff --git a/target-tricore/translate.c b/target-tricore/translate.c
index 469f721..3f54987 100644
--- a/target-tricore/translate.c
+++ b/target-tricore/translate.c
@@ -7061,6 +7061,12 @@ static void decode_rrr_divide(CPUTriCoreState *env, 
DisasContext *ctx)
         gen_helper_pack(cpu_gpr_d[r4], cpu_PSW_C, cpu_gpr_d[r3],
                         cpu_gpr_d[r3+1], cpu_gpr_d[r1]);
         break;
+    case OPC2_32_RRR_ADD_F:
+        gen_helper_fadd(cpu_gpr_d[r4], cpu_env, cpu_gpr_d[r1], cpu_gpr_d[r3]);
+        break;
+    case OPC2_32_RRR_SUB_F:
+        gen_helper_fsub(cpu_gpr_d[r4], cpu_env, cpu_gpr_d[r1], cpu_gpr_d[r3]);
+        break;
     default:
         generate_trap(ctx, TRAPC_INSN_ERR, TIN2_IOPC);
     }
-- 
2.7.2