Ros-diffs

ros-diffs@reactos.org

81390 discussions

[chorns] 14786: Use correct case
by chorns＠svn.reactos.com 23 Apr '05

23 Apr '05

Use correct case Modified: branches/xmlbuildsystem/reactos/subsys/system/reporterror/reporterror.rc _____ Modified: branches/xmlbuildsystem/reactos/subsys/system/reporterror/reporterror.rc --- branches/xmlbuildsystem/reactos/subsys/system/reporterror/reporterror.rc 2005-04-23 18:15:39 UTC (rev 14785) +++ branches/xmlbuildsystem/reactos/subsys/system/reporterror/reporterror.rc 2005-04-23 18:16:59 UTC (rev 14786) @@ -16,4 +16,4 @@ #include "En.rc" #include "De.rc" -#include "Dk.rc" +#include "dk.rc"

1 0

[ion] 14785: Share compiler-generated asm exports between ntdll and ntoskrnl (stuff like aullshr, alldiv, etc
by ion＠svn.reactos.com 23 Apr '05

23 Apr '05

Share compiler-generated asm exports between ntdll and ntoskrnl (stuff like aullshr, alldiv, etc Modified: trunk/reactos/lib/ntdll/makefile Modified: trunk/reactos/lib/ntdll/rtl/apc.c Deleted: trunk/reactos/lib/ntdll/rtl/i386/alldiv.s Deleted: trunk/reactos/lib/ntdll/rtl/i386/allmul.s Deleted: trunk/reactos/lib/ntdll/rtl/i386/allrem.s Deleted: trunk/reactos/lib/ntdll/rtl/i386/allshl.s Deleted: trunk/reactos/lib/ntdll/rtl/i386/allshr.s Deleted: trunk/reactos/lib/ntdll/rtl/i386/aulldiv.s Deleted: trunk/reactos/lib/ntdll/rtl/i386/aullrem.s Deleted: trunk/reactos/lib/ntdll/rtl/i386/aullshr.s Deleted: trunk/reactos/lib/ntdll/rtl/i386/exception.c Modified: trunk/reactos/lib/ntdll/rtl/i386/ftol.c Added: trunk/reactos/lib/rtl/i386/alldiv.s Added: trunk/reactos/lib/rtl/i386/allmul.s Added: trunk/reactos/lib/rtl/i386/allrem.s Added: trunk/reactos/lib/rtl/i386/allshl.s Added: trunk/reactos/lib/rtl/i386/allshr.s Added: trunk/reactos/lib/rtl/i386/aulldiv.s Added: trunk/reactos/lib/rtl/i386/aullrem.s Added: trunk/reactos/lib/rtl/i386/aullshr.s Modified: trunk/reactos/lib/rtl/makefile Modified: trunk/reactos/ntoskrnl/Makefile.i386 Deleted: trunk/reactos/ntoskrnl/ke/i386/i386-mcount.S Deleted: trunk/reactos/ntoskrnl/rtl/i386/alldiv.s Deleted: trunk/reactos/ntoskrnl/rtl/i386/allmul.s Deleted: trunk/reactos/ntoskrnl/rtl/i386/allrem.s Deleted: trunk/reactos/ntoskrnl/rtl/i386/allshl.s Deleted: trunk/reactos/ntoskrnl/rtl/i386/allshr.s Deleted: trunk/reactos/ntoskrnl/rtl/i386/aulldiv.s Deleted: trunk/reactos/ntoskrnl/rtl/i386/aullrem.s Deleted: trunk/reactos/ntoskrnl/rtl/i386/aullshr.s _____ Modified: trunk/reactos/lib/ntdll/makefile --- trunk/reactos/lib/ntdll/makefile 2005-04-23 18:00:59 UTC (rev 14784) +++ trunk/reactos/lib/ntdll/makefile 2005-04-23 18:15:39 UTC (rev 14785) @@ -51,15 +51,6 @@ ldr/utils.o RTL_I386_OBJECTS = \ - rtl/i386/alldiv.o \ - rtl/i386/allmul.o \ - rtl/i386/allrem.o \ - rtl/i386/allshl.o \ - rtl/i386/allshr.o \ - rtl/i386/aulldiv.o \ - rtl/i386/aullrem.o \ - rtl/i386/aullshr.o \ - rtl/i386/float.o \ rtl/i386/ftol.o RTL_OBJECTS = \ _____ Modified: trunk/reactos/lib/ntdll/rtl/apc.c --- trunk/reactos/lib/ntdll/rtl/apc.c 2005-04-23 18:00:59 UTC (rev 14784) +++ trunk/reactos/lib/ntdll/rtl/apc.c 2005-04-23 18:15:39 UTC (rev 14785) @@ -28,6 +28,7 @@ #include <ddk/ntddk.h> #include <string.h> +#include <debug.h> /* FUNCTIONS ***************************************************************/ @@ -41,12 +42,14 @@ /* * Call the APC */ + //DPRINT1("ITS ME\n"); ApcRoutine(ApcContext, Iosb, Reserved); /* * Switch back to the interrupted context */ + //DPRINT1("switch back\n"); NtContinue(Context, 1); } _____ Deleted: trunk/reactos/lib/ntdll/rtl/i386/alldiv.s --- trunk/reactos/lib/ntdll/rtl/i386/alldiv.s 2005-04-23 18:00:59 UTC (rev 14784) +++ trunk/reactos/lib/ntdll/rtl/i386/alldiv.s 2005-04-23 18:15:39 UTC (rev 14785) @@ -1,50 +0,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: Math support for IA-32 - * FILE: lib/ntdll/rtl/i386/alldiv.s - * PROGRAMER: Eric Kohl (ekohl(a)rz-online.de) - */ - -/* - * long long - * __alldiv(long long Dividend, long long Divisor); - * - * Parameters: - * [ESP+04h] - long long Dividend - * [ESP+0Ch] - long long Divisor - * Registers: - * Unknown - * Returns: - * EDX:EAX - long long quotient (Dividend/Divisor) - * Notes: - * Routine removes the arguments from the stack. - */ -.globl __alldiv -__alldiv: - call ___divdi3 - ret $0x10 - -/* -__alldiv: - pushl %ebp - movl %esp, %ebp - pushl %eax - pushl %eax - movl 20(%ebp), %eax - pushl %eax - movl 16(%ebp), %eax - pushl %eax - movl 12(%ebp), %eax - pushl %eax - movl 8(%ebp), %eax - pushl %eax - call ___divdi3 - addl $16, %esp - movl %ebp, %esp - popl %ebp - ret -*/ - -/* EOF */ _____ Deleted: trunk/reactos/lib/ntdll/rtl/i386/allmul.s --- trunk/reactos/lib/ntdll/rtl/i386/allmul.s 2005-04-23 18:00:59 UTC (rev 14784) +++ trunk/reactos/lib/ntdll/rtl/i386/allmul.s 2005-04-23 18:15:39 UTC (rev 14785) @@ -1,54 +0,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: Math support for IA-32 - * FILE: lib/ntdll/rtl/i386/allmul.s - * PROGRAMER: Eric Kohl (ekohl(a)rz-online.de) - */ - -/* - * long long - * __allmul(long long Multiplier, long long Multiplicand); - * - * Parameters: - * [ESP+04h] - long long Multiplier - * [ESP+0Ch] - long long Multiplicand - * Registers: - * Unknown - * Returns: - * EDX:EAX - long long product (Multiplier*Multiplicand) - * Notes: - * Routine removes the arguments from the stack. - */ -.globl __allmul -__allmul: - pushl %ebp - movl %esp, %ebp - pushl %edi - pushl %esi - pushl %ebx - subl $12, %esp - movl 16(%ebp), %ebx - movl 8(%ebp), %eax - mull %ebx - movl 20(%ebp), %ecx - movl %eax, -24(%ebp) - movl 8(%ebp), %eax - movl %edx, %esi - imull %ecx, %eax - addl %eax, %esi - movl 12(%ebp), %eax - imull %eax, %ebx - leal (%ebx,%esi), %eax - movl %eax, -20(%ebp) - movl -24(%ebp), %eax - movl -20(%ebp), %edx - addl $12, %esp - popl %ebx - popl %esi - popl %edi - popl %ebp - ret $0x10 - -/* EOF */ _____ Deleted: trunk/reactos/lib/ntdll/rtl/i386/allrem.s --- trunk/reactos/lib/ntdll/rtl/i386/allrem.s 2005-04-23 18:00:59 UTC (rev 14784) +++ trunk/reactos/lib/ntdll/rtl/i386/allrem.s 2005-04-23 18:15:39 UTC (rev 14785) @@ -1,31 +0,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: Math support for IA-32 - * FILE: lib/ntdll/rtl/i386/math.s - * PROGRAMER: Eric Kohl (ekohl(a)rz-online.de) - * NOTES: This file is shared with ntoskrnl/rtl/i386/math.s. - * Please keep the files synchronized! - */ - -/* - * long long - * __allrem(long long Dividend, long long Divisor); - * - * Parameters: - * [ESP+04h] - long long Dividend - * [ESP+0Ch] - long long Divisor - * Registers: - * Unknown - * Returns: - * EDX:EAX - long long remainder (Dividend/Divisor) - * Notes: - * Routine removes the arguments from the stack. - */ -.globl __allrem -__allrem: - call ___moddi3 - ret $16 - -/* EOF */ _____ Deleted: trunk/reactos/lib/ntdll/rtl/i386/allshl.s --- trunk/reactos/lib/ntdll/rtl/i386/allshl.s 2005-04-23 18:00:59 UTC (rev 14784) +++ trunk/reactos/lib/ntdll/rtl/i386/allshl.s 2005-04-23 18:15:39 UTC (rev 14785) @@ -1,33 +0,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: Math support for IA-32 - * FILE: lib/ntdll/rtl/i386/allshl.s - * PROGRAMER: Eric Kohl (ekohl(a)rz-online.de) - */ - -/* - * long long - * __allshl(long long Value, unsigned char Shift); - * - * Parameters: - * EDX:EAX - signed long long value to be shifted left - * CL - number of bits to shift by - * Registers: - * Destroys CL - * Returns: - * EDX:EAX - shifted value - */ -.globl __allshl -__allshl: - shldl %cl, %eax, %edx - sall %cl, %eax - andl $32, %ecx - je L1 - movl %eax, %edx - xorl %eax, %eax -L1: - ret - -/* EOF */ _____ Deleted: trunk/reactos/lib/ntdll/rtl/i386/allshr.s --- trunk/reactos/lib/ntdll/rtl/i386/allshr.s 2005-04-23 18:00:59 UTC (rev 14784) +++ trunk/reactos/lib/ntdll/rtl/i386/allshr.s 2005-04-23 18:15:39 UTC (rev 14785) @@ -1,33 +0,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: Math support for IA-32 - * FILE: lib/ntdll/rtl/i386/allshr.s - * PROGRAMER: Eric Kohl (ekohl(a)rz-online.de) - */ - -/* - * long long - * __allshr(long long Value, unsigned char Shift); - * - * Parameters: - * EDX:EAX - signed long long value to be shifted right - * CL - number of bits to shift by - * Registers: - * Destroys CL - * Returns: - * EDX:EAX - shifted value - */ -.globl __allshr -__allshr: - shrdl %cl, %edx, %eax - sarl %cl, %edx - andl $32, %ecx - je L1 - movl %edx, %eax - sarl $31, %edx -L1: - ret - -/* EOF */ _____ Deleted: trunk/reactos/lib/ntdll/rtl/i386/aulldiv.s --- trunk/reactos/lib/ntdll/rtl/i386/aulldiv.s 2005-04-23 18:00:59 UTC (rev 14784) +++ trunk/reactos/lib/ntdll/rtl/i386/aulldiv.s 2005-04-23 18:15:39 UTC (rev 14785) @@ -1,29 +0,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: Math support for IA-32 - * FILE: lib/ntdll/rtl/i386/aulldiv.s - * PROGRAMER: Eric Kohl (ekohl(a)rz-online.de) - */ - -/* - * unsigned long long - * __aulldiv(unsigned long long Dividend, unsigned long long Divisor); - * - * Parameters: - * [ESP+04h] - unsigned long long Dividend - * [ESP+0Ch] - unsigned long long Divisor - * Registers: - * Unknown - * Returns: - * EDX:EAX - unsigned long long quotient (Dividend/Divisor) - * Notes: - * Routine removes the arguments from the stack. - */ -.globl __aulldiv -__aulldiv: - call ___udivdi3 - ret $16 - -/* EOF */ _____ Deleted: trunk/reactos/lib/ntdll/rtl/i386/aullrem.s --- trunk/reactos/lib/ntdll/rtl/i386/aullrem.s 2005-04-23 18:00:59 UTC (rev 14784) +++ trunk/reactos/lib/ntdll/rtl/i386/aullrem.s 2005-04-23 18:15:39 UTC (rev 14785) @@ -1,29 +0,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: Math support for IA-32 - * FILE: lib/ntdll/rtl/i386/aullrem.s - * PROGRAMER: Eric Kohl (ekohl(a)rz-online.de) - */ - -/* - * unsigned long long - * __aullrem(unsigned long long Dividend, unsigned long long Divisor); - * - * Parameters: - * [ESP+04h] - unsigned long long Dividend - * [ESP+0Ch] - unsigned long long Divisor - * Registers: - * Unknown - * Returns: - * EDX:EAX - unsigned long long remainder (Dividend%Divisor) - * Notes: - * Routine removes the arguments from the stack. - */ -.globl __aullrem -__aullrem: - call ___umoddi3 - ret $16 - -/* EOF */ _____ Deleted: trunk/reactos/lib/ntdll/rtl/i386/aullshr.s --- trunk/reactos/lib/ntdll/rtl/i386/aullshr.s 2005-04-23 18:00:59 UTC (rev 14784) +++ trunk/reactos/lib/ntdll/rtl/i386/aullshr.s 2005-04-23 18:15:39 UTC (rev 14785) @@ -1,32 +0,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: Math support for IA-32 - * FILE: lib/ntdll/rtl/i386/aullshr.s - * PROGRAMER: Eric Kohl (ekohl(a)rz-online.de) - */ - -/* - * unsigned long long - * __aullshr(unsigned long long Value, unsigned char Shift); - * - * Parameters: - * EDX:EAX - unsigned long long value to be shifted right - * CL - number of bits to shift by - * Registers: - * Destroys CL - * Returns: - * EDX:EAX - shifted value - */ -.globl __aullshr -__aullshr: - shrdl %cl, %edx, %eax - shrl %cl, %edx - andl $32, %ecx - je L1 - movl %edx, %eax -L1: - ret - -/* EOF */ _____ Deleted: trunk/reactos/lib/ntdll/rtl/i386/exception.c --- trunk/reactos/lib/ntdll/rtl/i386/exception.c 2005-04-23 18:00:59 UTC (rev 14784) +++ trunk/reactos/lib/ntdll/rtl/i386/exception.c 2005-04-23 18:15:39 UTC (rev 14785) @@ -1,446 +0,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: User-mode exception support for IA-32 - * FILE: lib/ntdll/rtl/i386/exception.c - * PROGRAMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) - */ - -/* INCLUDES *****************************************************************/ - -#include <ddk/ntddk.h> -#include <windows.h> -#include <string.h> - -#define NDEBUG -#include <debug.h> - -/* FUNCTIONS ***************************************************************/ - -/* Implemented in except.s */ - -VOID -RtlpCaptureContext(PCONTEXT pContext); - -/* Macros that will help streamline the SEH implementations for - kernel mode and user mode */ - -#define SehpGetStackLimits(StackBase, StackLimit) \ -{ \ - (*(StackBase)) = NtCurrentTeb()->Tib->StackBase; \ - (*(StackLimit)) = NtCurrentTeb()->Tib->StackLimit; \ -} - -#define SehpGetExceptionList() \ - (PEXCEPTION_REGISTRATION)(NtCurrentTeb()->Tib.ExceptionList) - -#define SehpSetExceptionList(NewExceptionList) \ - NtCurrentTeb()->Tib.ExceptionList = (PVOID)(NewExceptionList) - -#define SehpCaptureContext(Context) \ -{ \ - RtlpCaptureContext(Context); \ -} - -#define SehpContinue(Context, TestAlert) \ - NtContinue(Context, TestAlert) - -/*** Code below this line is shared with ntoskrnl/rtl/i386/exception.c - please keep in sync ***/ - -VOID STDCALL -AsmDebug(ULONG Value) -{ - DbgPrint("Value 0x%.08x\n", Value); -} - - -/* Declare a few prototypes for the functions in except.s */ - -EXCEPTION_DISPOSITION -RtlpExecuteHandlerForException( - PEXCEPTION_RECORD ExceptionRecord, - PEXCEPTION_REGISTRATION RegistrationFrame, - PCONTEXT Context, - PVOID DispatcherContext, - PEXCEPTION_HANDLER ExceptionHandler); - -EXCEPTION_DISPOSITION -RtlpExecuteHandlerForUnwind( - PEXCEPTION_RECORD ExceptionRecord, - PEXCEPTION_REGISTRATION RegistrationFrame, - PCONTEXT Context, - PVOID DispatcherContext, - PEXCEPTION_HANDLER ExceptionHandler); - - -#ifndef NDEBUG - -VOID RtlpDumpExceptionRegistrations(VOID) -{ - PEXCEPTION_REGISTRATION Current; - - DbgPrint("Dumping exception registrations:\n"); - - Current = SehpGetExceptionList(); - - if ((ULONG_PTR)Current != -1) - { - while ((ULONG_PTR)Current != -1) - { - DbgPrint(" (0x%08X) HANDLER (0x%08X)\n", Current, Current->handler); - Current = Current->prev; - } - DbgPrint(" End-Of-List\n"); - } else { - DbgPrint(" No exception registrations exists.\n"); - } -} - -#endif /* NDEBUG */ - -ULONG -RtlpDispatchException(IN PEXCEPTION_RECORD ExceptionRecord, - IN PCONTEXT Context) -{ - PEXCEPTION_REGISTRATION RegistrationFrame; - DWORD DispatcherContext; - DWORD ReturnValue; - - DPRINT("RtlpDispatchException()\n"); - -#ifndef NDEBUG - RtlpDumpExceptionRegistrations(); -#endif /* NDEBUG */ - - RegistrationFrame = SehpGetExceptionList(); - - DPRINT("RegistrationFrame is 0x%X\n", RegistrationFrame); - - while ((ULONG_PTR)RegistrationFrame != -1) - { - EXCEPTION_RECORD ExceptionRecord2; - DWORD Temp = 0; - //PVOID RegistrationFrameEnd = (PVOID)RegistrationFrame + 8; - - // Make sure the registration frame is located within the stack - - DPRINT("Error checking\n"); -#if 0 - if (Teb->Tib.StackBase > RegistrationFrameEnd) - { - DPRINT("Teb->Tib.StackBase (0x%.08x) > RegistrationFrameEnd (0x%.08x)\n", - Teb->Tib.StackBase, RegistrationFrameEnd); - ExceptionRecord->ExceptionFlags |= EXCEPTION_STACK_INVALID; - return ExceptionContinueExecution; - } - // FIXME: Stack top, correct? - if (Teb->Tib.StackLimit < RegistrationFrameEnd) - { - DPRINT("Teb->Tib.StackLimit (0x%.08x) > RegistrationFrameEnd (0x%.08x)\n", - Teb->Tib.StackLimit, RegistrationFrameEnd); - ExceptionRecord->ExceptionFlags |= EXCEPTION_STACK_INVALID; - return ExceptionContinueExecution; - } - - // Make sure stack is DWORD aligned - if ((ULONG_PTR)RegistrationFrame & 3) - { - DPRINT("RegistrationFrameEnd (0x%.08x) is not DWORD aligned.\n", - RegistrationFrameEnd); - ExceptionRecord->ExceptionFlags |= EXCEPTION_STACK_INVALID; - return ExceptionContinueExecution; - } -#endif - -#if 0 - /* FIXME: */ - if (someFlag) - RtlpLogLastExceptionDisposition( hLog, retValue ); -#endif - - DPRINT("Calling handler at 0x%X\n", RegistrationFrame->handler); - DPRINT("ExceptionRecord 0x%X\n", ExceptionRecord); - DPRINT("RegistrationFrame 0x%X\n", RegistrationFrame); - DPRINT("Context 0x%X\n", Context); - DPRINT("&DispatcherContext 0x%X\n", &DispatcherContext); - - ReturnValue = RtlpExecuteHandlerForException( - ExceptionRecord, - RegistrationFrame, - Context, - &DispatcherContext, - RegistrationFrame->handler); -#ifdef DEBUG - DPRINT("Exception handler said 0x%X\n", ReturnValue); - DPRINT("RegistrationFrame == 0x%.08x\n", RegistrationFrame); - { - PULONG sp = (PULONG)((PVOID)RegistrationFrame - 0x08); - DPRINT("StandardESP == 0x%.08x\n", sp[0]); - DPRINT("Exception Pointers == 0x%.08x\n", sp[1]); - DPRINT("PrevFrame == 0x%.08x\n", sp[2]); - DPRINT("Handler == 0x%.08x\n", sp[3]); - DPRINT("ScopeTable == 0x%.08x\n", sp[4]); - DPRINT("TryLevel == 0x%.08x\n", sp[5]); - DPRINT("EBP == 0x%.08x\n", sp[6]); - } -#endif - if (RegistrationFrame == NULL) - { - ExceptionRecord->ExceptionFlags &= ~EXCEPTION_NESTED_CALL; // Turn off flag - } - - if (ReturnValue == ExceptionContinueExecution) - { - DPRINT("ReturnValue == ExceptionContinueExecution\n"); - if (ExceptionRecord->ExceptionFlags & EXCEPTION_NONCONTINUABLE) - { - DPRINT("(ExceptionRecord->ExceptionFlags & EXCEPTION_NONCONTINUABLE) == TRUE\n"); - - ExceptionRecord2.ExceptionRecord = ExceptionRecord; - ExceptionRecord2.ExceptionCode = STATUS_NONCONTINUABLE_EXCEPTION; - ExceptionRecord2.ExceptionFlags = EXCEPTION_NONCONTINUABLE; - ExceptionRecord2.NumberParameters = 0; - RtlRaiseException(&ExceptionRecord2); - } - else - { - /* Copy the (possibly changed) context back to the trap frame and return */ - SehpContinue(Context, FALSE); - return ExceptionContinueExecution; - } - } - else if (ReturnValue == ExceptionContinueSearch) - { - DPRINT("ReturnValue == ExceptionContinueSearch\n"); - - /* Nothing to do here */ - } - else if (ReturnValue == ExceptionNestedException) - { - DPRINT("ReturnValue == ExceptionNestedException\n"); - - ExceptionRecord->ExceptionFlags |= EXCEPTION_EXIT_UNWIND; - if (DispatcherContext > Temp) - { - Temp = DispatcherContext; - } - } - else /* if (ReturnValue == ExceptionCollidedUnwind) */ - { - DPRINT("ReturnValue == ExceptionCollidedUnwind or unknown\n"); - - ExceptionRecord2.ExceptionRecord = ExceptionRecord; - ExceptionRecord2.ExceptionCode = STATUS_INVALID_DISPOSITION; - ExceptionRecord2.ExceptionFlags = EXCEPTION_NONCONTINUABLE; - ExceptionRecord2.NumberParameters = 0; - RtlRaiseException(&ExceptionRecord2); - } - - RegistrationFrame = RegistrationFrame->prev; // Go to previous frame - } - - /* No exception handler will handle this exception */ - - DPRINT("RtlpDispatchException(): Return ExceptionContinueExecution\n"); - - return ExceptionContinueExecution; -} - -/* - * @implemented - */ -VOID STDCALL -RtlRaiseStatus(NTSTATUS Status) -{ - EXCEPTION_RECORD ExceptionRecord; - - DPRINT("RtlRaiseStatus(Status 0x%.08x)\n", Status); - - ExceptionRecord.ExceptionCode = Status; - ExceptionRecord.ExceptionRecord = NULL; - ExceptionRecord.NumberParameters = 0; - ExceptionRecord.ExceptionFlags = EXCEPTION_NONCONTINUABLE; - RtlRaiseException (& ExceptionRecord); -} - -/* - * @implemented - */ -VOID STDCALL -RtlUnwind(PEXCEPTION_REGISTRATION RegistrationFrame, - PVOID ReturnAddress, - PEXCEPTION_RECORD ExceptionRecord, - DWORD EaxValue) -{ - PEXCEPTION_REGISTRATION ERHead; - PEXCEPTION_RECORD pExceptRec; - EXCEPTION_RECORD TempER; - CONTEXT Context; - - DPRINT("RtlUnwind(). RegistrationFrame 0x%X\n", RegistrationFrame); - -#ifndef NDEBUG - RtlpDumpExceptionRegistrations(); -#endif /* NDEBUG */ - - ERHead = SehpGetExceptionList(); - - DPRINT("ERHead is 0x%X\n", ERHead); - - if (ExceptionRecord == NULL) // The normal case - { - DPRINT("ExceptionRecord == NULL (normal)\n"); - - pExceptRec = &TempER; - pExceptRec->ExceptionFlags = 0; - pExceptRec->ExceptionCode = STATUS_UNWIND; - pExceptRec->ExceptionRecord = NULL; - pExceptRec->ExceptionAddress = ReturnAddress; - pExceptRec->ExceptionInformation[0] = 0; - } - else - { - pExceptRec = ExceptionRecord; - } - - if (RegistrationFrame) - pExceptRec->ExceptionFlags |= EXCEPTION_UNWINDING; - else - pExceptRec->ExceptionFlags |= (EXCEPTION_UNWINDING|EXCEPTION_EXIT_UNWIND); - -#ifndef NDEBUG - DPRINT("ExceptionFlags == 0x%x:\n", pExceptRec->ExceptionFlags); - if (pExceptRec->ExceptionFlags & EXCEPTION_UNWINDING) - { - DPRINT(" * EXCEPTION_UNWINDING (0x%x)\n", EXCEPTION_UNWINDING); - } - if (pExceptRec->ExceptionFlags & EXCEPTION_EXIT_UNWIND) - { - DPRINT(" * EXCEPTION_EXIT_UNWIND (0x%x)\n", EXCEPTION_EXIT_UNWIND); - } -#endif /* NDEBUG */ - - Context.ContextFlags = - (CONTEXT_i386 | CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS); - - SehpCaptureContext(&Context); - - DPRINT("Context.Eip = 0x%.08x\n", Context.Eip); - DPRINT("Context.Ebp = 0x%.08x\n", Context.Ebp); - DPRINT("Context.Esp = 0x%.08x\n", Context.Esp); - - Context.Esp += 0x10; - Context.Eax = EaxValue; - - // Begin traversing the list of EXCEPTION_REGISTRATION - while ((ULONG_PTR)ERHead != -1) - { - EXCEPTION_RECORD er2; - - DPRINT("ERHead 0x%X\n", ERHead); - - if (ERHead == RegistrationFrame) - { - DPRINT("Continueing execution\n"); - SehpContinue(&Context, FALSE); - return; - } - else - { - // If there's an exception frame, but it's lower on the stack - // than the head of the exception list, something's wrong! - if (RegistrationFrame && (RegistrationFrame <= ERHead)) - { - DPRINT("The exception frame is bad\n"); - - // Generate an exception to bail out - er2.ExceptionRecord = pExceptRec; - er2.NumberParameters = 0; - er2.ExceptionCode = STATUS_INVALID_UNWIND_TARGET; - er2.ExceptionFlags = EXCEPTION_NONCONTINUABLE; - - RtlRaiseException(&er2); - } - } - -#if 0 - Stack = ERHead + sizeof(EXCEPTION_REGISTRATION); - if ( (Teb->Tib.StackBase <= (PVOID)ERHead ) // Make sure that ERHead - && (Teb->Tib.->StackLimit >= (PVOID)Stack ) // is in range, and a multiple - && (0 == ((ULONG_PTR)ERHead & 3)) ) // of 4 (i.e., sane) - { -#else - if (1) { -#endif - PEXCEPTION_REGISTRATION NewERHead; - PEXCEPTION_REGISTRATION pCurrExceptReg; - EXCEPTION_DISPOSITION ReturnValue; - - DPRINT("Executing handler at 0x%X for unwind\n", ERHead->handler); - - ReturnValue = RtlpExecuteHandlerForUnwind( - pExceptRec, - ERHead, - &Context, - &NewERHead, - ERHead->handler); - - DPRINT("Handler at 0x%X returned 0x%X\n", ERHead->handler, ReturnValue); - - if (ReturnValue != ExceptionContinueSearch) - { - if (ReturnValue != ExceptionCollidedUnwind) - { - DPRINT("Bad return value\n"); - - er2.ExceptionRecord = pExceptRec; - er2.NumberParameters = 0; - er2.ExceptionCode = STATUS_INVALID_DISPOSITION; - er2.ExceptionFlags = EXCEPTION_NONCONTINUABLE; - - RtlRaiseException(&er2); - } - else - { - ERHead = NewERHead; - } - } - - pCurrExceptReg = ERHead; - ERHead = ERHead->prev; - - DPRINT("New ERHead is 0x%X\n", ERHead); - - DPRINT("Setting exception registration at 0x%X as current\n", - RegistrationFrame->prev); - - // Unlink the exception handler - SehpSetExceptionList(RegistrationFrame->prev); - } - else // The stack looks goofy! Raise an exception to bail out - { - DPRINT("Bad stack\n"); - - er2.ExceptionRecord = pExceptRec; - er2.NumberParameters = 0; - er2.ExceptionCode = STATUS_BAD_STACK; - er2.ExceptionFlags = EXCEPTION_NONCONTINUABLE; - - RtlRaiseException(&er2); - } - } - - // If we get here, we reached the end of the EXCEPTION_REGISTRATION list. - // This shouldn't happen normally. - - DPRINT("Ran out of exception registrations. RegistrationFrame is (0x%X)\n", - RegistrationFrame); - - if ((ULONG_PTR)RegistrationFrame == -1) - SehpContinue(&Context, FALSE); - else - NtRaiseException(pExceptRec, &Context, 0); -} - -/* EOF */ _____ Modified: trunk/reactos/lib/ntdll/rtl/i386/ftol.c --- trunk/reactos/lib/ntdll/rtl/i386/ftol.c 2005-04-23 18:00:59 UTC (rev 14784) +++ trunk/reactos/lib/ntdll/rtl/i386/ftol.c 2005-04-23 18:15:39 UTC (rev 14785) @@ -8,6 +8,7 @@ * REVISION HISTORY: 2003/04/24 Created */ +int _fltused = 0x9875; /* * This routine is called by MSVC-generated code to convert from floating point * to integer representation. The floating point number to be converted is _____ Added: trunk/reactos/lib/rtl/i386/alldiv.s --- trunk/reactos/lib/rtl/i386/alldiv.s 2005-04-23 18:00:59 UTC (rev 14784) +++ trunk/reactos/lib/rtl/i386/alldiv.s 2005-04-23 18:15:39 UTC (rev 14785) @@ -0,0 +1,50 @@ +/* $Id: alldiv.s 12852 2005-01-06 13:58:04Z mf $ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * PURPOSE: Math support for IA-32 + * FILE: ntoskrnl/rtl/i386/alldiv.s + * PROGRAMER: Eric Kohl (ekohl(a)rz-online.de) + */ + +/* + * long long + * __alldiv(long long Dividend, long long Divisor); + * + * Parameters: + * [ESP+04h] - long long Dividend + * [ESP+0Ch] - long long Divisor + * Registers: + * Unknown + * Returns: + * EDX:EAX - long long quotient (Dividend/Divisor) + * Notes: + * Routine removes the arguments from the stack. + */ +.globl __alldiv +__alldiv: + call ___divdi3 + ret $0x10 + +/* +__alldiv: + pushl %ebp + movl %esp, %ebp + pushl %eax + pushl %eax + movl 20(%ebp), %eax + pushl %eax + movl 16(%ebp), %eax + pushl %eax + movl 12(%ebp), %eax + pushl %eax + movl 8(%ebp), %eax + pushl %eax + call ___divdi3 + addl $16, %esp + movl %ebp, %esp + popl %ebp + ret +*/ + +/* EOF */ _____ Added: trunk/reactos/lib/rtl/i386/allmul.s --- trunk/reactos/lib/rtl/i386/allmul.s 2005-04-23 18:00:59 UTC (rev 14784) +++ trunk/reactos/lib/rtl/i386/allmul.s 2005-04-23 18:15:39 UTC (rev 14785) @@ -0,0 +1,54 @@ +/* $Id: allmul.s 12852 2005-01-06 13:58:04Z mf $ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * PURPOSE: Math support for IA-32 + * FILE: ntoskrnl/rtl/i386/allmul.s + * PROGRAMER: Eric Kohl (ekohl(a)rz-online.de) + */ + +/* + * long long + * __allmul(long long Multiplier, long long Multiplicand); + * + * Parameters: + * [ESP+04h] - long long Multiplier + * [ESP+0Ch] - long long Multiplicand + * Registers: + * Unknown + * Returns: + * EDX:EAX - long long product (Multiplier*Multiplicand) + * Notes: + * Routine removes the arguments from the stack. + */ +.globl __allmul +__allmul: + pushl %ebp + movl %esp, %ebp + pushl %edi + pushl %esi + pushl %ebx + subl $12, %esp + movl 16(%ebp), %ebx + movl 8(%ebp), %eax + mull %ebx + movl 20(%ebp), %ecx + movl %eax, -24(%ebp) + movl 8(%ebp), %eax + movl %edx, %esi + imull %ecx, %eax + addl %eax, %esi + movl 12(%ebp), %eax + imull %eax, %ebx + leal (%ebx,%esi), %eax + movl %eax, -20(%ebp) + movl -24(%ebp), %eax + movl -20(%ebp), %edx + addl $12, %esp + popl %ebx + popl %esi + popl %edi + popl %ebp + ret $0x10 + +/* EOF */ _____ Added: trunk/reactos/lib/rtl/i386/allrem.s --- trunk/reactos/lib/rtl/i386/allrem.s 2005-04-23 18:00:59 UTC (rev 14784) +++ trunk/reactos/lib/rtl/i386/allrem.s 2005-04-23 18:15:39 UTC (rev 14785) @@ -0,0 +1,31 @@ +/* $Id: allrem.s 12852 2005-01-06 13:58:04Z mf $ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * PURPOSE: Math support for IA-32 + * FILE: ntoskrnl/rtl/i386/math.s + * PROGRAMER: Eric Kohl (ekohl(a)rz-online.de) + * NOTES: This file is shared with ntoskrnl/rtl/i386/math.s. + * Please keep the files synchronized! + */ + +/* + * long long + * __allrem(long long Dividend, long long Divisor); + * + * Parameters: + * [ESP+04h] - long long Dividend + * [ESP+0Ch] - long long Divisor + * Registers: + * Unknown + * Returns: + * EDX:EAX - long long remainder (Dividend/Divisor) + * Notes: + * Routine removes the arguments from the stack. + */ +.globl __allrem +__allrem: + call ___moddi3 + ret $16 + +/* EOF */ _____ Added: trunk/reactos/lib/rtl/i386/allshl.s --- trunk/reactos/lib/rtl/i386/allshl.s 2005-04-23 18:00:59 UTC (rev 14784) +++ trunk/reactos/lib/rtl/i386/allshl.s 2005-04-23 18:15:39 UTC (rev 14785) @@ -0,0 +1,33 @@ +/* $Id: allshl.s 12852 2005-01-06 13:58:04Z mf $ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel [truncated at 1000 lines; 608 more skipped]

1 0

[ion] 14784: Remove MDA support
by ion＠svn.reactos.com 23 Apr '05

23 Apr '05

Remove MDA support Modified: trunk/reactos/ntoskrnl/kd/kdebug.c _____ Modified: trunk/reactos/ntoskrnl/kd/kdebug.c --- trunk/reactos/ntoskrnl/kd/kdebug.c 2005-04-23 17:56:10 UTC (rev 14783) +++ trunk/reactos/ntoskrnl/kd/kdebug.c 2005-04-23 18:00:59 UTC (rev 14784) @@ -152,11 +152,6 @@ p2 += 4; KdDebugState |= KD_DEBUG_FILELOG; } - else if (!_strnicmp(p2, "MDA", 3) && BootPhase > 0) - { - p2 += 3; - KdDebugState |= KD_DEBUG_MDA; - } } } else if (!_strnicmp(p2, "KDSERIAL", 8) && BootPhase > 0) @@ -243,9 +238,6 @@ if (KdDebugState & KD_DEBUG_FILELOG && BootPhase > 0) DebugLogInit(); - - if (KdDebugState & KD_DEBUG_MDA && BootPhase > 0) - KdInitializeMda(); } @@ -353,9 +345,6 @@ if (KdDebugState & KD_DEBUG_FILELOG) DebugLogWrite(pch); - if (KdDebugState & KD_DEBUG_MDA) - KdPrintMda(pch); - return((ULONG)String->Length); }

