Merge origin/dev into dev

This commit is contained in:
honfika@gmail.com
2017-04-01 08:15:51 +02:00
2 changed files with 5 additions and 3 deletions

View File

@@ -2371,7 +2371,9 @@ public class AVM2Code implements Cloneable {
pos = code.size();
}
final int byteCount = instruction.getBytesLength();
if (pos == code.size()) {
if (code.size() == 0) {
instruction.setAddress(0);
} else if (pos == code.size()) {
instruction.setAddress(code.get(pos - 1).getAddress() + code.get(pos - 1).getBytesLength());
} else {
instruction.setAddress(code.get(pos).getAddress());