Ros-diffs July 2012

ros-diffs@reactos.org

14 participants
193 discussions

[ion] 57000: [NTOSKRNL]: Additional support for session space. A few more ASSERTs and paranoia. [NTOSKRNL]: Don't assume all prototype PTEs are cached, in fact none are in ReactOS at the moment! Th...

by ion＠svn.reactos.org

Author: ion Date: Tue Jul 31 07:11:52 2012 New Revision: 57000 URL: http://svn.reactos.org/svn/reactos?rev=57000&view=rev Log: [NTOSKRNL]: Additional support for session space. A few more ASSERTs and paranoia. [NTOSKRNL]: Don't assume all prototype PTEs are cached, in fact none are in ReactOS at the moment! This resulted in the wrong hardware caching bits for the PEB/TEB and NLS Data which are using ARM3 section code. [NTOSKRNL]: Also implement dirty page bit for prototype PTEs. Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pagfault.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Tue Jul 31 07:11:52 2012 @@ -23,7 +23,7 @@ #endif LONG MmSystemLockPagesCount; - + /* PRIVATE FUNCTIONS **********************************************************/ PMMPTE @@ -305,8 +305,18 @@ /* Check if we need a zero page */ NeedZero = (OldIrql != MM_NOIRQL); - /* Get the next system page color */ - Color = MI_GET_NEXT_COLOR(); +#if 0 + /* Session-backed image views must be zeroed */ + if ((Process == HYDRA_PROCESS) && + ((MI_IS_SESSION_IMAGE_ADDRESS(Address)) || + ((Address >= (PVOID)MiSessionViewStart) && + (Address < (PVOID)MiSessionSpaceWs)))) + { + NeedZero = TRUE; + } +#endif + /* Hardcode unknown color */ + Color = 0xFFFFFFFF; } /* Check if the PFN database should be acquired */ @@ -332,31 +342,31 @@ if (!Process) MI_SET_PROCESS2("Kernel Demand 0"); /* Do we need a zero page? */ - if ((NeedZero) && (Process)) + if (Color != 0xFFFFFFFF) { /* Try to get one, if we couldn't grab a free page and zero it */ PageFrameNumber = MiRemoveZeroPageSafe(Color); - if (PageFrameNumber) - { - /* We got a genuine zero page, stop worrying about it */ - NeedZero = FALSE; - } - else + if (!PageFrameNumber) { /* We'll need a free page and zero it manually */ PageFrameNumber = MiRemoveAnyPage(Color); - } - } - else if (!NeedZero) - { - /* Process or system doesn't want a zero page, grab anything */ - PageFrameNumber = MiRemoveAnyPage(Color); + NeedZero = TRUE; + } } else { - /* System wants a zero page, obtain one */ - PageFrameNumber = MiRemoveZeroPage(Color); - NeedZero = FALSE; + /* Get a color, and see if we should grab a zero or non-zero page */ + Color = MI_GET_NEXT_COLOR(); + if (!NeedZero) + { + /* Process or system doesn't want a zero page, grab anything */ + PageFrameNumber = MiRemoveAnyPage(Color); + } + else + { + /* System wants a zero page, obtain one */ + PageFrameNumber = MiRemoveZeroPage(Color); + } } /* Initialize it */ @@ -434,6 +444,7 @@ ULONG_PTR Protection; PFN_NUMBER PageFrameIndex; PMMPFN Pfn1, Pfn2; + BOOLEAN OriginalProtection, DirtyPage; /* Must be called with an valid prototype PTE, with the PFN lock held */ ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); @@ -458,13 +469,40 @@ { /* Get the protection from the PTE, there's no real Proto PTE data */ Protection = PointerPte->u.Soft.Protection; + + /* Remember that we did not use the proto protection */ + OriginalProtection = FALSE; } else { /* Get the protection from the original PTE link */ OriginalPte = &Pfn1->OriginalPte; Protection = OriginalPte->u.Soft.Protection; - } + + /* Remember that we used the original protection */ + OriginalProtection = TRUE; + + /* Check if this was a write on a read only proto */ + if ((StoreInstruction) && !(Protection & MM_READWRITE)) + { + /* Clear the flag */ + StoreInstruction = 0; + } + } + + /* Check if this was a write on a non-COW page */ + DirtyPage = FALSE; + if ((StoreInstruction) && ((Protection & MM_WRITECOPY) != MM_WRITECOPY)) + { + /* Then the page should be marked dirty */ + DirtyPage = TRUE; + + /* ReactOS check */ + ASSERT(Pfn1->OriginalPte.u.Soft.Prototype != 0); + } + + /* Not yet handled by ReactOS */ + ASSERT(LockedPfn == NULL); /* Release the PFN lock */ KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); @@ -472,6 +510,20 @@ /* Remove caching bits */ Protection &= ~(MM_NOCACHE | MM_NOACCESS); + /* Setup caching */ + if (Pfn1->u3.e1.CacheAttribute == MiWriteCombined) + { + /* Write combining, no caching */ + MI_PAGE_DISABLE_CACHE(&TempPte); + MI_PAGE_WRITE_COMBINED(&TempPte); + } + else if (Pfn1->u3.e1.CacheAttribute == MiNonCached) + { + /* Write through, no caching */ + MI_PAGE_DISABLE_CACHE(&TempPte); + MI_PAGE_WRITE_THROUGH(&TempPte); + } + /* Check if this is a kernel or user address */ if (Address < MmSystemRangeStart) { @@ -484,10 +536,17 @@ MI_MAKE_HARDWARE_PTE(&TempPte, PointerPte, Protection, PageFrameIndex); } + /* Set the dirty flag if needed */ + if (DirtyPage) TempPte.u.Hard.Dirty = TRUE; + /* Write the PTE */ MI_WRITE_VALID_PTE(PointerPte, TempPte); + /* Reset the protection if needed */ + if (OriginalProtection) Protection = MM_ZERO_ACCESS; + /* Return success */ + ASSERT(PointerPte == MiAddressToPte(Address)); return STATUS_SUCCESS; } @@ -823,31 +882,31 @@ /* Has the PTE been made valid yet? */ if (!SuperProtoPte->u.Hard.Valid) { - UNIMPLEMENTED; - while (TRUE); - } - else - { - /* Resolve the fault -- this will release the PFN lock */ - ASSERT(PointerPte->u.Hard.Valid == 0); - Status = MiResolveProtoPteFault(StoreInstruction, - Address, - PointerPte, - PointerProtoPte, - NULL, - NULL, - NULL, - Process, - LockIrql, - TrapInformation); - ASSERT(Status == STATUS_SUCCESS); - - /* Complete this as a transition fault */ - ASSERT(OldIrql == KeGetCurrentIrql()); - ASSERT(OldIrql <= APC_LEVEL); - ASSERT(KeAreAllApcsDisabled() == TRUE); - return Status; - } + ASSERT(FALSE); + } + else if (PointerPte->u.Hard.Valid == 1) + { + ASSERT(FALSE); + } + + /* Resolve the fault -- this will release the PFN lock */ + Status = MiResolveProtoPteFault(StoreInstruction, + Address, + PointerPte, + PointerProtoPte, + NULL, + NULL, + NULL, + Process, + LockIrql, + TrapInformation); + ASSERT(Status == STATUS_SUCCESS); + + /* Complete this as a transition fault */ + ASSERT(OldIrql == KeGetCurrentIrql()); + ASSERT(OldIrql <= APC_LEVEL); + ASSERT(KeAreAllApcsDisabled() == TRUE); + return Status; } else {

12 years, 4 months

[ion] 56999: [NTOSKRNL]: Multiple fixes to faulting paths. Make some checks more explicit, support lock pages counter, update dirty bit when needed, and stub further support for session space.

by ion＠svn.reactos.org

