curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-10 10:34:06 +09:00
Code Issues Packages Projects Releases Wiki Activity

determining array base offset: replaced trick code with proper code

Browse Source
This commit is contained in:
minjaesong
2020-02-27 17:54:35 +09:00
parent e235b81041
commit 1524919ae0
5 changed files with 25 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/net/torvald/UnsafePtr.kt
View File

@@ -24,14 +24,24 @@ internal object UnsafeHelper {
return UnsafePtr(ptr, size) return UnsafePtr(ptr, size)
} }
fun memcpy(src: UnsafePtr, fromIndex: Long, dest: UnsafePtr, toIndex: Long, copyLength: Long) { fun memcpy(src: UnsafePtr, fromIndex: Long, dest: UnsafePtr, toIndex: Long, copyLength: Long) =
// unsafe.copyMemory(srcAddress, destAddress, bytes); in case no src for the sun.misc.Unsafe is available :D unsafe.copyMemory(src.ptr + fromIndex, dest.ptr + toIndex, copyLength)
unsafe.copyMemory(src.ptr + fromIndex, dest.ptr + toIndex, copyLength) fun memcpy(srcAddress: Long, destAddress: Long, copyLength: Long) =
} unsafe.copyMemory(srcAddress, destAddress, copyLength)
fun memcpyRaw(srcObj: Any?, srcPos: Long, destObj: Any?, destPos: Long, len: Long) =
unsafe.copyMemory(srcObj, srcPos, destObj, destPos, len)
fun memcpy(srcAddress: Long, destAddress: Long, copyLength: Long) = unsafe.copyMemory(srcAddress, destAddress, copyLength) /**
* The array object in JVM is stored in this memory map:
fun memcpyRaw(srcObj: Any?, srcPos: Long, destObj: Any?, destPos: Long, len: Long) = unsafe.copyMemory(srcObj, srcPos, destObj, destPos, len) *
* 0 w 2w *
* | Some identifier | Other identifier | the actual data ... |
*
* (where w = 4 for 32-bit JVM and 8 for 64-bit JVM. If Compressed-OOP is involved, things may get complicated)
*
* @return offset from the array's base memory address (aka pointer) that the actual data begins.
*/
fun getArrayOffset(obj: Any) = unsafe.arrayBaseOffset(obj.javaClass)
} }
/** /**

4
src/net/torvald/random/XXHash32.java
View File

@@ -17,8 +17,6 @@ public class XXHash32 {
static final int PRIME4 = 0x27D4EB2F; static final int PRIME4 = 0x27D4EB2F;
static final int PRIME5 = 0x165667B1; static final int PRIME5 = 0x165667B1;
static final int ARRAY_ELEM_OFFSET = (AppLoader.is32BitJVM) ? 8 : 16;
public static int hash(byte[] data, int seed) { public static int hash(byte[] data, int seed) {
int end = data.length; int end = data.length;
int offset = 0; int offset = 0;
@@ -74,6 +72,6 @@ public class XXHash32 {
} }
protected static int getInt(byte[] data, int offset) { protected static int getInt(byte[] data, int offset) {
return UnsafeHelper.INSTANCE.getUnsafe().getInt(data, offset + ARRAY_ELEM_OFFSET); return UnsafeHelper.INSTANCE.getUnsafe().getInt(data, offset + UnsafeHelper.INSTANCE.getArrayOffset(data));
} }
} }

2
src/net/torvald/terrarum/modulecomputers/virtualcomputer/computer/BLIT.kt
View File

@@ -35,7 +35,7 @@ class BLIT {
val writeAddr = toAddr(x, y) val writeAddr = toAddr(x, y)
UnsafeHelper.memcpyRaw( UnsafeHelper.memcpyRaw(
bytes, (if (AppLoader.is32BitJVM) 8 else 16) + yy * width, bytes, UnsafeHelper.getArrayOffset(bytes) + yy * width,
null, framebuffer.ptr + writeAddr, null, framebuffer.ptr + writeAddr,
width.toLong() width.toLong()
) )

4
src/net/torvald/terrarum/tests/RNGTest.kt
View File

@@ -39,6 +39,8 @@ fun main(args: Array<String>) {
val rangeSize = 64
val textLen = (rangeSize - 1).toString().length
for (tries in 0 until 16) { for (tries in 0 until 16) {
repeat(BlockCodex.DYNAMIC_RANDOM_CASES + 12) { repeats -> repeat(BlockCodex.DYNAMIC_RANDOM_CASES + 12) { repeats ->
val x = 349 + repeats val x = 349 + repeats
@@ -48,7 +50,7 @@ fun main(args: Array<String>) {
val offset = XXHash32.hash(((x and 0xFFFF).shl(16) or (y and 0xFFFF)).toLittle(), 10000) val offset = XXHash32.hash(((x and 0xFFFF).shl(16) or (y and 0xFFFF)).toLittle(), 10000)
//print("${offset.toString().padStart(2, '0')} ") //print("${offset.toString().padStart(2, '0')} ")
print("${offset.fmod(BlockCodex.DYNAMIC_RANDOM_CASES).toString().padStart(2, '0')} ") print("${offset.fmod(rangeSize).toString().padStart(textLen, '0')} ")
} }
println() println()
println() println()

25
src/net/torvald/terrarum/tests/UnsafeTest.kt
View File

@@ -19,30 +19,11 @@ class UnsafeTest {
private val memsize = 512L // must be big enough value so that your OS won't always return zero-filled pieces private val memsize = 512L // must be big enough value so that your OS won't always return zero-filled pieces
fun main() { fun main() {
var ptr = unsafe.allocateMemory(memsize) val intarray = intArrayOf(5,4,3,2,1)
printDump(ptr)
unsafe.setMemory(ptr, memsize, 0x00.toByte()) val arrayBaseOffset = UnsafeHelper.getArrayOffset(intarray) // should be 16 or 12 on 64-bit JVM
printDump(ptr)
for (k in 0 until 13) { println(arrayBaseOffset)
unsafe.putByte(ptr + k, (-1 - k).toByte())
}
printDump(ptr)
// test shingled memory copy -- how would it work out?
UnsafeHelper.memcpy(ptr, ptr + 3L, 13L)
printDump(ptr)
println(ptr)
ptr = unsafe.reallocateMemory(ptr, 256L)
println(ptr)
// that's all for today!
unsafe.freeMemory(ptr)
} }