From 03035c98b4ba3297b837e96080e78e0aac1e86db Mon Sep 17 00:00:00 2001 From: Aleksa Vučković Date: Mon, 31 Jan 2022 11:16:38 +0100 Subject: Promene --- include/01.pocetak/boot.s | 30 +----------------------------- include/01.pocetak/boot1.s | 5 +++++ include/01.pocetak/boot2.s | 5 +++++ include/01.pocetak/boot3.s | 2 ++ include/01.pocetak/boot4.s | 5 +++++ include/01.pocetak/boot5.s | 6 ++++++ include/01.pocetak/boot6.s | 12 ++++++++++++ include/01.pocetak/boot7.s | 1 + include/01.pocetak/deo1 | 5 ----- include/01.pocetak/deo10 | 5 ----- include/01.pocetak/deo11 | 12 ------------ include/01.pocetak/deo12 | 1 - include/01.pocetak/deo2 | 5 ----- include/01.pocetak/deo3 | 6 ------ include/01.pocetak/deo4 | 4 ---- include/01.pocetak/deo5 | 5 ----- include/01.pocetak/deo6 | 4 ---- include/01.pocetak/deo7 | 5 ----- include/01.pocetak/deo8 | 2 -- include/01.pocetak/deo9 | 5 ----- 20 files changed, 37 insertions(+), 88 deletions(-) create mode 100644 include/01.pocetak/boot1.s create mode 100644 include/01.pocetak/boot2.s create mode 100644 include/01.pocetak/boot3.s create mode 100644 include/01.pocetak/boot4.s create mode 100644 include/01.pocetak/boot5.s create mode 100644 include/01.pocetak/boot6.s create mode 100644 include/01.pocetak/boot7.s delete mode 100644 include/01.pocetak/deo1 delete mode 100644 include/01.pocetak/deo10 delete mode 100644 include/01.pocetak/deo11 delete mode 100644 include/01.pocetak/deo12 delete mode 100644 include/01.pocetak/deo2 delete mode 100644 include/01.pocetak/deo3 delete mode 100644 include/01.pocetak/deo4 delete mode 100644 include/01.pocetak/deo5 delete mode 100644 include/01.pocetak/deo6 delete mode 100644 include/01.pocetak/deo7 delete mode 100644 include/01.pocetak/deo8 delete mode 100644 include/01.pocetak/deo9 (limited to 'include/01.pocetak') diff --git a/include/01.pocetak/boot.s b/include/01.pocetak/boot.s index 907cd3c..f65cc72 100644 --- a/include/01.pocetak/boot.s +++ b/include/01.pocetak/boot.s @@ -10,35 +10,6 @@ .long FLAGS .long CHECKSUM -.global _start -.global load_gdt -.global load_idt -.global enable_interrupts -.global ioport_in -.global ioport_out - -load_gdt: - movl 4(%esp), %edx - lgdt (%edx) - ret - -load_idt: - movl 4(%esp), %edx - lidt (%edx) - sti - ret - -ioport_in: - movl 4(%esp),%edx - in %dx,%al - ret - -ioport_out: - movl 4(%esp),%edx - movl 8(%esp),%eax - outb %al,%dx - ret - .set CODE_SEGMENT, 0x08 .set DATA_SEGMENT, 0x10 @@ -49,6 +20,7 @@ stack_bottom: stack_top: .section .text +.global _start .type _start, @function _start: call init_gdt_table diff --git a/include/01.pocetak/boot1.s b/include/01.pocetak/boot1.s new file mode 100644 index 0000000..0e1bfbe --- /dev/null +++ b/include/01.pocetak/boot1.s @@ -0,0 +1,5 @@ +.set ALIGN, 1<<0 +.set MEMINFO, 1<<1 +.set FLAGS, ALIGN | MEMINFO +.set MAGIC, 0x1BADB002 +.set CHECKSUM, -(MAGIC + FLAGS) diff --git a/include/01.pocetak/boot2.s b/include/01.pocetak/boot2.s new file mode 100644 index 0000000..cd7b353 --- /dev/null +++ b/include/01.pocetak/boot2.s @@ -0,0 +1,5 @@ +.section .multiboot +.align 4 +.long MAGIC +.long FLAGS +.long CHECKSUM diff --git a/include/01.pocetak/boot3.s b/include/01.pocetak/boot3.s new file mode 100644 index 0000000..cd3f772 --- /dev/null +++ b/include/01.pocetak/boot3.s @@ -0,0 +1,2 @@ +.set CODE_SEGMENT, 0x08 +.set DATA_SEGMENT, 0x10 diff --git a/include/01.pocetak/boot4.s b/include/01.pocetak/boot4.s new file mode 100644 index 0000000..a9280a6 --- /dev/null +++ b/include/01.pocetak/boot4.s @@ -0,0 +1,5 @@ +.section .bss +.align 16 +stack_bottom: +.skip 16384 +stack_top: diff --git a/include/01.pocetak/boot5.s b/include/01.pocetak/boot5.s new file mode 100644 index 0000000..2fe5ffc --- /dev/null +++ b/include/01.pocetak/boot5.s @@ -0,0 +1,6 @@ +.section .text +.global _start +.type _start, @function +_start: + call init_gdt_table + ljmp $CODE_SEGMENT, $code diff --git a/include/01.pocetak/boot6.s b/include/01.pocetak/boot6.s new file mode 100644 index 0000000..bd0f1da --- /dev/null +++ b/include/01.pocetak/boot6.s @@ -0,0 +1,12 @@ +code: + movw $DATA_SEGMENT, %ax + movw %ax, %ds + movw %ax, %es + movw %ax, %fs + movw %ax, %gs + movw %ax, %ss + movl $stack_top, %esp + cli + call _init + call kernel_main + hlt diff --git a/include/01.pocetak/boot7.s b/include/01.pocetak/boot7.s new file mode 100644 index 0000000..d1d8388 --- /dev/null +++ b/include/01.pocetak/boot7.s @@ -0,0 +1 @@ +.size _start, . - _start diff --git a/include/01.pocetak/deo1 b/include/01.pocetak/deo1 deleted file mode 100644 index 0e1bfbe..0000000 --- a/include/01.pocetak/deo1 +++ /dev/null @@ -1,5 +0,0 @@ -.set ALIGN, 1<<0 -.set MEMINFO, 1<<1 -.set FLAGS, ALIGN | MEMINFO -.set MAGIC, 0x1BADB002 -.set CHECKSUM, -(MAGIC + FLAGS) diff --git a/include/01.pocetak/deo10 b/include/01.pocetak/deo10 deleted file mode 100644 index 3cd7ea1..0000000 --- a/include/01.pocetak/deo10 +++ /dev/null @@ -1,5 +0,0 @@ -.section .text -.type _start, @function -_start: - call init_gdt_table - ljmp $CODE_SEGMENT, $code diff --git a/include/01.pocetak/deo11 b/include/01.pocetak/deo11 deleted file mode 100644 index bd0f1da..0000000 --- a/include/01.pocetak/deo11 +++ /dev/null @@ -1,12 +0,0 @@ -code: - movw $DATA_SEGMENT, %ax - movw %ax, %ds - movw %ax, %es - movw %ax, %fs - movw %ax, %gs - movw %ax, %ss - movl $stack_top, %esp - cli - call _init - call kernel_main - hlt diff --git a/include/01.pocetak/deo12 b/include/01.pocetak/deo12 deleted file mode 100644 index d1d8388..0000000 --- a/include/01.pocetak/deo12 +++ /dev/null @@ -1 +0,0 @@ -.size _start, . - _start diff --git a/include/01.pocetak/deo2 b/include/01.pocetak/deo2 deleted file mode 100644 index cd7b353..0000000 --- a/include/01.pocetak/deo2 +++ /dev/null @@ -1,5 +0,0 @@ -.section .multiboot -.align 4 -.long MAGIC -.long FLAGS -.long CHECKSUM diff --git a/include/01.pocetak/deo3 b/include/01.pocetak/deo3 deleted file mode 100644 index 44fcb34..0000000 --- a/include/01.pocetak/deo3 +++ /dev/null @@ -1,6 +0,0 @@ -.global _start -.global load_gdt -.global load_idt -.global enable_interrupts -.global ioport_in -.global ioport_out diff --git a/include/01.pocetak/deo4 b/include/01.pocetak/deo4 deleted file mode 100644 index 975ee19..0000000 --- a/include/01.pocetak/deo4 +++ /dev/null @@ -1,4 +0,0 @@ -load_gdt: - movl 4(%esp), %edx - lgdt (%edx) - ret diff --git a/include/01.pocetak/deo5 b/include/01.pocetak/deo5 deleted file mode 100644 index 6f095e9..0000000 --- a/include/01.pocetak/deo5 +++ /dev/null @@ -1,5 +0,0 @@ -load_idt: - movl 4(%esp), %edx - lidt (%edx) - sti - ret diff --git a/include/01.pocetak/deo6 b/include/01.pocetak/deo6 deleted file mode 100644 index 3f23d36..0000000 --- a/include/01.pocetak/deo6 +++ /dev/null @@ -1,4 +0,0 @@ -ioport_in: - movl 4(%esp),%edx - in %dx,%al - ret diff --git a/include/01.pocetak/deo7 b/include/01.pocetak/deo7 deleted file mode 100644 index f441d17..0000000 --- a/include/01.pocetak/deo7 +++ /dev/null @@ -1,5 +0,0 @@ -ioport_out: - movl 4(%esp),%edx - movl 8(%esp),%eax - outb %al,%dx - ret diff --git a/include/01.pocetak/deo8 b/include/01.pocetak/deo8 deleted file mode 100644 index cd3f772..0000000 --- a/include/01.pocetak/deo8 +++ /dev/null @@ -1,2 +0,0 @@ -.set CODE_SEGMENT, 0x08 -.set DATA_SEGMENT, 0x10 diff --git a/include/01.pocetak/deo9 b/include/01.pocetak/deo9 deleted file mode 100644 index a9280a6..0000000 --- a/include/01.pocetak/deo9 +++ /dev/null @@ -1,5 +0,0 @@ -.section .bss -.align 16 -stack_bottom: -.skip 16384 -stack_top: -- cgit v1.2.3