Another variant of UnixNativeDispatcher.init

xxDark · Jun 5, 2022 · eaaaa77 · eaaaa77
1 parent 9b9ec9d
commit eaaaa77
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/main/java/dev/xdark/ssvm/natives/FileSystemNativeDispatcherNatives.java b/src/main/java/dev/xdark/ssvm/natives/FileSystemNativeDispatcherNatives.java
@@ -8,6 +8,7 @@
 import dev.xdark.ssvm.mirror.InstanceJavaClass;
 import dev.xdark.ssvm.util.VMHelper;
 import dev.xdark.ssvm.value.ArrayValue;
+import dev.xdark.ssvm.value.IntValue;
 import lombok.experimental.UtilityClass;
 
 import java.nio.charset.StandardCharsets;
@@ -35,6 +36,10 @@ public void init(VirtualMachine vm) {
 				return Result.ABORT;
 			});
 			vmi.setInvoker(unixDispatcher, "init", "()V", MethodInvoker.noop());
+			vmi.setInvoker(unixDispatcher, "init", "()I", ctx -> {
+				ctx.setResult(IntValue.ZERO);
+				return Result.ABORT;
+			});
 			InstanceJavaClass linuxDispatcher = (InstanceJavaClass) vm.findBootstrapClass("sun/nio/fs/LinuxNativeDispatcher");
 			if (linuxDispatcher != null) {
 				vmi.setInvoker(linuxDispatcher, "init", "()V", MethodInvoker.noop());

diff --git a/src/main/java/dev/xdark/ssvm/util/VolatileBufferAccess.java b/src/main/java/dev/xdark/ssvm/util/VolatileBufferAccess.java
@@ -135,7 +135,7 @@ final class VolatileArrayAccess implements VolatileBufferAccess {
 
 		VolatileArrayAccess(ByteBuffer buffer) {
 			array = buffer.array();
-			offset = UnsafeUtil.ARRAY_BYTE_BASE_OFFSET + + buffer.position() + buffer.arrayOffset();
+			offset = UnsafeUtil.ARRAY_BYTE_BASE_OFFSET + buffer.position() + buffer.arrayOffset();
 		}
 
 		@Override