Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 67601: [NTVDM]: Implement PC reset handling in the BIOS. Used by some apps for switching from protected mode back to real mode the 286 way (see: http://www.rcollins.org/articles/pmbasics...
by hbelusca＠svn.reactos.org 08 May '15

08 May '15

Author: hbelusca Date: Fri May 8 19:26:46 2015 New Revision: 67601 URL: http://svn.reactos.org/svn/reactos?rev=67601&view=rev Log: [NTVDM]: Implement PC reset handling in the BIOS. Used by some apps for switching from protected mode back to real mode the 286 way (see: http://www.rcollins.org/articles/pmbasics/ for more details). Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios.h trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios.h [iso-8859-1] Fri May 8 19:26:46 2015 @@ -74,7 +74,13 @@ WORD CrtBasePort; // 0x63 BYTE CrtModeControl; // 0x65 BYTE CrtColorPaletteMask; // 0x66 - BYTE CassetteData[5]; // 0x67 + + union // 0x67 + { + BYTE CassetteData[5]; // Cassette tape control (unused) + DWORD ResumeEntryPoint; // CS:IP for 286 return from Protected Mode + }; + DWORD TickCounter; // 0x6c BYTE MidnightPassed; // 0x70 BYTE BreakFlag; // 0x71 Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c [iso-8859-1] Fri May 8 19:26:46 2015 @@ -31,6 +31,7 @@ #include "hardware/cmos.h" #include "hardware/pic.h" #include "hardware/pit.h" +#include "hardware/ps2.h" /* PRIVATE VARIABLES **********************************************************/ @@ -131,7 +132,7 @@ static BYTE PostCode[] = { LOBYTE(EMULATOR_BOP), HIBYTE(EMULATOR_BOP), BOP_RESET, // Call BIOS POST - 0xCD, 0x19, // INT 0x19, the bootstrap loader interrupt + 0xCD, BIOS_BOOTSTRAP_LOADER, // INT 0x19 // LOBYTE(EMULATOR_BOP), HIBYTE(EMULATOR_BOP), BOP_UNSIMULATE }; @@ -233,9 +234,9 @@ * Return the (usable) extended memory (after 1 MB) * size in kB from CMOS. */ - IOWriteB(CMOS_ADDRESS_PORT, CMOS_REG_ACTUAL_EXT_MEMORY_LOW); + IOWriteB(CMOS_ADDRESS_PORT, CMOS_REG_ACTUAL_EXT_MEMORY_LOW | CMOS_DISABLE_NMI); Low = IOReadB(CMOS_DATA_PORT); - IOWriteB(CMOS_ADDRESS_PORT, CMOS_REG_ACTUAL_EXT_MEMORY_HIGH); + IOWriteB(CMOS_ADDRESS_PORT, CMOS_REG_ACTUAL_EXT_MEMORY_HIGH | CMOS_DISABLE_NMI); High = IOReadB(CMOS_DATA_PORT); setAX(MAKEWORD(Low, High)); @@ -607,9 +608,9 @@ * Retrieve the conventional memory size * in kB from CMOS, typically 640 kB. */ - IOWriteB(CMOS_ADDRESS_PORT, CMOS_REG_BASE_MEMORY_LOW); + IOWriteB(CMOS_ADDRESS_PORT, CMOS_REG_BASE_MEMORY_LOW | CMOS_DISABLE_NMI); Low = IOReadB(CMOS_DATA_PORT); - IOWriteB(CMOS_ADDRESS_PORT, CMOS_REG_BASE_MEMORY_HIGH); + IOWriteB(CMOS_ADDRESS_PORT, CMOS_REG_BASE_MEMORY_HIGH | CMOS_DISABLE_NMI); High = IOReadB(CMOS_DATA_PORT); Bda->MemorySize = MAKEWORD(Low, High); } @@ -640,6 +641,7 @@ #if 0 BOOLEAN Success; #endif + BYTE ShutdownStatus; DPRINT("Bios32Post\n"); @@ -654,12 +656,80 @@ setDS(BDA_SEGMENT); /* + * Perform early CMOS shutdown status checks + */ + + /* Read the CMOS shutdown status byte and reset it */ + IOWriteB(CMOS_ADDRESS_PORT, CMOS_REG_SHUTDOWN_STATUS | CMOS_DISABLE_NMI); + ShutdownStatus = IOReadB(CMOS_DATA_PORT); + IOWriteB(CMOS_ADDRESS_PORT, CMOS_REG_SHUTDOWN_STATUS | CMOS_DISABLE_NMI); + IOWriteB(CMOS_DATA_PORT, 0x00); + + DPRINT1("Bda->SoftReset = 0x%04X ; ShutdownStatus = 0x%02X\n", + Bda->SoftReset, ShutdownStatus); + + switch (ShutdownStatus) + { + /* Shutdown after Memory Tests (unsupported) */ + case 0x01: case 0x02: case 0x03: + /* Shutdown after Protected Mode Tests (unsupported) */ + case 0x06: case 0x07: case 0x08: + /* Shutdown after Block Move Test (unsupported) */ + case 0x09: + { + DisplayMessage(L"Unsupported CMOS Shutdown Status value 0x%02X. The VDM is stopping...", ShutdownStatus); + EmulatorTerminate(); + return; + } + + /* Shutdown to Boot Loader */ + case 0x04: + { + DPRINT1("Fast restart to Bootstrap Loader...\n"); + return; + } + + /* Flush keyboard, issue an EOI... */ + case 0x05: + { + IOReadB(PS2_DATA_PORT); + + /* Send EOI */ + IOWriteB(PIC_SLAVE_CMD , PIC_OCW2_EOI); + IOWriteB(PIC_MASTER_CMD, PIC_OCW2_EOI); + + // Fall back + } + + /* + * ... and far JMP to user-specified location at 0040:0067 + * (Bda->ResumeEntryPoint) with interrupts and NMI disabled. + */ + case 0x0A: + { + DPRINT1("Bda->ResumeEntryPoint = %04X:%04X\n", + HIWORD(Bda->ResumeEntryPoint), + LOWORD(Bda->ResumeEntryPoint)); + + /* Position execution pointers to Bda->ResumeEntryPoint and return */ + setCS(HIWORD(Bda->ResumeEntryPoint)); + setIP(LOWORD(Bda->ResumeEntryPoint)); + return; + } + + /* Soft reset or unexpected shutdown... */ + case 0x00: + /* ... or other possible shutdown codes: just continue the POST */ + default: + break; + } + + /* + * FIXME: UNIMPLEMENTED! * Check the word at 0040h:0072h (Bda->SoftReset) and do one of the * following actions: * - if the word is 0000h, perform a cold reboot (aka. Reset). Everything gets initialized. * - if the word is 1234h, perform a warm reboot (aka. Ctrl-Alt-Del). Some stuff is skipped. - * In case we do a warm reboot, we need to check for the CMOS shutdown flag - * and take a suitable action. */ // FIXME: This is a debug temporary check:

1 0

[bfreisen] 67600: [MSPAINT_NEW] Convert to C++, update header comments
by bfreisen＠svn.reactos.org 08 May '15

08 May '15

Author: bfreisen Date: Fri May 8 16:27:46 2015 New Revision: 67600 URL: http://svn.reactos.org/svn/reactos?rev=67600&view=rev Log: [MSPAINT_NEW] Convert to C++, update header comments Added: trunk/reactos/base/applications/mspaint_new/dialogs.cpp - copied, changed from r67599, trunk/reactos/base/applications/mspaint_new/dialogs.c trunk/reactos/base/applications/mspaint_new/dib.cpp - copied, changed from r67599, trunk/reactos/base/applications/mspaint_new/dib.c trunk/reactos/base/applications/mspaint_new/drawing.cpp - copied, changed from r67599, trunk/reactos/base/applications/mspaint_new/drawing.c trunk/reactos/base/applications/mspaint_new/history.cpp - copied, changed from r67599, trunk/reactos/base/applications/mspaint_new/history.c trunk/reactos/base/applications/mspaint_new/main.cpp - copied, changed from r67599, trunk/reactos/base/applications/mspaint_new/main.c trunk/reactos/base/applications/mspaint_new/mouse.cpp - copied, changed from r67599, trunk/reactos/base/applications/mspaint_new/mouse.c trunk/reactos/base/applications/mspaint_new/palette.cpp - copied, changed from r67599, trunk/reactos/base/applications/mspaint_new/palette.c trunk/reactos/base/applications/mspaint_new/registry.cpp - copied, changed from r67599, trunk/reactos/base/applications/mspaint_new/registry.c trunk/reactos/base/applications/mspaint_new/scrollbox.cpp - copied, changed from r67599, trunk/reactos/base/applications/mspaint_new/scrollbox.c trunk/reactos/base/applications/mspaint_new/selection.cpp - copied, changed from r67599, trunk/reactos/base/applications/mspaint_new/selection.c trunk/reactos/base/applications/mspaint_new/sizebox.cpp - copied, changed from r67599, trunk/reactos/base/applications/mspaint_new/sizebox.c trunk/reactos/base/applications/mspaint_new/textedit.cpp - copied, changed from r67599, trunk/reactos/base/applications/mspaint_new/textedit.c trunk/reactos/base/applications/mspaint_new/toolsettings.cpp - copied, changed from r67599, trunk/reactos/base/applications/mspaint_new/toolsettings.c trunk/reactos/base/applications/mspaint_new/winproc.cpp - copied, changed from r67599, trunk/reactos/base/applications/mspaint_new/winproc.c Removed: trunk/reactos/base/applications/mspaint_new/dialogs.c trunk/reactos/base/applications/mspaint_new/dib.c trunk/reactos/base/applications/mspaint_new/drawing.c trunk/reactos/base/applications/mspaint_new/history.c trunk/reactos/base/applications/mspaint_new/main.c trunk/reactos/base/applications/mspaint_new/mouse.c trunk/reactos/base/applications/mspaint_new/palette.c trunk/reactos/base/applications/mspaint_new/registry.c trunk/reactos/base/applications/mspaint_new/scrollbox.c trunk/reactos/base/applications/mspaint_new/selection.c trunk/reactos/base/applications/mspaint_new/sizebox.c trunk/reactos/base/applications/mspaint_new/textedit.c trunk/reactos/base/applications/mspaint_new/toolsettings.c trunk/reactos/base/applications/mspaint_new/winproc.c Modified: trunk/reactos/base/applications/mspaint_new/CMakeLists.txt trunk/reactos/base/applications/mspaint_new/definitions.h trunk/reactos/base/applications/mspaint_new/dialogs.h trunk/reactos/base/applications/mspaint_new/dib.h trunk/reactos/base/applications/mspaint_new/drawing.h trunk/reactos/base/applications/mspaint_new/globalvar.h trunk/reactos/base/applications/mspaint_new/history.h trunk/reactos/base/applications/mspaint_new/mouse.h trunk/reactos/base/applications/mspaint_new/palette.h trunk/reactos/base/applications/mspaint_new/registry.h trunk/reactos/base/applications/mspaint_new/rsrc.rc trunk/reactos/base/applications/mspaint_new/scrollbox.h trunk/reactos/base/applications/mspaint_new/selection.h trunk/reactos/base/applications/mspaint_new/sizebox.h trunk/reactos/base/applications/mspaint_new/textedit.h trunk/reactos/base/applications/mspaint_new/toolsettings.h trunk/reactos/base/applications/mspaint_new/winproc.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/mspaint_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… Modified: trunk/reactos/base/applications/mspaint_new/definitions.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… Removed: trunk/reactos/base/applications/mspaint_new/dialogs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… Copied: trunk/reactos/base/applications/mspaint_new/dialogs.cpp (from r67599, trunk/reactos/base/applications/mspaint_new/dialogs.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… Modified: trunk/reactos/base/applications/mspaint_new/dialogs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… Removed: trunk/reactos/base/applications/mspaint_new/dib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… Copied: trunk/reactos/base/applications/mspaint_new/dib.cpp (from r67599, trunk/reactos/base/applications/mspaint_new/dib.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… Modified: trunk/reactos/base/applications/mspaint_new/dib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… Removed: trunk/reactos/base/applications/mspaint_new/drawing.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… Copied: trunk/reactos/base/applications/mspaint_new/drawing.cpp (from r67599, trunk/reactos/base/applications/mspaint_new/drawing.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… Modified: trunk/reactos/base/applications/mspaint_new/drawing.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… Modified: trunk/reactos/base/applications/mspaint_new/globalvar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… Removed: trunk/reactos/base/applications/mspaint_new/history.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… Copied: trunk/reactos/base/applications/mspaint_new/history.cpp (from r67599, trunk/reactos/base/applications/mspaint_new/history.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… Modified: trunk/reactos/base/applications/mspaint_new/history.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… Removed: trunk/reactos/base/applications/mspaint_new/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… Copied: trunk/reactos/base/applications/mspaint_new/main.cpp (from r67599, trunk/reactos/base/applications/mspaint_new/main.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… Removed: trunk/reactos/base/applications/mspaint_new/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… Copied: trunk/reactos/base/applications/mspaint_new/mouse.cpp (from r67599, trunk/reactos/base/applications/mspaint_new/mouse.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… Modified: trunk/reactos/base/applications/mspaint_new/mouse.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… Removed: trunk/reactos/base/applications/mspaint_new/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… Copied: trunk/reactos/base/applications/mspaint_new/palette.cpp (from r67599, trunk/reactos/base/applications/mspaint_new/palette.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… Modified: trunk/reactos/base/applications/mspaint_new/palette.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… Removed: trunk/reactos/base/applications/mspaint_new/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… Copied: trunk/reactos/base/applications/mspaint_new/registry.cpp (from r67599, trunk/reactos/base/applications/mspaint_new/registry.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… Modified: trunk/reactos/base/applications/mspaint_new/registry.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… Modified: trunk/reactos/base/applications/mspaint_new/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… Removed: trunk/reactos/base/applications/mspaint_new/scrollbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… Copied: trunk/reactos/base/applications/mspaint_new/scrollbox.cpp (from r67599, trunk/reactos/base/applications/mspaint_new/scrollbox.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… Modified: trunk/reactos/base/applications/mspaint_new/scrollbox.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… Removed: trunk/reactos/base/applications/mspaint_new/selection.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… Copied: trunk/reactos/base/applications/mspaint_new/selection.cpp (from r67599, trunk/reactos/base/applications/mspaint_new/selection.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… Modified: trunk/reactos/base/applications/mspaint_new/selection.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… Removed: trunk/reactos/base/applications/mspaint_new/sizebox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… Copied: trunk/reactos/base/applications/mspaint_new/sizebox.cpp (from r67599, trunk/reactos/base/applications/mspaint_new/sizebox.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… Modified: trunk/reactos/base/applications/mspaint_new/sizebox.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… Removed: trunk/reactos/base/applications/mspaint_new/textedit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… Copied: trunk/reactos/base/applications/mspaint_new/textedit.cpp (from r67599, trunk/reactos/base/applications/mspaint_new/textedit.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… Modified: trunk/reactos/base/applications/mspaint_new/textedit.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… Removed: trunk/reactos/base/applications/mspaint_new/toolsettings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… Copied: trunk/reactos/base/applications/mspaint_new/toolsettings.cpp (from r67599, trunk/reactos/base/applications/mspaint_new/toolsettings.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… Modified: trunk/reactos/base/applications/mspaint_new/toolsettings.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… Removed: trunk/reactos/base/applications/mspaint_new/winproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… Copied: trunk/reactos/base/applications/mspaint_new/winproc.cpp (from r67599, trunk/reactos/base/applications/mspaint_new/winproc.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… Modified: trunk/reactos/base/applications/mspaint_new/winproc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_…

1 0

[bfreisen] 67599: [MSPAINT_NEW] bootstrap mspaint_new from mspaint
by bfreisen＠svn.reactos.org 08 May '15

08 May '15

Author: bfreisen Date: Fri May 8 16:02:36 2015 New Revision: 67599 URL: http://svn.reactos.org/svn/reactos?rev=67599&view=rev Log: [MSPAINT_NEW] bootstrap mspaint_new from mspaint Added: trunk/reactos/base/applications/mspaint_new/ - copied from r67598, trunk/reactos/base/applications/mspaint/ Modified: trunk/reactos/base/applications/CMakeLists.txt trunk/reactos/base/applications/mspaint_new/CMakeLists.txt Modified: trunk/reactos/base/applications/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/CMakeLis… ============================================================================== --- trunk/reactos/base/applications/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/CMakeLists.txt [iso-8859-1] Fri May 8 16:02:36 2015 @@ -20,6 +20,7 @@ add_subdirectory(msconfig) add_subdirectory(mscutils) add_subdirectory(mspaint) +add_subdirectory(mspaint_new) add_subdirectory(mstsc) add_subdirectory(network) add_subdirectory(notepad) Modified: trunk/reactos/base/applications/mspaint_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/CMakeLists.txt [iso-8859-1] Fri May 8 16:02:36 2015 @@ -16,8 +16,8 @@ winproc.c precomp.h) -add_executable(mspaint ${SOURCE} rsrc.rc) -set_module_type(mspaint win32gui UNICODE) -add_importlibs(mspaint hhctrl comdlg32 shell32 user32 gdi32 advapi32 comctl32 msvcrt kernel32) -add_pch(mspaint precomp.h SOURCE) -add_cd_file(TARGET mspaint DESTINATION reactos/system32 FOR all) +add_executable(mspaint_new ${SOURCE} rsrc.rc) +set_module_type(mspaint_new win32gui UNICODE) +add_importlibs(mspaint_new hhctrl comdlg32 shell32 user32 gdi32 advapi32 comctl32 msvcrt kernel32) +add_pch(mspaint_new precomp.h SOURCE) +add_cd_file(TARGET mspaint_new DESTINATION reactos/system32 FOR all)

1 0

[aandrejevic] 67598: [FAST486] Fix the order of operatins in RETF.
by aandrejevic＠svn.reactos.org 08 May '15

08 May '15

Author: aandrejevic Date: Fri May 8 03:43:31 2015 New Revision: 67598 URL: http://svn.reactos.org/svn/reactos?rev=67598&view=rev Log: [FAST486] Fix the order of operatins in RETF. Modified: trunk/reactos/lib/fast486/opcodes.c 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] Fri May 8 03:43:31 2015 @@ -4433,6 +4433,9 @@ ULONG Offset = 0; USHORT BytesToPop = 0; BOOLEAN Size = State->SegmentRegs[FAST486_REG_CS].Size; + ULONG StackPtr; + ULONG StackSel; + UCHAR OldCpl = Fast486GetCurrentPrivLevel(State); /* Make sure this is the right instruction */ ASSERT((Opcode & 0xFE) == 0xCA); @@ -4460,20 +4463,18 @@ return; } - /* Load the new CS */ - if (!Fast486LoadSegment(State, FAST486_REG_CS, Segment)) - { - /* Exception occurred */ - return; + /* Pop the parameters */ + if (State->SegmentRegs[FAST486_REG_SS].Size) + { + State->GeneralRegs[FAST486_REG_ESP].Long += BytesToPop; + } + else + { + State->GeneralRegs[FAST486_REG_ESP].LowWord += BytesToPop; } if ((State->ControlRegisters[FAST486_REG_CR0] & FAST486_CR0_PE) && !State->Flags.Vm) { - UINT i; - UINT OldCpl = Fast486GetCurrentPrivLevel(State); - ULONG StackPtr; - ULONG StackSel; - if (GET_SEGMENT_RPL(Segment) > OldCpl) { /* Pop ESP */ @@ -4490,6 +4491,22 @@ return; } } + } + + /* Load the new CS */ + if (!Fast486LoadSegment(State, FAST486_REG_CS, Segment)) + { + /* Exception occurred */ + return; + } + + /* Load new (E)IP */ + if (Size) State->InstPtr.Long = Offset; + else State->InstPtr.LowWord = LOWORD(Offset); + + if ((State->ControlRegisters[FAST486_REG_CR0] & FAST486_CR0_PE) && !State->Flags.Vm) + { + UINT i; /* Update the CPL */ State->Cpl = GET_SEGMENT_RPL(Segment); @@ -4522,18 +4539,6 @@ } } } - } - - /* Load new (E)IP, and if necessary, pop the parameters */ - if (Size) - { - State->InstPtr.Long = Offset; - State->GeneralRegs[FAST486_REG_ESP].Long += BytesToPop; - } - else - { - State->InstPtr.LowWord = LOWORD(Offset); - State->GeneralRegs[FAST486_REG_ESP].LowWord += BytesToPop; } }

1 0

[aandrejevic] 67597: [FAST486] The "Call" parameter should be true for calls.
by aandrejevic＠svn.reactos.org 08 May '15

08 May '15

Author: aandrejevic Date: Fri May 8 02:30:28 2015 New Revision: 67597 URL: http://svn.reactos.org/svn/reactos?rev=67597&view=rev Log: [FAST486] The "Call" parameter should be true for calls. Modified: trunk/reactos/lib/fast486/opgroups.c Modified: trunk/reactos/lib/fast486/opgroups.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/opgroups.c?rev… ============================================================================== --- trunk/reactos/lib/fast486/opgroups.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/opgroups.c [iso-8859-1] Fri May 8 02:30:28 2015 @@ -1631,7 +1631,7 @@ if (State->ControlRegisters[FAST486_REG_CR0] & FAST486_CR0_PE) { - if (!Fast486ProcessGate(State, Selector, Value, FALSE)) + if (!Fast486ProcessGate(State, Selector, Value, TRUE)) { /* Gate processed or exception occurred */ return;

1 0

[aandrejevic] 67596: [FAST486] Don't forget to check for gates in 16-bit protected mode too.
by aandrejevic＠svn.reactos.org 08 May '15

08 May '15

Author: aandrejevic Date: Fri May 8 01:34:18 2015 New Revision: 67596 URL: http://svn.reactos.org/svn/reactos?rev=67596&view=rev Log: [FAST486] Don't forget to check for gates in 16-bit protected mode too. Modified: trunk/reactos/lib/fast486/opgroups.c Modified: trunk/reactos/lib/fast486/opgroups.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/opgroups.c?rev… ============================================================================== --- trunk/reactos/lib/fast486/opgroups.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/opgroups.c [iso-8859-1] Fri May 8 01:34:18 2015 @@ -1629,6 +1629,15 @@ return; } + if (State->ControlRegisters[FAST486_REG_CR0] & FAST486_CR0_PE) + { + if (!Fast486ProcessGate(State, Selector, Value, FALSE)) + { + /* Gate processed or exception occurred */ + return; + } + } + /* Push the current value of CS */ if (!Fast486StackPush(State, State->SegmentRegs[FAST486_REG_CS].Selector)) { @@ -1686,6 +1695,15 @@ { /* Exception occurred */ return; + } + + if (State->ControlRegisters[FAST486_REG_CR0] & FAST486_CR0_PE) + { + if (!Fast486ProcessGate(State, Selector, Value, FALSE)) + { + /* Gate processed or exception occurred */ + return; + } } /* Load the new code segment */

1 0

[hbelusca] 67595: [NTVDM] - Move some interrupt initialization where it belongs and activate few other ones. - Initialize interruct vector for INT 2Ah (Network check) because some apps directly cal...
by hbelusca＠svn.reactos.org 07 May '15

07 May '15

Author: hbelusca Date: Thu May 7 23:54:47 2015 New Revision: 67595 URL: http://svn.reactos.org/svn/reactos?rev=67595&view=rev Log: [NTVDM] - Move some interrupt initialization where it belongs and activate few other ones. - Initialize interruct vector for INT 2Ah (Network check) because some apps directly call it and crash if it contains NULL. Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vidbios32.c trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c [iso-8859-1] Thu May 7 23:54:47 2015 @@ -570,7 +570,6 @@ RegisterBiosInt32(0x17, NULL); RegisterBiosInt32(0x1B, NULL); RegisterBiosInt32(0x4A, NULL); // User Alarm Handler - RegisterBiosInt32(0x6D, NULL); // Video BIOS Entry Point /* Relocated services by the BIOS (when needed) */ RegisterBiosInt32(0x40, NULL); // ROM BIOS Diskette Handler relocated by Hard Disk BIOS Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vidbios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vidbios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vidbios32.c [iso-8859-1] Thu May 7 23:54:47 2015 @@ -29,6 +29,10 @@ /* Register the BIOS 32-bit Interrupts */ RegisterBiosInt32(BIOS_VIDEO_INTERRUPT, VidBiosVideoService); + /* Vectors that should be implemented */ + RegisterBiosInt32(0x42, NULL); // Relocated Default INT 10h Video Services + RegisterBiosInt32(0x6D, NULL); // Video BIOS Entry Point + return TRUE; } Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c [iso-8859-1] Thu May 7 23:54:47 2015 @@ -3275,15 +3275,17 @@ BOOLEAN VidBiosInitialize(VOID) { - /* Some interrupts are in fact addresses to tables */ - ((PULONG)BaseAddress)[0x1D] = (ULONG)NULL; - // Far pointer to the 8x8 characters 80h-FFh + /* Some vectors are in fact addresses to tables */ + ((PULONG)BaseAddress)[0x1D] = (ULONG)NULL; // Video Parameter Tables + // Far pointer to the 8x8 graphics font for the 8x8 characters 80h-FFh ((PULONG)BaseAddress)[0x1F] = MAKELONG(FONT_8x8_HIGH_OFFSET, VIDEO_BIOS_DATA_SEG); - // ((PULONG)BaseAddress)[0x42] = (ULONG)NULL; - // Far pointer to the 8x16 characters 00h-... + // Far pointer to the character table (EGA, MCGA, VGA) for the 8x16 characters 00h-... ((PULONG)BaseAddress)[0x43] = MAKELONG(FONT_8x16_OFFSET, VIDEO_BIOS_DATA_SEG); - ((PULONG)BaseAddress)[0x44] = (ULONG)NULL; - // ((PULONG)BaseAddress)[0x6D] = (ULONG)NULL; + ((PULONG)BaseAddress)[0x44] = (ULONG)NULL; // ROM BIOS Character Font, Characters 00h-7Fh (PCjr) + + /* Relocated services by the BIOS (when needed) */ + ((PULONG)BaseAddress)[0x42] = (ULONG)NULL; // Relocated Default INT 10h Video Services + ((PULONG)BaseAddress)[0x6D] = (ULONG)NULL; // Video BIOS Entry Point /* Fill the tables */ RtlMoveMemory(SEG_OFF_TO_PTR(VIDEO_BIOS_DATA_SEG, FONT_8x8_OFFSET), Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] Thu May 7 23:54:47 2015 @@ -775,7 +775,7 @@ /* Get Interrupt Vector */ case 0x35: { - DWORD FarPointer = ((PDWORD)BaseAddress)[getAL()]; + ULONG FarPointer = ((PULONG)BaseAddress)[getAL()]; /* Read the address from the IDT into ES:BX */ setES(HIWORD(FarPointer)); @@ -2015,6 +2015,9 @@ RegisterDosInt32(0x29, DosFastConOut ); // DOS 2+ Fast Console Output RegisterDosInt32(0x2F, DosInt2Fh ); + /* Unimplemented DOS interrupts */ + RegisterDosInt32(0x2A, NULL); // Network - Installation Check + /* Load the CON driver */ ConDrvInitialize();

1 0

[hbelusca] 67594: [NTVDM]: Initialize only the interrupt vectors that we really need, and nothing else. I also include a (by default disabled) option that activates extended debug features that may...
by hbelusca＠svn.reactos.org 07 May '15

07 May '15

Author: hbelusca Date: Thu May 7 23:11:32 2015 New Revision: 67594 URL: http://svn.reactos.org/svn/reactos?rev=67594&view=rev Log: [NTVDM]: Initialize only the interrupt vectors that we really need, and nothing else. I also include a (by default disabled) option that activates extended debug features that may break some DOS apps (for example, initializing ALL of the non-handled interrupts to a default vector), to be used at your own risk. Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c [iso-8859-1] Thu May 7 23:11:32 2015 @@ -528,37 +528,72 @@ /* Initialize the callback context */ InitializeContext(&BiosContext, BIOS_SEGMENT, 0x0000); - /* Register the default BIOS 32-bit Interrupts */ + /* Register the default BIOS interrupt vectors */ + + /* Zero out all of the IVT (0x00 -- 0xFF) */ + RtlZeroMemory(BaseAddress, 0x0100 * sizeof(ULONG)); + +#ifdef ADVANCED_DEBUGGING + // Initialize all the interrupt vectors to the default one. for (i = 0x00; i <= 0xFF; i++) - { RegisterBiosInt32(i, NULL); - } - - /* Initialize the exception vector interrupts to a default Exception handler */ - for (i = 0; i < 8; i++) +#endif + + /* Initialize the exception interrupt vectors to a default Exception handler */ + for (i = 0x00; i <= 0x07; i++) RegisterBiosInt32(i, BiosException); - /* Initialize HW vector interrupts to a default HW handler */ - for (i = BIOS_PIC_MASTER_INT; i < BIOS_PIC_MASTER_INT + 8; i++) + /* Initialize HW interrupt vectors to a default HW handler */ + for (i = BIOS_PIC_MASTER_INT; i < BIOS_PIC_MASTER_INT + 8; i++) // 0x08 -- 0x0F RegisterBiosInt32(i, BiosHandleMasterPicIRQ); - for (i = BIOS_PIC_SLAVE_INT ; i < BIOS_PIC_SLAVE_INT + 8; i++) + for (i = BIOS_PIC_SLAVE_INT ; i < BIOS_PIC_SLAVE_INT + 8; i++) // 0x70 -- 0x77 RegisterBiosInt32(i, BiosHandleSlavePicIRQ); /* Initialize software vector handlers */ + // BIOS_VIDEO_INTERRUPT : 0x10 (vidbios32.c) RegisterBiosInt32(BIOS_EQUIPMENT_INTERRUPT, BiosEquipmentService ); RegisterBiosInt32(BIOS_MEMORY_SIZE , BiosGetMemorySize ); + // BIOS_DISK_INTERRUPT : 0x13 -- UNIMPLEMENTED + // BIOS_SERIAL_INTERRUPT : 0x14 -- UNIMPLEMENTED RegisterBiosInt32(BIOS_MISC_INTERRUPT , BiosMiscService ); + // BIOS_KBD_INTERRUPT : 0x16 (kbdbios32.c) + // BIOS_PRINTER_INTERRUPT: 0x17 -- UNIMPLEMENTED RegisterBiosInt32(BIOS_ROM_BASIC , BiosRomBasic ); RegisterBiosInt32(BIOS_BOOTSTRAP_LOADER , BiosBootstrapLoader ); RegisterBiosInt32(BIOS_TIME_INTERRUPT , BiosTimeService ); + // BIOS_KBD_CTRL_BREAK_INTERRUPT: 0x1B -- UNIMPLEMENTED RegisterBiosInt32(BIOS_SYS_TIMER_INTERRUPT, BiosSystemTimerInterrupt); - /* Some interrupts are in fact addresses to tables */ - ((PULONG)BaseAddress)[0x1E] = (ULONG)NULL; - ((PULONG)BaseAddress)[0x41] = (ULONG)NULL; - ((PULONG)BaseAddress)[0x46] = (ULONG)NULL; - ((PULONG)BaseAddress)[0x48] = (ULONG)NULL; - ((PULONG)BaseAddress)[0x49] = (ULONG)NULL; + /* Vectors that should be implemented (see above) */ + RegisterBiosInt32(0x13, NULL); + RegisterBiosInt32(0x14, NULL); + RegisterBiosInt32(0x17, NULL); + RegisterBiosInt32(0x1B, NULL); + RegisterBiosInt32(0x4A, NULL); // User Alarm Handler + RegisterBiosInt32(0x6D, NULL); // Video BIOS Entry Point + + /* Relocated services by the BIOS (when needed) */ + RegisterBiosInt32(0x40, NULL); // ROM BIOS Diskette Handler relocated by Hard Disk BIOS + RegisterBiosInt32(0x42, NULL); // Relocated Default INT 10h Video Services + + /* Miscellaneous unimplemented vector handlers that should better have a default one */ + RegisterBiosInt32(0x4B, NULL); // Virtual DMA Specification Services + RegisterBiosInt32(0x5C, NULL); // NetBIOS + + // ROM-BASIC interrupts span from 0x80 up to 0xEF. + // They don't have any default handler at the moment. + + /* Some vectors are in fact addresses to tables */ + ((PULONG)BaseAddress)[0x1D] = (ULONG)NULL; // Video Parameter Tables + ((PULONG)BaseAddress)[0x1E] = (ULONG)NULL; // Diskette Parameters + ((PULONG)BaseAddress)[0x1F] = (ULONG)NULL; // 8x8 Graphics Font + ((PULONG)BaseAddress)[0x41] = (ULONG)NULL; // Hard Disk 0 Parameter Table Address + ((PULONG)BaseAddress)[0x43] = (ULONG)NULL; // Character Table (EGA, MCGA, VGA) + ((PULONG)BaseAddress)[0x46] = (ULONG)NULL; // Hard Disk 1 Drive Parameter Table Address + /* Tables that are always uninitialized */ + ((PULONG)BaseAddress)[0x44] = (ULONG)NULL; // ROM BIOS Character Font, Characters 00h-7Fh (PCjr) + ((PULONG)BaseAddress)[0x48] = (ULONG)NULL; // Cordless Keyboard Translation (PCjr) + ((PULONG)BaseAddress)[0x49] = (ULONG)NULL; // Non-Keyboard Scan-code Translation Table (PCJr) } static VOID InitializeBiosData(VOID) Modified: trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/ntvd… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h [iso-8859-1] Thu May 7 23:11:32 2015 @@ -52,6 +52,13 @@ */ // #define WIN2K_COMPLIANT +/* + * Activate this line if you want advanced hardcoded debug facilities + * (called interrupts, etc...), that break PC-AT compatibility. + * USE AT YOUR OWN RISK! (disabled by default) + */ +// #define ADVANCED_DEBUGGING + /* FUNCTIONS ******************************************************************/ extern HANDLE VdmTaskEvent;

1 0

[aandrejevic] 67593: [FAST486] Support legacy (286) Task State Segments in Fast486InterruptInternal and Fast486CallGate.
by aandrejevic＠svn.reactos.org 07 May '15

07 May '15

Author: aandrejevic Date: Thu May 7 13:38:29 2015 New Revision: 67593 URL: http://svn.reactos.org/svn/reactos?rev=67593&view=rev Log: [FAST486] Support legacy (286) Task State Segments in Fast486InterruptInternal and Fast486CallGate. Modified: trunk/reactos/lib/fast486/common.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] Thu May 7 13:38:29 2015 @@ -315,12 +315,16 @@ if ((OldCpl > GET_SEGMENT_RPL(IdtEntry->Selector)) || State->Flags.Vm) { FAST486_TSS Tss; + PFAST486_LEGACY_TSS LegacyTss = (PFAST486_LEGACY_TSS)&Tss; + USHORT NewSs; + ULONG NewEsp; /* Read the TSS */ if (!Fast486ReadLinearMemory(State, State->TaskReg.Base, &Tss, - sizeof(Tss))) + State->TaskReg.Limit >= sizeof(FAST486_TSS) + ? sizeof(FAST486_TSS) : sizeof(FAST486_LEGACY_TSS))) { /* Exception occurred */ return FALSE; @@ -334,36 +338,48 @@ { case 0: { - if (!Fast486LoadSegment(State, FAST486_REG_SS, Tss.Ss0)) + if (State->TaskReg.Limit >= sizeof(FAST486_TSS)) { - /* Exception occurred */ - return FALSE; + NewSs = Tss.Ss0; + NewEsp = Tss.Esp0; } - State->GeneralRegs[FAST486_REG_ESP].Long = Tss.Esp0; + else + { + NewSs = LegacyTss->Ss0; + NewEsp = LegacyTss->Sp0; + } break; } case 1: { - if (!Fast486LoadSegment(State, FAST486_REG_SS, Tss.Ss1)) + if (State->TaskReg.Limit >= sizeof(FAST486_TSS)) { - /* Exception occurred */ - return FALSE; + NewSs = Tss.Ss1; + NewEsp = Tss.Esp1; } - State->GeneralRegs[FAST486_REG_ESP].Long = Tss.Esp1; + else + { + NewSs = LegacyTss->Ss1; + NewEsp = LegacyTss->Sp1; + } break; } case 2: { - if (!Fast486LoadSegment(State, FAST486_REG_SS, Tss.Ss2)) + if (State->TaskReg.Limit >= sizeof(FAST486_TSS)) { - /* Exception occurred */ - return FALSE; + NewSs = Tss.Ss2; + NewEsp = Tss.Esp2; } - State->GeneralRegs[FAST486_REG_ESP].Long = Tss.Esp2; + else + { + NewSs = LegacyTss->Ss2; + NewEsp = LegacyTss->Sp2; + } break; } @@ -374,6 +390,14 @@ ASSERT(FALSE); } } + + if (!Fast486LoadSegment(State, FAST486_REG_SS, NewSs)) + { + /* Exception occurred */ + return FALSE; + } + + State->GeneralRegs[FAST486_REG_ESP].Long = NewEsp; } /* Load new CS */ @@ -935,6 +959,7 @@ FAST486_GDT_ENTRY NewCodeSegment; BOOLEAN GateSize = (Gate->Type == FAST486_CALL_GATE_SIGNATURE); FAST486_TSS Tss; + PFAST486_LEGACY_TSS LegacyTss = (PFAST486_LEGACY_TSS)&Tss; USHORT OldCs = State->SegmentRegs[FAST486_REG_CS].Selector; ULONG OldEip = State->InstPtr.Long; USHORT OldCpl = State->Cpl; @@ -984,11 +1009,15 @@ { if (Call) { + USHORT NewSs; + ULONG NewEsp; + /* Read the TSS */ if (!Fast486ReadLinearMemory(State, State->TaskReg.Base, &Tss, - sizeof(Tss))) + State->TaskReg.Limit >= sizeof(FAST486_TSS) + ? sizeof(FAST486_TSS) : sizeof(FAST486_LEGACY_TSS))) { /* Exception occurred */ return FALSE; @@ -1002,36 +1031,48 @@ { case 0: { - if (!Fast486LoadSegment(State, FAST486_REG_SS, Tss.Ss0)) + if (State->TaskReg.Limit >= sizeof(FAST486_TSS)) { - /* Exception occurred */ - return FALSE; + NewSs = Tss.Ss0; + NewEsp = Tss.Esp0; } - State->GeneralRegs[FAST486_REG_ESP].Long = Tss.Esp0; + else + { + NewSs = LegacyTss->Ss0; + NewEsp = LegacyTss->Sp0; + } break; } case 1: { - if (!Fast486LoadSegment(State, FAST486_REG_SS, Tss.Ss1)) + if (State->TaskReg.Limit >= sizeof(FAST486_TSS)) { - /* Exception occurred */ - return FALSE; + NewSs = Tss.Ss1; + NewEsp = Tss.Esp1; } - State->GeneralRegs[FAST486_REG_ESP].Long = Tss.Esp1; + else + { + NewSs = LegacyTss->Ss1; + NewEsp = LegacyTss->Sp1; + } break; } case 2: { - if (!Fast486LoadSegment(State, FAST486_REG_SS, Tss.Ss2)) + if (State->TaskReg.Limit >= sizeof(FAST486_TSS)) { - /* Exception occurred */ - return FALSE; + NewSs = Tss.Ss2; + NewEsp = Tss.Esp2; } - State->GeneralRegs[FAST486_REG_ESP].Long = Tss.Esp2; + else + { + NewSs = LegacyTss->Ss2; + NewEsp = LegacyTss->Sp2; + } break; } @@ -1042,6 +1083,14 @@ ASSERT(FALSE); } } + + if (!Fast486LoadSegment(State, FAST486_REG_SS, NewSs)) + { + /* Exception occurred */ + return FALSE; + } + + State->GeneralRegs[FAST486_REG_ESP].Long = NewEsp; } else if (!NewCodeSegment.DirConf) {

1 0

[aandrejevic] 67592: [FAST486] The NULL selector is valid in the LDT.
by aandrejevic＠svn.reactos.org 07 May '15

07 May '15

Author: aandrejevic Date: Thu May 7 12:18:41 2015 New Revision: 67592 URL: http://svn.reactos.org/svn/reactos?rev=67592&view=rev Log: [FAST486] The NULL selector is valid in the LDT. 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] Thu May 7 12:18:41 2015 @@ -573,7 +573,7 @@ { /* Loading the stack segment */ - if (GET_SEGMENT_INDEX(Selector) == 0) + if (!(Selector & SEGMENT_TABLE_INDICATOR) && GET_SEGMENT_INDEX(Selector) == 0) { Fast486Exception(State, Exception); return FALSE; @@ -614,7 +614,7 @@ State->PrefetchValid = FALSE; #endif - if (GET_SEGMENT_INDEX(Selector) == 0) + if (!(Selector & SEGMENT_TABLE_INDICATOR) && GET_SEGMENT_INDEX(Selector) == 0) { Fast486Exception(State, Exception); return FALSE; @@ -665,7 +665,7 @@ { /* Loading a data segment */ - if (GET_SEGMENT_INDEX(Selector) != 0) + if (GET_SEGMENT_INDEX(Selector) != 0 || (Selector & SEGMENT_TABLE_INDICATOR)) { if (!GdtEntry.SystemType) {

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