From 7fee84c087e0f903e7d43bef180df047db1c8051 Mon Sep 17 00:00:00 2001 From: Vladimir Marko Date: Fri, 21 Aug 2015 18:39:26 +0000 Subject: Revert "[MIPS] Use hard float calling convention for managed code" MipsMir2Lir::LockCallTemps() is broken for secondary architecture on aosp_mips64-eng. This reverts commit a29449dcf57c57fe0876f51367985477317cc557. Change-Id: I480ea7569d73aea7894fc0a6dd804b1135286a37 --- compiler/utils/mips/assembler_mips.h | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'compiler/utils/mips/assembler_mips.h') diff --git a/compiler/utils/mips/assembler_mips.h b/compiler/utils/mips/assembler_mips.h index 6c8b162d62..df95daddc1 100644 --- a/compiler/utils/mips/assembler_mips.h +++ b/compiler/utils/mips/assembler_mips.h @@ -141,7 +141,7 @@ class MipsAssembler FINAL : public Assembler { void LoadSFromOffset(FRegister reg, Register base, int32_t offset); void LoadDFromOffset(DRegister reg, Register base, int32_t offset); void StoreToOffset(StoreOperandType type, Register reg, Register base, int32_t offset); - void StoreSToOffset(FRegister reg, Register base, int32_t offset); + void StoreFToOffset(FRegister reg, Register base, int32_t offset); void StoreDToOffset(DRegister reg, Register base, int32_t offset); // Emit data (e.g. encoded instruction or immediate) to the instruction stream. @@ -277,19 +277,6 @@ class MipsAssembler FINAL : public Assembler { int32_t EncodeBranchOffset(int offset, int32_t inst, bool is_jump); int DecodeBranchOffset(int32_t inst, bool is_jump); - FRegister ConvertDRegToFReg(DRegister reg) { - return static_cast(reg * 2); - } - Register ConvertDRegToReg(DRegister reg) { - return static_cast(reg * 2); - } - Register ConvertFRegToReg(FRegister reg) { - return static_cast(reg); - } - FRegister ConvertRegToFReg(Register reg) { - return static_cast(reg); - } - DISALLOW_COPY_AND_ASSIGN(MipsAssembler); }; -- cgit v1.2.3-59-g8ed1b