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

Unified Diff: src/arm/macro-assembler-arm.h

Issue 1478303002: Revert of [runtime] Replace global object link with native context link in all contexts. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 5 years, 1 month 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/arm/code-stubs-arm.cc ('k') | src/arm/macro-assembler-arm.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/arm/macro-assembler-arm.h
diff --git a/src/arm/macro-assembler-arm.h b/src/arm/macro-assembler-arm.h
index dab6b687a81f76dc33238ebdfe78bfe752e1dc3e..cb65fa0b924a1c2efa29aa81a07b44381a907500 100644
--- a/src/arm/macro-assembler-arm.h
+++ b/src/arm/macro-assembler-arm.h
@@ -608,15 +608,8 @@
void LoadContext(Register dst, int context_chain_length);
- // Load the global object from the current context.
- void LoadGlobalObject(Register dst) {
- LoadNativeContextSlot(Context::EXTENSION_INDEX, dst);
- }
-
// Load the global proxy from the current context.
- void LoadGlobalProxy(Register dst) {
- LoadNativeContextSlot(Context::GLOBAL_PROXY_INDEX, dst);
- }
+ void LoadGlobalProxy(Register dst);
// Conditionally load the cached Array transitioned map of type
// transitioned_kind from the native context if the map in register
@@ -629,7 +622,7 @@
Register scratch,
Label* no_map_match);
- void LoadNativeContextSlot(int index, Register dst);
+ void LoadGlobalFunction(int index, Register function);
// Load the initial map from the global function. The registers
// function and map can be the same, function is then overwritten.
@@ -1152,6 +1145,13 @@
void InvokeBuiltin(int native_context_index, InvokeFlag flag,
const CallWrapper& call_wrapper = NullCallWrapper());
+ // Store the code object for the given builtin in the target register and
+ // setup the function in r1.
+ void GetBuiltinEntry(Register target, int native_context_index);
+
+ // Store the function for the given builtin in the target register.
+ void GetBuiltinFunction(Register target, int native_context_index);
+
Handle<Object> CodeObject() {
DCHECK(!code_object_.is_null());
return code_object_;
@@ -1533,13 +1533,13 @@
// -----------------------------------------------------------------------------
// Static helper functions.
-inline MemOperand ContextMemOperand(Register context, int index = 0) {
+inline MemOperand ContextOperand(Register context, int index = 0) {
return MemOperand(context, Context::SlotOffset(index));
}
-inline MemOperand NativeContextMemOperand() {
- return ContextMemOperand(cp, Context::NATIVE_CONTEXT_INDEX);
+inline MemOperand GlobalObjectOperand() {
+ return ContextOperand(cp, Context::GLOBAL_OBJECT_INDEX);
}
« no previous file with comments | « src/arm/code-stubs-arm.cc ('k') | src/arm/macro-assembler-arm.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698