q3k
/
Cucumber
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleaned up debug.

master
q3k 2013-07-09 10:51:39 +02:00
parent 5a94b26f14
commit 024ab3a3fd
3 changed files with 16 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Loader/src/io.c
View File

@ -224,12 +224,17 @@ void printf(const s8 *szFormat, ...)
puti(va_arg(ap, u64));
break;
case 'X':
case 'x':
{
u64 bData = va_arg(ap, u64);
print_hex(bData);
break;
}
case 'x':
{
u32 bData = va_arg(ap, u32);
print_hex_32(bData);
break;
}
default:
printf("printf: Unknown escape character %c!\n", szFormat[Offset + 1]);
}

32
Loader/src/load.c
View File

@ -61,11 +61,7 @@ u32 load(void *Multiboot, unsigned int Magic)
u32 KernelStart = g_Multiboot->Modules[0].ModuleStart;
u32 KernelEnd = g_Multiboot->Modules[0].ModuleEnd;
puts("Kernel is ");
print_hex(KernelStart);
puts("-");
print_hex(KernelEnd);
puts(".\n");
printf("Kernel is at 0x%x - 0x%x\n", KernelStart, KernelEnd);
struct elf_header *Header = (struct elf_header *)KernelStart;
if (Header->Identification.Magic != 0x464C457F)
@ -86,9 +82,7 @@ u32 load(void *Multiboot, unsigned int Magic)
return 0;
}
puts("Entry point @");
print_hex(Header->Entry);
puts(".\n");
printf("Kernel entry: 0x%x\n", Header->Entry);
if (Header->SectionHeaderEntrySize != sizeof(struct elf_section_header))
{
@ -99,11 +93,7 @@ u32 load(void *Multiboot, unsigned int Magic)
struct elf_section_header *Sections = (struct elf_section_header *)((u32)Header + (u32)Header->SectionHeaderOffset);
struct elf_section_header *StringSection = &Sections[Header->SectionEntryStrings];
//u32 *Strings = (u32*)(ModulesAddress + (u32)StringSection->Offset);
puts("Kernel ELF has 0x");
print_hex(Header->NumSectionHeaderEntries);
puts(" sections.\n");
printf("Kernel ELF has %i sections.", Header->NumSectionHeaderEntries);
// Loop through ELF sections to find physical space occupied by them
u64 StartPhysical = 0;
@ -141,7 +131,8 @@ u32 load(void *Multiboot, unsigned int Magic)
puts("Kernel will probably not fit in extended memory. Failing.\n");
for(;;) {}
}
puts("Paging frames will be allocated from 0x"); print_hex(FreeSpaceStart); puts("\n");
printf("Allocating frames from 0x%x\n", FreeSpaceStart);
paging_setup(FreeSpaceStart);
// allocate idnetity mapping of low & extended memory (up to 0x00EFFFFF)
paging_map_address(0, 0, 0x00EFFFFF);
@ -161,20 +152,20 @@ u32 load(void *Multiboot, unsigned int Magic)
SizeAligned = (SizeAligned + 0x1000) & 0xFFFFF000;
u8 *Destination = paging_allocate(VirtualAddress, SizeAligned);
puts(" -> "); puts(Name); puts(" at "); print_hex(VirtualAddress);
printf(" -> %s at %X", Name, VirtualAddress);
if (!(Sections[i].Type & SHT_NOBITS))
{
// not .bss - copy data
puts(" (copy from "); print_hex(PhysicalAddress); puts(")\n");
u8 *Source = (u8 *)((u32)PhysicalAddress);
for (u32 j = 0; j < Size; j++)
Destination[j] = Source[j];
printf(" (copied %i bytes from 0x%x)\n", Size, PhysicalAddress);
}
else
{
for (u32 j = 0; j < Size; j++)
Destination[j] = 0;
puts(" (zeroed out)\n");
printf(" (zeroed %i bytes)\n", Size);
}
}
}
@ -194,15 +185,10 @@ u32 load(void *Multiboot, unsigned int Magic)
g_Context.LoaderPhysicalStart = (u32)&_start;
g_Context.LoaderPhysicalEnd = (u32)&_end;
puts("Load context 0x");
print_hex((u32)&g_Context);
puts(".\n");
printf("Load context at 0x%x\n", (u64)&g_Context);
__asm__ volatile ("movl %cr4, %eax; bts $5, %eax; movl %eax, %cr4");
__asm__ volatile ("movl %%eax, %%cr3" :: "a" (paging_get_pml4()));
puts("CR3 is now pointing to PML4 (0x");
print_hex((u32)paging_get_pml4());
puts(")\n");
puts("Here it goes, enabling long mode...\n");

18
Loader/src/paging.c
View File

@ -32,7 +32,6 @@ void paging_setup(u32 AllocateFramesFrom)
_zero_paging_structure(g_PML4);
}
u8 dbg = 0;
void paging_map_page(u64 Virtual, u64 Physical)
{
if (Virtual % 0x1000 || Physical % 0x1000)
@ -41,18 +40,15 @@ void paging_map_page(u64 Virtual, u64 Physical)
print_hex(Virtual);
for (;;) {}
}
// printf("Mapping %x\n", Virtual);
u64 PML4I = GET_PML4_ENTRY(Virtual);
u64 PDPI = GET_PDP_ENTRY(Virtual);
u64 DIRI = GET_DIR_ENTRY(Virtual);
u64 TABI = GET_TAB_ENTRY(Virtual);
// printf("%x %i/%i/%i/%i\n", Virtual, PML4I, PDPI, DIRI, TABI);
u64 *PDP = (u64 *)(g_PML4[PML4I] & 0xFFFFF000);
if (PDP == 0)
{
// printf("-> Creating PDP @%i\n", PML4I);
PDP = (u64 *)_allocate_frame_4k();
_zero_paging_structure(PDP);
g_PML4[PML4I] = ((u64)PDP) | 3;
@ -60,28 +56,16 @@ void paging_map_page(u64 Virtual, u64 Physical)
u64 *Directory = (u64 *)(PDP[PDPI] & 0xFFFFF000);
if (Directory == 0)
{
// printf("-> Creating Dirctory @%i/%i\n", PML4I, PDPI);
Directory = (u64 *)_allocate_frame_4k();
_zero_paging_structure(Directory);
PDP[PDPI] = ((u64)Directory) | 3;
printf("P%x[%i] < d%x\n", (u64)PDP, PDPI, (u64)Directory);
dbg = 0;
}
u64 *Table = (u64 *)(Directory[DIRI] & 0xFFFFF000);
if (Table == 0)
{
if (dbg < 3)
{
printf("P%x[%i] == D%x\n", (u64)PDP, PDPI, (u64)Directory);
dbg += 1;
}
// printf("P@ %x D@ %x, De %x\n", (u64)PDP, (u64)Directory, Directory[DIRI]);
// printf("-> Creating Table @%i/%i/%i\n", PML4I, PDPI, DIRI);
Table = (u64 *)_allocate_frame_4k();
// printf("aT %x\n", Table);
_zero_paging_structure(Table);
Directory[DIRI] = ((u64)Table) | 3;
// printf("De <- %x\n", Directory[DIRI]);
}
Table[TABI] = ((u64)Physical) | 3;
}