[ros-diffs] [tkreuzer] 53440: [FREELDR] - Use EFLAGS constants from NDK instead of defining them new - Add addresses for amd64 startup page tables

Author: tkreuzer
Date: Thu Aug 25 09:44:21 2011
New Revision: 53440

URL: http://svn.reactos.org/svn/reactos?rev=53440&view=rev
Log:
[FREELDR]
- Use EFLAGS constants from NDK instead of defining them new
- Add addresses for amd64 startup page tables

Modified:
    trunk/reactos/boot/freeldr/freeldr/arch/i386/pccons.c
    trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c
    trunk/reactos/boot/freeldr/freeldr/include/arch/pc/pcbios.h

Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pccons.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/arch/i386/pccons.c [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pccons.c [iso-8859-1] Thu Aug 25 09:44:21
2011
@@ -84,7 +84,7 @@
   Regs.b.ah = 0x01;
   Int386(0x16, &Regs, &Regs);
 
-  return 0 == (Regs.x.eflags & I386FLAG_ZF);
+  return 0 == (Regs.x.eflags & EFLAGS_ZF);
 }
 
 int

Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c [iso-8859-1] Thu Aug 25 09:44:21
2011
@@ -54,7 +54,7 @@
   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 @@
 
   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 @@
       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 */

Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/pc/pcbios.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/include/arch/pc/pcbios.h [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/include/arch/pc/pcbios.h [iso-8859-1] Thu Aug 25
09:44:21 2011
@@ -88,7 +88,7 @@
 
 // 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