Skip to content

psyqo: use portable inline and no_unique_address spellings #2049

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nicolasnoble wants to merge 1 commit into
base: main
Choose a base branch
from
Open

psyqo: use portable inline and no_unique_address spellings #2049

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/mips/common/hardware/spu.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ struct SPUVoice {
#define SPU_VOL_EXT_LEFT HW_U16(0x1f801db4)
#define SPU_VOL_EXT_RIGHT HW_U16(0x1f801db6)

static __inline__ void muteSpu() {
static inline void muteSpu() {
SPU_REVERB_RIGHT = 0;
SPU_REVERB_LEFT = 0;
SPU_VOL_MAIN_RIGHT = 0;
Expand Down
12 changes: 10 additions & 2 deletions src/mips/psyqo/vector.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,14 @@ SOFTWARE.
#include "psyqo/fixed-point.hh"
#include "psyqo/primitives/common.hh"

// MSVC and clang-cl target the MSVC ABI, which ignores the standard
// [[no_unique_address]]; they need the vendor spelling to elide empty members.
#if __has_cpp_attribute(msvc::no_unique_address)
#define PSYQO_NO_UNIQUE_ADDR [[msvc::no_unique_address]]
#else
#define PSYQO_NO_UNIQUE_ADDR [[no_unique_address]]
#endif

namespace psyqo {

template <unsigned N, unsigned precisionBits = 12, std::integral T = int32_t>
Expand All @@ -40,9 +48,9 @@ struct Vector {
typedef FixedPoint<precisionBits, T> FixedPointType;
FixedPoint<precisionBits, T> x, y;
struct EmptyZ {};
[[no_unique_address]] std::conditional_t<(N > 2), FixedPoint<precisionBits, T>, EmptyZ> z;
PSYQO_NO_UNIQUE_ADDR std::conditional_t<(N > 2), FixedPoint<precisionBits, T>, EmptyZ> z;
struct EmptyW {};
[[no_unique_address]] std::conditional_t<(N > 3), FixedPoint<precisionBits, T>, EmptyW> w;
PSYQO_NO_UNIQUE_ADDR std::conditional_t<(N > 3), FixedPoint<precisionBits, T>, EmptyW> w;
constexpr FixedPointType& get(unsigned i) {
if constexpr (N == 2) {
return (i == 0) ? x : y;
Expand Down
Loading