Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-19 16:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1522837 part 16 - Implement pushUint8BytecodeOperandArg and pushUint16BytecodeOperandArg in BaselineInterpreterCodeGen. r=djvj

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

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Jan de Mooij 2019-03-28 14:05:50 +00:00
parent 72a15183ba
commit f42c632f54
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -878,25 +878,30 @@ void BaselineInterpreterCodeGen::pushScriptScopeArg() {
}
template <>
void BaselineCompilerCodeGen::pushUint8BytecodeOperandArg() {
void BaselineCompilerCodeGen::pushUint8BytecodeOperandArg(Register) {
MOZ_ASSERT(JOF_OPTYPE(JSOp(*handler.pc())) == JOF_UINT8);
pushArg(Imm32(GET_UINT8(handler.pc())));
}
template <>
void BaselineInterpreterCodeGen::pushUint8BytecodeOperandArg() {
MOZ_CRASH("NYI: interpreter pushUint8BytecodeOperandArg");
void BaselineInterpreterCodeGen::pushUint8BytecodeOperandArg(Register scratch) {
masm.loadPtr(frame.addressOfInterpreterPC(), scratch);
LoadUint8Operand(masm, scratch, scratch);
pushArg(scratch);
}
template <>
void BaselineCompilerCodeGen::pushUint16BytecodeOperandArg() {
void BaselineCompilerCodeGen::pushUint16BytecodeOperandArg(Register) {
MOZ_ASSERT(JOF_OPTYPE(JSOp(*handler.pc())) == JOF_UINT16);
pushArg(Imm32(GET_UINT16(handler.pc())));
}
template <>
void BaselineInterpreterCodeGen::pushUint16BytecodeOperandArg() {
MOZ_CRASH("NYI: interpreter pushUint16BytecodeOperandArg");
void BaselineInterpreterCodeGen::pushUint16BytecodeOperandArg(
Register scratch) {
masm.loadPtr(frame.addressOfInterpreterPC(), scratch);
LoadUint16Operand(masm, scratch, scratch);
pushArg(scratch);
}
template <>
@ -1905,7 +1910,7 @@ bool BaselineCodeGen<Handler>::emit_JSOP_CHECKISOBJ() {
prepareVMCall();
pushUint8BytecodeOperandArg();
pushUint8BytecodeOperandArg(R0.scratchReg());
using Fn = bool (*)(JSContext*, CheckIsObjectKind);
if (!callVM<Fn, ThrowCheckIsObject>()) {
@ -1923,7 +1928,7 @@ bool BaselineCodeGen<Handler>::emit_JSOP_CHECKISCALLABLE() {
prepareVMCall();
pushUint8BytecodeOperandArg();
pushUint8BytecodeOperandArg(R1.scratchReg());
pushArg(R0);
using Fn = bool (*)(JSContext*, HandleValue, CheckIsCallableKind);
@ -2337,7 +2342,7 @@ bool BaselineCodeGen<Handler>::emit_JSOP_SETFUNNAME() {
prepareVMCall();
pushUint8BytecodeOperandArg();
pushUint8BytecodeOperandArg(R2.scratchReg());
pushArg(R1);
pushArg(R0.scratchReg());
@ -4370,7 +4375,7 @@ bool BaselineCodeGen<Handler>::emit_JSOP_TYPEOFEXPR() {
template <typename Handler>
bool BaselineCodeGen<Handler>::emit_JSOP_THROWMSG() {
prepareVMCall();
pushUint16BytecodeOperandArg();
pushUint16BytecodeOperandArg(R2.scratchReg());
using Fn = bool (*)(JSContext*, const unsigned);
return callVM<Fn, js::ThrowMsgOperation>();
@ -4899,7 +4904,7 @@ bool BaselineCodeGen<Handler>::emit_JSOP_ASYNCRESOLVE() {
masm.unboxObject(frame.addressOfStackValue(-1), R0.scratchReg());
prepareVMCall();
pushUint8BytecodeOperandArg();
pushUint8BytecodeOperandArg(R2.scratchReg());
pushArg(R1);
pushArg(R0.scratchReg());

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

@ -317,8 +317,8 @@ class BaselineCodeGen {
void pushScriptScopeArg();
// Pushes a bytecode operand as argument for a VM function.
void pushUint8BytecodeOperandArg();
void pushUint16BytecodeOperandArg();
void pushUint8BytecodeOperandArg(Register scratch);
void pushUint16BytecodeOperandArg(Register scratch);
void loadResumeIndexBytecodeOperand(Register dest);
void loadInt32LengthBytecodeOperand(Register dest);