commit 27bfaaeba29e07b2d83c94d332975bd56fcb10aa
author Tor Jeremiassen <torerik@google.com> Thu May 30 07:27:49 2024 -0700
committer Tor Jeremiassen <torerik@google.com> Fri May 31 12:37:54 2024 -0700
tree 83a5d0a7836fbbcda3bb16c86c9fdc67a0bbbc47
parent bbaac9dc2a84cfb721eed23f51150995d73f06e4

No public description

PiperOrigin-RevId: 638645191
Change-Id: I580e538658f69eb91d8791dea9cc42382c8adaf4

cheriot/riscv_cheriot_instructions.cc

diff --git a/cheriot/riscv_cheriot_instructions.cc b/cheriot/riscv_cheriot_instructions.cc
index a23bc7d..a1358c7 100644
--- a/cheriot/riscv_cheriot_instructions.cc
+++ b/cheriot/riscv_cheriot_instructions.cc
@@ -291,7 +291,7 @@
   if (pcc->IsSentry()) {
     if (pcc->object_type() != CapReg::kSentry) {
       bool interrupt_enable =
-          (pcc->object_type() == CapReg::kInterruptEnablingSentry) |
+          (pcc->object_type() == CapReg::kInterruptEnablingSentry) ||
           (pcc->object_type() == CapReg::kInterruptEnablingReturnSentry);
       mstatus->set_mie(interrupt_enable);
       mstatus->Submit();