1 0

[ion] 14783: Delete cruft
by ion＠svn.reactos.com 23 Apr '05

23 Apr '05

Delete cruft Modified: trunk/reactos/ntoskrnl/Makefile Deleted: trunk/reactos/ntoskrnl/kd/mda.c Deleted: trunk/reactos/ntoskrnl/ke/i386/multiboot.S _____ Modified: trunk/reactos/ntoskrnl/Makefile --- trunk/reactos/ntoskrnl/Makefile 2005-04-23 17:24:13 UTC (rev 14782) +++ trunk/reactos/ntoskrnl/Makefile 2005-04-23 17:56:10 UTC (rev 14783) @@ -332,7 +332,6 @@ kd/dlog.o \ kd/gdbstub.o \ kd/kdebug.o \ - kd/mda.o \ kd/service.o # User-Mode Debugging (Dbgk) _____ Deleted: trunk/reactos/ntoskrnl/kd/mda.c --- trunk/reactos/ntoskrnl/kd/mda.c 2005-04-23 17:24:13 UTC (rev 14782) +++ trunk/reactos/ntoskrnl/kd/mda.c 2005-04-23 17:56:10 UTC (rev 14783) @@ -1,131 +0,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/kd/mda.c - * PURPOSE: Support for debugging using an MDA card. - * - * PROGRAMMERS: David Welch <welch(a)cwcom.net> - */ - -/* INCLUDES ******************************************************************/ - -#include <ntoskrnl.h> -#include <internal/kdb.h> - -/* VARIABLES ***************************************************************/ - -STATIC ULONG MdaIndexPort; -STATIC ULONG MdaValuePort; -STATIC ULONG MdaStatusPort; -STATIC ULONG MdaGfxPort; -STATIC ULONG MdaModePort; -STATIC PUSHORT VideoBuffer; - -#define MDA_COLUMNS (80) -#define MDA_LINES (25) - -STATIC ULONG MdaCursorX, MdaCursorY; - -/* PRIVATE FUNCTIONS ********************************************************/ - -#if 0 -VOID STATIC -KdWriteByteMDA(ULONG Reg, ULONG Value) -{ - WRITE_PORT_UCHAR((PUCHAR)MdaIndexPort, (CHAR)Reg); - WRITE_PORT_UCHAR((PUCHAR)MdaValuePort, (CHAR)Value); -} - -VOID STATIC -KdWriteWordMDA(ULONG Reg, ULONG Value) -{ - WRITE_PORT_UCHAR((PUCHAR)MdaIndexPort, (CHAR)Reg); - WRITE_PORT_UCHAR((PUCHAR)MdaValuePort, (CHAR)(Value >> 8)); - WRITE_PORT_UCHAR((PUCHAR)MdaIndexPort, (CHAR)(Reg + 1)); - WRITE_PORT_UCHAR((PUCHAR)MdaValuePort, (CHAR)(Value & 0xFF)); -} -#endif - -VOID -KdInitializeMda(VOID) -{ - /* Setup the variables for the various port addresses. */ - MdaIndexPort = 0x3b4; - MdaValuePort = 0x3b5; - MdaModePort = 0x3b8; - MdaStatusPort = 0x3ba; - MdaGfxPort = 0x3bf; - - VideoBuffer = (PUSHORT)(0xff3b0000); - - MdaCursorX = MdaCursorY = 0; -} - -VOID STATIC -KdScrollMda(VOID) -{ - memmove(&VideoBuffer[(MDA_COLUMNS * 0) + 0], - &VideoBuffer[(MDA_COLUMNS * 1) + 0], - MDA_COLUMNS * (MDA_LINES - 1) * 2); - memset(&VideoBuffer[(MDA_COLUMNS * (MDA_LINES - 1)) + 0], 0, - MDA_COLUMNS * 2); -} - -VOID STATIC -KdPutCharMda(CHAR Ch) -{ - if (Ch == '\n') - { - if (MdaCursorY == (MDA_LINES - 1)) - { - KdScrollMda(); - } - else - { - MdaCursorY++; - } - MdaCursorX = 0; - return; - } - VideoBuffer[(MdaCursorY * MDA_COLUMNS) + MdaCursorX] = (Ch & 0xFF) | 0x0700; - MdaCursorX++; - if (MdaCursorX == (MDA_COLUMNS - 1)) - { - if (MdaCursorY == (MDA_LINES - 1)) - { - KdScrollMda(); - } - else - { - MdaCursorY++; - } - MdaCursorX = 0; - } -} - -VOID -KdPrintMda(PCH pch) -{ - while((*pch) != 0) - { - if ((*pch) == '\t') - { - KdPutCharMda(' '); - KdPutCharMda(' '); - KdPutCharMda(' '); - KdPutCharMda(' '); - } - if ((*pch) == '\r') - { - /* Nothing. */ - } - else - { - KdPutCharMda(*pch); - } - pch++; - } -} - -/* EOF */ _____ Deleted: trunk/reactos/ntoskrnl/ke/i386/multiboot.S --- trunk/reactos/ntoskrnl/ke/i386/multiboot.S 2005-04-23 17:24:13 UTC (rev 14782) +++ trunk/reactos/ntoskrnl/ke/i386/multiboot.S 2005-04-23 17:56:10 UTC (rev 14783) @@ -1,382 +0,0 @@ -#include <roscfg.h> -#include <internal/ntoskrnl.h> -#include <internal/i386/ke.h> -#include <internal/i386/segment.h> -#include <internal/ps.h> -#include <internal/i386/mm.h> -#include <internal/i386/fpu.h> - -#define MULTIBOOT_HEADER_MAGIC (0x1BADB002) - -#define MULTIBOOT_HEADER_FLAGS (0x00010003) - -#define V2P(x) (x - KERNEL_BASE + 0x200000) - -#ifdef CONFIG_SMP - -#define AP_MAGIC (0x12481020) - -#endif /* CONFIG_SMP */ - -.globl _NtProcessStartup -.globl _start -.globl _init_stack -.globl _init_stack_top -.globl _trap_stack -.globl _trap_stack_top -.globl _unmap_me -.globl _unmap_me2 -.globl _unmap_me3 -.globl _unmap_me4 -.globl _pagetable_start -.globl _pagetable_end -.globl _pae_pagedirtable - - /* - * This is called by the realmode loader, with protected mode - * enabled, paging disabled and the segment registers pointing - * a 4Gb, 32-bit segment starting at zero. - * - * EAX = Multiboot magic or application processor magic - * - * EBX = Points to a structure in lowmem with data from the - * loader - */ - -_NtProcessStartup: -_start: - jmp _multiboot_entry - - /* Align 32 bits boundary */ - .align 4 - - /* Multiboot header */ -multiboot_header: - /* magic */ - .long MULTIBOOT_HEADER_MAGIC - /* flags */ - .long MULTIBOOT_HEADER_FLAGS - /* checksum */ - .long -(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_FLAGS) - /* header_addr */ - .long (0x200000 + multiboot_header - KERNEL_BASE) - /* load_addr */ - .long 0x200000 - /* load_end_addr */ - .long (__bss_start__ + 0x200000 - KERNEL_BASE) - /* bss_end_addr */ - .long (__bss_end__ + 0x200000 - KERNEL_BASE) - /* entry_addr */ - .long (0x200000 + _start - KERNEL_BASE) - -_multiboot_entry: - /* - * This must be PIC because we haven't set up paging yet - */ - - /* - * Gcc expects this at all times - */ - cld - -#ifdef CONFIG_SMP - - /* - * Save the multiboot or application processor magic - */ - movl %eax, %edx - - cmpl $AP_MAGIC, %edx - je .m1 - -#endif /* CONFIG_SMP */ - - /* - * Zero the BSS - */ - movl %eax, %edx - movl $0, %eax - movl $__bss_end__, %ecx - subl $__bss_start__, %ecx - shr $2, %ecx - movl $__bss_start__, %edi - subl $KERNEL_BASE, %edi - addl $0x200000, %edi - rep - stosl - - /* - * Initialize the page directory - */ - movl $V2P(startup_pagedirectory), %esi - movl $(V2P(lowmem_pagetable) + 0x3), 0x0(%esi) - movl $(V2P(kernel_pagetable) + 0x3), (KERNEL_BASE >> 20)(%esi) - movl $(V2P(kernel_pagetable+4096) + 0x3), ((KERNEL_BASE >> 20) + 4)(%esi) - - movl $(V2P(startup_pagedirectory) + 0x3), 0xF00(%esi) - movl $(V2P(hyperspace_pagetable) + 0x3), 0xF08(%esi) -#ifdef CONFIG_SMP - movl $(V2P(apic_pagetable) + 0x3), 0xFEC(%esi) -#endif /* CONFIG_SMP */ - movl $(V2P(kpcr_pagetable) + 0x3), 0xFF0(%esi) - - /* - * Initialize the page table that maps low memory - */ - movl $V2P(lowmem_pagetable), %esi - movl $0x7, %eax - movl $0, %edi -.l3: - movl %eax, (%esi, %edi) - addl $0x1000, %eax - addl $4, %edi - cmpl $4096, %edi - jl .l3 - - /* - * Initialize the page table that maps kernel memory - */ - movl $V2P(kernel_pagetable), %esi - movl $0x200003, %eax - movl $0, %edi -.l4: - movl %eax, (%esi, %edi) - addl $0x1000, %eax - addl $4, %edi - cmpl $6144, %edi - jl .l4 - -#ifdef CONFIG_SMP - - /* - * Initialize the page table that maps the APIC register address space - */ - - /* - * FIXME: APIC register address space can be non-standard so do the - * mapping later - */ - movl $V2P(apic_pagetable), %esi - movl $0, %edi - movl $0xFEC0001B, %eax - movl %eax, (%esi, %edi) - movl $0x800, %edi - movl $0xFEE0001B, %eax - movl %eax, (%esi, %edi) - -#endif /* CONFIG_SMP */ - - /* - * Initialize the page table that maps the initial KPCR (at FF000000) - */ - movl $V2P(kpcr_pagetable), %esi - movl $0, %edi - movl $0x1003, %eax - movl %eax, (%esi, %edi) - - -#ifdef CONFIG_SMP - -.m1: - /* - * Check for pae mode (only possible for an application processor) - */ - - movl $(V2P(_Ke386Pae)), %eax - cmpb $0, (%eax) - je .m3 - - /* - * Set up the PDBR - */ - movl $(V2P(_pae_pagedirtable)), %eax - movl %eax, %cr3 - - /* - * Enable pae mode - */ - movl %cr4, %eax - orl $X86_CR4_PAE, %eax - movl %eax, %cr4 - - jmp .m4 - -.m3: - -#endif /* CONFIG_SMP */ - - /* - * Set up the PDBR - */ - movl $(V2P(startup_pagedirectory)), %eax - movl %eax, %cr3 - -#ifdef CONFIG_SMP -.m4: -#endif - - /* - * Enable paging and set write protect - */ - movl %cr0, %eax - orl $0x80010000, %eax - movl %eax, %cr0 - - /* - * Do an absolute jump because we now want to execute above 0xc0000000 - */ - movl $.l2, %eax - jmp *%eax -.l2: - - /* - * Load the GDTR and IDTR with new tables located above - * 0xc0000000 - */ - - /* FIXME: Application processors should have their own GDT/IDT */ - lgdt _KiGdtDescriptor - lidt _KiIdtDescriptor - - /* - * Reload the data segment registers - */ - movl $KERNEL_DS, %eax - movl %eax, %ds - movl %eax, %es - movl %eax, %gs - movl %eax, %ss - movl $0, %eax - movl %eax, %fs - -#ifdef CONFIG_SMP - - cmpl $AP_MAGIC, %edx - jne .m2 - - /* - * This is an application processor executing - */ - - /* - * Initialize EFLAGS - */ - pushl $0 - popfl - - /* - * Reserve space for the floating point save area. - */ - subl $SIZEOF_FX_SAVE_AREA, %esp - - /* - * Call the application processor initialization code - */ - pushl $0 - pushl $.l7 - pushl $KERNEL_CS - pushl $_KiSystemStartup - lret - - /* - * Catch illegal returns from KiSystemStartup - */ -.l7: - popl %eax - pushl $0 - call _KeBugCheck@4 - popl %eax -.l8: - jmp .l8 - - -.m2: - -#endif /* CONFIG_SMP */ - - /* - * Load the PCR selector - */ - movl $PCR_SELECTOR, %eax - movl %eax, %fs - - /* - * Load the initial kernel stack - */ - movl $(_init_stack_top - SIZEOF_FX_SAVE_AREA), %esp - - /* - * Initialize EFLAGS - */ - pushl $0 - popfl - - /* - * Call the main kernel initialization - */ - movl $0, %ebp - pushl %ebx - pushl %edx - pushl $.l5 - pushl $KERNEL_CS - pushl $__main - lret - - /* - * Catch illegal returns from main, try bug checking the system, - * if that fails then loop forever. - */ -.l5: - popl %eax - popl %eax - pushl $0 - call _KeBugCheck@4 - popl %eax -.l6: - jmp .l6 - - - /* - * This needs to be page aligned so put it at the beginning of the bss - * segment - */ -.bss -_pagetable_start: -startup_pagedirectory: - .fill 4096, 1, 0 - -lowmem_pagetable: - .fill 4096, 1, 0 - -kernel_pagetable: - .fill 2*4096, 1, 0 - -hyperspace_pagetable: - .fill 4096, 1, 0 - -_pae_pagedirtable: - .fill 4096, 1, 0 -#ifdef CONFIG_SMP -apic_pagetable: - .fill 4096, 1, 0 -#endif /* CONFIG_SMP */ - -kpcr_pagetable: - .fill 4096, 1, 0 -_pagetable_end: -_unmap_me: - .fill 4096, 1, 0 - -_init_stack: - .fill 3*4096, 1, 0 -_init_stack_top: - -_unmap_me2: - .fill 4096, 1, 0 - -_trap_stack: - .fill 3*4096, 1, 0 -_trap_stack_top: - -_unmap_me3: - .fill 4096, 1, 0

