From c5b0305b3a6e7e6ec6742b99ceb6a1a0b3c6e286 Mon Sep 17 00:00:00 2001 From: Marvin Borner Date: Sat, 9 May 2020 23:50:24 +0200 Subject: Interrupt analysis - removed many useless cli/sti --- src/userspace/programs/init.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) (limited to 'src/userspace/programs/init.c') diff --git a/src/userspace/programs/init.c b/src/userspace/programs/init.c index 64da122..306aee6 100644 --- a/src/userspace/programs/init.c +++ b/src/userspace/programs/init.c @@ -5,6 +5,20 @@ #include #include +u32 cpu_flags() +{ + u32 flags; + asm volatile("pushf\n" + "pop %0\n" + : "=rm"(flags)::"memory"); + return flags; +} + +int interrupts_enabled() +{ + return (cpu_flags() & 0x200) == 0x200; +} + void main() { if (get_pid() != 1) { @@ -12,6 +26,11 @@ void main() exit(1); } + if (interrupts_enabled()) + printf("INTs enabled :)\n"); + else + printf("INTs disabled :(\n"); + // TODO: Fix page fault when mallocing printf("Initializing userspace...\n"); @@ -19,7 +38,10 @@ void main() // TODO: Fix occasional race conditions with cli/sti // TODO: Fix scheduler turning off at some point spawn("/bin/sh"); - printf("AWESOME"); + if (interrupts_enabled()) + printf("INTs enabled :)\n"); + else + printf("INTs disabled :(\n"); while (1) { //printf("B"); -- cgit v1.2.3