Minor fixes

Author: xxDark

build.gradle

@@ -4,7 +4,7 @@ plugins {
 }
 
 group 'dev.xdark'
-version '1.9.0'
+version '1.9.0.1'
 
 repositories {
     mavenCentral()

src/main/java/dev/xdark/ssvm/execution/Locals.java

@@ -48,10 +48,11 @@ public interface Locals {
 	 * Copies contents into this locals.
 	 *
 	 * @param locals Content to copy.
-	 * @param offset Content offset.
+	 * @param srcOffset Content srcOffset.
+	 * @param destOffset Offset to copy to.
 	 * @param length Content length.
 	 */
-	void copyFrom(Value[] locals, int offset, int length);
+	void copyFrom(Value[] locals, int srcOffset, int destOffset, int length);
 
 	/**
 	 * @return underlying content of this LVT.

src/main/java/dev/xdark/ssvm/execution/Stack.java

@@ -307,20 +307,4 @@ default boolean isEmpty() {
 	 * @param count  Locals count.
 	 */
 	void sinkInto(Locals locals, int count);
-
-	/**
-	 * Copies contents into this stack.
-	 *
-	 * @param stack Content to copy.
-	 */
-	void copyFrom(Value[] stack);
-
-	/**
-	 * Copies contents into this stack.
-	 *
-	 * @param stack Content to copy.
-	 * @param offset Content offset.
-	 * @param length Content length.
-	 */
-	void copyFrom(Value[] stack, int offset, int length);
 }

src/main/java/dev/xdark/ssvm/execution/ThreadLocals.java

@@ -57,6 +57,7 @@ public void copyFrom(Locals locals, int srcOffset, int destOffset, int length) {
 			}
 			return;
 		}
+		destOffset = table.map(destOffset);
 		Value[] array = table.getArray();
 		if ((!(locals instanceof ThreadLocals))) {
 			Value[] from = locals.getTable();
@@ -68,15 +69,16 @@ public void copyFrom(Locals locals, int srcOffset, int destOffset, int length) {
 	}
 
 	@Override
-	public void copyFrom(Value[] locals, int offset, int length) {
+	public void copyFrom(Value[] locals, int srcOffset, int destOffset, int length) {
 		ThreadRegion table = this.table;
 		if (table.length() == 0) {
 			if (length != 0) {
 				throw new IllegalStateException();
 			}
 			return;
 		}
-		System.arraycopy(locals, offset, table.getArray(), table.map(0), length);
+		Value[] array = table.getArray();
+		System.arraycopy(locals, srcOffset, array, table.map(destOffset), length);
 	}
 
 	@Override

src/main/java/dev/xdark/ssvm/execution/ThreadStack.java

@@ -151,37 +151,10 @@ public void sinkInto(Locals locals, int count) {
 		}
 		ThreadRegion stack = this.stack;
 		int start = cursor - count;
-		locals.copyFrom(stack.getArray(), stack.map(start), count);
+		locals.copyFrom(stack.getArray(), stack.map(start), 0, count);
 		cursor = start;
 	}
 
-	@Override
-	public void copyFrom(Value[] locals) {
-		ThreadRegion stack = this.stack;
-		if (stack.length() == 0) {
-			if (locals.length != 0) {
-				throw new IllegalStateException();
-			}
-			return;
-		}
-		Value[] array = stack.getArray();
-		System.arraycopy(locals, 0, array, stack.map(0), locals.length);
-		cursor += locals.length;
-	}
-
-	@Override
-	public void copyFrom(Value[] locals, int offset, int length) {
-		ThreadRegion stack = this.stack;
-		if (stack.length() == 0) {
-			if (length != 0) {
-				throw new IllegalStateException();
-			}
-			return;
-		}
-		System.arraycopy(locals, offset, stack.getArray(), stack.map(0), length);
-		cursor += length;
-	}
-
 	@Override
 	public void dispose() {
 		stack.dispose();

src/main/java/dev/xdark/ssvm/jit/JitHelper.java

@@ -404,7 +404,7 @@ public Value invokeStatic(Value[] locals, String owner, String name, String desc
 		VMHelper helper = vm.getHelper();
 		JavaMethod mn = resolveStaticMethod(owner, name, desc, ctx);
 		Locals table = vm.getThreadStorage().newLocals(mn);
-		table.copyFrom(locals, 0, locals.length);
+		table.copyFrom(locals, 0, 0, locals.length);
 		ExecutionContext result = helper.invoke(mn, table);
 		return result.getResult();
 	}
@@ -414,7 +414,7 @@ public Value invokeVirtual(Value[] locals, String name, String desc, ExecutionCo
 		VMHelper helper = vm.getHelper();
 		JavaMethod method = vm.getLinkResolver().resolveInterfaceMethod(helper.checkNotNull(locals[0]), name, desc, true);
 		Locals table = vm.getThreadStorage().newLocals(method);
-		table.copyFrom(locals, 0, locals.length);
+		table.copyFrom(locals, 0, 0, locals.length);
 		ExecutionContext result = helper.invoke(method, table);
 		return result.getResult();
 	}
@@ -425,7 +425,7 @@ public Value invokeInterface(Value[] locals, String owner, String name, String d
 		InstanceJavaClass klass = (InstanceJavaClass) helper.tryFindClass(ctx.getOwner().getClassLoader(), owner, true);
 		JavaMethod method = vm.getLinkResolver().resolveVirtualMethod(helper.checkNotNull(locals[0]).getJavaClass(), klass, name, desc);
 		Locals table = vm.getThreadStorage().newLocals(method);
-		table.copyFrom(locals, 0, locals.length);
+		table.copyFrom(locals, 0, 0, locals.length);
 		ExecutionContext result = helper.invoke(method, table);
 		return result.getResult();
 	}

src/main/java/dev/xdark/ssvm/natives/MethodHandleNatives.java

@@ -149,7 +149,7 @@ public void init(VirtualMachine vm) {
 				}
 			}
 			Locals table = vm.getThreadStorage().newLocals(vmtarget);
-			table.copyFrom(lvt, 0, lvt.length);
+			table.copyFrom(lvt, 0, 0, lvt.length);
 			Value result = helper.invoke(vmtarget, table).getResult();
 			ctx.setResult(result);
 			return Result.ABORT;
@@ -178,7 +178,7 @@ public void init(VirtualMachine vm) {
 				}
 			}
 			Locals newLocals = vm.getThreadStorage().newLocals(vmtarget.getMaxLocals());
-			newLocals.copyFrom(table, 0, table.length - 1);
+			newLocals.copyFrom(table, 0, 0, table.length - 1);
 			Value result = helper.invoke(vmtarget, newLocals).getResult();
 
 			ctx.setResult(result);