diff --git a/Worksheet2_1/Makefile b/Worksheet2_1/Makefile deleted file mode 100644 index a5650f1e489552ca32108a4b127f479342439e6c..0000000000000000000000000000000000000000 --- a/Worksheet2_1/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -ASM=nasm -CC=gcc -QEMU=qemu-system-i386 -GENISO=mkisofs - -SRC_DIR=source -ISO_DIR=iso -BUILD_DIR=$(ISO_DIR)/boot - -KERNEL=kernel.elf -ISO=os.iso - -all: build run - -build: $(KERNEL) iso - -$(KERNEL): loader.o - $(CC) -nostdlib -o $(KERNEL) loader.o -Wl,-T,$(SRC_DIR)/link.ld - -loader.o: loader.asm - $(ASM) -f elf loader.asm - -iso: $(KERNEL) - mkdir -p $(BUILD_DIR)/grub - cp $(KERNEL) $(BUILD_DIR) - cp $(ISO_DIR)/boot/grub/menu.lst $(BUILD_DIR)/grub/ - cp $(ISO_DIR)/boot/grub/stage2_eltorito $(BUILD_DIR)/grub/ - $(GENISO) -R -b boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 \ - -A os -input-charset utf8 -quiet -boot-info-table -o $(ISO) $(ISO_DIR) - -run: build - $(QEMU) -nographic -boot d -cdrom $(ISO) -m 32 -d cpu -D logQ.txt - -clean: - rm -f *.o $(KERNEL) $(ISO) - rm -rf $(BUILD_DIR) - -.PHONY: all build iso run clean diff --git a/Worksheet2_1/README.md b/Worksheet2_1/README.md deleted file mode 100644 index 42b2e706c10166257e8d3f0f41bf001a34a45368..0000000000000000000000000000000000000000 --- a/Worksheet2_1/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# Worksheet 2 Part 1 - Tiny OS - -## Structure diff --git a/Worksheet2_1/iso/boot/grub/menu.lst b/Worksheet2_1/iso/boot/grub/menu.lst deleted file mode 100644 index 9a5b08c5675101071fb961e7dae15d7343147301..0000000000000000000000000000000000000000 --- a/Worksheet2_1/iso/boot/grub/menu.lst +++ /dev/null @@ -1,5 +0,0 @@ -default=0 -timeout=0 - -title os -kernel /boot/kernel.elf diff --git a/Worksheet2_1/iso/boot/grub/stage2_eltorito b/Worksheet2_1/iso/boot/grub/stage2_eltorito deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/Worksheet2_1/loader.asm b/Worksheet2_1/loader.asm deleted file mode 100644 index bad63b84ecb9cc5915190ac7634b2ad00106bdf6..0000000000000000000000000000000000000000 --- a/Worksheet2_1/loader.asm +++ /dev/null @@ -1,17 +0,0 @@ -global loader - -MAGIC_NUMBER equ 0x1BADB002 -FLAGS equ 0x0 -CHECKSUM equ -MAGIC_NUMBER - -section .text -align 4 - -dd MAGIC_NUMBER -dd FLAGS -dd CHECKSUM - -loader: - mov eax, 0xCAFEBABE -.loop: - jmp .loop diff --git a/Worksheet2_1/loader.o b/Worksheet2_1/loader.o deleted file mode 100644 index 77a0c8895f412835d6ed7210d4b37985b671e9e1..0000000000000000000000000000000000000000 Binary files a/Worksheet2_1/loader.o and /dev/null differ diff --git a/Worksheet2_1/source/link.ld b/Worksheet2_1/source/link.ld deleted file mode 100644 index dca86d69ca27449e220df7a03570303500bd9bb3..0000000000000000000000000000000000000000 --- a/Worksheet2_1/source/link.ld +++ /dev/null @@ -1,22 +0,0 @@ -ENTRY(loader) - -SECTIONS { - . = 0x00100000; - - .text ALIGN (0x1000) : { - *(.text) - } - - .rodata ALIGN (0x1000) : { - *(.rodata*) - } - - .data ALIGN (0x1000) : { - *(.data) - } - - .bss ALIGN (0x1000) : { - *(COMMON) - *(.bss) - } -}