Skip to content

[CORE] Remove naked function declaration for WWMath::Inv_Sqrt #1009

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.

Sign up for GitHub

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

Merged
xezon merged 7 commits into from
Jun 5, 2025
Merged

[CORE] Remove naked function declaration for WWMath::Inv_Sqrt #1009

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5c501e1
Test C++ code replacement for assembly.
Caball009 Jun 5, 2025
d8c626b
Added included for memcpy.
Caball009 Jun 5, 2025
2ef339c
Test non-naked function.
Caball009 Jun 5, 2025
e608c51
Reverted changes.
Caball009 Jun 5, 2025
c48ab7a
Removed unused includes.
Caball009 Jun 5, 2025
406fd61
Removed unused include.
Caball009 Jun 5, 2025
70af85a
Revert most changes except removal of naked function declaration.
Caball009 Jun 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions Core/Libraries/Source/WWVegas/WWMath/wwmath.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -602,21 +602,23 @@ WWINLINE int WWMath::Float_To_Int_Floor (const float& f)
// ----------------------------------------------------------------------------

#if defined(_MSC_VER) && defined(_M_IX86)
WWINLINE __declspec(naked) float __fastcall WWMath::Inv_Sqrt(float a)
WWINLINE float __fastcall WWMath::Inv_Sqrt(float a)
{
float retval;

__asm {
mov eax, 0be6eb508h
mov DWORD PTR [esp-12],03fc00000h ; 1.5 on the stack
sub eax, DWORD PTR [esp+4]; a
sub DWORD PTR [esp+4], 800000h ; a/2 a=Y0
sub eax, DWORD PTR [a]; a
sub DWORD PTR [a], 800000h ; a/2 a=Y0
shr eax, 1 ; firs approx in eax=R0
mov DWORD PTR [esp-8], eax

fld DWORD PTR [esp-8] ;r
fmul st, st ;r*r
fld DWORD PTR [esp-8] ;r
fxch st(1)
fmul DWORD PTR [esp+4];a ;r*r*y0
fmul DWORD PTR [a];a ;r*r*y0
fld DWORD PTR [esp-12];load 1.5
fld st(0)
fsub st,st(2) ;r1 = 1.5 - y1
Expand Down Expand Up @@ -644,8 +646,11 @@ WWINLINE __declspec(naked) float __fastcall WWMath::Inv_Sqrt(float a)
;x3 = st(1)
;r3 = st(0)
fmulp st(1), st
ret 4

fstp retval
}

return retval;
}
#else
WWINLINE float WWMath::Inv_Sqrt(float val)
Expand Down
Loading