Ros-diffs June 2011

ros-diffs@reactos.org

25 participants
460 discussions

[tkreuzer] 52204: [FREELDR] Make freeldr/setupldr composed of a PE file and prepended raw 16bit code. The 16 bit code starts with the usual fathelp code. This brings back support for fragmented fat...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Jun 12 21:21:47 2011 New Revision: 52204 URL: http://svn.reactos.org/svn/reactos?rev=52204&view=rev Log: [FREELDR] Make freeldr/setupldr composed of a PE file and prepended raw 16bit code. The 16 bit code starts with the usual fathelp code. This brings back support for fragmented fat12/16 disks. Later all 16 bit code is supposed to go into the raw binary chunk to be able to build freeldr with MSVC. Added: trunk/reactos/boot/freeldr/freeldr/arch/realmode/ (with props) trunk/reactos/boot/freeldr/freeldr/arch/realmode/amd64.S (with props) trunk/reactos/boot/freeldr/freeldr/arch/realmode/fathelp.inc trunk/reactos/boot/freeldr/freeldr/arch/realmode/helpers.inc trunk/reactos/boot/freeldr/freeldr/arch/realmode/i386.S (with props) Modified: trunk/reactos/boot/freeldr/bootsect/fat.S trunk/reactos/boot/freeldr/bootsect/fat32.S trunk/reactos/boot/freeldr/bootsect/isoboot.S trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt trunk/reactos/boot/freeldr/freeldr/arch/i386/fathelp.S Modified: trunk/reactos/boot/freeldr/bootsect/fat.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/fat.… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/fat.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/bootsect/fat.S [iso-8859-1] Sun Jun 12 21:21:47 2011 @@ -227,12 +227,7 @@ // to the helper code. Skip the first three bytes // because they contain a jump instruction to skip // over the helper code in the FreeLoader image. - //jmp 0000:9003h - push 0 // push segment (0x0000) - mov bx, [HEX(8000) + HEX(0A8)] // load the RVA of the EntryPoint into eax - add bx, HEX(8003) // RVA -> VA and skip 3 bytes (jump to fathelper code) - push bx // push offset - retf // Transfer control to FreeLoader + ljmp16 0, HEX(8003) Modified: trunk/reactos/boot/freeldr/bootsect/fat32.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/fat3… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/fat32.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/bootsect/fat32.S [iso-8859-1] Sun Jun 12 21:21:47 2011 @@ -420,11 +420,8 @@ mov dl, byte ptr BP_REL(BootDrive) // Load boot drive into DL mov dh, byte ptr ds:[BootPartition] // Load boot partition into DH - push 0 // push segment (0x0000) - mov eax, dword ptr ds:[HEX(8000) + HEX(0A8)] // load the RVA of the EntryPoint into eax - add eax, HEX(8000) // RVA -> VA - push ax // push offset - retf // Transfer control to FreeLoader + /* Transfer execution to the bootloader */ + ljmp16 0, HEX(8000) // Returns the FAT entry for a given cluster number // On entry EAX has cluster number Modified: trunk/reactos/boot/freeldr/bootsect/isoboot.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/isob… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/isoboot.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/bootsect/isoboot.S [iso-8859-1] Sun Jun 12 21:21:47 2011 @@ -372,12 +372,9 @@ mov dl, byte ptr ds:[DriveNo] // dl = boot drive mov dh, 0 // dh = boot partition - push 0 // push segment (0x0000) - mov eax, dword ptr ds:[HEX(8000) + HEX(0A8)] // load the RVA of the EntryPoint into eax - add eax, HEX(8000) // RVA -> VA - push ax // push offset - retf // Transfer control to ROSLDR - + + /* Transfer execution to the bootloader */ + ljmp16 0, HEX(8000) // // searchdir: 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] Sun Jun 12 21:21:47 2011 @@ -14,7 +14,6 @@ arch/i386/realmode.S) else() list(APPEND FREELDR_STARTUP_SOURCE - arch/i386/fathelp.S arch/i386/arch.S) endif() elseif(ARCH MATCHES amd64) @@ -23,7 +22,6 @@ arch/amd64/stubs.S) else() list(APPEND FREELDR_STARTUP_SOURCE - arch/i386/fathelp.S arch/amd64/arch.S) endif() endif() @@ -182,6 +180,11 @@ add_library(freeldr_arch ${FREELDR_ARCH_SOURCE}) add_dependencies(freeldr_arch bugcodes) +CreateBootSectorTarget2(frldr16 + ${CMAKE_CURRENT_SOURCE_DIR}/arch/realmode/i386.S + ${CMAKE_CURRENT_BINARY_DIR}/frldr16.bin + 8000) + list(APPEND FREELDR_SOURCE bootmgr.c ${FREELDR_STARTUP_SOURCE} @@ -189,24 +192,23 @@ ${FREELDR_BASE_SOURCE} ) -add_library(freeldr SHARED ${FREELDR_SOURCE}) +add_executable(freeldr_pe ${FREELDR_SOURCE}) if(NOT MSVC) - set_target_properties(freeldr PROPERTIES LINK_FLAGS "-Wl,--strip-all -Wl,--exclude-all-symbols -Wl,--file-alignment,0x1000 -Wl,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr_i386.lnk" SUFFIX ".sys") -set_image_base(freeldr 0x8000) + set_target_properties(freeldr_pe PROPERTIES LINK_FLAGS "-Wl,--strip-all -Wl,--exclude-all-symbols -Wl,--file-alignment,0x1000 -Wl,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr_i386.lnk") else() - set_target_properties(freeldr PROPERTIES LINK_FLAGS "/ignore:4078 /ignore:4254 /DRIVER /FIXED /ALIGN:0x400 /SECTION:.text,ERW /SECTION:.data,RW /MERGE:.text16=.text /MERGE:.data=.text /MERGE:.rdata=.text /MERGE:.bss=.text /SUBSYSTEM:BOOT_APPLICATION" SUFFIX ".sys") -set_image_base(freeldr 0x10000) -endif() - -set_subsystem(freeldr native) -set_entrypoint(freeldr mainCRTStartup) - -if(ARCH MATCHES i386) - target_link_libraries(freeldr mini_hal) -endif() - -target_link_libraries(freeldr + set_target_properties(freeldr_pe PROPERTIES LINK_FLAGS "/ignore:4078 /ignore:4254 /DRIVER /FIXED /ALIGN:0x400 /SECTION:.text,ERW /SECTION:.data,RW /MERGE:.text16=.text /MERGE:.data=.text /MERGE:.rdata=.text /MERGE:.bss=.text /SUBSYSTEM:BOOT_APPLICATION") +endif() + +set_subsystem(freeldr_pe native) +set_image_base(freeldr_pe 0x9000) +set_entrypoint(freeldr_pe mainCRTStartup) + +if(ARCH MATCHES i386) + target_link_libraries(freeldr_pe mini_hal) +endif() + +target_link_libraries(freeldr_pe freeldr_arch cportlib rossym @@ -214,10 +216,17 @@ rtl libcntpr) -add_pch(freeldr include/freeldr.h) -add_dependencies(freeldr asm) - -add_cd_file(TARGET freeldr DESTINATION loader NO_CAB FOR all) +add_pch(freeldr_pe include/freeldr.h) +add_dependencies(freeldr_pe asm) + +concatenate_files( + ${CMAKE_CURRENT_BINARY_DIR}/frldr16.bin + ${CMAKE_CURRENT_BINARY_DIR}/freeldr_pe.exe + ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys) + +add_custom_target(freeldr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys) + +add_cd_file(FILE ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys DESTINATION loader NO_CAB FOR all) list(APPEND SETUPLDR_MAIN_SOURCE bootmgr.c @@ -238,23 +247,23 @@ ${FREELDR_BASE_SOURCE} ${SETUPLDR_MAIN_SOURCE}) -add_library(setupldr SHARED ${SETUPLDR_SOURCE}) +add_executable(setupldr_pe ${SETUPLDR_SOURCE}) if(NOT MSVC) - set_target_properties(setupldr PROPERTIES LINK_FLAGS "-Wl,--strip-all -Wl,--exclude-all-symbols -Wl,--file-alignment,0x1000 -Wl,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr_i386.lnk" SUFFIX ".sys" COMPILE_DEFINITIONS "FREELDR_REACTOS_SETUP") -set_image_base(setupldr 0x8000) + set_target_properties(setupldr_pe PROPERTIES LINK_FLAGS "-Wl,--strip-all -Wl,--exclude-all-symbols -Wl,--file-alignment,0x1000 -Wl,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr_i386.lnk" COMPILE_DEFINITIONS "FREELDR_REACTOS_SETUP") else() - set_target_properties(setupldr PROPERTIES LINK_FLAGS "/DRIVER /SECTION:.text,ERWP,ALIGN=0x1000" SUFFIX ".sys" COMPILE_DEFINITIONS "FREELDR_REACTOS_SETUP") -endif() - -set_subsystem(setupldr native) -set_entrypoint(setupldr mainCRTStartup) - -if(ARCH MATCHES i386) - target_link_libraries(setupldr mini_hal) -endif() - -target_link_libraries(setupldr + set_target_properties(setupldr_pe PROPERTIES LINK_FLAGS "/DRIVER /SECTION:.text,ERWP,ALIGN=0x1000" COMPILE_DEFINITIONS "FREELDR_REACTOS_SETUP") +endif() + +set_subsystem(setupldr_pe native) +set_image_base(setupldr_pe 0x9000) +set_entrypoint(setupldr_pe mainCRTStartup) + +if(ARCH MATCHES i386) + target_link_libraries(setupldr_pe mini_hal) +endif() + +target_link_libraries(setupldr_pe freeldr_arch cportlib rossym @@ -262,7 +271,14 @@ rtl libcntpr) -add_dependencies(setupldr asm) - -add_cd_file(TARGET setupldr DESTINATION loader NO_CAB FOR all) - +add_dependencies(setupldr_pe asm) + +concatenate_files( + ${CMAKE_CURRENT_BINARY_DIR}/frldr16.bin + ${CMAKE_CURRENT_BINARY_DIR}/setupldr_pe.exe + ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys) + +add_custom_target(setupldr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys) + +add_cd_file(FILE ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys DESTINATION loader NO_CAB FOR all) + Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/fathelp.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/fathelp.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/fathelp.S [iso-8859-1] Sun Jun 12 21:21:47 2011 @@ -56,6 +56,7 @@ _mainCRTStartup: PUBLIC start start: +#if 0 .byte HEX(e9) .byte HEX(fd) .byte HEX(01) @@ -134,7 +135,7 @@ // Reads the entire FAT into memory at 7000:0000 ReadFatIntoMemory: - mov ax, [bp+HiddenSectors] + mov ax, [bp+HiddenSectors] mov dx, [bp+HiddenSectors+2] add ax, [bp+ReservedSectors] adc dx, 0 @@ -233,6 +234,7 @@ .org HEX(1fe) // Pad to 510 bytes .word HEX(0aa55) // BootSector signature +#endif .endcode16 Propchange: trunk/reactos/boot/freeldr/freeldr/arch/realmode/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Jun 12 21:21:47 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/boot/freeldr/freeldr/arch/realmode/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/boot/freeldr/freeldr/arch/realmode/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/boot/freeldr/freeldr/arch/realmode/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: 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 (added) +++ trunk/reactos/boot/freeldr/freeldr/arch/realmode/amd64.S [iso-8859-1] Sun Jun 12 21:21:47 2011 @@ -1,0 +1,225 @@ + +#include <asm.inc> +#include <arch/pc/x86common.h> + +#define IMAGE_DOS_HEADER_e_lfanew 36 +#define IMAGE_FILE_HEADER_SIZE 20 +#define IMAGE_OPTIONAL_HEADER_AddressOfEntryPoint 16 + + +.code16 + +/* fat helper code */ +#include "fathelp.inc" + +.org 512 +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 BootDrive and BootPartition */ + xor eax, eax + mov BootDrive, eax + mov BootPartition, eax + + /* Store the boot drive */ + mov BootDrive, dl + + /* Store the boot partition */ + mov BootPartition, 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, HEX(00200000) + 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, HEX(00a0) + test edx,edx // are PAE and PGE bits set? + jz no_x64_support_detected + + /* PAE and PGE are here */ + + xor edx, edx + mov eax, HEX(80000001) + cpuid + and edx, HEX(20000000) + test edx,edx + jz no_x64_support_detected + + /* X64 Processor */ + + /* checkPoint Charlie - where it all began... */ + mov si, offset CheckPoint3 + call writestr + + /* Get address of optional header */ + mov eax, dword ptr ds:[FREELDR_PE_BASE + IMAGE_DOS_HEADER_e_lfanew] + add eax, FREELDR_PE_BASE + 4 + IMAGE_FILE_HEADER_SIZE + + /* Get address of entry point */ + mov eax, dword ptr ds:[eax + IMAGE_OPTIONAL_HEADER_AddressOfEntryPoint] + + /* Store the address in the callback return variable */ + mov dword ptr ds:[CallbackReturnAddress], eax + +switch64: + mov + jmp x86_16_ReturnToLong + + +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 + +/* + * 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, HEX(00f) + stosd + /* clear rest */ + xor eax, eax + mov cx, HEX(03ff) + rep stosd + + /* One entry in the PDP pointing to PD */ + mov eax, offset pd_startup + or eax, HEX(00f) + stosd + /* clear rest */ + xor eax, eax + mov ecx, HEX(03ff) + rep stosd + + /* 512 entries in the PD defining a 2MB page each */ + mov ecx, 512 + mov eax, HEX(008f) + +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 + + + + + +x86_16_ReturnToLong: + + 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, HEX(0C0000080) // Specify EFER MSR + + rdmsr // Enable long mode + or eax, HEX(00000100) + wrmsr + + mov ebx, cr0 // Activate long mode + or ebx, HEX(080000001) // 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 + // Do a long jmp to the CallbackReturn address + + +#include "helpers.inc" + +.endcode16 + +END Propchange: trunk/reactos/boot/freeldr/freeldr/arch/realmode/amd64.S ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/boot/freeldr/freeldr/arch/realmode/fathelp.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/realmode/fathelp.inc (added) +++ trunk/reactos/boot/freeldr/freeldr/arch/realmode/fathelp.inc [iso-8859-1] Sun Jun 12 21:21:47 2011 @@ -1,0 +1,225 @@ +// fathelp.S +// FAT12/16 Boot Sector Helper Code +// Copyright (c) 1998, 2001, 2002, 2003 Brian Palmer + +//#include <asm.inc> + +//org 8000h + +//.text + +#define BootSectorStackTop HEX(7bf2) +#define DataAreaStartHigh 2 +#define DataAreaStartLow 4 +#define BiosCHSDriveSizeHigh 6 +#define BiosCHSDriveSizeLow 8 +#define BiosCHSDriveSize 8 +#define ReadSectorsOffset 10 +#define ReadClusterOffset 12 +#define PutCharsOffset 14 + +#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 HEX(7dfd) + + +// 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. +// + +PUBLIC start +start: + // This code is loaded at 0000:8000 so we have to + // encode a jmp instruction to jump to 0000:8200 + .byte HEX(e9), HEX(fd), HEX(01) + +// 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: + /* First save AX - the start cluster of freeldr.sys */ + push ax + + /* Display "Loading FreeLoader..." message */ + mov si, offset msgLoading + call word ptr [bp-PutCharsOffset] + + call ReadFatIntoMemory + + /* Restore AX (start cluster) */ + pop ax + + // AX has start cluster of freeldr.sys + mov bx, HEX(800) + mov es,bx + +LoadFile: + push ax + call IsFat12 + pop ax + jnc LoadFile2 + cmp ax, HEX(0ff8) // Check to see if this is the last cluster in the chain + jmp LoadFile3 + +LoadFile2: + cmp ax, HEX(0fff8) +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 word ptr [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, byte ptr ds:[BootPartition] // Load the boot partition into DH + + /* continue where other bootsectors start */ + jmp start + + +// 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, HEX(7000) + mov es,bx + xor bx,bx + call word ptr [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, HEX(7000) + 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, HEX(7000) + 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, HEX(0fff0) + shr ax,4 + jmp GetFatEntry12_Done + +UseLow12Bits: + and ax, HEX(0fff) + +GetFatEntry12_Done: + + ret + + +// Returns CF = 1 if this is a FAT12 file system +// Otherwise CF = 0 for FAT16 +IsFat12: + + mov ebx, dword ptr [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, dword ptr [bp+HiddenSectors] + + + xor eax,eax + mov ax, word ptr [bp+TotalSectors] + cmp ax, 0 + jnz IsFat12_2 + mov eax, dword ptr [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 510 // Pad to 510 bytes + .word HEX(0aa55) // BootSector signature + +END Added: trunk/reactos/boot/freeldr/freeldr/arch/realmode/helpers.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/realmode/helpers.inc (added) +++ trunk/reactos/boot/freeldr/freeldr/arch/realmode/helpers.inc [iso-8859-1] Sun Jun 12 21:21:47 2011 @@ -1,0 +1,104 @@ + +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 + +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 + +/* + * writestr + * si = pointer to zero terminated string + */ +writestr: + pushfd + pushad +writestr_top: + lodsb + and al, al + jz writestr_end + call writechr + jmp short writestr_top +writestr_end: + popad + popfd + ret + +/* + * writechr + * al = character to output + */ +writechr: + pushf + pusha + mov ah, 0x0E + xor bx, bx + int 0x10 + popa + popf + ret + +// +// writehex[248]: Write a hex number in (AL, AX, EAX) to the console +// +writehex2: + pushfd + pushad + shl eax, 24 + mov cx, 2 + jmp short writehex_common +writehex4: + pushfd + pushad + shl eax, 16 + mov cx, 4 + jmp short writehex_common +writehex8: + pushfd + pushad + mov cx, 8 +writehex_common: +.loop: + rol eax, 4 + push eax + and al, HEX(0F) + cmp al, 10 + jae .high +.low: + add al, '0' + jmp short .ischar +.high: + add al, 'A'-10 +.ischar: + call writechr + pop eax + loop .loop + popad + popfd + ret + +SoftReboot: + mov ax, HEX(40) + mov ds, ax + mov si, HEX(72) + + /* Set the word at location 40:72 to 1234h */ + mov word ptr [si], HEX(1234) + + /* and jump to location FFFF:0 in ROM */ + ljmp16 HEX(0FFFF), HEX(0000) Added: trunk/reactos/boot/freeldr/freeldr/arch/realmode/i386.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/realmode/i386.S (added) +++ trunk/reactos/boot/freeldr/freeldr/arch/realmode/i386.S [iso-8859-1] Sun Jun 12 21:21:47 2011 @@ -1,0 +1,32 @@ + +#include <asm.inc> +#include "../../include/arch/pc/x86common.h" + +#define IMAGE_DOS_HEADER_e_lfanew 60 +#define IMAGE_FILE_HEADER_SIZE 20 +#define IMAGE_OPTIONAL_HEADER_AddressOfEntryPoint 16 + +.code16 + +/* fat helper code */ +#include "fathelp.inc" + +.org 512 +RealEntryPoint: + + /* Get address of optional header */ + mov eax, dword ptr ds:[FREELDR_PE_BASE + IMAGE_DOS_HEADER_e_lfanew] + add eax, FREELDR_PE_BASE + 4 + IMAGE_FILE_HEADER_SIZE + + /* Jump to address of entry point */ + mov eax, dword ptr ds:[eax + IMAGE_OPTIONAL_HEADER_AddressOfEntryPoint] + add eax, FREELDR_PE_BASE + jmp ax + + +#include "helpers.inc" + +.org (FREELDR_PE_BASE - FREELDR_BASE) +.endcode16 + +END Propchange: trunk/reactos/boot/freeldr/freeldr/arch/realmode/i386.S ------------------------------------------------------------------------------ svn:eol-style = native

13 years, 6 months

[tkreuzer] 52203: [NTOSKRNL] Fix the "standard" for MSVC

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Jun 12 21:15:33 2011 New Revision: 52203 URL: http://svn.reactos.org/svn/reactos?rev=52203&view=rev Log: [NTOSKRNL] Fix the "standard" for MSVC Modified: trunk/reactos/ntoskrnl/ke/queue.c trunk/reactos/ntoskrnl/ke/wait.c Modified: trunk/reactos/ntoskrnl/ke/queue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/queue.c?rev=52… ============================================================================== --- trunk/reactos/ntoskrnl/ke/queue.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/queue.c [iso-8859-1] Sun Jun 12 21:15:33 2011 @@ -247,7 +247,7 @@ PKTIMER Timer = &Thread->Timer; BOOLEAN Swappable; PLARGE_INTEGER OriginalDueTime = Timeout; - LARGE_INTEGER DueTime = { }, NewDueTime, InterruptTime; + LARGE_INTEGER DueTime = {{0}}, NewDueTime, InterruptTime; ULONG Hand = 0; ASSERT_QUEUE(Queue); ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL); Modified: trunk/reactos/ntoskrnl/ke/wait.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/wait.c?rev=522… ============================================================================== --- trunk/reactos/ntoskrnl/ke/wait.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/wait.c [iso-8859-1] Sun Jun 12 21:15:33 2011 @@ -413,7 +413,7 @@ PKTIMER Timer = &Thread->Timer; NTSTATUS WaitStatus; BOOLEAN Swappable; - LARGE_INTEGER DueTime = { }, NewDueTime, InterruptTime; + LARGE_INTEGER DueTime = {{0}}, NewDueTime, InterruptTime; PLARGE_INTEGER OriginalDueTime = Timeout; ULONG Hand = 0; @@ -580,7 +580,7 @@ NTSTATUS WaitStatus = STATUS_SUCCESS; BOOLEAN Swappable; PLARGE_INTEGER OriginalDueTime = Timeout; - LARGE_INTEGER DueTime = { }, NewDueTime, InterruptTime; + LARGE_INTEGER DueTime = {{0}}, NewDueTime, InterruptTime; ULONG Index, Hand = 0; /* Make sure the Wait Count is valid */

13 years, 6 months

[akhaldi] 52202: [NTOSKRNL] * Fix uninitialized data use. Really.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jun 12 20:49:06 2011 New Revision: 52202 URL: http://svn.reactos.org/svn/reactos?rev=52202&view=rev Log: [NTOSKRNL] * Fix uninitialized data use. Really. Modified: trunk/reactos/ntoskrnl/ke/queue.c trunk/reactos/ntoskrnl/ke/wait.c Modified: trunk/reactos/ntoskrnl/ke/queue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/queue.c?rev=52… ============================================================================== --- trunk/reactos/ntoskrnl/ke/queue.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/queue.c [iso-8859-1] Sun Jun 12 20:49:06 2011 @@ -247,7 +247,7 @@ PKTIMER Timer = &Thread->Timer; BOOLEAN Swappable; PLARGE_INTEGER OriginalDueTime = Timeout; - LARGE_INTEGER DueTime = {0,0}, NewDueTime, InterruptTime; + LARGE_INTEGER DueTime = { }, NewDueTime, InterruptTime; ULONG Hand = 0; ASSERT_QUEUE(Queue); ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL); Modified: trunk/reactos/ntoskrnl/ke/wait.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/wait.c?rev=522… ============================================================================== --- trunk/reactos/ntoskrnl/ke/wait.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/wait.c [iso-8859-1] Sun Jun 12 20:49:06 2011 @@ -413,7 +413,7 @@ PKTIMER Timer = &Thread->Timer; NTSTATUS WaitStatus; BOOLEAN Swappable; - LARGE_INTEGER DueTime = {0,0}, NewDueTime, InterruptTime; + LARGE_INTEGER DueTime = { }, NewDueTime, InterruptTime; PLARGE_INTEGER OriginalDueTime = Timeout; ULONG Hand = 0; @@ -580,7 +580,7 @@ NTSTATUS WaitStatus = STATUS_SUCCESS; BOOLEAN Swappable; PLARGE_INTEGER OriginalDueTime = Timeout; - LARGE_INTEGER DueTime = {0,0}, NewDueTime, InterruptTime; + LARGE_INTEGER DueTime = { }, NewDueTime, InterruptTime; ULONG Index, Hand = 0; /* Make sure the Wait Count is valid */

13 years, 6 months

[cgutman] 52201: [LWIP] - Fix a memory leak during graceful socket closure - Print a message if not all data is taken in a receive request

by cgutman＠svn.reactos.org

Author: cgutman Date: Sun Jun 12 19:21:56 2011 New Revision: 52201 URL: http://svn.reactos.org/svn/reactos?rev=52201&view=rev Log: [LWIP] - Fix a memory leak during graceful socket closure - Print a message if not all data is taken in a receive request Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/rostcp.c Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/rostcp.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/rostcp.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/rostcp.c [iso-8859-1] Sun Jun 12 19:21:56 2011 @@ -85,36 +85,40 @@ return ERR_OK; } - if (!p) - { - TCPFinEventHandler(arg, ERR_OK); - } - else + if (p) { DbgPrint("[lwIP, InternalRecvEventHandler] RECV - p:0x%x p->payload:0x%x p->len:%d p->tot_len:%d\n", p, p->payload, p->len, p->tot_len); - if (err == ERR_OK) + len = TCPRecvEventHandler(arg, p); + if (len == p->tot_len) { - len = TCPRecvEventHandler(arg, p); - if (len != 0) - { - tcp_recved(pcb, len); - - pbuf_free(p); - - return ERR_OK; - } - else - { - /* We want lwIP to store the pbuf on its queue for later */ - return ERR_TIMEOUT; - } + tcp_recved(pcb, len); + + pbuf_free(p); + + return ERR_OK; + } + else if (len != 0) + { + DbgPrint("UNTESTED CASE: NOT ALL DATA TAKEN! EXTRA DATA MAY BE LOST!\n"); + + tcp_recved(pcb, len); + + /* Possible memory leak of pbuf here? */ + + return ERR_OK; } else { - pbuf_free(p); + /* We want lwIP to store the pbuf on its queue for later */ + return ERR_TIMEOUT; } + } + else if (err == ERR_OK) + { + TCPFinEventHandler(arg, ERR_OK); + tcp_close(pcb); } return ERR_OK;

13 years, 6 months

[cgutman] 52200: [LWIP] - Implement LibTCPShutdown [IP] - Replace an incredibly broken implementation of TCPDisconnect which caused memory corruption with a working one using LibTCPShutdown

by cgutman＠svn.reactos.org

Author: cgutman Date: Sun Jun 12 18:25:16 2011 New Revision: 52200 URL: http://svn.reactos.org/svn/reactos?rev=52200&view=rev Log: [LWIP] - Implement LibTCPShutdown [IP] - Replace an incredibly broken implementation of TCPDisconnect which caused memory corruption with a working one using LibTCPShutdown Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/tcp.c branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/include/rosip.h branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/rostcp.c Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Sun Jun 12 18:25:16 2011 @@ -316,19 +316,15 @@ if (Flags & TDI_DISCONNECT_RELEASE) { - /* FIXME */ - LibTCPClose(Connection->SocketContext); + Status = LibTCPShutdown(Connection->SocketContext, 0, 1); } if ((Flags & TDI_DISCONNECT_ABORT) || !Flags) { - /* FIXME */ - LibTCPClose(Connection->SocketContext); - } - - Status = STATUS_SUCCESS; - - DbgPrint("LibTCPClose: %x\n", Status); + Status = LibTCPShutdown(Connection->SocketContext, 1, 1); + } + + DbgPrint("LibTCPShutdown: %x\n", Status); UnlockObject(Connection, OldIrql); Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/include/rosip.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/include/rosip.h [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/include/rosip.h [iso-8859-1] Sun Jun 12 18:25:16 2011 @@ -18,6 +18,7 @@ struct tcp_pcb *LibTCPListen(struct tcp_pcb *pcb, u8_t backlog); err_t LibTCPSend(struct tcp_pcb *pcb, void *dataptr, u16_t len); err_t LibTCPConnect(struct tcp_pcb *pcb, struct ip_addr *ipaddr, u16_t port); +err_t LibTCPShutdown(struct tcp_pcb *pcb, int shut_rx, int shut_tx); err_t LibTCPClose(struct tcp_pcb *pcb); err_t LibTCPGetPeerName(struct tcp_pcb *pcb, struct ip_addr *ipaddr, u16_t *port); err_t LibTCPGetHostName(struct tcp_pcb *pcb, struct ip_addr *ipaddr, u16_t *port); Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/rostcp.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/rostcp.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/rostcp.c [iso-8859-1] Sun Jun 12 18:25:16 2011 @@ -517,6 +517,73 @@ return ERR_MEM; } +struct shutdown_callback_msg +{ + /* Synchronization */ + KEVENT Event; + + /* Input */ + struct tcp_pcb *Pcb; + int shut_rx; + int shut_tx; + + /* Output */ + err_t Error; +}; + +static +void +LibTCPShutdownCallback(void *arg) +{ + struct shutdown_callback_msg *msg = arg; + + msg->Error = tcp_shutdown(msg->Pcb, msg->shut_rx, msg->shut_tx); + + KeSetEvent(&msg->Event, IO_NO_INCREMENT, FALSE); +} + +err_t +LibTCPShutdown(struct tcp_pcb *pcb, int shut_rx, int shut_tx) +{ + struct shutdown_callback_msg *msg; + err_t ret; + + DbgPrint("[lwIP, LibTCPShutdown] Called\n"); + + if (!pcb) + { + DbgPrint("[lwIP, LibTCPShutdown] Done... NO pcb\n"); + return ERR_CLSD; + } + + msg = ExAllocatePool(NonPagedPool, sizeof(struct shutdown_callback_msg)); + if (msg) + { + KeInitializeEvent(&msg->Event, NotificationEvent, FALSE); + + msg->Pcb = pcb; + msg->shut_rx = shut_rx; + msg->shut_tx = shut_tx; + + tcpip_callback_with_block(LibTCPShutdownCallback, msg, 1); + + if (WaitForEventSafely(&msg->Event)) + ret = msg->Error; + else + ret = ERR_CLSD; + + ExFreePool(msg); + + DbgPrint("[lwIP, LibTCPShutdown] pcb = 0x%x\n", pcb); + + DbgPrint("[lwIP, LibTCPShutdown] Done\n"); + + return ret; + } + + return ERR_MEM; +} + struct close_callback_msg { /* Synchronization */

13 years, 6 months

[akhaldi] 52199: [NTOSKRNL] * Fix uninitialized data use. Spotted by gcc 4.6.0

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jun 12 18:18:52 2011 New Revision: 52199 URL: http://svn.reactos.org/svn/reactos?rev=52199&view=rev Log: [NTOSKRNL] * Fix uninitialized data use. Spotted by gcc 4.6.0 Modified: trunk/reactos/ntoskrnl/ke/queue.c trunk/reactos/ntoskrnl/ke/wait.c Modified: trunk/reactos/ntoskrnl/ke/queue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/queue.c?rev=52… ============================================================================== --- trunk/reactos/ntoskrnl/ke/queue.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/queue.c [iso-8859-1] Sun Jun 12 18:18:52 2011 @@ -247,7 +247,7 @@ PKTIMER Timer = &Thread->Timer; BOOLEAN Swappable; PLARGE_INTEGER OriginalDueTime = Timeout; - LARGE_INTEGER DueTime, NewDueTime, InterruptTime; + LARGE_INTEGER DueTime = {0,0}, NewDueTime, InterruptTime; ULONG Hand = 0; ASSERT_QUEUE(Queue); ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL); Modified: trunk/reactos/ntoskrnl/ke/wait.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/wait.c?rev=521… ============================================================================== --- trunk/reactos/ntoskrnl/ke/wait.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/wait.c [iso-8859-1] Sun Jun 12 18:18:52 2011 @@ -413,7 +413,7 @@ PKTIMER Timer = &Thread->Timer; NTSTATUS WaitStatus; BOOLEAN Swappable; - LARGE_INTEGER DueTime, NewDueTime, InterruptTime; + LARGE_INTEGER DueTime = {0,0}, NewDueTime, InterruptTime; PLARGE_INTEGER OriginalDueTime = Timeout; ULONG Hand = 0; @@ -580,7 +580,7 @@ NTSTATUS WaitStatus = STATUS_SUCCESS; BOOLEAN Swappable; PLARGE_INTEGER OriginalDueTime = Timeout; - LARGE_INTEGER DueTime, NewDueTime, InterruptTime; + LARGE_INTEGER DueTime = {0,0}, NewDueTime, InterruptTime; ULONG Index, Hand = 0; /* Make sure the Wait Count is valid */

13 years, 6 months

[cgutman] 52198: [MSAFD] - Reenable the FD_OOB async event after a call to WSPRecvFrom which received OOB data - Remove a useless check

by cgutman＠svn.reactos.org

Author: cgutman Date: Sun Jun 12 17:38:16 2011 New Revision: 52198 URL: http://svn.reactos.org/svn/reactos?rev=52198&view=rev Log: [MSAFD] - Reenable the FD_OOB async event after a call to WSPRecvFrom which received OOB data - Remove a useless check Modified: trunk/reactos/dll/win32/msafd/misc/sndrcv.c Modified: trunk/reactos/dll/win32/msafd/misc/sndrcv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/sndrc… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/sndrcv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/sndrcv.c [iso-8859-1] Sun Jun 12 17:38:16 2011 @@ -388,7 +388,14 @@ } /* Re-enable Async Event */ - SockReenableAsyncSelectEvent(Socket, FD_READ); + if (*ReceiveFlags & MSG_OOB) + { + SockReenableAsyncSelectEvent(Socket, FD_OOB); + } + else + { + SockReenableAsyncSelectEvent(Socket, FD_READ); + } return MsafdReturnWithErrno ( Status, lpErrno, IOSB->Information, lpNumberOfBytesRead ); } @@ -667,8 +674,7 @@ HeapFree(GlobalHeap, 0, BindAddress); } - if (Status != STATUS_PENDING) - SockReenableAsyncSelectEvent(Socket, FD_WRITE); + SockReenableAsyncSelectEvent(Socket, FD_WRITE); return MsafdReturnWithErrno(Status, lpErrno, IOSB->Information, lpNumberOfBytesSent); }

13 years, 6 months

[tkreuzer] 52197: [BOOTSECTOR] Convert fat bootsector to new syntax

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Jun 12 15:57:36 2011 New Revision: 52197 URL: http://svn.reactos.org/svn/reactos?rev=52197&view=rev Log: [BOOTSECTOR] Convert fat bootsector to new syntax Added: trunk/reactos/boot/freeldr/bootsect/fat.S (with props) Modified: trunk/reactos/boot/freeldr/bootsect/CMakeLists.txt Modified: trunk/reactos/boot/freeldr/bootsect/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/CMak… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/bootsect/CMakeLists.txt [iso-8859-1] Sun Jun 12 15:57:36 2011 @@ -4,13 +4,12 @@ CreateBootSectorTarget2(dosmbr ${CMAKE_CURRENT_SOURCE_DIR}/dosmbr.S ${CMAKE_CURRENT_BINARY_DIR}/dosmbr.bin 7c00) #CreateBootSectorTarget2(ext2 ${CMAKE_CURRENT_SOURCE_DIR}/ext2.S ${CMAKE_CURRENT_BINARY_DIR}/ext2.bin 0) CreateBootSectorTarget2(fat32 ${CMAKE_CURRENT_SOURCE_DIR}/fat32.S ${CMAKE_CURRENT_BINARY_DIR}/fat32.bin 7c00) -#CreateBootSectorTarget2(fat ${CMAKE_CURRENT_SOURCE_DIR}/fat.S ${CMAKE_CURRENT_BINARY_DIR}/fat.bin 0) +CreateBootSectorTarget2(fat ${CMAKE_CURRENT_SOURCE_DIR}/fat.S ${CMAKE_CURRENT_BINARY_DIR}/fat.bin 7c00) CreateBootSectorTarget2(isoboot ${CMAKE_CURRENT_SOURCE_DIR}/isoboot.S ${CMAKE_CURRENT_BINARY_DIR}/isoboot.bin 7000) CreateBootSectorTarget2(isobtrt ${CMAKE_CURRENT_SOURCE_DIR}/isobtrt.S ${CMAKE_CURRENT_BINARY_DIR}/isobtrt.bin 7000) if(NOT MSVC) CreateBootSectorTarget(ext2 ${CMAKE_CURRENT_SOURCE_DIR}/ext2.asm ${CMAKE_CURRENT_BINARY_DIR}/ext2.bin 0) -CreateBootSectorTarget(fat ${CMAKE_CURRENT_SOURCE_DIR}/fat.asm ${CMAKE_CURRENT_BINARY_DIR}/fat.bin 0) endif() add_cd_file(TARGET dosmbr DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/dosmbr.bin FOR all) Added: trunk/reactos/boot/freeldr/bootsect/fat.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/fat.… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/fat.S (added) +++ trunk/reactos/boot/freeldr/bootsect/fat.S [iso-8859-1] Sun Jun 12 15:57:36 2011 @@ -1,0 +1,433 @@ +// FAT.ASM +// FAT12/16 Boot Sector +// Copyright (c) 1998, 2001, 2002 Brian Palmer + + + +// This is a FAT12/16 file system boot sector +// that searches the entire root directory +// for the file freeldr.sys and loads it into +// memory. +// +// The stack is set to 0000:7BF2 so that the first +// WORD pushed will be placed at 0000:7BF0 +// +// The DWORD at 0000:7BFC or BP-04h is the logical +// sector number of the start of the data area. +// +// The DWORD at 0000:7BF8 or BP-08h is the total +// sector count of the boot drive as reported by +// the computers bios. +// +// The WORD at 0000:7BF6 or BP-0ah is the offset +// of the ReadSectors function in the boot sector. +// +// The WORD at 0000:7BF4 or BP-0ch is the offset +// of the ReadCluster function in the boot sector. +// +// The WORD at 0000:7BF2 or BP-0eh is the offset +// of the PutChars function in the boot sector. +// +// When it locates freeldr.sys on the disk it will +// load the first sector of the file to 0000:8000 +// With the help of this sector we should be able +// to load the entire file off the disk, no matter +// how fragmented it is. +// +// We load the entire FAT table into memory at +// 7000:0000. This improves the speed of floppy disk +// boots dramatically. + +#include <asm.inc> + +#define BP_REL(x) [bp+x-offset start] + +DataAreaStartHigh = 2 +DataAreaStartLow = 4 +BiosCHSDriveSizeHigh = 6 +BiosCHSDriveSizeLow = 8 +BiosCHSDriveSize = 8 +ReadSectorsOffset = 10 +ReadClusterOffset = 12 +PutCharsOffset = 14 +BootSectorStackTop = HEX(7c00) - 16 + + +// org 7c00h + +.code16 + +start: + jmp main + nop + +OEMName: + .ascii "FrLdr1.0" +BytesPerSector: + .word 512 +SectsPerCluster: + .byte 1 +ReservedSectors: + .word 1 +NumberOfFats: + .byte 2 +MaxRootEntries: + .word 224 +TotalSectors: + .word 2880 +MediaDescriptor: + .byte HEX(0f0) +SectorsPerFat: + .word 9 +SectorsPerTrack: + .word 18 +NumberOfHeads: + .word 2 +HiddenSectors: + .long 0 +TotalSectorsBig: + .long 0 +BootDrive: + .byte HEX(0ff) +Reserved: + .byte 0 +ExtendSig: + .byte HEX(29) +SerialNumber: + .long 00000000 +VolumeLabel: + .ascii "NO NAME " +FileSystem: + .ascii "FAT12 " + +main: + xor ax, ax + mov ss, ax + mov bp, HEX(7c00) + mov sp, BootSectorStackTop // Setup a stack + mov ds, ax // Make DS correct + mov es, ax // Make ES correct + + cmp byte ptr BP_REL(BootDrive), HEX(0ff) // If they have specified a boot drive then use it + jne GetDriveParameters + + mov byte ptr BP_REL(BootDrive), dl // Save the boot drive + + +GetDriveParameters: + mov ah, 8 + mov dl, byte ptr BP_REL(BootDrive) // Get boot drive in dl + int HEX(13) // Request drive parameters from the bios + jnc CalcDriveSize // If the call succeeded then calculate the drive size + + // If we get here then the call to the BIOS failed + // so just set CHS equal to the maximum addressable + // size + mov cx, HEX(0ffff) + mov dh, cl + +CalcDriveSize: + // Now that we have the drive geometry + // lets calculate the drive size + mov bl, ch // Put the low 8-bits of the cylinder count into BL + mov bh, cl // Put the high 2-bits in BH + shr bh, 6 // Shift them into position, now BX contains the cylinder count + and cl, HEX(3f) // Mask off cylinder bits from sector count + // CL now contains sectors per track and DH contains head count + movzx eax, dh // Move the heads into EAX + movzx ebx, bx // Move the cylinders into EBX + movzx ecx, cl // Move the sectors per track into ECX + inc eax // Make it one based because the bios returns it zero based + inc ebx // Make the cylinder count one based also + mul ecx // Multiply heads with the sectors per track, result in edx:eax + mul ebx // Multiply the cylinders with (heads * sectors) [stored in edx:eax already] + + // We now have the total number of sectors as reported + // by the bios in eax, so store it in our variable + mov dword ptr [bp - BiosCHSDriveSize], eax + + + // Now we must find our way to the first sector of the root directory + xor ax, ax + xor cx, cx + mov al, byte ptr BP_REL(NumberOfFats) // Number of fats + mul word ptr BP_REL(SectorsPerFat) // Times sectors per fat + add ax, word ptr BP_REL(HiddenSectors) + adc dx, word ptr BP_REL(HiddenSectors+2) // Add the number of hidden sectors + add ax, word ptr BP_REL(ReservedSectors) // Add the number of reserved sectors + adc dx, cx // Add carry bit + mov word ptr [bp - DataAreaStartLow], ax // Save the starting sector of the root directory + mov word ptr [bp - DataAreaStartHigh], dx // Save it in the first 4 bytes before the boot sector + mov si, word ptr BP_REL(MaxRootEntries) // Get number of root dir entries in SI + pusha // Save 32-bit logical start sector of root dir + // DX:AX now has the number of the starting sector of the root directory + + // Now calculate the size of the root directory + xor dx, dx + mov ax, 32 // Size of dir entry + mul si // Times the number of entries + mov bx, word ptr BP_REL(BytesPerSector) + add ax, bx + dec ax + div bx // Divided by the size of a sector + // AX now has the number of root directory sectors + + add word ptr [bp - DataAreaStartLow], ax // Add the number of sectors of the root directory to our other value + adc word ptr [bp - DataAreaStartHigh], cx // Now the first 4 bytes before the boot sector contain the starting sector of the data area + popa // Restore root dir logical sector start to DX:AX + +LoadRootDirSector: + mov bx, HEX(7e0) // We will load the root directory sector + mov es, bx // Right after the boot sector in memory + xor bx, bx // We will load it to [0000:7e00h] + xor cx, cx // Zero out CX + inc cx // Now increment it to 1, we are reading one sector + xor di, di // Zero out di + push es // Save ES because it will get incremented by 20h + call ReadSectors // Read the first sector of the root directory + pop es // Restore ES (ES:DI = 07E0:0000) + +SearchRootDirSector: + cmp byte ptr es:[di], ch // If the first byte of the directory entry is zero then we have + jz ErrBoot // reached the end of the directory and FREELDR.SYS is not here so reboot + pusha // Save all registers + mov cl, 11 // Put 11 in cl (length of filename in directory entry) + mov si, offset filename // Put offset of filename string in DS:SI + repe cmpsb // Compare this directory entry against 'FREELDR SYS' + popa // Restore all the registers + jz FoundFreeLoader // If we found it then jump + dec si // SI holds MaxRootEntries, subtract one + jz ErrBoot // If we are out of root dir entries then reboot + add di, 32 // Increment DI by the size of a directory entry + cmp di, HEX(0200) // Compare DI to 512 (DI has offset to next dir entry, make sure we haven't gone over one sector) + jc SearchRootDirSector // If DI is less than 512 loop again + jmp short LoadRootDirSector // Didn't find FREELDR.SYS in this directory sector, try again + +FoundFreeLoader: + // We found freeldr.sys on the disk + // so we need to load the first 512 + // bytes of it to 0000:8000 + // ES:DI has dir entry (ES:DI == 07E0:XXXX) + mov ax, word ptr es:[di + HEX(1a)] // Get start cluster + push ax // Save start cluster + push HEX(800) // Put 800h on the stack and load it + pop es // Into ES so that we load the cluster at 0000:8000 + call ReadCluster // Read the cluster + pop ax // Restore start cluster of FreeLoader + + // Save the addresses of needed functions so + // the helper code will know where to call them. + mov word ptr [bp-ReadSectorsOffset], offset ReadSectors // Save the address of ReadSectors + mov word ptr [bp-ReadClusterOffset], offset ReadCluster // Save the address of ReadCluster + mov word ptr [bp-PutCharsOffset], offset PutChars // Save the address of PutChars + + // Now AX has start cluster of FreeLoader and we + // have loaded the helper code in the first 512 bytes + // of FreeLoader to 0000:8000. Now transfer control + // to the helper code. Skip the first three bytes + // because they contain a jump instruction to skip + // over the helper code in the FreeLoader image. + //jmp 0000:9003h + push 0 // push segment (0x0000) + mov bx, [HEX(8000) + HEX(0A8)] // load the RVA of the EntryPoint into eax + add bx, HEX(8003) // RVA -> VA and skip 3 bytes (jump to fathelper code) + push bx // push offset + retf // Transfer control to FreeLoader + + + + +// Displays an error message +// And reboots +ErrBoot: + mov si, offset msgFreeLdr // FreeLdr not found message + call PutChars // Display it + +Reboot: +// mov si, offset msgAnyKey // Press any key message +// call PutChars // Display it + xor ax, ax + int HEX(16) // Wait for a keypress + int HEX(19) // Reboot + +PutChars: + lodsb + or al,al + jz short Done + mov ah, HEX(0e) + mov bx, 7 + int HEX(10) + jmp short PutChars +Done: + ret + +// Displays a bad boot message +// And reboots +BadBoot: + mov si, offset msgDiskError // Bad boot disk message + call PutChars // Display it + + jmp short Reboot + + +// Reads cluster number in AX into [ES:0000] +ReadCluster: + // StartSector = ((Cluster - 2) * SectorsPerCluster) + ReservedSectors + HiddenSectors; + dec ax // Adjust start cluster by 2 + dec ax // Because the data area starts on cluster 2 + xor ch, ch + mov cl, byte ptr BP_REL(SectsPerCluster) + mul cx // Times sectors per cluster + add ax, [bp-DataAreaStartLow] // Add start of data area + adc dx, [bp-DataAreaStartHigh] // Now we have DX:AX with the logical start sector of OSLOADER.SYS + xor bx, bx // We will load it to [ES:0000], ES loaded before function call + //mov cl,BYTE [BYTE bp+SectsPerCluster]// Sectors per cluster still in CX + //call ReadSectors + //ret + + + +// Reads logical sectors into [ES:BX] +// DX:AX has logical sector number to read +// CX has number of sectors to read +ReadSectors: + + // We can't just check if the start sector is + // in the BIOS CHS range. We have to check if + // the start sector + length is in that range. + pusha + dec cx + add ax, cx + adc dx, 0 + + cmp dx, word ptr [bp-BiosCHSDriveSizeHigh] // Check if they are reading a sector within CHS range + ja ReadSectorsLBA // No - go to the LBA routine + jb ReadSectorsCHS // Yes - go to the old CHS routine + cmp ax, word ptr [bp-BiosCHSDriveSizeLow] // Check if they are reading a sector within CHS range + jbe ReadSectorsCHS // Yes - go to the old CHS routine + +ReadSectorsLBA: + popa +ReadSectorsLBALoop: + pusha // Save logical sector number & sector count + + push 0 + push 0 + push dx // Put 64-bit logical + push ax // block address on stack + push es // Put transfer segment on stack + push bx // Put transfer offset on stack + push 1 // Set transfer count to 1 sector + push HEX(10) // Set size of packet to 10h + mov si,sp // Setup disk address packet on stack + +// We are so totally out of space here that I am forced to +// comment out this very beautifully written piece of code +// It would have been nice to have had this check... +//CheckInt13hExtensions: // Now make sure this computer supports extended reads +// mov ah,0x41 // AH = 41h +// mov bx,0x55aa // BX = 55AAh +// mov dl,[BYTE bp+BootDrive] // DL = drive (80h-FFh) +// int 13h // IBM/MS INT 13 Extensions - INSTALLATION CHECK +// jc PrintDiskError // CF set on error (extensions not supported) +// cmp bx,0xaa55 // BX = AA55h if installed +// jne PrintDiskError +// test cl,1 // CX = API subset support bitmap +// jz PrintDiskError // Bit 0, extended disk access functions (AH=42h-44h,47h,48h) supported + + + // Good, we're here so the computer supports LBA disk access + // So finish the extended read + mov dl, byte ptr BP_REL(BootDrive) // Drive number + mov ah, HEX(42) // Int 13h, AH = 42h - Extended Read + int HEX(13) // Call BIOS + jc BadBoot // If the read failed then abort + + add sp, 16 // Remove disk address packet from stack + + popa // Restore sector count & logical sector number + + inc ax // Increment Sector to Read + adc dx, 0 + + push bx + mov bx, es + add bx, HEX(20) // Increment read buffer for next sector + mov es, bx + pop bx + + loop ReadSectorsLBALoop // Read next sector + + ret + + +// Reads logical sectors into [ES:BX] +// DX:AX has logical sector number to read +// CX has number of sectors to read +// CarryFlag set on error +ReadSectorsCHS: + popa +ReadSectorsCHSLoop: + pusha + xchg ax, cx + xchg ax, dx + xor dx, dx + div word ptr BP_REL(SectorsPerTrack) + xchg ax, cx + div word ptr BP_REL(SectorsPerTrack) // Divide logical by SectorsPerTrack + inc dx // Sectors numbering starts at 1 not 0 + xchg cx, dx + div word ptr BP_REL(NumberOfHeads) // Number of heads + mov dh, dl // Head to DH, drive to DL + mov dl, byte ptr BP_REL(BootDrive) // Drive number + mov ch, al // Cylinder in CX + ror ah, 2 // Low 8 bits of cylinder in CH, high 2 bits + // in CL shifted to bits 6 & 7 + or cl, ah // Or with sector number + mov ax, HEX(0201) + int HEX(13) // DISK - READ SECTORS INTO MEMORY + // AL = number of sectors to read, CH = track, CL = sector + // DH = head, DL = drive, ES:BX -> buffer to fill + // Return: CF set on error, AH = status (see AH=01h), AL = number of sectors read + + jc BadBoot + + popa + inc ax //Increment Sector to Read + jnz NoCarryCHS + inc dx + + +NoCarryCHS: + push bx + mov bx, es + add bx, HEX(20) + mov es, bx + pop bx + // Increment read buffer for next sector + loop ReadSectorsCHSLoop // Read next sector + + ret + + +msgDiskError: + .asciz "Disk error\r\n" +msgFreeLdr: + .asciz "ldr not found\r\n" +// Sorry, need the space... +//msgAnyKey: +// .asciz "Press any key to restart\r\n" +filename: + .ascii "FREELDR SYS" + + .org 509 // Pad to 509 bytes + +BootPartition: + .byte 0 + +BootSignature: + .word HEX(0aa55) // BootSector signature + +.endcode16 + +END Propchange: trunk/reactos/boot/freeldr/bootsect/fat.S ------------------------------------------------------------------------------ svn:eol-style = native

13 years, 6 months

[cgutman] 52195: [AFD] - Fix packet size overflow check

by cgutman＠svn.reactos.org

Author: cgutman Date: Sat Jun 11 20:10:55 2011 New Revision: 52195 URL: http://svn.reactos.org/svn/reactos?rev=52195&view=rev Log: [AFD] - Fix packet size overflow check Modified: trunk/reactos/drivers/network/afd/afd/write.c Modified: trunk/reactos/drivers/network/afd/afd/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/wr… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] Sat Jun 11 20:10:55 2011 @@ -328,8 +328,7 @@ if (SpaceAvail < SendReq->BufferArray[i].len) { - if (FCB->Send.BytesUsed + TotalBytesCopied + - SendReq->BufferArray[i].len > FCB->Send.Size) + if (TotalBytesCopied + SendReq->BufferArray[i].len > FCB->Send.Size) { UnlockBuffers( SendReq->BufferArray, SendReq->BufferCount, FALSE );

13 years, 6 months

[akhaldi] 52194: [CMAKE] * Don't create cleanup targets when using a VS generator

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Jun 11 18:12:48 2011 New Revision: 52194 URL: http://svn.reactos.org/svn/reactos?rev=52194&view=rev Log: [CMAKE] * Don't create cleanup targets when using a VS generator Modified: trunk/reactos/CMakeMacros.cmake Modified: trunk/reactos/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeMacros.cmake?rev=5219… ============================================================================== --- trunk/reactos/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/CMakeMacros.cmake [iso-8859-1] Sat Jun 11 18:12:48 2011 @@ -190,15 +190,17 @@ COMMENT "Cleaning ${target}") endfunction() -function(add_library name) - _add_library(${name} ${ARGN}) - add_clean_target(${name}) -endfunction() - -function(add_executable name) - _add_executable(${name} ${ARGN}) - add_clean_target(${name}) -endfunction() +if(NOT MSVC_IDE) + function(add_library name) + _add_library(${name} ${ARGN}) + add_clean_target(${name}) + endfunction() + + function(add_executable name) + _add_executable(${name} ${ARGN}) + add_clean_target(${name}) + endfunction() +endif() if(WIN32) macro(to_win_path _cmake_path _native_path)

13 years, 6 months

← Newer
1
...
27
28
29
30
31
32
33
...
46
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 June 2011