Ros-diffs January 2007

ros-diffs@reactos.org

21 participants
401 discussions

[ion] 25504: [25 bug fixes]: - Implement KeReadStateThread. - Fix PspTerminateProcess to handle case where there's no threads in the process. - Fix check in PspTerminateProcess. ObClearProcessHandleTable gets called if there's a debug port, not if there's an object table. - Simplfy PspReapRoutine. - Fix PspExitThread to wait for all other threads before continuing to kill the last thread. Should fix lots of race/wait conditions. - PspExitThread should check for !DeadThread and not !Terminated be

by ion＠svn.reactos.org

Author: ion Date: Thu Jan 18 12:44:49 2007 New Revision: 25504 URL: http://svn.reactos.org/svn/reactos?rev=25504&view=rev Log: [25 bug fixes]: - Implement KeReadStateThread. - Fix PspTerminateProcess to handle case where there's no threads in the process. - Fix check in PspTerminateProcess. ObClearProcessHandleTable gets called if there's a debug port, not if there's an object table. - Simplfy PspReapRoutine. - Fix PspExitThread to wait for all other threads before continuing to kill the last thread. Should fix lots of race/wait conditions. - PspExitThread should check for !DeadThread and not !Terminated before determining if it should free the TEB. Also, the DbgK handle should only be closed if the thread isn't already dead. - Fixup formatting of some code to warn less on MSVC. - Fail various APIs if acquiring rundown protection failed. - Fix Process Quantum/Priority settings. - Grant PROCESS_TERMINATE by default. - Add PROCESS_SET_INFORMATION, STANDARD_RIGHTS_ALL and PROCESS_SET_QUOTA to the default process granted access mask. - Initialize process/thread/image notification callbacks durin phase 0 Ps initialization. - The Audit Name belongs to the system process, not the idle process. - Detect more failures in phase 0 startup. - Fix various race conditions/incorrect checks in ps/security.c related to impersonation information. Also allow PspAssignPrimaryToken to be called directly with the token pointer and not only the handle. - Wrap system thread startup stub in SEH and write a SEH filter function to print out debug information when a system thread dies unexpectedly. Modified: trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/include/internal/lpc.h trunk/reactos/ntoskrnl/include/internal/ps.h trunk/reactos/ntoskrnl/ke/thrdobj.c trunk/reactos/ntoskrnl/lpc/reply.c trunk/reactos/ntoskrnl/lpc/send.c trunk/reactos/ntoskrnl/ps/kill.c trunk/reactos/ntoskrnl/ps/process.c trunk/reactos/ntoskrnl/ps/psmgr.c trunk/reactos/ntoskrnl/ps/security.c trunk/reactos/ntoskrnl/ps/thread.c Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h Thu Jan 18 12:44:49 2007 @@ -216,6 +216,10 @@ KeSuspendThread(PKTHREAD Thread); BOOLEAN +NTAPI +KeReadStateThread(IN PKTHREAD Thread); + +BOOLEAN FASTCALL KiSwapContext( IN PKTHREAD CurrentThread, Modified: trunk/reactos/ntoskrnl/include/internal/lpc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/lpc.h (original) +++ trunk/reactos/ntoskrnl/include/internal/lpc.h Thu Jan 18 12:44:49 2007 @@ -93,7 +93,8 @@ NTAPI LpcpSaveDataInfoMessage( IN PLPCP_PORT_OBJECT Port, - IN PLPCP_MESSAGE Message + IN PLPCP_MESSAGE Message, + IN ULONG LockHeld ); // Modified: trunk/reactos/ntoskrnl/include/internal/ps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ps.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ps.h Thu Jan 18 12:44:49 2007 @@ -175,7 +175,7 @@ PspSetPrimaryToken( IN PEPROCESS Process, IN HANDLE TokenHandle OPTIONAL, - IN PTOKEN Token OPTIONAL + IN PACCESS_TOKEN Token OPTIONAL ); NTSTATUS Modified: trunk/reactos/ntoskrnl/ke/thrdobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/thrdobj.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/thrdobj.c (original) +++ trunk/reactos/ntoskrnl/ke/thrdobj.c Thu Jan 18 12:44:49 2007 @@ -44,6 +44,17 @@ /* Now find the right set and return it */ BitScanReverse(&Result, Bit); return (UCHAR)Result; +} + + +BOOLEAN +NTAPI +KeReadStateThread(IN PKTHREAD Thread) +{ + ASSERT_THREAD(Thread); + + /* Return signal state */ + return (BOOLEAN)Thread->DispatcherHeader.SignalState; } KPRIORITY Modified: trunk/reactos/ntoskrnl/lpc/reply.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/reply.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/reply.c (original) +++ trunk/reactos/ntoskrnl/lpc/reply.c Thu Jan 18 12:44:49 2007 @@ -57,7 +57,8 @@ VOID NTAPI LpcpSaveDataInfoMessage(IN PLPCP_PORT_OBJECT Port, - IN PLPCP_MESSAGE Message) + IN PLPCP_MESSAGE Message, + IN ULONG LockFlags) { PAGED_CODE(); @@ -402,7 +403,7 @@ if (Message->Request.u2.s2.DataInfoOffset) { /* It does, save it, and don't free the message below */ - LpcpSaveDataInfoMessage(Port, Message); + LpcpSaveDataInfoMessage(Port, Message, 1); Message = NULL; } } Modified: trunk/reactos/ntoskrnl/lpc/send.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/send.c?rev=25… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/send.c (original) +++ trunk/reactos/ntoskrnl/lpc/send.c Thu Jan 18 12:44:49 2007 @@ -391,7 +391,7 @@ (Message->Request.u2.s2.DataInfoOffset)) { /* Save the data information */ - LpcpSaveDataInfoMessage(Port, Message); + LpcpSaveDataInfoMessage(Port, Message, 0); } else { Modified: trunk/reactos/ntoskrnl/ps/kill.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/kill.c?rev=255… ============================================================================== --- trunk/reactos/ntoskrnl/ps/kill.c (original) +++ trunk/reactos/ntoskrnl/ps/kill.c Thu Jan 18 12:44:49 2007 @@ -18,6 +18,7 @@ LIST_ENTRY PspReaperListHead = {0}; WORK_QUEUE_ITEM PspReaperWorkItem; +LARGE_INTEGER ShortTime = {{-10 * 100 * 1000, -1}}; /* PRIVATE FUNCTIONS *********************************************************/ @@ -81,7 +82,8 @@ PspTerminateProcess(IN PEPROCESS Process, IN NTSTATUS ExitStatus) { - PETHREAD Thread = NULL; + PETHREAD Thread; + NTSTATUS Status = STATUS_NOTHING_TO_TERMINATE; PAGED_CODE(); PSTRACE(PS_KILL_DEBUG, "Process: %p ExitStatus: %p\n", Process, ExitStatus); @@ -100,22 +102,26 @@ InterlockedOr((PLONG)&Process->Flags, PSF_PROCESS_DELETE_BIT); /* Get the first thread */ - Thread = PsGetNextProcessThread(Process, Thread); + Thread = PsGetNextProcessThread(Process, NULL); while (Thread) { /* Kill it */ - PSREFTRACE(Thread); PspTerminateThreadByPointer(Thread, ExitStatus, FALSE); - PSREFTRACE(Thread); Thread = PsGetNextProcessThread(Process, Thread); - } - - /* Clear the handle table */ - if (Process->ObjectTable) ObClearProcessHandleTable(Process); - - /* Return success*/ - PSREFTRACE(Process); - return STATUS_SUCCESS; + + /* We had at least one thread, so termination is OK */ + Status = STATUS_SUCCESS; + } + + /* Check if there was nothing to terminate or if we have a debug port */ + if ((Status == STATUS_NOTHING_TO_TERMINATE) || (Process->DebugPort)) + { + /* Clear the handle table anyway */ + ObClearProcessHandleTable(Process); + } + + /* Return status */ + return Status; } NTSTATUS @@ -163,19 +169,16 @@ NTAPI PspReapRoutine(IN PVOID Context) { - PLIST_ENTRY *ListAddr; - PLIST_ENTRY NextEntry; + PSINGLE_LIST_ENTRY NextEntry; PETHREAD Thread; PSTRACE(PS_KILL_DEBUG, "Context: %p\n", Context); - /* Get the Reaper Address Pointer */ - ListAddr = &PspReaperListHead.Flink; - /* Start main loop */ do { /* Write magic value and return the next entry to process */ - NextEntry = InterlockedExchangePointer(ListAddr, (PVOID)1); + NextEntry = InterlockedExchangePointer(&PspReaperListHead.Flink, + (PVOID)1); ASSERT((NextEntry != NULL) && (NextEntry != (PVOID)1)); /* Start inner loop */ @@ -190,15 +193,16 @@ Thread->Tcb.InitialStack = NULL; /* Move to the next entry */ - NextEntry = NextEntry->Flink; + NextEntry = NextEntry->Next; /* Dereference this thread */ ObDereferenceObject(Thread); - PSREFTRACE(Thread); } while ((NextEntry != NULL) && (NextEntry != (PVOID)1)); /* Remove magic value, keep looping if it got changed */ - } while (InterlockedCompareExchangePointer(ListAddr, 0, 1) != (PVOID)1); + } while (InterlockedCompareExchangePointer(&PspReaperListHead.Flink, + 0, + 1) != (PVOID)1); } VOID @@ -245,7 +249,7 @@ /* Check if we have a debug port */ if (Process->DebugPort) { - /* Dererence the Debug Port */ + /* Deference the Debug Port */ ObDereferenceObject(Process->DebugPort); Process->DebugPort = NULL; } @@ -253,7 +257,7 @@ /* Check if we have an exception port */ if (Process->ExceptionPort) { - /* Dererence the Exception Port */ + /* Deference the Exception Port */ ObDereferenceObject(Process->ExceptionPort); Process->ExceptionPort = NULL; } @@ -261,7 +265,7 @@ /* Check if we have a section object */ if (Process->SectionObject) { - /* Dererence the Section Object */ + /* Deference the Section Object */ ObDereferenceObject(Process->SectionObject); Process->SectionObject = NULL; } @@ -279,7 +283,7 @@ /* Kill the Object Info */ ObKillProcess(Process); - /* Dettach */ + /* Detach */ KeUnstackDetachProcess(&ApcState); } @@ -295,7 +299,7 @@ /* Clean the Address Space */ PspExitProcess(FALSE, Process); - /* Dettach */ + /* Detach */ KeUnstackDetachProcess(&ApcState); /* Completely delete the Address Space */ @@ -303,7 +307,7 @@ } /* See if we have a PID */ - if(Process->UniqueProcessId) + if (Process->UniqueProcessId) { /* Delete the PID */ if (!(ExDestroyHandle(PspCidTable, Process->UniqueProcessId))) @@ -331,7 +335,6 @@ /* Destroy the Quota Block */ PspDestroyQuotaBlock(Process); - PSREFTRACE(Process); } VOID @@ -368,7 +371,6 @@ PspDeleteThreadSecurity(Thread); /* Make sure the thread was inserted, before continuing */ - PSREFTRACE(Thread); if (!Process) return; /* Check if the thread list is valid */ @@ -388,8 +390,6 @@ /* Dereference the Process */ ObDereferenceObject(Process); - PSREFTRACE(Thread); - PSREFTRACE(Process); } /* @@ -404,7 +404,7 @@ NTSTATUS Status; PTEB Teb; PEPROCESS CurrentProcess; - PETHREAD Thread; + PETHREAD Thread, OtherThread, PreviousThread = NULL; PVOID DeallocationStack; ULONG Dummy; BOOLEAN Last = FALSE; @@ -421,8 +421,6 @@ ASSERT((Thread) == PsGetCurrentThread()); /* Can't terminate a thread if it attached another process */ - PSREFTRACE(Thread); - PSREFTRACE(CurrentProcess); if (KeIsAttachedProcess()) { /* Bugcheck */ @@ -434,7 +432,7 @@ } /* Lower to Passive Level */ - KfLowerIrql(PASSIVE_LEVEL); + KeLowerIrql(PASSIVE_LEVEL); /* Can't be a worker thread */ if (Thread->ActiveExWorker) @@ -453,9 +451,9 @@ /* Bugcheck */ KEBUGCHECKEX(KERNEL_APC_PENDING_DURING_EXIT, 0, - Thread->Tcb.KernelApcDisable, - APC_LEVEL, - 0); + Thread->Tcb.CombinedApcDisable, + 0, + 1); } /* Lock the thread */ @@ -500,7 +498,44 @@ CurrentProcess->ExitStatus = ExitStatus; } - /* FIXME: Wait on the other threads to finish */ + /* Loop all the current threads */ + FirstEntry = &CurrentProcess->ThreadListHead; + CurrentEntry = FirstEntry->Flink; + while (FirstEntry != CurrentEntry) + { + /* Get the thread on the list */ + OtherThread = CONTAINING_RECORD(CurrentEntry, + ETHREAD, + ThreadListEntry); + + /* Check if it's a thread that's still alive */ + if ((OtherThread != Thread) && + !(KeReadStateThread(&OtherThread->Tcb)) && + (ObReferenceObjectSafe(OtherThread))) + { + /* It's a live thread and we referenced it, unlock process */ + ExReleasePushLockExclusive(&CurrentProcess->ProcessLock); + KeLeaveCriticalRegion(); + + /* Wait on the thread */ + KeWaitForSingleObject(OtherThread, + Executive, + KernelMode, + FALSE, + NULL); + + /* Check if we had a previous thread to dereference */ + if (PreviousThread) ObDereferenceObject(PreviousThread); + + /* Remember the thread and re-lock the process */ + PreviousThread = OtherThread; + KeEnterCriticalRegion(); + ExAcquirePushLockExclusive(&CurrentProcess->ProcessLock); + } + + /* Go to the next thread */ + CurrentEntry = CurrentEntry->Flink; + } } else if (ExitStatus != STATUS_THREAD_IS_TERMINATING) { @@ -511,6 +546,9 @@ /* Unlock the Process */ ExReleasePushLockExclusive(&CurrentProcess->ProcessLock); KeLeaveCriticalRegion(); + + /* Check if we had a previous thread to dereference */ + if (PreviousThread) ObDereferenceObject(PreviousThread); /* Check if the process has a debug port and if this is a user thread */ if ((CurrentProcess->DebugPort) && !(Thread->SystemThread)) @@ -570,15 +608,20 @@ /* Save the Create Time */ TerminationMsg.CreateTime = Thread->CreateTime; -TryAgain: - /* Send the LPC Message */ - Status = LpcRequestPort(TerminationPort->Port, &TerminationMsg.h); - if ((Status == STATUS_NO_MEMORY) || - (Status == STATUS_INSUFFICIENT_RESOURCES)) + /* Loop trying to send message */ + while (TRUE) { - /* Wait a bit and try again */ - KeDelayExecutionThread(KernelMode, FALSE, &ShortPsLockDelay); - goto TryAgain; + /* Send the LPC Message */ + Status = LpcRequestPort(TerminationPort->Port, + &TerminationMsg.h); + if ((Status == STATUS_NO_MEMORY) || + (Status == STATUS_INSUFFICIENT_RESOURCES)) + { + /* Wait a bit and try again */ + KeDelayExecutionThread(KernelMode, FALSE, &ShortTime); + continue; + } + break; } /* Dereference this LPC Port */ @@ -591,7 +634,8 @@ ExFreePool(TerminationPort); /* Keep looping as long as there is a port */ - } while ((TerminationPort = NextPort)); + TerminationPort = NextPort; + } while (TerminationPort); } else if (((ExitStatus == STATUS_THREAD_IS_TERMINATING) && (Thread->DeadThread)) || @@ -627,16 +671,20 @@ /* Save the Create Time */ TerminationMsg.CreateTime = Thread->CreateTime; -TryAgain2: - /* Send the LPC Message */ - Status = LpcRequestPort(CurrentProcess->ExceptionPort, - &TerminationMsg.h); - if ((Status == STATUS_NO_MEMORY) || - (Status == STATUS_INSUFFICIENT_RESOURCES)) + /* Loop trying to send message */ + while (TRUE) { - /* Wait a bit and try again */ - KeDelayExecutionThread(KernelMode, FALSE, &ShortPsLockDelay); - goto TryAgain2; + /* Send the LPC Message */ + Status = LpcRequestPort(CurrentProcess->ExceptionPort, + &TerminationMsg.h); + if ((Status == STATUS_NO_MEMORY) || + (Status == STATUS_INSUFFICIENT_RESOURCES)) + { + /* Wait a bit and try again */ + KeDelayExecutionThread(KernelMode, FALSE, &ShortTime); + continue; + } + break; } } } @@ -646,7 +694,6 @@ PsW32ThreadCalloutExit); /* If we are the last thread and have a W32 Process */ - PSREFTRACE(Thread); if ((Last) && (CurrentProcess->Win32Process)) { /* Run it down too */ @@ -674,25 +721,29 @@ /* Check if we have a TEB */ Teb = Thread->Tcb.Teb; - if(Teb) - { - /* Check if the thread isn't terminated and if we should free stack */ - if (!(Thread->Terminated) && (Teb->FreeStackOnTermination)) - { - /* Set the TEB's Deallocation Stack as the Base Address */ - Dummy = 0; - DeallocationStack = Teb->DeallocationStack; - - /* Free the Thread's Stack */ - ZwFreeVirtualMemory(NtCurrentProcess(), - &DeallocationStack, - &Dummy, - MEM_RELEASE); - } - - /* Free the debug handle */ - if (Teb->DbgSsReserved[1]) ObCloseHandle(Teb->DbgSsReserved[1], - UserMode); + if (Teb) + { + /* Check if the thread is still alive */ + if (!Thread->DeadThread) + { + /* Check if we need to free its stack */ + if (Teb->FreeStackOnTermination) + { + /* Set the TEB's Deallocation Stack as the Base Address */ + Dummy = 0; + DeallocationStack = Teb->DeallocationStack; + + /* Free the Thread's Stack */ + ZwFreeVirtualMemory(NtCurrentProcess(), + &DeallocationStack, + &Dummy, + MEM_RELEASE); + } + + /* Free the debug handle */ + if (Teb->DbgSsReserved[1]) ObCloseHandle(Teb->DbgSsReserved[1], + UserMode); + } /* Decommit the TEB */ MmDeleteTeb(CurrentProcess, Teb); @@ -710,8 +761,6 @@ ASSERT(Thread->Tcb.CombinedApcDisable == 0); /* Check if this is the final thread or not */ - PSREFTRACE(Thread); - PSREFTRACE(CurrentProcess); if (Last) { /* Set the process exit time */ @@ -736,7 +785,6 @@ /* Kill the process in the Object Manager */ ObKillProcess(CurrentProcess); - PSREFTRACE(CurrentProcess); /* Check if we have a section object */ if (CurrentProcess->SectionObject) @@ -768,6 +816,7 @@ FirstEntry = KeFlushQueueApc(&Thread->Tcb, UserMode); if (FirstEntry) { + /* Start with the first entry */ CurrentEntry = FirstEntry; do { @@ -781,7 +830,7 @@ if (Apc->RundownRoutine) { /* Call its own routine */ - (Apc->RundownRoutine)(Apc); + Apc->RundownRoutine(Apc); } else { @@ -800,12 +849,12 @@ /* Flush the APC queue, which should be empty */ FirstEntry = KeFlushQueueApc(&Thread->Tcb, KernelMode); - if (FirstEntry) + if ((FirstEntry) || (Thread->Tcb.CombinedApcDisable != 0)) { /* Bugcheck time */ KEBUGCHECKEX(KERNEL_APC_PENDING_DURING_EXIT, (ULONG_PTR)FirstEntry, - Thread->Tcb.KernelApcDisable, + Thread->Tcb.CombinedApcDisable, KeGetCurrentIrql(), 0); } @@ -814,8 +863,6 @@ if (Last) KeSetProcess(&CurrentProcess->Pcb, 0, FALSE); /* Terminate the Thread from the Scheduler */ - PSREFTRACE(Thread); - PSREFTRACE(CurrentProcess); KeTerminateThread(0); } @@ -927,10 +974,11 @@ Apc = ExAllocatePoolWithTag(NonPagedPool, sizeof(KAPC), TAG_TERMINATE_APC); /* Set the Terminated Flag */ - Flags = Thread->CrossThreadFlags | 1; + Flags = Thread->CrossThreadFlags | CT_TERMINATED_BIT; /* Set it, and check if it was already set while we were running */ - if (!(InterlockedExchange((PLONG)&Thread->CrossThreadFlags, Flags) & 1)) + if (!(InterlockedExchange((PLONG)&Thread->CrossThreadFlags, Flags) & + CT_TERMINATED_BIT)) { /* Initialize a Kernel Mode APC to Kill the Thread */ KeInitializeApc(Apc, @@ -961,7 +1009,6 @@ ExFreePool(Apc); /* Return Status */ - PSREFTRACE(Thread); return Status; } @@ -1006,7 +1053,6 @@ } /* Check if we are the last thread */ - PSREFTRACE(Process); if (LastThread) { /* Check if we have to set the Timer Resolution */ @@ -1088,7 +1134,12 @@ } /* Lock the Process */ - ExAcquireRundownProtection(&Process->RundownProtect); + if (!ExAcquireRundownProtection(&Process->RundownProtect)) + { + /* Failed to lock, fal */ + ObDereferenceObject (Process); + return STATUS_PROCESS_IS_TERMINATING; + } /* Set the delete flag */ if (!KillByHandle) InterlockedOr((PLONG)&Process->Flags, @@ -1113,7 +1164,8 @@ } /* Move to the next thread */ - } while((Thread = PsGetNextProcessThread(Process, Thread))); + Thread = PsGetNextProcessThread(Process, Thread); + } while (Thread); } /* Unlock the process */ Modified: trunk/reactos/ntoskrnl/ps/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/process.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ps/process.c (original) +++ trunk/reactos/ntoskrnl/ps/process.c Thu Jan 18 12:44:49 2007 @@ -397,7 +397,6 @@ (PVOID*)&Parent, NULL); if (!NT_SUCCESS(Status)) return Status; - PSREFTRACE(Parent); /* If this process should be in a job but the parent isn't */ if ((InJob) && (!Parent->Job)) @@ -434,7 +433,6 @@ if (!NT_SUCCESS(Status)) goto Cleanup; /* Clean up the Object */ - PSREFTRACE(Process); RtlZeroMemory(Process, sizeof(EPROCESS)); /* Initialize pushlock and rundown protection */ @@ -485,14 +483,15 @@ if (Parent != PsInitialSystemProcess) { /* It's not, so acquire the process rundown */ - ExAcquireRundownProtection(&Process->RundownProtect); - - /* If the parent has a section, use it */ - SectionObject = Parent->SectionObject; - if (SectionObject) ObReferenceObject(SectionObject); - - /* Release process rundown */ - ExReleaseRundownProtection(&Process->RundownProtect); + if (ExAcquireRundownProtection(&Process->RundownProtect)) + { + /* If the parent has a section, use it */ + SectionObject = Parent->SectionObject; + if (SectionObject) ObReferenceObject(SectionObject); + + /* Release process rundown */ + ExReleaseRundownProtection(&Process->RundownProtect); + } /* If we don't have a section object */ if (!SectionObject) @@ -647,23 +646,25 @@ AccessState, DesiredAccess, 1, - (PVOID*)&Process, + NULL, &hProcess); /* Free the access state */ if (AccessState) SeDeleteAccessState(AccessState); /* Cleanup on failure */ - PSREFTRACE(Process); if (!NT_SUCCESS(Status)) goto Cleanup; /* Compute Quantum and Priority */ - Process->Pcb.BasePriority = (SCHAR)PspComputeQuantumAndPriority(Process, - 0, - &Quantum); + ASSERT(IsListEmpty(&Process->ThreadListHead) == TRUE); + Process->Pcb.BasePriority = + (SCHAR)PspComputeQuantumAndPriority(Process, + PsProcessPriorityBackground, + &Quantum); Process->Pcb.QuantumReset = Quantum; /* Check if we have a parent other then the initial system process */ + Process->GrantedAccess = PROCESS_TERMINATE; if ((Parent) && (Parent != PsInitialSystemProcess)) { /* Get the process's SD */ @@ -683,7 +684,6 @@ SubjectContext.ClientToken = NULL; /* Do the access check */ - if (!SecurityDescriptor) DPRINT1("FIX PS SDs!!\n"); Result = SeAccessCheck(SecurityDescriptor, &SubjectContext, FALSE, @@ -712,7 +712,9 @@ PROCESS_CREATE_THREAD | PROCESS_DUP_HANDLE | PROCESS_CREATE_PROCESS | - PROCESS_SET_INFORMATION); + PROCESS_SET_INFORMATION | + STANDARD_RIGHTS_ALL | + PROCESS_SET_QUOTA); } else { @@ -720,14 +722,10 @@ Process->GrantedAccess = PROCESS_ALL_ACCESS; } - /* Sanity check */ - ASSERT(IsListEmpty(&Process->ThreadListHead)); - /* Set the Creation Time */ KeQuerySystemTime(&Process->CreateTime); /* Protect against bad user-mode pointer */ - PSREFTRACE(Process); _SEH_TRY { /* Save the process handle */ @@ -753,8 +751,6 @@ if (Parent) ObDereferenceObject(Parent); /* Return status to caller */ - PSREFTRACE(Process); - if (Parent) PSREFTRACE(Parent); return Status; } @@ -1387,8 +1383,6 @@ /* Dereference the Process */ ObDereferenceObject(Process); - PSREFTRACE(Process); - if (Thread) PSREFTRACE(Thread); } else { Modified: trunk/reactos/ntoskrnl/ps/psmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/psmgr.c?rev=25… ============================================================================== --- trunk/reactos/ntoskrnl/ps/psmgr.c (original) +++ trunk/reactos/ntoskrnl/ps/psmgr.c Thu Jan 18 12:44:49 2007 @@ -231,7 +231,6 @@ KeBugCheckEx(PROCESS1_INITIALIZATION_FAILED, Status, 4, 0, 0); } - /* Map it */ Status = PspMapSystemDll(PsGetCurrentProcess(), &PspSystemDllBase); if (!NT_SUCCESS(Status)) @@ -290,9 +289,7 @@ MM_SYSTEMSIZE SystemSize; UNICODE_STRING Name; OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; - - /* FIXME: Initialize Lock Data do it STATIC */ - ShortPsLockDelay.QuadPart = -100LL; + ULONG i; /* Get the system size */ SystemSize = MmQuerySystemSize(); @@ -320,10 +317,22 @@ break; } + /* Setup callbacks */ + for (i = 0; i < PSP_MAX_CREATE_THREAD_NOTIFY; i++) + { + ExInitializeCallBack(&PspThreadNotifyRoutine[i]); + } + for (i = 0; i < PSP_MAX_CREATE_PROCESS_NOTIFY; i++) + { + ExInitializeCallBack(&PspProcessNotifyRoutine[i]); + } + for (i = 0; i < PSP_MAX_LOAD_IMAGE_NOTIFY; i++) + { + ExInitializeCallBack(&PspLoadImageNotifyRoutine[i]); + } + /* Setup the quantum table */ PsChangeQuantumTable(FALSE, PsRawPrioritySeparation); - - /* Setup callbacks when we implement Generic Callbacks */ /* Set quota settings */ if (!PspDefaultPagedLimit) PspDefaultPagedLimit = 0; @@ -406,6 +415,7 @@ /* Create the CID Handle table */ PspCidTable = ExCreateHandleTable(NULL); + if (!PspCidTable) return FALSE; /* FIXME: Initialize LDT/VDM support */ @@ -447,11 +457,22 @@ strcpy(PsInitialSystemProcess->ImageFileName, "System"); /* Allocate a structure for the audit name */ - PsIdleProcess->SeAuditProcessCreationInfo.ImageFileName = - ExAllocatePoolWithTag(PagedPool, sizeof(UNICODE_STRING), TAG_SEPA); - if (!PsIdleProcess->SeAuditProcessCreationInfo.ImageFileName) KEBUGCHECK(0); - - /* Setup the system initailization thread */ + PsInitialSystemProcess->SeAuditProcessCreationInfo.ImageFileName = + ExAllocatePoolWithTag(PagedPool, + sizeof(OBJECT_NAME_INFORMATION), + TAG_SEPA); + if (!PsInitialSystemProcess->SeAuditProcessCreationInfo.ImageFileName) + { + /* Allocation failed */ + return FALSE; + } + + /* Zero it */ + RtlZeroMemory(PsInitialSystemProcess-> + SeAuditProcessCreationInfo.ImageFileName, + sizeof(OBJECT_NAME_INFORMATION)); + + /* Setup the system initialization thread */ Status = PsCreateSystemThread(&SysThreadHandle, THREAD_ALL_ACCESS, &ObjectAttributes, Modified: trunk/reactos/ntoskrnl/ps/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/security.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ps/security.c (original) +++ trunk/reactos/ntoskrnl/ps/security.c Thu Jan 18 12:44:49 2007 @@ -45,6 +45,7 @@ NTAPI PspDeleteThreadSecurity(IN PETHREAD Thread) { + PPS_IMPERSONATION_INFORMATION ImpersonationInfo = Thread->ImpersonationInfo; PAGED_CODE(); PSTRACE(PS_SECURITY_DEBUG, "Thread: %p\n", Thread); @@ -52,14 +53,14 @@ if (Thread->ActiveImpersonationInfo) { /* Dereference its token */ - ObDereferenceObject(Thread->ImpersonationInfo->Token); + ObDereferenceObject(ImpersonationInfo->Token); } /* Check if we have impersonation info */ - if (Thread->ImpersonationInfo) + if (ImpersonationInfo) { /* Free it */ - ExFreePool(Thread->ImpersonationInfo); + ExFreePool(ImpersonationInfo); PspClearCrossThreadFlag(Thread, CT_ACTIVE_IMPERSONATION_INFO_BIT); Thread->ImpersonationInfo = NULL; } @@ -91,7 +92,11 @@ ObFastDereferenceObject(&Parent->Token, ParentToken); /* Set the new Token */ - ObInitializeFastReference(&Process->Token, NewToken); + if (NT_SUCCESS(Status)) + { + /* Initailize the fast reference */ + ObInitializeFastReference(&Process->Token, NewToken); + } } else { @@ -133,36 +138,34 @@ Attached = TRUE; } + /* Check if we're in a different thread or acquire rundown */ + if ((Thread == CurrentThread) || + (ExAcquireRundownProtection(&Thread->RundownProtect))) + { + /* Check if the thread is impersonating */ + IsImpersonating = (BOOLEAN)Thread->ActiveImpersonationInfo; + if (IsImpersonating) + { + /* Set TEB data */ + Teb->ImpersonationLocale = -1; + Teb->IsImpersonating = 1; + } + else + { + /* Set TEB data */ + Teb->ImpersonationLocale = 0; + Teb->IsImpersonating = 0; + } + } + /* Check if we're in a different thread */ if (Thread != CurrentThread) { - /* Acquire thread rundown protection */ - ExAcquireRundownProtection(&Thread->RundownProtect); - } - - /* Check if the thread is impersonating */ - IsImpersonating = (BOOLEAN)Thread->ActiveImpersonationInfo; - if (IsImpersonating) - { - /* Set TEB data */ - Teb->ImpersonationLocale = -1; - Teb->IsImpersonating = 1; - } - else - { - /* Set TEB data */ - Teb->ImpersonationLocale = 0; - Teb->IsImpersonating = 0; - } - - /* Check if we're in a different thread */ - if (Thread != CurrentThread) - { /* Release protection */ ExReleaseRundownProtection(&Thread->RundownProtect); } - /* Dettach */ + /* Detach */ if (Attached) KeUnstackDetachProcess(&ApcState); } @@ -170,29 +173,40 @@ return STATUS_SUCCESS; } - NTSTATUS NTAPI PspAssignPrimaryToken(IN PEPROCESS Process, - IN PTOKEN Token) -{ - PACCESS_TOKEN OldToken; + IN HANDLE Token, + IN PACCESS_TOKEN AccessToken OPTIONAL) +{ + PACCESS_TOKEN NewToken = AccessToken, OldToken; NTSTATUS Status; PAGED_CODE(); PSTRACE(PS_SECURITY_DEBUG, "Process: %p Token: %p\n", Process, Token); - /* Lock the process */ + /* Check if we don't have a pointer */ + if (!AccessToken) + { + /* Reference it from the handle */ + Status = ObReferenceObjectByHandle(Token, + TOKEN_ASSIGN_PRIMARY, + SepTokenObjectType, + ExGetPreviousMode(), + &NewToken, + NULL); + if (!NT_SUCCESS(Status)) return Status; + } + + /* Exchange tokens */ + Status = SeExchangePrimaryToken(Process, NewToken, &OldToken); + + /* Acquire and release the lock */ PspLockProcessSecurityExclusive(Process); - - /* Exchange them */ - Status = SeExchangePrimaryToken(Process, Token, &OldToken); - - /* Release the lock */ PspUnlockProcessSecurityExclusive(Process); /* Dereference Tokens and Return */ if (NT_SUCCESS(Status)) ObDereferenceObject(OldToken); - ObDereferenceObject(Token); + if (AccessToken) ObDereferenceObject(NewToken); return Status; } @@ -200,10 +214,11 @@ NTAPI PspSetPrimaryToken(IN PEPROCESS Process, IN HANDLE TokenHandle OPTIONAL, - IN PTOKEN Token OPTIONAL) + IN PACCESS_TOKEN Token OPTIONAL) { KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); BOOLEAN IsChild; + PACCESS_TOKEN NewToken = Token; NTSTATUS Status, AccessStatus; BOOLEAN Result, SdAllocated; PSECURITY_DESCRIPTOR SecurityDescriptor; @@ -218,17 +233,17 @@ TOKEN_ASSIGN_PRIMARY, SepTokenObjectType, PreviousMode, - (PVOID*)&Token, + (PVOID*)&NewToken, NULL); if (!NT_SUCCESS(Status)) return Status; } /* Check if this is a child */ - Status = SeIsTokenChild(Token, &IsChild); + Status = SeIsTokenChild(NewToken, &IsChild); if (!NT_SUCCESS(Status)) { /* Failed, dereference */ - if (TokenHandle) ObDereferenceObject(Token); + if (TokenHandle) ObDereferenceObject(NewToken); return Status; } @@ -246,7 +261,7 @@ } /* Assign the token */ - Status = PspAssignPrimaryToken(Process, Token); + Status = PspAssignPrimaryToken(Process, NULL, NewToken); if (NT_SUCCESS(Status)) { /* @@ -264,7 +279,6 @@ SubjectContext.ClientToken = NULL; /* Do the access check */ - if (!SecurityDescriptor) DPRINT1("FIX PS SDs!!\n"); Result = SeAccessCheck(SecurityDescriptor, &SubjectContext, FALSE, @@ -283,6 +297,19 @@ /* Remove access if it failed */ if (!Result) Process->GrantedAccess = 0; + + /* Setup granted access */ + Process->GrantedAccess |= (PROCESS_VM_OPERATION | + PROCESS_VM_READ | + PROCESS_VM_WRITE | + PROCESS_QUERY_INFORMATION | + PROCESS_TERMINATE | + PROCESS_CREATE_THREAD | + PROCESS_DUP_HANDLE | + PROCESS_CREATE_PROCESS | + PROCESS_SET_INFORMATION | + STANDARD_RIGHTS_ALL | + PROCESS_SET_QUOTA); } /* Dereference the process */ @@ -290,7 +317,7 @@ } /* Dereference the token */ - if (TokenHandle) ObDereferenceObject(Token); + if (Token) ObDereferenceObject(NewToken); return Status; } @@ -352,7 +379,7 @@ /* Open the process token */ Status = PsOpenTokenOfProcess(ProcessHandle, &Token); - if(NT_SUCCESS(Status)) + if (NT_SUCCESS(Status)) { /* Reference it by handle and dereference the pointer */ Status = ObOpenObjectByPointer(Token, @@ -365,7 +392,7 @@ ObDereferenceObject(Token); /* Make sure we got a handle */ - if(NT_SUCCESS(Status)) + if (NT_SUCCESS(Status)) { /* Enter SEH for write */ _SEH_TRY @@ -487,10 +514,7 @@ return STATUS_BAD_TOKEN_TYPE; } - /* Check if this is a job, which we don't support yet */ - if (Thread->ThreadsProcess->Job) KEBUGCHECK(0); - - /* Get the impersionation level */ + /* Get the impersonation level */ ImpersonationLevel = SeTokenImpersonationLevel(Token); /* Call the impersonation API */ @@ -501,7 +525,7 @@ ImpersonationLevel); /* Dereference the token and return status */ - if (Token) ObDereferenceObject(Token); + ObDereferenceObject(Token); return Status; } @@ -546,13 +570,17 @@ /* Release thread security */ PspUnlockThreadSecurityExclusive(Thread); - } - - /* Dereference the impersonation token */ - if (Token) ObDereferenceObject(Token); - - /* Write impersonation info to the TEB */ - PspWriteTebImpersonationInfo(Thread, PsGetCurrentThread()); + + /* Check if we had a token */ + if (Token) + { + /* Dereference the impersonation token */ + ObDereferenceObject(Token); + + /* Write impersonation info to the TEB */ + PspWriteTebImpersonationInfo(Thread, PsGetCurrentThread()); + } + } } /* @@ -566,7 +594,7 @@ IN BOOLEAN EffectiveOnly, IN SECURITY_IMPERSONATION_LEVEL ImpersonationLevel) { - PPS_IMPERSONATION_INFORMATION Impersonation; + PPS_IMPERSONATION_INFORMATION Impersonation, OldData; PTOKEN OldToken = NULL; PAGED_CODE(); PSTRACE(PS_SECURITY_DEBUG, "Thread: %p, Token: %p\n", Thread, Token); @@ -591,8 +619,9 @@ OldToken = Thread->ImpersonationInfo->Token; } - /* Unlock the process */ + /* Unlock the process and write TEB information */ PspUnlockThreadSecurityExclusive(Thread); + PspWriteTebImpersonationInfo(Thread, PsGetCurrentThread()); } } else @@ -608,12 +637,15 @@ if (!Impersonation) return STATUS_INSUFFICIENT_RESOURCES; /* Update the pointer */ - if (InterlockedCompareExchangePointer(&Thread->ImpersonationInfo, - Impersonation, - NULL)) + OldData = InterlockedCompareExchangePointer(&Thread-> + ImpersonationInfo, + Impersonation, + NULL); + if (OldData) { /* Someone beat us to it, free our copy */ ExFreePool(Impersonation); + Impersonation = OldData; } } @@ -644,13 +676,13 @@ /* Unlock the thread */ PspUnlockThreadSecurityExclusive(Thread); - } - - /* Write impersonation info to the TEB */ - PspWriteTebImpersonationInfo(Thread, PsGetCurrentThread()); + + /* Write impersonation info to the TEB */ + PspWriteTebImpersonationInfo(Thread, PsGetCurrentThread()); + } /* Dereference the token and return success */ - if (OldToken) ObDereferenceObject(OldToken); + if (OldToken) PsDereferenceImpersonationToken(OldToken); return STATUS_SUCCESS; } @@ -674,9 +706,6 @@ Process = Thread->ThreadsProcess; if (!Thread->ActiveImpersonationInfo) { - *TokenType = TokenPrimary; - *EffectiveOnly = FALSE; - /* Fast Reference the Token */ Token = ObFastReferenceObject(&Process->Token); @@ -709,6 +738,10 @@ *TokenType = TokenImpersonation; *EffectiveOnly = Thread->ImpersonationInfo->EffectiveOnly; *Level = Thread->ImpersonationInfo->ImpersonationLevel; + + /* Unlock the Process */ + PspUnlockProcessSecurityShared(Process); + return Token; } /* Unlock the Process */ @@ -716,6 +749,8 @@ } /* Return the token */ + *TokenType = TokenPrimary; + *EffectiveOnly = FALSE; return Token; } Modified: trunk/reactos/ntoskrnl/ps/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/thread.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ps/thread.c (original) +++ trunk/reactos/ntoskrnl/ps/thread.c Thu Jan 18 12:44:49 2007 @@ -51,9 +51,8 @@ Teb->IdealProcessor = Thread->Tcb.IdealProcessor; } - /* Check if this is a system thread, or if we're hiding */ - PSREFTRACE(Thread); - if (!(Thread->SystemThread) && !(Thread->HideFromDebugger)) + /* Check if this is a dead thread, or if we're hiding */ + if (!(Thread->DeadThread) && !(Thread->HideFromDebugger)) { /* We're not, so notify the debugger */ DbgkCreateThread(StartContext); @@ -113,6 +112,30 @@ } } +_SEH_FILTER(PspUnhandledExceptionInSystemThread) +{ + PEXCEPTION_POINTERS ExceptionPointers= _SEH_GetExceptionPointers(); + + /* Print debugging information */ + DPRINT1("PS: Unhandled Kernel Mode Exception Pointers = 0x%p\n", + ExceptionPointers); + DPRINT1("Code %x Addr %p Info0 %p Info1 %p Info2 %p Info3 %p\n", + ExceptionPointers->ExceptionRecord->ExceptionCode, + ExceptionPointers->ExceptionRecord->ExceptionAddress, + ExceptionPointers->ExceptionRecord->ExceptionInformation[0], + ExceptionPointers->ExceptionRecord->ExceptionInformation[1], + ExceptionPointers->ExceptionRecord->ExceptionInformation[2], + ExceptionPointers->ExceptionRecord->ExceptionInformation[3]); + + /* Bugcheck the system */ + KeBugCheckEx(0x7E, + ExceptionPointers->ExceptionRecord->ExceptionCode, + (ULONG_PTR)ExceptionPointers->ExceptionRecord->ExceptionAddress, + (ULONG_PTR)ExceptionPointers->ExceptionRecord, + (ULONG_PTR)ExceptionPointers->ContextRecord); + return 0; +} + VOID NTAPI PspSystemThreadStartup(IN PKSTART_ROUTINE StartRoutine, @@ -127,12 +150,20 @@ Thread = PsGetCurrentThread(); /* Make sure the thread isn't gone */ - PSREFTRACE(Thread); - if (!(Thread->Terminated) && !(Thread->DeadThread)) - { - /* Call it the Start Routine */ - StartRoutine(StartContext); - } + _SEH_TRY + { + if (!(Thread->Terminated) && !(Thread->DeadThread)) + { + /* Call it the Start Routine */ + StartRoutine(StartContext); + } + } + _SEH_EXCEPT(PspUnhandledExceptionInSystemThread) + { + /* Bugcheck if we got here */ + KeBugCheck(KMODE_EXCEPTION_NOT_HANDLED); + } + _SEH_END; /* Exit the thread */ PspTerminateThreadByPointer(Thread, STATUS_SUCCESS, TRUE); @@ -192,7 +223,6 @@ { /* Reference the Process by Pointer */ ObReferenceObject(TargetProcess); - PSREFTRACE(TargetProcess); Process = TargetProcess; Status = STATUS_SUCCESS; } @@ -232,7 +262,6 @@ } /* Zero the Object entirely */ - PSREFTRACE(Thread); RtlZeroMemory(Thread, sizeof(ETHREAD)); /* Initialize rundown protection */ @@ -270,7 +299,12 @@ KeInitializeSpinLock(&Thread->ActiveTimerListLock); /* Acquire rundown protection */ - ExAcquireRundownProtection(&Process->RundownProtect); + if (!ExAcquireRundownProtection (&Process->RundownProtect)) + { + /* Fail */ + ObDereferenceObject(Thread); + return STATUS_PROCESS_IS_TERMINATING; + } /* Now let the kernel initialize the context */ if (ThreadContext) @@ -317,7 +351,6 @@ } /* Check if we failed */ - PSREFTRACE(Thread); if (!NT_SUCCESS(Status)) { /* Delete the TEB if we had done */ @@ -400,6 +433,7 @@ /* Dereference completely to kill it */ ObDereferenceObjectEx(Thread, 2); + return Status; } /* Insert the Thread into the Object Manager */ @@ -411,7 +445,6 @@ &hThread); /* Delete the access state if we had one */ - PSREFTRACE(Thread); if (AccessState) SeDeleteAccessState(AccessState); /* Check for success */ @@ -461,7 +494,6 @@ ASSERT(!(Thread->CreateTime.HighPart & 0xF0000000)); /* Make sure the thread isn't dead */ - PSREFTRACE(Thread); if (!Thread->DeadThread) { /* Get the thread's SD */ @@ -493,7 +525,6 @@ SubjectContext.ClientToken = NULL; /* Do the access check */ - if (!SecurityDescriptor) DPRINT1("FIX PS SDs!!\n"); Result = SeAccessCheck(SecurityDescriptor, &SubjectContext, FALSE, @@ -525,14 +556,12 @@ } /* Dispatch thread */ - PSREFTRACE(Thread); KeReadyThread(&Thread->Tcb); /* Dereference it, leaving only the keep-alive */ ObDereferenceObject(Thread); /* Return */ - PSREFTRACE(Thread); return Status; /* Most annoying failure case ever, where we undo almost all manually */ @@ -541,7 +570,6 @@ ExReleasePushLockExclusive(&Process->ProcessLock); /* Uninitailize it */ - PSREFTRACE(Thread); KeUninitThread(&Thread->Tcb); /* If we had a TEB, delete it */ @@ -552,7 +580,6 @@ /* Dereference the thread and return failure */ ObDereferenceObject(Thread); - PSREFTRACE(Thread); return STATUS_PROCESS_IS_TERMINATING; } @@ -841,7 +868,7 @@ "ProcessHandle: %p Context: %p\n", ProcessHandle, ThreadContext); /* Check if this was from user-mode */ - if(KeGetPreviousMode() != KernelMode) + if (KeGetPreviousMode() != KernelMode) { /* Make sure that we got a context */ if (!ThreadContext) return STATUS_INVALID_PARAMETER; @@ -865,14 +892,12 @@ /* Check the Initial TEB */ ProbeForRead(InitialTeb, sizeof(INITIAL_TEB), sizeof(ULONG)); SafeInitialTeb = *InitialTeb; - } + } _SEH_HANDLE { Status = _SEH_GetExceptionCode(); } _SEH_END; - - /* Handle any failures in our SEH checks */ if (!NT_SUCCESS(Status)) return Status; } else

