From c069e87c6ff61f22938d0ca4bd1e98eaf76524f3 Mon Sep 17 00:00:00 2001
From: Horst Schirmeier <horst.schirmeier@tu-dortmund.de>
Date: Thu, 6 Aug 2015 16:21:12 +0200
Subject: [PATCH] gem5: adapt to changed SimulatorController iface

This quick fix is necessary to let gem5 compile again.  Instead of passing
NULL to onInterrupt(), a proper fix should pass the currently active
ConcreteCPU instance.

Change-Id: Ie4322fd98cb7b12309a21a2dd431f9bdc84efaf8
---
 simulators/gem5/src/cpu/simple/base.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/simulators/gem5/src/cpu/simple/base.cc b/simulators/gem5/src/cpu/simple/base.cc
index 486280f3..f222ebed 100644
--- a/simulators/gem5/src/cpu/simple/base.cc
+++ b/simulators/gem5/src/cpu/simple/base.cc
@@ -334,7 +334,8 @@ BaseSimpleCPU::checkForInterrupts()
         if (interrupt != NoFault) {
             // DanceOS
             #ifdef CONFIG_EVENT_INTERRUPT
-            fail::simulator.onInterrupt(dynamic_cast<ArmFault*>(interrupt.get())->offset(), false);
+            // FIXME pass the currently active ConcreteCPU instance
+            fail::simulator.onInterrupt(NULL, dynamic_cast<ArmFault*>(interrupt.get())->offset(), false);
             #endif
             fetchOffset = 0;
             interrupts->updateIntrInfo(tc);