Index: src/compiler/arm/code-generator-arm.cc |
diff --git a/src/compiler/arm/code-generator-arm.cc b/src/compiler/arm/code-generator-arm.cc |
index 26ec8c5c4844158529894a4c12b475ac8e8da691..d6959b3db9ef074ef1429ceaec5520eb9afd850f 100644 |
--- a/src/compiler/arm/code-generator-arm.cc |
+++ b/src/compiler/arm/code-generator-arm.cc |
@@ -407,6 +407,20 @@ Condition FlagsConditionToCondition(FlagsCondition condition) { |
__ dmb(ISH); \ |
} while (0) |
+#define ASSEMBLE_IEEE754_UNOP(name) \ |
+ do { \ |
+ /* TODO(bmeurer): We should really get rid of this special instruction, */ \ |
+ /* and generate a CallAddress instruction instead. */ \ |
+ FrameScope scope(masm(), StackFrame::MANUAL); \ |
+ __ PrepareCallCFunction(0, 1, kScratchReg); \ |
+ __ MovToFloatParameter(i.InputFloat64Register(0)); \ |
+ __ CallCFunction(ExternalReference::ieee754_##name##_function(isolate()), \ |
+ 0, 1); \ |
+ /* Move the result in the double result register. */ \ |
+ __ MovFromFloatResult(i.OutputFloat64Register()); \ |
+ DCHECK_EQ(LeaveCC, i.OutputSBit()); \ |
+ } while (0) |
+ |
void CodeGenerator::AssembleDeconstructFrame() { |
__ LeaveFrame(StackFrame::MANUAL); |
} |
@@ -674,19 +688,12 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction( |
__ add(i.OutputRegister(0), base, Operand(offset.offset())); |
break; |
} |
- case kIeee754Float64Log: { |
- // TODO(bmeurer): We should really get rid of this special instruction, |
- // and generate a CallAddress instruction instead. |
- FrameScope scope(masm(), StackFrame::MANUAL); |
- __ PrepareCallCFunction(0, 1, kScratchReg); |
- __ MovToFloatParameter(i.InputFloat64Register(0)); |
- __ CallCFunction(ExternalReference::ieee754_log_function(isolate()), 0, |
- 1); |
- // Move the result in the double result register. |
- __ MovFromFloatResult(i.OutputFloat64Register()); |
- DCHECK_EQ(LeaveCC, i.OutputSBit()); |
+ case kIeee754Float64Log: |
+ ASSEMBLE_IEEE754_UNOP(log); |
+ break; |
+ case kIeee754Float64Log1p: |
+ ASSEMBLE_IEEE754_UNOP(log1p); |
break; |
- } |
case kArmAdd: |
__ add(i.OutputRegister(), i.InputRegister(0), i.InputOperand2(1), |
i.OutputSBit()); |