Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 29414: Dmitry Chapyshev <lentind@yandex.ru> - Update the icons for sysdm and netid.
by fireball＠svn.reactos.org 06 Oct '07

06 Oct '07

Author: fireball Date: Sat Oct 6 14:55:13 2007 New Revision: 29414 URL: http://svn.reactos.org/svn/reactos?rev=29414&view=rev Log: Dmitry Chapyshev <lentind(a)yandex.ru> - Update the icons for sysdm and netid. Modified: trunk/reactos/dll/cpl/sysdm/resources/devmgr.ico trunk/reactos/dll/win32/netid/res/netid.ico Modified: trunk/reactos/dll/cpl/sysdm/resources/devmgr.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/resources/de… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/netid/res/netid.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/res/netid.… ============================================================================== Binary files - no diff available.

1 0

[fireball] 29413: Dmitry Chapyshev <lentind@yandex.ru> - Add russian translation to clb. - Regedit's icons: remove 4bit icons, add 16bit icons.
by fireball＠svn.reactos.org 06 Oct '07

06 Oct '07

Author: fireball Date: Sat Oct 6 14:53:22 2007 New Revision: 29413 URL: http://svn.reactos.org/svn/reactos?rev=29413&view=rev Log: Dmitry Chapyshev <lentind(a)yandex.ru> - Add russian translation to clb. - Regedit's icons: remove 4bit icons, add 16bit icons. Added: trunk/reactos/base/applications/regedit/clb/lang/ru-RU.rc (with props) Modified: trunk/reactos/base/applications/regedit/clb/rsrc.rc trunk/reactos/base/applications/regedit/res/folder.ico trunk/reactos/base/applications/regedit/res/folderopen.ico trunk/reactos/base/applications/regedit/res/regedit.ico Added: trunk/reactos/base/applications/regedit/clb/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/clb/lang/ru-RU.rc (added) +++ trunk/reactos/base/applications/regedit/clb/lang/ru-RU.rc Sat Oct 6 14:53:22 2007 @@ -1,0 +1,27 @@ +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +IDD_COLUMNLISTBOXSTYLES DIALOGEX 0, 0, 227, 215 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Ñòèëè Column List Box" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Ñòèëè Column List Box", -1, 6, 7, 158, 71 + CHECKBOX "Ñ&òàíäàðòíàÿ", 1710, 10, 20, 42, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Îáðàìëåíèå", 1713, 10, 30, 34, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Ñîðòèðîâêà", 1705, 10, 40, 26, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Óâåäîìëåíèå", 1706, 10, 50, 32, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Âåðò. ïîëîñà ïðîêðóòêè", 1707, 10, 60, 64, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Ìíîæåñòâåííûé âûáîð", -1, 79, 20, 72, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP | WS_DISABLED + CHECKBOX "&Ðàñøèðåííûé âûáîð", -1, 79, 30, 77, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP | WS_DISABLED + CHECKBOX "&Âñïëûâàþùèå ïîäñêàçêè", 1714, 79, 40, 68, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Springy Columns", 1715, 79, 50, 66, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + GROUPBOX "Îñíîâíîé ñòèëü", -1, 6, 80, 158, 34 + CHECKBOX "Â&èäèìûé", 1701, 10, 92, 34, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Âûêëþ÷åíî", 1702, 10, 102, 41, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Ãðóïïèðîâêà", 1703, 79, 92, 32, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Tab Stop", 1704, 79, 102, 44, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 37, 125, 40, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Îòìåíà", IDCANCEL, 93, 125, 40, 14, BS_PUSHBUTTON | WS_GROUP | WS_TABSTOP + CHECKBOX "&Ðàçðåøèòü ïîëîñó ïðîêðóòêè", 1708, 79, 60, 66, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP +END + Propchange: trunk/reactos/base/applications/regedit/clb/lang/ru-RU.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/regedit/clb/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/clb/rsrc.rc (original) +++ trunk/reactos/base/applications/regedit/clb/rsrc.rc Sat Oct 6 14:53:22 2007 @@ -38,5 +38,6 @@ #include "lang/nb-NO.rc" #include "lang/th-TH.rc" #include "lang/uk-UA.rc" +#include "lang/ru-RU.rc" Modified: trunk/reactos/base/applications/regedit/res/folder.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/applications/regedit/res/folderopen.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/applications/regedit/res/regedit.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== Binary files - no diff available.

1 0

[fireball] 29412: Dmitry Chapyshev <lentind@yandex.ru> - Add a temporary icon (should be changed to a better one), so that it's displayed in the taskbar and window title.
by fireball＠svn.reactos.org 06 Oct '07

06 Oct '07

Author: fireball Date: Sat Oct 6 14:50:51 2007 New Revision: 29412 URL: http://svn.reactos.org/svn/reactos?rev=29412&view=rev Log: Dmitry Chapyshev <lentind(a)yandex.ru> - Add a temporary icon (should be changed to a better one), so that it's displayed in the taskbar and window title. Added: trunk/reactos/base/applications/msconfig/res/ trunk/reactos/base/applications/msconfig/res/msconfig.ico (with props) Modified: trunk/reactos/base/applications/msconfig/msconfig.c trunk/reactos/base/applications/msconfig/msconfig.rc trunk/reactos/base/applications/msconfig/resource.h Modified: trunk/reactos/base/applications/msconfig/msconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/msconfig.c (original) +++ trunk/reactos/base/applications/msconfig/msconfig.c Sat Oct 6 14:50:51 2007 @@ -141,11 +141,22 @@ { int idctrl; LPNMHDR pnmh; + static HICON hIcon; switch (message) { case WM_INITDIALOG: hMainWnd = hDlg; + hIcon = LoadImage(GetModuleHandle(NULL), + MAKEINTRESOURCE(IDI_APPICON), + IMAGE_ICON, + 16, + 16, + 0); + SendMessage(hDlg, + WM_SETICON, + ICON_SMALL, + (LPARAM)hIcon); return OnCreate(hDlg); case WM_COMMAND: Modified: trunk/reactos/base/applications/msconfig/msconfig.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/msconfig.rc (original) +++ trunk/reactos/base/applications/msconfig/msconfig.rc Sat Oct 6 14:50:51 2007 @@ -12,6 +12,8 @@ #define REACTOS_STR_ORIGINAL_FILENAME "msconfig.exe\0" #include <reactos/version.rc> +IDI_APPICON ICON "res/msconfig.ico" #include "rsrc.rc" + Added: trunk/reactos/base/applications/msconfig/res/msconfig.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/msconfig/res/msconfig.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/base/applications/msconfig/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/resource.h (original) +++ trunk/reactos/base/applications/msconfig/resource.h Sat Oct 6 14:50:51 2007 @@ -111,4 +111,6 @@ #define IDS_MSCONFIG 3000 +#define IDI_APPICON 3001 + /* EOF */

1 0

[fireball] 29411: Dmitry Chapyshev <lentind@yandex.ru> - Fix a typo in russian translation of intl.cpl
by fireball＠svn.reactos.org 06 Oct '07

06 Oct '07

Author: fireball Date: Sat Oct 6 14:46:42 2007 New Revision: 29411 URL: http://svn.reactos.org/svn/reactos?rev=29411&view=rev Log: Dmitry Chapyshev <lentind(a)yandex.ru> - Fix a typo in russian translation of intl.cpl Modified: trunk/reactos/dll/cpl/intl/lang/ru-RU.rc Modified: trunk/reactos/dll/cpl/intl/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/ru-RU.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/ru-RU.rc (original) +++ trunk/reactos/dll/cpl/intl/lang/ru-RU.rc Sat Oct 6 14:46:42 2007 @@ -89,7 +89,7 @@ IDD_CURRENCYPAGE DIALOGEX 0, 0, 246, 234 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Äåíåæíàÿ åäåíèöà" +CAPTION "Äåíåæíàÿ åäèíèöà" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Îáðàçöû", -1, 7, 7, 230, 33, WS_CHILD | WS_VISIBLE

1 0

[arty] 29410: Added to trunk.
by arty＠svn.reactos.org 06 Oct '07

06 Oct '07