Author: ion Date: Tue Jul 31 06:47:47 2012 New Revision: 56999 URL: http://svn.reactos.org/svn/reactos?rev=56999&view=rev Log: [NTOSKRNL]: Multiple fixes to faulting paths. Make some checks more explicit, support lock pages counter, update dirty bit when needed, and stub further support for session space. Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pagfault.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Tue Jul 31 06:47:47 2012 @@ -17,10 +17,13 @@ /* GLOBALS ********************************************************************/ +#define HYDRA_PROCESS (PEPROCESS)1 #if MI_TRACE_PFNS BOOLEAN UserPdeFault = FALSE; #endif +LONG MmSystemLockPagesCount; + /* PRIVATE FUNCTIONS **********************************************************/ PMMPTE @@ -35,8 +38,70 @@ /* No prototype/section support for now */ *ProtoVad = NULL; - /* Check if this is a page table address */ - if (MI_IS_PAGE_TABLE_ADDRESS(VirtualAddress)) + /* User or kernel fault? */ + if (VirtualAddress <= MM_HIGHEST_USER_ADDRESS) + { + /* Special case for shared data */ + if (PAGE_ALIGN(VirtualAddress) == (PVOID)MM_SHARED_USER_DATA_VA) + { + /* It's a read-only page */ + *ProtectCode = MM_READONLY; + return MmSharedUserDataPte; + } + + /* Find the VAD, it might not exist if the address is bogus */ + Vad = MiLocateAddress(VirtualAddress); + if (!Vad) + { + /* Bogus virtual address */ + *ProtectCode = MM_NOACCESS; + return NULL; + } + + /* ReactOS does not handle physical memory VADs yet */ + ASSERT(Vad->u.VadFlags.VadType != VadDevicePhysicalMemory); + + /* Check if it's a section, or just an allocation */ + if (Vad->u.VadFlags.PrivateMemory) + { + /* ReactOS does not handle AWE VADs yet */ + ASSERT(Vad->u.VadFlags.VadType != VadAwe); + + /* This must be a TEB/PEB VAD */ + if (Vad->u.VadFlags.MemCommit) + { + /* It's committed, so return the VAD protection */ + *ProtectCode = (ULONG)Vad->u.VadFlags.Protection; + } + else + { + /* It has not yet been committed, so return no access */ + *ProtectCode = MM_NOACCESS; + } + + /* In both cases, return no PTE */ + return NULL; + } + else + { + /* ReactOS does not supoprt these VADs yet */ + ASSERT(Vad->u.VadFlags.VadType != VadImageMap); + ASSERT(Vad->u2.VadFlags2.ExtendableFile == 0); + + /* Return the proto VAD */ + *ProtoVad = Vad; + + /* Get the prototype PTE for this page */ + PointerPte = (((ULONG_PTR)VirtualAddress >> PAGE_SHIFT) - Vad->StartingVpn) + Vad->FirstPrototypePte; + ASSERT(PointerPte != NULL); + ASSERT(PointerPte <= Vad->LastContiguousPte); + + /* Return the Prototype PTE and the protection for the page mapping */ + *ProtectCode = (ULONG)Vad->u.VadFlags.Protection; + return PointerPte; + } + } + else if (MI_IS_PAGE_TABLE_ADDRESS(VirtualAddress)) { /* This should never happen, as these addresses are handled by the double-maping */ if (((PMMPTE)VirtualAddress >= MiAddressToPte(MmPagedPoolStart)) && @@ -51,61 +116,15 @@ *ProtectCode = MM_READWRITE; return NULL; } - - /* Should not be a session address */ - ASSERT(MI_IS_SESSION_ADDRESS(VirtualAddress) == FALSE); - - /* Special case for shared data */ - if (PAGE_ALIGN(VirtualAddress) == (PVOID)MM_SHARED_USER_DATA_VA) - { - /* It's a read-only page */ - *ProtectCode = MM_READONLY; - return MmSharedUserDataPte; - } - - /* Find the VAD, it might not exist if the address is bogus */ - Vad = MiLocateAddress(VirtualAddress); - if (!Vad) - { - /* Bogus virtual address */ - *ProtectCode = MM_NOACCESS; - return NULL; - } - - /* This must be a VM VAD */ - ASSERT(Vad->u.VadFlags.VadType == VadNone); - - /* Check if it's a section, or just an allocation */ - if (Vad->u.VadFlags.PrivateMemory) - { - /* This must be a TEB/PEB VAD */ - if (Vad->u.VadFlags.MemCommit) - { - /* It's committed, so return the VAD protection */ - *ProtectCode = (ULONG)Vad->u.VadFlags.Protection; - } - else - { - /* It has not yet been committed, so return no access */ - *ProtectCode = MM_NOACCESS; - } - return NULL; - } - else - { - /* Return the proto VAD */ - ASSERT(Vad->u2.VadFlags2.ExtendableFile == 0); - *ProtoVad = Vad; - - /* Get the prototype PTE for this page */ - PointerPte = (((ULONG_PTR)VirtualAddress >> PAGE_SHIFT) - Vad->StartingVpn) + Vad->FirstPrototypePte; - ASSERT(PointerPte <= Vad->LastContiguousPte); - ASSERT(PointerPte != NULL); - - /* Return the Prototype PTE and the protection for the page mapping */ - *ProtectCode = (ULONG)Vad->u.VadFlags.Protection; - return PointerPte; - } + else if (MI_IS_SESSION_ADDRESS(VirtualAddress)) + { + /* ReactOS does not have an image list yet, so bail out to failure case */ + ASSERT(IsListEmpty(&MmSessionSpace->ImageList)); + } + + /* Default case -- failure */ + *ProtectCode = MM_NOACCESS; + return NULL; } #if (_MI_PAGING_LEVELS == 2) @@ -132,19 +151,23 @@ NTSTATUS FASTCALL +MiCheckPdeForSessionSpace(IN PVOID Address) +{ + /* Code not yet tested */ + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +FASTCALL MiCheckPdeForPagedPool(IN PVOID Address) { PMMPDE PointerPde; NTSTATUS Status = STATUS_SUCCESS; - if (MI_IS_SESSION_ADDRESS(Address)) - { - DPRINT1("Unexpected session fault: %p %p %p\n", Address, MmSessionBase, MiSessionSpaceEnd); - } - - /* No session support in ReactOS yet */ - ASSERT(MI_IS_SESSION_ADDRESS(Address) == FALSE); - ASSERT(MI_IS_SESSION_PTE(Address) == FALSE); + /* Check session PDE */ + if (MI_IS_SESSION_ADDRESS(Address)) return MiCheckPdeForSessionSpace(Address); + if (MI_IS_SESSION_PTE(Address)) return MiCheckPdeForSessionSpace(Address); // // Check if this is a fault while trying to access the page table itself @@ -178,15 +201,11 @@ // if (PointerPde->u.Hard.Valid == 0) { -#ifdef _M_AMD64 - ASSERT(FALSE); -#else // // Copy it from our double-mapped system page directory // InterlockedExchangePte(PointerPde, MmSystemPagePtes[((ULONG_PTR)PointerPde & (SYSTEM_PD_SIZE - 1)) / sizeof(MMPTE)].u.Long); -#endif } // @@ -260,12 +279,13 @@ MMPTE TempPte; BOOLEAN NeedZero = FALSE, HaveLock = FALSE; ULONG Color; + PMMPFN Pfn1; DPRINT("ARM3 Demand Zero Page Fault Handler for address: %p in process: %p\n", Address, Process); /* Must currently only be called by paging path */ - if ((Process) && (OldIrql == MM_NOIRQL)) + if ((Process > HYDRA_PROCESS) && (OldIrql == MM_NOIRQL)) { /* Sanity check */ ASSERT(MI_IS_PAGE_TABLE_ADDRESS(PointerPte)); @@ -299,15 +319,19 @@ /* We either manually locked the PFN DB, or already came with it locked */ ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); - - /* Do we need a zero page? */ ASSERT(PointerPte->u.Hard.Valid == 0); + + /* Assert we have enough pages */ + ASSERT(MmAvailablePages >= 32); + #if MI_TRACE_PFNS if (UserPdeFault) MI_SET_USAGE(MI_USAGE_PAGE_TABLE); if (!UserPdeFault) MI_SET_USAGE(MI_USAGE_DEMAND_ZERO); #endif if (Process) MI_SET_PROCESS2(Process->ImageFileName); if (!Process) MI_SET_PROCESS2("Kernel Demand 0"); + + /* Do we need a zero page? */ if ((NeedZero) && (Process)) { /* Try to get one, if we couldn't grab a free page and zero it */ @@ -338,11 +362,18 @@ /* Initialize it */ MiInitializePfn(PageFrameNumber, PointerPte, TRUE); + /* Do we have the lock? */ + if (HaveLock) + { + /* Release it */ + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + + /* Update performance counters */ + if (Process > HYDRA_PROCESS) Process->NumberOfPrivatePages++; + } + /* Increment demand zero faults */ - KeGetCurrentPrcb()->MmDemandZeroCount++; - - /* Release PFN lock if needed */ - if (HaveLock) KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + InterlockedIncrement(&KeGetCurrentPrcb()->MmDemandZeroCount); /* Zero the page if need be */ if (NeedZero) MiZeroPfn(PageFrameNumber); @@ -370,6 +401,17 @@ /* Write it */ MI_WRITE_VALID_PTE(PointerPte, TempPte); + + /* Did we manually acquire the lock */ + if (HaveLock) + { + /* Get the PFN entry */ + Pfn1 = MI_PFN_ELEMENT(PageFrameNumber); + + /* Windows does these sanity checks */ + ASSERT(Pfn1->u1.Event == 0); + ASSERT(Pfn1->u3.e1.PrototypePte == 0); + } // // It's all good now @@ -385,13 +427,13 @@ IN PMMPTE PointerPte, IN PMMPTE PointerProtoPte, IN KIRQL OldIrql, - IN PMMPFN Pfn1) + IN PMMPFN* LockedPfn) { MMPTE TempPte; PMMPTE OriginalPte, PageTablePte; ULONG_PTR Protection; PFN_NUMBER PageFrameIndex; - PMMPFN Pfn2; + PMMPFN Pfn1, Pfn2; /* Must be called with an valid prototype PTE, with the PFN lock held */ ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); @@ -494,6 +536,9 @@ ASSERT(MmAvailablePages >= 0); ASSERT(Pfn1->u4.InPageError == 0); + /* ReactOS checks for this */ + ASSERT(MmAvailablePages > 32); + /* Was this a transition page in the valid list, or free/zero list? */ if (Pfn1->u3.e1.PageLocation == ActiveAndValid) { @@ -523,7 +568,8 @@ ASSERT(FALSE); } - /* FIXME: Update counter */ + /* Update counter */ + InterlockedIncrementSizeT(&MmSystemLockPagesCount); /* We must be the first reference */ NewRefCount = InterlockedIncrement16((PSHORT)&Pfn1->u3.e2.ReferenceCount); @@ -555,7 +601,8 @@ ASSERT(FALSE); } - /* FIXME: Update counter */ + /* Update counter */ + InterlockedDecrementSizeT(&MmSystemLockPagesCount); } } @@ -585,7 +632,18 @@ (MmProtectToPteMask[PointerPte->u.Trans.Protection]) | MiDetermineUserGlobalPteMask(PointerPte); - /* FIXME: Set dirty bit */ + /* Is the PTE writeable? */ + if (((Pfn1->u3.e1.Modified) && (TempPte.u.Hard.Write)) && + (TempPte.u.Hard.CopyOnWrite == 0)) + { + /* Make it dirty */ + TempPte.u.Hard.Dirty = TRUE; + } + else + { + /* Make it clean */ + TempPte.u.Hard.Dirty = FALSE; + } /* Write the valid PTE */ MI_WRITE_VALID_PTE(PointerPte, TempPte); @@ -654,12 +712,24 @@ { if (!PteContents.u.Proto.ReadOnly) { - /* FIXME: CHECK FOR ACCESS AND COW */ + /* FIXME: CHECK FOR ACCESS */ + + /* Check for copy on write page */ + if ((TempPte.u.Soft.Protection & MM_WRITECOPY) == MM_WRITECOPY) + { + /* Not yet supported */ + ASSERT(FALSE); + } } } else { - /* FIXME: Should check for COW */ + /* Check for copy on write page */ + if ((PteContents.u.Soft.Protection & MM_WRITECOPY) == MM_WRITECOPY) + { + /* Not yet supported */ + ASSERT(FALSE); + } } /* Check for clone PTEs */ @@ -815,7 +885,8 @@ // // The PTE must be invalid but not completely empty. It must also not be a - // prototype PTE as that scenario should've been handled above + // prototype PTE as that scenario should've been handled above. These are + // all Windows checks // ASSERT(TempPte.u.Hard.Valid == 0); ASSERT(TempPte.u.Soft.Prototype == 0); @@ -823,7 +894,7 @@ // // No transition or page file software PTEs in ARM3 yet, so this must be a - // demand zero page + // demand zero page. These are all ReactOS checks // ASSERT(TempPte.u.Soft.Transition == 0); ASSERT(TempPte.u.Soft.PageFileHigh == 0);

12 years, 4 months

[akhaldi] 56998: * Align the stack on an 8-byte boundary for x86.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Jul 30 22:28:05 2012 New Revision: 56998 URL: http://svn.reactos.org/svn/reactos?rev=56998&view=rev Log: * Align the stack on an 8-byte boundary for x86. Modified: trunk/reactos/cmake/gcc.cmake Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=56998&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Mon Jul 30 22:28:05 2012 @@ -81,7 +81,7 @@ add_compile_flags("-fno-strict-aliasing") if(ARCH MATCHES i386) - add_compile_flags("-mpreferred-stack-boundary=2 -fno-set-stack-executable -fno-optimize-sibling-calls -fno-omit-frame-pointer") + add_compile_flags("-mpreferred-stack-boundary=3 -fno-set-stack-executable -fno-optimize-sibling-calls -fno-omit-frame-pointer") if(OPTIMIZE STREQUAL "1") add_compile_flags("-ftracer -momit-leaf-frame-pointer") endif()

12 years, 4 months

[akhaldi] 56997: [FREELDR/SETUPLDR] * Leverage the object library option provided by CMake 2.8.8+ which will speed up the build even further. * These wrapping conditions will go away as soon as we ...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Jul 30 16:57:55 2012 New Revision: 56997 URL: http://svn.reactos.org/svn/reactos?rev=56997&view=rev Log: [FREELDR/SETUPLDR] * Leverage the object library option provided by CMake 2.8.8+ which will speed up the build even further. * These wrapping conditions will go away as soon as we ship the new BE. Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMake… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Mon Jul 30 16:57:55 2012 @@ -150,8 +150,12 @@ #TBD endif() -add_library(freeldr_common ${FREELDR_COMMON_SOURCE}) -add_dependencies(freeldr_common bugcodes) +if(CMAKE_VERSION VERSION_GREATER 2.8.7) + add_library(freeldr_common OBJECT ${FREELDR_COMMON_SOURCE}) +else() + add_library(freeldr_common ${FREELDR_COMMON_SOURCE}) + add_dependencies(freeldr_common bugcodes) +endif() if(ARCH MATCHES i386 AND NOT MSVC) list(APPEND FREELDR_BASE_SOURCE arch/i386/multiboot.S) @@ -162,12 +166,18 @@ freeldr.c rtl/libsupp.c) -if (NOT MSVC) +if(NOT MSVC) list(APPEND FREELDR_BASE_SOURCE ${CMAKE_CURRENT_BINARY_DIR}/freeldr.def) endif() -add_library(freeldr_pe SHARED ${FREELDR_BASE_SOURCE}) -add_library(freeldr_pe_dbg SHARED EXCLUDE_FROM_ALL ${FREELDR_BASE_SOURCE}) + +if(CMAKE_VERSION VERSION_GREATER 2.8.7) + add_library(freeldr_pe SHARED $<TARGET_OBJECTS:freeldr_common> ${FREELDR_BASE_SOURCE}) + add_library(freeldr_pe_dbg SHARED EXCLUDE_FROM_ALL $<TARGET_OBJECTS:freeldr_common> ${FREELDR_BASE_SOURCE}) +else() + add_library(freeldr_pe SHARED ${FREELDR_BASE_SOURCE}) + add_library(freeldr_pe_dbg SHARED EXCLUDE_FROM_ALL ${FREELDR_BASE_SOURCE}) +endif() if(NOT MSVC) add_target_link_flags(freeldr_pe "-Wl,--strip-all,--exclude-all-symbols,--file-alignment,0x1000,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr_i386.lds") @@ -190,21 +200,13 @@ target_link_libraries(freeldr_pe_dbg mini_hal) endif() -target_link_libraries(freeldr_pe - freeldr_common - cportlib - rossym - cmlib - rtl - libcntpr) - -target_link_libraries(freeldr_pe_dbg - freeldr_common - cportlib - rossym - cmlib - rtl - libcntpr) +if(NOT CMAKE_VERSION VERSION_GREATER 2.8.7) + target_link_libraries(freeldr_pe freeldr_common) + target_link_libraries(freeldr_pe_dbg freeldr_common) +endif() + +target_link_libraries(freeldr_pe cportlib rossym cmlib rtl libcntpr) +target_link_libraries(freeldr_pe_dbg cportlib rossym cmlib rtl libcntpr) # add_pch(freeldr_pe include/freeldr.h) @@ -229,8 +231,13 @@ list(APPEND SETUPLDR_SOURCE windows/setupldr.c) endif() -add_library(setupldr_pe SHARED ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE}) -add_library(setupldr_pe_dbg SHARED EXCLUDE_FROM_ALL ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE}) +if(CMAKE_VERSION VERSION_GREATER 2.8.7) + add_library(setupldr_pe SHARED $<TARGET_OBJECTS:freeldr_common> ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE}) + add_library(setupldr_pe_dbg SHARED EXCLUDE_FROM_ALL $<TARGET_OBJECTS:freeldr_common> ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE}) +else() + add_library(setupldr_pe SHARED ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE}) + add_library(setupldr_pe_dbg SHARED EXCLUDE_FROM_ALL ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE}) +endif() if(NOT MSVC) add_target_link_flags(setupldr_pe "-Wl,--strip-all,--exclude-all-symbols,--file-alignment,0x1000,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr_i386.lds") @@ -256,21 +263,13 @@ target_link_libraries(setupldr_pe_dbg mini_hal) endif() -target_link_libraries(setupldr_pe - freeldr_common - cportlib - rossym - cmlib - rtl - libcntpr) - -target_link_libraries(setupldr_pe_dbg - freeldr_common - cportlib - rossym - cmlib - rtl - libcntpr) +if(NOT CMAKE_VERSION VERSION_GREATER 2.8.7) + target_link_libraries(setupldr_pe freeldr_common) + target_link_libraries(setupldr_pe_dbg freeldr_common) +endif() + +target_link_libraries(setupldr_pe cportlib rossym cmlib rtl libcntpr) +target_link_libraries(setupldr_pe_dbg cportlib rossym cmlib rtl libcntpr) add_dependencies(setupldr_pe asm) add_dependencies(setupldr_pe_dbg asm) @@ -281,5 +280,4 @@ ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys) add_custom_target(setupldr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys) - add_cd_file(TARGET setupldr FILE ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys DESTINATION loader NO_CAB FOR bootcd regtest)

12 years, 4 months

[jgardou] 56996: [MSVCRTEX] - Add is(w)blank implementation

by jgardou＠svn.reactos.org

Author: jgardou Date: Mon Jul 30 12:56:25 2012 New Revision: 56996 URL: http://svn.reactos.org/svn/reactos?rev=56996&view=rev Log: [MSVCRTEX] - Add is(w)blank implementation Added: trunk/reactos/lib/sdk/crt/misc/isblank.c (with props) trunk/reactos/lib/sdk/crt/misc/iswblank.c (with props) Modified: trunk/reactos/lib/sdk/crt/msvcrtex.cmake Added: trunk/reactos/lib/sdk/crt/misc/isblank.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/misc/isblank.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/misc/isblank.c (added) +++ trunk/reactos/lib/sdk/crt/misc/isblank.c [iso-8859-1] Mon Jul 30 12:56:25 2012 @@ -1,0 +1,7 @@ +#define __NO_CTYPE_LINES +#include <ctype.h> + +int __cdecl isblank (int _C) +{ + return (_isctype(_C, _BLANK) || _C == '\t'); +} Propchange: trunk/reactos/lib/sdk/crt/misc/isblank.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/sdk/crt/misc/iswblank.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/misc/iswblank.… ============================================================================== --- trunk/reactos/lib/sdk/crt/misc/iswblank.c (added) +++ trunk/reactos/lib/sdk/crt/misc/iswblank.c [iso-8859-1] Mon Jul 30 12:56:25 2012 @@ -1,0 +1,7 @@ +#define _CRT_WCTYPE_NOINLINE +#include <ctype.h> + +int __cdecl iswblank (wint_t _C) +{ + return (iswctype(_C, _BLANK) || _C == '\t'); +} Propchange: trunk/reactos/lib/sdk/crt/misc/iswblank.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/lib/sdk/crt/msvcrtex.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/msvcrtex.cmake… ============================================================================== --- trunk/reactos/lib/sdk/crt/msvcrtex.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/msvcrtex.cmake [iso-8859-1] Mon Jul 30 12:56:25 2012 @@ -36,6 +36,8 @@ startup/dllentry.c startup/reactos.c misc/fltused.c + misc/isblank.c + misc/iswblank.c misc/ofmt_stub.c )

12 years, 4 months

[jgardou] 56995: [INCLUDE] - Add some more C99 math functions - Fix definition of __forceinline and FORCEINLINE for C99 - Fix and add definition of _aligned_malloc and _aligned_free - Fix definitio...

by jgardou＠svn.reactos.org

