[FREELDR]

- Use EFLAGS constants from NDK instead of defining them new
- Add addresses for amd64 startup page tables

svn path=/trunk/; revision=53440

diff --git a/reactos/boot/freeldr/freeldr/arch/i386/pccons.c b/reactos/boot/freeldr/freeldr/arch/i386/pccons.c
index 8b5a8cd..b4cb5ce 100644 (file)
--- a/reactos/boot/freeldr/freeldr/arch/i386/pccons.c
+++ b/reactos/boot/freeldr/freeldr/arch/i386/pccons.c
@@ -84,7 +84,7 @@ PcConsKbHit(VOID)
   Regs.b.ah = 0x01;
   Int386(0x16, &Regs, &Regs);
 
-  return 0 == (Regs.x.eflags & I386FLAG_ZF);
+  return 0 == (Regs.x.eflags & EFLAGS_ZF);
 }
 
 int

diff --git a/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c b/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c
index 006492d..80f7474 100644 (file)
--- a/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c
+++ b/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c
@@ -54,7 +54,7 @@ PcMemGetExtendedMemorySize(VOID)
   DPRINTM(DPRINT_MEMORY, "BX = 0x%x\n", RegsOut.w.bx);
   DPRINTM(DPRINT_MEMORY, "CX = 0x%x\n", RegsOut.w.cx);
   DPRINTM(DPRINT_MEMORY, "DX = 0x%x\n", RegsOut.w.dx);
-  DPRINTM(DPRINT_MEMORY, "CF set = %s\n\n", (RegsOut.x.eflags & I386FLAG_CF) ? "TRUE" : "FALSE");
+  DPRINTM(DPRINT_MEMORY, "CF set = %s\n\n", (RegsOut.x.eflags & EFLAGS_CF) ? "TRUE" : "FALSE");
 
   if (INT386_SUCCESS(RegsOut))
     {
@@ -95,7 +95,7 @@ PcMemGetExtendedMemorySize(VOID)
 
   DPRINTM(DPRINT_MEMORY, "Int15h AH=88h\n");
   DPRINTM(DPRINT_MEMORY, "AX = 0x%x\n", RegsOut.w.ax);
-  DPRINTM(DPRINT_MEMORY, "CF set = %s\n\n", (RegsOut.x.eflags & I386FLAG_CF) ? "TRUE" : "FALSE");
+  DPRINTM(DPRINT_MEMORY, "CF set = %s\n\n", (RegsOut.x.eflags & EFLAGS_CF) ? "TRUE" : "FALSE");
 
   if (INT386_SUCCESS(RegsOut) && RegsOut.w.ax != 0)
     {
@@ -182,7 +182,7 @@ PcMemGetBiosMemoryMap(PBIOS_MEMORY_MAP BiosMemoryMap, ULONG MaxMemoryMapSize)
       DPRINTM(DPRINT_MEMORY, "EAX = 0x%x\n", Regs.x.eax);
       DPRINTM(DPRINT_MEMORY, "EBX = 0x%x\n", Regs.x.ebx);
       DPRINTM(DPRINT_MEMORY, "ECX = 0x%x\n", Regs.x.ecx);
-      DPRINTM(DPRINT_MEMORY, "CF set = %s\n", (Regs.x.eflags & I386FLAG_CF) ? "TRUE" : "FALSE");
+      DPRINTM(DPRINT_MEMORY, "CF set = %s\n", (Regs.x.eflags & EFLAGS_CF) ? "TRUE" : "FALSE");
 
       /* If the BIOS didn't return 'SMAP' in EAX then
        * it doesn't support this call */

diff --git a/reactos/boot/freeldr/freeldr/include/arch/pc/pcbios.h b/reactos/boot/freeldr/freeldr/include/arch/pc/pcbios.h
index 61ff8df..69a3036 100644 (file)
--- a/reactos/boot/freeldr/freeldr/include/arch/pc/pcbios.h
+++ b/reactos/boot/freeldr/freeldr/include/arch/pc/pcbios.h
@@ -88,7 +88,7 @@ int           Int386(int ivec, REGS* in, REGS* out);
 
 // This macro tests the Carry Flag
 // If CF is set then the call failed (usually)
-#define INT386_SUCCESS(regs)   ((regs.x.eflags & I386FLAG_CF) == 0)
+#define INT386_SUCCESS(regs)   ((regs.x.eflags & EFLAGS_CF) == 0)
 
 void   EnableA20(void);
 VOID   ChainLoadBiosBootSectorCode(VOID);      // Implemented in boot.S