Imbus/xv6-riscv-kernel
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'riscv-proc' into riscv

Browse source
This commit is contained in:
Frans Kaashoek 2019-07-08 15:50:06 -04:00
commit 2f22a3ed6a
17 changed files with 176 additions and 117 deletions
Download patch file Download diff file Expand all files Collapse all files

2
user/ls.c
View file

@ -43,7 +43,7 @@ ls(char *path)
switch(st.type){
case T_FILE:
printf(1, "%s %d %d %d\n", fmtname(path), st.type, st.ino, st.size);
printf(1, "%s %d %d %l\n", fmtname(path), st.type, st.ino, st.size);
break;
case T_DIR:

2
user/printf.c
View file

@ -68,6 +68,8 @@ printf(int fd, const char *fmt, ...)
} else if(state == '%'){
if(c == 'd'){
printint(fd, va_arg(ap, int), 10, 1);
} else if(c == 'l') {
printint(fd, va_arg(ap, uint64), 10, 0);
} else if(c == 'x') {
printint(fd, va_arg(ap, int), 16, 0);
} else if(c == 'p') {