/kernel/trunk/core/apic.inc |
---|
63,7 → 63,7 |
call IRQ_mask_all |
; IOAPIC init |
stdcall map_io_mem, [acpi_ioapic_base], 0x20, PG_SW+PG_NOCACHE |
stdcall map_io_mem, [acpi_ioapic_base], 0x20, PG_SWR+PG_NOCACHE |
mov [IOAPIC_base], eax |
mov eax, IOAPIC_VER |
127,7 → 127,7 |
cmp [LAPIC_BASE], 0 |
jne .done |
stdcall map_io_mem, [acpi_lapic_base], 0x1000, PG_SW+PG_NOCACHE |
stdcall map_io_mem, [acpi_lapic_base], 0x1000, PG_SWR+PG_NOCACHE |
mov [LAPIC_BASE], eax |
mov esi, eax |
/kernel/trunk/core/dll.inc |
---|
603,7 → 603,7 |
test eax, eax |
jz .err_3 |
or eax, PG_UW |
or eax, PG_UWR |
stosd |
dec edx |
jnz @B |
665,7 → 665,7 |
@@: |
lodsd |
and eax, 0xFFFFF000 |
or eax, PG_UW |
or eax, PG_UWR |
stosd |
loop @B |
1230,7 → 1230,7 |
.map_pages_loop: |
mov eax, [page_tabs+ecx*4] |
and eax, not 0xFFF |
or al, PG_USER |
or al, PG_UR |
xchg eax, [page_tabs+edx*4] |
test al, 1 |
jz @f |
/kernel/trunk/core/heap.inc |
---|
130,7 → 130,7 |
stdcall alloc_pages, dword 32 |
or eax, PG_SW |
or eax, PG_SWR |
mov ebx, HEAP_BASE |
mov ecx, 32 |
call commit_pages |
492,7 → 492,7 |
jz .err |
mov ecx, ebx |
or eax, PG_SW |
or eax, PG_SWR |
mov ebx, [lin_addr] |
call commit_pages |
506,7 → 506,7 |
test eax, eax |
jz .err |
stdcall map_page, edx, eax, dword PG_SW |
stdcall map_page, edx, eax, dword PG_SWR |
add edx, 0x1000 |
dec ebx |
jnz @B |
1451,7 → 1451,7 |
mov edx, [access] |
or edx, [owner_access] |
shl edx, 1 |
or edx, PG_USER+PG_SHARED |
or edx, PG_SHARED+PG_UR |
@@: |
lodsd |
and eax, 0xFFFFF000 |
/kernel/trunk/core/memory.inc |
---|
340,7 → 340,7 |
shr ebx, 22 |
mov eax, [phis_addr] |
and eax, not 0xFFF |
or eax, PG_UW ;+PG_NOCACHE |
or eax, PG_READ |
mov dword [master_tab+ebx*4], eax |
mov eax, [lin_addr] |
shr eax, 10 |
420,7 → 420,7 |
call alloc_page |
stdcall map_page_table, LFB_BASE, eax |
pop eax |
or eax, PG_UW |
or eax, PG_UWR |
mov ebx, LFB_BASE |
; max VGA=640*480*4=1228800 bytes |
; + 32*640*4=81920 bytes for mouse pointer |
447,7 → 447,7 |
bt [cpu_caps], CAPS_PSE |
jnc .map_page_tables |
or esi, PG_LARGE+PG_UW |
or esi, PDE_LARGE+PG_UWR |
mov edx, sys_proc+PROC.pdt_0+(LFB_BASE shr 20) |
@@: |
mov [edx], esi |
476,7 → 476,7 |
mov eax, [LFBAddress] |
mov edi, page_tabs + (LFB_BASE shr 10) |
or eax, PG_UW |
or eax, PG_UWR |
mov ecx, [pg_count] |
cld |
@@: |
679,7 → 679,7 |
ret |
.user_space: |
test eax, PG_MAP |
test eax, PG_READ |
jnz .err_access ;Страница присутствует |
;Ошибка доступа ? |
687,7 → 687,7 |
mov ecx, ebx |
shr ecx, 10 |
mov edx, [master_tab+ecx*4] |
test edx, PG_MAP |
test edx, PG_READ |
jz .fail ;таблица страниц не создана |
;неверный адрес в программе |
700,7 → 700,7 |
test eax, eax |
jz .fail |
stdcall map_page, [.err_addr], eax, PG_UW |
stdcall map_page, [.err_addr], eax, PG_UWR |
mov edi, [.err_addr] |
and edi, 0xFFFFF000 |
737,7 → 737,7 |
call alloc_page |
test eax, eax |
jz .fail |
stdcall map_page, ebx, eax, PG_UW |
stdcall map_page, ebx, eax, PG_UWR |
mov edi, ebx |
mov ecx, 1024 |
sub ebx, [esi+HDLL.base] |
748,7 → 748,7 |
jmp .exit |
.kernel_space: |
test eax, PG_MAP |
test eax, PG_READ |
jz .fail ;страница не присутствует |
test eax, 12 ;U/S (+below) |
774,7 → 774,7 |
jz .fail |
push eax |
stdcall map_page, [.err_addr], eax, dword PG_SW |
stdcall map_page, [.err_addr], eax, dword PG_SWR |
pop eax |
mov edi, [.err_addr] |
and edi, -4096 |
783,7 → 783,7 |
mov ebx, esi |
shr ebx, 12 |
mov edx, [current_slot] |
or eax, PG_SW |
or eax, PG_SWR |
mov [edx+APPDATA.io_map+ebx*4], eax |
add esi, [default_io_map] |
818,7 → 818,7 |
mov esi, [ipc_ptab] |
and eax, 0xFFFFF000 |
jz .exit |
stdcall map_page, esi, eax, PG_SW |
stdcall map_page, esi, eax, PG_SWR |
@@: |
mov edi, [lin_addr] |
and edi, 0xFFFFF000 |
849,7 → 849,7 |
and eax, 0xFFFFF000 |
jz .exit |
stdcall map_page, esi, eax, PG_SW |
stdcall map_page, esi, eax, PG_SWR |
xor edx, edx |
jmp .map |
.exit: |
881,7 → 881,7 |
mov esi, [proc_mem_tab] |
and eax, 0xFFFFF000 |
jz .exit |
stdcall map_page, esi, eax, PG_SW |
stdcall map_page, esi, eax, PG_SWR |
@@: |
mov edi, [lin_addr] |
and edi, 0xFFFFF000 |
912,7 → 912,7 |
and eax, 0xFFFFF000 |
jz .exit |
stdcall map_page, esi, eax, PG_SW |
stdcall map_page, esi, eax, PG_SWR |
xor edx, edx |
jmp .map |
.exit: |
927,7 → 927,7 |
; destroys: only eax |
proc safe_map_page stdcall, slot:dword, req_access:dword, ofs:dword |
mov eax, [esi+edx*4] |
test al, PG_MAP |
test al, PG_READ |
jz .not_present |
test al, PG_WRITE |
jz .resolve_readonly |
947,7 → 947,7 |
pop ecx |
test eax, eax |
jz .fail |
or al, PG_UW |
or al, PG_UWR |
mov [esi+edx*4], eax |
jmp .map |
.resolve_readonly: |
989,7 → 989,7 |
call alloc_page |
test eax, eax |
jz .no_hdll |
or al, PG_UW |
or al, PG_UWR |
mov [esi+edx*4], eax |
stdcall map_page, edi, eax, [req_access] |
push esi edi |
1090,7 → 1090,7 |
@@: |
mov [used_buf], ecx |
stdcall map_mem_ipc, ecx, [dst_slot], \ |
edi, esi, PG_SW |
edi, esi, PG_SWR |
mov edi, [dst_offset] |
add edi, [used_buf] |
/kernel/trunk/core/mtrr.inc |
---|
848,7 → 848,7 |
; LFB is mapped to virtual address LFB_BASE, |
; it uses global pages if supported by CPU. |
mov ebx, [sys_proc+PROC.pdt_0+(LFB_BASE shr 20)] |
test ebx, PG_LARGE |
test ebx, PDE_LARGE |
jnz @f |
mov ebx, [page_tabs+(LFB_BASE shr 10)] |
@@: |
/kernel/trunk/core/sys32.inc |
---|
308,7 → 308,7 |
mov ecx, ebx |
shr ecx, 10 |
mov edx, [master_tab+ecx*4] |
test edx, PG_MAP |
test edx, PG_READ |
jz .fail ;page table is not created |
;incorrect address in the program |
/kernel/trunk/core/taskman.inc |
---|
503,7 → 503,7 |
rep movsd |
mov eax, [edi-8192+PROC.pdt_0_phys] |
or eax, PG_SW |
or eax, PG_SWR |
mov [edi-4096+(page_tabs shr 20)], eax |
lea eax, [edi-8192] |
529,7 → 529,7 |
rep stosd |
mov ecx, [img_pages] |
mov ebx, PG_UW |
mov ebx, PG_UWR |
xor edx, edx |
mov esi, [img_base] |
shr esi, 10 |
554,7 → 554,7 |
test eax, eax |
jz .fail |
stdcall map_page, edx, eax, dword PG_UW |
stdcall map_page, edx, eax, dword PG_UWR |
add edx, 0x1000 |
dec [app_pages] |
jnz .alloc |
643,7 → 643,7 |
test eax, 1 |
jz .next |
and eax, not 0xFFF |
stdcall map_page, [tmp_task_ptab], eax, PG_SW |
stdcall map_page, [tmp_task_ptab], eax, PG_SWR |
stdcall destroy_page_table, [tmp_task_ptab] |
mov eax, [esi] |
call free_page |
788,7 → 788,7 |
push ecx |
stdcall map_memEx, [proc_mem_map], \ |
[slot], ebx, ecx, PG_MAP |
[slot], ebx, ecx, PG_READ |
pop ecx |
mov esi, [offset] |
859,7 → 859,7 |
; add ebx, new_app_base |
push ecx |
stdcall map_memEx, [proc_mem_map], \ |
[slot], ebx, ecx, PG_SW |
[slot], ebx, ecx, PG_SWR |
pop ecx |
mov edi, [offset] |
/kernel/trunk/core/v86.inc |
---|
78,7 → 78,7 |
; (I have seen one computer with EBDA segment = 0x9D80, |
; all other computers use less memory) |
mov eax, PG_UW |
mov eax, PG_UWR |
mov [page_tabs], eax |
invlpg [eax] |
89,7 → 89,7 |
mov byte [0x504], 0x10 |
mov byte [0x505], 0xF4 |
mov eax, 0x99000+PG_UW |
mov eax, 0x99000+PG_UWR |
mov edi, page_tabs+0x99*4 |
mov edx, 0x1000 |
mov ecx, 7 |
101,7 → 101,7 |
; addresses 0xC0000 - 0xFFFFF - BIOS code (shared between all machines!) |
; physical address = 0xC0000 |
mov eax, 0xC0000+PG_UW |
mov eax, 0xC0000+PG_UWR |
mov edi, page_tabs+0xC0*4 |
mov ecx, 64 |
@@: |