aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRSDuck <rsduck@users.noreply.github.com>2020-07-29 01:31:57 +0200
committerRSDuck <rsduck@users.noreply.github.com>2020-07-29 01:31:57 +0200
commita89741c628b7d2575ebeb26b58d7ee6b5d1025f7 (patch)
tree10c1ed6eb74e2be386f8c54742d0b17a80368303
parentf56aa60eb693ed41212960db60e01ceecf5d64c5 (diff)
fix unterminated string + remove some JIT logging
-rw-r--r--src/ARMJIT_Memory.cpp5
-rw-r--r--src/frontend/qt_sdl/Platform.cpp1
2 files changed, 3 insertions, 3 deletions
diff --git a/src/ARMJIT_Memory.cpp b/src/ARMJIT_Memory.cpp
index 2364023..cc8ad67 100644
--- a/src/ARMJIT_Memory.cpp
+++ b/src/ARMJIT_Memory.cpp
@@ -111,7 +111,6 @@ static LONG ExceptionHandler(EXCEPTION_POINTERS* exceptionInfo)
{
if (exceptionInfo->ExceptionRecord->ExceptionCode != EXCEPTION_ACCESS_VIOLATION)
{
- printf("narg\n");
return EXCEPTION_CONTINUE_SEARCH;
}
@@ -357,7 +356,7 @@ ARMJIT::TinyVector<Mapping> Mappings[memregions_Count];
void SetCodeProtection(int region, u32 offset, bool protect)
{
offset &= ~0xFFF;
- printf("set code protection %d %x %d\n", region, offset, protect);
+ //printf("set code protection %d %x %d\n", region, offset, protect);
for (int i = 0; i < Mappings[region].Length; i++)
{
@@ -375,7 +374,7 @@ void SetCodeProtection(int region, u32 offset, bool protect)
u8* states = (u8*)(mapping.Num == 0 ? MappingStatus9 : MappingStatus7);
- printf("%x %d %x %x %x %d\n", effectiveAddr, mapping.Num, mapping.Addr, mapping.LocalOffset, mapping.Size, states[effectiveAddr >> 12]);
+ //printf("%x %d %x %x %x %d\n", effectiveAddr, mapping.Num, mapping.Addr, mapping.LocalOffset, mapping.Size, states[effectiveAddr >> 12]);
assert(states[effectiveAddr >> 12] == (protect ? memstate_MappedRW : memstate_MappedProtected));
states[effectiveAddr >> 12] = protect ? memstate_MappedProtected : memstate_MappedRW;
diff --git a/src/frontend/qt_sdl/Platform.cpp b/src/frontend/qt_sdl/Platform.cpp
index 43f358f..05a0c2d 100644
--- a/src/frontend/qt_sdl/Platform.cpp
+++ b/src/frontend/qt_sdl/Platform.cpp
@@ -111,6 +111,7 @@ void Init(int argc, char** argv)
confdir = config.absolutePath() + "/melonDS/";
EmuDirectory = new char[confdir.length() + 1];
memcpy(EmuDirectory, confdir.toUtf8().data(), confdir.length());
+ EmuDirectory[confdir.length()] = '\0';
#endif
}