From c6e6c3fcfb2799d73e630a5316d514b9d7a6d00e Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Thu, 24 Aug 2017 22:18:44 -0400 Subject: [PATCH] Resolves all current analyser warnings. --- Outputs/CRT/Internals/CRTOpenGL.cpp | 20 +++++++++---------- .../Disassembler/Disassembler6502.cpp | 4 ++++ StaticAnalyser/StaticAnalyser.cpp | 13 ------------ Storage/Disk/Encodings/MFM.cpp | 2 +- Storage/Disk/Formats/OricMFMDSK.cpp | 2 +- 5 files changed, 16 insertions(+), 25 deletions(-) diff --git a/Outputs/CRT/Internals/CRTOpenGL.cpp b/Outputs/CRT/Internals/CRTOpenGL.cpp index 2568dd2cf..af9d18bb0 100644 --- a/Outputs/CRT/Internals/CRTOpenGL.cpp +++ b/Outputs/CRT/Internals/CRTOpenGL.cpp @@ -44,17 +44,17 @@ OpenGLOutputBuilder::OpenGLOutputBuilder(size_t bytes_per_pixel) : // create the source vertex array glGenVertexArrays(1, &source_vertex_array_); - bool supports_texture_barrier = false; +// bool supports_texture_barrier = false; #ifdef GL_NV_texture_barrier - GLint number_of_extensions; - glGetIntegerv(GL_NUM_EXTENSIONS, &number_of_extensions); - - for(GLuint c = 0; c < (GLuint)number_of_extensions; c++) { - const char *extension_name = (const char *)glGetStringi(GL_EXTENSIONS, c); - if(!strcmp(extension_name, "GL_NV_texture_barrier")) { - supports_texture_barrier = true; - } - } +// GLint number_of_extensions; +// glGetIntegerv(GL_NUM_EXTENSIONS, &number_of_extensions); +// +// for(GLuint c = 0; c < (GLuint)number_of_extensions; c++) { +// const char *extension_name = (const char *)glGetStringi(GL_EXTENSIONS, c); +// if(!strcmp(extension_name, "GL_NV_texture_barrier")) { +// supports_texture_barrier = true; +// } +// } #endif // if(supports_texture_barrier) { diff --git a/StaticAnalyser/Disassembler/Disassembler6502.cpp b/StaticAnalyser/Disassembler/Disassembler6502.cpp index 15c0def64..fb54a95bb 100644 --- a/StaticAnalyser/Disassembler/Disassembler6502.cpp +++ b/StaticAnalyser/Disassembler/Disassembler6502.cpp @@ -92,6 +92,10 @@ static void AddToDisassembly(PartialDisassembly &disassembly, const std::vector< #define IM_INSTRUCTION(base, op) \ case base: instruction.operation = op; break; switch(operation) { + default: + instruction.operation = Instruction::KIL; + break; + IM_INSTRUCTION(0x00, Instruction::BRK) IM_INSTRUCTION(0x20, Instruction::JSR) IM_INSTRUCTION(0x40, Instruction::RTI) diff --git a/StaticAnalyser/StaticAnalyser.cpp b/StaticAnalyser/StaticAnalyser.cpp index 2c60792ee..ec5196ba5 100644 --- a/StaticAnalyser/StaticAnalyser.cpp +++ b/StaticAnalyser/StaticAnalyser.cpp @@ -139,19 +139,6 @@ Media StaticAnalyser::GetMedia(const char *file_name) { std::list StaticAnalyser::GetTargets(const char *file_name) { std::list targets; - // Get the extension, if any; it will be assumed that extensions are reliable, so an extension is a broad-phase - // test as to file format. - const char *mixed_case_extension = strrchr(file_name, '.'); - char *lowercase_extension = nullptr; - if(mixed_case_extension) { - lowercase_extension = strdup(mixed_case_extension+1); - char *parser = lowercase_extension; - while(*parser) { - *parser = (char)tolower(*parser); - parser++; - } - } - // Collect all disks, tapes and ROMs as can be extrapolated from this file, forming the // union of all platforms this file might be a target for. TargetPlatformType potential_platforms = 0; diff --git a/Storage/Disk/Encodings/MFM.cpp b/Storage/Disk/Encodings/MFM.cpp index 3aa918365..6b69af9c1 100644 --- a/Storage/Disk/Encodings/MFM.cpp +++ b/Storage/Disk/Encodings/MFM.cpp @@ -346,7 +346,7 @@ uint8_t Parser::get_next_byte() { std::vector Parser::get_track() { std::vector result; int distance_until_permissible_sync = 0; - uint8_t last_id[6]; + uint8_t last_id[6] = {0, 0, 0, 0, 0, 0}; int last_id_pointer = 0; bool next_is_type = false; diff --git a/Storage/Disk/Formats/OricMFMDSK.cpp b/Storage/Disk/Formats/OricMFMDSK.cpp index 5895be271..b3bdaf4bc 100644 --- a/Storage/Disk/Formats/OricMFMDSK.cpp +++ b/Storage/Disk/Formats/OricMFMDSK.cpp @@ -62,7 +62,7 @@ std::shared_ptr OricMFMDSK::get_uncached_track_at_position(unsigned int h // The file format omits clock bits. So it's not a genuine MFM capture. // A consumer must contextually guess when an FB, FC, etc is meant to be a control mark. size_t track_offset = 0; - uint8_t last_header[6]; + uint8_t last_header[6] = {0, 0, 0, 0, 0, 0}; std::unique_ptr encoder = Encodings::MFM::GetMFMEncoder(segment.data); bool did_sync = false; while(track_offset < 6250) {