empathicqubit/Mesen-SX
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Libretro: Fixed compilation error

Browse source 
+ Fixed some GCC warnings
This commit is contained in:
Sour 2020-02-08 17:27:53 -05:00
parent 0cf94db654
commit 44eb8c5eb9
6 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Core/PpuTools.cpp
View file

@ -97,7 +97,7 @@ void PpuTools::GetTileView(GetTileViewOptions options, uint8_t *source, uint32_t
int tileCount = options.PageSize / bytesPerTile;
uint16_t bgColor = (cgram[1] << 8) | cgram[0];
for(int i = 0; i < outputSize / sizeof(uint32_t); i++) {
for(uint32_t i = 0; i < outputSize / sizeof(uint32_t); i++) {
outBuffer[i] = ToArgb(bgColor);
}

8
Core/Profiler.cpp
View file

@ -8,6 +8,8 @@
#include "MemoryDumper.h"
#include "DebugTypes.h"
static constexpr int32_t ResetFunctionIndex = -1;
Profiler::Profiler(Debugger* debugger)
{
_debugger = debugger;
@ -104,11 +106,11 @@ void Profiler::InternalReset()
{
_prevMasterClock = _memoryManager->GetMasterClock();
_currentCycleCount = 0;
_currentFunction = Profiler::ResetFunctionIndex;
_currentFunction = ResetFunctionIndex;
_functions.clear();
_functions[Profiler::ResetFunctionIndex] = ProfiledFunction();
_functions[Profiler::ResetFunctionIndex].Address = { Profiler::ResetFunctionIndex, SnesMemoryType::Register };
_functions[ResetFunctionIndex] = ProfiledFunction();
_functions[ResetFunctionIndex].Address = { ResetFunctionIndex, SnesMemoryType::Register };
}
void Profiler::GetProfilerData(ProfiledFunction* profilerData, uint32_t& functionCount)

2
Core/Profiler.h
View file

@ -20,8 +20,6 @@ struct ProfiledFunction
class Profiler
{
private:
static constexpr int32_t ResetFunctionIndex = -1;
Debugger* _debugger;
MemoryManager* _memoryManager;

5
Core/SpcDebugger.cpp
View file

@ -44,10 +44,9 @@ void SpcDebugger::ProcessRead(uint16_t addr, uint8_t value, MemoryOperationType
AddressInfo addressInfo = _spc->GetAbsoluteAddress(addr);
MemoryOperationInfo operation { addr, value, type };
BreakSource breakSource = BreakSource::Unspecified;
if(type == MemoryOperationType::ExecOpCode) {
BreakSource breakSource = BreakSource::Unspecified;
SpcState spcState = _spc->GetState();
if(_traceLogger->IsCpuLogged(CpuType::Spc) || _settings->CheckDebuggerFlag(DebuggerFlags::SpcDebuggerEnabled)) {
@ -98,7 +97,7 @@ void SpcDebugger::ProcessRead(uint16_t addr, uint8_t value, MemoryOperationType
}
}
_debugger->ProcessBreakConditions(_step->StepCount == 0, GetBreakpointManager(), operation, addressInfo);
_debugger->ProcessBreakConditions(_step->StepCount == 0, GetBreakpointManager(), operation, addressInfo, breakSource);
_memoryAccessCounter->ProcessMemoryAccess(addressInfo, type, _memoryManager->GetMasterClock());
}

4
Libretro/Makefile.common
View file

@ -21,7 +21,6 @@ SOURCES_C := $(SEVENZIP_DIR)/7zAlloc.c \
SOURCES_CXX := $(LIBRETRO_DIR)/libretro.cpp \
$(CORE_DIR)/AluMulDiv.cpp \
$(CORE_DIR)/AviRecorder.cpp \
$(CORE_DIR)/BaseCartridge.cpp \
$(CORE_DIR)/BaseControlDevice.cpp \
$(CORE_DIR)/BaseRenderer.cpp \
@ -83,6 +82,7 @@ SOURCES_CXX := $(LIBRETRO_DIR)/libretro.cpp \
$(CORE_DIR)/PcmReader.cpp \
$(CORE_DIR)/Ppu.cpp \
$(CORE_DIR)/PpuTools.cpp \
$(CORE_DIR)/Profiler.cpp \
$(CORE_DIR)/RegisterHandlerB.cpp \
$(CORE_DIR)/RewindData.cpp \
$(CORE_DIR)/RewindManager.cpp \
@ -114,6 +114,7 @@ SOURCES_CXX := $(LIBRETRO_DIR)/libretro.cpp \
$(CORE_DIR)/WaveRecorder.cpp \
$(UTIL_DIR)/ArchiveReader.cpp \
$(UTIL_DIR)/AutoResetEvent.cpp \
$(UTIL_DIR)/AviRecorder.cpp \
$(UTIL_DIR)/AviWriter.cpp \
$(UTIL_DIR)/blip_buf.cpp \
$(UTIL_DIR)/BpsPatcher.cpp \
@ -121,6 +122,7 @@ SOURCES_CXX := $(LIBRETRO_DIR)/libretro.cpp \
$(UTIL_DIR)/CRC32.cpp \
$(UTIL_DIR)/Equalizer.cpp \
$(UTIL_DIR)/FolderUtilities.cpp \
$(UTIL_DIR)/GifRecorder.cpp \
$(UTIL_DIR)/HexUtilities.cpp \
$(UTIL_DIR)/IpsPatcher.cpp \
$(UTIL_DIR)/md5.cpp \

2
Utilities/FastString.h
View file

@ -27,7 +27,7 @@ public:
void Write(const char* str, int size)
{
if(_lowerCase) {
for(size_t i = 0; i < size; i++) {
for(int i = 0; i < size; i++) {
_buffer[_pos + i] = ::tolower(str[i]);
}
} else {