From d0a5441a620d93f1083cad6c71692e23f9d50c9a Mon Sep 17 00:00:00 2001
From: CrazyEttin <>
Date: Wed, 2 Jun 2021 13:18:59 +0300
Subject: [PATCH] Reorganise the repo a bit.

---
 make.sh                         | 13 ++++---------
 {src => source}/boot.asm        |  3 ++-
 {src => source}/byte2hexstr.inc |  0
 {src => source}/cmpstr.inc      |  0
 {src => source}/echo.inc        |  0
 {src => source}/hello.inc       |  0
 {src => source}/help.inc        |  0
 {src => source}/keycode.inc     |  0
 {src => source}/newline.inc     |  0
 {src => source}/println.inc     |  0
 {src => source}/printstr.inc    |  0
 {src => source}/readln.inc      | 11 ++++-------
 {src => source}/system.asm      |  0
 13 files changed, 10 insertions(+), 17 deletions(-)
 rename {src => source}/boot.asm (97%)
 rename {src => source}/byte2hexstr.inc (100%)
 rename {src => source}/cmpstr.inc (100%)
 rename {src => source}/echo.inc (100%)
 rename {src => source}/hello.inc (100%)
 rename {src => source}/help.inc (100%)
 rename {src => source}/keycode.inc (100%)
 rename {src => source}/newline.inc (100%)
 rename {src => source}/println.inc (100%)
 rename {src => source}/printstr.inc (100%)
 rename {src => source}/readln.inc (96%)
 rename {src => source}/system.asm (100%)

diff --git a/make.sh b/make.sh
index 3724e0c..4ce037a 100755
--- a/make.sh
+++ b/make.sh
@@ -1,14 +1,9 @@
 #!/bin/bash
 
-if [ ! -d "build" ];
-then
-    mkdir build
-fi
+cd source/
+nasm boot.asm -f bin -O0 -o ../boot.bin
+nasm system.asm -f bin -O0 -o ../system.bin
 
-cd src/
-nasm boot.asm -f bin -O0 -o ../build/boot.bin
-nasm system.asm -f bin -O0 -o ../build/system.bin
-
-cd ../build/
+cd ..
 cat boot.bin system.bin > EttinOS.img
 rm boot.bin system.bin
diff --git a/src/boot.asm b/source/boot.asm
similarity index 97%
rename from src/boot.asm
rename to source/boot.asm
index 61f9c67..6e0d743 100644
--- a/src/boot.asm
+++ b/source/boot.asm
@@ -1,5 +1,5 @@
 [ORG 0x7c00]
-jmp 0:start
+jmp short start
 nop
 
 ;Disk description table
@@ -30,6 +30,7 @@ mov ds, ax
 
 ;Load the system
 ;Set the source
+mov dl, 0x0
 mov dh, 0x0
 mov ch, 0x0
 mov cl, 0x2
diff --git a/src/byte2hexstr.inc b/source/byte2hexstr.inc
similarity index 100%
rename from src/byte2hexstr.inc
rename to source/byte2hexstr.inc
diff --git a/src/cmpstr.inc b/source/cmpstr.inc
similarity index 100%
rename from src/cmpstr.inc
rename to source/cmpstr.inc
diff --git a/src/echo.inc b/source/echo.inc
similarity index 100%
rename from src/echo.inc
rename to source/echo.inc
diff --git a/src/hello.inc b/source/hello.inc
similarity index 100%
rename from src/hello.inc
rename to source/hello.inc
diff --git a/src/help.inc b/source/help.inc
similarity index 100%
rename from src/help.inc
rename to source/help.inc
diff --git a/src/keycode.inc b/source/keycode.inc
similarity index 100%
rename from src/keycode.inc
rename to source/keycode.inc
diff --git a/src/newline.inc b/source/newline.inc
similarity index 100%
rename from src/newline.inc
rename to source/newline.inc
diff --git a/src/println.inc b/source/println.inc
similarity index 100%
rename from src/println.inc
rename to source/println.inc
diff --git a/src/printstr.inc b/source/printstr.inc
similarity index 100%
rename from src/printstr.inc
rename to source/printstr.inc
diff --git a/src/readln.inc b/source/readln.inc
similarity index 96%
rename from src/readln.inc
rename to source/readln.inc
index 55b5b5b..7257be0 100644
--- a/src/readln.inc
+++ b/source/readln.inc
@@ -12,7 +12,7 @@ rep stosb
 sub di, [.length]
 
 ;Initialise the cursor pointer
-mov bl, 0x0
+mov bl, 0x1
 
 ;Initialise the last input line pointer
 mov ah, 0x3
@@ -38,9 +38,7 @@ cmp al, 0x8
 je .backspace
 
 ;Check for input end
-mov cl, bl
-inc cl
-cmp cl, [.length]
+cmp bl, [.length]
 je .loop
 
 ;Check for space
@@ -137,13 +135,12 @@ jmp .loop
 .return:
 
 ;Go to the end of the input
-mov bh, 0
+mov bh, 0x0
 sub di, bx
 add di, [.length]
 
 .findtrailing:
 ;Check for a trailing space
-dec di
 cmp byte [di], 0x20
 je .deltrailing
 jmp .done
@@ -152,7 +149,7 @@ jmp .done
 ;Delete a trailing space
 mov al, 0x0
 stosb
-dec di
+sub di, 0x2
 jmp .findtrailing
 
 .done:
diff --git a/src/system.asm b/source/system.asm
similarity index 100%
rename from src/system.asm
rename to source/system.asm