17 years, 9 months

[ion] 25503: - Fix __rdtsc so it's considered volatile by GCC instead of caching it. - Add NtInitialUserProcessBuffer settings and validate/user them when launching smss. - Use SePublicDefaultUnrestrictedSd for the root system link. - Make enough space for the smss process parameters, there's 6 strings, not 4. - Fix incorrect length of NtSystemRoot string. - Disable SYSENTER on CPUs that don't support it. - Detect and enable NX feature bit. - Detect and enable DTS support. - Implement Ki386Enabl

by ion＠svn.reactos.org

Author: ion Date: Thu Jan 18 09:23:14 2007 New Revision: 25503 URL: http://svn.reactos.org/svn/reactos?rev=25503&view=rev Log: - Fix __rdtsc so it's considered volatile by GCC instead of caching it. - Add NtInitialUserProcessBuffer settings and validate/user them when launching smss. - Use SePublicDefaultUnrestrictedSd for the root system link. - Make enough space for the smss process parameters, there's 6 strings, not 4. - Fix incorrect length of NtSystemRoot string. - Disable SYSENTER on CPUs that don't support it. - Detect and enable NX feature bit. - Detect and enable DTS support. - Implement Ki386EnableXMMIExceptions (the XMMI handler still needs to be done, however). - Implement KiI386PentiumLockErrataFixup to work around the F00F bug. - Implement KiIsNpxErrataPresent to detect the FDIV bug. - Implement CPU Speed detection. - Only setup Initial FX State if the CPU supports FXSR. - Setup some more PCR fields during init. - Use NX_SUPPORT_POLICY flags documented in ntddk.h - Don't boot if CMPXCHG8B is not supported by the CPU. This is the same requirement as Windows. - Don't overwrite all the PRCB locks in KiInitSpinlocks due to a stupid bug in the timer spinlock initialization. Modified: trunk/reactos/include/ddk/winddk.h trunk/reactos/include/ndk/ketypes.h trunk/reactos/include/psdk/intrin.h trunk/reactos/ntoskrnl/KrnlFun.c trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/include/internal/i386/ke.h trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/ke/dpc.c trunk/reactos/ntoskrnl/ke/i386/cpu.c trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S trunk/reactos/ntoskrnl/ke/i386/kiinit.c trunk/reactos/ntoskrnl/ke/i386/patpge.c trunk/reactos/ntoskrnl/ke/krnlinit.c Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=2… ============================================================================== --- trunk/reactos/include/ddk/winddk.h (original) +++ trunk/reactos/include/ddk/winddk.h Thu Jan 18 09:23:14 2007 @@ -426,6 +426,11 @@ } KSYSTEM_TIME, *PKSYSTEM_TIME; extern volatile KSYSTEM_TIME KeTickCount; + +#define NX_SUPPORT_POLICY_ALWAYSOFF 0 +#define NX_SUPPORT_POLICY_ALWAYSON 1 +#define NX_SUPPORT_POLICY_OPTIN 2 +#define NX_SUPPORT_POLICY_OPTOUT 3 typedef struct _KUSER_SHARED_DATA { Modified: trunk/reactos/include/ndk/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ketypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/ketypes.h (original) +++ trunk/reactos/include/ndk/ketypes.h Thu Jan 18 09:23:14 2007 @@ -38,6 +38,11 @@ // Maximum System Descriptor Table Entries // #define SSDT_MAX_ENTRIES 2 + +// +// Processor Architectures +// +#define PROCESSOR_ARCHITECTURE_INTEL 0 // // Object Type Mask for Kernel Dispatcher Objects @@ -87,8 +92,10 @@ #define KF_3DNOW 0x00004000 #define KF_AMDK6MTRR 0x00008000 #define KF_XMMI64 0x00010000 -#define KF_NX_DISABLED 0x00400000 -#define KF_NX_ENABLED 0x00800000 +#define KF_DTS 0x00020000 +#define KF_NX_BIT 0x20000000 +#define KF_NX_DISABLED 0x40000000 +#define KF_NX_ENABLED 0x80000000 // // KPCR Access for non-IA64 builds Modified: trunk/reactos/include/psdk/intrin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intrin.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/intrin.h (original) +++ trunk/reactos/include/psdk/intrin.h Thu Jan 18 09:23:14 2007 @@ -930,7 +930,7 @@ unsigned long lo32; unsigned long hi32; - __asm__("rdtsc" : "=a" (lo32), "=d" (hi32)); + __asm__ __volatile__("rdtsc" : "=a" (lo32), "=d" (hi32)); { union u_ Modified: trunk/reactos/ntoskrnl/KrnlFun.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/KrnlFun.c?rev=255… ============================================================================== --- trunk/reactos/ntoskrnl/KrnlFun.c (original) +++ trunk/reactos/ntoskrnl/KrnlFun.c Thu Jan 18 09:23:14 2007 @@ -9,7 +9,6 @@ // Failure to respect this will *ACHIEVE NOTHING*. // // Ke1: -// - Implement KiInitMachineDependent. // - Implement Privileged Instruction Handler in Umode GPF. // // Ex: @@ -27,10 +26,6 @@ // // Kd: // - Implement KD Kernel Debugging and WinDBG support. -// -// Native: -// - Rewrite loader. -// - Make smss NT-compatible. // /////////////////////////////////////////////////////////////////////////////// Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=255… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c (original) +++ trunk/reactos/ntoskrnl/ex/init.c Thu Jan 18 09:23:14 2007 @@ -38,6 +38,12 @@ /* NT Boot Path */ UNICODE_STRING NtSystemRoot; + +/* NT Initial User Application */ +WCHAR NtInitialUserProcessBuffer[128] = L"\\SystemRoot\\System32\\smss.exe"; +ULONG NtInitialUserProcessBufferLength = sizeof(NtInitialUserProcessBuffer) - + sizeof(WCHAR); +ULONG NtInitialUserProcessBufferType = REG_SZ; /* Boot NLS information */ PVOID ExpNlsTableBase; @@ -68,7 +74,7 @@ &LinkName, OBJ_CASE_INSENSITIVE | OBJ_PERMANENT, NULL, - SePublicDefaultSd); + SePublicDefaultUnrestrictedSd); /* Create it */ Status = NtCreateDirectoryObject(&LinkHandle, @@ -88,7 +94,7 @@ &LinkName, OBJ_CASE_INSENSITIVE | OBJ_PERMANENT, NULL, - SePublicDefaultSd); + SePublicDefaultUnrestrictedSd); /* Create it */ Status = NtCreateDirectoryObject(&LinkHandle, @@ -115,7 +121,7 @@ &LinkName, OBJ_CASE_INSENSITIVE | OBJ_PERMANENT, NULL, - SePublicDefaultSd); + SePublicDefaultUnrestrictedSd); /* Build the ARC name */ sprintf(Buffer, @@ -353,10 +359,11 @@ PWSTR p; UNICODE_STRING NullString = RTL_CONSTANT_STRING(L""); UNICODE_STRING SmssName, Environment, SystemDriveString; + PVOID EnvironmentPtr = NULL; /* Allocate memory for the process parameters */ Size = sizeof(RTL_USER_PROCESS_PARAMETERS) + - ((MAX_PATH * 4) * sizeof(WCHAR)); + ((MAX_PATH * 6) * sizeof(WCHAR)); Status = ZwAllocateVirtualMemory(NtCurrentProcess(), (PVOID)&ProcessParameters, 0, @@ -378,7 +385,7 @@ /* Allocate a page for the environment */ Size = PAGE_SIZE; Status = ZwAllocateVirtualMemory(NtCurrentProcess(), - (PVOID)&ProcessParameters->Environment, + &EnvironmentPtr, 0, &Size, MEM_COMMIT, @@ -388,6 +395,9 @@ /* Failed */ KeBugCheckEx(SESSION2_INITIALIZATION_FAILED, Status, 0, 0, 0); } + + /* Write the pointer */ + ProcessParameters->Environment = EnvironmentPtr; /* Make a buffer for the DOS path */ p = (PWSTR)(ProcessParameters + 1); @@ -416,11 +426,48 @@ ProcessParameters->ImagePathName.Buffer = p; ProcessParameters->ImagePathName.MaximumLength = MAX_PATH * sizeof(WCHAR); - /* Append the system path and session manager name */ - RtlAppendUnicodeToString(&ProcessParameters->ImagePathName, - L"\\SystemRoot\\System32"); - RtlAppendUnicodeToString(&ProcessParameters->ImagePathName, - L"\\smss.exe"); + /* Make sure the buffer is a valid string which within the given length */ + if ((NtInitialUserProcessBufferType != REG_SZ) || + ((NtInitialUserProcessBufferLength != -1) && + ((NtInitialUserProcessBufferLength < sizeof(WCHAR)) || + (NtInitialUserProcessBufferLength > + sizeof(NtInitialUserProcessBuffer) - sizeof(WCHAR))))) + { + /* Invalid initial process string, bugcheck */ + KeBugCheckEx(SESSION2_INITIALIZATION_FAILED, + (ULONG_PTR)STATUS_INVALID_PARAMETER, + NtInitialUserProcessBufferType, + NtInitialUserProcessBufferLength, + sizeof(NtInitialUserProcessBuffer)); + } + + /* Cut out anything after a space */ + p = NtInitialUserProcessBuffer; + while (*p && *p != L' ') p++; + + /* Set the image path length */ + ProcessParameters->ImagePathName.Length = + (USHORT)((PCHAR)p - (PCHAR)NtInitialUserProcessBuffer); + + /* Copy the actual buffer */ + RtlCopyMemory(ProcessParameters->ImagePathName.Buffer, + NtInitialUserProcessBuffer, + ProcessParameters->ImagePathName.Length); + + /* Null-terminate it */ + ProcessParameters-> + ImagePathName.Buffer[ProcessParameters->ImagePathName.Length / + sizeof(WCHAR)] = UNICODE_NULL; + + /* Make a buffer for the command line */ + p = (PWSTR)((PCHAR)ProcessParameters->ImagePathName.Buffer + + ProcessParameters->ImagePathName.MaximumLength); + ProcessParameters->CommandLine.Buffer = p; + ProcessParameters->CommandLine.MaximumLength = MAX_PATH * sizeof(WCHAR); + + /* Add the image name to the command line */ + RtlAppendUnicodeToString(&ProcessParameters->CommandLine, + NtInitialUserProcessBuffer); /* Create the environment string */ RtlInitEmptyUnicodeString(&Environment, @@ -446,11 +493,8 @@ RtlAppendUnicodeStringToString(&Environment, &NtSystemRoot); RtlAppendUnicodeStringToString(&Environment, &NullString); - /* Get and set the command line equal to the image path */ - ProcessParameters->CommandLine = ProcessParameters->ImagePathName; + /* Create SMSS process */ SmssName = ProcessParameters->ImagePathName; - - /* Create SMSS process */ Status = RtlCreateUserProcess(&SmssName, OBJ_CASE_INSENSITIVE, RtlDeNormalizeProcessParams( @@ -731,9 +775,9 @@ Buffer[--AnsiPath.Length] = ANSI_NULL; /* Get the string from KUSER_SHARED_DATA's buffer */ - NtSystemRoot.Buffer = SharedUserData->NtSystemRoot; - NtSystemRoot.MaximumLength = sizeof(SharedUserData->NtSystemRoot) / sizeof(WCHAR); - NtSystemRoot.Length = 0; + RtlInitEmptyUnicodeString(&NtSystemRoot, + SharedUserData->NtSystemRoot, + sizeof(SharedUserData->NtSystemRoot)); /* Now fill it in */ Status = RtlAnsiStringToUnicodeString(&NtSystemRoot, &AnsiPath, FALSE); @@ -960,19 +1004,17 @@ /* Bugcheck the system if SMSS couldn't initialize */ KeBugCheck(SESSION5_INITIALIZATION_FAILED); } - else - { - /* Close process handles */ - ZwClose(ThreadHandle); - ZwClose(ProcessHandle); - - /* FIXME: We should free the initial process' memory!*/ - - /* Increase init phase */ - ExpInitializationPhase += 1; - - /* Jump into zero page thread */ - MmZeroPageThreadMain(NULL); - } + + /* Close process handles */ + ZwClose(ThreadHandle); + ZwClose(ProcessHandle); + + /* FIXME: We should free the initial process' memory!*/ + + /* Increase init phase */ + ExpInitializationPhase += 1; + + /* Jump into zero page thread */ + MmZeroPageThreadMain(NULL); } /* EOF */ Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/ke.h (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h Thu Jan 18 09:23:14 2007 @@ -92,6 +92,12 @@ VOID ); +BOOLEAN +NTAPI +KiIsNpxErrataPresent( + VOID +); + VOID NTAPI KiSetProcessorType(VOID); Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h Thu Jan 18 09:23:14 2007 @@ -36,6 +36,18 @@ PKINTERRUPT_ROUTINE ChainedDispatch; PKINTERRUPT_ROUTINE *FlatDispatch; } DISPATCH_INFO, *PDISPATCH_INFO; + +typedef struct _KI_SAMPLE_MAP +{ + LARGE_INTEGER PerfStart; + LARGE_INTEGER PerfEnd; + LONGLONG PerfDelta; + LARGE_INTEGER PerfFreq; + LONGLONG TSCStart; + LONGLONG TSCEnd; + LONGLONG TSCDelta; + ULONG MHz; +} KI_SAMPLE_MAP, *PKI_SAMPLE_MAP; typedef struct _KTIMER_TABLE_ENTRY { @@ -113,7 +125,7 @@ extern KDPC KiExpireTimerDpc; extern KTIMER_TABLE_ENTRY KiTimerTableListHead[TIMER_TABLE_SIZE]; extern LIST_ENTRY KiTimerListHead; -extern KMUTEX KiGenericCallDpcMutex; +extern FAST_MUTEX KiGenericCallDpcMutex; extern LIST_ENTRY KiProfileListHead, KiProfileSourceListHead; extern KSPIN_LOCK KiProfileLock; extern LIST_ENTRY KiProcessListHead; @@ -235,6 +247,13 @@ IN PKPRCB Prcb ); +VOID +NTAPI +CPUID( + OUT ULONG CpuInfo[4], + IN ULONG InfoType +); + /* gmutex.c ********************************************************************/ VOID Modified: trunk/reactos/ntoskrnl/ke/dpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/dpc.c?rev=2550… ============================================================================== --- trunk/reactos/ntoskrnl/ke/dpc.c (original) +++ trunk/reactos/ntoskrnl/ke/dpc.c Thu Jan 18 09:23:14 2007 @@ -23,7 +23,7 @@ ULONG KiAdjustDpcThreshold = 20; ULONG KiIdealDpcRate = 20; BOOLEAN KeThreadDpcEnable; -KMUTEX KiGenericCallDpcMutex; +FAST_MUTEX KiGenericCallDpcMutex; /* PRIVATE FUNCTIONS *********************************************************/ 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 (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c Thu Jan 18 09:23:14 2007 @@ -340,6 +340,14 @@ FeatureBits &= ~KF_WORKING_PTE; } + /* Check if the CPU is too old to support SYSENTER */ + if ((Prcb->CpuType < 6) || + ((Prcb->CpuType == 6) && (Prcb->CpuStep < 0x0303))) + { + /* Disable it */ + Reg[3] &= ~0x800; + } + /* Set the current features */ CpuFeatures = Reg[3]; } @@ -354,6 +362,7 @@ if (CpuFeatures & 0x00002000) FeatureBits |= KF_GLOBAL_PAGE | KF_CR4; if (CpuFeatures & 0x00008000) FeatureBits |= KF_CMOV; if (CpuFeatures & 0x00010000) FeatureBits |= KF_PAT; + if (CpuFeatures & 0x00200000) FeatureBits |= KF_DTS; if (CpuFeatures & 0x00800000) FeatureBits |= KF_MMX; if (CpuFeatures & 0x01000000) FeatureBits |= KF_FXSR; if (CpuFeatures & 0x02000000) FeatureBits |= KF_XMMI; @@ -388,6 +397,9 @@ { /* Check which extended features are available. */ CPUID(Reg, 0x80000001); + + /* Check if NX-bit is supported */ + if (Reg[3] & 0x00100000) FeatureBits |= KF_NX_BIT; /* Now handle each features for each CPU Vendor */ switch (Vendor) @@ -741,8 +753,23 @@ NTAPI Ki386EnableXMMIExceptions(IN ULONG_PTR Context) { - /* FIXME: Support this */ - DPRINT1("Your machine supports XMMI exceptions but ReactOS doesn't\n"); +#if 0 // needs kitrap13 + PKIDTENTRY IdtEntry; + + /* Get the IDT Entry for Interrupt 19 */ + IdtEntry = ((PKIPCR)KeGetPcr())->IDT[19]; + + /* Set it up */ + IdtEntry->Selector = KGDT_R0_CODE; + IdtEntry->Offset = (KiTrap13 & 0xFFFF); + IdtEntry->ExtendedOffset = (KiTrap13 >> 16) & 0xFFFF; + ((PKIDT_ACCESS)&IdtEntry->Access)->Dpl = 0; + ((PKIDT_ACCESS)&IdtEntry->Access)->Present = 1; + ((PKIDT_ACCESS)&IdtEntry->Access)->SegmentType = I386_INTERRUPT_GATE; +#endif + + /* Enable XMMI exceptions */ + __writecr4(__readcr4() | CR4_XMMEXCPT); return 0; } @@ -750,8 +777,34 @@ NTAPI KiI386PentiumLockErrataFixup(VOID) { - /* FIXME: Support this */ - DPRINT1("WARNING: Your machine has a CPU bug that ReactOS can't bypass!\n"); + KDESCRIPTOR IdtDescriptor; + PKIDTENTRY NewIdt, NewIdt2; + + /* Allocate memory for a new IDT */ + NewIdt = ExAllocatePool(NonPagedPool, 2 * PAGE_SIZE); + + /* Put everything after the first 7 entries on a new page */ + NewIdt2 = (PVOID)((ULONG_PTR)NewIdt + PAGE_SIZE - (7 * sizeof(KIDTENTRY))); + + /* Disable interrupts */ + _disable(); + + /* Get the current IDT and copy it */ + Ke386GetInterruptDescriptorTable(IdtDescriptor); + RtlCopyMemory(NewIdt2, + (PVOID)IdtDescriptor.Base, + IdtDescriptor.Limit + 1); + IdtDescriptor.Base = (ULONG)NewIdt2; + + /* Set the new IDT */ + Ke386SetInterruptDescriptorTable(IdtDescriptor); + ((PKIPCR)KeGetPcr())->IDT = NewIdt2; + + /* Restore interrupts */ + _enable(); + + /* Set the first 7 entries as read-only to produce a fault */ + MmSetPageProtect(NULL, NewIdt, PAGE_READONLY); } /* 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 (original) +++ trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S Thu Jan 18 09:23:14 2007 @@ -17,7 +17,55 @@ #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 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 (original) +++ trunk/reactos/ntoskrnl/ke/i386/kiinit.c Thu Jan 18 09:23:14 2007 @@ -30,15 +30,18 @@ BOOLEAN FbCaching = FALSE; NTSTATUS Status; ULONG ReturnLength; - ULONG i, Affinity; + ULONG i, Affinity, Sample = 0; PFX_SAVE_AREA FxSaveArea; - ULONG MXCsrMask = 0xFFBF, NewMask; + ULONG MXCsrMask = 0xFFBF; + ULONG Dummy[4]; + KI_SAMPLE_MAP Samples[4]; + PKI_SAMPLE_MAP CurrentSample = Samples; /* Check for large page support */ if (KeFeatureBits & KF_LARGE_PAGE) { /* FIXME: Support this */ - DPRINT1("Your machine supports PGE but ReactOS doesn't yet.\n"); + DPRINT1("Large Page support detected but not yet taken advantage of!\n"); } /* Check for global page support */ @@ -70,6 +73,34 @@ /* Assume no errata for now */ SharedUserData->ProcessorFeatures[PF_FLOATING_POINT_PRECISION_ERRATA] = 0; + /* Check if we have an NPX */ + if (KeI386NpxPresent) + { + /* Loop every CPU */ + i = KeActiveProcessors; + for (Affinity = 1; i; Affinity <<= 1) + { + /* Check if this is part of the set */ + if (i & Affinity) + { + /* Run on this CPU */ + i &= ~Affinity; + KeSetSystemAffinityThread(Affinity); + + /* Detect FPU errata */ + if (KiIsNpxErrataPresent()) + { + /* Disable NPX support */ + KeI386NpxPresent = FALSE; + SharedUserData-> + ProcessorFeatures[PF_FLOATING_POINT_PRECISION_ERRATA] = + TRUE; + break; + } + } + } + } + /* If there's no NPX, then we're emulating the FPU */ SharedUserData->ProcessorFeatures[PF_FLOATING_POINT_EMULATED] = !KeI386NpxPresent; @@ -148,18 +179,66 @@ /* Start sampling loop */ for (;;) { - // - // FIXME: TODO - // - break; + /* Do a dummy CPUID to start the sample */ + CPUID(Dummy, 0); + + /* Fill out the starting data */ + CurrentSample->PerfStart = KeQueryPerformanceCounter(NULL); + CurrentSample->TSCStart = __rdtsc(); + CurrentSample->PerfFreq.QuadPart = -50000; + + /* Sleep for this sample */ + KeDelayExecutionThread(KernelMode, + FALSE, + &CurrentSample->PerfFreq); + + /* Do another dummy CPUID */ + CPUID(Dummy, 0); + + /* Fill out the ending data */ + CurrentSample->PerfEnd = + KeQueryPerformanceCounter(&CurrentSample->PerfFreq); + CurrentSample->TSCEnd = __rdtsc(); + + /* Calculate the differences */ + CurrentSample->PerfDelta = CurrentSample->PerfEnd.QuadPart - + CurrentSample->PerfStart.QuadPart; + CurrentSample->TSCDelta = CurrentSample->TSCEnd - + CurrentSample->TSCStart; + + /* Compute CPU Speed */ + CurrentSample->MHz = ((CurrentSample->TSCDelta * + CurrentSample->PerfFreq.QuadPart + + 500000) / + (CurrentSample->PerfDelta * 1000000)); + + /* Check if this isn't the first sample */ + if (Sample) + { + /* Check if we got a good precision within 1MHz */ + if ((CurrentSample->MHz == CurrentSample[-1].MHz) || + (CurrentSample->MHz == CurrentSample[-1].MHz + 1) || + (CurrentSample->MHz == CurrentSample[-1].MHz - 1)) + { + /* We did, stop sampling */ + break; + } + } + + /* Move on */ + CurrentSample++; + Sample++; } + + /* Save the CPU Speed */ + KeGetCurrentPrcb()->MHz = CurrentSample[-1].MHz; } - /* Check if we have MTRR without PAT */ - if (!(KeFeatureBits & KF_PAT) && (KeFeatureBits & KF_MTRR)) + /* Check if we have MTRR */ + if (KeFeatureBits & KF_MTRR) { /* Then manually initialize MTRR for the CPU */ - KiInitializeMTRR((BOOLEAN)i); + KiInitializeMTRR((BOOLEAN)i ? FALSE : TRUE); } /* Check if we have AMD MTRR and initialize it for the CPU */ @@ -168,52 +247,53 @@ /* Check if this is a buggy Pentium and apply the fixup if so */ if (KiI386PentiumLockErrataPresent) KiI386PentiumLockErrataFixup(); - /* Get the current thread NPX state */ - FxSaveArea = (PVOID) - ((ULONG_PTR)KeGetCurrentThread()->InitialStack - - NPX_FRAME_LENGTH); - - /* Clear initial MXCsr mask */ - FxSaveArea->U.FxArea.MXCsrMask = 0; - - /* Save the current NPX State */ + /* Check if the CPU supports FXSR */ + if (KeFeatureBits & KF_FXSR) + { + /* Get the current thread NPX state */ + FxSaveArea = (PVOID) + ((ULONG_PTR)KeGetCurrentThread()->InitialStack - + NPX_FRAME_LENGTH); + + /* Clear initial MXCsr mask */ + FxSaveArea->U.FxArea.MXCsrMask = 0; + + /* Save the current NPX State */ #ifdef __GNUC__ - asm volatile("fxsave %0\n\t" : "=m" (*FxSaveArea)); + asm volatile("fxsave %0\n\t" : "=m" (*FxSaveArea)); #else - __asm fxsave [FxSaveArea] + __asm fxsave [FxSaveArea] #endif - /* Check if the current mask doesn't match the reserved bits */ - if (FxSaveArea->U.FxArea.MXCsrMask != MXCsrMask) - { - /* Then use whatever it's holding */ - MXCsrMask = FxSaveArea->U.FxArea.MXCsrMask; + /* Check if the current mask doesn't match the reserved bits */ + if (FxSaveArea->U.FxArea.MXCsrMask != 0) + { + /* Then use whatever it's holding */ + MXCsrMask = FxSaveArea->U.FxArea.MXCsrMask; + } + + /* Check if nobody set the kernel-wide mask */ + if (!KiMXCsrMask) + { + /* Then use the one we calculated above */ + KiMXCsrMask = MXCsrMask; + } + else + { + /* Was it set to the same value we found now? */ + if (KiMXCsrMask != MXCsrMask) + { + /* No, something is definitely wrong */ + KEBUGCHECKEX(MULTIPROCESSOR_CONFIGURATION_NOT_SUPPORTED, + KF_FXSR, + KiMXCsrMask, + MXCsrMask, + 0); + } + } + + /* Now set the kernel mask */ + KiMXCsrMask &= MXCsrMask; } - - /* Check if nobody set the kernel-wide mask */ - if (!KiMXCsrMask) - { - /* Then use the one we calculated above */ - NewMask = MXCsrMask; - } - else - { - /* Use the existing mask */ - NewMask = KiMXCsrMask; - - /* Was it set to the same value we found now? */ - if (NewMask != MXCsrMask) - { - /* No, something is definitely wrong */ - KEBUGCHECKEX(MULTIPROCESSOR_CONFIGURATION_NOT_SUPPORTED, - KF_FXSR, - NewMask, - MXCsrMask, - 0); - } - } - - /* Now set the kernel mask */ - KiMXCsrMask = NewMask & MXCsrMask; } } @@ -242,7 +322,7 @@ Pcr->NtTib.ExceptionList = EXCEPTION_CHAIN_END; Pcr->NtTib.StackBase = 0; Pcr->NtTib.StackLimit = 0; - Pcr->NtTib.Self = 0; + Pcr->NtTib.Self = NULL; /* Set the Current Thread */ Pcr->PrcbData.CurrentThread = IdleThread; @@ -282,7 +362,11 @@ Pcr->GDT = (PVOID)Gdt; Pcr->IDT = Idt; Pcr->TSS = Tss; + Pcr->TssCopy = Tss; Pcr->PrcbData.DpcStack = DpcStack; + + /* Setup the processor set */ + Pcr->PrcbData.MultiThreadProcessorSet = Pcr->PrcbData.SetMember; } VOID @@ -299,6 +383,7 @@ LARGE_INTEGER PageDirectory; PVOID DpcStack; ULONG NXSupportPolicy; + ULONG Vendor[3]; /* Detect and set the CPU Type */ KiSetProcessorType(); @@ -319,19 +404,19 @@ FeatureBits = KiGetFeatureBits(); /* Set the default NX policy (opt-in) */ - NXSupportPolicy = 2; + NXSupportPolicy = NX_SUPPORT_POLICY_OPTIN; /* Check if NPX is always on */ if (strstr(KeLoaderBlock->LoadOptions, "NOEXECUTE=ALWAYSON")) { /* Set it always on */ - NXSupportPolicy = 1; + NXSupportPolicy = NX_SUPPORT_POLICY_ALWAYSON; FeatureBits |= KF_NX_ENABLED; } else if (strstr(KeLoaderBlock->LoadOptions, "NOEXECUTE=OPTOUT")) { /* Set it in opt-out mode */ - NXSupportPolicy = 3; + NXSupportPolicy = NX_SUPPORT_POLICY_OPTOUT; FeatureBits |= KF_NX_ENABLED; } else if ((strstr(KeLoaderBlock->LoadOptions, "NOEXECUTE=OPTIN")) || @@ -344,7 +429,7 @@ (strstr(KeLoaderBlock->LoadOptions, "EXECUTE"))) { /* Set disabled mode */ - NXSupportPolicy = 0; + NXSupportPolicy = NX_SUPPORT_POLICY_ALWAYSOFF; FeatureBits |= KF_NX_DISABLED; } @@ -372,18 +457,32 @@ KeI386NpxPresent = NpxPresent; KeI386CpuType = Prcb->CpuType; KeI386CpuStep = Prcb->CpuStep; - KeProcessorArchitecture = 0; + KeProcessorArchitecture = PROCESSOR_ARCHITECTURE_INTEL; KeProcessorLevel = (USHORT)Prcb->CpuType; if (Prcb->CpuID) KeProcessorRevision = Prcb->CpuStep; KeFeatureBits = FeatureBits; KeI386FxsrPresent = (KeFeatureBits & KF_FXSR) ? TRUE : FALSE; KeI386XMMIPresent = (KeFeatureBits & KF_XMMI) ? TRUE : FALSE; + /* Detect 8-byte compare exchange support */ + if (!(KeFeatureBits & KF_CMPXCHG8B)) + { + /* Copy the vendor string */ + RtlCopyMemory(Vendor, Prcb->VendorString, sizeof(Vendor)); + + /* Bugcheck the system. Windows *requires* this */ + KeBugCheckEx(0x5D, + (1 << 24 ) | (Prcb->CpuType << 16) | Prcb->CpuStep, + Vendor[0], + Vendor[1], + Vendor[2]); + } + /* Set the current MP Master KPRCB to the Boot PRCB */ Prcb->MultiThreadSetMaster = Prcb; /* Lower to APC_LEVEL */ - KfLowerIrql(APC_LEVEL); + KeLowerIrql(APC_LEVEL); /* Initialize some spinlocks */ KeInitializeSpinLock(&KiFreezeExecutionLock); @@ -499,7 +598,9 @@ KeSetPriorityThread(InitThread, 0); /* If there's no thread scheduled, put this CPU in the Idle summary */ + KiAcquirePrcbLock(Prcb); if (!Prcb->NextThread) KiIdleSummary |= 1 << Number; + KiReleasePrcbLock(Prcb); /* Raise back to HIGH_LEVEL and clear the PRCB for the loader block */ KfRaiseIrql(HIGH_LEVEL); @@ -683,11 +784,6 @@ /* Set the right wait IRQL */ KeGetCurrentThread()->WaitIrql = DISPATCH_LEVEL; - /* Set idle thread as running on UP builds */ -#ifndef CONFIG_SMP - KeGetCurrentThread()->State = Running; -#endif - /* Jump into the idle loop */ KiIdleLoop(); } Modified: trunk/reactos/ntoskrnl/ke/i386/patpge.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/patpge.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/patpge.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/patpge.c Thu Jan 18 09:23:14 2007 @@ -59,5 +59,5 @@ KiInitializePAT(VOID) { /* FIXME: Support this */ - DPRINT1("Your machine supports PAT but ReactOS doesn't yet.\n"); + DPRINT1("Advanced Memory features detected but not yet taken advantage of.\n"); } Modified: trunk/reactos/ntoskrnl/ke/krnlinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/krnlinit.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/krnlinit.c (original) +++ trunk/reactos/ntoskrnl/ke/krnlinit.c Thu Jan 18 09:23:14 2007 @@ -94,7 +94,7 @@ InitializeListHead(&KiStackInSwapListHead); /* Initialize the mutex for generic DPC calls */ - KeInitializeMutex(&KiGenericCallDpcMutex, 0); + ExInitializeFastMutex(&KiGenericCallDpcMutex); /* Initialize the syscall table */ KeServiceDescriptorTable[0].Base = MainSSDT; @@ -183,7 +183,7 @@ Prcb->QueueIndex = 1; Prcb->ReadySummary = 0; Prcb->DeferredReadyListHead.Next = NULL; - for (i = 0; i < 32; i++) + for (i = 0; i < MAXIMUM_PRIORITY; i++) { /* Initialize the ready list */ InitializeListHead(&Prcb->DispatcherReadyListHead[i]); @@ -246,9 +246,13 @@ { /* Initialize the lock and setup the Queued Spinlock */ KeInitializeSpinLock(&KiTimerTableLock[i]); - Prcb->LockQueue[i].Next = NULL; - Prcb->LockQueue[i].Lock = &KiTimerTableLock[i]; - } + Prcb->LockQueue[LockQueueTimerTableLock + i].Next = NULL; + Prcb->LockQueue[LockQueueTimerTableLock + i].Lock = + &KiTimerTableLock[i]; + } + + /* Initialize the PRCB lock */ + KeInitializeSpinLock(&Prcb->PrcbLock); /* Check if this is the boot CPU */ if (!Number)

17 years, 9 months

[ion] 25502: - Remove hack from KiSetPriorityThread. Now it doesn't dispatch threads anymore, but this cleans up the IRQL/Dispatcher hack (it will still insert the higher priority thread in the right queue though, so there's not much visible change, just that priorities suck a bit more -- but this is temporary). - Guard some more code with #ifdef NEW_SCHEDULER. - Fix bugs in KiDispatchInterrupt. - Use PRCB fields instead of PriorityListHead/PriorityListMask to reduces number of code changes betw

by ion＠svn.reactos.org

Author: ion Date: Thu Jan 18 00:53:45 2007 New Revision: 25502 URL: http://svn.reactos.org/svn/reactos?rev=25502&view=rev Log: - Remove hack from KiSetPriorityThread. Now it doesn't dispatch threads anymore, but this cleans up the IRQL/Dispatcher hack (it will still insert the higher priority thread in the right queue though, so there's not much visible change, just that priorities suck a bit more -- but this is temporary). - Guard some more code with #ifdef NEW_SCHEDULER. - Fix bugs in KiDispatchInterrupt. - Use PRCB fields instead of PriorityListHead/PriorityListMask to reduces number of code changes between NEW_SCHEDULER and old. - Fully implement KiDeferredReadyThread, but only for Uni-Processor systems. Supports unwait boosts as well as lock boosts. Not yet used. - Implement NEW_SCHEDULER version of KiSwapThread and NtYieldExecution. Modified: trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/ke/dpc.c trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S trunk/reactos/ntoskrnl/ke/i386/trap.s trunk/reactos/ntoskrnl/ke/process.c trunk/reactos/ntoskrnl/ke/thrdobj.c trunk/reactos/ntoskrnl/ke/thrdschd.c trunk/reactos/ntoskrnl/ps/psmgr.c Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h Thu Jan 18 00:53:45 2007 @@ -449,11 +449,10 @@ KeQueryBasePriorityThread(IN PKTHREAD Thread); VOID -NTAPI +FASTCALL KiSetPriorityThread( IN PKTHREAD Thread, - IN KPRIORITY Priority, - IN PBOOLEAN Released // hack + IN KPRIORITY Priority ); BOOLEAN Modified: trunk/reactos/ntoskrnl/ke/dpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/dpc.c?rev=2550… ============================================================================== --- trunk/reactos/ntoskrnl/ke/dpc.c (original) +++ trunk/reactos/ntoskrnl/ke/dpc.c Thu Jan 18 00:53:45 2007 @@ -76,8 +76,8 @@ if (NextThread) { /* Found one, set it on standby */ - NextThread->Standby; - Prcb->NextThread = NewThread; + NextThread->State = Standby; + Prcb->NextThread = NextThread; } #else /* Just leave now */ 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 (original) +++ trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S Thu Jan 18 00:53:45 2007 @@ -643,8 +643,10 @@ call @KfLowerIrql@4 CheckSchedule: +#ifndef NEW_SCHEDULER /* FIXME: ROS HACK */ call _NtYieldExecution@0 +#endif /* Check if a next thread is queued */ cmp dword ptr [ebx+KPCR_PRCB_NEXT_THREAD], 0 Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/trap.s (original) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s Thu Jan 18 00:53:45 2007 @@ -2099,13 +2099,13 @@ /* Check if we have a thread to swap to */ cmp byte ptr [ebx+KPCR_PRCB_NEXT_THREAD], 0 - jmp Return + je Return /* Make space on the stack to save registers */ sub esp, 3 * 4 mov [esp+8], esi - mov [esi+4], edi - mov [esi+0], ebp + mov [esp+4], edi + mov [esp+0], ebp /* Get the current thread */ mov edi, [ebx+KPCR_CURRENT_THREAD] Modified: trunk/reactos/ntoskrnl/ke/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/process.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/process.c (original) +++ trunk/reactos/ntoskrnl/ke/process.c Thu Jan 18 00:53:45 2007 @@ -289,7 +289,6 @@ PLIST_ENTRY NextEntry, ListHead; KPRIORITY NewPriority, OldPriority; PKTHREAD Thread; - BOOLEAN Released; ASSERT_PROCESS(Process); ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL); @@ -368,7 +367,7 @@ /* Disable decrements and update priority */ Thread->PriorityDecrement = 0; - KiSetPriorityThread(Thread, NewPriority, &Released); + KiSetPriorityThread(Thread, NewPriority); } /* Release the thread lock */ @@ -430,7 +429,7 @@ /* Disable decrements and update priority */ Thread->PriorityDecrement = 0; - KiSetPriorityThread(Thread, NewPriority, &Released); + KiSetPriorityThread(Thread, NewPriority); } /* Release the thread lock */ @@ -442,7 +441,7 @@ } /* Release Dispatcher Database */ - if (!Released) KiReleaseDispatcherLockFromDpcLevel(); + KiReleaseDispatcherLockFromDpcLevel(); /* Release the process lock */ KiReleaseProcessLockFromDpcLevel(&ProcessLock); Modified: trunk/reactos/ntoskrnl/ke/thrdobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/thrdobj.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/thrdobj.c (original) +++ trunk/reactos/ntoskrnl/ke/thrdobj.c Thu Jan 18 00:53:45 2007 @@ -1126,7 +1126,6 @@ KPRIORITY OldBasePriority, Priority, BasePriority; LONG OldIncrement; PKPROCESS Process; - BOOLEAN Released = FALSE; ASSERT_THREAD(Thread); ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL); @@ -1220,25 +1219,14 @@ { /* Reset the quantum and do the actual priority modification */ Thread->Quantum = Thread->QuantumReset; - KiSetPriorityThread(Thread, Priority, &Released); + KiSetPriorityThread(Thread, Priority); } /* Release thread lock */ KiReleaseThreadLock(Thread); - /* Check if lock was released */ - if (!Released) - { - /* Release the dispatcher database */ - KiReleaseDispatcherLock(OldIrql); - } - else - { - /* Lower IRQL only */ - KeLowerIrql(OldIrql); - } - - /* Return old increment */ + /* Release the dispatcher database and return old increment */ + KiReleaseDispatcherLock(OldIrql); return OldIncrement; } @@ -1276,7 +1264,6 @@ { KIRQL OldIrql; KPRIORITY OldPriority; - BOOLEAN Released = FALSE; ASSERT_THREAD(Thread); ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL); ASSERT((Priority <= HIGH_PRIORITY) && (Priority >= LOW_PRIORITY)); @@ -1302,23 +1289,14 @@ if ((Thread->BasePriority != 0) && !(Priority)) Priority = 1; /* Set the new Priority */ - KiSetPriorityThread(Thread, Priority, &Released); + KiSetPriorityThread(Thread, Priority); } /* Release thread lock */ KiReleaseThreadLock(Thread); - /* Check if lock was released */ - if (!Released) - { - /* Release the dispatcher database */ - KiReleaseDispatcherLock(OldIrql); - } - else - { - /* Lower IRQL only */ - KeLowerIrql(OldIrql); - } + /* Release the dispatcher database */ + KiReleaseDispatcherLock(OldIrql); /* Return Old Priority */ return OldPriority; Modified: trunk/reactos/ntoskrnl/ke/thrdschd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/thrdschd.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/thrdschd.c (original) +++ trunk/reactos/ntoskrnl/ke/thrdschd.c Thu Jan 18 00:53:45 2007 @@ -14,8 +14,6 @@ /* GLOBALS *******************************************************************/ -LIST_ENTRY PriorityListHead[MAXIMUM_PRIORITY]; -ULONG PriorityListMask = 0; ULONG KiIdleSummary; ULONG KiIdleSMTSummary; @@ -30,7 +28,243 @@ KxQueueReadyThread(Thread, Prcb); } -static +VOID +NTAPI +KiDeferredReadyThread(IN PKTHREAD Thread) +{ + PKPRCB Prcb; + BOOLEAN Preempted; + ULONG Processor = 0; + KPRIORITY OldPriority; + PKTHREAD NextThread; + + /* Sanity checks */ + ASSERT(Thread->State == DeferredReady); + ASSERT((Thread->Priority >= 0) && (Thread->Priority <= HIGH_PRIORITY)); + + /* Check if we have any adjusts to do */ + if (Thread->AdjustReason == AdjustBoost) + { + /* Lock the thread */ + KiAcquireThreadLock(Thread); + + /* Check if the priority is low enough to qualify for boosting */ + if ((Thread->Priority <= Thread->AdjustIncrement) && + (Thread->Priority < (LOW_REALTIME_PRIORITY - 3)) && + !(Thread->DisableBoost)) + { + /* Calculate the new priority based on the adjust increment */ + OldPriority = min(Thread->AdjustIncrement + 1, + LOW_REALTIME_PRIORITY - 1); + + /* Make sure we're not decreasing outside of the priority range */ + ASSERT((Thread->PriorityDecrement >= 0) && + (Thread->PriorityDecrement <= Thread->Priority)); + + /* Calculate the new priority decrement based on the boost */ + Thread->PriorityDecrement += ((SCHAR)OldPriority - Thread->Priority); + + /* Again verify that this decrement is valid */ + ASSERT((Thread->PriorityDecrement >= 0) && + (Thread->PriorityDecrement <= OldPriority)); + + /* Set the new priority */ + Thread->Priority = (SCHAR)OldPriority; + } + + /* We need 4 quanta, make sure we have them, then decrease by one */ + if (Thread->Quantum < 4) Thread->Quantum = 4; + Thread->Quantum--; + + /* Make sure the priority is still valid */ + ASSERT((Thread->Priority >= 0) && (Thread->Priority <= HIGH_PRIORITY)); + + /* Release the lock and clear the adjust reason */ + KiReleaseThreadLock(Thread); + Thread->AdjustReason = AdjustNone; + } + else if (Thread->AdjustReason == AdjustUnwait) + { + /* Acquire the thread lock and check if this is a real-time thread */ + KiAcquireThreadLock(Thread); + if (Thread->Priority < LOW_REALTIME_PRIORITY) + { + /* It's not real time, but is it time critical? */ + if (Thread->BasePriority >= (LOW_REALTIME_PRIORITY - 2)) + { + /* It is, so simply reset its quantum */ + Thread->Quantum = Thread->QuantumReset; + } + else + { + /* Has the priority been adjusted previously? */ + if (!(Thread->PriorityDecrement) && (Thread->AdjustIncrement)) + { + /* Yes, reset its quantum */ + Thread->Quantum = Thread->QuantumReset; + } + + /* Wait code already handles quantum adjustment during APCs */ + if (Thread->WaitStatus != STATUS_KERNEL_APC) + { + /* Decrease the quantum by one and check if we're out */ + if (--Thread->Quantum <= 0) + { + /* We are, reset the quantum and get a new priority */ + Thread->Quantum = Thread->QuantumReset; + Thread->Priority = KiComputeNewPriority(Thread, 1); + } + } + } + + /* Now check if we have no decrement and boosts are enabled */ + if (!(Thread->PriorityDecrement) && !(Thread->DisableBoost)) + { + /* Make sure we have an increment */ + ASSERT(Thread->AdjustIncrement >= 0); + + /* Calculate the new priority after the increment */ + OldPriority = Thread->BasePriority + Thread->AdjustIncrement; + + /* Check if this new priority is higher */ + if (OldPriority > Thread->Priority) + { + /* Make sure we don't go into the real time range */ + if (OldPriority >= LOW_REALTIME_PRIORITY) + { + /* Normalize it back down one notch */ + OldPriority = LOW_REALTIME_PRIORITY - 1; + } + + /* Check if the priority is higher then the boosted base */ + if (OldPriority > (Thread->BasePriority + + Thread->AdjustIncrement)) + { + /* Setup a priority decrement to nullify the boost */ + Thread->PriorityDecrement = ((SCHAR)OldPriority - + Thread->BasePriority - + Thread->AdjustIncrement); + } + + /* Make sure that the priority decrement is valid */ + ASSERT((Thread->PriorityDecrement >= 0) && + (Thread->PriorityDecrement <= OldPriority)); + + /* Set this new priority */ + Thread->Priority = (SCHAR)OldPriority; + } + } + } + else + { + /* It's a real-time thread, so just reset its quantum */ + Thread->Quantum = Thread->QuantumReset; + } + + /* Make sure the priority makes sense */ + ASSERT((Thread->Priority >= 0) && (Thread->Priority <= HIGH_PRIORITY)); + + /* Release the thread lock and reset the adjust reason */ + KiReleaseThreadLock(Thread); + Thread->AdjustReason = AdjustNone; + } + + /* Clear thread preemption status and save current values */ + Preempted = Thread->Preempted; + OldPriority = Thread->Priority; + Thread->Preempted = FALSE; + + /* Queue the thread on CPU 0 and get the PRCB */ + Thread->NextProcessor = 0; + Prcb = KiProcessorBlock[0]; + + /* Check if we have an idle summary */ + if (KiIdleSummary) + { + /* Clear it and set this thread as the next one */ + KiIdleSummary = 0; + Thread->State = Standby; + Prcb->NextThread = Thread; + return; + } + + /* Set the CPU number */ + Thread->NextProcessor = (UCHAR)Processor; + + /* Get the next scheduled thread */ + NextThread = Prcb->NextThread; + if (NextThread) + { + /* Sanity check */ + ASSERT(NextThread->State == Standby); + + /* Check if priority changed */ + if (OldPriority > NextThread->Priority) + { + /* Preempt the thread */ + NextThread->Preempted = TRUE; + + /* Put this one as the next one */ + Thread->State = Standby; + Prcb->NextThread = Thread; + + /* Set it in deferred ready mode */ + NextThread->State = DeferredReady; + NextThread->DeferredProcessor = Prcb->Number; + KiReleasePrcbLock(Prcb); + KiDeferredReadyThread(NextThread); + return; + } + } + else + { + /* Set the next thread as the current thread */ + NextThread = Prcb->CurrentThread; + if (OldPriority > NextThread->Priority) + { + /* Preempt it if it's already running */ + if (NextThread->State == Running) NextThread->Preempted = TRUE; + + /* Set the thread on standby and as the next thread */ + Thread->State = Standby; + Prcb->NextThread = Thread; + + /* Release the lock */ + KiReleasePrcbLock(Prcb); + + /* Check if we're running on another CPU */ + if (KeGetCurrentProcessorNumber() != Thread->NextProcessor) + { + /* We are, send an IPI */ + KiIpiSendRequest(AFFINITY_MASK(Thread->NextProcessor), IPI_DPC); + } + return; + } + } + + /* Sanity check */ + ASSERT((OldPriority >= 0) && (OldPriority <= HIGH_PRIORITY)); + + /* Set this thread as ready */ + Thread->State = Ready; + Thread->WaitTime = KeTickCount.LowPart; + + /* Insert this thread in the appropriate order */ + Preempted ? InsertHeadList(&Prcb->DispatcherReadyListHead[OldPriority], + &Thread->WaitListEntry) : + InsertTailList(&Prcb->DispatcherReadyListHead[OldPriority], + &Thread->WaitListEntry); + + /* Update the ready summary */ + Prcb->ReadySummary |= PRIORITY_MASK(OldPriority); + + /* Sanity check */ + ASSERT(OldPriority == Thread->Priority); + + /* Release the lock */ + KiReleasePrcbLock(Prcb); +} + VOID KiInsertIntoThreadList(KPRIORITY Priority, PKTHREAD Thread) @@ -44,23 +278,21 @@ KEBUGCHECK(0); } - InsertTailList(&PriorityListHead[Priority], &Thread->WaitListEntry); - PriorityListMask |= (1 << Priority); -} - -static + InsertTailList(&KeGetCurrentPrcb()->DispatcherReadyListHead[Priority], &Thread->WaitListEntry); + KeGetCurrentPrcb()->ReadySummary |= (1 << Priority); +} + VOID KiRemoveFromThreadList(PKTHREAD Thread) { ASSERT(Ready == Thread->State); RemoveEntryList(&Thread->WaitListEntry); - if (IsListEmpty(&PriorityListHead[(ULONG)Thread->Priority])) { - - PriorityListMask &= ~(1 << Thread->Priority); - } -} - -static + if (IsListEmpty(&KeGetCurrentPrcb()->DispatcherReadyListHead[Thread->Priority])) { + + KeGetCurrentPrcb()->ReadySummary &= ~(1 << Thread->Priority); + } +} + PKTHREAD KiScanThreadList(KPRIORITY Priority, KAFFINITY Affinity) @@ -70,9 +302,9 @@ Mask = (1 << Priority); - if (PriorityListMask & Mask) { - - LIST_FOR_EACH(current, &PriorityListHead[Priority], KTHREAD, WaitListEntry) { + if (KeGetCurrentPrcb()->ReadySummary & Mask) { + + LIST_FOR_EACH(current, &KeGetCurrentPrcb()->DispatcherReadyListHead[Priority], KTHREAD, WaitListEntry) { if (current->State != Ready) { @@ -165,11 +397,18 @@ } VOID -NTAPI -KiDeferredReadyThread(IN PKTHREAD Thread) -{ - /* FIXME: Not yet implemented */ - KEBUGCHECK(0); +STDCALL +KiDispatchThread(ULONG NewThreadStatus) +{ + KIRQL OldIrql; + + if (KeGetCurrentPrcb()->IdleThread == NULL) { + return; + } + + OldIrql = KiAcquireDispatcherLock(); + KiDispatchThreadNoLock(NewThreadStatus); + KeLowerIrql(OldIrql); } PKTHREAD @@ -203,15 +442,71 @@ KiSwapThread(IN PKTHREAD CurrentThread, IN PKPRCB Prcb) { - BOOLEAN ApcState; + BOOLEAN ApcState = FALSE; + KIRQL WaitIrql; + LONG_PTR WaitStatus; + PKTHREAD NextThread; +#ifdef NEW_SCHEDULER + PEPROCESS HackOfDoom = PsGetCurrentProcess(); +#endif ASSERT(KeGetCurrentIrql() >= DISPATCH_LEVEL); + /* Acquire the PRCB lock */ + KiAcquirePrcbLock(Prcb); + + /* Get the next thread */ + NextThread = Prcb->NextThread; + if (NextThread) + { + /* Already got a thread, set it up */ + Prcb->NextThread = NULL; + Prcb->CurrentThread = NextThread; + NextThread->State = Running; + } + else + { #ifdef NEW_SCHEDULER - + /* Try to find a ready thread */ + NextThread = KiSelectReadyThread(0, Prcb); + if (NextThread) + { + /* Switch to it */ + Prcb->CurrentThread = NextThread; + NextThread->State = Running; + } + else + { + /* Set the idle summary */ + InterlockedOr(&KiIdleSummary, Prcb->SetMember); + + /* Schedule the idle thread */ + NextThread = Prcb->IdleThread; + Prcb->CurrentThread = NextThread; + NextThread->State = Running; + } #else - /* Find a new thread to run */ - ApcState = KiDispatchThreadNoLock(Waiting); + /* Find a new thread to run */ + ApcState = KiDispatchThreadNoLock(Waiting); #endif + } + + /* Sanity check and release the PRCB */ + ASSERT(CurrentThread != Prcb->IdleThread); + KiReleasePrcbLock(Prcb); + + /* Save the wait IRQL */ + WaitIrql = CurrentThread->WaitIrql; + +#ifdef NEW_SCHEDULER + /* REACTOS Mm Hack of Doom */ + MmUpdatePageDir(HackOfDoom,((PETHREAD)NextThread)->ThreadsProcess, sizeof(EPROCESS)); + + /* Swap contexts */ + ApcState = KiSwapContext(CurrentThread, NextThread); +#endif + + /* Get the wait status */ + WaitStatus = CurrentThread->WaitStatus; /* Check if we need to deliver APCs */ if (ApcState) @@ -221,29 +516,12 @@ /* Deliver APCs */ KiDeliverApc(KernelMode, NULL, NULL); - ASSERT(CurrentThread->WaitIrql == 0); - } - - /* Lower IRQL back to what it was */ - KfLowerIrql(CurrentThread->WaitIrql); - - /* Return the wait status */ - return CurrentThread->WaitStatus; -} - -VOID -STDCALL -KiDispatchThread(ULONG NewThreadStatus) -{ - KIRQL OldIrql; - - if (KeGetCurrentPrcb()->IdleThread == NULL) { - return; - } - - OldIrql = KiAcquireDispatcherLock(); - KiDispatchThreadNoLock(NewThreadStatus); - KeLowerIrql(OldIrql); + ASSERT(WaitIrql == 0); + } + + /* Lower IRQL back to what it was and return the wait status */ + KeLowerIrql(WaitIrql); + return WaitStatus; } VOID @@ -289,6 +567,7 @@ KiAdjustQuantumThread(IN PKTHREAD Thread) { PKPRCB Prcb = KeGetCurrentPrcb(); + PKTHREAD NextThread; /* Acquire thread and PRCB lock */ KiAcquireThreadLock(Thread); @@ -327,6 +606,7 @@ } #else /* We need to dispatch a new thread */ + NextThread = NULL; KiDispatchThread(Ready); #endif } @@ -339,10 +619,9 @@ } VOID -NTAPI +FASTCALL KiSetPriorityThread(IN PKTHREAD Thread, - IN KPRIORITY Priority, - OUT PBOOLEAN Released) + IN KPRIORITY Priority) { PKPRCB Prcb; ULONG Processor; @@ -381,7 +660,8 @@ if (RemoveEntryList(&Thread->WaitListEntry)) { /* Update the ready summary */ - Prcb->ReadySummary ^= PRIORITY_MASK(Thread->Priority); + Prcb->ReadySummary ^= PRIORITY_MASK(Thread-> + Priority); } #else KiRemoveFromThreadList(Thread); @@ -393,8 +673,7 @@ /* Re-insert it at its current priority */ #ifndef NEW_SCHEDULER KiInsertIntoThreadList(Priority, Thread); - KiDispatchThreadNoLock(Ready); - *Released = TRUE; + //KiDispatchThreadNoLock(Ready); #else KiInsertDeferredReadyList(Thread); #endif @@ -486,14 +765,13 @@ } #else /* Check for threads with a higher priority */ - if (PriorityListMask & ~((1 << (Priority + 1)) - 1)) + if (KeGetCurrentPrcb()->ReadySummary & ~((1 << (Priority + 1)) - 1)) { /* Found a thread, is it us? */ if (Thread == KeGetCurrentThread()) { /* Dispatch us */ - KiDispatchThreadNoLock(Ready); - *Released = TRUE; + //KiDispatchThreadNoLock(Ready); return; } } @@ -535,9 +813,6 @@ break; } } - - /* Return to caller */ - *Released = FALSE; } KAFFINITY @@ -579,13 +854,75 @@ NTAPI NtYieldExecution(VOID) { - // - // TODO (nothing too hard, just want to test out other code) - // - //DPRINT1("NO YIELD PERFORMED! If you see this, contact Alex\n"); - //return STATUS_NO_YIELD_PERFORMED; +#ifdef NEW_SCHEDULER + NTSTATUS Status = STATUS_NO_YIELD_PERFORMED; + KIRQL OldIrql; + PKPRCB Prcb = KeGetCurrentPrcb(); + PKTHREAD Thread = KeGetCurrentThread(), NextThread; + + /* Fail if there's no ready summary */ + if (!Prcb->ReadySummary) return Status; + + /* Raise IRQL to synch */ + OldIrql = KeRaiseIrqlToSynchLevel(); + + /* Now check if there's still a ready summary */ + if (Prcb->ReadySummary) + { + /* Acquire thread and PRCB lock */ + KiAcquireThreadLock(Thread); + KiAcquirePrcbLock(Prcb); + + /* Find a new thread to run if none was selected */ + if (!Prcb->NextThread) Prcb->NextThread = KiSelectReadyThread(1, Prcb); + + /* Make sure we still have a next thread to schedule */ + NextThread = Prcb->NextThread; + if (NextThread) + { + /* Reset quantum and recalculate priority */ + Thread->Quantum = Thread->QuantumReset; + Thread->Priority = KiComputeNewPriority(Thread, 1); + + /* Release the thread lock */ + KiReleaseThreadLock(Thread); + + /* Set context swap busy */ + KiSetThreadSwapBusy(Thread); + + /* Set the new thread as running */ + Prcb->NextThread = NULL; + Prcb->CurrentThread = NextThread; + NextThread->State = Running; + + /* Setup a yield wait and queue the thread */ + Thread->WaitReason = WrYieldExecution; + KxQueueReadyThread(Thread, Prcb); + + /* Make it wait at APC_LEVEL */ + Thread->WaitIrql = APC_LEVEL; + + /* Sanity check */ + ASSERT(OldIrql <= DISPATCH_LEVEL); + + /* Swap to new thread */ + KiSwapContext(Thread, NextThread); + Status = STATUS_SUCCESS; + } + else + { + /* Release the PRCB and thread lock */ + KiReleasePrcbLock(Prcb); + KiReleaseThreadLock(Thread); + } + } + + /* Lower IRQL and return */ + KeLowerIrql(OldIrql); + return Status; +#else KiDispatchThread(Ready); return STATUS_SUCCESS; -} - - +#endif +} + Modified: trunk/reactos/ntoskrnl/ps/psmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/psmgr.c?rev=25… ============================================================================== --- trunk/reactos/ntoskrnl/ps/psmgr.c (original) +++ trunk/reactos/ntoskrnl/ps/psmgr.c Thu Jan 18 00:53:45 2007 @@ -289,7 +289,6 @@ PETHREAD SysThread; MM_SYSTEMSIZE SystemSize; UNICODE_STRING Name; - ULONG i; OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; /* FIXME: Initialize Lock Data do it STATIC */ @@ -379,12 +378,6 @@ ObjectTypeInitializer.ValidAccessMask = PROCESS_ALL_ACCESS; ObjectTypeInitializer.DeleteProcedure = PspDeleteProcess; ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &PsProcessType); - - /* Setup ROS Scheduler lists (HACK!) */ - for (i = 0; i < MAXIMUM_PRIORITY; i++) - { - InitializeListHead(&PriorityListHead[i]); - } /* Initialize the Thread type */ RtlInitUnicodeString(&Name, L"Thread");

