This commit is contained in:
minjaesong
2022-04-13 17:58:06 +09:00
parent 95b0d4672e
commit c8aa7b9f6b

View File

@@ -24,16 +24,29 @@ function readBytes(length) {
return ret*/ return ret*/
let ptr = sys.malloc(length) let ptr = sys.malloc(length)
let requiredBlocks = (readCount == 0) + Math.floor((readCount + length) / 4096) - Math.floor(readCount / 4096) let requiredBlocks = Math.floor((readCount + length) / 4096) - Math.floor(readCount / 4096)
let port = filesystem._toPorts("A") let port = filesystem._toPorts("A")[0]
let completedReads = 0 let completedReads = 0
for (let bc = 0; bc < requiredBlocks; bc++) { serial.println(`readBytes(${length}); readCount = ${readCount}`)
for (let bc = 0; bc < requiredBlocks + 1; bc++) {
if (completedReads >= length) break
if (readCount % 4096 == 0) { if (readCount % 4096 == 0) {
com.sendMessage(port[0], "READ") com.sendMessage(port, "READ")
let thisBlockLen = com.fetchResponse(port[0]) // [0, 4095] let blockTransferStatus = ((sys.peek(-4085 - port*2) & 255) | ((sys.peek(-4086 - port*2) & 255) << 8))
let remaining = Math.min(4096, length - completedReads) let thisBlockLen = blockTransferStatus & 4095
if (thisBlockLen == 0) thisBlockLen = 4096 // [1, 4096]
let hasMore = (blockTransferStatus & 0x8000 != 0)
serial.println(`thisBlockLen = ${thisBlockLen}`)
let remaining = Math.min(thisBlockLen, length - completedReads)
serial.println(`Pulled a block (${thisBlockLen}); readCount = ${readCount}, completedReads = ${completedReads}`)
// copy from read buffer to designated position // copy from read buffer to designated position
sys.memcpy(-4097, ptr + readCount, remaining) sys.memcpy(-4097, ptr + readCount, remaining)
@@ -46,6 +59,8 @@ function readBytes(length) {
let padding = 4096 - (readCount % 4096) let padding = 4096 - (readCount % 4096)
let remaining = Math.min(padding, length - completedReads) let remaining = Math.min(padding, length - completedReads)
serial.println(`Reusing a block (${remaining}); readCount = ${readCount}, completedReads = ${completedReads}`)
// copy from read buffer to designated position // copy from read buffer to designated position
sys.memcpy(-4097 - padding, ptr + readCount, remaining) sys.memcpy(-4097 - padding, ptr + readCount, remaining)
@@ -55,6 +70,8 @@ function readBytes(length) {
} }
} }
serial.println(`END readBytes(${length}); readCount = ${readCount}\n`)
return ptr return ptr
} }
@@ -87,6 +104,7 @@ let height = readShort()
let fps = readShort() let fps = readShort()
let frameCount = readInt() % 16777216 let frameCount = readInt() % 16777216
serial.println(readCount) // must say 18
serial.println(`Dim: (${width}x${height}), FPS: ${fps}, Frames: ${frameCount}`) serial.println(`Dim: (${width}x${height}), FPS: ${fps}, Frames: ${frameCount}`)
let fbuf = sys.malloc(FBUF_SIZE) let fbuf = sys.malloc(FBUF_SIZE)