Clean up Makefile a little, removing obsolete warning flags.

This commit is contained in:
Stephen Anthony 2024-08-23 20:45:49 -02:30
parent 0849a647e3
commit ca84bb699f
5 changed files with 13 additions and 12 deletions

View File

@ -67,25 +67,25 @@ CXXFLAGS_TEST+= -Wall -Wextra -Wno-unused-parameter
CFLAGS_TEST+= -Wall -Wextra -Wno-unused-parameter CFLAGS_TEST+= -Wall -Wextra -Wno-unused-parameter
ifdef HAVE_GCC ifdef HAVE_GCC
CXXFLAGS+= -Wno-multichar -Wunused -Woverloaded-virtual -Wnon-virtual-dtor -std=c++20 CXXFLAGS+= -Wno-multichar -Wunused -Woverloaded-virtual -std=c++20
CFLAGS+= -Wno-multichar -Wunused CFLAGS+= -Wunused
CXXFLAGS_TEST+= -Wno-multichar -Wunused -Woverloaded-virtual -Wnon-virtual-dtor -std=c++20 CXXFLAGS_TEST+= -Wno-multichar -Wunused -Woverloaded-virtual -std=c++20
CFLAGS_TEST+= -Wno-multichar -Wunused CFLAGS_TEST+= -Wno-multichar -Wunused
endif endif
ifdef HAVE_CLANG ifdef HAVE_CLANG
CXXFLAGS+= -Wno-multichar -Wunused -Woverloaded-virtual -Wnon-virtual-dtor -std=c++20 CXXFLAGS+= -Wunused -Woverloaded-virtual -std=c++20
CFLAGS+= -Wno-multichar -Wunused CFLAGS+= -Wunused
CXXFLAGS_TEST+= -Wno-multichar -Wunused -Woverloaded-virtual -Wnon-virtual-dtor -std=c++20 CXXFLAGS_TEST+= -Wno-multichar -Wunused -Woverloaded-virtual -std=c++20
CFLAGS_TEST+= -Wno-multichar -Wunused CFLAGS_TEST+= -Wno-multichar -Wunused
endif endif
ifdef CLANG_WARNINGS ifdef CLANG_WARNINGS
EXTRA_WARN=-Wno-c++98-compat-pedantic -Wno-unknown-warning-option \ EXTRA_WARN=-Wno-c++98-compat-pedantic -Wno-undefined-func-template \
-Wno-switch-enum -Wno-conversion -Wno-covered-switch-default \ -Wno-switch-enum -Wno-conversion -Wno-covered-switch-default \
-Wno-inconsistent-missing-destructor-override -Wno-float-equal \ -Wno-documentation -Wno-float-equal \
-Wno-exit-time-destructors -Wno-global-constructors -Wno-weak-vtables \ -Wno-exit-time-destructors -Wno-global-constructors -Wno-weak-vtables \
-Wno-four-char-constants -Wno-padded -Wno-reserved-identifier \ -Wno-four-char-constants -Wno-padded -Wno-reserved-identifier \
-Wno-duplicate-enum -Wno-unsafe-buffer-usage -Wno-duplicate-enum -Wno-unsafe-buffer-usage

View File

@ -31,6 +31,7 @@
#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" #pragma clang diagnostic ignored "-Wold-style-cast"
#pragma clang diagnostic ignored "-Wreserved-identifier"
#pragma clang diagnostic ignored "-Wswitch-default" #pragma clang diagnostic ignored "-Wswitch-default"
#include <SDL.h> #include <SDL.h>
#pragma clang diagnostic pop #pragma clang diagnostic pop

View File

@ -72,7 +72,7 @@ class CartridgeELF: public Cartridge {
const ByteBuffer& getImage(size_t& size) const override; const ByteBuffer& getImage(size_t& size) const override;
string name() const override { return "CartridgeELF"; }; string name() const override { return "CartridgeELF"; }
uInt8 overdrivePeek(uInt16 address, uInt8 value) override; uInt8 overdrivePeek(uInt16 address, uInt8 value) override;

View File

@ -91,8 +91,8 @@ namespace {
#define do_cflag_bit(x) cFlag = (x) #define do_cflag_bit(x) cFlag = (x)
#define do_vflag_bit(x) vFlag = (x) #define do_vflag_bit(x) vFlag = (x)
#define branch_target_9(inst) (read_register(15) + 2 + (((Int32)(inst) << 24) >> 23)) #define branch_target_9(inst) (read_register(15) + 2 + ((static_cast<Int32>(inst) << 24) >> 23))
#define branch_target_12(inst) (read_register(15) + 2 + (((Int32)(inst) << 21) >> 20)) #define branch_target_12(inst) (read_register(15) + 2 + ((static_cast<Int32>(inst) << 21) >> 20))
namespace { namespace {
constexpr uInt32 PAGEMAP_SIZE = 0x100000000 / 4096; constexpr uInt32 PAGEMAP_SIZE = 0x100000000 / 4096;

View File

@ -119,7 +119,7 @@ class Device : public Serializable
@return The byte at the specified address @return The byte at the specified address
*/ */
virtual uInt8 peek(uInt16 address) = 0; virtual uInt8 peek(uInt16 address) = 0;
virtual uInt8 peekOob(uInt16 address) { return peek(address); }; virtual uInt8 peekOob(uInt16 address) { return peek(address); }
/** /**
Change the byte at the specified address to the given value Change the byte at the specified address to the given value