| Index: src/arm64/macro-assembler-arm64.h
|
| diff --git a/src/arm64/macro-assembler-arm64.h b/src/arm64/macro-assembler-arm64.h
|
| index 6d99d19e547e26ead22fdcf4ebb4e0d1c242b5e4..f1ffcb8750803f21e3400c6d323688942570b8d6 100644
|
| --- a/src/arm64/macro-assembler-arm64.h
|
| +++ b/src/arm64/macro-assembler-arm64.h
|
| @@ -1132,14 +1132,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 the function register.
|
| - void GetBuiltinEntry(Register target, Register function,
|
| - int native_context_index);
|
| -
|
| - // Store the function for the given builtin in the target register.
|
| - void GetBuiltinFunction(Register target, int native_context_index);
|
| -
|
| void Jump(Register target);
|
| void Jump(Address target, RelocInfo::Mode rmode, Condition cond = al);
|
| void Jump(Handle<Code> code, RelocInfo::Mode rmode, Condition cond = al);
|
| @@ -1676,8 +1668,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);
|
| + }
|
|
|
| // Emit code for a truncating division by a constant. The dividend register is
|
| // unchanged. Dividend and result must be different.
|
| @@ -1899,7 +1898,7 @@ class MacroAssembler : public Assembler {
|
| Register scratch2,
|
| 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.
|
| @@ -2204,8 +2203,8 @@ inline MemOperand ContextMemOperand(Register context, int index = 0) {
|
| return MemOperand(context, Context::SlotOffset(index));
|
| }
|
|
|
| -inline MemOperand GlobalObjectMemOperand() {
|
| - return ContextMemOperand(cp, Context::GLOBAL_OBJECT_INDEX);
|
| +inline MemOperand NativeContextMemOperand() {
|
| + return ContextMemOperand(cp, Context::NATIVE_CONTEXT_INDEX);
|
| }
|
|
|
|
|
|
|