[gem5-dev] Change in public/gem5[master]: arm: Replace EventWrapper use with EventFunctionWrapper

2017-06-20 Thread Sean Wilson (Gerrit) 
Sean Wilson has submitted this change and it was merged. (  
https://gem5-review.googlesource.com/3747 )


Change subject: arm: Replace EventWrapper use with EventFunctionWrapper
..

arm: Replace EventWrapper use with EventFunctionWrapper

Change-Id: I08de5f72513645d1fe92bde99fa205dde897e951
Signed-off-by: Sean Wilson 
Reviewed-on: https://gem5-review.googlesource.com/3747
Reviewed-by: Jason Lowe-Power 
Reviewed-by: Anthony Gutierrez 
Reviewed-by: Andreas Sandberg 
Maintainer: Andreas Sandberg 
---
M src/arch/arm/table_walker.cc
M src/arch/arm/table_walker.hh
M src/dev/arm/energy_ctrl.cc
M src/dev/arm/energy_ctrl.hh
M src/dev/arm/flash_device.cc
M src/dev/arm/flash_device.hh
M src/dev/arm/generic_timer.cc
M src/dev/arm/generic_timer.hh
M src/dev/arm/hdlcd.cc
M src/dev/arm/hdlcd.hh
M src/dev/arm/kmi.cc
M src/dev/arm/kmi.hh
M src/dev/arm/pl011.cc
M src/dev/arm/pl011.hh
M src/dev/arm/pl111.cc
M src/dev/arm/pl111.hh
M src/dev/arm/rtc_pl031.cc
M src/dev/arm/rtc_pl031.hh
M src/dev/arm/timer_cpulocal.cc
M src/dev/arm/timer_cpulocal.hh
M src/dev/arm/timer_sp804.cc
M src/dev/arm/timer_sp804.hh
M src/dev/arm/ufs_device.cc
M src/dev/arm/ufs_device.hh
24 files changed, 54 insertions(+), 48 deletions(-)

Approvals:
  Jason Lowe-Power: Looks good to me, approved
  Andreas Sandberg: Looks good to me, approved; Looks good to me, approved
  Anthony Gutierrez: Looks good to me, approved



diff --git a/src/arch/arm/table_walker.cc b/src/arch/arm/table_walker.cc
index 8783d0a..2d66642 100644
--- a/src/arch/arm/table_walker.cc
+++ b/src/arch/arm/table_walker.cc
@@ -64,12 +64,15 @@
   numSquashable(p->num_squash_per_cycle),
   pendingReqs(0),
   pendingChangeTick(curTick()),
-  doL1DescEvent(this), doL2DescEvent(this),
-  doL0LongDescEvent(this), doL1LongDescEvent(this),
-  doL2LongDescEvent(this), doL3LongDescEvent(this),
+  doL1DescEvent([this]{ doL1DescriptorWrapper(); }, name()),
+  doL2DescEvent([this]{ doL2DescriptorWrapper(); }, name()),
+  doL0LongDescEvent([this]{ doL0LongDescriptorWrapper(); }, name()),
+  doL1LongDescEvent([this]{ doL1LongDescriptorWrapper(); }, name()),
+  doL2LongDescEvent([this]{ doL2LongDescriptorWrapper(); }, name()),
+  doL3LongDescEvent([this]{ doL3LongDescriptorWrapper(); }, name()),
   LongDescEventByLevel { , ,
  ,  },
-  doProcessEvent(this)
+  doProcessEvent([this]{ processWalkWrapper(); }, name())
 {
 sctlr = 0;

diff --git a/src/arch/arm/table_walker.hh b/src/arch/arm/table_walker.hh
index c52cfcb..b322c50 100644
--- a/src/arch/arm/table_walker.hh
+++ b/src/arch/arm/table_walker.hh
@@ -920,28 +920,22 @@

 void doL1Descriptor();
 void doL1DescriptorWrapper();
-EventWrapper doL1DescEvent;
+EventFunctionWrapper doL1DescEvent;

 void doL2Descriptor();
 void doL2DescriptorWrapper();
-EventWrapper doL2DescEvent;
+EventFunctionWrapper doL2DescEvent;

 void doLongDescriptor();

 void doL0LongDescriptorWrapper();
-EventWrapper  
doL0LongDescEvent;

+EventFunctionWrapper doL0LongDescEvent;
 void doL1LongDescriptorWrapper();
-EventWrapper  
doL1LongDescEvent;

+EventFunctionWrapper doL1LongDescEvent;
 void doL2LongDescriptorWrapper();
-EventWrapper  
doL2LongDescEvent;

+EventFunctionWrapper doL2LongDescEvent;
 void doL3LongDescriptorWrapper();
-EventWrapper  
doL3LongDescEvent;

+EventFunctionWrapper doL3LongDescEvent;

 void doLongDescriptorWrapper(LookupLevel curr_lookup_level);
 Event* LongDescEventByLevel[4];
@@ -960,7 +954,7 @@
 static bool checkAddrSizeFaultAArch64(Addr addr, int  
currPhysAddrRange);

 Fault processWalkAArch64();
 void processWalkWrapper();
-EventWrapper  
doProcessEvent;

+EventFunctionWrapper doProcessEvent;

 void nextWalk(ThreadContext *tc);

diff --git a/src/dev/arm/energy_ctrl.cc b/src/dev/arm/energy_ctrl.cc
index 9efdeb1..9cfce3a 100644
--- a/src/dev/arm/energy_ctrl.cc
+++ b/src/dev/arm/energy_ctrl.cc
@@ -54,7 +54,7 @@
   domainIDIndexToRead(0),
   perfLevelAck(0),
   perfLevelToRead(0),
-  updateAckEvent(this)
+  updateAckEvent([this]{ updatePLAck(); }, name())
 {
 fatal_if(!p->dvfs_handler, "EnergyCtrl: Needs a DVFSHandler for a "
  "functioning system.\n");
diff --git a/src/dev/arm/energy_ctrl.hh b/src/dev/arm/energy_ctrl.hh
index ddfd8d7..2c7eb85 100644
---

[gem5-dev] Change in public/gem5[master]: arm: Replace EventWrapper use with EventFunctionWrapper

2017-06-13 Thread Sean Wilson (Gerrit) 
Sean Wilson has uploaded this change for review. (  
https://gem5-review.googlesource.com/3747



Change subject: arm: Replace EventWrapper use with EventFunctionWrapper
..

arm: Replace EventWrapper use with EventFunctionWrapper

Change-Id: I08de5f72513645d1fe92bde99fa205dde897e951
Signed-off-by: Sean Wilson 
---
M src/arch/arm/table_walker.cc
M src/arch/arm/table_walker.hh
M src/dev/arm/energy_ctrl.cc
M src/dev/arm/energy_ctrl.hh
M src/dev/arm/flash_device.cc
M src/dev/arm/flash_device.hh
M src/dev/arm/generic_timer.cc
M src/dev/arm/generic_timer.hh
M src/dev/arm/hdlcd.cc
M src/dev/arm/hdlcd.hh
M src/dev/arm/kmi.cc
M src/dev/arm/kmi.hh
M src/dev/arm/pl011.cc
M src/dev/arm/pl011.hh
M src/dev/arm/pl111.cc
M src/dev/arm/pl111.hh
M src/dev/arm/rtc_pl031.cc
M src/dev/arm/rtc_pl031.hh
M src/dev/arm/timer_cpulocal.cc
M src/dev/arm/timer_cpulocal.hh
M src/dev/arm/timer_sp804.cc
M src/dev/arm/timer_sp804.hh
M src/dev/arm/ufs_device.cc
M src/dev/arm/ufs_device.hh
24 files changed, 54 insertions(+), 48 deletions(-)



diff --git a/src/arch/arm/table_walker.cc b/src/arch/arm/table_walker.cc
index 8783d0a..2d66642 100644
--- a/src/arch/arm/table_walker.cc
+++ b/src/arch/arm/table_walker.cc
@@ -64,12 +64,15 @@
   numSquashable(p->num_squash_per_cycle),
   pendingReqs(0),
   pendingChangeTick(curTick()),
-  doL1DescEvent(this), doL2DescEvent(this),
-  doL0LongDescEvent(this), doL1LongDescEvent(this),
-  doL2LongDescEvent(this), doL3LongDescEvent(this),
+  doL1DescEvent([this]{ doL1DescriptorWrapper(); }, name()),
+  doL2DescEvent([this]{ doL2DescriptorWrapper(); }, name()),
+  doL0LongDescEvent([this]{ doL0LongDescriptorWrapper(); }, name()),
+  doL1LongDescEvent([this]{ doL1LongDescriptorWrapper(); }, name()),
+  doL2LongDescEvent([this]{ doL2LongDescriptorWrapper(); }, name()),
+  doL3LongDescEvent([this]{ doL3LongDescriptorWrapper(); }, name()),
   LongDescEventByLevel { , ,
  ,  },
-  doProcessEvent(this)
+  doProcessEvent([this]{ processWalkWrapper(); }, name())
 {
 sctlr = 0;

diff --git a/src/arch/arm/table_walker.hh b/src/arch/arm/table_walker.hh
index c52cfcb..b322c50 100644
--- a/src/arch/arm/table_walker.hh
+++ b/src/arch/arm/table_walker.hh
@@ -920,28 +920,22 @@

 void doL1Descriptor();
 void doL1DescriptorWrapper();
-EventWrapper doL1DescEvent;
+EventFunctionWrapper doL1DescEvent;

 void doL2Descriptor();
 void doL2DescriptorWrapper();
-EventWrapper doL2DescEvent;
+EventFunctionWrapper doL2DescEvent;

 void doLongDescriptor();

 void doL0LongDescriptorWrapper();
-EventWrapper  
doL0LongDescEvent;

+EventFunctionWrapper doL0LongDescEvent;
 void doL1LongDescriptorWrapper();
-EventWrapper  
doL1LongDescEvent;

+EventFunctionWrapper doL1LongDescEvent;
 void doL2LongDescriptorWrapper();
-EventWrapper  
doL2LongDescEvent;

+EventFunctionWrapper doL2LongDescEvent;
 void doL3LongDescriptorWrapper();
-EventWrapper  
doL3LongDescEvent;

+EventFunctionWrapper doL3LongDescEvent;

 void doLongDescriptorWrapper(LookupLevel curr_lookup_level);
 Event* LongDescEventByLevel[4];
@@ -960,7 +954,7 @@
 static bool checkAddrSizeFaultAArch64(Addr addr, int  
currPhysAddrRange);

 Fault processWalkAArch64();
 void processWalkWrapper();
-EventWrapper  
doProcessEvent;

+EventFunctionWrapper doProcessEvent;

 void nextWalk(ThreadContext *tc);

diff --git a/src/dev/arm/energy_ctrl.cc b/src/dev/arm/energy_ctrl.cc
index 9efdeb1..9cfce3a 100644
--- a/src/dev/arm/energy_ctrl.cc
+++ b/src/dev/arm/energy_ctrl.cc
@@ -54,7 +54,7 @@
   domainIDIndexToRead(0),
   perfLevelAck(0),
   perfLevelToRead(0),
-  updateAckEvent(this)
+  updateAckEvent([this]{ updatePLAck(); }, name())
 {
 fatal_if(!p->dvfs_handler, "EnergyCtrl: Needs a DVFSHandler for a "
  "functioning system.\n");
diff --git a/src/dev/arm/energy_ctrl.hh b/src/dev/arm/energy_ctrl.hh
index ddfd8d7..2c7eb85 100644
--- a/src/dev/arm/energy_ctrl.hh
+++ b/src/dev/arm/energy_ctrl.hh
@@ -182,6 +182,6 @@
 perfLevelAck = 1;
 }

-EventWrapper updateAckEvent;
+EventFunctionWrapper updateAckEvent;
 };
 #endif //__DEV_ARM_ENERGY_CTRL_HH__
diff --git a/src/dev/arm/flash_device.cc b/src/dev/arm/flash_device.cc
index 3dc8d5b..ba28cff 100644
--- a/src/dev/arm/flash_device.cc
+++ b/src/dev/arm/flash_device.cc
@@ -88,7 +88,7 @@