archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-04 14:01:25 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Disable cotire on travis

Browse source 
Make some workarounds for clang because it poorly supports -Wold-style-cast
This commit is contained in:
Nekotekina 2020-02-21 15:39:40 +03:00
parent 972e0ab31d
commit 5e75a0c497
6 changed files with 37 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.travis/build-linux.bash
View file

@ -26,7 +26,7 @@ else
export CXX=${CLANGXX_BINARY} export CXX=${CLANGXX_BINARY}
fi fi
cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_LLVM_SUBMODULE=OFF -DLLVM_DIR=llvmlibs/lib/cmake/llvm/ -DUSE_NATIVE_INSTRUCTIONS=OFF -G Ninja cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_LLVM_SUBMODULE=OFF -DUSE_COTIRE=OFF -DLLVM_DIR=llvmlibs/lib/cmake/llvm/ -DUSE_NATIVE_INSTRUCTIONS=OFF -G Ninja
ninja; build_status=$?; ninja; build_status=$?;

1
rpcs3/Emu/Audio/FAudio/FAudioBackend.cpp
View file

@ -2,6 +2,7 @@
#error "FAudio support disabled but still being built." #error "FAudio support disabled but still being built."
#endif #endif
#include "stdafx.h"
#include "FAudioBackend.h" #include "FAudioBackend.h"
#include "Emu/system_config.h" #include "Emu/system_config.h"
#include "Emu/System.h" #include "Emu/System.h"

5
rpcs3/Emu/Cell/PPUInterpreter.cpp
View file

@ -10,6 +10,11 @@
#include <cmath> #include <cmath>
#include <atomic> #include <atomic>
#if !defined(_MSC_VER) && defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wold-style-cast"
#endif
#if defined(_MSC_VER) #if defined(_MSC_VER)
#define SSSE3_FUNC #define SSSE3_FUNC
#else #else

10
rpcs3/Emu/Cell/SPUInterpreter.cpp
View file

