diff --git a/src/emucore/Thumbulator.cxx b/src/emucore/Thumbulator.cxx index 8a79b49c7..811b3417a 100644 --- a/src/emucore/Thumbulator.cxx +++ b/src/emucore/Thumbulator.cxx @@ -2237,9 +2237,13 @@ int Thumbulator::execute() { rc = read32(sp); if(first) + { INC_N_CYCLES(sp, AccessType::data); + } else + { INC_S_CYCLES(sp, AccessType::data); + } rc += 2; write_register(15, rc); sp += 4; @@ -2305,9 +2309,13 @@ int Thumbulator::execute() rc = read_register(14); write32(rd, rc); if(first) + { INC_N_CYCLES(rd, AccessType::data); + } else + { INC_S_CYCLES(rd, AccessType::data); + } if((rc & 1) == 0) { // FIXME fprintf(stderr,"push {lr} with an ARM address pc 0x%08X popped 0x%08X\n",pc,rc); diff --git a/src/gui/PopUpWidget.cxx b/src/gui/PopUpWidget.cxx index 2d33a176f..980e37e3e 100644 --- a/src/gui/PopUpWidget.cxx +++ b/src/gui/PopUpWidget.cxx @@ -40,7 +40,7 @@ PopUpWidget::PopUpWidget(GuiObject* boss, const GUI::Font& font, _textcolorhi = kTextColor; // do not highlight the label 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);