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
315 lines
5.5 KiB
C
315 lines
5.5 KiB
C
// Console input and output.
|
|
// Input is from the keyboard or serial port.
|
|
// Output is written to the screen and serial port.
|
|
|
|
#include <stdarg.h>
|
|
|
|
#include "types.h"
|
|
#include "defs.h"
|
|
#include "param.h"
|
|
#include "traps.h"
|
|
#include "spinlock.h"
|
|
#include "sleeplock.h"
|
|
#include "fs.h"
|
|
#include "file.h"
|
|
#include "memlayout.h"
|
|
#include "mmu.h"
|
|
#include "proc.h"
|
|
#include "x86.h"
|
|
|
|
static void consputc(int);
|
|
|
|
static int panicked = 0;
|
|
|
|
static struct {
|
|
struct spinlock lock;
|
|
int locking;
|
|
} cons;
|
|
|
|
static char digits[] = "0123456789abcdef";
|
|
|
|
static void
|
|
printint(int xx, int base, int sign)
|
|
{
|
|
char buf[16];
|
|
int i;
|
|
uint x;
|
|
|
|
if(sign && (sign = xx < 0))
|
|
x = -xx;
|
|
else
|
|
x = xx;
|
|
|
|
i = 0;
|
|
do{
|
|
buf[i++] = digits[x % base];
|
|
}while((x /= base) != 0);
|
|
|
|
if(sign)
|
|
buf[i++] = '-';
|
|
|
|
while(--i >= 0)
|
|
consputc(buf[i]);
|
|
}
|
|
|
|
static void
|
|
printptr(uint64 x) {
|
|
int i;
|
|
consputc('0');
|
|
consputc('x');
|
|
for (i = 0; i < (sizeof(uint64) * 2); i++, x <<= 4)
|
|
consputc(digits[x >> (sizeof(uint64) * 8 - 4)]);
|
|
}
|
|
|
|
|
|
//PAGEBREAK: 50
|
|
|
|
// Print to the console. only understands %d, %x, %p, %s.
|
|
void
|
|
cprintf(char *fmt, ...)
|
|
{
|
|
va_list ap;
|
|
int i, c, locking;
|
|
char *s;
|
|
|
|
locking = cons.locking;
|
|
if(locking)
|
|
acquire(&cons.lock);
|
|
|
|
if (fmt == 0)
|
|
panic("null fmt");
|
|
|
|
va_start(ap, fmt);
|
|
for(i = 0; (c = fmt[i] & 0xff) != 0; i++){
|
|
if(c != '%'){
|
|
consputc(c);
|
|
continue;
|
|
}
|
|
c = fmt[++i] & 0xff;
|
|
if(c == 0)
|
|
break;
|
|
switch(c){
|
|
case 'd':
|
|
printint(va_arg(ap, int), 10, 1);
|
|
break;
|
|
case 'x':
|
|
printint(va_arg(ap, int), 16, 1);
|
|
break;
|
|
case 'p':
|
|
printptr(va_arg(ap, uint64));
|
|
break;
|
|
case 's':
|
|
if((s = va_arg(ap, char*)) == 0)
|
|
s = "(null)";
|
|
for(; *s; s++)
|
|
consputc(*s);
|
|
break;
|
|
case '%':
|
|
consputc('%');
|
|
break;
|
|
default:
|
|
// Print unknown % sequence to draw attention.
|
|
consputc('%');
|
|
consputc(c);
|
|
break;
|
|
}
|
|
}
|
|
|
|
if(locking)
|
|
release(&cons.lock);
|
|
}
|
|
|
|
void
|
|
panic(char *s)
|
|
{
|
|
int i;
|
|
uint64 pcs[10];
|
|
|
|
cli();
|
|
cons.locking = 0;
|
|
// use lapiccpunum so that we can call panic from mycpu()
|
|
cprintf("lapicid %d: panic: ", lapicid());
|
|
cprintf(s);
|
|
cprintf("\n");
|
|
getcallerpcs(&s, pcs);
|
|
for(i=0; i<10; i++)
|
|
cprintf(" %p", pcs[i]);
|
|
panicked = 1; // freeze other CPU
|
|
for(;;)
|
|
;
|
|
}
|
|
|
|
//PAGEBREAK: 50
|
|
#define BACKSPACE 0x100
|
|
#define CRTPORT 0x3d4
|
|
static ushort *crt = (ushort*)P2V(0xb8000); // CGA memory
|
|
|
|
static void
|
|
cgaputc(int c)
|
|
{
|
|
int pos;
|
|
|
|
// Cursor position: col + 80*row.
|
|
outb(CRTPORT, 14);
|
|
pos = inb(CRTPORT+1) << 8;
|
|
outb(CRTPORT, 15);
|
|
pos |= inb(CRTPORT+1);
|
|
|
|
if(c == '\n')
|
|
pos += 80 - pos%80;
|
|
else if(c == BACKSPACE){
|
|
if(pos > 0) --pos;
|
|
} else
|
|
crt[pos++] = (c&0xff) | 0x0700; // black on white
|
|
|
|
if(pos < 0 || pos > 25*80)
|
|
panic("pos under/overflow");
|
|
|
|
if((pos/80) >= 24){ // Scroll up.
|
|
memmove(crt, crt+80, sizeof(crt[0])*23*80);
|
|
pos -= 80;
|
|
memset(crt+pos, 0, sizeof(crt[0])*(24*80 - pos));
|
|
}
|
|
|
|
outb(CRTPORT, 14);
|
|
outb(CRTPORT+1, pos>>8);
|
|
outb(CRTPORT, 15);
|
|
outb(CRTPORT+1, pos);
|
|
crt[pos] = ' ' | 0x0700;
|
|
}
|
|
|
|
void
|
|
consputc(int c)
|
|
{
|
|
if(panicked){
|
|
cli();
|
|
for(;;)
|
|
;
|
|
}
|
|
|
|
if(c == BACKSPACE){
|
|
uartputc('\b'); uartputc(' '); uartputc('\b');
|
|
} else
|
|
uartputc(c);
|
|
cgaputc(c);
|
|
}
|
|
|
|
#define INPUT_BUF 128
|
|
struct {
|
|
char buf[INPUT_BUF];
|
|
uint r; // Read index
|
|
uint w; // Write index
|
|
uint e; // Edit index
|
|
} input;
|
|
|
|
#define C(x) ((x)-'@') // Control-x
|
|
|
|
void
|
|
consoleintr(int (*getc)(void))
|
|
{
|
|
int c, doprocdump = 0;
|
|
|
|
acquire(&cons.lock);
|
|
while((c = getc()) >= 0){
|
|
switch(c){
|
|
case C('P'): // Process listing.
|
|
// procdump() locks cons.lock indirectly; invoke later
|
|
doprocdump = 1;
|
|
break;
|
|
case C('U'): // Kill line.
|
|
while(input.e != input.w &&
|
|
input.buf[(input.e-1) % INPUT_BUF] != '\n'){
|
|
input.e--;
|
|
consputc(BACKSPACE);
|
|
}
|
|
break;
|
|
case C('H'): case '\x7f': // Backspace
|
|
if(input.e != input.w){
|
|
input.e--;
|
|
consputc(BACKSPACE);
|
|
}
|
|
break;
|
|
default:
|
|
if(c != 0 && input.e-input.r < INPUT_BUF){
|
|
c = (c == '\r') ? '\n' : c;
|
|
input.buf[input.e++ % INPUT_BUF] = c;
|
|
consputc(c);
|
|
if(c == '\n' || c == C('D') || input.e == input.r+INPUT_BUF){
|
|
input.w = input.e;
|
|
wakeup(&input.r);
|
|
}
|
|
}
|
|
break;
|
|
}
|
|
}
|
|
release(&cons.lock);
|
|
if(doprocdump) {
|
|
procdump(); // now call procdump() wo. cons.lock held
|
|
}
|
|
}
|
|
|
|
int
|
|
consoleread(struct inode *ip, char *dst, int n)
|
|
{
|
|
uint target;
|
|
int c;
|
|
|
|
iunlock(ip);
|
|
target = n;
|
|
acquire(&cons.lock);
|
|
while(n > 0){
|
|
while(input.r == input.w){
|
|
if(myproc()->killed){
|
|
release(&cons.lock);
|
|
ilock(ip);
|
|
return -1;
|
|
}
|
|
sleep(&input.r, &cons.lock);
|
|
}
|
|
c = input.buf[input.r++ % INPUT_BUF];
|
|
if(c == C('D')){ // EOF
|
|
if(n < target){
|
|
// Save ^D for next time, to make sure
|
|
// caller gets a 0-byte result.
|
|
input.r--;
|
|
}
|
|
break;
|
|
}
|
|
*dst++ = c;
|
|
--n;
|
|
if(c == '\n')
|
|
break;
|
|
}
|
|
release(&cons.lock);
|
|
ilock(ip);
|
|
|
|
return target - n;
|
|
}
|
|
|
|
int
|
|
consolewrite(struct inode *ip, char *buf, int n)
|
|
{
|
|
int i;
|
|
|
|
iunlock(ip);
|
|
acquire(&cons.lock);
|
|
for(i = 0; i < n; i++)
|
|
consputc(buf[i] & 0xff);
|
|
release(&cons.lock);
|
|
ilock(ip);
|
|
|
|
return n;
|
|
}
|
|
|
|
void
|
|
consoleinit(void)
|
|
{
|
|
initlock(&cons.lock, "console");
|
|
|
|
devsw[CONSOLE].write = consolewrite;
|
|
devsw[CONSOLE].read = consoleread;
|
|
cons.locking = 1;
|
|
|
|
ioapicenable(IRQ_KBD, 0);
|
|
}
|
|
|