Merge pull request #226 from sifive/dev_emmanuelp

Fix test condition into metal_privilege_drop_to_mode function
sifive · Jan 13, 2020 · b92526c · b92526c
2 parents d8c8009 + cc9e120
commit b92526c
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/privilege.c b/src/privilege.c
@@ -22,17 +22,17 @@ void metal_privilege_drop_to_mode(enum metal_privilege_mode mode,
     __asm__ volatile("csrr %0, mstatus" : "=r"(mstatus));
 
     /* Set xPIE bits based on current xIE bits */
-    if (mstatus && (1 << METAL_MSTATUS_MIE_OFFSET)) {
+    if (mstatus & (1 << METAL_MSTATUS_MIE_OFFSET)) {
         mstatus |= (1 << METAL_MSTATUS_MPIE_OFFSET);
     } else {
         mstatus &= ~(1 << METAL_MSTATUS_MPIE_OFFSET);
     }
-    if (mstatus && (1 << METAL_MSTATUS_SIE_OFFSET)) {
+    if (mstatus & (1 << METAL_MSTATUS_SIE_OFFSET)) {
         mstatus |= (1 << METAL_MSTATUS_SPIE_OFFSET);
     } else {
         mstatus &= ~(1 << METAL_MSTATUS_SPIE_OFFSET);
     }
-    if (mstatus && (1 << METAL_MSTATUS_UIE_OFFSET)) {
+    if (mstatus & (1 << METAL_MSTATUS_UIE_OFFSET)) {
         mstatus |= (1 << METAL_MSTATUS_UPIE_OFFSET);
     } else {
         mstatus &= ~(1 << METAL_MSTATUS_UPIE_OFFSET);