Мерджим!

.gitignore

@@ -0,0 +1,14 @@
+*
+!*.*
+!*/
+
+!Makefile
+
+build/*
+
+test.*
+
+!.vscode/
+!.vscode/*.*
+.vscode/c_cpp_properties.json
+.vscode/settings.json

.vscode/launch.json

@@ -0,0 +1,29 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "(linux) bochs floppy",
+            "type": "f5anything",
+            "request": "launch",
+            "command": "bochs -q -f ./bochs.linux.conf",
+            "preLaunchTask": "make_floppy"
+        },
+        {
+            "name": "(win) bochs floppy",
+            "type": "f5anything",
+            "request": "launch",
+            "command": "& \"${env:BOCHS_PATH}\\bochs\"-q -f ./bochs.win.conf",
+            "preLaunchTask": "make_floppy"
+        },
+        {
+            "name": "(win_dbg) bochs floppy",
+            "type": "f5anything",
+            "request": "launch",
+            "command": "& \"${env:BOCHS_PATH}\\bochsdbg\" -q -f ./bochsdbg.win.conf",
+            "preLaunchTask": "make_floppy"
+        }
+    ]
+}

.vscode/tasks.json

@@ -0,0 +1,10 @@
+{
+	"version": "2.0.0",
+	"tasks": [
+        {
+            "label": "make_floppy",
+            "type": "shell",
+            "command": "./build_"
+        }
+	]
+}

Makefile

@@ -0,0 +1,206 @@
+SOURCE_DIR = ./src
+BUILD_DIR = ./build
+
+BOOTLOADER_SOURCE_DIR = $(SOURCE_DIR)/bootloader
+KERNEL_SOURCE_DIR = $(SOURCE_DIR)/kernel
+LIBC_SOURCE_DIR = $(SOURCE_DIR)/libc
+
+BOOTLOADER_BUILD_DIR = $(BUILD_DIR)/bootloader
+KERNEL_BUILD_DIR = $(BUILD_DIR)/kernel
+LIBC_BUILD_DIR = $(BUILD_DIR)/libc
+
+BOOTLOADER_ASM = $(BOOTLOADER_SOURCE_DIR)/boot.asm
+KERNEL_C = $(KERNEL_SOURCE_DIR)/kernel.c
+KERNEL_ENTRY_ASM = $(KERNEL_SOURCE_DIR)/kernel_entry.asm
+
+TRAMP_WC_O = $(KERNEL_BUILD_DIR)/sys/context/tramplinsWContext.o
+
+BOOTLOADER_BIN = $(BOOTLOADER_BUILD_DIR)/bootloader.bin
+KERNEL_O = $(KERNEL_BUILD_DIR)/kernel.o
+KERNEL_ENTRY_O = $(KERNEL_BUILD_DIR)/kernel_entry.o
+KERNEL_TMP = $(KERNEL_BUILD_DIR)/kernel.tmp
+KERNEL_BIN = $(KERNEL_BUILD_DIR)/kernel.bin
+
+FLOPPY_IMG = $(BUILD_DIR)/floppy.img
+
+KERNEL_ENTRY_ADDRESS = 0x20200
+# 0xC0020200
+# 0x20200
+
+ifeq ($(OS), Windows_NT)
+	ASM = ${NASM_PATH}\nasm
+	DD = ${CYGWIN_PATH}\bin\dd
+	GCC = gcc -fno-leading-underscore
+	MCOPY = 
+	MKFS = 
+	LD = ld
+	LD_M_OPT = i386pe
+	OBJCOPY = objcopy
+	OD = ${CYGWIN_PATH}\bin\od
+	OD_OPT = -t x1 -A n
+	RM = 
+else
+    UNAME_S := $(shell uname -s)
+    ifeq ($(UNAME_S), Linux)
+		ASM = nasm
+		GCC = gcc
+		DD = dd
+		MCOPY = mcopy
+		MKFS = mkfs
+		LD = ld
+		OBJCOPY = objcopy
+		OD = od
+		OD_OPT = -t x1 -A n
+		RM = rm
+    endif
+endif
+
+$(info init..)
+
+.PHONY: clean_boot floppy kernel bootloader
+
+floppy: bootloader kernel $(FLOPPY_IMG)
+kernel: $(KERNEL_BIN)
+bootloader: $(BOOTLOADER_BIN)
+
+$(BUILD_DIR)/pm/io/print_d2vm.o: $(SOURCE_DIR)/pm/io/print_d2vm.asm
+	$(info [MAKE] building: $@)
+	$(ASM) -f elf $< -o $@
+
+$(TRAMP_WC_O): $(KERNEL_SOURCE_DIR)/sys/context/tramplinsWContext.asm
+	$(info [MAKE] building: $@)
+	$(ASM) -f elf $< -o $@
+
+$(KERNEL_BUILD_DIR)/sys/paging/paging.asm.o: $(KERNEL_SOURCE_DIR)/sys/paging/paging.asm
+	$(info [MAKE] building: $@)
+	$(ASM) -f elf $< -o $@
+
+$(KERNEL_BUILD_DIR)/sys/process/exec.asm.o: $(KERNEL_SOURCE_DIR)/sys/process/exec.asm
+	$(info [MAKE] building: $@)
+	$(ASM) -f elf $< -o $@
+
+$(KERNEL_BUILD_DIR)/sync/sync.asm.o: $(KERNEL_SOURCE_DIR)/sync/sync.asm $(KERNEL_SOURCE_DIR)/sync/sync.h
+	$(info [MAKE] building: $@)
+	$(ASM) -f elf $< -o $@
+
+$(KERNEL_BUILD_DIR)/sys/pic/pic.o: $(KERNEL_SOURCE_DIR)/sys/pic/pic.c							\
+	$(KERNEL_SOURCE_DIR)/sys/pic/pic.h
+	$(info [MAKE] building: $@)
+	$(GCC) -Wall -m32 -mno-sse -fno-pie -ffreestanding -nostdlib -fno-stack-protector -c $< -o $@
+
+$(KERNEL_BUILD_DIR)/sys/io/printf.o: $(KERNEL_SOURCE_DIR)/sys/io/printf.c							\
+	$(KERNEL_SOURCE_DIR)/sys/io/printf.h $(KERNEL_SOURCE_DIR)/sync/sync.h
+	$(info [MAKE] building: $@)
+	$(GCC) -Wall -m32 -mno-sse -fno-pie -ffreestanding -nostdlib -fno-stack-protector -c $< -o $@
+
+$(KERNEL_BUILD_DIR)/sys/memory/mem_utils.o: $(KERNEL_SOURCE_DIR)/sys/memory/mem_utils.c				\
+	$(KERNEL_SOURCE_DIR)/sys/memory/mem_utils.h
+	$(info [MAKE] building: $@)
+	$(GCC) -Wall -m32 -mno-sse -fno-pie -ffreestanding -nostdlib -fno-stack-protector -c $< -o $@
+
+$(KERNEL_BUILD_DIR)/sys/memory/alloc.o: $(KERNEL_SOURCE_DIR)/sys/memory/alloc.c						\
+	$(KERNEL_SOURCE_DIR)/sys/memory/alloc.h $(KERNEL_SOURCE_DIR)/sys/paging/paging.h				\
+	$(KERNEL_SOURCE_DIR)/sys/io/io.h $(KERNEL_SOURCE_DIR)/sys/io/printf.h							\
+	$(KERNEL_SOURCE_DIR)/misc/list.h
+	$(info [MAKE] building: $@)
+	$(GCC) -Wall -m32 -mno-sse -fno-pie -ffreestanding -nostdlib -fno-stack-protector -c $< -o $@
+
+$(KERNEL_BUILD_DIR)/sys/context/exp.o: $(KERNEL_SOURCE_DIR)/sys/context/experiment.asm
+	$(info [MAKE] building: $@)
+	$(ASM) -f elf $< -o $@
+
+$(KERNEL_BUILD_DIR)/sys/paging/paging.o: $(KERNEL_SOURCE_DIR)/sys/paging/paging.c					\
+	$(KERNEL_SOURCE_DIR)/sys/paging/paging.h $(KERNEL_SOURCE_DIR)/sys/memory/alloc.h				\
+	$(KERNEL_SOURCE_DIR)/sys/paging/pdt.h $(KERNEL_SOURCE_DIR)/sys/paging/pt.h						\
+	$(KERNEL_SOURCE_DIR)/sys/io/io.h $(KERNEL_SOURCE_DIR)/sys/io/printf.h
+	$(info [MAKE] building: $@)
+	$(GCC) -Wall -m32 -mno-sse -fno-pie -ffreestanding -nostdlib -fno-stack-protector -c $< -o $@
+
+$(KERNEL_BUILD_DIR)/misc/list.o: $(KERNEL_SOURCE_DIR)/misc/list.c									\
+	$(KERNEL_SOURCE_DIR)/misc/list.h $(KERNEL_SOURCE_DIR)/sys/memory/alloc.h
+	$(info [MAKE] building: $@)
+	$(GCC) -Wall -m32 -mno-sse -fno-pie -ffreestanding -nostdlib -fno-stack-protector -c $< -o $@
+
+$(KERNEL_BUILD_DIR)/sys/process/process.o: $(KERNEL_SOURCE_DIR)/sys/process/process.c							\
+	$(KERNEL_SOURCE_DIR)/sys/process/process.h $(KERNEL_SOURCE_DIR)/sys/paging/paging.h							\
+	$(KERNEL_SOURCE_DIR)/sys/io/io.h $(KERNEL_SOURCE_DIR)/sys/io/printf.h
+	$(info [MAKE] building: $@)
+	$(GCC) -Wall -m32 -mno-sse -fno-pie -ffreestanding -nostdlib -fno-stack-protector -c $< -o $@
+
+$(KERNEL_BUILD_DIR)/sys/process/scheduler.o: $(KERNEL_SOURCE_DIR)/sys/process/scheduler.c						\
+	$(KERNEL_SOURCE_DIR)/sys/process/scheduler.h $(KERNEL_SOURCE_DIR)/misc/list.h								\
+	$(KERNEL_SOURCE_DIR)/sys/memory/alloc.h $(KERNEL_SOURCE_DIR)/sys/context/context.h							\
+	$(KERNEL_SOURCE_DIR)/sys/process/process.h $(KERNEL_SOURCE_DIR)/sys/paging/paging.h							\
+	$(LIBC_SOURCE_DIR)/io/console.h
+	$(info [MAKE] building: $@)
+	$(GCC) -Wall -m32 -mno-sse -fno-pie -ffreestanding -nostdlib -fno-stack-protector -c $< -o $@
+
+$(KERNEL_BUILD_DIR)/sys/interruption.o: $(KERNEL_SOURCE_DIR)/sys/interruption.c														\
+	$(KERNEL_SOURCE_DIR)/sys/interruption.h $(KERNEL_SOURCE_DIR)/sys/tramplins.hpp							 						\
+	$(KERNEL_SOURCE_DIR)/sys/context/tramplinsWContext.asm																			\
+	$(KERNEL_SOURCE_DIR)/sys/context/context.h $(KERNEL_SOURCE_DIR)/sys/io/io.h $(KERNEL_SOURCE_DIR)/sys/io/printf.h				\
+	$(KERNEL_SOURCE_DIR)/sys/memory/memory.h $(KERNEL_SOURCE_DIR)/sys/paging/paging.h $(KERNEL_SOURCE_DIR)/sys/pic/pic.h			\
+	$(KERNEL_SOURCE_DIR)/sys/process/scheduler.h $(KERNEL_SOURCE_DIR)/sync/sync.h
+	$(info [MAKE] building: $@)
+	$(GCC) -Wall -m32 -mno-sse -fno-pie -ffreestanding -nostdlib -fno-stack-protector -c $< -o $@
+
+$(LIBC_BUILD_DIR)/io/console.o: $(LIBC_SOURCE_DIR)/io/console.c $(LIBC_SOURCE_DIR)/io/console.h				\
+	$(KERNEL_SOURCE_DIR)/sys/io/io.h $(KERNEL_SOURCE_DIR)/sys/memory/alloc.h
+	$(info [MAKE] building: $@)
+	$(GCC) -Wall -m32 -mno-sse -fno-pie -ffreestanding -nostdlib -fno-stack-protector -c $< -o $@
+
+$(LIBC_BUILD_DIR)/io/printer.o: $(LIBC_SOURCE_DIR)/io/printer.c $(LIBC_SOURCE_DIR)/io/printer.h				\
+	$(KERNEL_SOURCE_DIR)/sys/io/io.h $(KERNEL_SOURCE_DIR)/sys/memory/alloc.h
+	$(info [MAKE] building: $@)
+	$(GCC) -Wall -m32 -mno-sse -fno-pie -ffreestanding -nostdlib -fno-stack-protector -c $< -o $@
+
+$(KERNEL_O): $(KERNEL_C) $(KERNEL_SOURCE_DIR)/sys/io/io.h $(KERNEL_SOURCE_DIR)/sys/io/printf.h		\
+	$(KERNEL_SOURCE_DIR)/sys/memory/memory.h $(KERNEL_SOURCE_DIR)/sys/interruption.h				\
+	$(KERNEL_SOURCE_DIR)/sys/pic/pic.h $(KERNEL_SOURCE_DIR)/sys/paging/paging.h						\
+	$(KERNEL_SOURCE_DIR)/sys/process/scheduler.h $(LIBC_SOURCE_DIR)/io/printer.h
+	$(info [MAKE] building: $@)
+	$(GCC) -Wall -m32 -mno-sse -fno-pie -ffreestanding -nostdlib -fno-stack-protector -c $< -o $@
+#	-m32
+
+$(KERNEL_ENTRY_O): $(KERNEL_ENTRY_ASM)
+	$(info [MAKE] building: $@)
+	$(ASM) -f elf $< -o $@
+
+$(KERNEL_BIN): $(KERNEL_ENTRY_O) $(KERNEL_O)																						\
+	$(KERNEL_BUILD_DIR)/sys/io/printf.o $(BUILD_DIR)/pm/io/print_d2vm.o $(KERNEL_BUILD_DIR)/sys/memory/alloc.o 						\
+	$(KERNEL_BUILD_DIR)/sys/interruption.o $(KERNEL_BUILD_DIR)/sys/memory/mem_utils.o $(KERNEL_BUILD_DIR)/sys/pic/pic.o				\
+	$(TRAMP_WC_O) $(KERNEL_BUILD_DIR)/sys/context/exp.o																				\
+	$(KERNEL_BUILD_DIR)/sys/paging/paging.asm.o $(KERNEL_BUILD_DIR)/sys/paging/paging.o $(KERNEL_BUILD_DIR)/misc/list.o				\
+	$(KERNEL_BUILD_DIR)/sys/process/process.o $(KERNEL_BUILD_DIR)/sys/process/scheduler.o											\
+	$(KERNEL_BUILD_DIR)/sys/process/exec.asm.o $(KERNEL_BUILD_DIR)/sync/sync.asm.o $(LIBC_BUILD_DIR)/io/console.o					\
+	$(LIBC_BUILD_DIR)/io/printer.o
+	$(info [MAKE] building: $@)
+	$(LD) -m i386pe -Ttext $(KERNEL_ENTRY_ADDRESS) $^ -o $(KERNEL_TMP)
+#	$(LD) -m i386pe -T $(KERNEL_SOURCE_DIR)/link.ld $^ -o $(KERNEL_TMP)
+#	$(KERNEL_TMP)
+	$(OBJCOPY) -I pe-i386 -O binary $(KERNEL_TMP) $@
+
+$(BOOTLOADER_BIN): $(BOOTLOADER_ASM) $(SOURCE_DIR)/rm/io/print.asm							\
+	$(SOURCE_DIR)/bootloader/read_floppy_disk.asm $(SOURCE_DIR)/pm/switch2pm.asm			\
+	$(SOURCE_DIR)/pm/gdt.asm $(SOURCE_DIR)/pm/io/print_d2vm.asm								
+	$(info [MAKE] building: $@)
+	$(ASM) -fbin $< -o $@
+	$(OD) $(OD_OPT) $@
+
+$(FLOPPY_IMG): $(BOOTLOADER_BIN) $(KERNEL_BIN)
+	$(info [MAKE] building: $@)
+	$(DD) bs=512 count=2880 if=/dev/zero of=$@
+#	$(MKFS) -t fat -F 12 -n "UNOS" $@
+	$(DD) conv=notrunc if=$< of=$@
+#	$(MCOPY) -i $@ $(word 2,$^) "::kernel.bin"
+	$(DD) conv=notrunc seek=1 if=$(word 2,$^) of=$@
+
+clean_boot:
+	$(info [MAKE] do  $@:)
+	$(RM) -f $(FLOPPY_IMG)
+	$(RM) -f $(KERNEL_ENTRY_O)
+	$(RM) -f $(KERNEL_O)
+	$(RM) -f $(KERNEL_TMP)
+	$(RM) -f $(KERNEL_BIN)
+	$(RM) -f $(BOOTLOADER_BIN)
+	$(RM) -f $(BOOTLOADER_BIN)

bochs.linux.conf

@@ -0,0 +1,8 @@
+plugin_ctrl: unmapped=true, biosdev=true, speaker=true, extfpuirq=true, parallel=true, serial=true
+config_interface: textconfig
+display_library: x, options="gui_debug"
+memory: host=2048, guest=4096
+boot: floppy
+floppy_bootsig_check: disabled=0
+floppya: type=1_44, 1_44="./build/floppy.img", status=inserted, write_protected=0
+magic_break: enabled=1

bochs.win.conf

@@ -0,0 +1,8 @@
+plugin_ctrl: unmapped=true, biosdev=true, speaker=true, extfpuirq=true, parallel=true, serial=true
+config_interface: win32config
+display_library: win32
+memory: host=2048, guest=4096
+boot: floppy
+floppy_bootsig_check: disabled=0
+floppya: type=1_44, 1_44="./build/floppy.img", status=inserted, write_protected=0
+magic_break: enabled=1

bochsdbg.win.conf

@@ -0,0 +1,8 @@
+plugin_ctrl: unmapped=true, biosdev=true, speaker=true, extfpuirq=true, parallel=true, serial=true
+config_interface: win32config
+display_library: win32, options="gui_debug"
+memory: host=2048, guest=4096
+boot: floppy
+floppy_bootsig_check: disabled=0
+floppya: type=1_44, 1_44="./build/floppy.img", status=inserted, write_protected=0
+magic_break: enabled=1

bx_enh_dbg.ini

@@ -0,0 +1,26 @@
+# bx_enh_dbg_ini
+SeeReg[0] = TRUE
+SeeReg[1] = TRUE
+SeeReg[2] = TRUE
+SeeReg[3] = TRUE
+SeeReg[4] = FALSE
+SeeReg[5] = FALSE
+SeeReg[6] = TRUE
+SeeReg[7] = FALSE
+SingleCPU = FALSE
+ShowIOWindows = TRUE
+ShowButtons = TRUE
+SeeRegColors = TRUE
+ignoreNxtT = TRUE
+ignSSDisasm = TRUE
+UprCase = 0
+DumpInAsciiMode = 3
+isLittleEndian = TRUE
+DefaultAsmLines = 512
+DumpWSIndex = 0
+DockOrder = 0x123
+ListWidthPix[0] = 381
+ListWidthPix[1] = 468
+ListWidthPix[2] = 466
+MainWindow = 0, 0, 878, 500
+FontName = Normal

src/bootloader/boot.asm

@@ -0,0 +1,66 @@
+[BITS 16]
+
+KERNEL_OFFSET_ES equ 0x2000
+KERNEL_OFFSET_BX equ 0
+
+main:
+	xor ax, ax
+	mov es, ax
+
+	cli
+	mov ss, ax
+	mov sp, 0x7c00
+	mov ax, 0x7c0
+	mov ds, ax
+	mov bp, 0x7c00
+
+	mov si, os_boot_msg
+	call print
+
+	mov ax, KERNEL_OFFSET_ES
+	mov es, ax
+	mov bx, KERNEL_OFFSET_BX
+	call disk_load
+
+	;mov si, KERNEL_OFFSET_ES
+	;xor cx, cx
+	;mov al, dh
+	;mov cx, 0x200
+	;mul cx
+	;mov cx, ax
+	;add cx, 0
+	;xor ah, ah
+	;call accumulate
+
+	;mov si, sum
+	;call print					; TODO: implement print_hex, source=?
+
+	call switch_to_pm
+
+	jmp $
+
+%ifndef PRINT
+	%include "./src/rm/io/print.asm"
+%endif
+
+;%ifndef PRINT_HEX
+;	%include "./src/rm/io/print_hex.asm"
+;%endif
+
+%ifndef READ_FLOPPY_DISK
+	%include "./src/bootloader/read_floppy_disk.asm"
+%endif
+
+;%ifndef ACCUMULATE_SUM
+;	%include "./src/rm/misc/accumulate_sum.asm"
+;%endif
+
+os_boot_msg:
+	DB 'Hello world!', 0x0d, 0x0a, 0
+
+%ifndef SWITCH_TO_PM
+	%include "./src/pm/switch2pm.asm"
+%endif
+
+times 510-($-$$) DB 0
+dw 0xaa55