diff --git a/Common/ArmEmitter.h b/Common/ArmEmitter.h index 0bfe679d35..6da4dbc81e 100644 --- a/Common/ArmEmitter.h +++ b/Common/ArmEmitter.h @@ -272,8 +272,8 @@ public: u32 Imm12Mod() { - // This is a IMM12 with the top four bits being rotation and the - // bottom eight being a IMM. This is for instructions that need to + // This is an IMM12 with the top four bits being rotation and the + // bottom eight being an IMM. This is for instructions that need to // expand a 8bit IMM to a 32bit value and gives you some rotation as // well. // Each rotation rotates to the right by 2 bits diff --git a/Core/Dialog/PSPSaveDialog.cpp b/Core/Dialog/PSPSaveDialog.cpp index ae8f15ab5c..c3be481cb7 100755 --- a/Core/Dialog/PSPSaveDialog.cpp +++ b/Core/Dialog/PSPSaveDialog.cpp @@ -159,7 +159,7 @@ int PSPSaveDialog::Init(int paramAddr) display = DS_NONE; break; - case SCE_UTILITY_SAVEDATA_TYPE_DELETE: // This run on PSP display a list of all save on the PSP. Weird. (Not really, it's to let you free up space) + case SCE_UTILITY_SAVEDATA_TYPE_DELETE: // When run on a PSP, displays a list of all saves on the PSP. Weird. (Not really, it's to let you free up space) display = DS_DELETE_LIST_CHOICE; break; default: diff --git a/Core/ELF/ElfReader.cpp b/Core/ELF/ElfReader.cpp index ac2aab3a7a..44404e1e89 100644 --- a/Core/ELF/ElfReader.cpp +++ b/Core/ELF/ElfReader.cpp @@ -146,6 +146,14 @@ void ElfReader::LoadRelocations(Elf32_Rel *rels, int numRelocs) } break; + case R_MIPS_16: + { + char temp[256]; + MIPSDisAsm(op, 0, temp); + ERROR_LOG_REPORT(LOADER, "WARNING: Unsupported R_MIPS_16 reloc @ %08x : %s", addr, temp); + } + break; + case 0: // another GP reloc! { char temp[256]; @@ -158,7 +166,7 @@ void ElfReader::LoadRelocations(Elf32_Rel *rels, int numRelocs) { char temp[256]; MIPSDisAsm(op, 0, temp); - ERROR_LOG_REPORT(LOADER,"ARGH IT'S A UNKNOWN RELOCATION!!!!!!!! %08x, type=%d : %s", addr, type, temp); + ERROR_LOG_REPORT(LOADER,"ARGH IT'S AN UNKNOWN RELOCATION!!!!!!!! %08x, type=%d : %s", addr, type, temp); } break; } diff --git a/Core/HLE/sceAtrac.cpp b/Core/HLE/sceAtrac.cpp index 32600ca637..1fc3c4cd6e 100644 --- a/Core/HLE/sceAtrac.cpp +++ b/Core/HLE/sceAtrac.cpp @@ -1061,7 +1061,7 @@ int __AtracSetContext(Atrac *atrac) // select the audio stream ret = av_find_best_stream(atrac->pFormatCtx, AVMEDIA_TYPE_AUDIO, -1, -1, &pCodec, 0); if (ret < 0) { - ERROR_LOG(HLE, "av_find_best_stream: Cannot find a audio stream in the input file %d", ret); + ERROR_LOG(HLE, "av_find_best_stream: Cannot find an audio stream in the input file %d", ret); return -1; } atrac->audio_stream_index = ret; diff --git a/Core/HLE/sceKernelThread.cpp b/Core/HLE/sceKernelThread.cpp index 96b43d03a3..6bd67f7e01 100644 --- a/Core/HLE/sceKernelThread.cpp +++ b/Core/HLE/sceKernelThread.cpp @@ -2690,7 +2690,7 @@ int sceKernelResumeThread(SceUID threadID) DEBUG_LOG(HLE, "sceKernelResumeThread(%d)", threadID); t->nt.status &= ~THREADSTATUS_SUSPEND; - // If it was dormant, waiting, etc. before we don't flip it's ready state. + // If it was dormant, waiting, etc. before we don't flip its ready state. if (t->nt.status == 0) __KernelChangeReadyState(t, threadID, true); return 0; diff --git a/Core/HLE/sceMp3.cpp b/Core/HLE/sceMp3.cpp index 60377e0ea2..859ce7fb12 100644 --- a/Core/HLE/sceMp3.cpp +++ b/Core/HLE/sceMp3.cpp @@ -355,7 +355,7 @@ int sceMp3Init(u32 mp3) { /* select the audio stream */ ret = av_find_best_stream(ctx->avformat_context, AVMEDIA_TYPE_AUDIO, -1, -1, &dec, 0); if (ret < 0) { - ERROR_LOG(HLE, "av_find_best_stream: Cannot find a audio stream in the input file %d", ret); + ERROR_LOG(HLE, "av_find_best_stream: Cannot find an audio stream in the input file %d", ret); return -1; } ctx->audio_stream_index = ret; diff --git a/Core/HW/OMAConvert.cpp b/Core/HW/OMAConvert.cpp index c719e6e1ac..3964565963 100644 --- a/Core/HW/OMAConvert.cpp +++ b/Core/HW/OMAConvert.cpp @@ -46,7 +46,7 @@ bool isHeader(u8* audioStream, int offset) return (audioStream[offset] == header1) && (audioStream[offset+1] == header2); } -// header set to the headerbuf, and return it's size +// header set to the headerbuf, and return its size int getOmaHeader(u8 codecId, u8 headerCode0, u8 headerCode1, u8 headerCode2, u8* headerbuf) { int pos = 0; diff --git a/Core/HW/OMAConvert.h b/Core/HW/OMAConvert.h index c8b4b805f8..4be76c88f1 100644 --- a/Core/HW/OMAConvert.h +++ b/Core/HW/OMAConvert.h @@ -1,4 +1,4 @@ -// It can simply convert a at3+ file or stream to oma format +// It can simply convert an at3+ file or stream to oma format // Thanks to JPCSP project #pragma once @@ -7,9 +7,9 @@ namespace OMAConvert { - // output OMA to outputStream, and return it's size. You need to release it by use releaseStream() + // output OMA to outputStream, and return its size. You need to release it by use releaseStream() int convertStreamtoOMA(u8* audioStream, int audioSize, u8** outputStream); - // output OMA to outputStream, and return it's size. You need to release it by use releaseStream() + // output OMA to outputStream, and return its size. You need to release it by use releaseStream() int convertRIFFtoOMA(u8* riff, int riffSize, u8** outputStream, int *readSize = 0); void releaseStream(u8** stream); diff --git a/Core/MIPS/MIPSStackWalk.cpp b/Core/MIPS/MIPSStackWalk.cpp index a2241e8b2a..d4a9ffcb4c 100644 --- a/Core/MIPS/MIPSStackWalk.cpp +++ b/Core/MIPS/MIPSStackWalk.cpp @@ -31,7 +31,7 @@ namespace MIPSStackWalk { using namespace MIPSCodeUtils; - // In the worst case, we scan this far above the pc for a entry. + // In the worst case, we scan this far above the pc for an entry. const int MAX_FUNC_SIZE = 32768 * 4; // After this we assume we're stuck. const size_t MAX_DEPTH = 1024; diff --git a/Core/MIPS/MIPSStackWalk.h b/Core/MIPS/MIPSStackWalk.h index 78b3e1dc95..f380b5881f 100644 --- a/Core/MIPS/MIPSStackWalk.h +++ b/Core/MIPS/MIPSStackWalk.h @@ -28,7 +28,7 @@ namespace MIPSStackWalk { u32 pc; // Value of SP inside this function (assuming no alloca()...) u32 sp; - // Size of stack in bytes. + // Size of stack frame in bytes. int stackSize; };