Ros-diffs September 2007

ros-diffs@reactos.org

19 participants
589 discussions

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Mon Sep 3 12:57:19 2007 New Revision: 28808 URL: http://svn.reactos.org/svn/reactos?rev=28808&view=rev Log: Fix build Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/fa… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/fat.c (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/fat.c Mon Sep 3 12:57:19 2007 @@ -234,8 +234,6 @@ DbgPrint((DPRINT_FILESYSTEM, "BootSectorMagic: 0x%x\n", FatVolumeBootSector->BootSectorMagic)); } -#endif // !defined NDEBUG - // // Set the correct partition offset // Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=2… ============================================================================== --- trunk/reactos/include/psdk/winnt.h (original) +++ trunk/reactos/include/psdk/winnt.h Mon Sep 3 12:57:19 2007 @@ -2,10 +2,6 @@ #define _WINNT_H #if __GNUC__ >= 3 #pragma GCC system_header -#endif - -#ifdef __GNUC__ -#include "intrin.h" #endif /* translate GCC target defines to MS equivalents. Keep this synchronized @@ -250,6 +246,10 @@ typedef BYTE FCHAR; typedef WORD FSHORT; typedef DWORD FLONG; + +#ifdef __GNUC__ +#include "intrin.h" +#endif #define NTAPI __stdcall #include <basetsd.h>

17 years, 2 months

[hpoussin] 28807: Add a generic implementation of InterlockedBitTestAndSet/InterlockedBitTestAndReset/BitScanReverse

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Mon Sep 3 12:50:06 2007 New Revision: 28807 URL: http://svn.reactos.org/svn/reactos?rev=28807&view=rev Log: Add a generic implementation of InterlockedBitTestAndSet/InterlockedBitTestAndReset/BitScanReverse Modified: trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=2… ============================================================================== --- trunk/reactos/include/psdk/winnt.h (original) +++ trunk/reactos/include/psdk/winnt.h Mon Sep 3 12:50:06 2007 @@ -4,6 +4,9 @@ #pragma GCC system_header #endif +#ifdef __GNUC__ +#include "intrin.h" +#endif /* translate GCC target defines to MS equivalents. Keep this synchronized with windows.h. */ @@ -2341,7 +2344,7 @@ #endif } CONTEXT; -#elif defined(MIPS) +#elif defined(_MIPS_) /* The following flags control the contents of the CONTEXT structure. */ @@ -4039,28 +4042,32 @@ #if defined(__GNUC__) -#ifdef _M_IX86 +#if defined(_M_IX86) static __inline__ PVOID GetCurrentFiber(void) { void* ret; __asm__ __volatile__ ( - "movl %%fs:0x10,%0" - : "=r" (ret) /* allow use of reg eax,ebx,ecx,edx,esi,edi */ - ); + "movl %%fs:0x10,%0" + : "=r" (ret) /* allow use of reg eax,ebx,ecx,edx,esi,edi */ + ); return ret; } #else +#if defined(_M_PPC) static __inline__ __attribute__((always_inline)) unsigned long __readfsdword_winnt(const unsigned long Offset) { unsigned long result; __asm__("\tadd 7,13,%1\n" - "\tlwz %0,0(7)\n" - : "=r" (result) - : "r" (Offset) - : "r7"); + "\tlwz %0,0(7)\n" + : "=r" (result) + : "r" (Offset) + : "r7"); return result; } +#else +#error Unknown architecture +#endif static __inline__ PVOID GetCurrentFiber(void) { return __readfsdword_winnt(0x10); @@ -4147,78 +4154,36 @@ InterlockedBitTestAndSet(IN LONG volatile *Base, IN LONG Bit) { +#if defined(_M_IX86) LONG OldBit; - -#ifdef _M_IX86 __asm__ __volatile__("lock " "btsl %2,%1\n\t" "sbbl %0,%0\n\t" - :"=r" (OldBit),"=m" (*Base) - :"Ir" (Bit) - : "memory"); -#elif defined(_M_PPC) - LONG scratch = 0; - - Bit = 1 << Bit; - /* %0 - OldBit - * %1 - Bit - * %2 - scratch - * %3 - Base - */ - __asm__ __volatile__( - "sync\n" - "0:\n\t" - "lwarx %2,0,%3\n\t" - "mr %0,%2\n\t" - "or %2,%1,%2\n\t" - "stwcx. %2,0,%3\n\t" - "bne- 0b\n\t" : - "=r" (OldBit) : - "r" (Bit), - "r" (scratch), - "r" (Base) - ); -#endif + :"=r" (OldBit),"=m" (*Base) + :"Ir" (Bit) + : "memory"); return OldBit; +#else + return (_InterlockedOr(Base, 1 << Bit) >> Bit) & 1; +#endif } static __inline__ BOOLEAN InterlockedBitTestAndReset(IN LONG volatile *Base, - IN LONG Bit) + IN LONG Bit) { +#if defined(_M_IX86) LONG OldBit; - -#ifdef _M_IX86 __asm__ __volatile__("lock " "btrl %2,%1\n\t" "sbbl %0,%0\n\t" - :"=r" (OldBit),"=m" (*Base) - :"Ir" (Bit) - : "memory"); -#elif defined(_M_PPC) - LONG scratch = 0; - - Bit = ~(1 << Bit); - /* %0 - OldBit - * %1 - Bit - * %2 - scratch - * %3 - Base - */ - __asm__ __volatile__( - "sync\n" - "0:\n\t" - "lwarx %2,0,%3\n\t" - "mr %0,%2\n\t" - "and %2,%1,%2\n\t" - "stwcx. %2,0,%3\n\t" - "bne- 0b\n\t" : - "=r" (OldBit) : - "r" (Bit), - "r" (scratch), - "r" (Base) - ); -#endif + :"=r" (OldBit),"=m" (*Base) + :"Ir" (Bit) + : "memory"); return OldBit; +#else + return (_InterlockedAnd(Base, ~(1 << Bit)) >> Bit) & 1; +#endif } static __inline__ BOOLEAN @@ -4226,14 +4191,14 @@ IN ULONG Mask) { BOOLEAN BitPosition = 0; -#ifdef _M_IX86 +#if defined(_M_IX86) __asm__ __volatile__("bsrl %2,%0\n\t" "setnz %1\n\t" - :"=&r" (*Index), "=r" (BitPosition) - :"rm" (Mask) - :"memory"); + :"=&r" (*Index), "=r" (BitPosition) + :"rm" (Mask) + :"memory"); return BitPosition; -#elif defined(_M_PPC) +#else /* Slow implementation for now */ for( *Index = 31; *Index; *Index-- ) { if( (1<<*Index) & Mask ) { @@ -4247,10 +4212,14 @@ #endif -#ifdef _M_IX86 +#if defined(_M_IX86) #define YieldProcessor() __asm__ __volatile__("pause"); #elif defined(_M_PPC) #define YieldProcessor() __asm__ __volatile__("nop"); +#elif defined(_M_MIPS) +#define YieldProcessor() __asm__ __volatile__("nop"); +#else +#error Unknown architecture #endif #if defined(_AMD64_)

