diff options
Diffstat (limited to 'src/arch')
| -rw-r--r-- | src/arch/alpha/system.hh | 4 | ||||
| -rw-r--r-- | src/arch/mips/isa/includes.isa | 1 | ||||
| -rw-r--r-- | src/arch/sparc/isa/decoder.isa | 8 |
3 files changed, 7 insertions, 6 deletions
diff --git a/src/arch/alpha/system.hh b/src/arch/alpha/system.hh index 0f4f64581..0c073a68c 100644 --- a/src/arch/alpha/system.hh +++ b/src/arch/alpha/system.hh @@ -91,14 +91,14 @@ class AlphaSystem : public System /** Add a function-based event to PALcode. */ template <class T> - T *AlphaSystem::addPalFuncEvent(const char *lbl) + T *addPalFuncEvent(const char *lbl) { return addFuncEvent<T>(palSymtab, lbl); } /** Add a function-based event to the console code. */ template <class T> - T *AlphaSystem::addConsoleFuncEvent(const char *lbl) + T *addConsoleFuncEvent(const char *lbl) { return addFuncEvent<T>(consoleSymtab, lbl); } diff --git a/src/arch/mips/isa/includes.isa b/src/arch/mips/isa/includes.isa index 6b5f3c588..f58c8adaa 100644 --- a/src/arch/mips/isa/includes.isa +++ b/src/arch/mips/isa/includes.isa @@ -75,6 +75,7 @@ output exec {{ #include "cpu/base.hh" #include "cpu/exetrace.hh" #include "sim/sim_exit.hh" +#include "mem/packet_impl.hh" using namespace MipsISA; }}; diff --git a/src/arch/sparc/isa/decoder.isa b/src/arch/sparc/isa/decoder.isa index 0c2729833..25203f45c 100644 --- a/src/arch/sparc/isa/decoder.isa +++ b/src/arch/sparc/isa/decoder.isa @@ -220,7 +220,7 @@ decode OP default Unknown::unknown() ,{{0}},{{0}},{{0}},{{0}}); 0x1E: udivcc({{ uint32_t resTemp, val2 = Rs2_or_imm13.udw; - int32_t overflow; + int32_t overflow = 0; if(val2 == 0) fault = new DivisionByZero; else { @@ -236,7 +236,7 @@ decode OP default Unknown::unknown() ); 0x1F: sdivcc({{ int32_t resTemp, val2 = Rs2_or_imm13.sdw; - int32_t overflow, underflow; + int32_t overflow = 0, underflow = 0; if(val2 == 0) fault = new DivisionByZero; else { @@ -244,7 +244,7 @@ decode OP default Unknown::unknown() overflow = (resTemp<63:31> != 0); underflow = (resTemp<63:> && resTemp<62:31> != 0xFFFFFFFF); if(overflow) Rd = resTemp = 0x7FFFFFFF; - else if(underflow) Rd = resTemp = 0xFFFFFFFF80000000ULL; + else if(underflow) resTemp = Rd = 0xFFFFFFFF80000000ULL; else Rd = resTemp; } }}, {{0}}, @@ -272,7 +272,7 @@ decode OP default Unknown::unknown() ); 0x22: taddcctv({{ int64_t resTemp, val2 = Rs2_or_imm13; - Rd = Rs1 + val2; + Rd = resTemp = Rs1 + val2; int32_t overflow = Rs1<1:0> || val2<1:0> || (Rs1<31:> == val2<31:> && val2<31:> != Rd<31:>); if(overflow) fault = new TagOverflow;}}, |