Skip to content

chore: Prevent conflict between clang-format and MSVC by wrapping inline assembly blocks in curly braces #2811

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 1 commit into from
Jun 19, 2026
+16 −10
Merged

chore: Prevent conflict between clang-format and MSVC by wrapping inline assembly blocks in curly braces #2811

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 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 @@ -336,8 +336,10 @@ WWINLINE long WWMath::Float_To_Long(double f)
{
#if defined(_MSC_VER) && defined(_M_IX86)
long retval;
__asm fld qword ptr [f]
__asm fistp dword ptr [retval]
__asm {
fld qword ptr [f]
fistp dword ptr [retval]
}
return retval;
#else
return (long) f;
Expand Down
20 changes: 12 additions & 8 deletions Core/Libraries/Source/profile/internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,20 +58,24 @@ class ProfileFastCS
#define ts_lock _emit 0xF0
DASSERT(((unsigned)&nFlag % 4) == 0);

__asm mov ebx, [nFlag]
__asm ts_lock
__asm bts dword ptr [ebx], 0
__asm jc The_Bit_Was_Previously_Set_So_Try_Again
__asm {
mov ebx, [nFlag]
ts_lock
bts dword ptr [ebx], 0
jc The_Bit_Was_Previously_Set_So_Try_Again
}
return;

The_Bit_Was_Previously_Set_So_Try_Again:
// can't use SwitchToThread() here because Win9X doesn't have it!
if (testEvent)
::WaitForSingleObject(testEvent,1);
__asm mov ebx, [nFlag]
__asm ts_lock
__asm bts dword ptr [ebx], 0
__asm jc The_Bit_Was_Previously_Set_So_Try_Again
__asm {
mov ebx, [nFlag]
ts_lock
bts dword ptr [ebx], 0
jc The_Bit_Was_Previously_Set_So_Try_Again
}
}

void ThreadSafeClearFlag()
Expand Down
Loading