17 years, 2 months

[hpoussin] 28806: Swap boot sector on big endian systems, even if DEBUG is not defined. Debug and release builds should behave the same

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Mon Sep 3 12:17:55 2007 New Revision: 28806 URL: http://svn.reactos.org/svn/reactos?rev=28806&view=rev Log: Swap boot sector on big endian systems, even if DEBUG is not defined. Debug and release builds should behave the same Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/fa… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/fat.c (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/fat.c Mon Sep 3 12:17:55 2007 @@ -39,80 +39,80 @@ VOID FatSwapFatBootSector(PFAT_BOOTSECTOR Obj) { - SW(Obj, BytesPerSector); - SW(Obj, ReservedSectors); - SW(Obj, RootDirEntries); - SW(Obj, TotalSectors); - SW(Obj, SectorsPerFat); - SW(Obj, SectorsPerTrack); - SW(Obj, NumberOfHeads); - SD(Obj, HiddenSectors); - SD(Obj, TotalSectorsBig); - SD(Obj, VolumeSerialNumber); - SW(Obj, BootSectorMagic); + SW(Obj, BytesPerSector); + SW(Obj, ReservedSectors); + SW(Obj, RootDirEntries); + SW(Obj, TotalSectors); + SW(Obj, SectorsPerFat); + SW(Obj, SectorsPerTrack); + SW(Obj, NumberOfHeads); + SD(Obj, HiddenSectors); + SD(Obj, TotalSectorsBig); + SD(Obj, VolumeSerialNumber); + SW(Obj, BootSectorMagic); } VOID FatSwapFat32BootSector(PFAT32_BOOTSECTOR Obj) { - SW(Obj, BytesPerSector); - SW(Obj, ReservedSectors); - SW(Obj, RootDirEntries); - SW(Obj, TotalSectors); - SW(Obj, SectorsPerFat); - SW(Obj, NumberOfHeads); - SD(Obj, HiddenSectors); - SD(Obj, TotalSectorsBig); - SD(Obj, SectorsPerFatBig); - SW(Obj, ExtendedFlags); - SW(Obj, FileSystemVersion); - SD(Obj, RootDirStartCluster); - SW(Obj, FsInfo); - SW(Obj, BackupBootSector); - SD(Obj, VolumeSerialNumber); - SW(Obj, BootSectorMagic); + SW(Obj, BytesPerSector); + SW(Obj, ReservedSectors); + SW(Obj, RootDirEntries); + SW(Obj, TotalSectors); + SW(Obj, SectorsPerFat); + SW(Obj, NumberOfHeads); + SD(Obj, HiddenSectors); + SD(Obj, TotalSectorsBig); + SD(Obj, SectorsPerFatBig); + SW(Obj, ExtendedFlags); + SW(Obj, FileSystemVersion); + SD(Obj, RootDirStartCluster); + SW(Obj, FsInfo); + SW(Obj, BackupBootSector); + SD(Obj, VolumeSerialNumber); + SW(Obj, BootSectorMagic); } VOID FatSwapFatXBootSector(PFATX_BOOTSECTOR Obj) { - SD(Obj, VolumeSerialNumber); - SD(Obj, SectorsPerCluster); - SW(Obj, NumberOfFats); + SD(Obj, VolumeSerialNumber); + SD(Obj, SectorsPerCluster); + SW(Obj, NumberOfFats); } VOID FatSwapDirEntry(PDIRENTRY Obj) { - SW(Obj, CreateTime); - SW(Obj, CreateDate); - SW(Obj, LastAccessDate); - SW(Obj, ClusterHigh); - SW(Obj, Time); - SW(Obj, Date); - SW(Obj, ClusterLow); - SD(Obj, Size); + SW(Obj, CreateTime); + SW(Obj, CreateDate); + SW(Obj, LastAccessDate); + SW(Obj, ClusterHigh); + SW(Obj, Time); + SW(Obj, Date); + SW(Obj, ClusterLow); + SD(Obj, Size); } VOID FatSwapLFNDirEntry(PLFN_DIRENTRY Obj) { - int i; - SW(Obj, StartCluster); - for(i = 0; i < 5; i++) - Obj->Name0_4[i] = SWAPW(Obj->Name0_4[i]); - for(i = 0; i < 6; i++) - Obj->Name5_10[i] = SWAPW(Obj->Name5_10[i]); - for(i = 0; i < 2; i++) - Obj->Name11_12[i] = SWAPW(Obj->Name11_12[i]); + int i; + SW(Obj, StartCluster); + for(i = 0; i < 5; i++) + Obj->Name0_4[i] = SWAPW(Obj->Name0_4[i]); + for(i = 0; i < 6; i++) + Obj->Name5_10[i] = SWAPW(Obj->Name5_10[i]); + for(i = 0; i < 2; i++) + Obj->Name11_12[i] = SWAPW(Obj->Name11_12[i]); } VOID FatSwapFatXDirEntry(PFATX_DIRENTRY Obj) { - SD(Obj, StartCluster); - SD(Obj, Size); - SW(Obj, Time); - SW(Obj, Date); - SW(Obj, CreateTime); - SW(Obj, CreateDate); - SW(Obj, LastAccessTime); - SW(Obj, LastAccessDate); + SD(Obj, StartCluster); + SD(Obj, Size); + SW(Obj, Time); + SW(Obj, Date); + SW(Obj, CreateTime); + SW(Obj, CreateDate); + SW(Obj, LastAccessTime); + SW(Obj, LastAccessDate); } BOOLEAN FatOpenVolume(ULONG DriveNumber, ULONG VolumeStartSector, ULONG PartitionSectorCount) @@ -153,17 +153,14 @@ } RtlCopyMemory(FatVolumeBootSector, (PVOID)DISKREADBUFFER, 512); - // Get the FAT type FatType = FatDetermineFatType(FatVolumeBootSector, PartitionSectorCount); -#ifdef DEBUG - + // Dump boot sector (and swap it for big endian systems) DbgPrint((DPRINT_FILESYSTEM, "Dumping boot sector:\n")); - if (ISFATX(FatType)) { - FatSwapFatXBootSector(FatXVolumeBootSector); + FatSwapFatXBootSector(FatXVolumeBootSector); DbgPrint((DPRINT_FILESYSTEM, "sizeof(FATX_BOOTSECTOR) = 0x%x.\n", sizeof(FATX_BOOTSECTOR))); DbgPrint((DPRINT_FILESYSTEM, "FileSystemType: %c%c%c%c.\n", FatXVolumeBootSector->FileSystemType[0], FatXVolumeBootSector->FileSystemType[1], FatXVolumeBootSector->FileSystemType[2], FatXVolumeBootSector->FileSystemType[3])); @@ -177,7 +174,7 @@ } else if (FatType == FAT32) { - FatSwapFat32BootSector(Fat32VolumeBootSector); + FatSwapFat32BootSector(Fat32VolumeBootSector); DbgPrint((DPRINT_FILESYSTEM, "sizeof(FAT32_BOOTSECTOR) = 0x%x.\n", sizeof(FAT32_BOOTSECTOR))); DbgPrint((DPRINT_FILESYSTEM, "JumpBoot: 0x%x 0x%x 0x%x\n", Fat32VolumeBootSector->JumpBoot[0], Fat32VolumeBootSector->JumpBoot[1], Fat32VolumeBootSector->JumpBoot[2])); @@ -211,7 +208,7 @@ } else { - FatSwapFatBootSector(FatVolumeBootSector); + FatSwapFatBootSector(FatVolumeBootSector); DbgPrint((DPRINT_FILESYSTEM, "sizeof(FAT_BOOTSECTOR) = 0x%x.\n", sizeof(FAT_BOOTSECTOR))); DbgPrint((DPRINT_FILESYSTEM, "JumpBoot: 0x%x 0x%x 0x%x\n", FatVolumeBootSector->JumpBoot[0], FatVolumeBootSector->JumpBoot[1], FatVolumeBootSector->JumpBoot[2])); @@ -237,9 +234,9 @@ DbgPrint((DPRINT_FILESYSTEM, "BootSectorMagic: 0x%x\n", FatVolumeBootSector->BootSectorMagic)); } -#endif // defined DEBUG - - // +#endif // !defined NDEBUG + + // // Set the correct partition offset // FatVolumeStartSector = VolumeStartSector; @@ -250,7 +247,7 @@ if (! ISFATX(FatType) && SWAPW(FatVolumeBootSector->BootSectorMagic) != 0xaa55) { sprintf(ErrMsg, "Invalid boot sector magic on drive 0x%x (expected 0xaa55 found 0x%x)", - DriveNumber, FatVolumeBootSector->BootSectorMagic); + DriveNumber, FatVolumeBootSector->BootSectorMagic); FileSystemError(ErrMsg); MmFreeMemory(FatVolumeBootSector); return FALSE; @@ -261,7 +258,7 @@ // We do not support clusters bigger than 64k // if ((ISFATX(FatType) && 64 * 1024 < FatXVolumeBootSector->SectorsPerCluster * 512) || - (! ISFATX(FatType) && 64 * 1024 < FatVolumeBootSector->SectorsPerCluster * FatVolumeBootSector->BytesPerSector)) + (! ISFATX(FatType) && 64 * 1024 < FatVolumeBootSector->SectorsPerCluster * FatVolumeBootSector->BytesPerSector)) { FileSystemError("This file system has cluster sizes bigger than 64k.\nFreeLoader does not support this."); MmFreeMemory(FatVolumeBootSector); @@ -342,7 +339,6 @@ // // Initialize the disk cache for this drive // - printf("About to do cache init\n"); if (!CacheInitializeDrive(DriveNumber)) { return FALSE; @@ -502,7 +498,7 @@ for (CurrentEntry=0; CurrentEntry<EntryCount; CurrentEntry++, DirectoryBuffer = ((PDIRENTRY)DirectoryBuffer)+1) { - OurLfnDirEntry = *((PLFN_DIRENTRY) DirectoryBuffer); + OurLfnDirEntry = *((PLFN_DIRENTRY) DirectoryBuffer); FatSwapLFNDirEntry(LfnDirEntry); OurDirEntry = *((PDIRENTRY) DirectoryBuffer); FatSwapDirEntry(DirEntry); @@ -518,7 +514,7 @@ // if (DirEntry->FileName[0] == '\0') { - return FALSE; + return FALSE; } // @@ -701,7 +697,7 @@ ULONG EntryCount; ULONG CurrentEntry; ULONG FileNameLen; - FATX_DIRENTRY OurDirEntry; + FATX_DIRENTRY OurDirEntry; PFATX_DIRENTRY DirEntry = &OurDirEntry; EntryCount = DirectorySize / sizeof(FATX_DIRENTRY); @@ -712,8 +708,8 @@ for (CurrentEntry = 0; CurrentEntry < EntryCount; CurrentEntry++, DirectoryBuffer = ((PFATX_DIRENTRY)DirectoryBuffer)+1) { - OurDirEntry = *(PFATX_DIRENTRY) DirectoryBuffer; - FatSwapFatXDirEntry(&OurDirEntry); + OurDirEntry = *(PFATX_DIRENTRY) DirectoryBuffer; + FatSwapFatXDirEntry(&OurDirEntry); if (0xff == DirEntry->FileNameSize) { break; @@ -811,7 +807,6 @@ // Buffer the directory contents // DirectoryBuffer = FatBufferDirectory(DirectoryStartCluster, &DirectorySize, (i == 0) ); - if (DirectoryBuffer == NULL) { return FALSE;

