From f0e58643098efafecf77d2b9115dfff16f931868 Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Wed, 29 Jul 2020 14:58:34 +0200
Subject: Switched to -Os flag and fixed issues with it

Somehow the insl function gets optimized to one instruction so I need
a gcc attribute to exclude this function from optimization. I may fix
this in the future though. Anyways, the kernel is waay smaller now! :)
---
 src/drivers/cpu.c |  3 ++-
 src/features/fs.c | 16 ++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/drivers/cpu.c b/src/drivers/cpu.c
index d6a1760..945dc4a 100644
--- a/src/drivers/cpu.c
+++ b/src/drivers/cpu.c
@@ -24,7 +24,8 @@ u32 inl(u16 port)
 	return value;
 }
 
-void insl(u16 port, void *addr, int n)
+// TODO: Fix optimization issues with insl
+void __attribute__((optimize("O0"))) insl(u16 port, void *addr, int n)
 {
 	__asm__("cld; rep insl"
 		: "=D"(addr), "=c"(n)
diff --git a/src/features/fs.c b/src/features/fs.c
index 7795210..1eec30e 100644
--- a/src/features/fs.c
+++ b/src/features/fs.c
@@ -1,6 +1,7 @@
 // MIT License, Copyright (c) 2020 Marvin Borner
 // EXT2 based filesystem
 
+#include <assert.h>
 #include <def.h>
 #include <fs.h>
 #include <ide.h>
@@ -29,7 +30,9 @@ struct bgd *get_bgd()
 struct inode *get_inode(int i)
 {
 	struct superblock *s = get_superblock();
+	assert(s);
 	struct bgd *b = get_bgd();
+	assert(b);
 
 	int block_group = (i - 1) / s->inodes_per_group;
 	int index = (i - 1) % s->inodes_per_group;
@@ -50,28 +53,23 @@ u32 read_indirect(u32 indirect, u32 block_num)
 
 void *read_inode(struct inode *in)
 {
-	//assert(in);
+	assert(in);
 	if (!in)
 		return NULL;
 
 	int num_blocks = in->blocks / (BLOCK_SIZE / SECTOR_SIZE);
 
-	//assert(num_blocks != 0);
+	assert(num_blocks != 0);
 	if (!num_blocks)
 		return NULL;
 
 	u32 sz = BLOCK_SIZE * num_blocks;
 	void *buf = malloc(sz);
 	printf("Loading %dKiB\n", sz >> 10);
-	//assert(buf != NULL);
+	assert(buf != NULL);
 
 	int indirect;
 
-	// Singly indirect pointer
-	// TODO: Support doubly and triply pointers
-	if (num_blocks > 12)
-		indirect = in->block[12];
-
 	int blocknum = 0;
 	char *data;
 	for (int i = 0; i < num_blocks; i++) {
@@ -80,6 +78,8 @@ void *read_inode(struct inode *in)
 			data = buffer_read(blocknum);
 			memcpy((u32 *)((u32)buf + i * BLOCK_SIZE), data, BLOCK_SIZE);
 		} else {
+			// TODO: Support doubly and triply pointers
+			indirect = in->block[12];
 			blocknum = read_indirect(indirect, i - 12);
 			data = buffer_read(blocknum);
 			memcpy((u32 *)((u32)buf + (i - 1) * BLOCK_SIZE), data, BLOCK_SIZE);
-- 
cgit v1.2.3