6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-10-13 21:24:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1139 from TomHarte/OtherProjects

Browse Source 
Clean up SDL and Qt projects, Qt build warnings.
This commit is contained in:
Thomas Harte 2023-05-15 10:18:16 -04:00 committed by GitHub
commit 747dc09a80
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 20 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Components/9918/Implementation/Draw.hpp
View File

@ -15,7 +15,7 @@ namespace TI::TMS {
template <Personality personality>
template <SpriteMode mode, bool double_width>
void Base<personality>::draw_sprites(uint8_t y, int start, int end, const std::array<uint32_t, 16> &palette, int *colour_buffer) {
void Base<personality>::draw_sprites([[maybe_unused]] uint8_t y, int start, int end, const std::array<uint32_t, 16> &palette, int *colour_buffer) {
if(!draw_line_buffer_->sprites) {
return;
}
@ -346,7 +346,7 @@ void Base<personality>::draw_tms_text(int start, int end) {
// MARK: - Master System
template <Personality personality>
void Base<personality>::draw_sms(int start, int end, uint32_t cram_dot) {
void Base<personality>::draw_sms([[maybe_unused]] int start, [[maybe_unused]] int end, [[maybe_unused]] uint32_t cram_dot) {
if constexpr (is_sega_vdp(personality)) {
int colour_buffer[256];
auto &line_buffer = *draw_line_buffer_;
@ -451,7 +451,7 @@ void Base<personality>::draw_sms(int start, int end, uint32_t cram_dot) {
template <Personality personality>
template <ScreenMode mode>
void Base<personality>::draw_yamaha(uint8_t y, int start, int end) {
const auto active_palette = palette();
[[maybe_unused]] const auto active_palette = palette();
const int sprite_start = start >> 2;
const int sprite_end = end >> 2;
auto &line_buffer = *draw_line_buffer_;

2
Components/9918/Implementation/Fetch.hpp
View File

@ -588,7 +588,7 @@ struct SMSSequencer {
};
template <Personality personality>
template<bool use_end> void Base<personality>::fetch_sms(uint8_t y, int start, int end) {
template<bool use_end> void Base<personality>::fetch_sms([[maybe_unused]] uint8_t y, [[maybe_unused]] int start, [[maybe_unused]] int end) {
if constexpr (is_sega_vdp(personality)) {
SMSSequencer<personality> sequencer(this, y);
dispatch<use_end>(sequencer, start, end);

2
Components/Serial/Line.cpp
View File

@ -129,7 +129,7 @@ bool Line<include_clock>::read() const {
}
template <bool include_clock>
void Line<include_clock>::set_read_delegate(ReadDelegate *delegate, Storage::Time bit_length) {
void Line<include_clock>::set_read_delegate(ReadDelegate *delegate, [[maybe_unused]] Storage::Time bit_length) {
read_delegate_ = delegate;
if constexpr (!include_clock) {
assert(bit_length > Storage::Time(0));

3
Machines/Enterprise/Enterprise.cpp
View File

@ -139,6 +139,7 @@ template <bool has_disk_controller, bool is_6mhz> class ConcreteMachine:
ROM::Request(ROM::Name::EnterpriseBASIC11) ||
ROM::Request(ROM::Name::EnterpriseBASIC11Suffixed)
);
break;
case Target::BASICVersion::v21:
request = request && ROM::Request(ROM::Name::EnterpriseBASIC21);
break;
@ -724,7 +725,7 @@ template <bool has_disk_controller, bool is_6mhz> class ConcreteMachine:
EXDos exdos_;
// MARK: - Activity Source
void set_activity_observer(Activity::Observer *observer) final {
void set_activity_observer([[maybe_unused]] Activity::Observer *observer) final {
if constexpr (has_disk_controller) {
exdos_.set_activity_observer(observer);
}

2
Machines/MSX/MSX.cpp
View File

@ -228,7 +228,7 @@ class ConcreteMachine:
uint8_t character_generator = 1; /* 0 = Japan, 1 = USA, etc, 2 = USSR */
uint8_t date_format = 1; /* 0 = Y/M/D, 1 = M/D/Y, 2 = D/M/Y */
uint8_t keyboard = 1; /* 0 = Japan, 1 = USA, 2 = France, 3 = UK, 4 = Germany, 5 = USSR, 6 = Spain */
ROM::Name regional_bios_name;
[[maybe_unused]] ROM::Name regional_bios_name;
switch(target.region) {
default:

2
Machines/Sinclair/ZXSpectrum/ZXSpectrum.cpp
View File

@ -523,7 +523,7 @@ template<Model model> class ConcreteMachine:
break;
case PartialMachineCycle::Input: {
bool did_match = false;
[[maybe_unused]] bool did_match = false;
*cycle.value = 0xff;
if(!(address&32)) {

3
OSBindings/Qt/clksignal.pro
View File

@ -113,8 +113,6 @@ SOURCES += \
$$SRC/Processors/6502/Implementation/*.cpp \
$$SRC/Processors/6502/State/*.cpp \
$$SRC/Processors/65816/Implementation/*.cpp \
$$SRC/Processors/68000/Implementation/*.cpp \
$$SRC/Processors/68000/State/*.cpp \
$$SRC/Processors/Z80/Implementation/*.cpp \
$$SRC/Processors/Z80/State/*.cpp \
\
@ -259,7 +257,6 @@ HEADERS += \
$$SRC/Processors/65816/Implementation/*.hpp \
$$SRC/Processors/68000/*.hpp \
$$SRC/Processors/68000/Implementation/*.hpp \
$$SRC/Processors/68000/State/*.hpp \
$$SRC/Processors/Z80/*.hpp \
$$SRC/Processors/Z80/Implementation/*.hpp \
$$SRC/Processors/Z80/State/*.hpp \

2
OSBindings/SDL/SConstruct
View File

@ -100,8 +100,6 @@ SOURCES += glob.glob('../../Outputs/OpenGL/Primitives/*.cpp')
SOURCES += glob.glob('../../Processors/6502/Implementation/*.cpp')
SOURCES += glob.glob('../../Processors/6502/State/*.cpp')
SOURCES += glob.glob('../../Processors/65816/Implementation/*.cpp')
SOURCES += glob.glob('../../Processors/68000/Implementation/*.cpp')
SOURCES += glob.glob('../../Processors/68000/State/*.cpp')
SOURCES += glob.glob('../../Processors/Z80/Implementation/*.cpp')
SOURCES += glob.glob('../../Processors/Z80/State/*.cpp')

24
Processors/68000/Implementation/68000Implementation.hpp
View File

@ -727,20 +727,18 @@ void Processor<BusHandler, dtack_is_implicit, permit_overrun, signal_will_perfor
switch(instruction_.operation) {
case InstructionSet::M68k::Operation::Undefined:
if(instruction_.operation == InstructionSet::M68k::Operation::Undefined) {
switch(opcode_ & 0xf000) {
default:
exception_vector_ = InstructionSet::M68k::Exception::IllegalInstruction;
break;
case 0xa000:
exception_vector_ = InstructionSet::M68k::Exception::Line1010;
break;
case 0xf000:
exception_vector_ = InstructionSet::M68k::Exception::Line1111;
break;
}
MoveToStateSpecific(StandardException);
switch(opcode_ & 0xf000) {
default:
exception_vector_ = InstructionSet::M68k::Exception::IllegalInstruction;
break;
case 0xa000:
exception_vector_ = InstructionSet::M68k::Exception::Line1010;
break;
case 0xf000:
exception_vector_ = InstructionSet::M68k::Exception::Line1111;
break;
}
MoveToStateSpecific(StandardException);
StdCASE(NBCD, {
if(instruction_.mode(0) == Mode::DataRegisterDirect) {