From 4b75ea421dfb33f0dd3dbd75c66c249fa45bb3f1 Mon Sep 17 00:00:00 2001
From: Greg Bowne <gbowne144@gmail.com>
Date: Mon, 17 Jul 2023 22:35:29 -0700
Subject: [PATCH] some minor fixes to kernel

---
 kernel                | Bin 8956 -> 0 bytes
 src/boot/linker.ld    |  29 ++++++++---------------------
 src/kernel/kernel.bin | Bin 0 -> 5236 bytes
 src/kernel/linker.ld  |  21 +++++++++++++++++++++
 src/kernel/print.c    |   5 +++++
 src/linker.ld         |   8 --------
 6 files changed, 34 insertions(+), 29 deletions(-)
 delete mode 100755 kernel
 create mode 100755 src/kernel/kernel.bin
 create mode 100644 src/kernel/linker.ld
 create mode 100644 src/kernel/print.c
 delete mode 100644 src/linker.ld

diff --git a/kernel b/kernel
deleted file mode 100755
index 0be1a9a80b8be76655d84ea30edf40b6a13f1fe2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8956
zcmb<-^>JflWMqH=CI)5(7|(=(fx$%)B4fg!z`(|!!NASH#lXhEzyOjnX<*?1;R6f|
z3?R(Hz`y{)%nS?+UqHBlh2u*D3x_ZR0|N+y<UnSFFxb=v77hjw7GPjt5P;|f(IEK=
z@(c_U=Cg2sZ~+4Y0|<lc1<5lpFfibf2iXzyv?K+aJV*{?wti`Gk$z5Q5(p>j73b?2
zGJyRIk^{So0l`NWgUO-LIhjehAT!KRL`ONJAut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0wX*GK=aKY
z44SLvXk_8|`tN_fL?a6aD+2?ALn8|ZXb#+<k%fbcfq{V=ib2!oqErkw(40NUIM_-6
zkUJoJ(9Amn1IRrPK4_+&fdS+m2p{BXh&v&CkgGwH^(-6^KFIZud3^|<9X#(2n&SuY
z85!6aK>lJ_08uZ%z|J5Dl0f21gZNMk^0yd>jU>+y?-J?f=<Dgs5TBZoSdz#PpPHA#
z5FejZTpV9ql2}y2z@S%LnOl;W#GqGPQUswhV64o%lGLIC2EFvWQoW4C;tU48l*+u~
z%3KItQpBK_nh~E?l$e_e7D>#_Oa|FcBnG)16t|#I1cfnZjRa_21WY?f4#ZYxU|;}+
z97r7~>^T_0%Ok*RD?sv~PzGUT1_p+2|NrNM)Pdqef{}qi0=fnRS)DF4oq*JV;>rMO
z9>@-moglM7VQI?1zyOL-kUCIWb6|v|F_2jx3{nfCZK3NUK<XGKuyBCZWPrqB7-SxZ
z?asgeUMm7J6BNgwH5s6F93Xo^@*s7fgaI-aY!*lmgcTSVE-)}Ka6&Oi9mstkKFBPP
i5)i(iz`&pcVn8v-91s(fW{}l=Qea>R07*bGOdS9O#%q}X

diff --git a/src/boot/linker.ld b/src/boot/linker.ld
index 5615df3..b01bd5f 100644
--- a/src/boot/linker.ld
+++ b/src/boot/linker.ld
@@ -1,21 +1,8 @@
- ENTRY(main)
-
-SECTIONS {
-  . = 0x7c00;
-
-  .text : {
-    *(.text)
-  }
-
-  .rodata : {
-    *(.rodata)
-  }
-
-  .data : {
-    *(.data)
-  }
-
-  .bss : {
-    *(.bss)
-  }
-}
\ No newline at end of file
+ENTRY(boot)
+     SECTIONS {
+       . = 0x7c00;
+       .text : {
+         *(.text)
+       }
+       /* Add other sections as needed */
+     }
\ No newline at end of file
diff --git a/src/kernel/kernel.bin b/src/kernel/kernel.bin
new file mode 100755
index 0000000000000000000000000000000000000000..9a52566f6e6a8b3fc1e93b914f8d9d33e46383fc
GIT binary patch
literal 5236
zcmb<-^>JflWMqH=CI)5(2v2~)gn@x!j}S!0gh7FUnL&ern}G`=F8~q;5dsWP7#P5q
z9V)~E(kH;cu!lhajAa-Y7(f^#4#I&?OHx2e(J>nX0|UrJbn#LCXb6mkz-S1JhQMeD
zjE2By2#kinXb6mkz-S1JhQMeDjD`SZArRX6G`RT<%L{D=1_stM3=9m-Z+LnqB>(^a
zKdAHY3s#W85rNnLLOY+n-~cIE$-uxcA@*=Li^}2f)STq}+*E~<d<Ey6#Ny)2WdC4A
zkZVLh1Oo#DV^t6XV+{wRG!F|)2O|T61ausr=l}oz>L4|ad>pMzPQ0ux&CH;FzXbyW
z!}9<C|AWQ|K+>Qw10RqJ{{R0El4pRa_c_YL!ot7+QpW>w6axc;yI&}1T;c#o3^INJ
zG690!ot>=|G+a`XG86L@EcA@^40O#jAq<ED3=(V`d?dsiIx4};zywxl4d*k1`5|yV
z$acuM2S|dM0Tg}=3^(BNpb-v`3<NVXu!GzT;V^*w^YK3yoCo0}aT!<`KK=&{$H2^E
zWME^^U|?W?xlf3RiNOx6L4W}izCsL)3|<Tj4C)L5U>AV+4B4qgd8s*i$qWTWnRz98
z$qe!CKK@RQKJor;Zo#f0@ga^*KCbZ$@$nTFW_szVCGiEx@g*6hdD(i26;RFbxrv#1
z5dHDRB}JKe=?n~d#g(}wiAfB4#U(`$Is?WkNv$Yh&;yZr*iF?d%1=owNo3GV&4^Dc
zO3Y1V(96p&N!3fwE7dC~$}dPQDyd}9OV2OSE66Ef&`ZwG%}vcK0eh4vLK>7785kJY
zz^VnngG}aNHiUqs7f|8_u|euUVQMY_iUWum5DAh4(Y8?YK&b(g7OVvr7{ovlPz+P&
zilh#dMnVJ_7&4%0KolgkFfjNtFff3|&OqjY$IJvE<7FT<APiHN1T_zo>Og7Wh5!Qt
zDE))ffG|iM2xmjp8Gr;qV{>Tcf!qhfAUmPT7#IW@7(OsCFmN(J%mtYR$_XGo$WEBL
g4}uH~;V=%=E)Z9cfq?;8ox2bN19CKh>;$O;04i{y(*OVf

literal 0
HcmV?d00001

diff --git a/src/kernel/linker.ld b/src/kernel/linker.ld
new file mode 100644
index 0000000..6f90a30
--- /dev/null
+++ b/src/kernel/linker.ld
@@ -0,0 +1,21 @@
+ENTRY(kernel_main)
+
+SECTIONS {
+    . = 0x100000;
+
+    .text : {
+        *(.text)
+    }
+
+    .rodata : {
+        *(.rodata)
+    }
+
+    .data : {
+        *(.data)
+    }
+
+    .bss : {
+        *(.bss)
+    }
+}
\ No newline at end of file
diff --git a/src/kernel/print.c b/src/kernel/print.c
new file mode 100644
index 0000000..b9e1680
--- /dev/null
+++ b/src/kernel/print.c
@@ -0,0 +1,5 @@
+#include "kernel.h"
+
+void print_string(const char* str) {
+    // Your code to print the string to the screen goes here
+}
\ No newline at end of file
diff --git a/src/linker.ld b/src/linker.ld
deleted file mode 100644
index b01bd5f..0000000
--- a/src/linker.ld
+++ /dev/null
@@ -1,8 +0,0 @@
-ENTRY(boot)
-     SECTIONS {
-       . = 0x7c00;
-       .text : {
-         *(.text)
-       }
-       /* Add other sections as needed */
-     }
\ No newline at end of file