[Qemu-devel] [PATCH 3/5] target-tricore: add context managment trap generation

[Bastian Koppelmann]

Signed-off-by: Bastian Koppelmann <address@hidden>
---
 target-tricore/op_helper.c | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/target-tricore/op_helper.c b/target-tricore/op_helper.c
index fbe2be0..d7aafd1 100644
--- a/target-tricore/op_helper.c
+++ b/target-tricore/op_helper.c
@@ -2404,11 +2404,13 @@ void helper_call(CPUTriCoreState *env, uint32_t next_pc)
     /* if (FCX == 0) trap(FCU); */
     if (env->FCX == 0) {
         /* FCU trap */
+        generate_trap(env, TRAPC_CTX_MNG, TIN3_FCU);
     }
     /* if (PSW.CDE) then if (cdc_increment()) then trap(CDO); */
     if (psw & MASK_PSW_CDE) {
         if (cdc_increment(&psw)) {
             /* CDO trap */
+            generate_trap(env, TRAPC_CTX_MNG, TIN3_CDO);
         }
     }
     /* PSW.CDE = 1;*/
@@ -2444,6 +2446,7 @@ void helper_call(CPUTriCoreState *env, uint32_t next_pc)
     /* if (tmp_FCX == LCX) trap(FCD);*/
     if (tmp_FCX == env->LCX) {
         /* FCD trap */
+        generate_trap(env, TRAPC_CTX_MNG, TIN3_FCD);
     }
     psw_write(env, psw);
 }
@@ -2456,18 +2459,25 @@ void helper_ret(CPUTriCoreState *env)
 
     psw = psw_read(env);
      /* if (PSW.CDE) then if (cdc_decrement()) then trap(CDU);*/
-    if (env->PSW & MASK_PSW_CDE) {
-        if (cdc_decrement(&(env->PSW))) {
+    if (psw & MASK_PSW_CDE) {
+        if (cdc_decrement(&psw)) {
             /* CDU trap */
+            psw_write(env, psw);
+            generate_trap(env, TRAPC_CTX_MNG, TIN3_CDU);
         }
     }
     /*   if (PCXI[19: 0] == 0) then trap(CSU); */
     if ((env->PCXI & 0xfffff) == 0) {
         /* CSU trap */
+        psw_write(env, psw);
+        generate_trap(env, TRAPC_CTX_MNG, TIN3_CSU);
     }
     /* if (PCXI.UL == 0) then trap(CTYP); */
     if ((env->PCXI & MASK_PCXI_UL) == 0) {
         /* CTYP trap */
+        cdc_increment(&psw); /* restore to the start of helper */
+        psw_write(env, psw);
+        generate_trap(env, TRAPC_CTX_MNG, TIN3_CTYP);
     }
     /* PC = {A11 [31: 1], 1’b0}; */
     env->PC = env->gpr_a[11] & 0xfffffffe;
@@ -2502,6 +2512,7 @@ void helper_bisr(CPUTriCoreState *env, uint32_t const9)
 
     if (env->FCX == 0) {
         /* FCU trap */
+       generate_trap(env, TRAPC_CTX_MNG, TIN3_FCU);
     }
 
     tmp_FCX = env->FCX;
@@ -2533,6 +2544,7 @@ void helper_bisr(CPUTriCoreState *env, uint32_t const9)
 
     if (tmp_FCX == env->LCX) {
         /* FCD trap */
+        generate_trap(env, TRAPC_CTX_MNG, TIN3_FCD);
     }
 }
 
@@ -2544,14 +2556,17 @@ void helper_rfe(CPUTriCoreState *env)
     /* if (PCXI[19: 0] == 0) then trap(CSU); */
     if ((env->PCXI & 0xfffff) == 0) {
         /* raise csu trap */
+        generate_trap(env, TRAPC_CTX_MNG, TIN3_CSU);
     }
     /* if (PCXI.UL == 0) then trap(CTYP); */
     if ((env->PCXI & MASK_PCXI_UL) == 0) {
         /* raise CTYP trap */
+        generate_trap(env, TRAPC_CTX_MNG, TIN3_CTYP);
     }
     /* if (!cdc_zero() AND PSW.CDE) then trap(NEST); */
     if (!cdc_zero(&(env->PSW)) && (env->PSW & MASK_PSW_CDE)) {
-        /* raise MNG trap */
+        /* raise NEST trap */
+        generate_trap(env, TRAPC_CTX_MNG, TIN3_NEST);
     }
     env->PC = env->gpr_a[11] & ~0x1;
     /* ICR.IE = PCXI.PIE; */
@@ -2627,6 +2642,7 @@ void helper_svlcx(CPUTriCoreState *env)
 
     if (env->FCX == 0) {
         /* FCU trap */
+        generate_trap(env, TRAPC_CTX_MNG, TIN3_FCU);
     }
     /* tmp_FCX = FCX; */
     tmp_FCX = env->FCX;
@@ -2657,6 +2673,7 @@ void helper_svlcx(CPUTriCoreState *env)
     /* if (tmp_FCX == LCX) trap(FCD);*/
     if (tmp_FCX == env->LCX) {
         /* FCD trap */
+        generate_trap(env, TRAPC_CTX_MNG, TIN3_FCD);
     }
 }
 
@@ -2668,6 +2685,7 @@ void helper_svucx(CPUTriCoreState *env)
 
     if (env->FCX == 0) {
         /* FCU trap */
+        generate_trap(env, TRAPC_CTX_MNG, TIN3_FCU);
     }
     /* tmp_FCX = FCX; */
     tmp_FCX = env->FCX;
@@ -2698,6 +2716,7 @@ void helper_svucx(CPUTriCoreState *env)
     /* if (tmp_FCX == LCX) trap(FCD);*/
     if (tmp_FCX == env->LCX) {
         /* FCD trap */
+        generate_trap(env, TRAPC_CTX_MNG, TIN3_FCD);
     }
 }
 
@@ -2708,10 +2727,12 @@ void helper_rslcx(CPUTriCoreState *env)
     /*   if (PCXI[19: 0] == 0) then trap(CSU); */
     if ((env->PCXI & 0xfffff) == 0) {
         /* CSU trap */
+        generate_trap(env, TRAPC_CTX_MNG, TIN3_CSU);
     }
     /* if (PCXI.UL == 1) then trap(CTYP); */
     if ((env->PCXI & MASK_PCXI_UL) != 0) {
         /* CTYP trap */
+        generate_trap(env, TRAPC_CTX_MNG, TIN3_CTYP);
     }
     /* EA = {PCXI.PCXS, 6'b0, PCXI.PCXO, 6'b0}; */
     ea = ((env->PCXI & MASK_PCXI_PCXS) << 12) +
-- 
2.7.1