[gem5-dev] Change in gem5/gem5[master]: cpu: alpha: Delete all occurrances of the simPalCheck function.

2019-04-30 Thread Gabe Black (Gerrit) 
Gabe Black has submitted this change and it was merged. (  
https://gem5-review.googlesource.com/c/public/gem5/+/18434 )


Change subject: cpu: alpha: Delete all occurrances of the simPalCheck  
function.

..

cpu: alpha: Delete all occurrances of the simPalCheck function.

This is now handled within the ISA description.

Change-Id: Ie409bb46d102e59d4eb41408d9196fe235626d32
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/18434
Reviewed-by: Gabe Black 
Maintainer: Gabe Black 
Tested-by: kokoro 
---
M src/arch/alpha/ev5.cc
M src/cpu/checker/cpu.hh
M src/cpu/exec_context.hh
M src/cpu/minor/exec_context.hh
M src/cpu/o3/cpu.cc
M src/cpu/o3/cpu.hh
M src/cpu/o3/dyn_inst.hh
M src/cpu/o3/dyn_inst_impl.hh
M src/cpu/simple/exec_context.hh
M src/cpu/simple_thread.cc
M src/cpu/simple_thread.hh
11 files changed, 0 insertions(+), 120 deletions(-)

Approvals:
  Gabe Black: Looks good to me, approved; Looks good to me, approved
  kokoro: Regressions pass



diff --git a/src/arch/alpha/ev5.cc b/src/arch/alpha/ev5.cc
index e64523d..676d7a7 100644
--- a/src/arch/alpha/ev5.cc
+++ b/src/arch/alpha/ev5.cc
@@ -482,35 +482,3 @@
 }

 } // namespace AlphaISA
-
-using namespace AlphaISA;
-
-/**
- * Check for special simulator handling of specific PAL calls.
- * If return value is false, actual PAL call will be suppressed.
- */
-bool
-SimpleThread::simPalCheck(int palFunc)
-{
-auto *stats = dynamic_cast*>(kernelStats);

-assert(stats || !kernelStats);
-
-if (stats)
-stats->callpal(palFunc, this);
-
-switch (palFunc) {
-  case PAL::halt:
-halt();
-if (--System::numSystemsRunning == 0)
-exitSimLoop("all cpus halted");
-break;
-
-  case PAL::bpt:
-  case PAL::bugchk:
-if (system->breakpoint())
-return false;
-break;
-}
-
-return true;
-}
diff --git a/src/cpu/checker/cpu.hh b/src/cpu/checker/cpu.hh
index acbe94f..7582e5e 100644
--- a/src/cpu/checker/cpu.hh
+++ b/src/cpu/checker/cpu.hh
@@ -539,8 +539,6 @@
 void setStCondFailures(unsigned int sc_failures) override {}
 /

-bool simPalCheck(int palFunc) override
-{ return thread->simPalCheck(palFunc); }
 void wakeup(ThreadID tid) override { }
 // Assume that the normal CPU's call to syscall was successful.
 // The checker's state would have already been updated by the syscall.
diff --git a/src/cpu/exec_context.hh b/src/cpu/exec_context.hh
index 0477f3f..5909af6 100644
--- a/src/cpu/exec_context.hh
+++ b/src/cpu/exec_context.hh
@@ -311,19 +311,6 @@

 /**
  * @{
- * @name Alpha-Specific Interfaces
- */
-
-/**
- * Check for special simulator handling of specific PAL calls.  If
- * return value is false, actual PAL call will be suppressed.
- */
-virtual bool simPalCheck(int palFunc) = 0;
-
-/** @} */
-
-/**
- * @{
  * @name ARM-Specific Interfaces
  */

diff --git a/src/cpu/minor/exec_context.hh b/src/cpu/minor/exec_context.hh
index 03f8e09..55391c3 100644
--- a/src/cpu/minor/exec_context.hh
+++ b/src/cpu/minor/exec_context.hh
@@ -365,16 +365,6 @@
 return thread.setMiscReg(reg.index(), val);
 }

-bool
-simPalCheck(int palFunc) override
-{
-#if THE_ISA == ALPHA_ISA
-return thread.simPalCheck(palFunc);
-#else
-return false;
-#endif
-}
-
 void
 syscall(int64_t callnum, Fault *fault) override
 {
diff --git a/src/cpu/o3/cpu.cc b/src/cpu/o3/cpu.cc
index ba6e80f..50de81b 100644
--- a/src/cpu/o3/cpu.cc
+++ b/src/cpu/o3/cpu.cc
@@ -918,33 +918,6 @@
 }

 template 
-bool
-FullO3CPU::simPalCheck(int palFunc, ThreadID tid)
-{
-#if THE_ISA == ALPHA_ISA
-auto *stats = dynamic_cast(
-this->thread[tid]->kernelStats);
-if (stats)
-stats->callpal(palFunc, this->threadContexts[tid]);
-
-switch (palFunc) {
-  case PAL::halt:
-halt();
-if (--System::numSystemsRunning == 0)
-exitSimLoop("all cpus halted");
-break;
-
-  case PAL::bpt:
-  case PAL::bugchk:
-if (this->system->breakpoint())
-return false;
-break;
-}
-#endif
-return true;
-}
-
-template 
 void
 FullO3CPU::switchRenameMode(ThreadID tid, UnifiedFreeList* freelist)
 {
diff --git a/src/cpu/o3/cpu.hh b/src/cpu/o3/cpu.hh
index bd1479a..c754fe8 100644
--- a/src/cpu/o3/cpu.hh
+++ b/src/cpu/o3/cpu.hh
@@ -385,8 +385,6 @@
 /** Traps to handle given fault. */
 void trap(const Fault , ThreadID tid, const StaticInstPtr );

-bool simPalCheck(int palFunc, ThreadID tid);
-
 /** Check if a change in renaming is needed for vector registers.
  * The vecMode variable is updated and propagated to rename maps.
  *
diff --git a/src/cpu/o3/dyn_inst.hh b/src/cpu/o3/dyn_inst.hh
index 9b6c1fb..131ffd2 100644
--- a/src/cpu/o3/dyn_inst.hh
+++ b/src/cpu/o3/dyn_inst.hh
@@

[gem5-dev] Change in gem5/gem5[master]: cpu: alpha: Delete all occurrances of the simPalCheck function.

2019-04-29 Thread Gabe Black (Gerrit) 

Hello Andreas Sandberg, kokoro, Jason Lowe-Power,

I'd like you to reexamine a change. Please visit

https://gem5-review.googlesource.com/c/public/gem5/+/18434

to look at the new patch set (#2).

Change subject: cpu: alpha: Delete all occurrances of the simPalCheck  
function.

..

cpu: alpha: Delete all occurrances of the simPalCheck function.

This is now handled within the ISA description.

Change-Id: Ie409bb46d102e59d4eb41408d9196fe235626d32
---
M src/arch/alpha/ev5.cc
M src/cpu/checker/cpu.hh
M src/cpu/exec_context.hh
M src/cpu/minor/exec_context.hh
M src/cpu/o3/cpu.cc
M src/cpu/o3/cpu.hh
M src/cpu/o3/dyn_inst.hh
M src/cpu/o3/dyn_inst_impl.hh
M src/cpu/simple/exec_context.hh
M src/cpu/simple_thread.cc
M src/cpu/simple_thread.hh
11 files changed, 0 insertions(+), 120 deletions(-)


--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/18434
To unsubscribe, or for help writing mail filters, visit  
https://gem5-review.googlesource.com/settings


Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-Change-Id: Ie409bb46d102e59d4eb41408d9196fe235626d32
Gerrit-Change-Number: 18434
Gerrit-PatchSet: 2
Gerrit-Owner: Gabe Black 
Gerrit-Reviewer: Andreas Sandberg 
Gerrit-Reviewer: Gabe Black 
Gerrit-Reviewer: Jason Lowe-Power 
Gerrit-Reviewer: kokoro 
Gerrit-MessageType: newpatchset
___
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev

[gem5-dev] Change in gem5/gem5[master]: cpu: alpha: Delete all occurrances of the simPalCheck function.

2019-04-27 Thread Gabe Black (Gerrit) 
Gabe Black has uploaded this change for review. (  
https://gem5-review.googlesource.com/c/public/gem5/+/18434



Change subject: cpu: alpha: Delete all occurrances of the simPalCheck  
function.

..

cpu: alpha: Delete all occurrances of the simPalCheck function.

This is now handled within the ISA description.

Change-Id: Ie409bb46d102e59d4eb41408d9196fe235626d32
---
M src/arch/alpha/ev5.cc
M src/cpu/checker/cpu.hh
M src/cpu/exec_context.hh
M src/cpu/minor/exec_context.hh
M src/cpu/o3/cpu.cc
M src/cpu/o3/cpu.hh
M src/cpu/o3/dyn_inst.hh
M src/cpu/o3/dyn_inst_impl.hh
M src/cpu/simple/exec_context.hh
M src/cpu/simple_thread.cc
M src/cpu/simple_thread.hh
11 files changed, 0 insertions(+), 116 deletions(-)



diff --git a/src/arch/alpha/ev5.cc b/src/arch/alpha/ev5.cc
index 8b7691a..a847cd5 100644
--- a/src/arch/alpha/ev5.cc
+++ b/src/arch/alpha/ev5.cc
@@ -479,32 +479,3 @@
 }

 } // namespace AlphaISA
-
-using namespace AlphaISA;
-
-/**
- * Check for special simulator handling of specific PAL calls.
- * If return value is false, actual PAL call will be suppressed.
- */
-bool
-SimpleThread::simPalCheck(int palFunc)
-{
-if (kernelStats)
-kernelStats->callpal(palFunc, this);
-
-switch (palFunc) {
-  case PAL::halt:
-halt();
-if (--System::numSystemsRunning == 0)
-exitSimLoop("all cpus halted");
-break;
-
-  case PAL::bpt:
-  case PAL::bugchk:
-if (system->breakpoint())
-return false;
-break;
-}
-
-return true;
-}
diff --git a/src/cpu/checker/cpu.hh b/src/cpu/checker/cpu.hh
index 3f374e8..f70545b 100644
--- a/src/cpu/checker/cpu.hh
+++ b/src/cpu/checker/cpu.hh
@@ -554,8 +554,6 @@
 void setStCondFailures(unsigned int sc_failures) override {}
 /

-bool simPalCheck(int palFunc) override
-{ return thread->simPalCheck(palFunc); }
 void wakeup(ThreadID tid) override { }
 // Assume that the normal CPU's call to syscall was successful.
 // The checker's state would have already been updated by the syscall.
diff --git a/src/cpu/exec_context.hh b/src/cpu/exec_context.hh
index e2c6dd6..2c70eb4 100644
--- a/src/cpu/exec_context.hh
+++ b/src/cpu/exec_context.hh
@@ -311,19 +311,6 @@

 /**
  * @{
- * @name Alpha-Specific Interfaces
- */
-
-/**
- * Check for special simulator handling of specific PAL calls.  If
- * return value is false, actual PAL call will be suppressed.
- */
-virtual bool simPalCheck(int palFunc) = 0;
-
-/** @} */
-
-/**
- * @{
  * @name ARM-Specific Interfaces
  */

diff --git a/src/cpu/minor/exec_context.hh b/src/cpu/minor/exec_context.hh
index 22c6432..414bb41 100644
--- a/src/cpu/minor/exec_context.hh
+++ b/src/cpu/minor/exec_context.hh
@@ -365,16 +365,6 @@
 return thread.setMiscReg(reg.index(), val);
 }

