Subversion Repositories HelenOS-historic

Compare Revisions

Ignore whitespace Rev 406 → Rev 413

/SPARTAN/trunk/arch/amd64/include/asm.h
82,13 → 82,15
);
}
 
/** Set priority level low
/** Enable interrupts.
*
* Enable interrupts and return previous
* value of EFLAGS.
*
* @return Old interrupt priority level.
*/
static inline pri_t cpu_priority_low(void) {
pri_t v;
static inline ipl_t interrupts_enable(void) {
ipl_t v;
__asm__ volatile (
"pushfq\n"
"popq %0\n"
98,13 → 100,15
return v;
}
 
/** Set priority level high
/** Disable interrupts.
*
* Disable interrupts and return previous
* value of EFLAGS.
*
* @return Old interrupt priority level.
*/
static inline pri_t cpu_priority_high(void) {
pri_t v;
static inline ipl_t interrupts_disable(void) {
ipl_t v;
__asm__ volatile (
"pushfq\n"
"popq %0\n"
114,24 → 118,28
return v;
}
 
/** Restore priority level
/** Restore interrupt priority level.
*
* Restore EFLAGS.
*
* @param ipl Saved interrupt priority level.
*/
static inline void cpu_priority_restore(pri_t pri) {
static inline void interrupts_restore(ipl_t ipl) {
__asm__ volatile (
"pushq %0\n"
"popfq\n"
: : "r" (pri)
: : "r" (ipl)
);
}
 
/** Return raw priority level
/** Return interrupt priority level.
*
* Return EFLAFS.
*
* @return Current interrupt priority level.
*/
static inline pri_t cpu_priority_read(void) {
pri_t v;
static inline ipl_t interrupts_read(void) {
ipl_t v;
__asm__ volatile (
"pushfq\n"
"popq %0\n"
/SPARTAN/trunk/arch/amd64/include/context.h
55,7 → 55,7
__u64 r14;
__u64 r15;
 
pri_t pri;
ipl_t ipl;
} __attribute__ ((packed));
 
#endif
/SPARTAN/trunk/arch/amd64/include/types.h
40,8 → 40,8
 
typedef __u64 __address;
 
/* Flags of processor (return value of cpu_priority_high()) */
typedef __u64 pri_t;
/* Flags of processor (return value of interrupts_disable()) */
typedef __u64 ipl_t;
 
typedef __u64 __native;
 
/SPARTAN/trunk/arch/amd64/src/userspace.c
41,9 → 41,9
*/
void userspace(void)
{
pri_t pri;
ipl_t ipl;
pri = cpu_priority_high();
ipl = interrupts_disable();
 
__asm__ volatile (""
"movq %0, %%rax;"
57,7 → 57,7
"pushq %%rdx;"
"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 */
for(;;);
/SPARTAN/trunk/arch/amd64/src/interrupt.c
108,7 → 108,7
 
/*
* Called directly from the assembler code.
* CPU is cpu_priority_high().
* CPU is interrupts_disable()'d.
*/
void trap_dispatcher(__u8 n, __native stack[])
{