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

Core/DSP: Fix improper uses of offsetof 

According to the C standard, an offsetof expression must evaluate to an
address constant, otherwise it's undefined behavior.

Fixes https://bugs.dolphin-emu.org/issues/12409

See also https://gcc.gnu.org/bugzilla/show_bug.cgi?id=95942

There are still improper uses of offsetof (mostly in JitArm64) but
fixing that will take more effort since there's a PPCSTATE_OFF wrapper
macro that is sometimes used with non-array members and sometimes used
with arrays and variable indices... Let's keep that for another PR.
This commit is contained in:
Léo Lam 2021-02-10 01:56:14 +01:00
parent abc5d6c0d2
commit 118b2a3580
No known key found for this signature in database
GPG Key ID: 0DF30F9081000741
2 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/Core/DSP/Jit/x64/DSPEmitter.cpp
View File

@ -494,12 +494,13 @@ Gen::OpArg DSPEmitter::M_SDSP_external_interrupt_waiting()
Gen::OpArg DSPEmitter::M_SDSP_r_st(size_t index)
{
return MDisp(R15, static_cast<int>(offsetof(SDSP, r.st[index])));
return MDisp(R15, static_cast<int>(offsetof(SDSP, r.st) + sizeof(SDSP::r.st[0]) * index));
}
Gen::OpArg DSPEmitter::M_SDSP_reg_stack_ptrs(size_t index)
{
return MDisp(R15, static_cast<int>(offsetof(SDSP, reg_stack_ptrs[index])));
return MDisp(R15, static_cast<int>(offsetof(SDSP, reg_stack_ptrs) +
sizeof(SDSP::reg_stack_ptrs[0]) * index));
}
} // namespace DSP::JIT::x64

33
Source/Core/Core/DSP/Jit/x64/DSPJitRegCache.cpp
View File

@ -30,25 +30,30 @@ static Gen::OpArg GetRegisterPointer(size_t reg)
case DSP_REG_AR1:
case DSP_REG_AR2:
case DSP_REG_AR3:
return MDisp(R15, static_cast<int>(offsetof(SDSP, r.ar[reg - DSP_REG_AR0])));
return MDisp(
R15, static_cast<int>(offsetof(SDSP, r.ar) + sizeof(SDSP::r.ar[0]) * (reg - DSP_REG_AR0)));
case DSP_REG_IX0:
case DSP_REG_IX1:
case DSP_REG_IX2:
case DSP_REG_IX3:
return MDisp(R15, static_cast<int>(offsetof(SDSP, r.ix[reg - DSP_REG_IX0])));
return MDisp(
R15, static_cast<int>(offsetof(SDSP, r.ix) + sizeof(SDSP::r.ix[0]) * (reg - DSP_REG_IX0)));
case DSP_REG_WR0:
case DSP_REG_WR1:
case DSP_REG_WR2:
case DSP_REG_WR3:
return MDisp(R15, static_cast<int>(offsetof(SDSP, r.wr[reg - DSP_REG_WR0])));
return MDisp(
R15, static_cast<int>(offsetof(SDSP, r.wr) + sizeof(SDSP::r.wr[0]) * (reg - DSP_REG_WR0)));
case DSP_REG_ST0:
case DSP_REG_ST1:
case DSP_REG_ST2:
case DSP_REG_ST3:
return MDisp(R15, static_cast<int>(offsetof(SDSP, r.st[reg - DSP_REG_ST0])));
return MDisp(
R15, static_cast<int>(offsetof(SDSP, r.st) + sizeof(SDSP::r.st[0]) * (reg - DSP_REG_ST0)));
case DSP_REG_ACH0:
case DSP_REG_ACH1:
return MDisp(R15, static_cast<int>(offsetof(SDSP, r.ac[reg - DSP_REG_ACH0].h)));
return MDisp(R15, static_cast<int>(offsetof(SDSP, r.ac[0].h) +
sizeof(SDSP::r.ac[0]) * (reg - DSP_REG_ACH0)));
case DSP_REG_CR:
return MDisp(R15, static_cast<int>(offsetof(SDSP, r.cr)));
case DSP_REG_SR:
@ -63,22 +68,28 @@ static Gen::OpArg GetRegisterPointer(size_t reg)
return MDisp(R15, static_cast<int>(offsetof(SDSP, r.prod.m2)));
case DSP_REG_AXL0:
case DSP_REG_AXL1:
return MDisp(R15, static_cast<int>(offsetof(SDSP, r.ax[reg - DSP_REG_AXL0].l)));
return MDisp(R15, static_cast<int>(offsetof(SDSP, r.ax[0].l) +
sizeof(SDSP::r.ax[0]) * (reg - DSP_REG_AXL0)));
case DSP_REG_AXH0:
case DSP_REG_AXH1:
return MDisp(R15, static_cast<int>(offsetof(SDSP, r.ax[reg - DSP_REG_AXH0].h)));
return MDisp(R15, static_cast<int>(offsetof(SDSP, r.ax[0].h) +
sizeof(SDSP::r.ax[0]) * (reg - DSP_REG_AXH0)));
case DSP_REG_ACL0:
case DSP_REG_ACL1:
return MDisp(R15, static_cast<int>(offsetof(SDSP, r.ac[reg - DSP_REG_ACL0].l)));
return MDisp(R15, static_cast<int>(offsetof(SDSP, r.ac[0].l) +
sizeof(SDSP::r.ac[0]) * (reg - DSP_REG_ACL0)));
case DSP_REG_ACM0:
case DSP_REG_ACM1:
return MDisp(R15, static_cast<int>(offsetof(SDSP, r.ac[reg - DSP_REG_ACM0].m)));
return MDisp(R15, static_cast<int>(offsetof(SDSP, r.ac[0].m) +
sizeof(SDSP::r.ac[0]) * (reg - DSP_REG_ACM0)));
case DSP_REG_AX0_32:
case DSP_REG_AX1_32:
return MDisp(R15, static_cast<int>(offsetof(SDSP, r.ax[reg - DSP_REG_AX0_32].val)));
return MDisp(R15, static_cast<int>(offsetof(SDSP, r.ax[0].val) +
sizeof(SDSP::r.ax[0]) * (reg - DSP_REG_AX0_32)));
case DSP_REG_ACC0_64:
case DSP_REG_ACC1_64:
return MDisp(R15, static_cast<int>(offsetof(SDSP, r.ac[reg - DSP_REG_ACC0_64].val)));
return MDisp(R15, static_cast<int>(offsetof(SDSP, r.ac[0].val) +
sizeof(SDSP::r.ac[0]) * (reg - DSP_REG_ACC0_64)));
case DSP_REG_PROD_64:
return MDisp(R15, static_cast<int>(offsetof(SDSP, r.prod.val)));
default: