Changeset 99

Timestamp:

Jun 29, 2017, 3:48:39 PM (7 years ago)

Author:

max@…

Message:

add the irq functions; we will forbid nested critical sections, so
the argument will disappear soon

Location:

trunk/hal/x86_64/core

Files:

• hal_cpu.S (modified) (1 diff)
• hal_init.c (modified) (2 diffs)
• hal_internal.h (modified) (1 diff)
• hal_irqmask.c (modified) (2 diffs)
• hal_trap.c (modified) (1 diff)

trunk/hal/x86_64/core/hal_cpu.S

@@ -91 +91 @@
         ret
 
+ASM_ENTRY(rcr2)
+        movq    %cr2,%rax
+        ret
+
 ASM_ENTRY(x86_stop) /* debug only */
         int     $0x0b

trunk/hal/x86_64/core/hal_init.c

@@ -28 +28 @@
 #include <hal_internal.h>
 #include <hal_remote.h>
+#include <hal_irqmask.h>
 
 #include <memcpy.h>
@@ -181 +182 @@
         xptr_t myptr = XPTR(0, &mytest);
 
-        hal_remote_atomic_add(myptr, 3);
-        x86_printf("-> mytest = %z\n", mytest);
-
         hal_remote_spt(myptr, hoho);
         x86_printf("-> mytest = %Z\n", hal_remote_lpt(myptr));
 
-
         init_bootinfo(&btinfo);
+
+        reg_t dummy;
+        hal_enable_irq(&dummy);
+
         kernel_init(&btinfo);
+
         x86_printf("[+] kernel_init called\n");
+
+        while (1);
 
 //      void x86_stop();
 //      x86_stop();
-
-        sti();
-        while (1);
 
         int m = 0;

trunk/hal/x86_64/core/hal_internal.h

@@ -40 +40 @@
 uint64_t rdmsr(uint32_t);
 void wrmsr(uint32_t, uint64_t);
+vaddr_t rcr2(void);
 
 uint32_t atomic_cas_32(volatile uint32_t *ptr, uint32_t exp, uint32_t new);

trunk/hal/x86_64/core/hal_irqmask.c

@@ -1 +1 @@
 /*
- * hal_irqmask.c - implementation of Generic IRQ Masking API for TSAR-MIPS32
- * 
- * Author  Ghassan Almaless (2008,2009,2010,2011,2012)
- *         Alain Greiner    (2016)
+ * hal_irqmask.c - implementation of Generic IRQ Masking API for x86
  *
- * Copyright (c) UPMC Sorbonne Universites
- * 
- * This file is part of ALMOS-MKH..
+ * Copyright (c) 2017 Maxime Villard
  *
- * ALMOS-MKH. is free software; you can redistribute it and/or modify it
+ * This file is part of ALMOS-MKH.
+ *
+ * ALMOS-MKH is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by
  * the Free Software Foundation; version 2.0 of the License.
  *
- * ALMOS-MKH. is distributed in the hope that it will be useful, but
+ * ALMOS-MKH is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -26 +23 @@
 #include <hal_internal.h>
 
-inline void hal_disable_irq( uint32_t * old )
+static int interrupts_enabled __in_kdata = 0;
+
+inline void hal_disable_irq(uint32_t *old)
+{
+        if (!interrupts_enabled) {
+                x86_panic("nested critical sections forbidden");
+        }
+        interrupts_enabled = 0;
+        cli();
+}
+
+inline void hal_enable_irq(uint32_t *old)
+{
+        if (interrupts_enabled) {
+                x86_panic("nested critical sections forbidden");
+        }
+        interrupts_enabled = 1;
+        sti();
+}
+
+inline void hal_restore_irq(uint32_t old)
 {
         x86_panic((char *)__func__);
 }
 
-inline void hal_enable_irq( uint32_t * old )
-{
-        x86_panic((char *)__func__);
-}
-
-inline void hal_restore_irq( uint32_t old )
-{
-        x86_panic((char *)__func__);
-}
-

trunk/hal/x86_64/core/hal_trap.c

@@ -69 +69 @@
         x86_printf("-> rsp = %Z\n", tf->tf_rsp);
         x86_printf("-> err = %Z\n", tf->tf_err);
+        if (trapno == T_PAGEFLT)
+                x86_printf("-> va  = %Z\n", rcr2());
         x86_printf("****** FAULT OCCURRED ******\n\n");