Compare commits

..

1 Commits

Author SHA1 Message Date
coah
4de821d157 cleanup(TMCJPEG): name decode-buffer refill helpers
Rename TMCJPEG_814EAF50/814EB108 to refillJpegBufferAfterFF
and refillJpegBuffer.
2026-10-01 18:14:19 -05:00
3 changed files with 60 additions and 32 deletions

View File

@@ -8879,8 +8879,8 @@ TMCJPEGDEC_move_ptr = .text:0x814EAD28; // type:function size:0xE4
TMCJPEGDEC_load_buff = .text:0x814EAE0C; // type:function size:0x124
TMCJPEGDEC_get_position = .text:0x814EAF30; // type:function size:0x10
TMCJPEGDEC_chk_possible_size = .text:0x814EAF40; // type:function size:0x10
TMCJPEG_814EAF50 = .text:0x814EAF50; // type:function size:0x1B8 scope:local
TMCJPEG_814EB108 = .text:0x814EB108; // type:function size:0x198 scope:local
refillJpegBufferAfterFF = .text:0x814EAF50; // type:function size:0x1B8 scope:local
refillJpegBuffer = .text:0x814EB108; // type:function size:0x198 scope:local
TMCJPEGDEC_init_buff_thumbnail = .text:0x814EB2A0; // type:function size:0x88
TMCJPEGDEC_init_buff = .text:0x814EB328; // type:function size:0x10
TMCJPEGDEC_rewind_ptr = .text:0x814EB338; // type:function size:0xA4

View File

@@ -1,7 +1,7 @@
#include <tmc_jpeg_internal.h>
static s32 TMCJPEG_814EAF50(TMCCJPEGDecWork* work);
static s32 TMCJPEG_814EB108(TMCCJPEGDecWork* work);
static s32 refillJpegBufferAfterFF(TMCCJPEGDecWork* work);
static s32 refillJpegBuffer(TMCCJPEGDecWork* work);
s32 TMCJPEGDEC_init_ptr_buff(TMCCJPEGDecWork* work, void* param) {
u32 readSize;
@@ -52,7 +52,7 @@ s32 TMCJPEGDEC_get_byte(u8* dst, TMCCJPEGDecWork* work) {
if (work->pBufCur >= work->pBufEnd) {
if (work->remaining != 0) {
s32 r = TMCJPEG_814EB108(work);
s32 r = refillJpegBuffer(work);
if (r < 0) {
return r;
}
@@ -69,7 +69,7 @@ s32 TMCJPEGDEC_get_byte(u8* dst, TMCCJPEGDecWork* work) {
if (cur >= work->pBufEnd) {
if (work->remaining != 0) {
s32 r = TMCJPEG_814EB108(work);
s32 r = refillJpegBuffer(work);
if (r < 0) {
return r;
}
@@ -92,7 +92,7 @@ s32 TMCJPEGDEC_get_wbyte(u16* dst, TMCCJPEGDecWork* work) {
if (work->pBufCur >= work->pBufEnd) {
if (work->remaining != 0) {
r = TMCJPEG_814EB108(work);
r = refillJpegBuffer(work);
if (r < 0) {
goto br;
} else {
@@ -119,7 +119,7 @@ s32 TMCJPEGDEC_get_wbyte(u16* dst, TMCCJPEGDecWork* work) {
}
if (work->remaining != 0) {
r = TMCJPEG_814EB108(work);
r = refillJpegBuffer(work);
if (r >= 0) {
goto o1;
}
@@ -144,7 +144,7 @@ p2:
goto r2;
}
if (work->remaining != 0) {
r = TMCJPEG_814EB108(work);
r = refillJpegBuffer(work);
if (r < 0)
goto ez;
else {
@@ -166,7 +166,7 @@ r2:
}
if (work->remaining != 0) {
r = TMCJPEG_814EB108(work);
r = refillJpegBuffer(work);
if (r < 0)
goto ez;
else {
@@ -193,7 +193,7 @@ s32 TMCJPEGDEC_get_sbyte(u8* dst, u32 count, TMCCJPEGDecWork* work) {
for (i = 0; i < count; i++) {
if (work->pBufCur >= work->pBufEnd) {
if (work->remaining != 0) {
r = TMCJPEG_814EB108(work);
r = refillJpegBuffer(work);
if (r < 0) {
goto copy_byte;
} else {
@@ -214,7 +214,7 @@ s32 TMCJPEGDEC_get_sbyte(u8* dst, u32 count, TMCCJPEGDecWork* work) {
goto r0;
}
if (work->remaining != 0) {
r = TMCJPEG_814EB108(work);
r = refillJpegBuffer(work);
if (r >= 0) {
goto r0;
}
@@ -251,7 +251,7 @@ lp:
if (work->remaining == 0) {
goto er1;
}
r = TMCJPEG_814EB108(work);
r = refillJpegBuffer(work);
if (r >= 0) {
goto lc;
}
@@ -271,7 +271,7 @@ lc:
if (work->remaining == 0) {
goto er2;
}
r = TMCJPEG_814EB108(work);
r = refillJpegBuffer(work);
if (r >= 0) {
goto ret0;
}
@@ -320,7 +320,7 @@ s32 TMCJPEGDEC_load_buff(TMCCJPEGDecWork* work) {
if (work->remaining == 0) {
break;
}
r = TMCJPEG_814EAF50(work);
r = refillJpegBufferAfterFF(work);
if (r < 0) {
return r;
}
@@ -345,7 +345,7 @@ s32 TMCJPEGDEC_load_buff(TMCCJPEGDecWork* work) {
if (work->remaining == 0) {
break;
}
r = TMCJPEG_814EAF50(work);
r = refillJpegBufferAfterFF(work);
if (r < 0) {
return r;
}
@@ -364,7 +364,7 @@ s32 TMCJPEGDEC_chk_possible_size(TMCCJPEGDecWork* work) {
return work->pBufEnd - work->pBufCur;
}
static s32 TMCJPEG_814EAF50(TMCCJPEGDecWork* work) {
static s32 refillJpegBufferAfterFF(TMCCJPEGDecWork* work) {
u8 marker;
u32 readSize;
u8* dest;
@@ -410,7 +410,7 @@ static s32 TMCJPEG_814EAF50(TMCCJPEGDecWork* work) {
return 0;
}
static s32 TMCJPEG_814EB108(TMCCJPEGDecWork* work) {
static s32 refillJpegBuffer(TMCCJPEGDecWork* work) {
u8* end;
u32 i, j;
s32 readSize;

View File

@@ -91,7 +91,7 @@ extern CDBErr CDBDatabaseInit();
extern CDBErr CDBDatabaseOpen();
extern CDBErr CDBDatabaseClose();
extern CDBErr CDBDatabasePrivateCreateRecordAtOnce();
extern CDBErr CDBDatabaseCreateRecordAtOnce(CDBDatabase* database, CDBRecord* record, const char* typeStr, const char* fileTypeStr, u8* recordData, u32 recordDataSize);
extern CDBErr CDBDatabaseCreateRecordAtOnce();
extern CDBErr CDBDatabaseCreateRecordAtOnceEx();
extern CDBErr CDBDatabasePrivateCreateRecordAtOnceEx();
extern CDBErr CDBDatabasePrivateCreateRecordAtOnceEx_(CDBDatabase* database, CDBRecord* record, const char* typeStr, const char* fileTypeStr, int year, int month, int day, int hour, int min, int sec, u8* recordData, u32 recordDataSize, char* makerCode, char* gameCode);
@@ -206,19 +206,47 @@ CDBErr CDBDatabasePrivateCreateRecordAtOnce(CDBDatabase* database, CDBRecord* re
return result;
}
CDBErr CDBDatabaseCreateRecordAtOnce(CDBDatabase* database, CDBRecord* record, const char* typeStr, const char* fileTypeStr, u8* recordData, u32 recordDataSize) {
OSTime time;
u32 gameCode;
u16 makerCode;
CDBErr result;
makerCode = database->makerCode;
gameCode = database->gameCode;
time = OSGetTime();
CDBLock();
result = CDBDatabaseCreateRecordImAtOnce_(database, record, typeStr, fileTypeStr, time, gameCode, makerCode, recordData, recordDataSize);
CDBUnlock();
return result;
asm CDBErr CDBDatabaseCreateRecordAtOnce(CDBDatabase* database, CDBRecord* record, const char* typeStr, const char* fileTypeStr, u8* recordData, u32 recordDataSize) {
#ifdef __MWERKS__
nofralloc
stwu r1, -0x40(r1)
mflr r0
stw r0, 0x44(r1)
addi r11, r1, 0x40
bl _savegpr_22
lhz r28, 0x0(r3)
mr r22, r3
lwz r29, 0x4(r3)
mr r23, r4
mr r24, r5
mr r25, r6
mr r26, r7
mr r27, r8
bl OSGetTime
mr r30, r4
mr r31, r3
bl CDBLock
stw r26, 0x8(r1)
mr r3, r22
mr r4, r23
mr r5, r24
stw r27, 0xc(r1)
mr r6, r25
mr r8, r30
mr r7, r31
mr r9, r29
mr r10, r28
bl CDBDatabaseCreateRecordImAtOnce_
mr r28, r3
bl CDBUnlock
addi r11, r1, 0x40
mr r3, r28
bl _restgpr_22
lwz r0, 0x44(r1)
mtlr r0
addi r1, r1, 0x40
blr
#endif
}
CDBErr CDBDatabaseCreateRecordAtOnceEx(CDBDatabase* database, CDBRecord* record, const char* typeStr, const char* fileTypeStr, u8* recordData, u32 recordDataSize, int year, int month, int day, int hour, int min, int sec) {