Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 64523: [NTVDM] - Move registers code into cpu/ - Implement getIntelRegistersPointer.
by hbelusca＠svn.reactos.org 04 Oct '14

04 Oct '14

Author: hbelusca Date: Sat Oct 4 15:41:29 2014 New Revision: 64523 URL: http://svn.reactos.org/svn/reactos?rev=64523&view=rev Log: [NTVDM] - Move registers code into cpu/ - Implement getIntelRegistersPointer. Added: trunk/reactos/subsystems/ntvdm/cpu/registers.c - copied, changed from r64477, trunk/reactos/subsystems/ntvdm/registers.c trunk/reactos/subsystems/ntvdm/cpu/registers.h - copied, changed from r64477, trunk/reactos/subsystems/ntvdm/registers.h trunk/reactos/subsystems/ntvdm/cpu/x86context.h (with props) Removed: trunk/reactos/subsystems/ntvdm/registers.c trunk/reactos/subsystems/ntvdm/registers.h Modified: trunk/reactos/subsystems/ntvdm/CMakeLists.txt trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c Modified: trunk/reactos/subsystems/ntvdm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/CMakeList… ============================================================================== --- trunk/reactos/subsystems/ntvdm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/CMakeLists.txt [iso-8859-1] Sat Oct 4 15:41:29 2014 @@ -17,6 +17,7 @@ cpu/bop.c cpu/callback.c cpu/cpu.c + cpu/registers.c hardware/cmos.c hardware/keyboard.c hardware/mouse.c @@ -34,7 +35,6 @@ emulator.c int32.c io.c - registers.c utils.c vddsup.c ntvdm.c Copied: trunk/reactos/subsystems/ntvdm/cpu/registers.c (from r64477, trunk/reactos/subsystems/ntvdm/registers.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/cpu/regis… ============================================================================== --- trunk/reactos/subsystems/ntvdm/registers.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/cpu/registers.c [iso-8859-1] Sat Oct 4 15:41:29 2014 @@ -11,23 +11,83 @@ #define NDEBUG #include "emulator.h" -#include "cpu/cpu.h" +#include "cpu.h" +#include "x86context.h" + +/* PRIVATE VARIABLES **********************************************************/ + +// This structure must by synced with our CPU context +X86CONTEXT IntelRegPtr; /* PUBLIC FUNCTIONS ***********************************************************/ -VOID EmulatorSetStack(WORD Segment, DWORD Offset) -{ - Fast486SetStack(&EmulatorContext, Segment, Offset); -} - - - PVOID WINAPI getIntelRegistersPointer(VOID) { - UNIMPLEMENTED; - return NULL; + /* + * Sync the Intel Registers x86 Context with our CPU context + */ + + if (IntelRegPtr.ContextFlags & CONTEXT_DEBUG_REGISTERS) + { + IntelRegPtr.Dr0 = EmulatorContext.DebugRegisters[FAST486_REG_DR0]; + IntelRegPtr.Dr1 = EmulatorContext.DebugRegisters[FAST486_REG_DR1]; + IntelRegPtr.Dr2 = EmulatorContext.DebugRegisters[FAST486_REG_DR2]; + IntelRegPtr.Dr3 = EmulatorContext.DebugRegisters[FAST486_REG_DR3]; + IntelRegPtr.Dr6 = EmulatorContext.DebugRegisters[FAST486_REG_DR6]; + IntelRegPtr.Dr7 = EmulatorContext.DebugRegisters[FAST486_REG_DR7]; + } + + if (IntelRegPtr.ContextFlags & CONTEXT_FLOATING_POINT) + { + // IntelRegPtr.FloatSave = ; + IntelRegPtr.FloatSave.ControlWord = EmulatorContext.FpuControl.Value; + IntelRegPtr.FloatSave.StatusWord = EmulatorContext.FpuStatus.Value; + // IntelRegPtr.FloatSave.TagWord = ; + // IntelRegPtr.FloatSave.ErrorOffset = ; + // IntelRegPtr.FloatSave.ErrorSelector = ; + // IntelRegPtr.FloatSave.DataOffset = ; + // IntelRegPtr.FloatSave.DataSelector = ; + // IntelRegPtr.FloatSave.RegisterArea = ; // This is a region of size SIZE_OF_80387_REGISTERS == 80 bytes + // IntelRegPtr.FloatSave.Cr0NpxState = ; + } + + if (IntelRegPtr.ContextFlags & CONTEXT_SEGMENTS) + { + IntelRegPtr.SegGs = EmulatorContext.SegmentRegs[FAST486_REG_GS].Selector; + IntelRegPtr.SegFs = EmulatorContext.SegmentRegs[FAST486_REG_FS].Selector; + IntelRegPtr.SegEs = EmulatorContext.SegmentRegs[FAST486_REG_ES].Selector; + IntelRegPtr.SegDs = EmulatorContext.SegmentRegs[FAST486_REG_DS].Selector; + } + + if (IntelRegPtr.ContextFlags & CONTEXT_INTEGER) + { + IntelRegPtr.Edi = EmulatorContext.GeneralRegs[FAST486_REG_EDI].Long; + IntelRegPtr.Esi = EmulatorContext.GeneralRegs[FAST486_REG_ESI].Long; + IntelRegPtr.Ebx = EmulatorContext.GeneralRegs[FAST486_REG_EBX].Long; + IntelRegPtr.Edx = EmulatorContext.GeneralRegs[FAST486_REG_EDX].Long; + IntelRegPtr.Ecx = EmulatorContext.GeneralRegs[FAST486_REG_ECX].Long; + IntelRegPtr.Eax = EmulatorContext.GeneralRegs[FAST486_REG_EAX].Long; + } + + if (IntelRegPtr.ContextFlags & CONTEXT_CONTROL) + { + IntelRegPtr.Ebp = EmulatorContext.GeneralRegs[FAST486_REG_EBP].Long; + IntelRegPtr.Eip = EmulatorContext.InstPtr.Long; + IntelRegPtr.SegCs = EmulatorContext.SegmentRegs[FAST486_REG_CS].Selector; + IntelRegPtr.EFlags = EmulatorContext.Flags.Long; + IntelRegPtr.Esp = EmulatorContext.GeneralRegs[FAST486_REG_ESP].Long; + IntelRegPtr.SegSs = EmulatorContext.SegmentRegs[FAST486_REG_SS].Selector; + } + + if (IntelRegPtr.ContextFlags & CONTEXT_EXTENDED_REGISTERS) + { + // IntelRegPtr.ExtendedRegisters = ; + } + + /* Return the address of the Intel Registers x86 Context */ + return &IntelRegPtr; } ULONG @@ -271,7 +331,7 @@ WINAPI setESP(ULONG Value) { - EmulatorSetStack(getSS(), Value); + Fast486SetStack(&EmulatorContext, getSS(), Value); } USHORT @@ -285,7 +345,7 @@ WINAPI setSP(USHORT Value) { - EmulatorSetStack(getSS(), Value); + Fast486SetStack(&EmulatorContext, getSS(), Value); } Copied: trunk/reactos/subsystems/ntvdm/cpu/registers.h (from r64477, trunk/reactos/subsystems/ntvdm/registers.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/cpu/regis… ============================================================================== --- trunk/reactos/subsystems/ntvdm/registers.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/cpu/registers.h [iso-8859-1] Sat Oct 4 15:41:29 2014 @@ -10,8 +10,6 @@ #define _REGISTERS_H_ /* INCLUDES *******************************************************************/ - -VOID EmulatorSetStack(WORD Segment, DWORD Offset); #if 0 // Those function prototypes are already included via ddk/vddsvc.h Added: trunk/reactos/subsystems/ntvdm/cpu/x86context.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/cpu/x86co… ============================================================================== --- trunk/reactos/subsystems/ntvdm/cpu/x86context.h (added) +++ trunk/reactos/subsystems/ntvdm/cpu/x86context.h [iso-8859-1] Sat Oct 4 15:41:29 2014 @@ -0,0 +1,139 @@ +/* + * COPYRIGHT: GPL - See COPYING in the top level directory + * PROJECT: ReactOS Virtual DOS Machine + * FILE: x86context.h + * PURPOSE: x86 CPU Context Frame definitions + * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + * + * NOTE: Taken from the PSDK. + */ + +#ifndef __X86CONTEXT_H__ +#define __X86CONTEXT_H__ + +#pragma once + +/* Clean everything that may have been defined before */ +#undef SIZE_OF_80387_REGISTERS +#undef MAXIMUM_SUPPORTED_EXTENSION +#undef CONTEXT_i386 +#undef CONTEXT_i486 +#undef CONTEXT_CONTROL +#undef CONTEXT_INTEGER +#undef CONTEXT_SEGMENTS +#undef CONTEXT_FLOATING_POINT +#undef CONTEXT_DEBUG_REGISTERS +#undef CONTEXT_EXTENDED_REGISTERS +#undef CONTEXT_FULL +#undef CONTEXT_ALL +#undef CONTEXT_DEBUGGER +#undef CONTEXT_XSTATE + + + +#define SIZE_OF_80387_REGISTERS 80 +#define MAXIMUM_SUPPORTED_EXTENSION 512 + +#define CONTEXT_i386 0x00010000 +#define CONTEXT_i486 0x00010000 + +#define CONTEXT_CONTROL (CONTEXT_i386|0x00000001L) // SS:SP, CS:IP, FLAGS, BP +#define CONTEXT_INTEGER (CONTEXT_i386|0x00000002L) // AX, BX, CX, DX, SI, DI +#define CONTEXT_SEGMENTS (CONTEXT_i386|0x00000004L) // DS, ES, FS, GS +#define CONTEXT_FLOATING_POINT (CONTEXT_i386|0x00000008L) // 387 state +#define CONTEXT_DEBUG_REGISTERS (CONTEXT_i386|0x00000010L) // DB 0-3,6,7 +#define CONTEXT_EXTENDED_REGISTERS (CONTEXT_i386|0x00000020L) // CPU-specific extensions + +#define CONTEXT_FULL (CONTEXT_CONTROL|CONTEXT_INTEGER|CONTEXT_SEGMENTS) +#define CONTEXT_ALL (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS | \ + CONTEXT_FLOATING_POINT | CONTEXT_DEBUG_REGISTERS | \ + CONTEXT_EXTENDED_REGISTERS) + +#define CONTEXT_DEBUGGER (CONTEXT_FULL | CONTEXT_FLOATING_POINT) +#define CONTEXT_XSTATE (CONTEXT_i386 | 0x00000040L) + + +typedef struct _X87FLOATING_SAVE_AREA +{ + ULONG ControlWord; + ULONG StatusWord; + ULONG TagWord; + ULONG ErrorOffset; + ULONG ErrorSelector; + ULONG DataOffset; + ULONG DataSelector; + UCHAR RegisterArea[SIZE_OF_80387_REGISTERS]; + ULONG Cr0NpxState; +} X87FLOATING_SAVE_AREA, *PX87FLOATING_SAVE_AREA; + +#include "pshpack4.h" +/* + * x86 CPU Context Frame + */ +typedef struct _X86CONTEXT +{ + /* + * The flags values within this flag control the contents of + * a CONTEXT record. + */ + ULONG ContextFlags; + + /* + * Section specified/returned if CONTEXT_DEBUG_REGISTERS + * is set in ContextFlags. + */ + ULONG Dr0; + ULONG Dr1; + ULONG Dr2; + ULONG Dr3; + ULONG Dr6; + ULONG Dr7; + + /* + * Section specified/returned if CONTEXT_FLOATING_POINT + * is set in ContextFlags. + */ + X87FLOATING_SAVE_AREA FloatSave; + + /* + * Section specified/returned if CONTEXT_SEGMENTS + * is set in ContextFlags. + */ + ULONG SegGs; + ULONG SegFs; + ULONG SegEs; + ULONG SegDs; + + /* + * Section specified/returned if CONTEXT_INTEGER + * is set in ContextFlags. + */ + ULONG Edi; + ULONG Esi; + ULONG Ebx; + ULONG Edx; + ULONG Ecx; + ULONG Eax; + + /* + * Section specified/returned if CONTEXT_CONTROL + * is set in ContextFlags. + */ + ULONG Ebp; + ULONG Eip; + ULONG SegCs; + ULONG EFlags; + ULONG Esp; + ULONG SegSs; + + /* + * Section specified/returned if CONTEXT_EXTENDED_REGISTERS + * is set in ContextFlags. The format and contexts are processor specific. + */ + UCHAR ExtendedRegisters[MAXIMUM_SUPPORTED_EXTENSION]; +} X86CONTEXT; +#include "poppack.h" + +#endif // __X86CONTEXT_H__ + +/* EOF */ Propchange: trunk/reactos/subsystems/ntvdm/cpu/x86context.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/dos/dos32… ============================================================================== --- trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] Sat Oct 4 15:41:29 2014 @@ -19,7 +19,6 @@ #include "dos/dem.h" #include "bios/bios.h" -#include "registers.h" /* PRIVATE VARIABLES **********************************************************/ @@ -1057,8 +1056,8 @@ setES(Segment); /* Set the stack to the location from the header */ - EmulatorSetStack(Segment + (sizeof(DOS_PSP) >> 4) + Header->e_ss, - Header->e_sp); + setSS(Segment + (sizeof(DOS_PSP) >> 4) + Header->e_ss); + setSP(Header->e_sp); /* Execute */ CurrentPsp = Segment; @@ -1111,7 +1110,8 @@ setES(Segment); /* Set the stack to the last word of the segment */ - EmulatorSetStack(Segment, 0xFFFE); + setSS(Segment); + setSP(0xFFFE); /* * Set the value on the stack to 0, so that a near return Removed: trunk/reactos/subsystems/ntvdm/registers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/registers… ============================================================================== --- trunk/reactos/subsystems/ntvdm/registers.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/registers.c (removed) @@ -1,645 +0,0 @@ -/* - * COPYRIGHT: GPL - See COPYING in the top level directory - * PROJECT: ReactOS Virtual DOS Machine - * FILE: registers.c - * PURPOSE: Exported functions for manipulating registers - * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) - */ - -/* INCLUDES *******************************************************************/ - -#define NDEBUG - -#include "emulator.h" -#include "cpu/cpu.h" - -/* PUBLIC FUNCTIONS ***********************************************************/ - -VOID EmulatorSetStack(WORD Segment, DWORD Offset) -{ - Fast486SetStack(&EmulatorContext, Segment, Offset); -} - - - -PVOID -WINAPI -getIntelRegistersPointer(VOID) -{ - UNIMPLEMENTED; - return NULL; -} - -ULONG -WINAPI -getEAX(VOID) -{ - return EmulatorContext.GeneralRegs[FAST486_REG_EAX].Long; -} - -VOID -WINAPI -setEAX(ULONG Value) -{ - EmulatorContext.GeneralRegs[FAST486_REG_EAX].Long = Value; -} - -USHORT -WINAPI -getAX(VOID) -{ - return EmulatorContext.GeneralRegs[FAST486_REG_EAX].LowWord; -} - -VOID -WINAPI -setAX(USHORT Value) -{ - EmulatorContext.GeneralRegs[FAST486_REG_EAX].LowWord = Value; -} - -UCHAR -WINAPI -getAH(VOID) -{ - return EmulatorContext.GeneralRegs[FAST486_REG_EAX].HighByte; -} - -VOID -WINAPI -setAH(UCHAR Value) -{ - EmulatorContext.GeneralRegs[FAST486_REG_EAX].HighByte = Value; -} - -UCHAR -WINAPI -getAL(VOID) -{ - return EmulatorContext.GeneralRegs[FAST486_REG_EAX].LowByte; -} - -VOID -WINAPI -setAL(UCHAR Value) -{ - EmulatorContext.GeneralRegs[FAST486_REG_EAX].LowByte = Value; -} - -ULONG -WINAPI -getEBX(VOID) -{ - return EmulatorContext.GeneralRegs[FAST486_REG_EBX].Long; -} - -VOID -WINAPI -setEBX(ULONG Value) -{ - EmulatorContext.GeneralRegs[FAST486_REG_EBX].Long = Value; -} - -USHORT -WINAPI -getBX(VOID) -{ - return EmulatorContext.GeneralRegs[FAST486_REG_EBX].LowWord; -} - -VOID -WINAPI -setBX(USHORT Value) -{ - EmulatorContext.GeneralRegs[FAST486_REG_EBX].LowWord = Value; -} - -UCHAR -WINAPI -getBH(VOID) -{ - return EmulatorContext.GeneralRegs[FAST486_REG_EBX].HighByte; -} - -VOID -WINAPI -setBH(UCHAR Value) -{ - EmulatorContext.GeneralRegs[FAST486_REG_EBX].HighByte = Value; -} - -UCHAR -WINAPI -getBL(VOID) -{ - return EmulatorContext.GeneralRegs[FAST486_REG_EBX].LowByte; -} - -VOID -WINAPI -setBL(UCHAR Value) -{ - EmulatorContext.GeneralRegs[FAST486_REG_EBX].LowByte = Value; -} - - - -ULONG -WINAPI -getECX(VOID) -{ - return EmulatorContext.GeneralRegs[FAST486_REG_ECX].Long; -} - -VOID -WINAPI -setECX(ULONG Value) -{ - EmulatorContext.GeneralRegs[FAST486_REG_ECX].Long = Value; -} - -USHORT -WINAPI -getCX(VOID) -{ - return EmulatorContext.GeneralRegs[FAST486_REG_ECX].LowWord; -} - -VOID -WINAPI -setCX(USHORT Value) -{ - EmulatorContext.GeneralRegs[FAST486_REG_ECX].LowWord = Value; -} - -UCHAR -WINAPI -getCH(VOID) -{ - return EmulatorContext.GeneralRegs[FAST486_REG_ECX].HighByte; -} - -VOID -WINAPI -setCH(UCHAR Value) -{ - EmulatorContext.GeneralRegs[FAST486_REG_ECX].HighByte = Value; -} - -UCHAR -WINAPI -getCL(VOID) -{ - return EmulatorContext.GeneralRegs[FAST486_REG_ECX].LowByte; -} - -VOID -WINAPI -setCL(UCHAR Value) -{ - EmulatorContext.GeneralRegs[FAST486_REG_ECX].LowByte = Value; -} - - - -ULONG -WINAPI -getEDX(VOID) -{ - return EmulatorContext.GeneralRegs[FAST486_REG_EDX].Long; -} - -VOID -WINAPI -setEDX(ULONG Value) -{ - EmulatorContext.GeneralRegs[FAST486_REG_EDX].Long = Value; -} - -USHORT -WINAPI -getDX(VOID) -{ - return EmulatorContext.GeneralRegs[FAST486_REG_EDX].LowWord; -} - -VOID -WINAPI -setDX(USHORT Value) -{ - EmulatorContext.GeneralRegs[FAST486_REG_EDX].LowWord = Value; -} - -UCHAR -WINAPI -getDH(VOID) -{ - return EmulatorContext.GeneralRegs[FAST486_REG_EDX].HighByte; -} - -VOID -WINAPI -setDH(UCHAR Value) -{ - EmulatorContext.GeneralRegs[FAST486_REG_EDX].HighByte = Value; -} - -UCHAR -WINAPI -getDL(VOID) -{ - return EmulatorContext.GeneralRegs[FAST486_REG_EDX].LowByte; -} - -VOID -WINAPI -setDL(UCHAR Value) -{ - EmulatorContext.GeneralRegs[FAST486_REG_EDX].LowByte = Value; -} - - - -ULONG -WINAPI -getESP(VOID) -{ - return EmulatorContext.GeneralRegs[FAST486_REG_ESP].Long; -} - -VOID -WINAPI -setESP(ULONG Value) -{ - EmulatorSetStack(getSS(), Value); -} - -USHORT -WINAPI -getSP(VOID) -{ - return EmulatorContext.GeneralRegs[FAST486_REG_ESP].LowWord; -} - -VOID -WINAPI -setSP(USHORT Value) -{ - EmulatorSetStack(getSS(), Value); -} - - - -ULONG -WINAPI -getEBP(VOID) -{ - return EmulatorContext.GeneralRegs[FAST486_REG_EBP].Long; -} - -VOID -WINAPI -setEBP(ULONG Value) -{ - EmulatorContext.GeneralRegs[FAST486_REG_EBP].Long = Value; -} - -USHORT -WINAPI -getBP(VOID) -{ - return EmulatorContext.GeneralRegs[FAST486_REG_EBP].LowWord; -} - -VOID -WINAPI -setBP(USHORT Value) -{ - EmulatorContext.GeneralRegs[FAST486_REG_EBP].LowWord = Value; -} - - - -ULONG -WINAPI -getESI(VOID) -{ - return EmulatorContext.GeneralRegs[FAST486_REG_ESI].Long; -} - -VOID -WINAPI -setESI(ULONG Value) -{ - EmulatorContext.GeneralRegs[FAST486_REG_ESI].Long = Value; -} - -USHORT -WINAPI -getSI(VOID) -{ - return EmulatorContext.GeneralRegs[FAST486_REG_ESI].LowWord; -} - -VOID -WINAPI -setSI(USHORT Value) -{ - EmulatorContext.GeneralRegs[FAST486_REG_ESI].LowWord = Value; -} - - - -ULONG -WINAPI -getEDI(VOID) -{ - return EmulatorContext.GeneralRegs[FAST486_REG_EDI].Long; -} - -VOID -WINAPI -setEDI(ULONG Value) -{ - EmulatorContext.GeneralRegs[FAST486_REG_EDI].Long = Value; -} - -USHORT -WINAPI -getDI(VOID) -{ - return EmulatorContext.GeneralRegs[FAST486_REG_EDI].LowWord; -} - -VOID -WINAPI -setDI(USHORT Value) -{ - EmulatorContext.GeneralRegs[FAST486_REG_EDI].LowWord = Value; -} - - - -ULONG -WINAPI -getEIP(VOID) -{ - return EmulatorContext.InstPtr.Long; -} - -VOID -WINAPI -setEIP(ULONG Value) -{ - CpuExecute(getCS(), Value); -} - -USHORT -WINAPI -getIP(VOID) -{ - return EmulatorContext.InstPtr.LowWord; -} - -VOID -WINAPI -setIP(USHORT Value) -{ - CpuExecute(getCS(), Value); -} - - - -USHORT -WINAPI -getCS(VOID) -{ - return EmulatorContext.SegmentRegs[FAST486_REG_CS].Selector; -} - -VOID -WINAPI -setCS(USHORT Value) -{ - Fast486SetSegment(&EmulatorContext, FAST486_REG_CS, Value); -} - -USHORT -WINAPI -getSS(VOID) -{ - return EmulatorContext.SegmentRegs[FAST486_REG_SS].Selector; -} - -VOID -WINAPI -setSS(USHORT Value) -{ - Fast486SetSegment(&EmulatorContext, FAST486_REG_SS, Value); -} - -USHORT -WINAPI -getDS(VOID) -{ - return EmulatorContext.SegmentRegs[FAST486_REG_DS].Selector; -} - -VOID -WINAPI -setDS(USHORT Value) -{ - Fast486SetSegment(&EmulatorContext, FAST486_REG_DS, Value); -} - -USHORT -WINAPI -getES(VOID) -{ - return EmulatorContext.SegmentRegs[FAST486_REG_ES].Selector; -} - -VOID -WINAPI -setES(USHORT Value) -{ - Fast486SetSegment(&EmulatorContext, FAST486_REG_ES, Value); -} - -USHORT -WINAPI -getFS(VOID) -{ - return EmulatorContext.SegmentRegs[FAST486_REG_FS].Selector; -} - -VOID -WINAPI -setFS(USHORT Value) -{ - Fast486SetSegment(&EmulatorContext, FAST486_REG_FS, Value); -} - -USHORT -WINAPI -getGS(VOID) -{ - return EmulatorContext.SegmentRegs[FAST486_REG_GS].Selector; -} - -VOID -WINAPI -setGS(USHORT Value) -{ - Fast486SetSegment(&EmulatorContext, FAST486_REG_GS, Value); -} - - - -ULONG -WINAPI -getCF(VOID) -{ - return EmulatorContext.Flags.Cf; -} - -VOID -WINAPI -setCF(ULONG Flag) -{ - EmulatorContext.Flags.Cf = !!(Flag & 1); -} - -ULONG -WINAPI -getPF(VOID) -{ - return EmulatorContext.Flags.Pf; -} - -VOID -WINAPI -setPF(ULONG Flag) -{ - EmulatorContext.Flags.Pf = !!(Flag & 1); -} - -ULONG -WINAPI -getAF(VOID) -{ - return EmulatorContext.Flags.Af; -} - -VOID -WINAPI -setAF(ULONG Flag) -{ - EmulatorContext.Flags.Af = !!(Flag & 1); -} - -ULONG -WINAPI -getZF(VOID) -{ - return EmulatorContext.Flags.Zf; -} - -VOID -WINAPI -setZF(ULONG Flag) -{ - EmulatorContext.Flags.Zf = !!(Flag & 1); -} - -ULONG -WINAPI -getSF(VOID) -{ - return EmulatorContext.Flags.Sf; -} - -VOID -WINAPI -setSF(ULONG Flag) -{ - EmulatorContext.Flags.Sf = !!(Flag & 1); -} - -ULONG -WINAPI -getIF(VOID) -{ - return EmulatorContext.Flags.If; -} - -VOID -WINAPI -setIF(ULONG Flag) -{ - EmulatorContext.Flags.If = !!(Flag & 1); -} - -ULONG -WINAPI -getDF(VOID) -{ - return EmulatorContext.Flags.Df; -} - -VOID -WINAPI -setDF(ULONG Flag) -{ - EmulatorContext.Flags.Df = !!(Flag & 1); -} - -ULONG -WINAPI -getOF(VOID) -{ - return EmulatorContext.Flags.Of; -} - -VOID -WINAPI -setOF(ULONG Flag) -{ - EmulatorContext.Flags.Of = !!(Flag & 1); -} - - - -ULONG -WINAPI -getEFLAGS(VOID) -{ - return EmulatorContext.Flags.Long; -} - -VOID -WINAPI -setEFLAGS(ULONG Flags) -{ - EmulatorContext.Flags.Long = Flags; -} - - - -USHORT -WINAPI -getMSW(VOID) -{ - return LOWORD(EmulatorContext.ControlRegisters[FAST486_REG_CR0]); -} - -VOID -WINAPI -setMSW(USHORT Value) -{ - /* Set the lower 16 bits (Machine Status Word) of CR0 */ - EmulatorContext.ControlRegisters[FAST486_REG_CR0] &= 0xFFFF0000; - EmulatorContext.ControlRegisters[FAST486_REG_CR0] |= Value & 0xFFFF; -} - -/* EOF */ Removed: trunk/reactos/subsystems/ntvdm/registers.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/registers… ============================================================================== --- trunk/reactos/subsystems/ntvdm/registers.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/registers.h (removed) @@ -1,123 +0,0 @@ -/* - * COPYRIGHT: GPL - See COPYING in the top level directory - * PROJECT: ReactOS Virtual DOS Machine - * FILE: registers.c - * PURPOSE: Exported functions for manipulating registers - * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) - */ - -#ifndef _REGISTERS_H_ -#define _REGISTERS_H_ - -/* INCLUDES *******************************************************************/ - -VOID EmulatorSetStack(WORD Segment, DWORD Offset); - -#if 0 // Those function prototypes are already included via ddk/vddsvc.h - -PVOID WINAPI getIntelRegistersPointer(VOID); - -ULONG WINAPI getEAX(VOID); -VOID WINAPI setEAX(ULONG); -USHORT WINAPI getAX(VOID); -VOID WINAPI setAX(USHORT); -UCHAR WINAPI getAH(VOID); -VOID WINAPI setAH(UCHAR); -UCHAR WINAPI getAL(VOID); -VOID WINAPI setAL(UCHAR); - -ULONG WINAPI getEBX(VOID); -VOID WINAPI setEBX(ULONG); -USHORT WINAPI getBX(VOID); -VOID WINAPI setBX(USHORT); -UCHAR WINAPI getBH(VOID); -VOID WINAPI setBH(UCHAR); -UCHAR WINAPI getBL(VOID); -VOID WINAPI setBL(UCHAR); - -ULONG WINAPI getECX(VOID); -VOID WINAPI setECX(ULONG); -USHORT WINAPI getCX(VOID); -VOID WINAPI setCX(USHORT); -UCHAR WINAPI getCH(VOID); -VOID WINAPI setCH(UCHAR); -UCHAR WINAPI getCL(VOID); -VOID WINAPI setCL(UCHAR); - -ULONG WINAPI getEDX(VOID); -VOID WINAPI setEDX(ULONG); -USHORT WINAPI getDX(VOID); -VOID WINAPI setDX(USHORT); -UCHAR WINAPI getDH(VOID); -VOID WINAPI setDH(UCHAR); -UCHAR WINAPI getDL(VOID); -VOID WINAPI setDL(UCHAR); - - - -ULONG WINAPI getESP(VOID); -VOID WINAPI setESP(ULONG); -USHORT WINAPI getSP(VOID); -VOID WINAPI setSP(USHORT); - -ULONG WINAPI getEBP(VOID); -VOID WINAPI setEBP(ULONG); -USHORT WINAPI getBP(VOID); -VOID WINAPI setBP(USHORT); - -ULONG WINAPI getESI(VOID); -VOID WINAPI setESI(ULONG); -USHORT WINAPI getSI(VOID); -VOID WINAPI setSI(USHORT); - -ULONG WINAPI getEDI(VOID); -VOID WINAPI setEDI(ULONG); -USHORT WINAPI getDI(VOID); -VOID WINAPI setDI(USHORT); - -ULONG WINAPI getEIP(VOID); -VOID WINAPI setEIP(ULONG); -USHORT WINAPI getIP(VOID); -VOID WINAPI setIP(USHORT); - -USHORT WINAPI getCS(VOID); -VOID WINAPI setCS(USHORT); -USHORT WINAPI getSS(VOID); -VOID WINAPI setSS(USHORT); -USHORT WINAPI getDS(VOID); -VOID WINAPI setDS(USHORT); -USHORT WINAPI getES(VOID); -VOID WINAPI setES(USHORT); -USHORT WINAPI getFS(VOID); -VOID WINAPI setFS(USHORT); -USHORT WINAPI getGS(VOID); -VOID WINAPI setGS(USHORT); - -ULONG WINAPI getCF(VOID); -VOID WINAPI setCF(ULONG); -ULONG WINAPI getPF(VOID); -VOID WINAPI setPF(ULONG); -ULONG WINAPI getAF(VOID); -VOID WINAPI setAF(ULONG); -ULONG WINAPI getZF(VOID); -VOID WINAPI setZF(ULONG); -ULONG WINAPI getSF(VOID); -VOID WINAPI setSF(ULONG); -ULONG WINAPI getIF(VOID); -VOID WINAPI setIF(ULONG); -ULONG WINAPI getDF(VOID); -VOID WINAPI setDF(ULONG); -ULONG WINAPI getOF(VOID); -VOID WINAPI setOF(ULONG); - -ULONG WINAPI getEFLAGS(VOID); -VOID WINAPI setEFLAGS(ULONG); - -USHORT WINAPI getMSW(VOID); -VOID WINAPI setMSW(USHORT); - -#endif - -#endif // _REGISTERS_H_ - -/* EOF */

1 0

[hbelusca] 64522: [PSDK/XDK]: Don't hardcode "80" in the CONTEXT structure, but use the correct define.
by hbelusca＠svn.reactos.org 04 Oct '14

04 Oct '14

Author: hbelusca Date: Sat Oct 4 14:40:59 2014 New Revision: 64522 URL: http://svn.reactos.org/svn/reactos?rev=64522&view=rev Log: [PSDK/XDK]: Don't hardcode "80" in the CONTEXT structure, but use the correct define. Modified: trunk/reactos/include/psdk/winnt.h trunk/reactos/include/xdk/winnt_old.h Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=6… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Sat Oct 4 14:40:59 2014 @@ -2974,7 +2974,7 @@ DWORD ErrorSelector; DWORD DataOffset; DWORD DataSelector; - BYTE RegisterArea[80]; + BYTE RegisterArea[SIZE_OF_80387_REGISTERS]; DWORD Cr0NpxState; } FLOATING_SAVE_AREA, *PFLOATING_SAVE_AREA; Modified: trunk/reactos/include/xdk/winnt_old.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/winnt_old.h?re… ============================================================================== --- trunk/reactos/include/xdk/winnt_old.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/winnt_old.h [iso-8859-1] Sat Oct 4 14:40:59 2014 @@ -1623,7 +1623,7 @@ DWORD ErrorSelector; DWORD DataOffset; DWORD DataSelector; - BYTE RegisterArea[80]; + BYTE RegisterArea[SIZE_OF_80387_REGISTERS]; DWORD Cr0NpxState; } FLOATING_SAVE_AREA, *PFLOATING_SAVE_AREA;

1 0

[hbelusca] 64521: [NTVDM] - Move almost all the DOS command launch thread into dem.c, - Rework the code so that now, when we want to either load our BIOS32 or a custom one, we start their execution...
by hbelusca＠svn.reactos.org 04 Oct '14

04 Oct '14

Author: hbelusca Date: Sat Oct 4 13:36:17 2014 New Revision: 64521 URL: http://svn.reactos.org/svn/reactos?rev=64521&view=rev Log: [NTVDM] - Move almost all the DOS command launch thread into dem.c, - Rework the code so that now, when we want to either load our BIOS32 or a custom one, we start their execution at F000:FFF0 as it should be, - For modularity purposes (ie. to be able one day to load real OSes in our ntvdm), implement INT 19h (bootstrap loader) so that it calls a (temporary) dos bootsector loader that writes some bootstrap code at 0000:7c00, then the INT 19h runs this code, that has as an effect to load our DOS32 (for a real OS, the MBR code goes to 0000:7c00 and is then run). Modified: trunk/reactos/subsystems/ntvdm/bios/bios.c trunk/reactos/subsystems/ntvdm/bios/bios.h trunk/reactos/subsystems/ntvdm/bios/bios32/bios32.c trunk/reactos/subsystems/ntvdm/dos/dem.c trunk/reactos/subsystems/ntvdm/dos/dem.h trunk/reactos/subsystems/ntvdm/ntvdm.c trunk/reactos/subsystems/ntvdm/ntvdm.h Modified: trunk/reactos/subsystems/ntvdm/bios/bios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/bios… ============================================================================== --- trunk/reactos/subsystems/ntvdm/bios/bios.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/bios/bios.c [iso-8859-1] Sat Oct 4 13:36:17 2014 @@ -25,7 +25,7 @@ /* DEFINES ********************************************************************/ /* BOP Identifiers */ -#define BOP_BIOSINIT 0x00 // Windows NTVDM (SoftPC) BIOS calls BOP 0x00 +#define BOP_RESET 0x00 // Windows NTVDM (SoftPC) BIOS calls BOP 0x00 // to let the virtual machine initialize itself // the IVT and its hardware. #define BOP_EQUIPLIST 0x11 @@ -35,83 +35,10 @@ static BOOLEAN Bios32Loaded = FALSE; -static CALLBACK16 __BiosContext; PBIOS_DATA_AREA Bda; PBIOS_CONFIG_TABLE Bct; /* PRIVATE FUNCTIONS **********************************************************/ - -static VOID WINAPI BiosInitBop(LPWORD Stack) -{ - BOOLEAN Success; - - /* Load the second part of the Windows NTVDM BIOS image */ - LPCSTR BiosFileName = "bios1.rom"; - PVOID BiosLocation = (PVOID)TO_LINEAR(BIOS_SEGMENT, 0x0000); - DWORD BiosSize = 0; - - /* Disable interrupts */ - setIF(0); - - DisplayMessage(L"You are loading Windows NTVDM BIOS!\n"); - - /* Initialize a private callback context */ - InitializeContext(&__BiosContext, BIOS_SEGMENT, 0x0000); - - Success = LoadRom(BiosFileName, BiosLocation, &BiosSize); - DPRINT1("BIOS loading %s ; GetLastError() = %u\n", Success ? "succeeded" : "failed", GetLastError()); - - if (Success == FALSE) - { - /* Stop the VDM */ - EmulatorTerminate(); - return; - } - - // DisplayMessage(L"First bytes at 0x%p: 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x\n" - // L"3 last bytes at 0x%p: 0x%02x 0x%02x 0x%02x", - // BiosLocation, - // *(PCHAR)((ULONG_PTR)REAL_TO_PHYS(BiosLocation) + 0), - // *(PCHAR)((ULONG_PTR)REAL_TO_PHYS(BiosLocation) + 1), - // *(PCHAR)((ULONG_PTR)REAL_TO_PHYS(BiosLocation) + 2), - // *(PCHAR)((ULONG_PTR)REAL_TO_PHYS(BiosLocation) + 3), - // *(PCHAR)((ULONG_PTR)REAL_TO_PHYS(BiosLocation) + 4), - // *(PCHAR)((ULONG_PTR)REAL_TO_PHYS(BiosLocation) + 5), - // *(PCHAR)((ULONG_PTR)REAL_TO_PHYS(BiosLocation) + 6), - // *(PCHAR)((ULONG_PTR)REAL_TO_PHYS(BiosLocation) + 7), - // *(PCHAR)((ULONG_PTR)REAL_TO_PHYS(BiosLocation) + 8), - // *(PCHAR)((ULONG_PTR)REAL_TO_PHYS(BiosLocation) + 9), - - // (PVOID)((ULONG_PTR)BiosLocation + BiosSize - 2), - // *(PCHAR)((ULONG_PTR)REAL_TO_PHYS(BiosLocation) + BiosSize - 2), - // *(PCHAR)((ULONG_PTR)REAL_TO_PHYS(BiosLocation) + BiosSize - 1), - // *(PCHAR)((ULONG_PTR)REAL_TO_PHYS(BiosLocation) + BiosSize - 0)); - - /* Initialize IVT and hardware */ - - /* Initialize the Keyboard and Video BIOS */ - if (!KbdBiosInitialize() || !VidBiosInitialize()) - { - /* Stop the VDM */ - EmulatorTerminate(); - return; - } - - /* Load VGA BIOS */ - // Success = LoadRom("v7vga.rom", (PVOID)0xC0000, &BiosSize); - // DPRINT1("VGA BIOS loading %s ; GetLastError() = %u\n", Success ? "succeeded" : "failed", GetLastError()); - - /* Enable interrupts */ - setIF(1); - - ///////////// MUST BE DONE AFTER IVT INITIALIZATION !! ///////////////////// - - /* Load some ROMs */ - // Success = LoadRom("boot.bin", (PVOID)0xE0000, &BiosSize); - // DPRINT1("Test ROM loading %s ; GetLastError() = %u\n", Success ? "succeeded" : "failed", GetLastError()); - - SearchAndInitRoms(&__BiosContext); -} /* PUBLIC FUNCTIONS ***********************************************************/ @@ -140,12 +67,14 @@ // The BCT is found at F000:E6F5 for 100% compatible BIOSes. Bct = (PBIOS_CONFIG_TABLE)SEG_OFF_TO_PTR(BIOS_SEGMENT, 0xE6F5); - /* Register the BIOS support BOPs */ - RegisterBop(BOP_BIOSINIT , BiosInitBop); - RegisterBop(BOP_EQUIPLIST , BiosEquipmentService); - RegisterBop(BOP_GETMEMSIZE, BiosGetMemorySize); + /**** HACK! HACK! for Windows NTVDM BIOS ****/ + // WinNtVdmBiosSupportInitialize(); - if (BiosFileName) + // /* Register the BIOS support BOPs */ + // RegisterBop(BOP_EQUIPLIST , BiosEquipmentService); + // RegisterBop(BOP_GETMEMSIZE, BiosGetMemorySize); + + if (BiosFileName && BiosFileName[0] != '\0') { PVOID BiosLocation = NULL; DWORD BiosSize = 0; @@ -199,8 +128,8 @@ Success = Bios32Loaded = Bios32Initialize(); } - /* Enable interrupts */ - setIF(1); + // /* Enable interrupts */ + // setIF(1); return Success; } 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 4 13:36:17 2014 @@ -16,6 +16,16 @@ #include "vidbios.h" /* DEFINES ********************************************************************/ + +/* BOP Identifiers */ +#define BOP_RESET 0x00 // Windows NTVDM (SoftPC) BIOS calls BOP 0x00 + // to let the virtual machine initialize itself + // the IVT and its hardware. +#define BOP_EQUIPLIST 0x11 +#define BOP_GETMEMSIZE 0x12 + + + #define BDA_SEGMENT 0x40 #define BIOS_SEGMENT 0xF000 Modified: trunk/reactos/subsystems/ntvdm/bios/bios32/bios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/bios… ============================================================================== --- trunk/reactos/subsystems/ntvdm/bios/bios32/bios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/bios/bios32/bios32.c [iso-8859-1] Sat Oct 4 13:36:17 2014 @@ -15,8 +15,8 @@ #include "emulator.h" #include "cpu/cpu.h" // for EMULATOR_FLAG_CF +#include "cpu/bop.h" #include "int32.h" -// #include "bop.h" #include "../bios.h" #include "../rom.h" @@ -129,7 +129,8 @@ */ static BYTE PostCode[] = { - 0xCD, 0x19, // int 0x19, the bootstrap loader interrupt + LOBYTE(EMULATOR_BOP), HIBYTE(EMULATOR_BOP), BOP_RESET, // Call BIOS POST + 0xCD, 0x19, // INT 0x19, the bootstrap loader interrupt // LOBYTE(EMULATOR_BOP), HIBYTE(EMULATOR_BOP), BOP_UNSIMULATE }; @@ -278,16 +279,25 @@ return; } + +VOID DosBootsectorInitialize(VOID); + static VOID WINAPI BiosBootstrapLoader(LPWORD Stack) { /* - * In real bioses one loads the bootsector read from a diskette - * or from a disk, to 0000:7C00 and then one runs it. + * In real BIOSes one loads the bootsector read from a diskette + * or from a disk, copy it to 0000:7C00 and then boot it. * Since we are 32-bit VM and we hardcode our DOS at the moment, * just call the DOS 32-bit initialization code. */ DPRINT1("BiosBootstrapLoader -->\n"); + + /* Load DOS */ + DosBootsectorInitialize(); + /* Position CPU to 0000:7C00 to boot the OS */ + setCS(0x0000); + setIP(0x7C00); DPRINT1("<-- BiosBootstrapLoader\n"); } @@ -510,6 +520,25 @@ ((PULONG)BaseAddress)[0x49] = (ULONG)NULL; } +static VOID InitializeBiosData(VOID) +{ + UCHAR Low, High; + + /* Initialize the BDA contents */ + RtlZeroMemory(Bda, sizeof(*Bda)); + Bda->EquipmentList = BIOS_EQUIPMENT_LIST; + + /* + * Retrieve the conventional memory size + * in kB from CMOS, typically 640 kB. + */ + IOWriteB(CMOS_ADDRESS_PORT, CMOS_REG_BASE_MEMORY_LOW); + Low = IOReadB(CMOS_DATA_PORT); + IOWriteB(CMOS_ADDRESS_PORT, CMOS_REG_BASE_MEMORY_HIGH); + High = IOReadB(CMOS_DATA_PORT); + Bda->MemorySize = MAKEWORD(Low, High); +} + static VOID InitializeBiosInfo(VOID) { RtlZeroMemory(Bct, sizeof(*Bct)); @@ -525,45 +554,17 @@ Bct->Feature[4] = 0x00; } -static VOID InitializeBiosData(VOID) -{ - UCHAR Low, High; - - /* System BIOS Copyright */ - RtlCopyMemory(SEG_OFF_TO_PTR(0xF000, 0xE000), BiosCopyright, sizeof(BiosCopyright)-1); - - /* System BIOS Version */ - RtlCopyMemory(SEG_OFF_TO_PTR(0xF000, 0xE080), BiosVersion, sizeof(BiosVersion)-1); // FIXME: or E061, or E100 ?? - - /* System BIOS Date */ - RtlCopyMemory(SEG_OFF_TO_PTR(0xF000, 0xFFF5), BiosDate, sizeof(BiosDate)-1); - - /* System BIOS Model (same as Bct->Model) */ - *(PBYTE)(SEG_OFF_TO_PTR(0xF000, 0xFFFE)) = BIOS_MODEL; - - /* Initialize the BDA contents */ - RtlZeroMemory(Bda, sizeof(*Bda)); - Bda->EquipmentList = BIOS_EQUIPMENT_LIST; - - /* - * Retrieve the conventional memory size - * in kB from CMOS, typically 640 kB. - */ - IOWriteB(CMOS_ADDRESS_PORT, CMOS_REG_BASE_MEMORY_LOW); - Low = IOReadB(CMOS_DATA_PORT); - IOWriteB(CMOS_ADDRESS_PORT, CMOS_REG_BASE_MEMORY_HIGH); - High = IOReadB(CMOS_DATA_PORT); - Bda->MemorySize = MAKEWORD(Low, High); -} - -/* PUBLIC FUNCTIONS ***********************************************************/ + /* * The BIOS POST (Power On-Self Test) */ -BOOLEAN Bios32Initialize(VOID) +VOID +Bios32Post(VOID) { BOOLEAN Success; + + DPRINT1("Bios32Post\n"); /* Initialize the stack */ // That's what says IBM... (stack at 30:00FF going downwards) @@ -587,7 +588,13 @@ /* Initialize the Keyboard, Video and Mouse BIOS */ if (!KbdBios32Initialize() || !VidBios32Initialize() || !MouseBios32Initialize()) - return FALSE; + { + // return FALSE; + + /* Stop the VDM */ + EmulatorTerminate(); + return; + } ///////////// MUST BE DONE AFTER IVT INITIALIZATION !! ///////////////////// @@ -597,10 +604,70 @@ SearchAndInitRoms(&BiosContext); + /* + * End of the 32-bit POST portion. We then fall back into 16-bit where + * the rest of the POST code is executed, typically calling INT 19h + * to boot up the OS. + */ +} + +static VOID WINAPI Bios32ResetBop(LPWORD Stack) +{ + DPRINT1("Bios32ResetBop\n"); + + /* Disable interrupts */ + setIF(0); + + // FIXME: Check the word at 0040h:0072h and do one of the following actions: + // - if the word is 1234h, perform a warm reboot (aka. Ctrl-Alt-Del); + // - if the word is 0000h, perform a cold reboot (aka. Reset). + + /* Initialize IVT and hardware */ + + /* Initialize the Keyboard and Video BIOS */ + if (!KbdBiosInitialize() || !VidBiosInitialize()) + { + /* Stop the VDM */ + EmulatorTerminate(); + return; + } + + /* Do the POST */ + Bios32Post(); + + /* Enable interrupts */ + setIF(1); +} + + +/* PUBLIC FUNCTIONS ***********************************************************/ + +BOOLEAN Bios32Initialize(VOID) +{ + /* + * Initialize BIOS32 static data + */ + /* Bootstrap code */ RtlCopyMemory(SEG_OFF_TO_PTR(0xF000, 0xE05B), PostCode , sizeof(PostCode )); RtlCopyMemory(SEG_OFF_TO_PTR(0xF000, 0xFFF0), Bootstrap, sizeof(Bootstrap)); + /* System BIOS Copyright */ + RtlCopyMemory(SEG_OFF_TO_PTR(0xF000, 0xE000), BiosCopyright, sizeof(BiosCopyright)-1); + + /* System BIOS Version */ + RtlCopyMemory(SEG_OFF_TO_PTR(0xF000, 0xE080), BiosVersion, sizeof(BiosVersion)-1); + // FIXME: or E061, or E100 ?? + + /* System BIOS Date */ + RtlCopyMemory(SEG_OFF_TO_PTR(0xF000, 0xFFF5), BiosDate, sizeof(BiosDate)-1); + + /* System BIOS Model (same as Bct->Model) */ + *(PBYTE)(SEG_OFF_TO_PTR(0xF000, 0xFFFE)) = BIOS_MODEL; + + /* Redefine our POST function */ + RegisterBop(BOP_RESET, Bios32ResetBop); + /* We are done */ return TRUE; } Modified: trunk/reactos/subsystems/ntvdm/dos/dem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/dos/dem.c… ============================================================================== --- trunk/reactos/subsystems/ntvdm/dos/dem.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/dos/dem.c [iso-8859-1] Sat Oct 4 13:36:17 2014 @@ -33,8 +33,10 @@ /* DEFINES ********************************************************************/ /* BOP Identifiers */ -#define BOP_DOS 0x50 // DOS System BOP (for NTIO.SYS and NTDOS.SYS) -#define BOP_CMD 0x54 // DOS Command Interpreter BOP (for COMMAND.COM) +#define BOP_LOAD_DOS 0x2B // DOS Loading and Initializing BOP. In parameter (following bytes) we take a NULL-terminated string indicating the name of the DOS kernel file. +#define BOP_START_DOS 0x2C // DOS Starting BOP. In parameter (following bytes) we take a NULL-terminated string indicating the name of the DOS kernel file. +#define BOP_DOS 0x50 // DOS System BOP (for NTIO.SYS and NTDOS.SYS) +#define BOP_CMD 0x54 // DOS Command Interpreter BOP (for COMMAND.COM) /* PRIVATE FUNCTIONS **********************************************************/ @@ -185,17 +187,157 @@ } } +#ifndef STANDALONE +static DWORD +WINAPI +CommandThreadProc(LPVOID Parameter) +{ + BOOLEAN First = TRUE; + DWORD Result; + VDM_COMMAND_INFO CommandInfo; + CHAR CmdLine[MAX_PATH]; + CHAR AppName[MAX_PATH]; + CHAR PifFile[MAX_PATH]; + CHAR Desktop[MAX_PATH]; + CHAR Title[MAX_PATH]; + ULONG EnvSize = 256; + PVOID Env = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, EnvSize); + + UNREFERENCED_PARAMETER(Parameter); + ASSERT(Env != NULL); + + do + { + /* Clear the structure */ + ZeroMemory(&CommandInfo, sizeof(CommandInfo)); + + /* Initialize the structure members */ + CommandInfo.TaskId = SessionId; + CommandInfo.VDMState = VDM_FLAG_DOS; + CommandInfo.CmdLine = CmdLine; + CommandInfo.CmdLen = sizeof(CmdLine); + CommandInfo.AppName = AppName; + CommandInfo.AppLen = sizeof(AppName); + CommandInfo.PifFile = PifFile; + CommandInfo.PifLen = sizeof(PifFile); + CommandInfo.Desktop = Desktop; + CommandInfo.DesktopLen = sizeof(Desktop); + CommandInfo.Title = Title; + CommandInfo.TitleLen = sizeof(Title); + CommandInfo.Env = Env; + CommandInfo.EnvLen = EnvSize; + + if (First) CommandInfo.VDMState |= VDM_FLAG_FIRST_TASK; + +Command: + if (!GetNextVDMCommand(&CommandInfo)) + { + if (CommandInfo.EnvLen > EnvSize) + { + /* Expand the environment size */ + EnvSize = CommandInfo.EnvLen; + Env = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, Env, EnvSize); + + /* Repeat the request */ + goto Command; + } + + break; + } + + /* Start the process from the command line */ + DPRINT1("Starting '%s' ('%s')...\n", AppName, CmdLine); + Result = DosStartProcess(AppName, CmdLine, Env); + if (Result != ERROR_SUCCESS) + { + DisplayMessage(L"Could not start '%S'. Error: %u", AppName, Result); + // break; + continue; + } + + First = FALSE; + } + while (AcceptCommands); + + HeapFree(GetProcessHeap(), 0, Env); + return 0; +} +#endif + /* PUBLIC FUNCTIONS ***********************************************************/ -BOOLEAN DosInitialize(IN LPCSTR DosKernelFileName) -{ +// +// This function (equivalent of the DOS bootsector) is called by the bootstrap +// loader *BEFORE* jumping at 0000:7C00. What we should do is to write at 0000:7C00 +// a BOP call that calls DosInitialize back. Then the bootstrap loader jumps at +// 0000:7C00, our BOP gets called and then we can initialize the 32-bit part of the DOS. +// + +/* 16-bit bootstrap code at 0000:7C00 */ +/* Of course, this is not in real bootsector format, because we don't care */ +static BYTE Bootsector1[] = +{ + LOBYTE(EMULATOR_BOP), HIBYTE(EMULATOR_BOP), BOP_LOAD_DOS, // Call DOS Loading +}; +/* This portion of code is run if we failed to load the DOS */ +static BYTE Bootsector2[] = +{ + 0xEA, // jmp far ptr + 0x5B, 0xE0, 0x00, 0xF0, // F000:E05B /** HACK! What to do instead?? **/ +}; + +static VOID WINAPI DosInitialize(LPWORD Stack); + +VOID DosBootsectorInitialize(VOID) +{ + /* We write the bootsector at 0000:7C00 */ + ULONG_PTR Address = (ULONG_PTR)SEG_OFF_TO_PTR(0x0000, 0x7C00); + CHAR DosKernelFileName[] = ""; // No DOS file name, therefore we'll load DOS32 + + DPRINT1("DosBootsectorInitialize\n"); + + /* Write the "bootsector" */ + RtlCopyMemory((PVOID)Address, Bootsector1, sizeof(Bootsector1)); + Address += sizeof(Bootsector1); + RtlCopyMemory((PVOID)Address, DosKernelFileName, sizeof(DosKernelFileName)); + Address += sizeof(DosKernelFileName); + RtlCopyMemory((PVOID)Address, Bootsector2, sizeof(Bootsector2)); + + /* Register the DOS Loading BOP */ + RegisterBop(BOP_LOAD_DOS, DosInitialize); +} + + +// +// This function is called by the DOS bootsector. We finish to load +// the DOS, then we jump to 0070:0000. +// + +/* 16-bit startup code at 0070:0000 */ +static BYTE Startup[] = +{ + LOBYTE(EMULATOR_BOP), HIBYTE(EMULATOR_BOP), BOP_START_DOS, // Call DOS Start +}; + +static VOID WINAPI DosStart(LPWORD Stack); + +static VOID WINAPI DosInitialize(LPWORD Stack) +{ + BOOLEAN Success = FALSE; + + /* Get the DOS kernel file name (NULL-terminated) */ + // FIXME: Isn't it possible to use some DS:SI instead?? + LPCSTR DosKernelFileName = (LPCSTR)SEG_OFF_TO_PTR(getCS(), getIP()); + setIP(getIP() + strlen(DosKernelFileName) + 1); // Skip it + + DPRINT1("DosInitialize('%s')\n", DosKernelFileName); + /* Register the DOS BOPs */ RegisterBop(BOP_DOS, DosSystemBop ); RegisterBop(BOP_CMD, DosCmdInterpreterBop); - if (DosKernelFileName) - { - BOOLEAN Success; + if (DosKernelFileName && DosKernelFileName[0] != '\0') + { HANDLE hDosBios; ULONG ulDosBiosSize = 0; @@ -203,7 +345,7 @@ hDosBios = FileOpen(DosKernelFileName, &ulDosBiosSize); /* If we failed, bail out */ - if (hDosBios == NULL) return FALSE; + if (hDosBios == NULL) goto QuitCustom; /* Attempt to load the DOS BIOS into memory */ Success = FileLoadByHandle(hDosBios, @@ -220,26 +362,121 @@ /* Close the DOS BIOS file */ FileClose(hDosBios); - if (Success) - { - /* Position execution pointers and return */ - setCS(0x0070); - setIP(0x0000); - } - - return Success; + if (!Success) goto QuitCustom; + + /* Position execution pointers and return */ + setCS(0x0070); + setIP(0x0000); + + /* Return control */ +QuitCustom: + if (!Success) + DisplayMessage(L"Custom DOS '%S' loading failed, what to do??", DosKernelFileName); } else { - BOOLEAN Result; - - Result = DosBIOSInitialize(); - DosMouseInitialize(); // FIXME: Should be done by the DOS BIOS - // Result &= DosKRNLInitialize(); - - return Result; - } -} + Success = DosBIOSInitialize(); + // Success &= DosKRNLInitialize(); + + if (!Success) goto Quit32; + + /* Write the "bootsector" */ + RtlCopyMemory(SEG_OFF_TO_PTR(0x0070, 0x0000), Startup, sizeof(Startup)); + + /* Register the DOS Starting BOP */ + RegisterBop(BOP_START_DOS, DosStart); + + /* Position execution pointers and return */ + setCS(0x0070); + setIP(0x0000); + + /* Return control */ +Quit32: + if (!Success) + DisplayMessage(L"DOS32 loading failed, what to do??"); + } + + if (Success) + { + /* + * We succeeded, deregister the DOS Loading BOP + * so that no app will be able to call us back. + */ + RegisterBop(BOP_LOAD_DOS, NULL); + } +} + +static VOID WINAPI DosStart(LPWORD Stack) +{ +#ifdef STANDALONE + DWORD Result; + CHAR ApplicationName[MAX_PATH]; + CHAR CommandLine[DOS_CMDLINE_LENGTH]; +#endif + + DPRINT1("DosStart\n"); + + /* + * We succeeded, deregister the DOS Starting BOP + * so that no app will be able to call us back. + */ + RegisterBop(BOP_START_DOS, NULL); + + /* Load the mouse driver */ + DosMouseInitialize(); + +#ifndef STANDALONE + + /* Create the GetNextVDMCommand thread */ + CommandThread = CreateThread(NULL, 0, &CommandThreadProc, NULL, 0, NULL); + if (CommandThread == NULL) + { + wprintf(L"FATAL: Failed to create the command processing thread: %d\n", GetLastError()); + goto Quit; + } + + /* Wait for the command thread to exit */ + WaitForSingleObject(CommandThread, INFINITE); + + /* Close the thread handle */ + CloseHandle(CommandThread); + +#else + + if (NtVdmArgc >= 2) + { + WideCharToMultiByte(CP_ACP, 0, NtVdmArgv[1], -1, ApplicationName, sizeof(ApplicationName), NULL, NULL); + + if (NtVdmArgc >= 3) + WideCharToMultiByte(CP_ACP, 0, NtVdmArgv[2], -1, CommandLine, sizeof(CommandLine), NULL, NULL); + else + strcpy(CommandLine, ""); + } + else + { + DisplayMessage(L"Invalid DOS command line\n"); + goto Quit; + } + + /* Start the process from the command line */ + DPRINT1("Starting '%s' ('%s')...\n", ApplicationName, CommandLine); + Result = DosStartProcess(ApplicationName, + CommandLine, + GetEnvironmentStrings()); + if (Result != ERROR_SUCCESS) + { + DisplayMessage(L"Could not start '%S'. Error: %u", ApplicationName, Result); + goto Quit; + } + +#endif + +Quit: + /* Stop the VDM */ + EmulatorTerminate(); +} + + /* PUBLIC EXPORTED APIS *******************************************************/ Modified: trunk/reactos/subsystems/ntvdm/dos/dem.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/dos/dem.h… ============================================================================== --- trunk/reactos/subsystems/ntvdm/dos/dem.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/dos/dem.h [iso-8859-1] Sat Oct 4 13:36:17 2014 @@ -19,8 +19,6 @@ #include "dos32krnl/dos.h" /* FUNCTIONS ******************************************************************/ - -BOOLEAN DosInitialize(IN LPCSTR DosKernelFileNames); DWORD WINAPI Modified: trunk/reactos/subsystems/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/ntvdm.c?r… ============================================================================== --- trunk/reactos/subsystems/ntvdm/ntvdm.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/ntvdm.c [iso-8859-1] Sat Oct 4 13:36:17 2014 @@ -12,6 +12,7 @@ #include "ntvdm.h" #include "emulator.h" +#include "cpu/cpu.h" #include "clock.h" #include "hardware/ps2.h" @@ -26,18 +27,24 @@ static HANDLE ConsoleInput = INVALID_HANDLE_VALUE; static HANDLE ConsoleOutput = INVALID_HANDLE_VALUE; static DWORD OrgConsoleInputMode, OrgConsoleOutputMode; -static BOOLEAN AcceptCommands = TRUE; -static HANDLE CommandThread = NULL; + +// For DOS +#ifndef STANDALONE +BOOLEAN AcceptCommands = TRUE; +HANDLE CommandThread = NULL; +ULONG SessionId = 0; +#endif + +HANDLE VdmTaskEvent = NULL; + +// Command line of NTVDM +INT NtVdmArgc; +WCHAR** NtVdmArgv; + static HMENU hConsoleMenu = NULL; static INT VdmMenuPos = -1; static BOOLEAN ShowPointer = FALSE; - -#ifndef STANDALONE -ULONG SessionId = 0; -#endif - -HANDLE VdmTaskEvent = NULL; /* * Those menu helpers were taken from the GUI frontend in winsrv.dll @@ -198,6 +205,7 @@ case CTRL_BREAK_EVENT: { /* Call INT 23h */ + DPRINT1("Ctrl-C/Break: Call INT 23h\n"); EmulatorInterrupt(0x23); break; } @@ -206,14 +214,18 @@ if (WaitForSingleObject(VdmTaskEvent, 0) == WAIT_TIMEOUT) { /* Exit immediately */ +#ifndef STANDALONE if (CommandThread) TerminateThread(CommandThread, 0); +#endif EmulatorTerminate(); } +#ifndef STANDALONE else { /* Stop accepting new commands */ AcceptCommands = FALSE; } +#endif break; } @@ -361,100 +373,12 @@ DPRINT1("Focus events not handled\n"); } -#ifndef STANDALONE -static DWORD -WINAPI -CommandThreadProc(LPVOID Parameter) -{ - BOOLEAN First = TRUE; - DWORD Result; - VDM_COMMAND_INFO CommandInfo; - CHAR CmdLine[MAX_PATH]; - CHAR AppName[MAX_PATH]; - CHAR PifFile[MAX_PATH]; - CHAR Desktop[MAX_PATH]; - CHAR Title[MAX_PATH]; - ULONG EnvSize = 256; - PVOID Env = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, EnvSize); - - UNREFERENCED_PARAMETER(Parameter); - ASSERT(Env != NULL); - - do - { - /* Clear the structure */ - ZeroMemory(&CommandInfo, sizeof(CommandInfo)); - - /* Initialize the structure members */ - CommandInfo.TaskId = SessionId; - CommandInfo.VDMState = VDM_FLAG_DOS; - CommandInfo.CmdLine = CmdLine; - CommandInfo.CmdLen = sizeof(CmdLine); - CommandInfo.AppName = AppName; - CommandInfo.AppLen = sizeof(AppName); - CommandInfo.PifFile = PifFile; - CommandInfo.PifLen = sizeof(PifFile); - CommandInfo.Desktop = Desktop; - CommandInfo.DesktopLen = sizeof(Desktop); - CommandInfo.Title = Title; - CommandInfo.TitleLen = sizeof(Title); - CommandInfo.Env = Env; - CommandInfo.EnvLen = EnvSize; - - if (First) CommandInfo.VDMState |= VDM_FLAG_FIRST_TASK; - -Command: - if (!GetNextVDMCommand(&CommandInfo)) - { - if (CommandInfo.EnvLen > EnvSize) - { - /* Expand the environment size */ - EnvSize = CommandInfo.EnvLen; - Env = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, Env, EnvSize); - - /* Repeat the request */ - goto Command; - } - - break; - } - - /* Start the process from the command line */ - DPRINT1("Starting '%s' ('%s')...\n", AppName, CmdLine); - Result = DosStartProcess(AppName, CmdLine, Env); - if (Result != ERROR_SUCCESS) - { - DisplayMessage(L"Could not start '%S'. Error: %u", AppName, Result); - // break; - continue; - } - - First = FALSE; - } - while (AcceptCommands); - - HeapFree(GetProcessHeap(), 0, Env); - return 0; -} -#endif - INT wmain(INT argc, WCHAR *argv[]) { #ifdef STANDALONE - DWORD Result; - CHAR ApplicationName[MAX_PATH]; - CHAR CommandLine[DOS_CMDLINE_LENGTH]; - - if (argc >= 2) - { - WideCharToMultiByte(CP_ACP, 0, argv[1], -1, ApplicationName, sizeof(ApplicationName), NULL, NULL); - - if (argc >= 3) WideCharToMultiByte(CP_ACP, 0, argv[2], -1, CommandLine, sizeof(CommandLine), NULL, NULL); - else strcpy(CommandLine, ""); - } - else + if (argc < 2) { wprintf(L"\nReactOS Virtual DOS Machine\n\n" L"Usage: NTVDM <executable> [<parameters>]\n"); @@ -481,6 +405,9 @@ #endif + NtVdmArgc = argc; + NtVdmArgv = argv; + DPRINT1("\n\n\nNTVDM - Starting...\n\n\n"); /* Create the task event */ @@ -508,43 +435,8 @@ goto Cleanup; } - /* Initialize the VDM DOS kernel */ - if (!DosInitialize(NULL)) - { - wprintf(L"FATAL: Failed to initialize the VDM DOS kernel.\n"); - goto Cleanup; - } - -#ifndef STANDALONE - - /* Create the GetNextVDMCommand thread */ - CommandThread = CreateThread(NULL, 0, &CommandThreadProc, NULL, 0, NULL); - if (CommandThread == NULL) - { - wprintf(L"FATAL: Failed to create the command processing thread: %d\n", GetLastError()); - goto Cleanup; - } - - /* Wait for the command thread to exit */ - WaitForSingleObject(CommandThread, INFINITE); - - /* Close the thread handle */ - CloseHandle(CommandThread); - -#else - - /* Start the process from the command line */ - DPRINT1("Starting '%s' ('%s')...\n", ApplicationName, CommandLine); - Result = DosStartProcess(ApplicationName, - CommandLine, - GetEnvironmentStrings()); - if (Result != ERROR_SUCCESS) - { - DisplayMessage(L"Could not start '%S'. Error: %u", ApplicationName, Result); - goto Cleanup; - } - -#endif + /* Let's go! Start simulation */ + CpuSimulate(); Cleanup: BiosCleanup(); Modified: trunk/reactos/subsystems/ntvdm/ntvdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/ntvdm.h?r… ============================================================================== --- trunk/reactos/subsystems/ntvdm/ntvdm.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/ntvdm.h [iso-8859-1] Sat Oct 4 13:36:17 2014 @@ -41,10 +41,17 @@ /* FUNCTIONS ******************************************************************/ #ifndef STANDALONE +extern BOOLEAN AcceptCommands; +extern HANDLE CommandThread; extern ULONG SessionId; #endif extern HANDLE VdmTaskEvent; + +// Command line of NTVDM +extern INT NtVdmArgc; +extern WCHAR** NtVdmArgv; + /* * Interface functions

1 0

[spetreolle] 64520: [EVENTVWR] -Fix use of unitialized handle for the waiting dialog. -Allocate the size of one event for each event, not the amount of all events.
by spetreolle＠svn.reactos.org 04 Oct '14

04 Oct '14

Author: spetreolle Date: Sat Oct 4 13:34:19 2014 New Revision: 64520 URL: http://svn.reactos.org/svn/reactos?rev=64520&view=rev Log: [EVENTVWR] -Fix use of unitialized handle for the waiting dialog. -Allocate the size of one event for each event, not the amount of all events. Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] Sat Oct 4 13:34:19 2014 @@ -520,7 +520,7 @@ QueryEventMessages(LPWSTR lpMachineName, LPWSTR lpLogName) { - HWND hwndDlg; + HWND hwndDlg=0; HANDLE hEventLog; EVENTLOGRECORD *pevlr; DWORD dwRead, dwNeeded, dwThisRecord, dwTotalRecords = 0, dwCurrentRecord = 0, dwRecordsToRead = 0, dwFlags, dwMaxLength; @@ -599,7 +599,7 @@ while (dwCurrentRecord < dwTotalRecords) { - pevlr = HeapAlloc(GetProcessHeap(), 0, sizeof(EVENTLOGRECORD) * dwTotalRecords); + pevlr = HeapAlloc(GetProcessHeap(), 0, sizeof(EVENTLOGRECORD)); g_RecordPtrs[dwCurrentRecord] = pevlr; bResult = ReadEventLog(hEventLog, // Event log handle @@ -713,7 +713,8 @@ } // All events loaded - EndDialog(hwndDlg, 0); + if(hwndDlg) + EndDialog(hwndDlg, 0); StringCchPrintfExW(szWindowTitle, sizeof(szWindowTitle) / sizeof(WCHAR),

1 0

[tfaber] 64519: [CRT] - Add __fastfail intrinsic implementation for GCC and MSVC <= 2010. Patch by Timo Kreuzer. CORE-8419
by tfaber＠svn.reactos.org 04 Oct '14

04 Oct '14

Author: tfaber Date: Sat Oct 4 12:03:37 2014 New Revision: 64519 URL: http://svn.reactos.org/svn/reactos?rev=64519&view=rev Log: [CRT] - Add __fastfail intrinsic implementation for GCC and MSVC <= 2010. Patch by Timo Kreuzer. CORE-8419 Modified: trunk/reactos/include/crt/mingw32/intrin_x86.h trunk/reactos/include/crt/msc/intrin.h Modified: trunk/reactos/include/crt/mingw32/intrin_x86.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/mingw32/intrin… ============================================================================== --- trunk/reactos/include/crt/mingw32/intrin_x86.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/mingw32/intrin_x86.h [iso-8859-1] Sat Oct 4 12:03:37 2014 @@ -1504,6 +1504,7 @@ __INTRIN_INLINE void _disable(void); __INTRIN_INLINE void _enable(void); __INTRIN_INLINE void __halt(void); +__declspec(noreturn) __INTRIN_INLINE void __fastfail(unsigned int Code); #ifdef __clang__ #define __debugbreak() __asm__("int $3") @@ -1532,7 +1533,13 @@ __INTRIN_INLINE void __halt(void) { - __asm__("hlt\n\t" : : : "memory"); + __asm__("hlt" : : : "memory"); +} + +__declspec(noreturn) +__INTRIN_INLINE void __fastfail(unsigned int Code) +{ + __asm__("int $0x29" : : "c"(Code) : "memory"); } /*** Protected memory management ***/ Modified: trunk/reactos/include/crt/msc/intrin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/msc/intrin.h?r… ============================================================================== --- trunk/reactos/include/crt/msc/intrin.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/msc/intrin.h [iso-8859-1] Sat Oct 4 12:03:37 2014 @@ -587,6 +587,16 @@ #if (_MSC_VER >= 1700) __declspec(noreturn) void __fastfail(unsigned int Code); #pragma intrinsic(__fastfail) +#else +__declspec(noreturn) __forceinline +void __fastfail(unsigned int Code) +{ + __asm + { + mov ecx, Code + int 29h + } +} #endif #endif #if defined(_M_ARM)

