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 832073 - s/ScaleFromShift/ScaleFromElemWidth/ (r=dvander)

Browse Source 
--HG--
extra : rebase_source : 113e5770c8f6c6ad67e55bdd341e79e03bb29ff9
This commit is contained in:
Luke Wagner 2012-12-14 10:27:15 -08:00
parent d8c9cd65c3
commit d87fb1100e
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
js/src/ion/CodeGenerator.cpp
View File

@ -1235,7 +1235,7 @@ CodeGenerator::emitPushArguments(LApplyArgsGeneric *apply, Register extraStackSp
// We remove sizeof(void*) from argvOffset because withtout it we target
// the address after the memory area that we want to copy.
BaseIndex disp(StackPointer, argcreg, ScaleFromShift(sizeof(Value)), argvOffset - sizeof(void*));
BaseIndex disp(StackPointer, argcreg, ScaleFromElemWidth(sizeof(Value)), argvOffset - sizeof(void*));
// Do not use Push here because other this account to 1 in the framePushed
// instead of 0. These push are only counted by argcreg.
@ -1253,7 +1253,7 @@ CodeGenerator::emitPushArguments(LApplyArgsGeneric *apply, Register extraStackSp
// Compute the stack usage.
masm.movePtr(argcreg, extraStackSpace);
masm.lshiftPtr(Imm32::ShiftOf(ScaleFromShift(sizeof(Value))), extraStackSpace);
masm.lshiftPtr(Imm32::ShiftOf(ScaleFromElemWidth(sizeof(Value))), extraStackSpace);
// Join with all arguments copied and the extra stack usage computed.
masm.bind(&end);
@ -3527,7 +3527,7 @@ CodeGenerator::visitGetArgument(LGetArgument *lir)
masm.loadValue(argPtr, result);
} else {
Register i = ToRegister(index);
BaseIndex argPtr(StackPointer, i, ScaleFromShift(sizeof(Value)), argvOffset);
BaseIndex argPtr(StackPointer, i, ScaleFromElemWidth(sizeof(Value)), argvOffset);
masm.loadValue(argPtr, result);
}
return true;
@ -4411,14 +4411,14 @@ CodeGenerator::visitLoadTypedArrayElement(LLoadTypedArrayElement *lir)
AnyRegister out = ToAnyRegister(lir->output());
int arrayType = lir->mir()->arrayType();
int shift = TypedArray::slotWidth(arrayType);
int width = TypedArray::slotWidth(arrayType);
Label fail;
if (lir->index()->isConstant()) {
Address source(elements, ToInt32(lir->index()) * shift);
Address source(elements, ToInt32(lir->index()) * width);
masm.loadFromTypedArray(arrayType, source, out, temp, &fail);
} else {
BaseIndex source(elements, ToRegister(lir->index()), ScaleFromShift(shift));
BaseIndex source(elements, ToRegister(lir->index()), ScaleFromElemWidth(width));
masm.loadFromTypedArray(arrayType, source, out, temp, &fail);
}
@ -4468,14 +4468,14 @@ CodeGenerator::visitLoadTypedArrayElementHole(LLoadTypedArrayElementHole *lir)
masm.loadPtr(Address(object, TypedArray::dataOffset()), scratch);
int arrayType = lir->mir()->arrayType();
int shift = TypedArray::slotWidth(arrayType);
int width = TypedArray::slotWidth(arrayType);
Label fail;
if (key.isConstant()) {
Address source(scratch, key.constant() * shift);
Address source(scratch, key.constant() * width);
masm.loadFromTypedArray(arrayType, source, out, lir->mir()->allowDouble(), &fail);
} else {
BaseIndex source(scratch, key.reg(), ScaleFromShift(shift));
BaseIndex source(scratch, key.reg(), ScaleFromElemWidth(width));
masm.loadFromTypedArray(arrayType, source, out, lir->mir()->allowDouble(), &fail);
}
@ -4535,13 +4535,13 @@ CodeGenerator::visitStoreTypedArrayElement(LStoreTypedArrayElement *lir)
const LAllocation *value = lir->value();
int arrayType = lir->mir()->arrayType();
int shift = TypedArray::slotWidth(arrayType);
int width = TypedArray::slotWidth(arrayType);
if (lir->index()->isConstant()) {
Address dest(elements, ToInt32(lir->index()) * shift);
Address dest(elements, ToInt32(lir->index()) * width);
StoreToTypedArray(masm, arrayType, value, dest);
} else {
BaseIndex dest(elements, ToRegister(lir->index()), ScaleFromShift(shift));
BaseIndex dest(elements, ToRegister(lir->index()), ScaleFromElemWidth(width));
StoreToTypedArray(masm, arrayType, value, dest);
}

2
js/src/ion/shared/Assembler-shared.h
View File

@ -31,7 +31,7 @@ enum Scale {
};
static inline Scale
ScaleFromShift(int shift)
ScaleFromElemWidth(int shift)
{
switch (shift) {
case 1: