Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
CSEP551
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Krishna Vinnakota
CSEP551
Commits
9e4272c1
Commit
9e4272c1
authored
13 years ago
by
Austin Clements
Browse files
Options
Downloads
Patches
Plain Diff
Cleanup comments and fit setupkvm on same page as kmap, which aligns lots of other things
parent
14835ec9
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
vm.c
+6
-10
6 additions, 10 deletions
vm.c
with
6 additions
and
10 deletions
vm.c
+
6
−
10
View file @
9e4272c1
...
@@ -92,10 +92,9 @@ mappages(pde_t *pgdir, void *va, uint size, uint pa,
...
@@ -92,10 +92,9 @@ mappages(pde_t *pgdir, void *va, uint size, uint pa,
// The mappings from logical to virtual are one to one (i.e.,
// The mappings from logical to virtual are one to one (i.e.,
// segmentation doesn't do anything). There is one page table per
// segmentation doesn't do anything). There is one page table per
// process, plus one that's used when a CPU is not running any
// process, plus one that's used when a CPU is not running any process
// process (kpgdir). A user process uses the same page table as
// (kpgdir). A user process uses the same page table as the kernel; the
// the kernel; the page protection bits prevent it from using
// page protection bits prevent it from accessing kernel memory.
// anything other than its memory.
//
//
// setupkvm() and exec() set up every page table like this:
// setupkvm() and exec() set up every page table like this:
// 0..KERNBASE: user memory (text+data+stack+heap), mapped to some free
// 0..KERNBASE: user memory (text+data+stack+heap), mapped to some free
...
@@ -108,10 +107,9 @@ mappages(pde_t *pgdir, void *va, uint size, uint pa,
...
@@ -108,10 +107,9 @@ mappages(pde_t *pgdir, void *va, uint size, uint pa,
// 0xfe000000..0: mapped direct (devices such as ioapic)
// 0xfe000000..0: mapped direct (devices such as ioapic)
//
//
// The kernel allocates memory for its heap and for user memory
// The kernel allocates memory for its heap and for user memory
// between kernend and the end of physical memory (PHYSTOP).
// between KERNBASE+end and the end of physical memory (PHYSTOP).
// The virtual address space of each user program includes the kernel
// The user program sits in the bottom of the address space, and the
// (which is inaccessible in user mode). The user program sits in
// kernel at the top at KERNBASE.
// the bottom of the address space, and the kernel at the top at KERNBASE.
static
struct
kmap
{
static
struct
kmap
{
void
*
virt
;
void
*
virt
;
uint
phys_start
;
uint
phys_start
;
...
@@ -134,14 +132,12 @@ setupkvm(char* (*alloc)(void))
...
@@ -134,14 +132,12 @@ setupkvm(char* (*alloc)(void))
if
((
pgdir
=
(
pde_t
*
)
alloc
())
==
0
)
if
((
pgdir
=
(
pde_t
*
)
alloc
())
==
0
)
return
0
;
return
0
;
memset
(
pgdir
,
0
,
PGSIZE
);
memset
(
pgdir
,
0
,
PGSIZE
);
k
=
kmap
;
if
(
p2v
(
PHYSTOP
)
>
(
void
*
)
DEVSPACE
)
if
(
p2v
(
PHYSTOP
)
>
(
void
*
)
DEVSPACE
)
panic
(
"PHYSTOP too high"
);
panic
(
"PHYSTOP too high"
);
for
(
k
=
kmap
;
k
<
&
kmap
[
NELEM
(
kmap
)];
k
++
)
for
(
k
=
kmap
;
k
<
&
kmap
[
NELEM
(
kmap
)];
k
++
)
if
(
mappages
(
pgdir
,
k
->
virt
,
k
->
phys_end
-
k
->
phys_start
,
if
(
mappages
(
pgdir
,
k
->
virt
,
k
->
phys_end
-
k
->
phys_start
,
(
uint
)
k
->
phys_start
,
k
->
perm
,
alloc
)
<
0
)
(
uint
)
k
->
phys_start
,
k
->
perm
,
alloc
)
<
0
)
return
0
;
return
0
;
return
pgdir
;
return
pgdir
;
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment