2006-06-15 18:02:20 +02:00
|
|
|
#include "types.h"
|
2009-03-08 22:38:30 +01:00
|
|
|
#include "x86.h"
|
2006-06-15 18:02:20 +02:00
|
|
|
|
2006-09-06 19:27:19 +02:00
|
|
|
void*
|
2006-07-17 03:52:13 +02:00
|
|
|
memset(void *dst, int c, uint n)
|
2006-06-12 17:22:12 +02: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 14:24:42 +02:00
|
|
|
if ((uint64)dst%4 == 0 && n%4 == 0){
|
2011-09-01 16:41:21 +02:00
|
|
|
c &= 0xFF;
|
|
|
|
stosl(dst, (c<<24)|(c<<16)|(c<<8)|c, n/4);
|
|
|
|
} else
|
|
|
|
stosb(dst, c, n);
|
2006-06-12 17:22:12 +02:00
|
|
|
return dst;
|
|
|
|
}
|
2006-06-21 03:53:07 +02:00
|
|
|
|
|
|
|
int
|
2006-07-17 03:52:13 +02:00
|
|
|
memcmp(const void *v1, const void *v2, uint n)
|
2006-06-21 03:53:07 +02:00
|
|
|
{
|
2007-08-10 19:17:42 +02:00
|
|
|
const uchar *s1, *s2;
|
2016-08-25 15:13:00 +02:00
|
|
|
|
2007-08-10 19:17:42 +02:00
|
|
|
s1 = v1;
|
|
|
|
s2 = v2;
|
2007-08-28 20:32:08 +02:00
|
|
|
while(n-- > 0){
|
2006-09-06 19:27:19 +02:00
|
|
|
if(*s1 != *s2)
|
2007-08-10 19:17:42 +02:00
|
|
|
return *s1 - *s2;
|
2006-06-21 03:53:07 +02:00
|
|
|
s1++, s2++;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
2006-06-22 03:28:57 +02:00
|
|
|
|
2006-09-06 19:27:19 +02:00
|
|
|
void*
|
2006-07-17 03:52:13 +02:00
|
|
|
memmove(void *dst, const void *src, uint n)
|
2006-06-22 03:28:57 +02:00
|
|
|
{
|
|
|
|
const char *s;
|
|
|
|
char *d;
|
2006-09-06 19:04:06 +02:00
|
|
|
|
2006-06-22 03:28:57 +02:00
|
|
|
s = src;
|
|
|
|
d = dst;
|
2007-08-28 20:32:08 +02:00
|
|
|
if(s < d && s + n > d){
|
2006-06-22 03:28:57 +02:00
|
|
|
s += n;
|
|
|
|
d += n;
|
2006-09-06 19:27:19 +02:00
|
|
|
while(n-- > 0)
|
2006-06-22 03:28:57 +02:00
|
|
|
*--d = *--s;
|
2007-08-28 20:37:41 +02:00
|
|
|
} else
|
2006-09-06 19:27:19 +02:00
|
|
|
while(n-- > 0)
|
2006-06-22 03:28:57 +02:00
|
|
|
*d++ = *s++;
|
|
|
|
|
|
|
|
return dst;
|
|
|
|
}
|
2006-07-05 22:00:14 +02:00
|
|
|
|
2009-10-07 19:06:55 +02:00
|
|
|
// memcpy exists to placate GCC. Use memmove.
|
2009-10-07 18:05:56 +02:00
|
|
|
void*
|
|
|
|
memcpy(void *dst, const void *src, uint n)
|
|
|
|
{
|
|
|
|
return memmove(dst, src, n);
|
|
|
|
}
|
|
|
|
|
2006-07-05 22:00:14 +02:00
|
|
|
int
|
2006-07-17 03:52:13 +02:00
|
|
|
strncmp(const char *p, const char *q, uint n)
|
2006-07-05 22:00:14 +02:00
|
|
|
{
|
2006-09-06 19:27:19 +02:00
|
|
|
while(n > 0 && *p && *p == *q)
|
2006-09-06 19:04:06 +02:00
|
|
|
n--, p++, q++;
|
2006-09-06 19:27:19 +02:00
|
|
|
if(n == 0)
|
2006-09-06 19:04:06 +02:00
|
|
|
return 0;
|
2007-08-24 23:00:02 +02:00
|
|
|
return (uchar)*p - (uchar)*q;
|
|
|
|
}
|
|
|
|
|
|
|
|
char*
|
|
|
|
strncpy(char *s, const char *t, int n)
|
|
|
|
{
|
|
|
|
char *os;
|
2016-08-25 15:13:00 +02:00
|
|
|
|
2007-08-24 23:00:02 +02:00
|
|
|
os = s;
|
|
|
|
while(n-- > 0 && (*s++ = *t++) != 0)
|
|
|
|
;
|
|
|
|
while(n-- > 0)
|
|
|
|
*s++ = 0;
|
|
|
|
return os;
|
2006-07-05 22:00:14 +02:00
|
|
|
}
|
2007-08-08 10:37:22 +02:00
|
|
|
|
|
|
|
// Like strncpy but guaranteed to NUL-terminate.
|
|
|
|
char*
|
|
|
|
safestrcpy(char *s, const char *t, int n)
|
|
|
|
{
|
|
|
|
char *os;
|
2016-08-25 15:13:00 +02:00
|
|
|
|
2007-08-08 10:37:22 +02:00
|
|
|
os = s;
|
|
|
|
if(n <= 0)
|
|
|
|
return os;
|
|
|
|
while(--n > 0 && (*s++ = *t++) != 0)
|
|
|
|
;
|
|
|
|
*s = 0;
|
|
|
|
return os;
|
|
|
|
}
|
|
|
|
|
2007-08-21 21:22:08 +02:00
|
|
|
int
|
|
|
|
strlen(const char *s)
|
|
|
|
{
|
|
|
|
int n;
|
|
|
|
|
|
|
|
for(n = 0; s[n]; n++)
|
|
|
|
;
|
|
|
|
return n;
|
|
|
|
}
|
|
|
|
|