mirror of https://github.com/stella-emu/stella.git
Fix minor compiler warnings in g++ and clang.
This commit is contained in:
parent
f67bcec1b6
commit
eba34b5320
|
@ -30,6 +30,7 @@
|
||||||
#pragma clang diagnostic ignored "-Wdocumentation-unknown-command"
|
#pragma clang diagnostic ignored "-Wdocumentation-unknown-command"
|
||||||
#pragma clang diagnostic ignored "-Wimplicit-fallthrough"
|
#pragma clang diagnostic ignored "-Wimplicit-fallthrough"
|
||||||
#pragma clang diagnostic ignored "-Wreserved-id-macro"
|
#pragma clang diagnostic ignored "-Wreserved-id-macro"
|
||||||
|
#pragma clang diagnostic ignored "-Wold-style-cast"
|
||||||
#include <SDL.h>
|
#include <SDL.h>
|
||||||
#pragma clang diagnostic pop
|
#pragma clang diagnostic pop
|
||||||
#else
|
#else
|
||||||
|
|
|
@ -266,7 +266,7 @@ void CartridgeARMWidget::handleArmCycles()
|
||||||
{
|
{
|
||||||
bool devSettings = instance().settings().getBool("dev.settings");
|
bool devSettings = instance().settings().getBool("dev.settings");
|
||||||
bool enable = myIncCycles->getState();
|
bool enable = myIncCycles->getState();
|
||||||
double factor = myCycleFactor->getValue() / 100.F;
|
double factor = static_cast<double>(myCycleFactor->getValue()) / 100.0;
|
||||||
|
|
||||||
if(devSettings)
|
if(devSettings)
|
||||||
{
|
{
|
||||||
|
|
|
@ -107,7 +107,8 @@ CartridgeCDF::CartridgeCDF(const ByteBuffer& image, size_t size,
|
||||||
static_cast<uInt32>(mySize),
|
static_cast<uInt32>(mySize),
|
||||||
cBase, cStart, cStack,
|
cBase, cStart, cStack,
|
||||||
devSettings ? settings.getBool("dev.thumb.trapfatal") : false,
|
devSettings ? settings.getBool("dev.thumb.trapfatal") : false,
|
||||||
devSettings ? settings.getFloat("dev.thumb.cyclefactor") : 1.0,
|
devSettings ? static_cast<double>(
|
||||||
|
settings.getFloat("dev.thumb.cyclefactor")) : 1.0,
|
||||||
thumulatorConfiguration(myCDFSubtype),
|
thumulatorConfiguration(myCDFSubtype),
|
||||||
this);
|
this);
|
||||||
|
|
||||||
|
|
|
@ -57,7 +57,8 @@ CartridgeDPCPlus::CartridgeDPCPlus(const ByteBuffer& image, size_t size,
|
||||||
0x00000C08,
|
0x00000C08,
|
||||||
0x40001FDC,
|
0x40001FDC,
|
||||||
devSettings ? settings.getBool("dev.thumb.trapfatal") : false,
|
devSettings ? settings.getBool("dev.thumb.trapfatal") : false,
|
||||||
devSettings ? settings.getFloat("dev.thumb.cyclefactor") : 1.0,
|
devSettings ? static_cast<double>(
|
||||||
|
settings.getFloat("dev.thumb.cyclefactor")) : 1.0,
|
||||||
Thumbulator::ConfigureFor::DPCplus,
|
Thumbulator::ConfigureFor::DPCplus,
|
||||||
this);
|
this);
|
||||||
|
|
||||||
|
|
|
@ -74,13 +74,13 @@ using Common::Base;
|
||||||
#define INC_LDR_CYCLES \
|
#define INC_LDR_CYCLES \
|
||||||
INC_N_CYCLES(rb, AccessType::data); \
|
INC_N_CYCLES(rb, AccessType::data); \
|
||||||
INC_I_CYCLES; \
|
INC_I_CYCLES; \
|
||||||
//FETCH_TYPE(CycleType::N, AccessType::data); \
|
/*FETCH_TYPE(CycleType::N, AccessType::data); \
|
||||||
//FETCH_TYPE_N;
|
FETCH_TYPE_N;*/
|
||||||
#define INC_LDRB_CYCLES \
|
#define INC_LDRB_CYCLES \
|
||||||
INC_N_CYCLES(rb & (~1U), AccessType::data); \
|
INC_N_CYCLES(rb & (~1U), AccessType::data); \
|
||||||
INC_I_CYCLES; \
|
INC_I_CYCLES; \
|
||||||
//FETCH_TYPE(CycleType::N, AccessType::data); \
|
/*FETCH_TYPE(CycleType::N, AccessType::data); \
|
||||||
//FETCH_TYPE_N;
|
FETCH_TYPE_N;*/
|
||||||
|
|
||||||
#define INC_STR_CYCLES \
|
#define INC_STR_CYCLES \
|
||||||
INC_N_CYCLES(rb, AccessType::data); \
|
INC_N_CYCLES(rb, AccessType::data); \
|
||||||
|
@ -91,9 +91,11 @@ using Common::Base;
|
||||||
FETCH_TYPE_N; \
|
FETCH_TYPE_N; \
|
||||||
//INC_N_CYCLES(rb & (~1U), AccessType::data);
|
//INC_N_CYCLES(rb & (~1U), AccessType::data);
|
||||||
|
|
||||||
|
#if 0 // unused for now
|
||||||
#define FETCH_TYPE(cycleType, accessType) \
|
#define FETCH_TYPE(cycleType, accessType) \
|
||||||
_prefetchCycleType[_pipeIdx] = cycleType; \
|
_prefetchCycleType[_pipeIdx] = cycleType; \
|
||||||
_prefetchAccessType[_pipeIdx] = accessType
|
_prefetchAccessType[_pipeIdx] = accessType
|
||||||
|
#endif
|
||||||
#define FETCH_TYPE_N \
|
#define FETCH_TYPE_N \
|
||||||
_prefetchCycleType[_pipeIdx] = CycleType::N
|
_prefetchCycleType[_pipeIdx] = CycleType::N
|
||||||
|
|
||||||
|
@ -290,7 +292,7 @@ uInt32 Thumbulator::fetch16(uInt32 addr)
|
||||||
uInt32 data;
|
uInt32 data;
|
||||||
|
|
||||||
#ifdef THUMB_CYCLE_COUNT
|
#ifdef THUMB_CYCLE_COUNT
|
||||||
_pipeIdx = (++_pipeIdx) % 3;
|
_pipeIdx = (_pipeIdx+1) % 3;
|
||||||
|
|
||||||
#ifdef MERGE_I_S
|
#ifdef MERGE_I_S
|
||||||
if(_lastCycleType[2] == CycleType::I)
|
if(_lastCycleType[2] == CycleType::I)
|
||||||
|
|
|
@ -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);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue