Rename x86.h -> amd64.h

21fa76fa · Silas Boyd-Wickizer · 1a43a88b · 21fa76fa · 21fa76fa · 21fa76fa
--- a/x86.h
+++ b/x86.h
--- a/bootmain.c
+++ b/bootmain.c
@@ -7,7 +7,7 @@

 #include "types.h"
 #include "elf.h"
-#include "x86.h"
+#include "amd64.h"
 #include "memlayout.h"

 #define SECTSIZE  512

--- a/cga.c
+++ b/cga.c
 #include "types.h"
 #include "kernel.h"
-#include "x86.h"
+#include "amd64.h"

 #define BACKSPACE 0x100
 #define CRTPORT 0x3d4

--- a/condvar.c
+++ b/condvar.c
 #include "types.h"
 #include "param.h"
-#include "x86.h"
+#include "amd64.h"
 #include "mmu.h"
 #include "spinlock.h"
 #include "condvar.h"

--- a/console.c
+++ b/console.c
@@ -10,7 +10,7 @@
 #include "fs.h"
 #include "condvar.h"
 #include "file.h"
-#include "x86.h"
+#include "amd64.h"
 #include "queue.h"
 #include "proc.h"
 #include "traps.h"

--- a/dirbench.c
+++ b/dirbench.c
@@ -2,7 +2,7 @@
 #include "stat.h"
 #include "user.h"
 #include "xv6-mtrace.h"
-#include "x86.h"
+#include "amd64.h"
 #include "param.h"
 #include "fcntl.h"


--- a/exec.c
+++ b/exec.c
@@ -7,7 +7,7 @@
 #include "queue.h"
 #include "proc.h"
 #include "kernel.h"
-#include "x86.h"
+#include "amd64.h"
 #include "stat.h"
 #include "fs.h"
 #include "file.h"

--- a/ide.c
+++ b/ide.c
@@ -12,7 +12,7 @@
 #include "condvar.h"
 #include "queue.h"
 #include "proc.h"
-#include "x86.h"
+#include "amd64.h"
 #include "traps.h"
 #include "buf.h"


--- a/kbd.c
+++ b/kbd.c
 #include "types.h"
-#include "x86.h"
+#include "amd64.h"
 #include "kernel.h"
 #include "kbd.h"
 #include "param.h"

--- a/lapic.c
+++ b/lapic.c
@@ -3,7 +3,7 @@

 #include "types.h"
 #include "param.h"
-#include "x86.h"
+#include "amd64.h"
 #include "kernel.h"
 #include "traps.h"
 #include "bits.h"

--- a/mapbench.c
+++ b/mapbench.c
@@ -2,7 +2,7 @@
 #include "stat.h"
 #include "user.h"
 #include "xv6-mtrace.h"
-#include "x86.h"
+#include "amd64.h"
 #include "uspinlock.h"

 static struct uspinlock l;

--- a/maptest.c
+++ b/maptest.c
@@ -2,7 +2,7 @@
 #include "stat.h"
 #include "user.h"
 #include "xv6-mtrace.h"
-#include "x86.h"
+#include "amd64.h"
 #include "uspinlock.h"

 static volatile char *p;

--- a/memide.c
+++ b/memide.c
@@ -9,7 +9,7 @@
 #include "queue.h"
 #include "condvar.h"
 #include "proc.h"
-#include "x86.h"
+#include "amd64.h"
 #include "traps.h"
 #include "buf.h"


--- a/mp.c
+++ b/mp.c
@@ -4,7 +4,7 @@

 #include "types.h"
 #include "param.h"
-#include "x86.h"
+#include "amd64.h"
 #include "mp.h"
 #include "kernel.h"
 #include "cpu.h"

--- a/picirq.c
+++ b/picirq.c
 // Intel 8259A programmable interrupt controllers.

 #include "types.h"
-#include "x86.h"
+#include "amd64.h"
 #include "traps.h"

 // I/O Addresses of the two programmable interrupt controllers

--- a/proc.c
+++ b/proc.c
@@ -3,7 +3,7 @@
 #include "param.h"
 #include "memlayout.h"
 #include "mmu.h"
-#include "x86.h"
+#include "amd64.h"
 #include "spinlock.h"
 #include "condvar.h"
 #include "queue.h"

--- a/rcu.c
+++ b/rcu.c
@@ -2,7 +2,7 @@
 #include "param.h"
 #include "kernel.h"
 #include "mmu.h"
-#include "x86.h"
+#include "amd64.h"
 #include "spinlock.h"
 #include "condvar.h"
 #include "queue.h"

--- a/spinlock.c
+++ b/spinlock.c
@@ -3,7 +3,7 @@
 #include "types.h"
 #include "kernel.h"
 #include "param.h"
-#include "x86.h"
+#include "amd64.h"
 #include "cpu.h"
 #include "bits.h"
 #include "spinlock.h"

--- a/string.c
+++ b/string.c
 #include "types.h"
-#include "x86.h"
+#include "amd64.h"

 void*
 memset(void *dst, int c, u32 n)

--- a/syscall.c
+++ b/syscall.c
@@ -7,7 +7,7 @@
 #include "condvar.h"
 #include "queue.h"
 #include "proc.h"
-#include "x86.h"
+#include "amd64.h"
 #include "syscall.h"
 #include "xv6-mtrace.h"
 #include "cpu.h"

--- a/sysproc.c
+++ b/sysproc.c
 #include "types.h"
-#include "x86.h"
+#include "amd64.h"
 #include "kernel.h"
 #include "param.h"
 #include "memlayout.h"

--- a/thrtest.c
+++ b/thrtest.c
@@ -2,7 +2,7 @@
 #include "stat.h"
 #include "user.h"
 #include "xv6-mtrace.h"
-#include "x86.h"
+#include "amd64.h"
 #include "uspinlock.h"

 static struct uspinlock l;

--- a/timer.c
+++ b/timer.c
@@ -5,7 +5,7 @@
 #include "types.h"
 #include "defs.h"
 #include "traps.h"
-#include "x86.h"
+#include "amd64.h"

 #define IO_TIMER1       0x040           // 8253 Timer #1


--- a/trap.c
+++ b/trap.c
@@ -2,7 +2,7 @@
 #include "param.h"
 #include "mmu.h"
 #include "kernel.h"
-#include "x86.h"
+#include "amd64.h"
 #include "cpu.h"
 #include "traps.h"
 #include "queue.h"

--- a/uart.c
+++ b/uart.c
 // Intel 8250 serial port (UART).
 #include "types.h"
 #include "kernel.h"
-#include "x86.h"
+#include "amd64.h"
 #include "traps.h"

 #define COM1    0x3f8

--- a/ulib.c
+++ b/ulib.c
@@ -2,7 +2,7 @@
 #include "stat.h"
 #include "fcntl.h"
 #include "user.h"
-#include "x86.h"
+#include "amd64.h"

 char*
 strncpy(char *s, const char *t, int n)

--- a/vm.c
+++ b/vm.c
 #include "param.h"
 #include "types.h"
-#include "x86.h"
+#include "amd64.h"
 #include "mmu.h"
 #include "cpu.h"
 #include "kernel.h"