Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Redo commit 932945d4808e37ba0ca1a953571187f445e24f41 #426

Merged
merged 1 commit into from
May 27, 2014
Merged

Redo commit 932945d4808e37ba0ca1a953571187f445e24f41 #426

merged 1 commit into from
May 27, 2014

Conversation

shuffle2
Copy link
Contributor

0:000> dps dolphin!__xi_a
00000000`00bb5008  00000000`00000000
00000000`00bb5010  00000000`009fbb48 Dolphin!pre_c_init [f:\dd\vctools\crt\crtw32\dllstuff\crtexe.c @ 284]
00000000`00bb5018  00000000`00836330 Dolphin!EnableXSaveWorkaround [c:\src\dolphin\source\core\common\xsaveworkaround.cpp @ 11]
00000000`00bb5020  00000000`009fb8a8 Dolphin!__atonexitinit [f:\dd\vctools\crt\crtw32\dllstuff\atonexit.c @ 63]
0:000> bp Dolphin!WinMainCRTStartup
0:000> g
Breakpoint 0 hit
Dolphin!WinMainCRTStartup:
00000000`009fbc7c 4883ec28        sub     rsp,28h
0:000> ba e 1 MSVCR120!_set_FMA3_enable
0:000> g
Breakpoint 1 hit
MSVCR120!_set_FMA3_enable:
00007ffc`94d31b7c 8b0556060600    mov     eax,dword ptr [MSVCR120!__use_fma3_lib (00007ffc`94d921d8)] ds:00007ffc`94d921d8=00000001
0:000> kn
 # Child-SP          RetAddr           Call Site
00 00000000`0013fee8 00007ffc`94cd27b1 MSVCR120!_set_FMA3_enable [f:\dd\vctools\crt\fpw32\tran\amd64\fma3_available.c @ 19]
01 00000000`0013fef0 00000000`009fbd18 MSVCR120!_initterm_e+0x25 [f:\dd\vctools\crt\crtw32\startup\crt0dat.c @ 1006]
02 00000000`0013ff20 00007ffc`b50116ad Dolphin!__tmainCRTStartup+0x88 [f:\dd\vctools\crt\crtw32\dllstuff\crtexe.c @ 532]
03 00000000`0013ff60 00007ffc`b6ea4629 KERNEL32!BaseThreadInitThunk+0xd
04 00000000`0013ff90 00000000`00000000 ntdll!RtlUserThreadStart+0x1d

This time, make sure the object for disabling XSave support in msvcr can't be dropped by the linker.
@magumagu
Copy link
Contributor

Looks fine, assuming It works.

@lioncash
Copy link
Member

Likewise – looks fine to me.

@shuffle2
Copy link
Contributor Author

I think the log above is enough to prove that it works, shown running on haswell with xsavedisable bcd option enabled.

shuffle2 added a commit that referenced this pull request May 27, 2014
Redo commit 932945d
Fixes crashes from running on hardware with FMA3 support and software which doesn't support it.
@shuffle2 shuffle2 merged commit 3d21c67 into dolphin-emu:master May 27, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

3 participants