diff options
| author | Aleksa Vučković <aleksav013@gmail.com> | 2022-01-31 11:16:38 +0100 |
|---|---|---|
| committer | Aleksa Vučković <aleksav013@gmail.com> | 2022-01-31 14:03:24 +0100 |
| commit | 03035c98b4ba3297b837e96080e78e0aac1e86db (patch) | |
| tree | 55b5f69f83bc8b77ec229062f702c0a4f960e87f /include/09.paging | |
| parent | 11e780fd0f7bed3594de9a7170fadc88c4d48be8 (diff) | |
Promene
Diffstat (limited to 'include/09.paging')
| -rw-r--r-- | include/09.paging/deo1 | 1 | ||||
| -rw-r--r-- | include/09.paging/paging.c | 16 | ||||
| -rw-r--r-- | include/09.paging/paging1.c | 2 | ||||
| -rw-r--r-- | include/09.paging/paging2.c (renamed from include/09.paging/deo2) | 2 | ||||
| -rw-r--r-- | include/09.paging/paging3.c (renamed from include/09.paging/deo3) | 0 | ||||
| -rw-r--r-- | include/09.paging/paging4.c (renamed from include/09.paging/deo4) | 2 | ||||
| -rw-r--r-- | include/09.paging/paging5.c (renamed from include/09.paging/deo5) | 0 | ||||
| -rw-r--r-- | include/09.paging/paging6.c (renamed from include/09.paging/deo6) | 6 | ||||
| -rw-r--r-- | include/09.paging/paging7.c (renamed from include/09.paging/deo7) | 3 | ||||
| -rw-r--r-- | include/09.paging/paging8.c (renamed from include/09.paging/deo8) | 0 | ||||
| -rw-r--r-- | include/09.paging/paging9.c (renamed from include/09.paging/deo9) | 2 |
11 files changed, 21 insertions, 13 deletions
diff --git a/include/09.paging/deo1 b/include/09.paging/deo1 deleted file mode 100644 index c45e28b..0000000 --- a/include/09.paging/deo1 +++ /dev/null @@ -1 +0,0 @@ -#include<types.h> diff --git a/include/09.paging/paging.c b/include/09.paging/paging.c index f08530d..9c4875a 100644 --- a/include/09.paging/paging.c +++ b/include/09.paging/paging.c @@ -1,11 +1,12 @@ +#include<source/paging.h> #include<types.h> extern void loadPageDirectory(uint32_t*); -extern void enablePaging(); +extern void enablePaging(void); uint32_t page_directory[1024] __attribute__((aligned(4096))); -void set_pd() +void set_pd(void) { //set each entry to not present for(size_t i=0;i<1024;i++) @@ -22,22 +23,25 @@ uint32_t page_table[1024][1024] __attribute__((aligned(4096))); void set_pt(size_t num,uint32_t address) { - // holds the physical address where we want to start mapping these pages to. - // in this case, we want to map these pages to the very beginning of memory. + // holds the physical address where we want to start mapping these pages + // to. + // in this case, we want to map these pages to the very beginning of + // memory. //we will fill all 1024 entries in the table, mapping 4 megabytes for(size_t i=0;i<1024;i++) { // As the address is page aligned, it will always leave 12 bits zeroed. // Those bits are used by the attributes ;) - page_table[num][i] = (address + i * 0x1000) | 3; // attributes: supervisor level, read/write, present. + page_table[num][i] = (address + i * 0x1000) | 3; // attributes: + supervisor level, read/write, present. } page_directory[num] = ((uint32_t)page_table[num]) | 3; // attributes: supervisor level, read/write, present } -void set_paging() +void set_paging(void) { set_pd(); for(size_t i=0;i<1024;i++) set_pt(i,0x00400000 * i); // all 4GB mapped diff --git a/include/09.paging/paging1.c b/include/09.paging/paging1.c new file mode 100644 index 0000000..2893924 --- /dev/null +++ b/include/09.paging/paging1.c @@ -0,0 +1,2 @@ +#include<source/paging.h> +#include<types.h> diff --git a/include/09.paging/deo2 b/include/09.paging/paging2.c index b56d18e..8baa0b4 100644 --- a/include/09.paging/deo2 +++ b/include/09.paging/paging2.c @@ -1,2 +1,2 @@ extern void loadPageDirectory(uint32_t*); -extern void enablePaging(); +extern void enablePaging(void); diff --git a/include/09.paging/deo3 b/include/09.paging/paging3.c index cbfbd25..cbfbd25 100644 --- a/include/09.paging/deo3 +++ b/include/09.paging/paging3.c diff --git a/include/09.paging/deo4 b/include/09.paging/paging4.c index 6905d35..2523a96 100644 --- a/include/09.paging/deo4 +++ b/include/09.paging/paging4.c @@ -1,4 +1,4 @@ -void set_pd() +void set_pd(void) { //set each entry to not present for(size_t i=0;i<1024;i++) diff --git a/include/09.paging/deo5 b/include/09.paging/paging5.c index 57f997d..57f997d 100644 --- a/include/09.paging/deo5 +++ b/include/09.paging/paging5.c diff --git a/include/09.paging/deo6 b/include/09.paging/paging6.c index 4e670bb..c5ffd58 100644 --- a/include/09.paging/deo6 +++ b/include/09.paging/paging6.c @@ -1,4 +1,6 @@ void set_pt(size_t num,uint32_t address) { - // holds the physical address where we want to start mapping these pages to. - // in this case, we want to map these pages to the very beginning of memory. + // holds the physical address where we want to start mapping these pages + // to. + // in this case, we want to map these pages to the very beginning of + // memory. diff --git a/include/09.paging/deo7 b/include/09.paging/paging7.c index 5898f28..1b9c590 100644 --- a/include/09.paging/deo7 +++ b/include/09.paging/paging7.c @@ -3,5 +3,6 @@ { // As the address is page aligned, it will always leave 12 bits zeroed. // Those bits are used by the attributes ;) - page_table[num][i] = (address + i * 0x1000) | 3; // attributes: supervisor level, read/write, present. + page_table[num][i] = (address + i * 0x1000) | 3; // attributes: + supervisor level, read/write, present. } diff --git a/include/09.paging/deo8 b/include/09.paging/paging8.c index b842a0c..b842a0c 100644 --- a/include/09.paging/deo8 +++ b/include/09.paging/paging8.c diff --git a/include/09.paging/deo9 b/include/09.paging/paging9.c index d99797b..eacd1a6 100644 --- a/include/09.paging/deo9 +++ b/include/09.paging/paging9.c @@ -1,4 +1,4 @@ -void set_paging() +void set_paging(void) { set_pd(); for(size_t i=0;i<1024;i++) set_pt(i,0x00400000 * i); // all 4GB mapped |
