Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1813)

Unified Diff: src/mips64/macro-assembler-mips64.cc

Issue 2106113002: Revert of [builtins] New frame type for exits to C++ builtins (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/mips64/macro-assembler-mips64.h ('k') | src/profiler/tick-sample.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/mips64/macro-assembler-mips64.cc
diff --git a/src/mips64/macro-assembler-mips64.cc b/src/mips64/macro-assembler-mips64.cc
index 475262a8affb1ad9ff0ae16319313954acdfef47..d8bdbfac648bb51e02ff9559c8adf1c4450f83f2 100644
--- a/src/mips64/macro-assembler-mips64.cc
+++ b/src/mips64/macro-assembler-mips64.cc
@@ -5915,12 +5915,11 @@
JumpToExternalReference(ExternalReference(fid, isolate()));
}
+
void MacroAssembler::JumpToExternalReference(const ExternalReference& builtin,
- BranchDelaySlot bd,
- bool builtin_exit_frame) {
+ BranchDelaySlot bd) {
PrepareCEntryFunction(builtin);
- CEntryStub stub(isolate(), 1, kDontSaveFPRegs, kArgvOnStack,
- builtin_exit_frame);
+ CEntryStub stub(isolate(), 1);
Jump(stub.GetCode(),
RelocInfo::CODE_TARGET,
al,
@@ -5928,6 +5927,7 @@
Operand(zero_reg),
bd);
}
+
void MacroAssembler::SetCounter(StatsCounter* counter, int value,
Register scratch1, Register scratch2) {
@@ -6184,11 +6184,7 @@
ld(fp, MemOperand(fp, 0 * kPointerSize));
}
-void MacroAssembler::EnterExitFrame(bool save_doubles, int stack_space,
- StackFrame::Type frame_type) {
- DCHECK(frame_type == StackFrame::EXIT ||
- frame_type == StackFrame::BUILTIN_EXIT);
-
+void MacroAssembler::EnterExitFrame(bool save_doubles, int stack_space) {
// Set up the frame structure on the stack.
STATIC_ASSERT(2 * kPointerSize == ExitFrameConstants::kCallerSPDisplacement);
STATIC_ASSERT(1 * kPointerSize == ExitFrameConstants::kCallerPCOffset);
@@ -6208,7 +6204,7 @@
daddiu(sp, sp, -2 * kPointerSize - ExitFrameConstants::kFixedFrameSizeFromFp);
sd(ra, MemOperand(sp, 4 * kPointerSize));
sd(fp, MemOperand(sp, 3 * kPointerSize));
- li(at, Operand(Smi::FromInt(frame_type)));
+ li(at, Operand(Smi::FromInt(StackFrame::EXIT)));
sd(at, MemOperand(sp, 2 * kPointerSize));
// Set up new frame pointer.
daddiu(fp, sp, ExitFrameConstants::kFixedFrameSizeFromFp);
« no previous file with comments | « src/mips64/macro-assembler-mips64.h ('k') | src/profiler/tick-sample.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698