X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fuserprog%2Fpagedir.c;h=3ad8123557a37dace964bcc18be56a431605f87d;hb=7d4e3dda080a47db88616f1c0d975f2091be47f1;hp=000aefea700be64ded51049debd81ffae0199328;hpb=f0ad7eb8b43516c7a2999fd217ec85d954dfc791;p=pintos-anon diff --git a/src/userprog/pagedir.c b/src/userprog/pagedir.c index 000aefe..3ad8123 100644 --- a/src/userprog/pagedir.c +++ b/src/userprog/pagedir.c @@ -192,18 +192,18 @@ pagedir_activate (uint32_t *pd) aka PDBR (page directory base register). This activates our new page tables immediately. See [IA32-v2a] "MOV--Move to/from Control Registers" and [IA32-v3] 3.7.5. */ - asm volatile ("movl %0,%%cr3" :: "r" (vtop (pd))); + asm volatile ("mov %%cr3, %0" :: "r" (vtop (pd))); } /* Returns the currently active page directory. */ static uint32_t * active_pd (void) { + /* Copy CR3, the page directory base register (PDBR), into + `pd'. + See [IA32-v2a] "MOV--Move to/from Control Registers" and + [IA32-v3] 3.7.5. */ uint32_t *pd; - - /* Copy CR3, the page directory base register (PDBR), into `pd' - for us to exmaine. See [IA32-v2a] "MOV--Move to/from - Control Registers" and [IA32-v3] 3.7.5. */ - asm ("movl %%cr3,%0" : "=r" (pd)); + asm ("mov %0, %%cr3" : "=r" (pd)); return pd; }