2019-07-27 07:49:03 +00:00
|
|
|
//
|
|
|
|
// Console input and output, to the uart.
|
2019-07-27 08:15:06 +00:00
|
|
|
// Reads are line at a time.
|
|
|
|
// Implements special input characters:
|
|
|
|
// newline -- end of line
|
|
|
|
// control-h -- backspace
|
|
|
|
// control-u -- kill line
|
|
|
|
// control-d -- end of file
|
|
|
|
// control-p -- print process list
|
2019-07-27 07:49:03 +00:00
|
|
|
//
|
2007-08-28 19:04:36 +00:00
|
|
|
|
Checkpoint port of xv6 to x86-64. Passed usertests on 2 processors a few times.
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
2018-09-23 12:24:42 +00:00
|
|
|
#include <stdarg.h>
|
|
|
|
|
2006-07-16 15:40:05 +00:00
|
|
|
#include "types.h"
|
2007-08-27 23:26:33 +00:00
|
|
|
#include "param.h"
|
2006-07-12 01:48:35 +00:00
|
|
|
#include "spinlock.h"
|
2016-09-12 00:59:57 +00:00
|
|
|
#include "sleeplock.h"
|
2009-08-08 08:07:30 +00:00
|
|
|
#include "fs.h"
|
|
|
|
#include "file.h"
|
2011-07-29 11:31:27 +00:00
|
|
|
#include "memlayout.h"
|
2019-05-31 13:45:59 +00:00
|
|
|
#include "riscv.h"
|
|
|
|
#include "defs.h"
|
2019-06-01 09:33:38 +00:00
|
|
|
#include "proc.h"
|
2006-07-12 01:48:35 +00:00
|
|
|
|
2009-08-08 08:07:30 +00:00
|
|
|
#define BACKSPACE 0x100
|
2019-07-27 08:15:06 +00:00
|
|
|
#define C(x) ((x)-'@') // Control-x
|
2009-08-08 08:07:30 +00:00
|
|
|
|
2019-07-27 08:15:06 +00:00
|
|
|
//
|
|
|
|
// send one character to the uart.
|
2022-08-12 14:57:16 +00:00
|
|
|
// called by printf(), and to echo input characters,
|
2020-07-20 10:59:26 +00:00
|
|
|
// but not from write().
|
2019-07-27 08:15:06 +00:00
|
|
|
//
|
2009-08-08 08:07:30 +00:00
|
|
|
void
|
|
|
|
consputc(int c)
|
|
|
|
{
|
2010-09-01 04:41:25 +00:00
|
|
|
if(c == BACKSPACE){
|
2019-07-27 09:47:19 +00:00
|
|
|
// if the user typed backspace, overwrite with a space.
|
2020-07-22 14:31:46 +00:00
|
|
|
uartputc_sync('\b'); uartputc_sync(' '); uartputc_sync('\b');
|
2019-07-27 08:15:06 +00:00
|
|
|
} else {
|
2020-07-22 14:31:46 +00:00
|
|
|
uartputc_sync(c);
|
2019-07-27 08:15:06 +00:00
|
|
|
}
|
2006-08-09 16:04:04 +00:00
|
|
|
}
|
2019-06-01 09:33:38 +00:00
|
|
|
|
|
|
|
struct {
|
2019-07-27 07:49:03 +00:00
|
|
|
struct spinlock lock;
|
|
|
|
|
|
|
|
// input
|
2022-08-12 14:57:16 +00:00
|
|
|
#define INPUT_BUF_SIZE 128
|
|
|
|
char buf[INPUT_BUF_SIZE];
|
2019-06-01 09:33:38 +00:00
|
|
|
uint r; // Read index
|
|
|
|
uint w; // Write index
|
|
|
|
uint e; // Edit index
|
2019-07-27 07:49:03 +00:00
|
|
|
} cons;
|
2019-06-01 09:33:38 +00:00
|
|
|
|
2019-07-27 08:15:06 +00:00
|
|
|
//
|
|
|
|
// user write()s to the console go here.
|
|
|
|
//
|
|
|
|
int
|
|
|
|
consolewrite(int user_src, uint64 src, int n)
|
|
|
|
{
|
|
|
|
int i;
|
2019-06-01 09:33:38 +00:00
|
|
|
|
2019-07-27 08:15:06 +00:00
|
|
|
for(i = 0; i < n; i++){
|
|
|
|
char c;
|
|
|
|
if(either_copyin(&c, user_src, src+i, 1) == -1)
|
|
|
|
break;
|
2020-07-22 14:31:46 +00:00
|
|
|
uartputc(c);
|
2019-07-27 08:15:06 +00:00
|
|
|
}
|
|
|
|
|
2020-08-07 19:06:43 +00:00
|
|
|
return i;
|
2019-07-27 08:15:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
//
|
|
|
|
// user read()s from the console go here.
|
|
|
|
// copy (up to) a whole input line to dst.
|
|
|
|
// user_dist indicates whether dst is a user
|
|
|
|
// or kernel address.
|
|
|
|
//
|
2019-06-01 09:33:38 +00:00
|
|
|
int
|
2019-06-13 14:29:27 +00:00
|
|
|
consoleread(int user_dst, uint64 dst, int n)
|
2019-06-01 09:33:38 +00:00
|
|
|
{
|
|
|
|
uint target;
|
|
|
|
int c;
|
2019-07-27 08:15:06 +00:00
|
|
|
char cbuf;
|
2019-06-01 09:33:38 +00:00
|
|
|
|
|
|
|
target = n;
|
|
|
|
acquire(&cons.lock);
|
|
|
|
while(n > 0){
|
2019-07-27 08:15:06 +00:00
|
|
|
// wait until interrupt handler has put some
|
|
|
|
// input into cons.buffer.
|
2019-07-27 07:49:03 +00:00
|
|
|
while(cons.r == cons.w){
|
2022-08-11 11:23:17 +00:00
|
|
|
if(killed(myproc())){
|
2019-06-01 09:33:38 +00:00
|
|
|
release(&cons.lock);
|
|
|
|
return -1;
|
|
|
|
}
|
2019-07-27 07:49:03 +00:00
|
|
|
sleep(&cons.r, &cons.lock);
|
2019-06-01 09:33:38 +00:00
|
|
|
}
|
2019-07-27 08:15:06 +00:00
|
|
|
|
2022-08-12 14:57:16 +00:00
|
|
|
c = cons.buf[cons.r++ % INPUT_BUF_SIZE];
|
2019-07-27 08:15:06 +00:00
|
|
|
|
|
|
|
if(c == C('D')){ // end-of-file
|
2019-06-01 09:33:38 +00:00
|
|
|
if(n < target){
|
|
|
|
// Save ^D for next time, to make sure
|
|
|
|
// caller gets a 0-byte result.
|
2019-07-27 07:49:03 +00:00
|
|
|
cons.r--;
|
2019-06-01 09:33:38 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
2019-07-27 08:15:06 +00:00
|
|
|
|
|
|
|
// copy the input byte to the user-space buffer.
|
|
|
|
cbuf = c;
|
|
|
|
if(either_copyout(user_dst, dst, &cbuf, 1) == -1)
|
2019-06-04 09:57:47 +00:00
|
|
|
break;
|
2019-07-27 08:15:06 +00:00
|
|
|
|
2019-06-04 09:57:47 +00:00
|
|
|
dst++;
|
2019-06-01 09:33:38 +00:00
|
|
|
--n;
|
|
|
|
|
2019-07-27 08:15:06 +00:00
|
|
|
if(c == '\n'){
|
|
|
|
// a whole line has arrived, return to
|
|
|
|
// the user-level read().
|
2019-06-04 09:57:47 +00:00
|
|
|
break;
|
2019-07-27 08:15:06 +00:00
|
|
|
}
|
2019-06-04 09:57:47 +00:00
|
|
|
}
|
2019-06-01 09:33:38 +00:00
|
|
|
release(&cons.lock);
|
|
|
|
|
2019-07-27 08:15:06 +00:00
|
|
|
return target - n;
|
2019-06-01 09:33:38 +00:00
|
|
|
}
|
|
|
|
|
2019-07-27 08:15:06 +00:00
|
|
|
//
|
2019-07-27 09:47:19 +00:00
|
|
|
// the console input interrupt handler.
|
|
|
|
// uartintr() calls this for input character.
|
|
|
|
// do erase/kill processing, append to cons.buf,
|
|
|
|
// wake up consoleread() if a whole line has arrived.
|
2019-07-27 08:15:06 +00:00
|
|
|
//
|
2019-06-03 21:59:17 +00:00
|
|
|
void
|
|
|
|
consoleintr(int c)
|
|
|
|
{
|
|
|
|
acquire(&cons.lock);
|
|
|
|
|
|
|
|
switch(c){
|
2019-07-27 08:15:06 +00:00
|
|
|
case C('P'): // Print process list.
|
|
|
|
procdump();
|
2019-06-06 17:54:03 +00:00
|
|
|
break;
|
2019-06-03 21:59:17 +00:00
|
|
|
case C('U'): // Kill line.
|
2019-07-27 07:49:03 +00:00
|
|
|
while(cons.e != cons.w &&
|
2022-08-12 14:57:16 +00:00
|
|
|
cons.buf[(cons.e-1) % INPUT_BUF_SIZE] != '\n'){
|
2019-07-27 07:49:03 +00:00
|
|
|
cons.e--;
|
2019-06-03 21:59:17 +00:00
|
|
|
consputc(BACKSPACE);
|
|
|
|
}
|
|
|
|
break;
|
2019-07-27 08:15:06 +00:00
|
|
|
case C('H'): // Backspace
|
2022-08-12 15:47:39 +00:00
|
|
|
case '\x7f': // Delete key
|
2019-07-27 07:49:03 +00:00
|
|
|
if(cons.e != cons.w){
|
|
|
|
cons.e--;
|
2019-06-03 21:59:17 +00:00
|
|
|
consputc(BACKSPACE);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
2022-08-12 14:57:16 +00:00
|
|
|
if(c != 0 && cons.e-cons.r < INPUT_BUF_SIZE){
|
2019-06-03 21:59:17 +00:00
|
|
|
c = (c == '\r') ? '\n' : c;
|
2019-07-27 09:47:19 +00:00
|
|
|
|
|
|
|
// echo back to the user.
|
2019-06-03 21:59:17 +00:00
|
|
|
consputc(c);
|
2019-07-27 09:47:19 +00:00
|
|
|
|
|
|
|
// store for consumption by consoleread().
|
2022-08-12 14:57:16 +00:00
|
|
|
cons.buf[cons.e++ % INPUT_BUF_SIZE] = c;
|
2019-07-27 09:47:19 +00:00
|
|
|
|
2022-08-12 16:59:33 +00:00
|
|
|
if(c == '\n' || c == C('D') || cons.e-cons.r == INPUT_BUF_SIZE){
|
2019-07-27 09:47:19 +00:00
|
|
|
// wake up consoleread() if a whole line (or end-of-file)
|
|
|
|
// has arrived.
|
2019-07-27 07:49:03 +00:00
|
|
|
cons.w = cons.e;
|
|
|
|
wakeup(&cons.r);
|
2019-06-03 21:59:17 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
release(&cons.lock);
|
|
|
|
}
|
|
|
|
|
2019-06-01 09:33:38 +00:00
|
|
|
void
|
|
|
|
consoleinit(void)
|
|
|
|
{
|
2019-07-27 07:49:03 +00:00
|
|
|
initlock(&cons.lock, "cons");
|
2019-06-01 09:33:38 +00:00
|
|
|
|
2019-07-27 08:15:06 +00:00
|
|
|
uartinit();
|
|
|
|
|
2019-07-27 10:44:24 +00:00
|
|
|
// connect read and write system calls
|
|
|
|
// to consoleread and consolewrite.
|
2019-06-01 09:33:38 +00:00
|
|
|
devsw[CONSOLE].read = consoleread;
|
2019-07-27 10:44:24 +00:00
|
|
|
devsw[CONSOLE].write = consolewrite;
|
2019-06-01 09:33:38 +00:00
|
|
|
}
|