diff options
| author | Jcw87 <Jcw87@users.noreply.github.com> | 2022-06-07 13:03:27 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-07 16:03:27 -0400 |
| commit | fb9dd3cdee440e61d96ddd2efd0216a99df14997 (patch) | |
| tree | 32653af10f8b8d3d56f0ae05fc37df8c2d222646 /libs/JSystem/JKernel/JKRAram.cpp | |
| parent | 3c962112db3d3644c67c67a40fdb3a1deb5f13dc (diff) | |
JKRDvdRipper, JKRSolidHeap (#199)
Diffstat (limited to 'libs/JSystem/JKernel/JKRAram.cpp')
| -rw-r--r-- | libs/JSystem/JKernel/JKRAram.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/libs/JSystem/JKernel/JKRAram.cpp b/libs/JSystem/JKernel/JKRAram.cpp index 2e62f309a0..73e6a7dbad 100644 --- a/libs/JSystem/JKernel/JKRAram.cpp +++ b/libs/JSystem/JKernel/JKRAram.cpp @@ -252,13 +252,13 @@ static u8* szpBuf; static u8* szpEnd; /* 804513D4-804513D8 0008D4 0004+00 2/2 0/0 0/0 .sbss refBuf */ -static u8 refBuf[4]; +static u8* refBuf; /* 804513D8-804513DC 0008D8 0004+00 2/2 0/0 0/0 .sbss refEnd */ -static u8 refEnd[4]; +static u8* refEnd; /* 804513DC-804513E0 0008DC 0004+00 2/2 0/0 0/0 .sbss refCurrent */ -static u8 refCurrent[4]; +static u8* refCurrent; /* 804513E0-804513E4 0008E0 0004+00 3/3 0/0 0/0 .sbss srcOffset */ static u32 srcOffset; @@ -267,28 +267,28 @@ static u32 srcOffset; static u32 transLeft; /* 804513E8-804513EC 0008E8 0004+00 3/3 0/0 0/0 .sbss srcLimit */ -static u32 srcLimit; +static u8* srcLimit; /* 804513EC-804513F0 0008EC 0004+00 3/3 0/0 0/0 .sbss srcAddress */ static u32 srcAddress; /* 804513F0-804513F4 0008F0 0004+00 2/2 0/0 0/0 .sbss fileOffset */ -static u8 fileOffset[4]; +static u32 fileOffset; /* 804513F4-804513F8 0008F4 0004+00 2/2 0/0 0/0 .sbss readCount */ -static u8 readCount[4]; +static u32 readCount; /* 804513F8-804513FC 0008F8 0004+00 2/2 0/0 0/0 .sbss maxDest */ -static u8 maxDest[4]; +static u32 maxDest; /* 804513FC-80451400 0008FC 0004+00 1/1 0/0 0/0 .sbss None */ static u8 data_804513FC[4]; /* 80451400-80451404 000900 0004+00 2/2 0/0 0/0 .sbss tsPtr */ -static u8 tsPtr[4]; +static u32* tsPtr; /* 80451404-80451408 000904 0004+00 1/1 0/0 0/0 .sbss tsArea */ -static u8 tsArea[4]; +static u32 tsArea; /* 802D2830-802D29A0 2CD170 0170+00 1/1 0/0 0/0 .text * JKRDecompressFromAramToMainRam__FUlPvUlUlUlPUl */ @@ -371,7 +371,7 @@ static asm void JKRDecompressFromAramToMainRam(u32 param_0, void* param_1, u32 p #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void decompSZS_subroutine(u8* param_0, u8* param_1) { +static asm int decompSZS_subroutine(u8* param_0, u8* param_1) { nofralloc #include "asm/JSystem/JKernel/JKRAram/decompSZS_subroutine__FPUcPUc.s" } @@ -379,7 +379,7 @@ static asm void decompSZS_subroutine(u8* param_0, u8* param_1) { /* 802D2C40-802D2CE4 2CD580 00A4+00 1/1 0/0 0/0 .text firstSrcData__Fv */ static u8* firstSrcData(void) { - srcLimit = (u32)(szpEnd - 0x19); + srcLimit = szpEnd - 0x19; u8* buffer = szpBuf; u32 length; @@ -398,7 +398,7 @@ static u8* firstSrcData(void) { srcOffset += length; transLeft -= length; if (!transLeft) { - srcLimit = (u32)(buffer + length); + srcLimit = buffer + length; } return buffer; @@ -441,7 +441,7 @@ static u8* nextSrcData(u8* current) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void nextSrcData(u8* param_0) { +static asm u8* nextSrcData(u8* param_0) { nofralloc #include "asm/JSystem/JKernel/JKRAram/nextSrcData__FPUc.s" } |