Ros-diffs November 2010

ros-diffs@reactos.org

16 participants
491 discussions

[tkreuzer] 49597: revert unwanted changes

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Nov 15 19:45:52 2010 New Revision: 49597 URL: http://svn.reactos.org/svn/reactos?rev=49597&view=rev Log: revert unwanted changes Modified: branches/cmake-bringup/boot/freeldr/freeldr/arch/i386/arch.S Modified: branches/cmake-bringup/boot/freeldr/freeldr/arch/i386/arch.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/freeldr/free… ============================================================================== --- branches/cmake-bringup/boot/freeldr/freeldr/arch/i386/arch.S [iso-8859-1] (original) +++ branches/cmake-bringup/boot/freeldr/freeldr/arch/i386/arch.S [iso-8859-1] Mon Nov 15 19:45:52 2010 @@ -17,19 +17,16 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include <asm.inc> +.intel_syntax noprefix +#define HEX(y) 0x##y + +#define ASM #include <arch.h> #include <multiboot.h> -EXTERN _BootMain:PROC -EXTERN __bss_start__:DWORD -EXTERN __bss_end__:DWORD -EXTERN i386idtptr:FWORD - -.code16 - -PUBLIC RealEntryPoint -RealEntryPoint: + .code16 + +EXTERN(RealEntryPoint) cli @@ -47,10 +44,9 @@ sti /* Init pmode */ - call switch_to_prot - -.endcode16 -.code32 + call switch_to_prot + + .code32 /* Zero BootDrive and BootPartition */ xor eax, eax @@ -68,7 +64,7 @@ call _BootMain call switch_to_real -.code16 + .code16 int HEX(19) @@ -82,8 +78,9 @@ * Switches the processor to protected mode * it destroys eax */ -PUBLIC switch_to_prot -switch_to_prot: +EXTERN(switch_to_prot) + +.code16 cli /* None of these */ @@ -107,9 +104,9 @@ mov word ptr ds:[stack16], sp /* Load the GDT */ - lgdt gdtptr + lgdt gdtptr /* Load the IDT */ - lidt i386idtptr + lidt i386idtptr /* Enable Protected Mode */ mov eax, cr0 @@ -117,12 +114,12 @@ mov cr0, eax /* Clear prefetch queue & correct CS */ - ljmp16 PMODE_CS, inpmode + //ljmp PMODE_CS, inpmode + jmp far ptr PMODE_CS:inpmode + +.code32 inpmode: -.endcode16 -.code32 - /* Setup segment selectors */ mov ax, PMODE_DS mov ds, ax @@ -142,8 +139,9 @@ * Switches the processor back to real mode * it destroys eax */ -PUBLIC switch_to_real -switch_to_real: +EXTERN(switch_to_real) + +.code32 /* We don't know what values are currently */ /* in the segment registers. So we are */ @@ -184,7 +182,7 @@ mov cr0, eax /* Clear prefetch queue & correct CS */ - //ljmp16 0, offset inrmode + //ljmp $0, $inrmode jmp far ptr 0:inrmode inrmode: @@ -209,7 +207,7 @@ push word ptr ds:[code16ret] /* Load IDTR with real mode value */ - lidt rmode_idtptr + lidt rmode_idtptr sti /* These are ok now */ @@ -220,8 +218,9 @@ /* * Needed for enabling the a20 address line */ +.code16 empty_8042: - .word HEX(00eb), HEX(00eb) // jmp $+2, jmp $+2 + .word 0x00eb,0x00eb // jmp $+2, jmp $+2 in al, HEX(64) cmp al, HEX(ff) // legacy-free machine without keyboard jz empty_8042_ret // controllers on Intel Macs read back 0xFF @@ -230,14 +229,11 @@ empty_8042_ret: ret -.endcode16 -.code32 - /* * Enable the A20 address line (to allow access to over 1mb) */ -PUBLIC _EnableA20 -_EnableA20: +EXTERN(_EnableA20) +.code32 pusha @@ -252,9 +248,7 @@ out HEX(60), al call empty_8042 call switch_to_prot - -.endcode16 -.code32 + .code32 popa @@ -263,26 +257,23 @@ /* * Disable the A20 address line */ -PUBLIC _DisableA20 -_DisableA20: +EXTERN(_DisableA20) +.code32 pusha call switch_to_real - -.code16 - - call empty_8042 + .code16 + + call empty_8042 mov al, HEX(D1) // command write out HEX(64), al call empty_8042 mov al, HEX(DD) // A20 off out HEX(60), al - call empty_8042 - call switch_to_prot - -.endcode16 -.code32 + call empty_8042 + call switch_to_prot + .code32 popa @@ -310,7 +301,7 @@ #define INITIAL_BASE HEX(200000) /* Align 32 bits boundary */ - .align 4 +.align 4 /* Multiboot header */ MultibootHeader: @@ -340,10 +331,10 @@ /* Although the multiboot spec says we should be called with the * segment registers set to 4GB flat mode, let's be sure and set up * our own */ - lgdt gdtptrhigh + INITIAL_BASE - FREELDR_BASE + lgdt gdtptrhigh + INITIAL_BASE - FREELDR_BASE /* Reload segment selectors */ - ljmp PMODE_CS, (mb1 + INITIAL_BASE - FREELDR_BASE) - //jmp far ptr PMODE_CS: (offset mb1 + INITIAL_BASE - FREELDR_BASE) + //ljmp $PMODE_CS, $(mb1 + INITIAL_BASE - FREELDR_BASE) + jmp far ptr PMODE_CS: (mb1 + INITIAL_BASE - FREELDR_BASE) mb1: mov dx, PMODE_DS mov ds, dx @@ -383,13 +374,13 @@ rep movsd /* Load the GDT and IDT */ - lgdt gdtptr - lidt i386idtptr + lgdt gdtptr + lidt i386idtptr /* Clear prefetch queue & correct CS, * jump to low mem */ - ljmp PMODE_CS, mb4 - //jmp far ptr PMODE_CS:mb4 + //ljmp $PMODE_CS, $mb4 + jmp far ptr PMODE_CS:mb4 mb4: /* Reload segment selectors */ mov dx, PMODE_DS @@ -425,17 +416,15 @@ /* GO! */ push eax - call _BootMain + call _BootMain mbfail: call switch_to_real -.code16 - int HEX(19) -mbstop: - jmp mbstop /* We should never get here */ - -.endcode16 -.code32 + .code16 + int 0x19 +mbstop: jmp mbstop /* We should never get here */ + + .code32 /* 16-bit stack pointer */ stack16: @@ -507,13 +496,8 @@ cmdline: .fill CMDLINE_SIZE, 1, 0 -PUBLIC _BootDrive -_BootDrive: +EXTERN(_BootDrive) .long 0 - -PUBLIC _BootPartition -_BootPartition: + +EXTERN(_BootPartition) .long 0 - -END -

13 years, 11 months

[tkreuzer] 49596: [FREELDR] Add a new file realmode.S for MSVC currently only containing some stubs to resolve references. The 16 bit code needs some work to be compilable with ML. Delete some amd6...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Nov 15 19:44:48 2010 New Revision: 49596 URL: http://svn.reactos.org/svn/reactos?rev=49596&view=rev Log: [FREELDR] Add a new file realmode.S for MSVC currently only containing some stubs to resolve references. The 16 bit code needs some work to be compilable with ML. Delete some amd64 files that only duplicated x86 16 bit code. Remove unused _alloca.S. Improve freeldr rules, add some experimental linking flags for MSVC, it links with a few warnings. Added: branches/cmake-bringup/boot/freeldr/freeldr/arch/i386/realmode.S (with props) Removed: branches/cmake-bringup/boot/freeldr/freeldr/arch/amd64/drvmap.S branches/cmake-bringup/boot/freeldr/freeldr/arch/amd64/fathelp.S branches/cmake-bringup/boot/freeldr/freeldr/arch/amd64/i386cpu.S branches/cmake-bringup/boot/freeldr/freeldr/arch/amd64/i386idt.S branches/cmake-bringup/boot/freeldr/freeldr/arch/amd64/i386trap.S branches/cmake-bringup/boot/freeldr/freeldr/arch/i386/_alloca.S Modified: branches/cmake-bringup/boot/CMakeLists.txt branches/cmake-bringup/boot/freeldr/freeldr/arch/amd64/arch.S branches/cmake-bringup/boot/freeldr/freeldr/arch/amd64/boot.S branches/cmake-bringup/boot/freeldr/freeldr/arch/amd64/i386pnp.S branches/cmake-bringup/boot/freeldr/freeldr/arch/amd64/int386.S branches/cmake-bringup/boot/freeldr/freeldr/arch/amd64/mb.S branches/cmake-bringup/boot/freeldr/freeldr/arch/i386/arch.S branches/cmake-bringup/boot/freeldr/freeldr/debug.c branches/cmake-bringup/boot/freeldr/freeldr/freeldr.c branches/cmake-bringup/boot/freeldr/freeldr/reactos/reactos.c branches/cmake-bringup/boot/freeldr/freeldr/windows/winldr.c Modified: branches/cmake-bringup/boot/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/CMakeLists.t… ============================================================================== --- branches/cmake-bringup/boot/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/boot/CMakeLists.txt [iso-8859-1] Mon Nov 15 19:44:48 2010 @@ -10,16 +10,22 @@ include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) if(ARCH MATCHES i386) +if(MSVC) +list(APPEND FREELDR_BASE64K_SOURCE + freeldr/freeldr/arch/i386/realmode.S) +else() list(APPEND FREELDR_STARTUP_SOURCE freeldr/freeldr/arch/i386/fathelp.S freeldr/freeldr/arch/i386/arch.S) +endif() elseif(ARCH MATCHES amd64) list(APPEND FREELDR_STARTUP_SOURCE - freeldr/freeldr/arch/amd64/fathelp.S + freeldr/freeldr/arch/i386/fathelp.S freeldr/freeldr/arch/amd64/arch.S) endif(ARCH MATCHES i386) if(ARCH MATCHES i386) +if(NOT MSVC) list(APPEND FREELDR_BASE64K_SOURCE freeldr/freeldr/arch/i386/boot.S freeldr/freeldr/arch/i386/drvmap.S @@ -31,12 +37,13 @@ freeldr/freeldr/arch/i386/linux.S freeldr/freeldr/arch/i386/mb.S freeldr/freeldr/arch/i386/i386bug.c) +endif() elseif(ARCH MATCHES amd64) list(APPEND FREELDR_BASE64K_SOURCE - freeldr/freeldr/arch/amd64/drvmap.S - freeldr/freeldr/arch/amd64/i386cpu.S - freeldr/freeldr/arch/amd64/i386idt.S - freeldr/freeldr/arch/amd64/i386trap.S + freeldr/freeldr/arch/i386/drvmap.S + freeldr/freeldr/arch/i386/i386cpu.S + freeldr/freeldr/arch/i386/i386idt.S + freeldr/freeldr/arch/i386/i386trap.S freeldr/freeldr/arch/amd64/mb.S) endif(ARCH MATCHES i386) @@ -107,7 +114,6 @@ if(ARCH MATCHES i386) list(APPEND FREELDR_ARCH_SOURCE - freeldr/freeldr/arch/i386/_alloca.S freeldr/freeldr/arch/i386/archmach.c freeldr/freeldr/arch/i386/custom.c freeldr/freeldr/arch/i386/drivemap.c @@ -171,7 +177,16 @@ ${CMAKE_CURRENT_BINARY_DIR}/freeldr_freeldr.h.gch ${FREELDR_SOURCE}) -set_target_properties(freeldr PROPERTIES LINK_FLAGS "-Wl,--strip-all -Wl,-entry,_mainCRTStartup -Wl,--image-base,0x8000 -Wl,--exclude-all-symbols -Wl,--subsystem,native -Wl,--file-alignment,0x1000 -Wl,-T,${REACTOS_SOURCE_DIR}/global.lds" SUFFIX ".sys") +if(NOT MSVC) +set_target_properties(freeldr PROPERTIES LINK_FLAGS "-Wl,--strip-all -Wl,--exclude-all-symbols -Wl,--file-alignment,0x1000 -Wl,-T,${REACTOS_SOURCE_DIR}/global.lds" SUFFIX ".sys") +set_image_base(freeldr 0x8000) +else() +set_target_properties(freeldr PROPERTIES LINK_FLAGS "/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) @@ -184,6 +199,7 @@ rtl libcntpr) add_pch(freeldr ${CMAKE_CURRENT_SOURCE_DIR}/freeldr/freeldr/include/freeldr.h ${FREELDR_SOURCE}) +add_dependencies(freeldr ks386) list(APPEND SETUPLDR_SOURCE ${FREELDR_STARTUP_SOURCE} @@ -194,7 +210,15 @@ add_library(setupldr SHARED ${SETUPLDR_SOURCE}) -set_target_properties(setupldr PROPERTIES LINK_FLAGS "-Wl,--strip-all -Wl,-entry,_mainCRTStartup -Wl,--image-base,0x8000 -Wl,--exclude-all-symbols -Wl,--subsystem,native -Wl,--file-alignment,0x1000 -Wl,-T,${REACTOS_SOURCE_DIR}/global.lds" SUFFIX ".sys" COMPILE_DEFINITIONS "FREELDR_REACTOS_SETUP") +if(NOT MSVC) +set_target_properties(setupldr PROPERTIES LINK_FLAGS "-Wl,--strip-all -Wl,--exclude-all-symbols -Wl,--file-alignment,0x1000 -Wl,-T,${REACTOS_SOURCE_DIR}/global.lds" SUFFIX ".sys" COMPILE_DEFINITIONS "FREELDR_REACTOS_SETUP") +set_image_base(setupldr 0x8000) +else() +set_target_properties(setupldr PROPERTIES LINK_FLAGS "/SECTION:.text,ERWP,ALIGN=0x1000" SUFFIX ".sys" COMPILE_DEFINITIONS "FREELDR_REACTOS_SETUP") +endif() + +set_subsystem(setupldr native) +set_entrypoint(freeldr mainCRTStartup) if(ARCH MATCHES i386) target_link_libraries(setupldr mini_hal) @@ -206,7 +230,9 @@ cmlib rtl libcntpr) - + +add_dependencies(setupldr ks386) + # Bootcd files add_minicd_target(setupldr loader setupldr.sys) add_minicd_target(freeldr loader freeldr.sys) Modified: branches/cmake-bringup/boot/freeldr/freeldr/arch/amd64/arch.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/freeldr/free… ============================================================================== --- branches/cmake-bringup/boot/freeldr/freeldr/arch/amd64/arch.S [iso-8859-1] (original) +++ branches/cmake-bringup/boot/freeldr/freeldr/arch/amd64/arch.S [iso-8859-1] Mon Nov 15 19:44:48 2010 @@ -1,9 +1,12 @@ -.intel_syntax noprefix + +#define ASM + +#include <asm.inc> + +#include <arch.h> + .text .code16 - -#define ASM -#include <arch.h> //.org 0x8000 Modified: branches/cmake-bringup/boot/freeldr/freeldr/arch/amd64/boot.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/freeldr/free… ============================================================================== --- branches/cmake-bringup/boot/freeldr/freeldr/arch/amd64/boot.S [iso-8859-1] (original) +++ branches/cmake-bringup/boot/freeldr/freeldr/arch/amd64/boot.S [iso-8859-1] Mon Nov 15 19:44:48 2010 @@ -17,14 +17,17 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include <asm.inc> + + .text .code16 #define ASM #include <arch.h> - -EXTERN(ChainLoadBiosBootSectorCode) +PUBLIC ChainLoadBiosBootSectorCode +ChainLoadBiosBootSectorCode: .code64 call x86_64_SwitchToReal @@ -46,7 +49,8 @@ // ljmpl $0x0000,$0x7C00 jmp 0x7c00:0x0000 -EXTERN(SoftReboot) +PUBLIC SoftReboot +SoftReboot: .code64 call x86_64_SwitchToReal Removed: branches/cmake-bringup/boot/freeldr/freeldr/arch/amd64/drvmap.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/freeldr/free… ============================================================================== --- branches/cmake-bringup/boot/freeldr/freeldr/arch/amd64/drvmap.S [iso-8859-1] (original) +++ branches/cmake-bringup/boot/freeldr/freeldr/arch/amd64/drvmap.S (removed) @@ -1,132 +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 - -#define ASM -#include <arch.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) Removed: branches/cmake-bringup/boot/freeldr/freeldr/arch/amd64/fathelp.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/freeldr/free… ============================================================================== --- branches/cmake-bringup/boot/freeldr/freeldr/arch/amd64/fathelp.S [iso-8859-1] (original) +++ branches/cmake-bringup/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: branches/cmake-bringup/boot/freeldr/freeldr/arch/amd64/i386cpu.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/freeldr/free… ============================================================================== --- branches/cmake-bringup/boot/freeldr/freeldr/arch/amd64/i386cpu.S [iso-8859-1] (original) +++ branches/cmake-bringup/boot/freeldr/freeldr/arch/amd64/i386cpu.S (removed) @@ -1,131 +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 - -#define ASM - -#include <arch.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: branches/cmake-bringup/boot/freeldr/freeldr/arch/amd64/i386idt.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/freeldr/free… ============================================================================== --- branches/cmake-bringup/boot/freeldr/freeldr/arch/amd64/i386idt.S [iso-8859-1] (original) +++ branches/cmake-bringup/boot/freeldr/freeldr/arch/amd64/i386idt.S (removed) @@ -1,224 +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 - -#define ASM -#include <arch.h> - - - .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 */ Modified: branches/cmake-bringup/boot/freeldr/freeldr/arch/amd64/i386pnp.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/freeldr/free… ============================================================================== --- branches/cmake-bringup/boot/freeldr/freeldr/arch/amd64/i386pnp.S [iso-8859-1] (original) +++ branches/cmake-bringup/boot/freeldr/freeldr/arch/amd64/i386pnp.S [iso-8859-1] Mon Nov 15 19:44:48 2010 @@ -16,6 +16,9 @@ * 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 @@ -255,4 +258,5 @@ ret +END /* EOF */ Removed: branches/cmake-bringup/boot/freeldr/freeldr/arch/amd64/i386trap.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/freeldr/free… ============================================================================== --- branches/cmake-bringup/boot/freeldr/freeldr/arch/amd64/i386trap.S [iso-8859-1] (original) +++ branches/cmake-bringup/boot/freeldr/freeldr/arch/amd64/i386trap.S (removed) @@ -1,942 +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 - -#define ASM -#include <arch.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: branches/cmake-bringup/boot/freeldr/freeldr/arch/amd64/int386.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/freeldr/free… ============================================================================== --- branches/cmake-bringup/boot/freeldr/freeldr/arch/amd64/int386.S [iso-8859-1] (original) +++ branches/cmake-bringup/boot/freeldr/freeldr/arch/amd64/int386.S [iso-8859-1] Mon Nov 15 19:44:48 2010 @@ -16,6 +16,9 @@ * 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> + .intel_syntax noprefix .text @@ -168,3 +171,5 @@ mov eax, Int386_eax ret + +END Modified: branches/cmake-bringup/boot/freeldr/freeldr/arch/amd64/mb.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/freeldr/free… ============================================================================== --- branches/cmake-bringup/boot/freeldr/freeldr/arch/amd64/mb.S [iso-8859-1] (original) +++ branches/cmake-bringup/boot/freeldr/freeldr/arch/amd64/mb.S [iso-8859-1] Mon Nov 15 19:44:48 2010 @@ -16,6 +16,9 @@ * 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 @@ -61,3 +64,5 @@ .fill 4096, 1, 0 PageDirectoryEnd: + +END Removed: branches/cmake-bringup/boot/freeldr/freeldr/arch/i386/_alloca.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/freeldr/free… ============================================================================== --- branches/cmake-bringup/boot/freeldr/freeldr/arch/i386/_alloca.S [iso-8859-1] (original) +++ branches/cmake-bringup/boot/freeldr/freeldr/arch/i386/_alloca.S (removed) @@ -1,33 +1,0 @@ -/* stuff needed for libgcc on win32. */ - -/*#ifdef L_chkstk*/ -#ifdef WIN32 - - .global ___chkstk - .global __alloca -___chkstk: -__alloca: - pushl %ecx /* save temp */ - movl %esp,%ecx /* get sp */ - addl $0x8,%ecx /* and point to return addr */ - -probe: cmpl $0x1000,%eax /* > 4k ?*/ - jb done - - subl $0x1000,%ecx /* yes, move pointer down 4k*/ - orl $0x0,(%ecx) /* probe there */ - subl $0x1000,%eax /* decrement count */ - jmp probe /* and do it again */ - -done: subl %eax,%ecx - orl $0x0,(%ecx) /* less that 4k, just peek here */ - - movl %esp,%eax - movl %ecx,%esp /* decrement stack */ - - movl (%eax),%ecx /* recover saved temp */ - movl 4(%eax),%eax /* get return address */ - jmp *%eax - - -#endif Modified: branches/cmake-bringup/boot/freeldr/freeldr/arch/i386/arch.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/freeldr/free… ============================================================================== --- branches/cmake-bringup/boot/freeldr/freeldr/arch/i386/arch.S [iso-8859-1] (original) +++ branches/cmake-bringup/boot/freeldr/freeldr/arch/i386/arch.S [iso-8859-1] Mon Nov 15 19:44:48 2010 @@ -17,16 +17,19 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -.intel_syntax noprefix -#define HEX(y) 0x##y - -#define ASM +#include <asm.inc> #include <arch.h> #include <multiboot.h> - .code16 - -EXTERN(RealEntryPoint) +EXTERN _BootMain:PROC +EXTERN __bss_start__:DWORD +EXTERN __bss_end__:DWORD +EXTERN i386idtptr:FWORD + +.code16 + +PUBLIC RealEntryPoint +RealEntryPoint: cli @@ -44,9 +47,10 @@ sti /* Init pmode */ - call switch_to_prot - - .code32 + call switch_to_prot + +.endcode16 +.code32 /* Zero BootDrive and BootPartition */ xor eax, eax @@ -64,7 +68,7 @@ call _BootMain call switch_to_real - .code16 +.code16 int HEX(19) @@ -78,9 +82,8 @@ * Switches the processor to protected mode * it destroys eax */ -EXTERN(switch_to_prot) - -.code16 +PUBLIC switch_to_prot +switch_to_prot: cli /* None of these */ @@ -104,9 +107,9 @@ mov word ptr ds:[stack16], sp /* Load the GDT */ - lgdt gdtptr + lgdt gdtptr /* Load the IDT */ - lidt i386idtptr + lidt i386idtptr /* Enable Protected Mode */ mov eax, cr0 @@ -114,12 +117,12 @@ mov cr0, eax /* Clear prefetch queue & correct CS */ - //ljmp PMODE_CS, inpmode - jmp far ptr PMODE_CS:inpmode - + ljmp16 PMODE_CS, inpmode + +inpmode: +.endcode16 .code32 -inpmode: /* Setup segment selectors */ mov ax, PMODE_DS mov ds, ax @@ -139,9 +142,8 @@ * Switches the processor back to real mode * it destroys eax */ -EXTERN(switch_to_real) - -.code32 +PUBLIC switch_to_real +switch_to_real: /* We don't know what values are currently */ /* in the segment registers. So we are */ @@ -182,7 +184,7 @@ mov cr0, eax /* Clear prefetch queue & correct CS */ - //ljmp $0, $inrmode + //ljmp16 0, offset inrmode jmp far ptr 0:inrmode inrmode: @@ -207,7 +209,7 @@ push word ptr ds:[code16ret] /* Load IDTR with real mode value */ - lidt rmode_idtptr + lidt rmode_idtptr sti /* These are ok now */ @@ -218,9 +220,8 @@ /* * Needed for enabling the a20 address line */ -.code16 empty_8042: - .word 0x00eb,0x00eb // jmp $+2, jmp $+2 + .word HEX(00eb), HEX(00eb) // jmp $+2, jmp $+2 in al, HEX(64) cmp al, HEX(ff) // legacy-free machine without keyboard jz empty_8042_ret // controllers on Intel Macs read back 0xFF @@ -229,11 +230,14 @@ empty_8042_ret: ret +.endcode16 +.code32 + /* * Enable the A20 address line (to allow access to over 1mb) */ -EXTERN(_EnableA20) -.code32 +PUBLIC _EnableA20 +_EnableA20: pusha @@ -248,7 +252,9 @@ out HEX(60), al call empty_8042 call switch_to_prot - .code32 + +.endcode16 +.code32 popa @@ -257,23 +263,26 @@ /* * Disable the A20 address line */ -EXTERN(_DisableA20) -.code32 +PUBLIC _DisableA20 +_DisableA20: pusha call switch_to_real - .code16 - - call empty_8042 + +.code16 + + call empty_8042 mov al, HEX(D1) // command write out HEX(64), al call empty_8042 mov al, HEX(DD) // A20 off out HEX(60), al - call empty_8042 - call switch_to_prot - .code32 + call empty_8042 + call switch_to_prot + +.endcode16 +.code32 popa @@ -301,7 +310,7 @@ #define INITIAL_BASE HEX(200000) /* Align 32 bits boundary */ -.align 4 + .align 4 /* Multiboot header */ MultibootHeader: @@ -331,10 +340,10 @@ /* Although the multiboot spec says we should be called with the * segment registers set to 4GB flat mode, let's be sure and set up * our own */ - lgdt gdtptrhigh + INITIAL_BASE - FREELDR_BASE + lgdt gdtptrhigh + INITIAL_BASE - FREELDR_BASE /* Reload segment selectors */ - //ljmp $PMODE_CS, $(mb1 + INITIAL_BASE - FREELDR_BASE) - jmp far ptr PMODE_CS: (mb1 + INITIAL_BASE - FREELDR_BASE) + ljmp PMODE_CS, (mb1 + INITIAL_BASE - FREELDR_BASE) + //jmp far ptr PMODE_CS: (offset mb1 + INITIAL_BASE - FREELDR_BASE) mb1: mov dx, PMODE_DS mov ds, dx @@ -374,13 +383,13 @@ rep movsd /* Load the GDT and IDT */ - lgdt gdtptr - lidt i386idtptr + lgdt gdtptr + lidt i386idtptr /* Clear prefetch queue & correct CS, * jump to low mem */ - //ljmp $PMODE_CS, $mb4 - jmp far ptr PMODE_CS:mb4 + ljmp PMODE_CS, mb4 + //jmp far ptr PMODE_CS:mb4 mb4: /* Reload segment selectors */ mov dx, PMODE_DS @@ -416,15 +425,17 @@ /* GO! */ push eax - call _BootMain + call _BootMain mbfail: call switch_to_real - .code16 - int 0x19 -mbstop: jmp mbstop /* We should never get here */ - - .code32 +.code16 + int HEX(19) +mbstop: + jmp mbstop /* We should never get here */ + +.endcode16 +.code32 /* 16-bit stack pointer */ stack16: @@ -496,8 +507,13 @@ cmdline: .fill CMDLINE_SIZE, 1, 0 -EXTERN(_BootDrive) +PUBLIC _BootDrive +_BootDrive: .long 0 - -EXTERN(_BootPartition) + +PUBLIC _BootPartition +_BootPartition: .long 0 + +END + Added: branches/cmake-bringup/boot/freeldr/freeldr/arch/i386/realmode.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/freeldr/free… ============================================================================== --- branches/cmake-bringup/boot/freeldr/freeldr/arch/i386/realmode.S (added) +++ branches/cmake-bringup/boot/freeldr/freeldr/arch/i386/realmode.S [iso-8859-1] Mon Nov 15 19:44:48 2010 @@ -1,0 +1,80 @@ + + +#include <asm.inc> + +.code16 +PUBLIC _mainCRTStartup +_mainCRTStartup: +_LoaderEntry: + ret + +.endcode16 + +.code32 + + +// globals +PUBLIC _BootPartition +_BootPartition: +PUBLIC _BootDrive +_BootDrive: + +PUBLIC _PageDirectoryStart +_PageDirectoryStart: +PUBLIC _PageDirectoryEnd +_PageDirectoryEnd: + +PUBLIC _startup_pagedirectory +_startup_pagedirectory: +PUBLIC _apic_pagetable +_apic_pagetable: +PUBLIC _kernel_pagetable +_kernel_pagetable: +PUBLIC _lowmem_pagetable +_lowmem_pagetable: + + +PUBLIC RealEntryPoint +RealEntryPoint: + +PUBLIC _EnableA20 +_EnableA20: + +PUBLIC _ChainLoadBiosBootSectorCode +_ChainLoadBiosBootSectorCode: + +PUBLIC _BootOldLinuxKernel +_BootOldLinuxKernel: + +PUBLIC _BootNewLinuxKernel +_BootNewLinuxKernel: + +PUBLIC _SoftReboot +_SoftReboot: + +PUBLIC _DriveMapOldInt13HandlerAddress +_DriveMapOldInt13HandlerAddress: + +PUBLIC _DriveMapInt13HandlerStart +_DriveMapInt13HandlerStart: + +PUBLIC _DriveMapInt13HandlerEnd +_DriveMapInt13HandlerEnd: + +PUBLIC _DriveMapInt13HandlerMapList +_DriveMapInt13HandlerMapList: + +PUBLIC _PnpBiosGetDeviceNode +_PnpBiosGetDeviceNode: + +PUBLIC _PnpBiosGetDeviceNodeCount +_PnpBiosGetDeviceNodeCount: + +PUBLIC _PnpBiosSupported +_PnpBiosSupported: + +PUBLIC _Int386 +_Int386: + + +END Propchange: branches/cmake-bringup/boot/freeldr/freeldr/arch/i386/realmode.S ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/boot/freeldr/freeldr/debug.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/freeldr/free… ============================================================================== --- branches/cmake-bringup/boot/freeldr/freeldr/debug.c [iso-8859-1] (original) +++ branches/cmake-bringup/boot/freeldr/freeldr/debug.c [iso-8859-1] Mon Nov 15 19:44:48 2010 @@ -341,7 +341,6 @@ } NTKERNELAPI -DECLSPEC_NORETURN VOID NTAPI KeBugCheckEx( Modified: branches/cmake-bringup/boot/freeldr/freeldr/freeldr.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/freeldr/free… ============================================================================== --- branches/cmake-bringup/boot/freeldr/freeldr/freeldr.c [iso-8859-1] (original) +++ branches/cmake-bringup/boot/freeldr/freeldr/freeldr.c [iso-8859-1] Mon Nov 15 19:44:48 2010 @@ -53,3 +53,14 @@ #endif RunLoader(); } + +#ifdef _MSC_VER +long _ftol2(double f) +{ + return _ftol(f); +} +long _ftol2_sse(double f) +{ + return _ftol(f); +} +#endif Modified: branches/cmake-bringup/boot/freeldr/freeldr/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/freeldr/free… ============================================================================== --- branches/cmake-bringup/boot/freeldr/freeldr/reactos/reactos.c [iso-8859-1] (original) +++ branches/cmake-bringup/boot/freeldr/freeldr/reactos/reactos.c [iso-8859-1] Mon Nov 15 19:44:48 2010 @@ -606,6 +606,8 @@ // if (IniReadSettingByName(SectionId, "Options", value, sizeof(value))) { + PCHAR File; + // // Append boot-time options // @@ -614,7 +616,6 @@ // // Check if a ramdisk file was given // - PCHAR File; File = strstr(value, "/RDIMAGEPATH="); if (File) { Modified: branches/cmake-bringup/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/freeldr/free… ============================================================================== --- branches/cmake-bringup/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] (original) +++ branches/cmake-bringup/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] Mon Nov 15 19:44:48 2010 @@ -39,6 +39,11 @@ extern ULONG LoaderPagesSpanned; extern BOOLEAN AcpiPresent; +extern HEADLESS_LOADER_BLOCK LoaderRedirectionInformation; +extern BOOLEAN WinLdrTerminalConnected; + +extern void WinLdrSetupEms(IN PCHAR BootOptions); + BOOLEAN WinLdrCheckForLoadedDll(IN OUT PLOADER_PARAMETER_BLOCK WinLdrBlock, IN PCH DllName, @@ -205,8 +210,6 @@ } /* Set headless block pointer */ - extern HEADLESS_LOADER_BLOCK LoaderRedirectionInformation; - extern BOOLEAN WinLdrTerminalConnected; if (WinLdrTerminalConnected) { Extension->HeadlessLoaderBlock = MmHeapAlloc(sizeof(HEADLESS_LOADER_BLOCK)); @@ -535,7 +538,6 @@ AllocateAndInitLPB(&LoaderBlock); /* Setup redirection support */ - extern void WinLdrSetupEms(IN PCHAR BootOptions); WinLdrSetupEms(BootOptions); /* Detect hardware */