@ -10,6 +10,11 @@
#include <cmath> #include <cmath>
#include <cfenv> #include <cfenv>
#if !defined(_MSC_VER) && defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wold-style-cast"
#endif
// Compare 16 packed unsigned bytes (greater than) // Compare 16 packed unsigned bytes (greater than)
inline __m128i sse_cmpgt_epu8(__m128i A, __m128i B) inline __m128i sse_cmpgt_epu8(__m128i A, __m128i B)
{ {
@ -550,6 +555,11 @@ bool spu_interpreter::GBB(spu_thread& spu, spu_opcode_t op)
return true; return true;
} }
#ifndef _MSC_VER
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wold-style-cast"
#endif
bool spu_interpreter::FSM(spu_thread& spu, spu_opcode_t op) bool spu_interpreter::FSM(spu_thread& spu, spu_opcode_t op)
{ {
const auto bits = _mm_shuffle_epi32(spu.gpr[op.ra].vi, 0xff); const auto bits = _mm_shuffle_epi32(spu.gpr[op.ra].vi, 0xff);

30
rpcs3/Emu/Cell/lv2/sys_net.cpp
View file

@ -476,8 +476,8 @@ error_code sys_net_bnet_accept(ppu_thread& ppu, s32 s, vm::ptr<sys_net_sockaddr>
paddr->sin_len = sizeof(sys_net_sockaddr_in); paddr->sin_len = sizeof(sys_net_sockaddr_in);
paddr->sin_family = SYS_NET_AF_INET; paddr->sin_family = SYS_NET_AF_INET;
paddr->sin_port = ntohs(reinterpret_cast<struct sockaddr_in*>(&native_addr)->sin_port); paddr->sin_port = std::bit_cast<be_t<u16>, u16>(reinterpret_cast<struct sockaddr_in*>(&native_addr)->sin_port);
paddr->sin_addr = ntohl(reinterpret_cast<struct sockaddr_in*>(&native_addr)->sin_addr.s_addr); paddr->sin_addr = std::bit_cast<be_t<u32>, u32>(reinterpret_cast<struct sockaddr_in*>(&native_addr)->sin_addr.s_addr);
paddr->sin_zero = 0; paddr->sin_zero = 0;
} }
@ -501,8 +501,8 @@ error_code sys_net_bnet_bind(ppu_thread& ppu, s32 s, vm::cptr<sys_net_sockaddr>
::sockaddr_in name{}; ::sockaddr_in name{};
name.sin_family = AF_INET; name.sin_family = AF_INET;
name.sin_port = htons(psa_in->sin_port); name.sin_port = std::bit_cast<u16>(psa_in->sin_port);
name.sin_addr.s_addr = htonl(psa_in->sin_addr); name.sin_addr.s_addr = std::bit_cast<u32>(psa_in->sin_addr);
::socklen_t namelen = sizeof(name); ::socklen_t namelen = sizeof(name);
const auto sock = idm::check<lv2_socket>(s, [&](lv2_socket& sock) -> sys_net_error const auto sock = idm::check<lv2_socket>(s, [&](lv2_socket& sock) -> sys_net_error
@ -541,8 +541,8 @@ error_code sys_net_bnet_connect(ppu_thread& ppu, s32 s, vm::ptr<sys_net_sockaddr
s32 result = 0; s32 result = 0;
::sockaddr_in name{}; ::sockaddr_in name{};
name.sin_family = AF_INET; name.sin_family = AF_INET;
name.sin_port = htons(psa_in->sin_port); name.sin_port = std::bit_cast<u16>(psa_in->sin_port);
name.sin_addr.s_addr = htonl(psa_in->sin_addr); name.sin_addr.s_addr = std::bit_cast<u32>(psa_in->sin_addr);
::socklen_t namelen = sizeof(name); ::socklen_t namelen = sizeof(name);
const auto sock = idm::check<lv2_socket>(s, [&](lv2_socket& sock) const auto sock = idm::check<lv2_socket>(s, [&](lv2_socket& sock)
@ -552,7 +552,7 @@ error_code sys_net_bnet_connect(ppu_thread& ppu, s32 s, vm::ptr<sys_net_sockaddr
if (addr->sa_family == 0 && !psa_in->sin_port && !psa_in->sin_addr) if (addr->sa_family == 0 && !psa_in->sin_port && !psa_in->sin_addr)
{ {
// Hack for DNS (8.8.8.8:53) // Hack for DNS (8.8.8.8:53)
name.sin_port = htons(53); name.sin_port = std::bit_cast<u16, be_t<u16>>(53);
name.sin_addr.s_addr = 0x08080808; name.sin_addr.s_addr = 0x08080808;
// Overwrite arg (probably used to validate recvfrom addr) // Overwrite arg (probably used to validate recvfrom addr)
@ -714,8 +714,8 @@ error_code sys_net_bnet_getpeername(ppu_thread& ppu, s32 s, vm::ptr<sys_net_sock
paddr->sin_len = sizeof(sys_net_sockaddr_in); paddr->sin_len = sizeof(sys_net_sockaddr_in);
paddr->sin_family = SYS_NET_AF_INET; paddr->sin_family = SYS_NET_AF_INET;
paddr->sin_port = ntohs(reinterpret_cast<struct sockaddr_in*>(&native_addr)->sin_port); paddr->sin_port = std::bit_cast<be_t<u16>, u16>(reinterpret_cast<struct sockaddr_in*>(&native_addr)->sin_port);
paddr->sin_addr = ntohl(reinterpret_cast<struct sockaddr_in*>(&native_addr)->sin_addr.s_addr); paddr->sin_addr = std::bit_cast<be_t<u32>, u32>(reinterpret_cast<struct sockaddr_in*>(&native_addr)->sin_addr.s_addr);
paddr->sin_zero = 0; paddr->sin_zero = 0;
return {}; return {};
} }
@ -762,8 +762,8 @@ error_code sys_net_bnet_getsockname(ppu_thread& ppu, s32 s, vm::ptr<sys_net_sock
paddr->sin_len = sizeof(sys_net_sockaddr_in); paddr->sin_len = sizeof(sys_net_sockaddr_in);
paddr->sin_family = SYS_NET_AF_INET; paddr->sin_family = SYS_NET_AF_INET;
paddr->sin_port = ntohs(reinterpret_cast<struct sockaddr_in*>(&native_addr)->sin_port); paddr->sin_port = std::bit_cast<be_t<u16>, u16>(reinterpret_cast<struct sockaddr_in*>(&native_addr)->sin_port);
paddr->sin_addr = ntohl(reinterpret_cast<struct sockaddr_in*>(&native_addr)->sin_addr.s_addr); paddr->sin_addr = std::bit_cast<be_t<u32>, u32>(reinterpret_cast<struct sockaddr_in*>(&native_addr)->sin_addr.s_addr);
paddr->sin_zero = 0; paddr->sin_zero = 0;
return {}; return {};
} }
@ -1138,8 +1138,8 @@ error_code sys_net_bnet_recvfrom(ppu_thread& ppu, s32 s, vm::ptr<void> buf, u32
paddr->sin_len = sizeof(sys_net_sockaddr_in); paddr->sin_len = sizeof(sys_net_sockaddr_in);
paddr->sin_family = SYS_NET_AF_INET; paddr->sin_family = SYS_NET_AF_INET;
paddr->sin_port = ntohs(reinterpret_cast<struct sockaddr_in*>(&native_addr)->sin_port); paddr->sin_port = std::bit_cast<be_t<u16>, u16>(reinterpret_cast<struct sockaddr_in*>(&native_addr)->sin_port);
paddr->sin_addr = ntohl(reinterpret_cast<struct sockaddr_in*>(&native_addr)->sin_addr.s_addr); paddr->sin_addr = std::bit_cast<be_t<u32>, u32>(reinterpret_cast<struct sockaddr_in*>(&native_addr)->sin_addr.s_addr);
paddr->sin_zero = 0; paddr->sin_zero = 0;
} }
@ -1195,8 +1195,8 @@ error_code sys_net_bnet_sendto(ppu_thread& ppu, s32 s, vm::cptr<void> buf, u32 l
if (addr) if (addr)
{ {
name.sin_family = AF_INET; name.sin_family = AF_INET;
name.sin_port = htons(psa_in->sin_port); name.sin_port = std::bit_cast<u16>(psa_in->sin_port);
name.sin_addr.s_addr = htonl(psa_in->sin_addr); name.sin_addr.s_addr = std::bit_cast<u32>(psa_in->sin_addr);
} }
::socklen_t namelen = sizeof(name); ::socklen_t namelen = sizeof(name);

5
rpcs3/Emu/RSX/Common/BufferUtils.cpp
View file

@ -8,6 +8,11 @@
#define DEBUG_VERTEX_STREAMING 0 #define DEBUG_VERTEX_STREAMING 0
#if !defined(_MSC_VER) && defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wold-style-cast"
#endif
#if defined(_MSC_VER) #if defined(_MSC_VER)
#define SSSE3_FUNC #define SSSE3_FUNC
#define SSE4_1_FUNC #define SSE4_1_FUNC