Changeset 7c5a8dd in mainline for kernel/arch/xen32/src/asm.S

Timestamp:

2006-08-01T23:34:02Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

adf7f9c

Parents:

5b23a82

Message:

xen32: proper virtual traps, domU asynchronous console

File:

• kernel/arch/xen32/src/asm.S (modified) (2 diffs)

kernel/arch/xen32/src/asm.S

@@ -38 +38 @@
 .global xen_failsafe_callback
 .global enable_l_apic_in_msr
-.global interrupt_handlers
 .global memcpy
 .global memcpy_from_uspace
@@ -124 +123 @@
         pop %eax
         ret
-
-# Clear nested flag
-# overwrites %ecx
-.macro CLEAR_NT_FLAG
-        pushfl
-        pop %ecx
-        and $0xffffbfff,%ecx
-        push %ecx
-        popfl
-.endm   
-
-## Declare interrupt handlers
-#
-# Declare interrupt handlers for n interrupt
-# vectors starting at vector i.
-#
-# The handlers setup data segment registers
-# and call exc_dispatch().
-#
-#define INTERRUPT_ALIGN 64
-.macro handler i n
-
-.ifeq \i-0x30     # Syscall handler
-        push %ds
-        push %es
-        push %fs
-        push %gs
-
-        # Push arguments on stack
-        push %edi
-        push %esi
-        push %edx
-        push %ecx
-        push %eax
-        
-        # we must fill the data segment registers
-        movw $16,%ax
-        movw %ax,%ds
-        movw %ax,%es
-        
-        sti
-        
-        call syscall_handler   # syscall_handler(ax,cx,dx,si,di)
-        cli
-        addl $20, %esp         # clean-up of parameters
-        
-        pop %gs
-        pop %fs
-        pop %es
-        pop %ds
-        
-        CLEAR_NT_FLAG
-        iret
-.else   
-        /*
-         * This macro distinguishes between two versions of ia32 exceptions.
-         * One version has error word and the other does not have it.
-         * The latter version fakes the error word on the stack so that the
-         * handlers and istate_t can be the same for both types.
-         */
-        .iflt \i-32
-                .if (1 << \i) & ERROR_WORD_INTERRUPT_LIST
-                        /* 
-                         * With error word, do nothing
-                         */
-                .else
-                        /*
-                         * Version without error word,
-                         */
-                        subl $4, %esp
-                .endif
-        .else
-                /*
-                 * Version without error word,
-                 */
-                subl $4, %esp
-        .endif
-        
-        push %ds
-        push %es
-        push %fs
-        push %gs
-
-#ifdef CONFIG_DEBUG_ALLREGS
-        push %ebx
-        push %ebp
-        push %edi
-        push %esi
-#else
-        sub $16, %esp
-#endif
-        push %edx
-        push %ecx
-        push %eax
-        
-        # we must fill the data segment registers
-        movw $16,%ax
-        movw %ax,%ds
-        movw %ax,%es
-
-        pushl %esp          # *istate
-        pushl $(\i)         # intnum
-        call exc_dispatch   # excdispatch(intnum, *istate)
-        addl $8,%esp        # Clear arguments from stack
-
-        CLEAR_NT_FLAG # Modifies %ecx
-        
-        pop %eax
-        pop %ecx
-        pop %edx
-#ifdef CONFIG_DEBUG_ALLREGS
-        pop %esi
-        pop %edi
-        pop %ebp
-        pop %ebx
-#else
-        add $16, %esp
-#endif  
-        
-        pop %gs
-        pop %fs
-        pop %es
-        pop %ds
-
-        addl $4,%esp    # Skip error word, no matter whether real or fake.
-        iret
-.endif
-
-        .align INTERRUPT_ALIGN
-        .if (\n-\i)-1
-        handler "(\i+1)",\n
-        .endif
-.endm
-
-# keep in sync with pm.h !!!
-IDT_ITEMS=64
-.align INTERRUPT_ALIGN
-interrupt_handlers:
-h_start:
-        handler 0 IDT_ITEMS
-h_end:
-
-.data
-.global interrupt_handler_size
-
-interrupt_handler_size: .long (h_end-h_start)/IDT_ITEMS