1 0

[tfaber] 64518: [NTOS:FORMATTING] - Remove some trailing whitespace
by tfaber＠svn.reactos.org 04 Oct '14

04 Oct '14

Author: tfaber Date: Sat Oct 4 08:43:15 2014 New Revision: 64518 URL: http://svn.reactos.org/svn/reactos?rev=64518&view=rev Log: [NTOS:FORMATTING] - Remove some trailing whitespace Modified: trunk/reactos/ntoskrnl/ke/i386/context.c trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S trunk/reactos/ntoskrnl/ke/i386/irqobj.c trunk/reactos/ntoskrnl/ke/i386/traphdlr.c Modified: trunk/reactos/ntoskrnl/ke/i386/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/context.c… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/context.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/context.c [iso-8859-1] Sat Oct 4 08:43:15 2014 @@ -24,7 +24,7 @@ PKIPCR Pcr = (PKIPCR)KeGetPcr(); #ifdef CONFIG_SMP LONG SetMember; - + /* Update active processor mask */ SetMember = (LONG)Pcr->SetMember; InterlockedXor((PLONG)&NewProcess->ActiveProcessors, SetMember); @@ -38,13 +38,13 @@ UNIMPLEMENTED_DBGBREAK(); return; } - + /* Update CR3 */ __writecr3(NewProcess->DirectoryTableBase[0]); - + /* Clear GS */ Ke386SetGs(0); - + /* Update IOPM offset */ Pcr->TSS->IoMapBase = NewProcess->IopmOffset; } Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/ctxswitch… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S [iso-8859-1] Sat Oct 4 08:43:15 2014 @@ -3,7 +3,7 @@ * PROJECT: ReactOS kernel * FILE: ntoskrnl/ke/i386/ctxswitch.S * PURPOSE: Thread Context Switching - * + * * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) * Gregor Anich (FPU Code) */ @@ -63,7 +63,7 @@ /* Load the new kernel stack and switch OS to new thread */ mov esp, edx call @KiSwapContextExit@8 - + /* Now we're on the new thread. Return to the caller to restore registers */ add esp, 2 * 4 ret Modified: trunk/reactos/ntoskrnl/ke/i386/irqobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/irqobj.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/irqobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/irqobj.c [iso-8859-1] Sat Oct 4 08:43:15 2014 @@ -143,7 +143,7 @@ _disable(); HalEndSystemInterrupt(OldIrql, TrapFrame); } - + /* Now exit the trap */ KiEoiHelper(TrapFrame); } @@ -154,25 +154,25 @@ /* Crash the machine */ KeBugCheck(TRAP_CAUSE_UNKNOWN); } - + VOID FASTCALL KiUnexpectedInterruptTailHandler(IN PKTRAP_FRAME TrapFrame) { KIRQL OldIrql; - + /* Enter trap */ KiEnterInterruptTrap(TrapFrame); - + /* Increase interrupt count */ KeGetCurrentPrcb()->InterruptCount++; - + /* Start the interrupt */ if (HalBeginSystemInterrupt(HIGH_LEVEL, TrapFrame->ErrCode, &OldIrql)) { /* Warn user */ DPRINT1("\n\x7\x7!!! Unexpected Interrupt 0x%02lx !!!\n", TrapFrame->ErrCode); - + /* Now call the epilogue code */ KiExitInterrupt(TrapFrame, OldIrql, FALSE); } @@ -194,12 +194,12 @@ FASTCALL KiInterruptDispatch(IN PKTRAP_FRAME TrapFrame, IN PKINTERRUPT Interrupt) -{ +{ KIRQL OldIrql; /* Increase interrupt count */ KeGetCurrentPrcb()->InterruptCount++; - + /* Begin the interrupt, making sure it's not spurious */ if (HalBeginSystemInterrupt(Interrupt->SynchronizeIrql, Interrupt->Vector, @@ -207,13 +207,13 @@ { /* Acquire interrupt lock */ KxAcquireSpinLock(Interrupt->ActualLock); - + /* Call the ISR */ Interrupt->ServiceRoutine(Interrupt, Interrupt->ServiceContext); - + /* Release interrupt lock */ KxReleaseSpinLock(Interrupt->ActualLock); - + /* Now call the epilogue code */ KiExitInterrupt(TrapFrame, OldIrql, FALSE); } @@ -252,7 +252,7 @@ /* Raise to higher IRQL */ OldInterruptIrql = KfRaiseIrql(Interrupt->SynchronizeIrql); } - + /* Acquire interrupt lock */ KxAcquireSpinLock(Interrupt->ActualLock); @@ -262,7 +262,7 @@ /* Release interrupt lock */ KxReleaseSpinLock(Interrupt->ActualLock); - + /* Check if this interrupt's IRQL is higher than the current one */ if (Interrupt->SynchronizeIrql > Interrupt->Irql) { @@ -270,23 +270,23 @@ ASSERT(OldInterruptIrql == Interrupt->Irql); KfLowerIrql(OldInterruptIrql); } - + /* Check if the interrupt got handled and it's level */ if ((Handled) && (Interrupt->Mode == LevelSensitive)) break; - + /* What's next? */ NextEntry = NextEntry->Flink; - + /* Is this the last one? */ if (NextEntry == ListHead) { /* Level should not have gotten here */ if (Interrupt->Mode == LevelSensitive) break; - + /* As for edge, we can only exit once nobody can handle the interrupt */ if (!Handled) break; } - + /* Get the interrupt object for the next pass */ Interrupt = CONTAINING_RECORD(NextEntry, KINTERRUPT, InterruptListEntry); } @@ -575,22 +575,22 @@ { BOOLEAN Success; KIRQL OldIrql; - + /* Raise IRQL */ OldIrql = KfRaiseIrql(Interrupt->SynchronizeIrql); - + /* Acquire interrupt spinlock */ KeAcquireSpinLockAtDpcLevel(Interrupt->ActualLock); - + /* Call the routine */ Success = SynchronizeRoutine(SynchronizeContext); - + /* Release lock */ KeReleaseSpinLockFromDpcLevel(Interrupt->ActualLock); - + /* Lower IRQL */ KfLowerIrql(OldIrql); - + /* Return status */ return Success; } Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/traphdlr.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Sat Oct 4 08:43:15 2014 @@ -147,13 +147,13 @@ { ASSERT((TrapFrame->EFlags & EFLAGS_V86_MASK) == 0); ASSERT(!KiIsFrameEdited(TrapFrame)); - + /* Copy the status into EAX */ TrapFrame->Eax = Status; - + /* Common trap exit code */ KiCommonExit(TrapFrame, FALSE); - + /* Restore previous mode */ KeGetCurrentThread()->PreviousMode = (CCHAR)TrapFrame->PreviousPreviousMode; @@ -184,10 +184,10 @@ { /* Common trap exit code */ KiCommonExit(TrapFrame, FALSE); - + /* Restore previous mode */ KeGetCurrentThread()->PreviousMode = (CCHAR)TrapFrame->PreviousPreviousMode; - + /* Check if this was a V8086 trap */ if (TrapFrame->EFlags & EFLAGS_V86_MASK) KiTrapReturnNoSegments(TrapFrame); @@ -282,14 +282,14 @@ /* Clear the TS bit and re-enable interrupts */ SaveArea->Cr0NpxState &= ~CR0_TS; _enable(); - + /* Check if we should get the FN or FX error */ if (KeI386FxsrPresent) { /* Get it from FX */ Mask = SaveArea->U.FxArea.ControlWord; Error = SaveArea->U.FxArea.StatusWord; - + /* Get the FPU exception address too */ ErrorOffset = SaveArea->U.FxArea.ErrorOffset; DataOffset = SaveArea->U.FxArea.DataOffset; @@ -299,7 +299,7 @@ /* Get it from FN */ Mask = SaveArea->U.FnArea.ControlWord; Error = SaveArea->U.FnArea.StatusWord; - + /* Get the FPU exception address too */ ErrorOffset = SaveArea->U.FnArea.ErrorOffset; DataOffset = SaveArea->U.FnArea.DataOffset; @@ -338,7 +338,7 @@ 0, TrapFrame); } - + /* Check for divide by zero */ if (Error & FSW_ZERO_DIVIDE) { @@ -348,7 +348,7 @@ 0, TrapFrame); } - + /* Check for denormal */ if (Error & FSW_DENORMAL) { @@ -358,7 +358,7 @@ 0, TrapFrame); } - + /* Check for overflow */ if (Error & FSW_OVERFLOW) { @@ -368,7 +368,7 @@ 0, TrapFrame); } - + /* Check for underflow */ if (Error & FSW_UNDERFLOW) { @@ -388,7 +388,7 @@ 0, TrapFrame); } - + /* Unknown FPU fault */ KeBugCheckWithTf(TRAP_CAUSE_UNKNOWN, 1, Error, 0, 0, TrapFrame); } @@ -400,13 +400,13 @@ { /* Save trap frame */ KiEnterTrap(TrapFrame); - + /* Check for VDM trap */ ASSERT((KiVdmTrap(TrapFrame)) == FALSE); /* Enable interrupts */ _enable(); - + /* Dispatch the exception */ KiDispatchException0Args(STATUS_INTEGER_DIVIDE_BY_ZERO, TrapFrame->Eip, @@ -458,7 +458,7 @@ PKGDTENTRY TssGdt; KTRAP_FRAME TrapFrame; KIRQL OldIrql; - + // // In some sort of strange recursion case, we might end up here with the IF // flag incorrectly on the interrupt frame -- during a normal NMI this would @@ -475,14 +475,14 @@ Tss = PCR->TSS; Thread = ((PKIPCR)PCR)->PrcbData.CurrentThread; Process = Thread->ApcState.Process; - + // // Save data usually not in the TSS // Tss->CR3 = Process->DirectoryTableBase[0]; Tss->IoMapBase = Process->IopmOffset; Tss->LDT = Process->LdtDescriptor.LimitLow ? KGDT_LDT : 0; - + // // Now get the base address of the NMI TSS // @@ -490,7 +490,7 @@ NmiTss = (PKTSS)(ULONG_PTR)(TssGdt->BaseLow | TssGdt->HighWord.Bytes.BaseMid << 16 | TssGdt->HighWord.Bytes.BaseHi << 24); - + // // Switch to it and activate it, masking off the nested flag // @@ -502,7 +502,7 @@ TssGdt->HighWord.Bits.Dpl = 0; TssGdt->HighWord.Bits.Pres = 1; TssGdt->HighWord.Bits.Type = I386_TSS; - + // // Now build the trap frame based on the original TSS // @@ -532,12 +532,12 @@ TrapFrame.SegGs = Tss->Gs; TrapFrame.DbgEip = Tss->Eip; TrapFrame.DbgEbp = Tss->Ebp; - + // // Store the trap frame in the KPRCB // KiSaveProcessorState(&TrapFrame, NULL); - + // // Call any registered NMI handlers and see if they handled it or not // @@ -569,25 +569,25 @@ // Restore original TSS // PCR->TSS = Tss; - + // // Set it back to busy // TssGdt->HighWord.Bits.Dpl = 0; TssGdt->HighWord.Bits.Pres = 1; TssGdt->HighWord.Bits.Type = I386_ACTIVE_TSS; - + // // Restore nested flag // __writeeflags(__readeflags() | EFLAGS_NESTED_TASK); - + // // Handled, return from interrupt // KiIret(); } - + // // Unhandled: crash the system // @@ -601,7 +601,7 @@ { /* Save trap frame */ KiEnterTrap(TrapFrame); - + /* Continue with the common handler */ KiDebugHandler(TrapFrame, BREAKPOINT_BREAK, 0, 0); } @@ -613,13 +613,13 @@ { /* Save trap frame */ KiEnterTrap(TrapFrame); - + /* Check for VDM trap */ ASSERT((KiVdmTrap(TrapFrame)) == FALSE); /* Enable interrupts */ _enable(); - + /* Dispatch the exception */ KiDispatchException0Args(STATUS_INTEGER_OVERFLOW, TrapFrame->Eip - 1, @@ -633,16 +633,16 @@ { /* Save trap frame */ KiEnterTrap(TrapFrame); - + /* Check for VDM trap */ ASSERT((KiVdmTrap(TrapFrame)) == FALSE); - + /* Check for kernel-mode fault */ if (!KiUserTrap(TrapFrame)) KiSystemFatalException(EXCEPTION_BOUND_CHECK, TrapFrame); /* Enable interrupts */ _enable(); - + /* Dispatch the exception */ KiDispatchException0Args(STATUS_ARRAY_BOUNDS_EXCEEDED, TrapFrame->Eip, @@ -657,56 +657,56 @@ PUCHAR Instruction; ULONG i; KIRQL OldIrql; - + /* Check for V86 GPF */ if (__builtin_expect(KiV86Trap(TrapFrame), 1)) { /* Enter V86 trap */ KiEnterV86Trap(TrapFrame); - + /* Must be a VDM process */ if (__builtin_expect(!PsGetCurrentProcess()->VdmObjects, 0)) { /* Enable interrupts */ _enable(); - + /* Setup illegal instruction fault */ KiDispatchException0Args(STATUS_ILLEGAL_INSTRUCTION, TrapFrame->Eip, TrapFrame); } - + /* Go to APC level */ OldIrql = KfRaiseIrql(APC_LEVEL); _enable(); - + /* Check for BOP */ if (!VdmDispatchBop(TrapFrame)) { /* Should only happen in VDM mode */ UNIMPLEMENTED_FATAL(); } - + /* Bring IRQL back */ KfLowerIrql(OldIrql); _disable(); - + /* Do a quick V86 exit if possible */ KiExitV86Trap(TrapFrame); } /* Save trap frame */ KiEnterTrap(TrapFrame); - + /* Enable interrupts */ Instruction = (PUCHAR)TrapFrame->Eip; _enable(); - + /* Check for user trap */ if (KiUserTrap(TrapFrame)) { /* FIXME: Use SEH */ - + /* Scan next 4 opcodes */ for (i = 0; i < 4; i++) { @@ -719,15 +719,15 @@ TrapFrame); } } - + /* FIXME: SEH ends here */ } - + /* Kernel-mode or user-mode fault (but not LOCK) */ KiDispatchException0Args(STATUS_ILLEGAL_INSTRUCTION, TrapFrame->Eip, TrapFrame); - + } DECLSPEC_NORETURN @@ -738,7 +738,7 @@ PKTHREAD Thread, NpxThread; PFX_SAVE_AREA SaveArea, NpxSaveArea; ULONG Cr0; - + /* Save trap frame */ KiEnterTrap(TrapFrame); @@ -757,7 +757,7 @@ /* Not implemented */ UNIMPLEMENTED_FATAL(); } - + /* Save CR0 and check NPX state */ Cr0 = __readcr0(); if (Thread->NpxState != NPX_STATE_LOADED) @@ -765,14 +765,14 @@ /* Update CR0 */ Cr0 &= ~(CR0_MP | CR0_EM | CR0_TS); __writecr0(Cr0); - + /* Get the NPX thread */ NpxThread = KeGetCurrentPrcb()->NpxThread; if (NpxThread) { /* Get the NPX frame */ NpxSaveArea = KiGetThreadNpxArea(NpxThread); - + /* Save FPU state */ DPRINT("FIXME: Save FPU state: %p\n", NpxSaveArea); //Ke386SaveFpuState(NpxSaveArea); @@ -780,32 +780,32 @@ /* Update NPX state */ NpxThread->NpxState = NPX_STATE_NOT_LOADED; } - + /* Load FPU state */ //Ke386LoadFpuState(SaveArea); - + /* Update NPX state */ Thread->NpxState = NPX_STATE_LOADED; KeGetCurrentPrcb()->NpxThread = Thread; - + /* Enable interrupts */ _enable(); - + /* Check if CR0 needs to be reloaded due to context switch */ if (!SaveArea->Cr0NpxState) KiEoiHelper(TrapFrame); - + /* Otherwise, we need to reload CR0, disable interrupts */ _disable(); - + /* Reload CR0 */ Cr0 = __readcr0(); Cr0 |= SaveArea->Cr0NpxState; __writecr0(Cr0); - + /* Now restore interrupts and check for TS */ _enable(); if (Cr0 & CR0_TS) KiEoiHelper(TrapFrame); - + /* We're still here -- clear TS and try again */ __writecr0(__readcr0() &~ CR0_TS); _disable(); @@ -816,7 +816,7 @@ break; } } - + /* TS should not be set */ if (Cr0 & CR0_TS) { @@ -831,11 +831,11 @@ __writecr0(__readcr0() &~ CR0_TS); KiEoiHelper(TrapFrame); } - + /* Otherwise, something strange is going on */ KeBugCheckWithTf(TRAP_CAUSE_UNKNOWN, 2, Cr0, 0, 0, TrapFrame); } - + /* It's not a delayed load, so process this trap as an NPX fault */ KiNpxHandler(TrapFrame, Thread, SaveArea); } @@ -913,44 +913,44 @@ PUCHAR Instructions; UCHAR Instruction = 0; KIRQL OldIrql; - + /* Check for V86 GPF */ if (__builtin_expect(KiV86Trap(TrapFrame), 1)) { /* Enter V86 trap */ KiEnterV86Trap(TrapFrame); - + /* Must be a VDM process */ if (__builtin_expect(!PsGetCurrentProcess()->VdmObjects, 0)) { /* Enable interrupts */ _enable(); - + /* Setup illegal instruction fault */ KiDispatchException0Args(STATUS_ILLEGAL_INSTRUCTION, TrapFrame->Eip, TrapFrame); } - + /* Go to APC level */ OldIrql = KfRaiseIrql(APC_LEVEL); _enable(); - + /* Handle the V86 opcode */ if (__builtin_expect(Ki386HandleOpcodeV86(TrapFrame) == 0xFF, 0)) { /* Should only happen in VDM mode */ UNIMPLEMENTED_FATAL(); } - + /* Bring IRQL back */ KfLowerIrql(OldIrql); _disable(); - + /* Do a quick V86 exit if possible */ KiExitV86Trap(TrapFrame); } - + /* Save trap frame */ KiEnterTrap(TrapFrame); @@ -959,14 +959,14 @@ { /* Should not be VDM */ ASSERT(KiVdmTrap(TrapFrame) == FALSE); - + /* Enable interrupts and check error code */ _enable(); if (!TrapFrame->ErrCode) { /* FIXME: Use SEH */ Instructions = (PUCHAR)TrapFrame->Eip; - + /* Scan next 15 bytes */ for (i = 0; i < 15; i++) { @@ -980,7 +980,7 @@ break; } } - + /* Is this NOT any prefix instruction? */ if (j == sizeof(KiTrapPrefixTable)) { @@ -989,7 +989,7 @@ break; } } - + /* If all we found was prefixes, then this instruction is too long */ if (i == 15) { @@ -998,7 +998,7 @@ TrapFrame->Eip, TrapFrame); } - + /* Check for privileged instructions */ DPRINT("Instruction (%lu) at fault: %lx %lx %lx %lx\n", i, @@ -1065,7 +1065,7 @@ } } } - + /* So now... was the instruction privileged or not? */ if (Privileged) { @@ -1075,7 +1075,7 @@ TrapFrame); } } - + /* If we got here, send an access violation */ KiDispatchException2Args(STATUS_ACCESS_VIOLATION, TrapFrame->Eip, @@ -1123,7 +1123,7 @@ * when the user is purposedly trying to create one from kernel-mode, so * we should probably table this for now since it's not a "real" issue. */ - + /* * NOTE2: Another scenario is the IRET during a V8086 restore (BIOS Call) * which will cause a GPF since the trap frame is a total mess (on purpose) @@ -1153,7 +1153,7 @@ UNIMPLEMENTED_FATAL(); } } - + /* So since we're not dealing with the above case, check for RDMSR/WRMSR */ if ((Instructions[0] == 0xF) && // 2-byte opcode ((Instructions[1] == 0x32) || // RDMSR @@ -1181,7 +1181,7 @@ /* Whatever it is, we can't handle it */ KiSystemFatalException(EXCEPTION_GP_FAULT, TrapFrame); } - + /* Return to where we came from */ KiTrapReturn(TrapFrame); } @@ -1287,7 +1287,7 @@ #endif /* Check for VDM trap */ ASSERT((KiVdmTrap(TrapFrame)) == FALSE); - + /* Either kernel or user trap (non VDM) so dispatch exception */ if (Status == STATUS_ACCESS_VIOLATION) { @@ -1308,7 +1308,7 @@ Cr2, TrapFrame); } - + /* Only other choice is an in-page error, with 3 parameters */ KiDispatchExceptionFromTrapFrame(STATUS_IN_PAGE_ERROR, TrapFrame->Eip, @@ -1339,7 +1339,7 @@ { PKTHREAD Thread; PFX_SAVE_AREA SaveArea; - + /* Save trap frame */ KiEnterTrap(TrapFrame); @@ -1351,11 +1351,11 @@ /* It isn't, enable interrupts and set delayed error */ _enable(); SaveArea->Cr0NpxState |= CR0_TS; - + /* End trap */ KiEoiHelper(TrapFrame); } - + /* Otherwise, proceed with NPX fault handling */ KiNpxHandler(TrapFrame, Thread, SaveArea); } @@ -1381,7 +1381,7 @@ PKTHREAD Thread; PFX_SAVE_AREA SaveArea; ULONG Cr0, MxCsrMask, Error; - + /* Save trap frame */ KiEnterTrap(TrapFrame); @@ -1405,31 +1405,31 @@ /* Kernel should not fault on XMMI */ KeBugCheckWithTf(TRAP_CAUSE_UNKNOWN, 13, 0, 0, 2, TrapFrame); } - + /* Update CR0 */ Cr0 = __readcr0(); Cr0 &= ~(CR0_MP | CR0_EM | CR0_TS); __writecr0(Cr0); - + /* Save FPU state */ Ke386SaveFpuState(SaveArea); - + /* Mark CR0 state dirty */ Cr0 |= NPX_STATE_NOT_LOADED; Cr0 |= SaveArea->Cr0NpxState; __writecr0(Cr0); - + /* Update NPX state */ Thread->NpxState = NPX_STATE_NOT_LOADED; KeGetCurrentPrcb()->NpxThread = NULL; - + /* Clear the TS bit and re-enable interrupts */ SaveArea->Cr0NpxState &= ~CR0_TS; _enable(); /* Now look at MxCsr to get the mask of errors we should care about */ MxCsrMask = ~((USHORT)SaveArea->U.FxArea.MXCsr >> 7); - + /* Get legal exceptions that software should handle */ Error = (USHORT)SaveArea->U.FxArea.MXCsr & (FSW_INVALID_OPERATION | FSW_DENORMAL | @@ -1453,7 +1453,7 @@ 0, TrapFrame); } - + /* Unknown XMMI fault */ KeBugCheckWithTf(TRAP_CAUSE_UNKNOWN, 13, 0, 0, 1, TrapFrame); } @@ -1507,10 +1507,10 @@ { /* Save trap frame */ KiEnterTrap(TrapFrame); - + /* Increment EIP to skip the INT3 instruction */ TrapFrame->Eip++; - + /* Continue with the common handler */ KiDebugHandler(TrapFrame, TrapFrame->Eax, TrapFrame->Ecx, TrapFrame->Edx); } @@ -1548,7 +1548,7 @@ ULONG Id, Offset, StackBytes, Result; PVOID Handler; ULONG SystemCallNumber = TrapFrame->Eax; - + /* Get the current thread */ Thread = KeGetCurrentThread(); @@ -1629,43 +1629,43 @@ goto ExitCall; } } - + /* Check if this is a GUI call */ if (__builtin_expect(Offset & SERVICE_TABLE_TEST, 0)) { /* Get the batch count and flush if necessary */ if (NtCurrentTeb()->GdiBatchCount) KeGdiFlushUserBatch(); } - + /* Increase system call count */ KeGetCurrentPrcb()->KeSystemCalls++; - + /* FIXME: Increase individual counts on debug systems */ //KiIncreaseSystemCallCount(DescriptorTable, Id); - + /* Get stack bytes */ StackBytes = DescriptorTable->Number[Id]; - + /* Probe caller stack */ if (__builtin_expect((Arguments < (PVOID)MmUserProbeAddress) && !(KiUserTrap(TrapFrame)), 0)) { /* Access violation */ UNIMPLEMENTED_FATAL(); } - + /* Call pre-service debug hook */ KiDbgPreServiceHook(SystemCallNumber, Arguments); /* Get the handler and make the system call */ Handler = (PVOID)DescriptorTable->Base[Id]; Result = KiSystemCallTrampoline(Handler, Arguments, StackBytes); - + /* Call post-service debug hook */ Result = KiDbgPostServiceHook(SystemCallNumber, Result); /* Make sure we're exiting correctly */ KiExitSystemCallDebugChecks(Id, TrapFrame); - + /* Restore the old trap frame */ ExitCall: Thread->TrapFrame = (PKTRAP_FRAME)TrapFrame->Edx;

1 0

[hbelusca] 64517: [NTVDM]: DPRINT the CPU level for diagnostics purposes.
by hbelusca＠svn.reactos.org 04 Oct '14

04 Oct '14

Author: hbelusca Date: Sat Oct 4 00:18:39 2014 New Revision: 64517 URL: http://svn.reactos.org/svn/reactos?rev=64517&view=rev Log: [NTVDM]: DPRINT the CPU level for diagnostics purposes. Modified: trunk/reactos/subsystems/ntvdm/cpu/cpu.c Modified: trunk/reactos/subsystems/ntvdm/cpu/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/cpu/cpu.c… ============================================================================== --- trunk/reactos/subsystems/ntvdm/cpu/cpu.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/cpu/cpu.c [iso-8859-1] Sat Oct 4 00:18:39 2014 @@ -124,10 +124,12 @@ return; } CpuCallLevel++; + DPRINT1("CpuSimulate --> Level %d\n", CpuCallLevel); CpuRunning = TRUE; while (VdmRunning && CpuRunning) ClockUpdate(); + DPRINT1("CpuSimulate <-- Level %d\n", CpuCallLevel); CpuCallLevel--; if (CpuCallLevel < 0) CpuCallLevel = 0;

1 0

[jgardou] 64516: [MKHIVE] - Perform a case insensitive comparison to find existing subkeys in the tree. Dedicated to Hervé ;-)
by jgardou＠svn.reactos.org 03 Oct '14

03 Oct '14

Author: jgardou Date: Fri Oct 3 22:19:07 2014 New Revision: 64516 URL: http://svn.reactos.org/svn/reactos?rev=64516&view=rev Log: [MKHIVE] - Perform a case insensitive comparison to find existing subkeys in the tree. Dedicated to Hervé ;-) Modified: trunk/reactos/tools/mkhive/registry.c Modified: trunk/reactos/tools/mkhive/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/registry.c?re… ============================================================================== --- trunk/reactos/tools/mkhive/registry.c [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/registry.c [iso-8859-1] Fri Oct 3 22:19:07 2014 @@ -20,7 +20,7 @@ * PROJECT: ReactOS hive maker * FILE: tools/mkhive/registry.c * PURPOSE: Registry code - * PROGRAMMER: Hervé Poussineau + * PROGRAMMER: HervÃ© Poussineau */ /* @@ -159,7 +159,7 @@ { CurrentKey = CONTAINING_RECORD(Ptr, KEY, KeyList); if (CurrentKey->NameSize == KeyString.Length - && memcmp(CurrentKey->Name, KeyString.Buffer, KeyString.Length) == 0) + && strncmpiW(CurrentKey->Name, KeyString.Buffer, KeyString.Length / sizeof(WCHAR)) == 0) { goto nextsubkey; }

1 0

[jgardou] 64515: [ADVAPI32] - Add parameter checks to RegEnumValueW/A - Implement RegEnumValueW for HKCR subkeys CORE-8582
by jgardou＠svn.reactos.org 03 Oct '14

03 Oct '14

Author: jgardou Date: Fri Oct 3 22:18:49 2014 New Revision: 64515 URL: http://svn.reactos.org/svn/reactos?rev=64515&view=rev Log: [ADVAPI32] - Add parameter checks to RegEnumValueW/A - Implement RegEnumValueW for HKCR subkeys CORE-8582 Modified: trunk/reactos/dll/win32/advapi32/reg/hkcr.c trunk/reactos/dll/win32/advapi32/reg/reg.c trunk/reactos/dll/win32/advapi32/reg/reg.h Modified: trunk/reactos/dll/win32/advapi32/reg/hkcr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/hkc… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/hkcr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/reg/hkcr.c [iso-8859-1] Fri Oct 3 22:18:49 2014 @@ -799,3 +799,216 @@ return ErrorCode; } + +/* HKCR version of RegEnumValueW */ +LONG +WINAPI +EnumHKCRValue( + _In_ HKEY hKey, + _In_ DWORD dwIndex, + _Out_ LPWSTR lpName, + _Inout_ PDWORD lpcbName, + _Reserved_ PDWORD lpReserved, + _Out_opt_ PDWORD lpdwType, + _Out_opt_ LPBYTE lpData, + _Inout_opt_ PDWORD lpcbData) +{ + HKEY PreferredKey, FallbackKey; + DWORD NumPreferredValues; + DWORD MaxFallbackValueNameLen; + DWORD FallbackIndex; + WCHAR* FallbackValueName = NULL; + LONG ErrorCode; + + ASSERT(IsHKCRKey(hKey)); + + /* Remove the HKCR flag while we're working */ + hKey = (HKEY)(((ULONG_PTR)hKey) & ~0x2); + + /* Get the preferred key */ + ErrorCode = GetPreferredHKCRKey(hKey, &PreferredKey); + if (ErrorCode != ERROR_SUCCESS) + { + if (ErrorCode == ERROR_FILE_NOT_FOUND) + { + /* Only the HKLM key exists */ + return RegEnumValueW( + hKey, + dwIndex, + lpName, + lpcbName, + lpReserved, + lpdwType, + lpData, + lpcbData); + } + return ErrorCode; + } + + /* Get the fallback key */ + ErrorCode = GetFallbackHKCRKey(hKey, &FallbackKey, FALSE); + if (ErrorCode != ERROR_SUCCESS) + { + if (PreferredKey != hKey) + RegCloseKey(PreferredKey); + if (ErrorCode == ERROR_FILE_NOT_FOUND) + { + /* Only the HKCU key exists */ + return RegEnumValueW( + hKey, + dwIndex, + lpName, + lpcbName, + lpReserved, + lpdwType, + lpData, + lpcbData); + } + return ErrorCode; + } + + /* Get some info on the HKCU side */ + ErrorCode = RegQueryInfoKeyW( + PreferredKey, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + &NumPreferredValues, + NULL, + NULL, + NULL, + NULL); + if (ErrorCode != ERROR_SUCCESS) + goto Exit; + + if (dwIndex < NumPreferredValues) + { + /* HKCU side takes precedence */ + return RegEnumValueW( + PreferredKey, + dwIndex, + lpName, + lpcbName, + lpReserved, + lpdwType, + lpData, + lpcbData); + goto Exit; + } + + /* Here it gets tricky. We must enumerate the values from the HKLM side, + * without reporting those which are present on the HKCU side */ + + /* Squash out the indices from HKCU */ + dwIndex -= NumPreferredValues; + + /* Get some info */ + ErrorCode = RegQueryInfoKeyW( + FallbackKey, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + &MaxFallbackValueNameLen, + NULL, + NULL, + NULL); + if (ErrorCode != ERROR_SUCCESS) + { + ERR("Could not query info of key %p (Err: %d)\n", FallbackKey, ErrorCode); + goto Exit; + } + + ERR("Maxfallbacksubkeylen: %d\n", MaxFallbackValueNameLen); + + /* Allocate our buffer */ + FallbackValueName = RtlAllocateHeap( + RtlGetProcessHeap(), 0, (MaxFallbackValueNameLen + 1) * sizeof(WCHAR)); + if (!FallbackValueName) + { + ErrorCode = ERROR_NOT_ENOUGH_MEMORY; + goto Exit; + } + + /* We must begin at the very first subkey of the fallback key, + * and then see if we meet keys that already are in the preferred key. + * In that case, we must bump dwIndex, as otherwise we would enumerate a key we already + * saw in a previous call. + */ + FallbackIndex = 0; + while (TRUE) + { + DWORD FallbackValueNameLen = MaxFallbackValueNameLen; + + /* Try enumerating */ + ErrorCode = RegEnumValueW( + FallbackKey, + FallbackIndex, + FallbackValueName, + &FallbackValueNameLen, + NULL, + NULL, + NULL, + NULL); + if (ErrorCode != ERROR_SUCCESS) + { + /* Most likely ERROR_NO_MORE_ITEMS */ + ERR("Returning %d.\n", ErrorCode); + goto Exit; + } + FallbackValueName[FallbackValueNameLen] = L'\0'; + + /* See if there is such a value on HKCU side */ + ErrorCode = RegQueryValueExW( + PreferredKey, + FallbackValueName, + NULL, + NULL, + NULL, + NULL); + + if (ErrorCode == ERROR_SUCCESS) + { + /* So we already enumerated it on HKCU side. */ + dwIndex++; + } + else if (ErrorCode != ERROR_FILE_NOT_FOUND) + { + ERR("Got error %d while querying for %s on HKCU side.\n", ErrorCode, FallbackValueName); + goto Exit; + } + + /* See if we caught up */ + if (FallbackIndex == dwIndex) + break; + + FallbackIndex++; + } + + /* We can finally enumerate on the fallback side */ + ErrorCode = RegEnumValueW( + FallbackKey, + dwIndex, + lpName, + lpcbName, + lpReserved, + lpdwType, + lpData, + lpcbData); + +Exit: + if (PreferredKey != hKey) + RegCloseKey(PreferredKey); + if (FallbackKey != hKey) + RegCloseKey(FallbackKey); + if (FallbackValueName) + RtlFreeHeap(RtlGetProcessHeap(), 0, FallbackValueName); + + return ErrorCode; +} Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] Fri Oct 3 22:18:49 2014 @@ -2705,7 +2705,7 @@ _Reserved_ LPDWORD lpdwReserved, _Out_opt_ LPDWORD lpdwType, _Out_opt_ LPBYTE lpData, - _Out_opt_ LPDWORD lpcbData) + _Inout_opt_ LPDWORD lpcbData) { WCHAR* NameBuffer; DWORD NameBufferSize, NameLength; @@ -2714,6 +2714,9 @@ BOOL NameOverflow = FALSE; /* Do parameter checks now, once and for all. */ + if (!lpName || !lpcbName) + return ERROR_INVALID_PARAMETER; + if ((lpData && !lpcbData) || lpdwReserved) return ERROR_INVALID_PARAMETER; @@ -2851,15 +2854,17 @@ * Success: ERROR_SUCCESS * Failure: nonzero error code from Winerror.h */ -LONG WINAPI -RegEnumValueW(HKEY hKey, - DWORD index, - LPWSTR value, - PDWORD val_count, - PDWORD reserved, - PDWORD type, - LPBYTE data, - PDWORD count) +LONG +WINAPI +RegEnumValueW( + _In_ HKEY hKey, + _In_ DWORD index, + _Out_ LPWSTR value, + _Inout_ PDWORD val_count, + _Reserved_ PDWORD reserved, + _Out_opt_ PDWORD type, + _Out_opt_ LPBYTE data, + _Inout_opt_ PDWORD count) { HANDLE KeyHandle; NTSTATUS status; @@ -2868,16 +2873,34 @@ KEY_VALUE_FULL_INFORMATION *info = (KEY_VALUE_FULL_INFORMATION *)buffer; static const int info_size = FIELD_OFFSET( KEY_VALUE_FULL_INFORMATION, Name ); - //TRACE("(%p,%ld,%p,%p,%p,%p,%p,%p)\n", - // hkey, index, value, val_count, reserved, type, data, count ); - - /* NT only checks count, not val_count */ - if ((data && !count) || reserved) return ERROR_INVALID_PARAMETER; + TRACE("(%p,%ld,%p,%p,%p,%p,%p,%p)\n", + hKey, index, value, val_count, reserved, type, data, count ); + + if (!value || !val_count) + return ERROR_INVALID_PARAMETER; + + if ((data && !count) || reserved) + return ERROR_INVALID_PARAMETER; status = MapDefaultKey(&KeyHandle, hKey); if (!NT_SUCCESS(status)) { return RtlNtStatusToDosError(status); + } + + if (IsHKCRKey(KeyHandle)) + { + LONG ErrorCode = EnumHKCRValue( + KeyHandle, + index, + value, + val_count, + reserved, + type, + data, + count); + ClosePredefKey(KeyHandle); + return ErrorCode; } total_size = info_size + (MAX_PATH + 1) * sizeof(WCHAR); Modified: trunk/reactos/dll/win32/advapi32/reg/reg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.h [iso-8859-1] Fri Oct 3 22:18:49 2014 @@ -84,3 +84,15 @@ _Inout_opt_ LPDWORD lpcbClass, _Out_opt_ PFILETIME lpftLastWriteTime); +LONG +WINAPI +EnumHKCRValue( + _In_ HKEY hKey, + _In_ DWORD index, + _Out_ LPWSTR value, + _Inout_ PDWORD val_count, + _Reserved_ PDWORD reserved, + _Out_opt_ PDWORD type, + _Out_opt_ LPBYTE data, + _Inout_opt_ PDWORD count); +

1 0

[tkreuzer] 64514: [HPP] Fix problem with inconsistent EOLs
by tkreuzer＠svn.reactos.org 03 Oct '14

03 Oct '14

Author: tkreuzer Date: Fri Oct 3 20:11:37 2014 New Revision: 64514 URL: http://svn.reactos.org/svn/reactos?rev=64514&view=rev Log: [HPP] Fix problem with inconsistent EOLs Modified: trunk/reactos/tools/hpp/hpp.c Modified: trunk/reactos/tools/hpp/hpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/hpp/hpp.c?rev=64514&… ============================================================================== --- trunk/reactos/tools/hpp/hpp.c [iso-8859-1] (original) +++ trunk/reactos/tools/hpp/hpp.c [iso-8859-1] Fri Oct 3 20:11:37 2014 @@ -210,11 +210,14 @@ pchVariable = strchr(pch, '$'); if (pchVariable && (pchVariable < pchLineEnd)) { + /* Write all characters up to the $ */ fwrite(pch, 1, pchVariable - pch, fileOut); + /* Try to find the define */ pDefine = FindDefine(pchVariable + 1, &pch); if (pDefine != 0) { + /* We have a define, write the value */ fwrite(pDefine->pszValue, 1, pDefine->cchValue, fileOut); } else @@ -224,7 +227,7 @@ fwrite(pchVariable, 1, pch - pchVariable, fileOut); } - len = pchLineEnd - pch; + len = pchLineEnd - pch + 1; } else {

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