17 years, 9 months

[ion] 25501: [10 bug fixes]: - Simplify KiSelectReadyThread. - Use ASSERT_IRQL_EQUAL instead of ASSERT_IRQL, because ASSERT_IRQL is braindead and doesn't actually do what the name proposes. This caused us to miss many critical bugs. - Don't lower IRQL to PASSIVE_LEVEL after KeInsertQueueApc. This caused a call to KiExitDispatcher at PASSIVE, which is completely fucked. Also do the same fix in KeFreezeAllThreads and KeThawAllThreads. - Implement code in KiDispatchInterrupt to switch to a new thre

by ion＠svn.reactos.org

Author: ion Date: Wed Jan 17 23:44:37 2007 New Revision: 25501 URL: http://svn.reactos.org/svn/reactos?rev=25501&view=rev Log: [10 bug fixes]: - Simplify KiSelectReadyThread. - Use ASSERT_IRQL_EQUAL instead of ASSERT_IRQL, because ASSERT_IRQL is braindead and doesn't actually do what the name proposes. This caused us to miss many critical bugs. - Don't lower IRQL to PASSIVE_LEVEL after KeInsertQueueApc. This caused a call to KiExitDispatcher at PASSIVE, which is completely fucked. Also do the same fix in KeFreezeAllThreads and KeThawAllThreads. - Implement code in KiDispatchInterrupt to switch to a new thread, but don't enable for now. - Fix the KiMask32Array. One of the values was totally off and screwed up priority/affinity masks. - Exit the dispatcher in KiAdjustQuantumThread. This wasn't done, thus causing a weird system state. - Fix a bug in KiSetPriorityThread which wasn't properly checking the ProcessReadyQueue member and thus not applying priority changes. - Fixup lock release and dispatcher exit in wait functions in the NoWait case. It was inverted and messed up, leading to system inconsistency. Modified: trunk/reactos/include/ndk/asm.h trunk/reactos/ntoskrnl/KrnlFun.c trunk/reactos/ntoskrnl/include/internal/ke_x.h trunk/reactos/ntoskrnl/io/iomgr/controller.c trunk/reactos/ntoskrnl/io/iomgr/deviface.c trunk/reactos/ntoskrnl/ke/apc.c trunk/reactos/ntoskrnl/ke/dpc.c trunk/reactos/ntoskrnl/ke/i386/cpu.c trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S trunk/reactos/ntoskrnl/ke/i386/thread.c trunk/reactos/ntoskrnl/ke/i386/trap.s trunk/reactos/ntoskrnl/ke/thrdobj.c trunk/reactos/ntoskrnl/ke/thrdschd.c trunk/reactos/ntoskrnl/ke/wait.c trunk/reactos/ntoskrnl/ps/kill.c trunk/reactos/ntoskrnl/vdm/vdmexec.c Modified: trunk/reactos/include/ndk/asm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/asm.h?rev=2550… ============================================================================== --- trunk/reactos/include/ndk/asm.h (original) +++ trunk/reactos/include/ndk/asm.h Wed Jan 17 23:44:37 2007 @@ -101,15 +101,16 @@ #define KTHREAD_STACK_LIMIT 0x1C #define KTHREAD_TEB 0x74 #define KTHREAD_KERNEL_STACK 0x20 -#define KTHREAD_STATE 0x4C -#define KTHREAD_NPX_STATE 0x4D #define KTHREAD_ALERTED 0x5E #define KTHREAD_APCSTATE_PROCESS 0x28 + 0x10 #define KTHREAD_PENDING_USER_APC 0x28 + 0x16 #define KTHREAD_PENDING_KERNEL_APC 0x28 + 0x15 #define KTHREAD_CONTEXT_SWITCHES 0x48 +#define KTHREAD_STATE 0x4C +#define KTHREAD_NPX_STATE 0x4D #define KTHREAD_WAIT_IRQL 0x4E #define KTHREAD_NEXT_PROCESSOR 0x40 +#define KTHREAD_WAIT_REASON 0x5A #define KTHREAD_SWAP_BUSY 0x5D #define KTHREAD_SERVICE_TABLE 0x118 #define KTHREAD_PREVIOUS_MODE 0xD7 Modified: trunk/reactos/ntoskrnl/KrnlFun.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/KrnlFun.c?rev=255… ============================================================================== --- trunk/reactos/ntoskrnl/KrnlFun.c (original) +++ trunk/reactos/ntoskrnl/KrnlFun.c Wed Jan 17 23:44:37 2007 @@ -8,12 +8,15 @@ // Do NOT ask when it will be fixed. // Failure to respect this will *ACHIEVE NOTHING*. // +// Ke1: +// - Implement KiInitMachineDependent. +// - Implement Privileged Instruction Handler in Umode GPF. +// // Ex: // - Use pushlocks for handle implementation. // -// Ke1: -// - Implement KiInitMachineDependent. -// - Implement Privileged Instruction Handler in Umode GPF. +// Ke2: +// - Dispatcher Rewrite (DPCs-Timers-Waits). // // Hal: // - Use APC and DPC Interrupt Dispatchers. @@ -21,10 +24,6 @@ // // Fstub: // - Implement IoAssignDriveLetters using mount manager support. -// -// Ke2: -// - New optimized table-based tick-hashed timer implementation. -// - New Thread Scheduler based on 2003. // // Kd: // - Implement KD Kernel Debugging and WinDBG support. Modified: trunk/reactos/ntoskrnl/include/internal/ke_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke_x.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ke_x.h Wed Jan 17 23:44:37 2007 @@ -1257,21 +1257,20 @@ KiSelectReadyThread(IN KPRIORITY Priority, IN PKPRCB Prcb) { - LONG PriorityMask, PrioritySet, HighPriority; + ULONG PrioritySet, HighPriority; PLIST_ENTRY ListEntry; PKTHREAD Thread = NULL; /* Save the current mask and get the priority set for the CPU */ - PriorityMask = Priority; - PrioritySet = Prcb->ReadySummary >> (UCHAR)Priority; + PrioritySet = Prcb->ReadySummary >> Priority; if (!PrioritySet) goto Quickie; - /* Get the highest priority possible */ + /* Get the highest priority possible */ BitScanReverse((PULONG)&HighPriority, PrioritySet); ASSERT((PrioritySet & PRIORITY_MASK(HighPriority)) != 0); - HighPriority += PriorityMask; - - /* Make sure the list isn't at highest priority */ + HighPriority += Priority; + + /* Make sure the list isn't empty at the highest priority */ ASSERT(IsListEmpty(&Prcb->DispatcherReadyListHead[HighPriority]) == FALSE); /* Get the first thread on the list */ Modified: trunk/reactos/ntoskrnl/io/iomgr/controller.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/controll… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/controller.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/controller.c Wed Jan 17 23:44:37 2007 @@ -28,7 +28,7 @@ IN PVOID Context) { IO_ALLOCATION_ACTION Result; - ASSERT_IRQL(DISPATCH_LEVEL); + ASSERT_IRQL_EQUAL(DISPATCH_LEVEL); /* Initialize the Wait Context Block */ DeviceObject->Queue.Wcb.DeviceContext = Context; Modified: trunk/reactos/ntoskrnl/io/iomgr/deviface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/deviface… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/deviface.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/deviface.c Wed Jan 17 23:44:37 2007 @@ -632,7 +632,7 @@ NTSTATUS Status; PEXTENDED_DEVOBJ_EXTENSION DeviceObjectExtension; - ASSERT_IRQL(PASSIVE_LEVEL); + ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); DPRINT("IoRegisterDeviceInterface(): PDO %p, RefString: %wZ\n", PhysicalDeviceObject, ReferenceString); Modified: trunk/reactos/ntoskrnl/ke/apc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/apc.c?rev=2550… ============================================================================== --- trunk/reactos/ntoskrnl/ke/apc.c (original) +++ trunk/reactos/ntoskrnl/ke/apc.c Wed Jan 17 23:44:37 2007 @@ -725,7 +725,7 @@ } /* Release the APC lock and return success */ - KiReleaseApcLock(&ApcLock); + KiReleaseApcLockFromDpcLevel(&ApcLock); KiExitDispatcher(ApcLock.OldIrql); return State; } @@ -951,3 +951,4 @@ } + Modified: trunk/reactos/ntoskrnl/ke/dpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/dpc.c?rev=2550… ============================================================================== --- trunk/reactos/ntoskrnl/ke/dpc.c (original) +++ trunk/reactos/ntoskrnl/ke/dpc.c Wed Jan 17 23:44:37 2007 @@ -199,7 +199,7 @@ DeferredContext, SystemArgument1, SystemArgument2); - ASSERT_IRQL(DISPATCH_LEVEL); + ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); /* Disable interrupts and keep looping */ _disable(); 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 (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c Wed Jan 17 23:44:37 2007 @@ -764,7 +764,7 @@ KeSaveFloatingPointState(OUT PKFLOATING_SAVE Save) { PFNSAVE_FORMAT FpState; - ASSERT_IRQL(DISPATCH_LEVEL); + ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); DPRINT1("%s is not really implemented\n", __FUNCTION__); /* check if we are doing software emulation */ 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 (original) +++ trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S Wed Jan 17 23:44:37 2007 @@ -11,11 +11,11 @@ /* INCLUDES ******************************************************************/ #include <roscfg.h> -#include <internal/i386/ke.h> #include <ndk/asm.h> .intel_syntax noprefix #define Running 2 +#define WrDispatchInt 0x1F /* FUNCTIONS ****************************************************************/ @@ -289,6 +289,7 @@ * Absolutely all registers except ESP can be trampled here for maximum code flexibility. * *--*/ +.globl @KiSwapContextInternal@0 .func @KiSwapContextInternal@0, @KiSwapContextInternal@0 @KiSwapContextInternal@0: @@ -413,7 +414,7 @@ sub eax, NPX_FRAME_LENGTH /* Check if this isn't V86 Mode, so we can bias the Esp0 */ - test dword ptr [eax - KTRAP_FRAME_SIZE + KTRAP_FRAME_EFLAGS], X86_EFLAGS_VM + test dword ptr [eax - KTRAP_FRAME_SIZE + KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK jnz NoAdjust /* Bias esp */ @@ -562,7 +563,6 @@ .globl @KiSwapContext@8 .func @KiSwapContext@8, @KiSwapContext@8 @KiSwapContext@8: - /* Note, we CANNOT touch ebp */ /* Save 4 registers */ sub esp, 4 * 4 @@ -664,7 +664,7 @@ /* Set the current thread to ready */ mov edi, [ebx+KPCR_CURRENT_THREAD] #ifdef CONFIG_SMP - mov [edi+KTHREAD_STATE], Ready + mov byte ptr [edi+KTHREAD_SWAP_BUSY], 1 /* Acquire the PRCB Lock */ lock bts [ebx+KPCR_PRCB_PRCB_LOCK], 0 Modified: trunk/reactos/ntoskrnl/ke/i386/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/thread.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/thread.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/thread.c Wed Jan 17 23:44:37 2007 @@ -6,18 +6,18 @@ * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ -/* INCLUDES ****************************************************************/ +/* INCLUDES ******************************************************************/ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> - -typedef struct _KSHARED_CTXSWITCH_FRAME +#include <debug.h> + +typedef struct _KSWITCHFRAME { PVOID ExceptionList; - KIRQL WaitIrql; - PVOID RetEip; -} KSHARED_CTXSWITCH_FRAME, *PKSHARED_CTXSWITCH_FRAME; + BOOLEAN ApcBypassDisable; + PVOID RetAddr; +} KSWITCHFRAME, *PKSWITCHFRAME; typedef struct _KSTART_FRAME { @@ -27,65 +27,47 @@ BOOLEAN UserThread; } KSTART_FRAME, *PKSTART_FRAME; -/* - * This is the Initial Thread Stack Frame on i386. - * - * It is composed of : - * - * - A shared Thread Switching frame so that we can use - * the context-switching code when initializing the thread. - * - * - The Stack Frame for KiThreadStartup, which are the parameters - * that it will receive (System/Start Routines & Context) - * - * - A Trap Frame with the Initial Context *IF AND ONLY IF THE THREAD IS USER* - * - * - The FPU Save Area, theoretically part of the Trap Frame's "ExtendedRegisters" - * - * This Initial Thread Stack Frame starts at Thread->InitialStack and it spans - * a total size of 0x2B8 bytes. - */ -typedef struct _KUINIT_FRAME { - KSHARED_CTXSWITCH_FRAME CtxSwitchFrame; /* -0x2B8 */ - KSTART_FRAME StartFrame; /* -0x2AC */ - KTRAP_FRAME TrapFrame; /* -0x29C */ - FX_SAVE_AREA FxSaveArea; /* -0x210 */ +typedef struct _KUINIT_FRAME +{ + KSWITCHFRAME CtxSwitchFrame; + KSTART_FRAME StartFrame; + KTRAP_FRAME TrapFrame; + FX_SAVE_AREA FxSaveArea; } KUINIT_FRAME, *PKUINIT_FRAME; -typedef struct _KKINIT_FRAME { - KSHARED_CTXSWITCH_FRAME CtxSwitchFrame; /* -0x22C */ - KSTART_FRAME StartFrame; /* -0x220 */ - FX_SAVE_AREA FxSaveArea; /* -0x210 */ +typedef struct _KKINIT_FRAME +{ + KSWITCHFRAME CtxSwitchFrame; + KSTART_FRAME StartFrame; + FX_SAVE_AREA FxSaveArea; } KKINIT_FRAME, *PKKINIT_FRAME; /* FUNCTIONS *****************************************************************/ VOID -STDCALL -Ke386InitThreadWithContext(PKTHREAD Thread, - PKSYSTEM_ROUTINE SystemRoutine, - PKSTART_ROUTINE StartRoutine, - PVOID StartContext, - PCONTEXT ContextPointer) +NTAPI +Ke386InitThreadWithContext(IN PKTHREAD Thread, + IN PKSYSTEM_ROUTINE SystemRoutine, + IN PKSTART_ROUTINE StartRoutine, + IN PVOID StartContext, + IN PCONTEXT ContextPointer) { PFX_SAVE_AREA FxSaveArea; PFXSAVE_FORMAT FxSaveFormat; PKSTART_FRAME StartFrame; - PKSHARED_CTXSWITCH_FRAME CtxSwitchFrame; + PKSWITCHFRAME CtxSwitchFrame; PKTRAP_FRAME TrapFrame; CONTEXT LocalContext; PCONTEXT Context = NULL; ULONG ContextFlags; /* Check if this is a With-Context Thread */ - DPRINT("Ke386InitThreadContext\n"); if (ContextPointer) { /* Set up the Initial Frame */ PKUINIT_FRAME InitFrame; InitFrame = (PKUINIT_FRAME)((ULONG_PTR)Thread->InitialStack - sizeof(KUINIT_FRAME)); - DPRINT("Setting up a user-mode thread. InitFrame at: %p\n", InitFrame); /* Copy over the context we got */ RtlCopyMemory(&LocalContext, ContextPointer, sizeof(CONTEXT)); @@ -190,7 +172,6 @@ PKKINIT_FRAME InitFrame; InitFrame = (PKKINIT_FRAME)((ULONG_PTR)Thread->InitialStack - sizeof(KKINIT_FRAME)); - DPRINT("Setting up a kernel thread. InitFrame at: %p\n", InitFrame); /* Setup the Fx Area */ FxSaveArea = &InitFrame->FxSaveArea; @@ -230,15 +211,14 @@ StartFrame->SystemRoutine = SystemRoutine; /* And set up the Context Switch Frame */ - CtxSwitchFrame->RetEip = KiThreadStartup; - CtxSwitchFrame->WaitIrql = APC_LEVEL; - CtxSwitchFrame->ExceptionList = (PVOID)0xFFFFFFFF; + CtxSwitchFrame->RetAddr = KiThreadStartup; + CtxSwitchFrame->ApcBypassDisable = TRUE; + CtxSwitchFrame->ExceptionList = EXCEPTION_CHAIN_END;; /* Save back the new value of the kernel stack. */ - DPRINT("Final Kernel Stack: %x \n", CtxSwitchFrame); Thread->KernelStack = (PVOID)CtxSwitchFrame; - return; } /* EOF */ + Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/trap.s (original) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s Wed Jan 17 23:44:37 2007 @@ -11,6 +11,9 @@ #include <asm.h> #include <internal/i386/asmmacro.S> .intel_syntax noprefix + +#define Running 2 +#define WrDispatchInt 0x1F /* GLOBALS *******************************************************************/ @@ -2082,7 +2085,7 @@ /* Restore stack and exception list */ pop esp - pop dword ptr [ebx] + pop dword ptr [ebx+KPCR_EXCEPTION_LIST] pop ebp CheckQuantum: @@ -2096,10 +2099,44 @@ /* Check if we have a thread to swap to */ cmp byte ptr [ebx+KPCR_PRCB_NEXT_THREAD], 0 - jz Return - - /* FIXME: Schedule new thread */ - UNHANDLED_PATH + jmp Return + + /* Make space on the stack to save registers */ + sub esp, 3 * 4 + mov [esp+8], esi + mov [esi+4], edi + mov [esi+0], ebp + + /* Get the current thread */ + mov edi, [ebx+KPCR_CURRENT_THREAD] + +#ifdef CONFIG_SMP + #error SMP Interrupt not handled! +#endif + + /* Get the next thread and clear it */ + mov esi, [ebx+KPCR_PRCB_NEXT_THREAD] + and dword ptr [ebx+KPCR_PRCB_NEXT_THREAD], 0 + + /* Set us as the current running thread */ + mov [ebx+KPCR_CURRENT_THREAD], esi + mov byte ptr [esi+KTHREAD_STATE], Running + mov byte ptr [edi+KTHREAD_WAIT_REASON], WrDispatchInt + + /* Put thread in ECX and get the PRCB in EDX */ + mov ecx, edi + lea edx, [ebx+KPCR_PRCB_DATA] + call @KiQueueReadyThread@8 + + /* Set APC_LEVEL and do the swap */ + mov cl, APC_LEVEL + call @KiSwapContextInternal@0 + + /* Restore registers */ + mov ebp, [esp+0] + mov edi, [esp+4] + mov esi, [esp+8] + add esp, 3*4 Return: /* All done */ Modified: trunk/reactos/ntoskrnl/ke/thrdobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/thrdobj.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/thrdobj.c (original) +++ trunk/reactos/ntoskrnl/ke/thrdobj.c Wed Jan 17 23:44:37 2007 @@ -18,7 +18,7 @@ ULONG KiMask32Array[MAXIMUM_PRIORITY] = { 0x1, 0x2, 0x4, 0x8, 0x10, 0x20, - 0x40, 0x80, 0x100, 0x200, 0x4000, 0x800, + 0x40, 0x80, 0x100, 0x200, 0x400, 0x800, 0x1000, 0x2000, 0x4000, 0x8000, 0x10000, 0x20000, 0x40000, 0x80000, 0x100000, 0x200000, 0x400000, 0x800000, 0x1000000, 0x2000000, 0x4000000, 0x8000000, 0x10000000, 0x20000000, @@ -311,7 +311,7 @@ } while (NextEntry != ListHead); /* Release the process lock and exit the dispatcher */ - KiReleaseProcessLock(&LockHandle); + KiReleaseProcessLockFromDpcLevel(&LockHandle); KiExitDispatcher(LockHandle.OldIrql); } @@ -634,7 +634,7 @@ } while (NextEntry != ListHead); /* Release the process lock and exit the dispatcher */ - KiReleaseProcessLock(&LockHandle); + KiReleaseProcessLockFromDpcLevel(&LockHandle); KiExitDispatcher(LockHandle.OldIrql); /* Leave the critical region */ Modified: trunk/reactos/ntoskrnl/ke/thrdschd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/thrdschd.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/thrdschd.c (original) +++ trunk/reactos/ntoskrnl/ke/thrdschd.c Wed Jan 17 23:44:37 2007 @@ -21,6 +21,15 @@ /* FUNCTIONS *****************************************************************/ +VOID +FASTCALL +KiQueueReadyThread(IN PKTHREAD Thread, + IN PKPRCB Prcb) +{ + /* Call the macro. We keep the API for compatibility with ASM code */ + KxQueueReadyThread(Thread, Prcb); +} + static VOID KiInsertIntoThreadList(KPRIORITY Priority, @@ -247,7 +256,7 @@ if (Process->State != ProcessInMemory) { /* We don't page out processes in ROS */ - ASSERT(FALSE); + KEBUGCHECK(0); } else if (!Thread->KernelStackResident) { @@ -260,7 +269,7 @@ Thread->State = Transition; /* The stack is always resident in ROS */ - ASSERT(FALSE); + KEBUGCHECK(0); } else { @@ -326,10 +335,11 @@ /* Release locks */ KiReleasePrcbLock(Prcb); KiReleaseThreadLock(Thread); -} - -VOID -STDCALL + KiExitDispatcher(Thread->WaitIrql); +} + +VOID +NTAPI KiSetPriorityThread(IN PKTHREAD Thread, IN KPRIORITY Priority, OUT PBOOLEAN Released) @@ -351,7 +361,7 @@ if (Thread->State == Ready) { /* Make sure we're not on the ready queue */ - if (Thread->ProcessReadyQueue) + if (!Thread->ProcessReadyQueue) { /* Get the PRCB for the thread and lock it */ Processor = Thread->NextProcessor; @@ -362,12 +372,12 @@ if ((Thread->State == Ready) && (Thread->NextProcessor == Prcb->Number)) { +#ifdef NEW_SCHEDULER /* Sanity check */ ASSERT((Prcb->ReadySummary & PRIORITY_MASK(Thread->Priority))); /* Remove it from the current queue */ -#ifdef NEW_SCHEDULER if (RemoveEntryList(&Thread->WaitListEntry)) { /* Update the ready summary */ @@ -395,7 +405,6 @@ else { /* Release the lock and loop again */ - KEBUGCHECK(0); KiReleasePrcbLock(Prcb); continue; } @@ -409,7 +418,6 @@ else if (Thread->State == Standby) { /* Get the PRCB for the thread and lock it */ - KEBUGCHECK(0); Processor = Thread->NextProcessor; Prcb = KiProcessorBlock[Processor]; KiAcquirePrcbLock(Prcb); Modified: trunk/reactos/ntoskrnl/ke/wait.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/wait.c?rev=255… ============================================================================== --- trunk/reactos/ntoskrnl/ke/wait.c (original) +++ trunk/reactos/ntoskrnl/ke/wait.c Wed Jan 17 23:44:37 2007 @@ -161,7 +161,7 @@ BOOLEAN PendingApc; /* Make sure we're at synchronization level */ - ASSERT_IRQL(SYNCH_LEVEL); + ASSERT_IRQL_EQUAL(SYNCH_LEVEL); /* Check if we have deferred threads */ KiCheckDeferredReadyList(Prcb); @@ -484,11 +484,11 @@ return WaitStatus; DontWait: - /* Adjust the Quantum */ + /* Release dispatcher lock but maintain high IRQL */ + KiReleaseDispatcherLockFromDpcLevel(); + + /* Adjust the Quantum and return the wait status */ KiAdjustQuantumThread(Thread); - - /* Release & Return */ - KiReleaseDispatcherLock(Thread->WaitIrql); return WaitStatus; } @@ -761,11 +761,11 @@ return WaitStatus; DontWait: - /* Adjust the Quantum */ + /* Release dispatcher lock but maintain high IRQL */ + KiReleaseDispatcherLockFromDpcLevel(); + + /* Adjust the Quantum and return the wait status */ KiAdjustQuantumThread(Thread); - - /* Release & Return */ - KiReleaseDispatcherLock(Thread->WaitIrql); return WaitStatus; } Modified: trunk/reactos/ntoskrnl/ps/kill.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/kill.c?rev=255… ============================================================================== --- trunk/reactos/ntoskrnl/ps/kill.c (original) +++ trunk/reactos/ntoskrnl/ps/kill.c Wed Jan 17 23:44:37 2007 @@ -911,7 +911,7 @@ if ((bSelf) || (PsGetCurrentThread() == Thread)) { /* This should only happen at passive */ - ASSERT_IRQL(PASSIVE_LEVEL); + ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); /* Mark it as terminated */ PspSetCrossThreadFlag(Thread, CT_TERMINATED_BIT); Modified: trunk/reactos/ntoskrnl/vdm/vdmexec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/vdm/vdmexec.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/vdm/vdmexec.c (original) +++ trunk/reactos/ntoskrnl/vdm/vdmexec.c Wed Jan 17 23:44:37 2007 @@ -49,7 +49,7 @@ ULONG EFlags, OldEFlags; /* Make sure that we're at APC_LEVEL and that this is a valid frame */ - ASSERT_IRQL(APC_LEVEL); + ASSERT(KeGetCurrentIrql() == APC_LEVEL); ASSERT(TrapFrame->DbgArgMark == 0xBADB0D00); /* Check if this is a V86 frame */ @@ -321,3 +321,4 @@ return TRUE; } +

