-#define EFI_D_INIT 0x00000001 // Initialization style messages\r
-#define EFI_D_WARN 0x00000002 // Warnings\r
-#define EFI_D_LOAD 0x00000004 // Load events\r
-#define EFI_D_FS 0x00000008 // EFI File system\r
-#define EFI_D_POOL 0x00000010 // Alloc & Free's\r
-#define EFI_D_PAGE 0x00000020 // Alloc & Free's\r
-#define EFI_D_INFO 0x00000040 // Verbose\r
-#define EFI_D_VARIABLE 0x00000100 // Variable\r
-#define EFI_D_BM 0x00000400 // Boot Manager (BDS)\r
-#define EFI_D_BLKIO 0x00001000 // BlkIo Driver\r
-#define EFI_D_NET 0x00004000 // SNI Driver\r
-#define EFI_D_UNDI 0x00010000 // UNDI Driver\r
-#define EFI_D_LOADFILE 0x00020000 // UNDI Driver\r
-#define EFI_D_EVENT 0x00080000 // Event messages\r
-#define EFI_D_ERROR 0x80000000 // Error\r
+#define DEBUG_INIT 0x00000001 // Initialization\r
+#define DEBUG_WARN 0x00000002 // Warnings\r
+#define DEBUG_LOAD 0x00000004 // Load events\r
+#define DEBUG_FS 0x00000008 // EFI File system\r
+#define DEBUG_POOL 0x00000010 // Alloc & Free (pool)\r
+#define DEBUG_PAGE 0x00000020 // Alloc & Free (page)\r
+#define DEBUG_INFO 0x00000040 // Informational debug messages\r
+#define DEBUG_DISPATCH 0x00000080 // PEI/DXE/SMM Dispatchers\r
+#define DEBUG_VARIABLE 0x00000100 // Variable\r
+#define DEBUG_BM 0x00000400 // Boot Manager\r
+#define DEBUG_BLKIO 0x00001000 // BlkIo Driver\r
+#define DEBUG_NET 0x00004000 // Network Io Driver\r
+#define DEBUG_UNDI 0x00010000 // UNDI Driver\r
+#define DEBUG_LOADFILE 0x00020000 // LoadFile\r
+#define DEBUG_EVENT 0x00080000 // Event messages\r
+#define DEBUG_GCD 0x00100000 // Global Coherency Database changes\r
+#define DEBUG_CACHE 0x00200000 // Memory range cachability changes\r
+#define DEBUG_VERBOSE 0x00400000 // Detailed debug messages that may\r
+ // significantly impact boot performance\r
+#define DEBUG_ERROR 0x80000000 // Error\r
+\r
+//\r
+// Aliases of debug message mask bits\r
+//\r
+#define EFI_D_INIT DEBUG_INIT\r
+#define EFI_D_WARN DEBUG_WARN\r
+#define EFI_D_LOAD DEBUG_LOAD\r
+#define EFI_D_FS DEBUG_FS\r
+#define EFI_D_POOL DEBUG_POOL\r
+#define EFI_D_PAGE DEBUG_PAGE\r
+#define EFI_D_INFO DEBUG_INFO\r
+#define EFI_D_DISPATCH DEBUG_DISPATCH\r
+#define EFI_D_VARIABLE DEBUG_VARIABLE\r
+#define EFI_D_BM DEBUG_BM\r
+#define EFI_D_BLKIO DEBUG_BLKIO\r
+#define EFI_D_NET DEBUG_NET\r
+#define EFI_D_UNDI DEBUG_UNDI\r
+#define EFI_D_LOADFILE DEBUG_LOADFILE\r
+#define EFI_D_EVENT DEBUG_EVENT\r
+#define EFI_D_VERBOSE DEBUG_VERBOSE\r
+#define EFI_D_ERROR DEBUG_ERROR\r
+\r
+//\r
+// Source file line number.\r
+// Default is use the to compiler provided __LINE__ macro value. The __LINE__\r
+// mapping can be overriden by predefining DEBUG_LINE_NUMBER\r
+//\r
+// Defining DEBUG_LINE_NUMBER to a fixed value is useful when comparing builds\r
+// across source code formatting changes that may add/remove lines in a source\r
+// file.\r
+//\r
+#ifdef DEBUG_LINE_NUMBER\r
+#else\r
+#define DEBUG_LINE_NUMBER __LINE__\r
+#endif\r