clang-format
This commit is contained in:
@@ -34,13 +34,11 @@
|
||||
* Address space structure and operations.
|
||||
*/
|
||||
|
||||
|
||||
#include <vm.h>
|
||||
#include "opt-dumbvm.h"
|
||||
|
||||
struct vnode;
|
||||
|
||||
|
||||
/*
|
||||
* Address space - data structure associated with the virtual memory
|
||||
* space of a process.
|
||||
@@ -50,15 +48,15 @@ struct vnode;
|
||||
|
||||
struct addrspace {
|
||||
#if OPT_DUMBVM
|
||||
vaddr_t as_vbase1;
|
||||
paddr_t as_pbase1;
|
||||
size_t as_npages1;
|
||||
vaddr_t as_vbase2;
|
||||
paddr_t as_pbase2;
|
||||
size_t as_npages2;
|
||||
paddr_t as_stackpbase;
|
||||
vaddr_t as_vbase1;
|
||||
paddr_t as_pbase1;
|
||||
size_t as_npages1;
|
||||
vaddr_t as_vbase2;
|
||||
paddr_t as_pbase2;
|
||||
size_t as_npages2;
|
||||
paddr_t as_stackpbase;
|
||||
#else
|
||||
/* Put stuff here for your VM system */
|
||||
/* Put stuff here for your VM system */
|
||||
#endif
|
||||
};
|
||||
|
||||
@@ -104,20 +102,16 @@ struct addrspace {
|
||||
*/
|
||||
|
||||
struct addrspace *as_create(void);
|
||||
int as_copy(struct addrspace *src, struct addrspace **ret);
|
||||
void as_activate(void);
|
||||
void as_deactivate(void);
|
||||
void as_destroy(struct addrspace *);
|
||||
|
||||
int as_define_region(struct addrspace *as,
|
||||
vaddr_t vaddr, size_t sz,
|
||||
int readable,
|
||||
int writeable,
|
||||
int executable);
|
||||
int as_prepare_load(struct addrspace *as);
|
||||
int as_complete_load(struct addrspace *as);
|
||||
int as_define_stack(struct addrspace *as, vaddr_t *initstackptr);
|
||||
int as_copy(struct addrspace *src, struct addrspace **ret);
|
||||
void as_activate(void);
|
||||
void as_deactivate(void);
|
||||
void as_destroy(struct addrspace *);
|
||||
|
||||
int as_define_region(struct addrspace *as, vaddr_t vaddr, size_t sz,
|
||||
int readable, int writeable, int executable);
|
||||
int as_prepare_load(struct addrspace *as);
|
||||
int as_complete_load(struct addrspace *as);
|
||||
int as_define_stack(struct addrspace *as, vaddr_t *initstackptr);
|
||||
|
||||
/*
|
||||
* Functions in loadelf.c
|
||||
@@ -128,5 +122,4 @@ int as_define_stack(struct addrspace *as, vaddr_t *initstackptr);
|
||||
|
||||
int load_elf(struct vnode *v, vaddr_t *entrypoint);
|
||||
|
||||
|
||||
#endif /* _ADDRSPACE_H_ */
|
||||
|
||||
Reference in New Issue
Block a user