Ros-diffs October 2006

ros-diffs@reactos.org

17 participants
357 discussions

[ion] 24333: - Remove all the remaining code in boot.S and make KiRosPrepareForSystemStartup fastcall. Now NtProcessStartup just does a jmp to KiRosPrepareForSystemStartup without any other code. - Use freeldr's stack during all of freeldr.c, and only switch to the boot stack in KiSystemStartup before calling KiInitializeKernel. This is what NT does as well (it piggybacks on NTLDR's stack until then). This allowed us to clean boot.S and now we can boot from NTLDR properly.
by ion＠svn.reactos.org 01 Oct '06

01 Oct '06

Author: ion Date: Sun Oct 1 10:08:05 2006 New Revision: 24333 URL: http://svn.reactos.org/svn/reactos?rev=24333&view=rev Log: - Remove all the remaining code in boot.S and make KiRosPrepareForSystemStartup fastcall. Now NtProcessStartup just does a jmp to KiRosPrepareForSystemStartup without any other code. - Use freeldr's stack during all of freeldr.c, and only switch to the boot stack in KiSystemStartup before calling KiInitializeKernel. This is what NT does as well (it piggybacks on NTLDR's stack until then). This allowed us to clean boot.S and now we can boot from NTLDR properly. Modified: trunk/reactos/ntoskrnl/ke/freeldr.c trunk/reactos/ntoskrnl/ke/i386/boot.S trunk/reactos/ntoskrnl/ke/i386/kiinit.c Modified: trunk/reactos/ntoskrnl/ke/freeldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/freeldr.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/freeldr.c (original) +++ trunk/reactos/ntoskrnl/ke/freeldr.c Sun Oct 1 10:08:05 2006 @@ -244,8 +244,9 @@ } VOID -NTAPI -KiRosPrepareForSystemStartup(IN PROS_LOADER_PARAMETER_BLOCK LoaderBlock) +FASTCALL +KiRosPrepareForSystemStartup(IN ULONG Dummy, + IN PROS_LOADER_PARAMETER_BLOCK LoaderBlock) { ULONG i; ULONG size; Modified: trunk/reactos/ntoskrnl/ke/i386/boot.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/boot.S?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/boot.S (original) +++ trunk/reactos/ntoskrnl/ke/i386/boot.S Sun Oct 1 10:08:05 2006 @@ -1,7 +1,7 @@ /* * FILE: ntoskrnl/ke/i386/boot.S * COPYRIGHT: See COPYING in the top level directory - * PURPOSE: Kernel Bootstrap Code + * PURPOSE: FreeLDR Wrapper Bootstrap Code * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ @@ -30,16 +30,6 @@ .text .func NtProcessStartup _NtProcessStartup: - - /* Load the initial kernel stack */ - lea eax, _P0BootStack - sub eax, (NPX_FRAME_LENGTH + KTRAP_FRAME_LENGTH + KTRAP_FRAME_ALIGN) - mov esp, eax - - /* Save initial CR0 state */ - push CR0_EM + CR0_TS + CR0_MP - /* Call the main kernel initialization */ - push edx - call _KiRosPrepareForSystemStartup@4 + jmp @KiRosPrepareForSystemStartup@8 .endfunc Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kiinit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kiinit.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/kiinit.c Sun Oct 1 10:08:05 2006 @@ -281,7 +281,7 @@ { ULONG Cpu; PKTHREAD InitialThread; - PVOID InitialStack; + ULONG InitialStack; PKGDTENTRY Gdt; PKIDTENTRY Idt; PKTSS Tss; @@ -302,7 +302,7 @@ } /* Save the initial thread and stack */ - InitialStack = (PVOID)LoaderBlock->KernelStack; + InitialStack = LoaderBlock->KernelStack; InitialThread = (PKTHREAD)LoaderBlock->Thread; /* Clean the APC List Head */ @@ -375,13 +375,21 @@ /* Raise to HIGH_LEVEL */ KfRaiseIrql(HIGH_LEVEL); + /* Align stack and make space for the trap frame and NPX frame */ + InitialStack &= ~KTRAP_FRAME_ALIGN; + __asm__ __volatile__("movl %0,%%esp" : :"r" (InitialStack)); + __asm__ __volatile__("subl %0,%%esp" : :"r" (NPX_FRAME_LENGTH + + KTRAP_FRAME_LENGTH + + KTRAP_FRAME_ALIGN)); + __asm__ __volatile__("push %0" : :"r" (CR0_EM + CR0_TS + CR0_MP)); + /* Call main kernel initialization */ KiInitializeKernel(&KiInitialProcess.Pcb, InitialThread, - InitialStack, + (PVOID)InitialStack, (PKPRCB)__readfsdword(KPCR_PRCB), Cpu, - LoaderBlock); + KeLoaderBlock); /* Set the priority of this thread to 0 */ KeGetCurrentThread()->Priority = 0;

1 0

[arty] 24332: Working out boot video, fixed memory map completely.
by arty＠svn.reactos.org 01 Oct '06

01 Oct '06

