From a4e4ea0cff43521fd758879784f12a70ab529065 Mon Sep 17 00:00:00 2001
From: "Hazal2.Veziroglu@live.uwe.ac.uk" <hazal2.veziroglu@live.uwe.ac.uk>
Date: Fri, 6 Dec 2024 09:58:55 +0000
Subject: [PATCH] Update 7 files
- /Worksheet2_1/source/link.ld
- /Worksheet2_1/iso/boot/grub/menu.lst
- /Worksheet2_1/iso/boot/grub/stage2_eltorito
- /Worksheet2_1/Makefile
- /Worksheet2_1/README.md
- /Worksheet2_1/loader.asm
- /Worksheet2_1/loader.o
---
Worksheet2_1/Makefile | 38 ---------------------
Worksheet2_1/README.md | 3 --
Worksheet2_1/iso/boot/grub/menu.lst | 5 ---
Worksheet2_1/iso/boot/grub/stage2_eltorito | 0
Worksheet2_1/loader.asm | 17 ---------
Worksheet2_1/loader.o | Bin 544 -> 0 bytes
Worksheet2_1/source/link.ld | 22 ------------
7 files changed, 85 deletions(-)
delete mode 100644 Worksheet2_1/Makefile
delete mode 100644 Worksheet2_1/README.md
delete mode 100644 Worksheet2_1/iso/boot/grub/menu.lst
delete mode 100644 Worksheet2_1/iso/boot/grub/stage2_eltorito
delete mode 100644 Worksheet2_1/loader.asm
delete mode 100644 Worksheet2_1/loader.o
delete mode 100644 Worksheet2_1/source/link.ld
diff --git a/Worksheet2_1/Makefile b/Worksheet2_1/Makefile
deleted file mode 100644
index a5650f1..0000000
--- 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 42b2e70..0000000
--- 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 9a5b08c..0000000
--- 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 e69de29..0000000
diff --git a/Worksheet2_1/loader.asm b/Worksheet2_1/loader.asm
deleted file mode 100644
index bad63b8..0000000
--- 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
GIT binary patch
literal 0
HcmV?d00001
literal 544
zcmb<-^>JflWMqH=Mh0dE1doBi0V-hvrZpH?8JNH<QVEcmAj}5UD8R_TAPi-LC;<?`
zz`(%Hz`(!^WrHXKMg|5&5Ce)qW`LN23=AkPNnm7PXkcJqV1b$eqCsX#qM7%Ak%7S)
zWB?Sy%!6_nm^Q4H2C@J72R+%bZ`Z$5um6F#2&`9<T2aEFSDaB?QdE+d#GqGPnG2yI
ze1uA@EM)sw7(V_-Rs;%p9+1DFZeU>e_#fncgqn~4<rx?lKyHJGef+P_z`y_s3kaW)
zL4$#T0b~Y<F93?koczR;)FQpa;#>w_M|V%>c)w6zC)XebHy=m$U<PLoS7-0wP+ta!
QGAN~&lb>GzGJ$~s01J9JVgLXD
diff --git a/Worksheet2_1/source/link.ld b/Worksheet2_1/source/link.ld
deleted file mode 100644
index dca86d6..0000000
--- 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)
- }
-}
--
GitLab