ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

cache: fix assembler to set correct switch table index

Browse Source 
The int operand of switch instructions is an index into the switch table. The operand was always 0, breaking scripts with multiple switches.
This commit is contained in:
Adam
2018-07-24 19:59:27 -04:00
parent 7831042189
commit 23c13c1d53
3 changed files with 293 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
cache/src/main/java/net/runelite/cache/script/assembler/ScriptWriter.java vendored
View File

@@ -32,6 +32,7 @@ import java.util.Objects;
import net.runelite.cache.definitions.ScriptDefinition;
import net.runelite.cache.script.Instruction;
import net.runelite.cache.script.Instructions;
import net.runelite.cache.script.Opcodes;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -216,6 +217,8 @@ public class ScriptWriter extends rs2asmBaseListener
public ScriptDefinition buildScript()
{
setSwitchOperands();
ScriptDefinition script = new ScriptDefinition();
script.setId(id);
script.setIntStackCount(intStackCount);
@@ -232,6 +235,20 @@ public class ScriptWriter extends rs2asmBaseListener
return script;
}
private void setSwitchOperands()
{
int count = 0;
for (int i = 0; i < opcodes.size(); ++i)
{
if (opcodes.get(i) != Opcodes.SWITCH)
{
continue;
}
iops.set(i, count++);
}
}
private Map<Integer, Integer>[] buildSwitches()
{
int count = (int) switches.stream().filter(Objects::nonNull).count();

3
cache/src/test/java/net/runelite/cache/script/assembler/AssemblerTest.java vendored
View File

@@ -51,7 +51,8 @@ public class AssemblerTest
{
return new String[]
{
"91.rs2asm"
"91.rs2asm",
"681.rs2asm"
};
}

274
cache/src/test/resources/net/runelite/cache/script/assembler/681.rs2asm vendored Normal file
View File

@@ -0,0 +1,274 @@
.int_stack_count 0
.string_stack_count 0
.int_var_count 2
.string_var_count 1
get_varc 5
load_int 14
if_icmpeq LABEL4
jump LABEL7
LABEL4:
load_int 1
put_varc 66
return
LABEL7:
load_int -1
istore 0
load_string ""
sstore 0
get_varc_string 22
string_length
istore 1
iload 1
load_int 0
if_icmpgt LABEL18
jump LABEL193
LABEL18:
get_varc 5
switch
1: LABEL21
2: LABEL44
3: LABEL44
4: LABEL23
5: LABEL23
6: LABEL44
7: LABEL110
8: LABEL114
9: LABEL120
10: LABEL123
11: LABEL185
12: LABEL142
13: LABEL160
15: LABEL120
16: LABEL190
jump LABEL192
LABEL21:
return
jump LABEL192
LABEL23:
get_ignorecount
load_int 0
if_icmplt LABEL27
jump LABEL30
LABEL27:
load_string "Unable to update ignore list - system busy."
send_game_message
jump LABEL43
LABEL30:
get_varc 5
load_int 4
if_icmpeq LABEL34
jump LABEL37
LABEL34:
get_varc_string 22
add_ignore
jump LABEL43
LABEL37:
get_varc 5
load_int 5
if_icmpeq LABEL41
jump LABEL43
LABEL41:
get_varc_string 22
remove_ignore
LABEL43:
jump LABEL192
LABEL44:
get_friendcount
load_int 0
if_icmplt LABEL48
jump LABEL51
LABEL48:
load_string "Unable to complete action - system busy."
send_game_message
jump LABEL109
LABEL51:
get_varc 5
load_int 2
if_icmpeq LABEL55
jump LABEL58
LABEL55:
get_varc_string 22
add_friend
jump LABEL109
LABEL58:
get_varc 5
load_int 3
if_icmpeq LABEL62
jump LABEL65
LABEL62:
get_varc_string 22
remove_friend
jump LABEL109
LABEL65:
get_varc 5
load_int 6
if_icmpeq LABEL69
jump LABEL109
LABEL69:
get_varc 203
load_int 0
if_icmpeq LABEL76
get_varc 203
load_int -1
if_icmpeq LABEL76
jump LABEL82
LABEL76:
load_int 1
load_int 1
invoke 299
load_string "You must set a name before you can chat."
send_game_message
return
LABEL82:
5005
load_int 2
if_icmpeq LABEL86
jump LABEL97
LABEL86:
5000
load_int 1
5016
chatfilter_update
invoke 178
invoke 553
istore 0
iload 0
invoke 84
iload 0
invoke 89
LABEL97:
get_varbit 4394
load_int 1
if_icmpeq LABEL101
jump LABEL104
LABEL101:
get_varc_string 23
remove_friend
jump LABEL107
LABEL104:
get_varc_string 23
get_varc_string 22
privmsg
LABEL107:
get_gamecycle
put_varc 61
LABEL109:
jump LABEL192
LABEL110:
get_varc_string 22
invoke 212
numeric_input
jump LABEL192
LABEL114:
get_varc_string 22
string_remove_html
put_varc_string 128
get_varc_string 22
string_input_1
jump LABEL192
LABEL120:
get_varc_string 22
string_input_2
jump LABEL192
LABEL123:
get_varc 203
load_int 0
if_icmpeq LABEL130
get_varc 203
load_int -1
if_icmpeq LABEL130
jump LABEL136
LABEL130:
load_int 1
load_int 1
invoke 299
load_string "You must set a name before you can chat."
send_game_message
return
LABEL136:
get_varc_string 22
string_remove_html
put_varc_string 129
get_varc_string 22
join_clanchat
jump LABEL192
LABEL142:
iload 1
load_int 10
if_icmpgt LABEL146
jump LABEL152
LABEL146:
get_varc_string 22
load_int 0
load_int 9
string_substring
sstore 0
jump LABEL154
LABEL152:
get_varc_string 22
sstore 0
LABEL154:
sload 0
tolowercase
5021
invoke 553
invoke 84
jump LABEL192
LABEL160:
get_varc 203
load_int 0
if_icmpeq LABEL167
get_varc 203
load_int -1
if_icmpeq LABEL167
jump LABEL173
LABEL167:
load_int 1
load_int 1
invoke 299
load_string "You must set a name before you can chat."
send_game_message
return
LABEL173:
get_varc_string 22
load_int 0
put_varc 62
put_varc_string 28
invoke 95
load_int 552
load_int -2147483645
load_int 1
load_string "I1"
load_int 10616843
widget_put_render_listener_widget
jump LABEL192
LABEL185:
load_int 0
load_int 1
invoke 299
return
jump LABEL192
LABEL190:
get_varc_string 22
invoke 2061
LABEL192:
jump LABEL199
LABEL193:
get_varc 5
switch
16: LABEL198
7: LABEL196
8: LABEL196
9: LABEL196
15: LABEL196
jump LABEL199
LABEL196:
return
jump LABEL199
LABEL198:
return
LABEL199:
load_int 1
load_int 1
invoke 299
return