From 594ba79e51ad64696129a977fd2ab0ca81fbbbe5 Mon Sep 17 00:00:00 2001 From: kanjitalk755 Date: Fri, 16 Oct 2020 19:17:58 +0900 Subject: [PATCH] remove .travis.yml reduce warnings (cherry picked from commit 73f194f422f0cf6363074eb1fde80d89bb401c3f) --- .travis.yml | 20 ---------------- .../BasiliskII.xcodeproj/project.pbxproj | 4 ++++ BasiliskII/src/uae_cpu/compiler/gencomp.c | 24 +++++++++---------- 3 files changed, 16 insertions(+), 32 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 27c17b7a2..000000000 --- a/.travis.yml +++ /dev/null @@ -1,20 +0,0 @@ -language: cpp - -matrix: - include: - - os: linux - dist: trusty - sudo: required - compiler: gcc - -addons: - apt: - packages: - - libsdl1.2-dev - - libgtk2.0-dev - -script: - - cd BasiliskII/src/Unix - - NO_CONFIGURE=1 ./autogen.sh - - ./configure --enable-sdl-video --enable-sdl-audio --disable-vosf --disable-jit-compiler --with-x --with-gtk --with-mon - - make -j 4 diff --git a/BasiliskII/src/MacOSX/BasiliskII.xcodeproj/project.pbxproj b/BasiliskII/src/MacOSX/BasiliskII.xcodeproj/project.pbxproj index 56ff5dba0..bbda1237b 100644 --- a/BasiliskII/src/MacOSX/BasiliskII.xcodeproj/project.pbxproj +++ b/BasiliskII/src/MacOSX/BasiliskII.xcodeproj/project.pbxproj @@ -1092,7 +1092,9 @@ ); GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_USE_STANDARD_INCLUDE_SEARCHING = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = NO; GCC_WARN_CHECK_SWITCH_STATEMENTS = NO; + GCC_WARN_UNUSED_VARIABLE = NO; HEADER_SEARCH_PATHS = ( /Library/Frameworks/SDL2.framework/Headers, ../MacOSX, @@ -1154,7 +1156,9 @@ ); GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_USE_STANDARD_INCLUDE_SEARCHING = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = NO; GCC_WARN_CHECK_SWITCH_STATEMENTS = NO; + GCC_WARN_UNUSED_VARIABLE = NO; HEADER_SEARCH_PATHS = ( /Library/Frameworks/SDL2.framework/Headers, ../MacOSX, diff --git a/BasiliskII/src/uae_cpu/compiler/gencomp.c b/BasiliskII/src/uae_cpu/compiler/gencomp.c index 14ad85a50..7055e5818 100644 --- a/BasiliskII/src/uae_cpu/compiler/gencomp.c +++ b/BasiliskII/src/uae_cpu/compiler/gencomp.c @@ -1359,7 +1359,7 @@ gen_opcode (unsigned long int opcode) case i_BCLR: case i_BSET: case i_BTST: -/* failure; /* NEW: from "Ipswitch Town" release */ +/* failure; NEW: from "Ipswitch Town" release */ genamode (curi->smode, "srcreg", curi->size, "src", 1, 0); genamode (curi->dmode, "dstreg", curi->size, "dst", 1, 0); start_brace(); @@ -1541,7 +1541,7 @@ gen_opcode (unsigned long int opcode) failure; break; case i_RTD: -/* failure; /* NEW: from "Ipswitch Town" release */ +/* failure; NEW: from "Ipswitch Town" release */ genamode (curi->smode, "srcreg", curi->size, "offs", 1, 0); /* offs is constant */ comprintf("\tadd_l_ri(offs,4);\n"); @@ -1557,7 +1557,7 @@ gen_opcode (unsigned long int opcode) isjump; break; case i_LINK: -/* failure; /* NEW: from "Ipswitch Town" release */ +/* failure; NEW: from "Ipswitch Town" release */ genamode (curi->smode, "srcreg", sz_long, "src", 1, 0); genamode (curi->dmode, "dstreg", curi->size, "offs", 1, 0); comprintf("\tsub_l_ri(15,4);\n" @@ -1569,7 +1569,7 @@ gen_opcode (unsigned long int opcode) genastore ("src", curi->smode, "srcreg", sz_long, "src"); break; case i_UNLK: -/* failure; /* NEW: from "Ipswitch Town" release */ +/* failure; NEW: from "Ipswitch Town" release */ genamode (curi->smode, "srcreg", curi->size, "src", 1, 0); comprintf("\tmov_l_rr(15,src);\n" "\treadlong(15,src,scratchie);\n" @@ -1790,7 +1790,7 @@ gen_opcode (unsigned long int opcode) break; case i_Scc: -/* failure; /* NEW: from "Ipswitch Town" release */ +/* failure; NEW: from "Ipswitch Town" release */ genamode (curi->smode, "srcreg", curi->size, "src", 2, 0); start_brace (); comprintf ("\tint val = scratchie++;\n"); @@ -1837,7 +1837,7 @@ gen_opcode (unsigned long int opcode) failure; break; case i_MULU: -/* failure; /* NEW: from "Ipswitch Town" release */ +/* failure; NEW: from "Ipswitch Town" release */ comprintf("\tdont_care_flags();\n"); genamode (curi->smode, "srcreg", sz_word, "src", 1, 0); genamode (curi->dmode, "dstreg", sz_word, "dst", 1, 0); @@ -1852,7 +1852,7 @@ gen_opcode (unsigned long int opcode) genastore ("dst", curi->dmode, "dstreg", sz_long, "dst"); break; case i_MULS: -/* failure; /* NEW: from "Ipswitch Town" release */ +/* failure; NEW: from "Ipswitch Town" release */ comprintf("\tdont_care_flags();\n"); genamode (curi->smode, "srcreg", sz_word, "src", 1, 0); genamode (curi->dmode, "dstreg", sz_word, "dst", 1, 0); @@ -1886,7 +1886,7 @@ gen_opcode (unsigned long int opcode) genamode (curi->smode, "srcreg", curi->size, "cnt", 1, 0); genamode (curi->dmode, "dstreg", curi->size, "data", 1, 0); if (curi->smode!=immi) { -/* failure; /* UNTESTED: NEW: from "Ipswitch Town" release */ +/* failure; UNTESTED: NEW: from "Ipswitch Town" release */ if (!noflags) { uses_cmov; start_brace(); @@ -2039,7 +2039,7 @@ gen_opcode (unsigned long int opcode) break; case i_ASL: -/* failure; /* NEW: from "Ipswitch Town" release */ +/* failure; NEW: from "Ipswitch Town" release */ mayfail; if (curi->smode==Dreg) { comprintf("if ((uae_u32)srcreg==(uae_u32)dstreg) {\n" @@ -2186,7 +2186,7 @@ gen_opcode (unsigned long int opcode) break; case i_LSR: -/* failure; /* NEW: from "Ipswitch Town" release */ +/* failure; NEW: from "Ipswitch Town" release */ mayfail; if (curi->smode==Dreg) { comprintf("if ((uae_u32)srcreg==(uae_u32)dstreg) {\n" @@ -2337,7 +2337,7 @@ gen_opcode (unsigned long int opcode) genamode (curi->smode, "srcreg", curi->size, "cnt", 1, 0); genamode (curi->dmode, "dstreg", curi->size, "data", 1, 0); if (curi->smode!=immi) { -/* failure; /* UNTESTED: NEW: from "Ipswitch Town" release */ +/* failure; UNTESTED: NEW: from "Ipswitch Town" release */ if (!noflags) { uses_cmov; start_brace(); @@ -2609,7 +2609,7 @@ gen_opcode (unsigned long int opcode) failure; break; case i_MULL: -/* failure; /* NEW: from "Ipswitch Town" release */ +/* failure; NEW: from "Ipswitch Town" release */ if (!noflags) { failure; break;