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
8a9933a2
Commit
8a9933a2
authored
13 years ago
by
Frans Kaashoek
Browse files
Options
Downloads
Patches
Plain Diff
Tiny bit of cleanup
parent
22c73411
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
+7
-7
7 additions, 7 deletions
vm.c
with
7 additions
and
7 deletions
vm.c
+
7
−
7
View file @
8a9933a2
...
...
@@ -43,7 +43,7 @@ seginit(void)
// that corresponds to linear address va. If create!=0,
// create any required page table pages.
static
pte_t
*
walkpgdir
(
pde_t
*
pgdir
,
const
void
*
va
,
int
create
,
char
*
(
*
alloc
)(
void
))
walkpgdir
(
pde_t
*
pgdir
,
const
void
*
va
,
char
*
(
*
alloc
)(
void
))
{
pde_t
*
pde
;
pte_t
*
pgtab
;
...
...
@@ -52,7 +52,7 @@ walkpgdir(pde_t *pgdir, const void *va, int create, char* (*alloc)(void))
if
(
*
pde
&
PTE_P
){
pgtab
=
(
pte_t
*
)
p2v
(
PTE_ADDR
(
*
pde
));
}
else
{
if
(
!
create
||
(
pgtab
=
(
pte_t
*
)
alloc
())
==
0
)
if
(
!
alloc
||
(
pgtab
=
(
pte_t
*
)
alloc
())
==
0
)
return
0
;
// Make sure all those PTE_P bits are zero.
memset
(
pgtab
,
0
,
PGSIZE
);
...
...
@@ -76,7 +76,7 @@ mappages(pde_t *pgdir, void *la, uint size, uint pa, int perm, char* (*alloc)(vo
a
=
PGROUNDDOWN
(
la
);
last
=
PGROUNDDOWN
(
la
+
size
-
1
);
for
(;;){
pte
=
walkpgdir
(
pgdir
,
a
,
1
,
alloc
);
pte
=
walkpgdir
(
pgdir
,
a
,
alloc
);
if
(
pte
==
0
)
return
-
1
;
if
(
*
pte
&
PTE_P
)
...
...
@@ -222,7 +222,7 @@ loaduvm(pde_t *pgdir, char *addr, struct inode *ip, uint offset, uint sz)
if
((
uint
)
addr
%
PGSIZE
!=
0
)
panic
(
"loaduvm: addr must be page aligned"
);
for
(
i
=
0
;
i
<
sz
;
i
+=
PGSIZE
){
if
((
pte
=
walkpgdir
(
pgdir
,
addr
+
i
,
0
,
kalloc
))
==
0
)
if
((
pte
=
walkpgdir
(
pgdir
,
addr
+
i
,
0
))
==
0
)
panic
(
"loaduvm: address should exist"
);
pa
=
PTE_ADDR
(
*
pte
);
if
(
sz
-
i
<
PGSIZE
)
...
...
@@ -277,7 +277,7 @@ deallocuvm(pde_t *pgdir, uint oldsz, uint newsz)
a
=
PGROUNDUP
(
newsz
);
for
(;
a
<
oldsz
;
a
+=
PGSIZE
){
pte
=
walkpgdir
(
pgdir
,
(
char
*
)
a
,
0
,
kalloc
);
pte
=
walkpgdir
(
pgdir
,
(
char
*
)
a
,
0
);
if
(
pte
&&
(
*
pte
&
PTE_P
)
!=
0
){
pa
=
PTE_ADDR
(
*
pte
);
if
(
pa
==
0
)
...
...
@@ -322,7 +322,7 @@ copyuvm(pde_t *pgdir, uint sz)
if
((
d
=
setupkvm
(
kalloc
))
==
0
)
return
0
;
for
(
i
=
0
;
i
<
sz
;
i
+=
PGSIZE
){
if
((
pte
=
walkpgdir
(
pgdir
,
(
void
*
)
i
,
0
,
kalloc
))
==
0
)
if
((
pte
=
walkpgdir
(
pgdir
,
(
void
*
)
i
,
0
))
==
0
)
panic
(
"copyuvm: pte should exist"
);
if
(
!
(
*
pte
&
PTE_P
))
panic
(
"copyuvm: page not present"
);
...
...
@@ -347,7 +347,7 @@ uva2ka(pde_t *pgdir, char *uva)
{
pte_t
*
pte
;
pte
=
walkpgdir
(
pgdir
,
uva
,
0
,
kalloc
);
pte
=
walkpgdir
(
pgdir
,
uva
,
0
);
if
((
*
pte
&
PTE_P
)
==
0
)
return
0
;
if
((
*
pte
&
PTE_U
)
==
0
)
...
...
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