13 years, 11 months

[tkreuzer] 49595: [GENINC] Prefix hex numbers with 0. Delete data.c

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Nov 15 19:40:58 2010 New Revision: 49595 URL: http://svn.reactos.org/svn/reactos?rev=49595&view=rev Log: [GENINC] Prefix hex numbers with 0. Delete data.c Removed: branches/cmake-bringup/tools/geninc/data.c Modified: branches/cmake-bringup/tools/geninc/geninc.c Removed: branches/cmake-bringup/tools/geninc/data.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/geninc/data… ============================================================================== --- branches/cmake-bringup/tools/geninc/data.c [iso-8859-1] (original) +++ branches/cmake-bringup/tools/geninc/data.c (removed) @@ -1,1567 +1,0 @@ -#undef __MSVCRT__ -#include <psdk/ntverp.h> - -/* DDK/IFS/NDK Headers */ -#include <excpt.h> -#include <ntdef.h> -#include <ntifs.h> -#include <arc/arc.h> -#include <ntndk.h> -#include <bugcodes.h> - -/* KD Support */ -#define NOEXTAPI -#include <windbgkd.h> -#include <wdbgexts.h> -#include <kddll.h> - -typedef struct -{ - UCHAR Type; - CHAR Name[60]; - ULONGLONG Value; -} ASMGENDATA; - -#define RAW(x) {0, #x, 0} -#define CONSTANT(name) {1, #name, name} -#define OFFSET(name, struct, member) {1, #name, FIELD_OFFSET(struct, member)} -#define RELOFFSET(name, struct, member, to) {1, #name, FIELD_OFFSET(struct, member) - FIELD_OFFSET(struct, to)} -#define SIZE(name, struct) {1, #name, sizeof(struct)} -#define HEADER(x) {2, x, 0} - -ASMGENDATA Table[] = -{ - -/* PORTABLE CONSTANTS ********************************************************/ - - HEADER("Pointer size"), - SIZE(SizeofPointer, PVOID), - - HEADER("Breakpoints"), - CONSTANT(BREAKPOINT_BREAK), - CONSTANT(BREAKPOINT_PRINT), - CONSTANT(BREAKPOINT_PROMPT), - CONSTANT(BREAKPOINT_LOAD_SYMBOLS), - CONSTANT(BREAKPOINT_UNLOAD_SYMBOLS), - CONSTANT(BREAKPOINT_COMMAND_STRING), - - HEADER("Context Frame Flags"), - CONSTANT(CONTEXT_FULL), - CONSTANT(CONTEXT_CONTROL), - CONSTANT(CONTEXT_INTEGER), - CONSTANT(CONTEXT_SEGMENTS), - CONSTANT(CONTEXT_FLOATING_POINT), - CONSTANT(CONTEXT_DEBUG_REGISTERS), - - HEADER("Exception flags"), - CONSTANT(EXCEPTION_NONCONTINUABLE), - CONSTANT(EXCEPTION_UNWINDING), - CONSTANT(EXCEPTION_EXIT_UNWIND), - CONSTANT(EXCEPTION_STACK_INVALID), - CONSTANT(EXCEPTION_NESTED_CALL), - CONSTANT(EXCEPTION_TARGET_UNWIND), - CONSTANT(EXCEPTION_COLLIDED_UNWIND), - CONSTANT(EXCEPTION_UNWIND), - CONSTANT(EXCEPTION_EXECUTE_HANDLER), - CONSTANT(EXCEPTION_CONTINUE_SEARCH), - CONSTANT(EXCEPTION_CONTINUE_EXECUTION), -#ifdef _X86_ - //CONSTANT(EXCEPTION_CHAIN_END), - //CONSTANT(FIXED_NTVDMSTATE_LINEAR), -#endif - - HEADER("Exception types"), - CONSTANT(ExceptionContinueExecution), - CONSTANT(ExceptionContinueSearch), - CONSTANT(ExceptionNestedException), - CONSTANT(ExceptionCollidedUnwind), - - HEADER("Lock Queue"), - CONSTANT(LOCK_QUEUE_WAIT), - CONSTANT(LOCK_QUEUE_OWNER), - CONSTANT(LockQueueDispatcherLock), - - HEADER("Performance Definitions"), -// CONSTANT(PERF_CONTEXTSWAP_OFFSET), -// CONSTANT(PERF_CONTEXTSWAP_FLAG), -// CONSTANT(PERF_INTERRUPT_OFFSET), -// CONSTANT(PERF_INTERRUPT_FLAG), -// CONSTANT(PERF_PROFILE_OFFSET), -// CONSTANT(PERF_PROFILE_FLAG), -// CONSTANT(PERF_SYSCALL_OFFSET), -// CONSTANT(PERF_SYSCALL_FLAG), -// CONSTANT(PERF_SPINLOCK_OFFSET), -// CONSTANT(PERF_SPINLOCK_FLAG), -// CONSTANT(NTOS_YIELD_MACRO), - - HEADER("Process states"), - CONSTANT(ProcessInMemory), - CONSTANT(ProcessOutOfMemory), - CONSTANT(ProcessInTransition), - - HEADER("Processor mode"), - CONSTANT(KernelMode), - CONSTANT(UserMode), - - HEADER("Status codes"), - CONSTANT(STATUS_ACCESS_VIOLATION), - CONSTANT(STATUS_ASSERTION_FAILURE), - CONSTANT(STATUS_ARRAY_BOUNDS_EXCEEDED), - CONSTANT(STATUS_BAD_COMPRESSION_BUFFER), - CONSTANT(STATUS_BREAKPOINT), - CONSTANT(STATUS_CALLBACK_POP_STACK), - CONSTANT(STATUS_DATATYPE_MISALIGNMENT), - CONSTANT(STATUS_FLOAT_DENORMAL_OPERAND), - CONSTANT(STATUS_FLOAT_DIVIDE_BY_ZERO), - CONSTANT(STATUS_FLOAT_INEXACT_RESULT), - CONSTANT(STATUS_FLOAT_INVALID_OPERATION), - CONSTANT(STATUS_FLOAT_OVERFLOW), - CONSTANT(STATUS_FLOAT_STACK_CHECK), - CONSTANT(STATUS_FLOAT_UNDERFLOW), - CONSTANT(STATUS_FLOAT_MULTIPLE_FAULTS), - CONSTANT(STATUS_FLOAT_MULTIPLE_TRAPS), - CONSTANT(STATUS_GUARD_PAGE_VIOLATION), - CONSTANT(STATUS_ILLEGAL_FLOAT_CONTEXT), - CONSTANT(STATUS_ILLEGAL_INSTRUCTION), - CONSTANT(STATUS_INSTRUCTION_MISALIGNMENT), - CONSTANT(STATUS_INVALID_HANDLE), - CONSTANT(STATUS_INVALID_LOCK_SEQUENCE), - CONSTANT(STATUS_INVALID_OWNER), - CONSTANT(STATUS_INVALID_PARAMETER), - CONSTANT(STATUS_INVALID_PARAMETER_1), - CONSTANT(STATUS_INVALID_SYSTEM_SERVICE), -// CONSTANT(STATUS_INVALID_THREAD), - CONSTANT(STATUS_INTEGER_DIVIDE_BY_ZERO), - CONSTANT(STATUS_INTEGER_OVERFLOW), - CONSTANT(STATUS_IN_PAGE_ERROR), - CONSTANT(STATUS_KERNEL_APC), - CONSTANT(STATUS_LONGJUMP), - CONSTANT(STATUS_NO_CALLBACK_ACTIVE), - CONSTANT(STATUS_NO_EVENT_PAIR), - CONSTANT(STATUS_PRIVILEGED_INSTRUCTION), - CONSTANT(STATUS_SINGLE_STEP), - CONSTANT(STATUS_STACK_BUFFER_OVERRUN), - CONSTANT(STATUS_STACK_OVERFLOW), - CONSTANT(STATUS_SUCCESS), - CONSTANT(STATUS_THREAD_IS_TERMINATING), - CONSTANT(STATUS_TIMEOUT), - CONSTANT(STATUS_UNWIND), - CONSTANT(STATUS_UNWIND_CONSOLIDATE), - CONSTANT(STATUS_USER_APC), - CONSTANT(STATUS_WAKE_SYSTEM_DEBUGGER), - - HEADER("TLS defines"), - CONSTANT(TLS_MINIMUM_AVAILABLE), - CONSTANT(TLS_EXPANSION_SLOTS), - - HEADER("Thread states"), - CONSTANT(Initialized), - CONSTANT(Ready), - CONSTANT(Running), - CONSTANT(Standby), - CONSTANT(Terminated), - CONSTANT(Waiting), - - HEADER("Wait type / reason"), - CONSTANT(WrExecutive), - CONSTANT(WrMutex), - CONSTANT(WrDispatchInt), - CONSTANT(WrQuantumEnd), - CONSTANT(WrEventPair), - CONSTANT(WaitAny), - CONSTANT(WaitAll), - - HEADER("Interrupt object types"), -// CONSTANT(InLevelSensitive), -// CONSTANT(InLatched), - - HEADER("Bug Check Codes"), - CONSTANT(APC_INDEX_MISMATCH), - CONSTANT(INVALID_AFFINITY_SET), - CONSTANT(INVALID_DATA_ACCESS_TRAP), - CONSTANT(IRQL_NOT_GREATER_OR_EQUAL), - CONSTANT(IRQL_NOT_LESS_OR_EQUAL), - CONSTANT(NO_USER_MODE_CONTEXT), - CONSTANT(SPIN_LOCK_ALREADY_OWNED), - CONSTANT(SPIN_LOCK_NOT_OWNED), - CONSTANT(THREAD_NOT_MUTEX_OWNER), - CONSTANT(TRAP_CAUSE_UNKNOWN), - CONSTANT(KMODE_EXCEPTION_NOT_HANDLED), - CONSTANT(KERNEL_APC_PENDING_DURING_EXIT), - CONSTANT(PANIC_STACK_SWITCH), - CONSTANT(DATA_BUS_ERROR), - CONSTANT(INSTRUCTION_BUS_ERROR), - CONSTANT(SYSTEM_EXIT_OWNED_MUTEX), -// CONSTANT(SYSTEM_UNWIND_PREVIOUS_USER), -// CONSTANT(SYSTEM_SERVICE_EXCEPTION), -// CONSTANT(INTERRUPT_UNWIND_ATTEMPTED), -// CONSTANT(INTERRUPT_EXCEPTION_NOT_HANDLED), - CONSTANT(PAGE_FAULT_WITH_INTERRUPTS_OFF), - CONSTANT(IRQL_GT_ZERO_AT_SYSTEM_SERVICE), - CONSTANT(DATA_COHERENCY_EXCEPTION), - CONSTANT(INSTRUCTION_COHERENCY_EXCEPTION), - CONSTANT(HAL1_INITIALIZATION_FAILED), - CONSTANT(UNEXPECTED_KERNEL_MODE_TRAP), - CONSTANT(NMI_HARDWARE_FAILURE), - CONSTANT(SPIN_LOCK_INIT_FAILURE), - CONSTANT(ATTEMPTED_SWITCH_FROM_DPC), -// CONSTANT(MUTEX_ALREADY_OWNED), -// CONSTANT(HARDWARE_INTERRUPT_STORM), -// CONSTANT(RECURSIVE_MACHINE_CHECK), -// CONSTANT(RECURSIVE_NMI), - - HEADER("IRQL"), - CONSTANT(PASSIVE_LEVEL), - CONSTANT(APC_LEVEL), - CONSTANT(DISPATCH_LEVEL), -#ifdef _M_AMD64 - CONSTANT(CLOCK_LEVEL), -#else - CONSTANT(CLOCK1_LEVEL), - CONSTANT(CLOCK2_LEVEL), -#endif - CONSTANT(IPI_LEVEL), - CONSTANT(POWER_LEVEL), - CONSTANT(PROFILE_LEVEL), - CONSTANT(HIGH_LEVEL), - RAW("#ifdef NT_UP"), - {1, "SYNCH_LEVEL", DISPATCH_LEVEL}, - RAW("#else"), - {1, "SYNCH_LEVEL", (IPI_LEVEL - 2)}, - RAW("#endif"), - - HEADER("Stack sizes"), - CONSTANT(KERNEL_STACK_SIZE), - CONSTANT(KERNEL_LARGE_STACK_SIZE), - CONSTANT(KERNEL_LARGE_STACK_COMMIT), -// CONSTANT(DOUBLE_FAULT_STACK_SIZE), -#ifdef _M_AMD64 - CONSTANT(KERNEL_MCA_EXCEPTION_STACK_SIZE), - CONSTANT(NMI_STACK_SIZE), -#endif - - HEADER("Thread flags"), -// CONSTANT(THREAD_FLAGS_CYCLE_PROFILING), -// CONSTANT(THREAD_FLAGS_CYCLE_PROFILING_LOCK_BIT), -// CONSTANT(THREAD_FLAGS_CYCLE_PROFILING_LOCK), -// CONSTANT(THREAD_FLAGS_COUNTER_PROFILING), -// CONSTANT(THREAD_FLAGS_COUNTER_PROFILING_LOCK_BIT), -// CONSTANT(THREAD_FLAGS_COUNTER_PROFILING_LOCK), -// CONSTANT(THREAD_FLAGS_CPU_THROTTLED), -// CONSTANT(THREAD_FLAGS_CPU_THROTTLED_BIT), -// CONSTANT(THREAD_FLAGS_ACCOUNTING_ANY), - - HEADER("Miscellaneous Definitions"), -// CONSTANT(BASE_PRIORITY_THRESHOLD), -// CONSTANT(EVENT_PAIR_INCREMENT), - CONSTANT(LOW_REALTIME_PRIORITY), - CONSTANT(CLOCK_QUANTUM_DECREMENT), -// CONSTANT(READY_SKIP_QUANTUM), -// CONSTANT(THREAD_QUANTUM), - CONSTANT(WAIT_QUANTUM_DECREMENT), -// CONSTANT(ROUND_TRIP_DECREMENT_COUNT), - CONSTANT(MAXIMUM_PROCESSORS), - CONSTANT(INITIAL_STALL_COUNT), - CONSTANT(EXCEPTION_EXECUTE_FAULT), -// CONSTANT(KCACHE_ERRATA_MONITOR_FLAGS), -// CONSTANT(KI_EXCEPTION_GP_FAULT), -// CONSTANT(KI_EXCEPTION_INVALID_OP), -// CONSTANT(KI_EXCEPTION_INTEGER_DIVIDE_BY_ZERO), - CONSTANT(KI_EXCEPTION_ACCESS_VIOLATION), -// CONSTANT(TARGET_FREEZE), -// CONSTANT(BlackHole), - CONSTANT(Executive), - CONSTANT(FALSE), - CONSTANT(TRUE), - CONSTANT(DBG_STATUS_CONTROL_C), - CONSTANT(USER_SHARED_DATA), -// CONSTANT(MM_SHARED_USER_DATA_VA), - CONSTANT(PAGE_SIZE), -// CONSTANT(KERNEL_STACK_CONTROL_LARGE_STACK), -// CONSTANT(KI_DPC_ALL_FLAGS), -// CONSTANT(DISPATCH_LENGTH), - CONSTANT(MAXIMUM_IDTVECTOR), -// CONSTANT(MAXIMUM_PRIMARY_VECTOR), - CONSTANT(PRIMARY_VECTOR_BASE), - CONSTANT(RPL_MASK), - CONSTANT(MODE_MASK), -// CONSTANT(KTHREAD_AUTO_ALIGNMENT_BIT), -// CONSTANT(KTHREAD_GUI_THREAD_MASK), -// CONSTANT(KI_SLIST_FAULT_COUNT_MAXIMUM), - CONSTANT(NUMBER_SERVICE_TABLES), - CONSTANT(SERVICE_NUMBER_MASK), - CONSTANT(SERVICE_TABLE_SHIFT), - CONSTANT(SERVICE_TABLE_MASK), - CONSTANT(SERVICE_TABLE_TEST), - -/* ARCHITECTURE SPECIFIC CONTSTANTS ******************************************/ - -#if defined(_M_AMD64) || defined(_M_IX86) - - HEADER("CR0 flags"), - CONSTANT(CR0_PE), - CONSTANT(CR0_MP), - CONSTANT(CR0_EM), - CONSTANT(CR0_TS), - CONSTANT(CR0_ET), - CONSTANT(CR0_NE), - CONSTANT(CR0_WP), - CONSTANT(CR0_AM), - CONSTANT(CR0_NW), - CONSTANT(CR0_CD), - CONSTANT(CR0_PG), - - HEADER("CR4 flags"), - CONSTANT(CR4_VME), - CONSTANT(CR4_PVI), - CONSTANT(CR4_TSD), - CONSTANT(CR4_DE), - CONSTANT(CR4_PSE), - CONSTANT(CR4_PAE), - CONSTANT(CR4_MCE), - CONSTANT(CR4_PGE), - CONSTANT(CR4_FXSR), - CONSTANT(CR4_XMMEXCPT), -#if defined(_M_IX86) -// CONSTANT(CR4_PGE_V), -// CONSTANT(CR4_XSAVE), -#elif defined(_M_AMD64) - CONSTANT(CR4_CHANNELS), -#endif - - HEADER("KeFeatureBits flags"), - CONSTANT(KF_RDTSC), - CONSTANT(KF_CR4), - CONSTANT(KF_GLOBAL_PAGE), - CONSTANT(KF_LARGE_PAGE), - CONSTANT(KF_CMPXCHG8B), - CONSTANT(KF_FAST_SYSCALL), -#ifdef _M_IX86 - CONSTANT(KF_V86_VIS), -// CONSTANT(KF_XSTATE), -#endif - - HEADER("Machine type definitions"), - CONSTANT(MACHINE_TYPE_ISA), - CONSTANT(MACHINE_TYPE_EISA), - CONSTANT(MACHINE_TYPE_MCA), - -#endif - -#ifdef _M_IX86 - - HEADER("EFLAGS"), - CONSTANT(EFLAGS_TF), - CONSTANT(EFLAGS_INTERRUPT_MASK), - CONSTANT(EFLAGS_V86_MASK), - CONSTANT(EFLAGS_ALIGN_CHECK), - CONSTANT(EFLAGS_VIF), - CONSTANT(EFLAGS_VIP), - CONSTANT(EFLAGS_USER_SANITIZE), - - HEADER("KDGT selectors"), - CONSTANT(KGDT_R3_DATA), - CONSTANT(KGDT_R3_CODE), - CONSTANT(KGDT_R0_CODE), - CONSTANT(KGDT_R0_DATA), - CONSTANT(KGDT_R0_PCR), -// CONSTANT(KGDT_STACK16), -// CONSTANT(KGDT_CODE16), - CONSTANT(KGDT_TSS), - CONSTANT(KGDT_R3_TEB), - CONSTANT(KGDT_DF_TSS), - CONSTANT(KGDT_NMI_TSS), - CONSTANT(KGDT_LDT), - - CONSTANT(NPX_STATE_NOT_LOADED), - CONSTANT(NPX_STATE_LOADED), -// CONSTANT(NPX_MASK_LAZY), - -/* - HEADER("VDM constants"), - CONSTANT(VDM_INDEX_Invalid), - CONSTANT(VDM_INDEX_0F), - CONSTANT(VDM_INDEX_ESPrefix), - CONSTANT(VDM_INDEX_CSPrefix), - CONSTANT(VDM_INDEX_SSPrefix), - CONSTANT(VDM_INDEX_DSPrefix), - CONSTANT(VDM_INDEX_FSPrefix), - CONSTANT(VDM_INDEX_GSPrefix), - CONSTANT(VDM_INDEX_OPER32Prefix), - CONSTANT(VDM_INDEX_ADDR32Prefix), - CONSTANT(VDM_INDEX_INSB), - CONSTANT(VDM_INDEX_INSW), - CONSTANT(VDM_INDEX_OUTSB), - CONSTANT(VDM_INDEX_OUTSW), - CONSTANT(VDM_INDEX_PUSHF), - CONSTANT(VDM_INDEX_POPF), - CONSTANT(VDM_INDEX_INTnn), - CONSTANT(VDM_INDEX_INTO), - CONSTANT(VDM_INDEX_IRET), - CONSTANT(VDM_INDEX_NPX), - CONSTANT(VDM_INDEX_INBimm), - CONSTANT(VDM_INDEX_INWimm), - CONSTANT(VDM_INDEX_OUTBimm), - CONSTANT(VDM_INDEX_OUTWimm), - CONSTANT(VDM_INDEX_INB), - CONSTANT(VDM_INDEX_INW), - CONSTANT(VDM_INDEX_OUTB), - CONSTANT(VDM_INDEX_OUTW), - CONSTANT(VDM_INDEX_LOCKPrefix), - CONSTANT(VDM_INDEX_REPNEPrefix), - CONSTANT(VDM_INDEX_REPPrefix), - CONSTANT(VDM_INDEX_CLI), - CONSTANT(VDM_INDEX_STI), - CONSTANT(VDM_INDEX_HLT), - CONSTANT(MAX_VDM_INDEX), -*/ - CONSTANT(PF_XMMI_INSTRUCTIONS_AVAILABLE), - CONSTANT(EFLAG_SELECT), -// CONSTANT(IPI_FREEZE), -// CONSTANT(XSAVE_PRESENT), - -#elif defined(_M_AMD64) - - HEADER("EFLAGS"), - CONSTANT(EFLAGS_TF_MASK), - CONSTANT(EFLAGS_TF_SHIFT), - CONSTANT(EFLAGS_IF_MASK), - CONSTANT(EFLAGS_IF_SHIFT), - CONSTANT(EFLAGS_ID_MASK), - - HEADER("Hypervisor Enlightenment Definitions"), - CONSTANT(HV_MMU_USE_HYPERCALL_FOR_ADDRESS_SWITCH), - CONSTANT(HV_MMU_USE_HYPERCALL_FOR_LOCAL_FLUSH), - CONSTANT(HV_MMU_USE_HYPERCALL_FOR_REMOTE_FLUSH), - CONSTANT(HV_X64_MSR_APIC_EOI), - CONSTANT(HV_APIC_ENLIGHTENED), - CONSTANT(HV_KE_USE_HYPERCALL_FOR_LONG_SPIN_WAIT), - CONSTANT(HV_VIRTUAL_APIC_NO_EOI_REQUIRED_V), - CONSTANT(HvApicFlags), - - HEADER("KDGT selectors"), - CONSTANT(KGDT64_NULL), - CONSTANT(KGDT64_R0_CODE), - CONSTANT(KGDT64_R0_DATA), - CONSTANT(KGDT64_R3_CMCODE), - CONSTANT(KGDT64_R3_DATA), - CONSTANT(KGDT64_R3_CODE), - CONSTANT(KGDT64_SYS_TSS), - CONSTANT(KGDT64_R3_CMTEB), - - HEADER("Machine Specific Register Numbers"), - CONSTANT(MSR_EFER), - CONSTANT(MSR_STAR), - CONSTANT(MSR_LSTAR), - CONSTANT(MSR_CSTAR), - CONSTANT(MSR_SYSCALL_MASK), - CONSTANT(MSR_FS_BASE), - CONSTANT(MSR_GS_BASE), - CONSTANT(MSR_GS_SWAP), - CONSTANT(MSR_MCG_STATUS), - CONSTANT(MSR_AMD_ACCESS), - - HEADER("Flags for MSR_EFER"), - CONSTANT(MSR_LMA), - CONSTANT(MSR_LME), - CONSTANT(MSR_SCE), - CONSTANT(MSR_NXE), - CONSTANT(MSR_PAT), - CONSTANT(MSR_DEGUG_CTL), - CONSTANT(MSR_LAST_BRANCH_FROM), - CONSTANT(MSR_LAST_BRANCH_TO), - CONSTANT(MSR_LAST_EXCEPTION_FROM), - CONSTANT(MSR_LAST_EXCEPTION_TO), - - HEADER("Flags for MSR_DEGUG_CTL"), - CONSTANT(MSR_DEBUG_CTL_LBR), - CONSTANT(MSR_DEBUG_CRL_BTF), - -#endif - -#if 0 - HEADER("Fatal exception codes"), - CONSTANT(EXCEPTION_DIVIDED_BY_ZERO), - CONSTANT(EXCEPTION_DEBUG), - CONSTANT(EXCEPTION_NMI), - CONSTANT(EXCEPTION_INT3), - CONSTANT(EXCEPTION_BOUND_CHECK), - CONSTANT(EXCEPTION_INVALID_OPCODE), - CONSTANT(EXCEPTION_NPX_NOT_AVAILABLE), - CONSTANT(EXCEPTION_DOUBLE_FAULT), - CONSTANT(EXCEPTION_NPX_OVERRUN), - CONSTANT(EXCEPTION_INVALID_TSS), - CONSTANT(EXCEPTION_SEGMENT_NOT_PRESENT), - CONSTANT(EXCEPTION_STACK_FAULT), - CONSTANT(EXCEPTION_GP_FAULT), - CONSTANT(EXCEPTION_RESERVED_TRAP), - CONSTANT(EXCEPTION_NPX_ERROR), - CONSTANT(EXCEPTION_ALIGNMENT_CHECK), -#endif - - -/* STRUCTURE OFFSETS *********************************************************/ - - HEADER("KAFFINITY_EX"), -// OFFSET(AfBitmap, KAFFINITY_EX, Bitmap), - - HEADER("Aligned Affinity"), -// OFFSET(AfsCpuSet, ???, CpuSet), - - HEADER("KAPC"), - OFFSET(ApType, KAPC, Type), - OFFSET(ApSize, KAPC, Size), - OFFSET(ApThread, KAPC, Thread), - OFFSET(ApApcListEntry, KAPC, ApcListEntry), - OFFSET(ApKernelRoutine, KAPC, KernelRoutine), - OFFSET(ApRundownRoutine, KAPC, RundownRoutine), - OFFSET(ApNormalRoutine, KAPC, NormalRoutine), - OFFSET(ApNormalContext, KAPC, NormalContext), - OFFSET(ApSystemArgument1, KAPC, SystemArgument1), - OFFSET(ApSystemArgument2, KAPC, SystemArgument2), - OFFSET(ApApcStateIndex, KAPC, ApcStateIndex), - OFFSET(ApApcMode, KAPC, ApcMode), - OFFSET(ApInserted, KAPC, Inserted), - SIZE(ApcObjectLength, KAPC), - - HEADER("KAPC_STATE"), - OFFSET(AsApcListHead, KAPC_STATE, ApcListHead), - OFFSET(AsProcess, KAPC_STATE, Process), - OFFSET(AsKernelApcInProgress, KAPC_STATE, KernelApcInProgress), - OFFSET(AsKernelApcPending, KAPC_STATE, KernelApcPending), - OFFSET(AsUserApcPending, KAPC_STATE, UserApcPending), - - HEADER("CLIENT_ID"), - OFFSET(CidUniqueProcess, CLIENT_ID, UniqueProcess), - OFFSET(CidUniqueThread, CLIENT_ID, UniqueThread), - - HEADER("RTL_CRITICAL_SECTION"), - OFFSET(CsDebugInfo, RTL_CRITICAL_SECTION, DebugInfo), - OFFSET(CsLockCount, RTL_CRITICAL_SECTION, LockCount), - OFFSET(CsRecursionCount, RTL_CRITICAL_SECTION, RecursionCount), - OFFSET(CsOwningThread, RTL_CRITICAL_SECTION, OwningThread), - OFFSET(CsLockSemaphore, RTL_CRITICAL_SECTION, LockSemaphore), - OFFSET(CsSpinCount, RTL_CRITICAL_SECTION, SpinCount), - - HEADER("RTL_CRITICAL_SECTION_DEBUG"), - OFFSET(CsType, RTL_CRITICAL_SECTION_DEBUG, Type), - OFFSET(CsCreatorBackTraceIndex, RTL_CRITICAL_SECTION_DEBUG, CreatorBackTraceIndex), - OFFSET(CsCriticalSection, RTL_CRITICAL_SECTION_DEBUG, CriticalSection), - OFFSET(CsProcessLocksList, RTL_CRITICAL_SECTION_DEBUG, ProcessLocksList), - OFFSET(CsEntryCount, RTL_CRITICAL_SECTION_DEBUG, EntryCount), - OFFSET(CsContentionCount, RTL_CRITICAL_SECTION_DEBUG, ContentionCount), - - HEADER("KDEVICE_QUEUE_ENTRY"), - OFFSET(DeDeviceListEntry, KDEVICE_QUEUE_ENTRY, DeviceListEntry), - OFFSET(DeSortKey, KDEVICE_QUEUE_ENTRY, SortKey), - OFFSET(DeInserted, KDEVICE_QUEUE_ENTRY, Inserted), - SIZE(DeviceQueueEntryLength, KDEVICE_QUEUE_ENTRY), - - HEADER("KDPC"), - OFFSET(DpType, KDPC, Type), - OFFSET(DpImportance, KDPC, Importance), - OFFSET(DpNumber, KDPC, Number), - OFFSET(DpDpcListEntry, KDPC, DpcListEntry), - OFFSET(DpDeferredRoutine, KDPC, DeferredRoutine), - OFFSET(DpDeferredContext, KDPC, DeferredContext), - OFFSET(DpSystemArgument1, KDPC, SystemArgument1), - OFFSET(DpSystemArgument2, KDPC, SystemArgument2), - OFFSET(DpDpcData, KDPC, DpcData), - SIZE(DpcObjectLength, KDPC), - - HEADER("KDEVICE_QUEUE"), - OFFSET(DvType, KDEVICE_QUEUE, Type), - OFFSET(DvSize, KDEVICE_QUEUE, Size), - OFFSET(DvDeviceListHead, KDEVICE_QUEUE, DeviceListHead), - OFFSET(DvSpinLock, KDEVICE_QUEUE, Lock), - OFFSET(DvBusy, KDEVICE_QUEUE, Busy), - SIZE(DeviceQueueObjectLength, KDEVICE_QUEUE), - - HEADER("EXCEPTION_RECORD"), - OFFSET(ErExceptionCode, EXCEPTION_RECORD, ExceptionCode), - OFFSET(ErExceptionFlags, EXCEPTION_RECORD, ExceptionFlags), - OFFSET(ErExceptionRecord, EXCEPTION_RECORD, ExceptionRecord), - OFFSET(ErExceptionAddress, EXCEPTION_RECORD, ExceptionAddress), - OFFSET(ErNumberParameters, EXCEPTION_RECORD, NumberParameters), - OFFSET(ErExceptionInformation, EXCEPTION_RECORD, ExceptionInformation), - SIZE(ExceptionRecordLength, EXCEPTION_RECORD), - SIZE(EXCEPTION_RECORD_LENGTH, EXCEPTION_RECORD), - - HEADER("EPROCESS"), - OFFSET(EpDebugPort, EPROCESS, DebugPort), - OFFSET(EpVdmObjects, EPROCESS, VdmObjects), - SIZE(ExecutiveProcessObjectLength, EPROCESS), - - HEADER("KEVENT"), - OFFSET(EvType, KEVENT, Header.Type), - OFFSET(EvSize, KEVENT, Header.Size), - OFFSET(EvSignalState, KEVENT, Header.SignalState), - OFFSET(EvWaitListHead, KEVENT, Header.WaitListHead), - SIZE(EventObjectLength, KEVENT), - - HEADER("FAST_MUTEX"), - OFFSET(FmCount, FAST_MUTEX, Count), - OFFSET(FmOwner, FAST_MUTEX, Owner), - OFFSET(FmContention, FAST_MUTEX, Contention), - OFFSET(FmGate, FAST_MUTEX, Gate), - OFFSET(FmOldIrql, FAST_MUTEX, OldIrql), - - HEADER("KINTERRUPT"), - OFFSET(InType, KINTERRUPT, Type), - OFFSET(InSize, KINTERRUPT, Size), - OFFSET(InInterruptListEntry, KINTERRUPT, InterruptListEntry), - OFFSET(InServiceRoutine, KINTERRUPT, ServiceRoutine), - OFFSET(InServiceContext, KINTERRUPT, ServiceContext), - OFFSET(InSpinLock, KINTERRUPT, SpinLock), - OFFSET(InTickCount, KINTERRUPT, TickCount), - OFFSET(InActualLock, KINTERRUPT, ActualLock), - OFFSET(InDispatchAddress, KINTERRUPT, DispatchAddress), - OFFSET(InVector, KINTERRUPT, Vector), - OFFSET(InIrql, KINTERRUPT, Irql), - OFFSET(InSynchronizeIrql, KINTERRUPT, SynchronizeIrql), - OFFSET(InFloatingSave, KINTERRUPT, FloatingSave), - OFFSET(InConnected, KINTERRUPT, Connected), - OFFSET(InNumber, KINTERRUPT, Number), - OFFSET(InShareVector, KINTERRUPT, ShareVector), - OFFSET(InMode, KINTERRUPT, Mode), - OFFSET(InServiceCount, KINTERRUPT, ServiceCount), - OFFSET(InDispatchCount, KINTERRUPT, DispatchCount), -// OFFSET(InTrapFrame, KINTERRUPT, TrapFrame), - OFFSET(InDispatchCode, KINTERRUPT, DispatchCode), - SIZE(InterruptObjectLength, KINTERRUPT), - - HEADER("IO_STATUS_BLOCK"), - OFFSET(IoStatus, IO_STATUS_BLOCK, Status), - OFFSET(IoPointer, IO_STATUS_BLOCK, Pointer), - OFFSET(IoInformation, IO_STATUS_BLOCK, Information), - -#ifdef _M_IX86 -// Kernel Stack Control Structure Offset (relative to initial stack pointer) Definitions -// RELOFFSET(KcPreviousBase, KERNEL_STACK_CONTROL, PreviousBase, ???), -// RELOFFSET(KcPreviousLimit, KERNEL_STACK_CONTROL, PreviousBase, ???), -// RELOFFSET(KcPreviousKernel, KERNEL_STACK_CONTROL, PreviousBase, ???), -// RELOFFSET(KcPreviousInitial, KERNEL_STACK_CONTROL, PreviousBase, ???), -#else - HEADER("KERNEL_STACK_CONTROL"), -// OFFSET(KcPreviousBase, KERNEL_STACK_CONTROL, PreviousBase), -// OFFSET(KcPreviousLimit, KERNEL_STACK_CONTROL, PreviousLimit), -// OFFSET(KcPreviousKernel, KERNEL_STACK_CONTROL, PreviousKernel), -// OFFSET(KcPreviousInitial, KERNEL_STACK_CONTROL, PreviousInitial), -// SIZE(KERNEL_STACK_CONTROL_LENGTH, KERNEL_STACK_CONTROL), -#endif - - HEADER("KNODE"), -// OFFSET(KnRight, KNODE, Right), -// OFFSET(KnLeft, KNODE, Left), - OFFSET(KnPfnDereferenceSListHead, KNODE, PfnDereferenceSListHead), - OFFSET(KnProcessorMask, KNODE, ProcessorMask), - OFFSET(KnColor, KNODE, Color), - OFFSET(KnSeed, KNODE, Seed), - OFFSET(KnNodeNumber, KNODE, NodeNumber), - OFFSET(KnFlags, KNODE, Flags), - OFFSET(knMmShiftedColor, KNODE, MmShiftedColor), - OFFSET(KnFreeCount, KNODE, FreeCount), - OFFSET(KnPfnDeferredList, KNODE, PfnDeferredList), - SIZE(KNODE_SIZE, KNODE), - - HEADER("KSPIN_LOCK_QUEUE"), - OFFSET(LqNext, KSPIN_LOCK_QUEUE, Next), - OFFSET(LqLock, KSPIN_LOCK_QUEUE, Lock), - - HEADER("KLOCK_QUEUE_HANDLE"), - OFFSET(LqhNext, KLOCK_QUEUE_HANDLE, LockQueue.Next), - OFFSET(LqhLock, KLOCK_QUEUE_HANDLE, LockQueue.Lock), - OFFSET(LqhOldIrql, KLOCK_QUEUE_HANDLE, OldIrql), - SIZE(LOCK_QUEUE_HEADER_SIZE, KLOCK_QUEUE_HANDLE), - - HEADER("LARGE_INTEGER"), - OFFSET(LiLowPart, LARGE_INTEGER, LowPart), - OFFSET(LiHighPart, LARGE_INTEGER, HighPart), -#if 0 - HEADER("LOADER_PARAMETER_BLOCK (rel. to LoadOrderListHead)"), - RELOFFSET(LpbLoadOrderListHead, LOADER_PARAMETER_BLOCK, LoadOrderListHead, LoadOrderListHead), - RELOFFSET(LpbMemoryDescriptorListHead, LOADER_PARAMETER_BLOCK, MemoryDescriptorListHead, LoadOrderListHead), - RELOFFSET(LpbKernelStack, LOADER_PARAMETER_BLOCK, KernelStack, LoadOrderListHead), - RELOFFSET(LpbPrcb, LOADER_PARAMETER_BLOCK, Prcb, LoadOrderListHead), - RELOFFSET(LpbProcess, LOADER_PARAMETER_BLOCK, Process, LoadOrderListHead), - RELOFFSET(LpbThread, LOADER_PARAMETER_BLOCK, Thread, LoadOrderListHead), - RELOFFSET(LpbI386, LOADER_PARAMETER_BLOCK, u.I386, LoadOrderListHead), - RELOFFSET(LpbRegistryLength, LOADER_PARAMETER_BLOCK, RegistryLength, LoadOrderListHead), - RELOFFSET(LpbRegistryBase, LOADER_PARAMETER_BLOCK, RegistryBase, LoadOrderListHead), - RELOFFSET(LpbConfigurationRoot, LOADER_PARAMETER_BLOCK, ConfigurationRoot, LoadOrderListHead), - RELOFFSET(LpbArcBootDeviceName, LOADER_PARAMETER_BLOCK, ArcBootDeviceName, LoadOrderListHead), - RELOFFSET(LpbArcHalDeviceName, LOADER_PARAMETER_BLOCK, ArcHalDeviceName, LoadOrderListHead), - RELOFFSET(LpbLoadOptions, LOADER_PARAMETER_BLOCK, LoadOptions, LoadOrderListHead), - RELOFFSET(LpbExtension, LOADER_PARAMETER_BLOCK, Extension, LoadOrderListHead), -#endif - - HEADER("LIST_ENTRY"), - OFFSET(LsFlink, LIST_ENTRY, Flink), - OFFSET(LsBlink, LIST_ENTRY, Blink), - - HEADER("PEB"), - OFFSET(PeKernelCallbackTable, PEB, KernelCallbackTable), - SIZE(ProcessEnvironmentBlockLength, PEB), - - HEADER("KPROFILE"), - OFFSET(PfType, KPROFILE, Type), - OFFSET(PfSize, KPROFILE, Size), - OFFSET(PfProfileListEntry, KPROFILE, ProfileListEntry), - OFFSET(PfProcess, KPROFILE, Process), - OFFSET(PfRangeBase, KPROFILE, RangeBase), - OFFSET(PfRangeLimit, KPROFILE, RangeLimit), - OFFSET(PfBucketShift, KPROFILE, BucketShift), - OFFSET(PfBuffer, KPROFILE, Buffer), - OFFSET(PfSegment, KPROFILE, Segment), - OFFSET(PfAffinity, KPROFILE, Affinity), - OFFSET(PfSource, KPROFILE, Source), - OFFSET(PfStarted, KPROFILE, Started), - SIZE(ProfileObjectLength, KPROFILE), - - HEADER("PORT_MESSAGE"), - OFFSET(PmLength, PORT_MESSAGE, u1.Length), - OFFSET(PmZeroInit, PORT_MESSAGE, u2.ZeroInit), - OFFSET(PmClientId, PORT_MESSAGE, ClientId), - OFFSET(PmProcess, PORT_MESSAGE, ClientId.UniqueProcess), - OFFSET(PmThread, PORT_MESSAGE, ClientId.UniqueThread), - OFFSET(PmMessageId, PORT_MESSAGE, MessageId), - OFFSET(PmClientViewSize, PORT_MESSAGE, ClientViewSize), - SIZE(PortMessageLength, PORT_MESSAGE), - - HEADER("KPROCESS"), - OFFSET(PrType, KPROCESS, Header.Type), - OFFSET(PrSize, KPROCESS, Header.Size), - OFFSET(PrSignalState, KPROCESS, Header.SignalState), - OFFSET(PrProfileListHead, KPROCESS, ProfileListHead), - OFFSET(PrDirectoryTableBase, KPROCESS, DirectoryTableBase), -#ifdef _M_IX86 - OFFSET(PrLdtDescriptor, KPROCESS, LdtDescriptor), -#endif - OFFSET(PrIopmOffset, KPROCESS, IopmOffset), -#ifdef _M_IX86 - OFFSET(PrInt21Descriptor, KPROCESS, Int21Descriptor), - OFFSET(PrVdmTrapcHandler, KPROCESS, VdmTrapcHandler), -// OFFSET(PrVdmObjects, KPROCESS, VdmObjects), - OFFSET(PrFlags, KPROCESS, Flags), -#endif -// OFFSET(PrInstrumentationCallback, KPROCESS, InstrumentationCallback), - OFFSET(PrActiveProcessors, KPROCESS, ActiveProcessors), - OFFSET(PrKernelTime, KPROCESS, KernelTime), - OFFSET(PrUserTime, KPROCESS, UserTime), - OFFSET(PrReadyListHead, KPROCESS, ReadyListHead), - OFFSET(PrSwapListEntry, KPROCESS, SwapListEntry), - OFFSET(PrThreadListHead, KPROCESS, ThreadListHead), - OFFSET(PrProcessLock, KPROCESS, ProcessLock), - OFFSET(PrAffinity, KPROCESS, Affinity), - OFFSET(PrProcessFlags, KPROCESS, ProcessFlags), - OFFSET(PrBasePriority, KPROCESS, BasePriority), - OFFSET(PrQuantumReset, KPROCESS, QuantumReset), - OFFSET(PrState, KPROCESS, State), - OFFSET(PrStackCount, KPROCESS, StackCount), -#if (NTDDI_VERSION >= NTDDI_LONGHORN) - OFFSET(PrCycleTime, KPROCESS, CycleTime), -#endif - SIZE(KernelProcessObjectLength, KPROCESS), - - HEADER("KQUEUE"), - OFFSET(QuType, KQUEUE, Header.Type), - OFFSET(QuSize, KQUEUE, Header.Size), - OFFSET(QuSignalState, KQUEUE, Header.SignalState), - OFFSET(QuEntryListHead, KQUEUE, EntryListHead), - OFFSET(QuCurrentCount, KQUEUE, CurrentCount), - OFFSET(QuMaximumCount, KQUEUE, MaximumCount), - OFFSET(QuThreadListHead, KQUEUE, ThreadListHead), - SIZE(QueueObjectLength, KQUEUE), - - HEADER("STRING"), - OFFSET(StrLength, STRING, Length), - OFFSET(StrMaximumLength, STRING, MaximumLength), - OFFSET(StrBuffer, STRING, Buffer), - - HEADER("TEB"), - OFFSET(TeCmTeb, TEB, Tib), -#ifdef _M_IX86 - OFFSET(TeExceptionList, TEB, Tib.ExceptionList), -#endif - OFFSET(TeStackBase, TEB, Tib.StackBase), - OFFSET(TeStackLimit, TEB, Tib.StackLimit), - OFFSET(TeFiberData, TEB, Tib.FiberData), - OFFSET(TeSelf, TEB, Tib.Self), - OFFSET(TeEnvironmentPointer, TEB, EnvironmentPointer), - OFFSET(TeClientId, TEB, ClientId), - OFFSET(TeActiveRpcHandle, TEB, ActiveRpcHandle), - OFFSET(TeThreadLocalStoragePointer, TEB, ThreadLocalStoragePointer), - OFFSET(TeCountOfOwnedCriticalSections, TEB, CountOfOwnedCriticalSections), - OFFSET(TePeb, TEB, ProcessEnvironmentBlock), - OFFSET(TeCsrClientThread, TEB, CsrClientThread), - OFFSET(TeWOW32Reserved, TEB, WOW32Reserved), -// OFFSET(TeSoftFpcr, TEB, SoftFpcr), - OFFSET(TeExceptionCode, TEB, ExceptionCode), - OFFSET(TeActivationContextStackPointer, TEB, ActivationContextStackPointer), - OFFSET(TeGdiClientPID, TEB, GdiClientPID), - OFFSET(TeGdiClientTID, TEB, GdiClientTID), - OFFSET(TeGdiThreadLocalInfo, TEB, GdiThreadLocalInfo), - OFFSET(TeglDispatchTable, TEB, glDispatchTable), - OFFSET(TeglReserved1, TEB, glReserved1), - OFFSET(TeglReserved2, TEB, glReserved2), - OFFSET(TeglSectionInfo, TEB, glSectionInfo), - OFFSET(TeglSection, TEB, glSection), - OFFSET(TeglTable, TEB, glTable), - OFFSET(TeglCurrentRC, TEB, glCurrentRC), - OFFSET(TeglContext, TEB, glContext), - OFFSET(TeDeallocationStack, TEB, DeallocationStack), - OFFSET(TeTlsSlots, TEB, TlsSlots), - OFFSET(TeTlsExpansionSlots, TEB, TlsExpansionSlots), - OFFSET(TeLastErrorValue, TEB, LastErrorValue), - OFFSET(TeVdm, TEB, Vdm), - OFFSET(TeInstrumentation, TEB, Instrumentation), - OFFSET(TeGdiBatchCount, TEB, GdiBatchCount), - OFFSET(TeGuaranteedStackBytes, TEB, GuaranteedStackBytes), - OFFSET(TeFlsData, TEB, FlsData), -// OFFSET(TeProcessRundown, TEB, ProcessRundown), - SIZE(ThreadEnvironmentBlockLength, TEB), - - HEADER("TIME_FIELDS"), - OFFSET(TfSecond, TIME_FIELDS, Second), - OFFSET(TfMinute, TIME_FIELDS, Minute), - OFFSET(TfHour, TIME_FIELDS, Hour), - OFFSET(TfWeekday, TIME_FIELDS, Weekday), - OFFSET(TfDay, TIME_FIELDS, Day), - OFFSET(TfMonth, TIME_FIELDS, Month), - OFFSET(TfYear, TIME_FIELDS, Year), - OFFSET(TfMilliseconds, TIME_FIELDS, Milliseconds), - - HEADER("KTHREAD"), - OFFSET(ThType, KTHREAD, DispatcherHeader.Type), -// OFFSET(ThNpxIrql, KTHREAD, NpxIrql), - OFFSET(ThSize, KTHREAD, DispatcherHeader.Size), - OFFSET(ThLock, KTHREAD, DispatcherHeader.Lock), - OFFSET(ThDebugActive, KTHREAD, DispatcherHeader.DebugActive), -// OFFSET(ThThreadControlFlags, KTHREAD, DispatcherHeader.ThreadControlFlags), - OFFSET(ThSignalState, KTHREAD, DispatcherHeader.SignalState), -#if (NTDDI_VERSION >= NTDDI_LONGHORN) - OFFSET(ThCycleTime, KTHREAD, CycleTime), - OFFSET(ThHighCycleTime, KTHREAD, HighCycleTime), -#endif - OFFSET(ThInitialStack, KTHREAD, InitialStack), - OFFSET(ThStackLimit, KTHREAD, StackLimit), - OFFSET(ThKernelStack, KTHREAD, KernelStack), - OFFSET(ThThreadLock, KTHREAD, ThreadLock), -// OFFSET(ThRunning, KTHREAD, Running), - OFFSET(ThAlerted, KTHREAD, Alerted), -// OFFSET(ThMiscFlags, KTHREAD, MiscFlags), - OFFSET(ThApcState, KTHREAD, ApcState), - OFFSET(ThPriority, KTHREAD, Priority), - OFFSET(ThSwapBusy, KTHREAD, SwapBusy), - OFFSET(ThNextProcessor, KTHREAD, NextProcessor), - OFFSET(ThDeferredProcessor, KTHREAD, DeferredProcessor), - OFFSET(ThApcQueueLock, KTHREAD, ApcQueueLock), - OFFSET(ThContextSwitches, KTHREAD, ContextSwitches), - OFFSET(ThState, KTHREAD, State), - OFFSET(ThNpxState, KTHREAD, NpxState), - OFFSET(ThWaitIrql, KTHREAD, WaitIrql), - OFFSET(ThWaitMode, KTHREAD, WaitMode), - OFFSET(ThWaitStatus, KTHREAD, WaitStatus), - OFFSET(ThWaitBlockList, KTHREAD, WaitBlockList), - OFFSET(ThGateObject, KTHREAD, GateObject), - OFFSET(ThWaitListEntry, KTHREAD, WaitListEntry), - OFFSET(ThSwapListEntry, KTHREAD, SwapListEntry), - OFFSET(ThQueue, KTHREAD, Queue), - OFFSET(ThWaitTime, KTHREAD, WaitTime), - OFFSET(ThCombinedApcDisable, KTHREAD, CombinedApcDisable), - OFFSET(ThKernelApcDisable, KTHREAD, KernelApcDisable), - OFFSET(ThSpecialApcDisable, KTHREAD, SpecialApcDisable), - OFFSET(ThTeb, KTHREAD, Teb), - OFFSET(ThTimer, KTHREAD, Timer), - OFFSET(ThThreadFlags, KTHREAD, ThreadFlags), - OFFSET(ThServiceTable, KTHREAD, ServiceTable), - OFFSET(ThWaitBlock, KTHREAD, WaitBlock), - OFFSET(ThResourceIndex, KTHREAD, ResourceIndex), - OFFSET(ThQueueListEntry, KTHREAD, QueueListEntry), - OFFSET(ThTrapFrame, KTHREAD, TrapFrame), -#if (NTDDI_VERSION >= NTDDI_LONGHORN) - OFFSET(ThFirstArgument, KTHREAD, FirstArgument), -#endif - OFFSET(ThCallbackStack, KTHREAD, CallbackStack), -// OFFSET(ThCallbackDepth, KTHREAD, CallbackDepth), - OFFSET(ThApcStateIndex, KTHREAD, ApcStateIndex), - OFFSET(ThIdealProcessor, KTHREAD, IdealProcessor), - OFFSET(ThBasePriority, KTHREAD, BasePriority), - OFFSET(ThPriorityDecrement, KTHREAD, PriorityDecrement), - OFFSET(ThAdjustReason, KTHREAD, AdjustReason), - OFFSET(ThAdjustIncrement, KTHREAD, AdjustIncrement), - OFFSET(ThPreviousMode, KTHREAD, PreviousMode), - OFFSET(ThSaturation, KTHREAD, Saturation), -#if (NTDDI_VERSION >= NTDDI_LONGHORN) - OFFSET(ThSystemCallNumber, KTHREAD, SystemCallNumber), -#endif - OFFSET(ThFreezeCount, KTHREAD, FreezeCount), - OFFSET(ThUserAffinity, KTHREAD, UserAffinity), - OFFSET(ThProcess, KTHREAD, Process), - OFFSET(ThAffinity, KTHREAD, Affinity), - OFFSET(ThUserIdealProcessor, KTHREAD, UserIdealProcessor), - OFFSET(ThApcStatePointer, KTHREAD, ApcStatePointer), - OFFSET(ThSavedApcState, KTHREAD, SavedApcState), - OFFSET(ThWaitReason, KTHREAD, WaitReason), - OFFSET(ThSuspendCount, KTHREAD, SuspendCount), -// OFFSET(ThCodePatchInProgress, KTHREAD, CodePatchInProgress), - OFFSET(ThWin32Thread, KTHREAD, Win32Thread), - OFFSET(ThStackBase, KTHREAD, StackBase), - OFFSET(ThSuspendApc, KTHREAD, SuspendApc), - OFFSET(ThPowerState, KTHREAD, PowerState), - OFFSET(ThKernelTime, KTHREAD, KernelTime), - OFFSET(ThLegoData, KTHREAD, LegoData), - OFFSET(ThLargeStack, KTHREAD, LargeStack), - OFFSET(ThUserTime, KTHREAD, UserTime), - OFFSET(ThSuspendSemaphore, KTHREAD, SuspendSemaphore), - OFFSET(ThSListFaultCount, KTHREAD, SListFaultCount), - OFFSET(ThThreadListEntry, KTHREAD, ThreadListEntry), - OFFSET(ThMutantListHead, KTHREAD, MutantListHead), - OFFSET(ThSListFaultAddress, KTHREAD, SListFaultAddress), - SIZE(KernelThreadObjectLength, KTHREAD), - SIZE(ExecutiveThreadObjectLength, ETHREAD), - - HEADER("KTIMER"), - OFFSET(TiType, KTIMER, Header.Type), - OFFSET(TiSize, KTIMER, Header.Size), - OFFSET(TiInserted, KTIMER, Header.Inserted), - OFFSET(TiSignalState, KTIMER, Header.SignalState), - OFFSET(TiDueTime, KTIMER, DueTime), - OFFSET(TiTimerListEntry, KTIMER, TimerListEntry), - OFFSET(TiDpc, KTIMER, Dpc), - OFFSET(TiPeriod, KTIMER, Period), - SIZE(TimerObjectLength, KTIMER), - - HEADER("TIME"), -// OFFSET(TmLowTime, TIME, LowTime), -// OFFSET(TmHighTime, TIME, HighTime), - -#if 0 - HEADER("SYSTEM_CONTEXT_SWITCH_INFORMATION (relative to FindAny)"), - RELOFFSET(TwFindAny, SYSTEM_CONTEXT_SWITCH_INFORMATION, FindAny, FindAny), - RELOFFSET(TwFindIdeal, SYSTEM_CONTEXT_SWITCH_INFORMATION, FindIdeal, FindAny), - RELOFFSET(TwFindLast, SYSTEM_CONTEXT_SWITCH_INFORMATION, FindLast, FindAny), - RELOFFSET(TwIdleAny, SYSTEM_CONTEXT_SWITCH_INFORMATION, IdleAny, FindAny), - RELOFFSET(TwIdleCurrent, SYSTEM_CONTEXT_SWITCH_INFORMATION, IdleCurrent, FindAny), - RELOFFSET(TwIdleIdeal, SYSTEM_CONTEXT_SWITCH_INFORMATION, IdleIdeal, FindAny), - RELOFFSET(TwIdleLast, SYSTEM_CONTEXT_SWITCH_INFORMATION, IdleLast, FindAny), - RELOFFSET(TwPreemptAny, SYSTEM_CONTEXT_SWITCH_INFORMATION, PreemptAny, FindAny), - RELOFFSET(TwPreemptCurrent, SYSTEM_CONTEXT_SWITCH_INFORMATION, PreemptCurrent, FindAny), - RELOFFSET(TwPreemptLast, SYSTEM_CONTEXT_SWITCH_INFORMATION, PreemptLast, FindAny), - RELOFFSET(TwSwitchToIdle, SYSTEM_CONTEXT_SWITCH_INFORMATION, SwitchToIdle, FindAny), -#endif - - HEADER("KUSER_SHARED_DATA"), - OFFSET(UsTickCountMultiplier, KUSER_SHARED_DATA, TickCountMultiplier), - OFFSET(UsInterruptTime, KUSER_SHARED_DATA, InterruptTime), - OFFSET(UsSystemTime, KUSER_SHARED_DATA, SystemTime), - OFFSET(UsTimeZoneBias, KUSER_SHARED_DATA, TimeZoneBias), - OFFSET(UsImageNumberLow, KUSER_SHARED_DATA, ImageNumberLow), - OFFSET(UsImageNumberHigh, KUSER_SHARED_DATA, ImageNumberHigh), - OFFSET(UsNtSystemRoot, KUSER_SHARED_DATA, NtSystemRoot), - OFFSET(UsMaxStackTraceDepth, KUSER_SHARED_DATA, MaxStackTraceDepth), - OFFSET(UsCryptoExponent, KUSER_SHARED_DATA, CryptoExponent), - OFFSET(UsTimeZoneId, KUSER_SHARED_DATA, TimeZoneId), - OFFSET(UsLargePageMinimum, KUSER_SHARED_DATA, LargePageMinimum), - OFFSET(UsReserved2, KUSER_SHARED_DATA, Reserved2), - OFFSET(UsNtProductType, KUSER_SHARED_DATA, NtProductType), - OFFSET(UsProductTypeIsValid, KUSER_SHARED_DATA, ProductTypeIsValid), - OFFSET(UsNtMajorVersion, KUSER_SHARED_DATA, NtMajorVersion), - OFFSET(UsNtMinorVersion, KUSER_SHARED_DATA, NtMinorVersion), - OFFSET(UsProcessorFeatures, KUSER_SHARED_DATA, ProcessorFeatures), - OFFSET(UsReserved1, KUSER_SHARED_DATA, Reserved1), - OFFSET(UsReserved3, KUSER_SHARED_DATA, Reserved3), - OFFSET(UsTimeSlip, KUSER_SHARED_DATA, TimeSlip), - OFFSET(UsAlternativeArchitecture, KUSER_SHARED_DATA, AlternativeArchitecture), - OFFSET(UsSystemExpirationDate, KUSER_SHARED_DATA, SystemExpirationDate), - OFFSET(UsSuiteMask, KUSER_SHARED_DATA, SuiteMask), - OFFSET(UsKdDebuggerEnabled, KUSER_SHARED_DATA, KdDebuggerEnabled), - OFFSET(UsActiveConsoleId, KUSER_SHARED_DATA, ActiveConsoleId), - OFFSET(UsDismountCount, KUSER_SHARED_DATA, DismountCount), - OFFSET(UsComPlusPackage, KUSER_SHARED_DATA, ComPlusPackage), - OFFSET(UsLastSystemRITEventTickCount, KUSER_SHARED_DATA, LastSystemRITEventTickCount), - OFFSET(UsNumberOfPhysicalPages, KUSER_SHARED_DATA, NumberOfPhysicalPages), - OFFSET(UsSafeBootMode, KUSER_SHARED_DATA, SafeBootMode), -// OFFSET(UsTscQpcData, KUSER_SHARED_DATA, TscQpcData), - OFFSET(UsTestRetInstruction, KUSER_SHARED_DATA, TestRetInstruction), - OFFSET(UsSystemCall, KUSER_SHARED_DATA, SystemCall), - OFFSET(UsSystemCallReturn, KUSER_SHARED_DATA, SystemCallReturn), - OFFSET(UsSystemCallPad, KUSER_SHARED_DATA, SystemCallPad), - OFFSET(UsTickCount, KUSER_SHARED_DATA, TickCount), - OFFSET(UsTickCountQuad, KUSER_SHARED_DATA, TickCountQuad), - OFFSET(UsWow64SharedInformation, KUSER_SHARED_DATA, Wow64SharedInformation), - - HEADER("KWAIT_BLOCK"), - OFFSET(WbWaitListEntry, KWAIT_BLOCK, WaitListEntry), - OFFSET(WbThread, KWAIT_BLOCK, Thread), - OFFSET(WbObject, KWAIT_BLOCK, Object), - OFFSET(WbNextWaitBlock, KWAIT_BLOCK, NextWaitBlock), - OFFSET(WbWaitKey, KWAIT_BLOCK, WaitKey), - OFFSET(WbWaitType, KWAIT_BLOCK, WaitType), - -#if defined(_M_IX86) - - HEADER("CONTEXT"), - OFFSET(CsContextFlags, CONTEXT, ContextFlags), - OFFSET(CsDr0, CONTEXT, Dr0), - OFFSET(CsDr1, CONTEXT, Dr1), - OFFSET(CsDr2, CONTEXT, Dr2), - OFFSET(CsDr3, CONTEXT, Dr3), - OFFSET(CsDr6, CONTEXT, Dr6), - OFFSET(CsDr7, CONTEXT, Dr7), - OFFSET(CsFloatSave, CONTEXT, FloatSave), - OFFSET(CsSegGs, CONTEXT, SegGs), - OFFSET(CsSegFs, CONTEXT, SegFs), - OFFSET(CsSegEs, CONTEXT, SegEs), - OFFSET(CsSegDs, CONTEXT, SegDs), - OFFSET(CsEdi, CONTEXT, Edi), - OFFSET(CsEsi, CONTEXT, Esi), - OFFSET(CsEbx, CONTEXT, Ebx), - OFFSET(CsEdx, CONTEXT, Edx), - OFFSET(CsEcx, CONTEXT, Ecx), - OFFSET(CsEax, CONTEXT, Eax), - OFFSET(CsEbp, CONTEXT, Ebp), - OFFSET(CsEip, CONTEXT, Eip), - OFFSET(CsSegCs, CONTEXT, SegCs), - OFFSET(CsEflags, CONTEXT, EFlags), - OFFSET(CsEsp, CONTEXT, Esp), - OFFSET(CsSegSs, CONTEXT, SegSs), - OFFSET(CsExtendedRegisters, CONTEXT, ExtendedRegisters), - SIZE(ContextFrameLength, CONTEXT), - SIZE(CONTEXT_LENGTH, CONTEXT), - - HEADER("KGDTENTRY"), - OFFSET(KgdtBaseLow, KGDTENTRY, BaseLow), - OFFSET(KgdtBaseMid, KGDTENTRY, HighWord.Bytes.BaseMid), - OFFSET(KgdtBaseHi, KGDTENTRY, HighWord.Bytes.BaseHi), - OFFSET(KgdtLimitHi, KGDTENTRY, HighWord.Bytes.Flags2), - OFFSET(KgdtLimitLow, KGDTENTRY, LimitLow), - - HEADER("KTRAP_FRAME"), - OFFSET(TsExceptionList, KTRAP_FRAME, ExceptionList), - OFFSET(TsPreviousPreviousMode, KTRAP_FRAME, PreviousPreviousMode), - OFFSET(TsSegGs, KTRAP_FRAME, SegGs), - OFFSET(TsSegFs, KTRAP_FRAME, SegFs), - OFFSET(TsSegEs, KTRAP_FRAME, SegEs), - OFFSET(TsSegDs, KTRAP_FRAME, SegDs), - OFFSET(TsEdi, KTRAP_FRAME, Edi), - OFFSET(TsEsi, KTRAP_FRAME, Esi), - OFFSET(TsEbp, KTRAP_FRAME, Ebp), - OFFSET(TsEbx, KTRAP_FRAME, Ebx), - OFFSET(TsEdx, KTRAP_FRAME, Edx), - OFFSET(TsEcx, KTRAP_FRAME, Ecx), - OFFSET(TsEax, KTRAP_FRAME, Eax), - OFFSET(TsErrCode, KTRAP_FRAME, ErrCode), - OFFSET(TsEip, KTRAP_FRAME, Eip), - OFFSET(TsSegCs, KTRAP_FRAME, SegCs), - OFFSET(TsEflags, KTRAP_FRAME, EFlags), - OFFSET(TsHardwareEsp, KTRAP_FRAME, HardwareEsp), - OFFSET(TsHardwareSegSs, KTRAP_FRAME, HardwareSegSs), - OFFSET(TsTempSegCs, KTRAP_FRAME, TempSegCs), -// OFFSET(TsLogging, KTRAP_FRAME, Logging), - OFFSET(TsTempEsp, KTRAP_FRAME, TempEsp), - OFFSET(TsDbgEbp, KTRAP_FRAME, DbgEbp), - OFFSET(TsDbgEip, KTRAP_FRAME, DbgEip), - OFFSET(TsDbgArgMark, KTRAP_FRAME, DbgArgMark), - OFFSET(TsDbgArgPointer, KTRAP_FRAME, DbgArgPointer), - OFFSET(TsDr0, KTRAP_FRAME, Dr0), - OFFSET(TsDr1, KTRAP_FRAME, Dr1), - OFFSET(TsDr2, KTRAP_FRAME, Dr2), - OFFSET(TsDr3, KTRAP_FRAME, Dr3), - OFFSET(TsDr6, KTRAP_FRAME, Dr6), - OFFSET(TsDr7, KTRAP_FRAME, Dr7), - OFFSET(TsV86Es, KTRAP_FRAME, V86Es), - OFFSET(TsV86Ds, KTRAP_FRAME, V86Ds), - OFFSET(TsV86Fs, KTRAP_FRAME, V86Fs), - OFFSET(TsV86Gs, KTRAP_FRAME, V86Gs), - SIZE(KTRAP_FRAME_LENGTH, KTRAP_FRAME), - CONSTANT(KTRAP_FRAME_ALIGN), - CONSTANT(FRAME_EDITED), - - HEADER("KTSS"), - OFFSET(TssEsp0, KTSS, Esp0), - OFFSET(TssCR3, KTSS, CR3), - OFFSET(TssEip, KTSS, Eip), - OFFSET(TssEFlags, KTSS, EFlags), - OFFSET(TssEax, KTSS, Eax), - OFFSET(TssEbx, KTSS, Ebx), - OFFSET(TssEcx, KTSS, Ecx), - OFFSET(TssEdx, KTSS, Edx), - OFFSET(TssEsp, KTSS, Esp), - OFFSET(TssEbp, KTSS, Ebp), - OFFSET(TssEsi, KTSS, Esi), - OFFSET(TssEdi, KTSS, Edi), - OFFSET(TssEs, KTSS, Es), - OFFSET(TssCs, KTSS, Cs), - OFFSET(TssSs, KTSS, Ss), - OFFSET(TssDs, KTSS, Ds), - OFFSET(TssFs, KTSS, Fs), - OFFSET(TssGs, KTSS, Gs), - OFFSET(TssLDT, KTSS, LDT), - OFFSET(TssIoMapBase, KTSS, IoMapBase), - OFFSET(TssIoMaps, KTSS, IoMaps), - SIZE(TssLength, KTSS), - -#elif defined(_M_AMD64) - - HEADER("Argument Home Address"), - OFFSET(P1Home, CONTEXT, P1Home), - OFFSET(P2Home, CONTEXT, P1Home), - OFFSET(P3Home, CONTEXT, P1Home), - OFFSET(P4Home, CONTEXT, P1Home), - - HEADER("CONTEXT"), - OFFSET(CxP1Home, CONTEXT, P1Home), - OFFSET(CxP2Home, CONTEXT, P2Home), - OFFSET(CxP3Home, CONTEXT, P3Home), - OFFSET(CxP4Home, CONTEXT, P4Home), - OFFSET(CxP5Home, CONTEXT, P5Home), - OFFSET(CxP6Home, CONTEXT, P6Home), - OFFSET(CxContextFlags, CONTEXT, ContextFlags), - OFFSET(CxMxCsr, CONTEXT, MxCsr), - OFFSET(CxSegCs, CONTEXT, SegCs), - OFFSET(CxSegDs, CONTEXT, SegDs), - OFFSET(CxSegEs, CONTEXT, SegEs), - OFFSET(CxSegFs, CONTEXT, SegFs), - OFFSET(CxSegGs, CONTEXT, SegGs), - OFFSET(CxSegSs, CONTEXT, SegSs), - OFFSET(CxEFlags, CONTEXT, EFlags), - OFFSET(CxDr0, CONTEXT, Dr0), - OFFSET(CxDr1, CONTEXT, Dr1), - OFFSET(CxDr2, CONTEXT, Dr2), - OFFSET(CxDr3, CONTEXT, Dr3), - OFFSET(CxDr6, CONTEXT, Dr6), - OFFSET(CxDr7, CONTEXT, Dr7), - OFFSET(CxRax, CONTEXT, Rax), - OFFSET(CxRcx, CONTEXT, Rcx), - OFFSET(CxRdx, CONTEXT, Rdx), - OFFSET(CxRbx, CONTEXT, Rbx), - OFFSET(CxRsp, CONTEXT, Rsp), - OFFSET(CxRbp, CONTEXT, Rbp), - OFFSET(CxRsi, CONTEXT, Rsi), - OFFSET(CxRdi, CONTEXT, Rdi), - OFFSET(CxR8, CONTEXT, R8), - OFFSET(CxR9, CONTEXT, R9), - OFFSET(CxR10, CONTEXT, R10), - OFFSET(CxR11, CONTEXT, R11), - OFFSET(CxR12, CONTEXT, R12), - OFFSET(CxR13, CONTEXT, R13), - OFFSET(CxR14, CONTEXT, R14), - OFFSET(CxR15, CONTEXT, R15), - OFFSET(CxRip, CONTEXT, Rip), - OFFSET(CxFltSave, CONTEXT, FltSave), - OFFSET(CxXmm0, CONTEXT, Xmm0), - OFFSET(CxXmm1, CONTEXT, Xmm1), - OFFSET(CxXmm2, CONTEXT, Xmm2), - OFFSET(CxXmm3, CONTEXT, Xmm3), - OFFSET(CxXmm4, CONTEXT, Xmm4), - OFFSET(CxXmm5, CONTEXT, Xmm5), - OFFSET(CxXmm6, CONTEXT, Xmm6), - OFFSET(CxXmm7, CONTEXT, Xmm7), - OFFSET(CxXmm8, CONTEXT, Xmm8), - OFFSET(CxXmm9, CONTEXT, Xmm9), - OFFSET(CxXmm10, CONTEXT, Xmm10), - OFFSET(CxXmm11, CONTEXT, Xmm11), - OFFSET(CxXmm12, CONTEXT, Xmm12), - OFFSET(CxXmm13, CONTEXT, Xmm13), - OFFSET(CxXmm14, CONTEXT, Xmm14), - OFFSET(CxXmm15, CONTEXT, Xmm15), - OFFSET(CxDebugControl, CONTEXT, DebugControl), - OFFSET(CxLastBranchToRip, CONTEXT, LastBranchToRip), - OFFSET(CxLastBranchFromRip, CONTEXT, LastBranchFromRip), - OFFSET(CxLastExceptionToRip, CONTEXT, LastExceptionToRip), - OFFSET(CxLastExceptionFromRip, CONTEXT, LastExceptionFromRip), - OFFSET(CxVectorControl, CONTEXT, VectorControl), - OFFSET(CxVectorRegister, CONTEXT, VectorRegister), - SIZE(CONTEXT_FRAME_LENGTH, CONTEXT), - - HEADER("DISPATCHER_CONTEXT"), - OFFSET(DcControlPc, TYPE, ControlPc), - OFFSET(DcImageBase, TYPE, ImageBase), - OFFSET(DcFunctionEntry, TYPE, FunctionEntry), - OFFSET(DcEstablisherFrame, TYPE, EstablisherFrame), - OFFSET(DcTargetIp, TYPE, TargetIp), - OFFSET(DcContextRecord, TYPE, ContextRecord), - OFFSET(DcLanguageHandler, TYPE, LanguageHandler), - OFFSET(DcHandlerData, TYPE, HandlerData), - OFFSET(DcHistoryTable, TYPE, HistoryTable), - OFFSET(DcScopeIndex, TYPE, ScopeIndex), - - HEADER("KEXCEPTION_FRAME"), - OFFSET(ExP1Home, KEXCEPTION_FRAME, P1Home), - OFFSET(ExP2Home, KEXCEPTION_FRAME, P2Home), - OFFSET(ExP3Home, KEXCEPTION_FRAME, P3Home), - OFFSET(ExP4Home, KEXCEPTION_FRAME, P4Home), - OFFSET(ExP5, KEXCEPTION_FRAME, P5), - OFFSET(ExXmm6, KEXCEPTION_FRAME, Xmm6), - OFFSET(ExXmm7, KEXCEPTION_FRAME, Xmm7), - OFFSET(ExXmm8, KEXCEPTION_FRAME, Xmm8), - OFFSET(ExXmm9, KEXCEPTION_FRAME, Xmm9), - OFFSET(ExXmm10, KEXCEPTION_FRAME, Xmm10), - OFFSET(ExXmm11, KEXCEPTION_FRAME, Xmm11), - OFFSET(ExXmm12, KEXCEPTION_FRAME, Xmm12), - OFFSET(ExXmm13, KEXCEPTION_FRAME, Xmm13), - OFFSET(ExXmm14, KEXCEPTION_FRAME, Xmm14), - OFFSET(ExXmm15, KEXCEPTION_FRAME, Xmm15), - OFFSET(ExMxCsr, KEXCEPTION_FRAME, MxCsr), - OFFSET(ExRbp, KEXCEPTION_FRAME, Rbp), - OFFSET(ExRbx, KEXCEPTION_FRAME, Rbx), - OFFSET(ExRdi, KEXCEPTION_FRAME, Rdi), - OFFSET(ExRsi, KEXCEPTION_FRAME, Rsi), - OFFSET(ExR12, KEXCEPTION_FRAME, R12), - OFFSET(ExR13, KEXCEPTION_FRAME, R13), - OFFSET(ExR14, KEXCEPTION_FRAME, R14), - OFFSET(ExR15, KEXCEPTION_FRAME, R15), - OFFSET(ExReturn, KEXCEPTION_FRAME, Return), - OFFSET(CuInitialStack, KEXCEPTION_FRAME, InitialStack), - OFFSET(CuTrapFrame, KEXCEPTION_FRAME, TrapFrame), - OFFSET(CuCallbackStack, KEXCEPTION_FRAME, CallbackStack), - OFFSET(CuOutputBuffer, KEXCEPTION_FRAME, OutputBuffer), - OFFSET(CuOutputLength, KEXCEPTION_FRAME, OutputLength), - SIZE(KEXCEPTION_FRAME_LENGTH, KEXCEPTION_FRAME), - - HEADER("JUMP_BUFFER"), - OFFSET(JbFrame, JUMP_BUFFER, Frame), - OFFSET(JbRbx, JUMP_BUFFER, Rbx), - OFFSET(JbRsp, JUMP_BUFFER, Rsp), - OFFSET(JbRbp, JUMP_BUFFER, Rbp), - OFFSET(JbRsi, JUMP_BUFFER, Rsi), - OFFSET(JbRdi, JUMP_BUFFER, Rdi), - OFFSET(JbR12, JUMP_BUFFER, R12), - OFFSET(JbR13, JUMP_BUFFER, R13), - OFFSET(JbR14, JUMP_BUFFER, R14), - OFFSET(JbR15, JUMP_BUFFER, R15), - OFFSET(JbRip, JUMP_BUFFER, Rip), - OFFSET(JbMxCsr, JUMP_BUFFER, MxCsr), - OFFSET(JbFpCsr, JUMP_BUFFER, FpCsr), - OFFSET(JbXmm6, JUMP_BUFFER, Xmm6), - OFFSET(JbXmm7, JUMP_BUFFER, Xmm7), - OFFSET(JbXmm8, JUMP_BUFFER, Xmm8), - OFFSET(JbXmm9, JUMP_BUFFER, Xmm9), - OFFSET(JbXmm10, JUMP_BUFFER, Xmm10), - OFFSET(JbXmm11, JUMP_BUFFER, Xmm11), - OFFSET(JbXmm12, JUMP_BUFFER, Xmm12), - OFFSET(JbXmm13, JUMP_BUFFER, Xmm13), - OFFSET(JbXmm14, JUMP_BUFFER, Xmm14), - OFFSET(JbXmm15, JUMP_BUFFER, Xmm15), - - HEADER("KGDT64"), - OFFSET(KgdtBaseLow, KGDT64, BaseLow), - OFFSET(KgdtBaseMiddle, KGDT64, BaseMiddle), - OFFSET(KgdtBaseHigh, KGDT64, BaseHigh), - OFFSET(KgdtBaseUpper, KGDT64, BaseUpper), - OFFSET(KgdtLimitHigh, KGDT64, LimitHigh), - OFFSET(KgdtLimitLow, KGDT64, LimitLow), - CONSTANT(KGDT_LIMIT_ENCODE_MASK), - - HEADER("KPRCB"), - OFFSET(PbMxCsr, KPRCB, MxCsr), - OFFSET(PbNumber, KPRCB, Number), - OFFSET(PbInterruptRequest, KPRCB, InterruptRequest), - OFFSET(PbIdleHalt, KPRCB, IdleHalt), - OFFSET(PbCurrentThread, KPRCB, CurrentThread), - OFFSET(PbNextThread, KPRCB, NextThread), - OFFSET(PbIdleThread, KPRCB, IdleThread), - OFFSET(PbNestingLevel, KPRCB, NestingLevel), - OFFSET(PbRspBase, KPRCB, RspBase), - OFFSET(PbPrcbLock, KPRCB, PrcbLock), - OFFSET(PbSetMember, KPRCB, SetMember), - OFFSET(PbProcessorState, KPRCB, ProcessorState), - OFFSET(PbCpuType, KPRCB, CpuType), - OFFSET(PbCpuID, KPRCB, CpuID), - OFFSET(PbCpuStep, KPRCB, CpuStep), - OFFSET(PbHalReserved, KPRCB, HalReserved), - OFFSET(PbMinorVersion, KPRCB, MinorVersion), - OFFSET(PbMajorVersion, KPRCB, MajorVersion), - OFFSET(PbBuildType, KPRCB, BuildType), - OFFSET(PbCpuVendor, KPRCB, CpuVendor), - OFFSET(PbCoresPerPhysicalProcessor, KPRCB, CoresPerPhysicalProcessor), - OFFSET(PbLogicalProcessorsPerCore, KPRCB, LogicalProcessorsPerCore), - OFFSET(PbApicMask, KPRCB, ApicMask), - OFFSET(PbCFlushSize, KPRCB, CFlushSize), - OFFSET(PbAcpiReserved, KPRCB, AcpiReserved), - OFFSET(PbInitialApicId, KPRCB, InitialApicId), - OFFSET(PbStride, KPRCB, Stride), - OFFSET(PbLockQueue, KPRCB, LockQueue), - OFFSET(PbPPLookasideList, KPRCB, PPLookasideList), - OFFSET(PbPPNPagedLookasideList, KPRCB, PPNPagedLookasideList), - OFFSET(PbPPPagedLookasideList, KPRCB, PPPagedLookasideList), - OFFSET(PbPacketBarrier, KPRCB, PacketBarrier), - OFFSET(PbDeferredReadyListHead, KPRCB, DeferredReadyListHead), - OFFSET(PbLookasideIrpFloat, KPRCB, LookasideIrpFloat), - OFFSET(PbSystemCalls, KPRCB, SystemCalls), - OFFSET(PbReadOperationCount, KPRCB, ReadOperationCount), - OFFSET(PbWriteOperationCount, KPRCB, WriteOperationCount), - OFFSET(PbOtherOperationCount, KPRCB, OtherOperationCount), - OFFSET(PbReadTransferCount, KPRCB, ReadTransferCount), - OFFSET(PbWriteTransferCount, KPRCB, WriteTransferCount), - OFFSET(PbOtherTransferCount, KPRCB, OtherTransferCount), - OFFSET(PbContextSwitches, KPRCB, ContextSwitches), - OFFSET(PbTargetSet, KPRCB, TargetSet), - OFFSET(PbIpiFrozen, KPRCB, IpiFrozen), - OFFSET(PbRequestMailbox, KPRCB, RequestMailbox), - OFFSET(PbSenderSummary, KPRCB, SenderSummary), - OFFSET(PbDpcListHead, KPRCB, DpcListHead), - OFFSET(PbDpcLock, KPRCB, DpcLock), - OFFSET(PbDpcQueueDepth, KPRCB, DpcQueueDepth), - OFFSET(PbDpcCount, KPRCB, DpcCount), - OFFSET(PbDpcStack, KPRCB, DpcStack), - OFFSET(PbMaximumDpcQueueDepth, KPRCB, MaximumDpcQueueDepth), - OFFSET(PbDpcRequestRate, KPRCB, DpcRequestRate), - OFFSET(PbMinimumDpcRate, KPRCB, MinimumDpcRate), - OFFSET(PbDpcInterruptRequested, KPRCB, DpcInterruptRequested), - OFFSET(PbDpcThreadRequested, KPRCB, DpcThreadRequested), - OFFSET(PbDpcRoutineActive, KPRCB, DpcRoutineActive), - OFFSET(PbDpcThreadActive, KPRCB, DpcThreadActive), - OFFSET(PbTimerHand, KPRCB, TimerHand), - OFFSET(PbTimerRequest, KPRCB, TimerRequest), - OFFSET(PbTickOffset, KPRCB, TickOffset), - OFFSET(PbMasterOffset, KPRCB, MasterOffset), - OFFSET(PbDpcLastCount, KPRCB, DpcLastCount), - OFFSET(PbQuantumEnd, KPRCB, QuantumEnd), - OFFSET(PbDpcSetEventRequest, KPRCB, DpcSetEventRequest), - OFFSET(PbIdleSchedule, KPRCB, IdleSchedule), - OFFSET(PbReadySummary, KPRCB, ReadySummary), - OFFSET(PbDispatcherReadyListHead, KPRCB, DispatcherReadyListHead), - OFFSET(PbInterruptCount, KPRCB, InterruptCount), - OFFSET(PbKernelTime, KPRCB, KernelTime), - OFFSET(PbUserTime, KPRCB, UserTime), - OFFSET(PbDpcTime, KPRCB, DpcTime), - OFFSET(PbInterruptTime, KPRCB, InterruptTime), - OFFSET(PbAdjustDpcThreshold, KPRCB, AdjustDpcThreshold), - OFFSET(PbSkipTick, KPRCB, SkipTick), - OFFSET(PbPollSlot, KPRCB, PollSlot), - OFFSET(PbParentNode, KPRCB, ParentNode), - OFFSET(PbMultiThreadProcessorSet, KPRCB, MultiThreadProcessorSet), - OFFSET(PbMultiThreadSetMaster, KPRCB, MultiThreadSetMaster), - OFFSET(PbStartCycles, KPRCB, StartCycles), - OFFSET(PbPageColor, KPRCB, PageColor), - OFFSET(PbNodeColor, KPRCB, NodeColor), - OFFSET(PbNodeShiftedColor, KPRCB,NodeShiftedColor), - OFFSET(PbSecondaryColorMask, KPRCB, SecondaryColorMask), - OFFSET(PbSleeping, KPRCB, Sleeping), - OFFSET(PbCycleTime, KPRCB, CycleTime), - OFFSET(PbFastReadNoWait, KPRCB, FastReadNoWait), - OFFSET(PbFastReadWait, KPRCB, FastReadWait), - OFFSET(PbFastReadNotPossible, KPRCB, FastReadNotPossible), - OFFSET(PbCopyReadNoWait, KPRCB, CopyReadNoWait), - OFFSET(PbCopyReadWait, KPRCB, CopyReadWait), - OFFSET(PbCopyReadNoWaitMiss, KPRCB, CopyReadNoWaitMiss), - OFFSET(PbAlignmentFixupCount, KPRCB, AlignmentFixupCount), - OFFSET(PbExceptionDispatchCount, KPRCB, ExceptionDispatchCount), - OFFSET(PbVendorString, KPRCB, VendorString), - OFFSET(PbPowerState, KPRCB, PowerState), - SIZE(ProcessorBlockLength, KPRCB), - - HEADER("KPCR"), - OFFSET(PcGdt, KPCR, Gdt), - OFFSET(PcTss, KPCR, Tss), - OFFSET(PcUserRsp, KPCR, UserRsp), - OFFSET(PcSelf, KPCR, Self), - OFFSET(PcCurrentPrcb, KPCR, CurrentPrcb), - OFFSET(PcLockArray, KPCR, LockArray), - OFFSET(PcTeb, KPCR, Teb), - OFFSET(PcIdt, KPCR, Idt), - OFFSET(PcIrql, KPCR, Irql), - OFFSET(PcStallScaleFactor, KPCR, StallScaleFactor), - OFFSET(PcHalReserved, KPCR, HalReserved), - OFFSET(PcPrcb, KPCR, Prcb), - OFFSET(PcMxCsr, KPCR, MxCsr), - OFFSET(PcNumber, KPCR, Number), - OFFSET(PcInterruptRequest, KPCR, InterruptRequest), - OFFSET(PcIdleHalt, KPCR, IdleHalt), - OFFSET(PcCurrentThread, KPCR, CurrentThread), - OFFSET(PcNextThread, KPCR, NextThread), - OFFSET(PcIdleThread, KPCR, IdleThread), - OFFSET(PcIpiFrozen, KPCR, IpiFrozen), - OFFSET(PcNestingLevel, KPCR, NestingLevel), - OFFSET(PcRspBase, KPCR, RspBase), - OFFSET(PcPrcbLock, KPCR, PrcbLock), - OFFSET(PcSetMember, KPCR, SetMember), - OFFSET(PcCr0, KPCR, Cr0), - OFFSET(PcCr2, KPCR, Cr2), - OFFSET(PcCr3, KPCR, Cr3), - OFFSET(PcCr4, KPCR, Cr4), - OFFSET(PcKernelDr0, KPCR, KernelDr0), - OFFSET(PcKernelDr1, KPCR, KernelDr1), - OFFSET(PcKernelDr2, KPCR, KernelDr2), - OFFSET(PcKernelDr3, KPCR, KernelDr3), - OFFSET(PcKernelDr7, KPCR, KernelDr7), - OFFSET(PcGdtrLimit, KPCR, GdtrLimit), - OFFSET(PcGdtrBase, KPCR, GdtrBase), - OFFSET(PcIdtrLimit, KPCR, IdtrLimit), - OFFSET(PcIdtrBase, KPCR, IdtrBase), - OFFSET(PcTr, KPCR, Tr), - OFFSET(PcLdtr, KPCR, Ldtr), - OFFSET(PcDebugControl, KPCR, DebugControl), - OFFSET(PcLastBranchToRip, KPCR, LastBranchToRip), - OFFSET(PcLastBranchFromRip, KPCR, LastBranchFromRip), - OFFSET(PcLastExceptionToRip, KPCR, LastExceptionToRip), - OFFSET(PcLastExceptionFromRip, KPCR, LastExceptionFromRip), - OFFSET(PcCr8, KPCR, Cr8), - OFFSET(PcCpuType, KPCR, CpuType), - OFFSET(PcCpuID, KPCR, CpuID), - OFFSET(PcCpuStep, KPCR, CpuStep), - OFFSET(PcCpuVendor, KPCR, CpuVendor), - OFFSET(PcVirtualApicAssist, KPCR, VirtualApicAssist), - OFFSET(PcCFlushSize, KPCR, CFlushSize), - OFFSET(PcDeferredReadyListHead, KPCR, DeferredReadyListHead), - OFFSET(PcSystemCalls, KPCR, SystemCalls), - OFFSET(PcDpcRoutineActive, KPCR, DpcRoutineActive), - OFFSET(PcInterruptCount, KPCR, InterruptCount), - OFFSET(PcDebuggerSavedIRQL, KPCR, DebuggerSavedIRQL), - OFFSET(PcTickOffset, KPCR, TickOffset), - OFFSET(PcMasterOffset, KPCR, MasterOffset), - OFFSET(PcSkipTick, KPCR, SkipTick), - OFFSET(PcStartCycles, KPCR, StartCycles), - SIZE(ProcessorControlRegisterLength, KPCR), - - HEADER("KPROCESSOR_STATE"), - OFFSET(PsSpecialRegisters, KPROCESSOR_STATE, SpecialRegisters), - OFFSET(PsCr0, KPROCESSOR_STATE, Cr0), - OFFSET(PsCr2, KPROCESSOR_STATE, Cr2), - OFFSET(PsCr3, KPROCESSOR_STATE, Cr3), - OFFSET(PsCr4, KPROCESSOR_STATE, Cr4), - OFFSET(PsKernelDr0, KPROCESSOR_STATE, KernelDr0), - OFFSET(PsKernelDr1, KPROCESSOR_STATE, KernelDr1), - OFFSET(PsKernelDr2, KPROCESSOR_STATE, KernelDr2), - OFFSET(PsKernelDr3, KPROCESSOR_STATE, KernelDr3), - OFFSET(PsKernelDr6, KPROCESSOR_STATE, KernelDr6), - OFFSET(PsKernelDr7, KPROCESSOR_STATE, KernelDr7), - OFFSET(PsGdtr, KPROCESSOR_STATE, Gdtr), - OFFSET(PsIdtr, KPROCESSOR_STATE, Idtr), - OFFSET(PsTr, KPROCESSOR_STATE, Tr), - OFFSET(PsLdtr, KPROCESSOR_STATE, Ldtr), - OFFSET(PsMxCsr, KPROCESSOR_STATE, MxCsr), - OFFSET(PsContextFrame, KPROCESSOR_STATE, ContextFrame), - OFFSET(PsDebugControl, KPROCESSOR_STATE, DebugControl), - OFFSET(PsLastBranchToRip, KPROCESSOR_STATE, LastBranchToRip), - OFFSET(PsLastBranchFromRip, KPROCESSOR_STATE, LastBranchFromRip), - OFFSET(PsLastExceptionToRip, KPROCESSOR_STATE, LastExceptionToRip), - OFFSET(PsLastExceptionFromRip, KPROCESSOR_STATE, LastExceptionFromRip), - OFFSET(PsCr8, KPROCESSOR_STATE, Cr8), - SIZE(ProcessorStateLength, KPROCESSOR_STATE), - - HEADER("KSTART_FRAME"), - OFFSET(SfP1Home, KSTART_FRAME, P1Home), - OFFSET(SfP2Home, KSTART_FRAME, P2Home), - OFFSET(SfP3Home, KSTART_FRAME, P3Home), - OFFSET(SfP4Home, KSTART_FRAME, P4Home), - OFFSET(SfReturn, KSTART_FRAME, Return), - SIZE(KSTART_FRAME_LENGTH, KSTART_FRAME), - - HEADER("KSPECIAL_REGISTERS"), - OFFSET(SrKernelDr0, KSPECIAL_REGISTERS, KernelDr0), - OFFSET(SrKernelDr1, KSPECIAL_REGISTERS, KernelDr1), - OFFSET(SrKernelDr2, KSPECIAL_REGISTERS, KernelDr2), - OFFSET(SrKernelDr3, KSPECIAL_REGISTERS, KernelDr3), - OFFSET(SrKernelDr6, KSPECIAL_REGISTERS, KernelDr6), - OFFSET(SrKernelDr7, KSPECIAL_REGISTERS, KernelDr7), - OFFSET(SrGdtr, KSPECIAL_REGISTERS, Gdtr), - OFFSET(SrIdtr, KSPECIAL_REGISTERS, Idtr), - OFFSET(SrTr, KSPECIAL_REGISTERS, Tr), - OFFSET(SrMxCsr, KSPECIAL_REGISTERS, MxCsr), - OFFSET(SrMsrGsBase, KSPECIAL_REGISTERS, MsrGsBase), - OFFSET(SrMsrGsSwap, KSPECIAL_REGISTERS, MsrGsSwap), - OFFSET(SrMsrStar, KSPECIAL_REGISTERS, MsrStar), - OFFSET(SrMsrLStar, KSPECIAL_REGISTERS, MsrLStar), - OFFSET(SrMsrCStar, KSPECIAL_REGISTERS, MsrCStar), - OFFSET(SrMsrSyscallMask, KSPECIAL_REGISTERS, MsrSyscallMask), - - HEADER("KSYSTEM_TIME"), - OFFSET(StLowTime, KSYSTEM_TIME, LowTime), - OFFSET(StHigh1Time, KSYSTEM_TIME, High1Time), - OFFSET(StHigh2Time, KSYSTEM_TIME, High2Time), - - HEADER("KSWITCH_FRAME"), - OFFSET(SwP5Home, KSWITCH_FRAME, P5Home), - OFFSET(SwApcBypass, KSWITCH_FRAME, ApcBypass), - OFFSET(SwRbp, KSWITCH_FRAME, Rbp), - OFFSET(SwReturn, KSWITCH_FRAME, Return), - SIZE(SwitchFrameLength, KSWITCH_FRAME), - SIZE(KSWITCH_FRAME_LENGTH, KSWITCH_FRAME), - - HEADER("KTRAP_FRAME"), - OFFSET(TrP1Home, KTRAP_FRAME, P1Home), - OFFSET(TrP2Home, KTRAP_FRAME, P2Home), - OFFSET(TrP3Home, KTRAP_FRAME, P3Home), - OFFSET(TrP4Home, KTRAP_FRAME, P4Home), - OFFSET(TrP5, KTRAP_FRAME, P5), - OFFSET(TrPreviousMode, KTRAP_FRAME, PreviousMode), - OFFSET(TrPreviousIrql, KTRAP_FRAME, PreviousIrql), - OFFSET(TrFaultIndicator, KTRAP_FRAME, FaultIndicator), - OFFSET(TrExceptionActive, KTRAP_FRAME, ExceptionActive), - OFFSET(TrMxCsr, KTRAP_FRAME, MxCsr), - OFFSET(TrRax, KTRAP_FRAME, Rax), - OFFSET(TrRcx, KTRAP_FRAME, Rcx), - OFFSET(TrRdx, KTRAP_FRAME, Rdx), - OFFSET(TrR8, KTRAP_FRAME, R8), - OFFSET(TrR9, KTRAP_FRAME, R9), - OFFSET(TrR10, KTRAP_FRAME, R10), - OFFSET(TrR11, KTRAP_FRAME, R11), - OFFSET(TrGsBase, KTRAP_FRAME, GsBase), - OFFSET(TrGsSwap, KTRAP_FRAME,GsSwap), - OFFSET(TrXmm0, KTRAP_FRAME, Xmm0), - OFFSET(TrXmm1, KTRAP_FRAME, Xmm1), - OFFSET(TrXmm2, KTRAP_FRAME, Xmm2), - OFFSET(TrXmm3, KTRAP_FRAME, Xmm3), - OFFSET(TrXmm4, KTRAP_FRAME, Xmm4), - OFFSET(TrXmm5, KTRAP_FRAME, Xmm5), - OFFSET(TrFaultAddress, KTRAP_FRAME, FaultAddress), - OFFSET(TrTimeStampCKCL, KTRAP_FRAME, TimeStampCKCL), - OFFSET(TrDr0, KTRAP_FRAME, Dr0), - OFFSET(TrDr1, KTRAP_FRAME, Dr1), - OFFSET(TrDr2, KTRAP_FRAME, Dr2), - OFFSET(TrDr3, KTRAP_FRAME, Dr3), - OFFSET(TrDr6, KTRAP_FRAME, Dr6), - OFFSET(TrDr7, KTRAP_FRAME, Dr7), - OFFSET(TrDebugControl, KTRAP_FRAME, DebugControl), - OFFSET(TrLastBranchToRip, KTRAP_FRAME, LastBranchToRip), - OFFSET(TrLastBranchFromRip, KTRAP_FRAME, LastBranchFromRip), - OFFSET(TrLastExceptionToRip, KTRAP_FRAME, LastExceptionToRip), - OFFSET(TrLastExceptionFromRip, KTRAP_FRAME, LastExceptionFromRip), - OFFSET(TrLastBranchControl, KTRAP_FRAME, LastBranchControl), - OFFSET(TrLastBranchMSR, KTRAP_FRAME, LastBranchMSR), - OFFSET(TrSegDs, KTRAP_FRAME, SegDs), - OFFSET(TrSegEs, KTRAP_FRAME, SegEs), - OFFSET(TrSegFs, KTRAP_FRAME, SegFs), - OFFSET(TrSegGs, KTRAP_FRAME, SegGs), - OFFSET(TrTrapFrame, KTRAP_FRAME, TrapFrame), - OFFSET(TrRbx, KTRAP_FRAME, Rbx), - OFFSET(TrRdi, KTRAP_FRAME, Rdi), - OFFSET(TrRsi, KTRAP_FRAME, Rsi), - OFFSET(TrRbp, KTRAP_FRAME, Rbp), - OFFSET(TrErrorCode, KTRAP_FRAME, ErrorCode), - OFFSET(TrTimeStampKlog, KTRAP_FRAME, TimeStampKlog), - OFFSET(TrRip, KTRAP_FRAME, Rip), - OFFSET(TrSegCs, KTRAP_FRAME, SegCs), - OFFSET(TrLogging, KTRAP_FRAME, Logging), - OFFSET(TrEFlags, KTRAP_FRAME, EFlags), - OFFSET(TrRsp, KTRAP_FRAME, Rsp), - OFFSET(TrSegSs, KTRAP_FRAME, SegSs), - OFFSET(TrCodePatchCycle, KTRAP_FRAME, CodePatchCycle), - SIZE(KTRAP_FRAME_LENGTH, KTRAP_FRAME), - - HEADER("KTIMER_TABLE"), - OFFSET(TtEntry, KTIMER_TABLE, TimerEntries), - OFFSET(TtTime, KTIMER_TABLE, Time), - SIZE(TIMER_ENTRY_SIZE, KTIMER_ENTRY), - SIZE(TIMER_TABLE_SIZE, KTIMER_TABLE), - SIZE(KTIMER_TABLE_SIZE, KTIMER_TABLE), - - HEADER("KTSS"), - OFFSET(TssRsp0, TYPE, Rsp0), - OFFSET(TssRsp1, TYPE, Rsp1), - OFFSET(TssRsp2, TYPE, Rsp2), - OFFSET(TssPanicStack, TYPE, PanicStack), - OFFSET(TssMcaStack, TYPE, McaStack), - OFFSET(TssNmiStack, TYPE, NmiStack), - OFFSET(TssIoMapBase, TYPE, IoMapBase), - SIZE(TssLength, TYPE), - -#endif - - /* End of list */ - {-1, "", 0} -}; - Modified: branches/cmake-bringup/tools/geninc/geninc.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/geninc/geni… ============================================================================== --- branches/cmake-bringup/tools/geninc/geninc.c [iso-8859-1] (original) +++ branches/cmake-bringup/tools/geninc/geninc.c [iso-8859-1] Mon Nov 15 19:40:58 2010 @@ -174,7 +174,7 @@ case TYPE_CONSTANT: if (ms_format) { - fprintf(output, "%s equ %"PRIx64"h\n", data.Name, data.Value); + fprintf(output, "%s equ 0%"PRIx64"h\n", data.Name, data.Value); } else {

