fix for stack corruption caused by certain DSP LLE JIT ABI calls.

if you were getting crashes or freezes as a result of using the "DSP LLE on Thread" option, this might fix that.
This commit is contained in:
nitsuja 2012-01-07 20:46:41 -08:00
parent b33be736cd
commit 9ab69febe5

View file

@ -189,7 +189,7 @@ unsigned int XEmitter::ABI_GetAlignedFrameSize(unsigned int frameSize) {
#ifdef __GNUC__ #ifdef __GNUC__
(frameSize + 15) & -16; (frameSize + 15) & -16;
#else #else
frameSize; (frameSize + 3) & -4;
#endif #endif
return alignedSize; return alignedSize;
} }
@ -200,16 +200,15 @@ void XEmitter::ABI_AlignStack(unsigned int frameSize) {
// Linux requires the stack to be 16-byte aligned before calls that put SSE // Linux requires the stack to be 16-byte aligned before calls that put SSE
// vectors on the stack, but since we do not keep track of which calls do that, // vectors on the stack, but since we do not keep track of which calls do that,
// it is effectively every call as well. // it is effectively every call as well.
// Windows binaries compiled with MSVC do not have such a restriction, but I // Windows binaries compiled with MSVC do not have such a restriction*, but I
// expect that GCC on Windows acts the same as GCC on Linux in this respect. // expect that GCC on Windows acts the same as GCC on Linux in this respect.
// It would be nice if someone could verify this. // It would be nice if someone could verify this.
#ifdef __GNUC__ // *However, the MSVC optimizing compiler assumes a 4-byte-aligned stack at times.
unsigned int fillSize = unsigned int fillSize =
ABI_GetAlignedFrameSize(frameSize) - (frameSize + 4); ABI_GetAlignedFrameSize(frameSize) - (frameSize + 4);
if (fillSize != 0) { if (fillSize != 0) {
SUB(32, R(ESP), Imm8(fillSize)); SUB(32, R(ESP), Imm8(fillSize));
} }
#endif
} }
void XEmitter::ABI_RestoreStack(unsigned int frameSize) { void XEmitter::ABI_RestoreStack(unsigned int frameSize) {