WebSVN – Kolibri OS – Diff – /kernel/branches/kolibri-process/core/v86.inc

 DEBUG_SHOW_IO = 0
-struct  V86_machine
-; page directory
-        pagedir         dd ?
+struct  V86_machine
-; translation table: V86 address -> flat linear address
+; page directory
-        pages           dd ?
+        process         dd ?
 ; mutex to protect all data from writing by multiple threads at one time
         mutex           dd ?
 ; i/o permission map
         jz      .fail
 ; initialize mutex
         and     dword [eax+V86_machine.mutex], 0
 ; allocate tables
         mov     ebx, eax
-; We allocate 4 pages.
+        stdcall create_process, 4096, OS_BASE, 4096
-; First is main page directory for V86 mode.
+        test    eax, eax
-; Second page:
+        jz      .fail2
-; first half (0x800 bytes) is page table for addresses 0 - 0x100000,
+        mov     [eax+PROC.mem_used], 4096
-; second half is for V86-to-linear translation.
+        mov     [ebx+V86_machine.process], eax
-; Third and fourth are for I/O permission map.
+        push    2000h
-        push    8000h           ; blocks less than 8 pages are discontinuous
         call    kernel_alloc
         test    eax, eax
         jz      .fail2
-        mov     [ebx+V86_machine.pagedir], eax
-        push    edi eax
-        mov     edi, eax
-        add     eax, 1800h
-        mov     [ebx+V86_machine.pages], eax
+        mov     [ebx+V86_machine.iopm], eax
 ; initialize tables
-        mov     ecx, 2000h/4
+        push    edi
-        xor     eax, eax
+        mov     edi, eax
-        rep stosd
-        mov     [ebx+V86_machine.iopm], edi
-        dec     eax
+        mov     eax, -1
         mov     ecx, 2000h/4
         rep stosd
-        pop     eax
-; page directory: first entry is page table...
-        mov     edi, eax
-        add     eax, 1000h
-        push    eax
-        call    get_pg_addr
-        or      al, PG_UW
-        stosd
-; ...and also copy system page tables
-; thx to Serge, system is located at high addresses
-        add     edi, (OS_BASE shr 20) - 4
-        push    esi
-        mov     esi, sys_proc+PROC.pdt_0+(OS_BASE shr 20)
-        mov     ecx, 0x80000000 shr 22
-        rep movsd
-        mov     eax, [ebx+V86_machine.pagedir]   ;root dir also is
+        mov     eax, [ebx+V86_machine.process]
+        mov     eax, [eax+PROC.pdt_0_phys]
-        call    get_pg_addr                      ;used as page table
+        pushfd
-        or      al, PG_SW
+        cli
+        mov     cr3, eax
-        mov     [edi-4096+(page_tabs shr 20)], eax
-        pop     esi
 ; now V86 specific: initialize known addresses in first Mb
         pop     eax
 ; first page - BIOS data (shared between all machines!)
-; physical address = 0
-; linear address = OS_BASE
-        mov     dword [eax], 111b
+; physical address = 0
-        mov     dword [eax+800h], OS_BASE
+; linear address = OS_BASE
 ; page before 0xA0000 - Extended BIOS Data Area (shared between all machines!)
 ; physical address = 0x9C000
 ; linear address = 0x8009C000
+; (I have seen one computer with EBDA segment = 0x9D80,
-; (I have seen one computer with EBDA segment = 0x9D80,
+; all other computers use less memory)
-; all other computers use less memory)
-        mov     ecx, 4
+        mov     eax, PG_UW
+        mov     [page_tabs], eax
+        invlpg  [eax]
+        mov     byte [0x500], 0xCD
+        mov     byte [0x501], 0x13
+        mov     byte [0x502], 0xF4
+        mov     byte [0x503], 0xCD
+        mov     byte [0x504], 0x10
+        mov     byte [0x505], 0xF4
-        mov     edx, 0x9C000
+        mov     eax, 0x99000+PG_UW
+        mov     edi, page_tabs+0x99*4
-        push    eax
+        mov     edx, 0x1000
-        lea     edi, [eax+0x9C*4]
-@@:
-        lea     eax, [edx + OS_BASE]
-        mov     [edi+800h], eax
+        mov     ecx, 7
-        lea     eax, [edx + 111b]
+@@:
         stosd
-        add     edx, 0x1000
-        loop    @b
+        add     eax, edx
-        pop     eax
+        loop @b
         pop     edi
+; addresses 0xC0000 - 0xFFFFF - BIOS code (shared between all machines!)
+; physical address = 0xC0000
-; addresses 0xC0000 - 0xFFFFF - BIOS code (shared between all machines!)
+        mov     eax, 0xC0000+PG_UW
-; physical address = 0xC0000
+        mov     edi, page_tabs+0xC0*4
-; linear address = 0x800C0000
+        mov     edx, 0x1000
-        mov     ecx, 0xC0
-@@:
-        mov     edx, ecx
+        mov     ecx, 64
-        shl     edx, 12
+@@:
-        push    edx
-        or      edx, 111b
+        stosd
+        add     eax, edx
-        mov     [eax+ecx*4], edx
+        loop @b
-        pop     edx
+        mov     eax, sys_proc-OS_BASE+PROC.pdt_0
-        add     edx, OS_BASE
+        mov     cr3, eax
-        mov     [eax+ecx*4+0x800], edx
+        popfd
-        inc     cl
+        pop     edi
         jnz     @b
         mov     eax, ebx
         ret
 .fail2:
         mov     eax, ebx
         call    free
 .fail:
+        xor     eax, eax
-        xor     eax, eax
+        ret
         ret
 ;not used
 ; Destroy V86 machine
 ; in: eax = handle
 ; out: nothing
 ; destroys: eax, ebx, ecx, edx (due to free)
-v86_destroy:
+;v86_destroy:
-        push    eax
+;        push    eax
-        stdcall kernel_free, [eax+V86_machine.pagedir]
+;        stdcall kernel_free, [eax+V86_machine.pagedir]
-        pop     eax
+;        pop     eax
-        jmp     free
+;        jmp     free
 ; Translate V86-address to linear address
 ; in: eax=V86 address
 ;     esi=handle
 ; out: eax=linear address
 ; destroys: nothing
 v86_get_lin_addr:
         push    ecx edx
         mov     ecx, eax
-        mov     edx, [esi+V86_machine.pages]
+        mov     edx, page_tabs
         shr     ecx, 12
+        and     eax, 0xFFF
-        and     eax, 0xFFF
+        add     eax, [edx+ecx*4]        ; atomic operation, no mutex needed
-        add     eax, [edx+ecx*4]        ; atomic operation, no mutex needed
+        pop     edx ecx
-        pop     edx ecx
+        ret
         ret
 ;not used
 ; Sets linear address for V86-page
 ; in: eax=linear address (must be page-aligned)
 ;     ecx=V86 page (NOT address!)
 ;     esi=handle
 ; out: nothing
 ; destroys: nothing
-v86_set_page:
+;v86_set_page:
-        push    eax ebx
+;        push    eax ebx
-        mov     ebx, [esi+V86_machine.pagedir]
+;        mov     ebx, [esi+V86_machine.pagedir]
-        mov     [ebx+ecx*4+0x1800], eax
+;        mov     [ebx+ecx*4+0x1800], eax
-        call    get_pg_addr
+;        call    get_pg_addr
-        or      al, 111b
+;        or      al, 111b
-        mov     [ebx+ecx*4+0x1000], eax
+;        mov     [ebx+ecx*4+0x1000], eax
-        pop     ebx eax
+;        pop     ebx eax
 init_sys_v86:
         call    v86_create
         mov     [sys_v86_machine], eax
         test    eax, eax
         jz      .ret
-        mov     byte [OS_BASE + 0x500], 0xCD
-        mov     byte [OS_BASE + 0x501], 0x13
-        mov     byte [OS_BASE + 0x502], 0xF4
-        mov     byte [OS_BASE + 0x503], 0xCD
-        mov     byte [OS_BASE + 0x504], 0x10
-        mov     byte [OS_BASE + 0x505], 0xF4
         mov     esi, eax
-        mov     ebx, [eax+V86_machine.pagedir]
-; one page for stack, two pages for results (0x2000 bytes = 16 sectors)
-        mov     dword [ebx+0x99*4+0x1000], 0x99000 or 111b
-        mov     dword [ebx+0x99*4+0x1800], OS_BASE + 0x99000
-        mov     dword [ebx+0x9A*4+0x1000], 0x9A000 or 111b
-        mov     dword [ebx+0x9A*4+0x1800], OS_BASE + 0x9A000
-        mov     dword [ebx+0x9B*4+0x1000], 0x9B000 or 111b
-        mov     dword [ebx+0x9B*4+0x1800], OS_BASE + 0x9B000
 if ~DEBUG_SHOW_IO
 ; allow access to all ports
         mov     ecx, [esi+V86_machine.iopm]
         xor     eax, eax
         mov     edi, ecx
 ;     eax = 1 - exception has occured, cl contains code
 ;     eax = 2 - access to disabled i/o port, ecx contains port address
 ;     eax = 3 - IRQ is already hooked by another VM
 ; destroys: nothing
 v86_start:
+        xchg bx, bx
         pushad
         cli
         push    [ecx+APPDATA.process]
         push    [ecx+APPDATA.saved_esp0]
         mov     [ecx+APPDATA.saved_esp0], esp
         mov     [tss._esp0], esp
-        mov     eax, [esi+V86_machine.pagedir]
-        call    get_pg_addr
+        mov     eax, [esi+V86_machine.process]
         mov     [ecx+APPDATA.process], eax
-;        mov     cr3, eax
+        mov     eax, [eax+PROC.pdt_0_phys]
-;        mov     [irq_tab+5*4], my05
+        mov     cr3, eax
 ; We do not enable interrupts, because V86 IRQ redirector assumes that
 ; machine is running
         mov     dword [SLOT_BASE+ecx+APPDATA.io_map+4], ebx
         mov     dword [page_tabs + (tss._io_map_1 shr 10)], ebx
         pop     ebx
         mov     dword [SLOT_BASE+ecx+APPDATA.io_map], ebx
         mov     dword [page_tabs + (tss._io_map_0 shr 10)], ebx
+        mov     eax, [eax+PROC.pdt_0_phys]
         mov     cr3, eax
         sti
         popad
         cld
         mov     edi, ebp
         pop     eax
 v86_irq2:
         mov     esi, [v86_irqhooks+edi*8]       ; get VM handle
-        mov     eax, [esi+V86_machine.pagedir]
+        mov     eax, [esi+V86_machine.process]
-        call    get_pg_addr
         mov     ecx, [CURRENT_TASK]
         shl     ecx, 8
         cmp     [SLOT_BASE+ecx+APPDATA.process], eax
         jnz     .notcurrent
         lea     eax, [edi+8]
         mov     ecx, edi
         call    irq_eoi
         popad
         iretd
 .found:
+        mov     eax, [eax+PROC.pdt_0_phys]
         mov     cr3, eax
         mov     esi, [ebx+APPDATA.saved_esp0]
         sub     word [esi-sizeof.v86_regs+v86_regs.esp], 6
         mov     ecx, [esi-sizeof.v86_regs+v86_regs.eip]
         mov     word [edx], cx

Subversion Repositories Kolibri OS

(root)/kernel/branches/kolibri-process/core/v86.inc – Rev 4923 → 4993