AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Fix compile failure on Win64.

Browse Source 
Review URL: http://codereview.chromium.org/6727021

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@7320 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
lrn@chromium.org 2011-03-23 11:12:34 +00:00
parent 88854cd712
commit 6945a1241a
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/x64/macro-assembler-x64.cc
View File

@ -49,9 +49,9 @@ MacroAssembler::MacroAssembler(void* buffer, int size)
} }
static intptr_t RootRegisterDelta(ExternalReference other) { static intptr_t RootRegisterDelta(ExternalReference other, Isolate* isolate) {
Address roots_register_value = kRootRegisterBias + Address roots_register_value = kRootRegisterBias +
reinterpret_cast<Address>(Isolate::Current()->heap()->roots_address()); reinterpret_cast<Address>(isolate->heap()->roots_address());
intptr_t delta = other.address() - roots_register_value; intptr_t delta = other.address() - roots_register_value;
return delta; return delta;
} }
@ -60,10 +60,10 @@ static intptr_t RootRegisterDelta(ExternalReference other) {
Operand MacroAssembler::ExternalOperand(ExternalReference target, Operand MacroAssembler::ExternalOperand(ExternalReference target,
Register scratch) { Register scratch) {
if (root_array_available_ && !Serializer::enabled()) { if (root_array_available_ && !Serializer::enabled()) {
intptr_t delta = RootRegisterDelta(target); intptr_t delta = RootRegisterDelta(target, isolate());
if (is_int32(delta)) { if (is_int32(delta)) {
Serializer::TooLateToEnableNow(); Serializer::TooLateToEnableNow();
return Operand(kRootRegister, delta); return Operand(kRootRegister, static_cast<int32_t>(delta));
} }
} }
movq(scratch, target); movq(scratch, target);
@ -73,7 +73,7 @@ Operand MacroAssembler::ExternalOperand(ExternalReference target,
void MacroAssembler::Load(Register destination, ExternalReference source) { void MacroAssembler::Load(Register destination, ExternalReference source) {
if (root_array_available_ && !Serializer::enabled()) { if (root_array_available_ && !Serializer::enabled()) {
intptr_t delta = RootRegisterDelta(source); intptr_t delta = RootRegisterDelta(source, isolate());
if (is_int32(delta)) { if (is_int32(delta)) {
Serializer::TooLateToEnableNow(); Serializer::TooLateToEnableNow();
movq(destination, Operand(kRootRegister, static_cast<int32_t>(delta))); movq(destination, Operand(kRootRegister, static_cast<int32_t>(delta)));
@ -92,7 +92,7 @@ void MacroAssembler::Load(Register destination, ExternalReference source) {
void MacroAssembler::Store(ExternalReference destination, Register source) { void MacroAssembler::Store(ExternalReference destination, Register source) {
if (root_array_available_ && !Serializer::enabled()) { if (root_array_available_ && !Serializer::enabled()) {
intptr_t delta = RootRegisterDelta(destination); intptr_t delta = RootRegisterDelta(destination, isolate());
if (is_int32(delta)) { if (is_int32(delta)) {
Serializer::TooLateToEnableNow(); Serializer::TooLateToEnableNow();
movq(Operand(kRootRegister, static_cast<int32_t>(delta)), source); movq(Operand(kRootRegister, static_cast<int32_t>(delta)), source);
@ -112,7 +112,7 @@ void MacroAssembler::Store(ExternalReference destination, Register source) {
void MacroAssembler::LoadAddress(Register destination, void MacroAssembler::LoadAddress(Register destination,
ExternalReference source) { ExternalReference source) {
if (root_array_available_ && !Serializer::enabled()) { if (root_array_available_ && !Serializer::enabled()) {
intptr_t delta = RootRegisterDelta(source); intptr_t delta = RootRegisterDelta(source, isolate());
if (is_int32(delta)) { if (is_int32(delta)) {
Serializer::TooLateToEnableNow(); Serializer::TooLateToEnableNow();
lea(destination, Operand(kRootRegister, static_cast<int32_t>(delta))); lea(destination, Operand(kRootRegister, static_cast<int32_t>(delta)));
@ -129,7 +129,7 @@ int MacroAssembler::LoadAddressSize(ExternalReference source) {
// This calculation depends on the internals of LoadAddress. // This calculation depends on the internals of LoadAddress.
// It's correctness is ensured by the asserts in the Call // It's correctness is ensured by the asserts in the Call
// instruction below. // instruction below.
intptr_t delta = RootRegisterDelta(source); intptr_t delta = RootRegisterDelta(source, isolate());
if (is_int32(delta)) { if (is_int32(delta)) {
Serializer::TooLateToEnableNow(); Serializer::TooLateToEnableNow();
// Operand is lea(scratch, Operand(kRootRegister, delta)); // Operand is lea(scratch, Operand(kRootRegister, delta));