ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Misc: Purge OFFSETOF

This commit is contained in:
Stenzek 2023-12-22 20:44:03 +10:00 committed by Connor McLaughlin
parent b844bb1268
commit 1dac754ca3
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/Pcsx2Defs.h
View File

@ -24,14 +24,9 @@
#include "Pcsx2Types.h"
#include <cstddef>
#include <cassert>
#include "common/emitter/x86_intrin.h"
// The C++ standard doesn't allow `offsetof` to be used on non-constant values (e.g. `offsetof(class, field[i])`)
// Use this in those situations
#define OFFSETOF(a, b) (reinterpret_cast<size_t>(&(static_cast<a*>(0)->b)))
// --------------------------------------------------------------------------------------
// Dev / Debug conditionals - Consts for using if() statements instead of uglier #ifdef.
// --------------------------------------------------------------------------------------

12
pcsx2/GS/Renderers/SW/GSDrawScanlineCodeGenerator.all.cpp
View File

@ -1,5 +1,5 @@
/* PCSX2 - PS2 Emulator for PCs
* Copyright (C) 2002-2021 PCSX2 Dev Team
* Copyright (C) 2002-2023 PCSX2 Dev Team
*
* PCSX2 is free software: you can redistribute it and/or modify it under the terms
* of the GNU Lesser General Public License as published by the Free Software Found-
@ -19,12 +19,18 @@
#include "GSVertexSW.h"
#include "common/Perf.h"
#include <cstddef>
MULTI_ISA_UNSHARED_IMPL;
using namespace Xbyak;
#ifdef __clang__
#pragma clang diagnostic ignored "-Winvalid-offsetof" // We know what we're doing.
#endif
#define _rip_const(cptr) ptr[rip + ((char*)(cptr))]
#define _rip_local(field) ptr[_m_local + OFFSETOF(GSScanlineLocalData, field)]
#define _rip_global(field) ptr[_m_local__gd + OFFSETOF(GSScanlineGlobalData, field)]
#define _rip_local(field) ptr[_m_local + offsetof(GSScanlineLocalData, field)]
#define _rip_global(field) ptr[_m_local__gd + offsetof(GSScanlineGlobalData, field)]
/// On AVX, does a v-prefixed separate destination operation
/// On SSE, moves src1 into dst using movdqa, then does the operation

6
pcsx2/GS/Renderers/SW/GSSetupPrimCodeGenerator.all.cpp
View File

@ -1,5 +1,5 @@
/* PCSX2 - PS2 Emulator for PCs
* Copyright (C) 2002-2021 PCSX2 Dev Team
* Copyright (C) 2002-2023 PCSX2 Dev Team
*
* PCSX2 is free software: you can redistribute it and/or modify it under the terms
* of the GNU Lesser General Public License as published by the Free Software Found-
@ -18,10 +18,12 @@
#include "GSVertexSW.h"
#include "common/Perf.h"
#include <cstddef>
MULTI_ISA_UNSHARED_IMPL;
using namespace Xbyak;
#define _rip_local(field) (ptr[_m_local + OFFSETOF(GSScanlineLocalData, field)])
#define _rip_local(field) (ptr[_m_local + offsetof(GSScanlineLocalData, field)])
#define _64_m_local _64_t0