Some entry position optimizations

3 files changed, 5 insertions, 49 deletions

diff --git a/apps/Makefile b/apps/Makefile
index 16f108a..574f135 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -5,10 +5,7 @@ CC = ../cross/opt/bin/i686-elf-gcc
 LD = ../cross/opt/bin/i686-elf-ld
 OC = ../cross/opt/bin/i686-elf-objcopy
 
-# TODO: Fix crash without optimizations
-CSFLAGS = -mpreferred-stack-boundary=2 -fno-asynchronous-unwind-tables -Os
-
-CFLAGS = $(CSFLAGS) -Wall -Wextra -nostdlib -nostdinc -ffreestanding -fno-builtin -mgeneral-regs-only -std=c99 -m32 -pedantic-errors -I../src/lib/inc/ -fPIE -Os
+CFLAGS = $(CSFLAGS) -Wall -Wextra -nostdlib -nostdinc -ffreestanding -ffunction-sections -fno-builtin -std=c99 -m32 -pedantic-errors -I../src/lib/inc/ -fPIE
 
 all: $(COBJS)
 
diff --git a/apps/link.ld b/apps/link.ld
index d977c19..84b2e2f 100644
--- a/apps/link.ld
+++ b/apps/link.ld
@@ -7,7 +7,8 @@ SECTIONS
 	. = 0x00000000;
 
 	.text : {
-		*(.text)
+		*(.text.main)
+		*(.text*)
 	}
 
 	.rodata : {
diff --git a/apps/test.c b/apps/test.c
index c5e6468..ad84996 100644
--- a/apps/test.c
+++ b/apps/test.c
@@ -1,3 +1,5 @@
+// MIT License, Copyright (c) 2020 Marvin Borner
+
 #include <def.h>
 
 u32 strlen(const char *s)
@@ -15,54 +17,11 @@ u8 inb(u16 port)
 	return value;
 }
 
-u16 inw(u16 port)
-{
-	u16 value;
-	__asm__ volatile("inw %1, %0" : "=a"(value) : "Nd"(port));
-	return value;
-}
-
-u32 inl(u16 port)
-{
-	u32 value;
-	__asm__ volatile("inl %1, %0" : "=a"(value) : "Nd"(port));
-	return value;
-}
-
-void insl(u16 port, void *addr, int n)
-{
-	__asm__ volatile("cld; rep insl"
-			 : "=D"(addr), "=c"(n)
-			 : "d"(port), "0"(addr), "1"(n)
-			 : "memory", "cc");
-}
-
 void outb(u16 port, u8 data)
 {
 	__asm__ volatile("outb %0, %1" ::"a"(data), "Nd"(port));
 }
 
-void outw(u16 port, u16 data)
-{
-	__asm__ volatile("outw %0, %1" ::"a"(data), "Nd"(port));
-}
-
-void outl(u16 port, u32 data)
-{
-	__asm__ volatile("outl %0, %1" ::"a"(data), "Nd"(port));
-}
-
-void serial_install()
-{
-	outb(0x3f8 + 1, 0x00);
-	outb(0x3f8 + 3, 0x80);
-	outb(0x3f8 + 0, 0x03);
-	outb(0x3f8 + 1, 0x00);
-	outb(0x3f8 + 3, 0x03);
-	outb(0x3f8 + 2, 0xC7);
-	outb(0x3f8 + 4, 0x0B);
-}
-
 int is_transmit_empty()
 {
 	return inb(0x3f8 + 5) & 0x20;
@@ -83,6 +42,5 @@ void serial_print(const char *data)
 
 void main()
 {
-	serial_install();
 	serial_print("Follow the white rabbit.");
 }