curioustorvald/tsvm
1
0
Fork 0
mirror of https://github.com/curioustorvald/tsvm.git synced 2026-03-17 00:16:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

forceAlloc impl

Browse Source
This commit is contained in:
minjaesong
2025-04-07 21:10:19 +09:00
parent f30022bf66
commit 9ce7e3dfd2
3 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
assets/disk0/home/hdk/load.js
View File

@@ -16,7 +16,7 @@ sys.free(metaArea)
if (addrToLoad == 0) if (addrToLoad == 0)
addrToLoad = sys.malloc(imageSize + 4) addrToLoad = sys.malloc(imageSize + 4)
else else
forceAlloc(addrToLoad, imageSize + 4) sys.forceAlloc(addrToLoad, imageSize + 4)
// writes IMAGE_SIZE and the BINARY_IMAGE directly to the memory // writes IMAGE_SIZE and the BINARY_IMAGE directly to the memory
infile.pread(addrToLoad, imageSize + 4, 8) infile.pread(addrToLoad, imageSize + 4, 8)

16
tsvm_core/src/net/torvald/tsvm/VM.kt
View File

@@ -45,6 +45,7 @@ class VM(
val memsize = minOf(USER_SPACE_SIZE, _memsize.toLong()) val memsize = minOf(USER_SPACE_SIZE, _memsize.toLong())
val MALLOC_UNIT = 64 val MALLOC_UNIT = 64
val MALLOC_RESERVED_BLOCKS = 4 // 4*64=256 bytes are always reserved and won't be allocated to a pointer
private val mallocBlockSize = (memsize / MALLOC_UNIT).toInt() private val mallocBlockSize = (memsize / MALLOC_UNIT).toInt()
internal val usermem = UnsafeHelper.allocate(memsize, this) internal val usermem = UnsafeHelper.allocate(memsize, this)
@@ -218,7 +219,7 @@ class VM(
} }
private fun findEmptySpace(blockSize: Int): Int? { private fun findEmptySpace(blockSize: Int): Int? {
var cursorHead = 0 var cursorHead = MALLOC_RESERVED_BLOCKS
var cursorTail: Int var cursorTail: Int
val cursorHeadMaxInclusive = mallocBlockSize - blockSize val cursorHeadMaxInclusive = mallocBlockSize - blockSize
while (cursorHead <= cursorHeadMaxInclusive) { while (cursorHead <= cursorHeadMaxInclusive) {
@@ -261,6 +262,19 @@ class VM(
allocatedBlockCount -= count allocatedBlockCount -= count
} }
internal fun forceAlloc(ptr: Int, size: Int) {
val allocBlocks = ceil(size.toDouble() / MALLOC_UNIT).toInt()
val blockStart = ptr / MALLOC_UNIT
var previouslyUnallocated = 0
for (i in blockStart until blockStart + allocBlocks) {
if (mallocMap.get(i) == false) previouslyUnallocated++
mallocMap.set(i, true)
}
allocatedBlockCount += previouslyUnallocated
mallocSizes[blockStart] = allocBlocks
}
internal data class VMNativePtr(val address: Int, val size: Int) internal data class VMNativePtr(val address: Int, val size: Int)
} }

1
tsvm_core/src/net/torvald/tsvm/VMJSR223Delegate.kt
View File

@@ -82,6 +82,7 @@ class VMJSR223Delegate(private val vm: VM) {
fun nanoTime() = System.nanoTime() fun nanoTime() = System.nanoTime()
fun malloc(size: Int) = vm.malloc(size) fun malloc(size: Int) = vm.malloc(size)
fun free(ptr: Int) = vm.free(ptr) fun free(ptr: Int) = vm.free(ptr)
fun forceAlloc(ptr: Int, size: Int) = vm.forceAlloc(ptr, size)
fun memcpy(from: Int, to: Int, len: Int) { fun memcpy(from: Int, to: Int, len: Int) {
val from = from.toLong() val from = from.toLong()
val to = to.toLong() val to = to.toLong()