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

Rename Popcorn to jsix.

Browse Source 
See README.md for more information.
This commit is contained in:
Justin C. Miller
2019-05-27 12:48:10 -07:00
parent 2b0cd6f2f2
commit 6285517ef7
17 changed files with 67 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/kernel/boot.s
View File

@@ -1,4 +1,4 @@
MAGIC equ 0x600db007 ; Popcorn OS header magic number
MAGIC equ 0x600db007 ; jsix OS header magic number
section .header
align 4

6
src/kernel/main.cpp
View File

@@ -37,7 +37,7 @@ init_console()
console *cons = new (&g_console) console(com1);
cons->set_color(0x21, 0x00);
cons->puts("Popcorn OS ");
cons->puts("jsix OS ");
cons->set_color(0x08, 0x00);
cons->puts(GIT_VERSION " booting...\n");
@@ -47,7 +47,7 @@ init_console()
void
kernel_main(kernel_args *header)
{
bool waiting = header && (header->flags && POPCORN_FLAG_DEBUG);
bool waiting = header && (header->flags && JSIX_FLAG_DEBUG);
while (waiting);
kutil::assert_set_callback(__kernel_assert);
@@ -71,7 +71,7 @@ kernel_main(kernel_args *header)
init_console();
log::debug(logs::boot, " Popcorn header is at: %016lx", header);
log::debug(logs::boot, " jsix header is at: %016lx", header);
log::debug(logs::boot, " Framebuffer is at: %016lx", header->frame_buffer);
log::debug(logs::boot, " Kernel data is at: %016lx", header->data);
log::debug(logs::boot, " Memory map is at: %016lx", header->memory_map);

22
src/kernel/memory_bootstrap.cpp
View File

@@ -47,12 +47,12 @@ enum class efi_memory_type : uint32_t
efi_max,
popcorn_kernel = 0x80000000,
popcorn_data,
popcorn_initrd,
popcorn_scratch,
jsix_kernel = 0x80000000,
jsix_data,
jsix_initrd,
jsix_scratch,
popcorn_max
jsix_max
};
struct efi_memory_descriptor
@@ -123,9 +123,9 @@ public:
void add_used_frames(kutil::vm_space &vm) {
for (auto *desc : map) {
if (desc->type == efi_memory_type::popcorn_data ||
desc->type == efi_memory_type::popcorn_initrd ||
desc->type == efi_memory_type::popcorn_kernel)
if (desc->type == efi_memory_type::jsix_data ||
desc->type == efi_memory_type::jsix_initrd ||
desc->type == efi_memory_type::jsix_kernel)
{
uintptr_t virt_addr = desc->physical_start + kernel_offset;
vm.commit(virt_addr, desc->pages * frame_size);
@@ -135,9 +135,9 @@ public:
void page_in_kernel(page_manager &pm, page_table *pml4) {
for (auto *desc : map) {
if (desc->type == efi_memory_type::popcorn_kernel ||
desc->type == efi_memory_type::popcorn_data ||
desc->type == efi_memory_type::popcorn_initrd)
if (desc->type == efi_memory_type::jsix_kernel ||
desc->type == efi_memory_type::jsix_data ||
desc->type == efi_memory_type::jsix_initrd)
{
uintptr_t virt_addr = desc->physical_start + kernel_offset;
pm.page_in(pml4, desc->physical_start, virt_addr, desc->pages);