Author: jgardou Date: Mon Jul 30 12:55:13 2012 New Revision: 56995 URL: http://svn.reactos.org/svn/reactos?rev=56995&view=rev Log: [INCLUDE] - Add some more C99 math functions - Fix definition of __forceinline and FORCEINLINE for C99 - Fix and add definition of _aligned_malloc and _aligned_free - Fix definition of is(w)blank, as a C99 function, it is not in msvcrt.dll and has to be implemented in msvcrtex All of this taken from the mingw-w64 project Modified: trunk/reactos/include/crt/_mingw.h trunk/reactos/include/crt/ctype.h trunk/reactos/include/crt/malloc.h trunk/reactos/include/crt/math.h trunk/reactos/include/crt/stdlib.h trunk/reactos/include/psdk/intsafe.h trunk/reactos/include/psdk/ntdef.h trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/crt/_mingw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/_mingw.h?rev=5… ============================================================================== --- trunk/reactos/include/crt/_mingw.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/_mingw.h [iso-8859-1] Mon Jul 30 12:55:13 2012 @@ -172,7 +172,11 @@ # endif # define __ptr32 # define __ptr64 -# define __forceinline extern __inline __attribute((always_inline)) +# if ( __MINGW_GNUC_PREREQ(4, 3) && __STDC_VERSION__ >= 199901L) +# define __forceinline extern inline __attribute__((__always_inline__,__gnu_inline__)) +# else +# define __forceinline extern __inline__ __attribute__((__always_inline__)) +# endif #endif #ifdef __cplusplus Modified: trunk/reactos/include/crt/ctype.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/ctype.h?rev=56… ============================================================================== --- trunk/reactos/include/crt/ctype.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/ctype.h [iso-8859-1] Mon Jul 30 12:55:13 2012 @@ -112,7 +112,7 @@ _CRTIMP int __cdecl __iscsymf(int _C); _CRTIMP int __cdecl __iscsym(int _C); #if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || !defined (NO_OLDNAMES) - _CRTIMP int __cdecl isblank(int _C); + int __cdecl isblank(int _C); #endif #endif /* !_CTYPE_DEFINED */ @@ -156,7 +156,7 @@ _CRTIMP int __cdecl is_wctype(wint_t _C,wctype_t _Type); #if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || !defined (NO_OLDNAMES) - _CRTIMP int __cdecl iswblank(wint_t _C); + int __cdecl iswblank(wint_t _C); #endif #endif Modified: trunk/reactos/include/crt/malloc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/malloc.h?rev=5… ============================================================================== --- trunk/reactos/include/crt/malloc.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/malloc.h [iso-8859-1] Mon Jul 30 12:55:13 2012 @@ -52,6 +52,18 @@ extern unsigned int _amblksiz; +/* Make sure that X86intrin.h doesn't produce here collisions. */ +#if (!defined (_XMMINTRIN_H_INCLUDED) && !defined (_MM_MALLOC_H_INCLUDED)) || defined(_aligned_malloc) +#define __DO_ALIGN_DEFINES +#endif + +#ifdef __DO_ALIGN_DEFINES +#pragma push_macro("_aligned_free") +#pragma push_macro("_aligned_malloc") +#undef _aligned_free +#undef _aligned_malloc +#endif + #define _mm_free(a) _aligned_free(a) #define _mm_malloc(a,b) _aligned_malloc(a,b) @@ -62,13 +74,25 @@ void *__cdecl malloc(size_t _Size); void *__cdecl realloc(void *_Memory,size_t _NewSize); _CRTIMP void *__cdecl _recalloc(void *_Memory,size_t _Count,size_t _Size); - /* _CRTIMP void __cdecl _aligned_free(void *_Memory); - _CRTIMP void *__cdecl _aligned_malloc(size_t _Size,size_t _Alignment); */ + +#ifdef __DO_ALIGN_DEFINES + _CRTIMP void __cdecl _aligned_free(void *_Memory); + _CRTIMP void *__cdecl _aligned_malloc(size_t _Size,size_t _Alignment); +#endif + _CRTIMP void *__cdecl _aligned_offset_malloc(size_t _Size,size_t _Alignment,size_t _Offset); _CRTIMP void *__cdecl _aligned_realloc(void *_Memory,size_t _Size,size_t _Alignment); _CRTIMP void *__cdecl _aligned_recalloc(void *_Memory,size_t _Count,size_t _Size,size_t _Alignment); _CRTIMP void *__cdecl _aligned_offset_realloc(void *_Memory,size_t _Size,size_t _Alignment,size_t _Offset); _CRTIMP void *__cdecl _aligned_offset_recalloc(void *_Memory,size_t _Count,size_t _Size,size_t _Alignment,size_t _Offset); +#endif + +#ifdef __DO_ALIGN_DEFINES +#undef __DO_ALIGN_DEFINES + +#pragma pop_macro("_aligned_malloc") +#pragma pop_macro("_aligned_free") + #endif #define _MAX_WAIT_MALLOC_CRT 60000 Modified: trunk/reactos/include/crt/math.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/math.h?rev=569… ============================================================================== --- trunk/reactos/include/crt/math.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/math.h [iso-8859-1] Mon Jul 30 12:55:13 2012 @@ -240,8 +240,6 @@ #pragma pack(pop) -#endif /* !_INC_MATH */ - #if defined(_USE_MATH_DEFINES) && !defined(_MATH_DEFINES_DEFINED) #define _MATH_DEFINES_DEFINED @@ -261,41 +259,141 @@ #endif /* _USE_MATH_DEFINES */ +#ifdef __cplusplus +extern "C" { +#endif + #ifndef __NO_ISOCEXT #if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) \ || !defined __STRICT_ANSI__ || defined __GLIBCPP__ - /* Inverse hyperbolic trig functions */ - /* 7.12.5.1 */ +/* 7.12.3.1 */ +/* + Return values for fpclassify. + These are based on Intel x87 fpu condition codes + in the high byte of status word and differ from + the return values for MS IEEE 754 extension _fpclass() +*/ +#define FP_NAN 0x0100 +#define FP_NORMAL 0x0400 +#define FP_INFINITE (FP_NAN | FP_NORMAL) +#define FP_ZERO 0x4000 +#define FP_SUBNORMAL (FP_NORMAL | FP_ZERO) +/* 0x0200 is signbit mask */ + +/* + We can't inline float or double, because we want to ensure truncation + to semantic type before classification. + (A normal long double value might become subnormal when + converted to double, and zero when converted to float.) +*/ + + extern int __cdecl __fpclassifyl (long double); + extern int __cdecl __fpclassifyf (float); + extern int __cdecl __fpclassify (double); + +#ifndef __CRT__NO_INLINE + __CRT_INLINE int __cdecl __fpclassifyl (long double x) { + unsigned short sw; + __asm__ __volatile__ ("fxam; fstsw %%ax;" : "=a" (sw): "t" (x)); + return sw & (FP_NAN | FP_NORMAL | FP_ZERO ); + } + __CRT_INLINE int __cdecl __fpclassify (double x) { +#ifdef __x86_64__ + __mingw_dbl_type_t hlp; + unsigned int l, h; + + hlp.x = x; + h = hlp.lh.high; + l = hlp.lh.low | (h & 0xfffff); + h &= 0x7ff00000; + if ((h | l) == 0) + return FP_ZERO; + if (!h) + return FP_SUBNORMAL; + if (h == 0x7ff00000) + return (l ? FP_NAN : FP_INFINITE); + return FP_NORMAL; +#else + unsigned short sw; + __asm__ __volatile__ ("fxam; fstsw %%ax;" : "=a" (sw): "t" (x)); + return sw & (FP_NAN | FP_NORMAL | FP_ZERO ); +#endif + } + __CRT_INLINE int __cdecl __fpclassifyf (float x) { +#ifdef __x86_64__ + __mingw_flt_type_t hlp; + + hlp.x = x; + hlp.val &= 0x7fffffff; + if (hlp.val == 0) + return FP_ZERO; + if (hlp.val < 0x800000) + return FP_SUBNORMAL; + if (hlp.val >= 0x7f800000) + return (hlp.val > 0x7f800000 ? FP_NAN : FP_INFINITE); + return FP_NORMAL; +#else + unsigned short sw; + __asm__ __volatile__ ("fxam; fstsw %%ax;" : "=a" (sw): "t" (x)); + return sw & (FP_NAN | FP_NORMAL | FP_ZERO ); +#endif + } +#endif + +#define fpclassify(x) (sizeof (x) == sizeof (float) ? __fpclassifyf (x) \ + : sizeof (x) == sizeof (double) ? __fpclassify (x) \ + : __fpclassifyl (x)) + +/* 7.12.3.2 */ +#define isfinite(x) ((fpclassify(x) & FP_NAN) == 0) + +/* 7.12.3.3 */ +#define isinf(x) (fpclassify(x) == FP_INFINITE) + +/* Inverse hyperbolic trig functions */ +/* 7.12.5.1 */ extern double __cdecl acosh (double); extern float __cdecl acoshf (float); extern long double __cdecl acoshl (long double); - /* 7.12.5.2 */ +/* 7.12.5.2 */ extern double __cdecl asinh (double); extern float __cdecl asinhf (float); extern long double __cdecl asinhl (long double); - /* 7.12.5.3 */ +/* 7.12.5.3 */ extern double __cdecl atanh (double); extern float __cdecl atanhf (float); extern long double __cdecl atanhl (long double); - /* 7.12.6.2 */ +/* 7.12.6.2 */ extern double __cdecl exp2(double); extern float __cdecl exp2f(float); extern long double __cdecl exp2l(long double); - /* 7.12.6.10 */ +/* 7.12.6.10 */ extern double __cdecl log2 (double); extern float __cdecl log2f (float); extern long double __cdecl log2l (long double); - /* 7.12.9.8 */ - /* round towards zero, regardless of fpu control word settings */ +/* 7.12.9.6 */ +/* round away from zero, regardless of fpu control word settings */ + extern double __cdecl round (double); + extern float __cdecl roundf (float); + extern long double __cdecl roundl (long double); + +/* 7.12.9.8 */ +/* round towards zero, regardless of fpu control word settings */ extern double __cdecl trunc (double); extern float __cdecl truncf (float); extern long double __cdecl truncl (long double); #endif /* __STDC_VERSION__ >= 199901L */ #endif /* __NO_ISOCEXT */ + +#ifdef __cplusplus +} // extern "C" +#endif + +#endif /* !_INC_MATH */ Modified: trunk/reactos/include/crt/stdlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/stdlib.h?rev=5… ============================================================================== --- trunk/reactos/include/crt/stdlib.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/stdlib.h [iso-8859-1] Mon Jul 30 12:55:13 2012 @@ -342,8 +342,17 @@ void *__cdecl malloc(size_t _Size); void *__cdecl realloc(void *_Memory,size_t _NewSize); _CRTIMP void *__cdecl _recalloc(void *_Memory,size_t _Count,size_t _Size); - //_CRTIMP void __cdecl _aligned_free(void *_Memory); - //_CRTIMP void *__cdecl _aligned_malloc(size_t _Size,size_t _Alignment); +/* Make sure that X86intrin.h doesn't produce here collisions. */ +#if (!defined (_XMMINTRIN_H_INCLUDED) && !defined (_MM_MALLOC_H_INCLUDED)) || defined(_aligned_malloc) +#pragma push_macro("_aligned_free") +#pragma push_macro("_aligned_malloc") +#undef _aligned_free +#undef _aligned_malloc + _CRTIMP void __cdecl _aligned_free(void *_Memory); + _CRTIMP void *__cdecl _aligned_malloc(size_t _Size,size_t _Alignment); +#pragma pop_macro("_aligned_free") +#pragma pop_macro("_aligned_malloc") +#endif _CRTIMP void *__cdecl _aligned_offset_malloc(size_t _Size,size_t _Alignment,size_t _Offset); _CRTIMP void *__cdecl _aligned_realloc(void *_Memory,size_t _Size,size_t _Alignment); _CRTIMP void *__cdecl _aligned_recalloc(void *_Memory,size_t _Count,size_t _Size,size_t _Alignment); Modified: trunk/reactos/include/psdk/intsafe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intsafe.h?rev… ============================================================================== --- trunk/reactos/include/psdk/intsafe.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/intsafe.h [iso-8859-1] Mon Jul 30 12:55:13 2012 @@ -31,7 +31,11 @@ #include <specstrings.h> #if defined(__GNUC__) && !defined(__forceinline) -#define __forceinline extern __inline __attribute((always_inline)) +# if ( __MINGW_GNUC_PREREQ(4, 3) && __STDC_VERSION__ >= 199901L) +# define __forceinline extern inline __attribute__((__always_inline__,__gnu_inline__)) +# else +# define __forceinline extern __inline__ __attribute__((__always_inline__)) +# endif #endif /* Handle ntintsafe here too */ Modified: trunk/reactos/include/psdk/ntdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntdef.h?rev=5… ============================================================================== --- trunk/reactos/include/psdk/ntdef.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntdef.h [iso-8859-1] Mon Jul 30 12:55:13 2012 @@ -264,7 +264,11 @@ #elif defined(_MSC_VER) #define FORCEINLINE __inline #else /* __GNUC__ */ -#define FORCEINLINE extern __inline__ __attribute__((always_inline)) +# if ( __MINGW_GNUC_PREREQ(4, 3) && __STDC_VERSION__ >= 199901L) +# define FORCEINLINE extern inline __attribute__((__always_inline__,__gnu_inline__)) +# else +# define FORCEINLINE extern __inline__ __attribute__((__always_inline__)) +# endif #endif #endif /* FORCEINLINE */ Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=5… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Mon Jul 30 12:55:13 2012 @@ -176,7 +176,11 @@ #elif (_MSC_VER) #define FORCEINLINE __inline #else -#define FORCEINLINE extern __inline__ __attribute__((always_inline)) +# if ( __MINGW_GNUC_PREREQ(4, 3) && __STDC_VERSION__ >= 199901L) +# define FORCEINLINE extern inline __attribute__((__always_inline__,__gnu_inline__)) +# else +# define FORCEINLINE extern __inline__ __attribute__((__always_inline__)) +# endif #endif #endif

12 years, 4 months

[tkreuzer] 56994: [WIN32K] Check if the dc surface is NULL instead of ASSERTing

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Jul 30 11:09:31 2012 New Revision: 56994 URL: http://svn.reactos.org/svn/reactos?rev=56994&view=rev Log: [WIN32K] Check if the dc surface is NULL instead of ASSERTing Modified: trunk/reactos/win32ss/gdi/ntgdi/line.c Modified: trunk/reactos/win32ss/gdi/ntgdi/line.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/line.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/line.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/line.c [iso-8859-1] Mon Jul 30 11:09:31 2012 @@ -233,6 +233,12 @@ LONG i; PDC_ATTR pdcattr = dc->pdcattr; + psurf = dc->dclevel.pSurface; + if (!psurf) + { + return FALSE; + } + if (PATH_IsPathOpen(dc->dclevel)) return PATH_Polyline(dc, pt, Count); @@ -254,11 +260,6 @@ Points = EngAllocMem(0, Count * sizeof(POINT), GDITAG_TEMP); if (Points != NULL) { - psurf = dc->dclevel.pSurface; - /* FIXME: psurf can be NULL!!!! - Don't assert but handle this case gracefully! */ - ASSERT(psurf); - RtlCopyMemory(Points, pt, Count * sizeof(POINT)); IntLPtoDP(dc, Points, Count);

12 years, 4 months

[hpoussin] 56993: [FREELDR] i386: support drives bigger than ~4GB See issue #6669 for more details.

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Mon Jul 30 06:12:58 2012 New Revision: 56993 URL: http://svn.reactos.org/svn/reactos?rev=56993&view=rev Log: [FREELDR] i386: support drives bigger than ~4GB See issue #6669 for more details. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwdisk.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwdisk.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwdisk.c [iso-8859-1] Mon Jul 30 06:12:58 2012 @@ -150,8 +150,7 @@ if (Position->LowPart & (Context->SectorSize - 1)) return EINVAL; - /* FIXME: take HighPart into account */ - Context->SectorNumber = Position->LowPart / Context->SectorSize; + Context->SectorNumber = (ULONG)(Position->QuadPart / Context->SectorSize); return ESUCCESS; }

12 years, 4 months

[jgardou] 56992: [OPENGL32] - Fix build

by jgardou＠svn.reactos.org

Author: jgardou Date: Mon Jul 30 01:07:57 2012 New Revision: 56992 URL: http://svn.reactos.org/svn/reactos?rev=56992&view=rev Log: [OPENGL32] - Fix build Modified: trunk/reactos/dll/win32/opengl32/CMakeLists.txt Modified: trunk/reactos/dll/win32/opengl32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/opengl32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/opengl32/CMakeLists.txt [iso-8859-1] Mon Jul 30 01:07:57 2012 @@ -1,6 +1,11 @@ spec2def(opengl32.dll opengl32.spec ADD_IMPORTLIB) + +add_definitions( + -D_GDI32_ # prevent gl* being declared __declspec(dllimport) in MS headers + -DBUILD_GL32 # declare gl* as __declspec(dllexport) in Mesa headers +) list(APPEND SOURCE font.c

12 years, 4 months

[jgardou] 56991: [INCLUDE/CRT] - revert 56989. Our headers are a lost cause. Just add the functions that I need.

by jgardou＠svn.reactos.org