Author: arty Date: Sat Oct 6 12:34:33 2007 New Revision: 29410 URL: http://svn.reactos.org/svn/reactos?rev=29410&view=rev Log: Added to trunk. Added: trunk/reactos/lib/ppcmmu/ trunk/reactos/lib/ppcmmu/dummy.c trunk/reactos/lib/ppcmmu/ldscript trunk/reactos/lib/ppcmmu/mmuobject.c trunk/reactos/lib/ppcmmu/mmuobject.h trunk/reactos/lib/ppcmmu/mmutest.c trunk/reactos/lib/ppcmmu/mmuutil.c trunk/reactos/lib/ppcmmu/ppcmmu.mak trunk/reactos/lib/ppcmmu/ppcmmu.rbuild Added: trunk/reactos/lib/ppcmmu/dummy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/ppcmmu/dummy.c?rev=294… ============================================================================== (empty) Added: trunk/reactos/lib/ppcmmu/ldscript URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/ppcmmu/ldscript?rev=29… ============================================================================== --- trunk/reactos/lib/ppcmmu/ldscript (added) +++ trunk/reactos/lib/ppcmmu/ldscript Sat Oct 6 12:34:33 2007 @@ -1,0 +1,8 @@ +OUTPUT_FORMAT(elf32-powerpc); + +SECTIONS +{ + .text : { *(.text) } + .data : { *(.data) *(.rodata) } + .bss : { *(.sbss) *(.bss) *(COMMON) } +} Added: trunk/reactos/lib/ppcmmu/mmuobject.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/ppcmmu/mmuobject.c?rev… ============================================================================== --- trunk/reactos/lib/ppcmmu/mmuobject.c (added) +++ trunk/reactos/lib/ppcmmu/mmuobject.c Sat Oct 6 12:34:33 2007 @@ -1,0 +1,661 @@ +#include <stdarg.h> +#include "ppcmmu/mmu.h" +#include "ppcmmu/mmuutil.h" +#include "mmuobject.h" +#include "helper.h" + +typedef unsigned long ULONG; + +/* + +The MMU Object: +0x00300 -- Data miss +0x00400 -- Instruction miss +0x10000 -- Entry point +... Code +0x20000 -- Physical map (PTE + Process Ptr + Address : 16 bytes) + +4096 / 16 bytes = 256 entries per page +256 pages = 1Megabyte = 1 page table page + +Setup by freeldr and used to build the kernel map, then used by the kernel + +Calling: + +r3 -- Action +r4 .. r6 -- Args + +Actions: +00 Init +01 Map pages +02 erase pages +03 set segment vsid +04 page miss callback +05 inquire page +06 unit test +07 alloc page +08 set memory size +09 get first usable page +10 alloc vsid +11 revoke vsid +*/ + +MmuPageCallback callback; +typedef struct _MmuFreePage { + int page; + struct _MmuFreePage *next; +} MmuFreePage; +typedef struct _MmuFreeTree { + struct _MmuFreeTree *next; +} MmuFreeTree; +typedef struct _MmuVsidTree { + ppc_map_t *leaves[256]; +} MmuVsidTree; +typedef struct _MmuVsidInfo { + int vsid; + struct _MmuVsidInfo *next; + MmuVsidTree *tree[256]; +} MmuVsidInfo; +MmuFreePage *FreeList; +// Pages are allocated one by one until NextPage == RamSize >> PPC_PAGE_SHIFT +// Then we take only from the free list +int Clock = 0, TreeAlloc = 0; +paddr_t RamSize, FirstUsablePage, NextPage; +MmuVsidTree *NextTreePage = 0; +MmuFreeTree *FreeTree; +MmuVsidInfo *Segs[16], *VsidHead = 0; + +extern void fmtout(const char *fmt, ...); +int ptegreload(ppc_trap_frame_t *frame, vaddr_t addr); + +__asm__(".text\n\t" + ".globl mmumain\n\t" + ".globl _mmumain\n\t" + ".globl oldstack\n\t" + "mmumain:\n\t" + "lis 7,oldstack@ha\n\t" + "addi 7,7,oldstack@l\n\t" + "mflr 0\n\t" + "stw 1,0(7)\n\t" + "lis 1,2\n\t" + "subi 1,1,16\n\t" + "stw 0,0(1)\n\t" + "bl _mmumain\n\t" + "lis 7,oldstack@ha\n\t" + "addi 7,7,oldstack@l\n\t" + "lwz 0,0(1)\n\t" + "lwz 1,0(7)\n\t" + "mtlr 0\n\t" + "blr\n" + "oldstack:\n\t" + ".long 0\n\t"); + +__asm__(".text\n\t" + ".globl data_miss_finish_start\n" + "data_miss_finish_start:\n\t" + "lwz 2,8(1)\n\t" + "lwz 3,12(1)\n\t" + "lwz 4,16(1)\n\t" + "lwz 5,20(1)\n\t" + "lwz 6,24(1)\n\t" + "lwz 7,28(1)\n\t" + "lwz 8,32(1)\n\t" + "lwz 9,36(1)\n\t" + "lwz 10,40(1)\n\t" + "lwz 11,44(1)\n\t" + "lwz 12,48(1)\n\t" + "lwz 13,52(1)\n\t" + "lwz 14,56(1)\n\t" + "lwz 15,60(1)\n\t" + "lwz 16,64(1)\n\t" + "lwz 17,68(1)\n\t" + "lwz 18,72(1)\n\t" + "lwz 19,76(1)\n\t" + "lwz 20,80(1)\n\t" + "lwz 21,84(1)\n\t" + "lwz 22,88(1)\n\t" + "lwz 23,92(1)\n\t" + "lwz 24,96(1)\n\t" + "lwz 25,100(1)\n\t" + "lwz 26,104(1)\n\t" + "lwz 27,108(1)\n\t" + "lwz 28,112(1)\n\t" + "lwz 29,116(1)\n\t" + "lwz 30,120(1)\n\t" + "lwz 31,124(1)\n\t" + "lwz 0,128(1)\n\t" + "mtlr 0\n\t" + "lwz 0,132(1)\n\t" + "mtcr 0\n\t" + "lwz 0,136(1)\n\t" + "mtctr 0\n\t" + "lwz 0,0(1)\n\t" + "mfsprg1 1\n\t" + "rfi\n\t"); + +/* + * Trap frame: + * r0 .. r32 + * lr, ctr, srr0, srr1, dsisr + */ +__asm__(".text\n\t" + ".globl data_miss_start\n\t" + ".globl data_miss_end\n\t" + "data_miss_start:\n\t" + "mtsprg1 1\n\t" + "lis 1,2\n\t" + "subi 1,1,256\n\t" + "stw 0,0(1)\n\t" + "mfsprg1 0\n\t" + "stw 0,4(1)\n\t" + "stw 2,8(1)\n\t" + "stw 3,12(1)\n\t" + "stw 4,16(1)\n\t" + "stw 5,20(1)\n\t" + "stw 6,24(1)\n\t" + "stw 7,28(1)\n\t" + "stw 8,32(1)\n\t" + "stw 9,36(1)\n\t" + "stw 10,40(1)\n\t" + "stw 11,44(1)\n\t" + "stw 12,48(1)\n\t" + "stw 13,52(1)\n\t" + "stw 14,56(1)\n\t" + "stw 15,60(1)\n\t" + "stw 16,64(1)\n\t" + "stw 17,68(1)\n\t" + "stw 18,72(1)\n\t" + "stw 19,76(1)\n\t" + "stw 20,80(1)\n\t" + "stw 21,84(1)\n\t" + "stw 22,88(1)\n\t" + "stw 23,92(1)\n\t" + "stw 24,96(1)\n\t" + "stw 25,100(1)\n\t" + "stw 26,104(1)\n\t" + "stw 27,108(1)\n\t" + "stw 28,112(1)\n\t" + "stw 29,116(1)\n\t" + "stw 30,120(1)\n\t" + "stw 31,124(1)\n\t" + "mflr 0\n\t" + "stw 0,128(1)\n\t" + "mfcr 0\n\t" + "stw 0,132(1)\n\t" + "mfctr 0\n\t" + "stw 0,136(1)\n\t" + "mfsrr0 0\n\t" + "stw 0,140(1)\n\t" + "mfsrr1 0\n\t" + "stw 0,144(1)\n\t" + "mfdsisr 0\n\t" + "stw 0,148(1)\n\t" + "mfdar 0\n\t" + "stw 0,152(1)\n\t" + "mfxer 0\n\t" + "stw 0,156(1)\n\t" + "li 3,100\n\t" + "mr 4,1\n\t" + "lis 5,data_miss_finish_start@ha\n\t" + "addi 5,5,data_miss_finish_start@l\n\t" + "mtlr 5\n\t" + "lis 5,_mmumain@ha\n\t" + "addi 5,5,_mmumain@l\n\t" + "mtctr 5\n\t" + "bctr\n" + "data_miss_end:\n\t" + ".space 4"); + +extern int data_miss_end, data_miss_start; + +int _mmumain(int action, void *arg1, void *arg2, void *arg3) +{ + void (*fun)(void *) = arg1; + ppc_trap_frame_t *trap_frame = arg1; + int ret = 0; + + switch(action) + { + case 0: + initme(); + break; + case 1: + ret = mmuaddpage(arg1, (int)arg2); + break; + case 2: + mmudelpage(arg1, (int)arg2); + break; + case 3: + mmusetvsid((int)arg1, (int)arg2, (int)arg3); + break; + case 4: + /* Miss callback = arg1 */ + ret = (int)callback; + callback = arg1; + break; + case 5: + mmugetpage(arg1, (int)arg2); + break; + case 6: + ret = mmunitest(); + break; + case 7: + __asm__("mfmsr 3\n\t" + "ori 3,3,0x30\n\t" + "mtmsr 3\n\t" + "mtsdr1 %0\n\t" + "mr 0,%2\n\t" + "mtctr 0\n\t" + "mr 3,%1\n\t" + "bctrl\n\t" + : : "r" (HTABORG), "r" (arg2), "r" (fun)); + /* BYE ! */ + break; + case 8: + mmusetramsize((paddr_t)arg1); + break; + case 9: + return FirstUsablePage; + case 10: + mmuallocvsid((int)arg1, (int)arg2); + break; + case 11: + mmufreevsid((int)arg1, (int)arg2); + break; + case 100: + if(!ptegreload(trap_frame, trap_frame->dar)) + { + __asm__("mfmsr 3\n\tori 3,3,0x30\n\tmtmsr 3\n\t"); + callback(0,arg1); + } + break; + case 101: + if(!ptegreload(trap_frame, trap_frame->srr0)) + { + __asm__("mfmsr 3\n\tori 3,3,0x30\n\tmtmsr 3\n\t"); + callback(1,arg1); + } + break; + default: + while(1); + } + + return ret; +} + +void outchar(char c) +{ + SetPhysByte(0x800003f8, c); +} + +void outstr(const char *str) +{ + while(*str) outchar(*str); +} + +void outdig(int dig) +{ + if(dig < 10) outchar(dig + '0'); + else outchar(dig - 10 + 'A'); +} + +void outnum(unsigned long num) +{ + int i; + for( i = 0; i < 8; i++ ) + { + outdig(num >> 28); + num <<= 4; + } +} + +void fmtout(const char *str, ...) +{ + va_list ap; + va_start(ap, str); + while(*str) + { + if(*str == '%') + { + if(str[1] == '%') + { + outchar('%'); + } + else if(str[1] == 's') + { + outstr(va_arg(ap, const char *)); + } + else + { + outnum(va_arg(ap, int)); + } + str++; + } + else + { + outchar(*str); + } + str++; + } + va_end(ap); +} + +void mmusetramsize(paddr_t ramsize) +{ + ppc_map_t *last_map = &PpcPageTable[PPC_PAGE_NUMBER(ramsize)]; + if(!RamSize) + { + RamSize = ramsize; + FirstUsablePage = (paddr_t)last_map; + NextPage = PPC_PAGE_NUMBER(FirstUsablePage); + } +} + +void initme() +{ + int i; + int *target, *start; + + for(i = 0; i < HTABSIZ / sizeof(int); i++) + { + ((int *)HTABORG)[i] = 0; + } + + for(target = (int *)0x300, start = &data_miss_start; start < &data_miss_end; start++, target++) + { + SetPhys((paddr_t)target, *start); + } + + (&data_miss_start)[50]++; + + for(target = (int *)0x400, start = &data_miss_start; start < &data_miss_end; start++, target++) + { + SetPhys((paddr_t)target, *start); + } +} + +ppc_map_t *allocpage() +{ + MmuFreePage *FreePage = 0; + + if(NextPage < PPC_PAGE_NUMBER(RamSize)) { + return &PpcPageTable[NextPage++]; + } else { + FreePage = FreeList; + FreeList = FreeList->next; + return ((ppc_map_t*)FreePage); + } +} + +void freepage(ppc_map_t *PagePtr) +{ + MmuFreePage *FreePage = (MmuFreePage*)PagePtr; + PagePtr->proc = PagePtr->addr = 0; + FreePage->next = FreeList; + FreeList = FreePage; +} + +MmuVsidTree *allocvsidtree() +{ + if(FreeTree) + { + MmuVsidTree *result = (MmuVsidTree*)FreeTree; + FreeTree = FreeTree->next; + return result; + } + else if(TreeAlloc >= 3 || !NextTreePage) + { + ppc_map_t *map = allocpage(); + NextTreePage = (MmuVsidTree*)PPC_PAGE_ADDR((map - PpcPageTable)); + TreeAlloc = 1; + return NextTreePage; + } + else + { + return &NextTreePage[TreeAlloc++]; + } +} + +void freevsidtree(MmuVsidTree *tree) +{ + int i; + for(i = 0; i < 256; i++) + if(tree->leaves[i]) + freepage(tree->leaves[i]); + MmuFreeTree *NextFreeTree = (MmuFreeTree *)tree; + NextFreeTree->next = FreeTree; + FreeTree = NextFreeTree; +} + +void *allocvsid(int vsid) +{ + ppc_map_t *map = allocpage(); + MmuVsidInfo *info; + if(!map) return 0; + map->pte.pteh = map->pte.ptel = 0; + info = (MmuVsidInfo*)PPC_PAGE_ADDR((map - PpcPageTable)); + info->vsid = vsid; + info->next = VsidHead; + VsidHead = info; + return info; +} + +void mmuallocvsid(int vsid, int mask) +{ + int i; + for(i = 0; i < 16; i++) + { + if(mask & (1 << i)) + allocvsid((vsid << 4) + i); + } +} + +MmuVsidInfo *findvsid(int vsid) +{ + MmuVsidInfo *info; + for(info = VsidHead; info; info = info->next) + { + if(info->vsid == vsid) return info; + } + return 0; +} + +void freevsid(int vsid) +{ + int i; + MmuVsidInfo *info = findvsid(vsid); + if(!info) return; + ppc_map_t *map = &PpcPageTable[PPC_PAGE_NUMBER((paddr_t)info)]; + for(i = 0; i < 256; i++) + { + if(info->tree[i]) + freevsidtree(info->tree[i]); + } + freepage(map); +} + +void mmufreevsid(int vsid, int mask) +{ + int i; + for(i = 0; i < 16; i++) + { + if(mask & (1 << i)) + allocvsid((vsid << 4) + i); + } +} + +int mmuaddpage(ppc_map_info_t *info, int count) +{ + int i, iva = 0, vsid, phys, virt; + int ptehi; + int ptelo, vsid_table_hi, vsid_table_lo; + ppc_map_t *PagePtr; + MmuVsidInfo *VsidInfo; + MmuVsidTree *VsidTree; + + for(i = 0; i < count; i++) + { + virt = info[i].addr; + vsid = ((info[i].addr >> 28) & 15) | (info[i].proc << 4); + VsidInfo = findvsid(vsid); + + if(!VsidInfo) return -1; + + ptehi = (1 << 31) | (vsid << 7) | ((virt >> 22) & 0x3f); + + if(info[i].phys) { + PagePtr = &PpcPageTable[PPC_PAGE_NUMBER(info[i].phys)]; + } else { + PagePtr = allocpage(); + if(!PagePtr) + { + return 0; + } + } + + phys = PPC_PAGE_ADDR((PagePtr - PpcPageTable)); + ptelo = phys & ~PPC_PAGE_MASK; + + /* Update page data */ + PagePtr->pte.pteh = ptehi; + PagePtr->pte.ptel = ptelo; + PagePtr->proc = info[i].proc; + PagePtr->addr = virt; + + vsid_table_hi = virt >> 20 & 255; + vsid_table_lo = virt >> 12 & 255; + + if(!VsidInfo->tree[vsid_table_hi]) + VsidInfo->tree[vsid_table_hi] = allocvsidtree(); + VsidTree = VsidInfo->tree[vsid_table_hi]; + if(!VsidTree) return 0; + VsidTree->leaves[vsid_table_lo] = PagePtr; + + __asm__("tlbie %0\n\tsync\n\tisync" : : "r" (iva)); + } + return 1; +} + +ppc_pteg_t *PtegFromPage(ppc_map_t *map, int hfun) +{ + if(!map->proc && !map->addr) return 0; + return &PpcHashedPTE[PtegNumber(map->addr, hfun)]; +} + +int PageMatch(vaddr_t addr, ppc_pte_t pte) +{ + int vsid_pte = (pte.pteh >> 7) & 15, api_pte = pte.pteh & 63; + return + (((addr >> 28) & 15) == vsid_pte) && + (((addr >> 22) & 63) == api_pte); +} + +ppc_map_t *mmuvirtmap(vaddr_t addr, int vsid) +{ + int seg = (addr >> 28) & 15; + MmuVsidInfo *seginfo = Segs[seg]; + MmuVsidTree *segtree = 0; + if(!seginfo) return 0; + segtree = seginfo->tree[(addr >> 20) & 255]; + if(!segtree) return 0; + return segtree->leaves[(addr >> 12) & 255]; +} + +void mmudelpage(ppc_map_info_t *info, int count) +{ + int i, j, k, ipa; + ppc_map_t *PagePtr; + ppc_pteg_t *PageEntry; + ppc_pte_t ZeroPte = { 0 }; + + for(i = 0; i < count; i++) + { + if (info[i].phys) + { + ipa = info[i].phys; + PagePtr = &PpcPageTable[ipa]; + info[i].proc = PagePtr->proc; + info[i].addr = PagePtr->addr; + } + else + { + PagePtr = mmuvirtmap(info[i].proc, info[i].addr); + ipa = PPC_PAGE_ADDR(PagePtr - PpcPageTable); + } + + for(j = 0; j < 2; j++) + { + PageEntry = PtegFromPage(PagePtr, j); + for(k = 0; k < 8; k++) + { + if(PageMatch(ipa, PageEntry->block[k])) + { + if(PageEntry->block[k].ptel & 0x100) + info[i].flags |= MMU_PAGE_DIRTY; + PageEntry->block[k] = ZeroPte; + } + } + } + freepage(PagePtr); + __asm__("tlbie %0\n\tsync\n\tisync" : : "r" (info[i].addr)); + } +} + +void mmugetpage(ppc_map_info_t *info, int count) +{ + int i; + ppc_map_t *PagePtr; + + for( i = 0; i < count; i++ ) + { + if(!info[i].addr && !info[i].proc) + { + PagePtr = &((ppc_map_t*)PAGETAB)[info[i].phys]; + info[i].proc = PagePtr->proc; + info[i].addr = PagePtr->addr; + info[i].flags = MMU_ALL_RW; + } else { + vaddr_t addr = info[i].addr; + int vsid = ((addr >> 28) & 15) | (info[i].proc << 4); + PagePtr = mmuvirtmap(info[i].addr, vsid); + if(!PagePtr) + info[i].phys = 0; + else + { + info[i].phys = PPC_PAGE_ADDR(PagePtr - PpcPageTable); + info[i].flags = MMU_ALL_RW; // HACK + } + } + } +} + +void mmusetvsid(int start, int end, int vsid) +{ + int i, sr, s_vsid; + for(i = start; i < end; i++) + { + s_vsid = (vsid << 4) | (i & 15); + sr = (GetSR(i) & ~PPC_VSID_MASK) | s_vsid; + SetSR(i, sr); + Segs[i] = findvsid(s_vsid); + } +} + +int ptegreload(ppc_trap_frame_t *frame, vaddr_t addr) +{ + int hfun = (Clock >> 3) & 1, ptegnum = PtegNumber(addr, hfun); + int vsid = GetSR((addr >> 28) & 15) & PPC_VSID_MASK; + ppc_map_t *map = mmuvirtmap(addr, vsid); + if(!map) return 0; + map->pte.pteh = (map->pte.pteh & ~64) | (hfun << 6); + PpcHashedPTE[ptegnum].block[Clock & 7] = map->pte; +#if 0 + fmtout("Reloading addr %x (phys %x) at %x[%x] (%x:%x)\r\n", + addr, PPC_PAGE_ADDR(map - PpcPageTable), ptegnum, Clock & 15, + PpcHashedPTE[ptegnum].block[Clock&7].pteh, + PpcHashedPTE[ptegnum].block[Clock&7].ptel); +#endif + Clock++; + __asm__("tlbie %0\n\tsync\n\tisync" : : "r" (addr)); + return 1; +} Added: trunk/reactos/lib/ppcmmu/mmuobject.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/ppcmmu/mmuobject.h?rev… ============================================================================== --- trunk/reactos/lib/ppcmmu/mmuobject.h (added) +++ trunk/reactos/lib/ppcmmu/mmuobject.h Sat Oct 6 12:34:33 2007 @@ -1,0 +1,17 @@ +#ifndef _LIBMMU_MMUOBJECT_H +#define _LIBMMU_MMUOBJECT_H + +MmuPageCallback callback; +void initme(); +void mmusetramsize(paddr_t size); +int mmuaddpage(ppc_map_info_t *info, int count); +void mmudelpage(ppc_map_info_t *info, int count); +void mmugetpage(ppc_map_info_t *info, int count); +void mmusetvsid(int start, int end, int vsid); +void *allocvsid(int); +void mmuallocvsid(int vsid, int mask); +void freevsid(int); +void mmufreevsid(int vsid, int mask); +int mmunitest(); + +#endif/*_LIBMMU_MMUOBJECT_H*/ Added: trunk/reactos/lib/ppcmmu/mmutest.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/ppcmmu/mmutest.c?rev=2… ============================================================================== --- trunk/reactos/lib/ppcmmu/mmutest.c (added) +++ trunk/reactos/lib/ppcmmu/mmutest.c Sat Oct 6 12:34:33 2007 @@ -1,0 +1,23 @@ +#include "ppcmmu/mmu.h" +#include "ppcmmu/mmuutil.h" +#include "mmuobject.h" + +int mmunitest() +{ + int ret; + int (*fun)(int ret) = (void *)0x80000000; + ppc_map_info_t info = { 0 }; + volatile int oldmsr, msr = 0x2030; + __asm__("mfmsr 0\n\tstw 0,0(%0)" : : "r" (&oldmsr)); + mmusetvsid(8, 9, 0); + info.flags = MMU_ALL_RW; + info.proc = 0; + info.addr = (vaddr_t)fun; + mmuaddpage(&info, 1); + __asm__("mtmsr %0" : : "r" (msr)); + __asm__("mtsdr1 %0" : : "r" (HTABORG)); + *((int *)fun) = 0x4e800020; + ret = fun(3); + __asm__("mtmsr %0" : : "r" (oldmsr)); + return ret != 3; +} Added: trunk/reactos/lib/ppcmmu/mmuutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/ppcmmu/mmuutil.c?rev=2… ============================================================================== --- trunk/reactos/lib/ppcmmu/mmuutil.c (added) +++ trunk/reactos/lib/ppcmmu/mmuutil.c Sat Oct 6 12:34:33 2007 @@ -1,0 +1,411 @@ +#include "ppcmmu/mmu.h" +#include "ppcmmu/mmuutil.h" + +inline int GetMSR() { + register int res asm ("r3"); + __asm__("mfmsr 3"); + return res; +} + +inline int GetDEC() { + register int res asm ("r3"); + __asm__("mfdec 3"); + return res; +} + +__asm__("\t.globl GetPhys\n" + "GetPhys:\t\n" + "mflr 0\n\t" + "stwu 0,-16(1)\n\t" + "mfmsr 5\n\t" + "andi. 6,5,0xffef\n\t"/* turn off MSR[DR] */ + "mtmsr 6\n\t" + "isync\n\t" + "sync\n\t" + "lwz 3,0(3)\n\t" /* Get actual value at phys addr r3 */ + "mtmsr 5\n\t" + "isync\n\t" + "sync\n\t" + "lwz 0,0(1)\n\t" + "addi 1,1,16\n\t" + "mtlr 0\n\t" + "blr" + ); + +__asm__("\t.globl GetPhysHalf\n" + "GetPhysHalf:\t\n" + "mflr 0\n\t" + "stwu 0,-16(1)\n\t" + "mfmsr 5\n\t" + "andi. 6,5,0xffef\n\t"/* turn off MSR[DR] */ + "mtmsr 6\n\t" + "isync\n\t" + "sync\n\t" + "lhz 3,0(3)\n\t" /* Get actual value at phys addr r3 */ + "mtmsr 5\n\t" + "isync\n\t" + "sync\n\t" + "lwz 0,0(1)\n\t" + "addi 1,1,16\n\t" + "mtlr 0\n\t" + "blr" + ); + +__asm__("\t.globl GetPhysByte\n" + "GetPhysByte:\t\n" + "mflr 0\n\t" + "stwu 0,-16(1)\n\t" + "mfmsr 5\n\t" + "andi. 6,5,0xffef\n\t"/* turn off MSR[DR] */ + "mtmsr 6\n\t" + "isync\n\t" + "sync\n\t" + "lbz 3,0(3)\n\t" /* Get actual value at phys addr r3 */ + "mtmsr 5\n\t" + "isync\n\t" + "sync\n\t" + "lwz 0,0(1)\n\t" + "addi 1,1,16\n\t" + "mtlr 0\n\t" + "blr" + ); + +__asm__("\t.globl SetPhys\n" + "SetPhys:\t\n" + "mflr 0\n\t" + "stwu 0,-16(1)\n\t" + "mfmsr 5\n\t" + "andi. 6,5,0xffef\n\t"/* turn off MSR[DR] */ + "mtmsr 6\n\t" + "sync\n\t" + "eieio\n\t" + "stw 4,0(3)\n\t" /* Set actual value at phys addr r3 */ + "dcbst 0,3\n\t" + "mtmsr 5\n\t" + "sync\n\t" + "eieio\n\t" + "mr 3,4\n\t" + "lwz 0,0(1)\n\t" + "addi 1,1,16\n\t" + "mtlr 0\n\t" + "blr" + ); + +__asm__("\t.globl SetPhysHalf\n" + "SetPhysHalf:\t\n" + "mflr 0\n\t" + "stwu 0,-16(1)\n\t" + "mfmsr 5\n\t" + "andi. 6,5,0xffef\n\t"/* turn off MSR[DR] */ + "mtmsr 6\n\t" + "sync\n\t" + "eieio\n\t" + "sth 4,0(3)\n\t" /* Set actual value at phys addr r3 */ + "dcbst 0,3\n\t" + "mtmsr 5\n\t" + "sync\n\t" + "eieio\n\t" + "mr 3,4\n\t" + "lwz 0,0(1)\n\t" + "addi 1,1,16\n\t" + "mtlr 0\n\t" + "blr" + ); + +__asm__("\t.globl SetPhysByte\n" + "SetPhysByte:\t\n" + "mflr 0\n\t" + "stwu 0,-16(1)\n\t" + "mfmsr 5\n\t" + "andi. 6,5,0xffef\n\t"/* turn off MSR[DR] */ + "mtmsr 6\n\t" + "sync\n\t" + "eieio\n\t" + "stb 4,0(3)\n\t" /* Set actual value at phys addr r3 */ + "dcbst 0,3\n\t" + "mtmsr 5\n\t" + "sync\n\t" + "eieio\n\t" + "mr 3,4\n\t" + "lwz 0,0(1)\n\t" + "addi 1,1,16\n\t" + "mtlr 0\n\t" + "blr" + ); + +inline int GetSR(int n) { + register int res = 0; + switch( n ) { + case 0: + __asm__("mfsr %0,0" : "=r" (res)); + break; + case 1: + __asm__("mfsr %0,1" : "=r" (res)); + break; + case 2: + __asm__("mfsr %0,2" : "=r" (res)); + break; + case 3: + __asm__("mfsr %0,3" : "=r" (res)); + break; + case 4: + __asm__("mfsr %0,4" : "=r" (res)); + break; + case 5: + __asm__("mfsr %0,5" : "=r" (res)); + break; + case 6: + __asm__("mfsr %0,6" : "=r" (res)); + break; + case 7: + __asm__("mfsr %0,7" : "=r" (res)); + break; + case 8: + __asm__("mfsr %0,8" : "=r" (res)); + break; + case 9: + __asm__("mfsr %0,9" : "=r" (res)); + break; + case 10: + __asm__("mfsr %0,10" : "=r" (res)); + break; + case 11: + __asm__("mfsr %0,11" : "=r" (res)); + break; + case 12: + __asm__("mfsr %0,12" : "=r" (res)); + break; + case 13: + __asm__("mfsr %0,13" : "=r" (res)); + break; + case 14: + __asm__("mfsr %0,14" : "=r" (res)); + break; + case 15: + __asm__("mfsr %0,15" : "=r" (res)); + break; + } + return res; +} + +inline void SetSR(int n, int val) { + switch( n ) { + case 0: + __asm__("mtsr 0,%0" : : "r" (val)); + break; + case 1: + __asm__("mtsr 1,%0" : : "r" (val)); + break; + case 2: + __asm__("mtsr 2,%0" : : "r" (val)); + break; + case 3: + __asm__("mtsr 3,%0" : : "r" (val)); + break; + case 4: + __asm__("mtsr 4,%0" : : "r" (val)); + break; + case 5: + __asm__("mtsr 5,%0" : : "r" (val)); + break; + case 6: + __asm__("mtsr 6,%0" : : "r" (val)); + break; + case 7: + __asm__("mtsr 7,%0" : : "r" (val)); + break; + case 8: + __asm__("mtsr 8,%0" : : "r" (val)); + break; + case 9: + __asm__("mtsr 9,%0" : : "r" (val)); + break; + case 10: + __asm__("mtsr 10,%0" : : "r" (val)); + break; + case 11: + __asm__("mtsr 11,%0" : : "r" (val)); + break; + case 12: + __asm__("mtsr 12,%0" : : "r" (val)); + break; + case 13: + __asm__("mtsr 13,%0" : : "r" (val)); + break; + case 14: + __asm__("mtsr 14,%0" : : "r" (val)); + break; + case 15: + __asm__("mtsr 15,%0" : : "r" (val)); + break; + } +} + +void GetBat( int bat, int inst, int *batHi, int *batLo ) { + register int bh asm("r3"), bl asm("r4"); + if( inst ) { + switch( bat ) { + case 0: + __asm__("mfibatu 3,0"); + __asm__("mfibatl 4,0"); + break; + case 1: + __asm__("mfibatu 3,1"); + __asm__("mfibatl 4,1"); + break; + case 2: + __asm__("mfibatu 3,2"); + __asm__("mfibatl 4,2"); + break; + case 3: + __asm__("mfibatu 3,3"); + __asm__("mfibatl 4,3"); + break; + } + } else { + switch( bat ) { + case 0: + __asm__("mfdbatu 3,0"); + __asm__("mfdbatl 4,0"); + break; + case 1: + __asm__("mfdbatu 3,1"); + __asm__("mfdbatl 4,1"); + break; + case 2: + __asm__("mfdbatu 3,2"); + __asm__("mfdbatl 4,2"); + break; + case 3: + __asm__("mfdbatu 3,3"); + __asm__("mfdbatl 4,3"); + break; + } + } + *batHi = bh; + *batLo = bl; +} + +#define BATSET(n,t) \ + case n: __asm__("mt" #t "batu " #n ",%0\n\tmt" #t "batl " #n ",%1" \ + : : "r" (batHi), "r" (batLo)); break; + +void SetBat( int bat, int inst, int batHi, int batLo ) { + if( inst ) { + switch( bat ) { + BATSET(0,i); + BATSET(1,i); + BATSET(2,i); + BATSET(3,i); + } + } else { + switch( bat ) { + BATSET(0,d); + BATSET(1,d); + BATSET(2,d); + BATSET(3,d); + } + } + __asm__("isync\n\tsync"); +} + +inline int GetSDR1() { + register int res asm("r3"); + __asm__("mfsdr1 3"); + return res; +} + +inline void SetSDR1( int sdr ) { + int i,j; + __asm__("mtsdr1 3"); + __asm__("sync"); + __asm__("isync"); + + for( i = 0; i < 256; i++ ) { + j = i << 12; + __asm__("tlbie %0,0" : : "r" (j)); + } + __asm__("eieio"); + __asm__("tlbsync"); + __asm__("ptesync"); +} + +inline int BatTranslate( int batu, int batl, int virt ) { + int mask; + if(batu & 0x3fc) + { + mask = ~(0x1ffff | ((batu & 0x3fc)>>2)<<17); + if((batu & 2) && ((batu & mask) == (virt & mask))) + return (batl & mask) | (virt & ~mask); + } else { + mask = ~(0x1ffff | (batl << 17)); + if(!(batl & 0x40) || ((batu & mask) != (virt & mask))) + return (batl & mask) | (virt & ~mask); + } + return -1; +} + +inline int BatHit( int batu, int batl, int virt ) { + return BatTranslate( batu, batl, virt ) != -1; +} + +/* translate address */ +int PpcVirt2phys( vaddr_t virt, int inst ) { + int msr = GetMSR(); + int txmask = inst ? 0x20 : 0x10; + int i, bath, batl, sr, sdr1, physbase, vahi, valo; + int npteg, hash, hashmask, ptehi, ptelo, ptegaddr; + int vsid, pteh, ptevsid, pteapi; + + if( msr & txmask ) { + sr = GetSR( virt >> 28 ); + vsid = sr & 0xfffffff; + vahi = vsid >> 4; + valo = (vsid << 28) | (virt & 0xfffffff); + if( sr & 0x80000000 ) { + return valo; + } + + for( i = 0; i < 4; i++ ) { + GetBat( i, inst, &bath, &batl ); + if( BatHit( bath, batl, virt ) ) { + return BatTranslate( bath, batl, virt ); + } + } + + sdr1 = GetSDR1(); + + physbase = sdr1 & ~0xffff; + hashmask = ((sdr1 & 0x1ff) << 10) | 0x3ff; + hash = (vsid & 0x7ffff) ^ ((valo >> 12) & 0xffff); + npteg = hashmask + 1; + + for( pteh = 0; pteh < 0x80; pteh += 64, hash ^= 0x7ffff ) { + ptegaddr = ((hashmask & hash) * 64) + physbase; + + for( i = 0; i < 8; i++ ) { + ptehi = GetPhys( ptegaddr + (i * 8) ); + ptelo = GetPhys( ptegaddr + (i * 8) + 4 ); + + ptevsid = (ptehi >> 7) & 0xffffff; + pteapi = ptehi & 0x3f; + + if( (ptehi & 64) != pteh ) continue; + if( ptevsid != (vsid & 0xffffff) ) continue; + if( pteapi != ((virt >> 22) & 0x3f) ) continue; + + return (ptelo & 0xfffff000) | (virt & 0xfff); + } + } + return -1; + } else { + return virt; + } +} + +int PtegNumber(vaddr_t virt, int hfun) +{ + int sr = GetSR( (virt >> 28) & 0xf ); + int vsid = sr & PPC_VSID_MASK; + return ((((vsid & 0x7ffff) ^ ((virt >> 12) & 0xffff)) ^ (hfun ? -1 : 0)) & ((HTABSIZ - 1) >> 3) & 0x3ff); +} Added: trunk/reactos/lib/ppcmmu/ppcmmu.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/ppcmmu/ppcmmu.mak?rev=… ============================================================================== --- trunk/reactos/lib/ppcmmu/ppcmmu.mak (added) +++ trunk/reactos/lib/ppcmmu/ppcmmu.mak Sat Oct 6 12:34:33 2007 @@ -1,0 +1,26 @@ +O=$(INTERMEDIATE)/lib/ppcmmu +S=lib/ppcmmu +CC=powerpc-unknown-elf-gcc -I$T/include/reactos/ppcmmu +AR=powerpc-unknown-elf-ar +OBJCOPY=powerpc-unknown-elf-objcopy +LDSCRIPT=-Wl,-T,$S/ldscript +PPCMMU_TARGETS=$O/libppcmmu_code.a + +$O/mmuutil_object.o: $S/mmuutil.c | $O + $(CC) -Iinclude/reactos/libs -g -c -o $@ $S/mmuutil.c + +$O/libppcmmu_code.a: $O/mmuobject.o $O/mmuutil_object.o $O/mmutest.o | $O + $(CC) -Wl,-N -nostartfiles -nostdlib -o $O/mmuobject -Ttext=0x10000 $(LDSCRIPT) -Wl,-u,mmumain -Wl,-u,data_miss_start -Wl,-u,data_miss_end $O/mmuobject.o $O/mmuutil_object.o $O/mmutest.o + $(OBJCOPY) -O binary $O/mmuobject mmucode + $(OBJCOPY) -I binary -O elf32-powerpc -B powerpc:common mmucode $O/mmucode.o + mkdir -p `dirname $@` + $(AR) cr $@ $O/mmucode.o + +$O/mmuobject.o: $S/mmuobject.c $S/mmuobject.h | $O + $(CC) -Iinclude/reactos -Iinclude/reactos/libs -g -c -o $@ $S/mmuobject.c + +$O/mmutest.o: $S/mmutest.c $S/mmuobject.h | $O + $(CC) -Iinclude/reactos/libs -g -c -o $@ $S/mmutest.c + +ppcmmuobject_clean: + rm -f $O/*.o $O/*.a mmucode $O/mmuobject Added: trunk/reactos/lib/ppcmmu/ppcmmu.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/ppcmmu/ppcmmu.rbuild?r… ============================================================================== --- trunk/reactos/lib/ppcmmu/ppcmmu.rbuild (added) +++ trunk/reactos/lib/ppcmmu/ppcmmu.rbuild Sat Oct 6 12:34:33 2007 @@ -1,0 +1,10 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> +<module name="ppcmmu" type="staticlibrary"> + <include base="ppcmmu">.</include> + <define name="__NO_CTYPE_INLINES" /> + <if property="ARCH" value="powerpc"> + <file>mmuutil.c</file> + </if> + <file>dummy.c</file> +</module>