13 years, 11 months

[tkreuzer] 49594: [GENINCDATA] - Use 32 bit constants by default and add macros for 64 bit and pointer size. Fixes some constants.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Nov 15 19:14:56 2010 New Revision: 49594 URL: http://svn.reactos.org/svn/reactos?rev=49594&view=rev Log: [GENINCDATA] - Use 32 bit constants by default and add macros for 64 bit and pointer size. Fixes some constants. Modified: branches/cmake-bringup/include/asm/genincdata.c branches/cmake-bringup/include/asm/ksx.template.h Modified: branches/cmake-bringup/include/asm/genincdata.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/asm/genin… ============================================================================== --- branches/cmake-bringup/include/asm/genincdata.c [iso-8859-1] (original) +++ branches/cmake-bringup/include/asm/genincdata.c [iso-8859-1] Mon Nov 15 19:14:56 2010 @@ -28,7 +28,10 @@ #define TYPE_HEADER 3 #define RAW(x) {TYPE_RAW, x, 0} -#define CONSTANT(name) {TYPE_CONSTANT, #name, name > (ULONG)-1 ? (ULONGLONG)name : (ULONG)name} +#define CONSTANT(name) {TYPE_CONSTANT, #name, (ULONG)name} +#define CONSTANT64(name) {TYPE_CONSTANT, #name, (ULONGLONG)name} +#define CONSTANTPTR(name) {TYPE_CONSTANT, #name, (ULONG_PTR)name} +#define CONSTANTX(name, value) {TYPE_CONSTANT, #name, value} #define OFFSET(name, struct, member) {TYPE_CONSTANT, #name, FIELD_OFFSET(struct, member)} #define RELOFFSET(name, struct, member, to) {TYPE_CONSTANT, #name, FIELD_OFFSET(struct, member) - FIELD_OFFSET(struct, to)} #define SIZE(name, struct) {TYPE_CONSTANT, #name, sizeof(struct)} Modified: branches/cmake-bringup/include/asm/ksx.template.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/asm/ksx.t… ============================================================================== --- branches/cmake-bringup/include/asm/ksx.template.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/asm/ksx.template.h [iso-8859-1] Mon Nov 15 19:14:56 2010 @@ -32,7 +32,7 @@ CONSTANT(EXCEPTION_CONTINUE_SEARCH), CONSTANT(EXCEPTION_CONTINUE_EXECUTION), #ifdef _X86_ -//CONSTANT(EXCEPTION_CHAIN_END), +CONSTANT(EXCEPTION_CHAIN_END), //CONSTANT(FIXED_NTVDMSTATE_LINEAR), #endif @@ -47,7 +47,7 @@ CONSTANT(LOCK_QUEUE_OWNER), CONSTANT(LockQueueDispatcherLock), -HEADER("Performance Definitions"), +//HEADER("Performance Definitions"), //CONSTANT(PERF_CONTEXTSWAP_OFFSET), //CONSTANT(PERF_CONTEXTSWAP_FLAG), //CONSTANT(PERF_INTERRUPT_OFFSET), @@ -138,8 +138,8 @@ CONSTANT(WaitAll), HEADER("Interrupt object types"), -//CONSTANT(InLevelSensitive), -//CONSTANT(InLatched), +CONSTANTX(InLevelSensitive, LevelSensitive), +CONSTANTX(InLatched, Latched), HEADER("Bug Check Codes"), CONSTANT(APC_INDEX_MISMATCH), @@ -206,7 +206,7 @@ CONSTANT(NMI_STACK_SIZE), #endif -HEADER("Thread flags"), +//HEADER("Thread flags"), //CONSTANT(THREAD_FLAGS_CYCLE_PROFILING), //CONSTANT(THREAD_FLAGS_CYCLE_PROFILING_LOCK_BIT), //CONSTANT(THREAD_FLAGS_CYCLE_PROFILING_LOCK), @@ -240,7 +240,7 @@ CONSTANT(FALSE), CONSTANT(TRUE), CONSTANT(DBG_STATUS_CONTROL_C), -CONSTANT(USER_SHARED_DATA), +CONSTANTPTR(USER_SHARED_DATA), //CONSTANT(MM_SHARED_USER_DATA_VA), CONSTANT(PAGE_SIZE), //CONSTANT(KERNEL_STACK_CONTROL_LARGE_STACK), @@ -264,10 +264,10 @@ /* STRUCTURE OFFSETS *********************************************************/ -HEADER("KAFFINITY_EX"), +//HEADER("KAFFINITY_EX"), //OFFSET(AfBitmap, KAFFINITY_EX, Bitmap), -HEADER("Aligned Affinity"), +//HEADER("Aligned Affinity"), //OFFSET(AfsCpuSet, ???, CpuSet), HEADER("KAPC"), @@ -397,14 +397,14 @@ OFFSET(IoPointer, IO_STATUS_BLOCK, Pointer), OFFSET(IoInformation, IO_STATUS_BLOCK, Information), +//HEADER("KERNEL_STACK_CONTROL"), #ifdef _M_IX86 // Kernel Stack Control Structure Offset (relative to initial stack pointer) Definitions -//RELOFFSET(KcPreviousBase, KERNEL_STACK_CONTROL, PreviousBase, ???), -//RELOFFSET(KcPreviousLimit, KERNEL_STACK_CONTROL, PreviousBase, ???), -//RELOFFSET(KcPreviousKernel, KERNEL_STACK_CONTROL, PreviousBase, ???), -//RELOFFSET(KcPreviousInitial, KERNEL_STACK_CONTROL, PreviousBase, ???), +//RELOFFSET(KcPreviousBase, KERNEL_STACK_CONTROL, PreviousBase, ???), -40 +//RELOFFSET(KcPreviousLimit, KERNEL_STACK_CONTROL, PreviousBase, ???), -36 +//RELOFFSET(KcPreviousKernel, KERNEL_STACK_CONTROL, PreviousBase, ???), -32 +//RELOFFSET(KcPreviousInitial, KERNEL_STACK_CONTROL, PreviousBase, ???), -28 #else -HEADER("KERNEL_STACK_CONTROL"), //OFFSET(KcPreviousBase, KERNEL_STACK_CONTROL, PreviousBase), //OFFSET(KcPreviousLimit, KERNEL_STACK_CONTROL, PreviousLimit), //OFFSET(KcPreviousKernel, KERNEL_STACK_CONTROL, PreviousKernel),

