Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sir_richard] 45303: [HAL]: Fix HalpFlushTlb. Thanks to Stefan Ginsberg <stefan100@reactos.org>
by sir_richard＠svn.reactos.org 28 Jan '10

28 Jan '10

Author: sir_richard Date: Fri Jan 29 00:08:04 2010 New Revision: 45303 URL: http://svn.reactos.org/svn/reactos?rev=45303&view=rev Log: [HAL]: Fix HalpFlushTlb. Thanks to Stefan Ginsberg <stefan100(a)reactos.org> Modified: trunk/reactos/hal/halx86/generic/misc.c Modified: trunk/reactos/hal/halx86/generic/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/misc.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/misc.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/misc.c [iso-8859-1] Fri Jan 29 00:08:04 2010 @@ -102,6 +102,7 @@ // Restore interrupts // __writeeflags(Flags); + return; } }

1 0

[mkupfer] 45302: this log message left intentionally non-descriptive
by mkupfer＠svn.reactos.org 28 Jan '10

28 Jan '10

Author: mkupfer Date: Thu Jan 28 23:18:31 2010 New Revision: 45302 URL: http://svn.reactos.org/svn/reactos?rev=45302&view=rev Log: this log message left intentionally non-descriptive Modified: trunk/reactos/dll/cpl/sysdm/general.c trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc trunk/reactos/dll/cpl/sysdm/lang/en-US.rc trunk/reactos/dll/cpl/sysdm/resource.h Modified: trunk/reactos/dll/cpl/sysdm/general.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/general.c?re… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/general.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/general.c [iso-8859-1] Thu Jan 28 23:18:31 2010 @@ -12,6 +12,9 @@ #include "precomp.h" +#define ANIM_STEP 2 +#define ANIM_TIME 50 + typedef struct _IMGINFO { HBITMAP hBitmap; @@ -19,6 +22,7 @@ INT cySource; } IMGINFO, *PIMGINFO; +PIMGINFO pImgInfo = NULL; void ShowLastWin32Error(HWND hWndOwner) @@ -70,6 +74,124 @@ } } +LRESULT CALLBACK RosImageProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + static UINT timerid = 0, top = 0, offset; + static HBITMAP hBitmap2; + RECT r; + NONCLIENTMETRICS ncm; + HFONT hfont; + BITMAP bitmap; + HDC dc, sdc; + TCHAR devtext[2048]; + switch (uMsg) + { + case WM_LBUTTONDBLCLK: + if (wParam & (MK_CONTROL | MK_SHIFT)) + { + if (timerid == 0) + { + top = 0; // set top + + // build new bitmap + GetObject(pImgInfo->hBitmap, sizeof(BITMAP), &bitmap); + dc = CreateCompatibleDC(GetDC(NULL)); + sdc = CreateCompatibleDC(dc); + ncm.cbSize = sizeof(NONCLIENTMETRICS); + SystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &ncm, 0); + + hfont = CreateFontIndirect(&ncm.lfMessageFont); + SelectObject(dc, hfont); + SetRect(&r, 0, 0, 0, 0); + LoadString(hApplet, IDS_DEVS, devtext, sizeof(devtext) / sizeof(TCHAR)); + DrawText(dc, devtext, -1, &r, DT_CALCRECT); + hBitmap2 = CreateBitmap(pImgInfo->cxSource, (2 * pImgInfo->cySource) + (r.bottom + 1 - r.top), bitmap.bmPlanes, bitmap.bmBitsPixel, NULL); + SelectObject(sdc, pImgInfo->hBitmap); + SelectObject(dc, hBitmap2); + offset = 0; + BitBlt(dc, 0, offset, bitmap.bmWidth, bitmap.bmHeight, sdc, 0, 0, SRCCOPY); + offset += bitmap.bmHeight; + + SetRect(&r, 0, offset, bitmap.bmWidth, offset + (r.bottom - r.top) + 1); + FillRect(dc, &r, GetSysColorBrush(COLOR_3DFACE)); + SetBkMode(dc, TRANSPARENT); + OffsetRect(&r, 1, 1); + SetTextColor(dc, GetSysColor(COLOR_BTNSHADOW)); + DrawText(dc, devtext, -1, &r, DT_CENTER); + OffsetRect(&r, -1, -1); + SetTextColor(dc, GetSysColor(COLOR_WINDOWTEXT)); + DrawText(dc, devtext, -1, &r, DT_CENTER); + offset += r.bottom - r.top; + + BitBlt(dc, 0, offset, bitmap.bmWidth, bitmap.bmHeight, sdc, 0, 0, SRCCOPY); + offset += bitmap.bmHeight; + DeleteDC(sdc); + DeleteDC(dc); + + timerid = SetTimer(hwnd, 1, ANIM_TIME, NULL); + } + } + break; + case WM_LBUTTONDOWN: + if (timerid) + { + KillTimer(hwnd, timerid); + top = 0; + timerid = 0; + DeleteObject(hBitmap2); + InvalidateRect(hwnd, NULL, FALSE); + } + break; + case WM_TIMER: + top += ANIM_STEP; + if (top > offset - pImgInfo->cySource) + { + KillTimer(hwnd, timerid); + top = 0; + timerid = 0; + DeleteObject(hBitmap2); + } + InvalidateRect(hwnd, NULL, FALSE); + break; + case WM_PAINT: + { + PAINTSTRUCT PS; + HDC hdcMem, hdc; + LONG left; + if (wParam != 0) + { + hdc = (HDC)wParam; + } else + { + hdc = BeginPaint(hwnd,&PS); + } + GetClientRect(hwnd,&PS.rcPaint); + + /* position image in center of dialog */ + left = (PS.rcPaint.right - pImgInfo->cxSource) / 2; + hdcMem = CreateCompatibleDC(hdc); + + if (hdcMem != NULL) + { + SelectObject(hdcMem, timerid ? hBitmap2 : pImgInfo->hBitmap); + BitBlt(hdc, + left, + PS.rcPaint.top, + PS.rcPaint.right - PS.rcPaint.left, + PS.rcPaint.top + pImgInfo->cySource, + hdcMem, + 0, + top, + SRCCOPY); + DeleteDC(hdcMem); + } + if (wParam == 0) + EndPaint(hwnd,&PS); + break; + } + } + return TRUE; +} static VOID SetRegTextData(HWND hwnd, @@ -372,12 +494,9 @@ WPARAM wParam, LPARAM lParam) { - PIMGINFO pImgInfo; UNREFERENCED_PARAMETER(lParam); UNREFERENCED_PARAMETER(wParam); - - pImgInfo = (PIMGINFO)GetWindowLongPtr(hwndDlg, DWLP_USER); switch (uMsg) { @@ -389,9 +508,8 @@ return FALSE; } - SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pImgInfo); - InitImageInfo(pImgInfo); + SetWindowLongPtr(GetDlgItem(hwndDlg, IDC_ROSIMG), GWL_WNDPROC, (LONG)RosImageProc); GetSystemInformation(hwndDlg); break; Modified: trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/de-DE.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc [iso-8859-1] Thu Jan 28 23:18:31 2010 @@ -289,4 +289,5 @@ IDS_USERPROFILE_TYPE "Typ" IDS_USERPROFILE_STATUS "Status" IDS_USERPROFILE_MODIFIED "Geändert" -END + IDS_DEVS "\nReactOS Team\n\nProjektkoordinator\n\nAleksey Bragin\n\nEntwicklerteam\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas Blümel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGé van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Verantwortliche\n\nColin Finck\nZ98\n\nWebseitenteam\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedienteam\n\nMindflyer\nWierd_W\n\nweiterer Dank geht an\n\nalle Mitwirkenden\nWine Team\n\n" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/en-US.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/en-US.rc [iso-8859-1] Thu Jan 28 23:18:31 2010 @@ -284,4 +284,5 @@ IDS_USERPROFILE_TYPE "Type" IDS_USERPROFILE_STATUS "Status" IDS_USERPROFILE_MODIFIED "Modified" -END + IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas Blümel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGé van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Engineers\n\nColin Finck\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributers\nWine Team\n\n" +END Modified: trunk/reactos/dll/cpl/sysdm/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/resource.h?r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/resource.h [iso-8859-1] Thu Jan 28 23:18:31 2010 @@ -156,5 +156,6 @@ #define RC_LICENSE 1502 #define RTDATA 1503 +#define IDS_DEVS 2000 #endif /* __CPL_RESOURCE_H */

1 0

[sir_richard] 45301: [PERF]: Optimize nested interrupt cases (where a pending interrupt exists at the end of a software or system interrupt) just like the old HAL did, by jumping into a second-level handler and completing the outer trap frame instead of the nested trap frame. This saves a lot of cycles in those cases, and they do happen quite often (pending DPC at the end of an interrupt, for example). [NTOS/HAL]: Rework respective code to handle this by using the VDM Alert field in the KPCR.
by sir_richard＠svn.reactos.org 28 Jan '10

28 Jan '10

Author: sir_richard Date: Thu Jan 28 21:45:45 2010 New Revision: 45301 URL: http://svn.reactos.org/svn/reactos?rev=45301&view=rev Log: [PERF]: Optimize nested interrupt cases (where a pending interrupt exists at the end of a software or system interrupt) just like the old HAL did, by jumping into a second-level handler and completing the outer trap frame instead of the nested trap frame. This saves a lot of cycles in those cases, and they do happen quite often (pending DPC at the end of an interrupt, for example). [NTOS/HAL]: Rework respective code to handle this by using the VDM Alert field in the KPCR. Modified: trunk/reactos/hal/halx86/generic/pic.c trunk/reactos/hal/halx86/include/halp.h trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S trunk/reactos/ntoskrnl/ke/time.c Modified: trunk/reactos/hal/halx86/generic/pic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/pic.c?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/pic.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/pic.c [iso-8859-1] Thu Jan 28 21:45:45 2010 @@ -205,6 +205,15 @@ HalpDispatchInterrupt }; +/* Handlers for pending software interrupts when we already have a trap frame*/ +PHAL_SW_INTERRUPT_HANDLER_2ND_ENTRY SWInterruptHandlerTable2[3] = +{ + (PHAL_SW_INTERRUPT_HANDLER_2ND_ENTRY)KiUnexpectedInterrupt, + HalpApcInterrupt2ndEntry, + HalpDispatchInterrupt2ndEntry +}; + + USHORT HalpEisaELCR; /* FUNCTIONS ******************************************************************/ @@ -552,9 +561,7 @@ /* Check for pending software interrupts and compare with current IRQL */ PendingIrql = SWInterruptLookUpTable[Pcr->IRR]; - - /* NOTE: We can do better! We need to support "jumping" a frame for nested cases! */ - if (PendingIrql > OldIrql) SWInterruptHandlerTable[PendingIrql](); + if (PendingIrql > OldIrql) HalpNestedTrap(PendingIrql); } /* INTERRUPT DISMISSAL FUNCTIONS **********************************************/ @@ -811,18 +818,56 @@ /* Check for pending software interrupts and compare with current IRQL */ PendingIrql = SWInterruptLookUpTable[Pcr->IRR]; - if (PendingIrql > OldIrql) SWInterruptHandlerTable[PendingIrql](); + if (PendingIrql > OldIrql) HalpNestedTrap(PendingIrql); } /* SOFTWARE INTERRUPT TRAPS ***************************************************/ VOID +FORCEINLINE +DECLSPEC_NORETURN +_HalpApcInterruptHandler(IN PKTRAP_FRAME TrapFrame) +{ + KIRQL CurrentIrql; + PKPCR Pcr = KeGetPcr(); + + /* Save the current IRQL and update it */ + CurrentIrql = Pcr->Irql; + Pcr->Irql = APC_LEVEL; + + /* Remove DPC from IRR */ + Pcr->IRR &= ~(1 << APC_LEVEL); + + /* Enable interrupts and call the kernel's APC interrupt handler */ + _enable(); + KiDeliverApc(((KiUserTrap(TrapFrame)) || (TrapFrame->EFlags & EFLAGS_V86_MASK)) ? + UserMode : KernelMode, + NULL, + TrapFrame); + + /* Disable interrupts and end the interrupt */ + _disable(); + Pcr->VdmAlert = (ULONG_PTR)TrapFrame; + HalpEndSoftwareInterrupt(CurrentIrql); + + /* Exit the interrupt */ + KiEoiHelper(TrapFrame); +} + +VOID FASTCALL +DECLSPEC_NORETURN +HalpApcInterrupt2ndEntry(IN PKTRAP_FRAME TrapFrame) +{ + /* Do the work */ + _HalpApcInterruptHandler(TrapFrame); +} + +VOID +FASTCALL +DECLSPEC_NORETURN HalpApcInterruptHandler(IN PKTRAP_FRAME TrapFrame) { - KIRQL CurrentIrql; - PKPCR Pcr = KeGetPcr(); - /* Set up a fake INT Stack */ TrapFrame->EFlags = __readeflags(); TrapFrame->SegCs = KGDT_R0_CODE; @@ -831,35 +876,52 @@ /* Build the trap frame */ KiEnterInterruptTrap(TrapFrame); + /* Do the work */ + _HalpApcInterruptHandler(TrapFrame); +} + +VOID +FORCEINLINE +DECLSPEC_NORETURN +_HalpDispatchInterruptHandler(IN PKTRAP_FRAME TrapFrame) +{ + KIRQL CurrentIrql; + PKPCR Pcr = KeGetPcr(); + /* Save the current IRQL and update it */ CurrentIrql = Pcr->Irql; - Pcr->Irql = APC_LEVEL; + Pcr->Irql = DISPATCH_LEVEL; /* Remove DPC from IRR */ - Pcr->IRR &= ~(1 << APC_LEVEL); - - /* Enable interrupts and call the kernel's APC interrupt handler */ + Pcr->IRR &= ~(1 << DISPATCH_LEVEL); + + /* Enable interrupts and call the kernel's DPC interrupt handler */ _enable(); - KiDeliverApc(((KiUserTrap(TrapFrame)) || (TrapFrame->EFlags & EFLAGS_V86_MASK)) ? - UserMode : KernelMode, - NULL, - TrapFrame); - + KiDispatchInterrupt(); + /* Disable interrupts and end the interrupt */ _disable(); + Pcr->VdmAlert = (ULONG_PTR)TrapFrame; HalpEndSoftwareInterrupt(CurrentIrql); /* Exit the interrupt */ - KiEoiHelper(TrapFrame); + KiEoiHelper(TrapFrame); } VOID FASTCALL +DECLSPEC_NORETURN +HalpDispatchInterrupt2ndEntry(IN PKTRAP_FRAME TrapFrame) +{ + /* Do the work */ + _HalpDispatchInterruptHandler(TrapFrame); +} + +VOID +FASTCALL +DECLSPEC_NORETURN HalpDispatchInterruptHandler(IN PKTRAP_FRAME TrapFrame) -{ - KIRQL CurrentIrql; - PKPCR Pcr = KeGetPcr(); - +{ /* Set up a fake INT Stack */ TrapFrame->EFlags = __readeflags(); TrapFrame->SegCs = KGDT_R0_CODE; @@ -868,23 +930,8 @@ /* Build the trap frame */ KiEnterInterruptTrap(TrapFrame); - /* Save the current IRQL and update it */ - CurrentIrql = Pcr->Irql; - Pcr->Irql = DISPATCH_LEVEL; - - /* Remove DPC from IRR */ - Pcr->IRR &= ~(1 << DISPATCH_LEVEL); - - /* Enable interrupts and call the kernel's DPC interrupt handler */ - _enable(); - KiDispatchInterrupt(); - - /* Disable interrupts and end the interrupt */ - _disable(); - HalpEndSoftwareInterrupt(CurrentIrql); - - /* Exit the interrupt */ - KiEoiHelper(TrapFrame); + /* Do the work */ + _HalpDispatchInterruptHandler(TrapFrame); } KiTrap(HalpApcInterrupt, KI_SOFTWARE_TRAP); Modified: trunk/reactos/hal/halx86/include/halp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/halp.h?… ============================================================================== --- trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] Thu Jan 28 21:45:45 2010 @@ -22,6 +22,19 @@ ULONG Prefix; } HAL_BIOS_FRAME, *PHAL_BIOS_FRAME; +typedef +VOID +(*PHAL_SW_INTERRUPT_HANDLER)( + VOID +); + +typedef +FASTCALL +VOID +(*PHAL_SW_INTERRUPT_HANDLER_2ND_ENTRY)( + IN PKTRAP_FRAME TrapFrame +); + #define HAL_APC_REQUEST 0 #define HAL_DPC_REQUEST 1 @@ -96,6 +109,28 @@ : [v] "i"(Alignment), [i] "i"(Size) ); +} + +// +// Nested Trap Trampoline +// +VOID +DECLSPEC_NORETURN +FORCEINLINE +HalpNestedTrap(IN KIRQL PendingIrql) +{ + /* Use the second interrupt handler table */ + extern PHAL_SW_INTERRUPT_HANDLER_2ND_ENTRY SWInterruptHandlerTable2[3]; + __asm__ __volatile__ + ( + "movl %c[t], %%ecx\n" + "jmp *%0\n" + : + : "im"(SWInterruptHandlerTable2[PendingIrql]), + [t] "i"(&PCR->VdmAlert) + : "%esp" + ); + UNREACHABLE; } // @@ -432,12 +467,6 @@ } PIC_MASK, *PPIC_MASK; typedef -VOID -(*PHAL_SW_INTERRUPT_HANDLER)( - VOID -); - -typedef BOOLEAN __attribute__((regparm(3))) (*PHAL_DISMISS_INTERRUPT)( @@ -531,6 +560,8 @@ VOID NTAPI HalpInitializePICs(IN BOOLEAN EnableInterrupts); VOID HalpApcInterrupt(VOID); VOID HalpDispatchInterrupt(VOID); +VOID FASTCALL HalpApcInterrupt2ndEntry(IN PKTRAP_FRAME TrapFrame); +VOID FASTCALL HalpDispatchInterrupt2ndEntry(IN PKTRAP_FRAME TrapFrame); /* timer.c */ VOID NTAPI HalpInitializeClock(VOID); Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S [iso-8859-1] Thu Jan 28 21:45:45 2010 @@ -1452,6 +1452,8 @@ cli /* End the interrupt and do EOI */ + lea eax, [esp+8] + mov PCR[KPCR_VDM_ALERT], eax call _HalEndSystemInterrupt@8 jmp _Kei386EoiHelper@0 .endif Modified: trunk/reactos/ntoskrnl/ke/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/time.c?rev=453… ============================================================================== --- trunk/reactos/ntoskrnl/ke/time.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/time.c [iso-8859-1] Thu Jan 28 21:45:45 2010 @@ -112,6 +112,9 @@ Prcb->InterruptCount++; } + /* Save the nested trap frame address */ + KeGetPcr()->VdmAlert = (ULONG_PTR)TrapFrame; + /* Disable interrupts and end the interrupt */ _disable(); HalEndSystemInterrupt(Irql, CLOCK2_LEVEL);

