Compare commits
2 commits
065dbf5177
...
eae0e5e345
Author | SHA1 | Date | |
---|---|---|---|
|
eae0e5e345 | ||
|
bb30cd2a65 |
5 changed files with 5 additions and 5 deletions
4
Makefile
4
Makefile
|
@ -8,7 +8,7 @@ CC=i686-elf-gcc
|
||||||
bootstrap.o: bootstrap.s
|
bootstrap.o: bootstrap.s
|
||||||
i686-elf-as bootstrap.s -o bootstrap.o
|
i686-elf-as bootstrap.s -o bootstrap.o
|
||||||
|
|
||||||
kernel.bin: bootstrap.o vga.o std/std.o std/kstd.o cpu/idt.o cpu/pic.o cpu/exception.o kernel.o
|
kernel.bin: bootstrap.o gfx/terminal.o std/std.o std/kstd.o cpu/idt.o cpu/pic.o cpu/exception.o kernel.o
|
||||||
$(CC) -T linker.ld -o $@ -ffreestanding -O2 -nostdlib -lgcc $^
|
$(CC) -T linker.ld -o $@ -ffreestanding -O2 -nostdlib -lgcc $^
|
||||||
|
|
||||||
iso: kernel.bin
|
iso: kernel.bin
|
||||||
|
@ -21,5 +21,5 @@ run: iso
|
||||||
qemu-system-i386 -d int -M smm=off -cdrom generated-iso.iso
|
qemu-system-i386 -d int -M smm=off -cdrom generated-iso.iso
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -rf *.o kernel.bin *.iso isodir/
|
rm -rf *.o **/**.o kernel.bin *.iso isodir/
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#include "vga.h"
|
#include "gfx/terminal.h"
|
||||||
#include "std/std.h"
|
#include "std/std.h"
|
||||||
|
|
||||||
size_t terminal_row;
|
size_t terminal_row;
|
2
kernel.c
2
kernel.c
|
@ -1,7 +1,7 @@
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include "vga.h"
|
#include "gfx/terminal.h"
|
||||||
#include "cpu/pic.h"
|
#include "cpu/pic.h"
|
||||||
#include "cpu/idt.h"
|
#include "cpu/idt.h"
|
||||||
#include "std/kstd.h"
|
#include "std/kstd.h"
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
#include <limits.h>
|
#include <limits.h>
|
||||||
#include "std/kstd.h"
|
#include "std/kstd.h"
|
||||||
#include "std/std.h"
|
#include "std/std.h"
|
||||||
#include "vga.h"
|
#include "gfx/terminal.h"
|
||||||
|
|
||||||
int putchar(int ic) {
|
int putchar(int ic) {
|
||||||
char c = (char) ic;
|
char c = (char) ic;
|
||||||
|
|
Loading…
Reference in a new issue