| Index: src/x64/macro-assembler-x64.h
|
| diff --git a/src/x64/macro-assembler-x64.h b/src/x64/macro-assembler-x64.h
|
| index 61abc206e108ec2f85e0ff83393eb778c58dde79..e611c8ae27999a9520d0aa07bfa050b51a0bb831 100644
|
| --- a/src/x64/macro-assembler-x64.h
|
| +++ b/src/x64/macro-assembler-x64.h
|
| @@ -823,10 +823,6 @@ class MacroAssembler: public Assembler {
|
| void Drop(int stack_elements);
|
|
|
| void Call(Label* target) { call(target); }
|
| - void Push(Register src) { push(src); }
|
| - void Pop(Register dst) { pop(dst); }
|
| - void PushReturnAddressFrom(Register src) { push(src); }
|
| - void PopReturnAddressTo(Register dst) { pop(dst); }
|
|
|
| // Control Flow
|
| void Jump(Address destination, RelocInfo::Mode rmode);
|
| @@ -841,7 +837,7 @@ class MacroAssembler: public Assembler {
|
|
|
| // The size of the code generated for different call instructions.
|
| int CallSize(Address destination, RelocInfo::Mode rmode) {
|
| - return kCallSequenceLength;
|
| + return kCallInstructionLength;
|
| }
|
| int CallSize(ExternalReference ext);
|
| int CallSize(Handle<Code> code_object) {
|
| @@ -1006,7 +1002,7 @@ class MacroAssembler: public Assembler {
|
| // enabled via --debug-code.
|
| void AssertRootValue(Register src,
|
| Heap::RootListIndex root_value_index,
|
| - BailoutReason reason);
|
| + const char* message);
|
|
|
| // ---------------------------------------------------------------------------
|
| // Exception handling
|
| @@ -1323,15 +1319,15 @@ class MacroAssembler: public Assembler {
|
|
|
| // Calls Abort(msg) if the condition cc is not satisfied.
|
| // Use --debug_code to enable.
|
| - void Assert(Condition cc, BailoutReason reason);
|
| + void Assert(Condition cc, const char* msg);
|
|
|
| void AssertFastElements(Register elements);
|
|
|
| // Like Assert(), but always enabled.
|
| - void Check(Condition cc, BailoutReason reason);
|
| + void Check(Condition cc, const char* msg);
|
|
|
| // Print a message to stdout and abort execution.
|
| - void Abort(BailoutReason msg);
|
| + void Abort(const char* msg);
|
|
|
| // Check that the stack is aligned.
|
| void CheckStackAlignment();
|
|
|