ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix minor warnings in g++10.

This commit is contained in:
Stephen Anthony 2021-06-27 12:25:21 -02:30
parent 06c6c1ccaa
commit 15c40bb197
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/emucore/Thumbulator.cxx
View File

@ -2237,9 +2237,13 @@ int Thumbulator::execute()
{ {
rc = read32(sp); rc = read32(sp);
if(first) if(first)
{
INC_N_CYCLES(sp, AccessType::data); INC_N_CYCLES(sp, AccessType::data);
}
else else
{
INC_S_CYCLES(sp, AccessType::data); INC_S_CYCLES(sp, AccessType::data);
}
rc += 2; rc += 2;
write_register(15, rc); write_register(15, rc);
sp += 4; sp += 4;
@ -2305,9 +2309,13 @@ int Thumbulator::execute()
rc = read_register(14); rc = read_register(14);
write32(rd, rc); write32(rd, rc);
if(first) if(first)
{
INC_N_CYCLES(rd, AccessType::data); INC_N_CYCLES(rd, AccessType::data);
}
else else
{
INC_S_CYCLES(rd, AccessType::data); INC_S_CYCLES(rd, AccessType::data);
}
if((rc & 1) == 0) if((rc & 1) == 0)
{ {
// FIXME fprintf(stderr,"push {lr} with an ARM address pc 0x%08X popped 0x%08X\n",pc,rc); // FIXME fprintf(stderr,"push {lr} with an ARM address pc 0x%08X popped 0x%08X\n",pc,rc);

2
src/gui/PopUpWidget.cxx
View File

@ -40,7 +40,7 @@ PopUpWidget::PopUpWidget(GuiObject* boss, const GUI::Font& font,
_textcolorhi = kTextColor; // do not highlight the label _textcolorhi = kTextColor; // do not highlight the label
setTextFilter([](char c) { setTextFilter([](char c) {
return isprint(c) && c != '\"' || c == '\x1c' || c == '\x1d'; // DEGREE || ELLIPSIS return (isprint(c) && c != '\"') || c == '\x1c' || c == '\x1d'; // DEGREE || ELLIPSIS
}); });
setEditable(false); setEditable(false);