summaryrefslogtreecommitdiff
path: root/src/JSystem/JKernel
diff options
context:
space:
mode:
authorJasper St. Pierre <jstpierre@mecheye.net>2023-11-11 17:10:34 -0800
committerJasper St. Pierre <jstpierre@mecheye.net>2023-11-11 17:10:34 -0800
commitbd412feae7ef3c2fc2ce0ccf240ea9d0a8d15fb8 (patch)
tree6f764880afb749c09ed3fbd6b91852521b91db6c /src/JSystem/JKernel
parentfef715c69bfa5a593c7653698566398d53851ab9 (diff)
JUT work
Diffstat (limited to 'src/JSystem/JKernel')
-rw-r--r--src/JSystem/JKernel/JKRExpHeap.cpp17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/JSystem/JKernel/JKRExpHeap.cpp b/src/JSystem/JKernel/JKRExpHeap.cpp
index 7cbc894e..24260f2f 100644
--- a/src/JSystem/JKernel/JKRExpHeap.cpp
+++ b/src/JSystem/JKernel/JKRExpHeap.cpp
@@ -817,7 +817,7 @@ bool JKRExpHeap::dump() {
}
/* 802B2D5C-802B2F5C .text dump_sort_by_address__10JKRExpHeapFv */
-// regalloc, stack
+// regalloc
bool JKRExpHeap::dump_sort_by_address() {
/* Nonmatching */
lock();
@@ -828,16 +828,17 @@ bool JKRExpHeap::dump_sort_by_address() {
JUTReportConsole(" attr address: size gid aln prev_ptr next_ptr\n");
CMemBlock* block;
- for (CMemBlock* var1 = NULL; true; var1 = block) {
- CMemBlock* block = (CMemBlock*)0xffffffff;
+ for (CMemBlock* nextBlock = NULL; ; nextBlock = block) {
+ block = (CMemBlock*)0xffffffff;
+
for (CMemBlock* iterBlock = mHeadFreeList; iterBlock; iterBlock = iterBlock->getNextBlock()) {
- if (var1 < iterBlock && iterBlock < block) {
+ if (nextBlock < iterBlock && iterBlock < block) {
block = iterBlock;
}
}
for (CMemBlock* iterBlock = mHeadUsedList; iterBlock; iterBlock = iterBlock->getNextBlock()) {
- if (var1 < iterBlock && iterBlock < block) {
+ if (nextBlock < iterBlock && iterBlock < block) {
block = iterBlock;
}
}
@@ -860,15 +861,13 @@ bool JKRExpHeap::dump_sort_by_address() {
int offset = block->getAlignment();
void* content = block->getContent();
const char* type = block->_isTempMemBlock() ? " temp" : "alloc";
- JUTReportConsole_f("%s %08x: %08x %3d %3d (%08x %08x)\n", type, content, block->getSize(),
- block->getGroupId(), offset, block->getPrevBlock(), block->getNextBlock());
+ JUTReportConsole_f("%s %08x: %08x %3d %3d (%08x %08x)\n", type, content, block->getSize(), block->getGroupId(), offset, block->getPrevBlock(), block->getNextBlock());
usedBytes += sizeof(CMemBlock) + block->size + block->getAlignment();
usedCount++;
}
float percent = ((float)usedBytes / (float)mSize) * 100.0f;
- JUTReportConsole_f("%d / %d bytes (%6.2f%%) used (U:%d F:%d)\n", usedBytes, mSize, percent,
- usedCount, freeCount);
+ JUTReportConsole_f("%d / %d bytes (%6.2f%%) used (U:%d F:%d)\n", usedBytes, mSize, percent, usedCount, freeCount);
unlock();
return result;
}