commit fd2a087c74c93cb0e88809c94f3654f5203dbbf0
author Tor Jeremiassen <torerik@google.com> Tue Dec 17 14:50:46 2024 -0800
committer Tor Jeremiassen <torerik@google.com> Tue Dec 17 14:58:10 2024 -0800
tree 7d22c6f2efcc96b1cbf323f42f44c3555fef001c
parent dfad0a8a22723dc2915d46e5be7da02f558aa2d0

Fixed 'next' command in debug shell as new jal instrutions had been added.

PiperOrigin-RevId: 707260089
Change-Id: I8d161564eb0040eb6536c61d017ef95c44a8dc67

cheriot/debug_command_shell.cc

diff --git a/cheriot/debug_command_shell.cc b/cheriot/debug_command_shell.cc
index cd2f0d4..1576d76 100644
--- a/cheriot/debug_command_shell.cc
+++ b/cheriot/debug_command_shell.cc
@@ -1529,9 +1529,11 @@
   auto opcode = inst->opcode();
   // If it's not a jump-and-link, it's a single step.
   if ((opcode != *isa32::OpcodeEnum::kCheriotJal) &&
+      (opcode != *isa32::OpcodeEnum::kCheriotJalCra) &&
       (opcode != *isa32::OpcodeEnum::kCheriotJalr) &&
       (opcode != *isa32::OpcodeEnum::kCheriotJalrCra) &&
       (opcode != *isa32::OpcodeEnum::kCheriotCjal) &&
+      (opcode != *isa32::OpcodeEnum::kCheriotCjalCra) &&
       (opcode != *isa32::OpcodeEnum::kCheriotCjalrCra)) {
     inst->DecRef();
     return core_access_[current_core_].debug_interface->Step(1).status();