Merge git://github.com/notaz/pcsx_rearmed

1 files changed, 12 insertions, 2 deletions

diff --git a/libpcsxcore/r3000a.h b/libpcsxcore/r3000a.h
index 76f42bc..13aaa59 100644
--- a/libpcsxcore/r3000a.h
+++ b/libpcsxcore/r3000a.h
@@ -163,11 +163,21 @@ enum {
 	PSXINT_COUNT
 };
 
+typedef struct psxCP2Regs {
+	psxCP2Data CP2D; 	/* Cop2 data registers */
+	psxCP2Ctrl CP2C; 	/* Cop2 control registers */
+} psxCP2Regs;
+
 typedef struct {
 	psxGPRRegs GPR;		/* General Purpose Registers */
 	psxCP0Regs CP0;		/* Coprocessor0 Registers */
-	psxCP2Data CP2D; 	/* Cop2 data registers */
-	psxCP2Ctrl CP2C; 	/* Cop2 control registers */
+	union {
+		struct {
+			psxCP2Data CP2D; 	/* Cop2 data registers */
+			psxCP2Ctrl CP2C; 	/* Cop2 control registers */
+		};
+		psxCP2Regs CP2;
+	};
     u32 pc;				/* Program counter */
     u32 code;			/* The instruction */
 	u32 cycle;