17 years, 2 months

[hpoussin] 28805: Add missing svn:eol-style=native properties

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Mon Sep 3 11:39:30 2007 New Revision: 28805 URL: http://svn.reactos.org/svn/reactos?rev=28805&view=rev Log: Add missing svn:eol-style=native properties Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/compat.h (props changed) trunk/reactos/boot/freeldr/freeldr/arch/powerpc/loader.c (props changed) trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mmu.c (props changed) trunk/reactos/boot/freeldr/freeldr/arch/powerpc/ofw_util.s (props changed) trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep.c (props changed) trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep.h (props changed) trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep_ide.c (props changed) trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep_pci.c (props changed) trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep_vga.c (props changed) trunk/reactos/boot/freeldr/freeldr/fs/fs.c trunk/reactos/boot/freeldr/freeldr/include/bytesex.h (props changed) trunk/reactos/boot/freeldr/freeldr/include/freeldr.h trunk/reactos/boot/freeldr/freeldr/mm/mm.c Propchange: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/compat.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/loader.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mmu.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/ofw_util.s ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep_ide.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep_pci.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep_vga.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/boot/freeldr/freeldr/fs/fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/fs… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/fs.c (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/fs.c Mon Sep 3 11:39:30 2007 @@ -26,8 +26,8 @@ // DATA ///////////////////////////////////////////////////////////////////////////////////////////// -ULONG FsType = 0; // Type of filesystem on boot device, set by FsOpenVolume() -PVOID FsStaticBufferDisk = 0, FsStaticBufferData = 0; +ULONG FsType = 0; // Type of filesystem on boot device, set by FsOpenVolume() +PVOID FsStaticBufferDisk = 0, FsStaticBufferData = 0; ///////////////////////////////////////////////////////////////////////////////////////////// // FUNCTIONS @@ -52,20 +52,17 @@ { CHAR ErrorText[80]; - printf("FsOpenVolume: (disk=%d,start=%d,count=%d,type=%d)\n", - DriveNumber, StartSector, SectorCount, Type); - FsType = Type; if( !FsStaticBufferDisk ) - FsStaticBufferDisk = MmAllocateMemory( 0x20000 ); + FsStaticBufferDisk = MmAllocateMemory( 0x20000 ); if( !FsStaticBufferDisk ) { - FileSystemError("could not allocate filesystem static buffer"); + FileSystemError("could not allocate filesystem static buffer"); return FALSE; } FsStaticBufferData = ((PCHAR)FsStaticBufferDisk) + 0x10000; - + switch (FsType) { case FS_FAT: @@ -165,7 +162,6 @@ break; } -#ifdef DEBUG // // Check return value // @@ -177,7 +173,6 @@ { DbgPrint((DPRINT_FILESYSTEM, "FsOpenFile() failed.\n")); } -#endif // defined DEBUG return FileHandle; } Propchange: trunk/reactos/boot/freeldr/freeldr/include/bytesex.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/freeldr.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/freeldr.h Mon Sep 3 11:39:30 2007 @@ -90,7 +90,10 @@ /* Swap */ #include <bytesex.h> +/* arch defines */ +#ifdef _X86_ #define Ke386EraseFlags(x) __asm__ __volatile__("pushl $0 ; popfl\n") +#endif extern BOOLEAN UserInterfaceUp; /* Tells us if the user interface is displayed */ Modified: trunk/reactos/boot/freeldr/freeldr/mm/mm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/mm… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/mm/mm.c (original) +++ trunk/reactos/boot/freeldr/freeldr/mm/mm.c Mon Sep 3 11:39:30 2007 @@ -85,21 +85,24 @@ // satisfy this allocation PagesNeeded = ROUND_UP(MemorySize, MM_PAGE_SIZE) / MM_PAGE_SIZE; +#ifdef _M_PPC + { + // We don't have enough reserve, claim some memory from openfirmware + ULONG ptr; + ptr = ofw_claim(0,MemorySize,MM_PAGE_SIZE); + MemPointer = (PVOID)(ptr); + if (MemPointer) + return MemPointer; + } +#endif + // If we don't have enough available mem // then return NULL if (FreePagesInLookupTable < PagesNeeded) { -#ifdef _M_PPC - ULONG ptr; - printf("Allocating %d bytes directly ...\n", MemorySize); - ptr = ofw_claim(0,MemorySize,MM_PAGE_SIZE); - MemPointer = (PVOID)(ptr); - return MemPointer; -#else DbgPrint((DPRINT_MEMORY, "Memory allocation failed in MmAllocateMemory(). Not enough free memory to allocate %d bytes. AllocationCount: %d\n", MemorySize, AllocationCount)); UiMessageBoxCritical("Memory allocation failed: out of memory."); return NULL; -#endif } FirstFreePageFromEnd = MmFindAvailablePages(PageLookupTableAddress, TotalPagesInLookupTable, PagesNeeded, AllocateFromEnd);

