paging: remove page.asm
This commit is contained in:
@@ -1,24 +0,0 @@
|
||||
|
||||
|
||||
global loadPageDirectory
|
||||
loadPageDirectory:
|
||||
push ebp
|
||||
mov ebp, esp
|
||||
mov eax, [esp+8]
|
||||
mov cr3, eax
|
||||
mov esp, ebp
|
||||
pop ebp
|
||||
ret
|
||||
|
||||
global enablePaging
|
||||
enablePaging:
|
||||
push ebp
|
||||
mov ebp, esp
|
||||
|
||||
mov eax, cr0
|
||||
or eax, 0x80000000
|
||||
mov cr0, eax
|
||||
|
||||
mov esp, ebp
|
||||
pop ebp
|
||||
ret
|
||||
+4
-7
@@ -2,10 +2,7 @@
|
||||
#include <stdint.h>
|
||||
#include "../include/stdio.h"
|
||||
|
||||
//extern void loadPageDirectory(unsigned int*);
|
||||
//extern void enablePaging();
|
||||
|
||||
void enablePaging1() {
|
||||
void enablePaging() {
|
||||
asm volatile (
|
||||
"mov %%cr0, %%eax\n"
|
||||
"or $0x80000000, %%eax\n"
|
||||
@@ -21,7 +18,7 @@ void enablePaging1() {
|
||||
);
|
||||
}
|
||||
|
||||
void loadPageDirectory1(uint32_t* page_directory) {
|
||||
void loadPageDirectory(uint32_t* page_directory) {
|
||||
asm volatile (
|
||||
"mov %0, %%cr3\n" // Загружаем физический адрес каталога страниц в CR3
|
||||
: // Нет выходных операндов
|
||||
@@ -132,8 +129,8 @@ void paging_init()
|
||||
printf("OSHIBKA ZAPISI BLYA\n");
|
||||
while (1); // Ошибка записи
|
||||
}
|
||||
loadPageDirectory1(kernel_page_directory);
|
||||
enablePaging1();
|
||||
loadPageDirectory(kernel_page_directory);
|
||||
enablePaging();
|
||||
}
|
||||
|
||||
void *get_physaddr(void *virtualaddr) {
|
||||
|
||||
Reference in New Issue
Block a user