-bool
-simPalCheck(int palFunc) override
-{
-#if THE_ISA == ALPHA_ISA
-return thread.simPalCheck(palFunc);
-#else
-return false;
-#endif
-}
-
 void
 syscall(int64_t callnum, Fault *fault) override
 {
diff --git a/src/cpu/o3/cpu.cc b/src/cpu/o3/cpu.cc
index bec4244..50de81b 100644
--- a/src/cpu/o3/cpu.cc
+++ b/src/cpu/o3/cpu.cc
@@ -918,32 +918,6 @@
 }

 template 
-bool
-FullO3CPU::simPalCheck(int palFunc, ThreadID tid)
-{
-#if THE_ISA == ALPHA_ISA
-if (this->thread[tid]->kernelStats)
-this->thread[tid]->kernelStats->callpal(palFunc,
-this->threadContexts[tid]);
-
-switch (palFunc) {
-  case PAL::halt:
-halt();
-if (--System::numSystemsRunning == 0)
-exitSimLoop("all cpus halted");
-break;
-
-  case PAL::bpt:
-  case PAL::bugchk:
-if (this->system->breakpoint())
-return false;
-break;
-}
-#endif
-return true;
-}
-
-template 
 void
 FullO3CPU::switchRenameMode(ThreadID tid, UnifiedFreeList* freelist)
 {
diff --git a/src/cpu/o3/cpu.hh b/src/cpu/o3/cpu.hh
index 11b5f18..49cec54 100644
--- a/src/cpu/o3/cpu.hh
+++ b/src/cpu/o3/cpu.hh
@@ -386,8 +386,6 @@
 /** Traps to handle given fault. */
 void trap(const Fault , ThreadID tid, const StaticInstPtr );

-bool simPalCheck(int palFunc, ThreadID tid);
-
 /** Check if a change in renaming is needed for vector registers.
  * The vecMode variable is updated and propagated to rename maps.
  *
diff --git a/src/cpu/o3/dyn_inst.hh b/src/cpu/o3/dyn_inst.hh
index 6bb8e2d..0d7877a 100644
--- a/src/cpu/o3/dyn_inst.hh
+++ b/src/cpu/o3/dyn_inst.hh
@@ -250,7 +250,6 @@
 }
 /** Traps to handle specified fault. */
 void trap(const Fault );
-bool simPalCheck(int palFunc) override;

 /** Emulates a syscall. */
 void syscall(int64_t callnum, Fault *fault) override;
diff --git a/src/cpu/o3/dyn_inst_impl.hh b/src/cpu/o3/dyn_inst_impl.hh
index