17 years, 2 months

[arty] 28804: Fix swapping for fat recognition.

by arty＠svn.reactos.org

Author: arty Date: Mon Sep 3 10:58:25 2007 New Revision: 28804 URL: http://svn.reactos.org/svn/reactos?rev=28804&view=rev Log: Fix swapping for fat recognition. Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/fa… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/fat.c (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/fat.c Mon Sep 3 10:58:25 2007 @@ -247,7 +247,7 @@ // // Check the boot sector magic // - if (! ISFATX(FatType) && FatVolumeBootSector->BootSectorMagic != 0xaa55) + if (! ISFATX(FatType) && SWAPW(FatVolumeBootSector->BootSectorMagic) != 0xaa55) { sprintf(ErrMsg, "Invalid boot sector magic on drive 0x%x (expected 0xaa55 found 0x%x)", DriveNumber, FatVolumeBootSector->BootSectorMagic);

17 years, 2 months

[arty] 28803: Fix building of libcntpr on ppc. We now get a proper bootcd image.

by arty＠svn.reactos.org

Author: arty Date: Mon Sep 3 10:29:13 2007 New Revision: 28803 URL: http://svn.reactos.org/svn/reactos?rev=28803&view=rev Log: Fix building of libcntpr on ppc. We now get a proper bootcd image. Modified: branches/powerpc/reactos/lib/mmu/mmuobject.c branches/powerpc/reactos/lib/mmu/mmutest.c branches/powerpc/reactos/lib/mmu/ppcmmu.mak trunk/reactos/ReactOS-ppc.rbuild trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep.c trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild trunk/reactos/lib/sdk/libcntpr/libcntpr.rbuild trunk/reactos/tools/ppc.lost+found/link-freeldr trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: branches/powerpc/reactos/lib/mmu/mmuobject.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/lib/mmu/mmuobje… ============================================================================== --- branches/powerpc/reactos/lib/mmu/mmuobject.c (original) +++ branches/powerpc/reactos/lib/mmu/mmuobject.c Mon Sep 3 10:29:13 2007 @@ -1,6 +1,6 @@ #include <stdarg.h> -#include "mmu.h" -#include "mmuutil.h" +#include "ppcmmu/mmu.h" +#include "ppcmmu/mmuutil.h" #include "mmuobject.h" #include "helper.h" Modified: branches/powerpc/reactos/lib/mmu/mmutest.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/lib/mmu/mmutest… ============================================================================== --- branches/powerpc/reactos/lib/mmu/mmutest.c (original) +++ branches/powerpc/reactos/lib/mmu/mmutest.c Mon Sep 3 10:29:13 2007 @@ -1,5 +1,5 @@ -#include "mmu.h" -#include "mmuutil.h" +#include "ppcmmu/mmu.h" +#include "ppcmmu/mmuutil.h" #include "mmuobject.h" int mmunitest() Modified: branches/powerpc/reactos/lib/mmu/ppcmmu.mak URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/lib/mmu/ppcmmu.… ============================================================================== --- branches/powerpc/reactos/lib/mmu/ppcmmu.mak (original) +++ branches/powerpc/reactos/lib/mmu/ppcmmu.mak Mon Sep 3 10:29:13 2007 @@ -12,20 +12,20 @@ $(AR) cr $@ $O/mmuutil.o $O/mmuutil.o: $S/mmuutil.c - $(CC) -g -c $S/mmuutil.c + $(CC) -Iinclude/reactos/libs -g -c -o $@ $S/mmuutil.c $O/libppcmmu_code.a: $O/mmuobject.o $O/mmuutil.o $O/mmutest.o - $(CC) -g -nostartfiles -nostdlib -o $O/mmuobject -Ttext=0x10000 $(LDSCRIPT) -Wl,-u,mmumain -Wl,-u,data_miss_start -Wl,-u,data_miss_end $O/mmuobject.o $O/mmuutil.o $O/mmutest.o - $(OBJCOPY) -O binary $O/mmuobject $O/mmucode - $(OBJCOPY) -I binary -O elf32-powerpc -B powerpc:common $O/mmucode $O/mmucode.o + $(CC) -nostartfiles -nostdlib -o $O/mmuobject -Ttext=0x10000 $(LDSCRIPT) -Wl,-u,mmumain -Wl,-u,data_miss_start -Wl,-u,data_miss_end $O/mmuobject.o $O/mmuutil.o $O/mmutest.o + $(OBJCOPY) -O binary $O/mmuobject mmucode + $(OBJCOPY) -I binary -O elf32-powerpc -B powerpc:common mmucode $O/mmucode.o mkdir -p `dirname $@` $(AR) cr $@ $O/mmucode.o $O/mmuobject.o: $S/mmuobject.c $S/mmuobject.h - $(CC) -Iinclude/reactos -g -c $S/mmuobject.c + $(CC) -Iinclude/reactos -Iinclude/reactos/libs -g -c -o $@ $S/mmuobject.c $O/mmutest.o: $S/mmutest.c $S/mmuobject.h - $(CC) -g -c $S/mmutest.c + $(CC) -Iinclude/reactos/libs -g -c -o $@ $S/mmutest.c -clean: - rm -f $O/*.o $O/*.a $O/mmucode $O/mmuobject +ppcmmu_clean: + rm -f $O/*.o $O/*.a mmucode $O/mmuobject Modified: trunk/reactos/ReactOS-ppc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-ppc.rbuild?rev=288… ============================================================================== --- trunk/reactos/ReactOS-ppc.rbuild (original) +++ trunk/reactos/ReactOS-ppc.rbuild Mon Sep 3 10:29:13 2007 @@ -9,7 +9,7 @@ <xi:include href="ReactOS-generic.rbuild" /> - <property name="OFWLDR_LINKFORMAT" value="-L$(INTERMEDIATE)/lib/ppcmmu -lppcmmu_code"/> + <property name="OFWLDR_LINKFORMAT" value="-L$(INTERMEDIATE)/lib/ppcmmu -lppcmmu_code -lppcmmu -nostdlib -nostartfiles"/> <define name="_M_PPC" /> <define name="_PPC_" /> Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c Mon Sep 3 10:29:13 2007 @@ -61,7 +61,6 @@ #define BAT_GRANULARITY (64 * 1024) #define KernelMemorySize (8 * 1024 * 1024) -#define KernelEntryPoint (KernelEntry - KERNEL_BASE_PHYS) + KernelBase #define XROUNDUP(x,n) ((((ULONG)x) + ((n) - 1)) & (~((n) - 1))) /* Load Address of Next Module */ @@ -77,7 +76,7 @@ BOOLEAN PaeModeEnabled; /* Kernel Entrypoint in Physical Memory */ -ULONG_PTR KernelEntry; +ULONG_PTR KernelEntryPoint; /* Dummy to bring in memmove */ PVOID memmove_dummy = memmove; @@ -127,7 +126,7 @@ FrLdrStartup(ULONG Magic) { KernelEntryFn KernelEntryAddress = - (KernelEntryFn)(KernelEntry + KernelBase); + (KernelEntryFn)(KernelEntryPoint + KernelBase); ULONG_PTR i, j, page, count; PCHAR ModHeader; boot_infos_t *LocalBootInfo = &BootInfo; @@ -459,7 +458,7 @@ } ImageSize = SWAPD(NtHeader->OptionalHeader.SizeOfImage); - KernelEntry = SWAPD(NtHeader->OptionalHeader.AddressOfEntryPoint); + KernelEntryPoint = SWAPD(NtHeader->OptionalHeader.AddressOfEntryPoint); printf("Total image size is %x\n", ImageSize); /* Handle relocation sections */ @@ -677,6 +676,24 @@ return(ModuleData->ModStart); } +PVOID +NTAPI +FrLdrMapImage(IN FILE *Image, IN PCHAR ShortName, IN ULONG ImageType) +{ + PVOID Result; + + if (ImageType == 1) + { + if(FrLdrMapKernel(Image)) + return (PVOID)KernelBase; + else + return NULL; + } + else + Result = (PVOID)FrLdrLoadModule(Image, ShortName, NULL); + return Result; +} + ULONG_PTR NTAPI FrLdrCreateModule(LPCSTR ModuleName) Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep.c Mon Sep 3 10:29:13 2007 @@ -61,7 +61,7 @@ *Depth = 16; } -void PpcPrepVideoPrepareForReactOS() +void PpcPrepVideoPrepareForReactOS(BOOLEAN setup) { pci_setup(&pci1_desc); } Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild Mon Sep 3 10:29:13 2007 @@ -22,5 +22,6 @@ <library>rossym</library> <library>cmlib</library> <library>rtl</library> + <library>libcntpr</library> </module> </if> Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild Mon Sep 3 10:29:13 2007 @@ -57,8 +57,16 @@ <compilerflag>-fno-zero-initialized-in-bss</compilerflag> <compilerflag>-Os</compilerflag> <file>boot.s</file> + <file>loader.c</file> <file>mach.c</file> <file>mboot.c</file> + <file>ofw.c</file> + <file>ofw_util.s</file> + <file>ofw_calls.s</file> + <file>prep.c</file> + <file>prep_ide.c</file> + <file>prep_pci.c</file> + <file>prep_vga.c</file> </module> </if> </directory> Modified: trunk/reactos/lib/sdk/libcntpr/libcntpr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/libcntpr/libcntpr.… ============================================================================== --- trunk/reactos/lib/sdk/libcntpr/libcntpr.rbuild (original) +++ trunk/reactos/lib/sdk/libcntpr/libcntpr.rbuild Mon Sep 3 10:29:13 2007 @@ -5,7 +5,9 @@ <define name="_NTSYSTEM_" /> <define name="_NTDLLBUILD_" /> <define name="_SEH_NO_NATIVE_NLG" /> - <define name="__MINGW_IMPORT">"extern __attribute__ ((dllexport))"</define> + <if property="ARCH" value="i386"> + <define name="__MINGW_IMPORT">"extern __attribute__ ((dllexport))"</define> + </if> <include base="libcntpr">.</include> <directory name="except"> Modified: trunk/reactos/tools/ppc.lost+found/link-freeldr URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/ppc.lost%2Bfound/lin… ============================================================================== --- trunk/reactos/tools/ppc.lost+found/link-freeldr (original) +++ trunk/reactos/tools/ppc.lost+found/link-freeldr Mon Sep 3 10:29:13 2007 @@ -1,74 +1,7 @@ #!/bin/sh -v export PATH=$PATH:/usr/local/pkg/reactos-powerpc/bin -make -C lib/mmu powerpc-unknown-linux-gnu-ld \ -g -nostartfiles -nostdlib -N -Ttext=0xe00000 \ - -o freeldr.elf \ - obj-ppc/boot/freeldr/freeldr/arch/powerpc/boot.o \ - obj-ppc/boot/freeldr/freeldr/arch/powerpc/ofw_util.o \ - obj-ppc/boot/freeldr/freeldr/arch/powerpc/ofw_calls.o \ - obj-ppc/boot/freeldr/freeldr/cache/blocklist.o \ - obj-ppc/boot/freeldr/freeldr/cache/cache.o \ - obj-ppc/boot/freeldr/freeldr/comm/rs232.o \ - obj-ppc/boot/freeldr/freeldr/disk/disk.o \ - obj-ppc/boot/freeldr/freeldr/disk/partition.o \ - obj-ppc/boot/freeldr/freeldr/fs/ext2.o \ - obj-ppc/boot/freeldr/freeldr/fs/fat.o \ - obj-ppc/boot/freeldr/freeldr/fs/fs.o \ - obj-ppc/boot/freeldr/freeldr/fs/fsrec.o \ - obj-ppc/boot/freeldr/freeldr/fs/iso.o \ - obj-ppc/boot/freeldr/freeldr/fs/ntfs.o \ - obj-ppc/boot/freeldr/freeldr/inifile/ini_init.o \ - obj-ppc/boot/freeldr/freeldr/inifile/inifile.o \ - obj-ppc/boot/freeldr/freeldr/inifile/parse.o \ - obj-ppc/boot/freeldr/freeldr/math/libgcc2.o \ - obj-ppc/boot/freeldr/freeldr/mm/meminit.o \ - obj-ppc/boot/freeldr/freeldr/mm/mm.o \ - obj-ppc/boot/freeldr/freeldr/reactos/registry.o \ - obj-ppc/boot/freeldr/freeldr/reactos/binhive.o \ - obj-ppc/boot/freeldr/freeldr/reactos/arcname.o \ - obj-ppc/boot/freeldr/freeldr/reactos/reactos.o \ - obj-ppc/boot/freeldr/freeldr/rtl/list.o \ - obj-ppc/boot/freeldr/freeldr/rtl/libsupp.o \ - obj-ppc/boot/freeldr/freeldr/ui/gui.o \ - obj-ppc/boot/freeldr/freeldr/ui/tui.o \ - obj-ppc/boot/freeldr/freeldr/ui/tuimenu.o \ - obj-ppc/boot/freeldr/freeldr/ui/ui.o \ - obj-ppc/boot/freeldr/freeldr/video/bank.o \ - obj-ppc/boot/freeldr/freeldr/video/fade.o \ - obj-ppc/boot/freeldr/freeldr/video/palette.o \ - obj-ppc/boot/freeldr/freeldr/video/pixel.o \ - obj-ppc/boot/freeldr/freeldr/video/video.o \ - obj-ppc/boot/freeldr/freeldr/freeldr.o \ - obj-ppc/boot/freeldr/freeldr/debug.o \ - obj-ppc/boot/freeldr/freeldr/version.o \ - obj-ppc/boot/freeldr/freeldr/cmdline.o \ - obj-ppc/boot/freeldr/freeldr/machine.o \ - obj-ppc/boot/freeldr/freeldr/windows/conversion.o \ - obj-ppc/boot/freeldr/freeldr/windows/peloader.o \ - obj-ppc/boot/freeldr/freeldr/windows/winldr.o \ - obj-ppc/boot/freeldr/freeldr/windows/wlmemory.o \ - obj-ppc/boot/freeldr/freeldr/windows/wlregistry.o \ - obj-ppc/boot/freeldr/freeldr/arch/powerpc/mach.o \ - obj-ppc/boot/freeldr/freeldr/arch/powerpc/ofw.o \ - obj-ppc/boot/freeldr/freeldr/arch/powerpc/mboot.o \ - obj-ppc/boot/freeldr/freeldr/arch/powerpc/loader.o \ - obj-ppc/boot/freeldr/freeldr/arch/powerpc/prep.o \ - obj-ppc/boot/freeldr/freeldr/arch/powerpc/prep_ide.o \ - obj-ppc/boot/freeldr/freeldr/arch/powerpc/prep_pci.o \ - obj-ppc/boot/freeldr/freeldr/arch/powerpc/prep_vga.o \ - obj-ppc/boot/freeldr/freeldr/bootmgr.o \ - obj-ppc/boot/freeldr/freeldr/drivemap.o \ - obj-ppc/boot/freeldr/freeldr/miscboot.o \ - obj-ppc/boot/freeldr/freeldr/options.o \ - obj-ppc/boot/freeldr/freeldr/linuxboot.o \ - obj-ppc/boot/freeldr/freeldr/oslist.o \ - obj-ppc/boot/freeldr/freeldr/custom.o \ - obj-ppc/lib/rossym/rossym.a \ - obj-ppc/lib/cmlib/cmlib.a \ - obj-ppc/lib/string/string.a \ - obj-ppc/lib/rtl/rtl.a \ - obj-ppc/lib/mmu/libmmu.a \ - obj-ppc/lib/mmu/libmmu_code.a \ - /usr/local/pkg/reactos-powerpc/lib/libgcc.a + -o freeldr.elf output-ppc/boot/freeldr/freeldr/ofwldr \ + -Lobj-ppc/lib/ppcmmu -lppcmmu_code -lppcmmu Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Mon Sep 3 10:29:13 2007 @@ -146,7 +146,7 @@ MingwModuleHandler::GetTargetDirectoryTree ( const Module& module ) { - if ( module.type == StaticLibrary || module.type == BootProgram ) + if ( module.type == StaticLibrary ) return backend->intermediateDirectory; return backend->outputDirectory; }

