From ed4ed7e7e0373d33c6aa3ed6566d0eee28ff0c91 Mon Sep 17 00:00:00 2001
From: Alastair Reid
Date: Fri, 4 Jan 2019 10:54:41 +0000
Subject: Arm ElfMain: fix minor type errors

I guess that Sail became a bit more strict about typechecking variables in
the last few months.
---
 aarch64/elfmain.sail | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'aarch64')

diff --git a/aarch64/elfmain.sail b/aarch64/elfmain.sail
index ad564108..2fdb471b 100644
--- a/aarch64/elfmain.sail
+++ b/aarch64/elfmain.sail
@@ -23,7 +23,7 @@ function Step_CPU() = {
   interrupt_req.take_IRQ = true; interrupt_req.take_vIRQ = true;
   interrupt_req.take_FIQ = true; interrupt_req.take_vFIQ = true;
   try {
-      var interrupted = false;
+      var interrupted : bool = false;
       interrupted = TakePendingInterrupts(interrupt_req);
       if interrupted then {
           print("Pending interrupt taken\n");
@@ -34,7 +34,7 @@ function Step_CPU() = {
       }
   };
 
-  var fetch_ok = false;
+  var fetch_ok : bool = false;
   try {
       if PSTATE.nRW != bitzero then {
         print("UNIMPLEMENTED: AArch32 support\n");
@@ -247,7 +247,7 @@ function Step_System () = {
                    PSTATE.EL);
       };
       if prevI != PSTATE.I then {
-	prerr_bits("[Sail] PSTATE.I changed to: ", PSTATE.I);
+        prerr_bits("[Sail] PSTATE.I changed to: ", PSTATE.I);
         print(concat_str("   at PC=",
               concat_str(HexStr(UInt(aget_PC())),
               concat_str(" in cycle=",
@@ -263,7 +263,7 @@ function Step_System () = {
 
     } catch {
       Error_ExceptionTaken(_) => {
-	// enable_tracing()
+        // enable_tracing()
         print(concat_str("Exception taken during Step_System.  PC=",
               concat_str(HexStr(UInt(aget_PC())),
               concat_str(" cycle=",
-- 
cgit v1.2.3