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

Side by Side Diff: src/vm-state-inl.h

Issue 131383004: [not for landing] Diff between a64 and r19234 for no-a64 files. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 6 years, 10 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2010 the V8 project authors. All rights reserved. 1 // Copyright 2010 the V8 project authors. All rights reserved.
2 // Redistribution and use in source and binary forms, with or without 2 // Redistribution and use in source and binary forms, with or without
3 // modification, are permitted provided that the following conditions are 3 // modification, are permitted provided that the following conditions are
4 // met: 4 // met:
5 // 5 //
6 // * Redistributions of source code must retain the above copyright 6 // * Redistributions of source code must retain the above copyright
7 // notice, this list of conditions and the following disclaimer. 7 // notice, this list of conditions and the following disclaimer.
8 // * Redistributions in binary form must reproduce the above 8 // * Redistributions in binary form must reproduce the above
9 // copyright notice, this list of conditions and the following 9 // copyright notice, this list of conditions and the following
10 // disclaimer in the documentation and/or other materials provided 10 // disclaimer in the documentation and/or other materials provided
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 } 78 }
79 isolate_->set_current_vm_state(previous_tag_); 79 isolate_->set_current_vm_state(previous_tag_);
80 } 80 }
81 81
82 82
83 ExternalCallbackScope::ExternalCallbackScope(Isolate* isolate, Address callback) 83 ExternalCallbackScope::ExternalCallbackScope(Isolate* isolate, Address callback)
84 : isolate_(isolate), 84 : isolate_(isolate),
85 callback_(callback), 85 callback_(callback),
86 previous_scope_(isolate->external_callback_scope()) { 86 previous_scope_(isolate->external_callback_scope()) {
87 #ifdef USE_SIMULATOR 87 #ifdef USE_SIMULATOR
88 #if V8_TARGET_ARCH_A64
89 scope_address_ = reinterpret_cast<Address>(Simulator::current(isolate)->sp());
90 #else
88 int32_t sp = Simulator::current(isolate)->get_register(Simulator::sp); 91 int32_t sp = Simulator::current(isolate)->get_register(Simulator::sp);
89 scope_address_ = reinterpret_cast<Address>(static_cast<intptr_t>(sp)); 92 scope_address_ = reinterpret_cast<Address>(static_cast<intptr_t>(sp));
90 #endif 93 #endif
94 #endif
91 isolate_->set_external_callback_scope(this); 95 isolate_->set_external_callback_scope(this);
92 } 96 }
93 97
94 ExternalCallbackScope::~ExternalCallbackScope() { 98 ExternalCallbackScope::~ExternalCallbackScope() {
95 isolate_->set_external_callback_scope(previous_scope_); 99 isolate_->set_external_callback_scope(previous_scope_);
96 } 100 }
97 101
98 Address ExternalCallbackScope::scope_address() { 102 Address ExternalCallbackScope::scope_address() {
99 #ifdef USE_SIMULATOR 103 #ifdef USE_SIMULATOR
100 return scope_address_; 104 return scope_address_;
101 #else 105 #else
102 return reinterpret_cast<Address>(this); 106 return reinterpret_cast<Address>(this);
103 #endif 107 #endif
104 } 108 }
105 109
106 110
107 } } // namespace v8::internal 111 } } // namespace v8::internal
108 112
109 #endif // V8_VM_STATE_INL_H_ 113 #endif // V8_VM_STATE_INL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698