Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 67861: [CMAKE] Fix and improve the Release build type of the MSVC builds.
by akhaldi＠svn.reactos.org 23 May '15

23 May '15

Author: akhaldi Date: Sat May 23 10:34:25 2015 New Revision: 67861 URL: http://svn.reactos.org/svn/reactos?rev=67861&view=rev Log: [CMAKE] Fix and improve the Release build type of the MSVC builds. Modified: trunk/reactos/cmake/msvc.cmake Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=67861… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Sat May 23 10:34:25 2015 @@ -2,6 +2,11 @@ #if(${CMAKE_BUILD_TYPE} STREQUAL "Debug") if(CMAKE_BUILD_TYPE STREQUAL "Debug") # no optimization + add_compile_flags("/Ob0 /Od") +elseif(CMAKE_BUILD_TYPE STREQUAL "Release") + add_compile_flags("/Ox /Ob2 /Ot /Oy /GT /GF") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /OPT:REF /OPT:ICF") + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /OPT:REF /OPT:ICF") elseif(OPTIMIZE STREQUAL "1") add_definitions(/O1) elseif(OPTIMIZE STREQUAL "2") @@ -76,10 +81,9 @@ if(NOT (_PREFAST_ OR _VS_ANALYZE_)) add_compile_flags("/Zi") endif() - add_compile_flags("/Ob0 /Od") #elseif(${CMAKE_BUILD_TYPE} STREQUAL "Release") elseif(CMAKE_BUILD_TYPE STREQUAL "Release") - add_compile_flags("/Ob2 /D NDEBUG") + add_definitions("/D NDEBUG") endif() if(MSVC_IDE AND (NOT DEFINED USE_FOLDER_STRUCTURE))

1 0

[akhaldi] 67860: [CMAKE] Don't set initial flags for Release build type, let us handle them ourselves.
by akhaldi＠svn.reactos.org 23 May '15

23 May '15

Author: akhaldi Date: Sat May 23 10:32:43 2015 New Revision: 67860 URL: http://svn.reactos.org/svn/reactos?rev=67860&view=rev Log: [CMAKE] Don't set initial flags for Release build type, let us handle them ourselves. Modified: trunk/reactos/cmake/Platform/Windows-MSVC.cmake Modified: trunk/reactos/cmake/Platform/Windows-MSVC.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/Platform/Windows-MSV… ============================================================================== --- trunk/reactos/cmake/Platform/Windows-MSVC.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/Platform/Windows-MSVC.cmake [iso-8859-1] Sat May 23 10:32:43 2015 @@ -237,7 +237,7 @@ set(CMAKE_${lang}_FLAGS_INIT "") set(CMAKE_${lang}_FLAGS_DEBUG_INIT "") - set(CMAKE_${lang}_FLAGS_RELEASE_INIT "/MD /O2 /Ob2 /D NDEBUG") + set(CMAKE_${lang}_FLAGS_RELEASE_INIT "") set(CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT "/MD /Zi /O2 /Ob1 /D NDEBUG") set(CMAKE_${lang}_FLAGS_MINSIZEREL_INIT "/MD /O1 /Ob1 /D NDEBUG") endmacro()

1 0

[akhaldi] 67859: [CMAKE] Fix setting CMake build type so we can use other types too (like Release).
by akhaldi＠svn.reactos.org 23 May '15

23 May '15

Author: akhaldi Date: Sat May 23 10:31:52 2015 New Revision: 67859 URL: http://svn.reactos.org/svn/reactos?rev=67859&view=rev Log: [CMAKE] Fix setting CMake build type so we can use other types too (like Release). Modified: trunk/reactos/CMakeLists.txt Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=67859&r… ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Sat May 23 10:31:52 2015 @@ -47,8 +47,10 @@ string(TOLOWER ${ARCH} ARCH) # Default to Debug for the build type -set(CMAKE_BUILD_TYPE "Debug" CACHE STRING - "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel." FORCE) +if(NOT CMAKE_BUILD_TYPE) + set(CMAKE_BUILD_TYPE "Debug" CACHE STRING + "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel.") +endif() # Compile options if(ARCH STREQUAL "i386")

