Index: src/mips/assembler-mips.cc |
diff --git a/src/mips/assembler-mips.cc b/src/mips/assembler-mips.cc |
index c255d0fbda970efa8e93df9a66d5cc88a23e9fb4..fcb8819c2b5e71034fa83c568dfa3ea6f6b38935 100644 |
--- a/src/mips/assembler-mips.cc |
+++ b/src/mips/assembler-mips.cc |
@@ -80,29 +80,24 @@ static uint64_t CpuFeaturesImpliedByCompiler() { |
const char* DoubleRegister::AllocationIndexToString(int index) { |
- if (CpuFeatures::IsSupported(FPU)) { |
- ASSERT(index >= 0 && index < kMaxNumAllocatableRegisters); |
- const char* const names[] = { |
- "f0", |
- "f2", |
- "f4", |
- "f6", |
- "f8", |
- "f10", |
- "f12", |
- "f14", |
- "f16", |
- "f18", |
- "f20", |
- "f22", |
- "f24", |
- "f26" |
- }; |
- return names[index]; |
- } else { |
- ASSERT(index == 0); |
- return "sfpd0"; |
- } |
+ ASSERT(index >= 0 && index < kMaxNumAllocatableRegisters); |
+ const char* const names[] = { |
+ "f0", |
+ "f2", |
+ "f4", |
+ "f6", |
+ "f8", |
+ "f10", |
+ "f12", |
+ "f14", |
+ "f16", |
+ "f18", |
+ "f20", |
+ "f22", |
+ "f24", |
+ "f26" |
+ }; |
+ return names[index]; |
} |
@@ -127,10 +122,8 @@ void CpuFeatures::Probe() { |
// If the compiler is allowed to use fpu then we can use fpu too in our |
// code generation. |
#if !defined(__mips__) |
- // For the simulator=mips build, use FPU when FLAG_enable_fpu is enabled. |
- if (FLAG_enable_fpu) { |
- supported_ |= static_cast<uint64_t>(1) << FPU; |
- } |
+ // For the simulator build, use FPU. |
+ supported_ |= static_cast<uint64_t>(1) << FPU; |
#else |
// Probe for additional features not already known to be available. |
if (OS::MipsCpuHasFeature(FPU)) { |
@@ -876,7 +869,6 @@ void Assembler::GenInstrRegister(Opcode opcode, |
FPURegister fd, |
SecondaryField func) { |
ASSERT(fd.is_valid() && fs.is_valid() && ft.is_valid()); |
- ASSERT(IsEnabled(FPU)); |
Instr instr = opcode | fmt | (ft.code() << kFtShift) | (fs.code() << kFsShift) |
| (fd.code() << kFdShift) | func; |
emit(instr); |
@@ -890,7 +882,6 @@ void Assembler::GenInstrRegister(Opcode opcode, |
FPURegister fd, |
SecondaryField func) { |
ASSERT(fd.is_valid() && fr.is_valid() && fs.is_valid() && ft.is_valid()); |
- ASSERT(IsEnabled(FPU)); |
Instr instr = opcode | (fr.code() << kFrShift) | (ft.code() << kFtShift) |
| (fs.code() << kFsShift) | (fd.code() << kFdShift) | func; |
emit(instr); |
@@ -904,7 +895,6 @@ void Assembler::GenInstrRegister(Opcode opcode, |
FPURegister fd, |
SecondaryField func) { |
ASSERT(fd.is_valid() && fs.is_valid() && rt.is_valid()); |
- ASSERT(IsEnabled(FPU)); |
Instr instr = opcode | fmt | (rt.code() << kRtShift) |
| (fs.code() << kFsShift) | (fd.code() << kFdShift) | func; |
emit(instr); |
@@ -917,7 +907,6 @@ void Assembler::GenInstrRegister(Opcode opcode, |
FPUControlRegister fs, |
SecondaryField func) { |
ASSERT(fs.is_valid() && rt.is_valid()); |
- ASSERT(IsEnabled(FPU)); |
Instr instr = |
opcode | fmt | (rt.code() << kRtShift) | (fs.code() << kFsShift) | func; |
emit(instr); |
@@ -952,7 +941,6 @@ void Assembler::GenInstrImmediate(Opcode opcode, |
FPURegister ft, |
int32_t j) { |
ASSERT(rs.is_valid() && ft.is_valid() && (is_int16(j) || is_uint16(j))); |
- ASSERT(IsEnabled(FPU)); |
Instr instr = opcode | (rs.code() << kRsShift) | (ft.code() << kFtShift) |
| (j & kImm16Mask); |
emit(instr); |
@@ -1874,7 +1862,6 @@ void Assembler::cvt_d_s(FPURegister fd, FPURegister fs) { |
// Conditions. |
void Assembler::c(FPUCondition cond, SecondaryField fmt, |
FPURegister fs, FPURegister ft, uint16_t cc) { |
- ASSERT(IsEnabled(FPU)); |
ASSERT(is_uint3(cc)); |
ASSERT((fmt & ~(31 << kRsShift)) == 0); |
Instr instr = COP1 | fmt | ft.code() << 16 | fs.code() << kFsShift |
@@ -1885,7 +1872,6 @@ void Assembler::c(FPUCondition cond, SecondaryField fmt, |
void Assembler::fcmp(FPURegister src1, const double src2, |
FPUCondition cond) { |
- ASSERT(IsEnabled(FPU)); |
ASSERT(src2 == 0.0); |
mtc1(zero_reg, f14); |
cvt_d_w(f14, f14); |
@@ -1894,7 +1880,6 @@ void Assembler::fcmp(FPURegister src1, const double src2, |
void Assembler::bc1f(int16_t offset, uint16_t cc) { |
- ASSERT(IsEnabled(FPU)); |
ASSERT(is_uint3(cc)); |
Instr instr = COP1 | BC1 | cc << 18 | 0 << 16 | (offset & kImm16Mask); |
emit(instr); |
@@ -1902,7 +1887,6 @@ void Assembler::bc1f(int16_t offset, uint16_t cc) { |
void Assembler::bc1t(int16_t offset, uint16_t cc) { |
- ASSERT(IsEnabled(FPU)); |
ASSERT(is_uint3(cc)); |
Instr instr = COP1 | BC1 | cc << 18 | 1 << 16 | (offset & kImm16Mask); |
emit(instr); |