| Index: src/mips/assembler-mips.cc
 | 
| diff --git a/src/mips/assembler-mips.cc b/src/mips/assembler-mips.cc
 | 
| index 9f803d9c1fe8f457ec97e12d2db7fc9d179a4d97..bf4b0d61ecfe0f5dba78111dda61e7b7c6472a10 100644
 | 
| --- a/src/mips/assembler-mips.cc
 | 
| +++ b/src/mips/assembler-mips.cc
 | 
| @@ -1319,7 +1319,7 @@ void Assembler::srav(Register rd, Register rt, Register rs) {
 | 
|  void Assembler::rotr(Register rd, Register rt, uint16_t sa) {
 | 
|    // Should be called via MacroAssembler::Ror.
 | 
|    ASSERT(rd.is_valid() && rt.is_valid() && is_uint5(sa));
 | 
| -  ASSERT(mips32r2);
 | 
| +  ASSERT(arch_variant == mips32r2);
 | 
|    Instr instr = SPECIAL | (1 << kRsShift) | (rt.code() << kRtShift)
 | 
|        | (rd.code() << kRdShift) | (sa << kSaShift) | SRL;
 | 
|    emit(instr);
 | 
| @@ -1329,7 +1329,7 @@ void Assembler::rotr(Register rd, Register rt, uint16_t sa) {
 | 
|  void Assembler::rotrv(Register rd, Register rt, Register rs) {
 | 
|    // Should be called via MacroAssembler::Ror.
 | 
|    ASSERT(rd.is_valid() && rt.is_valid() && rs.is_valid() );
 | 
| -  ASSERT(mips32r2);
 | 
| +  ASSERT(arch_variant == mips32r2);
 | 
|    Instr instr = SPECIAL | (rs.code() << kRsShift) | (rt.code() << kRtShift)
 | 
|       | (rd.code() << kRdShift) | (1 << kSaShift) | SRLV;
 | 
|    emit(instr);
 | 
| @@ -1604,7 +1604,7 @@ void Assembler::clz(Register rd, Register rs) {
 | 
|  void Assembler::ins_(Register rt, Register rs, uint16_t pos, uint16_t size) {
 | 
|    // Should be called via MacroAssembler::Ins.
 | 
|    // Ins instr has 'rt' field as dest, and two uint5: msb, lsb.
 | 
| -  ASSERT(mips32r2);
 | 
| +  ASSERT(arch_variant == mips32r2);
 | 
|    GenInstrRegister(SPECIAL3, rs, rt, pos + size - 1, pos, INS);
 | 
|  }
 | 
|  
 | 
| @@ -1612,7 +1612,7 @@ void Assembler::ins_(Register rt, Register rs, uint16_t pos, uint16_t size) {
 | 
|  void Assembler::ext_(Register rt, Register rs, uint16_t pos, uint16_t size) {
 | 
|    // Should be called via MacroAssembler::Ext.
 | 
|    // Ext instr has 'rt' field as dest, and two uint5: msb, lsb.
 | 
| -  ASSERT(mips32r2);
 | 
| +  ASSERT(arch_variant == mips32r2);
 | 
|    GenInstrRegister(SPECIAL3, rs, rt, size - 1, pos, EXT);
 | 
|  }
 | 
|  
 | 
| @@ -1772,25 +1772,25 @@ void Assembler::ceil_w_d(FPURegister fd, FPURegister fs) {
 | 
|  
 | 
|  
 | 
|  void Assembler::cvt_l_s(FPURegister fd, FPURegister fs) {
 | 
| -  ASSERT(mips32r2);
 | 
| +  ASSERT(arch_variant == mips32r2);
 | 
|    GenInstrRegister(COP1, S, f0, fs, fd, CVT_L_S);
 | 
|  }
 | 
|  
 | 
|  
 | 
|  void Assembler::cvt_l_d(FPURegister fd, FPURegister fs) {
 | 
| -  ASSERT(mips32r2);
 | 
| +  ASSERT(arch_variant == mips32r2);
 | 
|    GenInstrRegister(COP1, D, f0, fs, fd, CVT_L_D);
 | 
|  }
 | 
|  
 | 
|  
 | 
|  void Assembler::trunc_l_s(FPURegister fd, FPURegister fs) {
 | 
| -  ASSERT(mips32r2);
 | 
| +  ASSERT(arch_variant == mips32r2);
 | 
|    GenInstrRegister(COP1, S, f0, fs, fd, TRUNC_L_S);
 | 
|  }
 | 
|  
 | 
|  
 | 
|  void Assembler::trunc_l_d(FPURegister fd, FPURegister fs) {
 | 
| -  ASSERT(mips32r2);
 | 
| +  ASSERT(arch_variant == mips32r2);
 | 
|    GenInstrRegister(COP1, D, f0, fs, fd, TRUNC_L_D);
 | 
|  }
 | 
|  
 | 
| @@ -1831,7 +1831,7 @@ void Assembler::cvt_s_w(FPURegister fd, FPURegister fs) {
 | 
|  
 | 
|  
 | 
|  void Assembler::cvt_s_l(FPURegister fd, FPURegister fs) {
 | 
| -  ASSERT(mips32r2);
 | 
| +  ASSERT(arch_variant == mips32r2);
 | 
|    GenInstrRegister(COP1, L, f0, fs, fd, CVT_S_L);
 | 
|  }
 | 
|  
 | 
| @@ -1847,7 +1847,7 @@ void Assembler::cvt_d_w(FPURegister fd, FPURegister fs) {
 | 
|  
 | 
|  
 | 
|  void Assembler::cvt_d_l(FPURegister fd, FPURegister fs) {
 | 
| -  ASSERT(mips32r2);
 | 
| +  ASSERT(arch_variant == mips32r2);
 | 
|    GenInstrRegister(COP1, L, f0, fs, fd, CVT_D_L);
 | 
|  }
 | 
|  
 | 
| 
 |