1 0

[akhaldi] 67858: [MSPORTS] Add Italian translation by Carlo Bramini. CORE-9725
by akhaldi＠svn.reactos.org 23 May '15

23 May '15

Author: akhaldi Date: Sat May 23 10:29:54 2015 New Revision: 67858 URL: http://svn.reactos.org/svn/reactos?rev=67858&view=rev Log: [MSPORTS] Add Italian translation by Carlo Bramini. CORE-9725 Added: trunk/reactos/dll/win32/msports/lang/it-IT.rc (with props) Modified: trunk/reactos/dll/win32/msports/msports.rc Added: trunk/reactos/dll/win32/msports/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/lang/it-… ============================================================================== --- trunk/reactos/dll/win32/msports/lang/it-IT.rc (added) +++ trunk/reactos/dll/win32/msports/lang/it-IT.rc [iso-8859-1] Sat May 23 10:29:54 2015 @@ -0,0 +1,41 @@ +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +IDD_SERIALSETTINGS DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Impostazioni della Porta" +FONT 8, "MS Shell Dlg" +BEGIN + RTEXT "B&it per secondo:", -1, 6, 19, 130, 8, WS_GROUP + COMBOBOX IDC_SERIAL_BITSPERSECOND, 139, 17, 106, 90, WS_TABSTOP | CBS_DROPDOWNLIST + RTEXT "Bit di &Dati:", -1, 6, 40, 130, 8 + COMBOBOX IDC_SERIAL_DATABITS, 139, 38, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST + RTEXT "&Parità:", -1, 6, 61, 130, 8 + COMBOBOX IDC_SERIAL_PARITY, 139, 59, 106, 62, WS_TABSTOP | CBS_DROPDOWNLIST + RTEXT "Bit di &Stop:", -1, 6, 82, 130, 8 + COMBOBOX IDC_SERIAL_STOPBITS, 139, 80, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST + RTEXT "Controllo di &Flusso:", -1, 6, 102, 130, 8 + COMBOBOX IDC_SERIAL_FLOWCONTROL, 139, 100, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST + PUSHBUTTON "&Avanzate...", IDC_SERIAL_ADVANCED, 71, 130, 85, 14, WS_GROUP + PUSHBUTTON "&Ripristina", IDC_SERIAL_RESTORE, 160, 130, 85, 14, WS_GROUP +END + +IDD_PARALLELSETTINGS DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Impostazioni della Porta" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Metodo di filtraggio delle Risorse", -1, 6, 6, 237, 75, WS_GROUP + AUTORADIOBUTTON "Prova a non usare un interrupt", IDC_TRY_INTERRUPT, 11, 22, 227, 10 + AUTORADIOBUTTON "Non usare mai un interrupt", IDC_NEVER_INTERRUPT, 11, 44, 227, 10 + AUTORADIOBUTTON "Usare qualsiasi interrupt assegnato alla porta", IDC_ANY_INTERRUPT, 11, 66, 227, 10, WS_GROUP + AUTOCHECKBOX "Attiva rilevamento Plug and Play obsoleto", -1, 6, 90, 237, 10 + LTEXT "Numero di Porta LPT:", -1, 6, 107, 76, 10, WS_GROUP + COMBOBOX IDC_PARALLEL_NAME, 88, 105, 75, 20, WS_TABSTOP | CBS_DROPDOWNLIST +END + +STRINGTABLE +BEGIN + IDS_LPT1 "LPT1" + IDS_LPT2 "LPT2" + IDS_LPT3 "LPT3" +END Propchange: trunk/reactos/dll/win32/msports/lang/it-IT.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/msports/msports.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/msports.… ============================================================================== --- trunk/reactos/dll/win32/msports/msports.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/msports.rc [iso-8859-1] Sat May 23 10:29:54 2015 @@ -28,6 +28,9 @@ #ifdef LANGUAGE_HE_IL #include "lang/he-IL.rc" #endif +#ifdef LANGUAGE_IT_IT + #include "lang/it-IT.rc" +#endif #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif

1 0

[jimtabor] 67857: - Kill debug spam.
by jimtabor＠svn.reactos.org 23 May '15

23 May '15

Author: jimtabor Date: Sat May 23 07:19:50 2015 New Revision: 67857 URL: http://svn.reactos.org/svn/reactos?rev=67857&view=rev Log: - Kill debug spam. Modified: trunk/reactos/win32ss/user/ntuser/caret.c Modified: trunk/reactos/win32ss/user/ntuser/caret.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/caret.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/caret.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/caret.c [iso-8859-1] Sat May 23 07:19:50 2015 @@ -103,7 +103,7 @@ if (ThreadQueue->CaretInfo->hWnd != hwnd) { - ERR("Not the same caret window!\n"); + TRACE("Not the same caret window!\n"); return; }

1 0

[jimtabor] 67856: [NtUser] - Since this is hiding the cursor, no window, just return. See CORE-9723.
by jimtabor＠svn.reactos.org 23 May '15

23 May '15

Author: jimtabor Date: Sat May 23 04:43:32 2015 New Revision: 67856 URL: http://svn.reactos.org/svn/reactos?rev=67856&view=rev Log: [NtUser] - Since this is hiding the cursor, no window, just return. See CORE-9723. Modified: trunk/reactos/win32ss/user/ntuser/caret.c Modified: trunk/reactos/win32ss/user/ntuser/caret.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/caret.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/caret.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/caret.c [iso-8859-1] Sat May 23 04:43:32 2015 @@ -22,6 +22,12 @@ HDC hdc, hdcMem; HBITMAP hbmOld; BOOL bDone = FALSE; + + if (pWnd == NULL) + { + TRACE("Null Window!\n"); + return; + } hdc = UserGetDCEx(pWnd, 0, DCX_USESTYLE | DCX_WINDOW); if (!hdc)

1 0

[aandrejevic] 67855: [FAST486] Use a better algorithm for the base 2 logarithm. Put the shared code for FPREM and FPREM1 in an inline function used by both.
by aandrejevic＠svn.reactos.org 23 May '15

23 May '15