1 0

[sir_richard] 45300: [NTOS]: Fix L1/L2 cache detection and write out the size and associativity. Now that KeGetCurrentProcessorNumber doesn't think your L2 cache is the number of CPUs, this can be safely done.
by sir_richard＠svn.reactos.org 28 Jan '10

28 Jan '10

Author: sir_richard Date: Thu Jan 28 21:43:25 2010 New Revision: 45300 URL: http://svn.reactos.org/svn/reactos?rev=45300&view=rev Log: [NTOS]: Fix L1/L2 cache detection and write out the size and associativity. Now that KeGetCurrentProcessorNumber doesn't think your L2 cache is the number of CPUs, this can be safely done. Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] Thu Jan 28 21:43:25 2010 @@ -40,6 +40,7 @@ ULONG KeDcacheFlushCount = 0; ULONG KeIcacheFlushCount = 0; ULONG KiDmaIoCoherency = 0; +ULONG KePrefetchNTAGranularity = 32; CHAR KeNumberProcessors; KAFFINITY KeActiveProcessors = 1; BOOLEAN KiI386PentiumLockErrataPresent; @@ -453,6 +454,7 @@ ULONG CacheRequests = 0, i; ULONG CurrentRegister; UCHAR RegisterByte; + ULONG Size, Associativity = 0, CacheLine = 64, CurrentSize = 0; BOOLEAN FirstPass = TRUE; /* Set default L2 size */ @@ -517,17 +519,144 @@ * (32MB), or from 0x80 to 0x89 (same size but * 8-way associative. */ - if (((RegisterByte > 0x40) && - (RegisterByte <= 0x49)) || - ((RegisterByte > 0x80) && - (RegisterByte <= 0x89))) + if (((RegisterByte > 0x40) && (RegisterByte <= 0x47)) || + ((RegisterByte > 0x78) && (RegisterByte <= 0x7C)) || + ((RegisterByte > 0x80) && (RegisterByte <= 0x85))) { + /* Compute associativity */ + Associativity = 4; + if (RegisterByte >= 0x79) Associativity = 8; + /* Mask out only the first nibble */ - RegisterByte &= 0x0F; - - /* Set the L2 Cache Size */ - Pcr->SecondLevelCacheSize = 0x10000 << - RegisterByte; + RegisterByte &= 0x07; + + /* Check if this cache is bigger than the last */ + Size = 0x10000 << RegisterByte; + if ((Size / Associativity) > CurrentSize) + { + /* Set the L2 Cache Size and Associativity */ + CurrentSize = Size / Associativity; + Pcr->SecondLevelCacheSize = Size; + Pcr->SecondLevelCacheAssociativity = Associativity; + } + } + else if ((RegisterByte > 0x21) && (RegisterByte <= 0x29)) + { + /* Set minimum cache line size */ + if (CacheLine < 128) CacheLine = 128; + + /* Hard-code size/associativity */ + Associativity = 8; + switch (RegisterByte) + { + case 0x22: + Size = 512 * 1024; + Associativity = 4; + break; + + case 0x23: + Size = 1024 * 1024; + break; + + case 0x25: + Size = 2048 * 1024; + break; + + case 0x29: + Size = 4096 * 1024; + break; + + default: + Size = 0; + break; + } + + /* Check if this cache is bigger than the last */ + if ((Size / Associativity) > CurrentSize) + { + /* Set the L2 Cache Size and Associativity */ + CurrentSize = Size / Associativity; + Pcr->SecondLevelCacheSize = Size; + Pcr->SecondLevelCacheAssociativity = Associativity; + } + } + else if (((RegisterByte > 0x65) && (RegisterByte < 0x69)) || + (RegisterByte == 0x2C) || (RegisterByte == 0xF0)) + { + /* Indicates L1 cache line of 64 bytes */ + KePrefetchNTAGranularity = 64; + } + else if (RegisterByte == 0xF1) + { + /* Indicates L1 cache line of 128 bytes */ + KePrefetchNTAGranularity = 128; + } + else if (((RegisterByte >= 0x4A) && (RegisterByte <= 0x4C)) || + (RegisterByte == 0x78) || + (RegisterByte == 0x7D) || + (RegisterByte == 0x7F) || + (RegisterByte == 0x86) || + (RegisterByte == 0x87)) + { + /* Set minimum cache line size */ + if (CacheLine < 64) CacheLine = 64; + + /* Hard-code size/associativity */ + switch (RegisterByte) + { + case 0x4A: + Size = 4 * 1024 * 1024; + Associativity = 8; + break; + + case 0x4B: + Size = 6 * 1024 * 1024; + Associativity = 12; + break; + + case 0x4C: + Size = 8 * 1024 * 1024; + Associativity = 16; + break; + + case 0x78: + Size = 1 * 1024 * 1024; + Associativity = 4; + break; + + case 0x7D: + Size = 2 * 1024 * 1024; + Associativity = 8; + break; + + case 0x7F: + Size = 512 * 1024; + Associativity = 2; + break; + + case 0x86: + Size = 512 * 1024; + Associativity = 4; + break; + + case 0x87: + Size = 1 * 1024 * 1024; + Associativity = 8; + break; + + default: + Size = 0; + break; + } + + /* Check if this cache is bigger than the last */ + if ((Size / Associativity) > CurrentSize) + { + /* Set the L2 Cache Size and Associativity */ + CurrentSize = Size / Associativity; + Pcr->SecondLevelCacheSize = Size; + Pcr->SecondLevelCacheAssociativity = Associativity; + } } } } @@ -537,15 +666,65 @@ case CPU_AMD: - /* Check if we support CPUID 0x80000006 */ - CPUID(0x80000000, &Data[0], &Dummy, &Dummy, &Dummy); - if (Data[0] >= 6) + /* Check if we support CPUID 0x80000005 */ + CPUID(0x80000000, &Data[0], &Data[1], &Data[2], &Data[3]); + if (Data[0] >= 0x80000006) { - /* Get 2nd level cache and tlb size */ - CPUID(0x80000006, &Dummy, &Dummy, &Data[2], &Dummy); - - /* Set the L2 Cache Size */ - Pcr->SecondLevelCacheSize = (Data[2] & 0xFFFF0000) >> 6; + /* Get L1 size first */ + CPUID(0x80000005, &Data[0], &Data[1], &Data[2], &Data[3]); + KePrefetchNTAGranularity = Data[2] & 0xFF; + + /* Check if we support CPUID 0x80000006 */ + CPUID(0x80000000, &Data[0], &Data[1], &Data[2], &Data[3]); + if (Data[0] >= 0x80000006) + { + /* Get 2nd level cache and tlb size */ + CPUID(0x80000006, &Data[0], &Data[1], &Data[2], &Data[3]); + + /* Cache line size */ + CacheLine = Data[2] & 0xFF; + + /* Hardcode associativity */ + RegisterByte = Data[2] >> 12; + switch (RegisterByte) + { + case 2: + Associativity = 2; + break; + + case 4: + Associativity = 4; + break; + + case 6: + Associativity = 8; + break; + + case 8: + case 15: + Associativity = 16; + break; + + default: + Associativity = 1; + break; + } + + /* Compute size */ + Size = (Data[2] >> 16) << 10; + + /* Hack for Model 6, Steping 300 */ + if ((KeGetCurrentPrcb()->CpuType == 6) && + (KeGetCurrentPrcb()->CpuStep == 0x300)) + { + /* Stick 64K in there */ + Size = 64 * 1024; + } + + /* Set the L2 Cache Size and associativity */ + Pcr->SecondLevelCacheSize = Size; + Pcr->SecondLevelCacheAssociativity = Associativity; + } } break; @@ -557,6 +736,14 @@ /* FIXME */ break; } + + /* Set the cache line */ + if (CacheLine > KeLargestCacheLine) KeLargestCacheLine = CacheLine; + DPRINT1("Prefetch Cache: %d bytes\tL2 Cache: %d bytes\tL2 Cache Line: %d bytes\tL2 Cache Associativity: %d\n", + KePrefetchNTAGranularity, + Pcr->SecondLevelCacheSize, + KeLargestCacheLine, + Pcr->SecondLevelCacheAssociativity); } VOID

