Index: src/arm/macro-assembler-arm.h |
diff --git a/src/arm/macro-assembler-arm.h b/src/arm/macro-assembler-arm.h |
index cb65fa0b924a1c2efa29aa81a07b44381a907500..dab6b687a81f76dc33238ebdfe78bfe752e1dc3e 100644 |
--- a/src/arm/macro-assembler-arm.h |
+++ b/src/arm/macro-assembler-arm.h |
@@ -608,8 +608,15 @@ class MacroAssembler: public Assembler { |
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); |
+ void LoadGlobalProxy(Register dst) { |
+ LoadNativeContextSlot(Context::GLOBAL_PROXY_INDEX, dst); |
+ } |
// Conditionally load the cached Array transitioned map of type |
// transitioned_kind from the native context if the map in register |
@@ -622,7 +629,7 @@ class MacroAssembler: public Assembler { |
Register scratch, |
Label* no_map_match); |
- void LoadGlobalFunction(int index, Register function); |
+ void LoadNativeContextSlot(int index, Register dst); |
// Load the initial map from the global function. The registers |
// function and map can be the same, function is then overwritten. |
@@ -1145,13 +1152,6 @@ class MacroAssembler: public Assembler { |
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 @@ class CodePatcher { |
// ----------------------------------------------------------------------------- |
// Static helper functions. |
-inline MemOperand ContextOperand(Register context, int index = 0) { |
+inline MemOperand ContextMemOperand(Register context, int index = 0) { |
return MemOperand(context, Context::SlotOffset(index)); |
} |
-inline MemOperand GlobalObjectOperand() { |
- return ContextOperand(cp, Context::GLOBAL_OBJECT_INDEX); |
+inline MemOperand NativeContextMemOperand() { |
+ return ContextMemOperand(cp, Context::NATIVE_CONTEXT_INDEX); |
} |