Index: src/arm/macro-assembler-arm.h |
diff --git a/src/arm/macro-assembler-arm.h b/src/arm/macro-assembler-arm.h |
index 50c298bfab9ce09da69fba3af068eef71968a38b..3c05e003841c6a895308bd63c93e79fa9463439b 100644 |
--- a/src/arm/macro-assembler-arm.h |
+++ b/src/arm/macro-assembler-arm.h |
@@ -178,7 +178,7 @@ class MacroAssembler: public Assembler { |
// Register move. May do nothing if the registers are identical. |
void Move(Register dst, Handle<Object> value); |
void Move(Register dst, Register src, Condition cond = al); |
- void Move(DwVfpRegister dst, DwVfpRegister src); |
+ void Move(DoubleRegister dst, DoubleRegister src); |
// Load an object from the root table. |
void LoadRoot(Register destination, |
@@ -1058,9 +1058,9 @@ class MacroAssembler: public Assembler { |
// whether soft or hard floating point ABI is used. These functions |
// abstract parameter passing for the three different ways we call |
// C functions from generated code. |
- void SetCallCDoubleArguments(DwVfpRegister dreg); |
- void SetCallCDoubleArguments(DwVfpRegister dreg1, DwVfpRegister dreg2); |
- void SetCallCDoubleArguments(DwVfpRegister dreg, Register reg); |
+ void SetCallCDoubleArguments(DoubleRegister dreg); |
+ void SetCallCDoubleArguments(DoubleRegister dreg1, DoubleRegister dreg2); |
+ void SetCallCDoubleArguments(DoubleRegister dreg, Register reg); |
// Calls a C function and cleans up the space for arguments allocated |
// by PrepareCallCFunction. The called function is not allowed to trigger a |
@@ -1076,7 +1076,7 @@ class MacroAssembler: public Assembler { |
int num_reg_arguments, |
int num_double_arguments); |
- void GetCFunctionDoubleResult(const DwVfpRegister dst); |
+ void GetCFunctionDoubleResult(const DoubleRegister dst); |
// Calls an API function. Allocates HandleScope, extracts returned value |
// from handle and propagates exceptions. Restores context. stack_space |
@@ -1289,8 +1289,8 @@ class MacroAssembler: public Assembler { |
void ClampUint8(Register output_reg, Register input_reg); |
void ClampDoubleToUint8(Register result_reg, |
- DwVfpRegister input_reg, |
- DwVfpRegister temp_double_reg); |
+ DoubleRegister input_reg, |
+ DoubleRegister temp_double_reg); |
void LoadInstanceDescriptors(Register map, Register descriptors); |
@@ -1365,9 +1365,9 @@ class MacroAssembler: public Assembler { |
// This handle will be patched with the code object on installation. |
Handle<Object> code_object_; |
- // Needs access to SafepointRegisterStackIndex for compiled frame |
+ // Needs access to SafepointRegisterStackIndex for optimized frame |
// traversal. |
- friend class CompiledFrame; |
+ friend class OptimizedFrame; |
}; |