1 0

[sir_richard] 45299: [NDK]: Fix KPCR definition. [DDK]: KeGetCurrentProcessorNumber should not return a 32-bit DWORD combined of "ProcessorNumer", "VdmAlert" and "SecondLevelCacheAssociativity" because those 3 fields are probably not equal to a processor number. Having an L2 Cache will no longer result in ReactOS believing you have a 32000 core CPU.
by sir_richard＠svn.reactos.org 28 Jan '10

28 Jan '10

Author: sir_richard Date: Thu Jan 28 17:05:54 2010 New Revision: 45299 URL: http://svn.reactos.org/svn/reactos?rev=45299&view=rev Log: [NDK]: Fix KPCR definition. [DDK]: KeGetCurrentProcessorNumber should not return a 32-bit DWORD combined of "ProcessorNumer", "VdmAlert" and "SecondLevelCacheAssociativity" because those 3 fields are probably not equal to a processor number. Having an L2 Cache will no longer result in ReactOS believing you have a 32000 core CPU. Modified: trunk/reactos/include/ddk/winddk.h trunk/reactos/include/ndk/i386/ketypes.h trunk/reactos/ntoskrnl/kdbg/kdb_cli.c Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=4… ============================================================================== --- trunk/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/winddk.h [iso-8859-1] Thu Jan 28 17:05:54 2010 @@ -5149,23 +5149,7 @@ ULONG KeGetCurrentProcessorNumber(VOID) { -#if defined(__GNUC__) - ULONG ret; - __asm__ __volatile__ ( - "movl %%fs:%c1, %0\n" - : "=r" (ret) - : "i" (FIELD_OFFSET(KPCR, Number)) - ); - return ret; -#elif defined(_MSC_VER) -#if _MSC_FULL_VER >= 13012035 - return (ULONG)__readfsbyte(FIELD_OFFSET(KPCR, Number)); -#else - __asm { movzx eax, fs:[0] KPCR.Number } -#endif -#else -#error Unknown compiler -#endif + return (ULONG)__readfsbyte(FIELD_OFFSET(KPCR, Number)); } NTHALAPI Modified: trunk/reactos/include/ndk/i386/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/i386/ketypes.h… ============================================================================== --- trunk/reactos/include/ndk/i386/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/i386/ketypes.h [iso-8859-1] Thu Jan 28 17:05:54 2010 @@ -705,8 +705,8 @@ ULONG StallScaleFactor; UCHAR SpareUnused; UCHAR Number; - UCHAR Reserved; - UCHAR L2CacheAssociativity; + UCHAR Spare0; + UCHAR SecondLevelCacheAssociativity; ULONG VdmAlert; ULONG KernelReserved[14]; ULONG SecondLevelCacheSize; Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_cli.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] Thu Jan 28 17:05:54 2010 @@ -1788,7 +1788,7 @@ Pcr->NtTib.Self, Pcr->Self, Pcr->Prcb, Pcr->Irql, Pcr->IRR, Pcr->IrrActive, Pcr->IDR, Pcr->KdVersionBlock, Pcr->IDT, Pcr->GDT, Pcr->TSS, Pcr->MajorVersion, Pcr->MinorVersion, Pcr->SetMember, Pcr->StallScaleFactor, - Pcr->Number, Pcr->L2CacheAssociativity, + Pcr->Number, Pcr->SecondLevelCacheAssociativity, Pcr->VdmAlert, Pcr->SecondLevelCacheSize, Pcr->InterruptMode); return TRUE;