17 years, 9 months

[greatlrd] 25500: fixing dymatic abi for ppc, and implement a dymatic abi even for ia32 converter

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Wed Jan 17 23:25:46 2007 New Revision: 25500 URL: http://svn.reactos.org/svn/reactos?rev=25500&view=rev Log: fixing dymatic abi for ppc, and implement a dymatic abi even for ia32 converter Modified: trunk/rosapps/devutils/cputointel/ConvertToIA32Process.c trunk/rosapps/devutils/cputointel/ConvertingProcess.c trunk/rosapps/devutils/cputointel/any_op.h Modified: trunk/rosapps/devutils/cputointel/ConvertToIA32Process.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/Conver… ============================================================================== --- trunk/rosapps/devutils/cputointel/ConvertToIA32Process.c (original) +++ trunk/rosapps/devutils/cputointel/ConvertToIA32Process.c Wed Jan 17 23:25:46 2007 @@ -8,21 +8,67 @@ #include "misc.h" #include "any_op.h" -CPU_INT ConvertToIA32Process( FILE *outfp, CPU_INT eax, CPU_INT ebp, - CPU_INT edx, CPU_INT esp, +/* + * eax = register 3 + * edx = register 4 + * esp = register 1 + * ebp = register 31 + + * ecx = 8 + * ebx = 9 + * esi = 10 + * edi = 11 + * mmx/sse/fpu 0 = 12 + * mmx/sse/fpu 1 = 14 + * mmx/sse/fpu 2 = 16 + * mmx/sse/fpu 3 = 18 + * mmx/sse/fpu 4 = 20 + * mmx/sse/fpu 5 = 22 + * mmx/sse/fpu 6 = 24 + * mmx/sse/fpu 7 = 28 + */ + +CPU_INT ConvertToIA32Process( FILE *outfp, PMYBrainAnalys pMystart, PMYBrainAnalys pMyend, CPU_INT regbits, - CPU_INT HowManyRegInUse) + CPU_INT HowManyRegInUse, + CPU_INT *RegTableCount) { CPU_INT stack = 0; CPU_UNINT tmp; CPU_INT setup_ebp = 0 ; /* 0 = no, 1 = yes */ - - /* Fixme at moment we can not optimze code */ + CPU_INT t=0; + + /* Fixme optimze the RegTableCount table */ + //if (HowManyRegInUse > 9) - if (HowManyRegInUse > 4) - { + if (HowManyRegInUse > 8) + { + setup_ebp =1; /* we will use ebx as ebp */ + stack = HowManyRegInUse * regbits; + } + + if (RegTableCount[1]!=0) + t++; + if (RegTableCount[3]!=0) + t++; + if (RegTableCount[4]!=0) + t++; + if (RegTableCount[8]!=0) + t++; + if (RegTableCount[9]!=0) + t++; + if (RegTableCount[10]!=0) + t++; + if (RegTableCount[11]!=0) + t++; + if (RegTableCount[31]!=0) + t++; + + if (HowManyRegInUse != t) + { + /* fixme optimze the table or active the frame pointer */ setup_ebp =1; /* we will use ebx as ebp */ stack = HowManyRegInUse * regbits; } @@ -42,19 +88,7 @@ fprintf(outfp,"mov ebx,esp\n"); fprintf(outfp,"sub esp, %d ; Alloc %d bytes for reg\n\n",stack,stack); } - else - { - /* - 0 EAX - 1 ECX - 2 EDX - 5 EBX - 6 ESP - 7 EBP - 8 ESI - 9 EDI - */ - } + fprintf(outfp,"; Start the program \n"); while (pMystart!=NULL) @@ -75,33 +109,73 @@ { /* source are imm */ - if (pMystart->dst == eax) + /* + * esi = 10 + * edi = 11 */ + + /* eax */ + if (pMystart->dst == RegTableCount[3]) { if (pMystart->src == 0) fprintf(outfp,"xor eax,eax\n"); else fprintf(outfp,"mov eax,%llu\n",pMystart->src); } - else if (pMystart->dst == ebp) + /* ebp */ + else if (pMystart->dst == RegTableCount[31]) { if (pMystart->src == 0) fprintf(outfp,"xor ebp,ebp\n"); else fprintf(outfp,"mov ebp,%llu\n",pMystart->src); } - else if (pMystart->dst == edx) + /* edx */ + else if (pMystart->dst == RegTableCount[4]) { if (pMystart->src == 0) fprintf(outfp,"xor edx,edx\n"); else fprintf(outfp,"mov edx,%llu\n",pMystart->src); } - else if (pMystart->dst == esp) + /* esp */ + else if (pMystart->dst == RegTableCount[1]) { if (pMystart->src == 0) fprintf(outfp,"xor esp,esp\n"); else fprintf(outfp,"mov esp,%llu\n",pMystart->src); + } + /* ecx */ + else if (pMystart->dst == RegTableCount[8]) + { + if (pMystart->src == 0) + fprintf(outfp,"xor ecx,ecx\n"); + else + fprintf(outfp,"mov ecx,%llu\n",pMystart->src); + } + /* ebx */ + else if (pMystart->dst == RegTableCount[9]) + { + if (pMystart->src == 0) + fprintf(outfp,"xor ebx,ebx\n"); + else + fprintf(outfp,"mov ebx,%llu\n",pMystart->src); + } + /* esi */ + else if (pMystart->dst == RegTableCount[10]) + { + if (pMystart->src == 0) + fprintf(outfp,"xor esi,esi\n"); + else + fprintf(outfp,"mov esi,%llu\n",pMystart->src); + } + /* edi */ + else if (pMystart->dst == RegTableCount[10]) + { + if (pMystart->src == 0) + fprintf(outfp,"xor edi,edi\n"); + else + fprintf(outfp,"mov edi,%llu\n",pMystart->src); } else { Modified: trunk/rosapps/devutils/cputointel/ConvertingProcess.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/Conver… ============================================================================== --- trunk/rosapps/devutils/cputointel/ConvertingProcess.c (original) +++ trunk/rosapps/devutils/cputointel/ConvertingProcess.c Wed Jan 17 23:25:46 2007 @@ -13,10 +13,6 @@ CPU_INT ConvertProcess(FILE *outfp, CPU_INT FromCpuid, CPU_INT ToCpuid) { CPU_INT ret=0; - CPU_INT eax =-1; - CPU_INT ebp =-1; - CPU_INT edx =-1; - CPU_INT esp =-1; CPU_INT regbits=-1; CPU_INT HowManyRegInUse = 0; CPU_INT RegTableCount[32] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; @@ -31,10 +27,6 @@ (FromCpuid == IMAGE_FILE_MACHINE_I386)) { regbits = 32 / 8; - esp = 1; - eax = 3; - edx = 4; - ebp = 31; } /* FIXME calc where todo first split */ @@ -61,19 +53,19 @@ if (RegTableCount[t]!=0) { HowManyRegInUse++; + RegTableCount[t]=t; } - } + /* switch to the acual converting now */ switch (ToCpuid) { case IMAGE_FILE_MACHINE_I386: - ret = ConvertToIA32Process( outfp, eax, ebp, - edx, esp, - pMystart, - pMyend, regbits, - HowManyRegInUse); + ret = ConvertToIA32Process( outfp, pMystart, + pMyend, regbits, + HowManyRegInUse, + RegTableCount); if (ret !=0) { printf("should not happen contact a devloper, x86 fail\n"); @@ -82,11 +74,10 @@ break; case IMAGE_FILE_MACHINE_POWERPC: - ret = ConvertToPPCProcess( outfp, eax, ebp, - edx, esp, - pMystart, - pMyend, regbits, - HowManyRegInUse); + ret = ConvertToPPCProcess( outfp, pMystart, + pMyend, regbits, + HowManyRegInUse, + RegTableCount); if (ret !=0) { printf("should not happen contact a devloper, x86 fail\n"); Modified: trunk/rosapps/devutils/cputointel/any_op.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/any_op… ============================================================================== --- trunk/rosapps/devutils/cputointel/any_op.h (original) +++ trunk/rosapps/devutils/cputointel/any_op.h Wed Jan 17 23:25:46 2007 @@ -11,18 +11,18 @@ * esp = register 1 * ebp = register 31 - * ecx = 5 - * ebx = 6 - * esi = 7 - * edi = 8 - * mmx/sse/fpu 0 = 10 - * mmx/sse/fpu 1 = 12 - * mmx/sse/fpu 2 = 14 - * mmx/sse/fpu 3 = 16 - * mmx/sse/fpu 4 = 18 - * mmx/sse/fpu 5 = 20 - * mmx/sse/fpu 6 = 22 - * mmx/sse/fpu 7 = 24 + * ecx = 8 + * ebx = 9 + * esi = 10 + * edi = 11 + * mmx/sse/fpu 0 = 12 + * mmx/sse/fpu 1 = 14 + * mmx/sse/fpu 2 = 16 + * mmx/sse/fpu 3 = 18 + * mmx/sse/fpu 4 = 20 + * mmx/sse/fpu 5 = 22 + * mmx/sse/fpu 6 = 24 + * mmx/sse/fpu 7 = 28 */ typedef struct _BrainAnalys @@ -53,16 +53,16 @@ extern PMYBrainAnalys pMyBrainAnalys; /* current working address */ extern PMYBrainAnalys pStartMyBrainAnalys; /* start address */ -CPU_INT ConvertToIA32Process( FILE *outfp, CPU_INT eax, CPU_INT ebp, - CPU_INT edx, CPU_INT esp, +CPU_INT ConvertToIA32Process( FILE *outfp, PMYBrainAnalys pMystart, PMYBrainAnalys pMyend, CPU_INT regbits, - CPU_INT HowManyRegInUse); + CPU_INT HowManyRegInUse, + CPU_INT *RegTableCount); -CPU_INT ConvertToPPCProcess( FILE *outfp, CPU_INT r3, CPU_INT r31, - CPU_INT r4, CPU_INT r1, +CPU_INT ConvertToPPCProcess( FILE *outfp, PMYBrainAnalys pMystart, PMYBrainAnalys pMyend, CPU_INT regbits, - CPU_INT HowManyRegInUse); + CPU_INT HowManyRegInUse, + CPU_INT *RegTableCount); #endif