17 years, 2 months

[jimtabor] 28802: Turn off support for now due to user land exception.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Sep 3 09:30:45 2007 New Revision: 28802 URL: http://svn.reactos.org/svn/reactos?rev=28802&view=rev Log: Turn off support for now due to user land exception. Modified: trunk/reactos/dll/win32/gdi32/objects/dc.c Modified: trunk/reactos/dll/win32/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/dc… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/dc.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/dc.c Mon Sep 3 09:30:45 2007 @@ -320,7 +320,7 @@ STDCALL GetDCObject( HDC hDC, INT iType) { -//#if 0 +#if 0 if((iType == GDI_OBJECT_TYPE_BRUSH) || (iType == GDI_OBJECT_TYPE_EXTPEN)|| (iType == GDI_OBJECT_TYPE_PEN) || @@ -348,7 +348,7 @@ } return hGO; } -//#endif +#endif return NtGdiGetDCObject( hDC, iType ); }

17 years, 2 months

[arty] 28801: Move mismerged segment to the right place; claim from openfirmware if we don't have enough reserve.

by arty＠svn.reactos.org

Author: arty Date: Mon Sep 3 09:29:03 2007 New Revision: 28801 URL: http://svn.reactos.org/svn/reactos?rev=28801&view=rev Log: Move mismerged segment to the right place; claim from openfirmware if we don't have enough reserve. Modified: trunk/reactos/boot/freeldr/freeldr/mm/mm.c Modified: trunk/reactos/boot/freeldr/freeldr/mm/mm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/mm… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/mm/mm.c (original) +++ trunk/reactos/boot/freeldr/freeldr/mm/mm.c Mon Sep 3 09:29:03 2007 @@ -68,36 +68,38 @@ if (MemorySize == 0) { + DbgPrint((DPRINT_MEMORY, "MmAllocateMemory() called for 0 bytes. Returning NULL.\n")); + UiMessageBoxCritical("Memory allocation failed: MmAllocateMemory() called for 0 bytes."); + return NULL; + } + + MemorySize = ROUND_UP(MemorySize, 4); + if (MemorySize <= SubAllocationRest) + { + MemPointer = (PVOID)((ULONG_PTR)SubAllocationPage + MM_PAGE_SIZE - SubAllocationRest); + SubAllocationRest -= MemorySize; + return MemPointer; + } + + // Find out how many blocks it will take to + // satisfy this allocation + PagesNeeded = ROUND_UP(MemorySize, MM_PAGE_SIZE) / MM_PAGE_SIZE; + + // If we don't have enough available mem + // then return NULL + if (FreePagesInLookupTable < PagesNeeded) + { #ifdef _M_PPC ULONG ptr; printf("Allocating %d bytes directly ...\n", MemorySize); ptr = ofw_claim(0,MemorySize,MM_PAGE_SIZE); MemPointer = (PVOID)(ptr); -#endif - DbgPrint((DPRINT_MEMORY, "MmAllocateMemory() called for 0 bytes. Returning NULL.\n")); - UiMessageBoxCritical("Memory allocation failed: MmAllocateMemory() called for 0 bytes."); - return NULL; - } - - MemorySize = ROUND_UP(MemorySize, 4); - if (MemorySize <= SubAllocationRest) - { - MemPointer = (PVOID)((ULONG_PTR)SubAllocationPage + MM_PAGE_SIZE - SubAllocationRest); - SubAllocationRest -= MemorySize; - return MemPointer; - } - - // Find out how many blocks it will take to - // satisfy this allocation - PagesNeeded = ROUND_UP(MemorySize, MM_PAGE_SIZE) / MM_PAGE_SIZE; - - // If we don't have enough available mem - // then return NULL - if (FreePagesInLookupTable < PagesNeeded) - { + return MemPointer; +#else DbgPrint((DPRINT_MEMORY, "Memory allocation failed in MmAllocateMemory(). Not enough free memory to allocate %d bytes. AllocationCount: %d\n", MemorySize, AllocationCount)); UiMessageBoxCritical("Memory allocation failed: out of memory."); return NULL; +#endif } FirstFreePageFromEnd = MmFindAvailablePages(PageLookupTableAddress, TotalPagesInLookupTable, PagesNeeded, AllocateFromEnd);

17 years, 2 months

[hpoussin] 28800: Few indentation fixes Generate again boot programs in output directory

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Mon Sep 3 08:12:48 2007 New Revision: 28800 URL: http://svn.reactos.org/svn/reactos?rev=28800&view=rev Log: Few indentation fixes Generate again boot programs in output directory Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h trunk/reactos/tools/rbuild/module.cpp trunk/reactos/tools/rbuild/rbuild.h Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Mon Sep 3 08:12:48 2007 @@ -267,9 +267,9 @@ case EmbeddedTypeLib: handler = new MingwEmbeddedTypeLibModuleHandler ( module ); break; - case ElfExecutable: - handler = new MingwElfExecutableModuleHandler ( module ); - break; + case ElfExecutable: + handler = new MingwElfExecutableModuleHandler ( module ); + break; default: throw UnknownModuleTypeException ( module.node.location, @@ -2002,6 +2002,8 @@ globalCflags += " -pipe"; if ( !module.allowWarnings ) globalCflags += " -Werror"; + if ( module.host == HostTrue ) + globalCflags += " $(HOST_CFLAGS)"; // Always force disabling of sibling calls optimisation for GCC // (TODO: Move to version-specific once this bug is fixed in GCC) @@ -3149,8 +3151,8 @@ fprintf ( fMakefile, "\t$(ECHO_BOOTPROG)\n" ); fprintf ( fMakefile, "\t$(%s_PREPARE) $(OUTPUT)$(SEP)%s %s\n", - module.buildtype.c_str (), - NormalizeFilename( payload->GetPath() ).c_str (), + module.buildtype.c_str (), + NormalizeFilename( payload->GetPath() ).c_str (), junk_cpy.c_str () ); fprintf ( fMakefile, "\t${objcopy} $(%s_FLATFORMAT) %s %s\n", @@ -3726,8 +3728,8 @@ fprintf ( fMakefile, "\t$(ECHO_BOOTPROG)\n" ); fprintf ( fMakefile, "\t${ld} $(%s_LINKFORMAT) %s %s -g -o %s\n", - module.buildtype.c_str(), - objectsMacro.c_str(), - libsMacro.c_str(), - targetMacro.c_str () ); -} + module.buildtype.c_str(), + objectsMacro.c_str(), + libsMacro.c_str(), + targetMacro.c_str () ); +} Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h Mon Sep 3 08:12:48 2007 @@ -518,7 +518,7 @@ class MingwElfExecutableModuleHandler : public MingwModuleHandler { public: - MingwElfExecutableModuleHandler ( const Module& module ); + MingwElfExecutableModuleHandler ( const Module& module ); virtual HostType DefaultHost() { return HostFalse; } virtual void Process (); }; Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp (original) +++ trunk/reactos/tools/rbuild/module.cpp Mon Sep 3 08:12:48 2007 @@ -892,8 +892,8 @@ return IdlHeader; if ( attribute.value == "embeddedtypelib" ) return EmbeddedTypeLib; - if ( attribute.value == "elfexecutable" ) - return ElfExecutable; + if ( attribute.value == "elfexecutable" ) + return ElfExecutable; throw InvalidAttributeValueException ( location, attribute.name, attribute.value ); @@ -942,7 +942,7 @@ case RpcClient: return ".o"; case Alias: - case ElfExecutable: + case ElfExecutable: case IdlHeader: return ""; case EmbeddedTypeLib: @@ -995,7 +995,7 @@ case Alias: case BootProgram: case IdlHeader: - case ElfExecutable: + case ElfExecutable: case EmbeddedTypeLib: return ""; } @@ -1024,8 +1024,8 @@ case KernelModeDLL: case KernelModeDriver: return "0x00010000"; - case ElfExecutable: - return "0xe00000"; + case ElfExecutable: + return "0xe00000"; case BuildTool: case StaticLibrary: case ObjectLibrary: @@ -1085,7 +1085,7 @@ case Alias: case IdlHeader: case EmbeddedTypeLib: - case ElfExecutable: + case ElfExecutable: return false; } throw InvalidOperationException ( __FILE__, @@ -1111,19 +1111,19 @@ case BuildTool: case BootLoader: case BootSector: + case BootProgram: case Iso: case LiveIso: case IsoRegTest: case LiveIsoRegTest: case EmbeddedTypeLib: - case ElfExecutable: + case ElfExecutable: return true; case StaticLibrary: case ObjectLibrary: case RpcServer: case RpcClient: case Alias: - case BootProgram: case IdlHeader: return false; } Modified: trunk/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.h (original) +++ trunk/reactos/tools/rbuild/rbuild.h Mon Sep 3 08:12:48 2007 @@ -275,7 +275,7 @@ IsoRegTest = 24, LiveIsoRegTest = 25, EmbeddedTypeLib = 26, - ElfExecutable = 27 + ElfExecutable = 27 }; enum HostType

