From dc8018a5c3482008232e6faaa2d96cf20aed7485 Mon Sep 17 00:00:00 2001 From: Steve Reinhardt Date: Sat, 6 Feb 2016 17:21:18 -0800 Subject: style: remove trailing whitespace Result of running 'hg m5style --skip-all --fix-white -a'. --- src/arch/alpha/isa/decoder.isa | 24 ++++++++++++------------ src/arch/alpha/linux/linux.hh | 2 +- src/arch/alpha/process.cc | 8 ++++---- src/arch/alpha/tlb.cc | 6 +++--- 4 files changed, 20 insertions(+), 20 deletions(-) (limited to 'src/arch/alpha') diff --git a/src/arch/alpha/isa/decoder.isa b/src/arch/alpha/isa/decoder.isa index a114afaea..d6de363a7 100644 --- a/src/arch/alpha/isa/decoder.isa +++ b/src/arch/alpha/isa/decoder.isa @@ -349,7 +349,7 @@ decode OPCODE default Unknown::unknown() { for (int i = 0; i < 8; ++i) { uint8_t ra_ub = Ra_uq; uint8_t rb_ub = Rb_uq; - temp += (ra_ub >= rb_ub) ? + temp += (ra_ub >= rb_ub) ? (ra_ub - rb_ub) : (rb_ub - ra_ub); hi += 8; lo += 8; @@ -378,15 +378,15 @@ decode OPCODE default Unknown::unknown() { if (!(temp<7:0>)) { temp >>= 8; count += 8; } if (!(temp<3:0>)) { temp >>= 4; count += 4; } if (!(temp<1:0>)) { temp >>= 2; count += 2; } - if (!(temp<0:0> & ULL(0x1))) { - temp >>= 1; count += 1; + if (!(temp<0:0> & ULL(0x1))) { + temp >>= 1; count += 1; } if (!(temp<0:0> & ULL(0x1))) count += 1; Rc = count; }}, IntAluOp); - 0x34: unpkbw({{ + 0x34: unpkbw({{ Rc = (Rb_uq<7:0> | (Rb_uq<15:8> << 16) | (Rb_uq<23:16> << 32) @@ -415,7 +415,7 @@ decode OPCODE default Unknown::unknown() { for (int i = 7; i >= 0; --i) { int8_t ra_sb = Ra_uq; int8_t rb_sb = Rb_uq; - temp = ((temp << 8) + temp = ((temp << 8) | ((ra_sb < rb_sb) ? Ra_uq : Rb_uq)); hi -= 8; @@ -431,7 +431,7 @@ decode OPCODE default Unknown::unknown() { for (int i = 3; i >= 0; --i) { int16_t ra_sw = Ra_uq; int16_t rb_sw = Rb_uq; - temp = ((temp << 16) + temp = ((temp << 16) | ((ra_sw < rb_sw) ? Ra_uq : Rb_uq)); hi -= 16; @@ -447,7 +447,7 @@ decode OPCODE default Unknown::unknown() { for (int i = 7; i >= 0; --i) { uint8_t ra_ub = Ra_uq; uint8_t rb_ub = Rb_uq; - temp = ((temp << 8) + temp = ((temp << 8) | ((ra_ub < rb_ub) ? Ra_uq : Rb_uq)); hi -= 8; @@ -463,7 +463,7 @@ decode OPCODE default Unknown::unknown() { for (int i = 3; i >= 0; --i) { uint16_t ra_sw = Ra_uq; uint16_t rb_sw = Rb_uq; - temp = ((temp << 16) + temp = ((temp << 16) | ((ra_sw < rb_sw) ? Ra_uq : Rb_uq)); hi -= 16; @@ -479,7 +479,7 @@ decode OPCODE default Unknown::unknown() { for (int i = 7; i >= 0; --i) { uint8_t ra_ub = Ra_uq; uint8_t rb_ub = Rb_uq; - temp = ((temp << 8) + temp = ((temp << 8) | ((ra_ub > rb_ub) ? Ra_uq : Rb_uq)); hi -= 8; @@ -495,7 +495,7 @@ decode OPCODE default Unknown::unknown() { for (int i = 3; i >= 0; --i) { uint16_t ra_uw = Ra_uq; uint16_t rb_uw = Rb_uq; - temp = ((temp << 16) + temp = ((temp << 16) | ((ra_uw > rb_uw) ? Ra_uq : Rb_uq)); hi -= 16; @@ -511,7 +511,7 @@ decode OPCODE default Unknown::unknown() { for (int i = 7; i >= 0; --i) { int8_t ra_sb = Ra_uq; int8_t rb_sb = Rb_uq; - temp = ((temp << 8) + temp = ((temp << 8) | ((ra_sb > rb_sb) ? Ra_uq : Rb_uq)); hi -= 8; @@ -527,7 +527,7 @@ decode OPCODE default Unknown::unknown() { for (int i = 3; i >= 0; --i) { int16_t ra_sw = Ra_uq; int16_t rb_sw = Rb_uq; - temp = ((temp << 16) + temp = ((temp << 16) | ((ra_sw > rb_sw) ? Ra_uq : Rb_uq)); hi -= 16; diff --git a/src/arch/alpha/linux/linux.hh b/src/arch/alpha/linux/linux.hh index 115508405..f019b4f21 100644 --- a/src/arch/alpha/linux/linux.hh +++ b/src/arch/alpha/linux/linux.hh @@ -127,7 +127,7 @@ class AlphaLinux : public Linux static const unsigned TGT_RLIMIT_AS = 7; static const unsigned TGT_RLIMIT_NOFILE = 6; static const unsigned TGT_RLIMIT_MEMLOCK = 9; - + typedef struct { int64_t uptime; /* Seconds since boot */ uint64_t loads[3]; /* 1, 5, and 15 minute load averages */ diff --git a/src/arch/alpha/process.cc b/src/arch/alpha/process.cc index e214c8874..3b37b42c7 100644 --- a/src/arch/alpha/process.cc +++ b/src/arch/alpha/process.cc @@ -75,7 +75,7 @@ AlphaLiveProcess::argsInit(int intSize, int pageSize) ElfObject * elfObject = dynamic_cast(objFile); if(elfObject) { - // modern glibc uses a bunch of auxiliary vectors to set up + // modern glibc uses a bunch of auxiliary vectors to set up // TLS as well as do a bunch of other stuff // these vectors go on the bottom of the stack, below argc/argv/envp // pointers but above actual arg strings @@ -111,10 +111,10 @@ AlphaLiveProcess::argsInit(int intSize, int pageSize) } int space_needed = - argv_array_size + - envp_array_size + + argv_array_size + + envp_array_size + auxv_array_size + - arg_data_size + + arg_data_size + env_data_size; if (space_needed < 32*1024) diff --git a/src/arch/alpha/tlb.cc b/src/arch/alpha/tlb.cc index 5f0ed85db..3360b34c5 100644 --- a/src/arch/alpha/tlb.cc +++ b/src/arch/alpha/tlb.cc @@ -230,9 +230,9 @@ TLB::checkCacheability(RequestPtr &req, bool itb) req->setPaddr(req->getPaddr() & PAddrUncachedMask); } // 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 - // register as we destroy any data that is clear-on-read. - if (req->isUncacheable() && itb) + // we don't have a ROM and we don't want to try to fetch from a device + // register as we destroy any data that is clear-on-read. + if (req->isUncacheable() && itb) return std::make_shared( "CPU trying to fetch from uncached I/O"); -- cgit v1.2.3