Make all DMA transferred data packed,aligned(16)

Author: rickgaiser

include/ps2s/dmac.h

@@ -37,7 +37,7 @@ typedef struct tSourceChainTag_t {
     tU64 SPR : 1;
     tU32 opt1;
     tU32 opt2;
-} tSourceChainTag __attribute__((aligned(16)));
+} __attribute__((packed,aligned(16))) tSourceChainTag;
 
 typedef tSourceChainTag tDmaTag;
 

include/ps2s/drawenv.h

@@ -193,34 +193,37 @@ class CDrawEnv {
     inline void operator delete(void* p) { Core::Delete16(p); }
 
 protected:
-    tSourceChainTag SettingsDmaTag;
-    tGifTag SettingsGifTag;
-    GS::tFrame gsrFrame;
-    tU64 FrameAddr;
-    GS::tZbuf gsrZBuf;
-    tU64 ZBufAddr;
-    GS::tXyoffset gsrXYOffset;
-    tU64 XYOffsetAddr;
-    GS::tPrmodecont gsrPrModeCont;
-    tU64 PrModeContAddr;
-    GS::tColclamp gsrColClamp;
-    tU64 ColClampAddr;
-    GS::tTest gsrTest;
-    tU64 TestAddr;
-    GS::tAlpha gsrAlpha;
-    tU64 AlphaAddr;
-    GS::tPabe gsrPABE;
-    tU64 PABEAddr;
-    GS::tFba gsrFBA;
-    tU64 FBAAddr;
-    GS::tDthe gsrDTHE;
-    tU64 DTHEAddr;
-    GS::tDimx gsrDIMX;
-    tU64 DIMXAddr;
-    GS::tScissor gsrScissor;
-    tU64 ScissorAddr;
-    GS::tFogcol gsrFogCol;
-    tU64 FogColAddr;
+    struct {
+        // DMA tag + GIF tag + 13 register settings
+        tSourceChainTag SettingsDmaTag;
+        tGifTag SettingsGifTag;
+        GS::tFrame gsrFrame;
+        tU64 FrameAddr;
+        GS::tZbuf gsrZBuf;
+        tU64 ZBufAddr;
+        GS::tXyoffset gsrXYOffset;
+        tU64 XYOffsetAddr;
+        GS::tPrmodecont gsrPrModeCont;
+        tU64 PrModeContAddr;
+        GS::tColclamp gsrColClamp;
+        tU64 ColClampAddr;
+        GS::tTest gsrTest;
+        tU64 TestAddr;
+        GS::tAlpha gsrAlpha;
+        tU64 AlphaAddr;
+        GS::tPabe gsrPABE;
+        tU64 PABEAddr;
+        GS::tFba gsrFBA;
+        tU64 FBAAddr;
+        GS::tDthe gsrDTHE;
+        tU64 DTHEAddr;
+        GS::tDimx gsrDIMX;
+        tU64 DIMXAddr;
+        GS::tScissor gsrScissor;
+        tU64 ScissorAddr;
+        GS::tFogcol gsrFogCol;
+        tU64 FogColAddr;
+    } __attribute__((packed,aligned(16)));
     tU32 uiNumGSRegs;
 
     CSCDmaPacket GifPacket;
@@ -232,7 +235,7 @@ class CDrawEnv {
 private:
     void InitCommon(GS::tContext context);
 
-} __attribute__((aligned(16)));
+};
 
 /********************************************
     * inline methods

include/ps2s/gs.h

@@ -202,7 +202,7 @@ typedef struct tGifTag_t {
     unsigned long long REGS13 : 4;
     unsigned long long REGS14 : 4;
     unsigned long long REGS15 : 4;
-} tGifTag __attribute__((aligned(16)));
+} __attribute__((packed,aligned(16))) tGifTag;
 
 inline unsigned int
 GS::GetBitsPerPixel(tPSM psm)

include/ps2s/imagepackets.h

@@ -76,24 +76,27 @@ class CImageUploadPkt : protected CVifSCDmaPacket {
 protected:
 private:
     // gs packet to setup the texture image transfer
-    tU128 FirstDmaTag;
-    tGifTag ImageXferSettingsGifTag;
-    GS::tBitbltbuf gsrBitBltBuf;
-    tU64 BitBltBufAddr;
-    GS::tTrxpos gsrTrxPos;
-    tU64 TrxPosAddr;
-    GS::tTrxreg gsrTrxReg;
-    tU64 TrxRegAddr;
-    GS::tTrxdir gsrTrxDir;
-    tU64 TrxDirAddr;
-    tU128 RestOfPacket[15];
+    struct {
+        // DMA tag + GIF tag + 4 register settings (+ 15 rest ?)
+        tU128 FirstDmaTag;
+        tGifTag ImageXferSettingsGifTag;
+        GS::tBitbltbuf gsrBitBltBuf;
+        tU64 BitBltBufAddr;
+        GS::tTrxpos gsrTrxPos;
+        tU64 TrxPosAddr;
+        GS::tTrxreg gsrTrxReg;
+        tU64 TrxRegAddr;
+        GS::tTrxdir gsrTrxDir;
+        tU64 TrxDirAddr;
+        tU128 RestOfPacket[15];
+    } __attribute__((packed,aligned(16)));
 
     tU32 uiNumXferGSRegs;
     tU128* pImage;
 
     void InitCommon(void);
     void BuildXferTags(void);
-} __attribute__((aligned(16)));
+};
 
 /********************************************
  * CClutUploadPkt

include/ps2s/sprite.h

@@ -87,16 +87,19 @@ class CSprite {
 
 protected:
 private:
-    tGifTag DrawGifTag;
-    tU32 Color[4];
-    tTexCoords TexCoords1;
-    tU32 Vertex1[4];
-    tTexCoords TexCoords2;
-    tU32 Vertex2[4];
+    struct {
+        // GIF tag + 5 qwords data
+        tGifTag DrawGifTag;
+        tU32 Color[4];
+        tTexCoords TexCoords1;
+        tU32 Vertex1[4];
+        tTexCoords TexCoords2;
+        tU32 Vertex2[4];
+    } __attribute__((packed,aligned(16)));
 
     CDmaPacket GifPacket;
 
-} __attribute__((aligned(16)));
+};
 
 /********************************************
  * inline methods

include/ps2s/texture.h

@@ -125,18 +125,21 @@ class CTexEnv {
 
 protected:
     // gs packet to setup texture environment
-    tSourceChainTag SettingsDmaTag;
-    tGifTag SettingsGifTag;
-    GS::tTexflush gsrTexflush;
-    tU64 TexflushAddr;
-    GS::tClamp gsrClamp;
-    tU64 ClampAddr;
-    GS::tTex1 gsrTex1;
-    tU64 Tex1Addr;
-    GS::tTex0 gsrTex0;
-    tU64 Tex0Addr;
-    GS::tTexa gsrTexA;
-    tU64 TexAAddr;
+    struct {
+        // DMA tag + GIF tag + 5 register settings
+        tSourceChainTag SettingsDmaTag;
+        tGifTag SettingsGifTag;
+        GS::tTexflush gsrTexflush;
+        tU64 TexflushAddr;
+        GS::tClamp gsrClamp;
+        tU64 ClampAddr;
+        GS::tTex1 gsrTex1;
+        tU64 Tex1Addr;
+        GS::tTex0 gsrTex0;
+        tU64 Tex0Addr;
+        GS::tTexa gsrTexA;
+        tU64 TexAAddr;
+    } __attribute__((packed,aligned(16)));
 
     tU32 uiNumSettingsGSRegs;
     tU32 uiTexPixelWidth, uiTexPixelHeight;
@@ -146,7 +149,7 @@ class CTexEnv {
 private:
     void InitCommon(GS::tContext context);
 
-} __attribute__((aligned(16)));
+};
 
 /********************************************
     * CTexture

src/gs.cpp

@@ -17,8 +17,8 @@ typedef struct {
     tGifTag gt;
     tU64 texFlush;
     tU64 texFlushAddr;
-} tFlushPkt;
-static tFlushPkt FlushPkt __attribute__((aligned(16)));
+} __attribute__((packed,aligned(16))) tFlushPkt;
+static tFlushPkt FlushPkt;
 
 /********************************************
  * functions