christoph/fail
1
Fork 0
Code Actions Packages Releases Activity

gem5: adapt to changed SimulatorController iface

Browse Source 
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
This commit is contained in:
Horst Schirmeier
2015-08-06 16:21:12 +02:00
parent 6ae7c6becc
commit c069e87c6f
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
simulators/gem5/src/cpu/simple/base.cc
View File

@ -334,7 +334,8 @@ BaseSimpleCPU::checkForInterrupts()
if (interrupt != NoFault) { if (interrupt != NoFault) {
// DanceOS // DanceOS
#ifdef CONFIG_EVENT_INTERRUPT #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 #endif
fetchOffset = 0; fetchOffset = 0;
interrupts->updateIntrInfo(tc); interrupts->updateIntrInfo(tc);