1 0

[sir_richard] 45298: [NTOS]: Remove checks for VDM alert during GPF. This is a Windows-specific hack for VDM, which isn't implemented.
by sir_richard＠svn.reactos.org 28 Jan '10

28 Jan '10

Author: sir_richard Date: Thu Jan 28 17:01:43 2010 New Revision: 45298 URL: http://svn.reactos.org/svn/reactos?rev=45298&view=rev Log: [NTOS]: Remove checks for VDM alert during GPF. This is a Windows-specific hack for VDM, which isn't implemented. Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/traphdlr.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Thu Jan 28 17:01:43 2010 @@ -967,14 +967,6 @@ TrapFrame); } - /* Check for custom VDM trap handler */ - if (KeGetPcr()->VdmAlert) - { - /* Not implemented */ - UNIMPLEMENTED; - while (TRUE); - } - /* * Check for a fault during checking of the user instruction. * @@ -1086,14 +1078,6 @@ /* Save trap frame */ KiEnterTrap(TrapFrame); - /* Check for custom VDM trap handler */ - if (KeGetPcr()->VdmAlert) - { - /* Not implemented */ - UNIMPLEMENTED; - while (TRUE); - } - /* Check if this is the base frame */ Thread = KeGetCurrentThread(); if (KeGetTrapFrame(Thread) != TrapFrame)

