Commit 3526c6be authored by danno@chromium.org's avatar danno@chromium.org

Use EXTERNAL_REFERENCE instead of RUNTIME_ENTRY for Runtime::PerformGC and

CallApiFunctionAndReturn in X64

Review URL: https://codereview.chromium.org/11694008
Patch from Haitao Feng <haitao.feng@intel.com>.

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@13287 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent a7f9c491
......@@ -3934,8 +3934,7 @@ void CEntryStub::GenerateCore(MacroAssembler* masm,
__ movq(rdi, rax);
#endif
__ movq(kScratchRegister,
FUNCTION_ADDR(Runtime::PerformGC),
RelocInfo::RUNTIME_ENTRY);
ExternalReference::perform_gc_function(masm->isolate()));
__ call(kScratchRegister);
}
......
......@@ -731,7 +731,7 @@ void MacroAssembler::CallApiFunctionAndReturn(Address function_address,
// Call the api function!
movq(rax, reinterpret_cast<int64_t>(function_address),
RelocInfo::RUNTIME_ENTRY);
RelocInfo::EXTERNAL_REFERENCE);
call(rax);
if (FLAG_log_timer_events) {
......
......@@ -1473,17 +1473,16 @@ extern void LogGeneratedCodeCoverage(const char* file_line);
#define CODE_COVERAGE_STRINGIFY(x) #x
#define CODE_COVERAGE_TOSTRING(x) CODE_COVERAGE_STRINGIFY(x)
#define __FILE_LINE__ __FILE__ ":" CODE_COVERAGE_TOSTRING(__LINE__)
#define ACCESS_MASM(masm) { \
byte* x64_coverage_function = \
reinterpret_cast<byte*>(FUNCTION_ADDR(LogGeneratedCodeCoverage)); \
masm->pushfd(); \
masm->pushad(); \
masm->push(Immediate(reinterpret_cast<int>(&__FILE_LINE__))); \
masm->call(x64_coverage_function, RelocInfo::RUNTIME_ENTRY); \
masm->pop(rax); \
masm->popad(); \
masm->popfd(); \
} \
#define ACCESS_MASM(masm) { \
Address x64_coverage_function = FUNCTION_ADDR(LogGeneratedCodeCoverage); \
masm->pushfq(); \
masm->Pushad(); \
masm->push(Immediate(reinterpret_cast<int>(&__FILE_LINE__))); \
masm->Call(x64_coverage_function, RelocInfo::EXTERNAL_REFERENCE); \
masm->pop(rax); \
masm->Popad(); \
masm->popfq(); \
} \
masm->
#else
#define ACCESS_MASM(masm) masm->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment