Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 13:21:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1522837 part 2 - Implement subtractScriptSlotsSize, loadGlobalLexicalEnvironment, loadGlobalThisValue, pushScriptArg. r=tcampbell

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D17645

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Jan de Mooij 2019-02-03 10:07:01 +00:00
parent aa34bcb168
commit ae765c9ac3
3 changed files with 35 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
js/src/jit/BaselineCompiler.cpp
View File

@ -738,7 +738,14 @@ void BaselineCompilerCodeGen::subtractScriptSlotsSize(Register reg,
template <>
void BaselineInterpreterCodeGen::subtractScriptSlotsSize(Register reg,
Register scratch) {
MOZ_CRASH("NYI: interpreter subtractScriptSlotsSize");
// reg = reg - script->nslots() * sizeof(Value)
MOZ_ASSERT(reg != scratch);
loadScript(scratch);
masm.load32(Address(scratch, JSScript::offsetOfNslots()), scratch);
static_assert(sizeof(Value) == 8,
"shift by 3 below assumes Value is 8 bytes");
masm.lshiftPtr(Imm32(3), scratch);
masm.subPtr(scratch, reg);
}
template <>
@ -748,7 +755,13 @@ void BaselineCompilerCodeGen::loadGlobalLexicalEnvironment(Register dest) {
template <>
void BaselineInterpreterCodeGen::loadGlobalLexicalEnvironment(Register dest) {
MOZ_CRASH("NYI: interpreter loadGlobalLexicalEnvironment");
// TODO(bug 1522394): consider storing a pointer to the global lexical in
// Realm to eliminate some dependent loads and unboxing.
masm.loadPtr(AbsoluteAddress(cx->addressOfRealm()), dest);
masm.loadPtr(Address(dest, Realm::offsetOfActiveGlobal()), dest);
masm.loadPtr(Address(dest, NativeObject::offsetOfSlots()), dest);
Address lexicalSlot(dest, GlobalObject::offsetOfLexicalEnvironmentSlot());
masm.unboxObject(lexicalSlot, dest);
}
template <>
@ -772,17 +785,22 @@ void BaselineCompilerCodeGen::loadGlobalThisValue(ValueOperand dest) {
template <>
void BaselineInterpreterCodeGen::loadGlobalThisValue(ValueOperand dest) {
MOZ_CRASH("NYI: interpreter loadGlobalThisValue");
Register scratch = dest.scratchReg();
loadGlobalLexicalEnvironment(scratch);
static constexpr size_t SlotOffset =
LexicalEnvironmentObject::offsetOfThisValueOrScopeSlot();
masm.loadValue(Address(scratch, SlotOffset), dest);
}
template <>
void BaselineCompilerCodeGen::pushScriptArg() {
void BaselineCompilerCodeGen::pushScriptArg(Register scratch) {
pushArg(ImmGCPtr(handler.script()));
}
template <>
void BaselineInterpreterCodeGen::pushScriptArg() {
MOZ_CRASH("NYI: interpreter pushScriptArg");
void BaselineInterpreterCodeGen::pushScriptArg(Register scratch) {
loadScript(scratch);
pushArg(scratch);
}
template <>
@ -975,7 +993,7 @@ bool BaselineCompilerCodeGen::initEnvironmentChain() {
prepareVMCall();
pushScriptArg();
pushScriptArg(R2.scratchReg());
masm.loadPtr(frame.addressOfEnvironmentChain(), R0.scratchReg());
pushArg(R0.scratchReg());
@ -3287,7 +3305,7 @@ bool BaselineCodeGen<Handler>::emit_JSOP_SETINTRINSIC() {
pushArg(R0);
pushBytecodePCArg();
pushScriptArg();
pushScriptArg(R2.scratchReg());
return callVM(SetIntrinsicInfo);
}
@ -3305,7 +3323,7 @@ bool BaselineCodeGen<Handler>::emit_JSOP_DEFVAR() {
prepareVMCall();
pushBytecodePCArg();
pushScriptArg();
pushScriptArg(R2.scratchReg());
pushArg(R0.scratchReg());
return callVM(DefVarInfo);
@ -3327,7 +3345,7 @@ bool BaselineCodeGen<Handler>::emitDefLexical(JSOp op) {
prepareVMCall();
pushBytecodePCArg();
pushScriptArg();
pushScriptArg(R2.scratchReg());
pushArg(R0.scratchReg());
return callVM(DefLexicalInfo);
@ -3358,7 +3376,7 @@ bool BaselineCodeGen<Handler>::emit_JSOP_DEFFUN() {
pushArg(R0.scratchReg());
pushArg(R1.scratchReg());
pushScriptArg();
pushScriptArg(R2.scratchReg());
return callVM(DefFunOperationInfo);
}
@ -5598,7 +5616,7 @@ bool BaselineCodeGen<Handler>::emit_JSOP_CLASSCONSTRUCTOR() {
prepareVMCall();
pushArg(ImmPtr(nullptr));
pushBytecodePCArg();
pushScriptArg();
pushScriptArg(R2.scratchReg());
if (!callVM(MakeDefaultConstructorInfo)) {
return false;
}
@ -5617,7 +5635,7 @@ bool BaselineCodeGen<Handler>::emit_JSOP_DERIVEDCONSTRUCTOR() {
prepareVMCall();
pushArg(R0.scratchReg());
pushBytecodePCArg();
pushScriptArg();
pushScriptArg(R2.scratchReg());
if (!callVM(MakeDefaultConstructorInfo)) {
return false;
}
@ -5668,7 +5686,7 @@ bool BaselineCodeGen<Handler>::emit_JSOP_DYNAMIC_IMPORT() {
prepareVMCall();
pushArg(R0);
pushScriptArg();
pushScriptArg(R2.scratchReg());
if (!callVM(StartDynamicModuleImportInfo)) {
return false;
}

2
js/src/jit/BaselineCompiler.h
View File

@ -303,7 +303,7 @@ class BaselineCodeGen {
}
// Pushes the current script as argument for a VM function.
void pushScriptArg();
void pushScriptArg(Register scratch);
// Pushes the bytecode pc as argument for a VM function.
void pushBytecodePCArg();

2
js/src/vm/JSContext.h
View File

@ -846,6 +846,8 @@ struct JSContext : public JS::RootingContext,
}
void* addressOfZone() { return &zone_; }
const void* addressOfRealm() const { return &realm_; }
// Futex state, used by Atomics.wait() and Atomics.wake() on the Atomics
// object.
js::FutexThread fx;