1 0

[chorns] 14782: Don't detect host compiler on Linux
by chorns＠svn.reactos.com 23 Apr '05

23 Apr '05

Don't detect host compiler on Linux Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-04-23 17:11:51 UTC (rev 14781) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-04-23 17:24:13 UTC (rev 14782) @@ -590,11 +590,13 @@ compilerCommand = ROS_PREFIXValue + "-gcc"; detectedCompiler = TryToDetectThisCompiler ( compilerCommand ); } +#if defined(WIN32) if ( !detectedCompiler ) { compilerCommand = "gcc"; detectedCompiler = TryToDetectThisCompiler ( compilerCommand ); } +#endif if ( !detectedCompiler ) { compilerCommand = "mingw32-gcc";

1 0

[chorns] 14781: Allow warnings for now (for real this time)
by chorns＠svn.reactos.com 23 Apr '05

23 Apr '05

Allow warnings for now (for real this time) Modified: branches/xmlbuildsystem/reactos/subsys/system/format/format.xml _____ Modified: branches/xmlbuildsystem/reactos/subsys/system/format/format.xml --- branches/xmlbuildsystem/reactos/subsys/system/format/format.xml 2005-04-23 17:09:59 UTC (rev 14780) +++ branches/xmlbuildsystem/reactos/subsys/system/format/format.xml 2005-04-23 17:11:51 UTC (rev 14781) @@ -1,4 +1,4 @@ -<module name="format" type="win32cui" installbase="system32" installname="format.exe" warnings="false"> +<module name="format" type="win32cui" installbase="system32" installname="format.exe" warnings="true"> <include base="format">.</include> <define name="__USE_W32API" /> <library>ntdll</library>