13 years, 11 months

[janderwald] 49593: [PORTCLS] - Implement support for IPinCount interface - Add informal debug print

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Nov 15 09:09:42 2010 New Revision: 49593 URL: http://svn.reactos.org/svn/reactos?rev=49593&view=rev Log: [PORTCLS] - Implement support for IPinCount interface - Add informal debug print Modified: branches/audio-bringup/drivers/wdm/audio/backpln/portcls/propertyhandler.cpp branches/audio-bringup/drivers/wdm/audio/backpln/portcls/undoc.cpp Modified: branches/audio-bringup/drivers/wdm/audio/backpln/portcls/propertyhandler.cpp URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/wdm/audio… ============================================================================== --- branches/audio-bringup/drivers/wdm/audio/backpln/portcls/propertyhandler.cpp [iso-8859-1] (original) +++ branches/audio-bringup/drivers/wdm/audio/backpln/portcls/propertyhandler.cpp [iso-8859-1] Mon Nov 15 09:09:42 2010 @@ -14,10 +14,13 @@ IN PKSIDENTIFIER Request, IN OUT PVOID Data, IN PSUBDEVICE_DESCRIPTOR Descriptor, - IN BOOL Global) + IN BOOL Global, + IN ISubdevice *SubDevice) { KSPIN_CINSTANCES * Instances; KSP_PIN * Pin = (KSP_PIN*)Request; + ULONG FilterNecessary, FilterCurrent, FilterPossible, GlobalCurrent, GlobalPossible; + NTSTATUS Status; if (Pin->PinId >= Descriptor->Factory.PinDescriptorCount) { @@ -28,12 +31,31 @@ Instances = (KSPIN_CINSTANCES*)Data; - if (Global) - Instances->PossibleCount = Descriptor->Factory.Instances[Pin->PinId].MaxGlobalInstanceCount; + // check if the miniport supports the IPinCount interface + Status = SubDevice->PinCount(Pin->PinId, &FilterNecessary, &FilterCurrent, &FilterPossible, &GlobalCurrent, &GlobalPossible); + + if (NT_SUCCESS(Status)) + { + if (Global) + { + Instances->PossibleCount = GlobalPossible; + Instances->CurrentCount = GlobalCurrent; + } + else + { + Instances->PossibleCount = FilterPossible; + Instances->CurrentCount = FilterCurrent; + } + } else - Instances->PossibleCount = Descriptor->Factory.Instances[Pin->PinId].MaxFilterInstanceCount; - - Instances->CurrentCount = Descriptor->Factory.Instances[Pin->PinId].CurrentPinInstanceCount; + { + if (Global) + Instances->PossibleCount = Descriptor->Factory.Instances[Pin->PinId].MaxGlobalInstanceCount; + else + Instances->PossibleCount = Descriptor->Factory.Instances[Pin->PinId].MaxFilterInstanceCount; + + Instances->CurrentCount = Descriptor->Factory.Instances[Pin->PinId].CurrentPinInstanceCount; + } IoStatus->Information = sizeof(KSPIN_CINSTANCES); IoStatus->Status = STATUS_SUCCESS; @@ -45,10 +67,13 @@ IN PIO_STATUS_BLOCK IoStatus, IN PKSIDENTIFIER Request, IN OUT PVOID Data, - IN PSUBDEVICE_DESCRIPTOR Descriptor) + IN PSUBDEVICE_DESCRIPTOR Descriptor, + IN ISubdevice *SubDevice) { PULONG Result; KSP_PIN * Pin = (KSP_PIN*)Request; + ULONG FilterNecessary, FilterCurrent, FilterPossible, GlobalCurrent, GlobalPossible; + NTSTATUS Status; if (Pin->PinId >= Descriptor->Factory.PinDescriptorCount) { @@ -58,7 +83,19 @@ } Result = (PULONG)Data; - *Result = Descriptor->Factory.Instances[Pin->PinId].MinFilterInstanceCount; + + + // check if the miniport supports the IPinCount interface + Status = SubDevice->PinCount(Pin->PinId, &FilterNecessary, &FilterCurrent, &FilterPossible, &GlobalCurrent, &GlobalPossible); + + if (NT_SUCCESS(Status)) + { + *Result = FilterNecessary; + } + else + { + *Result = Descriptor->Factory.Instances[Pin->PinId].MinFilterInstanceCount; + } IoStatus->Information = sizeof(ULONG); IoStatus->Status = STATUS_SUCCESS; @@ -236,13 +273,13 @@ Status = KsPinPropertyHandler(Irp, Request, Data, Descriptor->Factory.PinDescriptorCount, Descriptor->Factory.KsPinDescriptor); break; case KSPROPERTY_PIN_GLOBALCINSTANCES: - Status = HandlePropertyInstances(&Irp->IoStatus, Request, Data, Descriptor, TRUE); + Status = HandlePropertyInstances(&Irp->IoStatus, Request, Data, Descriptor, TRUE, SubDevice); break; case KSPROPERTY_PIN_CINSTANCES: - Status = HandlePropertyInstances(&Irp->IoStatus, Request, Data, Descriptor, FALSE); + Status = HandlePropertyInstances(&Irp->IoStatus, Request, Data, Descriptor, FALSE, SubDevice); break; case KSPROPERTY_PIN_NECESSARYINSTANCES: - Status = HandleNecessaryPropertyInstances(&Irp->IoStatus, Request, Data, Descriptor); + Status = HandleNecessaryPropertyInstances(&Irp->IoStatus, Request, Data, Descriptor, SubDevice); break; case KSPROPERTY_PIN_DATAINTERSECTION: Modified: branches/audio-bringup/drivers/wdm/audio/backpln/portcls/undoc.cpp URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/wdm/audio… ============================================================================== --- branches/audio-bringup/drivers/wdm/audio/backpln/portcls/undoc.cpp [iso-8859-1] (original) +++ branches/audio-bringup/drivers/wdm/audio/backpln/portcls/undoc.cpp [iso-8859-1] Mon Nov 15 09:09:42 2010 @@ -280,6 +280,7 @@ PropertyRequest->PropertyItem->Handler, PropertyRequest, PropertyRequest->PropertyItem->Flags, PropertyRequest->PropertyItem->Id); #if 1 Status = PropertyRequest->PropertyItem->Handler(PropertyRequest); + DPRINT1("Status %lx ValueSize %lu Information %lu\n", Status, PropertyRequest->ValueSize, Irp->IoStatus.Information); #else Status = STATUS_NOT_FOUND; #endif

