Merge pull request #5 from 0-x-2-2/master

Implementation of Unsafe#putByte(long,byte).

Author: Col-E

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

@@ -163,7 +163,7 @@ private static void init(VirtualMachine vm, InstanceJavaClass unsafe, UnsafeHelp
 				throw new PanicException("Segfault");
 			}
 			val value = (ObjectValue) obj;
-			val offset = (int) locals.load(2).asLong();
+			val offset = locals.load(2).asLong();
 			val expected = locals.load(4).asInt();
 			val x = locals.load(5).asInt();
 			val memoryManager = vm.getMemoryManager();
@@ -189,7 +189,7 @@ private static void init(VirtualMachine vm, InstanceJavaClass unsafe, UnsafeHelp
 				throw new PanicException("Segfault");
 			}
 			val value = (ObjectValue) obj;
-			val offset = (int) locals.load(2).asLong();
+			val offset = locals.load(2).asLong();
 			val expected = locals.<ObjectValue>load(4);
 			val x = locals.<ObjectValue>load(5);
 			val memoryManager = vm.getMemoryManager();
@@ -212,7 +212,7 @@ private static void init(VirtualMachine vm, InstanceJavaClass unsafe, UnsafeHelp
 				throw new PanicException("Segfault");
 			}
 			val value = (ObjectValue) $value;
-			val offset = (int) locals.load(2).asLong();
+			val offset = locals.load(2).asLong();
 			val expected = locals.load(4).asLong();
 			val x = locals.load(6).asLong();
 			val memoryManager = vm.getMemoryManager();
@@ -282,20 +282,28 @@ private static void init(VirtualMachine vm, InstanceJavaClass unsafe, UnsafeHelp
 			ctx.setResult(LongValue.M_ONE);
 			return Result.ABORT;
 		});
+		vmi.setInvoker(unsafe, "putByte", "(JB)V", ctx -> {
+			val memoryManager = vm.getMemoryManager();
+			val locals = ctx.getLocals();
+			val address = locals.load(1).asLong();
+			val block = nonNull(memoryManager.getMemory(address));
+			block.getData().writeByte(address - block.getAddress(), locals.load(3).asByte());
+			return Result.ABORT;
+		});
 		vmi.setInvoker(unsafe, "putLong", "(JJ)V", ctx -> {
 			val memoryManager = vm.getMemoryManager();
 			val locals = ctx.getLocals();
 			val address = locals.load(1).asLong();
 			val block = nonNull(memoryManager.getMemory(address));
-			block.getData().writeLong((int) (address - block.getAddress()), locals.load(3).asLong());
+			block.getData().writeLong(address - block.getAddress(), locals.load(3).asLong());
 			return Result.ABORT;
 		});
 		vmi.setInvoker(unsafe, "getByte", "(J)B", ctx -> {
 			val memoryManager = vm.getMemoryManager();
 			val locals = ctx.getLocals();
 			val address = locals.load(1).asLong();
 			val block = nonNull(memoryManager.getMemory(address));
-			ctx.setResult(IntValue.of(block.getData().readByte((int) (address - block.getAddress()))));
+			ctx.setResult(IntValue.of(block.getData().readByte(address - block.getAddress())));
 			return Result.ABORT;
 		});
 		vmi.setInvoker(unsafe, "putInt", "(Ljava/lang/Object;JI)V", ctx -> {
@@ -346,7 +354,7 @@ private static void init(VirtualMachine vm, InstanceJavaClass unsafe, UnsafeHelp
 		vmi.setInvoker(unsafe, "getLong", "(J)J", ctx -> {
 			val address = ctx.getLocals().load(1).asLong();
 			val block = nonNull(vm.getMemoryManager().getMemory(address));
-			ctx.setResult(LongValue.of(block.getData().readLong((int) (address - block.getAddress()))));
+			ctx.setResult(LongValue.of(block.getData().readLong(address - block.getAddress())));
 			return Result.ABORT;
 		});
 		vmi.setInvoker(unsafe, "defineAnonymousClass", "(Ljava/lang/Class;[B[Ljava/lang/Object;)Ljava/lang/Class;", ctx -> {

src/test/java/dev/xdark/ssvm/enhanced/UnsafeTest.java

@@ -38,6 +38,31 @@ private static void testLong2() {
 			}
 		}
 
+		@VMTest
+		private static void testLongWithByte() {
+			val address = U.allocateMemory(8L);
+			val v = System.currentTimeMillis();
+			U.putByte(address, (byte) v);
+			U.putByte(address + 1, (byte) (v >> 8));
+			U.putByte(address + 2, (byte) (v >> 16));
+			U.putByte(address + 3, (byte) (v >> 24));
+			U.putByte(address + 4, (byte) (v >> 32));
+			U.putByte(address + 5, (byte) (v >> 40));
+			U.putByte(address + 6, (byte) (v >> 48));
+			U.putByte(address + 7, (byte) (v >> 56));
+			val read = ((long) U.getByte(address + 7) << 56)
+					| ((long) U.getByte(address + 6) & 0xff) << 48
+					| ((long) U.getByte(address + 5) & 0xff) << 40
+					| ((long) U.getByte(address + 4) & 0xff) << 32
+					| ((long) U.getByte(address + 3) & 0xff) << 24
+					| ((long) U.getByte(address + 2) & 0xff) << 16
+					| ((long) U.getByte(address + 1) & 0xff) << 8
+					| ((long) U.getByte(address) & 0xff);
+			if (v != read || v != U.getLong(address)) {
+				throw new IllegalStateException();
+			}
+		}
+
 		@VMTest
 		private static void testArray() {
 			val unsafe = U;