Change knight-native heap to be an offset from the start of stack

rather than a fixed address
oriansj · Feb 3, 2021 · 259f067 · 259f067
1 parent cb87098
commit 259f067
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 6 deletions.
diff --git a/knight/Native/unistd.h b/knight/Native/unistd.h
@@ -17,6 +17,7 @@
 
 #define NULL 0
 #define __PATH_MAX 4096
+#define EOF 0xFFFFFFFF
 
 void* malloc(unsigned size);
 

diff --git a/knight/libc-native-file.M1 b/knight/libc-native-file.M1
@@ -23,15 +23,26 @@
 	LOADUI R0 0x1100
 	FOPEN_READ
 
-	LOADR32 R12 @HEAP           ; Setup HEAP pointer
-	LOADUI R15 $STACK           ; Setup initial stack pointer
+	LOADR R15 4
+	JUMP 4
+	&STACK                      ; Setup initial stack pointer
 	COPY R14 R15                ; Setup initial base pointer
+
+	LOADR32 R12 @HEAP           ; Setup HEAP pointer
+	ADD R12 R12 R15             ; After Stack ends
+
+	;; Setup for FILE*
+	LOADR R0 4
+	JUMP 4
+	&FUNCTION___init_io
+	CALL R0 R15
+
 	LOADR R0 4
 	JUMP 4
 	&FUNCTION_main
 	CALL R0 R15
 	HALT                        ; Exit to kernel
 
-	;; Our default heap pointer
+	;; Our default heap offset (how big our stack ia)
 :HEAP
 	'00100000'
diff --git a/knight/libc-native.M1 b/knight/libc-native.M1
@@ -15,13 +15,14 @@
 ## along with M2-Planet.  If not, see <http://www.gnu.org/licenses/>.
 
 :_start
-	LOADR32 R12 @HEAP           ; Setup HEAP pointer
-
 	; Setup initial stack pointer
 	LOADR R15 4
 	JUMP 4
 	&STACK
 
+	LOADR32 R12 @HEAP           ; Setup HEAP pointer
+	ADD R12 R12 R15             ; After Stack
+
 	; Setup initial base pointer
 	COPY R14 R15
 
@@ -33,6 +34,6 @@
 
 	HALT                        ; Exit to kernel
 
-	;; Our default heap pointer
+	;; Our default heap pointer (offset from start of stack)
 :HEAP
 	'00100000'