Ros-diffs August 2011

ros-diffs@reactos.org

18 participants
498 discussions

[cgutman] 53461: [ACPI] - Skip fixed feature buttons when reporting resources - Terminate the hardware ID list with 2 NULL characters

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Aug 26 23:46:32 2011 New Revision: 53461 URL: http://svn.reactos.org/svn/reactos?rev=53461&view=rev Log: [ACPI] - Skip fixed feature buttons when reporting resources - Terminate the hardware ID list with 2 NULL characters Modified: trunk/reactos/drivers/bus/acpi/acpienum.c trunk/reactos/drivers/bus/acpi/buspdo.c Modified: trunk/reactos/drivers/bus/acpi/acpienum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpienum.… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpienum.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpienum.c [iso-8859-1] Fri Aug 26 23:46:32 2011 @@ -92,7 +92,7 @@ L"*%hs", Device->pnp.hardware_id); index++; - temp[index] = UNICODE_NULL; + temp[++index] = UNICODE_NULL; pdoData->HardwareIDs = ExAllocatePool(NonPagedPool, index*sizeof(WCHAR)); Modified: trunk/reactos/drivers/bus/acpi/buspdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/buspdo.c?… ============================================================================== --- trunk/reactos/drivers/bus/acpi/buspdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/buspdo.c [iso-8859-1] Fri Aug 26 23:46:32 2011 @@ -656,6 +656,11 @@ ULONG i; ULONGLONG BusNumber; + if (!DeviceData->AcpiHandle) + { + return Irp->IoStatus.Status; + } + /* A bus number resource is not included in the list of current resources * for the root PCI bus so we manually query one here and if we find it * we create a resource list and add a bus number descriptor to it */ @@ -1103,6 +1108,10 @@ PAGED_CODE (); + if (!DeviceData->AcpiHandle) + { + return Irp->IoStatus.Status; + } /* Get current resources */ while (TRUE)

13 years, 4 months

[tkreuzer] 53460: [NMIDEBUG] Fix amd64 build

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Aug 26 20:05:58 2011 New Revision: 53460 URL: http://svn.reactos.org/svn/reactos?rev=53460&view=rev Log: [NMIDEBUG] Fix amd64 build Modified: trunk/reactos/drivers/base/CMakeLists.txt trunk/reactos/drivers/base/nmidebug/nmidebug.c Modified: trunk/reactos/drivers/base/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/CMakeLists.tx… ============================================================================== --- trunk/reactos/drivers/base/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/base/CMakeLists.txt [iso-8859-1] Fri Aug 26 20:05:58 2011 @@ -7,7 +7,5 @@ else() add_subdirectory(kdcom) endif() -if(ARCH MATCHES i386) - add_subdirectory(nmidebug) -endif() +add_subdirectory(nmidebug) add_subdirectory(null) Modified: trunk/reactos/drivers/base/nmidebug/nmidebug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/nmidebug/nmid… ============================================================================== --- trunk/reactos/drivers/base/nmidebug/nmidebug.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/nmidebug/nmidebug.c [iso-8859-1] Fri Aug 26 20:05:58 2011 @@ -21,6 +21,7 @@ { ((PCHAR)&KiBugCheckData[4])[0] -= (NmiBegin[3] | NmiBegin[7]); ((PCHAR)&KiBugCheckData[4])[3] |= 1; +#ifdef _M_IX86 #ifdef _MSC_VER __asm { @@ -28,6 +29,7 @@ } #else __asm__("rcrl %b[shift], %k[retval]" : [retval] "=rm" (KiBugCheckData[4]) : "[retval]" (KiBugCheckData[4]), [shift] "Nc" (8)); +#endif #endif } @@ -44,7 +46,9 @@ ((void(*)())&KiBugCheckData[4])(); /* Handle the NMI safely */ +#ifdef _M_IX86 KiEnableTimerWatchdog = (RtlCompareMemory(NmiBegin, NmiBegin + 4, 4) != 4); +#endif return TRUE; }

13 years, 4 months

[tkreuzer] 53459: [FREELDR] - fix a bug in x86 PnpBiosGetDeviceNodeCount - enable pxe for amd64 (not yet implemented though) - store boot drive and boot partition in shared memory isnetad of relyin...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Aug 26 20:00:17 2011 New Revision: 53459 URL: http://svn.reactos.org/svn/reactos?rev=53459&view=rev Log: [FREELDR] - fix a bug in x86 PnpBiosGetDeviceNodeCount - enable pxe for amd64 (not yet implemented though) - store boot drive and boot partition in shared memory isnetad of relying on a register, which seems to be erased on switch to long mode 64 bit freeldr is back on track! Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/entry.S trunk/reactos/boot/freeldr/freeldr/arch/i386/i386pnp.cmake.S trunk/reactos/boot/freeldr/freeldr/arch/realmode/amd64.S trunk/reactos/boot/freeldr/freeldr/fs/fs.c trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/entry.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/amd64/entry.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/amd64/entry.S [iso-8859-1] Fri Aug 26 20:00:17 2011 @@ -31,9 +31,10 @@ FrldrStartup: /* Store BootDrive and BootPartition */ - mov byte ptr [FrldrBootDrive], dl + mov al, byte ptr [BSS_BootDrive] + mov byte ptr [FrldrBootDrive], al xor eax, eax - mov al, dh + mov al, byte ptr [BSS_BootPartition] mov dword ptr [FrldrBootPartition], eax /* Patch long jump with real mode entry point */ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386pnp.cmake.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/i386pnp.cmake.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/i386pnp.cmake.S [iso-8859-1] Fri Aug 26 20:00:17 2011 @@ -120,7 +120,7 @@ mov esi, [ebp + 12] mov ax, [BSS_PnpNodeCount] movzx ecx, ax - mov [esi], eax + mov [esi], ecx pop es popa @@ -140,7 +140,6 @@ */ PUBLIC _PnpBiosGetDeviceNode _PnpBiosGetDeviceNode: - .code32 push ebp mov ebp, esp Modified: trunk/reactos/boot/freeldr/freeldr/arch/realmode/amd64.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/realmode/amd64.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/realmode/amd64.S [iso-8859-1] Fri Aug 26 20:00:17 2011 @@ -24,6 +24,10 @@ mov fs, ax mov gs, ax mov ss, ax + + /* Save the boot drive and partition */ + mov byte ptr ds:[BSS_BootDrive], dl + mov byte ptr ds:[BSS_BootPartition], dh /* Setup a real mode stack */ mov sp, word ptr ds:[stack16] @@ -118,6 +122,7 @@ CheckFor64BitSupport: /* Check if CPU supports CPUID */ + pushad pushfd pop eax mov ebx, eax @@ -131,6 +136,7 @@ mov si, offset .Msg_NoCpuidSupport call writestr + popad xor al, al ret @@ -147,6 +153,7 @@ mov si, offset .Msg_NoPAE call writestr + popad xor al, al ret @@ -163,6 +170,7 @@ mov si, offset .Msg_NoLongMode call writestr + popad xor al, al ret @@ -170,6 +178,7 @@ .ascii "Long mode is not supported.", CR, LF, NUL .Success: + popad xor al, al inc al ret @@ -291,8 +300,8 @@ mov cr4, eax /* Point cr3 at the PML4 */ - mov edx, PML4_ADDRESS - mov cr3, edx + mov eax, PML4_ADDRESS + mov cr3, eax /* Enable long mode */ mov ecx, MSR_EFER @@ -302,9 +311,9 @@ /* Activate long mode by enabling paging and protection simultaneously, skipping protected mode entirely */ - mov ebx, cr0 - or ebx, HEX(80000001) - mov cr0, ebx + mov eax, cr0 + or eax, HEX(80000001) + mov cr0, eax /* Clear prefetch queue & correct CS */ ljmp16 LMODE_CS, InLongMode Modified: trunk/reactos/boot/freeldr/freeldr/fs/fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/fs… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/fs.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/fs.c [iso-8859-1] Fri Aug 26 20:00:17 2011 @@ -339,7 +339,7 @@ if (!FileData[DeviceId].FileFuncTable) FileData[DeviceId].FileFuncTable = Ext2Mount(DeviceId); #endif -#ifdef _M_IX86 +#if defined(_M_IX86) || defined(_M_AMD64) if (!FileData[DeviceId].FileFuncTable) FileData[DeviceId].FileFuncTable = PxeMount(DeviceId); #endif Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h [iso-8859-1] Fri Aug 26 20:00:17 2011 @@ -56,6 +56,8 @@ #define BSS_PnpNodeCount (BSS_START + 96) #define BSS_PnpNodeNumber (BSS_START + 100) #define BSS_PnpResult (BSS_START + 104) +#define BSS_BootDrive (BSS_START + 108) // 1 byte +#define BSS_BootPartition (BSS_START + 109) // 1 byte /* Realmode function IDs */

13 years, 4 months

[tkreuzer] 53458: [HAL] Fix amd64 build

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Aug 26 19:45:21 2011 New Revision: 53458 URL: http://svn.reactos.org/svn/reactos?rev=53458&view=rev Log: [HAL] Fix amd64 build Modified: trunk/reactos/hal/CMakeLists.txt trunk/reactos/hal/halx86/CMakeLists.txt trunk/reactos/hal/halx86/amd64/systimer.S Modified: trunk/reactos/hal/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/CMakeLists.txt?rev=534… ============================================================================== --- trunk/reactos/hal/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/hal/CMakeLists.txt [iso-8859-1] Fri Aug 26 19:45:21 2011 @@ -1,5 +1,5 @@ -if(ARCH MATCHES i386 OR ARCH MATCHES amd64) +if((ARCH MATCHES i386) OR (ARCH MATCHES amd64)) add_subdirectory(halx86) elseif(ARCH MATCHES arm) # add_subdirectory(halarm) Modified: trunk/reactos/hal/halx86/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/CMakeLists.txt?… ============================================================================== --- trunk/reactos/hal/halx86/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/CMakeLists.txt [iso-8859-1] Fri Aug 26 19:45:21 2011 @@ -129,7 +129,36 @@ add_dependencies(mini_hal psdk bugcodes asm) elseif(ARCH MATCHES amd64) -#TBD + + spec2def(hal.dll ../hal.spec) + + list(APPEND HAL_SOURCE + ${HAL_GENERIC_SOURCE} + ${HAL_GENERIC_PCAT_SOURCE} + ${HAL_GENERIC_UP_SOURCE} + up/halinit_up.c + up/halup.rc + generic/spinlock.c + amd64/x86bios.c + amd64/halinit.c + amd64/stubs.c + amd64/systimer.S + amd64/processor.c + ${CMAKE_CURRENT_BINARY_DIR}/hal.def) + + # hal + add_library(hal SHARED ${HAL_SOURCE}) + add_pch(hal include/hal.h) + add_dependencies(hal psdk bugcodes) + + set_entrypoint(hal HalInitSystem) + set_subsystem(hal native) + set_image_base(hal 0x00010000) + add_importlibs(hal ntoskrnl) + target_link_libraries(hal libcntpr) + + add_cd_file(TARGET hal DESTINATION reactos/system32 NO_CAB FOR all) + endif() add_importlib_target(../hal.spec) Modified: trunk/reactos/hal/halx86/amd64/systimer.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/amd64/systimer.… ============================================================================== --- trunk/reactos/hal/halx86/amd64/systimer.S [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/amd64/systimer.S [iso-8859-1] Fri Aug 26 19:45:21 2011 @@ -8,21 +8,19 @@ /* INCLUDES ******************************************************************/ #include <asm.inc> - #include <ksamd64.inc> /* GLOBALS *******************************************************************/ .data -.global MsgUnimplemented +PUBLIC MsgUnimplemented MsgUnimplemented: .asciz "WARNING: %s at %s:%d is UNIMPLEMENTED!\n" /* FUNCTIONS *****************************************************************/ -.text .code64 PUBLIC HalpCalibrateStallExecution@0 @@ -40,7 +38,7 @@ jecxz Done /* Multiply by the stall factor */ - mov eax, gs:[KPCR_STALL_SCALE_FACTOR] + mov eax, gs:[PcStallScaleFactor] mul ecx /* Align to 16 bytes */ @@ -71,14 +69,14 @@ /* Set timer data */ mov al, 0 - out 0x43, al + out HEX(43), al jmp $+2 /* Read current timer */ - in al, 0x40 + in al, HEX(40) jmp $+2 movzx ecx, al - in al, 0x40 + in al, HEX(40) mov ch, al /* Return it and restore interrupt state */

13 years, 4 months

[akhaldi] 53457: [NEWCC] * Initialize some variables. * Add a base address to csrsrv in rbuild build to prevent its relocation.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Aug 26 18:06:01 2011 New Revision: 53457 URL: http://svn.reactos.org/svn/reactos?rev=53457&view=rev Log: [NEWCC] * Initialize some variables. * Add a base address to csrsrv in rbuild build to prevent its relocation. Modified: branches/arty-newcc/baseaddress.rbuild branches/arty-newcc/ntoskrnl/cache/cachesub.c branches/arty-newcc/ntoskrnl/cache/section/io.c branches/arty-newcc/ntoskrnl/mm/section.c branches/arty-newcc/subsystems/win32/csrss/csrsrv/csrsrv.rbuild Modified: branches/arty-newcc/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/baseaddress.rbuild?r… ============================================================================== --- branches/arty-newcc/baseaddress.rbuild [iso-8859-1] (original) +++ branches/arty-newcc/baseaddress.rbuild [iso-8859-1] Fri Aug 26 18:06:01 2011 @@ -261,6 +261,7 @@ <property name="BASEADDRESS_QUERY" value="0x7d9a0000" /> <property name="BASEADDRESS_HHCTRL" value="0x7e410000" /> <property name="BASEADDRESS_SXS" value="0x7e690000" /> + <property name="BASEADDRESS_CSRSRV" value="0x7e700000" /> <property name="BASEADDRESS_BEEPMIDI" value="0x7ef00000" /> <property name="BASEADDRESS_FREETYPE" value="0x7f000000" /> </group> Modified: branches/arty-newcc/ntoskrnl/cache/cachesub.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/cache… ============================================================================== --- branches/arty-newcc/ntoskrnl/cache/cachesub.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/cache/cachesub.c [iso-8859-1] Fri Aug 26 18:06:01 2011 @@ -143,7 +143,9 @@ PNOCC_BCB Bcb = NULL; LARGE_INTEGER LowerBound, UpperBound; PLIST_ENTRY ListEntry; - IO_STATUS_BLOCK IOSB = {{0}}; + IO_STATUS_BLOCK IOSB; + + RtlZeroMemory(&IOSB, sizeof(IO_STATUS_BLOCK)); DPRINT("CcFlushCache (while file) (%s:%d)\n", File, Line); Modified: branches/arty-newcc/ntoskrnl/cache/section/io.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/secti… ============================================================================== --- branches/arty-newcc/ntoskrnl/cache/section/io.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/cache/section/io.c [iso-8859-1] Fri Aug 26 18:06:01 2011 @@ -198,21 +198,21 @@ Length, FileOffset, ReadStatus); - + if (!Irp) { ObDereferenceObject(FileObject); return STATUS_NO_MEMORY; } - + Irp->Flags = IRP_PAGING_IO | IRP_SYNCHRONOUS_PAGING_IO | IRP_NOCACHE | IRP_SYNCHRONOUS_API; - + Irp->UserEvent = &ReadWait; Irp->Tail.Overlay.OriginalFileObject = FileObject; Irp->Tail.Overlay.Thread = PsGetCurrentThread(); IrpSp = IoGetNextIrpStackLocation(Irp); IrpSp->FileObject = FileObject; - + DPRINT("Call Driver\n"); Status = IoCallDriver(DeviceObject, Irp); DPRINT("Status %x\n", Status); Modified: branches/arty-newcc/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/section.… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/section.c [iso-8859-1] Fri Aug 26 18:06:01 2011 @@ -1197,9 +1197,11 @@ * Page - Variable that receives a page contains the read data. */ { - MM_REQUIRED_RESOURCES Resources = {0}; + MM_REQUIRED_RESOURCES Resources; NTSTATUS Status; - + + RtlZeroMemory(&Resources, sizeof(MM_REQUIRED_RESOURCES)); + Resources.Context = MemoryArea->Data.SectionData.Section->FileObject; Resources.FileOffset.QuadPart = SegOffset + MemoryArea->Data.SectionData.Segment->Image.FileOffset; @@ -4995,6 +4997,7 @@ NTSTATUS Status; CHAR Buffer; LARGE_INTEGER ByteOffset; + RtlZeroMemory(&ByteOffset, sizeof(LARGE_INTEGER)); Status = ZwReadFile (FileHandle, NULL, Modified: branches/arty-newcc/subsystems/win32/csrss/csrsrv/csrsrv.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/subsystems/win32/csr… ============================================================================== --- branches/arty-newcc/subsystems/win32/csrss/csrsrv/csrsrv.rbuild [iso-8859-1] (original) +++ branches/arty-newcc/subsystems/win32/csrss/csrsrv/csrsrv.rbuild [iso-8859-1] Fri Aug 26 18:06:01 2011 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="csrsrv" type="nativedll" entrypoint="DllMain@12" installbase="system32" installname="csrsrv.dll"> +<module name="csrsrv" type="nativedll" baseaddress="${BASEADDRESS_CSRSRV}" entrypoint="DllMain@12" installbase="system32" installname="csrsrv.dll"> <importlibrary definition="csrsrv.spec" /> <include base="csrsrv">.</include> <include base="csrss">.</include>

13 years, 4 months

[tkreuzer] 53456: [CMAKE] Fix compilation with VS x64

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Aug 26 17:33:33 2011 New Revision: 53456 URL: http://svn.reactos.org/svn/reactos?rev=53456&view=rev Log: [CMAKE] Fix compilation with VS x64 Modified: trunk/reactos/cmake/msvc.cmake Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=53456… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Fri Aug 26 17:33:33 2011 @@ -225,6 +225,13 @@ #pseh workaround set(PSEH_LIB "pseh") +# Use full path for ml when using x64 VS +if((ARCH MATCHES amd64) AND ($ENV{VCINSTALLDIR})) + set(CMAKE_ASM16_COMPILER $ENV{VCINSTALLDIR}/bin/ml.exe) +else() + set(CMAKE_ASM16_COMPILER ml.exe) +endif() + function(CreateBootSectorTarget2 _target_name _asm_file _binary_file _base_address) set(_object_file ${_binary_file}.obj) @@ -237,7 +244,7 @@ add_custom_command( OUTPUT ${_object_file} - COMMAND ml /nologo /Cp /Fo${_object_file} /c /Ta ${_temp_file} + COMMAND ${CMAKE_ASM16_COMPILER} /nologo /Cp /Fo${_object_file} /c /Ta ${_temp_file} DEPENDS ${_temp_file}) add_custom_command(

13 years, 4 months

[tkreuzer] 53455: [NTOSKRNL] Fix amd64 build

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Aug 26 15:06:25 2011 New Revision: 53455 URL: http://svn.reactos.org/svn/reactos?rev=53455&view=rev Log: [NTOSKRNL] Fix amd64 build Modified: trunk/reactos/ntoskrnl/ke/amd64/cpu.c trunk/reactos/ntoskrnl/ntoskrnl.spec Modified: trunk/reactos/ntoskrnl/ke/amd64/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/amd64/cpu.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/amd64/cpu.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/amd64/cpu.c [iso-8859-1] Fri Aug 26 15:06:25 2011 @@ -481,11 +481,11 @@ __sidt(&ProcessorState->SpecialRegisters.Idtr.Limit); // __stmxcsr(&ProcessorState->SpecialRegisters.MxCsr); -// ProcessorState->SpecialRegisters.DebugControl = -// ProcessorState->SpecialRegisters.LastBranchToRip = -// ProcessorState->SpecialRegisters.LastBranchFromRip = -// ProcessorState->SpecialRegisters.LastExceptionToRip = -// ProcessorState->SpecialRegisters.LastExceptionFromRip = +// ProcessorState->SpecialRegisters.DebugControl = +// ProcessorState->SpecialRegisters.LastBranchToRip = +// ProcessorState->SpecialRegisters.LastBranchFromRip = +// ProcessorState->SpecialRegisters.LastExceptionToRip = +// ProcessorState->SpecialRegisters.LastExceptionFromRip = /* Save MSRs */ ProcessorState->SpecialRegisters.MsrGsBase = __readmsr(X86_MSR_GSBASE); @@ -528,18 +528,18 @@ NTSTATUS NTAPI -KeSaveFloatingPointState(OUT PKFLOATING_SAVE Save) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; +KxSaveFloatingPointState(OUT PKFLOATING_SAVE FloatingState) +{ + UNREFERENCED_PARAMETER(FloatingState); + return STATUS_SUCCESS; } NTSTATUS NTAPI -KeRestoreFloatingPointState(IN PKFLOATING_SAVE Save) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; +KxRestoreFloatingPointState(IN PKFLOATING_SAVE FloatingState) +{ + UNREFERENCED_PARAMETER(FloatingState); + return STATUS_SUCCESS; } BOOLEAN Modified: trunk/reactos/ntoskrnl/ntoskrnl.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.spec?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.spec [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.spec [iso-8859-1] Fri Aug 26 15:06:25 2011 @@ -672,10 +672,12 @@ @ stdcall KeRemoveQueueDpc(ptr) @ stdcall KeRemoveSystemServiceTable(long) @ stdcall KeResetEvent(ptr) -@ stdcall KeRestoreFloatingPointState(ptr) +@ stdcall -arch=i386 KeRestoreFloatingPointState(ptr) +@ stdcall -arch=x86_64 KeRestoreFloatingPointState(ptr) KxRestoreFloatingPointState @ stdcall KeRevertToUserAffinityThread() @ stdcall KeRundownQueue(ptr) -@ stdcall KeSaveFloatingPointState(ptr) +@ stdcall -arch=i386 KeSaveFloatingPointState(ptr) +@ stdcall -arch=x86_64 KeSaveFloatingPointState(ptr) KxSaveFloatingPointState @ cdecl KeSaveStateForHibernate(ptr) @ extern KeServiceDescriptorTable @ stdcall KeSetAffinityThread(ptr long)

13 years, 4 months

