Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sir_richard] 45353: [PERF]: Omit setting certain useless trap frame fields. [NTOS]: Fix KiEnterInterruptFrame. In the case of a V86 trap, the segments were overriden because this wasn't a kernel trap (missing if/elseif).
by sir_richard＠svn.reactos.org 30 Jan '10

30 Jan '10

Author: sir_richard Date: Sat Jan 30 19:25:30 2010 New Revision: 45353 URL: http://svn.reactos.org/svn/reactos?rev=45353&view=rev Log: [PERF]: Omit setting certain useless trap frame fields. [NTOS]: Fix KiEnterInterruptFrame. In the case of a V86 trap, the segments were overriden because this wasn't a kernel trap (missing if/elseif). Modified: trunk/reactos/ntoskrnl/include/internal/trap_x.h Modified: trunk/reactos/ntoskrnl/include/internal/trap_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/trap_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/trap_x.h [iso-8859-1] Sat Jan 30 19:25:30 2010 @@ -616,8 +616,7 @@ Ke386SetDs(KGDT_R3_DATA | RPL_MASK); Ke386SetEs(KGDT_R3_DATA | RPL_MASK); - /* Save exception list and bogus previous mode */ - TrapFrame->PreviousPreviousMode = -1; + /* Save exception list */ TrapFrame->ExceptionList = KeGetPcr()->Tib.ExceptionList; /* Clear direction flag */ @@ -639,10 +638,7 @@ FORCEINLINE KiEnterInterruptTrap(IN PKTRAP_FRAME TrapFrame) { - /* Set bogus previous mode */ - TrapFrame->PreviousPreviousMode = -1; - - /* Check for V86 mode */ + /* Check for V86 mode, otherwise check for ring 3 code */ if (__builtin_expect(TrapFrame->EFlags & EFLAGS_V86_MASK, 0)) { /* Restore V8086 segments into Protected Mode segments */ @@ -651,9 +647,7 @@ TrapFrame->SegDs = TrapFrame->V86Ds; TrapFrame->SegEs = TrapFrame->V86Es; } - - /* Check if this wasn't kernel code */ - if (__builtin_expect(TrapFrame->SegCs != KGDT_R0_CODE, 1)) /* Ring 3 is more common */ + else if (__builtin_expect(TrapFrame->SegCs != KGDT_R0_CODE, 1)) /* Ring 3 is more common */ { /* Save segments and then switch to correct ones */ TrapFrame->SegFs = Ke386GetFs(); @@ -668,10 +662,7 @@ /* Save exception list and terminate it */ TrapFrame->ExceptionList = KeGetPcr()->Tib.ExceptionList; KeGetPcr()->Tib.ExceptionList = EXCEPTION_CHAIN_END; - - /* No error code */ - TrapFrame->ErrCode = 0; - + /* Clear direction flag */ Ke386ClearDirectionFlag(); @@ -718,8 +709,7 @@ TrapFrame->SegGs = Ke386GetGs(); Ke386SetFs(KGDT_R0_PCR); - /* Save exception list and bogus previous mode */ - TrapFrame->PreviousPreviousMode = -1; + /* Save exception list */ TrapFrame->ExceptionList = KeGetPcr()->Tib.ExceptionList; /* Check for V86 mode */

1 0

[tkreuzer] 45352: Autostart blue.sys, also needed for console mode
by tkreuzer＠svn.reactos.org 30 Jan '10

30 Jan '10

Author: tkreuzer Date: Sat Jan 30 18:47:58 2010 New Revision: 45352 URL: http://svn.reactos.org/svn/reactos?rev=45352&view=rev Log: Autostart blue.sys, also needed for console mode Modified: branches/reactos-yarotows/boot/bootdata/hivesys_i386.inf Modified: branches/reactos-yarotows/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/boot/bootdata/… ============================================================================== --- branches/reactos-yarotows/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ branches/reactos-yarotows/boot/bootdata/hivesys_i386.inf [iso-8859-1] Sat Jan 30 18:47:58 2010 @@ -995,7 +995,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Blue","ErrorControl",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\Blue","Group",0x00000000,"Video Init" HKLM,"SYSTEM\CurrentControlSet\Services\Blue","ImagePath",0x00020000,"system32\drivers\blue.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Blue","Start",0x00010001,0x00000004 +HKLM,"SYSTEM\CurrentControlSet\Services\Blue","Start",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Blue","Type",0x00010001,0x00000001 ; Cdfs (ISO96660) filesystem driver

1 0

[tkreuzer] 45351: Add vgafonts to bootcd, needed for console mode
by tkreuzer＠svn.reactos.org 30 Jan '10

30 Jan '10

Author: tkreuzer Date: Sat Jan 30 18:47:01 2010 New Revision: 45351 URL: http://svn.reactos.org/svn/reactos?rev=45351&view=rev Log: Add vgafonts to bootcd, needed for console mode Modified: branches/reactos-yarotows/boot/bootdata/packages/reactos.dff Modified: branches/reactos-yarotows/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/boot/bootdata/… ============================================================================== --- branches/reactos-yarotows/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ branches/reactos-yarotows/boot/bootdata/packages/reactos.dff [iso-8859-1] Sat Jan 30 18:47:01 2010 @@ -568,6 +568,8 @@ media\fonts\tahoma.ttf 3 media\fonts\tahomabd.ttf 3 +media\vgafonts\vgafonts.cab 4 + media\nls\c_037.nls 1 media\nls\c_424.nls 1 media\nls\c_500.nls 1

1 0

[spetreolle] 45350: Move Reactos logon sound to WindowsLogon sound scheme. Fixes bug 5002.
by spetreolle＠svn.reactos.org 30 Jan '10

30 Jan '10

Author: spetreolle Date: Sat Jan 30 18:07:33 2010 New Revision: 45350 URL: http://svn.reactos.org/svn/reactos?rev=45350&view=rev Log: Move Reactos logon sound to WindowsLogon sound scheme. Fixes bug 5002. Modified: trunk/reactos/boot/bootdata/hivedef_i386.inf Modified: trunk/reactos/boot/bootdata/hivedef_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivedef_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivedef_i386.inf [iso-8859-1] Sat Jan 30 18:07:33 2010 @@ -1790,14 +1790,14 @@ HKCU,"AppEvents\Schemes\Apps\.Default\SystemQuestion\.Current","",0x00020000,"" HKCU,"AppEvents\Schemes\Apps\.Default\SystemQuestion\.Default","",0x00020000,"" HKCU,"AppEvents\Schemes\Apps\.Default\SystemStart",,0x00000012 -HKCU,"AppEvents\Schemes\Apps\.Default\SystemStart\.Current","",0x00020000,"%SystemRoot%\media\ReactOS_LogOn.wav" -HKCU,"AppEvents\Schemes\Apps\.Default\SystemStart\.Default","",0x00020000,"%SystemRoot%\media\ReactOS_LogOn.wav" +HKCU,"AppEvents\Schemes\Apps\.Default\SystemStart\.Current","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\SystemStart\.Default","",0x00020000,"" HKCU,"AppEvents\Schemes\Apps\.Default\WindowsLogoff",,0x00000012 HKCU,"AppEvents\Schemes\Apps\.Default\WindowsLogoff\.Current","",0x00020000,"" HKCU,"AppEvents\Schemes\Apps\.Default\WindowsLogoff\.Default","",0x00020000,"" HKCU,"AppEvents\Schemes\Apps\.Default\WindowsLogon",,0x00000012 -HKCU,"AppEvents\Schemes\Apps\.Default\WindowsLogon\.Current","",0x00020000,"" -HKCU,"AppEvents\Schemes\Apps\.Default\WindowsLogon\.Default","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\WindowsLogon\.Current","",0x00020000,"%SystemRoot%\media\ReactOS_LogOn.wav" +HKCU,"AppEvents\Schemes\Apps\.Default\WindowsLogon\.Default","",0x00020000,"%SystemRoot%\media\ReactOS_LogOn.wav" HKCU,"AppEvents\Schemes\Apps\Explorer","",0x00000002,"ReactOS Explorer" HKCU,"AppEvents\Schemes\Apps\Explorer","DispFileName",0x00000000,"@mmsys.cpl,-5854" HKCU,"AppEvents\Schemes\Apps\Explorer\EmptyRecycleBin",,0x00000012

1 0

[cgutman] 45349: - Remove some unused junk code
by cgutman＠svn.reactos.org 30 Jan '10

30 Jan '10

Author: cgutman Date: Sat Jan 30 17:45:22 2010 New Revision: 45349 URL: http://svn.reactos.org/svn/reactos?rev=45349&view=rev Log: - Remove some unused junk code Modified: branches/aicom-network-branch/lib/drivers/oskittcp/include/freebsd/src/sys/sys/mbuf.h branches/aicom-network-branch/lib/drivers/oskittcp/oskittcp/uipc_mbuf.c Modified: branches/aicom-network-branch/lib/drivers/oskittcp/include/freebsd/src/sys/sys/mbuf.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/lib/driver… ============================================================================== --- branches/aicom-network-branch/lib/drivers/oskittcp/include/freebsd/src/sys/sys/mbuf.h [iso-8859-1] (original) +++ branches/aicom-network-branch/lib/drivers/oskittcp/include/freebsd/src/sys/sys/mbuf.h [iso-8859-1] Sat Jan 30 17:45:22 2010 @@ -55,13 +55,6 @@ #ifndef M_WAITOK #include <sys/malloc.h> -#endif - -#ifndef OSKIT -#ifdef __REACTOS__ -/* #define OSKIT */ -#define LOCAL_OSKIT_DEFINED -#endif #endif /* @@ -301,21 +294,6 @@ } \ ) -#ifdef __REACTOS__ -#define MCLGET(m, how) { \ - OS_DbgPrint(OSK_MID_TRACE,("(MCLGET) m = %x\n", m)); \ - (m)->m_ext.ext_buf = malloc(MCLBYTES,__FILE__,__LINE__); \ - if ((m)->m_ext.ext_buf != NULL) { \ - (m)->m_data = (m)->m_ext.ext_buf; \ - (m)->m_flags |= M_EXT; \ - (m)->m_ext.ext_size = MCLBYTES; \ - } \ - } - -#define MCLFREE(p) { \ - free( (p), 0 ); \ - } -#else #define MCLGET(m, how) \ { MCLALLOC((m)->m_ext.ext_buf, (how)); \ OS_DbgPrint(OSK_MID_TRACE,("(MCLGET) m = %x\n", m)); \ @@ -335,7 +313,6 @@ mbstat.m_clfree++; \ } \ ) -#endif #else #define MCLGET(m, how) \ { (m)->m_ext.ext_bufio = oskit_bufio_create(MCLBYTES); \ @@ -557,9 +534,4 @@ #endif #endif -#ifdef LOCAL_OSKIT_DEFINED -#undef LOCAL_OSKIT_DEFINED -#undef OSKIT -#endif - #endif /* !_SYS_MBUF_H_ */ Modified: branches/aicom-network-branch/lib/drivers/oskittcp/oskittcp/uipc_mbuf.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/lib/driver… ============================================================================== --- branches/aicom-network-branch/lib/drivers/oskittcp/oskittcp/uipc_mbuf.c [iso-8859-1] (original) +++ branches/aicom-network-branch/lib/drivers/oskittcp/oskittcp/uipc_mbuf.c [iso-8859-1] Sat Jan 30 17:45:22 2010 @@ -365,9 +365,7 @@ #ifdef OSKIT oskit_bufio_addref(m->m_ext.ext_bufio); #else -#ifndef __REACTOS__ mclrefcnt[mtocl(m->m_ext.ext_buf)]++; -#endif #endif /* OSKIT */ n->m_ext = m->m_ext; n->m_flags |= M_EXT; @@ -729,11 +727,7 @@ if (copy) copy(cp, mtod(m, caddr_t), (unsigned)len); else -#ifdef __REACTOS__ - memcpy(mtod(m, caddr_t), cp, len); -#else bcopy(cp, mtod(m, caddr_t), (unsigned)len); -#endif cp += len; *mp = m; mp = &m->m_next;

1 0

[sir_richard] 45348: [HAL]: Add debugging feature to HalpTrap06 error that sometimes happen. Please post/email/IM your trap frame should you see this error.
by sir_richard＠svn.reactos.org 30 Jan '10

30 Jan '10

Author: sir_richard Date: Sat Jan 30 17:40:57 2010 New Revision: 45348 URL: http://svn.reactos.org/svn/reactos?rev=45348&view=rev Log: [HAL]: Add debugging feature to HalpTrap06 error that sometimes happen. Please post/email/IM your trap frame should you see this error. Modified: trunk/reactos/hal/halx86/generic/bios.c Modified: trunk/reactos/hal/halx86/generic/bios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/bios.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/bios.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/bios.c [iso-8859-1] Sat Jan 30 17:40:57 2010 @@ -226,6 +226,7 @@ /* Strange, it isn't! This can happen during NMI */ DPRINT1("HAL: Trap0D while not in V86 mode\n"); + KiDumpTrapFrame(TrapFrame); while (TRUE); }

