Changeset 78

Timestamp:

Jun 27, 2017, 5:19:53 PM (7 years ago)

Author:

max@…

Message:

print %rip, and add cli/sti

Location:

trunk/hal/x86_64/core

Files:

• hal_cpu.S (modified) (1 diff)
• hal_internal.h (modified) (1 diff)
• hal_trap.c (modified) (1 diff)

trunk/hal/x86_64/core/hal_cpu.S

@@ -39 +39 @@
         ret
 
+ASM_ENTRY(sti)
+        sti
+        ret
+
+ASM_ENTRY(cli)
+        cli
+        ret
+
 ASM_ENTRY(rdmsr)
         movq    %rdi,%rcx

trunk/hal/x86_64/core/hal_internal.h

@@ -31 +31 @@
 /* hal_cpu.S */
 void invlpg(vaddr_t va);
+void sti();
+void cli();
 uint64_t rdmsr(uint32_t);
 void wrmsr(uint32_t, uint64_t);

trunk/hal/x86_64/core/hal_trap.c

@@ -64 +64 @@
         }
 
-        x86_printf("\n");
-        x86_printf("****** FAULT OCCURRED ******\n");
-        x86_printf((char *)buf);
-        x86_printf("\n");
-        x86_printf("****** FAULT OCCURRED ******\n");
-        x86_printf("\n");
+        x86_printf("\n****** FAULT OCCURRED ******\n");
+        x86_printf("%s\n", (char *)buf);
+        x86_printf("-> rip = %Z\n", tf->tf_rip);
+        x86_printf("****** FAULT OCCURRED ******\n\n");
 
         while (1);