Author: arty Date: Sun Oct 1 09:46:59 2006 New Revision: 24332 URL: http://svn.reactos.org/svn/reactos?rev=24332&view=rev Log: Working out boot video, fixed memory map completely. Added: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/compat.h Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c Added: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/compat.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/compat.h (added) +++ branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/compat.h Sun Oct 1 09:46:59 2006 @@ -1,0 +1,108 @@ +#ifndef _FREELDR_ARCH_COMPAT_H +#define _FREELDR_ARCH_COMPAT_H + +#define __init +#define __initdata + +#define SPRN_MSSCR0 0x3f6 /* Memory Subsystem Control Register 0 */ +#define SPRN_MSSSR0 0x3f7 /* Memory Subsystem Status Register 1 */ +#define SPRN_LDSTCR 0x3f8 /* Load/Store control register */ +#define SPRN_LDSTDB 0x3f4 /* */ +#define SPRN_LR 0x008 /* Link Register */ +#ifndef SPRN_PIR +#define SPRN_PIR 0x3FF /* Processor Identification Register */ +#endif +#define SPRN_PTEHI 0x3D5 /* 981 7450 PTE HI word (S/W TLB load) */ +#define SPRN_PTELO 0x3D6 /* 982 7450 PTE LO word (S/W TLB load) */ +#define SPRN_PURR 0x135 /* Processor Utilization of Resources Reg */ +#define SPRN_PVR 0x11F /* Processor Version Register */ +#define SPRN_RPA 0x3D6 /* Required Physical Address Register */ +#define SPRN_SDA 0x3BF /* Sampled Data Address Register */ +#define SPRN_SDR1 0x019 /* MMU Hash Base Register */ +#define SPRN_ASR 0x118 /* Address Space Register */ +#define SPRN_SIA 0x3BB /* Sampled Instruction Address Register */ +#define SPRN_SPRG0 0x110 /* Special Purpose Register General 0 */ +#define SPRN_SPRG1 0x111 /* Special Purpose Register General 1 */ +#define SPRN_SPRG2 0x112 /* Special Purpose Register General 2 */ +#define SPRN_SPRG3 0x113 /* Special Purpose Register General 3 */ +#define SPRN_SPRG4 0x114 /* Special Purpose Register General 4 */ +#define SPRN_SPRG5 0x115 /* Special Purpose Register General 5 */ +#define SPRN_SPRG6 0x116 /* Special Purpose Register General 6 */ +#define SPRN_SPRG7 0x117 /* Special Purpose Register General 7 */ +#define SPRN_SRR0 0x01A /* Save/Restore Register 0 */ +#define SPRN_SRR1 0x01B /* Save/Restore Register 1 */ +#ifndef SPRN_SVR +#define SPRN_SVR 0x11E /* System Version Register */ +#endif +#define SPRN_THRM1 0x3FC /* Thermal Management Register 1 */ +/* these bits were defined in inverted endian sense originally, ugh, confusing */ + +/* Values for PP (assumes Ks=0, Kp=1) */ +#define PP_RWXX 0 /* Supervisor read/write, User none */ +#define PP_RWRX 1 /* Supervisor read/write, User read */ +#define PP_RWRW 2 /* Supervisor read/write, User read/write */ +#define PP_RXRX 3 /* Supervisor read, User read */ + +/* Block size masks */ +#define BL_128K 0x000 +#define BL_256K 0x001 +#define BL_512K 0x003 +#define BL_1M 0x007 +#define BL_2M 0x00F +#define BL_4M 0x01F +#define BL_8M 0x03F +#define BL_16M 0x07F +#define BL_32M 0x0FF +#define BL_64M 0x1FF +#define BL_128M 0x3FF +#define BL_256M 0x7FF + +/* BAT Access Protection */ +#define BPP_XX 0x00 /* No access */ +#define BPP_RX 0x01 /* Read only */ +#define BPP_RW 0x02 /* Read/write */ + +/* Definitions for 40x embedded chips. */ +#define _PAGE_GUARDED 0x001 /* G: page is guarded from prefetch */ +#define _PAGE_FILE 0x001 /* when !present: nonlinear file mapping */ +#define _PAGE_PRESENT 0x002 /* software: PTE contains a translation */ +#define _PAGE_NO_CACHE 0x004 /* I: caching is inhibited */ +#define _PAGE_WRITETHRU 0x008 /* W: caching is write-through */ +#define _PAGE_USER 0x010 /* matches one of the zone permission bits */ +#define _PAGE_RW 0x040 /* software: Writes permitted */ +#define _PAGE_DIRTY 0x080 /* software: dirty page */ +#define _PAGE_HWWRITE 0x100 /* hardware: Dirty & RW, set in exception */ +#define _PAGE_HWEXEC 0x200 /* hardware: EX permission */ +#define _PAGE_ACCESSED 0x400 /* software: R: page referenced */ + +#define _PMD_PRESENT 0x400 /* PMD points to page of PTEs */ +#define _PMD_BAD 0x802 +#define _PMD_SIZE 0x0e0 /* size field, != 0 for large-page PMD entry */ +#define _PMD_SIZE_4M 0x0c0 +#define _PMD_SIZE_16M 0x0e0 +#define PMD_PAGE_SIZE(pmdval) (1024 << (((pmdval) & _PMD_SIZE) >> 4)) + +#define PVR_VER(pvr)(((pvr) >> 16) & 0xFFFF) /* Version field */ + +#define KERNELBASE 0x80000000 + +typedef unsigned char __u8; +typedef unsigned short __u16; +typedef unsigned int __u32; + +typedef struct _pci_reg_property { + struct { + int a_hi, a_mid, a_lo; + } addr; + int size_hi, size_lo; +} pci_reg_property; + +void btext_drawstring(const char *c); +void btext_drawhex(unsigned long v); + +void *ioremap(__u32 phys, __u32 size); +void iounmap(void *logical); + +__u32 GetPVR(); + +#endif/*_FREELDR_ARCH_COMPAT_H*/ Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c Sun Oct 1 09:46:59 2006 @@ -20,19 +20,20 @@ #include "machine.h" #include "of.h" #include "mmu.h" - -#define TOTAL_HEAP_NEEDED (48 * 1024 * 1024) /* 48 megs */ +#include "compat.h" +#include "ppcboot.h" extern void BootMain( LPSTR CmdLine ); extern PCHAR GetFreeLoaderVersionString(); extern ULONG CacheSizeLimit; of_proxy ofproxy; -void *PageDirectoryStart, *PageDirectoryEnd, *mem_base = 0; +void *PageDirectoryStart, *PageDirectoryEnd; static int chosen_package, stdin_handle, part_handle = -1; BOOLEAN AcpiPresent = FALSE; char BootPath[0x100] = { 0 }, BootPart[0x100] = { 0 }, CmdLine[0x100] = { 0 }; jmp_buf jmp; volatile char *video_mem = 0; +boot_infos_t BootInfo; void le_swap( void *start_addr_v, void *end_addr_v, @@ -183,56 +184,160 @@ printf( "Sync\n" ); } +static int prom_next_node(int *nodep) +{ + int node; + + if ((node = *nodep) != 0 + && (*nodep = ofw_child(node)) != 0) + return 1; + if ((*nodep = ofw_peer(node)) != 0) + return 1; + for (;;) { + if ((node = ofw_parent(node)) == 0) + return 0; + if ((*nodep = ofw_peer(node)) != 0) + return 1; + } +} + VOID PpcVideoPrepareForReactOS() { - printf( "PrepareForReactOS\n"); -} + int i, j, display_handle, display_size = 0; + int node, ret, elts; + pci_reg_property display_regs[8]; + char type[256], path[256], name[256]; + + for( node = ofw_finddevice("/"); prom_next_node(&node); ) { + memset(type, 0, sizeof(type)); + memset(path, 0, sizeof(path)); + + ret = ofw_getprop(node, "name", name, sizeof(name)); + + if(ofw_getprop(node, "device_type", type, sizeof(type)) <= 0) { + printf("Could not get type for node %x\n", node); + continue; + } + + printf("Node %x ret %d name %s type %s\n", node, ret, name, type); + + if(strcmp(type, "display") == 0) break; + } + + if(!node) return; + + if(ofw_package_to_path(node, path, sizeof(path)) < 0) { + printf("could not get path for display package %x\n", node); + return; + } + + printf("Opening display package: %s\n", path); + + display_handle = ofw_open(path); + + printf("display handle %x\n", display_handle); + + BootInfo.dispDeviceRect[0] = BootInfo.dispDeviceRect[1] = 0; + + ofw_getprop(display_handle, "width", + (void *)&BootInfo.dispDeviceRect[2], sizeof(int)); + ofw_getprop(display_handle, "height", + (void *)&BootInfo.dispDeviceRect[3], sizeof(int)); + ofw_getprop(display_handle, "depth", + (void *)&BootInfo.dispDeviceDepth, sizeof(int)); + ofw_getprop(display_handle, "linebytes", + (void *)&BootInfo.dispDeviceRowBytes, sizeof(int)); + + if(ofw_getprop + (display_handle, + "address", + (void *)&BootInfo.dispDeviceBase, + sizeof(BootInfo.dispDeviceBase)) > 0) { + goto finish; + } + + if((elts = ofw_getprop(display_handle, + "assigned-addresses", + (void *)display_regs, + sizeof(display_regs))) <= 0) { + printf("Could not get assigned addresses\n"); + return; + } + + elts /= sizeof(display_regs[0]); + for( i = 0; i < elts; i++ ) { + display_size = display_regs[i].size_lo; + if( display_size >= (1 << 20) ) { + BootInfo.dispDeviceBase = (void *)display_regs[i].addr.a_lo; + + /* Map pages for display at some location */ + BootInfo.logicalDisplayBase = (void *)0xc0000000; + + for( i = 0; i < display_size; i += (1 << 12) ) { + InsertPageEntry((ULONG_PTR)((PCHAR)BootInfo.logicalDisplayBase)+i, + (ULONG_PTR)((PCHAR)BootInfo.dispDeviceBase)+i); + } + } + } + +finish: + /* Draw something ... */ + elts = 0; + for( i = 0; i < BootInfo.dispDeviceRect[3]; i++ ) { + for( j = 0; j < BootInfo.dispDeviceRect[2]; j++ ) { + ((PCHAR)BootInfo.logicalDisplayBase) + [(j * (BootInfo.dispDeviceDepth/8)) + + (i * (BootInfo.dispDeviceRowBytes))] = elts++; + } + } +} + /* * Get memory the proper openfirmware way */ ULONG PpcGetMemoryMap( PBIOS_MEMORY_MAP BiosMemoryMap, ULONG MaxMemoryMapSize ) { - int i, memhandle, mmuhandle, returned, total = 0, num_mem = 0; - int memdata[256]; + int i, memhandle, returned, total = 0, slots = 0; + int memdata[0x40]; printf("PpcGetMemoryMap(%d)\n", MaxMemoryMapSize); - if( mem_base ) { - BiosMemoryMap[0].Type = MEMTYPE_USABLE; - BiosMemoryMap[0].BaseAddress = (ULONG)mem_base; - BiosMemoryMap[0].Length = TOTAL_HEAP_NEEDED; - printf("[cached] returning 1 element\n"); - return 1; - } - - ofw_getprop(chosen_package, "memory", - (char *)&memhandle, sizeof(memhandle)); - ofw_getprop(chosen_package, "mmu", - (char *)&mmuhandle, sizeof(mmuhandle)); + memhandle = ofw_finddevice("/memory"); returned = ofw_getprop(memhandle, "available", (char *)memdata, sizeof(memdata)); - /* We need to leave some for open firmware. Let's claim up to 16 megs - * for now */ - - for( i = 0; i < returned / sizeof(int) && !num_mem; i += 2 ) { - BiosMemoryMap[num_mem].Type = MEMTYPE_USABLE; - BiosMemoryMap[num_mem].BaseAddress = memdata[i]; - mem_base = (void *)memdata[i]; - BiosMemoryMap[num_mem].Length = memdata[i+1]; - if( BiosMemoryMap[num_mem].Length >= TOTAL_HEAP_NEEDED && - total < TOTAL_HEAP_NEEDED ) { - BiosMemoryMap[num_mem].Length = TOTAL_HEAP_NEEDED; - ofw_claim(BiosMemoryMap[num_mem].BaseAddress, - BiosMemoryMap[num_mem].Length, 0x1000); /* claim it */ - total += BiosMemoryMap[0].Length; - num_mem++; + printf("Returned data: %d\n", returned); + if( returned == -1 ) { + printf("getprop /memory[@reg] failed\n"); + return 0; + } + + for( i = 0; i < returned; i++ ) { + printf("%x ", memdata[i]); + } + printf("\n"); + + for( i = 0; i < returned / 2; i++ ) { + BiosMemoryMap[slots].Type = MEMTYPE_USABLE; + BiosMemoryMap[slots].BaseAddress = REV(memdata[i*2]); + BiosMemoryMap[slots].Length = REV(memdata[i*2+1]); + printf("MemoryMap[%d] = (%x:%x)\n", + i, + (int)BiosMemoryMap[slots].BaseAddress, + (int)BiosMemoryMap[slots].Length); + + if( BiosMemoryMap[slots].Length && + ofw_claim((int)BiosMemoryMap[slots].BaseAddress, + (int)BiosMemoryMap[slots].Length, + 0x1000) ) { + total += BiosMemoryMap[slots].Length; + slots++; } } printf( "Returning memory map (%dk total)\n", total / 1024 ); - return num_mem; + return slots; } /* Strategy: @@ -304,6 +409,7 @@ printf("Seek to %x failed\n", (ULONG)(SectorNumber * 512)); return FALSE; } + rlen = ofw_read( part_handle, Buffer, (ULONG)(SectorCount * 512) ); return rlen > 0; } @@ -374,36 +480,27 @@ return TRUE; } +extern int _bss; typedef unsigned int uint32_t; - void PpcInit( of_proxy the_ofproxy ) { int len, stdin_handle_chosen; ofproxy = the_ofproxy; - ofw_print_string("Freeldr PowerPC Init\n"); - + //SetPhys(0x900, (19 << 26) | (50 << 1)); + chosen_package = ofw_finddevice( "/chosen" ); - ofw_print_string("Freeldr: chosen_package is "); - ofw_print_number(chosen_package); - ofw_print_string("\n"); - ofw_getprop( chosen_package, "stdin", - (char *)&stdin_handle_chosen, sizeof(stdin_handle_chosen) ); - - ofw_print_string("Freeldr: stdin_handle is "); - ofw_print_number(stdin_handle_chosen); - ofw_print_string("\n"); - - stdin_handle = stdin_handle_chosen; - - /* stdin_handle = REV(stdin_handle); */ + (char *)&stdin_handle_chosen, sizeof(stdin_handle_chosen) ); + + stdin_handle = REV(stdin_handle_chosen); MachVtbl.ConsPutChar = PpcPutChar; MachVtbl.ConsKbHit = PpcConsKbHit; MachVtbl.ConsGetCh = PpcConsGetCh; - printf( "stdin_handle is %x\n", stdin_handle ); + printf( "chosen_package %x, stdin_handle is %x\n", + chosen_package, stdin_handle ); printf("virt2phys (0xe00000,D) -> %x\n", PpcVirt2phys(0xe00000,0)); printf("virt2phys (0xe01000,D) -> %x\n", PpcVirt2phys(0xe01000,0)); @@ -444,6 +541,8 @@ len = ofw_getprop(chosen_package, "bootargs", CmdLine, sizeof(CmdLine)); + printf("bootargs: len %d\n", len); + if( len < 0 ) len = 0; CmdLine[len] = 0;

