git://scm.lunaixsky.com
/
lunaix-os.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
feat: basic elf32 loader (only LOAD segment is supported)
[lunaix-os.git]
/
lunaix-os
/
kernel
/
proc0.c
diff --git
a/lunaix-os/kernel/proc0.c
b/lunaix-os/kernel/proc0.c
index 2a410322345706414a4d2d4719c548e63b8e7c4a..6f39299977eaf1dac49a312cb1efce05db75d2ae 100644
(file)
--- a/
lunaix-os/kernel/proc0.c
+++ b/
lunaix-os/kernel/proc0.c
@@
-1,9
+1,8
@@
#include <lunaix/block.h>
#include <lunaix/common.h>
#include <lunaix/block.h>
#include <lunaix/common.h>
-#include <lunaix/f
ctrl
.h>
+#include <lunaix/f
options
.h>
#include <lunaix/fs.h>
#include <lunaix/fs/twifs.h>
#include <lunaix/fs.h>
#include <lunaix/fs/twifs.h>
-#include <lunaix/lunistd.h>
#include <lunaix/lxconsole.h>
#include <lunaix/mm/cake.h>
#include <lunaix/mm/pmm.h>
#include <lunaix/lxconsole.h>
#include <lunaix/mm/cake.h>
#include <lunaix/mm/pmm.h>
@@
-11,11
+10,15
@@
#include <lunaix/mm/vmm.h>
#include <lunaix/peripheral/ps2kbd.h>
#include <lunaix/peripheral/serial.h>
#include <lunaix/mm/vmm.h>
#include <lunaix/peripheral/ps2kbd.h>
#include <lunaix/peripheral/serial.h>
-#include <lunaix/proc.h>
#include <lunaix/spike.h>
#include <lunaix/syscall.h>
#include <lunaix/syslog.h>
#include <lunaix/types.h>
#include <lunaix/spike.h>
#include <lunaix/syscall.h>
#include <lunaix/syslog.h>
#include <lunaix/types.h>
+
+#include <usr/fcntl.h>
+#include <usr/sys/lunaix.h>
+#include <usr/unistd.h>
+
#include <sdbg/protocol.h>
#include <hal/acpi/acpi.h>
#include <sdbg/protocol.h>
#include <hal/acpi/acpi.h>
@@
-76,6
+79,18
@@
input_test();
extern void
sh_main();
extern void
sh_main();
+void __USER__
+__setup_dir()
+{
+ int errno;
+ mkdir("/mnt");
+ mkdir("/mnt/lunaix-os");
+
+ if ((errno = mount("/dev/sdb", "/mnt/lunaix-os", "iso9660", 0))) {
+ syslog(2, "fail mounting boot medium. (%d)\n", errno);
+ }
+}
+
void __USER__
__proc0_usr()
{
void __USER__
__proc0_usr()
{
@@
-85,10
+100,9
@@
__proc0_usr()
int fdstdout = open("/dev/tty", 0);
int fdstdin = dup2(stdout, 1);
int fdstdout = open("/dev/tty", 0);
int fdstdin = dup2(stdout, 1);
+ __setup_dir();
+
pid_t p;
pid_t p;
- // if (!fork()) {
- // _pconsole_main();
- // }
if (!(p = fork())) {
#ifndef USE_DEMO
if (!(p = fork())) {
#ifndef USE_DEMO
@@
-132,6
+146,7
@@
__proc0()
init_proc_user_space(__current);
init_proc_user_space(__current);
+ // user space
asm volatile("movw %0, %%ax\n"
"movw %%ax, %%es\n"
"movw %%ax, %%ds\n"
asm volatile("movw %0, %%ax\n"
"movw %%ax, %%es\n"
"movw %%ax, %%ds\n"
@@
-156,38
+171,50
@@
extern multiboot_info_t* _k_init_mb_info; /* k_init.c */
void
init_platform()
{
void
init_platform()
{
+ kprintf(KINFO "\033[11;0mLunaixOS (gcc v%s, %s)\033[39;49m\n",
+ __VERSION__,
+ __TIME__);
+
// 锁定所有系统预留页(内存映射IO,ACPI之类的),并且进行1:1映射
lock_reserved_memory();
// 锁定所有系统预留页(内存映射IO,ACPI之类的),并且进行1:1映射
lock_reserved_memory();
- rtc_init();
+ // firmware
acpi_init(_k_init_mb_info);
acpi_init(_k_init_mb_info);
+
+ // die
apic_init();
ioapic_init();
apic_init();
ioapic_init();
+
+ // debugger
serial_init();
sdbg_init();
serial_init();
sdbg_init();
+
+ // timers & clock
+ rtc_init();
timer_init(SYS_TIMER_FREQUENCY_HZ);
clock_init();
timer_init(SYS_TIMER_FREQUENCY_HZ);
clock_init();
+
+ // peripherals & chipset features
ps2_kbd_init();
ps2_kbd_init();
- pci_init();
block_init();
ahci_init();
block_init();
ahci_init();
-
syscall_install
();
+
pci_init
();
+ // console
console_start_flushing();
console_flush();
console_start_flushing();
console_flush();
+ // expose cake allocator states to vfs
cake_export();
cake_export();
+
unlock_reserved_memory();
unlock_reserved_memory();
+ // clean up
for (size_t i = 0; i < (uintptr_t)(&__init_hhk_end); i += PG_SIZE) {
for (size_t i = 0; i < (uintptr_t)(&__init_hhk_end); i += PG_SIZE) {
- vmm_del_mapping(
PD_REFERENCED
, (void*)i);
+ vmm_del_mapping(
VMS_SELF
, (void*)i);
pmm_free_page(KERNEL_PID, (void*)i);
}
pmm_free_page(KERNEL_PID, (void*)i);
}
-
- for (size_t i = L1_INDEX(KERNEL_MM_BASE); i < 1023; i++) {
- vmm_set_mapping(PD_REFERENCED, i << 22, 0, 0, VMAP_NOMAP);
- }
}
void
}
void
@@
-219,22
+246,30
@@
__do_reserved_memory(int unlock)
size_t pg_num = CEIL(mmap.len_low, PG_SIZE_BITS);
size_t j = 0;
if (!unlock) {
size_t pg_num = CEIL(mmap.len_low, PG_SIZE_BITS);
size_t j = 0;
if (!unlock) {
+ kprintf("mem: freeze: %p..%p type=%x\n",
+ pa,
+ pa + pg_num * PG_SIZE,
+ mmap.type);
for (; j < pg_num; j++) {
uintptr_t _pa = pa + (j << PG_SIZE_BITS);
if (_pa >= KERNEL_MM_BASE) {
// Don't fuck up our kernel space!
break;
}
for (; j < pg_num; j++) {
uintptr_t _pa = pa + (j << PG_SIZE_BITS);
if (_pa >= KERNEL_MM_BASE) {
// Don't fuck up our kernel space!
break;
}
- vmm_set_mapping(
PD_REFERENCED
, _pa, _pa, PG_PREM_R, VMAP_NULL);
+ vmm_set_mapping(
VMS_SELF
, _pa, _pa, PG_PREM_R, VMAP_NULL);
pmm_mark_page_occupied(
KERNEL_PID, _pa >> PG_SIZE_BITS, PP_FGLOCKED);
}
// Save the progress for later unmapping.
mmaps[i].len_low = j * PG_SIZE;
} else {
pmm_mark_page_occupied(
KERNEL_PID, _pa >> PG_SIZE_BITS, PP_FGLOCKED);
}
// Save the progress for later unmapping.
mmaps[i].len_low = j * PG_SIZE;
} else {
+ kprintf("mem: reclaim: %p..%p type=%x\n",
+ pa,
+ pa + pg_num * PG_SIZE,
+ mmap.type);
for (; j < pg_num; j++) {
uintptr_t _pa = pa + (j << PG_SIZE_BITS);
for (; j < pg_num; j++) {
uintptr_t _pa = pa + (j << PG_SIZE_BITS);
- vmm_del_mapping(
PD_REFERENCED
, _pa);
+ vmm_del_mapping(
VMS_SELF
, _pa);
if (mmap.type == MULTIBOOT_MEMORY_ACPI_RECLAIMABLE) {
pmm_mark_page_free(_pa >> PG_SIZE_BITS);
}
if (mmap.type == MULTIBOOT_MEMORY_ACPI_RECLAIMABLE) {
pmm_mark_page_free(_pa >> PG_SIZE_BITS);
}