35a36
> #include "systemc/core/sc_main_fiber.hh"
49,50c50
< stopEvent(this, false, StopPriority),
< scMain(nullptr), _throwToScMain(nullptr),
---
> stopEvent(this, false, StopPriority), _throwToScMain(nullptr),
352,353c352,353
< if (scMain && !scMain->finished())
< scMain->run();
---
> if (scMainFiber.called() && !scMainFiber.finished())
> scMainFiber.run();
365,366c365,366
< if (scMain && !scMain->finished())
< scMain->run();
---
> if (scMainFiber.called() && !scMainFiber.finished())
> scMainFiber.run();
372,375d371
< // We should be running from sc_main. Keep track of that Fiber to return
< // to later.
< scMain = Fiber::currentFiber();
<
434c430
< scMain->run();
---
> scMainFiber.run();