From fddedb44488ae552e3dfa0b30cd1e800ee187a6b Mon Sep 17 00:00:00 2001
From: Morten Delenk <mtg.morten@googlemail.com>
Date: Thu, 16 Jun 2016 20:50:03 +0200
Subject: [PATCH] First step towards x86_64

---
 kernel.settings                     |  11 ++-
 kernel/hal/x86_64/boot/boot.S       | 127 ++++++++++++++++++++++++++++
 kernel/{hal/x86 => kernel}/string.c |   0
 test.elf                            | Bin 18560 -> 18616 bytes
 4 files changed, 135 insertions(+), 3 deletions(-)
 create mode 100644 kernel/hal/x86_64/boot/boot.S
 rename kernel/{hal/x86 => kernel}/string.c (100%)

diff --git a/kernel.settings b/kernel.settings
index fe4af82..078b7d3 100644
--- a/kernel.settings
+++ b/kernel.settings
@@ -1,10 +1,15 @@
-arch = x86
+arch = x86_64
 #MODE = debug
 MODE = release # enables optimization
 
 export PATH := $(HOME)/opt/bin:$(PATH)
-#PREFIX =
-PREFIX = i686-elf-
+ifeq ($(arch),x86)
+  PREFIX = i686-elf-
+else
+  ifeq ($(arch),x86_64)
+    PREFIX = x86_64-elf-
+  endif
+endif
 
 ifeq ($(MODE),debug)
   	CFLAGS += -g3 -DDEBUG
diff --git a/kernel/hal/x86_64/boot/boot.S b/kernel/hal/x86_64/boot/boot.S
new file mode 100644
index 0000000..f1046b7
--- /dev/null
+++ b/kernel/hal/x86_64/boot/boot.S
@@ -0,0 +1,127 @@
+.code32
+.section multiboot
+#define MB_MAGIC 0x1BADB002
+#define MB_FLAGS 0x0
+#define MB_CHECKSUM -(MB_MAGIC + MB_FLAGS)
+.align 4
+.int MB_MAGIC
+.int MB_FLAGS
+.int MB_CHECKSUM
+.section .text
+.extern init
+.global _start
+_start:
+  mov $mb_ptr, %edi
+  stosl
+  mov %ebx, %eax
+  stosl //Temponarily store both multiboot header pointer and multiboot
+  mov $kernel_stack, %esp
+  mov $0x80000001, %eax //Check if Long Mode is supported
+  cpuid
+  and $0x20000000, %edx
+  jz x86_64_err
+
+  xor %eax, %eax //Check if PAE is supported
+  inc %eax
+  cpuid
+  and $0x40, %dl
+  jz x86_64_err
+  jmp x86_64_OK
+x86_64_err:
+  cli
+  hlt
+  jmp x86_64_err
+x86_64_OK:
+  //Fill one entry of both the pagemap L4 and the Pagedir PT
+  mov $pmfill, %esi
+  mov $pagemapL4, %edi
+  lodsl
+  stosl
+  lodsl
+  stosl
+  mov $pagedirPT, %edi
+  lodsl
+  stosl
+  lodsl
+  stosl
+  //Activate PAE
+  mov %cr4, %eax
+  or $0x20, %al
+  mov %eax, %cr4
+  //Activate x86_64
+  mov $0xC0000080, %ecx
+  rdmsr
+  or $0x00000100, %eax
+  wrmsr
+  //Load Page Table
+  mov $pagemapL4, %eax
+  mov %eax, %cr3
+  //Activate Paging
+  mov %cr0, %eax
+  bswap %eax
+  or $0x80, %al
+  bswap %eax
+  mov %eax, %cr0
+  //Jump to x86_64loader
+  lgdt gdtr
+  jmp $0x18, $start
+
+.code64
+//extern "C" void init(uint32_t eax, multiboot_info * ebx, uint64_t **** pt);
+.global init
+start:
+  xor %rax, %rax
+  mov $mb_ptr, %rsi
+  lodsl
+  mov %rax, %rdi
+  lodsl
+  mov %rax, %rsi
+  mov $pagemapL4, %rdx
+  call init
+stop:
+  cli
+  hlt
+  jmp stop
+.section .data
+gdt:
+//NULL-descriptor
+.quad 0
+//32-bit code
+.word 0xFFFF
+.word 0x0000
+.byte 0x00
+.byte 0x98
+.byte 0xCF
+.byte 0x00
+//data
+.word 0xFFFF
+.word 0x0000
+.byte 0x00
+.byte 0x92
+.byte 0xCF
+.byte 00
+//64-bit code
+.int 0
+.byte 0
+.byte 0x98
+.byte 0x20
+.byte 0
+
+gdtr:
+  .word 4 * 8
+  .int gdt
+pmfill:
+.int pagedirPT + 0x7
+.int 0
+pdptfill:
+.quad 0x87
+.section .bss
+mb_ptr:
+// These 8 Bytes will never be used when the stack comes near it
+.space 4096
+kernel_stack:
+.align 4096
+pagemapL4:
+.space 4096
+pagedirPT:
+.space 4096
diff --git a/kernel/hal/x86/string.c b/kernel/kernel/string.c
similarity index 100%
rename from kernel/hal/x86/string.c
rename to kernel/kernel/string.c
diff --git a/test.elf b/test.elf
index 0d5a60f10e8d2a331a7260e2912665b52a3ecbe0..c31f7970fd4a185301214c0415aea2e6f0c6cf17 100755
GIT binary patch
delta 778
zcmZ8e&ubG=5T4m=YD+>%@|t#cn_p{bV?iyeHEL35ZPhe4JqQ*&Xo+bL#UF`91SNW~
z2M^Ntz*9imn@~gvf*uPZdJsYI5AY%?BI-Y&-)xLp7iQjkGv7Be@9p&lKW*@8hCe=b
z>mHxiYhJB2mm4+e51EL2Xu}}dg!S(SmSEs)wTi+ugw%H#-fF^q2BL_f91d>2N9G62
z7PZkJ`-y)pk@H%*hI3$!`OHv&XaqLcX%BXycBx8r4&U-cCOO|k6sbT|_eGNs-1$$G
zya_f(_JUwE%+!QPqHVO8dLby*?pIFFFIR|_G%y-7=?fUf@drLyqRcAVtOL|t@fkAA
zZJ(fynNo0+3`u^#COiF2UV`%u_V4=Sc*1gHQAK-v)>km%=2li>egT}t_PU9RfS*3-
zruZE6r+Ju$p*aBi^Y;A<s7QwT<Z6~Q4I_0JqdX+Ic@mj3Fk7^EOWM97cOP8_!|@rk
z1KXJNw)JJ-N<bG1>qm<!A1Z`0p|WCyVL=M?mejb7UyZO^Y9-{Y-R!Azy-|*JO<84i
zciI-V9VAZ~7M?~Q&kvj$?1&|m_$wEflv=x+z|{B_m<IekOR5>>lE04YQb~=4aFN#Y
z{04Kab#WqWwysV+>f(EPS8*sfd5~yYpC}IT4Sl7U<xRZ?|3<%pzpcL)vqsMm?aYqw
TeSK&)YaN>*dWJXYe4X$Y+=F;K

delta 1434
zcmZ8fOGs2<6h7ylJ9E`LuRB+Bu9G%{q-Ca!g}sEVjB(l&5w!^nF*OkBVT&Gg-Bb_-
z4L2epdaNpl9t=@Si3oxg)g}spHa%DE3M%M3_jht?@&D)XednC-e>^JjbcxSp`QH7U
zm*@5V_54BaGZ95@F?REn>`61CV6x`4m}NEFHVqK<n-hX<HCx5(HqVOLXZm8M&F5my
znIr|*%p+p%nY$!8V~&b>VV;rXd-I}1-zYqU(AWZBdG+JSRSRG(KxqLXEx^zM!dgH?
z3ox~S8ZDq!3#iiqEG;0a1;n&~xE7G0+G7}MsJ4Rgi0Y;gs6_>lXbGS??!e{qaIa!T
zi$G#q1dd-3cu5%h4#fNr&f~w7U2~Mq*A>cJI3NB}mZJ&9eGt{s7VJAbY4aO+2u?7G
z;=jOAUF!rEG=ptP1&xgZjLD->;wZ{g_Y7QKTfw8j1WFpVAs4F{08uIkY-2AX#gQH$
z&M^G?X%8;f(s2Z$s$nH!apvtgZ~#DXYDX@haT42CX_j=T7ltpFk$HlZmTFa^^r^s3
zkSo{5(OxjS1LivbKd_oA?ZM6*oWcYzDz~Oe2Dx&PoE$|F9tG{~5YY%$b<zA2U~^Iq
ziJIm<DY11l-uzUel<qguGJI&1*pUXRw6SHM3~M+VL=&_?4nKt;>jgV0!~BA3+YrE&
z_u}S{P|_JFxdi47tZF6X%8PL>WjoXpux7yc^dBoTJO+-u8RTY0C6KpMr5dW2H|3#)
z^c^*IM%CRni~*4hIdZf{X&Oap0Hg9q@Z}DG%dyf@i@T)UNs+wx5ExAXgBAfX=vld`
z_hiTm6V)mX#Vu=%wbo(>?PC;*OHg!HS@`!|yw25$$#{>|=Z-kSiiWA^tZ?z;#KF(4
zrWKtzVxk(*X?&CfS?FyiJXk4DC1)L{EofKY#RW%1WGy|fAq-V|;yk!DS|F~Vi}TK8
z+~!oIKRx1H*x-t~beQsvO5?#Qef}df&9>X_3M(_$QNsBG>H!iqulOfyK{z{J&;`uJ
z;6}1JDDTFpa^;_EZZmHx-|UMT<p=$DBfQ_=Q)ms_tBF?oXA7;o*}q?C=hOZh>=%6=
bZ0DW+;=y+Ha=_m<*v8}jVWiUj^})tJ?gO|1