commit e8aa5a8dbf242f5680bcf8c5e43953390d29ff4c
author Cindy Liu <hcindyl@google.com> Wed May 22 03:20:33 2024 -0700
committer Cindy Liu <hcindyl@google.com> Wed May 22 11:46:59 2024 +0000
tree 02690f36137dd933a6eab2de7091c4757330b4f6
parent eda230ab231bf68b4f9bca14e7224623f2e48aca

Fix External CPU API

Match https://github.com/renode/renode-infrastructure/commit/03eb1abf

Also fix PerformanceInMips data type warning

Bypass-Presubmit-Reason: test_nexus_boot_robot test broken at ToT

Change-Id: Id3c5f273bd206e0f85cfc71a16218ae862778d03

shodan_infrastructure/KelvinCPU.cs

diff --git a/shodan_infrastructure/KelvinCPU.cs b/shodan_infrastructure/KelvinCPU.cs
index 385ec1f..299bdbc 100644
--- a/shodan_infrastructure/KelvinCPU.cs
+++ b/shodan_infrastructure/KelvinCPU.cs
@@ -147,7 +147,7 @@
         }
 
         // No-op public API to match RiscVCPU
-        public Int32 PerformanceInMips { get; set; }
+        public uint PerformanceInMips { get; set; }
 
         public override string Architecture { get { return "kelvin"; } }
 
@@ -211,7 +211,7 @@
             }
         }
 
-        protected override ExecutionResult ExecuteInstructions(
+        public override ExecutionResult ExecuteInstructions(
             ulong numberOfInstructionsToExecute,
             out ulong numberOfExecutedInstructions)
         {

shodan_infrastructure/MpactCheriotCPU.cs

diff --git a/shodan_infrastructure/MpactCheriotCPU.cs b/shodan_infrastructure/MpactCheriotCPU.cs
index b115bad..3c5960e 100644
--- a/shodan_infrastructure/MpactCheriotCPU.cs
+++ b/shodan_infrastructure/MpactCheriotCPU.cs
@@ -262,7 +262,7 @@
         }
     }
 
-    protected override ExecutionResult ExecuteInstructions(
+    public override ExecutionResult ExecuteInstructions(
                     ulong numberOfInstructionsToExecute,
                     out ulong numberOfExecutedInstructions) {
         UInt64 instructionsExecutedThisRound = 0UL;