Index: src/mips/macro-assembler-mips.h |
diff --git a/src/mips/macro-assembler-mips.h b/src/mips/macro-assembler-mips.h |
index 318d6179318b4d462b9fdbf6b9f9640ed58d5098..0fb9f77f3c45bcdd70cf8aadf2967e1ec0eb326a 100644 |
--- a/src/mips/macro-assembler-mips.h |
+++ b/src/mips/macro-assembler-mips.h |
@@ -112,13 +112,13 @@ |
// ----------------------------------------------------------------------------- |
// Static helper functions. |
-inline MemOperand ContextMemOperand(Register context, int index) { |
+inline MemOperand ContextOperand(Register context, int index) { |
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); |
} |
@@ -935,15 +935,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 |
@@ -956,7 +949,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. |
@@ -1337,6 +1330,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 a1. |
+ 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); |
+ |
struct Unresolved { |
int pc; |
uint32_t flags; // See Bootstrapper::FixupFlags decoders/encoders. |