jack/42-archive
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

makefile gdb

Browse source
This commit is contained in:
Jack Halford 2018-02-09 17:28:53 +01:00
parent 01fb8e1667
commit 44e6787e2e
2 changed files with 17 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kernel-rs/Makefile
View file

@ -27,7 +27,7 @@ asm_source := $(wildcard src/arch/$(arch)/*.asm)
asm_object := $(patsubst src/arch/$(arch)/%.asm, build/arch/$(arch)/%.o, $(asm_source)) asm_object := $(patsubst src/arch/$(arch)/%.asm, build/arch/$(arch)/%.o, $(asm_source))
KERNEL_RUN := $(QEMU) -curses -cdrom $(iso) KERNEL_RUN := $(QEMU) -curses -cdrom $(iso)
MONITOR := sleep 0.5; telnet 127.0.0.1 $(PORT); kill \`ps -x | grep gdb | head -n 2 | tail -n 1 | cut -d \ -f 2 \` MONITOR := sleep 0.5; telnet 127.0.0.1 $(PORT); kill \`ps -x | grep gdb | head -n 2 | tail -n 1 | cut -d \ -f 1 \`
GDB := gdb -q -ex \"target remote localhost:$(PORTG)\" -ex \"continue\" GDB := gdb -q -ex \"target remote localhost:$(PORTG)\" -ex \"continue\"

33
kernel-rs/src/lib.rs
View file

@ -22,24 +22,23 @@ pub extern fn kmain() -> ! {
use vga_buffer::ColorCode; use vga_buffer::ColorCode;
WRITER.lock().reset_screen(); WRITER.lock().reset_screen();
WRITER.lock().color_code = ColorCode::new(Color::Yellow, Color::Black);
println!(r#" ,--, "#);
println!(r#" ,--.'| ,----, "#);
println!(r#" ,--, | : .' .' \ "#);
println!(r#",---.'| : ' ,----,' | "#);
println!(r#"; : | | ; | : . ; "#);
println!(r#"| | : _' | ; |.' / "#);
println!(r#": : |.' | `----'/ ; "#);
println!(r#"| ' ' ; : / ; / "#);
println!(r#"\ \ .'. | ; / /-, "#);
println!(r#" `---`: | ' / / /.`| "#);
println!(r#" ' ; |./__; : "#);
println!(r#" | : ;| : .' "#);
println!(r#" ' ,/ ; | .' "#);
println!(r#" '--' `---' "#);
WRITER.lock().color_code = ColorCode::new(Color::White, Color::Black);
println!(">> Kernel startup..."); println!(">> Kernel startup...");
println!(">> Kernel startup...");
WRITER.lock().color_code = ColorCode::new(Color::Blue, Color::Yellow);
println!(">> Kernel startup...");
println!(">> Kernel startup...");
println!(">> Kernel startup...");
WRITER.lock().color_code = ColorCode::new(Color::Red, Color::Green);
println!(">> Kernel startup...");
print!("\n");
println!(">> Kernel startup...");
print!("\n");
println!(">> Kernel startup...");
print!("0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000");
// WRITER.lock().color_code = ColorCode::new(Color::White, Color::Black);
loop { loop {
let control = unsafe { cpuio::inb(0x64) }; let control = unsafe { cpuio::inb(0x64) };
if (control & 1) == 1 { if (control & 1) == 1 {