Added mandelbrot demo and fpu driver

9 files changed, 100 insertions, 5 deletions

diff --git a/apps/Makefile b/apps/Makefile
index 6a22e35..44222d9 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -1,6 +1,6 @@
 # MIT License, Copyright (c) 2020 Marvin Borner
 
-COBJS = init.o wm.o window.o test.o
+COBJS = init.o wm.o mandelbrot.o window.o test.o
 CC = ../cross/opt/bin/i686-elf-gcc
 LD = ../cross/opt/bin/i686-elf-ld
 OC = ../cross/opt/bin/i686-elf-objcopy
@@ -8,7 +8,7 @@ OC = ../cross/opt/bin/i686-elf-objcopy
 # Flags to make the binary smaller TODO: Remove after indirect pointer support!
 CSFLAGS = -mpreferred-stack-boundary=2 -fno-asynchronous-unwind-tables -Os
 
-CFLAGS = $(CSFLAGS) -Wall -Wextra -nostdlib -nostdinc -fno-builtin -mgeneral-regs-only -std=c99 -m32 -pedantic-errors -I../libc/inc/ -I../libgui/inc/ -fPIE -Duserspace
+CFLAGS = $(CSFLAGS) -Wall -Wextra -nostdlib -nostdinc -fno-builtin -std=c99 -m32 -pedantic-errors -I../libc/inc/ -I../libgui/inc/ -fPIE -Duserspace
 
 all: $(COBJS)
 
diff --git a/apps/init.c b/apps/init.c
index 072e24e..01eb47d 100644
--- a/apps/init.c
+++ b/apps/init.c
@@ -11,7 +11,8 @@ int main(int argc, char **argv)
 
 	// TODO: Fix GPF if file doesn't exist
 	int wm = exec("/wm", "wm", argv[1], NULL);
-	int test = exec("/window", "test", NULL);
+	/* int test = exec("/window", "test", NULL); */
+	int mandelbrot = exec("/mandelbrot", "mandelbrot", NULL);
 
-	return wm + test;
+	return wm + mandelbrot;
 }
diff --git a/apps/mandelbrot.c b/apps/mandelbrot.c
new file mode 100644
index 0000000..6b6d45c
--- /dev/null
+++ b/apps/mandelbrot.c
@@ -0,0 +1,58 @@
+// MIT License, Copyright (c) 2020 Marvin Borner
+
+#include <conv.h>
+#include <def.h>
+#include <gui.h>
+#include <input.h>
+#include <print.h>
+#include <random.h>
+#include <str.h>
+#include <sys.h>
+
+void draw_pixel(struct window *win, int x, int y, u32 c)
+{
+	int pos = x * (win->bpp >> 3) + y * win->pitch;
+	win->fb[pos + 0] = GET_BLUE(c);
+	win->fb[pos + 1] = GET_GREEN(c);
+	win->fb[pos + 2] = GET_RED(c);
+	win->fb[pos + 3] = GET_ALPHA(c);
+}
+
+int main()
+{
+	print("[mandelbrot window loaded]\n");
+
+	struct window *win = gui_new_window(WF_DEFAULT);
+	gui_fill(win, BG_COLOR);
+
+	int height = win->height;
+	int width = win->width;
+	int max = 500;
+
+	for (int row = 0; row < height; row++) {
+		for (int col = 0; col < width; col++) {
+			double c_re = (col - width / 2.0) * 4.0 / width;
+			double c_im = (row - height / 2.0) * 4.0 / width;
+			double x = 0, y = 0;
+			int iteration = 0;
+			while (x * x + y * y <= 4 && iteration < max) {
+				double x_new = x * x - y * y + c_re;
+				y = 2 * x * y + c_im;
+				x = x_new;
+				iteration++;
+			}
+			srand(iteration);
+			if (iteration < max)
+				draw_pixel(win, col, row, rand() | 0xff000000);
+			else
+				draw_pixel(win, col, row, BG_COLOR);
+		}
+	}
+	gui_redraw();
+
+	while (1) {
+		yield();
+	};
+
+	return 0;
+}
diff --git a/apps/window.c b/apps/window.c
index eabac97..a1311a0 100644
--- a/apps/window.c
+++ b/apps/window.c
@@ -11,7 +11,7 @@ int main()
 {
 	print("[test window loaded]\n");
 
-	struct window *win = gui_new_window(0);
+	struct window *win = gui_new_window(WF_DEFAULT);
 
 	gui_fill(win, BG_COLOR);
 	gui_border(win, FG_COLOR, 2);
diff --git a/kernel/Makefile b/kernel/Makefile
index 07f985a..98060df 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -3,6 +3,7 @@
 COBJS = main.o \
 	drivers/interrupts.o \
 	drivers/interrupts_asm.o \
+	drivers/fpu.o \
 	drivers/keyboard.o \
 	drivers/mouse.o \
 	drivers/ide.o \
diff --git a/kernel/drivers/fpu.c b/kernel/drivers/fpu.c
new file mode 100644
index 0000000..d8a2b79
--- /dev/null
+++ b/kernel/drivers/fpu.c
@@ -0,0 +1,24 @@
+// MIT License, Copyright (c) 2020 Marvin Borner
+
+#include <def.h>
+
+void set_fpu_cw(const u16 cw)
+{
+	__asm__ volatile("fldcw %0" ::"m"(cw));
+}
+
+void fpu_install()
+{
+	__asm__ volatile("clts");
+	u32 t;
+	__asm__ volatile("mov %%cr0, %0" : "=r"(t));
+	t &= ~(1 << 2);
+	t |= (1 << 1);
+	__asm__ volatile("mov %0, %%cr0" ::"r"(t));
+
+	__asm__ volatile("mov %%cr4, %0" : "=r"(t));
+	t |= 3 << 9;
+	__asm__ volatile("mov %0, %%cr4" ::"r"(t));
+
+	__asm__ volatile("fninit");
+}
diff --git a/kernel/inc/fpu.h b/kernel/inc/fpu.h
new file mode 100644
index 0000000..d747708
--- /dev/null
+++ b/kernel/inc/fpu.h
@@ -0,0 +1,8 @@
+// MIT License, Copyright (c) 2020 Marvin Borner
+
+#ifndef FPU_H
+#define FPU_H
+
+void fpu_install();
+
+#endif
diff --git a/kernel/main.c b/kernel/main.c
index 7d87be5..4792d75 100644
--- a/kernel/main.c
+++ b/kernel/main.c
@@ -2,6 +2,7 @@
 
 #include <boot.h>
 #include <cpu.h>
+#include <fpu.h>
 #include <fs.h>
 #include <keyboard.h>
 #include <load.h>
@@ -23,6 +24,7 @@ void kernel_main(struct vid_info *vid_info)
 
 	// Install drivers
 	interrupts_install();
+	fpu_install();
 	timer_install();
 	keyboard_install();
 	mouse_install();
diff --git a/libgui/inc/gui.h b/libgui/inc/gui.h
index ad089bd..335dc05 100644
--- a/libgui/inc/gui.h
+++ b/libgui/inc/gui.h
@@ -15,6 +15,7 @@
 #define FG_COLOR 0xffabb2bf
 #define BG_COLOR 0xff282c34
 
+#define WF_DEFAULT (0 << 0)
 #define WF_NO_FOCUS (1 << 0)
 #define WF_NO_DRAG (1 << 1)
 #define WF_NO_RESIZE (1 << 2)