17 years, 2 months

[hpoussin] 28799: Supports a few more ACPI devices Patch by Cameron Gutman (aicommander at gmail dot com)

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Mon Sep 3 08:01:28 2007 New Revision: 28799 URL: http://svn.reactos.org/svn/reactos?rev=28799&view=rev Log: Supports a few more ACPI devices Patch by Cameron Gutman (aicommander at gmail dot com) Modified: trunk/reactos/media/inf/machine.inf Modified: trunk/reactos/media/inf/machine.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/machine.inf?rev=… ============================================================================== --- trunk/reactos/media/inf/machine.inf (original) +++ trunk/reactos/media/inf/machine.inf Mon Sep 3 08:01:28 2007 @@ -40,6 +40,7 @@ %*PNP0C04.DeviceDesc% = NO_DRV,*PNP0C04 %*PNP0C0B.DeviceDesc% = NO_DRV,*PNP0C0B %*PNP0C0C.DeviceDesc% = NO_DRV,*PNP0C0C +%*PNP0C0D.DeviceDesc% = NO_DRV,*PNP0C0D %*PNP0C0E.DeviceDesc% = NO_DRV,*PNP0C0E %*PNP0C0F.DeviceDesc% = NO_DRV,*PNP0C0F @@ -47,6 +48,7 @@ %PCI\CC_0600.DeviceDesc% = NO_DRV,PCI\CC_0600 %PCI\CC_0601.DeviceDesc% = PCI_ISA_Inst,PCI\CC_0601 %PCI\CC_0604.DeviceDesc% = PCI_Inst,PCI\CC_0604 +%*ThermalZone.DeviceDesc% = NO_DRV,*ThermalZone [IntelMfg] %*INT0800.DeviceDesc% = NO_DRV,*INT0800 @@ -125,12 +127,14 @@ *PNP0C04.DeviceDesc = "Math coprocessor" *PNP0C0B.DeviceDesc = "ACPI fan" *PNP0C0C.DeviceDesc = "ACPI power button device" +*PNP0C0D.DeviceDesc = "ACPI lid" *PNP0C0E.DeviceDesc = "ACPI sleep button device" *PNP0C0F.DeviceDesc = "PCI interrupt link device" -ACPI\FixedButton.DeviceDesc ="ACPI Fixed Feature Button" +ACPI\FixedButton.DeviceDesc = "ACPI fixed feature button" PCI\CC_0600.DeviceDesc = "Standard CPU to PCI bridge" PCI\CC_0601.DeviceDesc = "Standard PCI to ISA bridge" PCI\CC_0604.DeviceDesc = "Standard PCI to PCI bridge" +*ThermalZone.DeviceDesc = "ACPI thermal zone" IntelMfg = "Intel" *INT0800.DeviceDesc = "Intel 82802 Firmware Hub Device"

17 years, 2 months

← Newer
1
...
49
50
51
52
53
54
55
...
59
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 September 2007