1 0

[ion] 24331: - Fully use KeLoaderBlock->InLoadOrderListHead for driver loading and symbol lookups, instead of KeLoaderModules/KeLoaderModuleCount. Still not 100% compatible with NTLDR (since it uses BootDriverListHead with a special structure), but much closer to a portable design that doesn't rely on static kernel data. - Change some internal functions to use UNICODE_STRING instead of PCHAR since this is how LdrEntry->BaseDllName is, and also it's closer to NT Design.
by ion＠svn.reactos.org 01 Oct '06

01 Oct '06

Author: ion Date: Sun Oct 1 09:05:57 2006 New Revision: 24331 URL: http://svn.reactos.org/svn/reactos?rev=24331&view=rev Log: - Fully use KeLoaderBlock->InLoadOrderListHead for driver loading and symbol lookups, instead of KeLoaderModules/KeLoaderModuleCount. Still not 100% compatible with NTLDR (since it uses BootDriverListHead with a special structure), but much closer to a portable design that doesn't rely on static kernel data. - Change some internal functions to use UNICODE_STRING instead of PCHAR since this is how LdrEntry->BaseDllName is, and also it's closer to NT Design. Modified: trunk/reactos/include/reactos/rosldr.h trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/include/internal/kd.h trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c trunk/reactos/ntoskrnl/ke/i386/kiinit.c Modified: trunk/reactos/include/reactos/rosldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/rosldr.h?r… ============================================================================== --- trunk/reactos/include/reactos/rosldr.h (original) +++ trunk/reactos/include/reactos/rosldr.h Sun Oct 1 09:05:57 2006 @@ -44,8 +44,6 @@ ULONG KernelBase; } ROS_LOADER_PARAMETER_BLOCK, *PROS_LOADER_PARAMETER_BLOCK; -extern LOADER_MODULE KeLoaderModules[64]; -extern ULONG KeLoaderModuleCount; extern ULONG MmFreeLdrMemHigher, MmFreeLdrMemLower; extern BOOLEAN AcpiTableDetected; extern ULONG MmFreeLdrPageDirectoryStart, MmFreeLdrPageDirectoryEnd; Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=243… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c (original) +++ trunk/reactos/ntoskrnl/ex/init.c Sun Oct 1 09:05:57 2006 @@ -35,6 +35,7 @@ extern ULONG_PTR LastKrnlPhysAddr; extern ULONG_PTR LastKernelAddress; extern LOADER_MODULE KeLoaderModules[64]; +extern ULONG KeLoaderModuleCount; extern PRTL_MESSAGE_RESOURCE_DATA KiBugCodeMessages; BOOLEAN NoGuiBoot = FALSE; Modified: trunk/reactos/ntoskrnl/include/internal/kd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/kd.h (original) +++ trunk/reactos/ntoskrnl/include/internal/kd.h Sun Oct 1 09:05:57 2006 @@ -77,7 +77,7 @@ KdbSymUnloadDriverSymbols(IN PLDR_DATA_TABLE_ENTRY ModuleObject); VOID -KdbSymProcessBootSymbols(IN PCHAR FileName); +KdbSymProcessBootSymbols(IN PUNICODE_STRING FileName); VOID KdbSymInit( Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c Sun Oct 1 09:05:57 2006 @@ -462,9 +462,10 @@ if (ServiceStart == 0) { - ULONG i; - CHAR SearchName[256]; - PCHAR ModuleName; + WCHAR SearchNameBuffer[256]; + UNICODE_STRING SearchName; + PLIST_ENTRY ListHead, NextEntry; + PLDR_DATA_TABLE_ENTRY LdrEntry; /* * FIXME: @@ -472,28 +473,37 @@ * stored in registry entry ImageName and use the whole path * (requires change in FreeLoader). */ - - _snprintf(SearchName, sizeof(SearchName), "%wZ.sys", ServiceName); - for (i = 1; i < KeLoaderModuleCount; i++) + swprintf(SearchNameBuffer, L"%wZ.sys", ServiceName); + RtlInitUnicodeString(&SearchName, SearchNameBuffer); + + /* Loop the boot modules */ + ListHead = &KeLoaderBlock->LoadOrderListHead; + NextEntry = ListHead->Flink->Flink; + while (ListHead != NextEntry) { - ModuleName = (PCHAR)KeLoaderModules[i].String; - if (!_stricmp(ModuleName, SearchName)) + /* Get the entry */ + LdrEntry = CONTAINING_RECORD(NextEntry, + LDR_DATA_TABLE_ENTRY, + InLoadOrderLinks); + + /* Compare names */ + if (RtlEqualUnicodeString(&LdrEntry->BaseDllName, &SearchName, TRUE)) { - DPRINT("Initializing boot module\n"); - - /* Tell, that the module is already loaded */ - KeLoaderModules[i].Reserved = 1; - - Status = LdrProcessModule( - (PVOID)KeLoaderModules[i].ModStart, - &ServiceImagePath, - ModuleObject); - - KDB_SYMBOLFILE_HOOK(SearchName); - - break; + /* Tell, that the module is already loaded */ + LdrEntry->Flags |= LDRP_ENTRY_INSERTED; + + Status = LdrProcessModule(LdrEntry->DllBase, + &ServiceImagePath, + ModuleObject); + + KDB_SYMBOLFILE_HOOK(&SearchName); + break; } + + /* Go to the next driver */ + NextEntry = NextEntry->Flink; } + if (!NT_SUCCESS(Status)) /* Try to load it. It may just have been installed by PnP manager */ Status = LdrLoadModule(&ServiceImagePath, ModuleObject); @@ -817,23 +827,23 @@ IopInitializeBuiltinDriver( PDEVICE_NODE ModuleDeviceNode, PVOID ModuleLoadBase, - PCHAR FileName, + PUNICODE_STRING ModuleName, ULONG ModuleLength) { PLDR_DATA_TABLE_ENTRY ModuleObject; PDEVICE_NODE DeviceNode; PDRIVER_OBJECT DriverObject; NTSTATUS Status; - PCHAR FileNameWithoutPath; + PWCHAR FileNameWithoutPath; LPWSTR FileExtension; - DPRINT("Initializing driver '%s' at %08lx, length 0x%08lx\n", - FileName, ModuleLoadBase, ModuleLength); + DPRINT("Initializing driver '%wZ' at %08lx, length 0x%08lx\n", + ModuleName, ModuleLoadBase, ModuleLength); /* * Display 'Loading XXX...' message */ - IopDisplayLoadingMessage(FileName, FALSE); + IopDisplayLoadingMessage(ModuleName->Buffer, TRUE); /* * Determine the right device object @@ -845,7 +855,7 @@ Status = IopCreateDeviceNode(IopRootDeviceNode, NULL, &DeviceNode); if (!NT_SUCCESS(Status)) { - CPRINT("Driver '%s' load failed, status (%x)\n", FileName, Status); + CPRINT("Driver '%wZ' load failed, status (%x)\n", ModuleName, Status); return(Status); } } else @@ -857,30 +867,28 @@ * Generate filename without path (not needed by freeldr) */ - FileNameWithoutPath = strrchr(FileName, '\\'); + FileNameWithoutPath = wcsrchr(ModuleName->Buffer, L'\\'); if (FileNameWithoutPath == NULL) { - FileNameWithoutPath = FileName; + FileNameWithoutPath = ModuleName->Buffer; } /* * Load the module */ - - RtlCreateUnicodeStringFromAsciiz(&DeviceNode->ServiceName, - FileNameWithoutPath); + RtlCreateUnicodeString(&DeviceNode->ServiceName, FileNameWithoutPath); Status = LdrProcessModule(ModuleLoadBase, &DeviceNode->ServiceName, &ModuleObject); if (!NT_SUCCESS(Status)) { if (ModuleDeviceNode == NULL) IopFreeDeviceNode(DeviceNode); - CPRINT("Driver '%s' load failed, status (%x)\n", FileName, Status); + CPRINT("Driver '%wZ' load failed, status (%x)\n", ModuleName, Status); return Status; } /* Load symbols */ - KDB_SYMBOLFILE_HOOK(FileName); + KDB_SYMBOLFILE_HOOK(ModuleName); /* * Strip the file extension from ServiceName @@ -904,7 +912,7 @@ { if (ModuleDeviceNode == NULL) IopFreeDeviceNode(DeviceNode); - CPRINT("Driver '%s' load failed, status (%x)\n", FileName, Status); + CPRINT("Driver '%wZ' load failed, status (%x)\n", ModuleName, Status); return Status; } @@ -929,75 +937,66 @@ * None */ -VOID FASTCALL +VOID +FASTCALL IopInitializeBootDrivers(VOID) { - ULONG BootDriverCount; - ULONG ModuleStart; - ULONG ModuleSize; - ULONG ModuleLoaded; - PCHAR ModuleName; - PCHAR Extension; - ULONG i; - UNICODE_STRING DriverName; - NTSTATUS Status; - - DPRINT("IopInitializeBootDrivers()\n"); - - BootDriverCount = 0; - for (i = 0; i < KeLoaderModuleCount; i++) - { - ModuleStart = KeLoaderModules[i].ModStart; - ModuleSize = KeLoaderModules[i].ModEnd - ModuleStart; - ModuleName = (PCHAR)KeLoaderModules[i].String; - ModuleLoaded = KeLoaderModules[i].Reserved; - Extension = strrchr(ModuleName, '.'); - if (Extension == NULL) - Extension = ""; - - if (!_stricmp(Extension, ".sym") || !_stricmp(Extension, ".dll")) - { - /* Process symbols for *.exe and *.dll */ - KDB_SYMBOLFILE_HOOK(ModuleName); - - /* Log *.exe and *.dll files */ - RtlCreateUnicodeStringFromAsciiz(&DriverName, ModuleName); - IopBootLog(&DriverName, TRUE); - RtlFreeUnicodeString(&DriverName); - } - else if (!_stricmp(Extension, ".sys")) - { - /* Initialize and log boot start driver */ - if (!ModuleLoaded) - { - Status = IopInitializeBuiltinDriver(NULL, - (PVOID)ModuleStart, - ModuleName, - ModuleSize); - RtlCreateUnicodeStringFromAsciiz(&DriverName, ModuleName); - IopBootLog(&DriverName, NT_SUCCESS(Status) ? TRUE : FALSE); - RtlFreeUnicodeString(&DriverName); - } - BootDriverCount++; - } - } - - /* - * Free memory for all boot files, except ntoskrnl.exe. - */ - for (i = 1; i < KeLoaderModuleCount; i++) - { - MiFreeBootDriverMemory((PVOID)KeLoaderModules[i].ModStart, - KeLoaderModules[i].ModEnd - KeLoaderModules[i].ModStart); - } - - KeLoaderModuleCount = 0; - - if (BootDriverCount == 0) - { - DbgPrint("No boot drivers available.\n"); - KEBUGCHECK(INACCESSIBLE_BOOT_DEVICE); - } + PLIST_ENTRY ListHead, NextEntry; + PLDR_DATA_TABLE_ENTRY LdrEntry; + UNICODE_STRING NtosSymName = RTL_CONSTANT_STRING(L"ntoskrnl.sym"); + + /* Hack for NTOSKRNL.SYM */ + KDB_SYMBOLFILE_HOOK(&NtosSymName); + + /* Loop the boot modules */ + ListHead = &KeLoaderBlock->LoadOrderListHead; + NextEntry = ListHead->Flink; + while (ListHead != NextEntry) + { + /* Get the entry */ + LdrEntry = CONTAINING_RECORD(NextEntry, + LDR_DATA_TABLE_ENTRY, + InLoadOrderLinks); + + /* + * HACK: Make sure we're loading a driver + * (we should be using BootDriverListHead!) + */ + if (wcsstr(LdrEntry->BaseDllName.Buffer, L".sys")) + { + /* Make sure we didn't load this driver already */ + if (!(LdrEntry->Flags & LDRP_ENTRY_INSERTED)) + { + /* Initialize it */ + IopInitializeBuiltinDriver(NULL, + LdrEntry->DllBase, + &LdrEntry->BaseDllName, + LdrEntry->SizeOfImage); + } + } + + /* Go to the next driver */ + NextEntry = NextEntry->Flink; + } + + /* Loop modules again */ + NextEntry = ListHead->Flink->Flink; + while (ListHead != NextEntry) + { + /* Get the entry */ + LdrEntry = CONTAINING_RECORD(NextEntry, + LDR_DATA_TABLE_ENTRY, + InLoadOrderLinks); + + /* Free memory */ + MiFreeBootDriverMemory(LdrEntry->DllBase, LdrEntry->SizeOfImage); + + /* Go to the next driver */ + NextEntry = NextEntry->Flink; + } + + /* In old ROS, the loader list became empty after this point. Simulate. */ + InitializeListHead(&KeLoaderBlock->LoadOrderListHead); } /* Modified: trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_symbols.… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c Sun Oct 1 09:05:57 2006 @@ -588,29 +588,28 @@ * \param FileName Filename for which the symbols are loaded. */ VOID -KdbSymProcessBootSymbols(IN PCHAR FileName) +KdbSymProcessBootSymbols(IN PUNICODE_STRING FileName) { PLDR_DATA_TABLE_ENTRY ModuleObject; - UNICODE_STRING UnicodeString; - ANSI_STRING AnsiString; - ULONG i; + BOOLEAN Found = FALSE; BOOLEAN IsRaw; - - DPRINT("KdbSymProcessBootSymbols(%s)\n", FileName); - - if (0 == _stricmp(FileName, "ntoskrnl.sym")) - { - RtlInitAnsiString(&AnsiString, "ntoskrnl.exe"); + PLIST_ENTRY ListHead, NextEntry; + PLDR_DATA_TABLE_ENTRY LdrEntry; + UNICODE_STRING NtosSymName = RTL_CONSTANT_STRING(L"ntoskrnl.sym"); + UNICODE_STRING NtosName = RTL_CONSTANT_STRING(L"ntoskrnl.exe"); + DPRINT("KdbSymProcessBootSymbols(%wZ)\n", FileName); + + if (RtlEqualUnicodeString(FileName, &NtosSymName, TRUE)) + { + FileName = &NtosName; IsRaw = TRUE; } else { - RtlInitAnsiString(&AnsiString, FileName); IsRaw = FALSE; } - RtlAnsiStringToUnicodeString(&UnicodeString, &AnsiString, TRUE); - ModuleObject = LdrGetModuleObject(&UnicodeString); - RtlFreeUnicodeString(&UnicodeString); + + ModuleObject = LdrGetModuleObject(FileName); if (ModuleObject != NULL) { @@ -620,16 +619,27 @@ return; } - for (i = 0; i < KeLoaderModuleCount; i++) + ListHead = &KeLoaderBlock->LoadOrderListHead; + NextEntry = ListHead->Flink; + while (ListHead != NextEntry) { - if (0 == _stricmp(FileName, (PCHAR)KeLoaderModules[i].String)) - { - break; - } - } - if (i < KeLoaderModuleCount) + /* Get the entry */ + LdrEntry = CONTAINING_RECORD(NextEntry, + LDR_DATA_TABLE_ENTRY, + InLoadOrderLinks); + + if (RtlEqualUnicodeString(FileName, &LdrEntry->BaseDllName, TRUE)) + { + Found = TRUE; + break; + } + + /* Go to the next one */ + NextEntry = NextEntry->Flink; + } + + if (Found) { - KeLoaderModules[i].Reserved = 1; if (ModuleObject->PatchInformation != NULL) { KdbpSymRemoveCachedFile(ModuleObject->PatchInformation); @@ -637,8 +647,8 @@ if (IsRaw) { - if (! RosSymCreateFromRaw((PVOID) KeLoaderModules[i].ModStart, - KeLoaderModules[i].ModEnd - KeLoaderModules[i].ModStart, + if (! RosSymCreateFromRaw(LdrEntry->DllBase, + LdrEntry->SizeOfImage, (PROSSYM_INFO*)&ModuleObject->PatchInformation)) { return; @@ -646,8 +656,8 @@ } else { - if (! RosSymCreateFromMem((PVOID) KeLoaderModules[i].ModStart, - KeLoaderModules[i].ModEnd - KeLoaderModules[i].ModStart, + if (! RosSymCreateFromMem(LdrEntry->DllBase, + LdrEntry->SizeOfImage, (PROSSYM_INFO*)&ModuleObject->PatchInformation)) { return; @@ -655,12 +665,9 @@ } /* add file to cache */ - RtlInitAnsiString(&AnsiString, FileName); - RtlAnsiStringToUnicodeString(&UnicodeString, &AnsiString, TRUE); - KdbpSymAddCachedFile(&UnicodeString, ModuleObject->PatchInformation); - RtlFreeUnicodeString(&UnicodeString); - - DPRINT("Installed symbols: %s@%08x-%08x %p\n", + KdbpSymAddCachedFile(FileName, ModuleObject->PatchInformation); + + DPRINT("Installed symbols: %wZ@%08x-%08x %p\n", FileName, ModuleObject->DllBase, ModuleObject->SizeOfImage + (ULONG)ModuleObject->DllBase, Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kiinit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kiinit.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/kiinit.c Sun Oct 1 09:05:57 2006 @@ -379,7 +379,7 @@ KiInitializeKernel(&KiInitialProcess.Pcb, InitialThread, InitialStack, - &Pcr->PrcbData, //(PKPRCB)__readfsdword(KPCR_PRCB), + (PKPRCB)__readfsdword(KPCR_PRCB), Cpu, LoaderBlock);

1 0

[amunger] 24330: WaxDragon curses BrandonTurner.
by amunger＠svn.reactos.org 01 Oct '06

01 Oct '06

Author: amunger Date: Sun Oct 1 08:57:50 2006 New Revision: 24330 URL: http://svn.reactos.org/svn/reactos?rev=24330&view=rev Log: WaxDragon curses BrandonTurner. Modified: branches/ros-branch-0_3_1/reactos/config.rbuild Modified: branches/ros-branch-0_3_1/reactos/config.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/config… ============================================================================== --- branches/ros-branch-0_3_1/reactos/config.rbuild (original) +++ branches/ros-branch-0_3_1/reactos/config.rbuild Sun Oct 1 08:57:50 2006 @@ -44,14 +44,14 @@  -<property name="KDBG" value="1" /> +<property name="KDBG" value="0" />  -<property name="DBG" value="1" /> +<property name="DBG" value="0" /> <!--

1 0

[amunger] 24329: Oops. I forgot the branch has a config.rbuild...
by amunger＠svn.reactos.org 01 Oct '06

01 Oct '06

Author: amunger Date: Sun Oct 1 08:47:34 2006 New Revision: 24329 URL: http://svn.reactos.org/svn/reactos?rev=24329&view=rev Log: Oops. I forgot the branch has a config.rbuild... Modified: branches/ros-branch-0_3_1/reactos/config.rbuild Modified: branches/ros-branch-0_3_1/reactos/config.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/config… ============================================================================== --- branches/ros-branch-0_3_1/reactos/config.rbuild (original) +++ branches/ros-branch-0_3_1/reactos/config.rbuild Sun Oct 1 08:47:34 2006 @@ -67,6 +67,6 @@ enable this (except they/you purchased a license from the patent owner). This settings is disabled (0) by default. --> -<property name="NSWPAT" value="1" /> +<property name="NSWPAT" value="0" /> </rbuild>

