wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1166711 part 2.3 - M{Load,Store}UnboxedScalar: Rename indexType to storageType. r=bbouvier

Browse Source
This commit is contained in:
Nicolas B. Pierron 2015-06-11 14:30:32 +02:00
parent 4b01311b3b
commit 7095ec698f
3 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/src/jit/CodeGenerator.cpp
View File

@ -9090,7 +9090,7 @@ CodeGenerator::visitLoadUnboxedScalar(LLoadUnboxedScalar* lir)
Scalar::Type readType = mir->readType();
unsigned numElems = mir->numElems();
int width = Scalar::byteSize(mir->indexType());
int width = Scalar::byteSize(mir->storageType());
bool canonicalizeDouble = mir->canonicalizeDoubles();
Label fail;
@ -9177,7 +9177,7 @@ CodeGenerator::visitStoreUnboxedScalar(LStoreUnboxedScalar* lir)
Scalar::Type writeType = mir->writeType();
unsigned numElems = mir->numElems();
int width = Scalar::byteSize(mir->indexType());
int width = Scalar::byteSize(mir->storageType());
if (lir->index()->isConstant()) {
Address dest(elements, ToInt32(lir->index()) * width + mir->offsetAdjustment());

2
js/src/jit/MIR.cpp
View File

@ -1076,7 +1076,7 @@ void
MLoadUnboxedScalar::printOpcode(GenericPrinter& out) const
{
MDefinition::printOpcode(out);
out.printf(" %s", ScalarTypeDescr::typeName(indexType()));
out.printf(" %s", ScalarTypeDescr::typeName(storageType()));
}
void

40
js/src/jit/MIR.h
View File

@ -9323,7 +9323,7 @@ class MLoadUnboxedScalar
: public MBinaryInstruction,
public SingleObjectPolicy::Data
{
Scalar::Type indexType_;
Scalar::Type storageType_;
Scalar::Type readType_;
unsigned numElems_; // used only for SIMD
bool requiresBarrier_;
@ -9331,11 +9331,11 @@ class MLoadUnboxedScalar
bool canonicalizeDoubles_;
MLoadUnboxedScalar(MDefinition* elements, MDefinition* index,
Scalar::Type indexType, MemoryBarrierRequirement requiresBarrier,
Scalar::Type storageType, MemoryBarrierRequirement requiresBarrier,
int32_t offsetAdjustment, bool canonicalizeDoubles)
: MBinaryInstruction(elements, index),
indexType_(indexType),
readType_(indexType),
storageType_(storageType),
readType_(storageType),
numElems_(1),
requiresBarrier_(requiresBarrier == DoesRequireMemoryBarrier),
offsetAdjustment_(offsetAdjustment),
@ -9348,20 +9348,20 @@ class MLoadUnboxedScalar
setMovable();
MOZ_ASSERT(IsValidElementsType(elements, offsetAdjustment));
MOZ_ASSERT(index->type() == MIRType_Int32);
MOZ_ASSERT(indexType >= 0 && indexType < Scalar::MaxTypedArrayViewType);
MOZ_ASSERT(storageType >= 0 && storageType < Scalar::MaxTypedArrayViewType);
}
public:
INSTRUCTION_HEADER(LoadUnboxedScalar)
static MLoadUnboxedScalar* New(TempAllocator& alloc, MDefinition* elements, MDefinition* index,
Scalar::Type indexType,
Scalar::Type storageType,
MemoryBarrierRequirement requiresBarrier
= DoesNotRequireMemoryBarrier,
int32_t offsetAdjustment = 0,
bool canonicalizeDoubles = true)
{
return new(alloc) MLoadUnboxedScalar(elements, index, indexType,
return new(alloc) MLoadUnboxedScalar(elements, index, storageType,
requiresBarrier, offsetAdjustment,
canonicalizeDoubles);
}
@ -9377,8 +9377,8 @@ class MLoadUnboxedScalar
return readType_;
}
Scalar::Type indexType() const {
return indexType_;
Scalar::Type storageType() const {
return storageType_;
}
bool fallible() const {
// Bailout if the result does not fit in an int32.
@ -9413,7 +9413,7 @@ class MLoadUnboxedScalar
if (!ins->isLoadUnboxedScalar())
return false;
const MLoadUnboxedScalar* other = ins->toLoadUnboxedScalar();
if (indexType_ != other->indexType_)
if (storageType_ != other->storageType_)
return false;
if (readType_ != other->readType_)
return false;
@ -9430,7 +9430,7 @@ class MLoadUnboxedScalar
void computeRange(TempAllocator& alloc) override;
bool canProduceFloat32() const override { return indexType_ == Scalar::Float32; }
bool canProduceFloat32() const override { return storageType_ == Scalar::Float32; }
ALLOW_CLONE(MLoadUnboxedScalar)
};
@ -9609,17 +9609,17 @@ class MStoreUnboxedScalar
public StoreUnboxedScalarBase,
public StoreUnboxedScalarPolicy::Data
{
Scalar::Type indexType_;
Scalar::Type storageType_;
bool requiresBarrier_;
int32_t offsetAdjustment_;
unsigned numElems_; // used only for SIMD
MStoreUnboxedScalar(MDefinition* elements, MDefinition* index, MDefinition* value,
Scalar::Type indexType, MemoryBarrierRequirement requiresBarrier,
Scalar::Type storageType, MemoryBarrierRequirement requiresBarrier,
int32_t offsetAdjustment)
: MTernaryInstruction(elements, index, value),
StoreUnboxedScalarBase(indexType),
indexType_(indexType),
StoreUnboxedScalarBase(storageType),
storageType_(storageType),
requiresBarrier_(requiresBarrier == DoesRequireMemoryBarrier),
offsetAdjustment_(offsetAdjustment),
numElems_(1)
@ -9630,7 +9630,7 @@ class MStoreUnboxedScalar
setMovable();
MOZ_ASSERT(IsValidElementsType(elements, offsetAdjustment));
MOZ_ASSERT(index->type() == MIRType_Int32);
MOZ_ASSERT(indexType >= 0 && indexType < Scalar::MaxTypedArrayViewType);
MOZ_ASSERT(storageType >= 0 && storageType < Scalar::MaxTypedArrayViewType);
}
public:
@ -9638,12 +9638,12 @@ class MStoreUnboxedScalar
static MStoreUnboxedScalar* New(TempAllocator& alloc,
MDefinition* elements, MDefinition* index,
MDefinition* value, Scalar::Type indexType,
MDefinition* value, Scalar::Type storageType,
MemoryBarrierRequirement requiresBarrier =
DoesNotRequireMemoryBarrier,
int32_t offsetAdjustment = 0)
{
return new(alloc) MStoreUnboxedScalar(elements, index, value, indexType,
return new(alloc) MStoreUnboxedScalar(elements, index, value, storageType,
requiresBarrier, offsetAdjustment);
}
@ -9655,8 +9655,8 @@ class MStoreUnboxedScalar
unsigned numElems() const {
return numElems_;
}
Scalar::Type indexType() const {
return indexType_;
Scalar::Type storageType() const {
return storageType_;
}
MDefinition* elements() const {
return getOperand(0);