derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

arch-sparc: Stop "using namespace std"

Browse Source 
Change-Id: I4a1019b5978b08b4999edfe5f65ef7eae06481c2
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/39560
Reviewed-by: Daniel Carvalho <odanrc@yahoo.com.br>
Maintainer: Gabe Black <gabe.black@gmail.com>
Tested-by: kokoro <noreply+kokoro@google.com>
This commit is contained in:
Gabe Black
2021-01-21 03:43:35 -08:00
parent 35c4ed086d
commit 5f6f6d0850
5 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/arch/sparc/faults.cc
View File

@@ -42,8 +42,6 @@
#include "sim/full_system.hh"
#include "sim/process.hh"
using namespace std;
namespace SparcISA
{
@@ -340,7 +338,7 @@ doREDFault(ThreadContext *tc, TrapType tt)
tc->setMiscRegNoEffect(MISCREG_TT, tt);
// Update GL
tc->setMiscReg(MISCREG_GL, min<int>(GL+1, MaxGL));
tc->setMiscReg(MISCREG_GL, std::min<int>(GL+1, MaxGL));
bool priv = pstate.priv; // just save the priv bit
pstate = 0;
@@ -424,9 +422,9 @@ doNormalFault(ThreadContext *tc, TrapType tt, bool gotoHpriv)
// Update the global register level
if (!gotoHpriv)
tc->setMiscReg(MISCREG_GL, min<int>(GL + 1, MaxPGL));
tc->setMiscReg(MISCREG_GL, std::min<int>(GL + 1, MaxPGL));
else
tc->setMiscReg(MISCREG_GL, min<int>(GL + 1, MaxGL));
tc->setMiscReg(MISCREG_GL, std::min<int>(GL + 1, MaxGL));
// pstate.mm is unchanged
pstate.pef = 1; // PSTATE.pef = whether or not an fpu is present

1
src/arch/sparc/isa/includes.isa
View File

@@ -86,6 +86,5 @@ output exec {{
#include "sim/sim_exit.hh"
using namespace SparcISA;
using namespace std;
}};

3
src/arch/sparc/process.cc
View File

@@ -45,7 +45,6 @@
#include "sim/syscall_return.hh"
#include "sim/system.hh"
using namespace std;
using namespace SparcISA;
SparcProcess::SparcProcess(const ProcessParams &params,
@@ -142,7 +141,7 @@ SparcProcess::argsInit(int pageSize)
std::vector<AuxVector<IntType>> auxv;
string filename;
std::string filename;
if (argv.size() < 1)
filename = "";
else

1
src/arch/sparc/remote_gdb.cc
View File

@@ -140,7 +140,6 @@
#include "sim/process.hh"
#include "sim/system.hh"
using namespace std;
using namespace SparcISA;
RemoteGDB::RemoteGDB(System *_system, ThreadContext *c, int _port)

5
src/arch/sparc/ua2005.cc
View File

@@ -38,7 +38,6 @@
#include "sim/system.hh"
using namespace SparcISA;
using namespace std;
void
@@ -66,10 +65,10 @@ ISA::checkSoftInt()
}
// These functions map register indices to names
static inline string
static inline std::string
getMiscRegName(RegIndex index)
{
static string miscRegName[NumMiscRegs] =
static std::string miscRegName[NumMiscRegs] =
{/*"y", "ccr",*/ "asi", "tick", "fprs", "pcr", "pic",
"gsr", "softint_set", "softint_clr", "softint", "tick_cmpr",
"stick", "stick_cmpr",