commit be89562052f5854668991ccaee4e3820ceab0195 Author: AderKonstantin Date: Sun Apr 20 05:30:01 2025 +0300 Update .gitignore, LICENSE, Makefile, and 5 more files diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d6c6092 --- /dev/null +++ b/.gitignore @@ -0,0 +1,40 @@ +# Файлы сборки и объектные файлы +*.o +*.obj +*.bin +*.elf +*.iso +*.img +*.lst +*.map + +# Временные файлы и артефакты +*.d +*.log +*.out +*.tmp +*~ +*.swp +*.swo +bochslog.txt + +# Директории сборки +/build/ +/iso/ +/obj/ +/bin/ + +# Специфичные для редакторов/IDE +.vscode/ +.idea/ +*.suo +*.user +*.sublime-workspace + +# Резервные копии +*.bak +*.backup + +# Системные файлы +.DS_Store +Thumbs.db diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..15cafb4 --- /dev/null +++ b/LICENSE @@ -0,0 +1,9 @@ +MIT License + +Copyright (c) 2025 AderKonstantin + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..cdd3d81 --- /dev/null +++ b/Makefile @@ -0,0 +1,37 @@ +OBJECTS = loader.o kmain.o +CC = gcc +CFLAGS = -m32 -nostdlib -nostdinc -fno-builtin -fno-stack-protector \ + -nostartfiles -nodefaultlibs -Wall -Wextra -Werror -c +LDFLAGS = -T link.ld -melf_i386 +AS = nasm +ASFLAGS = -f elf + +all: kernel.elf + +kernel.elf: $(OBJECTS) + ld $(LDFLAGS) $(OBJECTS) -o kernel.elf + +os.iso: kernel.elf + cp kernel.elf iso/boot/kernel.elf + genisoimage -R \ + -b boot/grub/stage2_eltorito \ + -no-emul-boot \ + -boot-load-size 4 \ + -A os \ + -input-charset utf8 \ + -quiet \ + -boot-info-table \ + -o os.iso \ + iso + +run: os.iso + bochs -f bochsrc.txt -q + +%.o: %.c + $(CC) $(CFLAGS) $< -o $@ + +%.o: %.s + $(AS) $(ASFLAGS) $< -o $@ + +clean: + rm -rf *.o kernel.elf os.iso diff --git a/README.md b/README.md new file mode 100644 index 0000000..9a4d545 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# three-days-os + +Ось которую я хочу попробовать написать за три дня. Академический проект. \ No newline at end of file diff --git a/UPDATELOG.md b/UPDATELOG.md new file mode 100644 index 0000000..2813aa6 --- /dev/null +++ b/UPDATELOG.md @@ -0,0 +1,12 @@ +# Update Log + +## [Unreleased] +### [CAFEBABE] - 2025-17-04 +- Ось записывает CAFEBABE в eax регистр + +### [Stack] - 2025-18-04 +- Добавил стек (Stack) + +### Успешно все проебал - 2025-19-04 +- Пока делал гит-репозиторий все проебал. Пришлось восстанавливать. + diff --git a/bochsrc.txt b/bochsrc.txt new file mode 100644 index 0000000..02b96e2 --- /dev/null +++ b/bochsrc.txt @@ -0,0 +1,9 @@ +megs: 32 +display_library: x +romimage: file=/usr/share/bochs/BIOS-bochs-latest +vgaromimage: file=/usr/share/bochs/VGABIOS-lgpl-latest +ata0-master: type=cdrom, path=os.iso, status=inserted +boot: cdrom +log: bochslog.txt +clock: sync=realtime, time0=local +cpu: count=1, ips=1000000 diff --git a/kmain.c b/kmain.c new file mode 100644 index 0000000..889346e --- /dev/null +++ b/kmain.c @@ -0,0 +1,15 @@ +#define VGA_ADDRESS 0xB8000 + +void vga_write(const char* str, unsigned char color) { + volatile char* vga = (volatile char*) VGA_ADDRESS; + while(*str) { + *vga++ = *str++; + *vga++ = color; + } +} + +int kmain() { + vga_write("OS Booted!", 0x0F); // Белый текст на черном фоне + while(1); + return 0; +} diff --git a/link.ld b/link.ld new file mode 100644 index 0000000..4b45002 --- /dev/null +++ b/link.ld @@ -0,0 +1,21 @@ +ENTRY(loader) +SECTIONS { + . = 0x00100000; /* Ядро загружается по 1 МБ */ + + .text ALIGN(4K) : { + *(.text) + } + + .rodata ALIGN(4K) : { + *(.rodata*) + } + + .data ALIGN(4K) : { + *(.data) + } + + .bss ALIGN(4K) : { + *(COMMON) + *(.bss) + } +} diff --git a/loader.s b/loader.s new file mode 100644 index 0000000..1343652 --- /dev/null +++ b/loader.s @@ -0,0 +1,25 @@ +global loader +extern kmain + +MAGIC_NUMBER equ 0x1BADB002 +FLAGS equ 0x0 +CHECKSUM equ -MAGIC_NUMBER + +section .text +align 4 + dd MAGIC_NUMBER + dd FLAGS + dd CHECKSUM + +loader: + mov esp, stack_top ; Инициализация стека + call kmain ; Вызов ядра на C + +.loop: + jmp .loop ; Бесконечный цикл + +section .bss +align 16 +stack_bottom: + resb 16384 ; 16 KiB стек +stack_top: