nintendo-emulators/desmume
1
0
Fork 0
mirror of https://github.com/TASEmulators/desmume synced 2025-10-05 16:22:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix compiling on newer GCCs that are averse to referencing variables on an unexpected memory alignment.

Browse Source
This commit is contained in:
rogerman
2025-08-09 17:51:53 -07:00
parent 81683cb097
commit 82761798cc
2 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
desmume/src/GPU.cpp
View File

@@ -904,19 +904,15 @@ void GPUEngineBase::UpdatePropertiesWithoutRender(const u16 l)
if ( this->_isBGLayerShown[GPULayerID_BG2] &&
((this->_BGLayer[GPULayerID_BG2].baseType == BGType_Affine) || (this->_BGLayer[GPULayerID_BG2].baseType == BGType_AffineExt)) )
{
IOREG_BG2Parameter &BG2Param = this->_IORegisterMap->BG2Param;
BG2Param.BG2X.value += BG2Param.BG2PB.value;
BG2Param.BG2Y.value += BG2Param.BG2PD.value;
this->_IORegisterMap->BG2Param.BG2X.value += this->_IORegisterMap->BG2Param.BG2PB.value;
this->_IORegisterMap->BG2Param.BG2Y.value += this->_IORegisterMap->BG2Param.BG2PD.value;
}
if ( this->_isBGLayerShown[GPULayerID_BG3] &&
((this->_BGLayer[GPULayerID_BG3].baseType == BGType_Affine) || (this->_BGLayer[GPULayerID_BG3].baseType == BGType_AffineExt)) )
{
IOREG_BG3Parameter &BG3Param = this->_IORegisterMap->BG3Param;
BG3Param.BG3X.value += BG3Param.BG3PB.value;
BG3Param.BG3Y.value += BG3Param.BG3PD.value;
this->_IORegisterMap->BG3Param.BG3X.value += this->_IORegisterMap->BG3Param.BG3PB.value;
this->_IORegisterMap->BG3Param.BG3Y.value += this->_IORegisterMap->BG3Param.BG3PD.value;
}
}
@@ -3495,10 +3491,9 @@ void GPUEngineA::SetDisplayCaptureEnable()
void GPUEngineA::ResetDisplayCaptureEnable()
{
IOREG_DISPCAPCNT &DISPCAPCNT = this->_IORegisterMap->DISPCAPCNT;
if (this->_displayCaptureEnable)
{
DISPCAPCNT.CaptureEnable = 0;
this->_IORegisterMap->DISPCAPCNT.CaptureEnable = 0;
this->_displayCaptureEnable = false;
}
}

24
desmume/src/wifi.cpp
View File

@@ -562,7 +562,9 @@ static void WIFI_triggerIRQ(const WifiIRQ irq)
io.TXBUSY.Beacon = 1;
io.RF_PINS.value = RFPinsLUT[WifiRFStatus3_TXEnabled];
WIFI_TXStart(WifiTXLocIndex_BEACON, io.TXBUF_BEACON);
IOREG_W_TXBUF_LOCATION txBufBeacon = io.TXBUF_BEACON;
WIFI_TXStart(WifiTXLocIndex_BEACON, txBufBeacon);
io.TXBUF_BEACON = txBufBeacon;
}
if(io.LISTENCOUNT.Count == 0)
@@ -1477,25 +1479,33 @@ void WIFI_write16(u32 address, u16 val)
if(TXREQ_SET.Loc1 != 0)
{
io.TXREQ_READ.Loc1 = 1;
WIFI_TXStart(WifiTXLocIndex_LOC1, io.TXBUF_LOC1);
IOREG_W_TXBUF_LOCATION txBufLoc1 = io.TXBUF_LOC1;
WIFI_TXStart(WifiTXLocIndex_LOC1, txBufLoc1);
io.TXBUF_LOC1 = txBufLoc1;
}
if(TXREQ_SET.Cmd != 0)
{
io.TXREQ_READ.Cmd = 1;
WIFI_TXStart(WifiTXLocIndex_CMD, io.TXBUF_CMD);
IOREG_W_TXBUF_LOCATION txBufCmd = io.TXBUF_CMD;
WIFI_TXStart(WifiTXLocIndex_CMD, txBufCmd);
io.TXBUF_CMD = txBufCmd;
}
if(TXREQ_SET.Loc2 != 0)
{
io.TXREQ_READ.Loc2 = 1;
WIFI_TXStart(WifiTXLocIndex_LOC2, io.TXBUF_LOC2);
IOREG_W_TXBUF_LOCATION txBufLoc2 = io.TXBUF_LOC2;
WIFI_TXStart(WifiTXLocIndex_LOC2, txBufLoc2);
io.TXBUF_LOC2 = txBufLoc2;
}
if(TXREQ_SET.Loc3 != 0)
{
io.TXREQ_READ.Loc3 = 1;
WIFI_TXStart(WifiTXLocIndex_LOC3, io.TXBUF_LOC3);
IOREG_W_TXBUF_LOCATION txBufLoc3 = io.TXBUF_LOC3;
WIFI_TXStart(WifiTXLocIndex_LOC3, txBufLoc3);
io.TXBUF_LOC3 = txBufLoc3;
}
if(TXREQ_SET.UNKNOWN1 != 0)
@@ -4650,7 +4660,9 @@ void WifiHandler::CommTrigger()
if(wifi.cmdCount_u32 == 0)
{
WIFI_TXStart(WifiTXLocIndex_CMD, io.TXBUF_CMD);
IOREG_W_TXBUF_LOCATION txBufCmd = io.TXBUF_CMD;
WIFI_TXStart(WifiTXLocIndex_CMD, txBufCmd);
io.TXBUF_CMD = txBufCmd;
}
}
}