Author: aandrejevic Date: Sat May 23 02:50:11 2015 New Revision: 67855 URL: http://svn.reactos.org/svn/reactos?rev=67855&view=rev Log: [FAST486] Use a better algorithm for the base 2 logarithm. Put the shared code for FPREM and FPREM1 in an inline function used by both. Modified: trunk/reactos/lib/fast486/fpu.c Modified: trunk/reactos/lib/fast486/fpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.c?rev=6785… ============================================================================== --- trunk/reactos/lib/fast486/fpu.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.c [iso-8859-1] Sat May 23 02:50:11 2015 @@ -52,6 +52,9 @@ /* ln(2) */ static const FAST486_FPU_DATA_REG FpuLnTwo = {0xB17217F7D1CF79ABULL, FPU_REAL10_BIAS - 1, FALSE}; + +/* 2.00 */ +static const FAST486_FPU_DATA_REG FpuTwo = {0x8000000000000000ULL, FPU_REAL10_BIAS + 1, FALSE}; static const FAST486_FPU_DATA_REG FpuInverseNumber[INVERSE_NUMBERS_COUNT] = { @@ -1105,11 +1108,6 @@ *Result = TempResult; } -/* - * Calculates using the identities: - * log2(x) = ln(x) / ln(2) - * ln(x)= sum { -1^(n+1) * x^n / n!, n >= 1 } - */ static inline BOOLEAN FASTCALL Fast486FpuCalculateLogBase2(PFAST486_STATE State, PFAST486_FPU_DATA_REG Operand, @@ -1117,7 +1115,6 @@ { INT i; FAST486_FPU_DATA_REG Value = *Operand; - FAST486_FPU_DATA_REG SeriesElement; FAST486_FPU_DATA_REG TempResult; FAST486_FPU_DATA_REG TempValue; LONGLONG UnbiasedExp = (LONGLONG)Operand->Exponent - FPU_REAL10_BIAS; @@ -1163,40 +1160,31 @@ Value.Mantissa <<= Bits; } - /* Subtract one from the value */ - if (!Fast486FpuSubtract(State, &Value, &FpuOne, &Value)) return FALSE; - - /* Calculate the natural logarithm */ - SeriesElement = TempResult = Value; - - for (i = 2; i < INVERSE_NUMBERS_COUNT / 2; i++) - { - if (!Fast486FpuMultiply(State, &SeriesElement, &Value, &SeriesElement)) - { - /* An exception occurred */ - return FALSE; - } - - /* Toggle the sign of the series element */ - SeriesElement.Sign = !SeriesElement.Sign; - - /* Divide it by the counter */ - if (!Fast486FpuMultiply(State, &SeriesElement, &FpuInverseNumber[i - 1], &TempValue)) - { - /* An exception occurred */ - return FALSE; - } - - /* And add it to the result */ - if (!Fast486FpuAdd(State, &TempResult, &TempValue, &TempResult)) - { - /* An exception occurred */ - return FALSE; - } - } - - /* Now convert the natural logarithm into a base 2 logarithm */ - if (!Fast486FpuDivide(State, &TempResult, &FpuLnTwo, &TempResult)) return FALSE; + TempResult.Sign = FALSE; + TempResult.Exponent = FPU_REAL10_BIAS - 1; + TempResult.Mantissa = 0ULL; + + for (i = 63; i >= 0; i--) + { + /* Square the value */ + if (!Fast486FpuMultiply(State, &Value, &Value, &Value)) return FALSE; + + /* Subtract two from it */ + if (!Fast486FpuSubtract(State, &Value, &FpuTwo, &TempValue)) return FALSE; + + /* Is the result positive? */ + if (!TempValue.Sign) + { + /* Yes, set the appropriate bit in the mantissa */ + TempResult.Mantissa |= 1ULL << i; + + /* Halve the value */ + if (!Fast486FpuMultiply(State, &Value, &FpuInverseNumber[1], &Value)) return FALSE; + } + } + + /* Normalize the result */ + if (!Fast486FpuNormalize(State, &TempResult)) return FALSE; /* * Add the exponent to the result @@ -1207,6 +1195,35 @@ *Result = TempResult; return TRUE; +} + +static inline BOOLEAN FASTCALL +Fast486FpuRemainder(PFAST486_STATE State, + PCFAST486_FPU_DATA_REG FirstOperand, + PCFAST486_FPU_DATA_REG SecondOperand, + BOOLEAN RoundToNearest, + PFAST486_FPU_DATA_REG Result) +{ + BOOLEAN Success = FALSE; + INT OldRoundingMode = State->FpuControl.Rc; + LONGLONG Integer; + FAST486_FPU_DATA_REG Temp; + + if (!Fast486FpuDivide(State, FirstOperand, SecondOperand, &Temp)) return FALSE; + + State->FpuControl.Rc = RoundToNearest ? FPU_ROUND_NEAREST : FPU_ROUND_TRUNCATE; + + if (!Fast486FpuToInteger(State, &Temp, &Integer)) goto Cleanup; + Fast486FpuFromInteger(State, Integer, &Temp); + + if (!Fast486FpuMultiply(State, &Temp, SecondOperand, &Temp)) goto Cleanup; + if (!Fast486FpuSubtract(State, FirstOperand, &Temp, Result)) goto Cleanup; + + Success = TRUE; + +Cleanup: + State->FpuControl.Rc = OldRoundingMode; + return Success; } /* @@ -2008,10 +2025,6 @@ /* FPREM1 */ case 0x35: { - FAST486_FPU_DATA_REG Temp; - LONGLONG Integer; - INT OldRoundingMode = State->FpuControl.Rc; - if (FPU_GET_TAG(0) == FPU_TAG_EMPTY || FPU_GET_TAG(1) == FPU_TAG_EMPTY) { State->FpuStatus.Ie = TRUE; @@ -2020,34 +2033,9 @@ break; } - /* Divide ST0 by ST1 */ - if (!Fast486FpuDivide(State, &FPU_ST(0), &FPU_ST(1), &Temp)) break; - - /* Round the result to the nearest integer */ - if (FPU_ST(0).Exponent < FPU_REAL10_BIAS + 63) - { - State->FpuControl.Rc = FPU_ROUND_NEAREST; - - if (Fast486FpuToInteger(State, &Temp, &Integer)) - { - Fast486FpuFromInteger(State, Integer, &Temp); - State->FpuControl.Rc = OldRoundingMode; - } - else - { - /* Restore the rounding mode and exit */ - State->FpuControl.Rc = OldRoundingMode; - break; - } - } - - /* Multiply the result by ST1 */ - if (!Fast486FpuMultiply(State, &Temp, &FPU_ST(1), &Temp)) break; - - /* Subtract the result from ST0 */ - if (!Fast486FpuSubtract(State, &FPU_ST(0), &Temp, &FPU_ST(0))) break; - + Fast486FpuRemainder(State, &FPU_ST(0), &FPU_ST(1), TRUE, &FPU_ST(0)); FPU_UPDATE_TAG(0); + break; } @@ -2068,10 +2056,6 @@ /* FPREM */ case 0x38: { - FAST486_FPU_DATA_REG Temp; - LONGLONG Integer; - INT OldRoundingMode = State->FpuControl.Rc; - if (FPU_GET_TAG(0) == FPU_TAG_EMPTY || FPU_GET_TAG(1) == FPU_TAG_EMPTY) { State->FpuStatus.Ie = TRUE; @@ -2080,34 +2064,9 @@ break; } - /* Divide ST0 by ST1 */ - if (!Fast486FpuDivide(State, &FPU_ST(0), &FPU_ST(1), &Temp)) break; - - /* Round the result to an integer, towards zero */ - if (FPU_ST(0).Exponent < FPU_REAL10_BIAS + 63) - { - State->FpuControl.Rc = FPU_ROUND_TRUNCATE; - - if (Fast486FpuToInteger(State, &Temp, &Integer)) - { - Fast486FpuFromInteger(State, Integer, &Temp); - State->FpuControl.Rc = OldRoundingMode; - } - else - { - /* Restore the rounding mode and exit */ - State->FpuControl.Rc = OldRoundingMode; - break; - } - } - - /* Multiply the result by ST1 */ - if (!Fast486FpuMultiply(State, &Temp, &FPU_ST(1), &Temp)) break; - - /* Subtract the result from ST0 */ - if (!Fast486FpuSubtract(State, &FPU_ST(0), &Temp, &FPU_ST(0))) break; - + Fast486FpuRemainder(State, &FPU_ST(0), &FPU_ST(1), FALSE, &FPU_ST(0)); FPU_UPDATE_TAG(0); + break; }

