alpha: get rid of all turbolaser remnants

diff --git a/SConstruct b/SConstruct
index cd22ab2cc271f103b860d1408b49c1eacc1ee493..1c7f09515e77c97ed942bf43ece30310e02740da 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -698,7 +698,7 @@ nonsticky_vars.AddVariables(
     )
 
 # These variables get exported to #defines in config/*.hh (see src/SConscript).
-env.ExportVariables = ['FULL_SYSTEM', 'ALPHA_TLASER', 'USE_FENV', \
+env.ExportVariables = ['FULL_SYSTEM', 'USE_FENV', \
                        'USE_MYSQL', 'NO_FAST_ALLOC', 'FAST_ALLOC_DEBUG', \
                        'FAST_ALLOC_STATS', 'SS_COMPATIBLE_FP', \
                        'USE_CHECKER', 'TARGET_ISA', 'CP_ANNOTATE']

diff --git a/build_opts/ALPHA_FS b/build_opts/ALPHA_FS
index ddd69b9b3ff188f5a3f9850b30ae610f24cbbbcc..a2ab671786e30637143ac0fed2e33cb1a7d5a591 100644 (file)
--- a/build_opts/ALPHA_FS
+++ b/build_opts/ALPHA_FS
@@ -1,2 +1 @@
 FULL_SYSTEM = 1
-ALPHA_TLASER = 0

diff --git a/build_opts/ALPHA_FS_TL b/build_opts/ALPHA_FS_TL
deleted file mode 100644 (file)
index 4f3e201..0000000
--- a/build_opts/ALPHA_FS_TL
+++ /dev/null
@@ -1,2 +0,0 @@
-FULL_SYSTEM = 1
-ALPHA_TLASER = 1

diff --git a/src/arch/alpha/SConsopts b/src/arch/alpha/SConsopts
index b418e27c86990fc473aea0745ce5821e0432f58f..4af7a4dafd2b4b38b1ba483a117d2b7a082ddd29 100644 (file)
--- a/src/arch/alpha/SConsopts
+++ b/src/arch/alpha/SConsopts
@@ -31,7 +31,3 @@
 Import('*')
 
 all_isa_list.append('alpha')
-
-# Alpha can be compiled with Turbolaser support instead of Tsunami
-sticky_vars.Add(BoolVariable('ALPHA_TLASER',
-    'Model Alpha TurboLaser platform (vs. Tsunami)', False))

diff --git a/src/arch/alpha/ev5.hh b/src/arch/alpha/ev5.hh
index 1915d822b19d0baf14793d52d16b560862c6b382..a135ac506c95d72f4d3f1bbb729c8cd1fe1fdbd9 100644 (file)
--- a/src/arch/alpha/ev5.hh
+++ b/src/arch/alpha/ev5.hh
@@ -33,17 +33,11 @@
 #ifndef __ARCH_ALPHA_EV5_HH__
 #define __ARCH_ALPHA_EV5_HH__
 
-#include "config/alpha_tlaser.hh"
 #include "arch/alpha/isa_traits.hh"
 
 namespace AlphaISA {
 
-#if ALPHA_TLASER
-const uint64_t AsnMask = ULL(0x7f);
-#else
 const uint64_t AsnMask = ULL(0xff);
-#endif
-
 const int VAddrImplBits = 43;
 const Addr VAddrImplMask = (ULL(1) << VAddrImplBits) - 1;
 const Addr VAddrUnImplMask = ~VAddrImplMask;
@@ -53,13 +47,8 @@ inline Addr VAddrOffset(Addr a) { return a & PageOffset; }
 inline Addr VAddrSpaceEV5(Addr a) { return a >> 41 & 0x3; }
 inline Addr VAddrSpaceEV6(Addr a) { return a >> 41 & 0x7f; }
 
-#if ALPHA_TLASER
-inline bool PAddrIprSpace(Addr a) { return a >= ULL(0xFFFFF00000); }
-const int PAddrImplBits = 40;
-#else
 inline bool PAddrIprSpace(Addr a) { return a >= ULL(0xFFFFFF00000); }
 const int PAddrImplBits = 44; // for Tsunami
-#endif
 const Addr PAddrImplMask = (ULL(1) << PAddrImplBits) - 1;
 const Addr PAddrUncachedBit39 = ULL(0x8000000000);
 const Addr PAddrUncachedBit40 = ULL(0x10000000000);
@@ -69,12 +58,10 @@ const Addr PAddrUncachedMask = ULL(0x807ffffffff); // Clear PA<42:35>
 inline Addr
 Phys2K0Seg(Addr addr)
 {
-#if !ALPHA_TLASER
     if (addr & PAddrUncachedBit43) {
         addr &= PAddrUncachedMask;
         addr |= PAddrUncachedBit40;
     }
-#endif
     return addr | K0SegBase;
 }
 

diff --git a/src/arch/alpha/tlb.cc b/src/arch/alpha/tlb.cc
index d4f31b42148beeb66b0cc823c89cae68a809cf68..d9e9dd34206da72f43fe11092fce786b5c5a03c3 100644 (file)
--- a/src/arch/alpha/tlb.cc
+++ b/src/arch/alpha/tlb.cc
@@ -39,7 +39,6 @@
 #include "base/inifile.hh"
 #include "base/str.hh"
 #include "base/trace.hh"
-#include "config/alpha_tlaser.hh"
 #include "cpu/thread_context.hh"
 
 using namespace std;
@@ -215,12 +214,7 @@ TLB::checkCacheability(RequestPtr &req, bool itb)
      */
 
 
-#if ALPHA_TLASER
-    if (req->getPaddr() & PAddrUncachedBit39)
-#else
-    if (req->getPaddr() & PAddrUncachedBit43)
-#endif
-    {
+    if (req->getPaddr() & PAddrUncachedBit43) {
         // IPR memory space not implemented
         if (PAddrIprSpace(req->getPaddr())) {
             return new UnimpFault("IPR memory space not implemented!");
@@ -228,11 +222,9 @@ TLB::checkCacheability(RequestPtr &req, bool itb)
             // mark request as uncacheable
             req->setFlags(Request::UNCACHEABLE);
 
-#if !ALPHA_TLASER
             // Clear bits 42:35 of the physical address (10-2 in
             // Tsunami manual)
             req->setPaddr(req->getPaddr() & PAddrUncachedMask);
-#endif
         }
         // We shouldn't be able to read from an uncachable address in Alpha as
         // we don't have a ROM and we don't want to try to fetch from a device 
@@ -398,13 +390,7 @@ TLB::translateInst(RequestPtr req, ThreadContext *tc)
 
         // VA<42:41> == 2, VA<39:13> maps directly to PA<39:13> for EV5
         // VA<47:41> == 0x7e, VA<40:13> maps directly to PA<40:13> for EV6
-#if ALPHA_TLASER
-        if ((MCSR_SP(tc->readMiscRegNoEffect(IPR_MCSR)) & 2) &&
-            VAddrSpaceEV5(req->getVaddr()) == 2)
-#else
-        if (VAddrSpaceEV6(req->getVaddr()) == 0x7e)
-#endif
-        {
+        if (VAddrSpaceEV6(req->getVaddr()) == 0x7e) {
             // only valid in kernel mode
             if (ICM_CM(tc->readMiscRegNoEffect(IPR_ICM)) !=
                 mode_kernel) {
@@ -414,14 +400,11 @@ TLB::translateInst(RequestPtr req, ThreadContext *tc)
 
             req->setPaddr(req->getVaddr() & PAddrImplMask);
 
-#if !ALPHA_TLASER
             // sign extend the physical address properly
             if (req->getPaddr() & PAddrUncachedBit40)
                 req->setPaddr(req->getPaddr() | ULL(0xf0000000000));
             else
                 req->setPaddr(req->getPaddr() & ULL(0xffffffffff));
-#endif
-
         } else {
             // not a physical address: need to look up pte
             int asn = DTB_ASN_ASN(tc->readMiscRegNoEffect(IPR_DTB_ASN));
@@ -495,13 +478,7 @@ TLB::translateData(RequestPtr req, ThreadContext *tc, bool write)
         }
 
         // Check for "superpage" mapping
-#if ALPHA_TLASER
-        if ((MCSR_SP(tc->readMiscRegNoEffect(IPR_MCSR)) & 2) &&
-            VAddrSpaceEV5(req->getVaddr()) == 2)
-#else
-        if (VAddrSpaceEV6(req->getVaddr()) == 0x7e)
-#endif
-        {
+        if (VAddrSpaceEV6(req->getVaddr()) == 0x7e) {
             // only valid in kernel mode
             if (DTB_CM_CM(tc->readMiscRegNoEffect(IPR_DTB_CM)) !=
                 mode_kernel) {
@@ -515,14 +492,11 @@ TLB::translateData(RequestPtr req, ThreadContext *tc, bool write)
 
             req->setPaddr(req->getVaddr() & PAddrImplMask);
 
-#if !ALPHA_TLASER
             // sign extend the physical address properly
             if (req->getPaddr() & PAddrUncachedBit40)
                 req->setPaddr(req->getPaddr() | ULL(0xf0000000000));
             else
                 req->setPaddr(req->getPaddr() & ULL(0xffffffffff));
-#endif
-
         } else {
             if (write)
                 write_accesses++;

diff --git a/src/dev/Uart.py b/src/dev/Uart.py
index c5db3c42f5c1a8eedd688ccd1576d809cbef4591..5135a064d8efded0430dcf0f6f5e8d0c643d1ade 100644 (file)
--- a/src/dev/Uart.py
+++ b/src/dev/Uart.py
@@ -38,8 +38,3 @@ class Uart(BasicPioDevice):
 
 class Uart8250(Uart):
     type = 'Uart8250'
-
-if build_env['ALPHA_TLASER']:
-    class Uart8530(Uart):
-        type = 'Uart8530'
-

diff --git a/tests/SConscript b/tests/SConscript
index 38e9ae9d25274e291433c70433687dbf5505f892..42b844813a5fe81a69ab2d5eb5d6f2c2f31ce415 100644 (file)
--- a/tests/SConscript
+++ b/tests/SConscript
@@ -251,13 +251,12 @@ def test_builder(env, ref_dir):
 configs = []
 if env['FULL_SYSTEM']:
     if env['TARGET_ISA'] == 'alpha':
-        if not env['ALPHA_TLASER']:
-            configs += ['tsunami-simple-atomic',
-                        'tsunami-simple-timing',
-                        'tsunami-simple-atomic-dual',
-                        'tsunami-simple-timing-dual',
-                        'twosys-tsunami-simple-atomic',
-                        'tsunami-o3', 'tsunami-o3-dual']
+        configs += ['tsunami-simple-atomic',
+                    'tsunami-simple-timing',
+                    'tsunami-simple-atomic-dual',
+                    'tsunami-simple-timing-dual',
+                    'twosys-tsunami-simple-atomic',
+                    'tsunami-o3', 'tsunami-o3-dual']
     if env['TARGET_ISA'] == 'sparc':
         configs += ['t1000-simple-atomic',
                     't1000-simple-timing']