1 0

[cgutman] 45347: - ovbcopy is used when the source address and destination address overlap so defining it to memcpy was a horrible idea
by cgutman＠svn.reactos.org 30 Jan '10

30 Jan '10

Author: cgutman Date: Sat Jan 30 16:18:21 2010 New Revision: 45347 URL: http://svn.reactos.org/svn/reactos?rev=45347&view=rev Log: - ovbcopy is used when the source address and destination address overlap so defining it to memcpy was a horrible idea Modified: branches/aicom-network-branch/lib/drivers/oskittcp/include/oskitfreebsd.h Modified: branches/aicom-network-branch/lib/drivers/oskittcp/include/oskitfreebsd.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/lib/driver… ============================================================================== --- branches/aicom-network-branch/lib/drivers/oskittcp/include/oskitfreebsd.h [iso-8859-1] (original) +++ branches/aicom-network-branch/lib/drivers/oskittcp/include/oskitfreebsd.h [iso-8859-1] Sat Jan 30 16:18:21 2010 @@ -14,7 +14,7 @@ #define printf DbgPrint #define vprintf DbgVPrint -#define ovbcopy(x,y,z) bcopy(x,y,z) +#define ovbcopy(src,dst,n) memmove(dst,src,n) #define bzero(x,y) memset(x,0,y) #define bcopy(src,dst,n) memcpy(dst,src,n) #ifdef _MSC_VER

1 0

[cfinck] 45346: - Pass through the return value of the program called by buildtime. - Make the Windows version of buildtime fully Unicode-aware.
by cfinck＠svn.reactos.org 30 Jan '10

30 Jan '10

Author: cfinck Date: Sat Jan 30 15:37:45 2010 New Revision: 45346 URL: http://svn.reactos.org/svn/reactos?rev=45346&view=rev Log: - Pass through the return value of the program called by buildtime. - Make the Windows version of buildtime fully Unicode-aware. Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/tools/buildtime.c trunk/tools/RosBE/RosBE-Windows/Tools/buildtime.c Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/tools/buildtime.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/Base-i386/t… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/Base-i386/tools/buildtime.c [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/Base-i386/tools/buildtime.c [iso-8859-1] Sat Jan 30 15:37:45 2010 @@ -1,28 +1,20 @@ /* Program for computing the build time. - Developed by Colin Finck <mail(a)colinfinck.de> + Developed by Colin Finck <colin(a)reactos.org> Derived from "buildtime.c" of RosBE for Windows Released under GNU GPL v2 or any later version. */ #include <stdio.h> -#include <stdlib.h> -#include <string.h> +#include <sys/types.h> +#include <sys/wait.h> #include <time.h> +#include <unistd.h> int main(int argc, char* argv[]) { - char* CommandLine; - double TotalTime; - int i; - int CommandLineLength = 0; - int Hour; - int Minute; - int Ret; - int Second; - time_t StartTime; - time_t FinishTime; + pid_t ProcessId; /* Do we have command line arguments? */ if(argc <= 1) @@ -31,50 +23,52 @@ return 1; } - /* First compute the memory size to allocate */ - for(i = 1; i < argc; i++) + ProcessId = fork(); + if(ProcessId < 0) { - /* Every argument is enclosed between quotes and followed by a space. - The last argument is followed by a terminating null character instead of a space. */ - CommandLineLength += 3 + strlen(argv[i]); - } - - /* Now allocate the needed memory */ - CommandLine = malloc(CommandLineLength + 1); - if(!CommandLine) - { - fprintf(stderr, "buildtime: Unable to allocate memory!\n"); + /* Error */ + fprintf(stderr, "buildtime: fork() failed!\n"); return 1; } + else if(ProcessId == 0) + { + /* Child process */ + execvp(argv[1], &argv[1]); + + /* If this function returned, an error occured */ + fprintf(stderr, "execvp() failed!\n"); + return 1; + } + else + { + /* Parent process */ + double TotalTime; + int Hour; + int Minute; + int Ret; + int Second; + time_t StartTime; + time_t FinishTime; + + time(&StartTime); - memset(CommandLine, 0, CommandLineLength + 1); + if(wait(&Ret) != ProcessId) + { + fprintf(stderr, "buildtime: wait() failed!\n"); + return 1; + } + + time(&FinishTime); - /* Put the command line into the variable */ - for(i = 1; i < argc; i++) - { - strcat(CommandLine, "\""); - strcat(CommandLine, argv[i]); - strcat(CommandLine, "\" "); + /* Compute the needed time and print it */ + TotalTime = difftime(FinishTime, StartTime); + + Second = (int)TotalTime % 60; + TotalTime = TotalTime / 60; + Minute = (int)TotalTime % 60; + Hour = TotalTime / 60; + + printf("\nTotal Build Time: %02d:%02d:%02d\n", Hour, Minute, Second); + return WEXITSTATUS(Ret); } - - CommandLine[CommandLineLength] = 0; - - /* Get the timestamps and execute the command line */ - time(&StartTime); - Ret = system(CommandLine); - time(&FinishTime); - - /* Compute the needed time and print it */ - TotalTime = difftime(FinishTime, StartTime); - - Second = (int)TotalTime % 60; - TotalTime = TotalTime / 60; - Minute = (int)TotalTime % 60; - Hour = TotalTime / 60; - - printf("\nTotal Build Time: %02d:%02d:%02d\n", Hour, Minute, Second); - - /* Final actions */ - free(CommandLine); - return Ret; } Modified: trunk/tools/RosBE/RosBE-Windows/Tools/buildtime.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/bu… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/buildtime.c [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/buildtime.c [iso-8859-1] Sat Jan 30 15:37:45 2010 @@ -5,25 +5,22 @@ * PURPOSE: Buildtime Counter * COPYRIGHT: Copyright 2007 KJK::Hyperion * Copyright 2007 Peter Ward <dralnix(a)gmail.com> + * Copyright 2010 Colin Finck <colin(a)reactos.org> * */ #include <windows.h> #include <time.h> #include <stdio.h> -#include <stdlib.h> -#include <string.h> #include <ctype.h> -#include <wctype.h> -#include <tchar.h> -static LPTSTR SkipSelfArgument(LPTSTR lpszCommandLine) +static PWSTR SkipSelfArgument(PWSTR lpszCommandLine) { - LPTSTR p = lpszCommandLine; + PWSTR p = lpszCommandLine; int quote = 0; // Skip leading whitespace - while(*p != 0 && _istspace(*p)) + while(*p != 0 && iswspace(*p)) ++ p; if(*p == 0) @@ -33,7 +30,7 @@ // BUGBUG: the assumption is that argument 0 never contains escaped quotes do { - if(*p == TEXT('\"')) + if(*p == L'\"') { quote = !quote; ++ p; @@ -42,10 +39,10 @@ ++ p; } - while(*p != 0 && (quote || !_istspace(*p))); + while(*p != 0 && (quote || !iswspace(*p))); // Skip trailing whitespace - while(*p != 0 && _istspace(*p)) + while(*p != 0 && iswspace(*p)) ++ p; return p; @@ -53,15 +50,16 @@ int main() { - LPTSTR CommandLine, FullCommandLine, CommandLineBuffer; + DWORD ExitCode; + PWSTR CommandLine; time_t StartTime, FinishTime; double TotalTime; int Hour, Minute, Second; - int Status; + PROCESS_INFORMATION ProcessInfo; + STARTUPINFOW StartupInfo = {0}; // Get the command line to pass on. - FullCommandLine = GetCommandLine(); - CommandLine = SkipSelfArgument(FullCommandLine); + CommandLine = SkipSelfArgument(GetCommandLineW()); // If nothing is on the command-line exit if (CommandLine[0] == 0) @@ -70,21 +68,20 @@ return 1; } - CommandLineBuffer = malloc((strlen(CommandLine) + 2 + 1)); - if (!CommandLineBuffer) + // Grab the starting timestamp. + time(&StartTime); + + // Run the program and get its exit code. + StartupInfo.cb = sizeof(StartupInfo); + + if(!CreateProcessW(NULL, CommandLine, NULL, NULL, TRUE, NORMAL_PRIORITY_CLASS, NULL, NULL, &StartupInfo, &ProcessInfo)) { - fprintf(stderr, "buildtime: unable to allocate memory\n"); + fprintf(stderr, "buildtime: CreateProcessW() failed!\n"); return 1; } - CommandLineBuffer[0] = 0; - strcat(CommandLineBuffer, CommandLine); - - // Grab the starting timestamp. - time(&StartTime); - - // Run the program (Status is 1 on failure). - Status = system(CommandLineBuffer); + WaitForSingleObject(ProcessInfo.hProcess, INFINITE); + GetExitCodeProcess(ProcessInfo.hProcess, &ExitCode); // Grab the finishing timestamp. time(&FinishTime); @@ -101,8 +98,5 @@ // Print the total build time. printf("\nTotal Build Time: %02d:%02d:%02d", Hour, Minute, Second); - // Free the memory we allocated for the command line. - free(CommandLineBuffer); - - return Status; + return ExitCode; }

1 0

[cfinck] 45345: [FORMATTING] Fix indentation and comment style. No code changes.
by cfinck＠svn.reactos.org 30 Jan '10

30 Jan '10

Author: cfinck Date: Sat Jan 30 14:39:19 2010 New Revision: 45345 URL: http://svn.reactos.org/svn/reactos?rev=45345&view=rev Log: [FORMATTING] Fix indentation and comment style. No code changes. Modified: trunk/tools/RosBE/RosBE-Windows/Tools/buildtime.c Modified: trunk/tools/RosBE/RosBE-Windows/Tools/buildtime.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/bu… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/buildtime.c [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/buildtime.c [iso-8859-1] Sat Jan 30 14:39:19 2010 @@ -19,36 +19,36 @@ static LPTSTR SkipSelfArgument(LPTSTR lpszCommandLine) { - LPTSTR p = lpszCommandLine; - int quote = 0; + LPTSTR p = lpszCommandLine; + int quote = 0; - // Skip leading whitespace - while(*p != 0 && _istspace(*p)) - ++ p; + // Skip leading whitespace + while(*p != 0 && _istspace(*p)) + ++ p; - if(*p == 0) - return p; + if(*p == 0) + return p; - // Skip argument 0 - // BUGBUG: the assumption is that argument 0 never contains escaped quotes - do - { - if(*p == TEXT('\"')) - { - quote = !quote; - ++ p; - continue; - } + // Skip argument 0 + // BUGBUG: the assumption is that argument 0 never contains escaped quotes + do + { + if(*p == TEXT('\"')) + { + quote = !quote; + ++ p; + continue; + } - ++ p; - } - while(*p != 0 && (quote || !_istspace(*p))); + ++ p; + } + while(*p != 0 && (quote || !_istspace(*p))); - // Skip trailing whitespace - while(*p != 0 && _istspace(*p)) - ++ p; + // Skip trailing whitespace + while(*p != 0 && _istspace(*p)) + ++ p; - return p; + return p; } int main() @@ -57,69 +57,51 @@ time_t StartTime, FinishTime; double TotalTime; int Hour, Minute, Second; - int Status; + int Status; - // // Get the command line to pass on. - // FullCommandLine = GetCommandLine(); CommandLine = SkipSelfArgument(FullCommandLine); - // // If nothing is on the command-line exit - // if (CommandLine[0] == 0) { - fprintf(stderr, "buildtime: required parameter not specified\n"); + fprintf(stderr, "buildtime: required parameter not specified\n"); return 1; } CommandLineBuffer = malloc((strlen(CommandLine) + 2 + 1)); if (!CommandLineBuffer) { - fprintf(stderr, "buildtime: unable to allocate memory\n"); + fprintf(stderr, "buildtime: unable to allocate memory\n"); return 1; } - CommandLineBuffer[0] = 0; + CommandLineBuffer[0] = 0; strcat(CommandLineBuffer, CommandLine); - // // Grab the starting timestamp. - // time(&StartTime); - // // Run the program (Status is 1 on failure). - // Status = system(CommandLineBuffer); - // // Grab the finishing timestamp. - // time(&FinishTime); - // // Get the elapsed time. - // TotalTime = difftime(FinishTime, StartTime); - // // Convert the elapsed time to a human readable format. - // Second = (int)TotalTime % 60; TotalTime = TotalTime / 60; Minute = (int)TotalTime % 60; Hour = TotalTime / 60; - // // Print the total build time. - // printf("\nTotal Build Time: %02d:%02d:%02d", Hour, Minute, Second); - // // Free the memory we allocated for the command line. - // free(CommandLineBuffer); return Status;

1 0

[tkreuzer] 45344: [NTOS] - Implement KiSystemFatalException, stubplement KiGeneralProtectionFaultHandler and KiXmmExceptionHandler, KiNpxNotAvailableFaultHandler in C - Implement KiDivideErrorFault, KiOverflowTrap, KiBoundFault, KiInvalidOpcodeFault, KiNpxNotAvailableFault, KiNpxSegmentOverrunAbort, KiInvalidTssFault, KiSegmentNotPresentFault, KiStackFault, KiAlignmentFault, KiMcheckAbort, KiXmmException, KiRaiseAssertion in assembler - Modify rsp instead of pushing a pseudo error code - Move al
by tkreuzer＠svn.reactos.org 30 Jan '10

30 Jan '10

Author: tkreuzer Date: Sat Jan 30 14:35:46 2010 New Revision: 45344 URL: http://svn.reactos.org/svn/reactos?rev=45344&view=rev Log: [NTOS] - Implement KiSystemFatalException, stubplement KiGeneralProtectionFaultHandler and KiXmmExceptionHandler, KiNpxNotAvailableFaultHandler in C - Implement KiDivideErrorFault, KiOverflowTrap, KiBoundFault, KiInvalidOpcodeFault, KiNpxNotAvailableFault, KiNpxSegmentOverrunAbort, KiInvalidTssFault, KiSegmentNotPresentFault, KiStackFault, KiAlignmentFault, KiMcheckAbort, KiXmmException, KiRaiseAssertion in assembler - Modify rsp instead of pushing a pseudo error code - Move all unwind ops into ENTER_TRAP_FRAME macro Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/except.c branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/except.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/except.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/except.c [iso-8859-1] Sat Jan 30 14:35:46 2010 @@ -202,3 +202,99 @@ return STATUS_UNSUCCESSFUL; } + +VOID +DECLSPEC_NORETURN +KiSystemFatalException(IN ULONG ExceptionCode, + IN PKTRAP_FRAME TrapFrame) +{ + /* Bugcheck the system */ + KeBugCheckWithTf(UNEXPECTED_KERNEL_MODE_TRAP, + ExceptionCode, + 0, + 0, + 0, + TrapFrame); +} + +NTSTATUS +NTAPI +KiNpxNotAvailableFaultHandler( + IN PKTRAP_FRAME TrapFrame) +{ + UNIMPLEMENTED; + KeBugCheckWithTf(TRAP_CAUSE_UNKNOWN, 13, 0, 0, 1, TrapFrame); + return -1; +} + + +NTSTATUS +NTAPI +KiGeneralProtectionFaultHandler( + IN PKTRAP_FRAME TrapFrame) +{ + PUCHAR Instructions; + + /* Check for user-mode GPF */ + if (TrapFrame->SegCs & 3) + { + UNIMPLEMENTED; + ASSERT(FALSE); + } + + /* Check for nested exception */ + if ((TrapFrame->Rip >= (ULONG64)KiGeneralProtectionFaultHandler) && + (TrapFrame->Rip < (ULONG64)KiGeneralProtectionFaultHandler)) + { + /* Not implemented */ + UNIMPLEMENTED; + ASSERT(FALSE); + } + + /* Get Instruction Pointer */ + Instructions = (PUCHAR)TrapFrame->Rip; + + /* Check for IRET */ + if (Instructions[0] == 0x48 && Instructions[1] == 0xCF) + { + /* Not implemented */ + UNIMPLEMENTED; + ASSERT(FALSE); + } + + /* Check for RDMSR/WRMSR */ + if ((Instructions[0] == 0xF) && // 2-byte opcode + (((Instructions[1] >> 8) == 0x30) || // RDMSR + ((Instructions[2] >> 8) == 0x32))) // WRMSR + { + /* Unknown CPU MSR, so raise an access violation */ + return STATUS_ACCESS_VIOLATION; + } + + /* Check for lazy segment load */ + if (TrapFrame->SegDs != (KGDT64_R0_DATA | RPL_MASK)) + { + /* Fix it */ + TrapFrame->SegDs = (KGDT64_R0_DATA | RPL_MASK); + return STATUS_SUCCESS; + } + else if (TrapFrame->SegEs != (KGDT64_R0_DATA | RPL_MASK)) + { + /* Fix it */ + TrapFrame->SegEs = (KGDT64_R0_DATA | RPL_MASK); + return STATUS_SUCCESS; + } + + ASSERT(FALSE); + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +NTAPI +KiXmmExceptionHandler( + IN PKTRAP_FRAME TrapFrame) +{ + UNIMPLEMENTED; + KeBugCheckWithTf(TRAP_CAUSE_UNKNOWN, 13, 0, 0, 1, TrapFrame); + return -1; +} Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] Sat Jan 30 14:35:46 2010 @@ -66,6 +66,7 @@ #define TRAPFLAG_XMM HEX(04) #define TRAPFLAG_SEGMENTS HEX(08) #define TRAPFLAG_DEBUG HEX(10) +#define TRAPFLAG_HAS_ERRORCODE HEX(100) #define TRAPFLAG_SYSTEMSERVICE (TRAPFLAG_VOLATILES|TRAPFLAG_DEBUG) #define TRAPFLAG_ALL HEX(ff) @@ -87,17 +88,26 @@ */ MACRO(ENTER_TRAP_FRAME, Flags) LOCAL dont_swap - SIZE_INITIAL_FRAME = 7 * 8 - SIZE_TRAP_FRAME_ALLOC = SIZE_KTRAP_FRAME - SIZE_INITIAL_FRAME + + /* Save the trap flags for this trap */ TRAPFLAGS = VAL(Flags) + /* Size of hardware trap frame */ +if (TRAPFLAGS AND TRAPFLAG_HAS_ERRORCODE) + .pushframe code + SIZE_INITIAL_FRAME = 6 * 8 +else + .pushframe + SIZE_INITIAL_FRAME = 5 * 8 +endif + + /* Make room for a KTRAP_FRAME */ + sub rsp, (SIZE_KTRAP_FRAME - SIZE_INITIAL_FRAME) + .allocstack (SIZE_KTRAP_FRAME - SIZE_INITIAL_FRAME) + .endprolog + /* Save rbp */ - push rbp - .pushreg rbp - - /* Make room for a KTRAP_FRAME and function parameters */ - sub rsp, SIZE_TRAP_FRAME_ALLOC - .allocstack SIZE_TRAP_FRAME_ALLOC + mov [rsp + KTRAP_FRAME_Rbp], rbp /* Point rbp to the KTRAP_FRAME */ lea rbp, [rsp] @@ -237,8 +247,8 @@ /* Restore rbp */ mov rbp, [rbp + KTRAP_FRAME_Rbp] - /* Adjust stack pointer (plus one qword for rbp, one for error code) */ - add rsp, SIZE_TRAP_FRAME_ALLOC + HEX(10) + /* Adjust stack pointer */ + add rsp, KTRAP_FRAME_Rip ENDM @@ -260,7 +270,7 @@ ENDR // rbp = TrapFrame, eax = ExceptionCode, edx = NumParams, r9,r10,r11 = params -_InternalDispatchException: +.PROC _InternalDispatchException /* Allocate stack space for EXCEPTION_RECORD and KEXCEPTION_FRAME */ sub rsp, SIZE_EXCEPTION_RECORD + SIZE_KEXCEPTION_FRAME @@ -326,30 +336,36 @@ add rsp, SIZE_EXCEPTION_RECORD + SIZE_KEXCEPTION_FRAME ret +.ENDP _InternalDispatchException + /* SOFTWARE INTERRUPT SERVICES ***********************************************/ PUBLIC _KiDivideErrorFault .PROC _KiDivideErrorFault - .pushframe - /* Push pseudo error code */ - push 0 - .allocstack 8 - .endprolog - - UNIMPLEMENTED KiDivideErrorFault - - jmp $ + /* Push pseudo error code */ + ENTER_TRAP_FRAME TRAPFLAG_ALL + + /* Enable interrupts */ + sti + + /* Dispatch the exception */ + mov eax, STATUS_INTEGER_DIVIDE_BY_ZERO + mov edx, 0 + mov r9, 0 + mov r10, 0 + mov r11, 0 + call _InternalDispatchException + + /* Return */ + LEAVE_TRAP_FRAME + iretq .ENDP _KiDivideErrorFault + PUBLIC _KiDebugTrapOrFault .PROC _KiDebugTrapOrFault - .pushframe - /* Push pseudo error code */ - push 0 - .allocstack 8 - .endprolog - + /* Push pseudo error code */ ENTER_TRAP_FRAME TRAPFLAG_ALL TRAPINFO KiDebugTrapOrFault @@ -376,27 +392,25 @@ iretq .ENDP _KiDebugTrapOrFault + PUBLIC _KiNmiInterrupt .PROC _KiNmiInterrupt - .pushframe - /* Push pseudo error code */ - push 0 - .allocstack 8 - .endprolog + /* Push pseudo error code */ + ENTER_TRAP_FRAME TRAPFLAG_ALL UNIMPLEMENTED KiNmiInterrupt jmp $ + + /* Return */ + LEAVE_TRAP_FRAME + iretq .ENDP _KiNmiInterrupt + PUBLIC _KiBreakpointTrap .PROC _KiBreakpointTrap - .pushframe - /* Push pseudo error code */ - push 0 - .allocstack 8 - .endprolog - + /* Push pseudo error code */ ENTER_TRAP_FRAME TRAPFLAG_ALL TRAPINFO KiBreakpointTrap @@ -418,82 +432,128 @@ iretq .ENDP _KiBreakpointTrap + PUBLIC _KiOverflowTrap .PROC _KiOverflowTrap - .pushframe - /* Push pseudo error code */ - push 0 - .allocstack 8 - .endprolog - - UNIMPLEMENTED KiOverflowTrap - jmp $ + /* Push pseudo error code */ + ENTER_TRAP_FRAME TRAPFLAG_ALL + + /* Enable interrupts */ + sti + + /* Dispatch the exception */ + mov eax, STATUS_INTEGER_OVERFLOW + mov edx, 3 + mov r9, 0 + mov r10, 0 + mov r11, 0 + call _InternalDispatchException + + /* Return */ + LEAVE_TRAP_FRAME + iretq .ENDP _KiOverflowTrap + PUBLIC _KiBoundFault .PROC _KiBoundFault - .pushframe - /* Push pseudo error code */ - push 0 - .allocstack 8 - - sub rsp, 32 - .allocstack 32 - - mov [rsp + 8], rbx - .savereg rbx, 8 - .endprolog - - UNIMPLEMENTED KiBoundFault - - jmp $ + /* Push pseudo error code */ + ENTER_TRAP_FRAME TRAPFLAG_ALL + + /* Check if the frame was from kernelmode */ + test word ptr [rbp + KTRAP_FRAME_SegCs], 3 + jnz KiBoundFaltUserMode + + /* Bugcheck */ + mov ecx, EXCEPTION_BOUND_CHECK + mov rdx, rbp + call _KiSystemFatalException + +KiBoundFaltUserMode: + /* Enable interrupts for user-mode */ + sti + + /* Dispatch the exception */ + mov eax, STATUS_INTEGER_OVERFLOW + mov edx, 3 + mov r9, 0 + mov r10, 0 + mov r11, 0 + call _InternalDispatchException + + /* Return */ + LEAVE_TRAP_FRAME + iretq .ENDP _KiBoundFault + PUBLIC _KiInvalidOpcodeFault .PROC _KiInvalidOpcodeFault - .pushframe - /* Push pseudo error code */ - push 0 - .allocstack 8 - .endprolog - + /* Push pseudo error code */ ENTER_TRAP_FRAME TRAPFLAG_ALL TRAPINFO KiInvalidOpcodeFault - -// DISPATCH_EXCEPTION STATUS_BREAKPOINT, 3, 0, 0, 0 mov rdx, [rbp + KTRAP_FRAME_Rip] lea rcx, _MsgInvalidOpcodeFault[rip] call qword ptr _FrLdrDbgPrint[rip] - jmp $ + + /* Enable interrupts */ + sti + + /* Check if the frame was from kernelmode */ + test word ptr [rbp + KTRAP_FRAME_SegCs], 3 + jz KiInvalidOpcodeKernel + + // FIXME: handle STATUS_INVALID_LOCK_SEQUENCE + +KiInvalidOpcodeKernel: + /* Kernel mode fault */ + + /* Dispatch the exception */ + mov eax, STATUS_ILLEGAL_INSTRUCTION + mov edx, 3 + mov r9, 0 + mov r10, 0 + mov r11, 0 + call _InternalDispatchException /* Return */ LEAVE_TRAP_FRAME iretq .ENDP _KiInvalidOpcodeFault + PUBLIC _KiNpxNotAvailableFault .PROC _KiNpxNotAvailableFault - .pushframe - /* Push pseudo error code */ - push 0 - .allocstack 8 - .endprolog - - UNIMPLEMENTED KiNpxNotAvailableFault - - jmp $ + /* Push pseudo error code */ + ENTER_TRAP_FRAME TRAPFLAG_ALL + + /* Call the C handler */ + mov rcx, rbp + call _KiNpxNotAvailableFaultHandler + + /* Check the return status code */ + test eax, eax + jz KiNpxNotAvailableFaultExit + + /* Dispatch the exception */ + mov edx, 3 + mov r9, 0 + mov r10, 0 + mov r11, 0 + call _InternalDispatchException + +KiNpxNotAvailableFaultExit: + /* Return */ + LEAVE_TRAP_FRAME + iretq .ENDP _KiNpxNotAvailableFault + PUBLIC _KiDoubleFaultAbort .PROC _KiDoubleFaultAbort - .pushframe - /* Push pseudo error code */ - push 0 - .allocstack 8 - .endprolog - + /* Push pseudo error code */ ENTER_TRAP_FRAME TRAPFLAG_ALL lea rcx, _MsgDoubleFault[rip] @@ -501,119 +561,94 @@ mov r8, rbp call qword ptr _FrLdrDbgPrint[rip] - /* Bugcheck code UNEXPECTED_KERNEL_MODE_TRAP */ - mov rcx, HEX(0000007F) - - /* Set double fault parameters */ - mov rdx, 8 // EXCEPTION_DOUBLE_FAULT - mov r8, 0 - mov r9, 0 - mov [rbp + KTRAP_FRAME_P5], rbp // trap frame (HACKY) - push 0 - call _KeBugCheckWithTf + /* Bugcheck */ + mov ecx, 8 // EXCEPTION_DOUBLE_FAULT + mov rdx, rbp + call _KiSystemFatalException jmp $ .ENDP _KiDoubleFaultAbort + PUBLIC _KiNpxSegmentOverrunAbort .PROC _KiNpxSegmentOverrunAbort - .pushframe - /* Push pseudo error code */ - push 0 - .allocstack 8 - .endprolog - - UNIMPLEMENTED KiNpxSegmentOverrunAbort + /* Push pseudo error code */ + ENTER_TRAP_FRAME TRAPFLAG_ALL + + /* Bugcheck */ + mov ecx, EXCEPTION_NPX_OVERRUN + mov rdx, rbp + call _KiSystemFatalException jmp $ .ENDP _KiNpxSegmentOverrunAbort + PUBLIC _KiInvalidTssFault .PROC _KiInvalidTssFault - .pushframe code /* We have an error code */ - .endprolog - - UNIMPLEMENTED KiInvalidTssFault + ENTER_TRAP_FRAME (TRAPFLAG_HAS_ERRORCODE | TRAPFLAG_ALL) + + /* Bugcheck */ + mov ecx, EXCEPTION_INVALID_TSS + mov rdx, rbp + call _KiSystemFatalException jmp $ .ENDP _KiInvalidTssFault + PUBLIC _KiSegmentNotPresentFault .PROC _KiSegmentNotPresentFault - .pushframe /* We have an error code */ - .endprolog - - UNIMPLEMENTED KiSegmentNotPresentFault + ENTER_TRAP_FRAME (TRAPFLAG_HAS_ERRORCODE | TRAPFLAG_ALL) + + /* Bugcheck */ + mov ecx, EXCEPTION_SEGMENT_NOT_PRESENT + mov rdx, rbp + call _KiSystemFatalException jmp $ .ENDP _KiSegmentNotPresentFault + PUBLIC _KiStackFault .PROC _KiStackFault - .pushframe code /* We have an error code */ - .endprolog - - UNIMPLEMENTED KiStackFault + ENTER_TRAP_FRAME (TRAPFLAG_HAS_ERRORCODE | TRAPFLAG_ALL) + + /* Bugcheck */ + mov ecx, EXCEPTION_STACK_FAULT + mov rdx, rbp + call _KiSystemFatalException jmp $ .ENDP _KiStackFault + PUBLIC _KiGeneralProtectionFault .PROC _KiGeneralProtectionFault - .pushframe code /* We have an error code */ - .endprolog - - cli - ENTER_TRAP_FRAME TRAPFLAG_ALL + ENTER_TRAP_FRAME (TRAPFLAG_HAS_ERRORCODE | TRAPFLAG_ALL) TRAPINFO KiGeneralProtectionFault - mov rdx, [rbp + KTRAP_FRAME_Rip] lea rcx, _MsgGeneralProtFault[rip] call qword ptr _FrLdrDbgPrint[rip] - /* Check if this was from user-mode */ - cmp byte ptr [rbp + KTRAP_FRAME_PreviousMode], KernelMode - jnz KiGpfUserMode - - /* Get instruction */ - mov rax, [rbp + KTRAP_FRAME_Rip] - mov rax, [rax] - - /* Check for MSR failure */ - cmp al, HEX(0F) - jz KiGpfMsr - - /* Check for IRET */ - cmp ax, HEX(0CF48) - je KiGpfIret - - /* Check for pop ds/es/fs/gs */ - xor edx, edx - cmp al, HEX(1F) - jz KiGpfPopSegDs - cmp al, HEX(07) - jz KiGpfPopSegEs - cmp ax, HEX(0A10F) - jz KiGpfPopSegFs - cmp ax, HEX(0A90F) - jz KiGpfPopSegGs - - - mov dx, HEX(002B) // KGDT64_R3_DATA | RPL_MASK - cmp [rbp + KTRAP_FRAME_SegDs], dx - jne KiGpfPopSegDs - cmp [rbp + KTRAP_FRAME_SegEs], dx - jne KiGpfPopSegEs - cmp [rbp + KTRAP_FRAME_SegGs], dx - jne KiGpfPopSegGs - mov dx, HEX(0053) // KGDT64_R3_CMTEB | RPL_MASK - cmp [rbp + KTRAP_FRAME_SegFs], dx - jne KiGpfPopSegFs + /* Call the C handler */ + call _KiGeneralProtectionFaultHandler + + /* Check for success */ + test eax, eax + jge KiGpfExit + + /* Dispatch the exception */ + mov edx, 3 + mov r9, 0 + mov r10, 0 + mov r11, 0 + call _InternalDispatchException KiGpfFatal: @@ -626,61 +661,17 @@ mov [rsp + KTRAP_FRAME_P5+8], rbp // trap frame call _KeBugCheckWithTf - -KiGpfPopSegDs: - mov [rbp + KTRAP_FRAME_SegDs], dx - jmp KiGpfPopSeg - -KiGpfPopSegEs: - mov [rbp + KTRAP_FRAME_SegEs], dx - jmp KiGpfPopSeg - -KiGpfPopSegFs: - mov [rbp + KTRAP_FRAME_SegFs], dx - jmp KiGpfPopSeg - -KiGpfPopSegGs: - mov [rbp + KTRAP_FRAME_SegGs], dx - jmp KiGpfPopSeg - -KiGpfPopSeg: - jmp KiGpfExit - -KiGpfIret: - /* Get error code */ - mov ax, [rbp + KTRAP_FRAME_ErrorCode] -// and ax, ~RPL_MASK - -KiGpfMsr: - - jmp KiGpfFatal - - -KiGpfUserMode: - - /* Dispatch the exception */ - mov eax, STATUS_ACCESS_VIOLATION - mov edx, 2 - mov r9, [rbp + KTRAP_FRAME_ErrorCode] - mov r10, 0 - mov r11, 0 - call _InternalDispatchException - KiGpfExit: - /* Return */ LEAVE_TRAP_FRAME iretq - .ENDP _KiGeneralProtectionFault + PUBLIC _KiPageFault .PROC _KiPageFault - .pushframe code /* We have an error code */ - .endprolog - - ENTER_TRAP_FRAME TRAPFLAG_ALL + ENTER_TRAP_FRAME (TRAPFLAG_HAS_ERRORCODE | TRAPFLAG_ALL) TRAPINFO KiPageFault @@ -740,88 +731,114 @@ call _InternalDispatchException PageFaultReturn: - LEAVE_TRAP_FRAME; + LEAVE_TRAP_FRAME iretq .ENDP _KiPageFault + PUBLIC _KiFloatingErrorFault .PROC _KiFloatingErrorFault - .pushframe - /* Push pseudo error code */ - push 0 - .allocstack 8 - .endprolog + /* Push pseudo error code */ + ENTER_TRAP_FRAME TRAPFLAG_ALL UNIMPLEMENTED KiFloatingErrorFault jmp $ .ENDP _KiFloatingErrorFault + PUBLIC _KiAlignmentFault .PROC _KiAlignmentFault - .pushframe code /* We have an error code */ - .endprolog - - UNIMPLEMENTED KiAlignmentFault + ENTER_TRAP_FRAME (TRAPFLAG_HAS_ERRORCODE | TRAPFLAG_ALL) + + /* Enable interrupts */ + sti + + /* Bugcheck */ + mov ecx, EXCEPTION_ALIGNMENT_CHECK + mov rdx, rbp + call _KiSystemFatalException jmp $ .ENDP _KiAlignmentFault + PUBLIC _KiMcheckAbort .PROC _KiMcheckAbort - .pushframe - /* Push pseudo error code */ - push 0 - .allocstack 8 - .endprolog - - UNIMPLEMENTED KiMcheckAbort + /* Push pseudo error code */ + ENTER_TRAP_FRAME TRAPFLAG_ALL + + /* Bugcheck */ + mov ecx, HEX(12) + mov rdx, rbp + call _KiSystemFatalException jmp $ .ENDP _KiMcheckAbort + PUBLIC _KiXmmException .PROC _KiXmmException - .pushframe - /* Push pseudo error code */ - push 0 - .allocstack 8 - .endprolog - - UNIMPLEMENTED KiXmmException - - jmp $ + /* Push pseudo error code */ + ENTER_TRAP_FRAME TRAPFLAG_ALL + + /* Call the C handler */ + mov rcx, rbp + call _KiXmmExceptionHandler + + /* Check for success */ + test eax, eax + jge KiXmmExit + + /* Dispatch the exception */ + mov edx, 3 + mov r9, 0 + mov r10, 0 + mov r11, 0 + call _InternalDispatchException + +KiXmmExit: + LEAVE_TRAP_FRAME + iretq .ENDP _KiXmmException + PUBLIC _KiApcInterrupt .PROC _KiApcInterrupt - .pushframe code - .endprolog + /* We have an error code */ + ENTER_TRAP_FRAME (TRAPFLAG_HAS_ERRORCODE | TRAPFLAG_ALL) UNIMPLEMENTED KiApcInterrupt jmp $ .ENDP _KiApcInterrupt + PUBLIC _KiRaiseAssertion .PROC _KiRaiseAssertion - .pushframe code - .endprolog - - UNIMPLEMENTED KiRaiseAssertion + /* We have an error code */ + ENTER_TRAP_FRAME (TRAPFLAG_HAS_ERRORCODE | TRAPFLAG_ALL) + + /* Decrement RIP to point to the INT2C instruction (2 bytes, not 1 like INT3) */ + sub qword ptr [rbp + KTRAP_FRAME_Rip], 2 + + /* Dispatch the exception */ + mov eax, STATUS_ASSERTION_FAILURE + mov edx, 0 + mov r9, 0 + mov r10, 0 + mov r11, 0 + call _InternalDispatchException - jmp $ + LEAVE_TRAP_FRAME + iretq .ENDP _KiRaiseAssertion + PUBLIC _KiDebugServiceTrap .PROC _KiDebugServiceTrap - .pushframe - /* Push pseudo error code */ - push 0 - .allocstack 8 - .endprolog - + /* Push pseudo error code */ ENTER_TRAP_FRAME TRAPFLAG_ALL TRAPINFO KiDebugServiceTrap @@ -841,36 +858,34 @@ iretq .ENDP _KiDebugServiceTrap + PUBLIC _KiDpcInterrupt .PROC _KiDpcInterrupt - .pushframe code - .endprolog + /* We have an error code */ + ENTER_TRAP_FRAME (TRAPFLAG_HAS_ERRORCODE | TRAPFLAG_ALL) UNIMPLEMENTED KiDpcInterrupt jmp $ .ENDP _KiDpcInterrupt + PUBLIC _KiIpiInterrupt .PROC _KiIpiInterrupt - .pushframe code - .endprolog + /* We have an error code */ + ENTER_TRAP_FRAME (TRAPFLAG_HAS_ERRORCODE | TRAPFLAG_ALL) UNIMPLEMENTED KiIpiInterrupt jmp $ .ENDP _KiIpiInterrupt + PUBLIC _KiUnexpectedInterrupt .PROC _KiUnexpectedInterrupt - .pushframe - .endprolog - /* The error code is the vector */ - cli - - ENTER_TRAP_FRAME TRAPFLAG_ALL + ENTER_TRAP_FRAME (TRAPFLAG_HAS_ERRORCODE | TRAPFLAG_ALL) /* Set bugcheck parameters */ mov ecx, TRAP_CAUSE_UNKNOWN @@ -881,14 +896,9 @@ mov [rbp + KTRAP_FRAME_P5 + 8], rbp // trap frame call _KeBugCheckWithTf + jmp $ .ENDP _KiUnexpectedInterrupt -PUBLIC _KiSystemFatalException -.PROC _KiSystemFatalException - .endprolog - -.ENDP _KiSystemFatalException - END

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