1 0

[hbelusca] 67854: [NTVDM]: Temporarily disable yielding (see r67851) because it causes timing issues (slowdowns).
by hbelusca＠svn.reactos.org 23 May '15

23 May '15

Author: hbelusca Date: Sat May 23 02:08:50 2015 New Revision: 67854 URL: http://svn.reactos.org/svn/reactos?rev=67854&view=rev Log: [NTVDM]: Temporarily disable yielding (see r67851) because it causes timing issues (slowdowns). Modified: trunk/reactos/subsystems/mvdm/ntvdm/clock.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/clock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/cloc… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/clock.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/clock.c [iso-8859-1] Sat May 23 02:08:50 2015 @@ -120,7 +120,8 @@ } /* Yield execution to other threads */ - NtYieldExecution(); + // FIXME: Disabled because it causes timing issues (slowdowns). + // NtYieldExecution(); } }

1 0

[aandrejevic] 67853: [FAST486] Fix FIST(P) and FRNDINT.
by aandrejevic＠svn.reactos.org 22 May '15

22 May '15

Author: aandrejevic Date: Fri May 22 23:09:13 2015 New Revision: 67853 URL: http://svn.reactos.org/svn/reactos?rev=67853&view=rev Log: [FAST486] Fix FIST(P) and FRNDINT. Modified: trunk/reactos/lib/fast486/fpu.c Modified: trunk/reactos/lib/fast486/fpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.c?rev=6785… ============================================================================== --- trunk/reactos/lib/fast486/fpu.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.c [iso-8859-1] Fri May 22 23:09:13 2015 @@ -2086,7 +2086,7 @@ /* Round the result to an integer, towards zero */ if (FPU_ST(0).Exponent < FPU_REAL10_BIAS + 63) { - State->FpuControl.Rc = FPU_ROUND_DOWN; + State->FpuControl.Rc = FPU_ROUND_TRUNCATE; if (Fast486FpuToInteger(State, &Temp, &Integer)) { @@ -2543,7 +2543,7 @@ } /* Check if it can fit in a signed 32-bit integer */ - if ((((ULONGLONG)Temp >> 31) + 1ULL) > 1ULL) + if ((LONGLONG)((LONG)Temp) != Temp) { State->FpuStatus.Ie = TRUE; @@ -3240,7 +3240,7 @@ } /* Check if it can fit in a signed 16-bit integer */ - if ((((ULONGLONG)Temp >> 15) + 1ULL) > 1ULL) + if ((LONGLONG)((SHORT)Temp) != Temp) { /* Raise the invalid operation exception */ State->FpuStatus.Ie = TRUE;

