cache: add switch to interpreter
This commit is contained in:
@@ -37,6 +37,7 @@ import net.runelite.cache.script.interpreter.instructions.Invoke;
|
|||||||
import net.runelite.cache.script.interpreter.instructions.Jump;
|
import net.runelite.cache.script.interpreter.instructions.Jump;
|
||||||
import net.runelite.cache.script.interpreter.instructions.LoadInt;
|
import net.runelite.cache.script.interpreter.instructions.LoadInt;
|
||||||
import net.runelite.cache.script.interpreter.instructions.Return;
|
import net.runelite.cache.script.interpreter.instructions.Return;
|
||||||
|
import net.runelite.cache.script.interpreter.instructions.Switch;
|
||||||
|
|
||||||
public class InstructionHandlers
|
public class InstructionHandlers
|
||||||
{
|
{
|
||||||
@@ -59,6 +60,7 @@ public class InstructionHandlers
|
|||||||
add(Opcodes.IF_ICMPGE, new If_ICmpGE());
|
add(Opcodes.IF_ICMPGE, new If_ICmpGE());
|
||||||
add(Opcodes.INVOKE, new Invoke());
|
add(Opcodes.INVOKE, new Invoke());
|
||||||
add(Opcodes.RETURN, new Return());
|
add(Opcodes.RETURN, new Return());
|
||||||
|
add(Opcodes.SWITCH, new Switch());
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void add(int opcode, InstructionHandler handler)
|
private static void add(int opcode, InstructionHandler handler)
|
||||||
|
|||||||
@@ -42,6 +42,8 @@ public abstract class If extends InstructionHandler
|
|||||||
StackContext sctx2 = intStack.pop();
|
StackContext sctx2 = intStack.pop();
|
||||||
|
|
||||||
ctx.popsInt(sctx1, sctx2);
|
ctx.popsInt(sctx1, sctx2);
|
||||||
|
sctx1.poppedBy(ctx);
|
||||||
|
sctx2.poppedBy(ctx);
|
||||||
|
|
||||||
Frame dup = frame.dup();
|
Frame dup = frame.dup();
|
||||||
dup.jump(iop);
|
dup.jump(iop);
|
||||||
|
|||||||
62
cache/src/main/java/net/runelite/cache/script/interpreter/instructions/Switch.java
vendored
Normal file
62
cache/src/main/java/net/runelite/cache/script/interpreter/instructions/Switch.java
vendored
Normal file
@@ -0,0 +1,62 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) 2017, Adam <Adam@sigterm.info>
|
||||||
|
* All rights reserved.
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted provided that the following conditions are met:
|
||||||
|
*
|
||||||
|
* 1. Redistributions of source code must retain the above copyright notice, this
|
||||||
|
* list of conditions and the following disclaimer.
|
||||||
|
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
||||||
|
* this list of conditions and the following disclaimer in the documentation
|
||||||
|
* and/or other materials provided with the distribution.
|
||||||
|
*
|
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
||||||
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||||
|
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
|
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
|
||||||
|
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||||
|
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||||
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||||
|
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||||
|
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
*/
|
||||||
|
package net.runelite.cache.script.interpreter.instructions;
|
||||||
|
|
||||||
|
import java.util.Map;
|
||||||
|
import net.runelite.cache.definitions.ScriptDefinition;
|
||||||
|
import net.runelite.cache.script.interpreter.Frame;
|
||||||
|
import net.runelite.cache.script.interpreter.InstructionContext;
|
||||||
|
import net.runelite.cache.script.interpreter.InstructionHandler;
|
||||||
|
import net.runelite.cache.script.interpreter.ScriptInstruction;
|
||||||
|
import net.runelite.cache.script.interpreter.Stack;
|
||||||
|
import net.runelite.cache.script.interpreter.StackContext;
|
||||||
|
|
||||||
|
public class Switch extends InstructionHandler
|
||||||
|
{
|
||||||
|
@Override
|
||||||
|
public void execute(Frame frame, InstructionContext ctx)
|
||||||
|
{
|
||||||
|
Stack intStack = frame.getIntStack();
|
||||||
|
ScriptInstruction scriptInstruction = ctx.getScriptInstruction();
|
||||||
|
ScriptDefinition script = frame.getScript();
|
||||||
|
int switchTableIndex = scriptInstruction.getIop();
|
||||||
|
|
||||||
|
// value -> pc
|
||||||
|
Map<Integer, Integer> switchTable = script.getSwitches()[switchTableIndex];
|
||||||
|
|
||||||
|
// pop value off stack
|
||||||
|
StackContext sctx = intStack.pop();
|
||||||
|
ctx.popsInt(sctx);
|
||||||
|
sctx.poppedBy(ctx);
|
||||||
|
|
||||||
|
// jump to targets
|
||||||
|
for (int target : switchTable.values())
|
||||||
|
{
|
||||||
|
Frame dup = frame.dup();
|
||||||
|
dup.jump(target);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user