Changeset 22f7769 in mainline for arch/amd64/src

Timestamp:

2005-10-17T23:31:41Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

4b2c872d

Parents:

75eacab

Message:

Rename cpu_priority_{high|low|restore|read} functions to interrupts_{disable|enable|restore|read}.
Rename pri_t to ipl_t (Interrupt Priority Level).
Rename thread_t::pri to thread_t::priority.

Location:

arch/amd64/src

Files:

• interrupt.c (modified) (1 diff)
• userspace.c (modified) (2 diffs)

arch/amd64/src/interrupt.c

@@ -109 +109 @@
 /*
  * Called directly from the assembler code.
- * CPU is cpu_priority_high().
+ * CPU is interrupts_disable()'d.
  */
 void trap_dispatcher(__u8 n, __native stack[])

arch/amd64/src/userspace.c

@@ -42 +42 @@
 void userspace(void)
 {
-        pri_t pri;
+        ipl_t ipl;
         
-        pri = cpu_priority_high();
+        ipl = interrupts_disable();
 
         __asm__ volatile (""
@@ -58 +58 @@
                           "pushq %%rsi;"
                           "iretq;"
-                          : : "i" (gdtselector(UDATA_DES) | PL_USER), "i" (USTACK_ADDRESS+THREAD_STACK_SIZE), "r" (pri), "i" (gdtselector(UTEXT_DES) | PL_USER), "i" (UTEXT_ADDRESS));
+                          : : "i" (gdtselector(UDATA_DES) | PL_USER), "i" (USTACK_ADDRESS+THREAD_STACK_SIZE), "r" (ipl), "i" (gdtselector(UTEXT_DES) | PL_USER), "i" (UTEXT_ADDRESS));
         
         /* Unreachable */