justin/jsix_import
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Commented out CPUID log messages, they're never differnet under qemu

Browse Source
This commit is contained in:
Justin C. Miller
2018-08-27 06:41:09 -07:00
parent f74f3f03d1
commit cd09c17d71
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/kernel/main.cpp
View File

@@ -86,23 +86,24 @@ kernel_main(popcorn_data *header)
init_console(header); init_console(header);
// pager->dump_blocks(); // pager->dump_blocks();
device_manager *devices = device_manager *devices =
new (&device_manager::get()) device_manager(header->acpi_table); new (&device_manager::get()) device_manager(header->acpi_table);
interrupts_enable(); interrupts_enable();
/*
cpu_id cpu; cpu_id cpu;
log::info(logs::boot, "CPU Vendor: %s", cpu.vendor_id()); log::info(logs::boot, "CPU Vendor: %s", cpu.vendor_id());
log::info(logs::boot, "CPU Family %x Model %x Stepping %x", log::info(logs::boot, "CPU Family %x Model %x Stepping %x",
cpu.family(), cpu.model(), cpu.stepping()); cpu.family(), cpu.model(), cpu.stepping());
auto r = cpu.get(0x15); auto r = cpu.get(0x15);
log::info(logs::boot, "CPU Crystal: %dHz", r.ecx);
addr_t cr4 = 0; addr_t cr4 = 0;
__asm__ __volatile__ ( "mov %%cr4, %0" : "=r" (cr4) ); __asm__ __volatile__ ( "mov %%cr4, %0" : "=r" (cr4) );
log::info(logs::boot, "cr4: cr4", r.ecx); log::info(logs::boot, "cr4: %016x", cr4);
*/
log::info(logs::boot, "CPU Crystal: %dHz", r.ecx);
devices->init_drivers(); devices->init_drivers();