Fix sign errors, make JMK2 show relative paths
diff --git a/src/kernel/x86_32/descriptor_tables.c b/src/kernel/x86_32/descriptor_tables.c
index 339162e..56ea13f 100644
--- a/src/kernel/x86_32/descriptor_tables.c
+++ b/src/kernel/x86_32/descriptor_tables.c
@@ -47,6 +47,7 @@
e->access = access;
}
+/*
static void init_tss(uint num, uint ss, uint esp)
{
gdt_set_gate(num, (uint)&tss_entry, (uint)&tss_entry+1, 0xe9, 0x00);
@@ -60,6 +61,7 @@
// can switch to kernel mode using this tss
tss_entry.ss = tss_entry.ds = tss_entry.es = tss_entry.fs = tss_entry.gs = 0x13;
}
+*/
void init_gdt()
{
diff --git a/src/kernel/x86_32/main.c b/src/kernel/x86_32/main.c
index 4d3d868..e1963e8 100644
--- a/src/kernel/x86_32/main.c
+++ b/src/kernel/x86_32/main.c
@@ -75,7 +75,7 @@
#ifdef TEST_THREADS
kprintf(DEBUG "Spawning test thread\n");
- spawn_thread(other_thread, NULL);
+ spawn_thread((task_function_t)other_thread, NULL);
greet();
#endif
diff --git a/src/kernel/x86_32/paging.c b/src/kernel/x86_32/paging.c
index c77f499..ff6226b 100644
--- a/src/kernel/x86_32/paging.c
+++ b/src/kernel/x86_32/paging.c
@@ -17,7 +17,6 @@
/* frames bitset, 0 = free, 1 = used */
static uint frames[NUM_FRAMES];
-static uint first_page_table[1024] __attribute__((aligned(4096)));
uint kernel_page_directory[1024] __attribute__((aligned(4096)));
@@ -31,12 +30,6 @@
frames[frame / BITS] |= 1 << (frame % BITS);
}
-static bool test_frame(size_t frame_addr)
-{
- uint frame = frame_addr / 0x1000; // page aligned
- return frames[frame / BITS] & 1 << (frame % BITS);
-}
-
static void clear_frame(size_t frame_addr)
{
uint frame = frame_addr / 0x1000; // page aligned
@@ -90,7 +83,6 @@
void map_4mb(uint *dir, size_t virt_start, size_t phys_start, bool user,
bool rw)
{
- uint page = virt_start / 0x1000;
uint table = virt_start >> 22;
for (uint i = 0; i < 1024 * 0x1000; i += 0x1000)
@@ -238,6 +230,7 @@
load_page_directory(VIRT_TO_PHYS(kernel_page_directory));
}
+#ifdef TEST_PAGING
void test_paging()
{
// a random page base address
@@ -252,3 +245,4 @@
base[i] = i;
}
}
+#endif
diff --git a/src/kernel/x86_32/timer.c b/src/kernel/x86_32/timer.c
index 0e52d0e..59af51d 100644
--- a/src/kernel/x86_32/timer.c
+++ b/src/kernel/x86_32/timer.c
@@ -5,8 +5,6 @@
#include "registers.h"
#include "task.h"
-static ulong tick = 0;
-
static void timer_cb(struct registers *regs)
{
if (tasks_initialized)