ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-08 14:03:06 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

remove old 32-bit registerMask stuff

Browse Source
This commit is contained in:
Joshua Warner 2014-12-04 16:32:52 -07:00
parent 76197e1f1d
commit 45cc85829a
4 changed files with 14 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/avian/codegen/architecture.h
View File

@ -45,21 +45,12 @@ class OperandMask {
{ {
} }
// TEMPORARY!
OperandMask(uint8_t typeMask,
RegisterMask registerMask)
: typeMask(typeMask),
lowRegisterMask(registerMask),
highRegisterMask(registerMask >> 32)
{
}
OperandMask() : typeMask(~0), lowRegisterMask(~static_cast<RegisterMask>(0)), highRegisterMask(~static_cast<RegisterMask>(0)) OperandMask() : typeMask(~0), lowRegisterMask(~static_cast<RegisterMask>(0)), highRegisterMask(~static_cast<RegisterMask>(0))
{ {
} }
void setLowHighRegisterMasks(RegisterMask lowRegisterMask, RegisterMask highRegisterMask) { void setLowHighRegisterMasks(RegisterMask lowRegisterMask, RegisterMask highRegisterMask) {
this->lowRegisterMask = lowRegisterMask | (highRegisterMask << 32); this->lowRegisterMask = lowRegisterMask;
this->highRegisterMask = highRegisterMask; this->highRegisterMask = highRegisterMask;
} }
}; };

4
src/codegen/compiler.cpp
View File

@ -342,7 +342,7 @@ Site* maybeMove(Context* c,
OperandMask src; OperandMask src;
OperandMask tmp; OperandMask tmp;
c->arch->planMove( c->arch->planMove(
size, src, tmp, OperandMask(dstMask.typeMask, dstMask.registerMask)); size, src, tmp, OperandMask(dstMask.typeMask, dstMask.registerMask, 0));
SiteMask srcMask = SiteMask::lowPart(src); SiteMask srcMask = SiteMask::lowPart(src);
for (SiteIterator it(c, value, true, includeNextWord); it.hasMore();) { for (SiteIterator it(c, value, true, includeNextWord); it.hasMore();) {
@ -369,7 +369,7 @@ Site* maybeMove(Context* c,
size, size,
src, src,
tmp, tmp,
OperandMask(1 << dstSite->type(c), dstSite->registerMask(c))); OperandMask(1 << dstSite->type(c), dstSite->registerMask(c), 0));
SiteMask srcMask = SiteMask::lowPart(src); SiteMask srcMask = SiteMask::lowPart(src);
unsigned cost = 0xFFFFFFFF; unsigned cost = 0xFFFFFFFF;

26
src/codegen/compiler/event.cpp
View File

@ -784,8 +784,8 @@ class MoveEvent : public Event {
srcSelectSize, srcSelectSize,
OperandMask( OperandMask(
1 << srcValue->source->type(c), 1 << srcValue->source->type(c),
(static_cast<uint64_t>(srcValue->nextWord->source->registerMask(c)) srcValue->source->registerMask(c),
<< 32) | static_cast<uint64_t>(srcValue->source->registerMask(c))), srcValue->nextWord->source->registerMask(c)),
dstSize, dstSize,
dst); dst);
@ -1127,17 +1127,13 @@ class CombineEvent : public Event {
firstValue->type.size(c->targetInfo), firstValue->type.size(c->targetInfo),
OperandMask( OperandMask(
1 << firstValue->source->type(c), 1 << firstValue->source->type(c),
(static_cast<uint64_t>( firstValue->source->registerMask(c),
firstValue->nextWord->source->registerMask(c)) firstValue->nextWord->source->registerMask(c)),
<< 32)
| static_cast<uint64_t>(firstValue->source->registerMask(c))),
secondValue->type.size(c->targetInfo), secondValue->type.size(c->targetInfo),
OperandMask( OperandMask(
1 << secondValue->source->type(c), 1 << secondValue->source->type(c),
(static_cast<uint64_t>( secondValue->source->registerMask(c),
secondValue->nextWord->source->registerMask(c)) secondValue->nextWord->source->registerMask(c)),
<< 32)
| static_cast<uint64_t>(secondValue->source->registerMask(c))),
resultValue->type.size(c->targetInfo), resultValue->type.size(c->targetInfo),
cMask); cMask);
@ -1319,10 +1315,8 @@ class TranslateEvent : public Event {
firstValue->type.size(c->targetInfo), firstValue->type.size(c->targetInfo),
OperandMask( OperandMask(
1 << firstValue->source->type(c), 1 << firstValue->source->type(c),
(static_cast<uint64_t>( firstValue->source->registerMask(c),
firstValue->nextWord->source->registerMask(c)) firstValue->nextWord->source->registerMask(c)),
<< 32)
| static_cast<uint64_t>(firstValue->source->registerMask(c))),
resultValue->type.size(c->targetInfo), resultValue->type.size(c->targetInfo),
bMask); bMask);
@ -1718,9 +1712,9 @@ class BranchEvent : public Event {
OperandMask dstMask; OperandMask dstMask;
c->arch->planDestination(op, c->arch->planDestination(op,
firstValue->type.size(c->targetInfo), firstValue->type.size(c->targetInfo),
OperandMask(0, 0), OperandMask(0, 0, 0),
firstValue->type.size(c->targetInfo), firstValue->type.size(c->targetInfo),
OperandMask(0, 0), OperandMask(0, 0, 0),
c->targetInfo.pointerSize, c->targetInfo.pointerSize,
dstMask); dstMask);

2
src/codegen/compiler/site.h
View File

@ -35,7 +35,7 @@ class SiteMask {
} }
SiteMask(uint8_t typeMask, RegisterMask registerMask, int frameIndex) SiteMask(uint8_t typeMask, RegisterMask registerMask, int frameIndex)
: typeMask(typeMask), registerMask(/*TODO: REMOVE CAST!!! */(uint32_t)registerMask), frameIndex(frameIndex) : typeMask(typeMask), registerMask(registerMask), frameIndex(frameIndex)
{ {
} }