Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-13 05:15:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1020122 - IonMonkey: (ARM) Remove some unused arguments on internal assembler methods. r=mjrosenb

Browse Source
This commit is contained in:
Douglas Crosher 2014-06-04 18:05:32 +10:00
parent eaeeb6d003
commit 580fb9bf17
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
js/src/jit/arm/Assembler-arm.cpp
View File

@ -1675,11 +1675,11 @@ Assembler::as_dtm(LoadStore ls, Register rn, uint32_t mask,
}
BufferOffset
Assembler::as_Imm32Pool(Register dest, uint32_t value, ARMBuffer::PoolEntry *pe, Condition c)
Assembler::as_Imm32Pool(Register dest, uint32_t value, Condition c)
{
PoolHintPun php;
php.phd.init(0, c, PoolHintData::poolDTR, dest);
return m_buffer.insertEntry(4, (uint8_t*)&php.raw, int32Pool, (uint8_t*)&value, pe);
return m_buffer.insertEntry(4, (uint8_t*)&php.raw, int32Pool, (uint8_t*)&value);
}
void
@ -1716,12 +1716,12 @@ Assembler::as_BranchPool(uint32_t value, RepatchLabel *label, ARMBuffer::PoolEnt
}
BufferOffset
Assembler::as_FImm64Pool(VFPRegister dest, double value, ARMBuffer::PoolEntry *pe, Condition c)
Assembler::as_FImm64Pool(VFPRegister dest, double value, Condition c)
{
JS_ASSERT(dest.isDouble());
PoolHintPun php;
php.phd.init(0, c, PoolHintData::poolVDTR, dest);
return m_buffer.insertEntry(4, (uint8_t*)&php.raw, doublePool, (uint8_t*)&value, pe);
return m_buffer.insertEntry(4, (uint8_t*)&php.raw, doublePool, (uint8_t*)&value);
}
struct PaddedFloat32
@ -1732,7 +1732,7 @@ struct PaddedFloat32
JS_STATIC_ASSERT(sizeof(PaddedFloat32) == sizeof(double));
BufferOffset
Assembler::as_FImm32Pool(VFPRegister dest, float value, ARMBuffer::PoolEntry *pe, Condition c)
Assembler::as_FImm32Pool(VFPRegister dest, float value, Condition c)
{
/*
* Insert floats into the double pool as they have the same limitations on
@ -1743,7 +1743,7 @@ Assembler::as_FImm32Pool(VFPRegister dest, float value, ARMBuffer::PoolEntry *pe
PoolHintPun php;
php.phd.init(0, c, PoolHintData::poolVDTR, dest);
PaddedFloat32 pf = { value, 0 };
return m_buffer.insertEntry(4, (uint8_t*)&php.raw, doublePool, (uint8_t*)&pf, pe);
return m_buffer.insertEntry(4, (uint8_t*)&php.raw, doublePool, (uint8_t*)&pf);
}
// Pool callbacks stuff:

6
js/src/jit/arm/Assembler-arm.h
View File

@ -1482,14 +1482,14 @@ class Assembler : public AssemblerShared
//overwrite a pool entry with new data.
void as_WritePoolEntry(Instruction *addr, Condition c, uint32_t data);
// load a 32 bit immediate from a pool into a register
BufferOffset as_Imm32Pool(Register dest, uint32_t value, ARMBuffer::PoolEntry *pe = nullptr, Condition c = Always);
BufferOffset as_Imm32Pool(Register dest, uint32_t value, Condition c = Always);
// make a patchable jump that can target the entire 32 bit address space.
BufferOffset as_BranchPool(uint32_t value, RepatchLabel *label, ARMBuffer::PoolEntry *pe = nullptr, Condition c = Always);
// load a 64 bit floating point immediate from a pool into a register
BufferOffset as_FImm64Pool(VFPRegister dest, double value, ARMBuffer::PoolEntry *pe = nullptr, Condition c = Always);
BufferOffset as_FImm64Pool(VFPRegister dest, double value, Condition c = Always);
// load a 32 bit floating point immediate from a pool into a register
BufferOffset as_FImm32Pool(VFPRegister dest, float value, ARMBuffer::PoolEntry *pe = nullptr, Condition c = Always);
BufferOffset as_FImm32Pool(VFPRegister dest, float value, Condition c = Always);
// Control flow stuff:

14
js/src/jit/arm/MacroAssembler-arm.cpp
View File

@ -380,11 +380,11 @@ MacroAssemblerARM::ma_alu(Register src1, Imm32 imm, Register dest,
// Going to have to use a load. If the operation is a move, then just move it into the
// destination register
if (op == op_mov) {
as_Imm32Pool(dest, imm.value, nullptr, c);
as_Imm32Pool(dest, imm.value, c);
return;
} else {
// If this isn't just going into a register, then stick it in a temp, and then proceed.
as_Imm32Pool(ScratchRegister, imm.value, nullptr, c);
as_Imm32Pool(ScratchRegister, imm.value, c);
}
}
as_alu(dest, src1, O2Reg(ScratchRegister), op, sc, c);
@ -442,7 +442,7 @@ MacroAssemblerARM::ma_movPatchable(Imm32 imm_, Register dest, Assembler::Conditi
break;
case L_LDR:
if(i == nullptr)
as_Imm32Pool(dest, imm, nullptr, c);
as_Imm32Pool(dest, imm, c);
else
as_WritePoolEntry(i, c, imm);
break;
@ -1332,11 +1332,11 @@ MacroAssemblerARM::ma_b(void *target, Relocation::Kind reloc, Assembler::Conditi
as_bx(ScratchRegister, c);
break;
case Assembler::B_LDR_BX:
as_Imm32Pool(ScratchRegister, trg, nullptr, c);
as_Imm32Pool(ScratchRegister, trg, c);
as_bx(ScratchRegister, c);
break;
case Assembler::B_LDR:
as_Imm32Pool(pc, trg, nullptr, c);
as_Imm32Pool(pc, trg, c);
if (c == Always)
m_buffer.markGuard();
break;
@ -1493,7 +1493,7 @@ MacroAssemblerARM::ma_vimm(double value, FloatRegister dest, Condition cc)
}
}
// Fall back to putting the value in a pool.
as_FImm64Pool(dest, value, nullptr, cc);
as_FImm64Pool(dest, value, cc);
}
static inline uint32_t
@ -1530,7 +1530,7 @@ MacroAssemblerARM::ma_vimm_f32(float value, FloatRegister dest, Condition cc)
}
}
// Fall back to putting the value in a pool.
as_FImm32Pool(vd, value, nullptr, cc);
as_FImm32Pool(vd, value, cc);
}
void