LowLevel/Luma3DS-3GX
Archived
1
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

Merge pull request #1246 from piepie62/Debuffer

Browse Source 
Remove cheat file buffer and use buffered reading
This commit is contained in:
TuxSH 2019-04-23 23:04:34 +02:00 committed by GitHub
commit 593f50de91
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 125 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

183
sysmodules/rosalina/source/menus/cheats.c
View File

@ -54,10 +54,16 @@ typedef struct CheatDescription
u64 codes[0];
} CheatDescription;
typedef struct BufferedFile
{
IFile file;
u64 curPos;
u64 maxPos;
char buffer[512];
} BufferedFile;
CheatDescription* cheats[1024] = { 0 };
u8 cheatFileBuffer[16384] = { 0 };
u32 cheatFilePos = 0;
u8 cheatBuffer[16384] = { 0 };
u8 cheatBuffer[32768] = { 0 };
static CheatProcessInfo cheatinfo[0x40] = { 0 };
@ -881,41 +887,95 @@ static void Cheat_AddCode(CheatDescription* cheat, u64 code)
}
}
static Result Cheat_ReadLine(char* line, u32 lineSize)
static Result BufferedFile_Open(BufferedFile* file, FS_ArchiveID archiveId, FS_Path archivePath, FS_Path filePath, u32 flags)
{
Result res = 0;
memset(file->buffer, '\0', sizeof(file->buffer));
res = IFile_Open(&file->file, archiveId, archivePath, filePath, flags);
if (R_SUCCEEDED(res))
{
file->curPos = 0;
res = IFile_Read(&file->file, &file->maxPos, file->buffer, sizeof(file->buffer));
}
return res;
}
static Result BufferedFile_Read(BufferedFile* file, u64* totalRead, void* buffer, u32 len)
{
Result res = 0;
if (len == 0)
{
*totalRead = 0;
return 0;
}
else if (file->curPos + len < file->maxPos)
{
memcpy(buffer, file->buffer + file->curPos, len);
file->curPos += len;
*totalRead = len;
}
else
{
*totalRead = 0;
while(R_SUCCEEDED(res) && file->maxPos != 0 && *totalRead < len)
{
u32 toRead = file->maxPos - file->curPos < len - *totalRead ? file->maxPos - file->curPos : len - *totalRead;
memcpy(buffer + *totalRead, file->buffer + file->curPos, toRead);
*totalRead += toRead;
file->curPos += toRead;
if (file->curPos >= file->maxPos)
{
res = IFile_Read(&file->file, &file->maxPos, file->buffer, sizeof(file->buffer));
file->curPos = 0;
}
}
}
return res;
}
static Result Cheat_ReadLine(BufferedFile* file, char* line, u32 lineSize)
{
Result res = 0;
char c = '\0';
u32 idx = 0;
while (R_SUCCEEDED(res) && cheatFilePos < sizeof(cheatFileBuffer))
u64 total = 0;
bool lastWasCarriageReturn = false;
while (R_SUCCEEDED(res) && idx < lineSize)
{
c = cheatFileBuffer[cheatFilePos++];
res = c ? 0 : -1;
if (R_SUCCEEDED(res) && c != '\0')
res = BufferedFile_Read(file, &total, line + idx, 1);
if (total == 0)
{
if (c == '\r' && cheatFilePos < sizeof(cheatFileBuffer) && cheatFileBuffer[cheatFilePos] == '\n')
line[idx] = '\0';
return -1;
}
if (R_SUCCEEDED(res))
{
if (line[idx] == '\r')
{
cheatFilePos++;
line[idx++] = '\0';
return idx;
lastWasCarriageReturn = true;
}
else if (c == '\n' || idx >= lineSize - 1)
else if (line[idx] == '\n')
{
line[idx++] = '\0';
return idx;
if (lastWasCarriageReturn)
{
line[--idx] = '\0';
return idx;
}
else
{
line[idx] = '\0';
return idx;
}
}
else if (line[idx] == '\0')
{
return -1;
}
else
{
line[idx++] = c;
}
}
else
{
if (idx > 0)
{
line[idx++] = '\0';
return idx;
lastWasCarriageReturn = false;
}
idx++;
}
}
return res;
@ -1002,6 +1062,22 @@ static u64 Cheat_GetCode(const char *line)
return tmp;
}
static char* stripWhitespace(char* in)
{
char* ret = in;
while (*ret == ' ' || *ret == '\t')
{
ret++;
}
int back = strlen(ret) - 1;
while (back > 0 && (ret[back] == ' ' || ret[back] == '\t'))
{
back--;
}
ret[back+1] = '\0';
return ret;
}
static void Cheat_LoadCheatsIntoMemory(u64 titleId)
{
cheatCount = 0;
@ -1010,54 +1086,46 @@ static void Cheat_LoadCheatsIntoMemory(u64 titleId)
char path[64] = { 0 };
sprintf(path, "/luma/titles/%016llX/cheats.txt", titleId);
IFile file;
BufferedFile file;
if (R_FAILED(IFile_Open(&file, ARCHIVE_SDMC, fsMakePath(PATH_EMPTY, ""), fsMakePath(PATH_ASCII, path), FS_OPEN_READ)))
if (R_FAILED(BufferedFile_Open(&file, ARCHIVE_SDMC, fsMakePath(PATH_EMPTY, ""), fsMakePath(PATH_ASCII, path), FS_OPEN_READ)))
{
// OK, let's try another source
sprintf(path, "/cheats/%016llX.txt", titleId);
if (R_FAILED(IFile_Open(&file, ARCHIVE_SDMC, fsMakePath(PATH_EMPTY, ""), fsMakePath(PATH_ASCII, path), FS_OPEN_READ))) return;
if (R_FAILED(BufferedFile_Open(&file, ARCHIVE_SDMC, fsMakePath(PATH_EMPTY, ""), fsMakePath(PATH_ASCII, path), FS_OPEN_READ))) return;
};
u64 fileLen = 0;
IFile_GetSize(&file, &fileLen);
if (fileLen > 16383)
{
fileLen = 16383;
}
u64 total;
IFile_Read(&file, &total, cheatFileBuffer, fileLen);
IFile_Close(&file);
for (int i = fileLen; i < 16384; i++)
{
cheatFileBuffer[i] = 0;
}
char line[1024] = { 0 };
Result res = 0;
CheatDescription* cheat = 0;
cheatFilePos = 0;
u32 cheatSize = 0;
do
{
res = Cheat_ReadLine(line, 1024);
res = Cheat_ReadLine(&file, line, 1024);
if (R_SUCCEEDED(res))
{
s32 lineLen = strnlen(line, 1023);
char* strippedLine = stripWhitespace(line);
s32 lineLen = strnlen(strippedLine, 1023);
if (!lineLen)
{
continue;
}
if (line[0] == '#')
if (strippedLine[0] == '#')
{
continue;
}
if (Cheat_IsCodeLine(line))
if (Cheat_IsCodeLine(strippedLine))
{
if (cheatSize + sizeof(u64) >= sizeof(cheatBuffer))
{
cheatCount--;
break;
}
if (cheat)
{
u64 tmp = Cheat_GetCode(line);
u64 tmp = Cheat_GetCode(strippedLine);
Cheat_AddCode(cheat, tmp);
cheatSize += sizeof(u64);
if (((tmp >> 32) & 0xFFFFFFFF) == 0xDD000000)
{
cheat->hasKeyCode = 1;
@ -1066,23 +1134,22 @@ static void Cheat_LoadCheatsIntoMemory(u64 titleId)
}
else
{
if (!cheat)
if (!cheat || cheat->codesCount > 0)
{
cheat = Cheat_AllocCheat();
}
else
{
if (cheat->codesCount > 0)
if (cheatSize + sizeof(CheatDescription) >= sizeof(cheatBuffer))
{
// Add new cheat only if previous has body. In other case just rewrite it's name
cheat = Cheat_AllocCheat();
break;
}
cheat = Cheat_AllocCheat();
cheatSize += sizeof(CheatDescription);
}
strncpy(cheat->name, line, 38);
cheat->name[38] = '\0';
}
}
} while (R_SUCCEEDED(res));
} while (R_SUCCEEDED(res) && cheatSize < sizeof(cheatBuffer));
IFile_Close(&file.file);
if ((cheatCount > 0) && (cheats[cheatCount - 1]->codesCount == 0))
{