[akhaldi] 53454: * Sync trunk up to r53429.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Aug 26 13:51:30 2011 New Revision: 53454 URL: http://svn.reactos.org/svn/reactos?rev=53454&view=rev Log: * Sync trunk up to r53429. Added: branches/arty-newcc/boot/freeldr/freeldr/arch/amd64/ntsetup.c - copied unchanged from r53429, trunk/reactos/boot/freeldr/freeldr/arch/amd64/ntsetup.c branches/arty-newcc/boot/freeldr/freeldr/arch/amd64/wlmemory.c - copied unchanged from r53429, trunk/reactos/boot/freeldr/freeldr/arch/amd64/wlmemory.c branches/arty-newcc/boot/freeldr/freeldr/arch/arm/wlmemory.c - copied unchanged from r53429, trunk/reactos/boot/freeldr/freeldr/arch/arm/wlmemory.c branches/arty-newcc/boot/freeldr/freeldr/arch/i386/ntsetup.c - copied unchanged from r53429, trunk/reactos/boot/freeldr/freeldr/arch/i386/ntsetup.c branches/arty-newcc/boot/freeldr/freeldr/arch/i386/wlmemory.c - copied unchanged from r53429, trunk/reactos/boot/freeldr/freeldr/arch/i386/wlmemory.c branches/arty-newcc/boot/freeldr/freeldr/windows/setupldr.c - copied unchanged from r53429, trunk/reactos/boot/freeldr/freeldr/windows/setupldr.c branches/arty-newcc/hal/halx86/generic/legacy/halpnpdd.c - copied unchanged from r53429, trunk/reactos/hal/halx86/generic/legacy/halpnpdd.c Removed: branches/arty-newcc/boot/freeldr/freeldr/windows/amd64/ntsetup.c branches/arty-newcc/boot/freeldr/freeldr/windows/amd64/wlmemory.c branches/arty-newcc/boot/freeldr/freeldr/windows/arm/wlmemory.c branches/arty-newcc/boot/freeldr/freeldr/windows/i386/ntsetup.c branches/arty-newcc/boot/freeldr/freeldr/windows/i386/wlmemory.c branches/arty-newcc/boot/freeldr/freeldr/windows/setupldr2.c Modified: branches/arty-newcc/ (props changed) branches/arty-newcc/baseaddress.rbuild branches/arty-newcc/boot/freeldr/freeldr/CMakeLists.txt branches/arty-newcc/boot/freeldr/freeldr/bootmgr.c branches/arty-newcc/boot/freeldr/freeldr/freeldr_arch.rbuild branches/arty-newcc/boot/freeldr/freeldr/setupldr_main.rbuild branches/arty-newcc/dll/directx/ksproxy/output_pin.cpp branches/arty-newcc/drivers/ksfilter/ks/filter.c branches/arty-newcc/drivers/storage/scsiport/scsiport.c branches/arty-newcc/drivers/wdm/audio/backpln/portcls/irpstream.cpp branches/arty-newcc/hal/halx86/CMakeLists.txt branches/arty-newcc/hal/halx86/generic/legacy/halpcat.c branches/arty-newcc/hal/halx86/hal_generic_acpi.rbuild branches/arty-newcc/hal/halx86/hal_generic_pcat.rbuild branches/arty-newcc/include/c++/stlport/stl/config/_reactos.h branches/arty-newcc/include/crt/msc/intrin.h branches/arty-newcc/lib/3rdparty/stlport/CMakeLists.txt branches/arty-newcc/media/inf/hal.inf Propchange: branches/arty-newcc/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Aug 26 13:51:30 2011 @@ -9,4 +9,4 @@ /branches/ros-amd64-bringup:36852 /branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 /branches/tcp-rewrite-branch:48720,48840-48841,49424-49426,49454 -/trunk/reactos:50808-53421 +/trunk/reactos:50808-53429 Modified: branches/arty-newcc/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/baseaddress.rbuild?r… ============================================================================== --- branches/arty-newcc/baseaddress.rbuild [iso-8859-1] (original) +++ branches/arty-newcc/baseaddress.rbuild [iso-8859-1] Fri Aug 26 13:51:30 2011 @@ -190,21 +190,21 @@ <property name="BASEADDRESS_CRYPTNET" value="0x75e60000" /> <property name="BASEADDRESS_RPCRT4" value="0x76000000" /> <property name="BASEADDRESS_SHLWAPI" value="0x76100000" /> - <property name="BASEADDRESS_INETCOMM" value="0x76140000" /> - <property name="BASEADDRESS_COMCTL32" value="0x76170000" /> - <property name="BASEADDRESS_COMDLG32" value="0x76230000" /> + <property name="BASEADDRESS_COMCTL32" value="0x76180000" /> + <property name="BASEADDRESS_COMDLG32" value="0x762d0000" /> <property name="BASEADDRESS_WINSTA" value="0x762f0000" /> - <property name="BASEADDRESS_IMM32" value="0x76320000" /> <property name="BASEADDRESS_D3D8THK" value="0x76340000" /> <property name="BASEADDRESS_RICHED32" value="0x76340000" /> <property name="BASEADDRESS_RICHED20" value="0x76360000" /> <property name="BASEADDRESS_ODBCCP32" value="0x76380000" /> <property name="BASEADDRESS_TWAIN_32" value="0x76380000" /> <property name="BASEADDRESS_NETSHELL" value="0x76390000" /> + <property name="BASEADDRESS_IMM32" value="0x763a0000" /> + <property name="BASEADDRESS_INETCOMM" value="0x763E0000" /> <property name="BASEADDRESS_LSASRV" value="0x76540000" /> <property name="BASEADDRESS_MIDIMAP" value="0x76600000" /> <property name="BASEADDRESS_WAVEMAP" value="0x76610000" /> - <property name="BASEADDRESS_MPR" value="0x76620000" /> + <property name="BASEADDRESS_MPR" value="0x76630000" /> <property name="BASEADDRESS_MSHTML" value="0x76650000" /> <property name="BASEADDRESS_ODBC32" value="0x76710000" /> <property name="BASEADDRESS_SETUPAPI" value="0x76730000" /> @@ -243,7 +243,7 @@ <property name="BASEADDRESS_IPRTPRIO" value="0x777c0000" /> <property name="BASEADDRESS_WS2HELP" value="0x777e0000" /> <property name="BASEADDRESS_WSHIRDA" value="0x777f0000" /> - <property name="BASEADDRESS_VERSION" value="0x77a40000" /> + <property name="BASEADDRESS_VERSION" value="0x77a30000" /> <property name="BASEADDRESS_OLE32" value="0x77a50000" /> <property name="BASEADDRESS_OLEPRO32" value="0x77b20000" /> <property name="BASEADDRESS_ACTIVEDS" value="0x77cb0000" /> Modified: branches/arty-newcc/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/boot/freeldr/freeldr… ============================================================================== --- branches/arty-newcc/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original) +++ branches/arty-newcc/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Fri Aug 26 13:51:30 2011 @@ -107,8 +107,8 @@ arch/i386/xboxmem.c arch/i386/xboxrtc.c arch/i386/xboxvideo.c - windows/i386/ntsetup.c - windows/i386/wlmemory.c + arch/i386/ntsetup.c + arch/i386/wlmemory.c windows/headless.c disk/scsiport.c) if(NOT MSVC) @@ -134,8 +134,8 @@ arch/i386/pcmem.c arch/i386/pcrtc.c arch/i386/pcvideo.c - windows/amd64/ntsetup.c - windows/amd64/wlmemory.c) + arch/amd64/ntsetup.c + arch/amd64/wlmemory.c) else() #TBD endif() @@ -191,7 +191,7 @@ inffile/inffile.c) if(ARCH MATCHES i386 OR ARCH MATCHES amd64) - list(APPEND SETUPLDR_SOURCE windows/setupldr2.c) + list(APPEND SETUPLDR_SOURCE windows/setupldr.c) endif() if(NOT MSVC) Modified: branches/arty-newcc/boot/freeldr/freeldr/bootmgr.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/boot/freeldr/freeldr… ============================================================================== --- branches/arty-newcc/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] (original) +++ branches/arty-newcc/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] Fri Aug 26 13:51:30 2011 @@ -213,7 +213,7 @@ if (BootType[0] == ANSI_NULL && SectionName[0] != ANSI_NULL) { // Try to infere boot type value -#ifdef __i386__ +#ifdef _M_IX86 ULONG FileId; if (ArcOpen((CHAR*)SectionName, OpenReadOnly, &FileId) == ESUCCESS) { @@ -231,20 +231,15 @@ IniOpenSection("Operating Systems", &SectionId); IniReadSettingByName(SectionId, SectionName, SettingValue, sizeof(SettingValue)); -#ifndef _M_ARM // Install the drive mapper according to this sections drive mappings -#if defined(__i386__) && !defined(_MSC_VER) +#if defined(_M_IX86) && !defined(_MSC_VER) DriveMapMapDrivesInSection(SectionName); #endif + #ifdef FREELDR_REACTOS_SETUP - if (_stricmp(BootType, "ReactOSSetup2") == 0) - { - // WinLdr-style boot - LoadReactOSSetup2(); - } - else -#endif -#ifdef __i386__ + // WinLdr-style boot + LoadReactOSSetup2(); +#elif defined(_M_IX86) if (_stricmp(BootType, "Windows") == 0) { LoadAndBootWindows(SectionName, SettingValue, 0); @@ -273,12 +268,10 @@ { LoadAndBootDrive(SectionName); } -#endif #else - LoadAndBootWindows(SectionName, SettingValue, _WIN32_WINNT_WS03); -#endif - } - + LoadAndBootWindows(SectionName, SettingValue, _WIN32_WINNT_WS03); +#endif + } reboot: UiUnInitialize("Rebooting..."); Modified: branches/arty-newcc/boot/freeldr/freeldr/freeldr_arch.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/boot/freeldr/freeldr… ============================================================================== --- branches/arty-newcc/boot/freeldr/freeldr/freeldr_arch.rbuild [iso-8859-1] (original) +++ branches/arty-newcc/boot/freeldr/freeldr/freeldr_arch.rbuild [iso-8859-1] Fri Aug 26 13:51:30 2011 @@ -41,6 +41,8 @@ <file>xboxmem.c</file> <file>xboxrtc.c</file> <file>xboxvideo.c</file> + <file>ntsetup.c</file> + <file>wlmemory.c</file> </if> </directory> <directory name="powerpc"> @@ -69,6 +71,8 @@ <if property="ARCH" value="amd64"> <directory name="amd64"> <file>loader.c</file> + <file>ntsetup.c</file> + <file>wlmemory.c</file> </directory> <directory name="i386"> <file>hardware.c</file> @@ -87,23 +91,8 @@ </directory> </if> - </directory> - - <directory name="windows"> - <if property="ARCH" value="arm"> - <directory name="arm"> - <file>wlmemory.c</file> - </directory> - </if> - <if property="ARCH" value="i386"> - <directory name="i386"> - <file>ntsetup.c</file> - <file>wlmemory.c</file> - </directory> - </if> - <if property="ARCH" value="amd64"> - <directory name="amd64"> - <file>ntsetup.c</file> + <if property="ARCH" value="arm"> + <directory name="arm"> <file>wlmemory.c</file> </directory> </if> Modified: branches/arty-newcc/boot/freeldr/freeldr/setupldr_main.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/boot/freeldr/freeldr… ============================================================================== --- branches/arty-newcc/boot/freeldr/freeldr/setupldr_main.rbuild [iso-8859-1] (original) +++ branches/arty-newcc/boot/freeldr/freeldr/setupldr_main.rbuild [iso-8859-1] Fri Aug 26 13:51:30 2011 @@ -9,14 +9,7 @@ <directory name="inffile"> <file>inffile.c</file> </directory> - <if property="ARCH" value="i386"> - <directory name="windows"> - <file>setupldr2.c</file> - </directory> - </if> - <if property="ARCH" value="amd64"> - <directory name="windows"> - <file>setupldr2.c</file> - </directory> - </if> + <directory name="windows"> + <file>setupldr.c</file> + </directory> </module> Removed: branches/arty-newcc/boot/freeldr/freeldr/windows/amd64/ntsetup.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/boot/freeldr/freeldr… ============================================================================== --- branches/arty-newcc/boot/freeldr/freeldr/windows/amd64/ntsetup.c [iso-8859-1] (original) +++ branches/arty-newcc/boot/freeldr/freeldr/windows/amd64/ntsetup.c (removed) @@ -1,84 +1,0 @@ -/* - * PROJECT: EFI Windows Loader - * LICENSE: GPL - See COPYING in the top level directory - * FILE: freeldr/windows/i386/ntsetup.c - * PURPOSE: i386-specific setup for Windows boot - * PROGRAMMERS: Aleksey Bragin (aleksey(a)reactos.org) - */ - -/* INCLUDES ***************************************************************/ - -#include <freeldr.h> -#include <debug.h> - -// this is needed for new IDT filling -#if 0 -extern ULONG_PTR i386DivideByZero; -extern ULONG_PTR i386DebugException; -extern ULONG_PTR i386NMIException; -extern ULONG_PTR i386Breakpoint; -extern ULONG_PTR i386Overflow; -extern ULONG_PTR i386BoundException; -extern ULONG_PTR i386InvalidOpcode; -extern ULONG_PTR i386FPUNotAvailable; -extern ULONG_PTR i386DoubleFault; -extern ULONG_PTR i386CoprocessorSegment; -extern ULONG_PTR i386InvalidTSS; -extern ULONG_PTR i386SegmentNotPresent; -extern ULONG_PTR i386StackException; -extern ULONG_PTR i386GeneralProtectionFault; -extern ULONG_PTR i386PageFault; // exc 14 -extern ULONG_PTR i386CoprocessorError; // exc 16 -extern ULONG_PTR i386AlignmentCheck; // exc 17 -#endif - -/* FUNCTIONS **************************************************************/ - -// Last step before going virtual -void WinLdrSetupForNt(PLOADER_PARAMETER_BLOCK LoaderBlock, - PVOID *GdtIdt, - ULONG *PcrBasePage, - ULONG *TssBasePage) -{ - ULONG TssSize; - ULONG TssPages; - ULONG_PTR Pcr = 0; - ULONG_PTR Tss = 0; - ULONG BlockSize, NumPages; - - LoaderBlock->u.I386.CommonDataArea = (PVOID)DbgPrint; // HACK - LoaderBlock->u.I386.MachineType = MACHINE_TYPE_ISA; - - /* Allocate 2 pages for PCR */ - Pcr = (ULONG_PTR)MmAllocateMemoryWithType(2 * MM_PAGE_SIZE, LoaderStartupPcrPage); - *PcrBasePage = Pcr >> MM_PAGE_SHIFT; - RtlZeroMemory((PVOID)Pcr, 2 * MM_PAGE_SIZE); - - if (Pcr == 0) - { - UiMessageBox("Can't allocate PCR\n"); - return; - } - - /* Allocate TSS */ - TssSize = (sizeof(KTSS) + MM_PAGE_SIZE) & ~(MM_PAGE_SIZE - 1); - TssPages = TssSize / MM_PAGE_SIZE; - - Tss = (ULONG_PTR)MmAllocateMemoryWithType(TssSize, LoaderMemoryData); - - *TssBasePage = Tss >> MM_PAGE_SHIFT; - - /* Allocate space for new GDT + IDT */ - BlockSize = NUM_GDT*sizeof(KGDTENTRY) + NUM_IDT*sizeof(KIDTENTRY);//FIXME: Use GDT/IDT limits here? - NumPages = (BlockSize + MM_PAGE_SIZE - 1) >> MM_PAGE_SHIFT; - *GdtIdt = (PKGDTENTRY)MmAllocateMemoryWithType(NumPages * MM_PAGE_SIZE, LoaderMemoryData); - - if (*GdtIdt == NULL) - { - UiMessageBox("Can't allocate pages for GDT+IDT!\n"); - return; - } - - /* Zero newly prepared GDT+IDT */ - RtlZeroMemory(*GdtIdt, NumPages << MM_PAGE_SHIFT); -} Removed: branches/arty-newcc/boot/freeldr/freeldr/windows/amd64/wlmemory.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/boot/freeldr/freeldr… ============================================================================== --- branches/arty-newcc/boot/freeldr/freeldr/windows/amd64/wlmemory.c [iso-8859-1] (original) +++ branches/arty-newcc/boot/freeldr/freeldr/windows/amd64/wlmemory.c (removed) @@ -1,354 +1,0 @@ -/* - * PROJECT: EFI Windows Loader - * LICENSE: GPL - See COPYING in the top level directory - * FILE: freeldr/amd64/wlmemory.c - * PURPOSE: Memory related routines - * PROGRAMMERS: Timo Kreuzer (timo.kreuzer(a)reactos.org) - */ - -/* INCLUDES ***************************************************************/ - -#include <freeldr.h> - -#include <ndk/asm.h> -#include <debug.h> - -//extern ULONG LoaderPagesSpanned; - -#define HYPER_SPACE_ENTRY 0x1EE - -/* GLOBALS ***************************************************************/ - -PHARDWARE_PTE PxeBase; -//PHARDWARE_PTE HalPageTable; - - -/* FUNCTIONS **************************************************************/ - -BOOLEAN -MempAllocatePageTables() -{ - DPRINTM(DPRINT_WINDOWS,">>> MempAllocatePageTables\n"); - - /* Allocate a page for the PML4 */ - PxeBase = MmAllocateMemoryWithType(PAGE_SIZE, LoaderMemoryData); - if (!PxeBase) - { - DPRINTM(DPRINT_WINDOWS,"failed to allocate PML4\n"); - return FALSE; - } - - // FIXME: Physical PTEs = FirmwareTemporary ? - - /* Zero the PML4 */ - RtlZeroMemory(PxeBase, PAGE_SIZE); - - /* The page tables are located at 0xfffff68000000000 - * We create a recursive self mapping through all 4 levels at - * virtual address 0xfffff6fb7dbedf68 */ - PxeBase[VAtoPXI(PXE_BASE)].Valid = 1; - PxeBase[VAtoPXI(PXE_BASE)].Write = 1; - PxeBase[VAtoPXI(PXE_BASE)].PageFrameNumber = PtrToPfn(PxeBase); - - // FIXME: map PDE's for hals memory mapping - - DPRINTM(DPRINT_WINDOWS,">>> leave MempAllocatePageTables\n"); - - return TRUE; -} - -PHARDWARE_PTE -MempGetOrCreatePageDir(PHARDWARE_PTE PdeBase, ULONG Index) -{ - PHARDWARE_PTE SubDir; - - if (!PdeBase) - return NULL; - - if (!PdeBase[Index].Valid) - { - SubDir = MmAllocateMemoryWithType(PAGE_SIZE, LoaderMemoryData); - if (!SubDir) - return NULL; - RtlZeroMemory(SubDir, PAGE_SIZE); - PdeBase[Index].PageFrameNumber = PtrToPfn(SubDir); - PdeBase[Index].Valid = 1; - PdeBase[Index].Write = 1; - } - else - { - SubDir = (PVOID)((ULONG64)(PdeBase[Index].PageFrameNumber) * PAGE_SIZE); - } - return SubDir; -} - -BOOLEAN -MempMapSinglePage(ULONG64 VirtualAddress, ULONG64 PhysicalAddress) -{ - PHARDWARE_PTE PpeBase, PdeBase, PteBase; - ULONG Index; - - PpeBase = MempGetOrCreatePageDir(PxeBase, VAtoPXI(VirtualAddress)); - PdeBase = MempGetOrCreatePageDir(PpeBase, VAtoPPI(VirtualAddress)); - PteBase = MempGetOrCreatePageDir(PdeBase, VAtoPDI(VirtualAddress)); - - if (!PteBase) - { - DPRINTM(DPRINT_WINDOWS,"!!!No Dir %p, %p, %p, %p\n", PxeBase, PpeBase, PdeBase, PteBase); - return FALSE; - } - - Index = VAtoPTI(VirtualAddress); - if (PteBase[Index].Valid) - { - DPRINTM(DPRINT_WINDOWS,"!!!Already mapped %ld\n", Index); - return FALSE; - } - - PteBase[Index].Valid = 1; - PteBase[Index].Write = 1; - PteBase[Index].PageFrameNumber = PhysicalAddress / PAGE_SIZE; - - return TRUE; -} - -BOOLEAN -MempIsPageMapped(PVOID VirtualAddress) -{ - PHARDWARE_PTE PpeBase, PdeBase, PteBase; - ULONG Index; - - Index = VAtoPXI(VirtualAddress); - if (!PxeBase[Index].Valid) - return FALSE; - - PpeBase = (PVOID)((ULONG64)(PxeBase[Index].PageFrameNumber) * PAGE_SIZE); - Index = VAtoPPI(VirtualAddress); - if (!PpeBase[Index].Valid) - return FALSE; - - PdeBase = (PVOID)((ULONG64)(PpeBase[Index].PageFrameNumber) * PAGE_SIZE); - Index = VAtoPDI(VirtualAddress); - if (!PdeBase[Index].Valid) - return FALSE; - - PteBase = (PVOID)((ULONG64)(PdeBase[Index].PageFrameNumber) * PAGE_SIZE); - Index = VAtoPTI(VirtualAddress); - if (!PteBase[Index].Valid) - return FALSE; - - return TRUE; -} - -ULONG -MempMapRangeOfPages(ULONG64 VirtualAddress, ULONG64 PhysicalAddress, ULONG cPages) -{ - ULONG i; - - for (i = 0; i < cPages; i++) - { - if (!MempMapSinglePage(VirtualAddress, PhysicalAddress)) - { - return i; - } - VirtualAddress += PAGE_SIZE; - PhysicalAddress += PAGE_SIZE; - } - return i; -} - -BOOLEAN -MempSetupPaging(IN ULONG StartPage, - IN ULONG NumberOfPages) -{ - DPRINTM(DPRINT_WINDOWS,">>> MempSetupPaging(0x%lx, %ld, %p)\n", - StartPage, NumberOfPages, StartPage * PAGE_SIZE + KSEG0_BASE); - - /* Identity mapping */ - if (MempMapRangeOfPages(StartPage * PAGE_SIZE, - StartPage * PAGE_SIZE, - NumberOfPages) != NumberOfPages) - { - DPRINTM(DPRINT_WINDOWS,"Failed to map pages 1\n"); - return FALSE; - } - - /* Kernel mapping */ - if (MempMapRangeOfPages(StartPage * PAGE_SIZE + KSEG0_BASE, - StartPage * PAGE_SIZE, - NumberOfPages) != NumberOfPages) - { - DPRINTM(DPRINT_WINDOWS,"Failed to map pages 2\n"); - return FALSE; - } - - return TRUE; -} - -VOID -MempUnmapPage(ULONG Page) -{ - // DPRINTM(DPRINT_WINDOWS,">>> MempUnmapPage\n"); -} - -VOID -WinLdrpMapApic() -{ - BOOLEAN LocalAPIC; - LARGE_INTEGER MsrValue; - ULONG CpuInfo[4]; - ULONG64 APICAddress; - - DPRINTM(DPRINT_WINDOWS,">>> WinLdrpMapApic\n"); - - /* Check if we have a local APIC */ - __cpuid((int*)CpuInfo, 1); - LocalAPIC = (((CpuInfo[3] >> 9) & 1) != 0); - - /* If there is no APIC, just return */ - if (!LocalAPIC) - { - DPRINTM(DPRINT_WINDOWS,"No APIC found.\n"); - return; - } - - /* Read the APIC Address */ - MsrValue.QuadPart = __readmsr(0x1B); - APICAddress = (MsrValue.LowPart & 0xFFFFF000); - - DPRINTM(DPRINT_WINDOWS, "Local APIC detected at address 0x%x\n", - APICAddress); - - /* Map it */ - MempMapSinglePage(APIC_BASE, APICAddress); -} - -BOOLEAN -WinLdrMapSpecialPages(ULONG PcrBasePage) -{ - /* Map the PCR page */ - if (!MempMapSinglePage(KIP0PCRADDRESS, PcrBasePage * PAGE_SIZE)) - { - DPRINTM(DPRINT_WINDOWS, "Could not map PCR @ %lx\n", PcrBasePage); - return FALSE; - } - - /* Map KI_USER_SHARED_DATA */ - if (!MempMapSinglePage(KI_USER_SHARED_DATA, (PcrBasePage+1) * PAGE_SIZE)) - { - DPRINTM(DPRINT_WINDOWS, "Could not map KI_USER_SHARED_DATA\n"); - return FALSE; - } - - /* Map the APIC page */ - WinLdrpMapApic(); - - return TRUE; -} - -VOID -WinLdrSetupGdt(PVOID GdtBase, ULONG64 TssBase) -{ - PKGDTENTRY64 Entry; - KDESCRIPTOR GdtDesc; - - /* Setup KGDT64_NULL */ - Entry = KiGetGdtEntry(GdtBase, KGDT64_NULL); - *(PULONG64)Entry = 0x0000000000000000ULL; - - /* Setup KGDT64_R0_CODE */ - Entry = KiGetGdtEntry(GdtBase, KGDT64_R0_CODE); - *(PULONG64)Entry = 0x00209b0000000000ULL; - - /* Setup KGDT64_R0_DATA */ - Entry = KiGetGdtEntry(GdtBase, KGDT64_R0_DATA); - *(PULONG64)Entry = 0x00cf93000000ffffULL; - - /* Setup KGDT64_R3_CMCODE */ - Entry = KiGetGdtEntry(GdtBase, KGDT64_R3_CMCODE); - *(PULONG64)Entry = 0x00cffb000000ffffULL; - - /* Setup KGDT64_R3_DATA */ - Entry = KiGetGdtEntry(GdtBase, KGDT64_R3_DATA); - *(PULONG64)Entry = 0x00cff3000000ffffULL; - - /* Setup KGDT64_R3_CODE */ - Entry = KiGetGdtEntry(GdtBase, KGDT64_R3_CODE); - *(PULONG64)Entry = 0x0020fb0000000000ULL; - - /* Setup KGDT64_R3_CMTEB */ - Entry = KiGetGdtEntry(GdtBase, KGDT64_R3_CMTEB); - *(PULONG64)Entry = 0xff40f3fd50003c00ULL; - - /* Setup TSS entry */ - Entry = KiGetGdtEntry(GdtBase, KGDT64_SYS_TSS); - KiInitGdtEntry(Entry, TssBase, sizeof(KTSS), I386_TSS, 0); - - /* Setup GDT descriptor */ - GdtDesc.Base = GdtBase; - GdtDesc.Limit = NUM_GDT * sizeof(KGDTENTRY) - 1; - - /* Set the new Gdt */ - __lgdt(&GdtDesc.Limit); - DbgPrint("Gdtr.Base = %p, num = %ld\n", GdtDesc.Base, NUM_GDT); - -} - -VOID -WinLdrSetupIdt(PVOID IdtBase) -{ - KDESCRIPTOR IdtDesc, OldIdt; - - /* Get old IDT */ - __sidt(&OldIdt); - - /* Copy the old IDT */ - RtlCopyMemory(IdtBase, (PVOID)OldIdt.Base, OldIdt.Limit + 1); - - /* Setup the new IDT descriptor */ - IdtDesc.Base = IdtBase; - IdtDesc.Limit = NUM_IDT * sizeof(KIDTENTRY) - 1; - - /* Set the new IDT */ - __lidt(&IdtDesc.Limit); - DbgPrint("Idtr.Base = %p\n", IdtDesc.Base); - -} - -VOID -WinLdrSetProcessorContext(PVOID GdtIdt, IN ULONG64 Pcr, IN ULONG64 Tss) -{ - DPRINTM(DPRINT_WINDOWS, "WinLdrSetProcessorContext %p\n", Pcr); - - /* Disable Interrupts */ - _disable(); - - /* Re-initalize EFLAGS */ - __writeeflags(0); - - /* Set the new PML4 */ - __writecr3((ULONG64)PxeBase); - - /* Get kernel mode address of gdt / idt */ - GdtIdt = (PVOID)((ULONG64)GdtIdt + KSEG0_BASE); - - /* Create gdt entries and load gdtr */ - WinLdrSetupGdt(GdtIdt, Tss); - - /* Copy old Idt and set idtr */ - WinLdrSetupIdt((PVOID)((ULONG64)GdtIdt + 2048)); // HACK! - - /* LDT is unused */ -// __lldt(0); - - /* Load TSR */ - __ltr(KGDT64_SYS_TSS); - - DPRINTM(DPRINT_WINDOWS, "leave WinLdrSetProcessorContext\n"); -} - -VOID -MempDump() -{ -} - Removed: branches/arty-newcc/boot/freeldr/freeldr/windows/arm/wlmemory.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/boot/freeldr/freeldr… ============================================================================== --- branches/arty-newcc/boot/freeldr/freeldr/windows/arm/wlmemory.c [iso-8859-1] (original) +++ branches/arty-newcc/boot/freeldr/freeldr/windows/arm/wlmemory.c (removed) @@ -1,274 +1,0 @@ -/* - * PROJECT: ReactOS Boot Loader - * LICENSE: BSD - See COPYING.ARM in the top level directory - * FILE: boot/freeldr/arch/arm/loader.c - * PURPOSE: ARM Kernel Loader - * PROGRAMMERS: ReactOS Portable Systems Group - */ - -/* INCLUDES ***************************************************************/ - -#include <freeldr.h> -#include <debug.h> -#include <internal/arm/mm.h> -#include <internal/arm/intrin_i.h> - -#define PFN_SHIFT 12 -#define LARGE_PFN_SHIFT 20 - -#define PTE_BASE 0xC0000000 -#define PDE_BASE 0xC0400000 -#define PDR_BASE 0xFFD00000 -#define VECTOR_BASE 0xFFFF0000 - -#ifdef _ZOOM2_ -#define IDMAP_BASE 0x81000000 -#define MMIO_BASE 0x10000000 -#else -#define IDMAP_BASE 0x00000000 -#define MMIO_BASE 0x10000000 -#endif - -#define LowMemPageTableIndex (IDMAP_BASE >> PDE_SHIFT) -#define MmioPageTableIndex (MMIO_BASE >> PDE_SHIFT) -#define KernelPageTableIndex (KSEG0_BASE >> PDE_SHIFT) -#define StartupPtePageTableIndex (PTE_BASE >> PDE_SHIFT) -#define StartupPdePageTableIndex (PDE_BASE >> PDE_SHIFT) -#define PdrPageTableIndex (PDR_BASE >> PDE_SHIFT) -#define VectorPageTableIndex (VECTOR_BASE >> PDE_SHIFT) - -#ifndef _ZOOM2_ -PVOID MempPdrBaseAddress = (PVOID)0x70000; -PVOID MempKernelBaseAddress = (PVOID)0; -#else -PVOID MempPdrBaseAddress = (PVOID)0x81100000; -PVOID MempKernelBaseAddress = (PVOID)0x80000000; -#endif - -/* Converts a Physical Address into a Page Frame Number */ -#define PaToPfn(p) ((p) >> PFN_SHIFT) -#define PaToLargePfn(p) ((p) >> LARGE_PFN_SHIFT) -#define PaPtrToPfn(p) (((ULONG_PTR)(p)) >> PFN_SHIFT) - -/* Converts a Physical Address into a Coarse Page Table PFN */ -#define PaPtrToPdePfn(p) (((ULONG_PTR)(p)) >> CPT_SHIFT) - -typedef struct _KPDR_PAGE -{ - PAGE_DIRECTORY_ARM PageDir; // 0xC0400000 [0xFFD00000] - CHAR HyperSpace[233 * PAGE_SIZE]; // 0xC0404000 [0xFFD04000] - PAGE_TABLE_ARM KernelPageTable[3]; // 0xC04ED000 [0xFFDED000] - CHAR SharedData[PAGE_SIZE]; // 0xC04F0000 [0xFFDF0000] - CHAR KernelStack[KERNEL_STACK_SIZE]; // 0xC04F1000 [0xFFDF1000] - CHAR PanicStack[KERNEL_STACK_SIZE]; // 0xC04F4000 [0xFFDF4000] - CHAR InterruptStack[KERNEL_STACK_SIZE]; // 0xC04F7000 [0xFFDF7000] - CHAR InitialProcess[PAGE_SIZE]; // 0xC04FA000 [0xFFDFA000] - CHAR InitialThread[PAGE_SIZE]; // 0xC04FB000 [0xFFDFB000] - CHAR Prcb[PAGE_SIZE]; // 0xC04FC000 [0xFFDFC000] - PAGE_TABLE_ARM PageDirPageTable; // 0xC04FD000 [0xFFDFD000] - PAGE_TABLE_ARM VectorPageTable; // 0xC04FE000 [0xFFDFE000] - CHAR Pcr[PAGE_SIZE]; // 0xC04FF000 [0xFFDFF000] -} KPDR_PAGE, *PKPDR_PAGE; - -C_ASSERT(sizeof(KPDR_PAGE) == (1 * 1024 * 1024)); - -HARDWARE_PTE_ARMV6 TempPte; -HARDWARE_LARGE_PTE_ARMV6 TempLargePte; -HARDWARE_PDE_ARMV6 TempPde; -PKPDR_PAGE PdrPage; - -/* FUNCTIONS **************************************************************/ - -BOOLEAN -MempSetupPaging(IN ULONG StartPage, - IN ULONG NumberOfPages) -{ - return TRUE; -} - -VOID -MempUnmapPage(IN ULONG Page) -{ - return; -} - -VOID -MempDump(VOID) -{ - return; -} - -BOOLEAN -WinLdrMapSpecialPages(ULONG PcrBasePage) -{ - ULONG i; - PHARDWARE_PTE_ARMV6 PointerPte; - PHARDWARE_PDE_ARMV6 PointerPde; - PHARDWARE_LARGE_PTE_ARMV6 LargePte; - PFN_NUMBER Pfn; - - /* Setup the Startup PDE */ - LargePte = &PdrPage->PageDir.Pte[StartupPdePageTableIndex]; - TempLargePte.PageFrameNumber = PaToLargePfn((ULONG_PTR)&PdrPage->PageDir); - *LargePte = TempLargePte; - - /* Map-in the PDR */ - LargePte = &PdrPage->PageDir.Pte[PdrPageTableIndex]; - *LargePte = TempLargePte; - - /* After this point, any MiAddressToPde is guaranteed not to fault */ - - /* - * Link them in the Startup PDE. - * Note these are the entries in the PD at (MiAddressToPde(PTE_BASE)). - */ - PointerPde = &PdrPage->PageDir.Pde[StartupPtePageTableIndex]; - Pfn = PaPtrToPdePfn(&PdrPage->PageDirPageTable); - for (i = 0; i < 4; i++) - { - TempPde.PageFrameNumber = Pfn++; - *PointerPde++ = TempPde; - } - - /* - * Now map these page tables in PTE space (MiAddressToPte(PTE_BASE)). - * Note that they all live on a single page, since each is 1KB. - */ - PointerPte = &PdrPage->PageDirPageTable.Pte[0x300]; - TempPte.PageFrameNumber = PaPtrToPfn(&PdrPage->PageDirPageTable); - *PointerPte = TempPte; - - /* - * After this point, MiAddressToPte((PDE_BASE) to MiAddressToPte(PDE_TOP)) - * is guaranteed not to fault. - * Any subsequent page allocation will first need its page table created - * and mapped in the PTE_BASE first, then the page table itself will be - * editable through its flat PTE address. - */ - - /* Setup the Vector PDE */ - PointerPde = &PdrPage->PageDir.Pde[VectorPageTableIndex]; - TempPde.PageFrameNumber = PaPtrToPdePfn(&PdrPage->VectorPageTable); - *PointerPde = TempPde; - - /* Setup the Vector PTEs */ - PointerPte = &PdrPage->VectorPageTable.Pte[0xF0]; - TempPte.PageFrameNumber = 0; - *PointerPte = TempPte; - - /* TODO: Map in the kernel CPTs */ - return TRUE; -} - -VOID -WinLdrSetupForNt(IN PLOADER_PARAMETER_BLOCK LoaderBlock, - IN PVOID *GdtIdt, - IN ULONG *PcrBasePage, - IN ULONG *TssBasePage) -{ - PKPDR_PAGE PdrPage = (PVOID)0xFFD00000; - - /* Load cache information */ - LoaderBlock->u.Arm.FirstLevelDcacheSize = FirstLevelDcacheSize; - LoaderBlock->u.Arm.FirstLevelDcacheFillSize = FirstLevelDcacheFillSize; - LoaderBlock->u.Arm.FirstLevelIcacheSize = FirstLevelIcacheSize; - LoaderBlock->u.Arm.FirstLevelIcacheFillSize = FirstLevelIcacheFillSize; - LoaderBlock->u.Arm.SecondLevelDcacheSize = SecondLevelDcacheSize; - LoaderBlock->u.Arm.SecondLevelDcacheFillSize = SecondLevelDcacheFillSize; - LoaderBlock->u.Arm.SecondLevelIcacheSize = SecondLevelIcacheSize; - LoaderBlock->u.Arm.SecondLevelIcacheFillSize = SecondLevelIcacheSize; - - /* Write initial context information */ - LoaderBlock->KernelStack = (ULONG_PTR)PdrPage->KernelStack; - LoaderBlock->KernelStack += KERNEL_STACK_SIZE; - LoaderBlock->u.Arm.PanicStack = (ULONG_PTR)PdrPage->PanicStack; - LoaderBlock->u.Arm.PanicStack += KERNEL_STACK_SIZE; - LoaderBlock->u.Arm.InterruptStack = (ULONG_PTR)PdrPage->InterruptStack; - LoaderBlock->u.Arm.InterruptStack += KERNEL_STACK_SIZE; - LoaderBlock->Prcb = (ULONG_PTR)PdrPage->Prcb; - LoaderBlock->Process = (ULONG_PTR)PdrPage->InitialProcess; - LoaderBlock->Thread = (ULONG_PTR)PdrPage->InitialThread; -} - -BOOLEAN -MempAllocatePageTables(VOID) -{ - ULONG i; - PHARDWARE_PTE_ARMV6 PointerPte; - PHARDWARE_PDE_ARMV6 PointerPde; - PHARDWARE_LARGE_PTE_ARMV6 LargePte; - PFN_NUMBER Pfn; - - /* Setup templates */ - TempPte.Sbo = TempPte.Valid = TempLargePte.LargePage = TempLargePte.Sbo = TempPde.Valid = 1; - - /* Allocate the 1MB "PDR" (Processor Data Region). Must be 1MB aligned */ - PdrPage = MmAllocateMemoryAtAddress(sizeof(KPDR_PAGE), - MempPdrBaseAddress, - LoaderMemoryData); - - /* Setup the Low Memory PDE as an identity-mapped Large Page (1MB) */ - LargePte = &PdrPage->PageDir.Pte[LowMemPageTableIndex]; - TempLargePte.PageFrameNumber = PaToLargePfn(IDMAP_BASE); - *LargePte = TempLargePte; - - /* Setup the MMIO PDE as two identity mapped large pages -- the kernel will blow these away later */ - LargePte = &PdrPage->PageDir.Pte[MmioPageTableIndex]; - Pfn = PaToLargePfn(MMIO_BASE); - for (i = 0; i < 2; i++) - { - TempLargePte.PageFrameNumber = Pfn++; - *LargePte++ = TempLargePte; - } - - /* Setup the Kernel PDEs */ - PointerPde = &PdrPage->PageDir.Pde[KernelPageTableIndex]; - Pfn = PaPtrToPdePfn(PdrPage->KernelPageTable); - for (i = 0; i < 12; i++) - { - TempPde.PageFrameNumber = Pfn; - *PointerPde++ = TempPde; - Pfn++; - } - - /* Setup the Kernel PTEs */ - PointerPte = PdrPage->KernelPageTable[0].Pte; - Pfn = PaPtrToPfn(MempKernelBaseAddress); - for (i = 0; i < 3072; i++) - { - TempPte.PageFrameNumber = Pfn++; - *PointerPte++ = TempPte; - } - - /* Done */ - return TRUE; -} - -VOID -WinLdrSetProcessorContext(PVOID GdtIdt, - IN ULONG Pcr, - IN ULONG Tss) -{ - ARM_CONTROL_REGISTER ControlRegister; - ARM_TTB_REGISTER TtbRegister; - ARM_DOMAIN_REGISTER DomainRegister; - - /* Set the TTBR */ - TtbRegister.AsUlong = (ULONG_PTR)&PdrPage->PageDir; - ASSERT(TtbRegister.Reserved == 0); - KeArmTranslationTableRegisterSet(TtbRegister); - - /* Disable domains and simply use access bits on PTEs */ - DomainRegister.AsUlong = 0; - DomainRegister.Domain0 = ClientDomain; - KeArmDomainRegisterSet(DomainRegister); - - /* Enable ARMv6+ paging (MMU), caches and the access bit */ - ControlRegister = KeArmControlRegisterGet(); - ControlRegister.MmuEnabled = TRUE; - ControlRegister.ICacheEnabled = TRUE; - ControlRegister.DCacheEnabled = TRUE; - ControlRegister.ForceAp = TRUE; - ControlRegister.ExtendedPageTables = TRUE; - KeArmControlRegisterSet(ControlRegister); -} Removed: branches/arty-newcc/boot/freeldr/freeldr/windows/i386/ntsetup.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/boot/freeldr/freeldr… ============================================================================== --- branches/arty-newcc/boot/freeldr/freeldr/windows/i386/ntsetup.c [iso-8859-1] (original) +++ branches/arty-newcc/boot/freeldr/freeldr/windows/i386/ntsetup.c (removed) @@ -1,83 +1,0 @@ -/* - * PROJECT: EFI Windows Loader - * LICENSE: GPL - See COPYING in the top level directory - * FILE: freeldr/windows/i386/ntsetup.c - * PURPOSE: i386-specific setup for Windows boot - * PROGRAMMERS: Aleksey Bragin (aleksey(a)reactos.org) - */ - -/* INCLUDES ***************************************************************/ - -#include <freeldr.h> -#include <debug.h> - -// this is needed for new IDT filling -#if 0 -extern ULONG_PTR i386DivideByZero; -extern ULONG_PTR i386DebugException; -extern ULONG_PTR i386NMIException; -extern ULONG_PTR i386Breakpoint; -extern ULONG_PTR i386Overflow; -extern ULONG_PTR i386BoundException; -extern ULONG_PTR i386InvalidOpcode; -extern ULONG_PTR i386FPUNotAvailable; -extern ULONG_PTR i386DoubleFault; -extern ULONG_PTR i386CoprocessorSegment; -extern ULONG_PTR i386InvalidTSS; -extern ULONG_PTR i386SegmentNotPresent; -extern ULONG_PTR i386StackException; -extern ULONG_PTR i386GeneralProtectionFault; -extern ULONG_PTR i386PageFault; // exc 14 -extern ULONG_PTR i386CoprocessorError; // exc 16 -extern ULONG_PTR i386AlignmentCheck; // exc 17 -#endif - -/* FUNCTIONS **************************************************************/ - -// Last step before going virtual -void WinLdrSetupForNt(PLOADER_PARAMETER_BLOCK LoaderBlock, - PVOID *GdtIdt, - ULONG *PcrBasePage, - ULONG *TssBasePage) -{ - ULONG TssSize; - //ULONG TssPages; - ULONG_PTR Pcr = 0; - ULONG_PTR Tss = 0; - ULONG BlockSize, NumPages; - - LoaderBlock->u.I386.CommonDataArea = NULL; // Force No ABIOS support - LoaderBlock->u.I386.MachineType = MACHINE_TYPE_ISA; - - /* Allocate 2 pages for PCR */ - Pcr = (ULONG_PTR)MmAllocateMemoryWithType(2 * MM_PAGE_SIZE, LoaderStartupPcrPage); - *PcrBasePage = Pcr >> MM_PAGE_SHIFT; - - if (Pcr == 0) - { - UiMessageBox("Can't allocate PCR\n"); - return; - } - - /* Allocate TSS */ - TssSize = (sizeof(KTSS) + MM_PAGE_SIZE) & ~(MM_PAGE_SIZE - 1); - //TssPages = TssSize / MM_PAGE_SIZE; - - Tss = (ULONG_PTR)MmAllocateMemoryWithType(TssSize, LoaderMemoryData); - - *TssBasePage = Tss >> MM_PAGE_SHIFT; - - /* Allocate space for new GDT + IDT */ - BlockSize = NUM_GDT*sizeof(KGDTENTRY) + NUM_IDT*sizeof(KIDTENTRY);//FIXME: Use GDT/IDT limits here? - NumPages = (BlockSize + MM_PAGE_SIZE - 1) >> MM_PAGE_SHIFT; - *GdtIdt = (PKGDTENTRY)MmAllocateMemoryWithType(NumPages * MM_PAGE_SIZE, LoaderMemoryData); - - if (*GdtIdt == NULL) - { - UiMessageBox("Can't allocate pages for GDT+IDT!\n"); - return; - } - - /* Zero newly prepared GDT+IDT */ - RtlZeroMemory(*GdtIdt, NumPages << MM_PAGE_SHIFT); -} Removed: branches/arty-newcc/boot/freeldr/freeldr/windows/i386/wlmemory.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/boot/freeldr/freeldr… ============================================================================== --- branches/arty-newcc/boot/freeldr/freeldr/windows/i386/wlmemory.c [iso-8859-1] (original) +++ branches/arty-newcc/boot/freeldr/freeldr/windows/i386/wlmemory.c (removed) @@ -1,553 +1,0 @@ -/* - * PROJECT: EFI Windows Loader - * LICENSE: GPL - See COPYING in the top level directory - * FILE: freeldr/winldr/i386/wlmemory.c - * PURPOSE: Memory related routines - * PROGRAMMERS: Aleksey Bragin (aleksey(a)reactos.org) - */ - -/* INCLUDES ***************************************************************/ - -#include <freeldr.h> - -#include <ndk/asm.h> -#include <debug.h> - -extern ULONG TotalNLSSize; -extern ULONG LoaderPagesSpanned; - -// This is needed because headers define wrong one for ReactOS -#undef KIP0PCRADDRESS -#define KIP0PCRADDRESS 0xffdff000 - -#define HYPER_SPACE_ENTRY 0x300 - -// This is needed only for SetProcessorContext routine -#pragma pack(2) - typedef struct - { - USHORT Limit; - ULONG Base; - } GDTIDT; -#pragma pack(4) - -/* GLOBALS ***************************************************************/ - -PHARDWARE_PTE PDE; -PHARDWARE_PTE HalPageTable; - -PUCHAR PhysicalPageTablesBuffer; -PUCHAR KernelPageTablesBuffer; -ULONG PhysicalPageTables; -ULONG KernelPageTables; - -/* FUNCTIONS **************************************************************/ - -BOOLEAN -MempAllocatePageTables() -{ - ULONG NumPageTables, TotalSize; - PUCHAR Buffer; - // It's better to allocate PDE + PTEs contigiuos - - // Max number of entries = MaxPageNum >> 10 - // FIXME: This is a number to describe ALL physical memory - // and windows doesn't expect ALL memory mapped... - NumPageTables = TotalPagesInLookupTable >> 10; - - DPRINTM(DPRINT_WINDOWS, "NumPageTables = %d\n", NumPageTables); - - // Allocate memory block for all these things: - // PDE, HAL mapping page table, physical mapping, kernel mapping - TotalSize = (1 + 1 + NumPageTables * 2) * MM_PAGE_SIZE; - - // PDE+HAL+KernelPTEs == MemoryData - Buffer = MmAllocateMemoryWithType(TotalSize, LoaderMemoryData); - - // Physical PTEs = FirmwareTemporary - PhysicalPageTablesBuffer = (PUCHAR)Buffer + TotalSize - NumPageTables*MM_PAGE_SIZE; - MmSetMemoryType(PhysicalPageTablesBuffer, - NumPageTables*MM_PAGE_SIZE, - LoaderFirmwareTemporary); - - // This check is now redundant - if (Buffer + (TotalSize - NumPageTables*MM_PAGE_SIZE) != - PhysicalPageTablesBuffer) - { - DPRINTM(DPRINT_WINDOWS, "There was a problem allocating two adjacent blocks of memory!"); - } - - if (Buffer == NULL || PhysicalPageTablesBuffer == NULL) - { - UiMessageBox("Impossible to allocate memory block for page tables!"); - return FALSE; - } - - // Zero all this memory block - RtlZeroMemory(Buffer, TotalSize); - - // Set up pointers correctly now - PDE = (PHARDWARE_PTE)Buffer; - - // Map the page directory at 0xC0000000 (maps itself) - PDE[HYPER_SPACE_ENTRY].PageFrameNumber = (ULONG)PDE >> MM_PAGE_SHIFT; - PDE[HYPER_SPACE_ENTRY].Valid = 1; - PDE[HYPER_SPACE_ENTRY].Write = 1; - - // The last PDE slot is allocated for HAL's memory mapping (Virtual Addresses 0xFFC00000 - 0xFFFFFFFF) - HalPageTable = (PHARDWARE_PTE)&Buffer[MM_PAGE_SIZE*1]; - - // Map it - PDE[1023].PageFrameNumber = (ULONG)HalPageTable >> MM_PAGE_SHIFT; - PDE[1023].Valid = 1; - PDE[1023].Write = 1; - - // Store pointer to the table for easier access - KernelPageTablesBuffer = &Buffer[MM_PAGE_SIZE*2]; - - // Zero counters of page tables used - PhysicalPageTables = 0; - KernelPageTables = 0; - - return TRUE; -} - -VOID -MempAllocatePTE(ULONG Entry, PHARDWARE_PTE *PhysicalPT, PHARDWARE_PTE *KernelPT) -{ - //Print(L"Creating PDE Entry %X\n", Entry); - - // Identity mapping - *PhysicalPT = (PHARDWARE_PTE)&PhysicalPageTablesBuffer[PhysicalPageTables*MM_PAGE_SIZE]; - PhysicalPageTables++; - - PDE[Entry].PageFrameNumber = (ULONG)*PhysicalPT >> MM_PAGE_SHIFT; - PDE[Entry].Valid = 1; - PDE[Entry].Write = 1; - - if (Entry+(KSEG0_BASE >> 22) > 1023) - { - DPRINTM(DPRINT_WINDOWS, "WARNING! Entry: %X > 1023\n", Entry+(KSEG0_BASE >> 22)); - } - - // Kernel-mode mapping - *KernelPT = (PHARDWARE_PTE)&KernelPageTablesBuffer[KernelPageTables*MM_PAGE_SIZE]; - KernelPageTables++; - - PDE[Entry+(KSEG0_BASE >> 22)].PageFrameNumber = ((ULONG)*KernelPT >> MM_PAGE_SHIFT); - PDE[Entry+(KSEG0_BASE >> 22)].Valid = 1; - PDE[Entry+(KSEG0_BASE >> 22)].Write = 1; -} - -BOOLEAN -MempSetupPaging(IN ULONG StartPage, - IN ULONG NumberOfPages) -{ - PHARDWARE_PTE PhysicalPT; - PHARDWARE_PTE KernelPT; - ULONG Entry, Page; - - //Print(L"MempSetupPaging: SP 0x%X, Number: 0x%X\n", StartPage, NumberOfPages); - - // HACK - if (StartPage+NumberOfPages >= 0x80000) - { - // - // We can't map this as it requires more than 1 PDE - // and in fact it's not possible at all ;) - // - //Print(L"skipping...\n"); - return TRUE; - } - - // - // Now actually set up the page tables for identity mapping - // - for (Page = StartPage; Page < StartPage + NumberOfPages; Page++) - { - Entry = Page >> 10; - - if (((PULONG)PDE)[Entry] == 0) - { - MempAllocatePTE(Entry, &PhysicalPT, &KernelPT); - } - else - { - PhysicalPT = (PHARDWARE_PTE)(PDE[Entry].PageFrameNumber << MM_PAGE_SHIFT); - KernelPT = (PHARDWARE_PTE)(PDE[Entry+(KSEG0_BASE >> 22)].PageFrameNumber << MM_PAGE_SHIFT); - } - - PhysicalPT[Page & 0x3ff].PageFrameNumber = Page; - PhysicalPT[Page & 0x3ff].Valid = (Page != 0); - PhysicalPT[Page & 0x3ff].Write = (Page != 0); - - KernelPT[Page & 0x3ff].PageFrameNumber = Page; - KernelPT[Page & 0x3ff].Valid = (Page != 0); - KernelPT[Page & 0x3ff].Write = (Page != 0); - } - - return TRUE; -} - -VOID -MempUnmapPage(ULONG Page) -{ - PHARDWARE_PTE KernelPT; - ULONG Entry = (Page >> 10) + (KSEG0_BASE >> 22); - - /* Don't unmap hyperspace or HAL entries */ - if (Entry == HYPER_SPACE_ENTRY || Entry == 1023) - return; - - if (PDE[Entry].Valid) - { - KernelPT = (PHARDWARE_PTE)(PDE[Entry].PageFrameNumber << MM_PAGE_SHIFT); - - if (KernelPT) - { - KernelPT[Page & 0x3ff].PageFrameNumber = 0; - KernelPT[Page & 0x3ff].Valid = 0; - KernelPT[Page & 0x3ff].Write = 0; - } - } -} - -VOID -WinLdrpMapApic() -{ - BOOLEAN LocalAPIC; - LARGE_INTEGER MsrValue; - ULONG APICAddress, CpuInfo[4]; - - /* Check if we have a local APIC */ - __cpuid((int*)CpuInfo, 1); - LocalAPIC = (((CpuInfo[3] >> 9) & 1) != 0); - - /* If there is no APIC, just return */ - if (!LocalAPIC) - return; - - /* Read the APIC Address */ - MsrValue.QuadPart = __readmsr(0x1B); - APICAddress = (MsrValue.LowPart & 0xFFFFF000); - - DPRINTM(DPRINT_WINDOWS, "Local APIC detected at address 0x%x\n", - APICAddress); - - /* Map it */ - HalPageTable[(APIC_BASE - 0xFFC00000) >> MM_PAGE_SHIFT].PageFrameNumber - = APICAddress >> MM_PAGE_SHIFT; - HalPageTable[(APIC_BASE - 0xFFC00000) >> MM_PAGE_SHIFT].Valid = 1; - HalPageTable[(APIC_BASE - 0xFFC00000) >> MM_PAGE_SHIFT].Write = 1; - HalPageTable[(APIC_BASE - 0xFFC00000) >> MM_PAGE_SHIFT].WriteThrough = 1; - HalPageTable[(APIC_BASE - 0xFFC00000) >> MM_PAGE_SHIFT].CacheDisable = 1; -} - -BOOLEAN -WinLdrMapSpecialPages(ULONG PcrBasePage) -{ - - //VideoDisplayString(L"Hello from VGA, going into the kernel\n"); - DPRINTM(DPRINT_WINDOWS, "HalPageTable: 0x%X\n", HalPageTable); - - // Page Tables have been setup, make special handling for PCR and TSS - // (which is done in BlSetupFotNt in usual ntldr) - HalPageTable[(KI_USER_SHARED_DATA - 0xFFC00000) >> MM_PAGE_SHIFT].PageFrameNumber = PcrBasePage+1; - HalPageTable[(KI_USER_SHARED_DATA - 0xFFC00000) >> MM_PAGE_SHIFT].Valid = 1; - HalPageTable[(KI_USER_SHARED_DATA - 0xFFC00000) >> MM_PAGE_SHIFT].Write = 1; - - HalPageTable[(KIP0PCRADDRESS - 0xFFC00000) >> MM_PAGE_SHIFT].PageFrameNumber = PcrBasePage; - HalPageTable[(KIP0PCRADDRESS - 0xFFC00000) >> MM_PAGE_SHIFT].Valid = 1; - HalPageTable[(KIP0PCRADDRESS - 0xFFC00000) >> MM_PAGE_SHIFT].Write = 1; - - // Map APIC - WinLdrpMapApic(); - - // Map VGA memory - //VideoMemoryBase = MmMapIoSpace(0xb8000, 4000, MmNonCached); - //DPRINTM(DPRINT_WINDOWS, "VideoMemoryBase: 0x%X\n", VideoMemoryBase); - - return TRUE; -} - - -VOID -WinLdrSetProcessorContext(PVOID GdtIdt, IN ULONG Pcr, IN ULONG Tss) -{ - GDTIDT GdtDesc, IdtDesc, OldIdt; - PKGDTENTRY pGdt; - PKIDTENTRY pIdt; - USHORT Ldt = 0; - //ULONG i; - - DPRINTM(DPRINT_WINDOWS, "GDtIdt %p, Pcr %p, Tss 0x%08X\n", - GdtIdt, Pcr, Tss); - - // Enable paging - //BS->ExitBootServices(ImageHandle,MapKey); - - // Disable Interrupts - _disable(); - - // Re-initalize EFLAGS - __writeeflags(0); - - // Set the PDBR - __writecr3((ULONG_PTR)PDE); - - // Enable paging by modifying CR0 - __writecr0(__readcr0() | CR0_PG); - - // Kernel expects the PCR to be zero-filled on startup - // FIXME: Why zero it here when we can zero it right after allocation? - RtlZeroMemory((PVOID)Pcr, MM_PAGE_SIZE); //FIXME: Why zero only 1 page when we allocate 2? - - // Get old values of GDT and IDT - Ke386GetGlobalDescriptorTable(&GdtDesc); - __sidt(&IdtDesc); - - // Save old IDT - OldIdt.Base = IdtDesc.Base; - OldIdt.Limit = IdtDesc.Limit; - - // Prepare new IDT+GDT - GdtDesc.Base = KSEG0_BASE | (ULONG_PTR)GdtIdt; - GdtDesc.Limit = NUM_GDT * sizeof(KGDTENTRY) - 1; - IdtDesc.Base = (ULONG)((PUCHAR)GdtDesc.Base + GdtDesc.Limit + 1); - IdtDesc.Limit = NUM_IDT * sizeof(KIDTENTRY) - 1; - - // ======================== - // Fill all descriptors now - // ======================== - - pGdt = (PKGDTENTRY)GdtDesc.Base; - pIdt = (PKIDTENTRY)IdtDesc.Base; - - // - // Code selector (0x8) - // Flat 4Gb - // - pGdt[1].LimitLow = 0xFFFF; - pGdt[1].BaseLow = 0; - pGdt[1].HighWord.Bytes.BaseMid = 0; - pGdt[1].HighWord.Bytes.Flags1 = 0x9A; - pGdt[1].HighWord.Bytes.Flags2 = 0xCF; - pGdt[1].HighWord.Bytes.BaseHi = 0; - - // - // Data selector (0x10) - // Flat 4Gb - // - pGdt[2].LimitLow = 0xFFFF; - pGdt[2].BaseLow = 0; - pGdt[2].HighWord.Bytes.BaseMid = 0; - pGdt[2].HighWord.Bytes.Flags1 = 0x92; - pGdt[2].HighWord.Bytes.Flags2 = 0xCF; - pGdt[2].HighWord.Bytes.BaseHi = 0; - - // - // Selector (0x18) - // Flat 2Gb - // - pGdt[3].LimitLow = 0xFFFF; - pGdt[3].BaseLow = 0; - pGdt[3].HighWord.Bytes.BaseMid = 0; - pGdt[3].HighWord.Bytes.Flags1 = 0xFA; - pGdt[3].HighWord.Bytes.Flags2 = 0xCF; - pGdt[3].HighWord.Bytes.BaseHi = 0; - - // - // Selector (0x20) - // Flat 2Gb - // - pGdt[4].LimitLow = 0xFFFF; - pGdt[4].BaseLow = 0; - pGdt[4].HighWord.Bytes.BaseMid = 0; - pGdt[4].HighWord.Bytes.Flags1 = 0xF2; - pGdt[4].HighWord.Bytes.Flags2 = 0xCF; - pGdt[4].HighWord.Bytes.BaseHi = 0; - - // - // TSS Selector (0x28) - // - pGdt[5].LimitLow = 0x78-1; //FIXME: Check this - pGdt[5].BaseLow = (USHORT)(Tss & 0xffff); - pGdt[5].HighWord.Bytes.BaseMid = (UCHAR)((Tss >> 16) & 0xff); - pGdt[5].HighWord.Bytes.Flags1 = 0x89; - pGdt[5].HighWord.Bytes.Flags2 = 0x00; - pGdt[5].HighWord.Bytes.BaseHi = (UCHAR)((Tss >> 24) & 0xff); - - // - // PCR Selector (0x30) - // - pGdt[6].LimitLow = 0x01; - pGdt[6].BaseLow = (USHORT)(Pcr & 0xffff); - pGdt[6].HighWord.Bytes.BaseMid = (UCHAR)((Pcr >> 16) & 0xff); - pGdt[6].HighWord.Bytes.Flags1 = 0x92; - pGdt[6].HighWord.Bytes.Flags2 = 0xC0; - pGdt[6].HighWord.Bytes.BaseHi = (UCHAR)((Pcr >> 24) & 0xff); - - // - // Selector (0x38) - // - pGdt[7].LimitLow = 0xFFFF; - pGdt[7].BaseLow = 0; - pGdt[7].HighWord.Bytes.BaseMid = 0; - pGdt[7].HighWord.Bytes.Flags1 = 0xF3; - pGdt[7].HighWord.Bytes.Flags2 = 0x40; - pGdt[7].HighWord.Bytes.BaseHi = 0; - - // - // Some BIOS stuff (0x40) - // - pGdt[8].LimitLow = 0xFFFF; - pGdt[8].BaseLow = 0x400; - pGdt[8].HighWord.Bytes.BaseMid = 0; - pGdt[8].HighWord.Bytes.Flags1 = 0xF2; - pGdt[8].HighWord.Bytes.Flags2 = 0x0; - pGdt[8].HighWord.Bytes.BaseHi = 0; - - // - // Selector (0x48) - // - pGdt[9].LimitLow = 0; - pGdt[9].BaseLow = 0; - pGdt[9].HighWord.Bytes.BaseMid = 0; - pGdt[9].HighWord.Bytes.Flags1 = 0; - pGdt[9].HighWord.Bytes.Flags2 = 0; - pGdt[9].HighWord.Bytes.BaseHi = 0; - - // - // Selector (0x50) - // - pGdt[10].LimitLow = 0xFFFF; //FIXME: Not correct! - pGdt[10].BaseLow = 0; - pGdt[10].HighWord.Bytes.BaseMid = 0x2; - pGdt[10].HighWord.Bytes.Flags1 = 0x89; - pGdt[10].HighWord.Bytes.Flags2 = 0; - pGdt[10].HighWord.Bytes.BaseHi = 0; - - // - // Selector (0x58) - // - pGdt[11].LimitLow = 0xFFFF; - pGdt[11].BaseLow = 0; - pGdt[11].HighWord.Bytes.BaseMid = 0x2; - pGdt[11].HighWord.Bytes.Flags1 = 0x9A; - pGdt[11].HighWord.Bytes.Flags2 = 0; - pGdt[11].HighWord.Bytes.BaseHi = 0; - - // - // Selector (0x60) - // - pGdt[12].LimitLow = 0xFFFF; - pGdt[12].BaseLow = 0; //FIXME: Maybe not correct, but noone cares - pGdt[12].HighWord.Bytes.BaseMid = 0x2; - pGdt[12].HighWord.Bytes.Flags1 = 0x92; - pGdt[12].HighWord.Bytes.Flags2 = 0; - pGdt[12].HighWord.Bytes.BaseHi = 0; - - // - // Video buffer Selector (0x68) - // - pGdt[13].LimitLow = 0x3FFF; - pGdt[13].BaseLow = 0x8000; - pGdt[13].HighWord.Bytes.BaseMid = 0x0B; - pGdt[13].HighWord.Bytes.Flags1 = 0x92; - pGdt[13].HighWord.Bytes.Flags2 = 0; - pGdt[13].HighWord.Bytes.BaseHi = 0; - - // - // Points to GDT (0x70) - // - pGdt[14].LimitLow = NUM_GDT*sizeof(KGDTENTRY) - 1; - pGdt[14].BaseLow = 0x7000; - pGdt[14].HighWord.Bytes.BaseMid = 0xFF; - pGdt[14].HighWord.Bytes.Flags1 = 0x92; - pGdt[14].HighWord.Bytes.Flags2 = 0; - pGdt[14].HighWord.Bytes.BaseHi = 0xFF; - - // - // Some unused descriptors should go here - // - - // Copy the old IDT - RtlCopyMemory(pIdt, (PVOID)OldIdt.Base, OldIdt.Limit + 1); - - // Mask interrupts - //asm("cli\n"); // they are already masked before enabling paged mode - - // Load GDT+IDT - Ke386SetGlobalDescriptorTable(&GdtDesc); - __lidt(&IdtDesc); - - // Jump to proper CS and clear prefetch queue -#if defined(__GNUC__) - asm("ljmp $0x08, $1f\n" - "1:\n"); -#elif defined(_MSC_VER) - /* We can't express the above in MASM so we use this far return instead */ - __asm - { - push 8 - push offset resume - retf - resume: - }; -#else -#error -#endif - - // Set SS selector - Ke386SetSs(0x10); // DataSelector=0x10 - - // Set DS and ES selectors - Ke386SetDs(0x10); - Ke386SetEs(0x10); // this is vital for rep stosd - - // LDT = not used ever, thus set to 0 - Ke386SetLocalDescriptorTable(Ldt); - - // Load TSR - Ke386SetTr(KGDT_TSS); - - // Clear GS - Ke386SetGs(0); - - // Set FS to PCR - Ke386SetFs(0x30); - - // Real end of the function, just for information - /* do not uncomment! - pop edi; - pop esi; - pop ebx; - mov esp, ebp; - pop ebp; - ret - */ -} - -#if DBG -VOID -MempDump() -{ - ULONG *PDE_Addr=(ULONG *)PDE;//0xC0300000; - int i, j; - - DPRINTM(DPRINT_WINDOWS, "\nPDE\n"); - - for (i=0; i<128; i++) - { - DPRINTM(DPRINT_WINDOWS, "0x%04X | ", i*8); - - for (j=0; j<8; j++) - { - DPRINTM(DPRINT_WINDOWS, "0x%08X ", PDE_Addr[i*8+j]); - } - - DPRINTM(DPRINT_WINDOWS, "\n"); - } -} -#endif - Removed: branches/arty-newcc/boot/freeldr/freeldr/windows/setupldr2.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/boot/freeldr/freeldr… ============================================================================== --- branches/arty-newcc/boot/freeldr/freeldr/windows/setupldr2.c [iso-8859-1] (original) +++ branches/arty-newcc/boot/freeldr/freeldr/windows/setupldr2.c (removed) @@ -1,373 +1,0 @@ -/* - * FreeLoader - * - * Copyright (C) 2009 Aleksey Bragin <aleksey(a)reactos.org> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#include <freeldr.h> - -#include <ndk/ldrtypes.h> -#include <arc/setupblk.h> - -#include <debug.h> - -// TODO: Move to .h -VOID AllocateAndInitLPB(PLOADER_PARAMETER_BLOCK *OutLoaderBlock); -BOOLEAN WinLdrLoadBootDrivers(PLOADER_PARAMETER_BLOCK LoaderBlock, LPSTR BootPath); -void WinLdrSetupForNt(PLOADER_PARAMETER_BLOCK LoaderBlock, - PVOID *GdtIdt, - ULONG *PcrBasePage, - ULONG *TssBasePage); -VOID -WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK LoaderBlock, - PCHAR Options, - PCHAR SystemPath, - PCHAR BootPath, - USHORT VersionToBoot); -BOOLEAN -WinLdrLoadNLSData(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, - IN LPCSTR DirectoryPath, - IN LPCSTR AnsiFileName, - IN LPCSTR OemFileName, - IN LPCSTR LanguageFileName); -BOOLEAN -WinLdrAddDriverToList(LIST_ENTRY *BootDriverListHead, - LPWSTR RegistryPath, - LPWSTR ImagePath, - LPWSTR ServiceName); - - -//FIXME: Do a better way to retrieve Arc disk information -extern ULONG reactos_disk_count; -extern ARC_DISK_SIGNATURE reactos_arc_disk_info[]; -extern char reactos_arc_strings[32][256]; - -extern BOOLEAN UseRealHeap; -extern ULONG LoaderPagesSpanned; - - -VOID -SetupLdrLoadNlsData(PLOADER_PARAMETER_BLOCK LoaderBlock, HINF InfHandle, LPCSTR SearchPath) -{ - INFCONTEXT InfContext; - BOOLEAN Status; - LPCSTR AnsiName, OemName, LangName; - - /* Get ANSI codepage file */ - if (!InfFindFirstLine(InfHandle, "NLS", "AnsiCodepage", &InfContext)) - { - printf("Failed to find 'NLS/AnsiCodepage'\n"); - return; - } - if (!InfGetDataField(&InfContext, 1, &AnsiName)) - { - printf("Failed to get load options\n"); - return; - } - - /* Get OEM codepage file */ - if (!InfFindFirstLine(InfHandle, "NLS", "OemCodepage", &InfContext)) - { - printf("Failed to find 'NLS/AnsiCodepage'\n"); - return; - } - if (!InfGetDataField(&InfContext, 1, &OemName)) - { - printf("Failed to get load options\n"); - return; - } - - if (!InfFindFirstLine(InfHandle, "NLS", "UnicodeCasetable", &InfContext)) - { - printf("Failed to find 'NLS/AnsiCodepage'\n"); - return; - } - if (!InfGetDataField(&InfContext, 1, &LangName)) - { - printf("Failed to get load options\n"); - return; - } - - Status = WinLdrLoadNLSData(LoaderBlock, SearchPath, AnsiName, OemName, LangName); - DPRINTM(DPRINT_WINDOWS, "NLS data loaded with status %d\n", Status); -} - -VOID -SetupLdrScanBootDrivers(PLOADER_PARAMETER_BLOCK LoaderBlock, HINF InfHandle, LPCSTR SearchPath) -{ - INFCONTEXT InfContext, dirContext; - BOOLEAN Status; - LPCSTR Media, DriverName, dirIndex, ImagePath; - WCHAR ServiceName[256]; - WCHAR ImagePathW[256]; - - /* Open inf section */ - if (!InfFindFirstLine(InfHandle, "SourceDisksFiles", NULL, &InfContext)) - return; - - /* Load all listed boot drivers */ - do - { - if (InfGetDataField(&InfContext, 7, &Media) && - InfGetDataField(&InfContext, 0, &DriverName) && - InfGetDataField(&InfContext, 13, &dirIndex)) - { - if ((strcmp(Media, "x") == 0) && - InfFindFirstLine(InfHandle, "Directories", dirIndex, &dirContext) && - InfGetDataField(&dirContext, 1, &ImagePath)) - { - /* Convert name to widechar */ - swprintf(ServiceName, L"%S", DriverName); - - /* Prepare image path */ - swprintf(ImagePathW, L"%S", ImagePath); - wcscat(ImagePathW, L"\\"); - wcscat(ImagePathW, ServiceName); - - /* Remove .sys extension */ - ServiceName[wcslen(ServiceName) - 4] = 0; - - /* Add it to the list */ - Status = WinLdrAddDriverToList(&LoaderBlock->BootDriverListHead, - L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\", - ImagePathW, - ServiceName); - - if (!Status) - { - DPRINTM(DPRINT_WINDOWS, "could not add boot driver %s, %s\n", SearchPath, DriverName); - return; - } - } - } - } while (InfFindNextLine(&InfContext, &InfContext)); -} - -VOID LoadReactOSSetup2(VOID) -{ - CHAR SystemPath[512], SearchPath[512]; - CHAR FileName[512]; - CHAR BootPath[512]; - LPCSTR LoadOptions, BootOptions; - BOOLEAN BootFromFloppy; -#if DBG - LPCSTR DbgOptions; -#endif - PVOID NtosBase = NULL, HalBase = NULL, KdComBase = NULL; - BOOLEAN Status; - ULONG i, ErrorLine; - HINF InfHandle; - INFCONTEXT InfContext; - PLOADER_PARAMETER_BLOCK LoaderBlock, LoaderBlockVA; - PSETUP_LOADER_BLOCK SetupBlock; - KERNEL_ENTRY_POINT KiSystemStartup; - PLDR_DATA_TABLE_ENTRY KernelDTE, HalDTE, KdComDTE = NULL; - // Mm-related things - PVOID GdtIdt; - ULONG PcrBasePage=0; - ULONG TssBasePage=0; - LPCSTR SourcePath; - LPCSTR SourcePaths[] = - { - "", /* Only for floppy boot */ -#if defined(_M_IX86) - "\\I386", -#elif defined(_M_MPPC) - "\\PPC", -#elif defined(_M_MRX000) - "\\MIPS", -#endif - "\\reactos", - NULL - }; - - /* Get boot path */ - MachDiskGetBootPath(SystemPath, sizeof(SystemPath)); - - /* And check if we booted from floppy */ - BootFromFloppy = strstr(SystemPath, "fdisk") != NULL; - - /* Open 'txtsetup.sif' from any of source paths */ - for (i = BootFromFloppy ? 0 : 1; ; i++) - { - SourcePath = SourcePaths[i]; - if (!SourcePath) - { - printf("Failed to open 'txtsetup.sif'\n"); - return; - } - sprintf(FileName, "%s\\txtsetup.sif", SourcePath); - if (InfOpenFile (&InfHandle, FileName, &ErrorLine)) - { - sprintf(BootPath, "%s%s\\", SystemPath, SourcePath); - break; - } - } - - /* Get Load options - debug and non-debug */ - if (!InfFindFirstLine(InfHandle, - "SetupData", - "OsLoadOptions", - &InfContext)) - { - printf("Failed to find 'SetupData/OsLoadOptions'\n"); - return; - } - - if (!InfGetDataField (&InfContext, 1, &LoadOptions)) - { - printf("Failed to get load options\n"); - return; - } - - BootOptions = LoadOptions; - -#if DBG - /* Get debug load options and use them */ - if (InfFindFirstLine(InfHandle, - "SetupData", - "DbgOsLoadOptions", - &InfContext)) - { - if (!InfGetDataField(&InfContext, 1, &DbgOptions)) - DbgOptions = ""; - else - BootOptions = DbgOptions; - } -#endif - - DPRINTM(DPRINT_WINDOWS,"BootOptions: '%s'\n", BootOptions); - - SetupUiInitialize(); - UiDrawStatusText(""); - UiDrawStatusText("Detecting Hardware..."); - - /* Let user know we started loading */ - UiDrawStatusText("Loading..."); - - /* Construct the system path */ - sprintf(SystemPath, "%s\\", SourcePath); - - DPRINTM(DPRINT_WINDOWS,"BootPath: '%s', SystemPath: '%s'\n", BootPath, SystemPath); - - /* Allocate and minimalistic-initialize LPB */ - AllocateAndInitLPB(&LoaderBlock); - - /* Allocate and initialize setup loader block */ - SetupBlock = MmHeapAlloc(sizeof(SETUP_LOADER_BLOCK)); - RtlZeroMemory(SetupBlock, sizeof(SETUP_LOADER_BLOCK)); - LoaderBlock->SetupLdrBlock = SetupBlock; - - /* Set textmode setup flag */ - SetupBlock->Flags = SETUPLDR_TEXT_MODE; - - /* Detect hardware */ - UseRealHeap = TRUE; - LoaderBlock->ConfigurationRoot = MachHwDetect(); - - strcpy(FileName, "\\ArcName\\"); - - /* Load kernel */ - strcpy(FileName+strlen("\\ArcName\\"), BootPath); - strcat(FileName, "SYSTEM32\\NTOSKRNL.EXE"); - Status = WinLdrLoadImage(FileName+strlen("\\ArcName\\"), LoaderSystemCode, &NtosBase); - DPRINTM(DPRINT_WINDOWS, "Ntos loaded with status %d at %p\n", Status, NtosBase); - Status = WinLdrAllocateDataTableEntry(LoaderBlock, "ntoskrnl.exe", - FileName, NtosBase, &KernelDTE); - DPRINTM(DPRINT_WINDOWS, "Ntos Data Table Entry allocated with status %d at %p\n", Status, KernelDTE); - - /* Load HAL */ - strcpy(FileName+strlen("\\ArcName\\"), BootPath); - strcat(FileName, "SYSTEM32\\HAL.DLL"); - Status = WinLdrLoadImage(FileName+strlen("\\ArcName\\"), LoaderHalCode, &HalBase); - DPRINTM(DPRINT_WINDOWS, "HAL loaded with status %d at %p\n", Status, HalBase); - Status = WinLdrAllocateDataTableEntry(LoaderBlock, "hal.dll", - FileName, HalBase, &HalDTE); - DPRINTM(DPRINT_WINDOWS, "HAL Data Table Entry allocated with status %d at %p\n", Status, HalDTE); - - /* Load kernel-debugger support dll */ - strcpy(FileName+strlen("\\ArcName\\"), BootPath); - strcat(FileName, "SYSTEM32\\KDCOM.DLL"); - Status = WinLdrLoadImage(FileName+strlen("\\ArcName\\"), LoaderBootDriver, &KdComBase); - DPRINTM(DPRINT_WINDOWS, "KdCom loaded with status %d at %p\n", Status, KdComBase); - Status = WinLdrAllocateDataTableEntry(LoaderBlock, "kdcom.dll", - FileName, KdComBase, &KdComDTE); - DPRINTM(DPRINT_WINDOWS, "KdCom Data Table Entry allocated with status %d at %p\n", Status, HalDTE); - - /* Load all referenced DLLs for kernel, HAL and kdcom.dll */ - strcpy(SearchPath, BootPath); - strcat(SearchPath, "system32\\"); - Status = WinLdrScanImportDescriptorTable(LoaderBlock, SearchPath, KernelDTE); - Status &= WinLdrScanImportDescriptorTable(LoaderBlock, SearchPath, HalDTE); - if (KdComDTE) - Status &= WinLdrScanImportDescriptorTable(LoaderBlock, SearchPath, KdComDTE); - - if (!Status) - { - UiMessageBox("Error loading imported dll."); - return; - } - - /* Load NLS data, they are in system32 */ - SetupLdrLoadNlsData(LoaderBlock, InfHandle, SearchPath); - - /* Get a list of boot drivers */ - SetupLdrScanBootDrivers(LoaderBlock, InfHandle, BootPath); - - /* Load boot drivers */ - Status = WinLdrLoadBootDrivers(LoaderBlock, BootPath); - DPRINTM(DPRINT_WINDOWS, "Boot drivers loaded with status %d\n", Status); - - /* Alloc PCR, TSS, do magic things with the GDT/IDT */ - WinLdrSetupForNt(LoaderBlock, &GdtIdt, &PcrBasePage, &TssBasePage); - - /* Initialize Phase 1 - no drivers loading anymore */ - WinLdrInitializePhase1(LoaderBlock, (PCHAR)BootOptions, SystemPath, BootPath, _WIN32_WINNT_WS03); - - /* Save entry-point pointer and Loader block VAs */ - KiSystemStartup = (KERNEL_ENTRY_POINT)KernelDTE->EntryPoint; - LoaderBlockVA = PaToVa(LoaderBlock); - - /* "Stop all motors", change videomode */ - MachPrepareForReactOS(TRUE); - - /* Debugging... */ - //DumpMemoryAllocMap(); - - /* Turn on paging mode of CPU*/ - WinLdrTurnOnPaging(LoaderBlock, PcrBasePage, TssBasePage, GdtIdt); - - /* Save final value of LoaderPagesSpanned */ - LoaderBlock->Extension->LoaderPagesSpanned = LoaderPagesSpanned; - - DPRINTM(DPRINT_WINDOWS, "Hello from paged mode, KiSystemStartup %p, LoaderBlockVA %p!\n", - KiSystemStartup, LoaderBlockVA); - - //WinLdrpDumpMemoryDescriptors(LoaderBlockVA); - //WinLdrpDumpBootDriver(LoaderBlockVA); - //WinLdrpDumpArcDisks(LoaderBlockVA); - - /*asm(".intel_syntax noprefix\n"); - asm("test1:\n"); - asm("jmp test1\n"); - asm(".att_syntax\n");*/ - - /* Pass control */ - (*KiSystemStartup)(LoaderBlockVA); - - return; -} Modified: branches/arty-newcc/dll/directx/ksproxy/output_pin.cpp URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/directx/ksproxy/… ============================================================================== --- branches/arty-newcc/dll/directx/ksproxy/output_pin.cpp [iso-8859-1] (original) +++ branches/arty-newcc/dll/directx/ksproxy/output_pin.cpp [iso-8859-1] Fri Aug 26 13:51:30 2011 @@ -1035,7 +1035,7 @@ return NOERROR; } -IMemAllocator * +IMemAllocator * STDMETHODCALLTYPE COutputPin::KsPeekAllocator(KSPEEKOPERATION Operation) { @@ -1318,7 +1318,7 @@ HRESULT STDMETHODCALLTYPE COutputPin::Backout( - IPin *ppinOut, + IPin *ppinOut, IGraphBuilder *pGraph) { #ifdef KSPROXY_TRACE @@ -2428,7 +2428,7 @@ assert(NumHandles); //allocate stream segment array - StreamSegment = (PKSSTREAM_SEGMENT*)CoTaskMemAlloc(sizeof(PKSSTREAM_SEGMENT) * NumHandles); + StreamSegment = (PKSSTREAM_SEGMENT*)CoTaskMemAlloc(sizeof(PVOID) * NumHandles); if (!StreamSegment) { OutputDebugStringW(L"COutputPin::IoProcessRoutine out of memory\n"); @@ -2444,7 +2444,7 @@ } // zero handles array - ZeroMemory(StreamSegment, sizeof(PKSSTREAM_SEGMENT) * NumHandles); + ZeroMemory(StreamSegment, sizeof(PVOID) * NumHandles); ZeroMemory(Samples, sizeof(IMediaSample*) * NumHandles); // first wait for the start event to signal @@ -2536,7 +2536,7 @@ } //circular stream segment array - RtlMoveMemory(StreamSegment, &StreamSegment[1], sizeof(PKSSTREAM_SEGMENT) * (NumHandles - 1)); + RtlMoveMemory(StreamSegment, &StreamSegment[1], sizeof(PVOID) * (NumHandles - 1)); RtlMoveMemory(Samples, &Samples[1], sizeof(IMediaSample*) * (NumHandles - 1)); }while(TRUE); Modified: branches/arty-newcc/drivers/ksfilter/ks/filter.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/ksfilter/ks/… ============================================================================== --- branches/arty-newcc/drivers/ksfilter/ks/filter.c [iso-8859-1] (original) +++ branches/arty-newcc/drivers/ksfilter/ks/filter.c [iso-8859-1] Fri Aug 26 13:51:30 2011 @@ -203,7 +203,7 @@ } /* does the filter require explicit deferred processing */ - if ((This->Filter.Descriptor->Flags & (KSFILTER_FLAG_DISPATCH_LEVEL_PROCESSING | KSFILTER_FLAG_CRITICAL_PROCESSING | KSFILTER_FLAG_HYPERCRITICAL_PROCESSING)) && + if ((This->Filter.Descriptor->Flags & (KSFILTER_FLAG_DISPATCH_LEVEL_PROCESSING | KSFILTER_FLAG_CRITICAL_PROCESSING | KSFILTER_FLAG_HYPERCRITICAL_PROCESSING)) && KeGetCurrentIrql() > PASSIVE_LEVEL) { /* queue work item */ @@ -512,8 +512,8 @@ /* allocate new process pin array */ Status = _KsEdit(This->Filter.Bag, (PVOID*)&This->ProcessPinIndex[ProcessPin->Pin->Id].Pins, - (This->Filter.Descriptor->PinDescriptorsCount + 1) * sizeof(PKSPROCESSPIN), - This->Filter.Descriptor->PinDescriptorsCount * sizeof(PKSPROCESSPIN), + (This->Filter.Descriptor->PinDescriptorsCount + 1) * sizeof(PVOID), + This->Filter.Descriptor->PinDescriptorsCount * sizeof(PVOID), 0); if (NT_SUCCESS(Status)) @@ -556,7 +556,7 @@ { if (Pins[Index] == ProcessPin) { - RtlMoveMemory(&Pins[Index], &Pins[Index + 1], (Count - (Index + 1)) * sizeof(PKSPROCESSPIN)); + RtlMoveMemory(&Pins[Index], &Pins[Index + 1], (Count - (Index + 1)) * sizeof(PVOID)); break; } @@ -755,7 +755,7 @@ } /* ignore custom structs for now */ - ASSERT(This->Filter.Descriptor->PinDescriptorSize == sizeof(KSPIN_DESCRIPTOR_EX)); + ASSERT(This->Filter.Descriptor->PinDescriptorSize == sizeof(KSPIN_DESCRIPTOR_EX)); ASSERT(This->Filter.Descriptor->PinDescriptorsCount > Pin->PinId); Instances = (KSPIN_CINSTANCES*)Data; @@ -787,7 +787,7 @@ } /* ignore custom structs for now */ - ASSERT(This->Filter.Descriptor->PinDescriptorSize == sizeof(KSPIN_DESCRIPTOR_EX)); + ASSERT(This->Filter.Descriptor->PinDescriptorSize == sizeof(KSPIN_DESCRIPTOR_EX)); ASSERT(This->Filter.Descriptor->PinDescriptorsCount > Pin->PinId); Result = (PULONG)Data; @@ -835,7 +835,7 @@ } /* ignore custom structs for now */ - ASSERT(This->Filter.Descriptor->PinDescriptorSize == sizeof(KSPIN_DESCRIPTOR_EX)); + ASSERT(This->Filter.Descriptor->PinDescriptorSize == sizeof(KSPIN_DESCRIPTOR_EX)); ASSERT(This->Filter.Descriptor->PinDescriptorsCount > Pin->PinId); if (This->Filter.Descriptor->PinDescriptors[Pin->PinId].IntersectHandler == NULL || @@ -1147,8 +1147,8 @@ } /* store instantiated pin arrays */ - Status = _KsEdit(This->Filter.Bag, (PVOID*)&This->FirstPin, sizeof(PKSPIN) * FilterDescriptor->PinDescriptorsCount, - sizeof(PKSPIN) * FilterDescriptor->PinDescriptorsCount, 0); + Status = _KsEdit(This->Filter.Bag, (PVOID*)&This->FirstPin, sizeof(PVOID) * FilterDescriptor->PinDescriptorsCount, + sizeof(PVOID) * FilterDescriptor->PinDescriptorsCount, 0); if (!NT_SUCCESS(Status)) { @@ -1395,7 +1395,7 @@ /* sanity check */ ASSERT(Connect->PinId < This->Filter.Descriptor->PinDescriptorsCount); - DPRINT("IKsFilter_DispatchCreatePin KsValidateConnectRequest PinId %lu CurrentInstanceCount %lu MaxPossible %lu\n", Connect->PinId, + DPRINT("IKsFilter_DispatchCreatePin KsValidateConnectRequest PinId %lu CurrentInstanceCount %lu MaxPossible %lu\n", Connect->PinId, This->PinInstanceCount[Connect->PinId], This->Filter.Descriptor->PinDescriptors[Connect->PinId].InstancesPossible); @@ -1922,7 +1922,7 @@ } /* modify first pin array */ - Status = _KsEdit(This->Filter.Bag,(PVOID*)&This->FirstPin, sizeof(PKSPIN) * Count, sizeof(PKSPIN) * This->Filter.Descriptor->PinDescriptorsCount, 0); + Status = _KsEdit(This->Filter.Bag,(PVOID*)&This->FirstPin, sizeof(PVOID) * Count, sizeof(PVOID) * This->Filter.Descriptor->PinDescriptorsCount, 0); if (!NT_SUCCESS(Status)) { /* failed */ Modified: branches/arty-newcc/drivers/storage/scsiport/scsiport.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/storage/scsi… ============================================================================== --- branches/arty-newcc/drivers/storage/scsiport/scsiport.c [iso-8859-1] (original) +++ branches/arty-newcc/drivers/storage/scsiport/scsiport.c [iso-8859-1] Fri Aug 26 13:51:30 2011 @@ -1537,12 +1537,12 @@ &Dirql[i], &Affinity[i]); } - + if (DeviceExtension->InterruptCount == 1 || Dirql[0] > Dirql[1]) MaxDirql = Dirql[0]; else MaxDirql = Dirql[1]; - + for (i = 0; i < DeviceExtension->InterruptCount; i++) { /* Determing IRQ sharability as usual */ @@ -1576,7 +1576,7 @@ break; } } - + if (!NT_SUCCESS(Status)) break; } @@ -1639,7 +1639,7 @@ /* Initialize bus scanning information */ DeviceExtension->BusesConfig = ExAllocatePoolWithTag(PagedPool, - sizeof(PSCSI_BUS_SCAN_INFO) * DeviceExtension->PortConfig->NumberOfBuses + sizeof(PVOID) * DeviceExtension->PortConfig->NumberOfBuses + sizeof(ULONG), TAG_SCSIPORT); if (!DeviceExtension->BusesConfig) @@ -1651,7 +1651,7 @@ /* Zero it */ RtlZeroMemory(DeviceExtension->BusesConfig, - sizeof(PSCSI_BUS_SCAN_INFO) * DeviceExtension->PortConfig->NumberOfBuses + sizeof(PVOID) * DeviceExtension->PortConfig->NumberOfBuses + sizeof(ULONG)); /* Store number of buses there */ @@ -2008,7 +2008,7 @@ case BusChangeDetected: DPRINT1("UNIMPLEMENTED SCSI Notification called: BusChangeDetected!\n"); break; - + default: DPRINT1 ("Unsupported notification from WMI: %lu\n", NotificationType); break; @@ -2183,7 +2183,7 @@ PortConfig->DmaPort != SP_UNINITIALIZED_VALUE) { Dma = 1; - + if (PortConfig->DmaChannel2 != SP_UNINITIALIZED_VALUE || PortConfig->DmaPort2 != SP_UNINITIALIZED_VALUE) Dma++; @@ -2288,7 +2288,7 @@ ResourceDescriptor->u.Dma.Channel = (Dma == 2) ? PortConfig->DmaChannel2 : PortConfig->DmaChannel; ResourceDescriptor->u.Dma.Port = (Dma == 2) ? PortConfig->DmaPort2 : PortConfig->DmaPort; ResourceDescriptor->Flags = 0; - + if (((Dma == 2) ? PortConfig->DmaWidth2 : PortConfig->DmaWidth) == Width8Bits) ResourceDescriptor->Flags |= CM_RESOURCE_DMA_8; else if (((Dma == 2) ? PortConfig->DmaWidth2 : PortConfig->DmaWidth) == Width16Bits) @@ -2301,7 +2301,7 @@ if (((Dma == 2) ? PortConfig->DmaPort2 : PortConfig->DmaPort) == SP_UNINITIALIZED_VALUE) ResourceDescriptor->u.Dma.Port = 0; - + ResourceDescriptor++; Dma--; } @@ -2327,12 +2327,11 @@ CHAR VendorIdString[8]; CHAR DeviceIdString[8]; UNICODE_STRING UnicodeStr; - PCM_RESOURCE_LIST ResourceList; + PCM_RESOURCE_LIST ResourceList = NULL; NTSTATUS Status; DPRINT ("SpiGetPciConfiguration() called\n"); - RtlZeroMemory(&ResourceList, sizeof(PCM_RESOURCE_LIST)); SlotNumber.u.AsULONG = 0; /* Loop through all devices */ @@ -5943,7 +5942,7 @@ UNICODE_STRING UnicodeString; ANSI_STRING AnsiString; NTSTATUS Status = STATUS_SUCCESS; - + KeyValueInformation = (PKEY_VALUE_FULL_INFORMATION) Buffer; @@ -6232,7 +6231,7 @@ break; case CmResourceTypeInterrupt: - + if (Interrupt == 0) { ConfigInfo->BusInterruptLevel = @@ -6253,7 +6252,7 @@ ConfigInfo->InterruptMode2 = (PartialDescriptor->Flags & CM_RESOURCE_INTERRUPT_LATCHED) ? Latched : LevelSensitive; } - + Interrupt++; break; @@ -6263,7 +6262,7 @@ { ConfigInfo->DmaChannel = PartialDescriptor->u.Dma.Channel; ConfigInfo->DmaPort = PartialDescriptor->u.Dma.Port; - + if (PartialDescriptor->Flags & CM_RESOURCE_DMA_8) ConfigInfo->DmaWidth = Width8Bits; else if ((PartialDescriptor->Flags & CM_RESOURCE_DMA_16) || @@ -6276,7 +6275,7 @@ { ConfigInfo->DmaChannel2 = PartialDescriptor->u.Dma.Channel; ConfigInfo->DmaPort2 = PartialDescriptor->u.Dma.Port; - + if (PartialDescriptor->Flags & CM_RESOURCE_DMA_8) ConfigInfo->DmaWidth2 = Width8Bits; else if ((PartialDescriptor->Flags & CM_RESOURCE_DMA_16) || @@ -6285,7 +6284,7 @@ else if (PartialDescriptor->Flags & CM_RESOURCE_DMA_32) ConfigInfo->DmaWidth2 = Width32Bits; } - + Dma++; break; Modified: branches/arty-newcc/drivers/wdm/audio/backpln/portcls/irpstream.cpp URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/wdm/audio/ba… ============================================================================== --- branches/arty-newcc/drivers/wdm/audio/backpln/portcls/irpstream.cpp [iso-8859-1] (original) +++ branches/arty-newcc/drivers/wdm/audio/backpln/portcls/irpstream.cpp [iso-8859-1] Fri Aug 26 13:51:30 2011 @@ -43,7 +43,7 @@ LIST_ENTRY m_IrpList; LIST_ENTRY m_FreeIrpList; - ULONG m_OutOfMapping; + BOOLEAN m_OutOfMapping; ULONG m_MaxFrameSize; ULONG m_Alignment; ULONG m_TagSupportEnabled; @@ -372,7 +372,7 @@ ASSERT(StreamData); // add to current offset - InterlockedExchangeAdd((volatile PLONG)&m_CurrentOffset, (LONG)BytesWritten); + InterlockedExchangeAdd((PLONG)&m_CurrentOffset, (LONG)BytesWritten); if (m_Descriptor->DataFlow == KSPIN_DATAFLOW_OUT) { Modified: branches/arty-newcc/hal/halx86/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/hal/halx86/CMakeList… ============================================================================== --- branches/arty-newcc/hal/halx86/CMakeLists.txt [iso-8859-1] (original) +++ branches/arty-newcc/hal/halx86/CMakeLists.txt [iso-8859-1] Fri Aug 26 13:51:30 2011 @@ -38,6 +38,7 @@ generic/legacy/bus/pcidata.c generic/legacy/bus/sysbus.c generic/legacy/bussupp.c + generic/legacy/halpnpdd.c generic/legacy/halpcat.c) list(APPEND HAL_GENERIC_ACPI_SOURCE Modified: branches/arty-newcc/hal/halx86/generic/legacy/halpcat.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/hal/halx86/generic/l… ============================================================================== --- branches/arty-newcc/hal/halx86/generic/legacy/halpcat.c [iso-8859-1] (original) +++ branches/arty-newcc/hal/halx86/generic/legacy/halpcat.c [iso-8859-1] Fri Aug 26 13:51:30 2011 @@ -60,6 +60,7 @@ return (HalpBusType == MACHINE_TYPE_EISA) ? CM_RESOURCE_PORT_16_BIT_DECODE : 0; } +#if 0 NTSTATUS NTAPI INIT_FUNCTION @@ -69,6 +70,7 @@ //HalpDebugPciBus(); return STATUS_SUCCESS; } +#endif /* * @implemented Modified: branches/arty-newcc/hal/halx86/hal_generic_acpi.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/hal/halx86/hal_gener… ============================================================================== --- branches/arty-newcc/hal/halx86/hal_generic_acpi.rbuild [iso-8859-1] (original) +++ branches/arty-newcc/hal/halx86/hal_generic_acpi.rbuild [iso-8859-1] Fri Aug 26 13:51:30 2011 @@ -8,16 +8,16 @@ <define name="_NTHAL_" /> <define name="CONFIG_ACPI" /> <directory name="generic"> - <directory name="acpi"> - <file>halacpi.c</file> - <file>halpnpdd.c</file> - <file>busemul.c</file> - </directory> - <directory name="legacy"> - <directory name="bus"> - <file>pcibus.c</file> - </directory> - </directory> + <directory name="acpi"> + <file>halacpi.c</file> + <file>halpnpdd.c</file> + <file>busemul.c</file> + </directory> + <directory name="legacy"> + <directory name="bus"> + <file>pcibus.c</file> + </directory> + </directory> <if property="ARCH" value="i386"> <file>halinit.c</file> </if> Modified: branches/arty-newcc/hal/halx86/hal_generic_pcat.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/hal/halx86/hal_gener… ============================================================================== --- branches/arty-newcc/hal/halx86/hal_generic_pcat.rbuild [iso-8859-1] (original) +++ branches/arty-newcc/hal/halx86/hal_generic_pcat.rbuild [iso-8859-1] Fri Aug 26 13:51:30 2011 @@ -7,18 +7,19 @@ <define name="_NTHALDLL_" /> <define name="_NTHAL_" /> <directory name="generic"> - <directory name="legacy"> - <directory name="bus"> - <file>bushndlr.c</file> - <file>cmosbus.c</file> - <file>isabus.c</file> - <file>pcibus.c</file> - <file>pcidata.c</file> - <file>sysbus.c</file> - </directory> - <file>bussupp.c</file> - <file>halpcat.c</file> - </directory> + <directory name="legacy"> + <directory name="bus"> + <file>bushndlr.c</file> + <file>cmosbus.c</file> + <file>isabus.c</file> + <file>pcibus.c</file> + <file>pcidata.c</file> + <file>sysbus.c</file> + </directory> + <file>bussupp.c</file> + <file>halpcat.c</file> + <file>halpnpdd.c</file> + </directory> <if property="ARCH" value="i386"> <file>halinit.c</file> </if> Modified: branches/arty-newcc/include/c++/stlport/stl/config/_reactos.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/include/c%2B%2B/stlp… ============================================================================== --- branches/arty-newcc/include/c++/stlport/stl/config/_reactos.h [iso-8859-1] (original) +++ branches/arty-newcc/include/c++/stlport/stl/config/_reactos.h [iso-8859-1] Fri Aug 26 13:51:30 2011 @@ -313,8 +313,11 @@ #ifdef __cplusplus } #endif + +#ifdef _BUILD_STLPORT #define InterlockedPopEntrySList(list) reinterpret_cast<_STLP_atomic_freelist::item*>(InterlockedPopEntrySList(list)) #define InterlockedFlushSList(list) reinterpret_cast<_STLP_atomic_freelist::item*>(InterlockedFlushSList(list)) +#endif #undef __cdecl__ #define __cdecl__ Modified: branches/arty-newcc/include/crt/msc/intrin.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/include/crt/msc/intr… ============================================================================== --- branches/arty-newcc/include/crt/msc/intrin.h [iso-8859-1] (original) +++ branches/arty-newcc/include/crt/msc/intrin.h [iso-8859-1] Fri Aug 26 13:51:30 2011 @@ -216,7 +216,7 @@ unsigned __int64 _byteswap_uint64(unsigned __int64 value); #pragma intrinsic(_byteswap_uint64) #ifdef _M_AMD64 -unsigned char _bittest64(__int64 *a, __int64 b); +unsigned char _bittest64(__int64 const *a, __int64 b); #pragma intrinsic(_bittest64) #endif Modified: branches/arty-newcc/lib/3rdparty/stlport/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/lib/3rdparty/stlport… ============================================================================== --- branches/arty-newcc/lib/3rdparty/stlport/CMakeLists.txt [iso-8859-1] (original) +++ branches/arty-newcc/lib/3rdparty/stlport/CMakeLists.txt [iso-8859-1] Fri Aug 26 13:51:30 2011 @@ -4,7 +4,8 @@ add_definitions( -D_STLP_USE_EXCEPTIONS - -D_DLL -D__USE_CRTIMP) + -D_DLL -D__USE_CRTIMP + -D_BUILD_STLPORT) set_cpp() Modified: branches/arty-newcc/media/inf/hal.inf URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/media/inf/hal.inf?re… ============================================================================== Binary files - no diff available.