17 years, 9 months

[greatlrd] 25499: fixing count how many reg we are using. so we can setup a frame pointer

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Wed Jan 17 21:47:08 2007 New Revision: 25499 URL: http://svn.reactos.org/svn/reactos?rev=25499&view=rev Log: fixing count how many reg we are using. so we can setup a frame pointer Modified: trunk/rosapps/devutils/cputointel/ConvertToIA32Process.c trunk/rosapps/devutils/cputointel/ConvertingProcess.c trunk/rosapps/devutils/cputointel/any_op.h Modified: trunk/rosapps/devutils/cputointel/ConvertToIA32Process.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/Conver… ============================================================================== --- trunk/rosapps/devutils/cputointel/ConvertToIA32Process.c (original) +++ trunk/rosapps/devutils/cputointel/ConvertToIA32Process.c Wed Jan 17 21:47:08 2007 @@ -130,7 +130,11 @@ } fprintf(outfp,"ret\n"); } - pMystart = (PMYBrainAnalys) pMystart->ptr_next; + if (pMystart == pMyend) + pMystart=NULL; + else + pMystart = (PMYBrainAnalys) pMystart->ptr_next; + } return 0; } Modified: trunk/rosapps/devutils/cputointel/ConvertingProcess.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/Conver… ============================================================================== --- trunk/rosapps/devutils/cputointel/ConvertingProcess.c (original) +++ trunk/rosapps/devutils/cputointel/ConvertingProcess.c Wed Jan 17 21:47:08 2007 @@ -19,11 +19,16 @@ CPU_INT esp =-1; CPU_INT regbits=-1; CPU_INT HowManyRegInUse = 0; - + CPU_INT RegTableCount[32] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; + CPU_INT t; PMYBrainAnalys pMystart = pStartMyBrainAnalys; PMYBrainAnalys pMyend = pMyBrainAnalys; - if (FromCpuid == IMAGE_FILE_MACHINE_POWERPC) + PMYBrainAnalys ptmpMystart = pStartMyBrainAnalys; + PMYBrainAnalys ptmpMyend = pMyBrainAnalys; + + if ( (FromCpuid == IMAGE_FILE_MACHINE_POWERPC) || + (FromCpuid == IMAGE_FILE_MACHINE_I386)) { regbits = 32 / 8; esp = 1; @@ -32,21 +37,35 @@ ebp = 31; } - /* FIXME calc where todo first split */ - /* FIXME calc who many register are in use */ + /* count how many register we got */ + ptmpMystart = pMystart; + ptmpMyend = pMyend; + while (ptmpMystart!=NULL) + { + if ((ptmpMystart->type & 2) == 2) + RegTableCount[ptmpMystart->src]++; - //ret = ConvertToIntelProcess(FILE *outfp, - // CPU_INT eax, - // CPU_INT edx, - // CPU_INT edx, - // CPU_INT esp, - // PMYBrainAnalys start, - // PMYBrainAnalys end); + if ((ptmpMystart->type & 8) == 8) + RegTableCount[ptmpMystart->dst]++; + if (ptmpMystart == ptmpMyend) + ptmpMystart=NULL; + else + ptmpMystart = (PMYBrainAnalys) ptmpMystart->ptr_next; + } + for (t=0;t<31;t++) + { + if (RegTableCount[t]!=0) + { + HowManyRegInUse++; + } + + } + /* switch to the acual converting now */ switch (ToCpuid) { case IMAGE_FILE_MACHINE_I386: Modified: trunk/rosapps/devutils/cputointel/any_op.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/any_op… ============================================================================== --- trunk/rosapps/devutils/cputointel/any_op.h (original) +++ trunk/rosapps/devutils/cputointel/any_op.h Wed Jan 17 21:47:08 2007 @@ -10,6 +10,19 @@ * edx = register 4 * esp = register 1 * ebp = register 31 + + * ecx = 5 + * ebx = 6 + * esi = 7 + * edi = 8 + * mmx/sse/fpu 0 = 10 + * mmx/sse/fpu 1 = 12 + * mmx/sse/fpu 2 = 14 + * mmx/sse/fpu 3 = 16 + * mmx/sse/fpu 4 = 18 + * mmx/sse/fpu 5 = 20 + * mmx/sse/fpu 6 = 22 + * mmx/sse/fpu 7 = 24 */ typedef struct _BrainAnalys

17 years, 9 months

