piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-29 00:59:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

specify custom brace style to fix unions

Browse Source 
BreakBeforeBraces: Allman apparently includes all styles,
except for AfterUnion (which is false) when using clang-format -dump-config
This commit is contained in:
BhaaL
2017-01-04 12:45:40 +01:00
parent 41101be545
commit 23d99f2f2c
47 changed files with 375 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/Core/ActionReplay.cpp
View File

@ -89,7 +89,8 @@ static bool s_disable_logging = false;
struct ARAddr
{
union {
union
{
u32 address;
struct
{

3
Source/Core/Core/Boot/ElfTypes.h
View File

@ -264,7 +264,8 @@ struct Elf32_Rela
struct Elf32_Dyn
{
s32 d_tag;
union {
union
{
u32 d_val;
u32 d_ptr;
} d_un;

9
Source/Core/Core/DSP/DSPCore.h
View File

@ -225,7 +225,8 @@ struct DSP_Regs
u16 cr;
u16 sr;
union {
union
{
u64 val;
struct
{
@ -236,7 +237,8 @@ struct DSP_Regs
};
} prod;
union {
union
{
u32 val;
struct
{
@ -245,7 +247,8 @@ struct DSP_Regs
};
} ax[2];
union {
union
{
u64 val;
struct
{

6
Source/Core/Core/FifoPlayer/FifoFileStruct.h
View File

@ -17,7 +17,8 @@ enum
#pragma pack(push, 4)
union FileHeader {
union FileHeader
{
struct
{
u32 fileId;
@ -40,7 +41,8 @@ union FileHeader {
u32 rawData[32];
};
union FileFrameInfo {
union FileFrameInfo
{
struct
{
u64 fifoDataOffset;

6
Source/Core/Core/HW/AudioInterface.cpp
View File

@ -70,7 +70,8 @@ enum
};
// AI Control Register
union AICR {
union AICR
{
AICR() { hex = 0; }
AICR(u32 _hex) { hex = _hex; }
struct
@ -90,7 +91,8 @@ union AICR {
};
// AI Volume Register
union AIVR {
union AIVR
{
AIVR() { hex = 0; }
struct
{

9
Source/Core/Core/HW/DSP.cpp
View File

@ -65,7 +65,8 @@ enum
};
// UARAMCount
union UARAMCount {
union UARAMCount
{
u32 Hex;
struct
{
@ -75,7 +76,8 @@ union UARAMCount {
};
// Blocks are 32 bytes.
union UAudioDMAControl {
union UAudioDMAControl
{
u16 Hex;
struct
{
@ -139,7 +141,8 @@ static AudioDMA g_audioDMA;
static ARAM_DMA g_arDMA;
UDSPControl g_dspState;
union ARAM_Info {
union ARAM_Info
{
u16 Hex;
struct
{

3
Source/Core/Core/HW/DSP.h
View File

@ -31,7 +31,8 @@ enum
// UDSPControl
constexpr u16 DSP_CONTROL_MASK = 0x0C07;
union UDSPControl {
union UDSPControl
{
u16 Hex;
struct
{

3
Source/Core/Core/HW/DSPHLE/UCodes/AXStructs.h
View File

@ -271,7 +271,8 @@ struct PBBiquadFilter
u16 a2;
};
union PBInfImpulseResponseWM {
union PBInfImpulseResponseWM
{
PBLowPassFilter lpf;
PBBiquadFilter biquad;
};

3
Source/Core/Core/HW/DSPHLE/UCodes/AXVoice.h
View File

@ -41,7 +41,8 @@ namespace
#define HILO_TO_32(name) ((name##_hi << 16) | name##_lo)
// Used to pass a large amount of buffers to the mixing function.
union AXBuffers {
union AXBuffers
{
struct
{
int* left;

24
Source/Core/Core/HW/DVDInterface.cpp
View File

@ -108,7 +108,8 @@ enum
};
// DI Status Register
union UDISR {
union UDISR
{
u32 Hex;
struct
{
@ -126,7 +127,8 @@ union UDISR {
};
// DI Cover Register
union UDICVR {
union UDICVR
{
u32 Hex;
struct
{
@ -139,7 +141,8 @@ union UDICVR {
UDICVR(u32 _hex) { Hex = _hex; }
};
union UDICMDBUF {
union UDICMDBUF
{
u32 Hex;
struct
{
@ -151,7 +154,8 @@ union UDICMDBUF {
};
// DI DMA Address Register
union UDIMAR {
union UDIMAR
{
u32 Hex;
struct
{
@ -166,7 +170,8 @@ union UDIMAR {
};
// DI DMA Address Length Register
union UDILENGTH {
union UDILENGTH
{
u32 Hex;
struct
{
@ -181,7 +186,8 @@ union UDILENGTH {
};
// DI DMA Control Register
union UDICR {
union UDICR
{
u32 Hex;
struct
{
@ -192,7 +198,8 @@ union UDICR {
};
};
union UDIIMMBUF {
union UDIIMMBUF
{
u32 Hex;
struct
{
@ -204,7 +211,8 @@ union UDIIMMBUF {
};
// DI Config Register
union UDICFG {
union UDICFG
{
u32 Hex;
struct
{

6
Source/Core/Core/HW/EXI_Channel.h
View File

@ -29,7 +29,8 @@ private:
};
// EXI Status Register - "Channel Parameter Register"
union UEXI_STATUS {
union UEXI_STATUS
{
u32 Hex;
// DO NOT obey the warning and give this struct a name. Things will fail.
struct
@ -55,7 +56,8 @@ private:
};
// EXI Control Register
union UEXI_CONTROL {
union UEXI_CONTROL
{
u32 Hex;
struct
{

3
Source/Core/Core/HW/EXI_DeviceAD16.h
View File

@ -24,7 +24,8 @@ private:
read = 0xa2
};
union UAD16Reg {
union UAD16Reg
{
u32 U32;
u32 U8[4];
};

3
Source/Core/Core/HW/EXI_DeviceMic.h
View File

@ -38,7 +38,8 @@ private:
u32 m_position;
int command;
union UStatus {
union UStatus
{
u16 U16;
u8 U8[2];
struct

18
Source/Core/Core/HW/MemoryInterface.cpp
View File

@ -49,7 +49,8 @@ enum
MI_UNKNOWN2 = 0x05A,
};
union MIRegion {
union MIRegion
{
u32 hex;
struct
{
@ -58,7 +59,8 @@ union MIRegion {
};
};
union MIProtType {
union MIProtType
{
u16 hex;
struct
{
@ -70,7 +72,8 @@ union MIProtType {
};
};
union MIIRQMask {
union MIIRQMask
{
u16 hex;
struct
{
@ -83,7 +86,8 @@ union MIIRQMask {
};
};
union MIIRQFlag {
union MIIRQFlag
{
u16 hex;
struct
{
@ -96,7 +100,8 @@ union MIIRQFlag {
};
};
union MIProtAddr {
union MIProtAddr
{
u32 hex;
struct
{
@ -111,7 +116,8 @@ union MIProtAddr {
};
};
union MITimer {
union MITimer
{
u32 hex;
struct
{

21
Source/Core/Core/HW/SI.cpp
View File

@ -59,7 +59,8 @@ enum
};
// SI Channel Output
union USIChannelOut {
union USIChannelOut
{
u32 Hex;
struct
{
@ -71,7 +72,8 @@ union USIChannelOut {
};
// SI Channel Input High u32
union USIChannelIn_Hi {
union USIChannelIn_Hi
{
u32 Hex;
struct
{
@ -85,7 +87,8 @@ union USIChannelIn_Hi {
};
// SI Channel Input Low u32
union USIChannelIn_Lo {
union USIChannelIn_Lo
{
u32 Hex;
struct
{
@ -106,7 +109,8 @@ struct SSIChannel
};
// SI Poll: Controls how often a device is polled
union USIPoll {
union USIPoll
{
u32 Hex;
struct
{
@ -125,7 +129,8 @@ union USIPoll {
};
// SI Communication Control Status Register
union USIComCSR {
union USIComCSR
{
u32 Hex;
struct
{
@ -151,7 +156,8 @@ union USIComCSR {
};
// SI Status Register
union USIStatusReg {
union USIStatusReg
{
u32 Hex;
struct
{
@ -190,7 +196,8 @@ union USIStatusReg {
};
// SI EXI Clock Count
union USIEXIClockCount {
union USIEXIClockCount
{
u32 Hex;
struct
{

3
Source/Core/Core/HW/SI_DeviceGCController.h
View File

@ -41,7 +41,8 @@ protected:
CMD_WRITE = 0x40
};
union UCommand {
union UCommand
{
u32 Hex;
struct
{

3
Source/Core/Core/HW/SI_DeviceKeyboard.h
View File

@ -26,7 +26,8 @@ protected:
CMD_POLL = 0x54
};
union UCommand {
union UCommand
{
u32 Hex;
struct
{

6
Source/Core/Core/HW/Sram.h
View File

@ -37,7 +37,8 @@ distribution.
#include "Common/CommonTypes.h"
#pragma pack(push, 1)
union SRAMFlags {
union SRAMFlags
{
u8 Hex;
struct
{
@ -53,7 +54,8 @@ union SRAMFlags {
};
};
union SRAM {
union SRAM
{
u8 p_SRAM[64];
struct // Stored configuration value from the system SRAM area
{

48
Source/Core/Core/HW/VideoInterface.h
View File

@ -79,7 +79,8 @@ enum
// VI_INTERLACE = 0x850, // ??? MYSTERY OLD CODE
};
union UVIVerticalTimingRegister {
union UVIVerticalTimingRegister
{
u16 Hex;
struct
{
@ -91,7 +92,8 @@ union UVIVerticalTimingRegister {
UVIVerticalTimingRegister() { Hex = 0; }
};
union UVIDisplayControlRegister {
union UVIDisplayControlRegister
{
u16 Hex;
struct
{
@ -109,7 +111,8 @@ union UVIDisplayControlRegister {
UVIDisplayControlRegister() { Hex = 0; }
};
union UVIHorizontalTiming0 {
union UVIHorizontalTiming0
{
u32 Hex;
struct
{
@ -126,7 +129,8 @@ union UVIHorizontalTiming0 {
};
};
union UVIHorizontalTiming1 {
union UVIHorizontalTiming1
{
u32 Hex;
struct
{
@ -142,7 +146,8 @@ union UVIHorizontalTiming1 {
};
// Exists for both odd and even fields
union UVIVBlankTimingRegister {
union UVIVBlankTimingRegister
{
u32 Hex;
struct
{
@ -158,7 +163,8 @@ union UVIVBlankTimingRegister {
};
// Exists for both odd and even fields
union UVIBurstBlankingRegister {
union UVIBurstBlankingRegister
{
u32 Hex;
struct
{
@ -173,7 +179,8 @@ union UVIBurstBlankingRegister {
};
};
union UVIFBInfoRegister {
union UVIFBInfoRegister
{
u32 Hex;
struct
{
@ -192,7 +199,8 @@ union UVIFBInfoRegister {
};
// VI Interrupt Register
union UVIInterruptRegister {
union UVIInterruptRegister
{
u32 Hex;
struct
{
@ -210,7 +218,8 @@ union UVIInterruptRegister {
};
};
union UVILatchRegister {
union UVILatchRegister
{
u32 Hex;
struct
{
@ -226,7 +235,8 @@ union UVILatchRegister {
};
};
union PictureConfigurationRegister {
union PictureConfigurationRegister
{
u16 Hex;
struct
{
@ -236,7 +246,8 @@ union PictureConfigurationRegister {
};
};
union UVIHorizontalScaling {
union UVIHorizontalScaling
{
u16 Hex;
struct
{
@ -250,7 +261,8 @@ union UVIHorizontalScaling {
};
// Used for tables 0-2
union UVIFilterCoefTable3 {
union UVIFilterCoefTable3
{
u32 Hex;
struct
{
@ -266,7 +278,8 @@ union UVIFilterCoefTable3 {
};
// Used for tables 3-6
union UVIFilterCoefTable4 {
union UVIFilterCoefTable4
{
u32 Hex;
struct
{
@ -288,7 +301,8 @@ struct SVIFilterCoefTables
};
// Debug video mode only, probably never used in Dolphin...
union UVIBorderBlankRegister {
union UVIBorderBlankRegister
{
u32 Hex;
struct
{
@ -304,7 +318,8 @@ union UVIBorderBlankRegister {
};
// ntsc-j and component cable bits
union UVIDTVStatus {
union UVIDTVStatus
{
u16 Hex;
struct
{
@ -314,7 +329,8 @@ union UVIDTVStatus {
};
};
union UVIHorizontalStepping {
union UVIHorizontalStepping
{
u16 Hex;
struct
{

18
Source/Core/Core/HW/WiimoteEmu/WiimoteHid.h
View File

@ -87,7 +87,8 @@ struct wm_ir_extended
};
// Nunchuk
union wm_nc_core {
union wm_nc_core
{
u8 hex;
struct
@ -102,7 +103,8 @@ union wm_nc_core {
};
};
union wm_nc {
union wm_nc
{
struct
{
// joystick x, y
@ -137,7 +139,8 @@ union wm_nc {
} passthrough_data;
};
union wm_classic_extension_buttons {
union wm_classic_extension_buttons
{
u16 hex;
struct
@ -181,7 +184,8 @@ union wm_classic_extension_buttons {
} passthrough_data;
};
union wm_classic_extension {
union wm_classic_extension
{
// lx/ly/lz; left joystick
// rx/ry/rz; right joystick
// lt; left trigger
@ -283,7 +287,8 @@ struct wm_turntable_extension
u8 ltable1 : 5;
u8 dial1 : 3;
union {
union
{
u16 ltable2 : 1;
u16 bt; // buttons
};
@ -314,7 +319,8 @@ struct wm_motionplus_data
struct wm_report
{
u8 wm;
union {
union
{
u8 data[0];
struct
{

3
Source/Core/Core/IPC_HLE/WII_Socket.h
View File

@ -174,7 +174,8 @@ class WiiSocket
{
u32 _CommandAddress;
bool is_ssl;
union {
union
{
NET_IOCTL net_type;
SSL_IOCTL ssl_type;
};

3
Source/Core/Core/IPC_HLE/hci.h
View File

@ -2575,7 +2575,8 @@ struct btreq
{
char btr_name[HCI_DEVNAME_SIZE]; /* device name */
union {
union
{
struct
{
bdaddr_t btri_bdaddr; /* device bdaddr */

6
Source/Core/Core/IPC_HLE/l2cap.h
View File

@ -295,7 +295,8 @@ typedef struct
} l2cap_cfg_opt_t;
/* L2CAP configuration option value */
typedef union {
typedef union
{
uint16_t mtu; /* L2CAP_OPT_MTU */
uint16_t flush_timo; /* L2CAP_OPT_FLUSH_TIMO */
l2cap_qos_t qos; /* L2CAP_OPT_QOS */
@ -342,7 +343,8 @@ typedef struct
*/
} l2cap_info_rsp_cp;
typedef union {
typedef union
{
/* L2CAP_CONNLESS_MTU */
struct
{

3
Source/Core/Core/PowerPC/CachedInterpreter.h
View File

@ -42,7 +42,8 @@ private:
Instruction(const ConditionalCallback c, u32 d)
: conditional_callback(c), data(d), type(INSTRUCTION_TYPE_CONDITIONAL){};
union {
union
{
const CommonCallback common_callback;
const ConditionalCallback conditional_callback;
};

54
Source/Core/Core/PowerPC/Gekko.h
View File

@ -11,7 +11,8 @@
// --- Gekko Instruction ---
union UGeckoInstruction {
union UGeckoInstruction
{
u32 hex;
UGeckoInstruction(u32 _hex) : hex(_hex) {}
@ -311,7 +312,8 @@ enum EQuantizeType : u32
};
// GQR Register
union UGQR {
union UGQR
{
BitField<0, 3, EQuantizeType> st_type;
BitField<8, 6, u32> st_scale;
BitField<16, 3, EQuantizeType> ld_type;
@ -324,7 +326,8 @@ union UGQR {
};
// FPU Register
union UFPR {
union UFPR
{
u64 as_u64;
s64 as_s64;
double d;
@ -339,7 +342,8 @@ union UFPR {
#define XER_OV_MASK 1
#define XER_SO_MASK 2
// XER
union UReg_XER {
union UReg_XER
{
struct
{
u32 BYTE_COUNT : 7;
@ -357,7 +361,8 @@ union UReg_XER {
};
// Machine State Register
union UReg_MSR {
union UReg_MSR
{
struct
{
u32 LE : 1;
@ -418,7 +423,8 @@ enum FPSCRExceptionFlag : u32
};
// Floating Point Status and Control Register
union UReg_FPSCR {
union UReg_FPSCR
{
struct
{
// Rounding mode (towards: nearest, zero, +inf, -inf)
@ -484,7 +490,8 @@ union UReg_FPSCR {
};
// Hardware Implementation-Dependent Register 0
union UReg_HID0 {
union UReg_HID0
{
struct
{
u32 NOOPTI : 1;
@ -522,7 +529,8 @@ union UReg_HID0 {
};
// Hardware Implementation-Dependent Register 2
union UReg_HID2 {
union UReg_HID2
{
struct
{
u32 : 16;
@ -547,7 +555,8 @@ union UReg_HID2 {
};
// Hardware Implementation-Dependent Register 4
union UReg_HID4 {
union UReg_HID4
{
struct
{
u32 : 20;
@ -569,7 +578,8 @@ union UReg_HID4 {
};
// SPR1 - Page Table format
union UReg_SPR1 {
union UReg_SPR1
{
u32 Hex;
struct
{
@ -580,7 +590,8 @@ union UReg_SPR1 {
};
// MMCR0 - Monitor Mode Control Register 0 format
union UReg_MMCR0 {
union UReg_MMCR0
{
u32 Hex;
struct
{
@ -603,7 +614,8 @@ union UReg_MMCR0 {
};
// MMCR1 - Monitor Mode Control Register 1 format
union UReg_MMCR1 {
union UReg_MMCR1
{
u32 Hex;
struct
{
@ -614,7 +626,8 @@ union UReg_MMCR1 {
};
// Write Pipe Address Register
union UReg_WPAR {
union UReg_WPAR
{
struct
{
u32 BNE : 1;
@ -628,7 +641,8 @@ union UReg_WPAR {
};
// Direct Memory Access Upper register
union UReg_DMAU {
union UReg_DMAU
{
struct
{
u32 DMA_LEN_U : 5;
@ -641,7 +655,8 @@ union UReg_DMAU {
};
// Direct Memory Access Lower (DMAL) register
union UReg_DMAL {
union UReg_DMAL
{
struct
{
u32 DMA_F : 1;
@ -656,7 +671,8 @@ union UReg_DMAL {
UReg_DMAL() { Hex = 0; }
};
union UReg_BAT_Up {
union UReg_BAT_Up
{
struct
{
u32 VP : 1;
@ -671,7 +687,8 @@ union UReg_BAT_Up {
UReg_BAT_Up() { Hex = 0; }
};
union UReg_BAT_Lo {
union UReg_BAT_Lo
{
struct
{
u32 PP : 2;
@ -686,7 +703,8 @@ union UReg_BAT_Lo {
UReg_BAT_Lo() { Hex = 0; }
};
union UReg_PTE {
union UReg_PTE
{
struct
{
u64 API : 6;

6
Source/Core/Core/PowerPC/MMU.cpp
View File

@ -867,7 +867,8 @@ TranslateResult JitCache_TranslateAddress(u32 address)
#define PTE2_PP(v) ((v)&3)
// Hey! these duplicate a structure in Gekko.h
union UPTE1 {
union UPTE1
{
struct
{
u32 API : 6;
@ -878,7 +879,8 @@ union UPTE1 {
u32 Hex;
};
union UPTE2 {
union UPTE2
{
struct
{
u32 PP : 2;

3
Source/Core/Core/ec_wii.h
View File

@ -68,7 +68,8 @@ private:
u8 boot1_hash[0x14]; // 0x100
u8 common_key[0x10]; // 0x114
u32 ng_id; // 0x124
union {
union
{
struct
{
u8 ng_priv[0x1e]; // 0x128