1 0

[chorns] 14780: Allow warnings for now
by chorns＠svn.reactos.com 23 Apr '05

23 Apr '05

Allow warnings for now Modified: branches/xmlbuildsystem/reactos/subsys/system/format/format.xml _____ Modified: branches/xmlbuildsystem/reactos/subsys/system/format/format.xml --- branches/xmlbuildsystem/reactos/subsys/system/format/format.xml 2005-04-23 16:23:57 UTC (rev 14779) +++ branches/xmlbuildsystem/reactos/subsys/system/format/format.xml 2005-04-23 17:09:59 UTC (rev 14780) @@ -1,4 +1,4 @@ -<module name="format" type="win32cui" installbase="system32" installname="format.exe"> +<module name="format" type="win32cui" installbase="system32" installname="format.exe" warnings="false"> <include base="format">.</include> <define name="__USE_W32API" /> <library>ntdll</library>

1 0

[ion] 14779: Add more detailed comment about ThreadListEntry so people don't get confused liek I did
by ion＠svn.reactos.com 23 Apr '05

23 Apr '05

Add more detailed comment about ThreadListEntry so people don't get confused liek I did Modified: trunk/reactos/ntoskrnl/ke/kthread.c Modified: trunk/reactos/ntoskrnl/ps/thread.c _____ Modified: trunk/reactos/ntoskrnl/ke/kthread.c --- trunk/reactos/ntoskrnl/ke/kthread.c 2005-04-23 16:17:27 UTC (rev 14778) +++ trunk/reactos/ntoskrnl/ke/kthread.c 2005-04-23 16:23:57 UTC (rev 14779) @@ -782,7 +782,11 @@ /* Set the Thread to initalized */ Thread->State = Initialized; - /* Insert the Thread into the Process's Thread List */ + /* + * Insert the Thread into the Process's Thread List + * Note, this is the KTHREAD Thread List. It is removed in + * ke/kthread.c!KeTerminateThread. + */ InsertTailList(&Process->ThreadListHead, &Thread->ThreadListEntry); DPRINT("Thread initalized\n"); } _____ Modified: trunk/reactos/ntoskrnl/ps/thread.c --- trunk/reactos/ntoskrnl/ps/thread.c 2005-04-23 16:17:27 UTC (rev 14778) +++ trunk/reactos/ntoskrnl/ps/thread.c 2005-04-23 16:23:57 UTC (rev 14779) @@ -250,7 +250,11 @@ KernelStack); } - /* Insert into Process List */ + /* + * Insert the Thread into the Process's Thread List + * Note, this is the ETHREAD Thread List. It is removed in + * ps/kill.c!PspExitThread. + */ DPRINT("Inserting into Process Thread List \n"); InsertTailList(&Process->ThreadListHead, &Thread->ThreadListEntry);

1 0

[ion] 14778: Move removing process from active list to PspDeleteProcess instead of PspExitProcess. This way we don't have to do it manually after ObInsertObject failure in PspCreateProces. Also, set the Process Query Time at the end of Process Creation, since the process doesn't really exist before then. Thanks to Hartmut for finding the bugs.
by ion＠svn.reactos.com 23 Apr '05

23 Apr '05

Move removing process from active list to PspDeleteProcess instead of PspExitProcess. This way we don't have to do it manually after ObInsertObject failure in PspCreateProces. Also, set the Process Query Time at the end of Process Creation, since the process doesn't really exist before then. Thanks to Hartmut for finding the bugs. Modified: trunk/reactos/ntoskrnl/ps/kill.c _____ Modified: trunk/reactos/ntoskrnl/ps/kill.c --- trunk/reactos/ntoskrnl/ps/kill.c 2005-04-23 16:16:59 UTC (rev 14777) +++ trunk/reactos/ntoskrnl/ps/kill.c 2005-04-23 16:17:27 UTC (rev 14778) @@ -148,6 +148,11 @@ DPRINT("PiDeleteProcess(ObjectBody %x)\n", ObjectBody); + /* Remove it from the Active List */ + ExAcquireFastMutex(&PspActiveProcessMutex); + RemoveEntryList(&Process->ProcessListEntry); + ExReleaseFastMutex(&PspActiveProcessMutex); + /* Delete the CID Handle */ if(Process->UniqueProcessId != NULL) { @@ -411,12 +416,7 @@ DPRINT("PspExitProcess 0x%x\n", Process); PspRunCreateProcessNotifyRoutines(Process, FALSE); - - /* Remove it from the Active List */ - ExAcquireFastMutex(&PspActiveProcessMutex); - RemoveEntryList(&Process->ProcessListEntry); - ExReleaseFastMutex(&PspActiveProcessMutex); - + /* close all handles associated with our process, this needs to be done when the last thread still runs */ ObKillProcess(Process);

1 0

[ion] 14777: Move removing process from active list to PspDeleteProcess instead of PspExitProcess. This way we don't have to do it manually after ObInsertObject failure in PspCreateProces. Also, set the Process Query Time at the end of Process Creation, since the process doesn't really exist before then. Thanks to Hartmut for finding the bus.
by ion＠svn.reactos.com 23 Apr '05

23 Apr '05

Move removing process from active list to PspDeleteProcess instead of PspExitProcess. This way we don't have to do it manually after ObInsertObject failure in PspCreateProces. Also, set the Process Query Time at the end of Process Creation, since the process doesn't really exist before then. Thanks to Hartmut for finding the bus. Modified: trunk/reactos/ntoskrnl/ps/process.c _____ Modified: trunk/reactos/ntoskrnl/ps/process.c --- trunk/reactos/ntoskrnl/ps/process.c 2005-04-23 16:09:06 UTC (rev 14776) +++ trunk/reactos/ntoskrnl/ps/process.c 2005-04-23 16:16:59 UTC (rev 14777) @@ -287,8 +287,6 @@ /* Clean up the Object */ DPRINT("Cleaning Process Object\n"); RtlZeroMemory(Process, sizeof(EPROCESS)); - - KeQuerySystemTime(&Process->CreateTime); /* Inherit stuff from the Parent since we now have the object created */ if (pParentProcess) @@ -411,13 +409,13 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Could not get a handle to the Process Object\n"); - ExAcquireFastMutex(&PspActiveProcessMutex); - RemoveEntryList(&Process->ProcessListEntry); - ExReleaseFastMutex(&PspActiveProcessMutex); ObDereferenceObject(Process); goto exitdereferenceobjects; } + /* Set the Creation Time */ + KeQuerySystemTime(&Process->CreateTime); + DPRINT("Done. Returning handle: %x\n", hProcess); _SEH_TRY {

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