1 0

[arty] 29409: Added missing file.
by arty＠svn.reactos.org 06 Oct '07

06 Oct '07

Author: arty Date: Sat Oct 6 12:33:29 2007 New Revision: 29409 URL: http://svn.reactos.org/svn/reactos?rev=29409&view=rev Log: Added missing file. Added: branches/powerpc/reactos/lib/mmu/ppcmmu.rbuild Added: branches/powerpc/reactos/lib/mmu/ppcmmu.rbuild URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/lib/mmu/ppcmmu.… ============================================================================== --- branches/powerpc/reactos/lib/mmu/ppcmmu.rbuild (added) +++ branches/powerpc/reactos/lib/mmu/ppcmmu.rbuild Sat Oct 6 12:33:29 2007 @@ -1,0 +1,10 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> +<module name="ppcmmu" type="staticlibrary"> + <include base="ppcmmu">.</include> + <define name="__NO_CTYPE_INLINES" /> + <if property="ARCH" value="powerpc"> + <file>mmuutil.c</file> + </if> + <file>dummy.c</file> +</module>

1 0

[arty] 29408: Flipped increment/decrement. Noticed by encoded.
by arty＠svn.reactos.org 06 Oct '07

06 Oct '07

Author: arty Date: Sat Oct 6 12:29:22 2007 New Revision: 29408 URL: http://svn.reactos.org/svn/reactos?rev=29408&view=rev Log: Flipped increment/decrement. Noticed by encoded. Modified: trunk/reactos/ntoskrnl/ke/powerpc/stubs.c Modified: trunk/reactos/ntoskrnl/ke/powerpc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/powerpc/stubs.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/powerpc/stubs.c (original) +++ trunk/reactos/ntoskrnl/ke/powerpc/stubs.c Sat Oct 6 12:29:22 2007 @@ -36,12 +36,12 @@ LONG NTAPI Exi386InterlockedDecrementLong(PLONG Addend) { + return _InterlockedDecrement(Addend); +} + +LONG NTAPI Exi386InterlockedIncrementLong(PLONG Addend) +{ return _InterlockedIncrement(Addend); -} - -LONG NTAPI Exi386InterlockedIncrementLong(PLONG Addend) -{ - return _InterlockedDecrement(Addend); } LONG NTAPI Exi386InterlockedExchangeUlong(PLONG Target, LONG Exch, LONG Compare)

1 0

[arty] 29407: All remaining changes from the PPC branch. Not well tested yet. Many things are indeed still stubs or WIP code. Some people have been interested in helping out from some time and I'm sorry I haven't been able to do this merge finally for a while.
by arty＠svn.reactos.org 06 Oct '07

06 Oct '07

Author: arty Date: Sat Oct 6 11:53:20 2007 New Revision: 29407 URL: http://svn.reactos.org/svn/reactos?rev=29407&view=rev Log: All remaining changes from the PPC branch. Not well tested yet. Many things are indeed still stubs or WIP code. Some people have been interested in helping out from some time and I'm sorry I haven't been able to do this merge finally for a while. Added: trunk/reactos/lib/pseh/powerpc/ trunk/reactos/lib/pseh/powerpc/framebased.S trunk/reactos/lib/rtl/powerpc/rtlmem.s trunk/reactos/lib/rtl/powerpc/rtlswap.s trunk/reactos/lib/sdk/libcntpr/except/powerpc/ trunk/reactos/lib/sdk/libcntpr/except/powerpc/chkstk_asm.s trunk/reactos/lib/sdk/libcntpr/except/powerpc/seh.s trunk/reactos/ntoskrnl/config/powerpc/ trunk/reactos/ntoskrnl/config/powerpc/cmhardwr.c trunk/reactos/ntoskrnl/ex/powerpc/ trunk/reactos/ntoskrnl/ex/powerpc/fastinterlck.c trunk/reactos/ntoskrnl/ex/powerpc/ioport.s trunk/reactos/ntoskrnl/kd/wrappers/gdbstub_powerpc.c trunk/reactos/ntoskrnl/ke/powerpc/ trunk/reactos/ntoskrnl/ke/powerpc/cpu.c trunk/reactos/ntoskrnl/ke/powerpc/exp.c trunk/reactos/ntoskrnl/ke/powerpc/kiinit.c trunk/reactos/ntoskrnl/ke/powerpc/main_asm.S trunk/reactos/ntoskrnl/ke/powerpc/ppc_irq.c trunk/reactos/ntoskrnl/ke/powerpc/stubs.c trunk/reactos/ntoskrnl/ke/powerpc/systimer.c trunk/reactos/ntoskrnl/mm/powerpc/ trunk/reactos/ntoskrnl/mm/powerpc/page.c trunk/reactos/ntoskrnl/mm/powerpc/pfault.c trunk/reactos/ntoskrnl/ntoskrnl_i386.lnk trunk/reactos/ntoskrnl/ntoskrnl_powerpc.lnk Removed: trunk/reactos/ntoskrnl/ntoskrnl.lnk trunk/reactos/tools/ppc.lost+found/link-freeldr trunk/reactos/tools/ppc.lost+found/pmake Modified: trunk/reactos/Makefile trunk/reactos/ReactOS-i386.rbuild trunk/reactos/ReactOS-ppc.rbuild trunk/reactos/boot/freeldr/freeldr/arch/powerpc/boot.s trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild trunk/reactos/boot/freeldr/freeldr/fs/fat.c trunk/reactos/boot/freeldr/freeldr/include/arch.h trunk/reactos/config-ppc.template.rbuild trunk/reactos/include/ddk/winddk.h trunk/reactos/include/psdk/intrin_ppc.h trunk/reactos/include/psdk/winnt.h trunk/reactos/lib/lib.rbuild trunk/reactos/lib/pseh/pseh.rbuild trunk/reactos/lib/rtl/rtl.rbuild trunk/reactos/lib/sdk/libcntpr/libcntpr.rbuild trunk/reactos/ntoskrnl/ex/sysinfo.c trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h trunk/reactos/ntoskrnl/include/internal/kd.h trunk/reactos/ntoskrnl/include/internal/ke_x.h trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h trunk/reactos/ntoskrnl/include/internal/powerpc/intrin_i.h trunk/reactos/ntoskrnl/include/internal/powerpc/ke.h trunk/reactos/ntoskrnl/kd/kdmain.c trunk/reactos/ntoskrnl/ke/bug.c trunk/reactos/ntoskrnl/ke/profobj.c trunk/reactos/ntoskrnl/mm/mm.c trunk/reactos/ntoskrnl/mm/pagefile.c trunk/reactos/ntoskrnl/ntoskrnl.rbuild trunk/reactos/ntoskrnl/ps/debug.c trunk/reactos/ntoskrnl/ps/thread.c trunk/reactos/ntoskrnl/rtl/libsupp.c trunk/reactos/subsystems/win32/win32k/win32k.rbuild trunk/reactos/tools/ppc.lost+found/bootcd trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h trunk/reactos/tools/tools.mak [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=29407&r1=2940… Modified: trunk/reactos/ReactOS-i386.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-i386.rbuild?rev=29… Modified: trunk/reactos/ReactOS-ppc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-ppc.rbuild?rev=294… Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/boot.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/fa… Modified: trunk/reactos/boot/freeldr/freeldr/include/arch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… Modified: trunk/reactos/config-ppc.template.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/config-ppc.template.rbuild… Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=2… Modified: trunk/reactos/include/psdk/intrin_ppc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intrin_ppc.h?… Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=2… Modified: trunk/reactos/lib/lib.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/lib.rbuild?rev=29407&r… Added: trunk/reactos/lib/pseh/powerpc/framebased.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/powerpc/framebase… Modified: trunk/reactos/lib/pseh/pseh.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/pseh.rbuild?rev=2… Added: trunk/reactos/lib/rtl/powerpc/rtlmem.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/powerpc/rtlmem.s?r… Added: trunk/reactos/lib/rtl/powerpc/rtlswap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/powerpc/rtlswap.s?… Modified: trunk/reactos/lib/rtl/rtl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtl.rbuild?rev=294… Added: trunk/reactos/lib/sdk/libcntpr/except/powerpc/chkstk_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/libcntpr/except/po… Added: trunk/reactos/lib/sdk/libcntpr/except/powerpc/seh.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/libcntpr/except/po… Modified: trunk/reactos/lib/sdk/libcntpr/libcntpr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/libcntpr/libcntpr.… Added: trunk/reactos/ntoskrnl/config/powerpc/cmhardwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/powerpc/cm… Added: trunk/reactos/ntoskrnl/ex/powerpc/fastinterlck.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/powerpc/fastin… Added: trunk/reactos/ntoskrnl/ex/powerpc/ioport.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/powerpc/ioport… Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… Modified: trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… Modified: trunk/reactos/ntoskrnl/include/internal/kd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… Modified: trunk/reactos/ntoskrnl/include/internal/ke_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… Modified: trunk/reactos/ntoskrnl/include/internal/powerpc/intrin_i.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… Modified: trunk/reactos/ntoskrnl/include/internal/powerpc/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… Modified: trunk/reactos/ntoskrnl/kd/kdmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdmain.c?rev=2… Added: trunk/reactos/ntoskrnl/kd/wrappers/gdbstub_powerpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/wrappers/gdbst… Modified: trunk/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/bug.c?rev=2940… Added: trunk/reactos/ntoskrnl/ke/powerpc/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/powerpc/cpu.c?… Added: trunk/reactos/ntoskrnl/ke/powerpc/exp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/powerpc/exp.c?… Added: trunk/reactos/ntoskrnl/ke/powerpc/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/powerpc/kiinit… Added: trunk/reactos/ntoskrnl/ke/powerpc/main_asm.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/powerpc/main_a… Added: trunk/reactos/ntoskrnl/ke/powerpc/ppc_irq.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/powerpc/ppc_ir… Added: trunk/reactos/ntoskrnl/ke/powerpc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/powerpc/stubs.… Added: trunk/reactos/ntoskrnl/ke/powerpc/systimer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/powerpc/systim… Modified: trunk/reactos/ntoskrnl/ke/profobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/profobj.c?rev=… Modified: trunk/reactos/ntoskrnl/mm/mm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mm.c?rev=29407… Modified: trunk/reactos/ntoskrnl/mm/pagefile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pagefile.c?rev… Added: trunk/reactos/ntoskrnl/mm/powerpc/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/powerpc/page.c… Added: trunk/reactos/ntoskrnl/mm/powerpc/pfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/powerpc/pfault… Removed: trunk/reactos/ntoskrnl/ntoskrnl.lnk URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.lnk?rev=… Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r… Added: trunk/reactos/ntoskrnl/ntoskrnl_i386.lnk URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl_i386.lnk… Added: trunk/reactos/ntoskrnl/ntoskrnl_powerpc.lnk URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl_powerpc.… Modified: trunk/reactos/ntoskrnl/ps/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/debug.c?rev=29… Modified: trunk/reactos/ntoskrnl/ps/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/thread.c?rev=2… Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/libsupp.c?rev… Modified: trunk/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/wi… Modified: trunk/reactos/tools/ppc.lost+found/bootcd URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/ppc.lost%2Bfound/boo… Removed: trunk/reactos/tools/ppc.lost+found/link-freeldr URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/ppc.lost%2Bfound/lin… Removed: trunk/reactos/tools/ppc.lost+found/pmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/ppc.lost%2Bfound/pma… Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… Modified: trunk/reactos/tools/tools.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/tools.mak?rev=29407&…

1 0

[fireball] 29406: - Implement KiTrap19 handler (XMMI exceptions, mostly copied KiTrap7 handler and used mxcsr status word and exceptions there). There will be no weird 0xF BSODs anymore, however I need to investigate about exceptions masking. - Dynamically enable it, if CPU supports XMMI (was already done in the kernel, but #if0-ed).
by fireball＠svn.reactos.org 06 Oct '07

06 Oct '07

Author: fireball Date: Sat Oct 6 11:22:59 2007 New Revision: 29406 URL: http://svn.reactos.org/svn/reactos?rev=29406&view=rev Log: - Implement KiTrap19 handler (XMMI exceptions, mostly copied KiTrap7 handler and used mxcsr status word and exceptions there). There will be no weird 0xF BSODs anymore, however I need to investigate about exceptions masking. - Dynamically enable it, if CPU supports XMMI (was already done in the kernel, but #if0-ed). Modified: trunk/reactos/include/ndk/asm.h trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/ke/i386/cpu.c trunk/reactos/ntoskrnl/ke/i386/trap.s Modified: trunk/reactos/include/ndk/asm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/asm.h?rev=2940… ============================================================================== --- trunk/reactos/include/ndk/asm.h (original) +++ trunk/reactos/include/ndk/asm.h Sat Oct 6 11:22:59 2007 @@ -264,6 +264,7 @@ #define FX_ERROR_SELECTOR 0xC #define FX_DATA_OFFSET 0x10 #define FX_DATA_SELECTOR 0x14 +#define FX_MXCSR 0x18 // // NPX States 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 Sat Oct 6 11:22:59 2007 @@ -142,6 +142,7 @@ extern PKPRCB KiProcessorBlock[]; extern ULONG KiMask32Array[MAXIMUM_PRIORITY]; extern ULONG KiIdleSummary; +extern VOID __cdecl KiTrap19(VOID); extern VOID __cdecl KiTrap8(VOID); extern VOID __cdecl KiTrap2(VOID); extern VOID __cdecl KiFastCallEntry(VOID); 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 Sat Oct 6 11:22:59 2007 @@ -798,20 +798,18 @@ NTAPI Ki386EnableXMMIExceptions(IN ULONG_PTR Context) { -#if 0 // needs kitrap13 PKIDTENTRY IdtEntry; /* Get the IDT Entry for Interrupt 19 */ - IdtEntry = ((PKIPCR)KeGetPcr())->IDT[19]; + IdtEntry = &((PKIPCR)KeGetPcr())->IDT[19]; /* Set it up */ IdtEntry->Selector = KGDT_R0_CODE; - IdtEntry->Offset = (KiTrap13 & 0xFFFF); - IdtEntry->ExtendedOffset = (KiTrap13 >> 16) & 0xFFFF; + IdtEntry->Offset = ((ULONG_PTR)KiTrap19 & 0xFFFF); + IdtEntry->ExtendedOffset = ((ULONG_PTR)KiTrap19 >> 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); 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 Sat Oct 6 11:22:59 2007 @@ -1034,7 +1034,7 @@ sub ecx, NPX_FRAME_LENGTH /* Check if emulation is enabled */ - test dword ptr [ecx+FN_CR0_NPX_STATE], CR0_EM + test byte ptr [ecx+FN_CR0_NPX_STATE], CR0_EM jnz EmulationEnabled CheckState: @@ -2027,6 +2027,180 @@ jmp _KiSystemFatalException .endfunc +.globl _KiTrap19 +.func KiTrap19 +TRAP_FIXUPS kit19_a, kit19_t, DoFixupV86, DoNotFixupAbios +_KiTrap19: + /* Push error code */ + push 0 + + /* Enter trap */ + TRAP_PROLOG kit19_a, kit19_t + + /* Check if this is the NPX Thread */ + mov eax, PCR[KPCR_CURRENT_THREAD] + cmp eax, PCR[KPCR_NPX_THREAD] + + /* If this is a valid fault, handle it */ + jz HandleXmmiFault + + /* Otherwise, bugcheck */ + mov eax, 19 + jmp _KiSystemFatalException + +HandleXmmiFault: + /* Get the initial stack and NPX frame */ + mov ecx, [eax+KTHREAD_INITIAL_STACK] + lea ecx, [ecx-NPX_FRAME_LENGTH] + + /* Check if the trap came from V86 mode */ + test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK + jnz V86Xmmi + + /* Check if it came from kernel mode */ + test byte ptr [ebp+KTRAP_FRAME_CS], MODE_MASK + jz KernelXmmi + + /* Check if it came from a VDM */ + cmp word ptr [ebp+KTRAP_FRAME_CS], KGDT_R3_CODE + RPL_MASK + jne VdmXmmi + +HandleUserXmmi: + /* Set new CR0 */ + mov ebx, cr0 + and ebx, ~(CR0_MP + CR0_EM + CR0_TS) + mov cr0, ebx + + /* Check if we have FX support */ + test byte ptr _KeI386FxsrPresent, 1 + jz XmmiFnSave2 + + /* Save the state */ + fxsave [ecx] + jmp XmmiMakeCr0Dirty +XmmiFnSave2: + fnsave [ecx] + wait + +XmmiMakeCr0Dirty: + /* Make CR0 state not loaded */ + or ebx, NPX_STATE_NOT_LOADED + or ebx, [ecx+FN_CR0_NPX_STATE] + mov cr0, ebx + + /* Update NPX state */ + mov byte ptr [eax+KTHREAD_NPX_STATE], NPX_STATE_NOT_LOADED + mov dword ptr PCR[KPCR_NPX_THREAD], 0 + + /* Clear the TS bit and re-enable interrupts */ + and dword ptr [ecx+FN_CR0_NPX_STATE], ~CR0_TS + + /* Re-enable interrupts for user-mode and send the exception */ + sti + mov ebx, [ebp+KTRAP_FRAME_EIP] + + /* Get MxCSR and get current mask (bits 7-12) */ + movzx eax, word ptr [ecx+FX_MXCSR] + mov edx, eax + shr edx, 7 + not edx + + /* Set faulting opcode address to 0 */ + mov esi, 0 + + /* Apply legal exceptions mask */ + and eax, 0x3f + + /* Apply the mask we got in MXCSR itself */ + and eax, edx + + /* Check for invalid operation */ + test al, 1 + jz 1f + + /* Raise exception */ + mov eax, STATUS_FLOAT_MULTIPLE_TRAPS + jmp _DispatchOneParam + +1: + /* Check for zero divide */ + test al, 2 + jz 1f + + /* Raise exception */ + mov eax, STATUS_FLOAT_MULTIPLE_TRAPS + jmp _DispatchOneParam + +1: + /* Check for denormal */ + test al, 4 + jz 1f + + /* Raise exception */ + mov eax, STATUS_FLOAT_MULTIPLE_TRAPS + jmp _DispatchOneParam + +1: + /* Check for overflow*/ + test al, 8 + jz 1f + + /* Raise exception */ + mov eax, STATUS_FLOAT_MULTIPLE_FAULTS + jmp _DispatchOneParam + +1: + /* Check for denormal */ + test al, 16 + jz 1f + + /* Raise exception */ + mov eax, STATUS_FLOAT_MULTIPLE_FAULTS + jmp _DispatchOneParam + +1: + /* Check for Precision */ + test al, 32 + jz UnexpectedXmmi + + /* Raise exception */ + mov eax, STATUS_FLOAT_MULTIPLE_FAULTS + jmp _DispatchOneParam + +UnexpectedXmmi: + /* Strange result, bugcheck the OS */ + sti + push ebp + push 1 + push 0 + push eax + push 13 + push TRAP_CAUSE_UNKNOWN + call _KeBugCheckWithTf@24 + +VdmXmmi: + /* Check if this is a VDM */ + mov eax, PCR[KPCR_CURRENT_THREAD] + mov ebx, [eax+KTHREAD_APCSTATE_PROCESS] + cmp dword ptr [ebx+EPROCESS_VDM_OBJECTS], 0 + jz HandleUserXmmi + +V86Xmmi: + /* V86 XMMI not handled */ + UNHANDLED_PATH + +KernelXmmi: + /* Another weird situation */ + push ebp + push 2 + push 0 + push eax + push 13 + push TRAP_CAUSE_UNKNOWN + call _KeBugCheckWithTf@24 +.endfunc + + .func KiSystemFatalException _KiSystemFatalException:

1 0

[fireball] 29405: - Fix an awful memory-overwrite bug. Buggy code written by Eugene Ingerman, 04-Aug-1988. - Alex is awarded ReactOS Medal-of-Honour for the great achievement (fix of the oldest bug ever in ReactOS).
by fireball＠svn.reactos.org 05 Oct '07

05 Oct '07

Author: fireball Date: Sat Oct 6 00:46:25 2007 New Revision: 29405 URL: http://svn.reactos.org/svn/reactos?rev=29405&view=rev Log: - Fix an awful memory-overwrite bug. Buggy code written by Eugene Ingerman, 04-Aug-1988. - Alex is awarded ReactOS Medal-of-Honour for the great achievement (fix of the oldest bug ever in ReactOS). Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/region.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/region.c Sat Oct 6 00:46:25 2007 @@ -669,7 +669,7 @@ else break; - for(i = j; i >= 0; i--) // fixup bottom band + for(i = j; i > 0; i--) // fixup bottom band if(((PRECT)rgnDst->Buffer + i)->bottom > right) ((PRECT)rgnDst->Buffer + i)->bottom = right; else

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