changeset cc13df09fa55 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=cc13df09fa55
description:
arm: More UBSan cleanups after additional full-system runs
Some incorrect casting to IntRegIndex, and a few uninitialized members
in the i8254xGBe device.
diffstat:
src/arch/arm/insts/misc.hh | 8 ++++----
src/arch/arm/isa/formats/misc.isa | 4 ++--
src/arch/arm/isa/templates/misc.isa | 8 ++++----
src/dev/i8254xGBe.cc | 8 +++++---
4 files changed, 15 insertions(+), 13 deletions(-)
diffs (111 lines):
diff -r 28b31101d9e6 -r cc13df09fa55 src/arch/arm/insts/misc.hh
--- a/src/arch/arm/insts/misc.hh Sun Sep 28 16:53:48 2014 -0400
+++ b/src/arch/arm/insts/misc.hh Wed Oct 01 08:05:51 2014 -0400
@@ -97,13 +97,13 @@
class MrrcOp : public PredOp
{
protected:
- IntRegIndex op1;
+ MiscRegIndex op1;
IntRegIndex dest;
IntRegIndex dest2;
uint32_t imm;
MrrcOp(const char *mnem, ExtMachInst _machInst, OpClass __opClass,
- IntRegIndex _op1, IntRegIndex _dest, IntRegIndex _dest2,
+ MiscRegIndex _op1, IntRegIndex _dest, IntRegIndex _dest2,
uint32_t _imm) :
PredOp(mnem, _machInst, __opClass), op1(_op1), dest(_dest),
dest2(_dest2), imm(_imm)
@@ -117,11 +117,11 @@
protected:
IntRegIndex op1;
IntRegIndex op2;
- IntRegIndex dest;
+ MiscRegIndex dest;
uint32_t imm;
McrrOp(const char *mnem, ExtMachInst _machInst, OpClass __opClass,
- IntRegIndex _op1, IntRegIndex _op2, IntRegIndex _dest,
+ IntRegIndex _op1, IntRegIndex _op2, MiscRegIndex _dest,
uint32_t _imm) :
PredOp(mnem, _machInst, __opClass), op1(_op1), op2(_op2),
dest(_dest), imm(_imm)
diff -r 28b31101d9e6 -r cc13df09fa55 src/arch/arm/isa/formats/misc.isa
--- a/src/arch/arm/isa/formats/misc.isa Sun Sep 28 16:53:48 2014 -0400
+++ b/src/arch/arm/isa/formats/misc.isa Wed Oct 01 08:05:51 2014 -0400
@@ -274,8 +274,8 @@
uint32_t iss = mcrrMrrcIssBuild(isRead, crm, rt, rt2, opc1);
if (isRead)
- return new Mrrc15(machInst, (IntRegIndex) miscReg, rt2,
rt, iss);
- return new Mcrr15(machInst, rt2, rt, (IntRegIndex) miscReg,
iss);
+ return new Mrrc15(machInst, miscReg, rt2, rt, iss);
+ return new Mcrr15(machInst, rt2, rt, miscReg, iss);
} else {
return new FailUnimplemented(isRead ? "mrrc" : "mcrr",
machInst,
csprintf("%s %s",
diff -r 28b31101d9e6 -r cc13df09fa55 src/arch/arm/isa/templates/misc.isa
--- a/src/arch/arm/isa/templates/misc.isa Sun Sep 28 16:53:48 2014 -0400
+++ b/src/arch/arm/isa/templates/misc.isa Wed Oct 01 08:05:51 2014 -0400
@@ -183,7 +183,7 @@
protected:
public:
// Constructor
- %(class_name)s(ExtMachInst machInst, IntRegIndex _op1,
+ %(class_name)s(ExtMachInst machInst, MiscRegIndex _op1,
IntRegIndex _dest, IntRegIndex _dest2, uint32_t imm);
%(BasicExecDeclare)s
};
@@ -191,7 +191,7 @@
def template MrrcOpConstructor {{
%(class_name)s::%(class_name)s(ExtMachInst machInst,
- IntRegIndex op1,
+ MiscRegIndex op1,
IntRegIndex dest,
IntRegIndex dest2,
uint32_t imm)
@@ -214,7 +214,7 @@
public:
// Constructor
%(class_name)s(ExtMachInst machInst, IntRegIndex _op1, IntRegIndex
_op2,
- IntRegIndex _dest, uint32_t imm);
+ MiscRegIndex _dest, uint32_t imm);
%(BasicExecDeclare)s
};
}};
@@ -223,7 +223,7 @@
%(class_name)s::%(class_name)s(ExtMachInst machInst,
IntRegIndex op1,
IntRegIndex op2,
- IntRegIndex dest,
+ MiscRegIndex dest,
uint32_t imm)
: %(base_class)s("%(mnemonic)s", machInst, %(op_class)s, op1, op2,
dest, imm)
diff -r 28b31101d9e6 -r cc13df09fa55 src/dev/i8254xGBe.cc
--- a/src/dev/i8254xGBe.cc Sun Sep 28 16:53:48 2014 -0400
+++ b/src/dev/i8254xGBe.cc Wed Oct 01 08:05:51 2014 -0400
@@ -821,8 +821,9 @@
template<class T>
IGbE::DescCache<T>::DescCache(IGbE *i, const std::string n, int s)
: igbe(i), _name(n), cachePnt(0), size(s), curFetching(0),
- wbOut(0), pktPtr(NULL), wbDelayEvent(this),
- fetchDelayEvent(this), fetchEvent(this), wbEvent(this)
+ wbOut(0), moreToWb(false), wbAlignment(0), pktPtr(NULL),
+ wbDelayEvent(this), fetchDelayEvent(this), fetchEvent(this),
+ wbEvent(this)
{
fetchBuf = new T[size];
wbBuf = new T[size];
@@ -1540,7 +1541,8 @@
IGbE::TxDescCache::TxDescCache(IGbE *i, const std::string n, int s)
: DescCache<TxDesc>(i,n, s), pktDone(false), isTcp(false),
- pktWaiting(false), completionAddress(0), completionEnabled(false),
+ pktWaiting(false), pktMultiDesc(false),
+ completionAddress(0), completionEnabled(false),
useTso(false), tsoHeaderLen(0), tsoMss(0), tsoTotalLen(0), tsoUsedLen(0),
tsoPrevSeq(0), tsoPktPayloadBytes(0), tsoLoadedHeader(false),
tsoPktHasHeader(false), tsoDescBytesUsed(0), tsoCopyBytes(0), tsoPkts(0),
_______________________________________________
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev
