Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dreimer] 45163: Remove the Address Translation from the reladdr2line scripts. This is done in raddr2line and log2lines now. Fixes Bug 5008.
by dreimer＠svn.reactos.org 20 Jan '10

20 Jan '10

Author: dreimer Date: Wed Jan 20 22:57:35 2010 New Revision: 45163 URL: http://svn.reactos.org/svn/reactos?rev=45163&view=rev Log: Remove the Address Translation from the reladdr2line scripts. This is done in raddr2line and log2lines now. Fixes Bug 5008. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1 trunk/tools/RosBE/RosBE-Windows/Root/raddr2line.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1 [iso-8859-1] Wed Jan 20 22:57:35 2010 @@ -32,14 +32,7 @@ if ("$ADDRESS" -eq "") { "ERROR: You must specify a address to analyze." } -$baseaddr = (objdump -p $FILEPATH | select-string "ImageBase").tostring().split() -$baseaddr = "0x" + ($baseaddr.get($baseaddr.length - 1)) -if ($baseaddr -lt $ADDRESS) { - IEX "& log2lines.exe '$FILEPATH' '$ADDRESS'" -} else { - $baseaddr = ($baseaddr | % {[Convert]::ToInt32($_,16)}) + ($ADDRESS | % {[Convert]::ToInt32($_,16)}) - $relbase = "0x" + ("{0:X}" -f $baseaddr) - IEX "& log2lines.exe '$FILEPATH' '$relbase'" -} + +IEX "& log2lines.exe '$FILEPATH' '$ADDRESS'" $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" Modified: trunk/tools/RosBE/RosBE-Windows/Root/raddr2line.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/rad… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/raddr2line.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/raddr2line.cmd [iso-8859-1] Wed Jan 20 22:57:35 2010 @@ -54,22 +54,7 @@ for /f "usebackq" %%i in (`"dir /a:-d /s /b "%FILEPATH%" 2>NUL | findstr "%FILEPATH%""`) do set FILEPATH=%%i ) -:: First get the ImageBase of the File. If its smaller than the given -:: Parameter, everything is ok, because it was already added onto the -:: adress and can be given directly to raddr2line. If not, add it and -:: give the result to raddr2line. -echo %FILEPATH% - -for /f "tokens=2" %%i in ('"objdump -p "%FILEPATH%" 2>NUL | findstr ImageBase"') do set BASEADDRESS=0x%%i - -if %%i lss %ADDRESS% ( - log2lines.exe "%FILEPATH%" "%ADDRESS%" -) else ( - set /a BASEADDRESS+=0x%ADDRESS% - - for /f %%i in ('"echoh.exe !BASEADDRESS!"') do set RELBASE=%%i - log2lines.exe "!FILEPATH!" "!RELBASE!" -) +log2lines.exe "%FILEPATH%" "%ADDRESS%" :EOC title ReactOS Build Environment %_ROSBE_VERSION%

1 0

[sir_richard] 45162: [RBUILD]: Use correct kernel entrypoint symbol name. Forgot to commit this earlier. Please, next time before you harass us with e-mails, try to read your logs. LD choses a random entrypoint if the symbol cannot be found.
by sir_richard＠svn.reactos.org 20 Jan '10

20 Jan '10

Author: sir_richard Date: Wed Jan 20 15:09:50 2010 New Revision: 45162 URL: http://svn.reactos.org/svn/reactos?rev=45162&view=rev Log: [RBUILD]: Use correct kernel entrypoint symbol name. Forgot to commit this earlier. Please, next time before you harass us with e-mails, try to read your logs. LD choses a random entrypoint if the symbol cannot be found. Modified: trunk/reactos/tools/rbuild/module.cpp Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/module.cpp [iso-8859-1] Wed Jan 20 15:09:50 2010 @@ -1113,7 +1113,8 @@ switch ( type ) { case Kernel: - return "KiSystemStartup"; + if (Environment::GetArch() == "arm") return "KiSystemStartup"; + return "KiSystemStartup@4"; case KeyboardLayout: case KernelModeDLL: case KernelModeDriver:

1 0

[dgorbachev] 45161: Fix build-2.
by dgorbachev＠svn.reactos.org 20 Jan '10

20 Jan '10

Author: dgorbachev Date: Wed Jan 20 11:59:39 2010 New Revision: 45161 URL: http://svn.reactos.org/svn/reactos?rev=45161&view=rev Log: Fix build-2. Modified: trunk/reactos/ntoskrnl/ke/i386/context.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] Wed Jan 20 11:59:39 2010 @@ -23,12 +23,12 @@ { PKIPCR Pcr = (PKIPCR)KeGetPcr(); #ifdef CONFIG_SMP - ULONG SetMember; + LONG SetMember; /* Update active processor mask */ - SetMember = Pcr->SetMember; - InterlockedXor(&NewProcess->ActiveProcessors, SetMember); - InterlockedXor(&OldProcess->ActiveProcessors, SetMember); + SetMember = (LONG)Pcr->SetMember; + InterlockedXor((PLONG)&NewProcess->ActiveProcessors, SetMember); + InterlockedXor((PLONG)&OldProcess->ActiveProcessors, SetMember); #endif /* Check for new LDT */

1 0

[dgorbachev] 45160: Fix build.
by dgorbachev＠svn.reactos.org 20 Jan '10

20 Jan '10

Author: dgorbachev Date: Wed Jan 20 11:38:40 2010 New Revision: 45160 URL: http://svn.reactos.org/svn/reactos?rev=45160&view=rev Log: Fix build. Modified: trunk/reactos/ntoskrnl/ke/i386/context.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] Wed Jan 20 11:38:40 2010 @@ -27,8 +27,8 @@ /* Update active processor mask */ SetMember = Pcr->SetMember; - InterlockedXor(NewProcess->ActiveProcessors, SetMember); - InterlockedXor(OldProcess->ActiveProcessors, SetMember); + InterlockedXor(&NewProcess->ActiveProcessors, SetMember); + InterlockedXor(&OldProcess->ActiveProcessors, SetMember); #endif /* Check for new LDT */

1 0

[gedmurphy] 45159: Add the build tools
by gedmurphy＠svn.reactos.org 20 Jan '10

20 Jan '10

Author: gedmurphy Date: Wed Jan 20 10:18:53 2010 New Revision: 45159 URL: http://svn.reactos.org/svn/reactos?rev=45159&view=rev Log: Add the build tools Added: branches/Tree-restructure-test/COPYING - copied unchanged from r44923, trunk/reactos/COPYING branches/Tree-restructure-test/COPYING.ARM - copied unchanged from r44923, trunk/reactos/COPYING.ARM branches/Tree-restructure-test/COPYING.LIB - copied unchanged from r44923, trunk/reactos/COPYING.LIB branches/Tree-restructure-test/COPYING3 - copied unchanged from r44923, trunk/reactos/COPYING3 branches/Tree-restructure-test/COPYING3.LIB - copied unchanged from r44923, trunk/reactos/COPYING3.LIB branches/Tree-restructure-test/CREDITS - copied unchanged from r44923, trunk/reactos/CREDITS branches/Tree-restructure-test/Doxyfile - copied unchanged from r44923, trunk/reactos/Doxyfile branches/Tree-restructure-test/INSTALL - copied unchanged from r44923, trunk/reactos/INSTALL branches/Tree-restructure-test/Makefile - copied unchanged from r44923, trunk/reactos/Makefile branches/Tree-restructure-test/README - copied unchanged from r44923, trunk/reactos/README branches/Tree-restructure-test/ReactOS-amd64.rbuild - copied unchanged from r44923, trunk/reactos/ReactOS-amd64.rbuild branches/Tree-restructure-test/ReactOS-arm.rbuild - copied unchanged from r44923, trunk/reactos/ReactOS-arm.rbuild branches/Tree-restructure-test/ReactOS-generic.rbuild - copied unchanged from r44923, trunk/reactos/ReactOS-generic.rbuild branches/Tree-restructure-test/ReactOS-i386.rbuild - copied unchanged from r44923, trunk/reactos/ReactOS-i386.rbuild branches/Tree-restructure-test/ReactOS-ppc.rbuild - copied unchanged from r44923, trunk/reactos/ReactOS-ppc.rbuild branches/Tree-restructure-test/apistatus.lst - copied unchanged from r44923, trunk/reactos/apistatus.lst branches/Tree-restructure-test/baseaddress.rbuild - copied unchanged from r44923, trunk/reactos/baseaddress.rbuild branches/Tree-restructure-test/config-amd64.template.rbuild - copied unchanged from r44923, trunk/reactos/config-amd64.template.rbuild branches/Tree-restructure-test/config-arm.template.rbuild - copied unchanged from r44923, trunk/reactos/config-arm.template.rbuild branches/Tree-restructure-test/config-ppc.template.rbuild - copied unchanged from r44923, trunk/reactos/config-ppc.template.rbuild branches/Tree-restructure-test/config.template.rbuild - copied unchanged from r44923, trunk/reactos/config.template.rbuild branches/Tree-restructure-test/depmap.xsl - copied unchanged from r44923, trunk/reactos/depmap.xsl branches/Tree-restructure-test/proxy.mak - copied unchanged from r44923, trunk/reactos/proxy.mak branches/Tree-restructure-test/rosbuild.bat - copied unchanged from r44923, trunk/reactos/rosbuild.bat branches/Tree-restructure-test/sdk/tools/bin2c.c - copied unchanged from r44923, trunk/reactos/tools/bin2c.c branches/Tree-restructure-test/sdk/tools/bin2c.mak - copied unchanged from r44923, trunk/reactos/tools/bin2c.mak branches/Tree-restructure-test/sdk/tools/buildno/ - copied from r44923, trunk/reactos/tools/buildno/ branches/Tree-restructure-test/sdk/tools/cabman/ - copied from r44923, trunk/reactos/tools/cabman/ branches/Tree-restructure-test/sdk/tools/cdmake/ - copied from r44923, trunk/reactos/tools/cdmake/ branches/Tree-restructure-test/sdk/tools/create_nls/ - copied from r44923, trunk/reactos/tools/create_nls/ branches/Tree-restructure-test/sdk/tools/dumpstab.c - copied unchanged from r44923, trunk/reactos/tools/dumpstab.c branches/Tree-restructure-test/sdk/tools/gendib/ - copied from r44923, trunk/reactos/tools/gendib/ branches/Tree-restructure-test/sdk/tools/geninc/ - copied from r44923, trunk/reactos/tools/geninc/ branches/Tree-restructure-test/sdk/tools/hpp/ - copied from r44923, trunk/reactos/tools/hpp/ branches/Tree-restructure-test/sdk/tools/kbdtool/ - copied from r44923, trunk/reactos/tools/kbdtool/ branches/Tree-restructure-test/sdk/tools/mkconfig.c - copied unchanged from r44923, trunk/reactos/tools/mkconfig.c branches/Tree-restructure-test/sdk/tools/mkhive/ - copied from r44923, trunk/reactos/tools/mkhive/ branches/Tree-restructure-test/sdk/tools/ms2ps/ - copied from r44923, trunk/reactos/tools/ms2ps/ branches/Tree-restructure-test/sdk/tools/nci/ - copied from r44923, trunk/reactos/tools/nci/ branches/Tree-restructure-test/sdk/tools/ofw_interface/ - copied from r44923, trunk/reactos/tools/ofw_interface/ branches/Tree-restructure-test/sdk/tools/pefixup.c - copied unchanged from r44923, trunk/reactos/tools/pefixup.c branches/Tree-restructure-test/sdk/tools/pefixup.mak - copied unchanged from r44923, trunk/reactos/tools/pefixup.mak branches/Tree-restructure-test/sdk/tools/pipetools/ - copied from r44923, trunk/reactos/tools/pipetools/ branches/Tree-restructure-test/sdk/tools/rbuild/ - copied from r44923, trunk/reactos/tools/rbuild/ branches/Tree-restructure-test/sdk/tools/rbuild_helper/ - copied from r44923, trunk/reactos/tools/rbuild_helper/ branches/Tree-restructure-test/sdk/tools/regtests2xml/ - copied from r44923, trunk/reactos/tools/regtests2xml/ branches/Tree-restructure-test/sdk/tools/rgenstat/ - copied from r44923, trunk/reactos/tools/rgenstat/ branches/Tree-restructure-test/sdk/tools/rsym/ - copied from r44923, trunk/reactos/tools/rsym/ branches/Tree-restructure-test/sdk/tools/ssprintf.cpp - copied unchanged from r44923, trunk/reactos/tools/ssprintf.cpp branches/Tree-restructure-test/sdk/tools/ssprintf.h - copied unchanged from r44923, trunk/reactos/tools/ssprintf.h branches/Tree-restructure-test/sdk/tools/stubgen.c - copied unchanged from r44923, trunk/reactos/tools/stubgen.c branches/Tree-restructure-test/sdk/tools/tools.mak - copied unchanged from r44923, trunk/reactos/tools/tools.mak branches/Tree-restructure-test/sdk/tools/tools.rbuild - copied unchanged from r44923, trunk/reactos/tools/tools.rbuild branches/Tree-restructure-test/sdk/tools/unicode/ - copied from r44923, trunk/reactos/tools/unicode/ branches/Tree-restructure-test/sdk/tools/utf16le/ - copied from r44923, trunk/reactos/tools/utf16le/ branches/Tree-restructure-test/sdk/tools/widl/ - copied from r44923, trunk/reactos/tools/widl/ branches/Tree-restructure-test/sdk/tools/winebuild/ - copied from r44923, trunk/reactos/tools/winebuild/ branches/Tree-restructure-test/sdk/tools/wmc/ - copied from r44923, trunk/reactos/tools/wmc/ branches/Tree-restructure-test/sdk/tools/wpp/ - copied from r44923, trunk/reactos/tools/wpp/ branches/Tree-restructure-test/sdk/tools/wrc/ - copied from r44923, trunk/reactos/tools/wrc/ branches/Tree-restructure-test/sdk/tools/xml.cpp - copied unchanged from r44923, trunk/reactos/tools/xml.cpp branches/Tree-restructure-test/sdk/tools/xml.h - copied unchanged from r44923, trunk/reactos/tools/xml.h branches/Tree-restructure-test/vreport.xsl - copied unchanged from r44923, trunk/reactos/vreport.xsl

1 0

[gedmurphy] 45158: Base level folder structure
by gedmurphy＠svn.reactos.org 20 Jan '10

20 Jan '10

Author: gedmurphy Date: Wed Jan 20 09:51:53 2010 New Revision: 45158 URL: http://svn.reactos.org/svn/reactos?rev=45158&view=rev Log: Base level folder structure Added: branches/Tree-restructure-test/addons/ branches/Tree-restructure-test/addons/dlls/ branches/Tree-restructure-test/addons/doc/ branches/Tree-restructure-test/addons/graphics/ branches/Tree-restructure-test/addons/subsystems/ branches/Tree-restructure-test/addons/themes/ branches/Tree-restructure-test/addons/wallpapers/ branches/Tree-restructure-test/audio/ branches/Tree-restructure-test/audio/drivers/ branches/Tree-restructure-test/audio/ksfilter/ branches/Tree-restructure-test/audio/libs/ branches/Tree-restructure-test/audio/services/ branches/Tree-restructure-test/directx/ branches/Tree-restructure-test/gui/ branches/Tree-restructure-test/gui/applications/ branches/Tree-restructure-test/gui/cpl/ branches/Tree-restructure-test/gui/expand/ branches/Tree-restructure-test/gui/format/ branches/Tree-restructure-test/gui/libs/ branches/Tree-restructure-test/gui/msiexec/ branches/Tree-restructure-test/gui/regsvr32/ branches/Tree-restructure-test/gui/rundll32/ branches/Tree-restructure-test/gui/runonce/ branches/Tree-restructure-test/gui/setup/ branches/Tree-restructure-test/gui/shell/ branches/Tree-restructure-test/gui/winedlls/ branches/Tree-restructure-test/network/ branches/Tree-restructure-test/network/apps/ branches/Tree-restructure-test/network/dlls/ branches/Tree-restructure-test/network/drivers/ branches/Tree-restructure-test/network/libs/ branches/Tree-restructure-test/network/services/ branches/Tree-restructure-test/ntcore/ branches/Tree-restructure-test/ntcore/apps/ branches/Tree-restructure-test/ntcore/bootdata/ branches/Tree-restructure-test/ntcore/dlls/ branches/Tree-restructure-test/ntcore/drivers/ branches/Tree-restructure-test/ntcore/freeldr/ branches/Tree-restructure-test/ntcore/hal/ branches/Tree-restructure-test/ntcore/libs/ branches/Tree-restructure-test/ntcore/lsass/ branches/Tree-restructure-test/ntcore/ntoskrnl/ branches/Tree-restructure-test/ntcore/smss/ branches/Tree-restructure-test/ntcore/userinit/ branches/Tree-restructure-test/ntcore/usetup/ branches/Tree-restructure-test/ntcore/vgafonts/ branches/Tree-restructure-test/ntcore/winlogon/ branches/Tree-restructure-test/sdk/ branches/Tree-restructure-test/sdk/include/ branches/Tree-restructure-test/sdk/libs/ branches/Tree-restructure-test/sdk/tools/ branches/Tree-restructure-test/win32core/ branches/Tree-restructure-test/win32core/csrss/ branches/Tree-restructure-test/win32core/dlls/ branches/Tree-restructure-test/win32core/drivers/ branches/Tree-restructure-test/win32core/fonts/ branches/Tree-restructure-test/win32core/keyboard/ branches/Tree-restructure-test/win32core/nls/ branches/Tree-restructure-test/win32core/services/ branches/Tree-restructure-test/win32core/win32k/