1 0

[sir_richard] 45297: [PERF]: Not in any way a scientific number you should bet the farm on, but we do now count the number of cycles at the very first instruction of kernel initialization, at the moment SMSS initializes the registry (when we call kernel initialization complete), and at the moment there have been 12 processes created (10 without counting idle/system), which is a bit less than a normal GUI boot. We also display the number if interrupts, system calls, and context switches it took t
by sir_richard＠svn.reactos.org 28 Jan '10

28 Jan '10

Author: sir_richard Date: Thu Jan 28 16:51:18 2010 New Revision: 45297 URL: http://svn.reactos.org/svn/reactos?rev=45297&view=rev Log: [PERF]: Not in any way a scientific number you should bet the farm on, but we do now count the number of cycles at the very first instruction of kernel initialization, at the moment SMSS initializes the registry (when we call kernel initialization complete), and at the moment there have been 12 processes created (10 without counting idle/system), which is a bit less than a normal GUI boot. We also display the number if interrupts, system calls, and context switches it took to get us there. A purely comparative number, perhaps worthy for inclusion in testman/regression tests? Modified: trunk/reactos/ntoskrnl/config/ntapi.c trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/ke/i386/kiinit.c trunk/reactos/ntoskrnl/ps/process.c Modified: trunk/reactos/ntoskrnl/config/ntapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/ntapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/ntapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/ntapi.c [iso-8859-1] Thu Jan 28 16:51:18 2010 @@ -890,6 +890,14 @@ /* Always do this as kernel mode */ if (KeGetPreviousMode() == UserMode) return ZwInitializeRegistry(Flag); + /* Enough of the system has booted by now */ + BootCyclesEnd = __rdtsc(); + DPRINT1("Boot took %I64d cycles!\n", BootCyclesEnd - BootCycles); + DPRINT1("Interrupts: %d System Calls: %d Context Switches: %d\n", + KeGetCurrentPrcb()->InterruptCount, + KeGetCurrentPrcb()->KeSystemCalls, + KeGetContextSwitches(KeGetCurrentPrcb())); + /* Validate flag */ if (Flag > CM_BOOT_FLAG_MAX) return STATUS_INVALID_PARAMETER; 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 [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] Thu Jan 28 16:51:18 2010 @@ -139,6 +139,8 @@ extern ULONG KiFreezeFlag; extern ULONG KiDPCTimeout; extern PGDI_BATCHFLUSH_ROUTINE KeGdiFlushUserBatch; +extern ULONGLONG BootCycles, BootCyclesEnd; +extern ULONG ProcessCount; /* MACROS *************************************************************************/ Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kiinit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kiinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/kiinit.c [iso-8859-1] Thu Jan 28 16:51:18 2010 @@ -24,6 +24,10 @@ /* Spinlocks used only on X86 */ KSPIN_LOCK KiFreezeExecutionLock; KSPIN_LOCK Ki486CompatibilityLock; + +/* Perf */ +ULONG ProcessCount; +ULONGLONG BootCycles, BootCyclesEnd; /* FUNCTIONS *****************************************************************/ @@ -683,6 +687,9 @@ PKTSS Tss; PKIPCR Pcr; + /* Boot cycles timestamp */ + BootCycles = __rdtsc(); + /* Check if we are being booted from FreeLDR */ if (!((ULONG_PTR)LoaderBlock & 0x80000000)) KiRosPrepareForSystemStartup((PROS_LOADER_PARAMETER_BLOCK)LoaderBlock); 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 [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/process.c [iso-8859-1] Thu Jan 28 16:51:18 2010 @@ -843,6 +843,18 @@ /* Run the Notification Routines */ PspRunCreateProcessNotifyRoutines(Process, TRUE); + + /* If 12 processes have been created, enough of user-mode is ready */ + if (++ProcessCount == 12) + { + /* Enough of the system has booted by now */ + BootCyclesEnd = __rdtsc(); + DPRINT1("User Boot took %I64d cycles!\n", BootCyclesEnd - BootCycles); + DPRINT1("Interrupts: %d System Calls: %d Context Switches: %d\n", + KeGetCurrentPrcb()->InterruptCount, + KeGetCurrentPrcb()->KeSystemCalls, + KeGetContextSwitches(KeGetCurrentPrcb())); + } CleanupWithRef: /*

