Merge branch 'viktoryou-master'

riscv/insns/cbo_inval.h

@@ -1,9 +1,9 @@
 require_extension(EXT_ZICBOM);
 DECLARE_XENVCFG_VARS(CBIE);
 require_envcfg(CBIE);
-if (((STATE.prv != PRV_M) && (mCBIE == 1)) ||
+if ((STATE.prv != PRV_M && mCBIE) ||
-    ((!STATE.v && (STATE.prv == PRV_U)) && (sCBIE = 1)) ||
+    (!STATE.v && STATE.prv == PRV_U && sCBIE) ||
-    (STATE.v && ((hCBIE == 1) || ((STATE.prv == PRV_U) && (sCBIE== 0)))))
+    (STATE.v && (hCBIE || (STATE.prv == PRV_U && sCBIE))))
   MMU.clean_inval(RS1, true, true);
 else
   MMU.clean_inval(RS1, false, true);