1 0

[gedmurphy] 45157: Create an empty branch for testing out tree restructure ideas. For more info see http://www.reactos.org/wiki/Techwiki:File_Layout
by gedmurphy＠svn.reactos.org 20 Jan '10

20 Jan '10

Author: gedmurphy Date: Wed Jan 20 09:49:09 2010 New Revision: 45157 URL: http://svn.reactos.org/svn/reactos?rev=45157&view=rev Log: Create an empty branch for testing out tree restructure ideas. For more info see http://www.reactos.org/wiki/Techwiki:File_Layout Added: branches/Tree-restructure-test/

1 0

[sir_richard] 45156: [NTOS]: Implement KiSwapProcess in C. [NTOS]: Implement KiIsNpxPresent and KiIsNpxErrataPresent in C. It's much clearer what these are doing now. [NTOS]: Implement KiFlushNPXState and fix some bugs that were present in the ASM version, such as a wrong NPX state check. [NTOS]: Implement working intrinsics for fxrstor, fxsave, fnsave and enable them for flushing. We'll update the FPU trap code to use these later.
by sir_richard＠svn.reactos.org 20 Jan '10

20 Jan '10

Author: sir_richard Date: Wed Jan 20 05:05:08 2010 New Revision: 45156 URL: http://svn.reactos.org/svn/reactos?rev=45156&view=rev Log: [NTOS]: Implement KiSwapProcess in C. [NTOS]: Implement KiIsNpxPresent and KiIsNpxErrataPresent in C. It's much clearer what these are doing now. [NTOS]: Implement KiFlushNPXState and fix some bugs that were present in the ASM version, such as a wrong NPX state check. [NTOS]: Implement working intrinsics for fxrstor, fxsave, fnsave and enable them for flushing. We'll update the FPU trap code to use these later. Added: trunk/reactos/ntoskrnl/ke/i386/context.c (with props) Modified: trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h trunk/reactos/ntoskrnl/ke/i386/cpu.c trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild Modified: trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h [iso-8859-1] Wed Jan 20 05:05:08 2010 @@ -13,6 +13,28 @@ : "=m" (*X) \ : /* no input */ \ : "memory"); + +FORCEINLINE +VOID +Ke386FxStore(IN PFX_SAVE_AREA SaveArea) +{ + asm volatile ("fxrstor (%0)" : : "r"(SaveArea)); +} + +FORCEINLINE +VOID +Ke386FxSave(IN PFX_SAVE_AREA SaveArea) +{ + asm volatile ("fxsave (%0)" : : "r"(SaveArea)); +} + + +FORCEINLINE +VOID +Ke386FnSave(IN PFLOATING_SAVE_AREA SaveArea) +{ + asm volatile ("fnsave (%0); wait" : : "r"(SaveArea)); +} FORCEINLINE VOID Added: 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 (added) +++ trunk/reactos/ntoskrnl/ke/i386/context.c [iso-8859-1] Wed Jan 20 05:05:08 2010 @@ -1,0 +1,51 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: ntoskrnl/ke/i386/context.c + * PURPOSE: Context Switching Related Code + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +/* GLOBALS ********************************************************************/ + +/* FUNCTIONS ******************************************************************/ + +VOID +NTAPI +KiSwapProcess(IN PKPROCESS NewProcess, + IN PKPROCESS OldProcess) +{ + PKIPCR Pcr = (PKIPCR)KeGetPcr(); +#ifdef CONFIG_SMP + ULONG SetMember; + + /* Update active processor mask */ + SetMember = Pcr->SetMember; + InterlockedXor(NewProcess->ActiveProcessors, SetMember); + InterlockedXor(OldProcess->ActiveProcessors, SetMember); +#endif + + /* Check for new LDT */ + if (NewProcess->LdtDescriptor.LimitLow != OldProcess->LdtDescriptor.LimitLow) + { + /* Not handled yet */ + UNIMPLEMENTED; + while (TRUE); + } + + /* Update CR3 */ + __writecr3(NewProcess->DirectoryTableBase[0]); + + /* Clear GS */ + Ke386SetGs(0); + + /* Update IOPM offset */ + Pcr->TSS->IoMapBase = NewProcess->IopmOffset; +} + Propchange: trunk/reactos/ntoskrnl/ke/i386/context.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] Wed Jan 20 05:05:08 2010 @@ -944,6 +944,155 @@ KiSaveProcessorControlState(&Prcb->ProcessorState); } +BOOLEAN +NTAPI +KiIsNpxPresent(VOID) +{ + ULONG Cr0; + USHORT Magic; + + /* Set magic */ + Magic = 0xFFFF; + + /* Read CR0 and mask out FPU flags */ + Cr0 = __readcr0() & ~(CR0_MP | CR0_TS | CR0_EM | CR0_ET); + + /* Store on FPU stack */ + asm volatile ("fninit;" "fnstsw %0" : "+m"(Magic)); + + /* Magic should now be cleared */ + if (Magic & 0xFF) + { + /* You don't have an FPU -- enable emulation for now */ + __writecr0(Cr0 | CR0_EM | CR0_TS); + return FALSE; + } + + /* You have an FPU, enable it */ + Cr0 |= CR0_ET; + + /* Enable INT 16 on 486 and higher */ + if (KeGetCurrentPrcb()->CpuType >= 3) Cr0 |= CR0_NE; + + /* Set FPU state */ + __writecr0(Cr0 | CR0_EM | CR0_TS); + return TRUE; +} + +BOOLEAN +NTAPI +KiIsNpxErrataPresent(VOID) +{ + BOOLEAN ErrataPresent; + ULONG Cr0; + volatile double Value1, Value2; + + /* Disable interrupts */ + _disable(); + + /* Read CR0 and remove FPU flags */ + Cr0 = __readcr0(); + __writecr0(Cr0 & ~(CR0_MP | CR0_TS | CR0_EM)); + + /* Initialize FPU state */ + asm volatile ("fninit"); + + /* Multiply the magic values and divide, we should get the result back */ + Value1 = 4195835.0; + Value2 = 3145727.0; + ErrataPresent = (Value1 * Value2 / 3145727.0) != 4195835.0; + + /* Restore CR0 */ + __writecr0(Cr0); + + /* Enable interrupts */ + _enable(); + + /* Return if there's an errata */ + return ErrataPresent; +} + +NTAPI +VOID +KiFlushNPXState(IN PFLOATING_SAVE_AREA SaveArea) +{ + ULONG EFlags, Cr0; + PKTHREAD Thread, NpxThread; + PFX_SAVE_AREA FxSaveArea; + + /* Save volatiles and disable interrupts */ + EFlags = __readeflags(); + _disable(); + + /* Save the PCR and get the current thread */ + Thread = KeGetCurrentThread(); + + /* Check if we're already loaded */ + if (Thread->NpxState != NPX_STATE_LOADED) + { + /* If there's nothing to load, quit */ + if (!SaveArea) return; + + /* Need FXSR support for this */ + ASSERT(KeI386FxsrPresent == TRUE); + + /* Check for sane CR0 */ + Cr0 = __readcr0(); + if (Cr0 & (CR0_MP | CR0_TS | CR0_EM)) + { + /* Mask out FPU flags */ + __writecr0(Cr0 & ~(CR0_MP | CR0_TS | CR0_EM)); + } + + /* Get the NPX thread and check its FPU state */ + NpxThread = KeGetCurrentPrcb()->NpxThread; + if ((NpxThread) && (NpxThread->NpxState == NPX_STATE_LOADED)) + { + /* Get the FX frame and store the state there */ + FxSaveArea = KiGetThreadNpxArea(NpxThread); + Ke386FxSave(FxSaveArea); + + /* NPX thread has lost its state */ + NpxThread->NpxState = NPX_STATE_NOT_LOADED; + } + + /* Now load NPX state from the NPX area */ + FxSaveArea = KiGetThreadNpxArea(Thread); + Ke386FxStore(FxSaveArea); + } + else + { + /* Check for sane CR0 */ + Cr0 = __readcr0(); + if (Cr0 & (CR0_MP | CR0_TS | CR0_EM)) + { + /* Mask out FPU flags */ + __writecr0(Cr0 & ~(CR0_MP | CR0_TS | CR0_EM)); + } + + /* Get FX frame */ + FxSaveArea = KiGetThreadNpxArea(Thread); + Thread->NpxState = NPX_STATE_NOT_LOADED; + + /* Save state if supported by CPU */ + if (KeI386FxsrPresent) Ke386FxSave(FxSaveArea); + } + + /* Now save the FN state wherever it was requested */ + if (SaveArea) Ke386FnSave(SaveArea); + + /* Clear NPX thread */ + KeGetCurrentPrcb()->NpxThread = NULL; + + /* Add the CR0 from the NPX frame */ + Cr0 |= NPX_STATE_NOT_LOADED; + Cr0 |= FxSaveArea->Cr0NpxState; + __writecr0(Cr0); + + /* Restore interrupt state */ + __writeeflags(EFlags); +} + /* PUBLIC FUNCTIONS **********************************************************/ /* 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] Wed Jan 20 05:05:08 2010 @@ -17,236 +17,7 @@ #define Running 2 #define WrDispatchInt 0x1F -Dividend: .float 4195835.0 -Divisor: .float 3145727.0 -Result1: .float 0 -Result2: .float 0 - /* FUNCTIONS ****************************************************************/ - -.globl _KiIsNpxErrataPresent@0 -.func KiIsNpxErrataPresent@0 -_KiIsNpxErrataPresent@0: - - /* Disable interrupts */ - cli - - /* Get CR0 and mask out FPU flags */ - mov eax, cr0 - mov ecx, eax - and eax, ~(CR0_MP + CR0_TS + CR0_EM) - mov cr0, eax - - /* Initialize the FPU */ - fninit - - /* Do the divison and inverse multiplication */ - fld qword ptr Dividend - fstp qword ptr Result1 - fld qword ptr Divisor - fstp qword ptr Result2 - fld qword ptr Result1 - fdiv qword ptr Result2 - fmul qword ptr Result2 - - /* Do the compare and check flags */ - fcomp qword ptr Result1 - fstsw ax - sahf - - /* Restore CR0 and interrupts */ - mov cr0, ecx - sti - - /* Return errata status */ - xor eax, eax - jz NoErrata - inc eax - -NoErrata: - ret -.endfunc - -.globl _KiIsNpxPresent@0 -.func KiIsNpxPresent@0 -_KiIsNpxPresent@0: - - /* Save stack */ - push ebp - - /* Get CR0 and mask out FPU flags */ - mov eax, cr0 - and eax, ~(CR0_MP + CR0_TS + CR0_EM + CR0_ET) - - /* Initialize the FPU and assume FALSE for return */ - xor edx, edx - fninit - - /* Save magic value on stack */ - mov ecx, 0x42424242 - push ecx - - /* Setup stack for FPU store */ - mov ebp ,esp - fnstsw [ebp] - - /* Now check if our magic got cleared */ - cmp byte ptr [ebp], 0 - jnz NoFpu - - /* Enable FPU, set return to TRUE */ - or eax, CR0_ET - mov edx, 1 - - /* If this is a 486 or higher, enable INT 16 as well */ - cmp dword ptr fs:KPCR_PRCB_CPU_TYPE, 3 - jbe NoFpu - or eax, CR0_NE - -NoFpu: - /* Set emulation enabled during the first boot phase and set the CR0 */ - or eax, (CR0_EM + CR0_TS) - mov cr0, eax - - /* Restore stack */ - pop eax - pop ebp - - /* Return true or false */ - mov eax, edx - ret -.endfunc - -.globl _KiFlushNPXState@4 -.func KiFlushNPXState@4 -_KiFlushNPXState@4: - - /* Save volatiles and disable interrupts */ - push esi - push edi - push ebx - pushfd - cli - - /* Save the PCR and get the current thread */ - mov edi, fs:[KPCR_SELF] - mov esi, [edi+KPCR_CURRENT_THREAD] - - /* Check if we're already loaded */ - cmp byte ptr [esi+KTHREAD_NPX_STATE], NPX_STATE_LOADED - je IsValid - - /* Check if we're supposed to get it */ - cmp dword ptr [esp+20], 0 - je Return - -#if DBG - /* Assert Fxsr support */ - test byte ptr _KeI386FxsrPresent, 1 - jnz AssertOk - int 3 -AssertOk: -#endif - - /* Get CR0 and test if it's valid */ - mov ebx, cr0 - test bl, CR0_MP + CR0_TS + CR0_EM - jz Cr0OK - - /* Enable fnsave to work */ - and ebx, ~(CR0_MP + CR0_TS + CR0_EM) - mov cr0, ebx - -Cr0OK: - /* Check if we are the NPX Thread */ - mov eax, [edi+KPCR_NPX_THREAD] - or eax, eax - jz DontSave - - /* Check if it's not loaded */ - cmp byte ptr [eax+KTHREAD_NPX_STATE], NPX_STATE_NOT_LOADED - jnz DontSave - -#if DBG - /* We are the NPX Thread with an unloaded NPX State... this isn't normal! */ - int 3 -#endif - - /* Save the NPX State */ - mov ecx, [eax+KTHREAD_INITIAL_STACK] - sub ecx, NPX_FRAME_LENGTH - fxsave [ecx] - mov byte ptr [eax+KTHREAD_NPX_STATE], NPX_STATE_NOT_LOADED - -DontSave: - /* Load the NPX State */ - mov ecx, [esi+KTHREAD_INITIAL_STACK] - sub ecx, NPX_FRAME_LENGTH - fxrstor [ecx] - - /* Get the CR0 state and destination */ - mov edx, [ecx+FN_CR0_NPX_STATE] - mov ecx, [esp+20] - jmp DoneLoad - -IsValid: - /* We already have a valid state, flush it */ - mov ebx, cr0 - test bl, CR0_MP + CR0_TS + CR0_EM - jz Cr0OK2 - - /* Enable fnsave to work */ - and ebx, ~(CR0_MP + CR0_TS + CR0_EM) - mov cr0, ebx - -Cr0OK2: - /* Get the kernel stack */ - mov ecx, [esi+KTHREAD_INITIAL_STACK] - test byte ptr _KeI386FxsrPresent, 1 - lea ecx, [ecx-NPX_FRAME_LENGTH] - - /* Set the NPX State */ - mov byte ptr [esi+KTHREAD_NPX_STATE], NPX_STATE_NOT_LOADED - - /* Get Cr0 */ - mov edx, [ecx+FN_CR0_NPX_STATE] - jz DoneLoad - - /* Save the FX State */ - fxsave [ecx] - - /* Check if we also have to save it in the parameter */ - mov ecx, [esp+20] - jecxz NoSave - -DoneLoad: - /* Save the Fn state in the parameter we got */ - fnsave [ecx] - fwait - -NoSave: - /* Clear eax */ - xor eax, eax - - /* Add NPX State */ - or ebx, NPX_STATE_NOT_LOADED - - /* Clear the NPX thread */ - mov [edi+KPCR_NPX_THREAD], eax - - /* Add saved CR0 into NPX State, and set it */ - or ebx, edx - mov cr0, ebx - - /* Re-enable interrupts and return */ -Return: - popf - pop ebx - pop edi - pop esi - ret 4 - -.endfunc /*++ * KiSwapContextInternal @@ -736,64 +507,6 @@ #endif .endfunc -.globl _KiSwapProcess@8 -.func KiSwapProcess@8 -_KiSwapProcess@8: - - /* Get process pointers */ - mov edx, [esp+4] - mov eax, [esp+8] - -#ifdef CONFIG_SMP - /* Update active processors */ - mov ecx, fs:[KPCR_SET_MEMBER] - lock xor [edx+KPROCESS_ACTIVE_PROCESSORS], ecx - lock xor [eax+KPROCESS_ACTIVE_PROCESSORS], ecx - - /* Sanity check */ -#if DBG - test [edx+KPROCESS_ACTIVE_PROCESSORS], ecx - jz WrongCpu1 - test [eax+KPROCESS_ACTIVE_PROCESSORS], ecx - jnz WrongCpu2 -#endif -#endif - - /* Check if their LDTs changed */ - mov ecx, [edx+KPROCESS_LDT_DESCRIPTOR0] - or ecx, [eax+KPROCESS_LDT_DESCRIPTOR0] - jnz NewLdt - - /* Update CR3 */ - mov eax, [edx+KPROCESS_DIRECTORY_TABLE_BASE] - mov cr3, eax - - /* Get the KTSS */ - mov ecx, fs:[KPCR_TSS] - - /* Clear GS on process swap */ - xor eax, eax - mov gs, ax - - /* Update IOPM offset */ - mov ax, [edx+KPROCESS_IOPM_OFFSET] - mov [ecx+KTSS_IOMAPBASE], ax - - /* Return */ - ret 8 - -NewLdt: - /* FIXME: TODO */ - int 3 - -#if DBG -WrongCpu1: - int 3 -WrongCpu2: - int 3 -#endif -.endfunc - .globl _Ki386SetupAndExitToV86Mode@4 .func Ki386SetupAndExitToV86Mode@4 _Ki386SetupAndExitToV86Mode@4: Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Wed Jan 20 05:05:08 2010 @@ -40,6 +40,7 @@ <directory name="i386"> <file>abios.c</file> <file>cpu.c</file> + <file>context.c</file> <file>ctxswitch.S</file> <file>exp.c</file> <file>irqobj.c</file>

1 0

[jimtabor] 45155: - Add dclevel flags.
by jimtabor＠svn.reactos.org 20 Jan '10

20 Jan '10

Author: jimtabor Date: Wed Jan 20 02:40:27 2010 New Revision: 45155 URL: http://svn.reactos.org/svn/reactos?rev=45155&view=rev Log: - Add dclevel flags. Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] Wed Jan 20 02:40:27 2010 @@ -12,6 +12,14 @@ /* Get/SetBounds/Rect support. */ #define DCB_WINDOWMGR 0x8000 /* Queries the Windows bounding rectangle instead of the application's */ + +/* flFontState */ +#define DC_DIRTYFONT_XFORM 1 +#define DC_DIRTYFONT_LFONT 2 +#define DC_UFI_MAPPING 4 + +/* fl */ +#define DC_FL_PAL_BACK 1 /* Type definitions ***********************************************************/

1 0

[sir_richard] 45154: [NTOS]: Workaround for GCC 4.4.x bug reported by Dmitry.
by sir_richard＠svn.reactos.org 19 Jan '10

19 Jan '10

Author: sir_richard Date: Tue Jan 19 23:21:12 2010 New Revision: 45154 URL: http://svn.reactos.org/svn/reactos?rev=45154&view=rev Log: [NTOS]: Workaround for GCC 4.4.x bug reported by Dmitry. Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kiinit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kiinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/kiinit.c [iso-8859-1] Tue Jan 19 23:21:12 2010 @@ -16,8 +16,8 @@ /* GLOBALS *******************************************************************/ /* Boot and double-fault/NMI/DPC stack */ -UCHAR P0BootStackData[KERNEL_STACK_SIZE] __attribute__((aligned (16))); -UCHAR KiDoubleFaultStackData[KERNEL_STACK_SIZE] __attribute__((aligned (16))); +UCHAR P0BootStackData[KERNEL_STACK_SIZE] __attribute__((aligned (16))) = {0}; +UCHAR KiDoubleFaultStackData[KERNEL_STACK_SIZE] __attribute__((aligned (16))) = {0}; ULONG_PTR P0BootStack = (ULONG_PTR)&P0BootStackData[KERNEL_STACK_SIZE]; ULONG_PTR KiDoubleFaultStack = (ULONG_PTR)&KiDoubleFaultStackData[KERNEL_STACK_SIZE];

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