1 0

[aandrejevic] 67852: [FAST486] Fix multiple FP80-to-int conversion issues.
by aandrejevic＠svn.reactos.org 22 May '15

22 May '15

Author: aandrejevic Date: Fri May 22 21:57:28 2015 New Revision: 67852 URL: http://svn.reactos.org/svn/reactos?rev=67852&view=rev Log: [FAST486] Fix multiple FP80-to-int conversion issues. Modified: trunk/reactos/lib/fast486/fpu.c Modified: trunk/reactos/lib/fast486/fpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.c?rev=6785… ============================================================================== --- trunk/reactos/lib/fast486/fpu.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.c [iso-8859-1] Fri May 22 21:57:28 2015 @@ -317,7 +317,7 @@ if (State->FpuControl.Im) { - *Result = 0LL; + *Result = 0x8000000000000000LL; return TRUE; } else @@ -339,16 +339,15 @@ { /* The result is zero */ *Result = 0LL; - - if (UnbiasedExp > -64) - { - Bits = 65 + UnbiasedExp; - Remainder = Value->Mantissa >> (64 - Bits); + Bits = 64; + + if (UnbiasedExp >= -64) + { + Remainder = Value->Mantissa >> (-1 - UnbiasedExp); } else { /* Too small to even have a remainder */ - Bits = 1; Remainder = 0ULL; } } @@ -2536,7 +2535,8 @@ return; } } - else if (!Fast486FpuToInteger(State, &FPU_ST(0), &Temp)) + + if (!Fast486FpuToInteger(State, &FPU_ST(0), &Temp)) { /* Exception occurred */ return; @@ -2547,7 +2547,10 @@ { State->FpuStatus.Ie = TRUE; - if (State->FpuControl.Im) Temp = 0LL; + if (State->FpuControl.Im) + { + Temp = 0x80000000LL; + } else { Fast486FpuException(State); @@ -3229,7 +3232,8 @@ return; } } - else if (!Fast486FpuToInteger(State, &FPU_ST(0), &Temp)) + + if (!Fast486FpuToInteger(State, &FPU_ST(0), &Temp)) { /* Exception occurred */ return; @@ -3241,7 +3245,10 @@ /* Raise the invalid operation exception */ State->FpuStatus.Ie = TRUE; - if (State->FpuControl.Im) Temp = 0LL; + if (State->FpuControl.Im) + { + Temp = 0x8000LL; + } else { Fast486FpuException(State); @@ -3365,7 +3372,8 @@ return; } } - else if (!Fast486FpuToInteger(State, &FPU_ST(0), &Temp)) + + if (!Fast486FpuToInteger(State, &FPU_ST(0), &Temp)) { /* Exception occurred */ return;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs