Skip to content

Commit

Permalink
Clean up among the logs. Remove MASTER_LOG.
Browse files Browse the repository at this point in the history
  • Loading branch information
@hrydgard
hrydgard committed Mar 6, 2017
1 parent cfe2621 commit 440e72d
Show file tree
Hide file tree
Showing 36 changed files with 182 additions and 180 deletions.
40 changes: 20 additions & 20 deletions Common/ChunkFile.cpp
View file
Expand Up @@ -43,7 +43,7 @@ PointerWrapSection PointerWrap::Section(const char *title, int minVer, int ver)
Do(foundVersion);

if (error == ERROR_FAILURE || foundVersion < minVer || foundVersion > ver) {
WARN_LOG(COMMON, "Savestate failure: wrong version %d found for %s", foundVersion, title);
WARN_LOG(SAVESTATE, "Savestate failure: wrong version %d found for %s", foundVersion, title);
SetError(ERROR_FAILURE);
return PointerWrapSection(*this, -1, title);
}
Expand Down Expand Up @@ -165,31 +165,31 @@ PointerWrapSection::~PointerWrapSection() {

CChunkFileReader::Error CChunkFileReader::LoadFileHeader(File::IOFile &pFile, SChunkHeader &header, std::string *title) {
if (!pFile) {
ERROR_LOG(COMMON, "ChunkReader: Can't open file for reading");
ERROR_LOG(SAVESTATE, "ChunkReader: Can't open file for reading");
return ERROR_BAD_FILE;
}

const u64 fileSize = pFile.GetSize();
u64 headerSize = sizeof(SChunkHeader);
if (fileSize < headerSize) {
ERROR_LOG(COMMON, "ChunkReader: File too small");
ERROR_LOG(SAVESTATE, "ChunkReader: File too small");
return ERROR_BAD_FILE;
}

if (!pFile.ReadArray(&header, 1)) {
ERROR_LOG(COMMON, "ChunkReader: Bad header size");
ERROR_LOG(SAVESTATE, "ChunkReader: Bad header size");
return ERROR_BAD_FILE;
}

if (header.Revision < REVISION_MIN) {
ERROR_LOG(COMMON, "ChunkReader: Wrong file revision, got %d expected >= %d", header.Revision, REVISION_MIN);
ERROR_LOG(SAVESTATE, "ChunkReader: Wrong file revision, got %d expected >= %d", header.Revision, REVISION_MIN);
return ERROR_BAD_FILE;
}

if (header.Revision >= REVISION_TITLE) {
char titleFixed[128];
if (!pFile.ReadArray(titleFixed, sizeof(titleFixed))) {
ERROR_LOG(COMMON, "ChunkReader: Unable to read title");
ERROR_LOG(SAVESTATE, "ChunkReader: Unable to read title");
return ERROR_BAD_FILE;
}

Expand All @@ -204,7 +204,7 @@ CChunkFileReader::Error CChunkFileReader::LoadFileHeader(File::IOFile &pFile, SC

u32 sz = (u32)(fileSize - headerSize);
if (header.ExpectedSize != sz) {
ERROR_LOG(COMMON, "ChunkReader: Bad file size, got %u expected %u", sz, header.ExpectedSize);
ERROR_LOG(SAVESTATE, "ChunkReader: Bad file size, got %u expected %u", sz, header.ExpectedSize);
return ERROR_BAD_FILE;
}

Expand All @@ -213,7 +213,7 @@ CChunkFileReader::Error CChunkFileReader::LoadFileHeader(File::IOFile &pFile, SC

CChunkFileReader::Error CChunkFileReader::GetFileTitle(const std::string &filename, std::string *title) {
if (!File::Exists(filename)) {
ERROR_LOG(COMMON, "ChunkReader: File doesn't exist");
ERROR_LOG(SAVESTATE, "ChunkReader: File doesn't exist");
return ERROR_BAD_FILE;
}

Expand All @@ -225,7 +225,7 @@ CChunkFileReader::Error CChunkFileReader::GetFileTitle(const std::string &filena
CChunkFileReader::Error CChunkFileReader::LoadFile(const std::string &filename, const char *gitVersion, u8 *&_buffer, size_t &sz, std::string *failureReason) {
if (!File::Exists(filename)) {
*failureReason = "LoadStateDoesntExist";
ERROR_LOG(COMMON, "ChunkReader: File doesn't exist");
ERROR_LOG(SAVESTATE, "ChunkReader: File doesn't exist");
return ERROR_BAD_FILE;
}

Expand All @@ -241,7 +241,7 @@ CChunkFileReader::Error CChunkFileReader::LoadFile(const std::string &filename,
u8 *buffer = new u8[sz];
if (!pFile.ReadBytes(buffer, sz))
{
ERROR_LOG(COMMON, "ChunkReader: Error reading file");
ERROR_LOG(SAVESTATE, "ChunkReader: Error reading file");
delete [] buffer;
return ERROR_BAD_FILE;
}
Expand All @@ -252,7 +252,7 @@ CChunkFileReader::Error CChunkFileReader::LoadFile(const std::string &filename,
size_t uncomp_size = header.UncompressedSize;
snappy_uncompress((const char *)buffer, sz, (char *)uncomp_buffer, &uncomp_size);
if ((u32)uncomp_size != header.UncompressedSize) {
ERROR_LOG(COMMON, "Size mismatch: file: %u calc: %u", header.UncompressedSize, (u32)uncomp_size);
ERROR_LOG(SAVESTATE, "Size mismatch: file: %u calc: %u", header.UncompressedSize, (u32)uncomp_size);
delete [] uncomp_buffer;
return ERROR_BAD_FILE;
}
Expand All @@ -266,12 +266,12 @@ CChunkFileReader::Error CChunkFileReader::LoadFile(const std::string &filename,

// Takes ownership of buffer.
CChunkFileReader::Error CChunkFileReader::SaveFile(const std::string &filename, const std::string &title, const char *gitVersion, u8 *buffer, size_t sz) {
INFO_LOG(COMMON, "ChunkReader: Writing %s", filename.c_str());
INFO_LOG(SAVESTATE, "ChunkReader: Writing %s", filename.c_str());

File::IOFile pFile(filename, "wb");
if (!pFile)
{
ERROR_LOG(COMMON, "ChunkReader: Error opening file for write");
ERROR_LOG(SAVESTATE, "ChunkReader: Error opening file for write");
delete[] buffer;
return ERROR_BAD_FILE;
}
Expand Down Expand Up @@ -300,36 +300,36 @@ CChunkFileReader::Error CChunkFileReader::SaveFile(const std::string &filename,
delete [] buffer;
header.ExpectedSize = (u32)comp_len;
if (!pFile.WriteArray(&header, 1)) {
ERROR_LOG(COMMON, "ChunkReader: Failed writing header");
ERROR_LOG(SAVESTATE, "ChunkReader: Failed writing header");
return ERROR_BAD_FILE;
}
if (!pFile.WriteArray(titleFixed, sizeof(titleFixed))) {
ERROR_LOG(COMMON, "ChunkReader: Failed writing title");
ERROR_LOG(SAVESTATE, "ChunkReader: Failed writing title");
return ERROR_BAD_FILE;
}
if (!pFile.WriteBytes(&compressed_buffer[0], comp_len)) {
ERROR_LOG(COMMON, "ChunkReader: Failed writing compressed data");
ERROR_LOG(SAVESTATE, "ChunkReader: Failed writing compressed data");
return ERROR_BAD_FILE;
} else {
INFO_LOG(COMMON, "Savestate: Compressed %i bytes into %i", (int)sz, (int)comp_len);
INFO_LOG(SAVESTATE, "Savestate: Compressed %i bytes into %i", (int)sz, (int)comp_len);
}
delete [] compressed_buffer;
} else {
if (!pFile.WriteArray(&header, 1))
{
ERROR_LOG(COMMON, "ChunkReader: Failed writing header");
ERROR_LOG(SAVESTATE, "ChunkReader: Failed writing header");
delete[] buffer;
return ERROR_BAD_FILE;
}
if (!pFile.WriteBytes(&buffer[0], sz))
{
ERROR_LOG(COMMON, "ChunkReader: Failed writing data");
ERROR_LOG(SAVESTATE, "ChunkReader: Failed writing data");
delete[] buffer;
return ERROR_BAD_FILE;
}
delete [] buffer;
}

INFO_LOG(COMMON, "ChunkReader: Done writing %s", filename.c_str());
INFO_LOG(SAVESTATE, "ChunkReader: Done writing %s", filename.c_str());
return ERROR_NONE;
}
6 changes: 3 additions & 3 deletions Common/ChunkFile.h
View file
Expand Up @@ -449,7 +449,7 @@ class PointerWrap
break;

default:
ERROR_LOG(COMMON, "Savestate error: invalid mode %d.", mode);
ERROR_LOG(SAVESTATE, "Savestate error: invalid mode %d.", mode);
}
}

Expand Down Expand Up @@ -537,7 +537,7 @@ class PointerWrap
{
if (shouldExist != 0)
{
WARN_LOG(COMMON, "Savestate failure: incorrect item marker %d", shouldExist);
WARN_LOG(SAVESTATE, "Savestate failure: incorrect item marker %d", shouldExist);
SetError(ERROR_FAILURE);
}
if (mode == MODE_READ)
Expand Down Expand Up @@ -629,7 +629,7 @@ class CChunkFileReader
delete [] ptr;
}

INFO_LOG(COMMON, "ChunkReader: Done loading %s", filename.c_str());
INFO_LOG(SAVESTATE, "ChunkReader: Done loading %s", filename.c_str());
if (error == ERROR_NONE) {
failureReason->clear();
}
Expand Down
7 changes: 4 additions & 3 deletions Common/Log.h
View file
Expand Up @@ -36,8 +36,6 @@ namespace LogTypes
{

enum LOG_TYPE {
MASTER_LOG,

SCEAUDIO,
SCECTRL,
SCEDISPLAY,
Expand All @@ -51,7 +49,9 @@ enum LOG_TYPE {
SCERTC,
SCESAS,
SCEUTILITY,
SCEMISC,

SYSTEM,
BOOT,
COMMON,
CPU,
Expand All @@ -64,6 +64,7 @@ enum LOG_TYPE {
MEMMAP,
TIME,
SASMIX,
SAVESTATE,

NUMBER_OF_LOGS, // Must be last
};
Expand Down Expand Up @@ -132,7 +133,7 @@ bool GenericLogEnabled(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type);
#endif // dbg_assert
#endif // MAX_LOGLEVEL DEBUG

#define _assert_(_a_) _dbg_assert_(MASTER_LOG, _a_)
#define _assert_(_a_) _dbg_assert_(SYSTEM, _a_)

#ifdef _MSC_VER
#define _assert_msg_(_t_, _a_, _fmt_, ...) \
Expand Down
57 changes: 29 additions & 28 deletions Common/LogManager.cpp
View file
Expand Up @@ -59,34 +59,35 @@ struct LogNameTableEntry {
};

static const LogNameTableEntry logTable[] = {
{LogTypes::MASTER_LOG, "*"},

{LogTypes::SCEAUDIO ,"SCEAUDIO"},
{LogTypes::SCECTRL ,"SCECTRL"},
{LogTypes::SCEDISPLAY ,"SCEDISP"},
{LogTypes::SCEFONT ,"SCEFONT"},
{LogTypes::SCEGE ,"SCESCEGE"},
{LogTypes::SCEINTC ,"SCEINTC"},
{LogTypes::SCEIO ,"SCEIO"},
{LogTypes::SCEKERNEL ,"SCEKERNEL"},
{LogTypes::SCEMODULE ,"SCEMODULE"},
{LogTypes::SCENET ,"SCENET"},
{LogTypes::SCERTC ,"SCERTC"},
{LogTypes::SCESAS ,"SCESAS"},
{LogTypes::SCEUTILITY ,"SCEUTIL"},

{LogTypes::BOOT ,"BOOT"},
{LogTypes::COMMON ,"COMMON"},
{LogTypes::CPU ,"CPU"},
{LogTypes::FILESYS ,"FILESYS"},
{LogTypes::G3D ,"G3D"},
{LogTypes::HLE ,"HLE"},
{LogTypes::JIT ,"JIT"},
{LogTypes::LOADER ,"LOAD"},
{LogTypes::ME ,"ME"},
{LogTypes::MEMMAP ,"MM"},
{LogTypes::TIME ,"TIME"},
{LogTypes::SASMIX ,"SASMIX"},
{LogTypes::SCEAUDIO, "SCEAUDIO"},
{LogTypes::SCECTRL, "SCECTRL"},
{LogTypes::SCEDISPLAY, "SCEDISP"},
{LogTypes::SCEFONT, "SCEFONT"},
{LogTypes::SCEGE, "SCESCEGE"},
{LogTypes::SCEINTC, "SCEINTC"},
{LogTypes::SCEIO, "SCEIO"},
{LogTypes::SCEKERNEL, "SCEKERNEL"},
{LogTypes::SCEMODULE, "SCEMODULE"},
{LogTypes::SCENET, "SCENET"},
{LogTypes::SCERTC, "SCERTC"},
{LogTypes::SCESAS, "SCESAS"},
{LogTypes::SCEUTILITY, "SCEUTIL"},
{LogTypes::SCEMISC, "SCEMISC"},

{LogTypes::SYSTEM, "SYSTEM"},
{LogTypes::BOOT, "BOOT"},
{LogTypes::COMMON, "COMMON"},
{LogTypes::CPU, "CPU"},
{LogTypes::FILESYS, "FILESYS"},
{LogTypes::G3D, "G3D"},
{LogTypes::HLE, "HLE"},
{LogTypes::JIT, "JIT"},
{LogTypes::LOADER, "LOADER"},
{LogTypes::ME, "ME"},
{LogTypes::MEMMAP, "MEMMAP"},
{LogTypes::TIME, "TIME"},
{LogTypes::SASMIX, "SASMIX"},
{LogTypes::SAVESTATE, "SAVESTATE"},
};

LogManager::LogManager() {
Expand Down
2 changes: 1 addition & 1 deletion Common/MsgHandler.cpp
View file
Expand Up @@ -54,7 +54,7 @@ bool MsgAlert(bool yes_no, int Style, const char* format, ...)
CharArrayFromFormatV(buffer, sizeof(buffer)-1, format, args);
va_end(args);

ERROR_LOG(MASTER_LOG, "%s: %s", caption, buffer);
ERROR_LOG(SYSTEM, "%s: %s", caption, buffer);

// Don't ignore questions, especially AskYesNo, PanicYesNo could be ignored
if (AlertEnabled || Style == QUESTION || Style == CRITICAL)
Expand Down
2 changes: 1 addition & 1 deletion Core/ELF/PrxDecrypter.cpp
View file
Expand Up @@ -305,7 +305,7 @@ bool HasKey(int key)
case 0x63: case 0x64:
return true;
default:
INFO_LOG(HLE, "Missing key %02X, cannot decrypt module", key);
INFO_LOG(LOADER, "Missing key %02X, cannot decrypt module", key);
return false;
}
}
Expand Down
2 changes: 1 addition & 1 deletion Core/FileSystems/BlockDevices.cpp
View file
Expand Up @@ -51,7 +51,7 @@ u32 BlockDevice::CalculateCRC() {
u8 block[2048];
for (u32 i = 0; i < GetNumBlocks(); ++i) {
if (!ReadBlock(i, block, true)) {
ERROR_LOG(HLE, "Failed to read block for CRC");
ERROR_LOG(FILESYS, "Failed to read block for CRC");
return 0;
}
crc = crc32(crc, block, 2048);
Expand Down
4 changes: 2 additions & 2 deletions Core/HLE/KUBridge.cpp
View file
Expand Up @@ -26,13 +26,13 @@
#include "Core/Config.h"

static int kuKernelLoadModule(const char *path, uint32_t flags, uint32_t lmOptionAddr) {
INFO_LOG(HLE, "kuKernelLoadModule - forwarding to sceKernelLoadModule");
INFO_LOG(SCEKERNEL, "kuKernelLoadModule - forwarding to sceKernelLoadModule");
// Simply forward the call, like JPSCP does.
return sceKernelLoadModule(path, flags, lmOptionAddr);
}

static int kuKernelGetModel() {
INFO_LOG(HLE, "kuKernelGetModel()");
INFO_LOG(SCEKERNEL, "kuKernelGetModel()");
return g_Config.iPSPModel;
}

Expand Down
12 changes: 5 additions & 7 deletions Core/HLE/sceAdler.cpp
View file
Expand Up @@ -28,23 +28,21 @@

static u32 sceAdler32(u32 adler, u32 data, u32 datalen) {
if (!Memory::IsValidAddress(data) || !Memory::IsValidAddress(data + datalen - 1)) {
ERROR_LOG(HLE, "sceAdler32(adler=%08x, data=%08x, datalen=%08x) - bad address(es)", adler, data, datalen);
ERROR_LOG(SCEMISC, "sceAdler32(adler=%08x, data=%08x, datalen=%08x) - bad address(es)", adler, data, datalen);
return -1;
}
INFO_LOG(HLE, "sceAdler32(adler=%08x, data=%08x, datalen=%08x)", adler, data, datalen);
INFO_LOG(SCEMISC, "sceAdler32(adler=%08x, data=%08x, datalen=%08x)", adler, data, datalen);

u8 *buf = Memory::GetPointerUnchecked(data);
u32 ret = adler32(adler, buf, datalen);

return ret;
}

const HLEFunction sceAdler[] =
{
{0X9702EF11, &WrapU_UUU<sceAdler32>, "sceAdler32", 'x', "xxx"},
const HLEFunction sceAdler[] = {
{0X9702EF11, &WrapU_UUU<sceAdler32>, "sceAdler32", 'x', "xxx"},
};

void Register_sceAdler()
{
void Register_sceAdler() {
RegisterModule("sceAdler", ARRAY_SIZE(sceAdler), sceAdler);
}
8 changes: 4 additions & 4 deletions Core/HLE/sceAudioRouting.cpp
View file
Expand Up @@ -28,24 +28,24 @@ u32 audioRoutingMode = AUDIO_ROUTING_SPEAKER_ON;
u32 audioRoutineVolumeMode = AUDIO_ROUTING_SPEAKER_ON;

static int sceAudioRoutingGetMode() {
INFO_LOG(HLE, "sceAudioRoutingGetMode");
INFO_LOG(SCEAUDIO, "sceAudioRoutingGetMode");
return 0;
}

static int sceAudioRoutingSetVolumeMode(int mode) {
INFO_LOG(HLE, "sceAudioRoutingSetVolumeMode %d", mode);
INFO_LOG(SCEAUDIO, "sceAudioRoutingSetVolumeMode %d", mode);
int previousMode = audioRoutineVolumeMode;
audioRoutineVolumeMode = audioRoutingMode;
return previousMode;
}

static int sceAudioRoutingGetVolumeMode() {
INFO_LOG(HLE, "sceAudioRoutingGetMode");
INFO_LOG(SCEAUDIO, "sceAudioRoutingGetMode");
return 0;
}

static int sceAudioRoutingSetMode(int mode) {
INFO_LOG(HLE, "sceAudioRoutingSetMode %d", mode);
INFO_LOG(SCEAUDIO, "sceAudioRoutingSetMode %d", mode);
int previousMode = audioRoutingMode;
audioRoutingMode = mode;
return previousMode;
Expand Down

0 comments on commit 440e72d

Please sign in to comment.