Author: jgardou Date: Mon Jul 30 00:36:00 2012 New Revision: 56991 URL: http://svn.reactos.org/svn/reactos?rev=56991&view=rev Log: [INCLUDE/CRT] - revert 56989. Our headers are a lost cause. Just add the functions that I need. Modified: trunk/reactos/include/crt/math.h Modified: trunk/reactos/include/crt/math.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/math.h?rev=569… ============================================================================== --- trunk/reactos/include/crt/math.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/math.h [iso-8859-1] Mon Jul 30 00:36:00 2012 @@ -1,1053 +1,301 @@ /** * This file has no copyright assigned and is placed in the Public Domain. - * This file is part of the mingw-w64 runtime package. - * No warranty is given; refer to the file DISCLAIMER.PD within this package. + * This file is part of the w64 mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER within this package. */ -#ifndef _MATH_H_ -#define _MATH_H_ - -#if __GNUC__ >= 3 -#pragma GCC system_header -#endif - -#include <crtdefs.h> - -struct _exception; +#ifndef _INC_MATH +#define _INC_MATH + +#include "crtdefs.h" + +struct exception; #pragma pack(push,_CRT_PACKING) - -#define _DOMAIN 1 /* domain error in argument */ -#define _SING 2 /* singularity */ -#define _OVERFLOW 3 /* range overflow */ -#define _UNDERFLOW 4 /* range underflow */ -#define _TLOSS 5 /* total loss of precision */ -#define _PLOSS 6 /* partial loss of precision */ - -#ifndef __STRICT_ANSI__ -#ifndef NO_OLDNAMES - -#define DOMAIN _DOMAIN -#define SING _SING -#define OVERFLOW _OVERFLOW -#define UNDERFLOW _UNDERFLOW -#define TLOSS _TLOSS -#define PLOSS _PLOSS - -#endif -#endif - -#ifndef __STRICT_ANSI__ -#define M_E 2.7182818284590452354 -#define M_LOG2E 1.4426950408889634074 -#define M_LOG10E 0.43429448190325182765 -#define M_LN2 0.69314718055994530942 -#define M_LN10 2.30258509299404568402 -#define M_PI 3.14159265358979323846 -#define M_PI_2 1.57079632679489661923 -#define M_PI_4 0.78539816339744830962 -#define M_1_PI 0.31830988618379067154 -#define M_2_PI 0.63661977236758134308 -#define M_2_SQRTPI 1.12837916709551257390 -#define M_SQRT2 1.41421356237309504880 -#define M_SQRT1_2 0.70710678118654752440 -#endif - -#ifndef __STRICT_ANSI__ -/* See also float.h */ -#ifndef __MINGW_FPCLASS_DEFINED -#define __MINGW_FPCLASS_DEFINED 1 -/* IEEE 754 classication */ -#define _FPCLASS_SNAN 0x0001 /* Signaling "Not a Number" */ -#define _FPCLASS_QNAN 0x0002 /* Quiet "Not a Number" */ -#define _FPCLASS_NINF 0x0004 /* Negative Infinity */ -#define _FPCLASS_NN 0x0008 /* Negative Normal */ -#define _FPCLASS_ND 0x0010 /* Negative Denormal */ -#define _FPCLASS_NZ 0x0020 /* Negative Zero */ -#define _FPCLASS_PZ 0x0040 /* Positive Zero */ -#define _FPCLASS_PD 0x0080 /* Positive Denormal */ -#define _FPCLASS_PN 0x0100 /* Positive Normal */ -#define _FPCLASS_PINF 0x0200 /* Positive Infinity */ -#endif -#endif - -#ifndef RC_INVOKED #ifdef __cplusplus extern "C" { -#endif - -#ifndef __MINGW_SOFTMATH -#define __MINGW_SOFTMATH - -/* IEEE float/double type shapes. */ - - typedef union __mingw_dbl_type_t { - double x; - unsigned long long val; - __C89_NAMELESS struct { - unsigned int low, high; - } lh; - } __mingw_dbl_type_t; - - typedef union __mingw_flt_type_t { - float x; - unsigned int val; - } __mingw_flt_type_t; - - typedef union __mingw_ldbl_type_t - { - long double x; - __C89_NAMELESS struct { - unsigned int low, high; - int sign_exponent : 16; - int res1 : 16; - int res0 : 32; - } lh; - } __mingw_ldbl_type_t; - -#endif - -#ifndef _HUGE - extern double * __MINGW_IMP_SYMBOL(_HUGE); -#define _HUGE (* __MINGW_IMP_SYMBOL(_HUGE)) -#endif - -#if __MINGW_GNUC_PREREQ(3, 3) -#define HUGE_VAL __builtin_huge_val() -#else -#define HUGE_VAL _HUGE #endif #ifndef _EXCEPTION_DEFINED #define _EXCEPTION_DEFINED struct _exception { int type; - const char *name; + char *name; double arg1; double arg2; double retval; }; - - void __mingw_raise_matherr (int typ, const char *name, double a1, double a2, - double rslt); - void __mingw_setusermatherr (int (__cdecl *)(struct _exception *)); - _CRTIMP void __setusermatherr(int (__cdecl *)(struct _exception *)); - #define __setusermatherr __mingw_setusermatherr -#endif - - double __cdecl sin(double _X); - double __cdecl cos(double _X); - double __cdecl tan(double _X); - double __cdecl sinh(double _X); - double __cdecl cosh(double _X); - double __cdecl tanh(double _X); - double __cdecl asin(double _X); - double __cdecl acos(double _X); - double __cdecl atan(double _X); - double __cdecl atan2(double _Y,double _X); - double __cdecl exp(double _X); - double __cdecl log(double _X); - double __cdecl log10(double _X); - double __cdecl pow(double _X,double _Y); - double __cdecl sqrt(double _X); - double __cdecl ceil(double _X); - double __cdecl floor(double _X); - -/* 7.12.7.2 The fabs functions: Double in C89 */ - extern float __cdecl fabsf (float x); - extern long double __cdecl fabsl (long double); - extern double __cdecl fabs (double _X); - -#ifndef __CRT__NO_INLINE -#if !defined (__ia64__) - __CRT_INLINE float __cdecl fabsf (float x) - { -#ifdef __x86_64__ - return __builtin_fabsf (x); -#else - float res = 0.0F; - __asm__ __volatile__ ("fabs;" : "=t" (res) : "0" (x)); - return res; -#endif - } - - __CRT_INLINE long double __cdecl fabsl (long double x) - { - long double res = 0.0l; - __asm__ __volatile__ ("fabs;" : "=t" (res) : "0" (x)); - return res; - } - - __CRT_INLINE double __cdecl fabs (double x) - { -#ifdef __x86_64__ - return __builtin_fabs (x); -#else - double res = 0.0; - __asm__ __volatile__ ("fabs;" : "=t" (res) : "0" (x)); - return res; -#endif - } -#endif -#endif - - double __cdecl ldexp(double _X,int _Y); - double __cdecl frexp(double _X,int *_Y); - double __cdecl modf(double _X,double *_Y); - double __cdecl fmod(double _X,double _Y); - - void __cdecl sincos (double __x, double *p_sin, double *p_cos); - void __cdecl sincosl (long double __x, long double *p_sin, long double *p_cos); - void __cdecl sincosf (float __x, float *p_sin, float *p_cos); - -#ifndef _CRT_ABS_DEFINED -#define _CRT_ABS_DEFINED - int __cdecl abs(int _X); - long __cdecl labs(long _X); -#endif -#ifndef _CRT_ATOF_DEFINED -#define _CRT_ATOF_DEFINED - double __cdecl atof(const char *_String); - double __cdecl _atof_l(const char *_String,_locale_t _Locale); -#endif - -#define EDOM 33 -#define ERANGE 34 - -#ifndef __STRICT_ANSI__ +#endif #ifndef _COMPLEX_DEFINED #define _COMPLEX_DEFINED struct _complex { - double x; - double y; + double x,y; }; #endif - _CRTIMP double __cdecl _cabs(struct _complex _ComplexA); - double __cdecl _hypot(double _X,double _Y); - _CRTIMP double __cdecl _j0(double _X); - _CRTIMP double __cdecl _j1(double _X); - _CRTIMP double __cdecl _jn(int _X,double _Y); - _CRTIMP double __cdecl _y0(double _X); - _CRTIMP double __cdecl _y1(double _X); - _CRTIMP double __cdecl _yn(int _X,double _Y); +#define _DOMAIN 1 +#define _SING 2 +#define _OVERFLOW 3 +#define _UNDERFLOW 4 +#define _TLOSS 5 +#define _PLOSS 6 +#define EDOM 33 +#define ERANGE 34 + + _CRTIMP extern double _HUGE; + +#define HUGE_VAL _HUGE +#define _matherrl _matherr + +#ifndef _CRT_ABS_DEFINED +#define _CRT_ABS_DEFINED + int __cdecl abs(int x); + long __cdecl labs(long x); +#endif + double __cdecl acos(double x); + double __cdecl asin(double x); + double __cdecl atan(double x); + double __cdecl atan2(double y, double x); + double __cdecl cos(double x); + double __cdecl cosh(double x); + double __cdecl exp(double x); + double __cdecl fabs(double x); + double __cdecl fmod(double x, double y); + double __cdecl log(double x); + double __cdecl log10(double x); + double __cdecl pow(double x, double y); + double __cdecl sin(double x); + double __cdecl sinh(double x); + double __cdecl sqrt(double x); + double __cdecl tan(double x); + double __cdecl tanh(double x); #ifndef _CRT_MATHERR_DEFINED #define _CRT_MATHERR_DEFINED - _CRTIMP int __cdecl _matherr (struct _exception *); -#endif - -/* These are also declared in Mingw float.h; needed here as well to work - around GCC build issues. */ -/* BEGIN FLOAT.H COPY */ -/* - * IEEE recommended functions - */ + int __cdecl _matherr(struct _exception *except); +#endif + +#ifndef _CRT_ATOF_DEFINED +#define _CRT_ATOF_DEFINED + _CRTIMP double __cdecl atof(const char *str); + _CRTIMP double __cdecl _atof_l(const char *str ,_locale_t locale); +#endif #ifndef _SIGN_DEFINED #define _SIGN_DEFINED - _CRTIMP double __cdecl _chgsign (double _X); - _CRTIMP double __cdecl _copysign (double _Number,double _Sign); - _CRTIMP double __cdecl _logb (double); - _CRTIMP double __cdecl _nextafter (double, double); - _CRTIMP double __cdecl _scalb (double, long); - _CRTIMP int __cdecl _finite (double); - _CRTIMP int __cdecl _fpclass (double); - _CRTIMP int __cdecl _isnan (double); -#endif - -/* END FLOAT.H COPY */ - -#if !defined(NO_OLDNAMES) - -_CRTIMP double __cdecl j0 (double); -_CRTIMP double __cdecl j1 (double); -_CRTIMP double __cdecl jn (int, double); -_CRTIMP double __cdecl y0 (double); -_CRTIMP double __cdecl y1 (double); -_CRTIMP double __cdecl yn (int, double); - -_CRTIMP double __cdecl chgsign (double); -/* - * scalb() is a GCC built-in. - * Exclude this _scalb() stub; the semantics are incompatible - * with the built-in implementation. - * -_CRTIMP double __cdecl scalb (double, long); - * - */ - _CRTIMP int __cdecl finite (double); - _CRTIMP int __cdecl fpclass (double); - -#define FP_SNAN _FPCLASS_SNAN -#define FP_QNAN _FPCLASS_QNAN -#define FP_NINF _FPCLASS_NINF -#define FP_PINF _FPCLASS_PINF -#define FP_NDENORM _FPCLASS_ND -#define FP_PDENORM _FPCLASS_PD -#define FP_NZERO _FPCLASS_NZ -#define FP_PZERO _FPCLASS_PZ -#define FP_NNORM _FPCLASS_NN -#define FP_PNORM _FPCLASS_PN - -#endif /* !defined (_NO_OLDNAMES) && !define (NO_OLDNAMES) */ - -#if(defined(_X86_) && !defined(__x86_64)) - _CRTIMP int __cdecl _set_SSE2_enable(int _Flag); -#endif - -#endif + _CRTIMP double __cdecl _copysign(double x,double sgn); + _CRTIMP double __cdecl _chgsign(double x); +#endif + _CRTIMP double __cdecl _cabs(struct _complex a); + _CRTIMP double __cdecl ceil(double x); + _CRTIMP double __cdecl floor(double x); + _CRTIMP double __cdecl frexp(double x, int *y); + _CRTIMP double __cdecl _hypot(double x, double y); + _CRTIMP double __cdecl _j0(double x); + _CRTIMP double __cdecl _j1(double x); + _CRTIMP double __cdecl _jn(int x, double y); + _CRTIMP double __cdecl ldexp(double x, int y); + _CRTIMP double __cdecl modf(double x, double *y); + _CRTIMP double __cdecl _y0(double x); + _CRTIMP double __cdecl _y1(double x); + _CRTIMP double __cdecl _yn(int x, double y); + _CRTIMP float __cdecl _hypotf(float x, float y); + +#if defined(__i386__) || defined(_M_IX86) + _CRTIMP int __cdecl _set_SSE2_enable(int flag); +#endif + +#if defined(__x86_64) || defined(_M_AMD64) + _CRTIMP float __cdecl _copysignf(float x, float sgn); + _CRTIMP float __cdecl _chgsignf(float x); + _CRTIMP float __cdecl _logbf(float x); + _CRTIMP float __cdecl _nextafterf(float x,float y); + _CRTIMP int __cdecl _finitef(float x); + _CRTIMP int __cdecl _isnanf(float x); + _CRTIMP int __cdecl _fpclassf(float x); +#endif + +#if defined(__ia64__) || defined (_M_IA64) + _CRTIMP float __cdecl fabsf(float x); + _CRTIMP float __cdecl ldexpf(float x, int y); + _CRTIMP long double __cdecl tanl(long double x); +#else + __CRT_INLINE float __cdecl fabsf(float x) { return ((float)fabs((double)x)); } + __CRT_INLINE float __cdecl ldexpf(float x, int expn) { return (float)ldexp (x, expn); } + __CRT_INLINE long double tanl(long double x) { return (tan((double)x)); } +#endif + +#if (_WIN32_WINNT >= 0x600) && \ + (defined(__x86_64) || defined(_M_AMD64) || \ + defined (__ia64__) || defined (_M_IA64)) + _CRTIMP float __cdecl acosf(float x); + _CRTIMP float __cdecl asinf(float x); + _CRTIMP float __cdecl atanf(float x); + _CRTIMP float __cdecl atan2f(float x, float y); + _CRTIMP float __cdecl ceilf(float x); + _CRTIMP float __cdecl cosf(float x); + _CRTIMP float __cdecl coshf(float x); + _CRTIMP float __cdecl expf(float x); + _CRTIMP float __cdecl floorf(float x); + _CRTIMP float __cdecl fmodf(float x, float y); + _CRTIMP float __cdecl logf(float x); + _CRTIMP float __cdecl log10f(float x); + _CRTIMP float __cdecl modff(float x, float *y); + _CRTIMP float __cdecl powf(float b, float e); + _CRTIMP float __cdecl sinf(float x); + _CRTIMP float __cdecl sinhf(float x); + _CRTIMP float __cdecl sqrtf(float x); + _CRTIMP float __cdecl tanf(float x); + _CRTIMP float __cdecl tanhf(float x); +#else + __CRT_INLINE float acosf(float x) { return ((float)acos((double)x)); } + __CRT_INLINE float asinf(float x) { return ((float)asin((double)x)); } + __CRT_INLINE float atanf(float x) { return ((float)atan((double)x)); } + __CRT_INLINE float atan2f(float x,float y) { return ((float)atan2((double)x,(double)y)); } + __CRT_INLINE float ceilf(float x) { return ((float)ceil((double)x)); } + __CRT_INLINE float cosf(float x) { return ((float)cos((double)x)); } + __CRT_INLINE float coshf(float x) { return ((float)cosh((double)x)); } + __CRT_INLINE float expf(float x) { return ((float)exp((double)x)); } + __CRT_INLINE float floorf(float x) { return ((float)floor((double)x)); } + __CRT_INLINE float fmodf(float x,float y) { return ((float)fmod((double)x,(double)y)); } + __CRT_INLINE float logf(float x) { return ((float)log((double)x)); } + __CRT_INLINE float log10f(float x) { return ((float)log10((double)x)); } + __CRT_INLINE float modff(float x,float *y) { + double _Di,_Df = modf((double)x,&_Di); + *y = (float)_Di; + return ((float)_Df); + } + __CRT_INLINE float powf(float x,float y) { return ((float)pow((double)x,(double)y)); } + __CRT_INLINE float sinf(float x) { return ((float)sin((double)x)); } + __CRT_INLINE float sinhf(float x) { return ((float)sinh((double)x)); } + __CRT_INLINE float sqrtf(float x) { return ((float)sqrt((double)x)); } + __CRT_INLINE float tanf(float x) { return ((float)tan((double)x)); } + __CRT_INLINE float tanhf(float x) { return ((float)tanh((double)x)); } +#endif + + __CRT_INLINE long double acosl(long double x) { return (acos((double)x)); } + __CRT_INLINE long double asinl(long double x) { return (asin((double)x)); } + __CRT_INLINE long double atanl(long double x) { return (atan((double)x)); } + __CRT_INLINE long double atan2l(long double y, long double x) { return (atan2((double)y, (double)x)); } + __CRT_INLINE long double ceill(long double x) { return (ceil((double)x)); } + __CRT_INLINE long double cosl(long double x) { return (cos((double)x)); } + __CRT_INLINE long double coshl(long double x) { return (cosh((double)x)); } + __CRT_INLINE long double expl(long double x) { return (exp((double)x)); } + __CRT_INLINE long double floorl(long double x) { return (floor((double)x)); } + __CRT_INLINE long double fmodl(long double x, long double y) { return (fmod((double)x, (double)y)); } + __CRT_INLINE long double frexpl(long double x, int *y) { return (frexp((double)x, y)); } + __CRT_INLINE long double logl(long double x) { return (log((double)x)); } + __CRT_INLINE long double log10l(long double x) { return (log10((double)x)); } + __CRT_INLINE long double powl(long double x, long double y) { return (pow((double)x, (double)y)); } + __CRT_INLINE long double sinl(long double x) { return (sin((double)x)); } + __CRT_INLINE long double sinhl(long double x) { return (sinh((double)x)); } + __CRT_INLINE long double sqrtl(long double x) { return (sqrt((double)x)); } + __CRT_INLINE long double tanhl(long double x) {return (tanh((double)x)); } + __CRT_INLINE long double __cdecl fabsl(long double x) { return fabs((double)x); } + __CRT_INLINE long double _chgsignl(long double _Number) { return _chgsign((double)(_Number)); } + __CRT_INLINE long double _copysignl(long double _Number, long double _Sign) { return _copysign((double)(_Number),(double)(_Sign)); } + __CRT_INLINE long double _hypotl(long double x,long double y) { return _hypot((double)(x),(double)(y)); } + __CRT_INLINE float frexpf(float x, int *y) { return ((float)frexp((double)x,y)); } + __CRT_INLINE long double ldexpl(long double x, int y) { return ldexp((double)x, y); } + __CRT_INLINE long double modfl(long double x,long double *y) { + double _Di,_Df = modf((double)x,&_Di); + *y = (long double)_Di; + return (_Df); + } + +#ifndef NO_OLDNAMES +#define DOMAIN _DOMAIN +#define SING _SING +#define OVERFLOW _OVERFLOW +#define UNDERFLOW _UNDERFLOW +#define TLOSS _TLOSS +#define PLOSS _PLOSS +#define matherr _matherr +#define HUGE _HUGE + // _CRTIMP double __cdecl cabs(struct _complex x); + #define cabs _cabs + _CRTIMP double __cdecl hypot(double x,double y); + _CRTIMP double __cdecl j0(double x); + _CRTIMP double __cdecl j1(double x); + _CRTIMP double __cdecl jn(int x,double y); + _CRTIMP double __cdecl y0(double x); + _CRTIMP double __cdecl y1(double x); + _CRTIMP double __cdecl yn(int x,double y); + __CRT_INLINE float __cdecl hypotf(float x, float y) { return (float) hypot (x, y); } +#endif + +#ifdef __cplusplus +} +extern "C++" { + template<class _Ty> inline _Ty _Pow_int(_Ty x,int y) { + unsigned int _N; + if(y >= 0) _N = (unsigned int)y; + else _N = (unsigned int)(-y); + for(_Ty _Z = _Ty(1);;x *= x) { + if((_N & 1)!=0) _Z *= x; + if((_N >>= 1)==0) return (y < 0 ? _Ty(1) / _Z : _Z); + } + } +} +#endif + +#pragma pack(pop) + +#endif /* !_INC_MATH */ + +#if defined(_USE_MATH_DEFINES) && !defined(_MATH_DEFINES_DEFINED) +#define _MATH_DEFINES_DEFINED + +#define M_E 2.71828182845904523536 +#define M_LOG2E 1.44269504088896340736 +#define M_LOG10E 0.434294481903251827651 +#define M_LN2 0.693147180559945309417 +#define M_LN10 2.30258509299404568402 +#define M_PI 3.14159265358979323846 +#define M_PI_2 1.57079632679489661923 +#define M_PI_4 0.785398163397448309616 +#define M_1_PI 0.318309886183790671538 +#define M_2_PI 0.636619772367581343076 +#define M_2_SQRTPI 1.12837916709551257390 +#define M_SQRT2 1.41421356237309504880 +#define M_SQRT1_2 0.707106781186547524401 + +#endif /* _USE_MATH_DEFINES */ #ifndef __NO_ISOCEXT #if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) \ - || !defined __STRICT_ANSI__ || defined __cplusplus - -#if __MINGW_GNUC_PREREQ(3, 3) -#define HUGE_VALF __builtin_huge_valf() -#define HUGE_VALL __builtin_huge_vall() -#define INFINITY __builtin_inf() -#define NAN __builtin_nan("") -#else -extern const float __INFF; -#define HUGE_VALF __INFF -extern const long double __INFL; -#define HUGE_VALL __INFL -#define INFINITY HUGE_VALF -extern const double __QNAN; -#define NAN __QNAN -#endif /* __MINGW_GNUC_PREREQ(3, 3) */ - -/* Use the compiler's builtin define for FLT_EVAL_METHOD to - set float_t and double_t. */ -#if defined(__FLT_EVAL_METHOD__) -# if ( __FLT_EVAL_METHOD__== 0) -typedef float float_t; -typedef double double_t; -# elif (__FLT_EVAL_METHOD__ == 1) -typedef double float_t; -typedef double double_t; -# elif (__FLT_EVAL_METHOD__ == 2) -typedef long double float_t; -typedef long double double_t; -#endif -#else /* ix87 FPU default */ -typedef long double float_t; -typedef long double double_t; -#endif - -/* 7.12.3.1 */ -/* - Return values for fpclassify. - These are based on Intel x87 fpu condition codes - in the high byte of status word and differ from - the return values for MS IEEE 754 extension _fpclass() -*/ -#define FP_NAN 0x0100 -#define FP_NORMAL 0x0400 -#define FP_INFINITE (FP_NAN | FP_NORMAL) -#define FP_ZERO 0x4000 -#define FP_SUBNORMAL (FP_NORMAL | FP_ZERO) -/* 0x0200 is signbit mask */ - -/* - We can't inline float or double, because we want to ensure truncation - to semantic type before classification. - (A normal long double value might become subnormal when - converted to double, and zero when converted to float.) -*/ - - extern int __cdecl __fpclassifyl (long double); - extern int __cdecl __fpclassifyf (float); - extern int __cdecl __fpclassify (double); - -#ifndef __CRT__NO_INLINE - __CRT_INLINE int __cdecl __fpclassifyl (long double x) { - unsigned short sw; - __asm__ __volatile__ ("fxam; fstsw %%ax;" : "=a" (sw): "t" (x)); - return sw & (FP_NAN | FP_NORMAL | FP_ZERO ); - } - __CRT_INLINE int __cdecl __fpclassify (double x) { -#ifdef __x86_64__ - __mingw_dbl_type_t hlp; - unsigned int l, h; - - hlp.x = x; - h = hlp.lh.high; - l = hlp.lh.low | (h & 0xfffff); - h &= 0x7ff00000; - if ((h | l) == 0) - return FP_ZERO; - if (!h) - return FP_SUBNORMAL; - if (h == 0x7ff00000) - return (l ? FP_NAN : FP_INFINITE); - return FP_NORMAL; -#else - unsigned short sw; - __asm__ __volatile__ ("fxam; fstsw %%ax;" : "=a" (sw): "t" (x)); - return sw & (FP_NAN | FP_NORMAL | FP_ZERO ); -#endif - } - __CRT_INLINE int __cdecl __fpclassifyf (float x) { -#ifdef __x86_64__ - __mingw_flt_type_t hlp; - - hlp.x = x; - hlp.val &= 0x7fffffff; - if (hlp.val == 0) - return FP_ZERO; - if (hlp.val < 0x800000) - return FP_SUBNORMAL; - if (hlp.val >= 0x7f800000) - return (hlp.val > 0x7f800000 ? FP_NAN : FP_INFINITE); - return FP_NORMAL; -#else - unsigned short sw; - __asm__ __volatile__ ("fxam; fstsw %%ax;" : "=a" (sw): "t" (x)); - return sw & (FP_NAN | FP_NORMAL | FP_ZERO ); -#endif - } -#endif - -#define fpclassify(x) (sizeof (x) == sizeof (float) ? __fpclassifyf (x) \ - : sizeof (x) == sizeof (double) ? __fpclassify (x) \ - : __fpclassifyl (x)) - -/* 7.12.3.2 */ -#define isfinite(x) ((fpclassify(x) & FP_NAN) == 0) - -/* 7.12.3.3 */ -#define isinf(x) (fpclassify(x) == FP_INFINITE) - -/* 7.12.3.4 */ -/* We don't need to worry about truncation here: - A NaN stays a NaN. */ - - extern int __cdecl __isnan (double); - extern int __cdecl __isnanf (float); - extern int __cdecl __isnanl (long double); - -#ifndef __CRT__NO_INLINE - __CRT_INLINE int __cdecl __isnan (double _x) - { -#ifdef __x86_64__ - __mingw_dbl_type_t hlp; - int l, h; - - hlp.x = _x; - l = hlp.lh.low; - h = hlp.lh.high & 0x7fffffff; - h |= (unsigned int) (l | -l) >> 31; - h = 0x7ff00000 - h; - return (int) ((unsigned int) h) >> 31; -#else - unsigned short sw; - __asm__ __volatile__ ("fxam;" - "fstsw %%ax": "=a" (sw) : "t" (_x)); - return (sw & (FP_NAN | FP_NORMAL | FP_INFINITE | FP_ZERO | FP_SUBNORMAL)) - == FP_NAN; -#endif - } - - __CRT_INLINE int __cdecl __isnanf (float _x) - { -#ifdef __x86_64__ - __mingw_flt_type_t hlp; - int i; - - hlp.x = _x; - i = hlp.val & 0x7fffffff; - i = 0x7f800000 - i; - return (int) (((unsigned int) i) >> 31); -#else - unsigned short sw; - __asm__ __volatile__ ("fxam;" - "fstsw %%ax": "=a" (sw) : "t" (_x)); - return (sw & (FP_NAN | FP_NORMAL | FP_INFINITE | FP_ZERO | FP_SUBNORMAL)) - == FP_NAN; -#endif - } - - __CRT_INLINE int __cdecl __isnanl (long double _x) - { - unsigned short sw; - __asm__ __volatile__ ("fxam;" - "fstsw %%ax": "=a" (sw) : "t" (_x)); - return (sw & (FP_NAN | FP_NORMAL | FP_INFINITE | FP_ZERO | FP_SUBNORMAL)) - == FP_NAN; - } -#endif - -#define isnan(x) (sizeof (x) == sizeof (float) ? __isnanf (x) \ - : sizeof (x) == sizeof (double) ? __isnan (x) \ - : __isnanl (x)) - -/* 7.12.3.5 */ -#define isnormal(x) (fpclassify(x) == FP_NORMAL) - -/* 7.12.3.6 The signbit macro */ - extern int __cdecl __signbit (double); - extern int __cdecl __signbitf (float); - extern int __cdecl __signbitl (long double); -#ifndef __CRT__NO_INLINE - __CRT_INLINE int __cdecl __signbit (double x) { -#ifdef __x86_64__ - __mingw_dbl_type_t hlp; - - hlp.x = x; - return ((hlp.lh.high & 0x80000000) != 0); -#else - unsigned short stw; - __asm__ __volatile__ ( "fxam; fstsw %%ax;": "=a" (stw) : "t" (x)); - return stw & 0x0200; -#endif - } - - __CRT_INLINE int __cdecl __signbitf (float x) { -#ifdef __x86_64__ - __mingw_flt_type_t hlp; - hlp.x = x; - return ((hlp.val & 0x80000000) != 0); -#else - unsigned short stw; - __asm__ __volatile__ ("fxam; fstsw %%ax;": "=a" (stw) : "t" (x)); - return stw & 0x0200; -#endif - } - - __CRT_INLINE int __cdecl __signbitl (long double x) { - unsigned short stw; - __asm__ __volatile__ ("fxam; fstsw %%ax;": "=a" (stw) : "t" (x)); - return stw & 0x0200; - } -#endif - -#define signbit(x) (sizeof (x) == sizeof (float) ? __signbitf (x) \ - : sizeof (x) == sizeof (double) ? __signbit (x) \ - : __signbitl (x)) - -/* 7.12.4 Trigonometric functions: Double in C89 */ - extern float __cdecl sinf(float _X); - extern long double __cdecl sinl(long double); - - extern float __cdecl cosf(float _X); - extern long double __cdecl cosl(long double); - - extern float __cdecl tanf(float _X); - extern long double __cdecl tanl(long double); - extern float __cdecl asinf(float _X); - extern long double __cdecl asinl(long double); - - extern float __cdecl acosf (float); - extern long double __cdecl acosl (long double); - - extern float __cdecl atanf (float); - extern long double __cdecl atanl (long double); - - extern float __cdecl atan2f (float, float); - extern long double __cdecl atan2l (long double, long double); - -/* 7.12.5 Hyperbolic functions: Double in C89 */ - extern float __cdecl sinhf(float _X); -#ifndef __CRT__NO_INLINE - __CRT_INLINE float sinhf(float _X) { return ((float)sinh((double)_X)); } -#endif - extern long double __cdecl sinhl(long double); - - extern float __cdecl coshf(float _X); -#ifndef __CRT__NO_INLINE - __CRT_INLINE float coshf(float _X) { return ((float)cosh((double)_X)); } -#endif - extern long double __cdecl coshl(long double); - - extern float __cdecl tanhf(float _X); -#ifndef __CRT__NO_INLINE - __CRT_INLINE float tanhf(float _X) { return ((float)tanh((double)_X)); } -#endif - extern long double __cdecl tanhl(long double); - -/* Inverse hyperbolic trig functions */ -/* 7.12.5.1 */ + || !defined __STRICT_ANSI__ || defined __GLIBCPP__ + + /* Inverse hyperbolic trig functions */ + /* 7.12.5.1 */ extern double __cdecl acosh (double); extern float __cdecl acoshf (float); extern long double __cdecl acoshl (long double); -/* 7.12.5.2 */ + /* 7.12.5.2 */ extern double __cdecl asinh (double); extern float __cdecl asinhf (float); extern long double __cdecl asinhl (long double); -/* 7.12.5.3 */ + /* 7.12.5.3 */ extern double __cdecl atanh (double); extern float __cdecl atanhf (float); extern long double __cdecl atanhl (long double); - -/* Exponentials and logarithms */ -/* 7.12.6.1 Double in C89 */ - extern float __cdecl expf(float _X); -#ifndef __CRT__NO_INLINE - __CRT_INLINE float expf(float _X) { return ((float)exp((double)_X)); } -#endif - extern long double __cdecl expl(long double); - -/* 7.12.6.2 */ + + /* 7.12.6.2 */ extern double __cdecl exp2(double); extern float __cdecl exp2f(float); extern long double __cdecl exp2l(long double); - -/* 7.12.6.3 The expm1 functions */ -/* TODO: These could be inlined */ - extern double __cdecl expm1(double); - extern float __cdecl expm1f(float); - extern long double __cdecl expm1l(long double); - -/* 7.12.6.4 Double in C89 */ - extern float frexpf(float _X,int *_Y); -#ifndef __CRT__NO_INLINE - __CRT_INLINE float frexpf(float _X,int *_Y) { return ((float)frexp((double)_X,_Y)); } -#endif - extern long double __cdecl frexpl(long double,int *); - -/* 7.12.6.5 */ -#define FP_ILOGB0 ((int)0x80000000) -#define FP_ILOGBNAN ((int)0x80000000) - extern int __cdecl ilogb (double); - extern int __cdecl ilogbf (float); - extern int __cdecl ilogbl (long double); - -/* 7.12.6.6 Double in C89 */ - extern float __cdecl ldexpf(float _X,int _Y); -#ifndef __CRT__NO_INLINE - __CRT_INLINE float __cdecl ldexpf (float x, int expn) { return (float) ldexp ((double)x, expn); } -#endif - extern long double __cdecl ldexpl (long double, int); - -/* 7.12.6.7 Double in C89 */ - extern float __cdecl logf (float); - extern long double __cdecl logl(long double); - -/* 7.12.6.8 Double in C89 */ - extern float __cdecl log10f (float); - extern long double __cdecl log10l(long double); - -/* 7.12.6.9 */ - extern double __cdecl log1p(double); - extern float __cdecl log1pf(float); - extern long double __cdecl log1pl(long double); - -/* 7.12.6.10 */ + + /* 7.12.6.10 */ extern double __cdecl log2 (double); extern float __cdecl log2f (float); extern long double __cdecl log2l (long double); - -/* 7.12.6.11 */ - extern double __cdecl logb (double); - extern float __cdecl logbf (float); - extern long double __cdecl logbl (long double); - -/* Inline versions. GCC-4.0+ can do a better fast-math optimization - with __builtins. */ -#ifndef __CRT__NO_INLINE -#if !(__MINGW_GNUC_PREREQ (4, 0) && defined (__FAST_MATH__)) - __CRT_INLINE double __cdecl logb (double x) - { -#ifdef __x86_64__ - __mingw_dbl_type_t hlp; - int lx, hx; - - hlp.x = x; - lx = hlp.lh.low; - hx = hlp.lh.high & 0x7fffffff; /* high |x| */ - if ((hx | lx) == 0) - return -1.0 / fabs (x); - if (hx >= 0x7ff00000) - return x * x; - if ((hx >>= 20) == 0) /* IEEE 754 logb */ - return -1022.0; - return (double) (hx - 1023); -#else - double res = 0.0; - __asm__ __volatile__ ("fxtract\n\t" - "fstp %%st" : "=t" (res) : "0" (x)); - return res; -#endif - } - - __CRT_INLINE float __cdecl logbf (float x) - { -#ifdef __x86_64__ - int v; - __mingw_flt_type_t hlp; - - hlp.x = x; - v = hlp.val & 0x7fffffff; /* high |x| */ - if (!v) - return (float)-1.0 / fabsf (x); - if (v >= 0x7f800000) - return x * x; - if ((v >>= 23) == 0) /* IEEE 754 logb */ - return -126.0; - return (float) (v - 127); -#else - float res = 0.0F; - __asm__ __volatile__ ("fxtract\n\t" - "fstp %%st" : "=t" (res) : "0" (x)); - return res; -#endif - } - - __CRT_INLINE long double __cdecl logbl (long double x) - { - long double res = 0.0l; - __asm__ __volatile__ ("fxtract\n\t" - "fstp %%st" : "=t" (res) : "0" (x)); - return res; - } -#endif /* !defined __FAST_MATH__ || !__MINGW_GNUC_PREREQ (4, 0) */ -#endif /* __CRT__NO_INLINE */ - -/* 7.12.6.12 Double in C89 */ - extern float __cdecl modff (float, float*); - extern long double __cdecl modfl (long double, long double*); - -/* 7.12.6.13 */ - extern double __cdecl scalbn (double, int); - extern float __cdecl scalbnf (float, int); - extern long double __cdecl scalbnl (long double, int); - - extern double __cdecl scalbln (double, long); - extern float __cdecl scalblnf (float, long); - extern long double __cdecl scalblnl (long double, long); - -/* 7.12.7.1 */ -/* Implementations adapted from Cephes versions */ - extern double __cdecl cbrt (double); - extern float __cdecl cbrtf (float); - extern long double __cdecl cbrtl (long double); - -/* 7.12.7.3 */ - extern double __cdecl hypot (double, double); - extern float __cdecl hypotf (float x, float y); -#ifndef __CRT__NO_INLINE - __CRT_INLINE float __cdecl hypotf (float x, float y) { return (float) hypot ((double)x, (double)y);} -#endif - extern long double __cdecl hypotl (long double, long double); - -/* 7.12.7.4 The pow functions. Double in C89 */ - extern float __cdecl powf(float _X,float _Y); -#ifndef __CRT__NO_INLINE - __CRT_INLINE float powf(float _X,float _Y) { return ((float)pow((double)_X,(double)_Y)); } -#endif - extern long double __cdecl powl (long double, long double); - -/* 7.12.7.5 The sqrt functions. Double in C89. */ - extern float __cdecl sqrtf (float); - extern long double sqrtl(long double); - -/* 7.12.8.1 The erf functions */ - extern double __cdecl erf (double); - extern float __cdecl erff (float); - extern long double __cdecl erfl (long double); - -/* 7.12.8.2 The erfc functions */ - extern double __cdecl erfc (double); - extern float __cdecl erfcf (float); - extern long double __cdecl erfcl (long double); - -/* 7.12.8.3 The lgamma functions */ - extern double __cdecl lgamma (double); - extern float __cdecl lgammaf (float); - extern long double __cdecl lgammal (long double); - -/* 7.12.8.4 The tgamma functions */ - extern double __cdecl tgamma (double); - extern float __cdecl tgammaf (float); - extern long double __cdecl tgammal (long double); - -/* 7.12.9.1 Double in C89 */ - extern float __cdecl ceilf (float); - extern long double __cdecl ceill (long double); - -/* 7.12.9.2 Double in C89 */ - extern float __cdecl floorf (float); - extern long double __cdecl floorl (long double); - -/* 7.12.9.3 */ - extern double __cdecl nearbyint ( double); - extern float __cdecl nearbyintf (float); - extern long double __cdecl nearbyintl (long double); - -/* 7.12.9.4 */ -/* round, using fpu control word settings */ -extern double __cdecl rint (double); -extern float __cdecl rintf (float); -extern long double __cdecl rintl (long double); - -/* 7.12.9.5 */ -extern long __cdecl lrint (double); -extern long __cdecl lrintf (float); -extern long __cdecl lrintl (long double); - -__MINGW_EXTENSION long long __cdecl llrint (double); -__MINGW_EXTENSION long long __cdecl llrintf (float); -__MINGW_EXTENSION long long __cdecl llrintl (long double); - -/* Inline versions of above. - GCC 4.0+ can do a better fast-math job with __builtins. */ - -#ifndef __CRT__NO_INLINE -#if !(__MINGW_GNUC_PREREQ (4, 0) && defined __FAST_MATH__ ) - __CRT_INLINE double __cdecl rint (double x) - { - double retval = 0.0; - __asm__ __volatile__ ("frndint;": "=t" (retval) : "0" (x)); - return retval; - } - - __CRT_INLINE float __cdecl rintf (float x) - { - float retval = 0.0; - __asm__ __volatile__ ("frndint;" : "=t" (retval) : "0" (x) ); - return retval; - } - - __CRT_INLINE long double __cdecl rintl (long double x) - { - long double retval = 0.0l; - __asm__ __volatile__ ("frndint;" : "=t" (retval) : "0" (x) ); - return retval; - } - - __CRT_INLINE long __cdecl lrint (double x) - { - long retval = 0; - __asm__ __volatile__ \ - ("fistpl %0" : "=m" (retval) : "t" (x) : "st"); \ - return retval; - } - - __CRT_INLINE long __cdecl lrintf (float x) - { - long retval = 0; - __asm__ __volatile__ \ - ("fistpl %0" : "=m" (retval) : "t" (x) : "st"); \ - return retval; - } - - __CRT_INLINE long __cdecl lrintl (long double x) - { - long retval = 0; - __asm__ __volatile__ \ - ("fistpl %0" : "=m" (retval) : "t" (x) : "st"); \ - return retval; - } - - __MINGW_EXTENSION __CRT_INLINE long long __cdecl llrint (double x) - { - __MINGW_EXTENSION long long retval = 0ll; - __asm__ __volatile__ \ - ("fistpll %0" : "=m" (retval) : "t" (x) : "st"); \ - return retval; - } - - __MINGW_EXTENSION __CRT_INLINE long long __cdecl llrintf (float x) - { - __MINGW_EXTENSION long long retval = 0ll; - __asm__ __volatile__ \ - ("fistpll %0" : "=m" (retval) : "t" (x) : "st"); \ - return retval; - } - - __MINGW_EXTENSION __CRT_INLINE long long __cdecl llrintl (long double x) - { - __MINGW_EXTENSION long long retval = 0ll; - __asm__ __volatile__ \ - ("fistpll %0" : "=m" (retval) : "t" (x) : "st"); \ - return retval; - } -#endif /* !__FAST_MATH__ || !__MINGW_GNUC_PREREQ (4,0) */ -#endif /* !__CRT__NO_INLINE */ - -/* 7.12.9.6 */ -/* round away from zero, regardless of fpu control word settings */ - extern double __cdecl round (double); - extern float __cdecl roundf (float); - extern long double __cdecl roundl (long double); - -/* 7.12.9.7 */ - extern long __cdecl lround (double); - extern long __cdecl lroundf (float); - extern long __cdecl lroundl (long double); - __MINGW_EXTENSION long long __cdecl llround (double); - __MINGW_EXTENSION long long __cdecl llroundf (float); - __MINGW_EXTENSION long long __cdecl llroundl (long double); -/* 7.12.9.8 */ -/* round towards zero, regardless of fpu control word settings */ + /* 7.12.9.8 */ + /* round towards zero, regardless of fpu control word settings */ extern double __cdecl trunc (double); extern float __cdecl truncf (float); extern long double __cdecl truncl (long double); -/* 7.12.10.1 Double in C89 */ - extern float __cdecl fmodf (float, float); - extern long double __cdecl fmodl (long double, long double); - -/* 7.12.10.2 */ - extern double __cdecl remainder (double, double); - extern float __cdecl remainderf (float, float); - extern long double __cdecl remainderl (long double, long double); - -/* 7.12.10.3 */ - extern double __cdecl remquo(double, double, int *); - extern float __cdecl remquof(float, float, int *); - extern long double __cdecl remquol(long double, long double, int *); - -/* 7.12.11.1 */ - extern double __cdecl copysign (double, double); /* in libmoldname.a */ - extern float __cdecl copysignf (float, float); - extern long double __cdecl copysignl (long double, long double); - -#ifndef __CRT__NO_INLINE -#if !defined (__ia64__) - __CRT_INLINE double __cdecl copysign (double x, double y) - { - __mingw_dbl_type_t hx, hy; - hx.x = x; hy.x = y; - hx.lh.high = (hx.lh.high & 0x7fffffff) | (hy.lh.high & 0x80000000); - return hx.x; - } - __CRT_INLINE float __cdecl copysignf (float x, float y) - { - __mingw_flt_type_t hx, hy; - hx.x = x; hy.x = y; - hx.val = (hx.val & 0x7fffffff) | (hy.val & 0x80000000); - return hx.x; - } -#endif -#endif - -/* 7.12.11.2 Return a NaN */ - extern double __cdecl nan(const char *tagp); - extern float __cdecl nanf(const char *tagp); - extern long double __cdecl nanl(const char *tagp); - -#ifndef __STRICT_ANSI__ -#define _nan() nan("") -#define _nanf() nanf("") -#define _nanl() nanl("") -#endif - -/* 7.12.11.3 */ - extern double __cdecl nextafter (double, double); /* in libmoldname.a */ - extern float __cdecl nextafterf (float, float); - extern long double __cdecl nextafterl (long double, long double); - -/* 7.12.11.4 The nexttoward functions */ - extern double __cdecl nexttoward (double, long double); - extern float __cdecl nexttowardf (float, long double); - extern long double __cdecl nexttowardl (long double, long double); - -/* 7.12.12.1 */ -/* x > y ? (x - y) : 0.0 */ - extern double __cdecl fdim (double x, double y); - extern float __cdecl fdimf (float x, float y); - extern long double __cdecl fdiml (long double x, long double y); - -/* fmax and fmin. - NaN arguments are treated as missing data: if one argument is a NaN - and the other numeric, then these functions choose the numeric - value. */ - -/* 7.12.12.2 */ - extern double __cdecl fmax (double, double); - extern float __cdecl fmaxf (float, float); - extern long double __cdecl fmaxl (long double, long double); - -/* 7.12.12.3 */ - extern double __cdecl fmin (double, double); - extern float __cdecl fminf (float, float); - extern long double __cdecl fminl (long double, long double); - -/* 7.12.13.1 */ -/* return x * y + z as a ternary op */ - extern double __cdecl fma (double, double, double); - extern float __cdecl fmaf (float, float, float); - extern long double __cdecl fmal (long double, long double, long double); - -/* 7.12.14 */ -/* - * With these functions, comparisons involving quiet NaNs set the FP - * condition code to "unordered". The IEEE floating-point spec - * dictates that the result of floating-point comparisons should be - * false whenever a NaN is involved, with the exception of the != op, - * which always returns true: yes, (NaN != NaN) is true). - */ - -#if __GNUC__ >= 3 - -#define isgreater(x, y) __builtin_isgreater(x, y) -#define isgreaterequal(x, y) __builtin_isgreaterequal(x, y) -#define isless(x, y) __builtin_isless(x, y) -#define islessequal(x, y) __builtin_islessequal(x, y) -#define islessgreater(x, y) __builtin_islessgreater(x, y) -#define isunordered(x, y) __builtin_isunordered(x, y) - -#else -/* helper */ -#ifndef __CRT__NO_INLINE - __CRT_INLINE int __cdecl - __fp_unordered_compare (long double x, long double y){ - unsigned short retval; - __asm__ __volatile__ ("fucom %%st(1);" - "fnstsw;": "=a" (retval) : "t" (x), "u" (y)); - return retval; - } -#endif - -#define isgreater(x, y) ((__fp_unordered_compare(x, y) & 0x4500) == 0) -#define isless(x, y) ((__fp_unordered_compare (y, x) & 0x4500) == 0) -#define isgreaterequal(x, y) ((__fp_unordered_compare (x, y) & FP_INFINITE) == 0) -#define islessequal(x, y) ((__fp_unordered_compare(y, x) & FP_INFINITE) == 0) -#define islessgreater(x, y) ((__fp_unordered_compare(x, y) & FP_SUBNORMAL) == 0) -#define isunordered(x, y) ((__fp_unordered_compare(x, y) & 0x4500) == 0x4500) - -#endif - #endif /* __STDC_VERSION__ >= 199901L */ #endif /* __NO_ISOCEXT */ - -#if defined(_X86_) && !defined(__x86_64) - _CRTIMP float __cdecl _hypotf(float _X,float _Y); -#endif - -#if !defined(__ia64__) - _CRTIMP float __cdecl _copysignf (float _Number,float _Sign); - _CRTIMP float __cdecl _chgsignf (float _X); - _CRTIMP float __cdecl _logbf(float _X); - _CRTIMP float __cdecl _nextafterf(float _X,float _Y); - _CRTIMP int __cdecl _finitef(float _X); - _CRTIMP int __cdecl _isnanf(float _X); - _CRTIMP int __cdecl _fpclassf(float _X); -#endif - -#ifdef _SIGN_DEFINED - extern long double __cdecl _chgsignl (long double); -#define _copysignl copysignl -#endif /* _SIGN_DEFINED */ - -#define _hypotl hypotl - -#ifndef NO_OLDNAMES -#define matherr _matherr -#define HUGE _HUGE -#endif - -#ifdef __cplusplus -} -#endif - -#endif /* Not RC_INVOKED */ - -#pragma pack(pop) - -#endif /* End _MATH_H_ */ -

12 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2012