[greatlrd] 25498: Adding m68k, arm, ia32, ppc to ppc convert. Remove the old disambler list from ppc to ppc implement new ppc to ppc disambler that are allot better at end.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Wed Jan 17 20:35:18 2007 New Revision: 25498 URL: http://svn.reactos.org/svn/reactos?rev=25498&view=rev Log: Adding m68k,arm,ia32,ppc to ppc convert. Remove the old disambler list from ppc to ppc implement new ppc to ppc disambler that are allot better at end. Modified: trunk/rosapps/devutils/cputointel/ConvertToIA32Process.c trunk/rosapps/devutils/cputointel/ConvertingProcess.c trunk/rosapps/devutils/cputointel/From/ARM/ARM.h trunk/rosapps/devutils/cputointel/From/ARM/ARMBrain.c trunk/rosapps/devutils/cputointel/From/ARM/ARMopcode.c trunk/rosapps/devutils/cputointel/From/PPC/PPC.h trunk/rosapps/devutils/cputointel/From/PPC/PPCBrain.c trunk/rosapps/devutils/cputointel/From/PPC/PPCopcode.c trunk/rosapps/devutils/cputointel/From/dummycpu/Dummy.h trunk/rosapps/devutils/cputointel/From/dummycpu/DummyBrain.c trunk/rosapps/devutils/cputointel/From/dummycpu/Dummyopcode.c trunk/rosapps/devutils/cputointel/From/m68k/M68kBrain.c trunk/rosapps/devutils/cputointel/From/m68k/M68kopcode.c trunk/rosapps/devutils/cputointel/From/m68k/m68k.h trunk/rosapps/devutils/cputointel/ImageLoader.c trunk/rosapps/devutils/cputointel/any_op.h trunk/rosapps/devutils/cputointel/cputointel.rbuild Modified: trunk/rosapps/devutils/cputointel/ConvertToIA32Process.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/Conver… ============================================================================== --- trunk/rosapps/devutils/cputointel/ConvertToIA32Process.c (original) +++ trunk/rosapps/devutils/cputointel/ConvertToIA32Process.c Wed Jan 17 20:35:18 2007 @@ -8,7 +8,7 @@ #include "misc.h" #include "any_op.h" -CPU_INT ConvertToIntelProcess( FILE *outfp, CPU_INT eax, CPU_INT ebp, +CPU_INT ConvertToIA32Process( FILE *outfp, CPU_INT eax, CPU_INT ebp, CPU_INT edx, CPU_INT esp, PMYBrainAnalys pMystart, PMYBrainAnalys pMyend, CPU_INT regbits, @@ -109,7 +109,7 @@ fprintf(outfp,"mov dword [ebx - %d], %llu\n", tmp, pMystart->src); else { - fprintf(outfp,"unsuported optimze should not happen it happen :(\n", tmp, pMystart->src); + fprintf(outfp,"unsuported optimze should not happen it happen :(\n"); } } } Modified: trunk/rosapps/devutils/cputointel/ConvertingProcess.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/Conver… ============================================================================== --- trunk/rosapps/devutils/cputointel/ConvertingProcess.c (original) +++ trunk/rosapps/devutils/cputointel/ConvertingProcess.c Wed Jan 17 20:35:18 2007 @@ -50,7 +50,20 @@ switch (ToCpuid) { case IMAGE_FILE_MACHINE_I386: - ret = ConvertToIntelProcess( outfp, eax, ebp, + ret = ConvertToIA32Process( outfp, eax, ebp, + edx, esp, + pMystart, + pMyend, regbits, + HowManyRegInUse); + if (ret !=0) + { + printf("should not happen contact a devloper, x86 fail\n"); + return -1; + } + break; + + case IMAGE_FILE_MACHINE_POWERPC: + ret = ConvertToPPCProcess( outfp, eax, ebp, edx, esp, pMystart, pMyend, regbits, Modified: trunk/rosapps/devutils/cputointel/From/ARM/ARM.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/From/A… ============================================================================== --- trunk/rosapps/devutils/cputointel/From/ARM/ARM.h (original) +++ trunk/rosapps/devutils/cputointel/From/ARM/ARM.h Wed Jan 17 20:35:18 2007 @@ -6,11 +6,10 @@ CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, - FILE *outfp, - CPU_INT mode); + FILE *outfp); /* here we put the prototype for the opcode api that brain need we show a example for it */ -CPU_INT ARM_(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, CPU_INT mode); +CPU_INT ARM_(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); /* Export comment thing see m68k for example Modified: trunk/rosapps/devutils/cputointel/From/ARM/ARMBrain.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/From/A… ============================================================================== --- trunk/rosapps/devutils/cputointel/From/ARM/ARMBrain.c (original) +++ trunk/rosapps/devutils/cputointel/From/ARM/ARMBrain.c Wed Jan 17 20:35:18 2007 @@ -44,8 +44,7 @@ CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, - FILE *outfp, - CPU_INT mode) + FILE *outfp) { CPU_UNINT cpu_oldpos; CPU_INT cpuint; @@ -64,7 +63,7 @@ if ((cpuint - (cpuint & GetMaskByte32(cpuARMInit_))) == ConvertBitToByte32(cpuARMInit_)) { retsize = ARM_( outfp, cpu_buffer, cpu_pos, cpu_size, - BaseAddress, cpuarch, mode); + BaseAddress, cpuarch); if (retsize<0) retcode = 1; else Modified: trunk/rosapps/devutils/cputointel/From/ARM/ARMopcode.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/From/A… ============================================================================== --- trunk/rosapps/devutils/cputointel/From/ARM/ARMopcode.c (original) +++ trunk/rosapps/devutils/cputointel/From/ARM/ARMopcode.c Wed Jan 17 20:35:18 2007 @@ -34,8 +34,7 @@ */ CPU_INT ARM_( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, - CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, - CPU_INT mode) + CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch) { /* Modified: trunk/rosapps/devutils/cputointel/From/PPC/PPC.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/From/P… ============================================================================== --- trunk/rosapps/devutils/cputointel/From/PPC/PPC.h (original) +++ trunk/rosapps/devutils/cputointel/From/PPC/PPC.h Wed Jan 17 20:35:18 2007 @@ -6,14 +6,13 @@ CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, - FILE *outfp, - CPU_INT mode); + FILE *outfp); /* here we put the prototype for the opcode api that brain need we show a example for it */ -CPU_INT PPC_Addx(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, CPU_INT mode); -CPU_INT PPC_Blr( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, CPU_INT mode); -CPU_INT PPC_Ld( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, CPU_INT mode); +CPU_INT PPC_Addx(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); +CPU_INT PPC_Blr( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); +CPU_INT PPC_Ld( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); /* Export comment thing see m68k for example * in dummy we do not show it, for it is diffent for each cpu Modified: trunk/rosapps/devutils/cputointel/From/PPC/PPCBrain.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/From/P… ============================================================================== --- trunk/rosapps/devutils/cputointel/From/PPC/PPCBrain.c (original) +++ trunk/rosapps/devutils/cputointel/From/PPC/PPCBrain.c Wed Jan 17 20:35:18 2007 @@ -44,8 +44,7 @@ CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, - FILE *outfp, - CPU_INT mode) + FILE *outfp) { CPU_UNINT cpu_oldpos; CPU_INT cpuint; @@ -64,7 +63,7 @@ if ((cpuint - (cpuint & GetMaskByte32(cpuPPCInit_Ld))) == ConvertBitToByte32(cpuPPCInit_Ld)) { retsize = PPC_Ld( outfp, cpu_buffer, cpu_pos, cpu_size, - BaseAddress, cpuarch, mode); + BaseAddress, cpuarch); if (retsize<0) retcode = 1; else @@ -75,7 +74,7 @@ if ((cpuint - (cpuint & GetMaskByte32(cpuPPCInit_Blr))) == ConvertBitToByte32(cpuPPCInit_Blr)) { retsize = PPC_Blr( outfp, cpu_buffer, cpu_pos, cpu_size, - BaseAddress, cpuarch, mode); + BaseAddress, cpuarch); if (retsize<0) retcode = 1; else Modified: trunk/rosapps/devutils/cputointel/From/PPC/PPCopcode.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/From/P… ============================================================================== --- trunk/rosapps/devutils/cputointel/From/PPC/PPCopcode.c (original) +++ trunk/rosapps/devutils/cputointel/From/PPC/PPCopcode.c Wed Jan 17 20:35:18 2007 @@ -30,34 +30,25 @@ CPU_INT PPC_Blr( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, - CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, - CPU_INT mode) + CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch) { BaseAddress +=cpu_pos; - if (mode==0) + + /* own translatons langues */ + if (AllocAny()!=0) /* alloc memory for pMyBrainAnalys */ { - fprintf(out,"Line_0x%08x:\n",BaseAddress); - fprintf(out,"blr\n"); + return -1; } - else if (mode>0) - { - /* own translatons langues */ - if (AllocAny()!=0) /* alloc memory for pMyBrainAnalys */ - { - return -1; - } - pMyBrainAnalys->op = OP_ANY_ret; - pMyBrainAnalys->memAdr=BaseAddress; - } + pMyBrainAnalys->op = OP_ANY_ret; + pMyBrainAnalys->memAdr=BaseAddress; return 4; } CPU_INT PPC_Ld( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, - CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, - CPU_INT mode) + CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch) { CPU_UNINT formA; CPU_UNINT formD; @@ -75,25 +66,18 @@ } BaseAddress +=cpu_pos; - if (mode==0) + + /* own translatons langues */ + if (AllocAny()!=0) /* alloc memory for pMyBrainAnalys */ { - fprintf(out,"Line_0x%08x:\n",BaseAddress); - fprintf(out,"li %%r%d,%d\n",formA, formDS); + return -1; } - else if (mode>0) - { - /* own translatons langues */ - if (AllocAny()!=0) /* alloc memory for pMyBrainAnalys */ - { - return -1; - } - pMyBrainAnalys->op = OP_ANY_mov; - pMyBrainAnalys->type= 8 + 16; /* 8 dst reg, 16 imm */ - pMyBrainAnalys->src_size = 16; - pMyBrainAnalys->src = formDS; - pMyBrainAnalys->dst = formA; - pMyBrainAnalys->memAdr=BaseAddress; - } + pMyBrainAnalys->op = OP_ANY_mov; + pMyBrainAnalys->type= 8 + 16; /* 8 dst reg, 16 imm */ + pMyBrainAnalys->src_size = 16; + pMyBrainAnalys->src = formDS; + pMyBrainAnalys->dst = formA; + pMyBrainAnalys->memAdr=BaseAddress; return 4; } Modified: trunk/rosapps/devutils/cputointel/From/dummycpu/Dummy.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/From/d… ============================================================================== --- trunk/rosapps/devutils/cputointel/From/dummycpu/Dummy.h (original) +++ trunk/rosapps/devutils/cputointel/From/dummycpu/Dummy.h Wed Jan 17 20:35:18 2007 @@ -6,11 +6,10 @@ CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, - FILE *outfp, - CPU_INT mode); + FILE *outfp); /* here we put the prototype for the opcode api that brain need we show a example for it */ -CPU_INT DUMMY_Add(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, CPU_INT mode); +CPU_INT DUMMY_Add(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); /* Export comment thing see m68k for example Modified: trunk/rosapps/devutils/cputointel/From/dummycpu/DummyBrain.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/From/d… ============================================================================== --- trunk/rosapps/devutils/cputointel/From/dummycpu/DummyBrain.c (original) +++ trunk/rosapps/devutils/cputointel/From/dummycpu/DummyBrain.c Wed Jan 17 20:35:18 2007 @@ -23,16 +23,6 @@ * cpu with same desgin but few other opcode or extend opcode * outfp : the output file pointer * - * mode : if we should run disambler of this binary or - * translate it, Disambler will not calc the - * the row name right so we simple give each - row a name. In translations mode we run a - * analys so we getting better optimzing and - * only row name there we need. - * value for mode are : - * 0 = disambler mode - * 1 = translate mode intel - * * return value * 0 : Ok * 1 : unimplemt @@ -46,8 +36,7 @@ CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, - FILE *outfp, - CPU_INT mode) + FILE *outfp) { CPU_UNINT cpu_oldpos; CPU_INT cpuint; @@ -71,7 +60,7 @@ if ((cpuint - (cpuint & GetMaskByte(cpuDummyInit_Add))) == ConvertBitToByte(cpuDummyInit_Add)) { retsize = DUMMY_Add( outfp, cpu_buffer, cpu_pos, cpu_size, - BaseAddress, cpuarch, mode); + BaseAddress, cpuarch); if (retsize<0) retcode = 1; else Modified: trunk/rosapps/devutils/cputointel/From/dummycpu/Dummyopcode.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/From/d… ============================================================================== --- trunk/rosapps/devutils/cputointel/From/dummycpu/Dummyopcode.c (original) +++ trunk/rosapps/devutils/cputointel/From/dummycpu/Dummyopcode.c Wed Jan 17 20:35:18 2007 @@ -16,17 +16,6 @@ * pentinum-mmx so on, use this flag to specify which type * of cpu you whant or do not use it if it does not exists * other or any sub model. - * - * mode : if we should run disambler of this binary or - * translate it, Disambler will not calc the - * the row name right so we simple give each - row a name. In translations mode we run a - * analys so we getting better optimzing and - * only row name there we need. - * value for mode are : - * 0 = disambler mode - * 1 = translate mode intel - * * Return value : * value -1 : unimplement * value 0 : wrong opcode or not vaild opcode @@ -34,8 +23,7 @@ */ CPU_INT DUMMY_Add( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, - CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, - CPU_INT mode) + CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch) { /* Modified: trunk/rosapps/devutils/cputointel/From/m68k/M68kBrain.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/From/m… ============================================================================== --- trunk/rosapps/devutils/cputointel/From/m68k/M68kBrain.c (original) +++ trunk/rosapps/devutils/cputointel/From/m68k/M68kBrain.c Wed Jan 17 20:35:18 2007 @@ -21,16 +21,6 @@ * cpu with same desgin but few other opcode or extend opcode * outfp : the output file pointer * - * mode : if we should run disambler of this binary or - * translate it, Disambler will not calc the - * the row name right so we simple give each - row a name. In translations mode we run a - * analys so we getting better optimzing and - * only row name there we need. - * value for mode are : - * 0 = disambler mode - * 1 = translate mode intel - * * return value * 0 : Ok * 1 : unimplemt @@ -44,8 +34,7 @@ CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, - FILE *outfp, - CPU_INT mode) + FILE *outfp) { CPU_UNINT cpu_oldpos; CPU_INT cpuint; @@ -63,7 +52,7 @@ if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_Abcd))) == ConvertBitToByte(cpuM68kInit_Abcd)) { retsize = M68k_Abcd( outfp, cpu_buffer, cpu_pos, cpu_size, - BaseAddress, cpuarch, mode); + BaseAddress, cpuarch); if (retsize<0) retcode = 1; else @@ -73,7 +62,7 @@ if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_Add))) == ConvertBitToByte(cpuM68kInit_Add)) { retsize = M68k_Add( outfp, cpu_buffer, cpu_pos, cpu_size, - BaseAddress, cpuarch, mode); + BaseAddress, cpuarch); if (retsize<0) retcode = 1; else @@ -83,7 +72,7 @@ if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_Addi))) == ConvertBitToByte(cpuM68kInit_Addi)) { retsize = M68k_Addi( outfp, cpu_buffer, cpu_pos, cpu_size, - BaseAddress, cpuarch, mode); + BaseAddress, cpuarch); if (retsize<0) retcode = 1; else @@ -93,7 +82,7 @@ if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_Addq))) == ConvertBitToByte(cpuM68kInit_Addq)) { retsize = M68k_Addq( outfp, cpu_buffer, cpu_pos, cpu_size, - BaseAddress, cpuarch, mode); + BaseAddress, cpuarch); if (retsize<0) retcode = 1; else @@ -103,7 +92,7 @@ if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_Addx))) == ConvertBitToByte(cpuM68kInit_Addx)) { retsize = M68k_Addx( outfp, cpu_buffer, cpu_pos, cpu_size, - BaseAddress, cpuarch, mode); + BaseAddress, cpuarch); if (retsize<0) retcode = 1; else @@ -113,7 +102,7 @@ if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_And))) == ConvertBitToByte(cpuM68kInit_And)) { retsize = M68k_Add( outfp, cpu_buffer, cpu_pos, cpu_size, - BaseAddress, cpuarch, mode); + BaseAddress, cpuarch); if (retsize<0) retcode = 1; else @@ -123,7 +112,7 @@ if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_Andi))) == ConvertBitToByte(cpuM68kInit_Andi)) { retsize = M68k_Andi( outfp, cpu_buffer, cpu_pos, cpu_size, - BaseAddress, cpuarch, mode); + BaseAddress, cpuarch); if (retsize<0) retcode = 1; else @@ -137,7 +126,7 @@ { cpu_pos++; retsize = M68k_AndToCCR( outfp, cpu_buffer, cpu_pos, cpu_size, - BaseAddress, cpuarch, mode); + BaseAddress, cpuarch); if (retsize<0) retcode = 1; else @@ -153,7 +142,7 @@ if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_Bhi))) == ConvertBitToByte(cpuM68kInit_Bhi)) { retsize = M68k_Bhi( outfp, cpu_buffer, cpu_pos, cpu_size, - BaseAddress, cpuarch, mode); + BaseAddress, cpuarch); if (retsize<0) retcode = 1; else @@ -164,7 +153,7 @@ if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_Bls))) == ConvertBitToByte(cpuM68kInit_Bls)) { retsize = M68k_Bls( outfp, cpu_buffer, cpu_pos, cpu_size, - BaseAddress, cpuarch, mode); + BaseAddress, cpuarch); if (retsize<0) retcode = 1; else @@ -175,7 +164,7 @@ if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_Bcc))) == ConvertBitToByte(cpuM68kInit_Bcc)) { retsize = M68k_Bcc( outfp, cpu_buffer, cpu_pos, cpu_size, - BaseAddress, cpuarch, mode); + BaseAddress, cpuarch); if (retsize<0) retcode = 1; else @@ -186,7 +175,7 @@ if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_Bcs))) == ConvertBitToByte(cpuM68kInit_Bcs)) { retsize = M68k_Bcs( outfp, cpu_buffer, cpu_pos, cpu_size, - BaseAddress, cpuarch, mode); + BaseAddress, cpuarch); if (retsize<0) retcode = 1; else @@ -197,7 +186,7 @@ if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_Bne))) == ConvertBitToByte(cpuM68kInit_Bne)) { retsize = M68k_Bne( outfp, cpu_buffer, cpu_pos, cpu_size, - BaseAddress, cpuarch, mode); + BaseAddress, cpuarch); if (retsize<0) retcode = 1; else @@ -208,7 +197,7 @@ if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_Beq))) == ConvertBitToByte(cpuM68kInit_Beq)) { retsize = M68k_Beq( outfp, cpu_buffer, cpu_pos, cpu_size, - BaseAddress, cpuarch, mode); + BaseAddress, cpuarch); if (retsize<0) retcode = 1; else @@ -219,7 +208,7 @@ if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_Bvc))) == ConvertBitToByte(cpuM68kInit_Bvc)) { retsize = M68k_Bvc( outfp, cpu_buffer, cpu_pos, cpu_size, - BaseAddress, cpuarch, mode); + BaseAddress, cpuarch); if (retsize<0) retcode = 1; else @@ -230,7 +219,7 @@ if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_Bvs))) == ConvertBitToByte(cpuM68kInit_Bvs)) { retsize = M68k_Bvs( outfp, cpu_buffer, cpu_pos, cpu_size, - BaseAddress, cpuarch, mode); + BaseAddress, cpuarch); if (retsize<0) retcode = 1; else @@ -241,7 +230,7 @@ if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_Bpl))) == ConvertBitToByte(cpuM68kInit_Bpl)) { retsize = M68k_Bpl( outfp, cpu_buffer, cpu_pos, cpu_size, - BaseAddress, cpuarch, mode); + BaseAddress, cpuarch); if (retsize<0) retcode = 1; else @@ -252,7 +241,7 @@ if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_Bmi))) == ConvertBitToByte(cpuM68kInit_Bmi)) { retsize = M68k_Bmi( outfp, cpu_buffer, cpu_pos, cpu_size, - BaseAddress, cpuarch, mode); + BaseAddress, cpuarch); if (retsize<0) retcode = 1; else @@ -263,7 +252,7 @@ if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_Bge))) == ConvertBitToByte(cpuM68kInit_Bge)) { retsize = M68k_Bge( outfp, cpu_buffer, cpu_pos, cpu_size, - BaseAddress, cpuarch, mode); + BaseAddress, cpuarch); if (retsize<0) retcode = 1; else @@ -274,7 +263,7 @@ if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_Blt))) == ConvertBitToByte(cpuM68kInit_Blt)) { retsize = M68k_Blt( outfp, cpu_buffer, cpu_pos, cpu_size, - BaseAddress, cpuarch, mode); + BaseAddress, cpuarch); if (retsize<0) retcode = 1; else @@ -285,7 +274,7 @@ if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_Bgt))) == ConvertBitToByte(cpuM68kInit_Bgt)) { retsize = M68k_Bgt( outfp, cpu_buffer, cpu_pos, cpu_size, - BaseAddress, cpuarch, mode); + BaseAddress, cpuarch); if (retsize<0) retcode = 1; else @@ -296,7 +285,7 @@ if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_Ble))) == ConvertBitToByte(cpuM68kInit_Ble)) { retsize = M68k_Ble( outfp, cpu_buffer, cpu_pos, cpu_size, - BaseAddress, cpuarch, mode); + BaseAddress, cpuarch); if (retsize<0) retcode = 1; else Modified: trunk/rosapps/devutils/cputointel/From/m68k/M68kopcode.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/From/m… ============================================================================== --- trunk/rosapps/devutils/cputointel/From/m68k/M68kopcode.c (original) +++ trunk/rosapps/devutils/cputointel/From/m68k/M68kopcode.c Wed Jan 17 20:35:18 2007 @@ -6,8 +6,7 @@ CPU_INT M68k_Abcd( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, - CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, - CPU_INT mode) + CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch) { fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos); @@ -16,8 +15,7 @@ } CPU_INT M68k_Add(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, - CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, - CPU_INT dismode) + CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch) { CPU_INT opmode; CPU_INT mode; @@ -89,8 +87,7 @@ } CPU_INT M68k_Addi( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, - CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, - CPU_INT mode) + CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch) { fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos); @@ -99,8 +96,7 @@ } CPU_INT M68k_Addq( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, - CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, - CPU_INT mode) + CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch) { fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos); @@ -109,8 +105,7 @@ } CPU_INT M68k_Addx( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, - CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, - CPU_INT mode) + CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch) { fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos); @@ -119,8 +114,7 @@ } CPU_INT M68k_And( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, - CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, - CPU_INT mode) + CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch) { fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos); @@ -129,8 +123,7 @@ } CPU_INT M68k_Andi( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, - CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, - CPU_INT mode) + CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch) { fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos); @@ -139,8 +132,7 @@ } CPU_INT M68k_AndToCCR( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, - CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, - CPU_INT mode) + CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch) { fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos); @@ -149,8 +141,7 @@ } CPU_INT M68k_Asl( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, - CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, - CPU_INT mode) + CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch) { fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos); @@ -159,8 +150,7 @@ } CPU_INT M68k_Asr( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, - CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, - CPU_INT mode) + CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch) { fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos); @@ -169,8 +159,7 @@ } CPU_INT M68k_Bhi( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, - CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, - CPU_INT mode) + CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch) { fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos); @@ -179,8 +168,7 @@ } CPU_INT M68k_Bls( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, - CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, - CPU_INT mode) + CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch) { fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos); @@ -189,8 +177,7 @@ } CPU_INT M68k_Bcc( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, - CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, - CPU_INT mode) + CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch) { fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos); @@ -199,8 +186,7 @@ } CPU_INT M68k_Bcs( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, - CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, - CPU_INT mode) + CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch) { fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos); @@ -209,8 +195,7 @@ } CPU_INT M68k_Bne( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, - CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, - CPU_INT mode) + CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch) { fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos); @@ -219,8 +204,7 @@ } CPU_INT M68k_Beq( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, - CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, - CPU_INT mode) + CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch) { fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos); @@ -229,8 +213,7 @@ } CPU_INT M68k_Bvc( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, - CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, - CPU_INT mode) + CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch) { fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos); @@ -239,8 +222,7 @@ } CPU_INT M68k_Bvs( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, - CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, - CPU_INT mode) + CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch) { fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos); @@ -249,8 +231,7 @@ } CPU_INT M68k_Bpl( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, - CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, - CPU_INT mode) + CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch) { fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos); @@ -259,8 +240,7 @@ } CPU_INT M68k_Bmi( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, - CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, - CPU_INT mode) + CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch) { fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos); @@ -269,8 +249,7 @@ } CPU_INT M68k_Bge( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, - CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, - CPU_INT mode) + CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch) { fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos); @@ -279,8 +258,7 @@ } CPU_INT M68k_Blt( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, - CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, - CPU_INT mode) + CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch) { fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos); @@ -289,8 +267,7 @@ } CPU_INT M68k_Bgt( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, - CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, - CPU_INT mode) + CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch) { fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos); @@ -299,8 +276,7 @@ } CPU_INT M68k_Ble( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, - CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, - CPU_INT mode) + CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch) { fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos); Modified: trunk/rosapps/devutils/cputointel/From/m68k/m68k.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/From/m… ============================================================================== --- trunk/rosapps/devutils/cputointel/From/m68k/m68k.h (original) +++ trunk/rosapps/devutils/cputointel/From/m68k/m68k.h Wed Jan 17 20:35:18 2007 @@ -5,34 +5,33 @@ CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, - FILE *outfp, - CPU_INT mode); + FILE *outfp); -CPU_INT M68k_Abcd(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, CPU_INT mode); -CPU_INT M68k_Add(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, CPU_INT mode); -CPU_INT M68k_Addi(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, CPU_INT mode); -CPU_INT M68k_Addq(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, CPU_INT mode); -CPU_INT M68k_Addx(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, CPU_INT mode); -CPU_INT M68k_And(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, CPU_INT mode); -CPU_INT M68k_Andi(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, CPU_INT mode); -CPU_INT M68k_AndToCCR(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, CPU_INT mode); -CPU_INT M68k_Asl(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, CPU_INT mode); -CPU_INT M68k_Asr(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, CPU_INT mode); -CPU_INT M68k_Bhi(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, CPU_INT mode); -CPU_INT M68k_Bls(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, CPU_INT mode); -CPU_INT M68k_Bcc(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, CPU_INT mode); -CPU_INT M68k_Bcs(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, CPU_INT mode); -CPU_INT M68k_Bne(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, CPU_INT mode); -CPU_INT M68k_Beq(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, CPU_INT mode); -CPU_INT M68k_Bvc(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, CPU_INT mode); -CPU_INT M68k_Bvs(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, CPU_INT mode); -CPU_INT M68k_Bpl(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, CPU_INT mode); -CPU_INT M68k_Bmi(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, CPU_INT mode); -CPU_INT M68k_Bge(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, CPU_INT mode); -CPU_INT M68k_Blt(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, CPU_INT mode); -CPU_INT M68k_Bgt(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, CPU_INT mode); -CPU_INT M68k_Ble(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, CPU_INT mode); +CPU_INT M68k_Abcd(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); +CPU_INT M68k_Add(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); +CPU_INT M68k_Addi(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); +CPU_INT M68k_Addq(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); +CPU_INT M68k_Addx(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); +CPU_INT M68k_And(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); +CPU_INT M68k_Andi(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); +CPU_INT M68k_AndToCCR(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); +CPU_INT M68k_Asl(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); +CPU_INT M68k_Asr(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); +CPU_INT M68k_Bhi(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); +CPU_INT M68k_Bls(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); +CPU_INT M68k_Bcc(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); +CPU_INT M68k_Bcs(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); +CPU_INT M68k_Bne(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); +CPU_INT M68k_Beq(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); +CPU_INT M68k_Bvc(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); +CPU_INT M68k_Bvs(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); +CPU_INT M68k_Bpl(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); +CPU_INT M68k_Bmi(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); +CPU_INT M68k_Bge(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); +CPU_INT M68k_Blt(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); +CPU_INT M68k_Bgt(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); +CPU_INT M68k_Ble(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); extern CPU_BYTE M68k_Rx[16]; extern CPU_BYTE M68k_RM[16]; Modified: trunk/rosapps/devutils/cputointel/ImageLoader.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/ImageL… ============================================================================== --- trunk/rosapps/devutils/cputointel/ImageLoader.c (original) +++ trunk/rosapps/devutils/cputointel/ImageLoader.c Wed Jan 17 20:35:18 2007 @@ -10,8 +10,8 @@ #include "From/PPC/PPC.h" static CPU_INT machine_type = 0; -static CPU_INT ToMachine_type = IMAGE_FILE_MACHINE_I386; - +//static CPU_INT ToMachine_type = IMAGE_FILE_MACHINE_I386; +static CPU_INT ToMachine_type = IMAGE_FILE_MACHINE_POWERPC; /* * infileName file name to convert or disambler * outputfileName file name to save to @@ -20,8 +20,42 @@ * type the loading mode Auto, PE, bin * mode disambler mode : 0 the arch cpu. * translate mode : 1 intel + * translate mode : 2 ppc * */ + +static void SetCPU(CPU_INT FromCpu, CPU_INT mode) +{ + machine_type = FromCpu; + switch(mode) + { + case 0: + ToMachine_type = machine_type; + break; + + case 1: + ToMachine_type = IMAGE_FILE_MACHINE_I386; + break; + + case 2: + ToMachine_type = IMAGE_FILE_MACHINE_POWERPC; + break; + + default: + printf("Not supported mode\n"); + break; + + } +} + +static void Convert(FILE *outfp, CPU_INT FromCpu, CPU_INT mode) +{ + SetCPU(machine_type,mode); + AnyalsingProcess(); + ConvertProcess(outfp, machine_type, ToMachine_type); + FreeAny(); +} + CPU_INT LoadPFileImage( char *infileName, char *outputfileName, CPU_UNINT BaseAddress, char *cpuid, @@ -121,9 +155,7 @@ { if (mode > 0) { - AnyalsingProcess(); - ConvertProcess(outfp, machine_type, ToMachine_type); - FreeAny(); + Convert(outfp,machine_type,mode); } fclose(outfp); return 0; @@ -134,83 +166,69 @@ { if (stricmp(cpuid,"m68000")) { - ret = M68KBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,68000,outfp,mode); - if (mode > 1) - { - AnyalsingProcess(); - ConvertProcess(outfp, machine_type, ToMachine_type); - FreeAny(); + ret = M68KBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,68000,outfp); + if (mode > 1) + { + Convert(outfp,machine_type,mode); } fclose(outfp); } else if (stricmp(cpuid,"m68010")) { - ret = M68KBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,68010,outfp,mode); - if (mode > 1) - { - AnyalsingProcess(); - ConvertProcess(outfp, machine_type, ToMachine_type); - FreeAny(); + ret = M68KBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,68010,outfp); + if (mode > 1) + { + Convert(outfp,machine_type,mode); } fclose(outfp); return ret; } else if (stricmp(cpuid,"m68020")) { - ret = M68KBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,68020,outfp,mode); - if (mode > 1) - { - AnyalsingProcess(); - ConvertProcess(outfp, machine_type, ToMachine_type); - FreeAny(); + ret = M68KBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,68020,outfp); + if (mode > 1) + { + Convert(outfp,machine_type,mode); } fclose(outfp); return ret; } else if (stricmp(cpuid,"m68030")) { - ret = M68KBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,68030,outfp,mode); - if (mode > 1) - { - AnyalsingProcess(); - ConvertProcess(outfp, machine_type, ToMachine_type); - FreeAny(); + ret = M68KBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,68030,outfp); + if (mode > 1) + { + Convert(outfp,machine_type,mode); } fclose(outfp); return ret; } else if (stricmp(cpuid,"m68040")) { - ret = M68KBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,68040,outfp,mode); - if (mode > 1) - { - AnyalsingProcess(); - ConvertProcess(outfp, machine_type, ToMachine_type); - FreeAny(); + ret = M68KBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,68040,outfp); + if (mode > 1) + { + Convert(outfp,machine_type,mode); } fclose(outfp); return ret; } else if (stricmp(cpuid,"ppc")) { - ret = PPCBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,0,outfp,mode); - if (mode > 1) - { - AnyalsingProcess(); - ConvertProcess(outfp, machine_type, ToMachine_type); - FreeAny(); + ret = PPCBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,0,outfp); + if (mode > 1) + { + Convert(outfp,machine_type,mode); } fclose(outfp); return ret; } else if (stricmp(cpuid,"arm4")) { - ret = ARMBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,4,outfp,mode); - if (mode > 1) - { - AnyalsingProcess(); - ConvertProcess(outfp, machine_type, ToMachine_type); - FreeAny(); + ret = ARMBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,4,outfp); + if (mode > 1) + { + Convert(outfp,machine_type,mode); } fclose(outfp); return ret; @@ -223,9 +241,7 @@ ret = PEFileStart(cpu_buffer, 0, BaseAddress, cpu_size, outfp, mode); if (mode > 1) { - AnyalsingProcess(); - ConvertProcess(outfp, machine_type, ToMachine_type); - FreeAny(); + Convert(outfp,machine_type,mode); } fclose(outfp); return ret; @@ -466,7 +482,7 @@ fprintf(outfp,"; CPU found POWERPC\n"); //PPCBrain(memory, pos, cpu_size, base, 0, outfp); machine_type = IMAGE_FILE_MACHINE_POWERPC; - return PPCBrain(memory+SectionHeader->PointerToRawData, 0, SectionHeader->SizeOfRawData, 0, 0, outfp,mode); + return PPCBrain(memory+SectionHeader->PointerToRawData, 0, SectionHeader->SizeOfRawData, 0, 0, outfp); case IMAGE_FILE_MACHINE_POWERPCFP: Modified: trunk/rosapps/devutils/cputointel/any_op.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/any_op… ============================================================================== --- trunk/rosapps/devutils/cputointel/any_op.h (original) +++ trunk/rosapps/devutils/cputointel/any_op.h Wed Jan 17 20:35:18 2007 @@ -4,6 +4,13 @@ #define OP_ANY_mov 0x00000000 #define OP_ANY_ret 0x00000001 + +/* We are using same abi as PPC + * eax = register 3 + * edx = register 4 + * esp = register 1 + * ebp = register 31 + */ typedef struct _BrainAnalys { @@ -33,10 +40,16 @@ extern PMYBrainAnalys pMyBrainAnalys; /* current working address */ extern PMYBrainAnalys pStartMyBrainAnalys; /* start address */ -CPU_INT ConvertToIntelProcess( FILE *outfp, CPU_INT eax, CPU_INT ebp, +CPU_INT ConvertToIA32Process( FILE *outfp, CPU_INT eax, CPU_INT ebp, CPU_INT edx, CPU_INT esp, PMYBrainAnalys pMystart, PMYBrainAnalys pMyend, CPU_INT regbits, CPU_INT HowManyRegInUse); +CPU_INT ConvertToPPCProcess( FILE *outfp, CPU_INT r3, CPU_INT r31, + CPU_INT r4, CPU_INT r1, + PMYBrainAnalys pMystart, + PMYBrainAnalys pMyend, CPU_INT regbits, + CPU_INT HowManyRegInUse); + #endif Modified: trunk/rosapps/devutils/cputointel/cputointel.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/cputoi… ============================================================================== --- trunk/rosapps/devutils/cputointel/cputointel.rbuild (original) +++ trunk/rosapps/devutils/cputointel/cputointel.rbuild Wed Jan 17 20:35:18 2007 @@ -28,5 +28,7 @@ <file>AnyalsingProcess.c</file> <file>ConvertingProcess.c</file> <file>ConvertToIA32Process.c</file> + <file>ConvertToPPCProcess.c</file> + </module>

17 years, 9 months

[greatlrd] 25497: fixing a bug did write end code for frame pointer that we do not have tempary fix, we can not optimize code so good yet. so if it more that 4 register same time we are using own frame, ebx is working as our ebp for we already resvert the ebp

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Wed Jan 17 19:23:39 2007 New Revision: 25497 URL: http://svn.reactos.org/svn/reactos?rev=25497&view=rev Log: fixing a bug did write end code for frame pointer that we do not have tempary fix, we can not optimize code so good yet. so if it more that 4 register same time we are using own frame, ebx is working as our ebp for we already resvert the ebp Modified: trunk/rosapps/devutils/cputointel/ConvertToIA32Process.c Modified: trunk/rosapps/devutils/cputointel/ConvertToIA32Process.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/Conver… ============================================================================== --- trunk/rosapps/devutils/cputointel/ConvertToIA32Process.c (original) +++ trunk/rosapps/devutils/cputointel/ConvertToIA32Process.c Wed Jan 17 19:23:39 2007 @@ -19,16 +19,13 @@ CPU_UNINT tmp; CPU_INT setup_ebp = 0 ; /* 0 = no, 1 = yes */ - if (HowManyRegInUse > 8) + /* Fixme at moment we can not optimze code */ + //if (HowManyRegInUse > 9) + if (HowManyRegInUse > 4) { setup_ebp =1; /* we will use ebx as ebp */ stack = HowManyRegInUse * regbits; } - - - - - fprintf(outfp,"BITS 32\n"); fprintf(outfp,"GLOBAL _main\n"); @@ -44,6 +41,19 @@ fprintf(outfp,"push ebx\n"); fprintf(outfp,"mov ebx,esp\n"); fprintf(outfp,"sub esp, %d ; Alloc %d bytes for reg\n\n",stack,stack); + } + else + { + /* + 0 EAX + 1 ECX + 2 EDX + 5 EBX + 6 ESP + 7 EBP + 8 ESI + 9 EDI + */ } fprintf(outfp,"; Start the program \n"); @@ -95,7 +105,12 @@ } else { - fprintf(outfp,"mov dword [ebx - %d], %llu\n", tmp, pMystart->src); + if (setup_ebp == 1) + fprintf(outfp,"mov dword [ebx - %d], %llu\n", tmp, pMystart->src); + else + { + fprintf(outfp,"unsuported optimze should not happen it happen :(\n", tmp, pMystart->src); + } } } } /* end pMyBrainAnalys->type & 8 */ @@ -106,9 +121,12 @@ { if (pMyBrainAnalys->ptr_next == NULL) { - fprintf(outfp,"\n; clean up after the frame \n"); - fprintf(outfp,"mov esp, ebx\n"); - fprintf(outfp,"pop ebx\n"); + if (setup_ebp == 1) + { + fprintf(outfp,"\n; clean up after the frame \n"); + fprintf(outfp,"mov esp, ebx\n"); + fprintf(outfp,"pop ebx\n"); + } } fprintf(outfp,"ret\n"); }

17 years, 9 months