1 0

[cfinck] 45296: Revert back to a more meaningful error message for the case that no compiler output was found in the current directory.
by cfinck＠svn.reactos.org 28 Jan '10

28 Jan '10

Author: cfinck Date: Thu Jan 28 14:42:59 2010 New Revision: 45296 URL: http://svn.reactos.org/svn/reactos?rev=45296&view=rev Log: Revert back to a more meaningful error message for the case that no compiler output was found in the current directory. Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/clean.sh trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/clean.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/Base-i386/s… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/clean.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/clean.sh [iso-8859-1] Thu Jan 28 14:42:59 2010 @@ -24,5 +24,5 @@ echo "Done cleaning ReactOS $ROS_ARCH source directory." else - echo "ERROR: There is no $ROS_ARCH compiler output to clean." + echo "ERROR: This directory contains no $ROS_ARCH compiler output to clean." fi Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 [iso-8859-1] Thu Jan 28 14:42:59 2010 @@ -55,7 +55,7 @@ "Done cleaning ReactOS $ENV:ROS_ARCH source directory." } else { - "ERROR: There is no $ENV:ROS_ARCH compiler output to clean." + "ERROR: This directory contains no $ENV:ROS_ARCH compiler output to clean." } } Modified: trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cle… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd [iso-8859-1] Thu Jan 28 14:42:59 2010 @@ -72,7 +72,7 @@ echo Done cleaning ReactOS %ROS_ARCH% source directory. ) else ( - echo ERROR: This does not look like a ReactOS %ROS_ARCH% source directory to clean. + echo ERROR: This directory contains no %ROS_ARCH% compiler output to clean. ) goto :EOF

1 0

[tkreuzer] 45295: fix the same typo once more
by tkreuzer＠svn.reactos.org 28 Jan '10

28 Jan '10

