Ros-diffs October 2014

ros-diffs@reactos.org

19 participants
730 discussions

[hbelusca] 64680: [FAST486] Use a more performant CountLeadingZeros64 version from Timo (tested by Thomas), and disable the MSVC-specific one until you find a version that works, and is supported f...
by hbelusca＠svn.reactos.org 11 Oct '14

11 Oct '14

Author: hbelusca Date: Sat Oct 11 18:35:23 2014 New Revision: 64680 URL: http://svn.reactos.org/svn/reactos?rev=64680&view=rev Log: [FAST486] Use a more performant CountLeadingZeros64 version from Timo (tested by Thomas), and disable the MSVC-specific one until you find a version that works, and is supported for any CPU. Modified: trunk/reactos/lib/fast486/common.inl 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] Sat Oct 11 18:35:23 2014 @@ -26,24 +26,27 @@ #if defined (__GNUC__) #define CountLeadingZeros64(x) __builtin_clzll(x) + +#if 0 #elif (_MSC_VER >= 1500) && defined(_WIN64) #define CountLeadingZeros64(x) __lzcnt64(x) #elif (_MSC_VER >= 1500) #define CountLeadingZeros64(x) ((x) > 0xFFFFFFFFULL) ? __lzcnt((x) >> 32) \ : (__lzcnt(x) + 32) +#endif + #else - static FORCEINLINE - ULONG CountLeadingZeros64(ULONGLONG Value) + FORCEINLINE + ULONG + CountLeadingZeros64(ULONGLONG Value) { ULONG Count = 0; - ULONGLONG Mask = 1ULL << 63; - - while (!(Value & Mask) && Mask) + Value = ~Value; + while ((LONGLONG)Value < 0) { Count++; - Mask >>= 1; - } - + Value <<= 1; + } return Count; } #endif

1 0

[pschweitzer] 64679: [NTFS] Addendum to r64678
by pschweitzer＠svn.reactos.org 11 Oct '14

11 Oct '14

Author: pschweitzer Date: Sat Oct 11 18:03:48 2014 New Revision: 64679 URL: http://svn.reactos.org/svn/reactos?rev=64679&view=rev Log: [NTFS] Addendum to r64678 Modified: trunk/reactos/drivers/filesystems/ntfs/create.c Modified: trunk/reactos/drivers/filesystems/ntfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/create.c [iso-8859-1] Sat Oct 11 18:03:48 2014 @@ -86,7 +86,7 @@ NTSTATUS Status; PWSTR AbsFileName = NULL; - DPRINT1("NtfsOpenFile(%p, %p, %S)\n", DeviceExt, FileObject, FileName); + DPRINT1("NtfsOpenFile(%p, %p, %S, %p)\n", DeviceExt, FileObject, FileName, FoundFCB); *FoundFCB = NULL;

1 0

[pschweitzer] 64678: [NTFS] Return found FCB on successful file opening
by pschweitzer＠svn.reactos.org 11 Oct '14

11 Oct '14

Author: pschweitzer Date: Sat Oct 11 18:00:46 2014 New Revision: 64678 URL: http://svn.reactos.org/svn/reactos?rev=64678&view=rev Log: [NTFS] Return found FCB on successful file opening Modified: trunk/reactos/drivers/filesystems/ntfs/create.c Modified: trunk/reactos/drivers/filesystems/ntfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/create.c [iso-8859-1] Sat Oct 11 18:00:46 2014 @@ -78,14 +78,17 @@ NTSTATUS NtfsOpenFile(PDEVICE_EXTENSION DeviceExt, PFILE_OBJECT FileObject, - PWSTR FileName) + PWSTR FileName, + PNTFS_FCB * FoundFCB) { PNTFS_FCB ParentFcb; PNTFS_FCB Fcb; NTSTATUS Status; PWSTR AbsFileName = NULL; - DPRINT("NtfsOpenFile(%p, %p, %S)\n", DeviceExt, FileObject, FileName); + DPRINT1("NtfsOpenFile(%p, %p, %S)\n", DeviceExt, FileObject, FileName); + + *FoundFCB = NULL; if (FileObject->RelatedFileObject) { @@ -143,6 +146,8 @@ if (AbsFileName) ExFreePool(AbsFileName); + *FoundFCB = Fcb; + return Status; } @@ -160,11 +165,11 @@ PFILE_OBJECT FileObject; ULONG RequestedDisposition; ULONG RequestedOptions; -// PFCB Fcb; + PNTFS_FCB Fcb; // PWSTR FileName; NTSTATUS Status; - DPRINT("NtfsCreateFile() called\n"); + DPRINT1("NtfsCreateFile(%p, %p) called\n", DeviceObject, Irp); DeviceExt = DeviceObject->DeviceExtension; ASSERT(DeviceExt); @@ -213,7 +218,8 @@ Status = NtfsOpenFile(DeviceExt, FileObject, - FileObject->FileName.Buffer); + FileObject->FileName.Buffer, + &Fcb); /* * If the directory containing the file to open doesn't exist then

1 0

[aandrejevic] 64677: [FAST486] CountLeadingZeros64 shouldn't loop forever if "Value" is 0.
by aandrejevic＠svn.reactos.org 11 Oct '14

11 Oct '14

Author: aandrejevic Date: Sat Oct 11 16:57:33 2014 New Revision: 64677 URL: http://svn.reactos.org/svn/reactos?rev=64677&view=rev Log: [FAST486] CountLeadingZeros64 shouldn't loop forever if "Value" is 0. Modified: trunk/reactos/lib/fast486/common.inl 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] Sat Oct 11 16:57:33 2014 @@ -38,7 +38,7 @@ ULONG Count = 0; ULONGLONG Mask = 1ULL << 63; - while (!(Value & Mask)) + while (!(Value & Mask) && Mask) { Count++; Mask >>= 1;

1 0

[hbelusca] 64676: [FAST486]: fixes for CountLeadingZeros64: - remove extra '; ' - This is (x)>0xff.... not >= - Use Timo inline function.
by hbelusca＠svn.reactos.org 11 Oct '14

11 Oct '14

Author: hbelusca Date: Sat Oct 11 16:25:45 2014 New Revision: 64676 URL: http://svn.reactos.org/svn/reactos?rev=64676&view=rev Log: [FAST486]: fixes for CountLeadingZeros64: - remove extra ';' - This is (x)>0xff.... not >= - Use Timo inline function. Modified: trunk/reactos/lib/fast486/common.inl 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] Sat Oct 11 16:25:45 2014 @@ -25,21 +25,26 @@ /* PUBLIC FUNCTIONS ***********************************************************/ #if defined (__GNUC__) - #define CountLeadingZeros64(x) __builtin_clzll(x); + #define CountLeadingZeros64(x) __builtin_clzll(x) #elif (_MSC_VER >= 1500) && defined(_WIN64) #define CountLeadingZeros64(x) __lzcnt64(x) #elif (_MSC_VER >= 1500) - #define CountLeadingZeros64(x) ((x) >= 0xFFFFFFFFULL) \ - ? __lzcnt((x) >> 32) : (__lzcnt(x) + 32) + #define CountLeadingZeros64(x) ((x) > 0xFFFFFFFFULL) ? __lzcnt((x) >> 32) \ + : (__lzcnt(x) + 32) #else - static - FORCEINLINE + static FORCEINLINE ULONG CountLeadingZeros64(ULONGLONG Value) { - ULONG LeadingZeros = 0; - - while (!(Value & (1 << (63 - LeadingZeros)))) LeadingZeros++; - return LeadingZeros; + ULONG Count = 0; + ULONGLONG Mask = 1ULL << 63; + + while (!(Value & Mask)) + { + Count++; + Mask >>= 1; + } + + return Count; } #endif

1 0

[hbelusca] 64675: Revert revision 64673 (as long as our FPU is not fully implemented, do not hint apps to use our FPU, but instead their simulated one if they have one). Fixes QBasic-compiled apps ...
by hbelusca＠svn.reactos.org 11 Oct '14

11 Oct '14

Author: hbelusca Date: Sat Oct 11 16:00:31 2014 New Revision: 64675 URL: http://svn.reactos.org/svn/reactos?rev=64675&view=rev Log: Revert revision 64673 (as long as our FPU is not fully implemented, do not hint apps to use our FPU, but instead their simulated one if they have one). Fixes QBasic-compiled apps (amongst others...) Modified: trunk/reactos/subsystems/ntvdm/bios/bios.h Modified: trunk/reactos/subsystems/ntvdm/bios/bios.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/bios… ============================================================================== --- trunk/reactos/subsystems/ntvdm/bios/bios.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/bios/bios.h [iso-8859-1] Sat Oct 11 16:00:31 2014 @@ -30,7 +30,11 @@ #define BDA_SEGMENT 0x40 #define BIOS_SEGMENT 0xF000 -#define BIOS_EQUIPMENT_LIST 0x2E // Bit1: FPU, Bit 2: Mouse +// HACK: Disable FPU for now because it is not fully ready yet for being used +// by all applications (e.g. QBasic runtime would use the native FPU if the bit +// is set, but then subsequently fails, unless the FPU bit is unset in that case +// QBasic uses its emulated FPU). +#define BIOS_EQUIPMENT_LIST 0x2C // Bit1: FPU, Bit 2: Mouse #pragma pack(push, 1)

1 0

[aandrejevic] 64674: [FAST486] Use intrinsics to count the leading zeros when possible. Add FPU data to Fast486DumpState.
by aandrejevic＠svn.reactos.org 11 Oct '14

11 Oct '14

Author: aandrejevic Date: Sat Oct 11 15:42:00 2014 New Revision: 64674 URL: http://svn.reactos.org/svn/reactos?rev=64674&view=rev Log: [FAST486] Use intrinsics to count the leading zeros when possible. Add FPU data to Fast486DumpState. Modified: trunk/reactos/lib/fast486/common.inl trunk/reactos/lib/fast486/fast486.c 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] Sat Oct 11 15:42:00 2014 @@ -24,6 +24,25 @@ /* PUBLIC FUNCTIONS ***********************************************************/ +#if defined (__GNUC__) + #define CountLeadingZeros64(x) __builtin_clzll(x); +#elif (_MSC_VER >= 1500) && defined(_WIN64) + #define CountLeadingZeros64(x) __lzcnt64(x) +#elif (_MSC_VER >= 1500) + #define CountLeadingZeros64(x) ((x) >= 0xFFFFFFFFULL) \ + ? __lzcnt((x) >> 32) : (__lzcnt(x) + 32) +#else + static + FORCEINLINE + ULONG CountLeadingZeros64(ULONGLONG Value) + { + ULONG LeadingZeros = 0; + + while (!(Value & (1 << (63 - LeadingZeros)))) LeadingZeros++; + return LeadingZeros; + } +#endif + FORCEINLINE INT Fast486GetCurrentPrivLevel(PFAST486_STATE State) @@ -1290,7 +1309,7 @@ VOID Fast486FpuNormalize(PFAST486_STATE State, PFAST486_FPU_DATA_REG Data) { - UINT LeadingZeros = 0; + UINT LeadingZeros; if (FPU_IS_NORMALIZED(Data)) return; if (FPU_IS_ZERO(Data)) @@ -1299,8 +1318,7 @@ return; } - /* Count the leading zeros */ - while (!(Data->Mantissa & (1 << (63 - LeadingZeros)))) LeadingZeros++; + LeadingZeros = CountLeadingZeros64(Data->Mantissa); if (LeadingZeros < Data->Exponent) { Modified: trunk/reactos/lib/fast486/fast486.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fast486.c?rev=… ============================================================================== --- trunk/reactos/lib/fast486/fast486.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fast486.c [iso-8859-1] Sat Oct 11 15:42:00 2014 @@ -29,6 +29,7 @@ #include <fast486.h> #include "common.h" #include "opcodes.h" +#include "fpu.h" /* DEFINES ********************************************************************/ @@ -369,6 +370,35 @@ State->DebugRegisters[FAST486_REG_DR3], State->DebugRegisters[FAST486_REG_DR4], State->DebugRegisters[FAST486_REG_DR5]); + +#ifndef FAST486_NO_FPU + DbgPrint("\nFPU Registers:\n" + "ST0 = %04X%016llX\tST1 = %04X%016llX\n" + "ST2 = %04X%016llX\tST3 = %04X%016llX\n" + "ST4 = %04X%016llX\tST5 = %04X%016llX\n" + "ST6 = %04X%016llX\tST7 = %04X%016llX\n" + "Status: %04X\tControl: %04X\tTag: %04X\n", + FPU_ST(0).Exponent | ((USHORT)FPU_ST(0).Sign << 15), + FPU_ST(0).Mantissa, + FPU_ST(1).Exponent | ((USHORT)FPU_ST(1).Sign << 15), + FPU_ST(1).Mantissa, + FPU_ST(2).Exponent | ((USHORT)FPU_ST(2).Sign << 15), + FPU_ST(2).Mantissa, + FPU_ST(3).Exponent | ((USHORT)FPU_ST(3).Sign << 15), + FPU_ST(3).Mantissa, + FPU_ST(4).Exponent | ((USHORT)FPU_ST(4).Sign << 15), + FPU_ST(4).Mantissa, + FPU_ST(5).Exponent | ((USHORT)FPU_ST(5).Sign << 15), + FPU_ST(5).Mantissa, + FPU_ST(6).Exponent | ((USHORT)FPU_ST(6).Sign << 15), + FPU_ST(6).Mantissa, + FPU_ST(7).Exponent | ((USHORT)FPU_ST(7).Sign << 15), + FPU_ST(7).Mantissa, + State->FpuStatus, + State->FpuControl, + State->FpuTag); +#endif + DbgPrint("\n<-- Fast486DumpState\n\n"); }

1 0

[hbelusca] 64673: [NTVDM]: we have a FPU.
by hbelusca＠svn.reactos.org 11 Oct '14

11 Oct '14

Author: hbelusca Date: Sat Oct 11 15:39:18 2014 New Revision: 64673 URL: http://svn.reactos.org/svn/reactos?rev=64673&view=rev Log: [NTVDM]: we have a FPU. Modified: trunk/reactos/subsystems/ntvdm/bios/bios.h Modified: trunk/reactos/subsystems/ntvdm/bios/bios.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/bios… ============================================================================== --- trunk/reactos/subsystems/ntvdm/bios/bios.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/bios/bios.h [iso-8859-1] Sat Oct 11 15:39:18 2014 @@ -30,8 +30,7 @@ #define BDA_SEGMENT 0x40 #define BIOS_SEGMENT 0xF000 -// HACK: Disable FPU for now -#define BIOS_EQUIPMENT_LIST 0x2C // Bit 2 set: Mouse present +#define BIOS_EQUIPMENT_LIST 0x2E // Bit1: FPU, Bit 2: Mouse #pragma pack(push, 1)

1 0

[hbelusca] 64672: [FAST486]: group Fast486GetIntVector and Fast486InterruptInternal calls into Fast486PerformInterrupt and use it in the code.
by hbelusca＠svn.reactos.org 11 Oct '14

11 Oct '14

Author: hbelusca Date: Sat Oct 11 15:28:21 2014 New Revision: 64672 URL: http://svn.reactos.org/svn/reactos?rev=64672&view=rev Log: [FAST486]: group Fast486GetIntVector and Fast486InterruptInternal calls into Fast486PerformInterrupt and use it in the code. Modified: trunk/reactos/lib/fast486/common.c trunk/reactos/lib/fast486/common.h trunk/reactos/lib/fast486/common.inl trunk/reactos/lib/fast486/fast486.c trunk/reactos/lib/fast486/opcodes.c Modified: trunk/reactos/lib/fast486/common.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/common.c?rev=6… ============================================================================== --- trunk/reactos/lib/fast486/common.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/common.c [iso-8859-1] Sat Oct 11 15:28:21 2014 @@ -160,6 +160,56 @@ return Fast486WriteLinearMemory(State, LinearAddress, Buffer, Size); } +static +inline +BOOLEAN +Fast486GetIntVector(PFAST486_STATE State, + UCHAR Number, + PFAST486_IDT_ENTRY IdtEntry) +{ + ULONG FarPointer; + + /* Check for protected mode */ + if (State->ControlRegisters[FAST486_REG_CR0] & FAST486_CR0_PE) + { + /* Read from the IDT */ + if (!Fast486ReadLinearMemory(State, + State->Idtr.Address + + Number * sizeof(*IdtEntry), + IdtEntry, + sizeof(*IdtEntry))) + { + /* Exception occurred */ + return FALSE; + } + } + else + { + /* Read from the real-mode IVT */ + + /* Paging is always disabled in real mode */ + State->MemReadCallback(State, + State->Idtr.Address + + Number * sizeof(FarPointer), + &FarPointer, + sizeof(FarPointer)); + + /* Fill a fake IDT entry */ + IdtEntry->Offset = LOWORD(FarPointer); + IdtEntry->Selector = HIWORD(FarPointer); + IdtEntry->Zero = 0; + IdtEntry->Type = FAST486_IDT_INT_GATE; + IdtEntry->Storage = FALSE; + IdtEntry->Dpl = 0; + IdtEntry->Present = TRUE; + IdtEntry->OffsetHigh = 0; + } + + return TRUE; +} + +static +inline BOOLEAN Fast486InterruptInternal(PFAST486_STATE State, USHORT SegmentSelector, @@ -304,14 +354,38 @@ return Success; } +BOOLEAN +Fast486PerformInterrupt(PFAST486_STATE State, + UCHAR Number) +{ + FAST486_IDT_ENTRY IdtEntry; + + /* Get the interrupt vector */ + if (!Fast486GetIntVector(State, Number, &IdtEntry)) + { + /* Exception occurred */ + return FALSE; + } + + /* Perform the interrupt */ + if (!Fast486InterruptInternal(State, + IdtEntry.Selector, + MAKELONG(IdtEntry.Offset, IdtEntry.OffsetHigh), + IdtEntry.Type)) + { + /* Exception occurred */ + return FALSE; + } + + return TRUE; +} + VOID FASTCALL Fast486ExceptionWithErrorCode(PFAST486_STATE State, FAST486_EXCEPTIONS ExceptionCode, ULONG ErrorCode) { - FAST486_IDT_ENTRY IdtEntry; - /* Increment the exception count */ State->ExceptionCount++; @@ -337,7 +411,8 @@ /* Restore the IP to the saved IP */ State->InstPtr = State->SavedInstPtr; - if (!Fast486GetIntVector(State, ExceptionCode, &IdtEntry)) + /* Perform the interrupt */ + if (!Fast486PerformInterrupt(State, ExceptionCode)) { /* * If this function failed, that means Fast486Exception @@ -346,19 +421,6 @@ return; } - /* Perform the interrupt */ - if (!Fast486InterruptInternal(State, - IdtEntry.Selector, - MAKELONG(IdtEntry.Offset, IdtEntry.OffsetHigh), - IdtEntry.Type)) - { - /* - * If this function failed, that means Fast486Exception - * was called again, so just return in this case. - */ - return; - } - if (EXCEPTION_HAS_ERROR_CODE(ExceptionCode) && (State->ControlRegisters[FAST486_REG_CR0] & FAST486_CR0_PE)) { Modified: trunk/reactos/lib/fast486/common.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/common.h?rev=6… ============================================================================== --- trunk/reactos/lib/fast486/common.h [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/common.h [iso-8859-1] Sat Oct 11 15:28:21 2014 @@ -154,12 +154,10 @@ ); BOOLEAN -Fast486InterruptInternal +Fast486PerformInterrupt ( PFAST486_STATE State, - USHORT SegmentSelector, - ULONG Offset, - ULONG GateType + UCHAR Number ); VOID 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] Sat Oct 11 15:28:21 2014 @@ -693,53 +693,6 @@ FORCEINLINE BOOLEAN -Fast486GetIntVector(PFAST486_STATE State, - UCHAR Number, - PFAST486_IDT_ENTRY IdtEntry) -{ - ULONG FarPointer; - - /* Check for protected mode */ - if (State->ControlRegisters[FAST486_REG_CR0] & FAST486_CR0_PE) - { - /* Read from the IDT */ - if (!Fast486ReadLinearMemory(State, - State->Idtr.Address - + Number * sizeof(*IdtEntry), - IdtEntry, - sizeof(*IdtEntry))) - { - /* Exception occurred */ - return FALSE; - } - } - else - { - /* Read from the real-mode IVT */ - - /* Paging is always disabled in real mode */ - State->MemReadCallback(State, - State->Idtr.Address - + Number * sizeof(FarPointer), - &FarPointer, - sizeof(FarPointer)); - - /* Fill a fake IDT entry */ - IdtEntry->Offset = LOWORD(FarPointer); - IdtEntry->Selector = HIWORD(FarPointer); - IdtEntry->Zero = 0; - IdtEntry->Type = FAST486_IDT_INT_GATE; - IdtEntry->Storage = FALSE; - IdtEntry->Dpl = 0; - IdtEntry->Present = TRUE; - IdtEntry->OffsetHigh = 0; - } - - return TRUE; -} - -FORCEINLINE -BOOLEAN Fast486CalculateParity(UCHAR Number) { // See http://graphics.stanford.edu/~seander/bithacks.html#ParityLookupTable too... Modified: trunk/reactos/lib/fast486/fast486.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fast486.c?rev=… ============================================================================== --- trunk/reactos/lib/fast486/fast486.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fast486.c [iso-8859-1] Sat Oct 11 15:28:21 2014 @@ -93,17 +93,8 @@ */ if (State->IntStatus == FAST486_INT_EXECUTE) { - FAST486_IDT_ENTRY IdtEntry; - - /* Get the interrupt vector */ - if (Fast486GetIntVector(State, State->PendingIntNum, &IdtEntry)) - { - /* Perform the interrupt */ - Fast486InterruptInternal(State, - IdtEntry.Selector, - MAKELONG(IdtEntry.Offset, IdtEntry.OffsetHigh), - IdtEntry.Type); - } + /* Perform the interrupt */ + Fast486PerformInterrupt(State, State->PendingIntNum); /* Clear the interrupt status */ State->IntStatus = FAST486_INT_NONE; Modified: trunk/reactos/lib/fast486/opcodes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/opcodes.c?rev=… ============================================================================== --- trunk/reactos/lib/fast486/opcodes.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/opcodes.c [iso-8859-1] Sat Oct 11 15:28:21 2014 @@ -4615,7 +4615,6 @@ FAST486_OPCODE_HANDLER(Fast486OpcodeInt) { UCHAR IntNum; - FAST486_IDT_ENTRY IdtEntry; switch (Opcode) { @@ -4656,24 +4655,8 @@ } } - /* Get the interrupt vector */ - if (!Fast486GetIntVector(State, IntNum, &IdtEntry)) - { - /* Exception occurred */ - return FALSE; - } - /* Perform the interrupt */ - if (!Fast486InterruptInternal(State, - IdtEntry.Selector, - MAKELONG(IdtEntry.Offset, IdtEntry.OffsetHigh), - IdtEntry.Type)) - { - /* Exception occurred */ - return FALSE; - } - - return TRUE; + return Fast486PerformInterrupt(State, IntNum); } FAST486_OPCODE_HANDLER(Fast486OpcodeIret)

1 0

[aandrejevic] 64671: [FAST486] Revert the previous fix and fix it again, but properly.
by aandrejevic＠svn.reactos.org 11 Oct '14

11 Oct '14

Author: aandrejevic Date: Sat Oct 11 14:40:53 2014 New Revision: 64671 URL: http://svn.reactos.org/svn/reactos?rev=64671&view=rev Log: [FAST486] Revert the previous fix and fix it again, but properly. 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=6467… ============================================================================== --- trunk/reactos/lib/fast486/fpu.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.c [iso-8859-1] Sat Oct 11 14:40:53 2014 @@ -511,10 +511,10 @@ else { /* Only a few of these instructions have any meaning on a 487 */ - switch ((ModRegRm.SecondRegister << 3) | ModRegRm.Register) + switch ((ModRegRm.Register << 3) | ModRegRm.SecondRegister) { /* FCLEX */ - case 0x42: + case 0x22: { /* Clear exception data */ State->FpuStatus.Ie = @@ -531,7 +531,7 @@ } /* FINIT */ - case 0x43: + case 0x23: { /* Restore the state */ State->FpuControl.Value = FAST486_FPU_DEFAULT_CONTROL; @@ -542,9 +542,9 @@ } /* FENI */ - case 0x40: + case 0x20: /* FDISI */ - case 0x41: + case 0x21: { /* These do nothing */ break;

1 0

← Newer
1
...
46
47
48
49
50
51
52
...
73
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2014