[greatlrd] 25496: fixing the ppc to ia32 break, use ebx as ebp if we got to many register.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Wed Jan 17 18:31:47 2007 New Revision: 25496 URL: http://svn.reactos.org/svn/reactos?rev=25496&view=rev Log: fixing the ppc to ia32 break, use ebx as ebp if we got to many register. Added: trunk/rosapps/devutils/cputointel/ConvertingProcess.c (with props) Modified: trunk/rosapps/devutils/cputointel/ConvertToIA32Process.c trunk/rosapps/devutils/cputointel/From/PPC/PPCBrain.c trunk/rosapps/devutils/cputointel/From/PPC/PPCBrain.h trunk/rosapps/devutils/cputointel/From/PPC/PPCopcode.c Modified: trunk/rosapps/devutils/cputointel/ConvertToIA32Process.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/Conver… ============================================================================== --- trunk/rosapps/devutils/cputointel/ConvertToIA32Process.c (original) +++ trunk/rosapps/devutils/cputointel/ConvertToIA32Process.c Wed Jan 17 18:31:47 2007 @@ -22,6 +22,7 @@ if (HowManyRegInUse > 8) { setup_ebp =1; /* we will use ebx as ebp */ + stack = HowManyRegInUse * regbits; } @@ -36,13 +37,17 @@ fprintf(outfp,"_main:\n"); /* setup a frame pointer */ - //fprintf(outfp,"\n; Setup frame pointer \n"); - //fprintf(outfp,"push ebp\n"); - //fprintf(outfp,"mov ebp,esp\n"); - //fprintf(outfp,"sub esp, %d ; Alloc %d bytes for reg\n\n",stack,stack); + + if (setup_ebp == 1) + { + fprintf(outfp,"\n; Setup frame pointer \n"); + fprintf(outfp,"push ebx\n"); + fprintf(outfp,"mov ebx,esp\n"); + fprintf(outfp,"sub esp, %d ; Alloc %d bytes for reg\n\n",stack,stack); + } fprintf(outfp,"; Start the program \n"); - while (pMystart!=pMyend) + while (pMystart!=NULL) { /* fixme the line lookup from anaylysing process */ @@ -60,7 +65,7 @@ { /* source are imm */ - if (pMyBrainAnalys->dst == eax) + if (pMystart->dst == eax) { if (pMystart->src == 0) fprintf(outfp,"xor eax,eax\n"); @@ -90,8 +95,7 @@ } else { - //fprintf(outfp,"mov dword [ebp - %d], %llu\n", tmp, pMystart->src); - printf("not support move from register\n"); + fprintf(outfp,"mov dword [ebx - %d], %llu\n", tmp, pMystart->src); } } } /* end pMyBrainAnalys->type & 8 */ @@ -100,12 +104,12 @@ /* return */ if (pMystart->op == OP_ANY_ret) { - //if (pMyBrainAnalys->ptr_next == NULL) - //{ - // fprintf(outfp,"\n; clean up after the frame \n"); - // fprintf(outfp,"mov esp, ebp\n"); - // fprintf(outfp,"pop ebp\n"); - //} + if (pMyBrainAnalys->ptr_next == NULL) + { + fprintf(outfp,"\n; clean up after the frame \n"); + fprintf(outfp,"mov esp, ebx\n"); + fprintf(outfp,"pop ebx\n"); + } fprintf(outfp,"ret\n"); } pMystart = (PMYBrainAnalys) pMystart->ptr_next; Added: trunk/rosapps/devutils/cputointel/ConvertingProcess.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/Conver… ============================================================================== --- trunk/rosapps/devutils/cputointel/ConvertingProcess.c (added) +++ trunk/rosapps/devutils/cputointel/ConvertingProcess.c Wed Jan 17 18:31:47 2007 @@ -1,0 +1,71 @@ +#include <windows.h> +#include <winnt.h> + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include "misc.h" +#include "any_op.h" + +/* hack should be in misc.h*/ + + +CPU_INT ConvertProcess(FILE *outfp, CPU_INT FromCpuid, CPU_INT ToCpuid) +{ + CPU_INT ret=0; + CPU_INT eax =-1; + CPU_INT ebp =-1; + CPU_INT edx =-1; + CPU_INT esp =-1; + CPU_INT regbits=-1; + CPU_INT HowManyRegInUse = 0; + + PMYBrainAnalys pMystart = pStartMyBrainAnalys; + PMYBrainAnalys pMyend = pMyBrainAnalys; + + if (FromCpuid == IMAGE_FILE_MACHINE_POWERPC) + { + regbits = 32 / 8; + esp = 1; + eax = 3; + edx = 4; + ebp = 31; + } + + + /* FIXME calc where todo first split */ + + /* FIXME calc who many register are in use */ + + //ret = ConvertToIntelProcess(FILE *outfp, + // CPU_INT eax, + // CPU_INT edx, + // CPU_INT edx, + // CPU_INT esp, + // PMYBrainAnalys start, + // PMYBrainAnalys end); + + + + switch (ToCpuid) + { + case IMAGE_FILE_MACHINE_I386: + ret = ConvertToIntelProcess( outfp, eax, ebp, + edx, esp, + pMystart, + pMyend, regbits, + HowManyRegInUse); + if (ret !=0) + { + printf("should not happen contact a devloper, x86 fail\n"); + return -1; + } + break; + + default: + printf("should not happen contact a devloper, unknown fail\n"); + return -1; + } + + return ret; +} Propchange: trunk/rosapps/devutils/cputointel/ConvertingProcess.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/devutils/cputointel/From/PPC/PPCBrain.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/From/P… ============================================================================== --- trunk/rosapps/devutils/cputointel/From/PPC/PPCBrain.c (original) +++ trunk/rosapps/devutils/cputointel/From/PPC/PPCBrain.c Wed Jan 17 18:31:47 2007 @@ -59,16 +59,6 @@ cpuint = GetData32Le(&cpu_buffer[cpu_pos]); - ///* Add */ - //if ((cpuint - (cpuint & GetMaskByte32(cpuPPCInit_Addx))) == ConvertBitToByte32(cpuPPCInit_Addx)) - //{ - // retsize = PPC_Addx( outfp, cpu_buffer, cpu_pos, cpu_size, - // BaseAddress, cpuarch, mode); - // if (retsize<0) - // retcode = 1; - // else - // cpu_pos += retsize; - //} /* 0x38 Ld aslo known as Li */ if ((cpuint - (cpuint & GetMaskByte32(cpuPPCInit_Ld))) == ConvertBitToByte32(cpuPPCInit_Ld)) Modified: trunk/rosapps/devutils/cputointel/From/PPC/PPCBrain.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/From/P… ============================================================================== --- trunk/rosapps/devutils/cputointel/From/PPC/PPCBrain.h (original) +++ trunk/rosapps/devutils/cputointel/From/PPC/PPCBrain.h Wed Jan 17 18:31:47 2007 @@ -8,7 +8,7 @@ * the opcode. but a opcode have also normal bit that is always been set to * same. thuse bit are always 0 or 1 */ -CPU_BYTE cpuPPCInit_Addx[32] = {2,0,1,0,1,0,0,0,0,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,1,1,1,0}; + CPU_BYTE cpuPPCInit_Blr[32] = {0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,1,0,0,1,1,1,0}; Modified: trunk/rosapps/devutils/cputointel/From/PPC/PPCopcode.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/From/P… ============================================================================== --- trunk/rosapps/devutils/cputointel/From/PPC/PPCopcode.c (original) +++ trunk/rosapps/devutils/cputointel/From/PPC/PPCopcode.c Wed Jan 17 18:31:47 2007 @@ -27,22 +27,7 @@ * value +1 and higher : who many byte we should add to cpu_pos */ -CPU_INT PPC_Addx( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, - CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, - CPU_INT mode) -{ - /* - * ConvertBitToByte() is perfect to use to get the bit being in use from a bit array - * GetMaskByte() is perfect if u whant known which bit have been mask out - * see M68kopcode.c and how it use the ConvertBitToByte() - */ - - fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos); - - printf(";Add unimplement\n"); - return -1; -} CPU_INT PPC_Blr( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch,

17 years, 9 months

[greatlrd] 25495: This break the ppc disambler support and convert to ia32, temporary I change the desgin lite to preopare the ia32 to ppc

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Wed Jan 17 18:02:43 2007 New Revision: 25495 URL: http://svn.reactos.org/svn/reactos?rev=25495&view=rev Log: This break the ppc disambler support and convert to ia32, temporary I change the desgin lite to preopare the ia32 to ppc Added: trunk/rosapps/devutils/cputointel/ConvertToIA32Process.c - copied, changed from r25473, trunk/rosapps/devutils/cputointel/ConvertToIntelProcess.c trunk/rosapps/devutils/cputointel/ReadMe.txt Removed: trunk/rosapps/devutils/cputointel/ConvertToIntelProcess.c Modified: trunk/rosapps/devutils/cputointel/CpuToIntel.c trunk/rosapps/devutils/cputointel/ImageLoader.c trunk/rosapps/devutils/cputointel/any_op.h trunk/rosapps/devutils/cputointel/cputointel.rbuild trunk/rosapps/devutils/cputointel/misc.h Copied: trunk/rosapps/devutils/cputointel/ConvertToIA32Process.c (from r25473, trunk/rosapps/devutils/cputointel/ConvertToIntelProcess.c) URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/Conver… ============================================================================== --- trunk/rosapps/devutils/cputointel/ConvertToIntelProcess.c (original) +++ trunk/rosapps/devutils/cputointel/ConvertToIA32Process.c Wed Jan 17 18:02:43 2007 @@ -8,83 +8,107 @@ #include "misc.h" #include "any_op.h" -CPU_INT ConvertToIntelProcess(FILE *outfp, CPU_INT cpuid) +CPU_INT ConvertToIntelProcess( FILE *outfp, CPU_INT eax, CPU_INT ebp, + CPU_INT edx, CPU_INT esp, + PMYBrainAnalys pMystart, + PMYBrainAnalys pMyend, CPU_INT regbits, + CPU_INT HowManyRegInUse) { - CPU_INT eax = 0; + CPU_INT stack = 0; - CPU_INT regbits = 0; CPU_UNINT tmp; + CPU_INT setup_ebp = 0 ; /* 0 = no, 1 = yes */ - pMyBrainAnalys = pStartMyBrainAnalys; + if (HowManyRegInUse > 8) + { + setup_ebp =1; /* we will use ebx as ebp */ + } - if (cpuid == IMAGE_FILE_MACHINE_POWERPC) - { - regbits = 64 / 8; - eax = 3; /* eax = r3 */ - stack = 31 * regbits; /* r0-r31 are 64bits reg ? */ - /* exemple : - * : [ebp - 256] = r0 - * : [ebp - 248] = r1 - */ - } - else - { - printf("not supported yet\n"); - return -1; - } + + + fprintf(outfp,"BITS 32\n"); fprintf(outfp,"GLOBAL _main\n"); fprintf(outfp,"SECTION .text\n\n"); - fprintf(outfp,"; compile with nasm filename.asm -f win32, gcc filename.obj -o filename.exe\n\n"); + fprintf(outfp,"; compile with nasm filename.asm -f win32, ld filename.obj -o filename.exe\n\n"); fprintf(outfp,"_main:\n"); /* setup a frame pointer */ - fprintf(outfp,"\n; Setup frame pointer \n"); - fprintf(outfp,"push ebp\n"); - fprintf(outfp,"mov ebp,esp\n"); - fprintf(outfp,"sub esp, %d ; Alloc %d bytes for reg\n\n",stack,stack); + //fprintf(outfp,"\n; Setup frame pointer \n"); + //fprintf(outfp,"push ebp\n"); + //fprintf(outfp,"mov ebp,esp\n"); + //fprintf(outfp,"sub esp, %d ; Alloc %d bytes for reg\n\n",stack,stack); fprintf(outfp,"; Start the program \n"); - while (pMyBrainAnalys!=NULL) + while (pMystart!=pMyend) { /* fixme the line lookup from anaylysing process */ /* mov not full implement */ - if (pMyBrainAnalys->op == OP_ANY_mov) + if (pMystart->op == OP_ANY_mov) { printf("waring OP_ANY_mov are not full implement\n"); - if ((pMyBrainAnalys->type & 8)== 8) + if ((pMystart->type & 8)== 8) { /* dst are register */ - tmp = stack - (pMyBrainAnalys->dst*regbits); + tmp = stack - (pMystart->dst*regbits); - if ((pMyBrainAnalys->type & 16)== 16) + if ((pMystart->type & 16)== 16) { /* source are imm */ - fprintf(outfp,"mov dword [ebp - %d], %llu\n", tmp, pMyBrainAnalys->src); + if (pMyBrainAnalys->dst == eax) { - fprintf(outfp,"mov eax,[ebp - %d]\n", tmp); + if (pMystart->src == 0) + fprintf(outfp,"xor eax,eax\n"); + else + fprintf(outfp,"mov eax,%llu\n",pMystart->src); + } + else if (pMystart->dst == ebp) + { + if (pMystart->src == 0) + fprintf(outfp,"xor ebp,ebp\n"); + else + fprintf(outfp,"mov ebp,%llu\n",pMystart->src); + } + else if (pMystart->dst == edx) + { + if (pMystart->src == 0) + fprintf(outfp,"xor edx,edx\n"); + else + fprintf(outfp,"mov edx,%llu\n",pMystart->src); + } + else if (pMystart->dst == esp) + { + if (pMystart->src == 0) + fprintf(outfp,"xor esp,esp\n"); + else + fprintf(outfp,"mov esp,%llu\n",pMystart->src); + } + else + { + //fprintf(outfp,"mov dword [ebp - %d], %llu\n", tmp, pMystart->src); + printf("not support move from register\n"); } } } /* end pMyBrainAnalys->type & 8 */ } /* return */ - if (pMyBrainAnalys->op == OP_ANY_ret) + if (pMystart->op == OP_ANY_ret) { - if (pMyBrainAnalys->ptr_next == NULL) - { - fprintf(outfp,"\n; clean up after the frame \n"); - fprintf(outfp,"mov esp, ebp\n"); - fprintf(outfp,"pop ebp\n"); - } + //if (pMyBrainAnalys->ptr_next == NULL) + //{ + // fprintf(outfp,"\n; clean up after the frame \n"); + // fprintf(outfp,"mov esp, ebp\n"); + // fprintf(outfp,"pop ebp\n"); + //} fprintf(outfp,"ret\n"); } - pMyBrainAnalys = (PMYBrainAnalys) pMyBrainAnalys->ptr_next; + pMystart = (PMYBrainAnalys) pMystart->ptr_next; } return 0; } Removed: trunk/rosapps/devutils/cputointel/ConvertToIntelProcess.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/Conver… ============================================================================== --- trunk/rosapps/devutils/cputointel/ConvertToIntelProcess.c (original) +++ trunk/rosapps/devutils/cputointel/ConvertToIntelProcess.c (removed) @@ -1,90 +1,0 @@ - -#include <windows.h> -#include <winnt.h> - -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include "misc.h" -#include "any_op.h" - -CPU_INT ConvertToIntelProcess(FILE *outfp, CPU_INT cpuid) -{ - CPU_INT eax = 0; - CPU_INT stack = 0; - CPU_INT regbits = 0; - CPU_UNINT tmp; - - pMyBrainAnalys = pStartMyBrainAnalys; - - if (cpuid == IMAGE_FILE_MACHINE_POWERPC) - { - regbits = 64 / 8; - eax = 3; /* eax = r3 */ - stack = 31 * regbits; /* r0-r31 are 64bits reg ? */ - /* exemple : - * : [ebp - 256] = r0 - * : [ebp - 248] = r1 - */ - } - else - { - printf("not supported yet\n"); - return -1; - } - - - fprintf(outfp,"BITS 32\n"); - fprintf(outfp,"GLOBAL _main\n"); - fprintf(outfp,"SECTION .text\n\n"); - fprintf(outfp,"; compile with nasm filename.asm -f win32, gcc filename.obj -o filename.exe\n\n"); - fprintf(outfp,"_main:\n"); - - /* setup a frame pointer */ - fprintf(outfp,"\n; Setup frame pointer \n"); - fprintf(outfp,"push ebp\n"); - fprintf(outfp,"mov ebp,esp\n"); - fprintf(outfp,"sub esp, %d ; Alloc %d bytes for reg\n\n",stack,stack); - - fprintf(outfp,"; Start the program \n"); - while (pMyBrainAnalys!=NULL) - { - /* fixme the line lookup from anaylysing process */ - - /* mov not full implement */ - if (pMyBrainAnalys->op == OP_ANY_mov) - { - printf("waring OP_ANY_mov are not full implement\n"); - - if ((pMyBrainAnalys->type & 8)== 8) - { - /* dst are register */ - tmp = stack - (pMyBrainAnalys->dst*regbits); - - if ((pMyBrainAnalys->type & 16)== 16) - { - /* source are imm */ - fprintf(outfp,"mov dword [ebp - %d], %llu\n", tmp, pMyBrainAnalys->src); - if (pMyBrainAnalys->dst == eax) - { - fprintf(outfp,"mov eax,[ebp - %d]\n", tmp); - } - } - } /* end pMyBrainAnalys->type & 8 */ - } - - /* return */ - if (pMyBrainAnalys->op == OP_ANY_ret) - { - if (pMyBrainAnalys->ptr_next == NULL) - { - fprintf(outfp,"\n; clean up after the frame \n"); - fprintf(outfp,"mov esp, ebp\n"); - fprintf(outfp,"pop ebp\n"); - } - fprintf(outfp,"ret\n"); - } - pMyBrainAnalys = (PMYBrainAnalys) pMyBrainAnalys->ptr_next; - } - return 0; -} Modified: trunk/rosapps/devutils/cputointel/CpuToIntel.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/CpuToI… ============================================================================== --- trunk/rosapps/devutils/cputointel/CpuToIntel.c (original) +++ trunk/rosapps/devutils/cputointel/CpuToIntel.c Wed Jan 17 18:02:43 2007 @@ -95,7 +95,7 @@ //} //return LoadPFileImage(infile,outfile,BaseAddress,cpuid,type, mode); - //return LoadPFileImage("e:\\testms.exe","e:\\cputointel.asm",0,0,0,0); // disambler + // return LoadPFileImage("e:\\testppc.exe","e:\\cputointel.asm",0,0,0,0); // disambler return LoadPFileImage("e:\\testms.exe","e:\\cputointel.asm",0,0,0,1); // convert } Modified: trunk/rosapps/devutils/cputointel/ImageLoader.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/ImageL… ============================================================================== --- trunk/rosapps/devutils/cputointel/ImageLoader.c (original) +++ trunk/rosapps/devutils/cputointel/ImageLoader.c Wed Jan 17 18:02:43 2007 @@ -10,6 +10,7 @@ #include "From/PPC/PPC.h" static CPU_INT machine_type = 0; +static CPU_INT ToMachine_type = IMAGE_FILE_MACHINE_I386; /* * infileName file name to convert or disambler @@ -121,7 +122,7 @@ if (mode > 0) { AnyalsingProcess(); - ConvertToIntelProcess(outfp,machine_type); + ConvertProcess(outfp, machine_type, ToMachine_type); FreeAny(); } fclose(outfp); @@ -137,7 +138,7 @@ if (mode > 1) { AnyalsingProcess(); - ConvertToIntelProcess(outfp,machine_type); + ConvertProcess(outfp, machine_type, ToMachine_type); FreeAny(); } fclose(outfp); @@ -148,7 +149,7 @@ if (mode > 1) { AnyalsingProcess(); - ConvertToIntelProcess(outfp,machine_type); + ConvertProcess(outfp, machine_type, ToMachine_type); FreeAny(); } fclose(outfp); @@ -160,7 +161,7 @@ if (mode > 1) { AnyalsingProcess(); - ConvertToIntelProcess(outfp,machine_type); + ConvertProcess(outfp, machine_type, ToMachine_type); FreeAny(); } fclose(outfp); @@ -172,7 +173,7 @@ if (mode > 1) { AnyalsingProcess(); - ConvertToIntelProcess(outfp,machine_type); + ConvertProcess(outfp, machine_type, ToMachine_type); FreeAny(); } fclose(outfp); @@ -184,7 +185,7 @@ if (mode > 1) { AnyalsingProcess(); - ConvertToIntelProcess(outfp,machine_type); + ConvertProcess(outfp, machine_type, ToMachine_type); FreeAny(); } fclose(outfp); @@ -196,7 +197,7 @@ if (mode > 1) { AnyalsingProcess(); - ConvertToIntelProcess(outfp,machine_type); + ConvertProcess(outfp, machine_type, ToMachine_type); FreeAny(); } fclose(outfp); @@ -208,7 +209,7 @@ if (mode > 1) { AnyalsingProcess(); - ConvertToIntelProcess(outfp,machine_type); + ConvertProcess(outfp, machine_type, ToMachine_type); FreeAny(); } fclose(outfp); @@ -223,7 +224,7 @@ if (mode > 1) { AnyalsingProcess(); - ConvertToIntelProcess(outfp,machine_type); + ConvertProcess(outfp, machine_type, ToMachine_type); FreeAny(); } fclose(outfp); Added: trunk/rosapps/devutils/cputointel/ReadMe.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/ReadMe… ============================================================================== --- trunk/rosapps/devutils/cputointel/ReadMe.txt (added) +++ trunk/rosapps/devutils/cputointel/ReadMe.txt Wed Jan 17 18:02:43 2007 @@ -1,0 +1,73 @@ +CpuToIntel is a experment tools and is strict under havy devloping + + +The Idea +The idea is to convert a binary file or win pe file +from one cpu to another cpu, But it does not exists +plan to port over diffent hardware architect like +how diffent hw comucate, example x86 DMA controller +to PPC like. It is only to convert the the binary or +pe file to another cpu. it mean a user mode apps +will always be ported, but if it self modify code +it will not work. But it exists a idea to deal with +self modify code. + + +The idea to handling self modify code +The idea is to add a small emulator that +runing the apps or adding a anylasuing process +to dectect self modify code and extract it +this is hard thing todo. almost imposible + + +Why the name are CpuToIntel +When I start write on it it was only ment to convert +from ARM, PPC, m68k to X86 but then I come think of +ReactOS PPC port that is going on. for or later we +will need something that doing convert from x86 to +PPC apps. It exists two way todo it. One is to use +dymatic translation a jit, like UAE or QEMU doing +converting. But it will lose of allot of speed if +it is a game or a havy apps to much. So the idea +is to convert the whole file in one sweep. will give + one other problem it will be a slow process todo it, +and hard dectect self modify program. so not all program +can be really convert with this process. + + +Who will it work +we take it step for step and I will describe the +binary translations how it works. The PE file +work simluare way. + +step 1 : it will disambler the program frist + +step 2 : translate everthing to a middle asm dialect, + it is own asm dialect it is not suite for a real + +step 3 : (not implement) send it to ananalysing processs + to get any name or mark out which row is a new functions + +step 3.5 (not implement) split the code into functions here + +step 4 : Now it start the convert process. + +step 4.5 (not implement) maybe a optimzer. + +step 5 : now it is finish. + + +The arch that are plan +PPC to IA32, PPC (work in progress) +m68k to IA32, PPC (stubed) +ARM to IA32, PPC (stubed) +IA32 to IA32, PPC (work in progress) + + +The Winodws NT PPC and x85 diffrent +R1 The stack pointer equal with x86 esp +R3 The return reg equal with x86 eax +R4 The return reg equal with x86 edx +R31 The base pointer equal with x86 ebp + + Modified: trunk/rosapps/devutils/cputointel/any_op.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/any_op… ============================================================================== --- trunk/rosapps/devutils/cputointel/any_op.h (original) +++ trunk/rosapps/devutils/cputointel/any_op.h Wed Jan 17 18:02:43 2007 @@ -1,4 +1,6 @@ +#ifndef __ANY_OP_H__ +#define __ANY_OP_H__ #define OP_ANY_mov 0x00000000 #define OP_ANY_ret 0x00000001 @@ -18,6 +20,11 @@ CPU_UNINT memAdr; /* where are we in the current memory pos + baseaddress */ + CPU_INT row; /* 0 = no row, + * 1 = row is bcc (conditions), + * 2 = row is jsr (Call) + */ + /* try translate the Adress to a name */ CPU_BYTE* ptr_next; /* hook next one */ CPU_BYTE* ptr_prev; /* hook previus one */ @@ -25,3 +32,11 @@ extern PMYBrainAnalys pMyBrainAnalys; /* current working address */ extern PMYBrainAnalys pStartMyBrainAnalys; /* start address */ + +CPU_INT ConvertToIntelProcess( FILE *outfp, CPU_INT eax, CPU_INT ebp, + CPU_INT edx, CPU_INT esp, + PMYBrainAnalys pMystart, + PMYBrainAnalys pMyend, CPU_INT regbits, + CPU_INT HowManyRegInUse); + +#endif Modified: trunk/rosapps/devutils/cputointel/cputointel.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/cputoi… ============================================================================== --- trunk/rosapps/devutils/cputointel/cputointel.rbuild (original) +++ trunk/rosapps/devutils/cputointel/cputointel.rbuild Wed Jan 17 18:02:43 2007 @@ -6,14 +6,14 @@ <library>kernel32</library> <library>user32</library> - <file>AnyalsingProcess.c</file> - <file>ConvertToIntelProcess.c</file> <file>CpuToIntel.c</file> - <file>ImageLoader.c</file> <file>misc.c</file> <file>From/ARM/ARMBrain.c</file> <file>From/ARM/ARMopcode.c</file> + + <file>From/IA32/IA32Brain.c</file> + <file>From/IA32/IA32opcode.c</file> <file>From/m68k/M68kBrain.c</file> <file>From/m68k/M68kopcode.c</file> @@ -24,4 +24,9 @@ <file>From/dummycpu/DummyBrain.c</file> <file>From/dummycpu/Dummyopcode.c</file> + <file>ImageLoader.c</file> + <file>AnyalsingProcess.c</file> + <file>ConvertingProcess.c</file> + <file>ConvertToIA32Process.c</file> + </module> Modified: trunk/rosapps/devutils/cputointel/misc.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/misc.h… ============================================================================== --- trunk/rosapps/devutils/cputointel/misc.h (original) +++ trunk/rosapps/devutils/cputointel/misc.h Wed Jan 17 18:02:43 2007 @@ -26,5 +26,7 @@ CPU_INT AllocAny(); CPU_INT FreeAny(); CPU_INT AnyalsingProcess(); -CPU_INT ConvertToIntelProcess(FILE *outfp, CPU_INT cpuid); +CPU_INT ConvertProcess(FILE *outfp, CPU_INT FromCpuid, CPU_INT ToCpuid); + +

17 years, 9 months

← Newer
1
...
14
15
16
17
18
19
20
...
41
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2007