Ros-diffs

ros-diffs@reactos.org

81390 discussions

[aandrejevic] 67821: [FAST486] Implement FYL2X and FYL2XP1.
by aandrejevic＠svn.reactos.org 18 May '15

18 May '15

Author: aandrejevic Date: Mon May 18 15:27:08 2015 New Revision: 67821 URL: http://svn.reactos.org/svn/reactos?rev=67821&view=rev Log: [FAST486] Implement FYL2X and FYL2XP1. 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=6782… ============================================================================== --- trunk/reactos/lib/fast486/fpu.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.c [iso-8859-1] Mon May 18 15:27:08 2015 @@ -1020,6 +1020,110 @@ } /* + * Calculates using the identities: + * log2(x) = log10(x) / log10(2) + * log10(x)= sum { -1^(n+1) * x^n / n!, n >= 1 } + */ +static inline BOOLEAN FASTCALL +Fast486FpuCalculateLogBase2(PFAST486_STATE State, + PFAST486_FPU_DATA_REG Operand, + PFAST486_FPU_DATA_REG Result) +{ + 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; + + if (Operand->Sign) + { + /* Raise the invalid operation exception */ + State->FpuStatus.Ie = TRUE; + + if (State->FpuControl.Im) + { + /* Return the indefinite NaN */ + Result->Sign = TRUE; + Result->Exponent = FPU_MAX_EXPONENT + 1; + Result->Mantissa = FPU_INDEFINITE_MANTISSA; + return TRUE; + } + else + { + Fast486FpuException(State); + return FALSE; + } + } + + /* Get only the mantissa as a floating-pointer number between 1 and 2 */ + Value.Exponent = FPU_REAL10_BIAS; + + /* Check if it's denormalized */ + if (!FPU_IS_NORMALIZED(&Value)) + { + ULONG Bits; + State->FpuStatus.De = TRUE; + + if (!State->FpuControl.Dm) + { + Fast486FpuException(State); + return FALSE; + } + + /* Normalize the number */ + Bits = CountLeadingZeros64(Value.Mantissa); + UnbiasedExp -= Bits; + Value.Mantissa <<= Bits; + } + + /* Subtract one from the value */ + if (!Fast486FpuSubtract(State, &Value, &FpuOne, &Value)) return FALSE; + + /* Calculate the base 10 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 base 10 logarithm into a base 2 logarithm */ + if (!Fast486FpuDivide(State, &TempResult, &FpuLgTwo, &TempResult)) return FALSE; + + /* + * Add the exponent to the result + * log2(x * 2^y) = log2(x) + log2(2^y) = log2(x) + y + */ + Fast486FpuFromInteger(State, UnbiasedExp, &TempValue); + if (!Fast486FpuAdd(State, &TempValue, &TempResult, &TempResult)) return FALSE; + + *Result = TempResult; + return TRUE; +} + +/* * Calculates using the identity: * sin(x) = sum { -1^n * x^(2n + 1) / (2n + 1)!, n >= 0 } */ @@ -1726,8 +1830,31 @@ /* FYL2X */ case 0x31: { - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; + FAST486_FPU_DATA_REG Logarithm; + + if (FPU_GET_TAG(0) == FPU_TAG_EMPTY || FPU_GET_TAG(1) == FPU_TAG_EMPTY) + { + State->FpuStatus.Ie = TRUE; + + if (!State->FpuControl.Im) Fast486FpuException(State); + break; + } + + if (!Fast486FpuCalculateLogBase2(State, &FPU_ST(0), &Logarithm)) + { + /* Exception occurred */ + break; + } + + if (!Fast486FpuMultiply(State, &Logarithm, &FPU_ST(1), &FPU_ST(1))) + { + /* Exception occurred */ + break; + } + + /* Pop the stack so that the result ends up in ST0 */ + Fast486FpuPop(State); + FPU_UPDATE_TAG(0); break; } @@ -1828,8 +1955,37 @@ /* FYL2XP1 */ case 0x39: { - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; + FAST486_FPU_DATA_REG Value, Logarithm; + + if (FPU_GET_TAG(0) == FPU_TAG_EMPTY || FPU_GET_TAG(1) == FPU_TAG_EMPTY) + { + State->FpuStatus.Ie = TRUE; + + if (!State->FpuControl.Im) Fast486FpuException(State); + break; + } + + if (!Fast486FpuAdd(State, &FPU_ST(0), &FpuOne, &Value)) + { + /* Exception occurred */ + break; + } + + if (!Fast486FpuCalculateLogBase2(State, &Value, &Logarithm)) + { + /* Exception occurred */ + break; + } + + if (!Fast486FpuMultiply(State, &Logarithm, &FPU_ST(1), &FPU_ST(1))) + { + /* Exception occurred */ + break; + } + + /* Pop the stack so that the result ends up in ST0 */ + Fast486FpuPop(State); + FPU_UPDATE_TAG(0); break; }

1 0

[aandrejevic] 67820: [FAST486] Fix several division related problems: - In UnsignedDivMod128, fix the leading zero calculation for 128-bit numbers. - In Fast486FpuDivide, there's no need to increas...
by aandrejevic＠svn.reactos.org 18 May '15

18 May '15

Author: aandrejevic Date: Mon May 18 12:17:40 2015 New Revision: 67820 URL: http://svn.reactos.org/svn/reactos?rev=67820&view=rev Log: [FAST486] Fix several division related problems: - In UnsignedDivMod128, fix the leading zero calculation for 128-bit numbers. - In Fast486FpuDivide, there's no need to increase the exponent by 64 (adding zeros at the end of a number after the decimal point changes nothing). - FDIV/FDIVR were reversed 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=6782… ============================================================================== --- trunk/reactos/lib/fast486/fpu.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.c [iso-8859-1] Mon May 18 12:17:40 2015 @@ -203,9 +203,9 @@ * Calculate the number of significant bits the current * divisor has more than the original divisor */ - Bits = CountLeadingZeros64(Divisor) + 64; - Bits -= (CurrentHigh > 0ULL) ? CountLeadingZeros64(CurrentHigh) : 64; - Bits -= (CurrentLow > 0ULL) ? CountLeadingZeros64(CurrentLow) : 64; + Bits = CountLeadingZeros64(Divisor); + if (CurrentHigh > 0ULL) Bits -= CountLeadingZeros64(CurrentHigh); + else Bits -= CountLeadingZeros64(CurrentLow); if (Bits) { @@ -923,11 +923,10 @@ } /* Calculate the exponent of the result */ - Exponent = (LONG)FirstOperand->Exponent - (LONG)SecondOperand->Exponent - 64; + Exponent = (LONG)FirstOperand->Exponent - (LONG)SecondOperand->Exponent - 1; /* Divide the two mantissas */ Remainder = UnsignedDivMod128(0ULL, - /* Notice the 64 above - this is the high part */ FirstOperand->Mantissa, SecondOperand->Mantissa, &QuotientLow, @@ -1169,14 +1168,14 @@ /* FDIV */ case 6: { - Fast486FpuDivide(State, DestOperand, SourceOperand, DestOperand); + Fast486FpuDivide(State, SourceOperand, DestOperand, DestOperand); break; } /* FDIVR */ case 7: { - Fast486FpuDivide(State, SourceOperand, DestOperand, DestOperand); + Fast486FpuDivide(State, DestOperand, SourceOperand, DestOperand); break; } }

1 0

[aandrejevic] 67819: [FAST486] - Zero is not a denormalized number. - In Fast486FpuMultiply, we must account for the fact that the resulting mantissa also has the "decimal point" at the second posi...
by aandrejevic＠svn.reactos.org 18 May '15

18 May '15

Author: aandrejevic Date: Mon May 18 04:42:22 2015 New Revision: 67819 URL: http://svn.reactos.org/svn/reactos?rev=67819&view=rev Log: [FAST486] - Zero is not a denormalized number. - In Fast486FpuMultiply, we must account for the fact that the resulting mantissa also has the "decimal point" at the second position. Modified: trunk/reactos/lib/fast486/common.inl trunk/reactos/lib/fast486/fpu.c trunk/reactos/lib/fast486/fpu.h Modified: trunk/reactos/lib/fast486/common.inl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/common.inl?rev… ============================================================================== --- trunk/reactos/lib/fast486/common.inl [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/common.inl [iso-8859-1] Mon May 18 04:42:22 2015 @@ -1626,12 +1626,13 @@ { UINT LeadingZeros; - if (FPU_IS_NORMALIZED(Data)) return TRUE; if (FPU_IS_ZERO(Data)) { Data->Exponent = 0; return TRUE; } + + if (FPU_IS_NORMALIZED(Data)) return TRUE; LeadingZeros = CountLeadingZeros64(Data->Mantissa); Modified: trunk/reactos/lib/fast486/fpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.c?rev=6781… ============================================================================== --- trunk/reactos/lib/fast486/fpu.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.c [iso-8859-1] Mon May 18 04:42:22 2015 @@ -277,7 +277,7 @@ if (Value < 0LL) { - Result->Sign = 1; + Result->Sign = TRUE; Value = -Value; } @@ -804,7 +804,7 @@ TempResult.Sign = FirstOperand->Sign ^ SecondOperand->Sign; /* Calculate the exponent */ - Exponent = (LONG)FirstOperand->Exponent + (LONG)SecondOperand->Exponent - FPU_REAL10_BIAS; + Exponent = (LONG)FirstOperand->Exponent + (LONG)SecondOperand->Exponent - FPU_REAL10_BIAS + 1; /* Calculate the mantissa */ UnsignedMult128(FirstOperand->Mantissa, Modified: trunk/reactos/lib/fast486/fpu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.h?rev=6781… ============================================================================== --- trunk/reactos/lib/fast486/fpu.h [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.h [iso-8859-1] Mon May 18 04:42:22 2015 @@ -63,7 +63,7 @@ #define FPU_REAL8_INFINITY 0x7FF0000000000000ULL #define FPU_REAL8_INDEFINITE 0xFFF8000000000000ULL -#define FPU_IS_NORMALIZED(x) (!FPU_IS_ZERO(x) && (((x)->Mantissa & FPU_MANTISSA_HIGH_BIT) != 0ULL)) +#define FPU_IS_NORMALIZED(x) (FPU_IS_ZERO(x) || (((x)->Mantissa & FPU_MANTISSA_HIGH_BIT) != 0ULL)) #define FPU_IS_ZERO(x) ((x)->Mantissa == 0ULL) #define FPU_IS_NAN(x) ((x)->Exponent == (FPU_MAX_EXPONENT + 1)) #define FPU_IS_INFINITY(x) (FPU_IS_NAN(x) && ((x)->Mantissa == FPU_MANTISSA_HIGH_BIT))

1 0

[aandrejevic] 67818: [FAST486] - Don't forget to check whether the FPU stack element exists before using it. - Implement FSCALE.
by aandrejevic＠svn.reactos.org 17 May '15

17 May '15

Author: aandrejevic Date: Sun May 17 21:52:12 2015 New Revision: 67818 URL: http://svn.reactos.org/svn/reactos?rev=67818&view=rev Log: [FAST486] - Don't forget to check whether the FPU stack element exists before using it. - Implement FSCALE. 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=6781… ============================================================================== --- trunk/reactos/lib/fast486/fpu.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.c [iso-8859-1] Sun May 17 21:52:12 2015 @@ -1699,156 +1699,6 @@ { FPU_SAVE_LAST_INST(); - Fast486FpuCalculateTwoPowerMinusOne(State, &FPU_ST(0), &FPU_ST(0)); - FPU_UPDATE_TAG(0); - - break; - } - - /* FYL2X */ - case 0x31: - { - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; - - break; - } - - /* FPTAN */ - case 0x32: - { - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; - - break; - } - - /* FPATAN */ - case 0x33: - { - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; - - break; - } - - /* FXTRACT */ - case 0x34: - { - FAST486_FPU_DATA_REG Value = FPU_ST(0); - - if ((FPU_GET_TAG(0) == FPU_TAG_EMPTY) || FPU_IS_INDEFINITE(&Value)) - { - State->FpuStatus.Ie = TRUE; - if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) State->FpuStatus.Sf = TRUE; - - if (!State->FpuControl.Im) Fast486FpuException(State); - break; - } - - if (FPU_IS_ZERO(&Value)) - { - /* The exponent of zero is negative infinity */ - FPU_ST(0).Sign = TRUE; - FPU_ST(0).Exponent = FPU_MAX_EXPONENT + 1; - FPU_ST(0).Mantissa = FPU_MANTISSA_HIGH_BIT; - } - else if (FPU_IS_INFINITY(&Value)) - { - /* The exponent of infinity is positive infinity */ - FPU_ST(0).Sign = FALSE; - FPU_ST(0).Exponent = FPU_MAX_EXPONENT + 1; - FPU_ST(0).Mantissa = FPU_MANTISSA_HIGH_BIT; - } - else - { - /* Store the unbiased exponent in ST0 */ - Fast486FpuFromInteger(State, - (LONGLONG)Value.Exponent - (LONGLONG)FPU_REAL10_BIAS, - &FPU_ST(0)); - } - - /* Now push the mantissa as a real number, with the original sign */ - Value.Exponent = FPU_REAL10_BIAS; - Fast486FpuPush(State, &Value); - - break; - } - - /* FPREM1 */ - case 0x35: - { - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; - - break; - } - - /* FDECSTP */ - case 0x36: - { - State->FpuStatus.Top--; - break; - } - - /* FINCSTP */ - case 0x37: - { - State->FpuStatus.Top++; - break; - } - - /* FPREM */ - case 0x38: - { - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; - - break; - } - - /* FYL2XP1 */ - case 0x39: - { - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; - - break; - } - - /* FSQRT */ - case 0x3A: - { - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; - - break; - } - - /* FSINCOS */ - case 0x3B: - { - FAST486_FPU_DATA_REG Number = FPU_ST(0); - FPU_SAVE_LAST_INST(); - - /* Replace FP0 with the sine */ - if (!Fast486FpuCalculateSine(State, &Number, &FPU_ST(0))) break; - FPU_UPDATE_TAG(0); - - /* Push the cosine */ - if (!Fast486FpuCalculateCosine(State, &Number, &Number)) break; - Fast486FpuPush(State, &Number); - - break; - } - - /* FRNDINT */ - case 0x3C: - { - INT Bits; - ULONGLONG Result = 0ULL; - ULONGLONG Remainder; - if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) { State->FpuStatus.Ie = TRUE; @@ -1868,6 +1718,194 @@ } } + Fast486FpuCalculateTwoPowerMinusOne(State, &FPU_ST(0), &FPU_ST(0)); + FPU_UPDATE_TAG(0); + + break; + } + + /* FYL2X */ + case 0x31: + { + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + break; + } + + /* FPTAN */ + case 0x32: + { + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + break; + } + + /* FPATAN */ + case 0x33: + { + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + break; + } + + /* FXTRACT */ + case 0x34: + { + FAST486_FPU_DATA_REG Value = FPU_ST(0); + + if ((FPU_GET_TAG(0) == FPU_TAG_EMPTY) || FPU_IS_INDEFINITE(&Value)) + { + State->FpuStatus.Ie = TRUE; + if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) State->FpuStatus.Sf = TRUE; + + if (!State->FpuControl.Im) Fast486FpuException(State); + break; + } + + if (FPU_IS_ZERO(&Value)) + { + /* The exponent of zero is negative infinity */ + FPU_ST(0).Sign = TRUE; + FPU_ST(0).Exponent = FPU_MAX_EXPONENT + 1; + FPU_ST(0).Mantissa = FPU_MANTISSA_HIGH_BIT; + } + else if (FPU_IS_INFINITY(&Value)) + { + /* The exponent of infinity is positive infinity */ + FPU_ST(0).Sign = FALSE; + FPU_ST(0).Exponent = FPU_MAX_EXPONENT + 1; + FPU_ST(0).Mantissa = FPU_MANTISSA_HIGH_BIT; + } + else + { + /* Store the unbiased exponent in ST0 */ + Fast486FpuFromInteger(State, + (LONGLONG)Value.Exponent - (LONGLONG)FPU_REAL10_BIAS, + &FPU_ST(0)); + } + + /* Now push the mantissa as a real number, with the original sign */ + Value.Exponent = FPU_REAL10_BIAS; + Fast486FpuPush(State, &Value); + + break; + } + + /* FPREM1 */ + case 0x35: + { + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + break; + } + + /* FDECSTP */ + case 0x36: + { + State->FpuStatus.Top--; + break; + } + + /* FINCSTP */ + case 0x37: + { + State->FpuStatus.Top++; + break; + } + + /* FPREM */ + case 0x38: + { + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + break; + } + + /* FYL2XP1 */ + case 0x39: + { + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + break; + } + + /* FSQRT */ + case 0x3A: + { + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + break; + } + + /* FSINCOS */ + case 0x3B: + { + FAST486_FPU_DATA_REG Number = FPU_ST(0); + FPU_SAVE_LAST_INST(); + + if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) + { + State->FpuStatus.Ie = TRUE; + + if (!State->FpuControl.Im) Fast486FpuException(State); + break; + } + + if (!FPU_IS_NORMALIZED(&FPU_ST(0))) + { + State->FpuStatus.De = TRUE; + + if (!State->FpuControl.Dm) + { + Fast486FpuException(State); + break; + } + } + + /* Replace FP0 with the sine */ + if (!Fast486FpuCalculateSine(State, &Number, &FPU_ST(0))) break; + FPU_UPDATE_TAG(0); + + /* Push the cosine */ + if (!Fast486FpuCalculateCosine(State, &Number, &Number)) break; + Fast486FpuPush(State, &Number); + + break; + } + + /* FRNDINT */ + case 0x3C: + { + INT Bits; + ULONGLONG Result = 0ULL; + ULONGLONG Remainder; + + if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) + { + State->FpuStatus.Ie = TRUE; + + if (!State->FpuControl.Im) Fast486FpuException(State); + break; + } + + if (!FPU_IS_NORMALIZED(&FPU_ST(0))) + { + State->FpuStatus.De = TRUE; + + if (!State->FpuControl.Dm) + { + Fast486FpuException(State); + break; + } + } + Bits = min(max(0, (INT)FPU_ST(0).Exponent - FPU_REAL10_BIAS + 1), 64); if (Bits == 64) break; @@ -1890,8 +1928,82 @@ /* FSCALE */ case 0x3D: { - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; + LONGLONG Scale; + LONGLONG UnbiasedExp = (LONGLONG)((SHORT)FPU_ST(0).Exponent) - FPU_REAL10_BIAS; + + FPU_SAVE_LAST_INST(); + + if (FPU_GET_TAG(0) == FPU_TAG_EMPTY || FPU_GET_TAG(1) == FPU_TAG_EMPTY) + { + State->FpuStatus.Ie = TRUE; + + if (!State->FpuControl.Im) Fast486FpuException(State); + break; + } + + if (!FPU_IS_NORMALIZED(&FPU_ST(0))) + { + State->FpuStatus.De = TRUE; + + if (!State->FpuControl.Dm) + { + Fast486FpuException(State); + break; + } + } + + if (!Fast486FpuToInteger(State, &FPU_ST(1), &Scale)) + { + /* Exception occurred */ + break; + } + + /* Adjust the unbiased exponent */ + UnbiasedExp += Scale; + + /* Check for underflow */ + if (UnbiasedExp < -1023) + { + /* Raise the underflow exception */ + State->FpuStatus.Ue = TRUE; + + if (State->FpuControl.Um) + { + /* Make the result zero */ + FPU_ST(0) = FpuZero; + FPU_UPDATE_TAG(0); + } + else + { + Fast486FpuException(State); + } + + break; + } + + /* Check for overflow */ + if (UnbiasedExp > 1023) + { + /* Raise the overflow exception */ + State->FpuStatus.Oe = TRUE; + + if (State->FpuControl.Om) + { + /* Make the result infinity */ + FPU_ST(0).Mantissa = FPU_MANTISSA_HIGH_BIT; + FPU_ST(0).Exponent = FPU_MAX_EXPONENT + 1; + FPU_UPDATE_TAG(0); + } + else + { + Fast486FpuException(State); + } + + break; + } + + FPU_ST(0).Exponent = (USHORT)(UnbiasedExp + FPU_REAL10_BIAS); + FPU_UPDATE_TAG(0); break; } @@ -1901,6 +2013,25 @@ { FPU_SAVE_LAST_INST(); + if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) + { + State->FpuStatus.Ie = TRUE; + + if (!State->FpuControl.Im) Fast486FpuException(State); + break; + } + + if (!FPU_IS_NORMALIZED(&FPU_ST(0))) + { + State->FpuStatus.De = TRUE; + + if (!State->FpuControl.Dm) + { + Fast486FpuException(State); + break; + } + } + Fast486FpuCalculateSine(State, &FPU_ST(0), &FPU_ST(0)); FPU_UPDATE_TAG(0); @@ -1911,6 +2042,25 @@ case 0x3F: { FPU_SAVE_LAST_INST(); + + if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) + { + State->FpuStatus.Ie = TRUE; + + if (!State->FpuControl.Im) Fast486FpuException(State); + break; + } + + if (!FPU_IS_NORMALIZED(&FPU_ST(0))) + { + State->FpuStatus.De = TRUE; + + if (!State->FpuControl.Dm) + { + Fast486FpuException(State); + break; + } + } Fast486FpuCalculateCosine(State, &FPU_ST(0), &FPU_ST(0)); FPU_UPDATE_TAG(0);

1 0

[aandrejevic] 67817: [FAST486] Fix F2XM1. Implement FSIN, FCOS and FSINCOS.
by aandrejevic＠svn.reactos.org 17 May '15

17 May '15

Author: aandrejevic Date: Sun May 17 19:48:57 2015 New Revision: 67817 URL: http://svn.reactos.org/svn/reactos?rev=67817&view=rev Log: [FAST486] Fix F2XM1. Implement FSIN, FCOS and FSINCOS. Modified: trunk/reactos/lib/fast486/fpu.c trunk/reactos/lib/fast486/fpu.h Modified: trunk/reactos/lib/fast486/fpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.c?rev=6781… ============================================================================== --- trunk/reactos/lib/fast486/fpu.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.c [iso-8859-1] Sun May 17 19:48:57 2015 @@ -75,6 +75,36 @@ {0xE38E38E38E38E38EULL, FPU_REAL10_BIAS - 5, FALSE}, /* 1 / 18 */ {0xD79435E50D79435EULL, FPU_REAL10_BIAS - 5, FALSE}, /* 1 / 19 */ {0xCCCCCCCCCCCCCCCDULL, FPU_REAL10_BIAS - 5, FALSE}, /* 1 / 20 */ + {0xC30C30C30C30C30CULL, FPU_REAL10_BIAS - 5, FALSE}, /* 1 / 21 */ + {0xBA2E8BA2E8BA2E8BULL, FPU_REAL10_BIAS - 5, FALSE}, /* 1 / 22 */ + {0xB21642C8590B2164ULL, FPU_REAL10_BIAS - 5, FALSE}, /* 1 / 23 */ + {0xAAAAAAAAAAAAAAABULL, FPU_REAL10_BIAS - 5, FALSE}, /* 1 / 24 */ + {0xA3D70A3D70A3D70AULL, FPU_REAL10_BIAS - 5, FALSE}, /* 1 / 25 */ + {0x9D89D89D89D89D8AULL, FPU_REAL10_BIAS - 5, FALSE}, /* 1 / 26 */ + {0x97B425ED097B425FULL, FPU_REAL10_BIAS - 5, FALSE}, /* 1 / 27 */ + {0x9249249249249249ULL, FPU_REAL10_BIAS - 5, FALSE}, /* 1 / 28 */ + {0x8D3DCB08D3DCB08DULL, FPU_REAL10_BIAS - 5, FALSE}, /* 1 / 29 */ + {0x8888888888888889ULL, FPU_REAL10_BIAS - 5, FALSE}, /* 1 / 30 */ + {0x8421084210842108ULL, FPU_REAL10_BIAS - 5, FALSE}, /* 1 / 31 */ + {0x8000000000000000ULL, FPU_REAL10_BIAS - 5, FALSE}, /* 1 / 32 */ + {0xF83E0F83E0F83E0FULL, FPU_REAL10_BIAS - 6, FALSE}, /* 1 / 33 */ + {0xF0F0F0F0F0F0F0F0ULL, FPU_REAL10_BIAS - 6, FALSE}, /* 1 / 34 */ + {0xEA0EA0EA0EA0EA0EULL, FPU_REAL10_BIAS - 6, FALSE}, /* 1 / 35 */ + {0xE38E38E38E38E38EULL, FPU_REAL10_BIAS - 6, FALSE}, /* 1 / 36 */ + {0xDD67C8A60DD67C8AULL, FPU_REAL10_BIAS - 6, FALSE}, /* 1 / 37 */ + {0xD79435E50D79435EULL, FPU_REAL10_BIAS - 6, FALSE}, /* 1 / 38 */ + {0xD20D20D20D20D20DULL, FPU_REAL10_BIAS - 6, FALSE}, /* 1 / 39 */ + {0xCCCCCCCCCCCCCCCDULL, FPU_REAL10_BIAS - 6, FALSE}, /* 1 / 40 */ + {0xC7CE0C7CE0C7CE0CULL, FPU_REAL10_BIAS - 6, FALSE}, /* 1 / 41 */ + {0xC30C30C30C30C30CULL, FPU_REAL10_BIAS - 6, FALSE}, /* 1 / 42 */ + {0xBE82FA0BE82FA0BFULL, FPU_REAL10_BIAS - 6, FALSE}, /* 1 / 43 */ + {0xBA2E8BA2E8BA2E8BULL, FPU_REAL10_BIAS - 6, FALSE}, /* 1 / 44 */ + {0xB60B60B60B60B60BULL, FPU_REAL10_BIAS - 6, FALSE}, /* 1 / 45 */ + {0xB21642C8590B2164ULL, FPU_REAL10_BIAS - 6, FALSE}, /* 1 / 46 */ + {0xAE4C415C9882B931ULL, FPU_REAL10_BIAS - 6, FALSE}, /* 1 / 47 */ + {0xAAAAAAAAAAAAAAABULL, FPU_REAL10_BIAS - 6, FALSE}, /* 1 / 48 */ + {0xA72F05397829CBC1ULL, FPU_REAL10_BIAS - 6, FALSE}, /* 1 / 49 */ + {0xA3D70A3D70A3D70AULL, FPU_REAL10_BIAS - 6, FALSE}, /* 1 / 50 */ }; /* PRIVATE FUNCTIONS **********************************************************/ @@ -953,11 +983,11 @@ FAST486_FPU_DATA_REG SeriesElement; /* Calculate the first series element, which is 2 * (x - 1) * ln(2) */ - Fast486FpuSubtract(State, Operand, &FpuOne, &Value); - Fast486FpuMultiply(State, &Value, &FpuLnTwo, &Value); - Fast486FpuAdd(State, &Value, &Value, &SeriesElement); - - for (i = 2; i < INVERSE_NUMBERS_COUNT; i++) + if (!Fast486FpuSubtract(State, Operand, &FpuOne, &Value)) return; + if (!Fast486FpuMultiply(State, &Value, &FpuLnTwo, &Value)) return; + if (!Fast486FpuAdd(State, &Value, &Value, &SeriesElement)) return; + + for (i = 2; i <= INVERSE_NUMBERS_COUNT / 2; i++) { /* Add the series element to the final sum */ if (!Fast486FpuAdd(State, &TempResult, &SeriesElement, &TempResult)) @@ -977,7 +1007,10 @@ } /* And now multiply the series element by the inverse counter */ - if (!Fast486FpuMultiply(State, &SeriesElement, &FpuInverseNumber[i], &SeriesElement)) + if (!Fast486FpuMultiply(State, + &SeriesElement, + &FpuInverseNumber[i - 1], + &SeriesElement)) { /* An exception occurred */ return; @@ -985,6 +1018,102 @@ } *Result = TempResult; +} + +/* + * Calculates using the identity: + * sin(x) = sum { -1^n * x^(2n + 1) / (2n + 1)!, n >= 0 } + */ +static inline BOOLEAN FASTCALL +Fast486FpuCalculateSine(PFAST486_STATE State, + PFAST486_FPU_DATA_REG Operand, + PFAST486_FPU_DATA_REG Result) +{ + INT i; + FAST486_FPU_DATA_REG TempResult = *Operand; + FAST486_FPU_DATA_REG OperandSquared = *Operand; + FAST486_FPU_DATA_REG SeriesElement = *Operand; + + /* Calculate the square of the operand */ + if (!Fast486FpuMultiply(State, Operand, Operand, &OperandSquared)) return FALSE; + + for (i = 2; (i * (i + 1)) <= INVERSE_NUMBERS_COUNT; i += 2) + { + if (!Fast486FpuMultiply(State, &SeriesElement, &OperandSquared, &SeriesElement)) + { + /* An exception occurred */ + return FALSE; + } + + if (!Fast486FpuMultiply(State, + &SeriesElement, + &FpuInverseNumber[i * (i + 1) - 1], + &SeriesElement)) + { + /* An exception occurred */ + return FALSE; + } + + /* Toggle the sign of the series element */ + SeriesElement.Sign = !SeriesElement.Sign; + + if (!Fast486FpuAdd(State, &TempResult, &SeriesElement, &TempResult)) + { + /* An exception occurred */ + return FALSE; + } + } + + *Result = TempResult; + return TRUE; +} + +/* + * Calculates using the identity: + * cos(x) = sum { -1^n * x^(2n) / (2n)!, n >= 0 } + */ +static inline BOOLEAN FASTCALL +Fast486FpuCalculateCosine(PFAST486_STATE State, + PFAST486_FPU_DATA_REG Operand, + PFAST486_FPU_DATA_REG Result) +{ + INT i; + FAST486_FPU_DATA_REG TempResult = FpuOne; + FAST486_FPU_DATA_REG OperandSquared = *Operand; + FAST486_FPU_DATA_REG SeriesElement = FpuOne; + + /* Calculate the square of the operand */ + if (!Fast486FpuMultiply(State, Operand, Operand, &OperandSquared)) return FALSE; + + for (i = 1; (i * (i + 1)) <= INVERSE_NUMBERS_COUNT; i += 2) + { + if (!Fast486FpuMultiply(State, &SeriesElement, &OperandSquared, &SeriesElement)) + { + /* An exception occurred */ + return FALSE; + } + + if (!Fast486FpuMultiply(State, + &SeriesElement, + &FpuInverseNumber[i * (i + 1) - 1], + &SeriesElement)) + { + /* An exception occurred */ + return FALSE; + } + + /* Toggle the sign of the series element */ + SeriesElement.Sign = !SeriesElement.Sign; + + if (!Fast486FpuAdd(State, &TempResult, &SeriesElement, &TempResult)) + { + /* An exception occurred */ + return FALSE; + } + } + + *Result = TempResult; + return TRUE; } static inline VOID FASTCALL @@ -1699,8 +1828,16 @@ /* FSINCOS */ case 0x3B: { - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; + FAST486_FPU_DATA_REG Number = FPU_ST(0); + FPU_SAVE_LAST_INST(); + + /* Replace FP0 with the sine */ + if (!Fast486FpuCalculateSine(State, &Number, &FPU_ST(0))) break; + FPU_UPDATE_TAG(0); + + /* Push the cosine */ + if (!Fast486FpuCalculateCosine(State, &Number, &Number)) break; + Fast486FpuPush(State, &Number); break; } @@ -1762,8 +1899,10 @@ /* FSIN */ case 0x3E: { - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; + FPU_SAVE_LAST_INST(); + + Fast486FpuCalculateSine(State, &FPU_ST(0), &FPU_ST(0)); + FPU_UPDATE_TAG(0); break; } @@ -1771,8 +1910,10 @@ /* FCOS */ case 0x3F: { - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; + FPU_SAVE_LAST_INST(); + + Fast486FpuCalculateCosine(State, &FPU_ST(0), &FPU_ST(0)); + FPU_UPDATE_TAG(0); break; } Modified: trunk/reactos/lib/fast486/fpu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.h?rev=6781… ============================================================================== --- trunk/reactos/lib/fast486/fpu.h [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.h [iso-8859-1] Sun May 17 19:48:57 2015 @@ -71,7 +71,7 @@ #define FPU_IS_NEG_INF(x) (FPU_IS_INFINITY(x) && (x)->Sign) #define FPU_IS_INDEFINITE(x) (FPU_IS_NAN(x) && !FPU_IS_INFINITY(x)) -#define INVERSE_NUMBERS_COUNT 21 +#define INVERSE_NUMBERS_COUNT 50 enum {

1 0

[cfinck] 67816: [WINSPOOL] - Use GdiConvertToDevmodeW instead of duplicating code. - Fix the spec2def call here as well.
by cfinck＠svn.reactos.org 17 May '15

17 May '15

Author: cfinck Date: Sun May 17 17:19:37 2015 New Revision: 67816 URL: http://svn.reactos.org/svn/reactos?rev=67816&view=rev Log: [WINSPOOL] - Use GdiConvertToDevmodeW instead of duplicating code. - Fix the spec2def call here as well. Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/CMakeLists.txt branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/main.c Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/CMakeLists.txt [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/CMakeLists.txt [iso-8859-1] Sun May 17 17:19:37 2015 @@ -1,7 +1,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/idl) add_rpc_files(client ${REACTOS_SOURCE_DIR}/include/reactos/idl/winspool.idl) -spec2def(winspool winspool.spec ADD_IMPORTLIB) +spec2def(winspool.drv winspool.spec ADD_IMPORTLIB) list(APPEND SOURCE main.c @@ -17,6 +17,6 @@ set_target_properties(winspool PROPERTIES SUFFIX ".drv") set_module_type(winspool win32dll UNICODE) target_link_libraries(winspool wine ${PSEH_LIB}) -add_importlibs(winspool rpcrt4 msvcrt kernel32 ntdll) +add_importlibs(winspool gdi32 rpcrt4 msvcrt kernel32 ntdll) add_pch(winspool precomp.h SOURCE) add_cd_file(TARGET winspool DESTINATION reactos/system32 FOR all) Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/main.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/main.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/main.c [iso-8859-1] Sun May 17 17:19:37 2015 @@ -165,7 +165,6 @@ OpenPrinterA(LPSTR pPrinterName, LPHANDLE phPrinter, LPPRINTER_DEFAULTSA pDefault) { BOOL ReturnValue = FALSE; - DEVMODEW wDevMode; PWSTR pwszPrinterName = NULL; PWSTR pwszDatatype = NULL; PRINTER_DEFAULTSW wDefault = { 0 }; @@ -207,22 +206,15 @@ } if (pDefault->pDevMode) - { - // Fixed size strings, so no additional memory needs to be allocated - MultiByteToWideChar(CP_ACP, 0, (LPCSTR)pDefault->pDevMode->dmDeviceName, -1, wDevMode.dmDeviceName, sizeof(wDevMode.dmDeviceName) / sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, (LPCSTR)pDefault->pDevMode->dmFormName, -1, wDevMode.dmFormName, sizeof(wDevMode.dmFormName) / sizeof(WCHAR)); - - // Use CopyMemory to copy over several structure values in one step - CopyMemory(&wDevMode.dmSpecVersion, &pDefault->pDevMode->dmSpecVersion, (ULONG_PTR)&wDevMode.dmCollate - (ULONG_PTR)&wDevMode.dmSpecVersion + sizeof(wDevMode.dmCollate)); - CopyMemory(&wDevMode.dmLogPixels, &pDefault->pDevMode->dmLogPixels, (ULONG_PTR)&wDevMode.dmPanningHeight - (ULONG_PTR)&wDevMode.dmLogPixels + sizeof(wDevMode.dmPanningHeight)); - - wDefault.pDevMode = &wDevMode; - } + wDefault.pDevMode = GdiConvertToDevmodeW(pDefault->pDevMode); } ReturnValue = OpenPrinterW(pwszPrinterName, phPrinter, &wDefault); Cleanup: + if (wDefault.pDevMode) + HeapFree(GetProcessHeap(), 0, wDefault.pDevMode); + if (pwszPrinterName) HeapFree(GetProcessHeap(), 0, pwszPrinterName);

1 0

[tkreuzer] 67815: [WIN32K] Add debug prints to NtGdiPathToRegion
by tkreuzer＠svn.reactos.org 17 May '15

17 May '15

Author: tkreuzer Date: Sun May 17 16:26:23 2015 New Revision: 67815 URL: http://svn.reactos.org/svn/reactos?rev=67815&view=rev Log: [WIN32K] Add debug prints to NtGdiPathToRegion Modified: trunk/reactos/win32ss/gdi/ntgdi/path.c Modified: trunk/reactos/win32ss/gdi/ntgdi/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/path.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/path.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/path.c [iso-8859-1] Sun May 17 16:26:23 2015 @@ -2703,6 +2703,7 @@ pDc = DC_LockDc(hDC); if (!pDc) { + DPRINT1("Failed to lock DC %p\n", hDC); EngSetLastError(ERROR_INVALID_PARAMETER); return NULL; } @@ -2712,6 +2713,7 @@ pPath = PATH_LockPath(pDc->dclevel.hPath); if (!pPath) { + DPRINT1("Failed to lock DC path %p\n", pDc->dclevel.hPath); DC_UnlockDc(pDc); return NULL; } @@ -2719,6 +2721,7 @@ if (pPath->state != PATH_Closed) { // FIXME: Check that setlasterror is being called correctly + DPRINT1("Path is not closed!\n"); EngSetLastError(ERROR_CAN_NOT_COMPLETE); } else @@ -2727,6 +2730,7 @@ Rgn = REGION_AllocUserRgnWithHandle(1); if (!Rgn) { + DPRINT1("Failed to allocate a region\n"); PATH_UnlockPath(pPath); DC_UnlockDc(pDc); return NULL; @@ -2740,6 +2744,7 @@ } else { + DPRINT1("PATH_PathToRegion failed\n"); REGION_Delete(Rgn); hrgnRval = NULL; }

1 0

[aandrejevic] 67814: [FAST486] Implement F2XM1 using a Maclaurin series.
by aandrejevic＠svn.reactos.org 17 May '15

17 May '15

Author: aandrejevic Date: Sun May 17 16:21:29 2015 New Revision: 67814 URL: http://svn.reactos.org/svn/reactos?rev=67814&view=rev Log: [FAST486] Implement F2XM1 using a Maclaurin series. Modified: trunk/reactos/lib/fast486/fpu.c trunk/reactos/lib/fast486/fpu.h Modified: trunk/reactos/lib/fast486/fpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.c?rev=6781… ============================================================================== --- trunk/reactos/lib/fast486/fpu.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.c [iso-8859-1] Sun May 17 16:21:29 2015 @@ -53,6 +53,30 @@ /* ln(2) */ static const FAST486_FPU_DATA_REG FpuLnTwo = {0xB17217F7D1CF79ABULL, FPU_REAL10_BIAS - 1, FALSE}; +static const FAST486_FPU_DATA_REG FpuInverseNumber[INVERSE_NUMBERS_COUNT] = +{ + {0x8000000000000000ULL, FPU_REAL10_BIAS, FALSE}, /* 1 / 1 */ + {0x8000000000000000ULL, FPU_REAL10_BIAS - 1, FALSE}, /* 1 / 2 */ + {0xAAAAAAAAAAAAAAABULL, FPU_REAL10_BIAS - 2, FALSE}, /* 1 / 3 */ + {0x8000000000000000ULL, FPU_REAL10_BIAS - 2, FALSE}, /* 1 / 4 */ + {0xCCCCCCCCCCCCCCCDULL, FPU_REAL10_BIAS - 3, FALSE}, /* 1 / 5 */ + {0xAAAAAAAAAAAAAAAAULL, FPU_REAL10_BIAS - 3, FALSE}, /* 1 / 6 */ + {0x9249249249249249ULL, FPU_REAL10_BIAS - 3, FALSE}, /* 1 / 7 */ + {0x8000000000000000ULL, FPU_REAL10_BIAS - 3, FALSE}, /* 1 / 8 */ + {0xE38E38E38E38E38EULL, FPU_REAL10_BIAS - 4, FALSE}, /* 1 / 9 */ + {0xCCCCCCCCCCCCCCCDULL, FPU_REAL10_BIAS - 4, FALSE}, /* 1 / 10 */ + {0xBA2E8BA2E8BA2E8CULL, FPU_REAL10_BIAS - 4, FALSE}, /* 1 / 11 */ + {0xAAAAAAAAAAAAAAABULL, FPU_REAL10_BIAS - 4, FALSE}, /* 1 / 12 */ + {0x9D89D89D89D89D8AULL, FPU_REAL10_BIAS - 4, FALSE}, /* 1 / 13 */ + {0x9249249249249249ULL, FPU_REAL10_BIAS - 4, FALSE}, /* 1 / 14 */ + {0x8888888888888889ULL, FPU_REAL10_BIAS - 4, FALSE}, /* 1 / 15 */ + {0x8000000000000000ULL, FPU_REAL10_BIAS - 4, FALSE}, /* 1 / 16 */ + {0xF0F0F0F0F0F0F0F0ULL, FPU_REAL10_BIAS - 5, FALSE}, /* 1 / 17 */ + {0xE38E38E38E38E38EULL, FPU_REAL10_BIAS - 5, FALSE}, /* 1 / 18 */ + {0xD79435E50D79435EULL, FPU_REAL10_BIAS - 5, FALSE}, /* 1 / 19 */ + {0xCCCCCCCCCCCCCCCDULL, FPU_REAL10_BIAS - 5, FALSE}, /* 1 / 20 */ +}; + /* PRIVATE FUNCTIONS **********************************************************/ #ifndef FAST486_NO_FPU @@ -527,7 +551,7 @@ return TRUE; } -static inline VOID FASTCALL +static inline BOOLEAN FASTCALL Fast486FpuAdd(PFAST486_STATE State, PCFAST486_FPU_DATA_REG FirstOperand, PCFAST486_FPU_DATA_REG SecondOperand, @@ -545,7 +569,7 @@ if (!State->FpuControl.Dm) { Fast486FpuException(State); - return; + return FALSE; } } @@ -604,7 +628,7 @@ else { Fast486FpuException(State); - return; + return FALSE; } } else @@ -617,11 +641,17 @@ } /* Normalize the result and return it */ - Fast486FpuNormalize(State, &TempResult); + if (!Fast486FpuNormalize(State, &TempResult)) + { + /* Exception occurred */ + return FALSE; + } + *Result = TempResult; + return TRUE; } -static inline VOID FASTCALL +static inline BOOLEAN FASTCALL Fast486FpuSubtract(PFAST486_STATE State, PCFAST486_FPU_DATA_REG FirstOperand, PCFAST486_FPU_DATA_REG SecondOperand, @@ -633,7 +663,7 @@ NegativeSecondOperand.Sign = !NegativeSecondOperand.Sign; /* And perform an addition instead */ - Fast486FpuAdd(State, FirstOperand, &NegativeSecondOperand, Result); + return Fast486FpuAdd(State, FirstOperand, &NegativeSecondOperand, Result); } static inline VOID FASTCALL @@ -689,7 +719,7 @@ } } -static inline VOID FASTCALL +static inline BOOLEAN FASTCALL Fast486FpuMultiply(PFAST486_STATE State, PCFAST486_FPU_DATA_REG FirstOperand, PCFAST486_FPU_DATA_REG SecondOperand, @@ -707,7 +737,7 @@ Result->Sign = TRUE; Result->Exponent = FPU_MAX_EXPONENT + 1; Result->Mantissa = FPU_INDEFINITE_MANTISSA; - return; + return TRUE; } if (FPU_IS_ZERO(FirstOperand) || FPU_IS_ZERO(SecondOperand)) @@ -716,7 +746,7 @@ Result->Sign = FirstOperand->Sign ^ SecondOperand->Sign; Result->Exponent = 0; Result->Mantissa = 0ULL; - return; + return TRUE; } if (FPU_IS_INFINITY(FirstOperand) || FPU_IS_INFINITY(SecondOperand)) @@ -725,7 +755,7 @@ Result->Sign = FirstOperand->Sign ^ SecondOperand->Sign; Result->Exponent = FPU_MAX_EXPONENT + 1; Result->Mantissa = FPU_MANTISSA_HIGH_BIT; - return; + return TRUE; } if ((!FPU_IS_NORMALIZED(FirstOperand) || !FPU_IS_NORMALIZED(SecondOperand))) @@ -736,7 +766,7 @@ if (!State->FpuControl.Dm) { Fast486FpuException(State); - return; + return FALSE; } } @@ -759,7 +789,7 @@ if (!State->FpuControl.Um) { Fast486FpuException(State); - return; + return FALSE; } /* The exponent will be zero */ @@ -777,7 +807,7 @@ if (!State->FpuControl.Om) { Fast486FpuException(State); - return; + return FALSE; } /* Make the result infinity */ @@ -787,11 +817,17 @@ else TempResult.Exponent = (USHORT)Exponent; /* Normalize the result */ - Fast486FpuNormalize(State, &TempResult); + if (!Fast486FpuNormalize(State, &TempResult)) + { + /* Exception occurred */ + return FALSE; + } + *Result = TempResult; + return TRUE; } -static inline VOID FASTCALL +static inline BOOLEAN FASTCALL Fast486FpuDivide(PFAST486_STATE State, PCFAST486_FPU_DATA_REG FirstOperand, PCFAST486_FPU_DATA_REG SecondOperand, @@ -815,10 +851,13 @@ Result->Sign = TRUE; Result->Exponent = FPU_MAX_EXPONENT + 1; Result->Mantissa = FPU_INDEFINITE_MANTISSA; - } - else Fast486FpuException(State); - - return; + return TRUE; + } + else + { + Fast486FpuException(State); + return FALSE; + } } if (FPU_IS_ZERO(SecondOperand) || FPU_IS_INFINITY(FirstOperand)) @@ -832,10 +871,13 @@ Result->Sign = FirstOperand->Sign; Result->Exponent = FPU_MAX_EXPONENT + 1; Result->Mantissa = FPU_MANTISSA_HIGH_BIT; - } - else Fast486FpuException(State); - - return; + return TRUE; + } + else + { + Fast486FpuException(State); + return FALSE; + } } /* Calculate the sign of the result */ @@ -847,7 +889,7 @@ Result->Sign = TempResult.Sign; Result->Mantissa = 0ULL; Result->Exponent = 0; - return; + return TRUE; } /* Calculate the exponent of the result */ @@ -886,7 +928,62 @@ TempResult.Exponent = (USHORT)(Exponent + FPU_REAL10_BIAS); /* Normalize the result */ - Fast486FpuNormalize(State, &TempResult); + if (!Fast486FpuNormalize(State, &TempResult)) + { + /* Exception occurred */ + return FALSE; + } + + *Result = TempResult; + return TRUE; +} + +/* + * Calculates using the identity: + * 2 ^ x - 1 = 1 + sum { 2 * (((x - 1) * ln(2)) ^ n) / n! } + */ +static inline VOID FASTCALL +Fast486FpuCalculateTwoPowerMinusOne(PFAST486_STATE State, + PFAST486_FPU_DATA_REG Operand, + PFAST486_FPU_DATA_REG Result) +{ + INT i; + FAST486_FPU_DATA_REG TempResult = FpuOne; + FAST486_FPU_DATA_REG Value; + FAST486_FPU_DATA_REG SeriesElement; + + /* Calculate the first series element, which is 2 * (x - 1) * ln(2) */ + Fast486FpuSubtract(State, Operand, &FpuOne, &Value); + Fast486FpuMultiply(State, &Value, &FpuLnTwo, &Value); + Fast486FpuAdd(State, &Value, &Value, &SeriesElement); + + for (i = 2; i < INVERSE_NUMBERS_COUNT; i++) + { + /* Add the series element to the final sum */ + if (!Fast486FpuAdd(State, &TempResult, &SeriesElement, &TempResult)) + { + /* An exception occurred */ + return; + } + + /* + * Calculate the next series element (partially) by multiplying + * it with (x - 1) * ln(2) + */ + if (!Fast486FpuMultiply(State, &SeriesElement, &Value, &SeriesElement)) + { + /* An exception occurred */ + return; + } + + /* And now multiply the series element by the inverse counter */ + if (!Fast486FpuMultiply(State, &SeriesElement, &FpuInverseNumber[i], &SeriesElement)) + { + /* An exception occurred */ + return; + } + } + *Result = TempResult; } @@ -1471,8 +1568,10 @@ /* F2XM1 */ case 0x30: { - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; + FPU_SAVE_LAST_INST(); + + Fast486FpuCalculateTwoPowerMinusOne(State, &FPU_ST(0), &FPU_ST(0)); + FPU_UPDATE_TAG(0); break; } Modified: trunk/reactos/lib/fast486/fpu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.h?rev=6781… ============================================================================== --- trunk/reactos/lib/fast486/fpu.h [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.h [iso-8859-1] Sun May 17 16:21:29 2015 @@ -71,6 +71,8 @@ #define FPU_IS_NEG_INF(x) (FPU_IS_INFINITY(x) && (x)->Sign) #define FPU_IS_INDEFINITE(x) (FPU_IS_NAN(x) && !FPU_IS_INFINITY(x)) +#define INVERSE_NUMBERS_COUNT 21 + enum { FPU_SINGLE_PRECISION = 0,

1 0

[ekohl] 67813: [SYSDM] Implement renaming and copying of hardware profiles. Modifications are not yet stored in the registry. WIP
by ekohl＠svn.reactos.org 17 May '15

17 May '15

Author: ekohl Date: Sun May 17 16:11:15 2015 New Revision: 67813 URL: http://svn.reactos.org/svn/reactos?rev=67813&view=rev Log: [SYSDM] Implement renaming and copying of hardware profiles. Modifications are not yet stored in the registry. WIP Modified: trunk/reactos/dll/cpl/sysdm/hardprof.c Modified: trunk/reactos/dll/cpl/sysdm/hardprof.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/hardprof.c?r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/hardprof.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/hardprof.c [iso-8859-1] Sun May 17 16:11:15 2015 @@ -14,13 +14,77 @@ typedef struct _PROFILE { WCHAR szFriendlyName[256]; + WCHAR szName[5]; + DWORD dwProfileNumber; + DWORD dwPreferenceOrder; } PROFILE, *PPROFILE; typedef struct _PROFILEDATA { DWORD dwProfileCount; + DWORD dwLastProfile; + DWORD dwSelectedProfile; + DWORD dwSelectedProfileIndex; PPROFILE pProfiles; + HWND hwndProfileDlg; } PROFILEDATA, *PPROFILEDATA; + + +static +VOID +OnCopyProfileInit(HWND hwndDlg, + PPROFILEDATA pProfileData, + UINT idFrom, + UINT idTo) +{ + WCHAR szNewProfileName[256]; + + SetDlgItemText(hwndDlg, idFrom, pProfileData->pProfiles[pProfileData->dwSelectedProfileIndex].szFriendlyName); + + swprintf(szNewProfileName, L"Profile %lu", pProfileData->dwProfileCount); + SetDlgItemText(hwndDlg, idTo, szNewProfileName); +} + + +static +VOID +CopyProfile( + HWND hwndDlg, + PPROFILEDATA pProfileData) +{ + PPROFILE pProfiles; +// PPROFILE pSrcProfile + PPROFILE pDstProfile; + + /* Allocate memory for the new profile */ + pProfiles = HeapReAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + pProfileData->pProfiles, + (pProfileData->dwProfileCount + 1) * sizeof(PROFILE)); + if (pProfiles == NULL) + { + DPRINT1("HeapReAlloc() failed!\n"); + return; + } + + pProfileData->dwProfileCount++; + pProfileData->pProfiles = pProfiles; + +// pSrcProfile = &pProfileData->pProfiles[pProfileData->dwSelectedProfileIndex]; + pDstProfile = &pProfileData->pProfiles[pProfileData->dwProfileCount - 1]; + + GetDlgItemText(hwndDlg, + IDC_COPYPROFILETO, + pDstProfile->szFriendlyName, + 256); + + pDstProfile->dwProfileNumber = ++pProfileData->dwLastProfile; + swprintf(pDstProfile->szName, L"%04lu", pDstProfile->dwProfileNumber); + + pDstProfile->dwPreferenceOrder = pDstProfile->dwProfileNumber; + + SendDlgItemMessageW(pProfileData->hwndProfileDlg, IDC_HRDPROFLSTBOX, LB_ADDSTRING, 0, (LPARAM)pDstProfile->szFriendlyName); +} static @@ -31,22 +95,54 @@ WPARAM wParam, LPARAM lParam) { - UNREFERENCED_PARAMETER(lParam); - UNREFERENCED_PARAMETER(wParam); - UNREFERENCED_PARAMETER(hwndDlg); + PPROFILEDATA pProfileData; + + pProfileData = (PPROFILEDATA)GetWindowLongPtr(hwndDlg, DWLP_USER); switch (uMsg) { + case WM_INITDIALOG: + SetWindowLongPtr(hwndDlg, DWLP_USER, lParam); + pProfileData = (PPROFILEDATA)lParam; + OnCopyProfileInit(hwndDlg, pProfileData, IDC_COPYPROFILEFROM, IDC_COPYPROFILETO); + break; + case WM_COMMAND: - if ((LOWORD(wParam) == IDOK) || (LOWORD(wParam) == IDCANCEL)) + switch (LOWORD(wParam)) { - EndDialog(hwndDlg, - LOWORD(wParam)); - return TRUE; + case IDOK: + CopyProfile(hwndDlg, pProfileData); + EndDialog(hwndDlg, IDOK); + return TRUE; + + case IDCANCEL: + EndDialog(hwndDlg, IDCANCEL); + return TRUE; } break; } return FALSE; +} + + +static +VOID +RenameProfile( + HWND hwndDlg, + PPROFILEDATA pProfileData) +{ + PPROFILE pProfile; + + pProfile = &pProfileData->pProfiles[pProfileData->dwSelectedProfileIndex]; + + GetDlgItemText(hwndDlg, + IDC_RENPROFEDITTO, + pProfile->szFriendlyName, + 256); + + /* Replace the listbox string */ + SendDlgItemMessageW(pProfileData->hwndProfileDlg, IDC_HRDPROFLSTBOX, LB_DELETESTRING, pProfileData->dwSelectedProfileIndex, 0); + SendDlgItemMessageW(pProfileData->hwndProfileDlg, IDC_HRDPROFLSTBOX, LB_INSERTSTRING, pProfileData->dwSelectedProfileIndex, (LPARAM)pProfile->szFriendlyName); } @@ -58,21 +154,33 @@ WPARAM wParam, LPARAM lParam) { - UNREFERENCED_PARAMETER(lParam); - UNREFERENCED_PARAMETER(wParam); - UNREFERENCED_PARAMETER(hwndDlg); + PPROFILEDATA pProfileData; + + pProfileData = (PPROFILEDATA)GetWindowLongPtr(hwndDlg, DWLP_USER); switch (uMsg) { + case WM_INITDIALOG: + SetWindowLongPtr(hwndDlg, DWLP_USER, lParam); + pProfileData = (PPROFILEDATA)lParam; + OnCopyProfileInit(hwndDlg, pProfileData, IDC_RENPROFEDITFROM, IDC_RENPROFEDITTO); + break; + case WM_COMMAND: - if ((LOWORD(wParam) == IDOK) || (LOWORD(wParam) == IDCANCEL)) + switch (LOWORD(wParam)) { - EndDialog(hwndDlg, - LOWORD(wParam)); - return TRUE; + case IDOK: + RenameProfile(hwndDlg, pProfileData); + EndDialog(hwndDlg, IDOK); + return TRUE; + + case IDCANCEL: + EndDialog(hwndDlg, IDCANCEL); + return TRUE; } break; } + return FALSE; } @@ -161,7 +269,12 @@ static VOID -GetProfile(HWND hwndDlg, HKEY hKey, LPWSTR lpName, PPROFILE pProfile) +GetProfile( + HWND hwndDlg, + HKEY hKey, + LPWSTR lpName, + DWORD dwProfileNumber, + PPROFILE pProfile) { HKEY hProfileKey; DWORD dwSize; @@ -185,8 +298,23 @@ if (lError == ERROR_SUCCESS) { DPRINT1("Profile: %S\n", pProfile->szFriendlyName); - SendDlgItemMessageW(hwndDlg, IDC_HRDPROFLSTBOX, LB_ADDSTRING, 0, (LPARAM)pProfile->szFriendlyName); - } + } + + dwSize = sizeof(DWORD); + lError = RegQueryValueExW(hProfileKey, + L"PreferenceOrder", + NULL, + NULL, + (LPBYTE)pProfile->dwPreferenceOrder, + &dwSize); + if (lError == ERROR_SUCCESS) + { + DPRINT1("PreferenceOrder: %lu\n", pProfile->dwPreferenceOrder); + } + + pProfile->dwProfileNumber = dwProfileNumber; + + SendDlgItemMessageW(hwndDlg, IDC_HRDPROFLSTBOX, LB_ADDSTRING, 0, (LPARAM)pProfile->szFriendlyName); RegCloseKey(hProfileKey); } @@ -199,6 +327,7 @@ PPROFILEDATA pProfileData; WCHAR szName[8]; DWORD dwNameLength; + DWORD dwProfileNumber; DWORD dwIndex = 0; HKEY hKey; LONG lError; @@ -206,6 +335,10 @@ pProfileData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(PROFILEDATA)); if (pProfileData == NULL) return FALSE; + + pProfileData->hwndProfileDlg = hwndDlg; + pProfileData->dwLastProfile = (DWORD)-1; + pProfileData->dwSelectedProfileIndex = (DWORD)-1; if (!GetProfileCount(&pProfileData->dwProfileCount)) { @@ -244,9 +377,17 @@ if (lError != ERROR_SUCCESS) break; + dwProfileNumber = wcstoul(szName, NULL, 10); DPRINT("Profile name: %S\n", szName); - - GetProfile(hwndDlg, hKey, szName, &pProfileData->pProfiles[dwIndex]); + DPRINT("Profile number: %lu\n", dwProfileNumber); + + if ((pProfileData->dwLastProfile == (DWORD)-1) || + (pProfileData->dwLastProfile < dwProfileNumber)) + pProfileData->dwLastProfile = dwProfileNumber; + + DPRINT("Last Profile number: %lu\n", pProfileData->dwLastProfile); + + GetProfile(hwndDlg, hKey, szName, dwProfileNumber, &pProfileData->pProfiles[dwIndex]); } RegCloseKey(hKey); @@ -345,17 +486,19 @@ switch (LOWORD(wParam)) { case IDC_HRDPROFCOPY: - DialogBox(hApplet, - MAKEINTRESOURCE(IDD_COPYPROFILE), - hwndDlg, - (DLGPROC)CopyProfileDlgProc); + DialogBoxParam(hApplet, + MAKEINTRESOURCE(IDD_COPYPROFILE), + hwndDlg, + (DLGPROC)CopyProfileDlgProc, + (LPARAM)pProfileData); break; case IDC_HRDPROFRENAME: - DialogBox(hApplet, - MAKEINTRESOURCE(IDD_RENAMEPROFILE), - hwndDlg, - (DLGPROC)RenameProfileDlgProc); + DialogBoxParam(hApplet, + MAKEINTRESOURCE(IDD_RENAMEPROFILE), + hwndDlg, + (DLGPROC)RenameProfileDlgProc, + (LPARAM)pProfileData); break; case IDC_HRDPROFWAIT: @@ -366,12 +509,21 @@ EnableWindow(GetDlgItem(hwndDlg, IDC_HRDPROFEDIT), TRUE); return TRUE; + case IDC_HRDPROFLSTBOX: + if (HIWORD(wParam) == LBN_SELCHANGE) + { + pProfileData->dwSelectedProfileIndex = (DWORD)SendDlgItemMessage(hwndDlg, IDC_HRDPROFLSTBOX, LB_GETCURSEL, 0, 0); + + EnableWindow(GetDlgItem(hwndDlg, IDC_HRDPROFCOPY), (pProfileData->dwSelectedProfileIndex != (DWORD)-1) ? TRUE : FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_HRDPROFRENAME), (pProfileData->dwSelectedProfileIndex != (DWORD)-1) ? TRUE : FALSE); + } + return TRUE; + case IDOK: OnOk(hwndDlg); case IDCANCEL: - EndDialog(hwndDlg, - LOWORD(wParam)); + EndDialog(hwndDlg, LOWORD(wParam)); return TRUE; } break;

1 0

[akhaldi] 67812: [SHLWAPI] Properly stub SHGetPrivateProfileSection. CORE-9708
by akhaldi＠svn.reactos.org 17 May '15

17 May '15

Author: akhaldi Date: Sun May 17 14:53:38 2015 New Revision: 67812 URL: http://svn.reactos.org/svn/reactos?rev=67812&view=rev Log: [SHLWAPI] Properly stub SHGetPrivateProfileSection. CORE-9708 Modified: trunk/reactos/dll/win32/shlwapi/shlwapi.spec Modified: trunk/reactos/dll/win32/shlwapi/shlwapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi.… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/shlwapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/shlwapi.spec [iso-8859-1] Sun May 17 14:53:38 2015 @@ -560,7 +560,7 @@ 560 stdcall -stub -noname SHWindowsPolicyGetValue(ptr ptr ptr) 561 stub -noname AssocGetUrlAction 562 stub -noname SHGetPrivateProfileInt -563 stub -noname SHGetPrivateProfileSection +563 stdcall -stub -noname SHGetPrivateProfileSection(wstr ptr long ptr) 564 stub -noname SHGetPrivateProfileSectionNames 565 stub -noname SHGetPrivateProfileString 566 stub -noname SHGetPrivateProfileStruct

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