1 0

[amunger] 24328: Sync win32k and gdi32_winetest from trunk. Merged 24228-24229, 24231, 24234-24239, 24255-24257, 24260-24264, 24266-24268, 24270-24271, 24287-24288.
by amunger＠svn.reactos.org 01 Oct '06

01 Oct '06

Author: amunger Date: Sun Oct 1 08:37:32 2006 New Revision: 24328 URL: http://svn.reactos.org/svn/reactos?rev=24328&view=rev Log: Sync win32k and gdi32_winetest from trunk. Merged 24228-24229, 24231, 24234-24239, 24255-24257, 24260-24264, 24266-24268, 24270-24271, 24287-24288. Added: branches/ros-branch-0_3_1/reactos/regtests/winetests/gdi32/clipping.c - copied unchanged from r24249, trunk/reactos/regtests/winetests/gdi32/clipping.c branches/ros-branch-0_3_1/reactos/regtests/winetests/gdi32/dc.c - copied unchanged from r24249, trunk/reactos/regtests/winetests/gdi32/dc.c branches/ros-branch-0_3_1/reactos/regtests/winetests/gdi32/font.c - copied unchanged from r24249, trunk/reactos/regtests/winetests/gdi32/font.c branches/ros-branch-0_3_1/reactos/regtests/winetests/gdi32/mapping.c - copied unchanged from r24264, trunk/reactos/regtests/winetests/gdi32/mapping.c branches/ros-branch-0_3_1/reactos/regtests/winetests/gdi32/palette.c - copied unchanged from r24264, trunk/reactos/regtests/winetests/gdi32/palette.c Removed: branches/ros-branch-0_3_1/reactos/regtests/winetests/gdi/ Modified: branches/ros-branch-0_3_1/reactos/config.rbuild branches/ros-branch-0_3_1/reactos/include/psdk/wingdi.h branches/ros-branch-0_3_1/reactos/regtests/winetests/gdi32/bitmap.c branches/ros-branch-0_3_1/reactos/regtests/winetests/gdi32/brush.c branches/ros-branch-0_3_1/reactos/regtests/winetests/gdi32/gdi32.rbuild branches/ros-branch-0_3_1/reactos/regtests/winetests/gdi32/gdiobj.c branches/ros-branch-0_3_1/reactos/regtests/winetests/gdi32/metafile.c branches/ros-branch-0_3_1/reactos/regtests/winetests/gdi32/testlist.c branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/include/brush.h branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/include/dc.h branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/include/path.h branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/include/pen.h branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/objects/bitmaps.c branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/objects/brush.c branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/objects/coord.c branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/objects/dc.c branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/objects/dibobj.c branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/objects/metafile.c branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/objects/path.c branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/objects/pen.c branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/objects/text.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ros-branch-0_3_1/reactos/config.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/config… Modified: branches/ros-branch-0_3_1/reactos/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/includ… Modified: branches/ros-branch-0_3_1/reactos/regtests/winetests/gdi32/bitmap.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/regtes… Modified: branches/ros-branch-0_3_1/reactos/regtests/winetests/gdi32/brush.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/regtes… Modified: branches/ros-branch-0_3_1/reactos/regtests/winetests/gdi32/gdi32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/regtes… Modified: branches/ros-branch-0_3_1/reactos/regtests/winetests/gdi32/gdiobj.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/regtes… Modified: branches/ros-branch-0_3_1/reactos/regtests/winetests/gdi32/metafile.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/regtes… Modified: branches/ros-branch-0_3_1/reactos/regtests/winetests/gdi32/testlist.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/regtes… Modified: branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/include/brush.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/subsys… Modified: branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/subsys… Modified: branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/include/path.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/subsys… Modified: branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/include/pen.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/subsys… Modified: branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/subsys… Modified: branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/objects/brush.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/subsys… Modified: branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/objects/coord.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/subsys… Modified: branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/subsys… Modified: branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/subsys… Modified: branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/objects/metafile.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/subsys… Modified: branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/objects/path.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/subsys… Modified: branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/objects/pen.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/subsys… Modified: branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/subsys…

1 0

[arty] 24327: Remove the need to relocate freeldr. We now use it in-place as stored in ofwldr's .data. Fix call_ofw for more modern macs. Add more debugging type calls to calls.ofw.
by arty＠svn.reactos.org 01 Oct '06

01 Oct '06

Author: arty Date: Sun Oct 1 07:30:06 2006 New Revision: 24327 URL: http://svn.reactos.org/svn/reactos?rev=24327&view=rev Log: Remove the need to relocate freeldr. We now use it in-place as stored in ofwldr's .data. Fix call_ofw for more modern macs. Add more debugging type calls to calls.ofw. Modified: branches/powerpc/reactos/boot/freeldr/bootsect/ofw_util.s branches/powerpc/reactos/boot/freeldr/bootsect/ofwboot.s branches/powerpc/reactos/tools/ofw_interface/calls.ofw branches/powerpc/reactos/tools/ppc.lost+found/link-freeldr Modified: branches/powerpc/reactos/boot/freeldr/bootsect/ofw_util.s URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/bo… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/bootsect/ofw_util.s (original) +++ branches/powerpc/reactos/boot/freeldr/bootsect/ofw_util.s Sun Oct 1 07:30:06 2006 @@ -25,56 +25,80 @@ * Other arg registers are unchanged. * Note that these 4 instructions are in reverse order due to * little-endian convention */ + stw %r8,24(%r1) + subi %r1,%r1,0x100 + stw %r8,0(%r1) + mflr %r8 + /* - */ + stw %r3,4(%r1) + stw %r4,8(%r1) + stw %r5,12(%r1) + stw %r6,16(%r1) + /* - */ + stw %r7,20(%r1) + stw %r9,28(%r1) + stw %r10,32(%r1) + stw %r20,36(%r1) + + /* - */ subi %r20,%r20,1 mfmsr %r20 mtmsr %r20 nop - /* Now normal ordering resumes */ - subi %r1,%r1,0x100 - - stw %r8,4(%r1) - stw %r9,8(%r1) - stw %r10,12(%r1) + + sync + isync + + /* BE MODE */ mflr %r8 stw %r8,16(%r1) lis %r10,0xe00000@ha addi %r8,%r10,ofw_functions_addr@l + /* - */ lwz %r9,0(%r8) add %r8,%r3,%r9 lwz %r9,0(%r8) mtctr %r9 + /* - */ mr %r3,%r4 mr %r4,%r5 mr %r5,%r6 mr %r6,%r7 + /* - */ mr %r7,%r8 mr %r8,%r9 - /* Goto the swapped function */ + /* Call ofw proxy function */ bctrl - - lwz %r8,16(%r1) - mtlr %r8 - - lwz %r8,4(%r1) - lwz %r9,8(%r1) - lwz %r10,12(%r1) - + nop + + /* Ok, go back to little endian */ + mfmsr %r10 + ori %r10,%r10,1 + nop + mtmsr %r10 + + sync + isync + + /* LE MODE */ + mtlr %r8 + lwz %r8,0(%r1) + lwz %r4,8(%r1) + lwz %r5,12(%r1) + /* - */ + lwz %r6,16(%r1) + lwz %r7,20(%r1) + lwz %r8,24(%r1) + lwz %r9,28(%r1) + /* - */ + lwz %r10,32(%r1) + lwz %r20,36(%r1) + /* - */ + blr addi %r1,%r1,0x100 - /* Ok, go back to little endian */ - - .align 4 - mfmsr %r0 - ori %r0,%r0,1 - - nop - mtmsr %r0 - - /* Note that this is little-endian from here on */ - blr - nop prim_strlen: mr %r5,%r3 @@ -93,6 +117,10 @@ cmp 0,0,%r3,%r4 bgelr + andi. %r6,%r3,0xfff + beql ofw_dumpregs + mtdec %r3 + lwz %r6,0(%r3) stw %r6,0(%r5) addi %r3,%r3,4 Modified: branches/powerpc/reactos/boot/freeldr/bootsect/ofwboot.s URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/bo… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/bootsect/ofwboot.s (original) +++ branches/powerpc/reactos/boot/freeldr/bootsect/ofwboot.s Sun Oct 1 07:30:06 2006 @@ -23,56 +23,14 @@ addi %r3,%r3,freeldr_banner - _start bl ofw_print_string - bl ofw_print_eol - - /* Claim enough bytes to place freeldr at 0x8000 */ - lis %r3,0x8000@ha - li %r3,0x8000@l - - lis %r4,_binary_freeldr_tmp_end@ha - addi %r4,%r4,_binary_freeldr_tmp_end@l - lis %r5,_binary_freeldr_tmp_start@ha - addi %r5,%r5,_binary_freeldr_tmp_start@l - sub %r4,%r4,%r5 - li %r5,0x1000 - - bl ofw_claim - - /* Now copy freeldr */ - lis %r3,0x8000@ha - addi %r3,%r3,0x8000@l - - lis %r4,_binary_freeldr_tmp_end@ha - addi %r4,%r4,_binary_freeldr_tmp_end@l - lis %r5,_binary_freeldr_tmp_start@ha - addi %r5,%r5,_binary_freeldr_tmp_start@l - /* Make sufficient room for .bss */ - sub %r4,%r4,%r5 - addi %r4,%r4,0x6000 - - xor %r5,%r5,%r5 - li %r5,0x1000 - - bl ofw_claim - - lis %r4,_binary_freeldr_tmp_end@ha - addi %r4,%r4,_binary_freeldr_tmp_end@l - lis %r3,_binary_freeldr_tmp_start@ha - addi %r3,%r3,_binary_freeldr_tmp_start@l - - lis %r5,0x8000@ha - addi %r5,%r5,0x8000@l - - bl ofw_dumpregs - bl copy_bits bl zero_registers /* Zero CTR */ mtcr %r31 - lis %r3,0x8000@ha - addi %r3,%r3,0x8000@l + lis %r3,0xe17000@ha + addi %r3,%r3,0xe17000@l mtlr %r3 Modified: branches/powerpc/reactos/tools/ofw_interface/calls.ofw URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ofw_inter… ============================================================================== --- branches/powerpc/reactos/tools/ofw_interface/calls.ofw (original) +++ branches/powerpc/reactos/tools/ofw_interface/calls.ofw Sun Oct 1 07:30:06 2006 @@ -22,6 +22,8 @@ -dumpregs 0 0 -print_string 1 0 char* -print_number 1 0 int +-print_eol 0 0 +-print_space 0 0 # MMU Methods @phys2virt!translate 4 1 int int int int&0 int @virt2phys!translate 2 1 int int&1 int Modified: branches/powerpc/reactos/tools/ppc.lost+found/link-freeldr URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc.lost%… ============================================================================== --- branches/powerpc/reactos/tools/ppc.lost+found/link-freeldr (original) +++ branches/powerpc/reactos/tools/ppc.lost+found/link-freeldr Sun Oct 1 07:30:06 2006 @@ -1,9 +1,10 @@ #!/bin/sh -v export PATH=$PATH:/usr/local/pkg/reactos-powerpc/bin -ld -EL -g -nostartfiles -nostdlib -N -Ttext=0x8000 -o freeldr.elf obj-ppc/boot/freeldr/freeldr/arch/powerpc/boot.o obj-ppc/boot/freeldr/freeldr/cache/blocklist.o obj-ppc/boot/freeldr/freeldr/cache/cache.o obj-ppc/boot/freeldr/freeldr/comm/rs232.o obj-ppc/boot/freeldr/freeldr/disk/disk.o obj-ppc/boot/freeldr/freeldr/disk/partition.o obj-ppc/boot/freeldr/freeldr/fs/ext2.o obj-ppc/boot/freeldr/freeldr/fs/fat.o obj-ppc/boot/freeldr/freeldr/fs/fs.o obj-ppc/boot/freeldr/freeldr/fs/fsrec.o obj-ppc/boot/freeldr/freeldr/fs/iso.o obj-ppc/boot/freeldr/freeldr/fs/ntfs.o obj-ppc/boot/freeldr/freeldr/inifile/ini_init.o obj-ppc/boot/freeldr/freeldr/inifile/inifile.o obj-ppc/boot/freeldr/freeldr/inifile/parse.o obj-ppc/boot/freeldr/freeldr/math/libgcc2.o obj-ppc/boot/freeldr/freeldr/mm/meminit.o obj-ppc/boot/freeldr/freeldr/mm/mm.o obj-ppc/boot/freeldr/freeldr/reactos/registry.o obj-ppc/boot/freeldr/freeldr/reactos/binhive.o obj-ppc/boot/freeldr/freeldr/reactos/arcname.o obj-ppc/boot/freeldr/freeldr/reactos/reactos.o obj-ppc/boot/freeldr/freeldr/rtl/list.o obj-ppc/boot/freeldr/freeldr/ui/gui.o obj-ppc/boot/freeldr/freeldr/ui/tui.o obj-ppc/boot/freeldr/freeldr/ui/tuimenu.o obj-ppc/boot/freeldr/freeldr/ui/ui.o obj-ppc/boot/freeldr/freeldr/video/bank.o obj-ppc/boot/freeldr/freeldr/video/fade.o obj-ppc/boot/freeldr/freeldr/video/palette.o obj-ppc/boot/freeldr/freeldr/video/pixel.o obj-ppc/boot/freeldr/freeldr/video/video.o obj-ppc/boot/freeldr/freeldr/freeldr.o obj-ppc/boot/freeldr/freeldr/debug.o obj-ppc/boot/freeldr/freeldr/version.o obj-ppc/boot/freeldr/freeldr/cmdline.o obj-ppc/boot/freeldr/freeldr/machine.o obj-ppc/boot/freeldr/freeldr/arch/powerpc/mach.o obj-ppc/boot/freeldr/freeldr/arch/powerpc/ofw.o obj-ppc/boot/freeldr/freeldr/arch/powerpc/mmu.o obj-ppc/boot/freeldr/freeldr/arch/powerpc/mboot.o obj-ppc/boot/freeldr/freeldr/bootmgr.o obj-ppc/boot/freeldr/freeldr/drivemap.o obj-ppc/boot/freeldr/freeldr/miscboot.o obj-ppc/boot/freeldr/freeldr/options.o obj-ppc/boot/freeldr/freeldr/linuxboot.o obj-ppc/boot/freeldr/freeldr/oslist.o obj-ppc/boot/freeldr/freeldr/custom.o obj-ppc/lib/rossym/rossym.a obj-ppc/lib/cmlib/cmlib.a obj-ppc/lib/string/string.a obj-ppc/lib/rtl/rtl.a /usr/local/pkg/reactos-powerpc/lib/libgcc.a -objcopy -O binary freeldr.elf freeldr.tmp.le +powerpc-unknown-linux-gnu-ld -EL -g -nostartfiles -nostdlib -N -Ttext=0xe17000 -o freeldr.elf obj-ppc/boot/freeldr/freeldr/arch/powerpc/boot.o obj-ppc/boot/freeldr/freeldr/cache/blocklist.o obj-ppc/boot/freeldr/freeldr/cache/cache.o obj-ppc/boot/freeldr/freeldr/comm/rs232.o obj-ppc/boot/freeldr/freeldr/disk/disk.o obj-ppc/boot/freeldr/freeldr/disk/partition.o obj-ppc/boot/freeldr/freeldr/fs/ext2.o obj-ppc/boot/freeldr/freeldr/fs/fat.o obj-ppc/boot/freeldr/freeldr/fs/fs.o obj-ppc/boot/freeldr/freeldr/fs/fsrec.o obj-ppc/boot/freeldr/freeldr/fs/iso.o obj-ppc/boot/freeldr/freeldr/fs/ntfs.o obj-ppc/boot/freeldr/freeldr/inifile/ini_init.o obj-ppc/boot/freeldr/freeldr/inifile/inifile.o obj-ppc/boot/freeldr/freeldr/inifile/parse.o obj-ppc/boot/freeldr/freeldr/math/libgcc2.o obj-ppc/boot/freeldr/freeldr/mm/meminit.o obj-ppc/boot/freeldr/freeldr/mm/mm.o obj-ppc/boot/freeldr/freeldr/reactos/registry.o obj-ppc/boot/freeldr/freeldr/reactos/binhive.o obj-ppc/boot/freeldr/freeldr/reactos/arcname.o obj-ppc/boot/freeldr/freeldr/reactos/reactos.o obj-ppc/boot/freeldr/freeldr/rtl/list.o obj-ppc/boot/freeldr/freeldr/ui/gui.o obj-ppc/boot/freeldr/freeldr/ui/tui.o obj-ppc/boot/freeldr/freeldr/ui/tuimenu.o obj-ppc/boot/freeldr/freeldr/ui/ui.o obj-ppc/boot/freeldr/freeldr/video/bank.o obj-ppc/boot/freeldr/freeldr/video/fade.o obj-ppc/boot/freeldr/freeldr/video/palette.o obj-ppc/boot/freeldr/freeldr/video/pixel.o obj-ppc/boot/freeldr/freeldr/video/video.o obj-ppc/boot/freeldr/freeldr/freeldr.o obj-ppc/boot/freeldr/freeldr/debug.o obj-ppc/boot/freeldr/freeldr/version.o obj-ppc/boot/freeldr/freeldr/cmdline.o obj-ppc/boot/freeldr/freeldr/machine.o obj-ppc/boot/freeldr/freeldr/arch/powerpc/mach.o obj-ppc/boot/freeldr/freeldr/arch/powerpc/ofw.o obj-ppc/boot/freeldr/freeldr/arch/powerpc/mmu.o obj-ppc/boot/freeldr/freeldr/arch/powerpc/mboot.o obj-ppc/boot/freeldr/freeldr/bootmgr.o obj-ppc/boot/freeldr/freeldr/drivemap.o obj-ppc/boot/freeldr/freeldr/miscboot.o obj-ppc/boot/freeldr/freeldr/options.o obj-ppc/boot/freeldr/freeldr/linuxboot.o obj-ppc/boot/freeldr/freeldr/oslist.o obj-ppc/boot/freeldr/freeldr/custom.o obj-ppc/lib/rossym/rossym.a obj-ppc/lib/cmlib/cmlib.a obj-ppc/lib/string/string.a obj-ppc/lib/rtl/rtl.a /usr/local/pkg/reactos-powerpc/lib/libgcc.a +powerpc-unknown-linux-gnu-objcopy -O binary freeldr.elf freeldr.tmp.le output-ppc/tools/ppc-le2be freeldr.tmp.le freeldr.tmp -objcopy -I binary -B powerpc:common -O elf32-powerpc freeldr.tmp ofwldr.payload +powerpc-unknown-linux-gnu-objcopy -I binary -B powerpc:common -O elf32-powerpc freeldr.tmp ofwldr.payload reactos-powerpc-as -mbig -o ofwboot.o boot/freeldr/bootsect/ofwboot.s boot/freeldr/bootsect/ofw_util.s boot/freeldr/bootsect/ofw.s -ld -EB -Ttext 0xe00000 -Tdata 0xe17000 -e _begin -o ofwldr ofwboot.o ofwldr.payload +powerpc-unknown-linux-gnu-ld -EB -Ttext 0xe00000 -Tdata 0xe17000 -e _begin -o ofwldr.x ofwboot.o ofwldr.payload +powerpc-unknown-linux-gnu-objcopy --only-section=.text --only-section=.data ofwldr.x ofwldr

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 October 2006