Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Libretro
melonDS
Commits
a89741c6
Commit
a89741c6
authored
Jul 29, 2020
by
RSDuck
Browse files
fix unterminated string + remove some JIT logging
parent
f56aa60e
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/ARMJIT_Memory.cpp
View file @
a89741c6
...
...
@@ -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
;
...
...
src/frontend/qt_sdl/Platform.cpp
View file @
a89741c6
...
...
@@ -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
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment