Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-22 16:36:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

[FREELDR]

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

svn path=/trunk/; revision=53440
This commit is contained in:
Timo Kreuzer 2011-08-25 09:44:21 +00:00
parent e4356aa258
commit 3f288f07ea
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/boot/freeldr/freeldr/arch/i386/pccons.c
View file

@ -84,7 +84,7 @@ PcConsKbHit(VOID)
Regs.b.ah = 0x01; Regs.b.ah = 0x01;
Int386(0x16, &Regs, &Regs); Int386(0x16, &Regs, &Regs);
return 0 == (Regs.x.eflags & I386FLAG_ZF); return 0 == (Regs.x.eflags & EFLAGS_ZF);
} }
int int

6
reactos/boot/freeldr/freeldr/arch/i386/pcmem.c
View file

@ -54,7 +54,7 @@ PcMemGetExtendedMemorySize(VOID)
DPRINTM(DPRINT_MEMORY, "BX = 0x%x\n", RegsOut.w.bx); DPRINTM(DPRINT_MEMORY, "BX = 0x%x\n", RegsOut.w.bx);
DPRINTM(DPRINT_MEMORY, "CX = 0x%x\n", RegsOut.w.cx); DPRINTM(DPRINT_MEMORY, "CX = 0x%x\n", RegsOut.w.cx);
DPRINTM(DPRINT_MEMORY, "DX = 0x%x\n", RegsOut.w.dx); 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)) if (INT386_SUCCESS(RegsOut))
{ {
@ -95,7 +95,7 @@ PcMemGetExtendedMemorySize(VOID)
DPRINTM(DPRINT_MEMORY, "Int15h AH=88h\n"); DPRINTM(DPRINT_MEMORY, "Int15h AH=88h\n");
DPRINTM(DPRINT_MEMORY, "AX = 0x%x\n", RegsOut.w.ax); 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) 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, "EAX = 0x%x\n", Regs.x.eax);
DPRINTM(DPRINT_MEMORY, "EBX = 0x%x\n", Regs.x.ebx); DPRINTM(DPRINT_MEMORY, "EBX = 0x%x\n", Regs.x.ebx);
DPRINTM(DPRINT_MEMORY, "ECX = 0x%x\n", Regs.x.ecx); 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 /* If the BIOS didn't return 'SMAP' in EAX then
* it doesn't support this call */ * it doesn't support this call */

2
reactos/boot/freeldr/freeldr/include/arch/pc/pcbios.h
View file

@ -88,7 +88,7 @@ int Int386(int ivec, REGS* in, REGS* out);
// This macro tests the Carry Flag // This macro tests the Carry Flag
// If CF is set then the call failed (usually) // 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 EnableA20(void);
VOID ChainLoadBiosBootSectorCode(VOID); // Implemented in boot.S VOID ChainLoadBiosBootSectorCode(VOID); // Implemented in boot.S