Reviewers: Erik Corry,
Message:
Very small review.
Description:
ARM: Removed unused StubReturn
(The one place where it was used, it's equivalent to Ret)
Please review this at http://codereview.chromium.org/578014
Affected files:
M src/arm/codegen-arm.cc
M src/arm/macro-assembler-arm.h
M src/arm/macro-assembler-arm.cc
Index: src/arm/codegen-arm.cc
diff --git a/src/arm/codegen-arm.cc b/src/arm/codegen-arm.cc
index
9afefac0b3cd2f9ce0f701f6ec86fec12f7f7136..36b3c7c21a984ec7e5e8216e8a99a5f4f2b7b3d4
100644
--- a/src/arm/codegen-arm.cc
+++ b/src/arm/codegen-arm.cc
@@ -6086,8 +6086,6 @@ void StackCheckStub::Generate(MacroAssembler* masm) {
__ mov(r0, Operand(Smi::FromInt(0)));
__ push(r0);
__ TailCallRuntime(ExternalReference(Runtime::kStackGuard), 1, 1);
-
- __ StubReturn(1);
}
@@ -6167,7 +6165,7 @@ void GenericUnaryOpStub::Generate(MacroAssembler*
masm) {
}
__ bind(&done);
- __ StubReturn(1);
+ __ Ret();
// Handle the slow case by jumping to the JavaScript builtin.
__ bind(&slow);
Index: src/arm/macro-assembler-arm.cc
diff --git a/src/arm/macro-assembler-arm.cc b/src/arm/macro-assembler-arm.cc
index
aadbb670d5f520aa60ff712279a8469651abff3d..1ed220588072f93019da7e58b71c48497ef53b77
100644
--- a/src/arm/macro-assembler-arm.cc
+++ b/src/arm/macro-assembler-arm.cc
@@ -1123,15 +1123,6 @@ void MacroAssembler::TailCallStub(CodeStub* stub,
Condition cond) {
}
-void MacroAssembler::StubReturn(int argc) {
- ASSERT(argc >= 1 && generating_stub());
- if (argc > 1) {
- add(sp, sp, Operand((argc - 1) * kPointerSize));
- }
- Ret();
-}
-
-
void MacroAssembler::IllegalOperation(int num_arguments) {
if (num_arguments > 0) {
add(sp, sp, Operand(num_arguments * kPointerSize));
Index: src/arm/macro-assembler-arm.h
diff --git a/src/arm/macro-assembler-arm.h b/src/arm/macro-assembler-arm.h
index
efb782c2ca88d63e65af8297bb8f26dbb9df2c87..41ee2578bfc1a973050cd652e6676362bc202407
100644
--- a/src/arm/macro-assembler-arm.h
+++ b/src/arm/macro-assembler-arm.h
@@ -315,9 +315,6 @@ class MacroAssembler: public Assembler {
// Call a code stub.
void TailCallStub(CodeStub* stub, Condition cond = al);
- // Return from a code stub after popping its arguments.
- void StubReturn(int argc);
-
// Call a runtime routine.
// Eventually this should be used for all C calls.
void CallRuntime(Runtime::Function* f, int num_arguments);
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
