11 Aug
2007
11 Aug
'07
9:55 a.m.
Author: fireball
Date: Sat Aug 11 13:55:12 2007
New Revision: 28283
URL: http://svn.reactos.org/svn/reactos?rev=28283&view=rev
Log:
- Merge 26302 (Freeldr's own DEBUG -> ROS's global DBG)
Modified:
branches/winldr/arch/i386/i386disk.c
branches/winldr/arch/i386/i386vid.c
branches/winldr/comm/rs232.c
branches/winldr/debug.c
branches/winldr/disk/partition.c
branches/winldr/freeldr_arch.rbuild
branches/winldr/freeldr_base.rbuild
branches/winldr/freeldr_base64k.rbuild
branches/winldr/freeldr_startup.rbuild
branches/winldr/fs/fat.c
branches/winldr/fs/fs.c
branches/winldr/fs/ntfs.c
branches/winldr/include/debug.h
branches/winldr/include/freeldr.h
branches/winldr/include/mm.h
branches/winldr/inifile/inifile.c
branches/winldr/mm/meminit.c
branches/winldr/mm/mm.c
branches/winldr/windows/wlmemory.c
Modified: branches/winldr/arch/i386/i386disk.c
URL:
http://svn.reactos.org/svn/reactos/branches/winldr/arch/i386/i386disk.c?rev…
==============================================================================
--- branches/winldr/arch/i386/i386disk.c (original)
+++ branches/winldr/arch/i386/i386disk.c Sat Aug 11 13:55:12 2007
@@ -165,37 +165,35 @@
memcpy(Buffer, Ptr, BufferSize);
-#ifdef DEBUG
- DbgPrint((DPRINT_DISK, "size of buffer: %x\n",
Ptr[0]));
- DbgPrint((DPRINT_DISK, "information flags: %x\n",
Ptr[1]));
- DbgPrint((DPRINT_DISK, "number of physical cylinders on drive: %u\n",
*(PULONG)&Ptr[2]));
- DbgPrint((DPRINT_DISK, "number of physical heads on drive: %u\n",
*(PULONG)&Ptr[4]));
- DbgPrint((DPRINT_DISK, "number of physical sectors per track: %u\n",
*(PULONG)&Ptr[6]));
- DbgPrint((DPRINT_DISK, "total number of sectors on drive:
%I64u\n", *(unsigned long long*)&Ptr[8]));
- DbgPrint((DPRINT_DISK, "bytes per sector: %u\n",
Ptr[12]));
- if (Ptr[0] >= 0x1e)
+ DbgPrint((DPRINT_DISK, "size of buffer: %x\n",
Ptr[0]));
+ DbgPrint((DPRINT_DISK, "information flags: %x\n",
Ptr[1]));
+ DbgPrint((DPRINT_DISK, "number of physical cylinders on drive: %u\n",
*(PULONG)&Ptr[2]));
+ DbgPrint((DPRINT_DISK, "number of physical heads on drive: %u\n",
*(PULONG)&Ptr[4]));
+ DbgPrint((DPRINT_DISK, "number of physical sectors per track: %u\n",
*(PULONG)&Ptr[6]));
+ DbgPrint((DPRINT_DISK, "total number of sectors on drive: %I64u\n",
*(unsigned long long*)&Ptr[8]));
+ DbgPrint((DPRINT_DISK, "bytes per sector: %u\n",
Ptr[12]));
+ if (Ptr[0] >= 0x1e)
+ {
+ DbgPrint((DPRINT_DISK, "EED configuration parameters:
%x:%x\n", Ptr[13], Ptr[14]));
+ if (Ptr[13] != 0xffff && Ptr[14] != 0xffff)
{
- DbgPrint((DPRINT_DISK, "EED configuration parameters:
%x:%x\n", Ptr[13], Ptr[14]));
- if (Ptr[13] != 0xffff && Ptr[14] != 0xffff)
- {
- PUCHAR SpecPtr = (PUCHAR)((Ptr[13] << 4) + Ptr[14]);
- DbgPrint((DPRINT_DISK, "SpecPtr:
%x\n", SpecPtr));
- DbgPrint((DPRINT_DISK, "physical I/O port base address:
%x\n", *(PUSHORT)&SpecPtr[0]));
- DbgPrint((DPRINT_DISK, "disk-drive control port address:
%x\n", *(PUSHORT)&SpecPtr[2]));
- DbgPrint((DPRINT_DISK, "drive flags:
%x\n", SpecPtr[4]));
- DbgPrint((DPRINT_DISK, "proprietary information:
%x\n", SpecPtr[5]));
- DbgPrint((DPRINT_DISK, "IRQ for drive:
%u\n", SpecPtr[6]));
- DbgPrint((DPRINT_DISK, "sector count for multi-sector transfers:
%u\n", SpecPtr[7]));
- DbgPrint((DPRINT_DISK, "DMA control:
%x\n", SpecPtr[8]));
- DbgPrint((DPRINT_DISK, "programmed I/O control:
%x\n", SpecPtr[9]));
- DbgPrint((DPRINT_DISK, "drive options:
%x\n", *(PUSHORT)&SpecPtr[10]));
- }
+ PUCHAR SpecPtr = (PUCHAR)((Ptr[13] << 4) + Ptr[14]);
+ DbgPrint((DPRINT_DISK, "SpecPtr:
%x\n", SpecPtr));
+ DbgPrint((DPRINT_DISK, "physical I/O port base address:
%x\n", *(PUSHORT)&SpecPtr[0]));
+ DbgPrint((DPRINT_DISK, "disk-drive control port address:
%x\n", *(PUSHORT)&SpecPtr[2]));
+ DbgPrint((DPRINT_DISK, "drive flags:
%x\n", SpecPtr[4]));
+ DbgPrint((DPRINT_DISK, "proprietary information:
%x\n", SpecPtr[5]));
+ DbgPrint((DPRINT_DISK, "IRQ for drive:
%u\n", SpecPtr[6]));
+ DbgPrint((DPRINT_DISK, "sector count for multi-sector transfers:
%u\n", SpecPtr[7]));
+ DbgPrint((DPRINT_DISK, "DMA control:
%x\n", SpecPtr[8]));
+ DbgPrint((DPRINT_DISK, "programmed I/O control:
%x\n", SpecPtr[9]));
+ DbgPrint((DPRINT_DISK, "drive options:
%x\n", *(PUSHORT)&SpecPtr[10]));
}
- if (Ptr[0] >= 0x42)
- {
- DbgPrint((DPRINT_DISK, "signature:
%x\n", Ptr[15]));
- }
-#endif
+ }
+ if (Ptr[0] >= 0x42)
+ {
+ DbgPrint((DPRINT_DISK, "signature: %x\n",
Ptr[15]));
+ }
return TRUE;
}
Modified: branches/winldr/arch/i386/i386vid.c
URL:
http://svn.reactos.org/svn/reactos/branches/winldr/arch/i386/i386vid.c?rev=…
==============================================================================
--- branches/winldr/arch/i386/i386vid.c (original)
+++ branches/winldr/arch/i386/i386vid.c Sat Aug 11 13:55:12 2007
@@ -162,10 +162,8 @@
{
REGS Regs;
PVESA_SVGA_INFO SvgaInfo = (PVESA_SVGA_INFO)BIOSCALLBUFFER;
-#ifdef DEBUG
//USHORT* VideoModes;
//USHORT Index;
-#endif // defined DEBUG
DbgPrint((DPRINT_UI, "BiosIsVesaSupported()\n"));
@@ -210,7 +208,6 @@
return 0x0000;
}
-#ifdef DEBUG
DbgPrint((DPRINT_UI, "Supported.\n"));
DbgPrint((DPRINT_UI, "SvgaInfo->Signature[4] = %c%c%c%c\n",
SvgaInfo->Signature[0], SvgaInfo->Signature[1], SvgaInfo->Signature[2],
SvgaInfo->Signature[3]));
DbgPrint((DPRINT_UI, "SvgaInfo->VesaVersion = v%d.%d\n",
((SvgaInfo->VesaVersion >> 8) & 0xFF), (SvgaInfo->VesaVersion &
0xFF)));
@@ -242,8 +239,6 @@
//}
DbgPrint((DPRINT_UI, "\n"));
- //getch();
-#endif // defined DEBUG
return SvgaInfo->VesaVersion;
}
Modified: branches/winldr/comm/rs232.c
URL:
http://svn.reactos.org/svn/reactos/branches/winldr/comm/rs232.c?rev=28283&a…
==============================================================================
--- branches/winldr/comm/rs232.c (original)
+++ branches/winldr/comm/rs232.c Sat Aug 11 13:55:12 2007
@@ -23,7 +23,7 @@
/* MACROS *******************************************************************/
-#ifdef DEBUG
+#ifdef DBG
#define DEFAULT_BAUD_RATE 19200
@@ -275,11 +275,11 @@
WRITE_PORT_UCHAR (SER_THR(Rs232PortBase), ByteToSend);
}
-#endif
+#endif /* defined DBG */
BOOLEAN Rs232PortInUse(ULONG Base)
{
-#ifdef DEBUG
+#ifdef DBG
return PortInitialized && Rs232PortBase == (PUCHAR)Base ? TRUE : FALSE;
#else
return FALSE;
Modified: branches/winldr/debug.c
URL:
http://svn.reactos.org/svn/reactos/branches/winldr/debug.c?rev=28283&r1…
==============================================================================
--- branches/winldr/debug.c (original)
+++ branches/winldr/debug.c Sat Aug 11 13:55:12 2007
@@ -21,7 +21,7 @@
#include <debug.h>
-#ifdef DEBUG
+#ifdef DBG
//#define DEBUG_ALL
//#define DEBUG_INIFILE
@@ -356,4 +356,4 @@
}
}
-#endif // defined DEBUG
+#endif // defined DBG
Modified: branches/winldr/disk/partition.c
URL:
http://svn.reactos.org/svn/reactos/branches/winldr/disk/partition.c?rev=282…
==============================================================================
--- branches/winldr/disk/partition.c (original)
+++ branches/winldr/disk/partition.c Sat Aug 11 13:55:12 2007
@@ -199,9 +199,7 @@
BOOLEAN DiskReadBootRecord(ULONG DriveNumber, ULONGLONG LogicalSectorNumber,
PMASTER_BOOT_RECORD BootRecord)
{
char ErrMsg[64];
-#ifdef DEBUG
ULONG Index;
-#endif
// Read master boot record
if (!MachDiskReadLogicalSectors(DriveNumber, LogicalSectorNumber, 1,
(PVOID)DISKREADBUFFER))
@@ -210,8 +208,6 @@
}
RtlCopyMemory(BootRecord, (PVOID)DISKREADBUFFER, sizeof(MASTER_BOOT_RECORD));
-
-#ifdef DEBUG
DbgPrint((DPRINT_DISK, "Dumping partition table for drive 0x%x:\n",
DriveNumber));
DbgPrint((DPRINT_DISK, "Boot record logical start sector = %d\n",
LogicalSectorNumber));
@@ -233,8 +229,6 @@
DbgPrint((DPRINT_DISK, "PartitionSectorCount: 0x%x\n",
BootRecord->PartitionTable[Index].PartitionSectorCount));
}
-#endif // defined DEBUG
-
// Check the partition table magic value
if (BootRecord->MasterBootRecordMagic != 0xaa55)
{
Modified: branches/winldr/freeldr_arch.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/winldr/freeldr_arch.rbuild?rev=…
==============================================================================
--- branches/winldr/freeldr_arch.rbuild (original)
+++ branches/winldr/freeldr_arch.rbuild Sat Aug 11 13:55:12 2007
@@ -6,9 +6,6 @@
<include base="freeldr_base">cache</include>
<include base="ntoskrnl">include</include>
<define name="__USE_W32API" />
-
- <define name="DEBUG" />
-
<define name="_NTHAL_" />
<define name="_NTSYSTEM_" />
<compilerflag>-ffreestanding</compilerflag>
@@ -53,9 +50,6 @@
<include base="freeldr_base">cache</include>
<include base="ntoskrnl">include</include>
<define name="__USE_W32API" />
-<!--
- <define name="DEBUG" />
--->
<define name="_NTHAL_" />
<define name="_NTSYSTEM_" />
<compilerflag>-ffreestanding</compilerflag>
@@ -69,4 +63,23 @@
</module>
</if>
</directory>
+ <directory name="mips">
+ <if property="ARCH" value="mips">
+ <module name="freeldr_arch" type="objectlibrary">
+ <include base="freeldr_base">include</include>
+ <include base="freeldr_base">cache</include>
+ <include base="ntoskrnl">include</include>
+ <define name="__USE_W32API" />
+ <define name="DEBUG" />
+ <define name="_NTHAL_" />
+ <file>boot.s</file>
+ <file>console.c</file>
+ <file>disk.c</file>
+ <file>hardware.c</file>
+ <file>loader.c</file>
+ <file>mach.c</file>
+ <file>video.c</file>
+ </module>
+ </if>
</directory>
+</directory>
Modified: branches/winldr/freeldr_base.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/winldr/freeldr_base.rbuild?rev=…
==============================================================================
--- branches/winldr/freeldr_base.rbuild (original)
+++ branches/winldr/freeldr_base.rbuild Sat Aug 11 13:55:12 2007
@@ -4,9 +4,6 @@
<include base="cmlib">.</include>
<include base="ntoskrnl">include</include>
<define name="__USE_W32API" />
-
- <define name="DEBUG" />
-
<define name="_NTHAL_" />
<define name="_NTSYSTEM_" />
<compilerflag>-ffreestanding</compilerflag>
Modified: branches/winldr/freeldr_base64k.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/winldr/freeldr_base64k.rbuild?r…
==============================================================================
--- branches/winldr/freeldr_base64k.rbuild (original)
+++ branches/winldr/freeldr_base64k.rbuild Sat Aug 11 13:55:12 2007
@@ -2,9 +2,6 @@
<include base="freeldr_base64k">include</include>
<include base="ntoskrnl">include</include>
<define name="__USE_W32API" />
-<!--
- <define name="DEBUG" />
--->
<define name="_NTHAL_" />
<define name="_NTSYSTEM_" />
<compilerflag>-ffreestanding</compilerflag>
Modified: branches/winldr/freeldr_startup.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/winldr/freeldr_startup.rbuild?r…
==============================================================================
--- branches/winldr/freeldr_startup.rbuild (original)
+++ branches/winldr/freeldr_startup.rbuild Sat Aug 11 13:55:12 2007
@@ -2,9 +2,6 @@
<include base="freeldr_startup">include</include>
<include base="ntoskrnl">include</include>
<define name="__USE_W32API" />
-<!--
- <define name="DEBUG" />
--->
<compilerflag>-ffreestanding</compilerflag>
<compilerflag>-fno-builtin</compilerflag>
<compilerflag>-fno-inline</compilerflag>
Modified: branches/winldr/fs/fat.c
URL:
http://svn.reactos.org/svn/reactos/branches/winldr/fs/fat.c?rev=28283&r…
==============================================================================
--- branches/winldr/fs/fat.c (original)
+++ branches/winldr/fs/fat.c Sat Aug 11 13:55:12 2007
@@ -77,8 +77,6 @@
// Get the FAT type
FatType = FatDetermineFatType(FatVolumeBootSector, PartitionSectorCount);
-
-#ifdef DEBUG
DbgPrint((DPRINT_FILESYSTEM, "Dumping boot sector:\n"));
@@ -155,9 +153,7 @@
DbgPrint((DPRINT_FILESYSTEM, "BootSectorMagic: 0x%x\n",
FatVolumeBootSector->BootSectorMagic));
}
-#endif // defined DEBUG
-
- //
+ //
// Set the correct partition offset
//
FatVolumeStartSector = VolumeStartSector;
Modified: branches/winldr/fs/fs.c
URL:
http://svn.reactos.org/svn/reactos/branches/winldr/fs/fs.c?rev=28283&r1…
==============================================================================
--- branches/winldr/fs/fs.c (original)
+++ branches/winldr/fs/fs.c Sat Aug 11 13:55:12 2007
@@ -152,7 +152,6 @@
break;
}
-#ifdef DEBUG
//
// Check return value
//
@@ -164,7 +163,6 @@
{
DbgPrint((DPRINT_FILESYSTEM, "FsOpenFile() failed.\n"));
}
-#endif // defined DEBUG
return FileHandle;
}
Modified: branches/winldr/fs/ntfs.c
URL:
http://svn.reactos.org/svn/reactos/branches/winldr/fs/ntfs.c?rev=28283&…
==============================================================================
--- branches/winldr/fs/ntfs.c (original)
+++ branches/winldr/fs/ntfs.c Sat Aug 11 13:55:12 2007
@@ -415,7 +415,7 @@
return NtfsFixupRecord((PNTFS_RECORD)Buffer);
}
-#ifdef DEBUG
+#ifdef DBG
VOID NtfsPrintFile(PNTFS_INDEX_ENTRY IndexEntry)
{
PWCHAR FileName;
@@ -443,7 +443,7 @@
EntryFileName = IndexEntry->FileName.FileName;
EntryFileNameLength = IndexEntry->FileName.FileNameLength;
-#ifdef DEBUG
+#ifdef DBG
NtfsPrintFile(IndexEntry);
#endif
Modified: branches/winldr/include/debug.h
URL:
http://svn.reactos.org/svn/reactos/branches/winldr/include/debug.h?rev=2828…
==============================================================================
--- branches/winldr/include/debug.h (original)
+++ branches/winldr/include/debug.h Sat Aug 11 13:55:12 2007
@@ -21,7 +21,7 @@
#ifndef __DEBUG_H
#define __DEBUG_H
-#ifdef DEBUG
+#ifdef DBG
#define DPRINT_NONE 0x00000000 // No debug print
#define DPRINT_WARNING 0x00000001 // OR this with DebugPrintMask to enable debugger
messages and other misc stuff
@@ -72,7 +72,7 @@
void MEMORY_READWRITE_BREAKPOINT4(unsigned long addr);
void MEMORY_WRITE_BREAKPOINT4(unsigned long addr);
-#endif
+#endif // defined __i386__
#else
@@ -82,7 +82,7 @@
#define BugCheck(_x_)
#define DbgDumpBuffer(_x_, _y_, _z_)
-#endif // defined DEBUG
+#endif // defined DBG
#define UNIMPLEMENTED() BugCheck((DPRINT_WARNING, "This function is
unimplemented!\n"))
Modified: branches/winldr/include/freeldr.h
URL:
http://svn.reactos.org/svn/reactos/branches/winldr/include/freeldr.h?rev=28…
==============================================================================
--- branches/winldr/include/freeldr.h (original)
+++ branches/winldr/include/freeldr.h Sat Aug 11 13:55:12 2007
@@ -67,6 +67,8 @@
#include <arch/i386/machxbox.h>
#include <internal/i386/intrin_i.h>
#include <internal/i386/ke.h>
+#elif _MIPS_
+#include <arch/mips/arcbios.h>
#endif
/* misc files */
#include <keycodes.h>
Modified: branches/winldr/include/mm.h
URL:
http://svn.reactos.org/svn/reactos/branches/winldr/include/mm.h?rev=28283&a…
==============================================================================
--- branches/winldr/include/mm.h (original)
+++ branches/winldr/include/mm.h Sat Aug 11 13:55:12 2007
@@ -37,7 +37,7 @@
ULONG Reserved;
} PACKED BIOS_MEMORY_MAP, *PBIOS_MEMORY_MAP;
-#if defined(__i386__) || defined(_PPC_)
+#if defined(__i386__) || defined(_PPC_) || defined(_MIPS_)
#define MM_PAGE_SIZE 4096
#define MM_PAGE_MASK 0xFFF
@@ -46,12 +46,11 @@
#define MM_SIZE_TO_PAGES(a) \
( ((a) >> MM_PAGE_SHIFT) + ((a) & MM_PAGE_MASK ? 1 : 0) )
+#endif // defined __i386__ or _PPC_ or _MIPS_
//
// This is the zone which is used by the OS loader
//
#define LOADER_HIGH_ZONE ((16*1024*1024) >> MM_PAGE_SHIFT) //16Mb page
-
-#endif // defined __i386__ or _PPC_
typedef struct
{
@@ -73,7 +72,7 @@
extern ULONG FreePagesInLookupTable;
extern ULONG LastFreePageHint;
-#ifdef DEBUG
+#ifdef DBG
PUCHAR MmGetSystemMemoryMapTypeString(ULONG Type);
#endif
Modified: branches/winldr/inifile/inifile.c
URL:
http://svn.reactos.org/svn/reactos/branches/winldr/inifile/inifile.c?rev=28…
==============================================================================
--- branches/winldr/inifile/inifile.c (original)
+++ branches/winldr/inifile/inifile.c Sat Aug 11 13:55:12 2007
@@ -83,9 +83,7 @@
{
PINI_SECTION Section = (PINI_SECTION)SectionId;
PINI_SECTION_ITEM SectionItem;
-#ifdef DEBUG
ULONG RealSettingNumber = SettingNumber;
-#endif
DbgPrint((DPRINT_INIFILE, ".001 NameSize = %d ValueSize = %d\n", NameSize,
ValueSize));
DbgPrint((DPRINT_INIFILE, "IniReadSettingByNumber() SectionId = 0x%x\n",
SectionId));
Modified: branches/winldr/mm/meminit.c
URL:
http://svn.reactos.org/svn/reactos/branches/winldr/mm/meminit.c?rev=28283&a…
==============================================================================
--- branches/winldr/mm/meminit.c (original)
+++ branches/winldr/mm/meminit.c Sat Aug 11 13:55:12 2007
@@ -23,7 +23,7 @@
#define NDEBUG
#include <debug.h>
-#ifdef DEBUG
+#ifdef DBG
typedef struct
{
ULONG Type;
@@ -50,7 +50,7 @@
{
BIOS_MEMORY_MAP BiosMemoryMap[32];
ULONG BiosMemoryMapEntryCount;
-#ifdef DEBUG
+#ifdef DBG
ULONG Index;
#endif
@@ -60,7 +60,7 @@
BiosMemoryMapEntryCount = MachGetMemoryMap(BiosMemoryMap, sizeof(BiosMemoryMap) /
sizeof(BIOS_MEMORY_MAP));
-#ifdef DEBUG
+#ifdef DBG
// Dump the system memory map
if (BiosMemoryMapEntryCount != 0)
{
@@ -116,7 +116,7 @@
return TRUE;
}
-#ifdef DEBUG
+#ifdef DBG
PUCHAR MmGetSystemMemoryMapTypeString(ULONG Type)
{
ULONG Index;
Modified: branches/winldr/mm/mm.c
URL:
http://svn.reactos.org/svn/reactos/branches/winldr/mm/mm.c?rev=28283&r1…
==============================================================================
--- branches/winldr/mm/mm.c (original)
+++ branches/winldr/mm/mm.c Sat Aug 11 13:55:12 2007
@@ -23,7 +23,7 @@
#define NDEBUG
#include <debug.h>
-#ifdef DEBUG
+#ifdef DBG
ULONG AllocationCount = 0;
VOID VerifyHeap(VOID);
@@ -31,7 +31,7 @@
VOID IncrementAllocationCount(VOID);
VOID DecrementAllocationCount(VOID);
VOID MemAllocTest(VOID);
-#endif // DEBUG
+#endif // DBG
/*
* Hack alert
@@ -115,12 +115,12 @@
}
-#ifdef DEBUG
+#ifdef DBG
IncrementAllocationCount();
DbgPrint((DPRINT_MEMORY, "Allocated %d bytes (%d pages) of memory starting at page
%d. AllocCount: %d\n", MemorySize, PagesNeeded, FirstFreePageFromEnd,
AllocationCount));
DbgPrint((DPRINT_MEMORY, "Memory allocation pointer: 0x%x\n", MemPointer));
//VerifyHeap();
-#endif // DEBUG
+#endif // DBG
// Now return the pointer
return MemPointer;
@@ -181,12 +181,12 @@
FreePagesInLookupTable -= PagesNeeded;
MemPointer = (PVOID)(StartPageNumber * MM_PAGE_SIZE);
-#ifdef DEBUG
+#ifdef DBG
IncrementAllocationCount();
DbgPrint((DPRINT_MEMORY, "Allocated %d bytes (%d pages) of memory starting at page
%d. AllocCount: %d\n", MemorySize, PagesNeeded, StartPageNumber, AllocationCount));
DbgPrint((DPRINT_MEMORY, "Memory allocation pointer: 0x%x\n", MemPointer));
//VerifyHeap();
-#endif // DEBUG
+#endif // DBG
// Now return the pointer
return MemPointer;
@@ -236,12 +236,12 @@
FreePagesInLookupTable -= PagesNeeded;
MemPointer = (PVOID)(FirstFreePageFromEnd * MM_PAGE_SIZE);
-#ifdef DEBUG
+#ifdef DBG
IncrementAllocationCount();
DbgPrint((DPRINT_MEMORY, "Allocated %d bytes (%d pages) of memory starting at page
%d. AllocCount: %d\n", MemorySize, PagesNeeded, FirstFreePageFromEnd,
AllocationCount));
DbgPrint((DPRINT_MEMORY, "Memory allocation pointer: 0x%x\n", MemPointer));
//VerifyHeap();
-#endif // DEBUG
+#endif // DBG
// Now return the pointer
return MemPointer;
@@ -254,21 +254,21 @@
ULONG Idx;
PPAGE_LOOKUP_TABLE_ITEM RealPageLookupTable =
(PPAGE_LOOKUP_TABLE_ITEM)PageLookupTableAddress;
-#ifdef DEBUG
+#ifdef DBG
// Make sure we didn't get a bogus pointer
if (MemoryPointer >= (PVOID)(TotalPagesInLookupTable * MM_PAGE_SIZE))
{
BugCheck((DPRINT_MEMORY, "Bogus memory pointer (0x%x) passed to
MmFreeMemory()\n", MemoryPointer));
}
-#endif // DEBUG
+#endif // DBG
// Find out the page number of the first
// page of memory they allocated
PageNumber = MmGetPageNumberFromAddress(MemoryPointer);
PageCount = RealPageLookupTable[PageNumber].PageAllocationLength;
-#ifdef DEBUG
+#ifdef DBG
// Make sure we didn't get a bogus pointer
if ((PageCount < 1) || (PageCount > (TotalPagesInLookupTable - PageNumber)))
{
@@ -305,14 +305,14 @@
FreePagesInLookupTable += PageCount;
-#ifdef DEBUG
+#ifdef DBG
DecrementAllocationCount();
DbgPrint((DPRINT_MEMORY, "Freed %d pages of memory starting at page %d.
AllocationCount: %d\n", PageCount, PageNumber, AllocationCount));
//VerifyHeap();
-#endif // DEBUG
-}
-
-#ifdef DEBUG
+#endif // DBG
+}
+
+#ifdef DBG
VOID VerifyHeap(VOID)
{
ULONG Idx;
@@ -488,7 +488,7 @@
printf("MemPtr5: 0x%x\n", (int)MemPtr5);
MachConsGetCh();
}
-#endif // DEBUG
+#endif // DBG
ULONG GetSystemMemorySize(VOID)
{
Modified: branches/winldr/windows/wlmemory.c
URL:
http://svn.reactos.org/svn/reactos/branches/winldr/windows/wlmemory.c?rev=2…
==============================================================================
--- branches/winldr/windows/wlmemory.c (original)
+++ branches/winldr/windows/wlmemory.c Sat Aug 11 13:55:12 2007
@@ -547,7 +547,7 @@
DbgPrint((DPRINT_WINDOWS, "Memory Descriptor List prepared, printing
PDE\n"));
List_PaToVa(&LoaderBlock->MemoryDescriptorListHead);
- #if DEBUG
+#ifdef DBG
{
ULONG *PDE_Addr=(ULONG *)PDE;//0xC0300000;
int j;
@@ -566,7 +566,7 @@
DbgPrint((DPRINT_WINDOWS, "\n"));
}
}
- #endif
+#endif
// Enable paging