13 years, 4 months

[tkreuzer] 53453: [FREELDR] - implement the amd64 real mode entry point and callback mechanism - implement PnpBiosSupported, PnpBiosGetDeviceNodeCount, PnpBiosGetDeviceNode for amd64 - delete outda...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Aug 26 13:10:18 2011 New Revision: 53453 URL: http://svn.reactos.org/svn/reactos?rev=53453&view=rev Log: [FREELDR] - implement the amd64 real mode entry point and callback mechanism - implement PnpBiosSupported, PnpBiosGetDeviceNodeCount, PnpBiosGetDeviceNode for amd64 - delete outdated amd64 files Added: trunk/reactos/boot/freeldr/freeldr/arch/amd64/pnpbios.S (with props) Removed: trunk/reactos/boot/freeldr/freeldr/arch/amd64/arch.S trunk/reactos/boot/freeldr/freeldr/arch/amd64/boot.S trunk/reactos/boot/freeldr/freeldr/arch/amd64/drvmap.S trunk/reactos/boot/freeldr/freeldr/arch/amd64/fathelp.S trunk/reactos/boot/freeldr/freeldr/arch/amd64/i386cpu.S trunk/reactos/boot/freeldr/freeldr/arch/amd64/i386idt.S trunk/reactos/boot/freeldr/freeldr/arch/amd64/i386pnp.S trunk/reactos/boot/freeldr/freeldr/arch/amd64/i386trap.S trunk/reactos/boot/freeldr/freeldr/arch/amd64/mb.S trunk/reactos/boot/freeldr/freeldr/arch/amd64/stubs.S Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt trunk/reactos/boot/freeldr/freeldr/arch/amd64/entry.S trunk/reactos/boot/freeldr/freeldr/arch/amd64/int386.S trunk/reactos/boot/freeldr/freeldr/arch/realmode/amd64.S Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMake… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Fri Aug 26 13:10:18 2011 @@ -124,7 +124,9 @@ elseif(ARCH MATCHES amd64) list(APPEND FREELDR_COMMON_SOURCE arch/amd64/entry.S + arch/amd64/int386.S arch/amd64/loader.c + arch/amd64/pnpbios.S arch/i386/hardware.c arch/i386/hwacpi.c arch/i386/hwapm.c Removed: trunk/reactos/boot/freeldr/freeldr/arch/amd64/arch.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/amd64/arch.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/amd64/arch.S (removed) @@ -1,454 +1,0 @@ - -#define ASM - -#include <asm.inc> - -.text -.code16 - -//.org 0x8000 - -.global RealEntryPoint -RealEntryPoint: - - cli - - /* Setup real mode segment registers */ - xor ax, ax - mov ds, ax - mov es, ax - mov fs, ax - mov gs, ax - mov ss, ax - - /* checkPoint Charlie - where it all began... */ - mov si, offset CheckPoint0 - call writestr - - /* Setup a real mode stack */ - mov sp, stack16 - - /* Zero BootPartition */ - xor eax, eax - mov FrldrBootPartition, eax - - /* Store the boot drive */ - mov FrldrBootDrive, dl - - /* Store the boot partition */ - mov FrldrBootPartition, dh - - /* Load the GDT */ - lgdt gdtptr - /* Load the IDT */ -// lidt idtptr - - call x86_16_EnableA20 - - /* checkPoint Charlie - where it all began... */ - mov si, offset CheckPoint1 - call writestr - - call x86_16_BuildPageTables - - /* checkPoint Charlie - where it all began... */ - mov si, offset CheckPoint2 - call writestr - - /* Check if CPU supports CPUID */ - - pushfd - pop eax - mov ebx, eax - xor eax, 0x00200000 - push eax - popfd - pushfd - pop eax - cmp eax,ebx - jz NO_CPUID_SUPPORT_DETECTED - - /* CPUID support detected - getting the PAE/PGE */ - - mov eax,1 // Fn0000_0001 - PAE in EDX[6] - cpuid - xor eax,eax - and edx,0x00a0 - test edx,edx // are PAE and PGE bits set? - jz NO_X64_SUPPORT_DETECTED - - /* PAE and PGE are here */ - - xor edx, edx - mov eax, 0x80000001 - cpuid - and edx, 0x20000000 - test edx,edx - jz NO_X64_SUPPORT_DETECTED - - /* X64 Processor */ - - /* checkPoint Charlie - where it all began... */ - mov si, offset CheckPoint3 - call writestr - - jmp switch64 - -NO_X64_SUPPORT_DETECTED: - mov si, offset NotAnX64Processor // Loading message - call writestr - jmp fail - -NO_CPUID_SUPPORT_DETECTED: - mov si, offset NoCPUIDSupport // Loading message - call writestr - -fail: - jmp fail - nop - nop - -switch64: - call x86_16_SwitchToLong - - .code64 - -// mov ax, LMODE_DS -// mov ds, ax -// mov word ptr ds:[0xb8000], 0x0e00 + '1' - - /* GO! */ - xor rcx, rcx - call BootMain - - /* Checkpoint */ -// mov ax, LMODE_DS -// mov ds, ax -// mov word ptr ds:[0xb8002], 0x0e02 + '2' - - - /* Return into real mode */ - call x86_64_SwitchToReal - .code16 - -// int 0x19 - - /* We should never get here */ -stop: - jmp stop - nop - nop - - -/** 16 Bit helper functions ***************************************************/ -.code16 - -x86_16_Empty8042: - .word 0x00eb,0x00eb // jmp $+2, jmp $+2 - in al, 0x64 - cmp al, 0xff // legacy-free machine without keyboard - jz empty_8042_ret // controllers on Intel Macs read back 0xFF - test al, 0x02 - jnz x86_16_Empty8042 -empty_8042_ret: - ret - -x86_16_EnableA20: - pusha - call x86_16_Empty8042 - mov al, 0xD1 // command write - out 0x64, al - call x86_16_Empty8042 - mov al, 0xDF // A20 on - out 0x60, al - call x86_16_Empty8042 - popa - ret - -/* - * We define 512 2MB pages at the start of memory, so we can access the first - * 1 GB as if paging was disabled - */ -x86_16_BuildPageTables: - pusha - push es - - /* Get segment of pml4 */ - mov eax, offset pml4_startup - shr eax, 4 - mov es, ax - cld - xor di, di - - /* One entry in the PML4 pointing to PDP */ - mov eax, offset pdp_startup - or eax, 0x00f - stosd - /* clear rest */ - xor eax, eax - mov cx, 0x03ff - rep stosd - - /* One entry in the PDP pointing to PD */ - mov eax, offset pd_startup - or eax, 0x00f - stosd - /* clear rest */ - xor eax, eax - mov ecx, 0x03ff - rep stosd - - /* 512 entries in the PD defining a 2MB page each */ - mov ecx, 512 - mov eax, 0x008f - -Bpt2: - mov es: [di], eax - mov dword ptr es: [di + 4], 0 - add eax, 512 << 12 // add 512 4k pages - add di, 8 - - /* Loop it */ - dec cx - jnz Bpt2 - - /* Return */ - pop es - popa - ret - -/* - * writechr,writestr - * - * - */ -writestr: - pushfd - pushad -.top: - lodsb - and al, al - jz .end - call writechr - jmp short .top -.end: - popad - popfd - ret - - -writechr: - pushf - pusha - mov ah, 0x0E - xor bx, bx - int 0x10 - popa - popf - ret - -//.global x86_16_SwitchToLong -x86_16_SwitchToLong: - - cli - - xor ax,ax - mov ds,ax - mov es,ax - mov fs,ax - mov gs,ax - mov ss,ax - - /* Get the return address off the stack */ - pop word ptr code64ret - - /* Save 16-bit stack pointer */ - mov stack16, sp - - mov eax, 0x00a0 // Set PAE and PGE: 10100000b - mov cr4, eax - - mov edx, offset pml4_startup // Point cr3 at PML4 - mov cr3, edx - - mov ecx, 0xC0000080 // Specify EFER MSR - - rdmsr // Enable long mode - or eax, 0x00000100 - wrmsr - - mov ebx, cr0 // Activate long mode - or ebx, 0x80000001 // by enabling paging and protection simultaneously - mov cr0, ebx // skipping protected mode entirely - - jmp LMODE_CS:offset LongCat //Load CS with 64 bit segment and flush the instruction cache - -.code64 -LongCat: - /* Set up 64 bit stack */ - mov rsp, stack64 - - /* Put the return address back onto the stack */ - push qword ptr code64ret - - /* Now return in long mode! */ - ret - -/** 64 Bit functions **********************************************************/ -.code64 - -.global x86_64_SwitchToReal -x86_64_SwitchToReal: - - /* Get the return address off the stack */ - pop qword ptr code64ret - - /* Save 64-bit stack pointer */ - mov stack64, rsp - -// mov ax, LMODE_DS -// mov ds, ax -// mov word ptr ds:[0xb8004], 0x0e00 + '3' - - /* Step 1 - jump to compatibility segment */ - ljmp jumpvector - -jumpvector: - .long SwitchToReal1 - .word CMODE_CS - -SwitchToReal1: -.code32 - -// mov word ptr ds:[0xb8006], 0x0e00 + '4' - - /* Step 2 - deactivate long mode, by disabling paging */ - mov eax, cr0 - and eax, 0x000000007fffffff //~0x80000000 - mov cr0, eax - - /* Step 2 - disable long mode in EFER MSR */ -// mov ecx, 0xC0000080 // Specify EFER MSR -// rdmsr -// and eax, ~0x00000100 // Disable EFER.LME -// wrmsr - - /* Step 3 - jump to 16-bit segment to set the limit correctly */ - jmp RMODE_CS: offset SwitchToReal2 - -SwitchToReal2: - .code16 - - /* Step 4 - Disable Protected Mode */ - mov eax, cr0 - and eax, ~0x00000001 - mov cr0, eax - - /* Clear prefetch queue & correct CS */ - jmp 0:offset BeReal - -BeReal: - /* Checkpoint */ -// mov ax, 0xb800 -// mov fs, ax -// mov word ptr fs:[0x0C], 0x0e00 + '7' - - /* Restore segment registers */ - mov ax, 0 - mov ds, ax - mov es, ax - mov fs, ax - mov gs, ax - mov ss, ax - - /* Restore 16 bit stack */ - mov sp, stack16 - -// lidt rmode_idtptr /* Load IDTR with real mode value */ - -// sti /* These are ok now */ - - /* Put the return address back onto the stack */ - push word ptr code64ret - - /* Now return in real mode! */ - ret - - - -/** Some data *****************************************************************/ - -.code64 - -stack16: - .quad STACK16ADDR - -stack64: - .quad STACK64ADDR - -code64ret: - .quad 0 - -.p2align 2 -gdt: - .quad 0x0000000000000000 /* 00: NULL descriptor */ - .quad 0x0000000000000000 /* 08: */ - .quad 0x0020980000000000 /* 10: long mode cs */ - .quad 0x00cff3000000ffff /* 18: long mode ds */ - .word 0xFFFF, 0x0000, 0x9E00, 0x0000 /* 16-bit real mode CS */ - .word 0xFFFF, 0x0000, 0x9200, 0x0000 /* 16-bit real mode DS */ - .quad 0x00CF9B000000FFFF /* 30: compat mode cs */ - -/* GDT table pointer */ -gdtptr: - .word 0x37 /* Limit */ - .long gdt /* Base Address */ - - -.global FrldrBootDrive -FrldrBootDrive: - .byte 0 - -.global FrldrBootPartition -FrldrBootPartition: - .long 0 - -.global NotAnX64Processor -NotAnX64Processor: - .ascii "FreeLoader: No x64-compatible CPU detected! Exiting..." - .byte 0x0d, 0x0a, 0 - -.global NoCPUIDSupport -NoCPUIDSupport: - .ascii "FreeLoader: No CPUID instruction support detected! Exiting..." - .byte 0x0d, 0x0a, 0 - -/////////////////////////// Checkpoint messages /////////////////////////////// -.global CheckPoint0 -CheckPoint0: - .ascii "Starting FreeLoader..." - .byte 0x0d, 0x0a, 0 - -.global CheckPoint1 -CheckPoint1: - .ascii "FreeLoader[16-bit]: building page tables..." - .byte 0x0d, 0x0a, 0 - -.global CheckPoint2 -CheckPoint2: - .ascii "FreeLoader[16-bit]: checking CPU for x64 long mode..." - .byte 0x0d, 0x0a, 0 - -.global CheckPoint3 -CheckPoint3: - .ascii "FreeLoader: Switching to x64 long mode..." - .byte 0x0d, 0x0a, 0 - -/////////////////////////////////////////////////////////////////////////////// - -/* Need to include them here, because of linking issues between 64 / 16 bit */ -//#include "debug16.S" -#include "int386.S" -#include "boot.S" -#include "i386pnp.S" - Removed: trunk/reactos/boot/freeldr/freeldr/arch/amd64/boot.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/amd64/boot.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/amd64/boot.S (removed) @@ -1,65 +1,0 @@ -/* - * FreeLoader - * Copyright (C) 1998-2002 Brian Palmer <brianp(a)sginet.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#include <asm.inc> - - - .text - .code16 - -PUBLIC ChainLoadBiosBootSectorCode -ChainLoadBiosBootSectorCode: - .code64 - - call x86_64_SwitchToReal - .code16 - - /* Set the boot drive */ - mov dl, BootDrive - - /* Load segment registers */ - cli - mov bx, 0x0000 - mov ds, bx - mov es, bx - mov fs, bx - mov gs, bx - mov ss, bx - mov sp, 0x7C00 - -// ljmpl $0x0000,$0x7C00 - jmp 0x7c00:0x0000 - -PUBLIC SoftReboot -SoftReboot: - .code64 - - call x86_64_SwitchToReal - .code16 - - mov ax, 0x40 - mov ds, ax - mov si, 0x72 - - // Set the word at location 40:72 to 1234h - mov word ptr [si], 0x1234 - - // and jump to location FFFF:0 in ROM -// ljmpl $0xFFFF,$0x0000 - jmp 0xffff: 0x0000 Removed: trunk/reactos/boot/freeldr/freeldr/arch/amd64/drvmap.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/amd64/drvmap.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/amd64/drvmap.S (removed) @@ -1,130 +1,0 @@ -/* - * FreeLoader - * Copyright (C) 1998-2002 Brian Palmer <brianp(a)sginet.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - - .text - .code16 - -#include <arch/pc/x86common.h> - -EXTERN(DriveMapInt13HandlerStart) -Int13Handler: - - pushw %bp - movw %sp,%bp - pushw %ax - pushw %cx - pushw %si - - cld - - /* Get callers flags from stack */ - movw 0x06(%bp),%ax - movw %ax,%cs:(CallersFlags - Int13Handler) - - /* Save the drive number they passed in */ - movb %dl,%cs:(PassedInDriveNumber - Int13Handler) - - /* Now we need to perform the mapping */ - xorw %cx,%cx - movw $(Int13HandlerMapCount - Int13Handler),%si - /* Get the count of drives in the map list */ - movb %cs:(%si),%cl - incw %si - - /* If the map list is empty then just call the old int 13h handler */ - cmpb $0,%cl - jz CallOldInt13Handler - -GetMappedDriveNumberLoop: - - /* Get the next drive number in the list */ - lodsw %cs:(%si),%ax - /* Check to see if it's the one they are calling int 13h for */ - cmpb %al,%dl - /* If not get the next one */ - jne GetMappedDriveNumberLoopNext - - /* If we get here then we have found a mapped drive */ - /* Send new drive number on to the old int 13h handler */ - movb %ah,%dl - /* Call BIOS Int 13 Handler */ - jmp CallOldInt13Handler - -GetMappedDriveNumberLoopNext: - loop GetMappedDriveNumberLoop - -CallOldInt13Handler: - /* Restore the registers we changed off the stack */ - popw %si - popw %cx - popw %ax - - /* Put flags onto stack */ - pushw %cs:(CallersFlags - Int13Handler) - - /* Call old int 13h handler with new drive number */ - .byte 0x9a /* lcall */ -EXTERN(DriveMapOldInt13HandlerAddress) - .word 0 - .word 0 - - /* Update the callers flags with the values the BIOS returned */ - pushw %ax - pushf - popw %ax - movw %ax,0x06(%bp) - popw %ax - /* Restore the callers drive number */ - movb %cs:(PassedInDriveNumber - Int13Handler),%dl - - popw %bp - - iret - -CallersFlags: - .word 0 - -PassedInDriveNumber: - .byte 0 - -EXTERN(DriveMapInt13HandlerMapList) -Int13HandlerMapCount: - .byte 0 - -Int13HandlerDrive1: - .byte 0 -Int13HandlerDriveNew1: - .byte 0 - -Int13HandlerDrive2: - .byte 0 -Int13HandlerDriveNew2: - .byte 0 - -Int13HandlerDrive3: - .byte 0 -Int13HandlerDriveNew3: - .byte 0 - -Int13HandlerDrive4: - .byte 0 -Int13HandlerDriveNew4: - .byte 0 - -EXTERN(DriveMapInt13HandlerEnd) Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/entry.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/amd64/entry.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/amd64/entry.S [iso-8859-1] Fri Aug 26 13:10:18 2011 @@ -27,7 +27,6 @@ ContinueAddress: .double offset FrldrStartup - FrldrStartup: @@ -72,7 +71,7 @@ mov gs, ax //mov ss, ax - mov word ptr [HEX(0b8008)], HEX(0e00) + '4' + //mov word ptr [HEX(0b8008)], HEX(0e00) + '4' /* Save 64-bit stack pointer */ mov qword ptr [stack64], rsp @@ -122,75 +121,22 @@ FrldrBootPartition: .long 0 -PUBLIC PageDirectoryEnd -PageDirectoryEnd: -PUBLIC PageDirectoryStart -PageDirectoryStart: -PUBLIC PnpBiosGetDeviceNode -PnpBiosGetDeviceNode: -PUBLIC PnpBiosGetDeviceNodeCount -PnpBiosGetDeviceNodeCount: -PUBLIC PnpBiosSupported -PnpBiosSupported: +PUBLIC PxeCallApi +PxeCallApi: + xor eax, eax + ret -/* int Int386(int ivec<ecx>, REGS* in<rdx>, REGS* out<r8>); */ -PUBLIC Int386 -Int386: +//void __lgdt(void *Source); +PUBLIC __lgdt +__lgdt: + lgdt fword ptr [rcx] + ret - /* Save home registers */ - mov r11, rsp - mov qword ptr [r11 + 8], rcx - mov qword ptr [r11 + 16], rdx - mov qword ptr [r11 + 24], r8 - - /* Save non-volatile registers */ - push rbx - push rbp - push rsi - push rdi - - /* Alloc stack space for home registers */ - sub rsp, 40 - //.ENDPROLOG - - mov word ptr [HEX(0b8006)], HEX(0e00) + '3' - - /* Copy the int vector to shared memory */ - mov dword ptr [BSS_IntVector], ecx - - /* Copy input registers */ - mov rsi, rdx - mov rdi, BSS_RegisterSet - mov rcx, REGS_SIZE / 4 - rep movsd - - /* Set the function ID and call real mode */ - mov bx, FNID_Int386 - call CallRealMode - - /* Copy output registers */ - mov rsi, BSS_RegisterSet - mov rdi, [r11 + 16] - mov rcx, REGS_SIZE / 4 - rep movsd - - /* cleanup and return */ - add rsp, 40 - pop rdi - pop rsi - pop rbp - pop rbx +//void __ltr(unsigned short Source); +PUBLIC __ltr +__ltr: + ltr cx ret -PUBLIC PxeCallApi -PxeCallApi: -PUBLIC __lgdt -__lgdt: -PUBLIC __ltr -__ltr: - -nop - - END Removed: trunk/reactos/boot/freeldr/freeldr/arch/amd64/fathelp.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/amd64/fathelp.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/amd64/fathelp.S (removed) @@ -1,235 +1,0 @@ -// fathelp.S -// FAT12/16 Boot Sector Helper Code -// Copyright (c) 1998, 2001, 2002, 2003 Brian Palmer - -.intel_syntax noprefix - -//org 8000h - -.text - -.code16 - - -#define BootSectorStackTop 0x7bf2 -#define DataAreaStartHigh 0x2 -#define DataAreaStartLow 0x4 -#define BiosCHSDriveSizeHigh 0x6 -#define BiosCHSDriveSizeLow 0x8 -#define BiosCHSDriveSize 0x8 -#define ReadSectorsOffset 0xa -#define ReadClusterOffset 0xc -#define PutCharsOffset 0xe - -#define OEMName 3 -#define BytesPerSector 11 -#define SectsPerCluster 13 -#define ReservedSectors 14 -#define NumberOfFats 16 -#define MaxRootEntries 17 -#define TotalSectors 19 -#define MediaDescriptor 21 -#define SectorsPerFat 22 -#define SectorsPerTrack 24 -#define NumberOfHeads 26 -#define HiddenSectors 28 -#define TotalSectorsBig 32 -#define BootDrive 36 -#define Reserved 37 -#define ExtendSig 38 -#define SerialNumber 39 -#define VolumeLabel 43 -#define FileSystem 54 - -#define BootPartition 0x7dfd - - -// This code will be stored in the first 512 bytes -// of freeldr.sys. The first 3 bytes will be a jmp -// instruction to skip past the FAT helper code -// that is stored in the rest of the 512 bytes. -// -// This code is loaded at 0000:8000 so we have to -// encode a jmp instruction to jump to 0000:8200 - -.global _mainCRTStartup // For Mingw32 builds where the linker looks for this symbol -_mainCRTStartup: -.global start -start: - .byte 0xe9 - .byte 0xfd - .byte 0x01 - -// Now starts the extra boot code that we will store -// in the first 512 bytes of freeldr.sys. This code -// allows the FAT12/16 bootsector to navigate the -// FAT table so that we can still load freeldr.sys -// even if it is fragmented. - - -FatHelperEntryPoint: - - push ax // First save AX - the start cluster of freeldr.sys - - - // Display "Loading FreeLoader..." message - mov esi, offset msgLoading // Loading message - call [bp-PutCharsOffset] // Display it - - - call ReadFatIntoMemory - - pop ax // Restore AX (start cluster) - // AX has start cluster of freeldr.sys - - mov bx,0x800 - mov es,bx - -LoadFile: - push ax - call IsFat12 - pop ax - jnc LoadFile2 - cmp ax,0x0ff8 // Check to see if this is the last cluster in the chain - jmp LoadFile3 -LoadFile2: - cmp ax,0x0fff8 -LoadFile3: - jae LoadFile_Done // If so continue, if not then read then next one - push ax - xor bx,bx // Load ROSLDR starting at 0000:8000h - push es - call [bp-ReadClusterOffset] - pop es - - xor bx,bx - mov bl, [bp+SectsPerCluster] - shl bx,5 // BX = BX * 512 / 16 - mov ax,es // Increment the load address by - add ax,bx // The size of a cluster - mov es,ax - - call IsFat12 - pop ax - push es - jnc LoadFile4 - call GetFatEntry12 // Get the next entry - jmp LoadFile5 -LoadFile4: - call GetFatEntry16 -LoadFile5: - pop es - - jmp LoadFile // Load the next cluster (if any) - -LoadFile_Done: - mov dl,BYTE PTR [bp+BootDrive] // Load the boot drive into DL - mov dh,[BootPartition] // Load the boot partition into DH - - push 0 // push segment (0x0000) - mov bx, [0x8000 + 0xA8] // load the RVA of the EntryPoint into eax - add bx, 0x8000 // RVA -> VA and skip 3 bytes (jump to fathelper code) - push bx // push offset - retf // Transfer control to FreeLoader - -// Reads the entire FAT into memory at 7000:0000 -ReadFatIntoMemory: - mov ax, [bp+HiddenSectors] - mov dx, [bp+HiddenSectors+2] - add ax, [bp+ReservedSectors] - adc dx, 0 - mov cx, [bp+SectorsPerFat] - mov bx,0x7000 - mov es,bx - xor bx,bx - call [bp-ReadSectorsOffset] - ret - - -// Returns the FAT entry for a given cluster number for 16-bit FAT -// On entry AX has cluster number -// On return AX has FAT entry for that cluster -GetFatEntry16: - - mov cx,2 // AX = AX * 2 (since FAT16 entries are 2 bytes) - mul cx - shl dx,12 - - mov bx,0x7000 - add bx,dx - mov es,bx - mov bx,ax // Restore FAT entry offset - mov ax, es:[bx] // Get FAT entry - - ret - - -// Returns the FAT entry for a given cluster number for 12-bit FAT -// On entry AX has cluster number -// On return AX has FAT entry for that cluster -GetFatEntry12: - - push ax - mov cx,ax - shr ax,1 - add ax,cx // AX = AX * 1.5 (AX = AX + (AX / 2)) (since FAT12 entries are 12 bits) - - mov bx,0x7000 - mov es,bx - mov bx,ax // Put FAT entry offset into BX - mov ax, es:[bx] // Get FAT entry - pop cx // Get cluster number from stack - and cx,1 - jz UseLow12Bits - and ax,0x0fff0 - shr ax,4 - jmp GetFatEntry12_Done - -UseLow12Bits: - and ax,0x0fff - -GetFatEntry12_Done: - - ret - - -// Returns CF = 1 if this is a FAT12 file system -// Otherwise CF = 0 for FAT16 -IsFat12: - - mov ebx, [bp-DataAreaStartLow] - // EBX now has the number of the starting sector of the data area - // starting from the beginning of the disk, so subtrace hidden sectors - sub ebx, [bp+HiddenSectors] - - - xor eax,eax - mov ax, [bp+TotalSectors] - cmp ax, 0 - jnz IsFat12_2 - mov eax, [bp+TotalSectorsBig] - - // EAX now contains the number of sectors on the volume - -IsFat12_2: - sub eax,ebx // Subtract data area start sector - xor edx,edx // from total sectors of volume - - // EDX:EAX now contains the number of data sectors on the volume - movzx ebx, byte ptr [bp+SectsPerCluster] - div ebx - // EAX now has the number of clusters on the volume - stc - cmp eax,4085 - jb IsFat12_Done - clc - -IsFat12_Done: - ret - - - -msgLoading: .asciz "Loading FreeLoader...\r\n" - - .org 0x1fe // Pad to 510 bytes - .word 0x0aa55 // BootSector signature Removed: trunk/reactos/boot/freeldr/freeldr/arch/amd64/i386cpu.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/amd64/i386cpu.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/amd64/i386cpu.S (removed) @@ -1,129 +1,0 @@ -/* - * FreeLoader - * Copyright (C) 2003 Eric Kohl - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - - .text - .code16 - -#include <arch/pc/x86common.h> - -/* - * U32 CpuidSupported(VOID); - * - * RETURNS: - * 0x00000001: CPU supports the CPUID instruction - * 0x00000300: Found 80386 CPU - * 0x00000400: Found 80486 CPU without CPUID support - */ - -EXTERN(CpuidSupported) - .code32 - - pushl %ecx /* save ECX */ - - pushfl /* push original EFLAGS */ - popl %eax /* get original EFLAGS */ - movl %eax,%ecx /* save original EFLAGS */ - xorl $0x40000,%eax /* flip AC bit in EFLAGS */ - pushl %eax /* save new EFLAGS value on stack */ - popfl /* replace current EFLAGS value */ - - pushfl /* get new EFLAGS */ - popl %eax /* store new EFLAGS in EAX */ - xorl %ecx, %eax /* can't toggle AC bit, processor=80386 */ - - movl $0x300,%eax /* return processor id */ - jz NoCpuid /* jump if 80386 processor */ - - pushl %ecx - popfl /* restore AC bit in EFLAGS first */ - - movl %ecx,%eax /* get original EFLAGS */ - xorl $0x200000,%eax /* flip ID bit in EFLAGS */ - pushl %eax /* save new EFLAGS value on stack */ - popfl /* replace current EFLAGS value */ - pushfl /* get new EFLAGS */ - popl %eax /* store new EFLAGS in EAX */ - xorl %ecx,%eax /* can't toggle ID bit, */ - - movl $0x400,%eax /* return processor id */ - je NoCpuid /* processor=80486 */ - - movl $1,%eax /* CPUID supported */ - -NoCpuid: - pushl %ecx - popfl /* restore EFLAGS */ - popl %ecx /* retore ECX */ - - ret - - -/* - * VOID GetCpuid(U32 Level, U32 *eax, U32 *ebx, U32 *ecx, U32 *edx); - */ - -EXTERN(GetCpuid) - .code32 - - pushl %ebp - movl %esp,%ebp - - pushl %eax - pushl %ebx - pushl %ecx - pushl %edx - pushl %esi - - movl 0x08(%ebp),%eax - - cpuid - - movl 0x0C(%ebp),%esi - movl %eax,(%esi) - - movl 0x10(%ebp),%esi - movl %ebx,(%esi) - - movl 0x14(%ebp),%esi - movl %ecx,(%esi) - - movl 0x18(%ebp),%esi - movl %edx,(%esi) - - popl %esi - popl %edx - popl %ecx - popl %ebx - popl %eax - - movl %ebp,%esp - popl %ebp - ret - - -/* - * U64 RDTSC(VOID); - */ - -EXTERN(RDTSC) - .code32 - rdtsc - ret - -/* EOF */ Removed: trunk/reactos/boot/freeldr/freeldr/arch/amd64/i386idt.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/amd64/i386idt.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/amd64/i386idt.S (removed) @@ -1,220 +1,0 @@ -/* - * FreeLoader - * Copyright (C) 1998-2002 Brian Palmer <brianp(a)sginet.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - - .text - .code16 - - .p2align 2 /* force 4-byte alignment */ -EXTERN(i386idt) - /* Exception 0 - Divide By Zero */ - .word i386DivideByZero /* Offset 0 - 15 */ - .word 0x0008 /* Selector */ - .word 0x8e00 /* Flags, Zero Byte */ - .word 0x0000 /* Offset 16 - 31 */ - - /* Exception 1 - Debug Exception */ - .word i386DebugException /* Offset 0 - 15 */ - .word 0x0008 /* Selector */ - .word 0x8e00 /* Zero byte, flags */ - .word 0x0000 /* Offset 16 - 31 */ - - /* Exception 2 - NMI */ - .word i386NMIException /* Offset 0 - 15 */ - .word 0x0008 /* Selector */ - .word 0x8e00 /* Zero byte, flags */ - .word 0x0000 /* Offset 16 - 31 */ - - /* Exception 3 - Breakpoint (INT 3) */ - .word i386Breakpoint /* Offset 0 - 15 */ - .word 0x0008 /* Selector */ - .word 0x8e00 /* Zero byte, flags */ - .word 0x0000 /* Offset 16 - 31 */ - - /* Exception 4 - Overflow (INTO with EFLAGS[OF] set) */ - .word i386Overflow /* Offset 0 - 15 */ - .word 0x0008 /* Selector */ - .word 0x8e00 /* Zero byte, flags */ - .word 0x0000 /* Offset 16 - 31 */ - - /* Exception 5 - Bound Exception */ - .word i386BoundException /* Offset 0 - 15 */ - .word 0x0008 /* Selector */ - .word 0x8e00 /* Zero byte, flags */ - .word 0x0000 /* Offset 16 - 31 */ - - /* Exception 6 - Invalid Opcode */ - .word i386InvalidOpcode /* Offset 0 - 15 */ - .word 0x0008 /* Selector */ - .word 0x8e00 /* Zero byte, flags */ - .word 0x0000 /* Offset 16 - 31 */ - - /* Exception 7 - FPU Not Available */ - .word i386FPUNotAvailable /* Offset 0 - 15 */ - .word 0x0008 /* Selector */ - .word 0x8e00 /* Zero byte, flags */ - .word 0x0000 /* Offset 16 - 31 */ - - /* Exception 8 - Double Fault */ - .word i386DoubleFault /* Offset 0 - 15 */ - .word 0x0008 /* Selector */ - .word 0x8e00 /* Zero byte, flags */ - .word 0x0000 /* Offset 16 - 31 */ - - /* Exception 9 - Coprocessor Segment Overrun */ - .word i386CoprocessorSegment /* Offset 0 - 15 */ - .word 0x0008 /* Selector */ - .word 0x8e00 /* Zero byte, flags */ - .word 0x0000 /* Offset 16 - 31 */ - - /* Exception 10 (0x0A) - Invalid TSS */ - .word i386InvalidTSS /* Offset 0 - 15 */ - .word 0x0008 /* Selector */ - .word 0x8e00 /* Zero byte, flags */ - .word 0x0000 /* Offset 16 - 31 */ - - /* Exception 11 (0x0B) - Segment Not Present */ - .word i386SegmentNotPresent /* Offset 0 - 15 */ - .word 0x0008 /* Selector */ - .word 0x8e00 /* Zero byte, flags */ - .word 0x0000 /* Offset 16 - 31 */ - - /* Exception 12 (0x0C) - Stack Exception */ - .word i386StackException /* Offset 0 - 15 */ - .word 0x0008 /* Selector */ - .word 0x8e00 /* Zero byte, flags */ - .word 0x0000 /* Offset 16 - 31 */ - - /* Exception 13 (0x0D) - General Protection Fault */ - .word i386GeneralProtectionFault /* Offset 0 - 15 */ - .word 0x0008 /* Selector */ - .word 0x8e00 /* Zero byte, flags */ - .word 0x0000 /* Offset 16 - 31 */ - - /* Exception 14 (0x0E) - Page Fault */ - .word i386PageFault /* Offset 0 - 15 */ - .word 0x0008 /* Selector */ - .word 0x8e00 /* Zero byte, flags */ - .word 0x0000 /* Offset 16 - 31 */ - - /* Exception 15 (0x0F) - Reserved */ - .word 0x0000 /* Offset 0 - 15 */ - .word 0x0000 /* Selector */ - .word 0x0000 /* Zero byte, flags */ - .word 0x0000 /* Offset 16 - 31 */ - - /* Exception 16 (0x10) - Coprocessor Error */ - .word i386CoprocessorError /* Offset 0 - 15 */ - .word 0x0008 /* Selector */ - .word 0x8e00 /* Zero byte, flags */ - .word 0x0000 /* Offset 16 - 31 */ - - /* Exception 17 (0x11) - Alignment Check */ - .word i386AlignmentCheck /* Offset 0 - 15 */ - .word 0x0008 /* Selector */ - .word 0x8e00 /* Zero byte, flags */ - .word 0x0000 /* Offset 16 - 31 */ - - /* Exception 18 (0x12) - Machine Check */ - .word i386MachineCheck /* Offset 0 - 15 */ - .word 0x0008 /* Selector */ - .word 0x8e00 /* Zero byte, flags */ - .word 0x0000 /* Offset 16 - 31 */ - - /* Exception 19 (0x13) - Reserved */ - .word 0x0000 /* Offset 0 - 15 */ - .word 0x0000 /* Selector */ - .word 0x0000 /* Zero byte, flags */ - .word 0x0000 /* Offset 16 - 31 */ - - /* Exception 20 (0x14) - Reserved */ - .word 0x0000 /* Offset 0 - 15 */ - .word 0x0000 /* Selector */ - .word 0x0000 /* Zero byte, flags */ - .word 0x0000 /* Offset 16 - 31 */ - - /* Exception 21 (0x15) - Reserved */ - .word 0x0000 /* Offset 0 - 15 */ - .word 0x0000 /* Selector */ - .word 0x0000 /* Zero byte, flags */ - .word 0x0000 /* Offset 16 - 31 */ - - /* Exception 22 (0x16) - Reserved */ - .word 0x0000 /* Offset 0 - 15 */ - .word 0x0000 /* Selector */ - .word 0x0000 /* Zero byte, flags */ - .word 0x0000 /* Offset 16 - 31 */ - - /* Exception 23 (0x17) - Reserved */ - .word 0x0000 /* Offset 0 - 15 */ - .word 0x0000 /* Selector */ - .word 0x0000 /* Zero byte, flags */ - .word 0x0000 /* Offset 16 - 31 */ - - /* Exception 24 (0x18) - Reserved */ - .word 0x0000 /* Offset 0 - 15 */ - .word 0x0000 /* Selector */ - .word 0x0000 /* Zero byte, flags */ - .word 0x0000 /* Offset 16 - 31 */ - - /* Exception 25 (0x19) - Reserved */ - .word 0x0000 /* Offset 0 - 15 */ - .word 0x0000 /* Selector */ - .word 0x0000 /* Zero byte, flags */ - .word 0x0000 /* Offset 16 - 31 */ - - /* Exception 26 (0x1A) - Reserved */ - .word 0x0000 /* Offset 0 - 15 */ - .word 0x0000 /* Selector */ - .word 0x0000 /* Zero byte, flags */ - .word 0x0000 /* Offset 16 - 31 */ - - /* Exception 27 (0x1B) - Reserved */ - .word 0x0000 /* Offset 0 - 15 */ - .word 0x0000 /* Selector */ - .word 0x0000 /* Zero byte, flags */ - .word 0x0000 /* Offset 16 - 31 */ - - /* Exception 28 (0x1C) - Reserved */ - .word 0x0000 /* Offset 0 - 15 */ - .word 0x0000 /* Selector */ - .word 0x0000 /* Zero byte, flags */ - .word 0x0000 /* Offset 16 - 31 */ - - /* Exception 29 (0x1D) - Reserved */ - .word 0x0000 /* Offset 0 - 15 */ - .word 0x0000 /* Selector */ - .word 0x0000 /* Zero byte, flags */ - .word 0x0000 /* Offset 16 - 31 */ - - /* Exception 30 (0x1E) - Reserved */ - .word 0x0000 /* Offset 0 - 15 */ - .word 0x0000 /* Selector */ - .word 0x0000 /* Zero byte, flags */ - .word 0x0000 /* Offset 16 - 31 */ - - /* Exception 31 (0x1F) - Reserved */ - .word 0x0000 /* Offset 0 - 15 */ - .word 0x0000 /* Selector */ - .word 0x0000 /* Zero byte, flags */ - .word 0x0000 /* Offset 16 - 31 */ - -/* IDT table pointer */ -EXTERN(i386idtptr) - .word (i386idtptr-i386idt) /* Limit */ - .long i386idt /* Base Address */ Removed: trunk/reactos/boot/freeldr/freeldr/arch/amd64/i386pnp.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/amd64/i386pnp.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/amd64/i386pnp.S (removed) @@ -1,260 +1,0 @@ -/* - * FreeLoader - * Copyright (C) 2003 Eric Kohl - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#include <asm.inc> - - - .text - .code16 - -#include <arch/pc/x86common.h> - - -/* - * U32 PnpBiosSupported(VOID); - * - * RETURNS: - */ -_pnp_bios_entry_point: - .long 0 -_pnp_bios_data_segment: - .word 0 - -EXTERN(PnpBiosSupported) - .code64 - - push rdi - push rsi - push rcx - push rdx - - xor edi, edi - - /* init esi */ - mov esi, 0xF0000 - -pnp_again: - mov eax, [%esi] - cmp eax, 0x506E5024 /* "$PnP" */ - je pnp_found - - cmp esi, 0xFFFF0 - je pnp_not_found - -pnp_add: - add esi, 0x10 - jmp pnp_again - -pnp_found: - /* first calculate the checksum */ - push rsi - - push 0x21 - pop rcx - xor edx, edx - -pnp_loop: - lodsb - add dl, al - loop pnp_loop - - test dl, dl - pop rsi - jnz pnp_add - - mov edi, esi - - /* Calculate the bios entry point (far pointer) */ - xor eax, eax - mov ax, [esi + 0x0F] - shl eax, 16 - mov ax, [esi + 0x0D] - mov _pnp_bios_entry_point, eax - - /* Store bios data segment */ - mov ax, [esi + 0x1B] - mov _pnp_bios_data_segment, ax - -pnp_not_found: - mov eax, edi - - pop rdx - pop rcx - pop rsi - pop rdi - - ret - - -/* - * U32 PnpBiosGetDeviceNodeCount(U32 *NodeSize, U32 *NodeCount); - * - * RETURNS: - */ -_pnp_result: - .long 0 -_pnp_node_size: - .word 0 -_pnp_node_count: - .word 0 - -EXTERN(PnpBiosGetDeviceNodeCount) - .code64 - - push rbp - mov rbp, rsp - -// pushal FIXME -// push es - - call x86_64_SwitchToReal - .code16 - - mov ax, _pnp_bios_data_segment - push ax - - push cs - mov ax, _pnp_node_size - push ax - - push cs - mov ax, _pnp_node_count - push ax - - push 0 - - call [_pnp_bios_entry_point] - add sp, 12 - - movzx ecx, ax - mov _pnp_result, ecx - - call x86_16_SwitchToLong - .code64 - - mov esi, [rbp + 0x08] - mov ax, _pnp_node_size - movzx ecx, ax - mov [rsi], ecx - - mov rsi, [ebp + 0x0C] - mov ax, _pnp_node_count - movzx ecx, ax - mov [rsi], eax - -// pop es -// popal - - mov rsp, rbp - pop rbp - - xor rax, rax - mov eax, _pnp_result - - ret - - -/* - * U32 PnpBiosGetDeviceNode(U8 *NodeId, U8 *NodeBuffer); - * - * RETURNS: - */ -_pnp_buffer_segment: - .word 0 -_pnp_buffer_offset: - .word 0 - -_pnp_node_number: - .byte 0 - -EXTERN(PnpBiosGetDeviceNode) - .code64 - - push rbp - mov rbp, rsp - -// pushal -// push es - - /* get current node number */ - mov rsi, [rbp + 0x08] - mov al, [rsi] - mov _pnp_node_number, al - - /* convert pointer to node buffer to segment/offset */ - mov eax, [rbp + 0x0C] - shr eax, 4 - and eax, 0xf000 - mov _pnp_buffer_segment , ax - mov eax, [rbp + 0x0C] - and eax, 0xffff - mov _pnp_buffer_offset, ax - - call x86_64_SwitchToReal - .code16 - - /* push bios segment */ - mov ax, _pnp_bios_data_segment - push ax - - /* push control flag */ - push 0x0001 - - /* push pointer to node buffer (segment/offset) */ - mov ax, _pnp_buffer_segment - push ax - mov ax, _pnp_buffer_offset - push ax - - /* push pointer to node number (segment/offset) */ - push cs - mov ax, _pnp_node_number - push ax - - /* push function number */ - push 1 - - /* call entry point */ - call [_pnp_bios_entry_point] - add sp, 14 - - movzx ecx, ax - mov _pnp_result, ecx - - call x86_16_SwitchToLong - .code64 - - /* update node number */ - mov rsi, [rbp + 0x08] - mov al, _pnp_node_number - mov [rsi], al - -// pop es -// popal - - mov rsp, rbp - pop rbp - - xor rax, rax - mov eax, _pnp_result - - ret - -END -/* EOF */ Removed: trunk/reactos/boot/freeldr/freeldr/arch/amd64/i386trap.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/amd64/i386trap.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/amd64/i386trap.S (removed) @@ -1,941 +1,0 @@ -/* - * FreeLoader - * Copyright (C) 1998-2002 Brian Palmer <brianp(a)sginet.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - - .text - .code16 - -#include <arch/pc/x86common.h> -#include <ver.h> - -#define SCREEN_ATTR 0x1f /* Bright white on blue background */ - -.macro SAVE_CPU_REGS - movl %eax,i386_EAX - movl %ebx,i386_EBX - movl %ecx,i386_ECX - movl %edx,i386_EDX - movl %esp,i386_ESP - movl %ebp,i386_EBP - movl %esi,i386_ESI - movl %edi,i386_EDI - movw %ds,%ax - movw %ax,i386_DS - movw %es,%ax - movw %ax,i386_ES - movw %fs,%ax - movw %ax,i386_FS - movw %gs,%ax - movw %ax,i386_GS - movw %ss,%ax - movw %ax,i386_SS - popl %eax - movl %eax,i386_EIP - popl %eax - movw %ax,i386_CS - popl %eax - movl %eax,i386_EFLAGS - movl %cr0,%eax - movl %eax,i386_CR0 - //movl %cr1,%eax - //movl %eax,i386_CR1 - movl %cr2,%eax - movl %eax,i386_CR2 - movl %cr3,%eax - movl %eax,i386_CR3 - movl %dr0,%eax - movl %eax,i386_DR0 - movl %dr1,%eax - movl %eax,i386_DR1 - movl %dr2,%eax - movl %eax,i386_DR2 - movl %dr3,%eax - movl %eax,i386_DR3 - movl %dr6,%eax - movl %eax,i386_DR6 - movl %dr7,%eax - movl %eax,i386_DR7 - sgdt i386_GDTR - sidt i386_IDTR - sldt i386_LDTR - str i386_TR -.endm - - - -i386ExceptionHandlerText: - .ascii "An error occured in FreeLoader\n" - .ascii VERSION - .ascii "\n" - .asciz "Report this error to the ReactOS Development mailing list <ros-dev(a)reactos.org>\n\n" - -i386DivideByZeroText: - .asciz "Exception 00: DIVIDE BY ZERO\n\n" -i386DebugExceptionText: - .asciz "Exception 01: DEBUG EXCEPTION\n\n" -i386NMIExceptionText: - .asciz "Exception 02: NON-MASKABLE INTERRUPT EXCEPTION\n\n" -i386BreakpointText: - .asciz "Exception 03: BREAKPOINT (INT 3)\n\n" -i386OverflowText: - .asciz "Exception 04: OVERFLOW\n\n" -i386BoundExceptionText: - .asciz "Exception 05: BOUND EXCEPTION\n\n" -i386InvalidOpcodeText: - .asciz "Exception 06: INVALID OPCODE\n\n" -i386FPUNotAvailableText: - .asciz "Exception 07: FPU NOT AVAILABLE\n\n" -i386DoubleFaultText: - .asciz "Exception 08: DOUBLE FAULT\n\n" -i386CoprocessorSegmentText: - .asciz "Exception 09: COPROCESSOR SEGMENT OVERRUN\n\n" -i386InvalidTSSText: - .asciz "Exception 0A: INVALID TSS\n\n" -i386SegmentNotPresentText: - .asciz "Exception 0B: SEGMENT NOT PRESENT\n\n" -i386StackExceptionText: - .asciz "Exception 0C: STACK EXCEPTION\n\n" -i386GeneralProtectionFaultText: - .asciz "Exception 0D: GENERAL PROTECTION FAULT\n\n" -i386PageFaultText: - .asciz "Exception 0E: PAGE FAULT\n\n" -i386CoprocessorErrorText: - .asciz "Exception 10: COPROCESSOR ERROR\n\n" -i386AlignmentCheckText: - .asciz "Exception 11: ALIGNMENT CHECK\n\n" -i386MachineCheckText: - .asciz "Exception 12: MACHINE CHECK\n\n" - -i386_EAX_Text: - .asciz "EAX: " -i386_EBX_Text: - .asciz "EBX: " -i386_ECX_Text: - .asciz "ECX: " -i386_EDX_Text: - .asciz "EDX: " -i386_ESP_Text: - .asciz " ESP: " -i386_EBP_Text: - .asciz " EBP: " -i386_ESI_Text: - .asciz " ESI: " -i386_EDI_Text: - .asciz " EDI: " -i386_CS_Text: - .asciz "CS: " -i386_DS_Text: - .asciz "DS: " -i386_ES_Text: - .asciz "ES: " -i386_FS_Text: - .asciz "FS: " -i386_GS_Text: - .asciz "GS: " -i386_SS_Text: - .asciz "SS: " -i386_EFLAGS_Text: - .asciz " EFLAGS: " -i386_EIP_Text: - .asciz " EIP: " -i386_ERROR_CODE_Text: - .asciz " ERROR CODE: " -i386_CR0_Text: - .asciz " CR0: " -i386_CR1_Text: - .asciz " CR1: " -i386_CR2_Text: - .asciz " CR2: " -i386_CR3_Text: - .asciz " CR3: " -i386_DR0_Text: - .asciz " DR0: " -i386_DR1_Text: - .asciz " DR1: " -i386_DR2_Text: - .asciz " DR2: " -i386_DR3_Text: - .asciz " DR3: " -i386_DR6_Text: - .asciz " DR6: " -i386_DR7_Text: - .asciz " DR7: " -i386_GDTR_Text: - .asciz " GDTR Base: " -i386_IDTR_Text: - .asciz " IDTR Base: " -i386_Limit_Text: - .asciz " Limit: " -i386_LDTR_Text: - .asciz " LDTR: " -i386_TR_Text: - .asciz " TR: " - -i386FramesText: - .asciz "Frames:\n" - -/* Set by each exception handler to the address of the description text */ -i386ExceptionDescriptionText: - .long 0 - -/* Used to store the contents of all the registers when an exception occurs */ -i386_EAX: - .long 0 -i386_EBX: - .long 0 -i386_ECX: - .long 0 -i386_EDX: - .long 0 -i386_ESP: - .long 0 -i386_EBP: - .long 0 -i386_ESI: - .long 0 -i386_EDI: - .long 0 -i386_CS: - .word 0 -i386_DS: - .word 0 -i386_ES: - .word 0 -i386_FS: - .word 0 -i386_GS: - .word 0 -i386_SS: - .word 0 -i386_EFLAGS: - .long 0 -i386_EIP: - .long 0 -i386_ERROR_CODE: - .long 0 -i386_CR0: - .long 0 -i386_CR1: - .long 0 -i386_CR2: - .long 0 -i386_CR3: - .long 0 -i386_DR0: - .long 0 -i386_DR1: - .long 0 -i386_DR2: - .long 0 -i386_DR3: - .long 0 -i386_DR6: - .long 0 -i386_DR7: - .long 0 -i386_GDTR: - .word 0 - .long 0 -i386_IDTR: - .word 0 - .long 0 -i386_LDTR: - .word 0 -i386_TR: - .word 0 - -/* Used to store the current X and Y position on the screen */ -i386_ScreenPosX: - .long 0 -i386_ScreenPosY: - .long 0 - -/************************************************************************/ -i386CommonExceptionHandler: - .code32 - - SAVE_CPU_REGS - - pushl $SCREEN_ATTR - call MachVideoClearScreen - add $4,%esp - - movl $i386ExceptionHandlerText,%esi - call i386PrintText - - movl i386ExceptionDescriptionText,%esi - call i386PrintText - - movl $i386_EAX_Text,%esi - call i386PrintText - movl i386_EAX,%eax - call i386PrintHexDword // Display EAX - movl $i386_ESP_Text,%esi - call i386PrintText - movl i386_ESP,%eax - call i386PrintHexDword // Display ESP - movl $i386_CR0_Text,%esi - call i386PrintText - movl i386_CR0,%eax - call i386PrintHexDword // Display CR0 - movl $i386_DR0_Text,%esi - call i386PrintText - movl i386_DR0,%eax - call i386PrintHexDword // Display DR0 - movl $0,i386_ScreenPosX - incl i386_ScreenPosY - movl $i386_EBX_Text,%esi - call i386PrintText - movl i386_EBX,%eax - call i386PrintHexDword // Display EBX - movl $i386_EBP_Text,%esi - call i386PrintText - movl i386_EBP,%eax - call i386PrintHexDword // Display EBP - movl $i386_CR1_Text,%esi - call i386PrintText - movl i386_CR1,%eax - call i386PrintHexDword // Display CR1 - movl $i386_DR1_Text,%esi - call i386PrintText - movl i386_DR1,%eax - call i386PrintHexDword // Display DR1 - movl $0,i386_ScreenPosX - incl i386_ScreenPosY - movl $i386_ECX_Text,%esi - call i386PrintText - movl i386_ECX,%eax - call i386PrintHexDword // Display ECX - movl $i386_ESI_Text,%esi - call i386PrintText - movl i386_ESI,%eax - call i386PrintHexDword // Display ESI - movl $i386_CR2_Text,%esi - call i386PrintText - movl i386_CR2,%eax - call i386PrintHexDword // Display CR2 - movl $i386_DR2_Text,%esi - call i386PrintText - movl i386_DR2,%eax - call i386PrintHexDword // Display DR2 - movl $0,i386_ScreenPosX - incl i386_ScreenPosY - movl $i386_EDX_Text,%esi - call i386PrintText - movl i386_EDX,%eax - call i386PrintHexDword // Display EDX - movl $i386_EDI_Text,%esi - call i386PrintText - movl i386_EDI,%eax - call i386PrintHexDword // Display EDI - movl $i386_CR3_Text,%esi - call i386PrintText - movl i386_CR3,%eax - call i386PrintHexDword // Display CR3 - movl $i386_DR3_Text,%esi - call i386PrintText - movl i386_DR3,%eax - call i386PrintHexDword // Display DR3 - incl i386_ScreenPosY - movl $55,i386_ScreenPosX - movl $i386_DR6_Text,%esi - call i386PrintText - movl i386_DR6,%eax - call i386PrintHexDword // Display DR6 - incl i386_ScreenPosY - movl $55,i386_ScreenPosX - movl $i386_DR7_Text,%esi - call i386PrintText - movl i386_DR7,%eax - call i386PrintHexDword // Display DR7 - movl $0,i386_ScreenPosX - incl i386_ScreenPosY - incl i386_ScreenPosY - movl $i386_CS_Text,%esi - call i386PrintText - movw i386_CS,%ax - call i386PrintHexWord // Display CS - movl $i386_EIP_Text,%esi - call i386PrintText - movl i386_EIP,%eax - call i386PrintHexDword // Display EIP - movl $0,i386_ScreenPosX - incl i386_ScreenPosY - movl $i386_DS_Text,%esi - call i386PrintText - movw i386_DS,%ax - call i386PrintHexWord // Display DS - movl $i386_ERROR_CODE_Text,%esi - call i386PrintText - movl i386_ERROR_CODE,%eax - call i386PrintHexDword // Display ERROR CODE - movl $0,i386_ScreenPosX - incl i386_ScreenPosY - movl $i386_ES_Text,%esi - call i386PrintText - movw i386_ES,%ax - call i386PrintHexWord // Display ES - movl $i386_EFLAGS_Text,%esi - call i386PrintText - movl i386_EFLAGS,%eax - call i386PrintHexDword // Display EFLAGS - movl $0,i386_ScreenPosX - incl i386_ScreenPosY - movl $i386_FS_Text,%esi - call i386PrintText - movw i386_FS,%ax - call i386PrintHexWord // Display FS - movl $i386_GDTR_Text,%esi - call i386PrintText - movl i386_GDTR+2,%eax - call i386PrintHexDword // Display GDTR Base - movl $i386_Limit_Text,%esi - call i386PrintText - movw i386_GDTR,%ax - call i386PrintHexWord // Display GDTR Limit - movl $0,i386_ScreenPosX - incl i386_ScreenPosY - movl $i386_GS_Text,%esi - call i386PrintText - movw i386_GS,%ax - call i386PrintHexWord // Display GS - movl $i386_IDTR_Text,%esi - call i386PrintText - movl i386_IDTR+2,%eax - call i386PrintHexDword // Display IDTR Base - movl $i386_Limit_Text,%esi - call i386PrintText - movw i386_IDTR,%ax - call i386PrintHexWord // Display IDTR Limit - movl $0,i386_ScreenPosX - incl i386_ScreenPosY - movl $i386_SS_Text,%esi - call i386PrintText - movw i386_SS,%ax - call i386PrintHexWord // Display SS - movl $i386_LDTR_Text,%esi - call i386PrintText - movw i386_LDTR,%ax - call i386PrintHexWord // Display LDTR - movl $i386_TR_Text,%esi - call i386PrintText - movw i386_TR,%ax - call i386PrintHexWord // Display TR - movl $0,i386_ScreenPosX - incl i386_ScreenPosY - incl i386_ScreenPosY - call i386PrintFrames // Display frames - incl i386_ScreenPosY - incl i386_ScreenPosY - - cli -i386ExceptionHandlerHang: - hlt - jmp i386ExceptionHandlerHang - - iret - -i386PrintFrames: - movl $0,i386_ScreenPosX - movl $i386FramesText,%esi - call i386PrintText - - movl i386_EBP,%edi -printnextframe: - test %edi,%edi - je nomoreframes - movl $STACK32ADDR,%eax - cmpl %edi,%eax - jbe nomoreframes - movl 4(%edi),%eax - pushl %edi - call i386PrintHexDword // Display frame - popl %edi - incl i386_ScreenPosX - incl i386_ScreenPosX - movl 0(%edi),%edi - jmp printnextframe -nomoreframes: - ret - -/************************************************************************/ -/* AL = Char to display */ -/************************************************************************/ -i386PrintChar: - .code32 - - pushl i386_ScreenPosY - pushl i386_ScreenPosX - pushl $SCREEN_ATTR - andl $0xff,%eax - pushl %eax - call MachVideoPutChar - addl $16,%esp - - ret - -/************************************************************************/ -/* ESI = Address of text to display */ -/************************************************************************/ -i386PrintText: - .code32 - -i386PrintTextLoop: - lodsb - - // Check for end of string char - cmp $0,%al - je i386PrintTextDone - - // Check for newline char - cmp $0x0a,%al - jne i386PrintTextLoop2 - incl i386_ScreenPosY - movl $0,i386_ScreenPosX - jmp i386PrintTextLoop - -i386PrintTextLoop2: - call i386PrintChar - incl i386_ScreenPosX - - jmp i386PrintTextLoop - -i386PrintTextDone: - - ret - -/************************************************************************/ -/* Prints the value in EAX on the screen in hex */ -/************************************************************************/ -i386PrintHexDword: - .code32 - - call i386PrintHex1 - -i386PrintHex1: - call i386PrintHex2 -i386PrintHex2: - call i386PrintHex3 -i386PrintHex3: - movb $4,%cl - rol %cl,%eax - push %eax - andb $0x0f,%al - movl $i386PrintHexTable,%ebx - xlat /*$i386PrintHexTable*/ - call i386PrintChar - incl i386_ScreenPosX - pop %eax - - ret - -i386PrintHexTable: - .ascii "0123456789ABCDEF" - -/************************************************************************/ -/* Prints the value in AX on the screen in hex */ -/************************************************************************/ -i386PrintHexWord: - .code32 - - call i386PrintHexWord1 -i386PrintHexWord1: - call i386PrintHexWord2 -i386PrintHexWord2: - movb $4,%cl - rol %cl,%ax - push %eax - andb $0x0f,%al - movl $i386PrintHexTable,%ebx - xlat /*$i386PrintHexTable*/ - call i386PrintChar - incl i386_ScreenPosX - pop %eax - - ret - -/************************************************************************/ -/* Prints the value in AL on the screen in hex */ -/************************************************************************/ -i386PrintHexByte: - .code32 - - call i386PrintHexByte1 -i386PrintHexByte1: - movb $4,%cl - rol %cl,%al - push %eax - andb $0x0f,%al - movl $i386PrintHexTable,%ebx - xlat /*$i386PrintHexTable*/ - call i386PrintChar - incl i386_ScreenPosX - pop %eax - - ret - -/************************************************************************/ -EXTERN(i386DivideByZero) - .code32 - - movl $i386DivideByZeroText,i386ExceptionDescriptionText - jmp i386CommonExceptionHandler - -/************************************************************************/ -EXTERN(i386DebugException) - .code32 - - movl $i386DebugExceptionText,i386ExceptionDescriptionText - jmp i386CommonExceptionHandler - -/************************************************************************/ -EXTERN(i386NMIException) - .code32 - - movl $i386NMIExceptionText,i386ExceptionDescriptionText - jmp i386CommonExceptionHandler - -/************************************************************************/ -EXTERN(i386Breakpoint) - .code32 - - movl $i386BreakpointText,i386ExceptionDescriptionText - jmp i386CommonExceptionHandler - -/************************************************************************/ -EXTERN(i386Overflow) - .code32 - - movl $i386OverflowText,i386ExceptionDescriptionText - jmp i386CommonExceptionHandler - -/************************************************************************/ -EXTERN(i386BoundException) - .code32 - - movl $i386BoundExceptionText,i386ExceptionDescriptionText - jmp i386CommonExceptionHandler - -/************************************************************************/ -EXTERN(i386InvalidOpcode) - .code32 - - movl $i386InvalidOpcodeText,i386ExceptionDescriptionText - jmp i386CommonExceptionHandler - -/************************************************************************/ -EXTERN(i386FPUNotAvailable) - .code32 - - movl $i386FPUNotAvailableText,i386ExceptionDescriptionText - jmp i386CommonExceptionHandler - -/************************************************************************/ -EXTERN(i386DoubleFault) - .code32 - - popl %eax - movl %eax,i386_ERROR_CODE - - movl $i386DoubleFaultText,i386ExceptionDescriptionText - jmp i386CommonExceptionHandler - -/************************************************************************/ -EXTERN(i386CoprocessorSegment) - .code32 - - movl $i386CoprocessorSegmentText,i386ExceptionDescriptionText - jmp i386CommonExceptionHandler - -/************************************************************************/ -EXTERN(i386InvalidTSS) - .code32 - - popl %eax - movl %eax,i386_ERROR_CODE - - movl $i386InvalidTSSText,i386ExceptionDescriptionText - jmp i386CommonExceptionHandler - -/************************************************************************/ -EXTERN(i386SegmentNotPresent) - .code32 - - popl %eax - movl %eax,i386_ERROR_CODE - - movl $i386SegmentNotPresentText,i386ExceptionDescriptionText - jmp i386CommonExceptionHandler - -/************************************************************************/ -EXTERN(i386StackException) - .code32 - - popl %eax - movl %eax,i386_ERROR_CODE - - movl $i386StackExceptionText,i386ExceptionDescriptionText - jmp i386CommonExceptionHandler - -/************************************************************************/ -EXTERN(i386GeneralProtectionFault) - .code32 - - popl %eax - movl %eax,i386_ERROR_CODE - - movl $i386GeneralProtectionFaultText,i386ExceptionDescriptionText - jmp i386CommonExceptionHandler - -/************************************************************************/ -EXTERN(i386PageFault) - .code32 - - popl %eax - movl %eax,i386_ERROR_CODE - - movl $i386PageFaultText,i386ExceptionDescriptionText - jmp i386CommonExceptionHandler - -/************************************************************************/ -EXTERN(i386CoprocessorError) - .code32 - - movl $i386CoprocessorErrorText,i386ExceptionDescriptionText - jmp i386CommonExceptionHandler - -/************************************************************************/ -EXTERN(i386AlignmentCheck) - .code32 - - movl $i386AlignmentCheckText,i386ExceptionDescriptionText - jmp i386CommonExceptionHandler - -/************************************************************************/ -EXTERN(i386MachineCheck) - .code32 - - movl $i386MachineCheckText,i386ExceptionDescriptionText - jmp i386CommonExceptionHandler - -/************************************************************************ - * DEBUGGING SUPPORT FUNCTIONS - ************************************************************************/ -EXTERN(_INSTRUCTION_BREAKPOINT1) - .code32 - - pushl %eax - - movl 8(%esp),%eax - - movl %eax,%dr0 - movl %dr7,%eax - andl $0xfff0ffff,%eax - orl $0x00000303,%eax - movl %eax,%dr7 - - popl %eax - - ret - -EXTERN(_MEMORY_READWRITE_BREAKPOINT1) - .code32 - - pushl %eax - - movl 8(%esp),%eax - - movl %eax,%dr0 - movl %dr7,%eax - andl $0xfff0ffff,%eax - orl $0x00030303,%eax - movl %eax,%dr7 - - popl %eax - - ret - -EXTERN(_MEMORY_WRITE_BREAKPOINT1) - .code32 - - pushl %eax - - movl 8(%esp),%eax - - movl %eax,%dr0 - movl %dr7,%eax - andl $0xfff0ffff,%eax - orl $0x00010303,%eax - movl %eax,%dr7 - - popl %eax - - ret - -EXTERN(_INSTRUCTION_BREAKPOINT2) - .code32 - - pushl %eax - - movl 8(%esp),%eax - - movl %eax,%dr1 - movl %dr7,%eax - andl $0xff0fffff,%eax - orl $0x0000030c,%eax - movl %eax,%dr7 - - popl %eax - - ret - -EXTERN(_MEMORY_READWRITE_BREAKPOINT2) - .code32 - - pushl %eax - - movl 8(%esp),%eax - - movl %eax,%dr1 - movl %dr7,%eax - andl $0xff0fffff,%eax - orl $0x0030030c,%eax - movl %eax,%dr7 - - popl %eax - - ret - -EXTERN(_MEMORY_WRITE_BREAKPOINT2) - .code32 - - pushl %eax - - movl 8(%esp),%eax - - movl %eax,%dr1 - movl %dr7,%eax - andl $0xff0fffff,%eax - orl $0x0010030c,%eax - movl %eax,%dr7 - - popl %eax - - ret - -EXTERN(_INSTRUCTION_BREAKPOINT3) - .code32 - - pushl %eax - - movl 8(%esp),%eax - - movl %eax,%dr2 - movl %dr7,%eax - andl $0xf0ffffff,%eax - orl $0x00000330,%eax - movl %eax,%dr7 - - popl %eax - - ret - -EXTERN(_MEMORY_READWRITE_BREAKPOINT3) - .code32 - - pushl %eax - - movl 8(%esp),%eax - - movl %eax,%dr2 - movl %dr7,%eax - andl $0xf0ffffff,%eax - orl $0x03000330,%eax - movl %eax,%dr7 - - popl %eax - - ret - -EXTERN(_MEMORY_WRITE_BREAKPOINT3) - .code32 - - pushl %eax - - movl 8(%esp),%eax - - movl %eax,%dr2 - movl %dr7,%eax - andl $0xf0ffffff,%eax - orl $0x01000330,%eax - movl %eax,%dr7 - - popl %eax - - ret - -EXTERN(_INSTRUCTION_BREAKPOINT4) - .code32 - - pushl %eax - - movl 8(%esp),%eax - - movl %eax,%dr3 - movl %dr7,%eax - andl $0x0fffffff,%eax - orl $0x000003c0,%eax - movl %eax,%dr7 - - popl %eax - - ret - -EXTERN(_MEMORY_READWRITE_BREAKPOINT4) - .code32 - - pushl %eax - - movl 8(%esp),%eax - - movl %eax,%dr3 - movl %dr7,%eax - andl $0x0fffffff,%eax - orl $0x300003c0,%eax - movl %eax,%dr7 - - popl %eax - - ret - -EXTERN(_MEMORY_WRITE_BREAKPOINT4) - .code32 - - pushl %eax - - movl 8(%esp),%eax - - movl %eax,%dr3 - movl %dr7,%eax - andl $0x0fffffff,%eax - orl $0x100003c0,%eax - movl %eax,%dr7 - - popl %eax - - ret Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/int386.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/amd64/int386.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/amd64/int386.S [iso-8859-1] Fri Aug 26 13:10:18 2011 @@ -18,157 +18,66 @@ */ #include <asm.inc> +#include <arch/pc/x86common.h> +.code64 +EXTERN CallRealMode:PROC - .intel_syntax noprefix - .text - .code16 +/* int Int386(int ivec<ecx>, REGS* in<rdx>, REGS* out<r8>); */ +PUBLIC Int386 +Int386: -#include <arch/pc/x86common.h> + /* Save home registers */ + mov r11, rsp + mov qword ptr [r11 + 8], rcx + mov qword ptr [r11 + 16], rdx + mov qword ptr [r11 + 24], r8 - -Int386_REGS: - -Int386_eax: - .long 0 -Int386_ebx: - .long 0 -Int386_ecx: - .long 0 -Int386_edx: - .long 0 - -Int386_esi: - .long 0 -Int386_edi: - .long 0 - -Int386_ds: - .word 0 -Int386_es: - .word 0 -Int386_fs: - .word 0 -Int386_gs: - .word 0 - -Int386_eflags: - .long 0 - -Int386_vector: - .quad 0 -Int386_regsin: - .quad 0 -Int386_regsout: - .quad 0 - -/* - * int Int386(int ivec, REGS* in, REGS* out); - */ -EXTERN(Int386) - .code64 - - /* Get the function parameters */ - mov Int386_vector, rcx - mov Int386_vector_opcode, cl - mov Int386_regsin, rdx - mov Int386_regsout, r8 - - /* Save all registers + segment registers */ -// push ds -// push es - push fs - push gs + /* Save non-volatile registers */ push rbx - push rcx - push rdx + push rbp push rsi push rdi - /* Copy the input regs to our variables */ - lea rdi, Int386_REGS - mov esi, Int386_regsin - mov ecx, 0x24 - rep movsb + /* Alloc stack space for home registers */ + sub rsp, 40 + //.ENDPROLOG - call x86_64_SwitchToReal - .code16 +int386_2: + /* Copy the int vector to shared memory */ + mov dword ptr [BSS_IntVector], ecx - /* Setup the registers */ - mov ax, cs:Int386_ds - mov ds, ax /* DS register */ - mov ax, cs:Int386_es - mov es, ax /* ES register */ - mov ax, cs:Int386_fs - mov fs, ax /* FS register */ - mov ax, cs:Int386_gs - mov gs, ax /* GS register */ + /* Copy input registers */ + mov rsi, rdx + mov rdi, BSS_RegisterSet + mov rcx, REGS_SIZE / 4 + rep movsd - mov eax, cs:Int386_eax /* EAX register */ - mov ebx, cs:Int386_ebx /* EBX register */ - mov ecx, cs:Int386_ecx /* ECX register */ - mov edx, cs:Int386_edx /* EDX register */ + xor rax, rax + xor rbx, rbx + xor rcx, rcx + xor rdx, rdx + xor rbp, rbp + xor rsi, rsi + xor rdi, rdi - mov esi, cs:Int386_esi /* ESI register */ - mov edi, cs:Int386_edi /* EDI register */ + /* Set the function ID and call real mode */ + mov bx, FNID_Int386 + call CallRealMode - /* Do not set the flags register */ - /* only return its value in regsout */ - //pushl Int386_eflags - //popfl /* EFLAGS register */ + /* Copy output registers */ + mov rsi, BSS_RegisterSet + mov rdi, [r11 + 24] + mov rcx, REGS_SIZE / 4 + rep movsd - /* Call the interrupt vector */ - /*int Int386_vector*/ -Int386_int_opcode: - .byte 0xcd -Int386_vector_opcode: - .byte 0x00 + /* cleanup and return */ + add rsp, 40 + pop rdi + pop rsi + pop rbp + pop rbx + ret - /* Save the registers */ - mov cs:Int386_eax, eax /* EAX register */ - mov cs:Int386_ebx, ebx /* EBX register */ - mov cs:Int386_ecx, ecx /* ECX register */ - mov cs:Int386_edx, edx /* EDX register */ - - mov cs:Int386_esi, esi /* ESI register */ - mov cs:Int386_edi, edi /* EDI register */ - - mov ax, ds /* DS register */ - mov cs:Int386_ds, ax - mov ax, es /* ES register */ - mov cs:Int386_es, ax - mov ax, fs /* FS register */ - mov cs:Int386_fs, ax - mov ax, gs /* GS register */ - mov cs:Int386_gs, ax - - pushf - pop cs:Int386_eflags /* EFLAGS register */ - - call x86_16_SwitchToLong - .code64 - - /* Copy the variables to the output regs */ - lea rsi, Int386_REGS - mov rdi, Int386_regsout - mov rcx, 0x24 - rep movsb - - /* Restore segment and all other registers */ - pop rdi - pop rsi - pop rdx - pop rcx - pop rbx - pop gs - pop fs -// pop es -// pop ds - - /* Get return value */ - xor rax, rax - mov eax, Int386_eax - - ret END Removed: trunk/reactos/boot/freeldr/freeldr/arch/amd64/mb.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/amd64/mb.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/amd64/mb.S (removed) @@ -1,67 +1,0 @@ -/* - * FreeLoader - * Copyright (C) 1998-2002 Brian Palmer <brianp(a)sginet.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#include <asm.inc> - - - .text - .code16 - -#include <arch/pc/x86common.h> -#include <multiboot.h> - - /* - * Here we assume the kernel is loaded at 1mb - * This boots the kernel - */ - .code64 - .globl PageDirectoryStart - - .globl pml4_startup - .globl pdp_startup - .globl pd_startup - - .globl PageDirectoryEnd - - // - // Boot information structure - // - -EXTERN(reactos_memory_map_descriptor_size) - .long 0 - -EXTERN(reactos_memory_map) - .rept (32 * /*sizeof(memory_map_t)*/24) - .byte 0 - .endr - -.bss -PageDirectoryStart: -pml4_startup: - .fill 4096, 1, 0 - -pdp_startup: - .fill 4096, 1, 0 - -pd_startup: - .fill 4096, 1, 0 - -PageDirectoryEnd: - -END Added: trunk/reactos/boot/freeldr/freeldr/arch/amd64/pnpbios.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/amd64/pnpbios.S (added) +++ trunk/reactos/boot/freeldr/freeldr/arch/amd64/pnpbios.S [iso-8859-1] Fri Aug 26 13:10:18 2011 @@ -1,0 +1,156 @@ +/* + * FreeLoader + * Copyright (C) 2003 Eric Kohl + * Copyright (C) 2011 Timo Kreuzer + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include <asm.inc> +#include <arch/pc/x86common.h> + +EXTERN CallRealMode:PROC + +.code64 + +/* + * U32 PnpBiosSupported(VOID); + * + * RETURNS: + */ +PUBLIC PnpBiosSupported +PnpBiosSupported: + + push rdi + push rsi + push rcx + push rdx + + xor rdi, rdi + + /* init rsi */ + mov rsi, HEX(0F0000) + +pnp_again: + mov eax, [rsi] + cmp eax, HEX(506E5024) /* "$PnP" */ + je pnp_found + + cmp rsi, HEX(0FFFF0) + je pnp_not_found + +pnp_add: + add rsi, 16 + jmp pnp_again + +pnp_found: + /* first calculate the checksum */ + push rsi + + push HEX(21) + pop rcx + xor edx, edx + +pnp_loop: + lodsb + add dl, al + loop pnp_loop + + test dl, dl + pop rsi + jnz pnp_add + + mov rdi, rsi + + /* Calculate the bios entry point (far pointer) */ + xor eax, eax + mov ax, [rsi + HEX(0F)] + shl eax, 16 + mov ax, [rsi + HEX(0D)] + mov dword ptr [BSS_PnpBiosEntryPoint], eax + + /* Store bios data segment */ + mov ax, [rsi + HEX(1B)] + mov word ptr [BSS_PnpBiosDataSegment], ax + +pnp_not_found: + mov rax, rdi + + pop rdx + pop rcx + pop rsi + pop rdi + + ret + + +/* + * U32 PnpBiosGetDeviceNodeCount(U32 *NodeSize<rcx>, U32 *NodeCount<rdx>); + * + * RETURNS: + */ +PUBLIC PnpBiosGetDeviceNodeCount +PnpBiosGetDeviceNodeCount: + + /* Call the real mode function */ + mov bx, FNID_PnpBiosGetDeviceNodeCount + call CallRealMode + + xor eax, eax + mov ax, [BSS_PnpNodeSize] + mov [rcx], eax + mov ax, [BSS_PnpNodeCount] + mov [rdx], eax + + mov eax, dword ptr [BSS_PnpResult] + + ret + + + +/* + * U32 PnpBiosGetDeviceNode(U8 *NodeId<rcx>, U8 *NodeBuffer<rdx>); + * + * RETURNS: + */ +PUBLIC PnpBiosGetDeviceNode +PnpBiosGetDeviceNode: + + /* get current node number */ + mov al, [rcx] + mov byte ptr [BSS_PnpNodeNumber], al + + /* convert pointer to node buffer to segment/offset */ + mov rax, rdx + shr eax, 4 + mov word ptr [BSS_PnpBiosBufferSegment], ax + mov rax, rdx + and eax, HEX(0f) + mov word ptr [BSS_PnpBiosBufferOffset], ax + + /* Call the real mode function */ + mov bx, FNID_PnpBiosGetDeviceNode + call CallRealMode + + /* update node number */ + mov al, byte ptr [BSS_PnpNodeNumber] + mov [rcx], al + + mov eax, [BSS_PnpResult] + + ret + +END +/* EOF */ Propchange: trunk/reactos/boot/freeldr/freeldr/arch/amd64/pnpbios.S ------------------------------------------------------------------------------ svn:eol-style = native Removed: trunk/reactos/boot/freeldr/freeldr/arch/amd64/stubs.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/amd64/stubs.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/amd64/stubs.S (removed) @@ -1,48 +1,0 @@ - - -#include <asm.inc> - -EXTERN BootMain:PROC - -.code64 - -/* 64 bit entry point */ -PUBLIC mainCRTStartup -mainCRTStartup: - jmp BootMain - -PUBLIC Int386 -Int386: - ret - -PUBLIC __lgdt -__lgdt: - -PUBLIC __ltr -__ltr: - -PUBLIC PxeCallApi -PxeCallApi: - .long 0 - -PUBLIC PageDirectoryStart -PageDirectoryStart: - .long 0 - -PUBLIC PageDirectoryEnd -PageDirectoryEnd: - .long 0 - -PUBLIC PnpBiosGetDeviceNode -PnpBiosGetDeviceNode: - .long 0 - -PUBLIC PnpBiosGetDeviceNodeCount -PnpBiosGetDeviceNodeCount: - .long 0 - -PUBLIC PnpBiosSupported -PnpBiosSupported: - .long 0 - -END Modified: trunk/reactos/boot/freeldr/freeldr/arch/realmode/amd64.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/realmode/amd64.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/realmode/amd64.S [iso-8859-1] Fri Aug 26 13:10:18 2011 @@ -69,7 +69,7 @@ /* Build the startup page tables */ call BuildPageTables - /* Safe real mode entry point in shared memory */ + /* Store real mode entry point in shared memory */ mov dword ptr ds:[BSS_RealModeEntry], offset RealModeEntryPoint /* Address the image with es segment */ @@ -242,11 +242,34 @@ InRealMode: - mov ax, HEX(0b800) +// mov ax, HEX(0b800) +// mov es, ax +// mov word ptr es:[12], HEX(0e00) + '6' + + /* Set real mode segments */ + xor ax, ax + mov ds, ax mov es, ax - mov word ptr es:[12], HEX(0e00) + '6' - jmp $ - + mov fs, ax + mov gs, ax + mov ss, ax + + /* Clear out the high 16-bits of ESP */ + /* This is needed because I have one */ + /* machine that hangs when booted to dos if */ + /* anything other than 0x0000 is in the high */ + /* 16-bits of ESP. Even though real-mode */ + /* code should only use SP and not ESP. */ + xor esp, esp + + /* Restore real mode stack */ + mov sp, word ptr ds:[stack16] + + // sti /* These are ok now */ + + /* Do the callback, specified by bx */ + shl bx, 1 + call word ptr ds:CallbackTable[bx] ExitToLongMode: /* Disable interrupts */ @@ -271,7 +294,6 @@ mov edx, PML4_ADDRESS mov cr3, edx - /* Enable long mode */ mov ecx, MSR_EFER rdmsr @@ -287,12 +309,12 @@ /* Clear prefetch queue & correct CS */ ljmp16 LMODE_CS, InLongMode InLongMode: - DB 66h, 0B8h, 18h, 00h // mov ax, LMODE_DS - DB 66h, 8Eh, 0D8h // mov ds, ax - DB 66h, 66h, 0C7h, 04h, 25h, 00h, 80h, 0Bh, 00h, 31h, 0Eh + //DB 66h, 0B8h, 18h, 00h // mov ax, LMODE_DS + //DB 66h, 8Eh, 0D8h // mov ds, ax + //DB 66h, 66h, 0C7h, 04h, 25h, 00h, 80h, 0Bh, 00h, 31h, 0Eh //mov word ptr [HEX(b8000)], HEX(0e00) + '1' - .byte HEX(0ff), HEX(25) // opcode of indirect jump + .byte HEX(0ff), HEX(25) // opcode of 64bit indirect jump .long 1 // relative address of LongModeEntryPoint nop LongModeEntryPoint: @@ -301,12 +323,23 @@ int HEX(16) jmp SoftReboot +CallbackTable: + .word Int386 + .word SoftReboot + .word ChainLoadBiosBootSectorCode + .word PxeCallApi + .word PnpBiosGetDeviceNodeCount + .word PnpBiosGetDeviceNode + .word 0 // BootLinuxKernel /* 16-bit stack pointer */ stack16: .word STACK16ADDR +#include "int386.inc" +#include "pxe.inc" +#include "pnp.inc" #include "helpers.inc" .org (FREELDR_PE_BASE - FREELDR_BASE - 1)

13 years, 4 months

[akhaldi] 53452: [NEWCC] * Sync some fixes.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Aug 26 11:39:53 2011 New Revision: 53452 URL: http://svn.reactos.org/svn/reactos?rev=53452&view=rev Log: [NEWCC] * Sync some fixes. Modified: branches/arty-newcc/ntoskrnl/cache/fssup.c branches/arty-newcc/ntoskrnl/cache/section/fault.c branches/arty-newcc/ntoskrnl/cache/section/io.c branches/arty-newcc/ntoskrnl/cache/section/newmm.h branches/arty-newcc/ntoskrnl/cache/section/reqtools.c branches/arty-newcc/ntoskrnl/cache/section/sptab.c branches/arty-newcc/ntoskrnl/mm/section.c Modified: branches/arty-newcc/ntoskrnl/cache/fssup.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/fssup… ============================================================================== --- branches/arty-newcc/ntoskrnl/cache/fssup.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/cache/fssup.c [iso-8859-1] Fri Aug 26 11:39:53 2011 @@ -337,14 +337,7 @@ { ToWrite = MIN(UpperBound.QuadPart - LowerBound.QuadPart, (PAGE_SIZE - LowerBound.QuadPart) & (PAGE_SIZE - 1)); DPRINT("Zero last half %08x%08x %x\n", Target.u.HighPart, Target.u.LowPart, ToWrite); - Status = MiSimpleRead(FileObject, - &Target, - ZeroBuf, - PAGE_SIZE, -#ifdef __ROS_CMAKE__ - TRUE, -#endif - &IOSB); + Status = MiSimpleRead(FileObject, &Target, ZeroBuf, PAGE_SIZE, TRUE, &IOSB); if (!NT_SUCCESS(Status)) { ExFreePool(ZeroBuf); @@ -380,14 +373,7 @@ { ToWrite = UpperBound.QuadPart - Target.QuadPart; DPRINT("Zero first half %08x%08x %x\n", Target.u.HighPart, Target.u.LowPart, ToWrite); - Status = MiSimpleRead(FileObject, - &Target, - ZeroBuf, - PAGE_SIZE, -#ifdef __ROS_CMAKE__ - TRUE, -#endif - &IOSB); + Status = MiSimpleRead(FileObject, &Target, ZeroBuf, PAGE_SIZE, TRUE, &IOSB); if (!NT_SUCCESS(Status)) { ExFreePool(ZeroBuf); Modified: branches/arty-newcc/ntoskrnl/cache/section/fault.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/secti… ============================================================================== --- branches/arty-newcc/ntoskrnl/cache/section/fault.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/cache/section/fault.c [iso-8859-1] Fri Aug 26 11:39:53 2011 @@ -395,6 +395,8 @@ BOOLEAN Locked = FromMdl; MM_REQUIRED_RESOURCES Resources = { 0 }; WORK_QUEUE_WITH_CONTEXT Context; + + RtlZeroMemory(&Context, sizeof(WORK_QUEUE_WITH_CONTEXT)); DPRINT("MmAccessFault(Mode %d, Address %x)\n", Mode, Address); @@ -590,6 +592,8 @@ WORK_QUEUE_WITH_CONTEXT Context; NTSTATUS Status = STATUS_SUCCESS; + RtlZeroMemory(&Context, sizeof(WORK_QUEUE_WITH_CONTEXT)); + if (!FromMdl) { MmLockAddressSpace(AddressSpace); Modified: branches/arty-newcc/ntoskrnl/cache/section/io.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/secti… ============================================================================== --- branches/arty-newcc/ntoskrnl/cache/section/io.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/cache/section/io.c [iso-8859-1] Fri Aug 26 11:39:53 2011 @@ -66,43 +66,12 @@ NTSTATUS NTAPI -MiSimpleReadComplete -(PDEVICE_OBJECT DeviceObject, - PIRP Irp, - PVOID Context) -{ - PMDL Mdl = Irp->MdlAddress; - - /* Unlock MDL Pages, page 167. */ - DPRINT("MiSimpleReadComplete %x\n", Irp); - while (Mdl) - { - DPRINT("MDL Unlock %x\n", Mdl); - MmUnlockPages(Mdl); - Mdl = Mdl->Next; - } - - /* Check if there's an MDL */ - while ((Mdl = Irp->MdlAddress)) - { - /* Clear all of them */ - Irp->MdlAddress = Mdl->Next; - IoFreeMdl(Mdl); - } - - return STATUS_SUCCESS; -} - -NTSTATUS -NTAPI MiSimpleRead (PFILE_OBJECT FileObject, PLARGE_INTEGER FileOffset, PVOID Buffer, ULONG Length, -#ifdef __ROS_CMAKE__ BOOLEAN Paging, -#endif PIO_STATUS_BLOCK ReadStatus) { NTSTATUS Status; @@ -116,6 +85,9 @@ ASSERT(Buffer); ASSERT(ReadStatus); + // This reference is consumed when the IRP is completed below + // It will be consumed by line 231 of irp.c + ObReferenceObject(FileObject); DeviceObject = MmGetDeviceObjectForFile(FileObject); ReadStatus->Status = STATUS_INTERNAL_ERROR; ReadStatus->Information = 0; @@ -142,26 +114,17 @@ if (!Irp) { + ObDereferenceObject(FileObject); return STATUS_NO_MEMORY; } -#ifndef __ROS_CMAKE__ - Irp->Flags |= IRP_PAGING_IO | IRP_SYNCHRONOUS_PAGING_IO | IRP_NOCACHE | IRP_SYNCHRONOUS_API; -#else Irp->Flags |= (Paging ? IRP_PAGING_IO | IRP_SYNCHRONOUS_PAGING_IO | IRP_NOCACHE : 0) | IRP_SYNCHRONOUS_API; -#endif Irp->UserEvent = &ReadWait; Irp->Tail.Overlay.OriginalFileObject = FileObject; Irp->Tail.Overlay.Thread = PsGetCurrentThread(); IrpSp = IoGetNextIrpStackLocation(Irp); - IrpSp->Control |= SL_INVOKE_ON_SUCCESS | SL_INVOKE_ON_ERROR; IrpSp->FileObject = FileObject; - IrpSp->CompletionRoutine = MiSimpleReadComplete; - -#ifdef __ROS_CMAKE__ - ObReferenceObject(FileObject); -#endif Status = IoCallDriver(DeviceObject, Irp); if (Status == STATUS_PENDING) @@ -176,14 +139,15 @@ NULL))) { DPRINT1("Warning: Failed to wait for synchronous IRP\n"); + ObDereferenceObject(FileObject); ASSERT(FALSE); return Status; } } DPRINT("Paging IO Done: %08x\n", ReadStatus->Status); - Status = - ReadStatus->Status == STATUS_END_OF_FILE ? + Status = + ReadStatus->Status == STATUS_END_OF_FILE ? STATUS_SUCCESS : ReadStatus->Status; return Status; } @@ -210,6 +174,8 @@ ASSERT(Buffer); ASSERT(ReadStatus); + // This reference is consumed when the IRP is completed below + // It will be consumed by line 231 of irp.c ObReferenceObject(FileObject); DeviceObject = MmGetDeviceObjectForFile(FileObject); ASSERT(DeviceObject); @@ -232,27 +198,27 @@ Length, FileOffset, ReadStatus); - + if (!Irp) { ObDereferenceObject(FileObject); return STATUS_NO_MEMORY; } - + Irp->Flags = IRP_PAGING_IO | IRP_SYNCHRONOUS_PAGING_IO | IRP_NOCACHE | IRP_SYNCHRONOUS_API; - + Irp->UserEvent = &ReadWait; Irp->Tail.Overlay.OriginalFileObject = FileObject; Irp->Tail.Overlay.Thread = PsGetCurrentThread(); IrpSp = IoGetNextIrpStackLocation(Irp); - IrpSp->Control |= SL_INVOKE_ON_SUCCESS | SL_INVOKE_ON_ERROR; IrpSp->FileObject = FileObject; - IrpSp->CompletionRoutine = MiSimpleReadComplete; - + DPRINT("Call Driver\n"); Status = IoCallDriver(DeviceObject, Irp); DPRINT("Status %x\n", Status); + // XXX hack: I need to find the reference that matches this one. + // The one above should be consumed by irp.c ObDereferenceObject(FileObject); if (Status == STATUS_PENDING) @@ -260,18 +226,19 @@ DPRINT("KeWaitForSingleObject(&ReadWait)\n"); if (!NT_SUCCESS (KeWaitForSingleObject - (&ReadWait, - Suspended, - KernelMode, - FALSE, + (&ReadWait, + Suspended, + KernelMode, + FALSE, NULL))) { DPRINT1("Warning: Failed to wait for synchronous IRP\n"); + ObDereferenceObject(FileObject); ASSERT(FALSE); return Status; } } - + DPRINT("Paging IO Done: %08x\n", ReadStatus->Status); return ReadStatus->Status; } Modified: branches/arty-newcc/ntoskrnl/cache/section/newmm.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/secti… ============================================================================== --- branches/arty-newcc/ntoskrnl/cache/section/newmm.h [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/cache/section/newmm.h [iso-8859-1] Fri Aug 26 11:39:53 2011 @@ -170,9 +170,7 @@ PLARGE_INTEGER FileOffset, PVOID Buffer, ULONG Length, -#ifdef __ROS_CMAKE__ BOOLEAN Paging, -#endif PIO_STATUS_BLOCK ReadStatus); NTSTATUS Modified: branches/arty-newcc/ntoskrnl/cache/section/reqtools.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/secti… ============================================================================== --- branches/arty-newcc/ntoskrnl/cache/section/reqtools.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/cache/section/reqtools.c [iso-8859-1] Fri Aug 26 11:39:53 2011 @@ -148,9 +148,7 @@ FileOffset, PageBuf, RequiredResources->Amount, -#ifdef __ROS_CMAKE__ TRUE, -#endif &IOSB); RtlZeroMemory ((PCHAR)PageBuf+RequiredResources->Amount, Modified: branches/arty-newcc/ntoskrnl/cache/section/sptab.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/secti… ============================================================================== --- branches/arty-newcc/ntoskrnl/cache/section/sptab.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/cache/section/sptab.c [iso-8859-1] Fri Aug 26 11:39:53 2011 @@ -105,9 +105,11 @@ PLARGE_INTEGER FileOffset) { LARGE_INTEGER SearchFileOffset; - CACHE_SECTION_PAGE_TABLE SectionZeroPageTable; + CACHE_SECTION_PAGE_TABLE SectionZeroPageTable; PCACHE_SECTION_PAGE_TABLE PageTableSlice = MiSectionPageTableGet(Table, FileOffset); + // Please zero memory when taking away zero initialization. + RtlZeroMemory(&SectionZeroPageTable, sizeof(CACHE_SECTION_PAGE_TABLE)); if (!PageTableSlice) { SearchFileOffset.QuadPart = ROUND_DOWN(FileOffset->QuadPart, ENTRIES_PER_ELEMENT * PAGE_SIZE); Modified: branches/arty-newcc/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/section.… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/section.c [iso-8859-1] Fri Aug 26 11:39:53 2011 @@ -3238,15 +3238,7 @@ UsedSize = 0; - Status = MiSimpleRead - (FileObject, - &FileOffset, - Buffer, - BufferSize, -#ifdef __ROS_CMAKE__ - TRUE, -#endif - &Iosb); + Status = MiSimpleRead(FileObject, &FileOffset, Buffer, BufferSize, TRUE, &Iosb); UsedSize = Iosb.Information;

13 years, 4 months

← Newer
1
2
3
4
5
6
7
8
9
...
50
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2011