Author: tkreuzer Date: Thu Jan 28 03:37:28 2010 New Revision: 45295 URL: http://svn.reactos.org/svn/reactos?rev=45295&view=rev Log: fix the same typo once more Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/sin.c Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/sin.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/sin.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/sin.c [iso-8859-1] Thu Jan 28 03:37:28 2010 @@ -45,7 +45,7 @@ result = 0; #if (PRECISION >= 10) - result += 1./(1.*2*3*4*5*6*7*8*9*10*11*12*13*14*15*16*17*18*20); + result += 1./(1.*2*3*4*5*6*7*8*9*10*11*12*13*14*15*16*17*18*19*20); result *= x2; #endif #if (PRECISION >= 9)

1 0

[tkreuzer] 45294: [CRT] Implement sin() in C. Code is actually 99% identical to cos. Note: We are using even exponents for sin, too, as this results in higher precision than using uneven exponents.
by tkreuzer＠svn.reactos.org 28 Jan '10

28 Jan '10

Author: tkreuzer Date: Thu Jan 28 02:18:12 2010 New Revision: 45294 URL: http://svn.reactos.org/svn/reactos?rev=45294&view=rev Log: [CRT] Implement sin() in C. Code is actually 99% identical to cos. Note: We are using even exponents for sin, too, as this results in higher precision than using uneven exponents. Added: branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/sin.c (with props) Removed: branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/amd64/sin.S Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/crt.rbuild branches/ros-amd64-bringup/reactos/lib/sdk/crt/libcntpr.rbuild Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/crt.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] Thu Jan 28 02:18:12 2010 @@ -162,6 +162,7 @@ </if> <if property="ARCH" value="amd64"> <file>cos.c</file> + <file>sin.c</file> <directory name="amd64"> <file>alldiv.S</file> <file>atan.S</file> @@ -178,7 +179,6 @@ <file>log.S</file> <file>log10.S</file> <file>pow.S</file> - <file>sin.S</file> <file>sqrt.S</file> <file>sqrtf.S</file> <file>tan.S</file> Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/libcntpr.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/libcntpr.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/libcntpr.rbuild [iso-8859-1] Thu Jan 28 02:18:12 2010 @@ -72,7 +72,6 @@ <file>log.S</file> <file>log10.S</file> <file>pow.S</file> - <file>sin.S</file> <file>sqrt.S</file> <file>tan.S</file> </directory> Removed: branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/amd64/sin.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/amd64/sin.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/amd64/sin.S (removed) @@ -1,21 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * PURPOSE: Implementation of sin - * FILE: lib/sdk/crt/math/amd64/sin.S - * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) - */ - -/* INCLUDES ******************************************************************/ - -#include <ndk/amd64/asm.h> -#include <ndk/amd64/asmmacro.S> - -.intel_syntax noprefix - - -.proc sin - UNIMPLEMENTED sin - ret - -.endproc Added: branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/sin.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/sin.c (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/sin.c [iso-8859-1] Thu Jan 28 02:18:12 2010 @@ -1,0 +1,89 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS CRT + * FILE: lib/crt/math/sin.c + * PURPOSE: Generic C Implementation of sin + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +#define PRECISION 9 +#define M_PI 3.141592653589793238462643 + +static double sin_off_tbl[] = {0.0, -M_PI/2., 0, -M_PI/2.}; +static double sin_sign_tbl[] = {1,-1,-1,1}; + +double +sin(double x) +{ + int quadrant; + double x2, result; + + /* Calculate the quadrant */ + quadrant = x * (2./M_PI); + + /* Get offset inside quadrant */ + x = x - quadrant * (M_PI/2.); + + /* Normalize quadrant to [0..3] */ + quadrant = (quadrant - 1) & 0x3; + + /* Fixup value for the generic function */ + x += sin_off_tbl[quadrant]; + + /* Calculate the negative of the square of x */ + x2 = - (x * x); + + /* This is an unrolled taylor series using <PRECISION> iterations + * Example with 4 iterations: + * result = 1 - x^2/2! + x^4/4! - x^6/6! + x^8/8! + * To save multiplications and to keep the precision high, it's performed + * like this: + * result = 1 - x^2 * (1/2! - x^2 * (1/4! - x^2 * (1/6! - x^2 * (1/8!)))) + */ + + /* Start with 0, compiler will optimize this away */ + result = 0; + +#if (PRECISION >= 10) + result += 1./(1.*2*3*4*5*6*7*8*9*10*11*12*13*14*15*16*17*18*20); + result *= x2; +#endif +#if (PRECISION >= 9) + result += 1./(1.*2*3*4*5*6*7*8*9*10*11*12*13*14*15*16*17*18); + result *= x2; +#endif +#if (PRECISION >= 8) + result += 1./(1.*2*3*4*5*6*7*8*9*10*11*12*13*14*15*16); + result *= x2; +#endif +#if (PRECISION >= 7) + result += 1./(1.*2*3*4*5*6*7*8*9*10*11*12*13*14); + result *= x2; +#endif +#if (PRECISION >= 6) + result += 1./(1.*2*3*4*5*6*7*8*9*10*11*12); + result *= x2; +#endif +#if (PRECISION >= 5) + result += 1./(1.*2*3*4*5*6*7*8*9*10); + result *= x2; +#endif + result += 1./(1.*2*3*4*5*6*7*8); + result *= x2; + + result += 1./(1.*2*3*4*5*6); + result *= x2; + + result += 1./(1.*2*3*4); + result *= x2; + + result += 1./(1.*2); + result *= x2; + + result += 1; + + /* Apply correct sign */ + result *= sin_sign_tbl[quadrant]; + + return result; +} Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/sin.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs