ab0db651af
The x86-64 doesn't just add two levels to page tables to support 64 bit addresses, but is a different processor. For example, calling conventions, system calls, and segmentation are different from 32-bit x86. Segmentation is basically gone, but gs/fs in combination with MSRs can be used to hold a per-core pointer. In general, x86-64 is more straightforward than 32-bit x86. The port uses code from sv6 and the xv6 "rsc-amd64" branch. A summary of the changes is as follows: - Booting: switch to grub instead of xv6's bootloader (pass -kernel to qemu), because xv6's boot loader doesn't understand 64bit ELF files. And, we don't care anymore about booting. - Makefile: use -m64 instead of -m32 flag for gcc, delete boot loader, xv6.img, bochs, and memfs. For now dont' use -O2, since usertests with -O2 is bigger than MAXFILE! - Update gdb.tmpl to be for i386 or x86-64 - Console/printf: use stdarg.h and treat 64-bit addresses different from ints (32-bit) - Update elfhdr to be 64 bit - entry.S/entryother.S: add code to switch to 64-bit mode: build a simple page table in 32-bit mode before switching to 64-bit mode, share code for entering boot processor and APs, and tweak boot gdt. The boot gdt is the gdt that the kernel proper also uses. (In 64-bit mode, the gdt/segmentation and task state mostly disappear.) - exec.c: fix passing argv (64-bit now instead of 32-bit). - initcode.c: use syscall instead of int. - kernel.ld: load kernel very high, in top terabyte. 64 bits is a lot of address space! - proc.c: initial return is through new syscall path instead of trapret. - proc.h: update struct cpu to have some scratch space since syscall saves less state than int, update struct context to reflect x86-64 calling conventions. - swtch: simplify for x86-64 calling conventions. - syscall: add fetcharg to handle x86-64 calling convetions (6 arguments are passed through registers), and fetchaddr to read a 64-bit value from user space. - sysfile: update to handle pointers from user space (e.g., sys_exec), which are 64 bits. - trap.c: no special trap vector for sys calls, because x86-64 has a different plan for system calls. - trapasm: one plan for syscalls and one plan for traps (interrupt and exceptions). On x86-64, the kernel is responsible for switching user/kernel stacks. To do, xv6 keeps some scratch space in the cpu structure, and uses MSR GS_KERN_BASE to point to the core's cpu structure (using swapgs). - types.h: add uint64, and change pde_t to uint64 - usertests: exit() when fork fails, which helped in tracking down one of the bugs in the switch from 32-bit to 64-bit - vectors: update to make them 64 bits - vm.c: use bootgdt in kernel too, program MSRs for syscalls and core-local state (for swapgs), walk 4 levels in walkpgdir, add DEVSPACETOP, use task segment to set kernel stack for interrupts (but simpler than in 32-bit mode), add an extra argument to freevm (size of user part of address space) to avoid checking all entries till KERNBASE (there are MANY TB before the top 1TB). - x86: update trapframe to have 64-bit entries, which is what the processor pushes on syscalls and traps. simplify lgdt and lidt, using struct desctr, which needs the gcc directives packed and aligned. TODO: - use int32 instead of int? - simplify curproc(). xv6 has per-cpu state again, but this time it must have it. - avoid repetition in walkpgdir - fix validateint() in usertests.c - fix bugs (e.g., observed one a case of entering kernel with invalid gs or proc
96 lines
1.7 KiB
C
96 lines
1.7 KiB
C
#include "types.h"
|
|
#include "stat.h"
|
|
#include "user.h"
|
|
|
|
#include <stdarg.h>
|
|
|
|
static char digits[] = "0123456789ABCDEF";
|
|
|
|
static void
|
|
putc(int fd, char c)
|
|
{
|
|
write(fd, &c, 1);
|
|
}
|
|
|
|
static void
|
|
printint(int fd, int xx, int base, int sgn)
|
|
{
|
|
char buf[16];
|
|
int i, neg;
|
|
uint x;
|
|
|
|
neg = 0;
|
|
if(sgn && xx < 0){
|
|
neg = 1;
|
|
x = -xx;
|
|
} else {
|
|
x = xx;
|
|
}
|
|
|
|
i = 0;
|
|
do{
|
|
buf[i++] = digits[x % base];
|
|
}while((x /= base) != 0);
|
|
if(neg)
|
|
buf[i++] = '-';
|
|
|
|
while(--i >= 0)
|
|
putc(fd, buf[i]);
|
|
}
|
|
|
|
static void
|
|
printptr(int fd, uint64 x) {
|
|
int i;
|
|
putc(fd, '0');
|
|
putc(fd, 'x');
|
|
for (i = 0; i < (sizeof(uint64) * 2); i++, x <<= 4)
|
|
putc(fd, digits[x >> (sizeof(uint64) * 8 - 4)]);
|
|
}
|
|
|
|
// Print to the given fd. Only understands %d, %x, %p, %s.
|
|
void
|
|
printf(int fd, const char *fmt, ...)
|
|
{
|
|
va_list ap;
|
|
char *s;
|
|
int c, i, state;
|
|
|
|
va_start(ap, fmt);
|
|
state = 0;
|
|
for(i = 0; fmt[i]; i++){
|
|
c = fmt[i] & 0xff;
|
|
if(state == 0){
|
|
if(c == '%'){
|
|
state = '%';
|
|
} else {
|
|
putc(fd, c);
|
|
}
|
|
} else if(state == '%'){
|
|
if(c == 'd'){
|
|
printint(fd, va_arg(ap, int), 10, 1);
|
|
} else if(c == 'x') {
|
|
printint(fd, va_arg(ap, int), 16, 0);
|
|
} else if(c == 'p') {
|
|
printptr(fd, va_arg(ap, uint64));
|
|
} else if(c == 's'){
|
|
s = va_arg(ap, char*);
|
|
if(s == 0)
|
|
s = "(null)";
|
|
while(*s != 0){
|
|
putc(fd, *s);
|
|
s++;
|
|
}
|
|
} else if(c == 'c'){
|
|
putc(fd, va_arg(ap, uint));
|
|
} else if(c == '%'){
|
|
putc(fd, c);
|
|
} else {
|
|
// Unknown % sequence. Print it to draw attention.
|
|
putc(fd, '%');
|
|
putc(fd, c);
|
|
}
|
|
state = 0;
|
|
}
|
|
}
|
|
}
|