13 years, 11 months

[jimtabor] 49592: [Win32k] - Fix hooks, do not cleanup hooks when any window from the same thread is destroyed.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Nov 15 06:52:44 2010 New Revision: 49592 URL: http://svn.reactos.org/svn/reactos?rev=49592&view=rev Log: [Win32k] - Fix hooks, do not cleanup hooks when any window from the same thread is destroyed. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Mon Nov 15 06:52:44 2010 @@ -401,8 +401,6 @@ } DestroyTimersForWindow(ThreadData, Window); - - HOOK_DestroyThreadHooks(ThreadData->pEThread); // This is needed here too! /* flush the message queue */ MsqRemoveWindowMessagesFromQueue(Window);

13 years, 11 months

[tkreuzer] 49591: [CRT] incude asm.inc instead of reactos/asm.h Fix a bug that smeaked into _chkstk

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Nov 15 01:29:12 2010 New Revision: 49591 URL: http://svn.reactos.org/svn/reactos?rev=49591&view=rev Log: [CRT] incude asm.inc instead of reactos/asm.h Fix a bug that smeaked into _chkstk Modified: branches/cmake-bringup/lib/sdk/crt/except/amd64/chkstk_asm.s branches/cmake-bringup/lib/sdk/crt/except/amd64/seh.s branches/cmake-bringup/lib/sdk/crt/except/i386/chkstk_asm.s branches/cmake-bringup/lib/sdk/crt/except/i386/prolog.s branches/cmake-bringup/lib/sdk/crt/except/i386/seh.s branches/cmake-bringup/lib/sdk/crt/math/amd64/alldiv.S branches/cmake-bringup/lib/sdk/crt/math/amd64/atan.S branches/cmake-bringup/lib/sdk/crt/math/amd64/atan2.S branches/cmake-bringup/lib/sdk/crt/math/amd64/ceil.S branches/cmake-bringup/lib/sdk/crt/math/amd64/ceilf.S branches/cmake-bringup/lib/sdk/crt/math/amd64/exp.S branches/cmake-bringup/lib/sdk/crt/math/amd64/fabs.S branches/cmake-bringup/lib/sdk/crt/math/amd64/floor.S branches/cmake-bringup/lib/sdk/crt/math/amd64/floorf.S branches/cmake-bringup/lib/sdk/crt/math/amd64/fmod.S branches/cmake-bringup/lib/sdk/crt/math/amd64/fmodf.S branches/cmake-bringup/lib/sdk/crt/math/amd64/ldexp.S branches/cmake-bringup/lib/sdk/crt/math/amd64/log.S branches/cmake-bringup/lib/sdk/crt/math/amd64/log10.S branches/cmake-bringup/lib/sdk/crt/math/amd64/pow.S branches/cmake-bringup/lib/sdk/crt/math/amd64/sqrt.S branches/cmake-bringup/lib/sdk/crt/math/amd64/sqrtf.S branches/cmake-bringup/lib/sdk/crt/math/amd64/tan.S branches/cmake-bringup/lib/sdk/crt/math/i386/alldiv_asm.s branches/cmake-bringup/lib/sdk/crt/math/i386/alldvrm_asm.s branches/cmake-bringup/lib/sdk/crt/math/i386/allmul_asm.s branches/cmake-bringup/lib/sdk/crt/math/i386/allrem_asm.s branches/cmake-bringup/lib/sdk/crt/math/i386/allshl_asm.s branches/cmake-bringup/lib/sdk/crt/math/i386/allshr_asm.s branches/cmake-bringup/lib/sdk/crt/math/i386/atan2_asm.s branches/cmake-bringup/lib/sdk/crt/math/i386/atan_asm.s branches/cmake-bringup/lib/sdk/crt/math/i386/aulldiv_asm.s branches/cmake-bringup/lib/sdk/crt/math/i386/aulldvrm_asm.s branches/cmake-bringup/lib/sdk/crt/math/i386/aullrem_asm.s branches/cmake-bringup/lib/sdk/crt/math/i386/aullshr_asm.s branches/cmake-bringup/lib/sdk/crt/math/i386/ceil_asm.s branches/cmake-bringup/lib/sdk/crt/math/i386/ceilf.S branches/cmake-bringup/lib/sdk/crt/math/i386/cos_asm.s branches/cmake-bringup/lib/sdk/crt/math/i386/exp_asm.s branches/cmake-bringup/lib/sdk/crt/math/i386/fabs_asm.s branches/cmake-bringup/lib/sdk/crt/math/i386/floor_asm.s branches/cmake-bringup/lib/sdk/crt/math/i386/floorf.S branches/cmake-bringup/lib/sdk/crt/math/i386/fmod_asm.s branches/cmake-bringup/lib/sdk/crt/math/i386/fmodf_asm.s branches/cmake-bringup/lib/sdk/crt/math/i386/ftol_asm.s branches/cmake-bringup/lib/sdk/crt/math/i386/log10_asm.s branches/cmake-bringup/lib/sdk/crt/math/i386/log_asm.s branches/cmake-bringup/lib/sdk/crt/math/i386/pow_asm.s branches/cmake-bringup/lib/sdk/crt/math/i386/sin_asm.s branches/cmake-bringup/lib/sdk/crt/math/i386/sqrt_asm.s branches/cmake-bringup/lib/sdk/crt/math/i386/tan_asm.s branches/cmake-bringup/lib/sdk/crt/mem/i386/memchr_asm.s branches/cmake-bringup/lib/sdk/crt/mem/i386/memmove_asm.s branches/cmake-bringup/lib/sdk/crt/mem/i386/memset_asm.s branches/cmake-bringup/lib/sdk/crt/setjmp/amd64/setjmp.s branches/cmake-bringup/lib/sdk/crt/setjmp/i386/setjmp.s branches/cmake-bringup/lib/sdk/crt/string/i386/tcscat.inc branches/cmake-bringup/lib/sdk/crt/string/i386/tcschr.inc branches/cmake-bringup/lib/sdk/crt/string/i386/tcscmp.inc branches/cmake-bringup/lib/sdk/crt/string/i386/tcscpy.inc branches/cmake-bringup/lib/sdk/crt/string/i386/tcslen.inc branches/cmake-bringup/lib/sdk/crt/string/i386/tcsncat.inc branches/cmake-bringup/lib/sdk/crt/string/i386/tcsncmp.inc branches/cmake-bringup/lib/sdk/crt/string/i386/tcsncpy.inc branches/cmake-bringup/lib/sdk/crt/string/i386/tcsnlen.inc branches/cmake-bringup/lib/sdk/crt/string/i386/tcsrchr.inc Modified: branches/cmake-bringup/lib/sdk/crt/except/amd64/chkstk_asm.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/excep… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/except/amd64/chkstk_asm.s [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/except/amd64/chkstk_asm.s [iso-8859-1] Mon Nov 15 01:29:12 2010 @@ -8,11 +8,10 @@ /* INCLUDES ******************************************************************/ -#include <reactos/asm.h> +#include <asm.inc> -.intel_syntax noprefix -.global MsgUnimplemented +PUBLIC MsgUnimplemented MsgUnimplemented: .asciz "WARNING: %s at %s:%d is UNIMPLEMENTED!\n" @@ -27,4 +26,5 @@ ret .endp +END /* EOF */ Modified: branches/cmake-bringup/lib/sdk/crt/except/amd64/seh.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/excep… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/except/amd64/seh.s [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/except/amd64/seh.s [iso-8859-1] Mon Nov 15 01:29:12 2010 @@ -8,8 +8,8 @@ /* INCLUDES ******************************************************************/ -#include <ndk/asm.h> -.intel_syntax noprefix +#include <asm.inc> +#include <ksamd64.inc> #define DISPOSITION_DISMISS 0 #define DISPOSITION_CONTINUE_SEARCH 1 @@ -54,3 +54,5 @@ _except_handler3: ret .endfunc + +END Modified: branches/cmake-bringup/lib/sdk/crt/except/i386/chkstk_asm.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/excep… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/except/i386/chkstk_asm.s [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/except/i386/chkstk_asm.s [iso-8859-1] Mon Nov 15 01:29:12 2010 @@ -7,8 +7,9 @@ * PROGRAMER: KJK::Hyperion <noog(a)libero.it> */ -#include <reactos/asm.h> -#include <ndk/asm.h> +#include <asm.inc> +#include <ks386.inc> + #define PAGE_SIZE 4096 PUBLIC __chkstk @@ -28,12 +29,11 @@ push ecx /* ECX = top of the previous stack frame */ - lea eax, [esp + 8] + lea ecx, [esp + 8] /* probe the desired memory, page by page */ cmp eax, PAGE_SIZE - jge .l_MoreThanAPage - jmp .l_LessThanAPage + jl .l_LessThanAPage .l_MoreThanAPage: Modified: branches/cmake-bringup/lib/sdk/crt/except/i386/prolog.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/excep… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/except/i386/prolog.s [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/except/i386/prolog.s [iso-8859-1] Mon Nov 15 01:29:12 2010 @@ -8,20 +8,23 @@ /* INCLUDES ******************************************************************/ -#include <ndk/asm.h> +#include <asm.inc> +#include <ks386.inc> -/* GLOBALS *******************************************************************/ +/* FUNCTIONS *****************************************************************/ +.code -.globl __EH_prolog - +PUBLIC __EH_prolog // Copied from Wine. __EH_prolog: - pushl $-1 - pushl %eax - pushl %fs:0 - movl %esp, %fs:0 - movl 12(%esp), %eax - movl %ebp, 12(%esp) - leal 12(%esp), %ebp - pushl %eax + push -1 + push eax + push fs:0 + mov fs:0, esp + mov eax, [esp + 12] + mov [esp + 12], ebp + lea ebp, [esp + 12] + push eax ret + +END Modified: branches/cmake-bringup/lib/sdk/crt/except/i386/seh.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/excep… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/except/i386/seh.s [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/except/i386/seh.s [iso-8859-1] Mon Nov 15 01:29:12 2010 @@ -8,7 +8,7 @@ /* INCLUDES ******************************************************************/ -#include <reactos/asm.h> +#include <asm.inc> #define DISPOSITION_DISMISS 0 #define DISPOSITION_CONTINUE_SEARCH 1 Modified: branches/cmake-bringup/lib/sdk/crt/math/amd64/alldiv.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/amd64/alldiv.S [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/amd64/alldiv.S [iso-8859-1] Mon Nov 15 01:29:12 2010 @@ -8,8 +8,7 @@ /* INCLUDES ******************************************************************/ -#include <reactos/asm.h> -#include <ndk/amd64/asm.h> +#include <asm.inc> /* DATA *********************************************************************/ Modified: branches/cmake-bringup/lib/sdk/crt/math/amd64/atan.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/amd64/atan.S [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/amd64/atan.S [iso-8859-1] Mon Nov 15 01:29:12 2010 @@ -8,8 +8,8 @@ /* INCLUDES ******************************************************************/ -#include <reactos/asm.h> -#include <ndk/amd64/asm.h> +#include <asm.inc> +#include <ksamd64.inc> /* FUNCTIONS ****************************************************************/ Modified: branches/cmake-bringup/lib/sdk/crt/math/amd64/atan2.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/amd64/atan2.S [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/amd64/atan2.S [iso-8859-1] Mon Nov 15 01:29:12 2010 @@ -8,8 +8,8 @@ /* INCLUDES ******************************************************************/ -#include <reactos/asm.h> -#include <ndk/amd64/asm.h> +#include <asm.inc> +#include <ksamd64.inc> /* FUNCTIONS ****************************************************************/ Modified: branches/cmake-bringup/lib/sdk/crt/math/amd64/ceil.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/amd64/ceil.S [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/amd64/ceil.S [iso-8859-1] Mon Nov 15 01:29:12 2010 @@ -8,8 +8,8 @@ /* INCLUDES ******************************************************************/ -#include <reactos/asm.h> -#include <ndk/amd64/asm.h> +#include <asm.inc> +#include <ksamd64.inc> /* FUNCTIONS ****************************************************************/ Modified: branches/cmake-bringup/lib/sdk/crt/math/amd64/ceilf.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/amd64/ceilf.S [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/amd64/ceilf.S [iso-8859-1] Mon Nov 15 01:29:12 2010 @@ -8,8 +8,8 @@ /* INCLUDES ******************************************************************/ -#include <reactos/asm.h> -#include <ndk/amd64/asm.h> +#include <asm.inc> +#include <ksamd64.inc> /* FUNCTIONS ****************************************************************/ @@ -26,8 +26,8 @@ /* Change fpu control word to round up */ fstcw [rsp + 8] mov eax, [rsp + 8] - or eax, 0x00800 - and eax, 0x0fbff + or eax, HEX(00800) + and eax, HEX(0fbff) mov [rsp + 12], eax fldcw [rsp + 12] @@ -42,3 +42,5 @@ add rsp, 16 ret + +END Modified: branches/cmake-bringup/lib/sdk/crt/math/amd64/exp.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/amd64/exp.S [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/amd64/exp.S [iso-8859-1] Mon Nov 15 01:29:12 2010 @@ -8,8 +8,8 @@ /* INCLUDES ******************************************************************/ -#include <reactos/asm.h> -#include <ndk/amd64/asm.h> +#include <asm.inc> +#include <ksamd64.inc> /* FUNCTIONS ****************************************************************/ @@ -20,3 +20,4 @@ UNIMPLEMENTED exp ret +END Modified: branches/cmake-bringup/lib/sdk/crt/math/amd64/fabs.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/amd64/fabs.S [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/amd64/fabs.S [iso-8859-1] Mon Nov 15 01:29:12 2010 @@ -8,8 +8,7 @@ /* INCLUDES ******************************************************************/ -#include <reactos/asm.h> -#include <ndk/amd64/asm.h> +#include <asm.inc> /* FUNCTIONS ****************************************************************/ Modified: branches/cmake-bringup/lib/sdk/crt/math/amd64/floor.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/amd64/floor.S [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/amd64/floor.S [iso-8859-1] Mon Nov 15 01:29:12 2010 @@ -8,8 +8,8 @@ /* INCLUDES ******************************************************************/ -#include <reactos/asm.h> -#include <ndk/amd64/asm.h> +#include <asm.inc> +#include <ksamd64.inc> /* FUNCTIONS ****************************************************************/ @@ -19,3 +19,5 @@ floor: UNIMPLEMENTED floor ret + +END Modified: branches/cmake-bringup/lib/sdk/crt/math/amd64/floorf.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/amd64/floorf.S [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/amd64/floorf.S [iso-8859-1] Mon Nov 15 01:29:12 2010 @@ -8,8 +8,8 @@ /* INCLUDES ******************************************************************/ -#include <reactos/asm.h> -#include <ndk/amd64/asm.h> +#include <asm.inc> +#include <ksamd64.inc> /* FUNCTIONS ****************************************************************/ Modified: branches/cmake-bringup/lib/sdk/crt/math/amd64/fmod.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/amd64/fmod.S [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/amd64/fmod.S [iso-8859-1] Mon Nov 15 01:29:12 2010 @@ -8,8 +8,7 @@ /* INCLUDES ******************************************************************/ -#include <reactos/asm.h> -#include <ndk/amd64/asm.h> +#include <asm.inc> /* DATA *********************************************************************/ @@ -17,3 +16,5 @@ fmod: UNIMPLEMENTED fmod ret + +END Modified: branches/cmake-bringup/lib/sdk/crt/math/amd64/fmodf.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/amd64/fmodf.S [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/amd64/fmodf.S [iso-8859-1] Mon Nov 15 01:29:12 2010 @@ -8,8 +8,7 @@ /* INCLUDES ******************************************************************/ -#include <reactos/asm.h> -#include <ndk/amd64/asm.h> +#include <asm.inc> /* DATA *********************************************************************/ @@ -17,3 +16,5 @@ fmodf: UNIMPLEMENTED fmodf ret + +END Modified: branches/cmake-bringup/lib/sdk/crt/math/amd64/ldexp.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/amd64/ldexp.S [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/amd64/ldexp.S [iso-8859-1] Mon Nov 15 01:29:12 2010 @@ -8,8 +8,7 @@ /* INCLUDES ******************************************************************/ -#include <reactos/asm.h> -#include <ndk/amd64/asm.h> +#include <asm.inc> /* DATA *********************************************************************/ @@ -17,3 +16,5 @@ ldexp: UNIMPLEMENTED ldexp ret + +END Modified: branches/cmake-bringup/lib/sdk/crt/math/amd64/log.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/amd64/log.S [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/amd64/log.S [iso-8859-1] Mon Nov 15 01:29:12 2010 @@ -8,8 +8,7 @@ /* INCLUDES ******************************************************************/ -#include <reactos/asm.h> -#include <ndk/amd64/asm.h> +#include <asm.inc> /* DATA *********************************************************************/ Modified: branches/cmake-bringup/lib/sdk/crt/math/amd64/log10.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/amd64/log10.S [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/amd64/log10.S [iso-8859-1] Mon Nov 15 01:29:12 2010 @@ -8,8 +8,7 @@ /* INCLUDES ******************************************************************/ -#include <reactos/asm.h> -#include <ndk/amd64/asm.h> +#include <asm.inc> /* DATA *********************************************************************/ Modified: branches/cmake-bringup/lib/sdk/crt/math/amd64/pow.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/amd64/pow.S [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/amd64/pow.S [iso-8859-1] Mon Nov 15 01:29:12 2010 @@ -8,8 +8,8 @@ /* INCLUDES ******************************************************************/ -#include <reactos/asm.h> -#include <ndk/amd64/asm.h> +#include <asm.inc> +#include <ksamd64.inc> /* DATA *********************************************************************/ Modified: branches/cmake-bringup/lib/sdk/crt/math/amd64/sqrt.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/amd64/sqrt.S [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/amd64/sqrt.S [iso-8859-1] Mon Nov 15 01:29:12 2010 @@ -8,8 +8,8 @@ /* INCLUDES ******************************************************************/ -#include <reactos/asm.h> -#include <ndk/amd64/asm.h> +#include <asm.inc> +#include <ksamd64.inc> /* DATA *********************************************************************/ @@ -17,3 +17,5 @@ sqrt: UNIMPLEMENTED sqrt ret + +END Modified: branches/cmake-bringup/lib/sdk/crt/math/amd64/sqrtf.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/amd64/sqrtf.S [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/amd64/sqrtf.S [iso-8859-1] Mon Nov 15 01:29:12 2010 @@ -8,8 +8,8 @@ /* INCLUDES ******************************************************************/ -#include <reactos/asm.h> -#include <ndk/amd64/asm.h> +#include <asm.inc> +#include <ksamd64.inc> /* DATA *********************************************************************/ @@ -17,3 +17,5 @@ sqrtf: sqrtss xmm0, xmm0 ret + +END Modified: branches/cmake-bringup/lib/sdk/crt/math/amd64/tan.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/amd64/tan.S [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/amd64/tan.S [iso-8859-1] Mon Nov 15 01:29:12 2010 @@ -8,8 +8,8 @@ /* INCLUDES ******************************************************************/ -#include <reactos/asm.h> -#include <ndk/amd64/asm.h> +#include <asm.inc> +#include <ksamd64.inc> /* DATA *********************************************************************/ @@ -17,3 +17,5 @@ tan: UNIMPLEMENTED tan ret + +END Modified: branches/cmake-bringup/lib/sdk/crt/math/i386/alldiv_asm.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/i386/alldiv_asm.s [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/i386/alldiv_asm.s [iso-8859-1] Mon Nov 15 01:29:12 2010 @@ -34,7 +34,7 @@ * SUCH DAMAGE. */ -#include <reactos/asm.h> +#include <asm.inc> PUBLIC __alldiv PUBLIC __fltused Modified: branches/cmake-bringup/lib/sdk/crt/math/i386/alldvrm_asm.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/i386/alldvrm_asm.s [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/i386/alldvrm_asm.s [iso-8859-1] Mon Nov 15 01:29:12 2010 @@ -34,7 +34,7 @@ * SUCH DAMAGE. */ -#include <reactos/asm.h> +#include <asm.inc> PUBLIC __alldvrm Modified: branches/cmake-bringup/lib/sdk/crt/math/i386/allmul_asm.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/i386/allmul_asm.s [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/i386/allmul_asm.s [iso-8859-1] Mon Nov 15 01:29:12 2010 @@ -34,7 +34,7 @@ * SUCH DAMAGE. */ -#include <reactos/asm.h> +#include <asm.inc> PUBLIC __allmul Modified: branches/cmake-bringup/lib/sdk/crt/math/i386/allrem_asm.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/i386/allrem_asm.s [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/i386/allrem_asm.s [iso-8859-1] Mon Nov 15 01:29:12 2010 @@ -34,7 +34,7 @@ * SUCH DAMAGE. */ -#include <reactos/asm.h> +#include <asm.inc> PUBLIC __allrem Modified: branches/cmake-bringup/lib/sdk/crt/math/i386/allshl_asm.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/i386/allshl_asm.s [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/i386/allshl_asm.s [iso-8859-1] Mon Nov 15 01:29:12 2010 @@ -34,7 +34,7 @@ * SUCH DAMAGE. */ -#include <reactos/asm.h> +#include <asm.inc> PUBLIC __allshl Modified: branches/cmake-bringup/lib/sdk/crt/math/i386/allshr_asm.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/i386/allshr_asm.s [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/i386/allshr_asm.s [iso-8859-1] Mon Nov 15 01:29:12 2010 @@ -34,7 +34,7 @@ * SUCH DAMAGE. */ -#include <reactos/asm.h> +#include <asm.inc> PUBLIC __allshr Modified: branches/cmake-bringup/lib/sdk/crt/math/i386/atan2_asm.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/i386/atan2_asm.s [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/i386/atan2_asm.s [iso-8859-1] Mon Nov 15 01:29:12 2010 @@ -1,5 +1,5 @@ -#include <reactos/asm.h> +#include <asm.inc> PUBLIC _atan2 Modified: branches/cmake-bringup/lib/sdk/crt/math/i386/atan_asm.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/i386/atan_asm.s [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/i386/atan_asm.s [iso-8859-1] Mon Nov 15 01:29:12 2010 @@ -34,7 +34,7 @@ * SUCH DAMAGE. */ -#include <reactos/asm.h> +#include <asm.inc> PUBLIC _atan Modified: branches/cmake-bringup/lib/sdk/crt/math/i386/aulldiv_asm.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/i386/aulldiv_asm.s [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/i386/aulldiv_asm.s [iso-8859-1] Mon Nov 15 01:29:12 2010 @@ -34,7 +34,7 @@ * SUCH DAMAGE. */ -#include <reactos/asm.h> +#include <asm.inc> PUBLIC __aulldiv Modified: branches/cmake-bringup/lib/sdk/crt/math/i386/aulldvrm_asm.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/i386/aulldvrm_asm.s [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/i386/aulldvrm_asm.s [iso-8859-1] Mon Nov 15 01:29:12 2010 @@ -34,7 +34,7 @@ * SUCH DAMAGE. */ -#include <reactos/asm.h> +#include <asm.inc> PUBLIC __aulldvrm Modified: branches/cmake-bringup/lib/sdk/crt/math/i386/aullrem_asm.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/i386/aullrem_asm.s [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/i386/aullrem_asm.s [iso-8859-1] Mon Nov 15 01:29:12 2010 @@ -34,7 +34,7 @@ * SUCH DAMAGE. */ -#include <reactos/asm.h> +#include <asm.inc> PUBLIC __aullrem Modified: branches/cmake-bringup/lib/sdk/crt/math/i386/aullshr_asm.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/i386/aullshr_asm.s [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/i386/aullshr_asm.s [iso-8859-1] Mon Nov 15 01:29:12 2010 @@ -34,7 +34,7 @@ * SUCH DAMAGE. */ -#include <reactos/asm.h> +#include <asm.inc> PUBLIC __aullshr Modified: branches/cmake-bringup/lib/sdk/crt/math/i386/ceil_asm.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/i386/ceil_asm.s [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/i386/ceil_asm.s [iso-8859-1] Mon Nov 15 01:29:12 2010 @@ -34,7 +34,7 @@ * SUCH DAMAGE. */ -#include <reactos/asm.h> +#include <asm.inc> PUBLIC _ceil Modified: branches/cmake-bringup/lib/sdk/crt/math/i386/ceilf.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/i386/ceilf.S [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/i386/ceilf.S [iso-8859-1] Mon Nov 15 01:29:12 2010 @@ -4,7 +4,7 @@ * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ -#include <reactos/asm.h> +#include <asm.inc> .code .align 4 Modified: branches/cmake-bringup/lib/sdk/crt/math/i386/cos_asm.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/i386/cos_asm.s [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/i386/cos_asm.s [iso-8859-1] Mon Nov 15 01:29:12 2010 @@ -34,7 +34,7 @@ * SUCH DAMAGE. */ -#include <reactos/asm.h> +#include <asm.inc> PUBLIC _cos Modified: branches/cmake-bringup/lib/sdk/crt/math/i386/exp_asm.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/i386/exp_asm.s [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/i386/exp_asm.s [iso-8859-1] Mon Nov 15 01:29:12 2010 @@ -1,5 +1,5 @@ -#include <reactos/asm.h> +#include <asm.inc> PUBLIC _exp Modified: branches/cmake-bringup/lib/sdk/crt/math/i386/fabs_asm.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/i386/fabs_asm.s [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/i386/fabs_asm.s [iso-8859-1] Mon Nov 15 01:29:12 2010 @@ -34,7 +34,7 @@ * SUCH DAMAGE. */ -#include <reactos/asm.h> +#include <asm.inc> PUBLIC _fabs Modified: branches/cmake-bringup/lib/sdk/crt/math/i386/floor_asm.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/i386/floor_asm.s [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/i386/floor_asm.s [iso-8859-1] Mon Nov 15 01:29:12 2010 @@ -34,7 +34,7 @@ * SUCH DAMAGE. */ -#include <reactos/asm.h> +#include <asm.inc> PUBLIC _floor Modified: branches/cmake-bringup/lib/sdk/crt/math/i386/floorf.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/i386/floorf.S [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/i386/floorf.S [iso-8859-1] Mon Nov 15 01:29:12 2010 @@ -8,7 +8,7 @@ * Danny Smith <dannysmith(a)users.sourceforge.net> */ -#include <reactos/asm.h> +#include <asm.inc> .code .align 4 Modified: branches/cmake-bringup/lib/sdk/crt/math/i386/fmod_asm.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/i386/fmod_asm.s [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/i386/fmod_asm.s [iso-8859-1] Mon Nov 15 01:29:12 2010 @@ -1,5 +1,5 @@ -#include <reactos/asm.h> +#include <asm.inc> PUBLIC _fmod Modified: branches/cmake-bringup/lib/sdk/crt/math/i386/fmodf_asm.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/i386/fmodf_asm.s [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/i386/fmodf_asm.s [iso-8859-1] Mon Nov 15 01:29:12 2010 @@ -1,5 +1,5 @@ -#include <reactos/asm.h> +#include <asm.inc> PUBLIC _fmodf Modified: branches/cmake-bringup/lib/sdk/crt/math/i386/ftol_asm.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/i386/ftol_asm.s [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/i386/ftol_asm.s [iso-8859-1] Mon Nov 15 01:29:12 2010 @@ -34,7 +34,7 @@ * SUCH DAMAGE. */ -#include <reactos/asm.h> +#include <asm.inc> PUBLIC __ftol Modified: branches/cmake-bringup/lib/sdk/crt/math/i386/log10_asm.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/i386/log10_asm.s [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/i386/log10_asm.s [iso-8859-1] Mon Nov 15 01:29:12 2010 @@ -8,7 +8,7 @@ * */ -#include <reactos/asm.h> +#include <asm.inc> PUBLIC _log10 Modified: branches/cmake-bringup/lib/sdk/crt/math/i386/log_asm.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/i386/log_asm.s [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/i386/log_asm.s [iso-8859-1] Mon Nov 15 01:29:12 2010 @@ -34,7 +34,7 @@ * SUCH DAMAGE. */ -#include <reactos/asm.h> +#include <asm.inc> PUBLIC _log Modified: branches/cmake-bringup/lib/sdk/crt/math/i386/pow_asm.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/i386/pow_asm.s [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/i386/pow_asm.s [iso-8859-1] Mon Nov 15 01:29:12 2010 @@ -20,7 +20,7 @@ 02111-1307 USA. */ /* Reactos modifications */ -#include <reactos/asm.h> +#include <asm.inc> #define ALIGNARG(log2) log2 #define ASM_TYPE_DIRECTIVE(name,typearg) @@ -29,9 +29,8 @@ PUBLIC _pow - .data - .text -ASSUME CS:NOTHING, DS:NOTHING, ES:NOTHING, FS:NOTHING, GS:NOTHING +.data +ASSUME nothing .align ALIGNARG(4) ASM_TYPE_DIRECTIVE(infinity,@object) @@ -77,8 +76,7 @@ #define MOX(op,x,f) op[x*f] #endif - .code - .text +.code _pow: fld qword ptr [esp + 12] // y fxam Modified: branches/cmake-bringup/lib/sdk/crt/math/i386/sin_asm.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/i386/sin_asm.s [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/i386/sin_asm.s [iso-8859-1] Mon Nov 15 01:29:12 2010 @@ -34,7 +34,7 @@ * SUCH DAMAGE. */ -#include <reactos/asm.h> +#include <asm.inc> PUBLIC _sin Modified: branches/cmake-bringup/lib/sdk/crt/math/i386/sqrt_asm.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/i386/sqrt_asm.s [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/i386/sqrt_asm.s [iso-8859-1] Mon Nov 15 01:29:12 2010 @@ -34,7 +34,7 @@ * SUCH DAMAGE. */ -#include <reactos/asm.h> +#include <asm.inc> PUBLIC _sqrt Modified: branches/cmake-bringup/lib/sdk/crt/math/i386/tan_asm.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/i386/tan_asm.s [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/i386/tan_asm.s [iso-8859-1] Mon Nov 15 01:29:12 2010 @@ -34,7 +34,7 @@ * SUCH DAMAGE. */ -#include <reactos/asm.h> +#include <asm.inc> PUBLIC _tan Modified: branches/cmake-bringup/lib/sdk/crt/mem/i386/memchr_asm.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/mem/i… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/mem/i386/memchr_asm.s [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/mem/i386/memchr_asm.s [iso-8859-1] Mon Nov 15 01:29:12 2010 @@ -5,7 +5,8 @@ * FILE: lib/sdk/crt/mem/i386/memchr.s */ -#include <reactos/asm.h> +#include <asm.inc> +#include <ks386.inc> /* * void* memchr(const void* s, int c, size_t n) Modified: branches/cmake-bringup/lib/sdk/crt/mem/i386/memmove_asm.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/mem/i… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/mem/i386/memmove_asm.s [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/mem/i386/memmove_asm.s [iso-8859-1] Mon Nov 15 01:29:12 2010 @@ -1,10 +1,10 @@ /* * void *memcpy (void *to, const void *from, size_t count) * - * NOTE: This code is a duplicate of memmove function from memmove_asm.s */ -#include <reactos/asm.h> +#include <asm.inc> +#include <ks386.inc> PUBLIC _memcpy PUBLIC _memmove Modified: branches/cmake-bringup/lib/sdk/crt/mem/i386/memset_asm.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/mem/i… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/mem/i386/memset_asm.s [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/mem/i386/memset_asm.s [iso-8859-1] Mon Nov 15 01:29:12 2010 @@ -2,7 +2,8 @@ * $Id$ */ -#include <reactos/asm.h> +#include <asm.inc> +#include <ks386.inc> /* * void *memset (void *src, int val, size_t count) Modified: branches/cmake-bringup/lib/sdk/crt/setjmp/amd64/setjmp.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/setjm… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/setjmp/amd64/setjmp.s [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/setjmp/amd64/setjmp.s [iso-8859-1] Mon Nov 15 01:29:12 2010 @@ -8,8 +8,8 @@ /* INCLUDES ******************************************************************/ -#include <reactos/asm.h> -#include <ndk/amd64/asm.h> +#include <asm.inc> +#include <ksamd64.inc> #define JUMP_BUFFER_Frame 0x00 #define JUMP_BUFFER_Rbx 0x08 @@ -156,3 +156,5 @@ inc rax 2: jmp r8 .endp longjmp + +END Modified: branches/cmake-bringup/lib/sdk/crt/setjmp/i386/setjmp.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/setjm… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/setjmp/i386/setjmp.s [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/setjmp/i386/setjmp.s [iso-8859-1] Mon Nov 15 01:29:12 2010 @@ -9,8 +9,7 @@ * complete implementation */ -#include <reactos/asm.h> -#include <ndk/asm.h> +#include <asm.inc> #define JB_BP 0 #define JB_BX 1 Modified: branches/cmake-bringup/lib/sdk/crt/string/i386/tcscat.inc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/strin… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/string/i386/tcscat.inc [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/string/i386/tcscat.inc [iso-8859-1] Mon Nov 15 01:29:12 2010 @@ -2,7 +2,7 @@ */ #include "tchar.h" -#include <reactos/asm.h> +#include <asm.inc> PUBLIC _tcscat .code Modified: branches/cmake-bringup/lib/sdk/crt/string/i386/tcschr.inc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/strin… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/string/i386/tcschr.inc [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/string/i386/tcschr.inc [iso-8859-1] Mon Nov 15 01:29:12 2010 @@ -2,7 +2,7 @@ */ #include "tchar.h" -#include <reactos/asm.h> +#include <asm.inc> PUBLIC _tcschr .code Modified: branches/cmake-bringup/lib/sdk/crt/string/i386/tcscmp.inc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/strin… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/string/i386/tcscmp.inc [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/string/i386/tcscmp.inc [iso-8859-1] Mon Nov 15 01:29:12 2010 @@ -2,7 +2,7 @@ */ #include "tchar.h" -#include <reactos/asm.h> +#include <asm.inc> PUBLIC _tcscmp .code Modified: branches/cmake-bringup/lib/sdk/crt/string/i386/tcscpy.inc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/strin… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/string/i386/tcscpy.inc [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/string/i386/tcscpy.inc [iso-8859-1] Mon Nov 15 01:29:12 2010 @@ -2,7 +2,7 @@ */ #include "tchar.h" -#include <reactos/asm.h> +#include <asm.inc> PUBLIC _tcscpy .code Modified: branches/cmake-bringup/lib/sdk/crt/string/i386/tcslen.inc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/strin… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/string/i386/tcslen.inc [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/string/i386/tcslen.inc [iso-8859-1] Mon Nov 15 01:29:12 2010 @@ -2,7 +2,7 @@ */ #include "tchar.h" -#include <reactos/asm.h> +#include <asm.inc> PUBLIC _tcslen .code Modified: branches/cmake-bringup/lib/sdk/crt/string/i386/tcsncat.inc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/strin… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/string/i386/tcsncat.inc [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/string/i386/tcsncat.inc [iso-8859-1] Mon Nov 15 01:29:12 2010 @@ -2,7 +2,7 @@ */ #include "tchar.h" -#include <reactos/asm.h> +#include <asm.inc> PUBLIC _tcsncat .code Modified: branches/cmake-bringup/lib/sdk/crt/string/i386/tcsncmp.inc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/strin… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/string/i386/tcsncmp.inc [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/string/i386/tcsncmp.inc [iso-8859-1] Mon Nov 15 01:29:12 2010 @@ -2,7 +2,7 @@ */ #include "tchar.h" -#include <reactos/asm.h> +#include <asm.inc> PUBLIC _tcsncmp .code Modified: branches/cmake-bringup/lib/sdk/crt/string/i386/tcsncpy.inc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/strin… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/string/i386/tcsncpy.inc [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/string/i386/tcsncpy.inc [iso-8859-1] Mon Nov 15 01:29:12 2010 @@ -2,7 +2,7 @@ */ #include "tchar.h" -#include <reactos/asm.h> +#include <asm.inc> PUBLIC _tcsncpy .code Modified: branches/cmake-bringup/lib/sdk/crt/string/i386/tcsnlen.inc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/strin… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/string/i386/tcsnlen.inc [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/string/i386/tcsnlen.inc [iso-8859-1] Mon Nov 15 01:29:12 2010 @@ -2,7 +2,7 @@ */ #include "tchar.h" -#include <reactos/asm.h> +#include <asm.inc> PUBLIC _tcsnlen .code Modified: branches/cmake-bringup/lib/sdk/crt/string/i386/tcsrchr.inc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/strin… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/string/i386/tcsrchr.inc [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/string/i386/tcsrchr.inc [iso-8859-1] Mon Nov 15 01:29:12 2010 @@ -2,7 +2,7 @@ */ #include "tchar.h" -#include <reactos/asm.h> +#include <asm.inc> PUBLIC _tcsrchr .code

13 years, 11 months

[tkreuzer] 49590: [CMAKE] Add include/asm to asm include pathes

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Nov 15 01:09:10 2010 New Revision: 49590 URL: http://svn.reactos.org/svn/reactos?rev=49590&view=rev Log: [CMAKE] Add include/asm to asm include pathes Modified: branches/cmake-bringup/toolchain-mingw32.cmake branches/cmake-bringup/toolchain-msvc.cmake Modified: branches/cmake-bringup/toolchain-mingw32.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/toolchain-mingw32… ============================================================================== --- branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] Mon Nov 15 01:09:10 2010 @@ -25,7 +25,7 @@ SET(CMAKE_CXX_COMPILER ${MINGW_PREFIX}g++) SET(CMAKE_RC_COMPILER ${MINGW_PREFIX}windres) SET(CMAKE_ASM_COMPILER ${MINGW_PREFIX}gcc) -SET(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> -x assembler-with-cpp -o <OBJECT> <FLAGS> <DEFINES> -D__ASM__ -c <SOURCE>") +SET(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> -x assembler-with-cpp -o <OBJECT> -I${REACTOS_SOURCE_DIR}/include/asm -I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> -D__ASM__ -c <SOURCE>") SET(CMAKE_IDL_COMPILER native-widl) SET(CMAKE_IDL_COMPILE_OBJECT "<CMAKE_IDL_COMPILER> <FLAGS> <DEFINES> -m32 --win32 -h -H <OBJECT> <SOURCE>") Modified: branches/cmake-bringup/toolchain-msvc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/toolchain-msvc.cm… ============================================================================== --- branches/cmake-bringup/toolchain-msvc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/toolchain-msvc.cmake [iso-8859-1] Mon Nov 15 01:09:10 2010 @@ -35,7 +35,7 @@ SET(CMAKE_IDL_COMPILE_OBJECT "<CMAKE_IDL_COMPILER> <FLAGS> <DEFINES> /win32 /Dstrict_context_handle= /h <OBJECT> <SOURCE>") SET(CMAKE_ASM_COMPILE_OBJECT - "<CMAKE_C_COMPILER> <FLAGS> <DEFINES> /D__ASM__ /D_USE_ML /EP /c <SOURCE> > <OBJECT>.tmp" + "<CMAKE_C_COMPILER> /X /I${REACTOS_SOURCE_DIR}/include/asm /I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> /D__ASM__ /D_USE_ML /EP /c <SOURCE> > <OBJECT>.tmp" "<CMAKE_ASM_COMPILER> /Fo<OBJECT> /c /Ta <OBJECT>.tmp") set(CMAKE_C_FLAGS_INIT "/DWIN32 /D_WINDOWS /W1 /Zm1000")

13 years, 11 months

[tkreuzer] 49589: [RTL] Make asm files compilable with ML

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Nov 15 01:03:14 2010 New Revision: 49589 URL: http://svn.reactos.org/svn/reactos?rev=49589&view=rev Log: [RTL] Make asm files compilable with ML Modified: branches/cmake-bringup/lib/rtl/CMakeLists.txt branches/cmake-bringup/lib/rtl/amd64/debug_asm.S branches/cmake-bringup/lib/rtl/amd64/except_asm.S branches/cmake-bringup/lib/rtl/amd64/rtlmem.S branches/cmake-bringup/lib/rtl/amd64/slist.S branches/cmake-bringup/lib/rtl/i386/debug_asm.S branches/cmake-bringup/lib/rtl/i386/except_asm.s branches/cmake-bringup/lib/rtl/i386/interlck.S branches/cmake-bringup/lib/rtl/i386/res_asm.s branches/cmake-bringup/lib/rtl/i386/rtlmem.s Modified: branches/cmake-bringup/lib/rtl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rtl/CMakeList… ============================================================================== --- branches/cmake-bringup/lib/rtl/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rtl/CMakeLists.txt [iso-8859-1] Mon Nov 15 01:03:14 2010 @@ -100,4 +100,4 @@ add_library(rtl ${CMAKE_CURRENT_BINARY_DIR}/rtl_rtl.h.gch ${SOURCE}) add_pch(rtl ${CMAKE_CURRENT_SOURCE_DIR}/rtl.h ${SOURCE}) -add_dependencies(rtl psdk) +add_dependencies(rtl psdk ks386) Modified: branches/cmake-bringup/lib/rtl/amd64/debug_asm.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rtl/amd64/deb… ============================================================================== --- branches/cmake-bringup/lib/rtl/amd64/debug_asm.S [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rtl/amd64/debug_asm.S [iso-8859-1] Mon Nov 15 01:03:14 2010 @@ -6,7 +6,7 @@ * PROGRAMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) */ -#include <reactos/asm.h> +#include <asm.inc> /* GLOBALS ****************************************************************/ Modified: branches/cmake-bringup/lib/rtl/amd64/except_asm.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rtl/amd64/exc… ============================================================================== --- branches/cmake-bringup/lib/rtl/amd64/except_asm.S [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rtl/amd64/except_asm.S [iso-8859-1] Mon Nov 15 01:03:14 2010 @@ -8,8 +8,8 @@ /* INCLUDES ******************************************************************/ -#include <reactos/asm.h> -#include <ndk/amd64/asm.h> +#include <asm.inc> +#include <ksamd64.inc> /* FUNCTIONS *****************************************************************/ Modified: branches/cmake-bringup/lib/rtl/amd64/rtlmem.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rtl/amd64/rtl… ============================================================================== --- branches/cmake-bringup/lib/rtl/amd64/rtlmem.S [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rtl/amd64/rtlmem.S [iso-8859-1] Mon Nov 15 01:03:14 2010 @@ -8,8 +8,7 @@ /* INCLUDES ******************************************************************/ -#include <reactos/asm.h> -#include <ndk/amd64/asm.h> +#include <asm.inc> /* FUNCTIONS *****************************************************************/ Modified: branches/cmake-bringup/lib/rtl/amd64/slist.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rtl/amd64/sli… ============================================================================== --- branches/cmake-bringup/lib/rtl/amd64/slist.S [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rtl/amd64/slist.S [iso-8859-1] Mon Nov 15 01:03:14 2010 @@ -6,8 +6,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <reactos/asm.h> -#include <ndk/amd64/asm.h> +#include <asm.inc> +#include <ksamd64.inc> #define SLIST8A_DEPTH_MASK HEX(000000000000FFFF) #define SLIST8A_DEPTH_INC HEX(0000000000000001) Modified: branches/cmake-bringup/lib/rtl/i386/debug_asm.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rtl/i386/debu… ============================================================================== --- branches/cmake-bringup/lib/rtl/i386/debug_asm.S [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rtl/i386/debug_asm.S [iso-8859-1] Mon Nov 15 01:03:14 2010 @@ -6,7 +6,7 @@ * PROGRAMER: Alex Ionescu (alex(a)relsoft.net) */ -#include <reactos/asm.h> +#include <asm.inc> /* GLOBALS ****************************************************************/ Modified: branches/cmake-bringup/lib/rtl/i386/except_asm.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rtl/i386/exce… ============================================================================== --- branches/cmake-bringup/lib/rtl/i386/except_asm.s [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rtl/i386/except_asm.s [iso-8859-1] Mon Nov 15 01:03:14 2010 @@ -9,8 +9,8 @@ /* INCLUDES ******************************************************************/ -#include <reactos/asm.h> -#include <ndk/asm.h> +#include <asm.inc> +#include <ks386.inc> EXTERN _RtlpCheckForActiveDebugger@0:PROC EXTERN _RtlDispatchException@8:PROC Modified: branches/cmake-bringup/lib/rtl/i386/interlck.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rtl/i386/inte… ============================================================================== --- branches/cmake-bringup/lib/rtl/i386/interlck.S [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rtl/i386/interlck.S [iso-8859-1] Mon Nov 15 01:03:14 2010 @@ -6,7 +6,7 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <reactos/asm.h> +#include <asm.inc> /* FUNCTIONS ****************************************************************/ .code Modified: branches/cmake-bringup/lib/rtl/i386/res_asm.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rtl/i386/res_… ============================================================================== --- branches/cmake-bringup/lib/rtl/i386/res_asm.s [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rtl/i386/res_asm.s [iso-8859-1] Mon Nov 15 01:03:14 2010 @@ -1,6 +1,13 @@ +/* + * COPYRIGHT: GNU GPL - See COPYING in the top level directory + * PROJECT: ReactOS Run-Time Library + * PURPOSE: + * FILE: lib/rtl/i386/res_asm.S + * PROGRAMER: + */ -#include <reactos/asm.h> -#include <ndk/asm.h> +#include <asm.inc> +#include <ks386.inc> EXTERN _LdrpAccessResource@16:PROC Modified: branches/cmake-bringup/lib/rtl/i386/rtlmem.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rtl/i386/rtlm… ============================================================================== --- branches/cmake-bringup/lib/rtl/i386/rtlmem.s [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rtl/i386/rtlmem.s [iso-8859-1] Mon Nov 15 01:03:14 2010 @@ -1,12 +1,12 @@ /* - * COPYRIGHT: See COPYING in the top level directory + * COPYRIGHT: GNU GPL - See COPYING in the top level directory * PROJECT: ReactOS Run-Time Library * PURPOSE: Memory functions * FILE: lib/rtl/i386/rtlswap.S * PROGRAMER: Alex Ionescu (alex.ionescu(a)reactos.org) */ -#include <reactos/asm.h> +#include <asm.inc> /* GLOBALS *******************************************************************/

13 years, 11 months

[tkreuzer] 49588: [FREELDR] Convert fathelp.S into ML compatible code. The result is identical to the old version when compiled with gcc, but slightly different when compiled with ml. Especially th...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Nov 14 17:46:56 2010 New Revision: 49588 URL: http://svn.reactos.org/svn/reactos?rev=49588&view=rev Log: [FREELDR] Convert fathelp.S into ML compatible code. The result is identical to the old version when compiled with gcc, but slightly different when compiled with ml. Especially the code starts at position 6 instead of 0, with a one byte text section at the top, this needs more investigation. also there is a large reg move, but that doesn't hurt. Finally the padding at the end doesn't work at all. Modified: branches/cmake-bringup/boot/freeldr/freeldr/arch/i386/fathelp.S Modified: branches/cmake-bringup/boot/freeldr/freeldr/arch/i386/fathelp.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/freeldr/free… ============================================================================== --- branches/cmake-bringup/boot/freeldr/freeldr/arch/i386/fathelp.S [iso-8859-1] (original) +++ branches/cmake-bringup/boot/freeldr/freeldr/arch/i386/fathelp.S [iso-8859-1] Sun Nov 14 17:46:56 2010 @@ -2,24 +2,24 @@ // FAT12/16 Boot Sector Helper Code // Copyright (c) 1998, 2001, 2002, 2003 Brian Palmer -.intel_syntax noprefix +#include <asm.inc> //org 8000h -.text +//.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 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 @@ -41,7 +41,7 @@ #define VolumeLabel 43 #define FileSystem 54 -#define BootPartition 0x7dfd +#define BootPartition HEX(7dfd) // This code will be stored in the first 512 bytes @@ -52,13 +52,13 @@ // 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 +PUBLIC _mainCRTStartup // For Mingw32 builds where the linker looks for this symbol _mainCRTStartup: -.global start +PUBLIC start start: - .byte 0xe9 - .byte 0xfd - .byte 0x01 + .byte HEX(e9) + .byte HEX(fd) + .byte HEX(01) // Now starts the extra boot code that we will store // in the first 512 bytes of freeldr.sys. This code @@ -74,7 +74,7 @@ // Display "Loading FreeLoader..." message mov esi, offset msgLoading // Loading message - call [bp-PutCharsOffset] // Display it + call word ptr [bp-PutCharsOffset] // Display it call ReadFatIntoMemory @@ -82,7 +82,7 @@ pop ax // Restore AX (start cluster) // AX has start cluster of freeldr.sys - mov bx,0x800 + mov bx, HEX(800) mov es,bx LoadFile: @@ -90,16 +90,16 @@ call IsFat12 pop ax jnc LoadFile2 - cmp ax,0x0ff8 // Check to see if this is the last cluster in the chain + cmp ax, HEX(0ff8) // Check to see if this is the last cluster in the chain jmp LoadFile3 LoadFile2: - cmp ax,0x0fff8 + 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 [bp-ReadClusterOffset] + call word ptr [bp-ReadClusterOffset] pop es xor bx,bx @@ -123,12 +123,12 @@ 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 + mov dl, byte ptr [bp+BootDrive] // Load the boot drive into DL + mov dh, byte ptr ds:[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) + mov bx, ds: [HEX(8000) + HEX(A8)] // load the RVA of the EntryPoint into eax + add bx, HEX(8000) // RVA -> VA and skip 3 bytes (jump to fathelper code) push bx // push offset retf // Transfer control to FreeLoader @@ -139,10 +139,10 @@ add ax, [bp+ReservedSectors] adc dx, 0 mov cx, [bp+SectorsPerFat] - mov bx,0x7000 + mov bx, HEX(7000) mov es,bx xor bx,bx - call [bp-ReadSectorsOffset] + call word ptr [bp-ReadSectorsOffset] ret @@ -155,7 +155,7 @@ mul cx shl dx,12 - mov bx,0x7000 + mov bx, HEX(7000) add bx,dx mov es,bx mov bx,ax // Restore FAT entry offset @@ -174,19 +174,19 @@ shr ax,1 add ax,cx // AX = AX * 1.5 (AX = AX + (AX / 2)) (since FAT12 entries are 12 bits) - mov bx,0x7000 + 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,0x0fff0 + and ax, HEX(0fff0) shr ax,4 jmp GetFatEntry12_Done UseLow12Bits: - and ax,0x0fff + and ax, HEX(0fff) GetFatEntry12_Done: @@ -197,17 +197,17 @@ // Otherwise CF = 0 for FAT16 IsFat12: - mov ebx, [bp-DataAreaStartLow] + 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, [bp+HiddenSectors] + sub ebx, dword ptr [bp+HiddenSectors] xor eax,eax - mov ax, [bp+TotalSectors] + mov ax, word ptr [bp+TotalSectors] cmp ax, 0 jnz IsFat12_2 - mov eax, [bp+TotalSectorsBig] + mov eax, dword ptr [bp+TotalSectorsBig] // EAX now contains the number of sectors on the volume @@ -231,5 +231,9 @@ msgLoading: .asciz "Loading FreeLoader...\r\n" - .org 0x1fe // Pad to 510 bytes - .word 0x0aa55 // BootSector signature + .org HEX(1fe) // Pad to 510 bytes + .word HEX(0aa55) // BootSector signature + +.endcode16 + +END

13 years, 11 months

← Newer
1
...
26
27
28
29
30
31
32
...
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 November 2010