Move emu/memory.[ch] to kernel/

A long time ago, for linux, emu and kernel were separated into separate
library targets, but for some reason memory.c was kept in emu/ despite
only being linked into kernel. Now's a good time to move it where it
belongs.

Author: tbodt

asbestos/asbestos.c

@@ -4,7 +4,6 @@
 #include "asbestos/gen.h"
 #include "asbestos/frame.h"
 #include "emu/cpu.h"
-#include "emu/memory.h"
 #include "emu/interrupt.h"
 #include "util/list.h"
 

emu/mmu.h

@@ -16,6 +16,7 @@ typedef dword_t page_t;
 typedef dword_t pages_t;
 // bytes MUST be unsigned if you would like this to overflow to zero
 #define PAGE_ROUND_UP(bytes) (PAGE((bytes) + PAGE_SIZE - 1))
+#define MEM_PAGES (1 << 20) // at least on 32-bit
 #endif
 
 struct mmu {
@@ -37,4 +38,4 @@ static inline void *mmu_translate(struct mmu *mmu, addr_t addr, int type) {
     return mmu->ops->translate(mmu, addr, type);
 }
 
-#endif
+#endif

fs/fd.h

@@ -1,7 +1,7 @@
 #ifndef FD_H
 #define FD_H
 #include <dirent.h>
-#include "emu/memory.h"
+#include "kernel/memory.h"
 #include "util/list.h"
 #include "util/sync.h"
 #include "util/bits.h"

fs/proc/pid.c

@@ -1,6 +1,6 @@
 #include <string.h>
 #include <sys/stat.h>
-#include "emu/memory.h"
+#include "kernel/memory.h"
 #include "kernel/calls.h"
 #include "fs/proc.h"
 #include "fs/fd.h"

kernel/calls.c

@@ -2,7 +2,7 @@
 #include "debug.h"
 #include "kernel/calls.h"
 #include "emu/interrupt.h"
-#include "emu/memory.h"
+#include "kernel/memory.h"
 #include "kernel/signal.h"
 #include "kernel/task.h"
 

kernel/fs.h

@@ -7,7 +7,7 @@
 #include "fs/dev.h"
 #include "fs/fake-db.h"
 #include "fs/fix_path.h"
-#include "emu/memory.h"
+#include "kernel/memory.h"
 #include <dirent.h>
 #include <sqlite3.h>
 

emu/memory.c kernel/memory.c

@@ -10,7 +10,7 @@
 #include "debug.h"
 #include "kernel/errno.h"
 #include "kernel/signal.h"
-#include "emu/memory.h"
+#include "kernel/memory.h"
 #include "asbestos/asbestos.h"
 #include "kernel/vdso.h"
 #include "kernel/task.h"

emu/memory.h kernel/memory.h

@@ -8,18 +8,15 @@
 #include "util/list.h"
 #include "util/sync.h"
 #include "misc.h"
-struct asbestos;
 
 struct mem {
     struct pt_entry **pgdir;
     int pgdir_used;
 
-    struct asbestos *asbestos;
     struct mmu mmu;
 
     wrlock_t lock;
 };
-#define MEM_PAGES (1 << 20) // at least on 32-bit
 #define MEM_PGDIR_SIZE (1 << 10)
 
 // Initialize the address space

kernel/mm.h

@@ -1,7 +1,7 @@
 #ifndef KERNEL_MM_H
 #define KERNEL_MM_H
 
-#include "emu/memory.h"
+#include "kernel/memory.h"
 #include "misc.h"
 
 // uses mem.lock instead of having a lock of its own

kernel/mmap.c

@@ -4,7 +4,7 @@
 #include "kernel/errno.h"
 #include "kernel/task.h"
 #include "fs/fd.h"
-#include "emu/memory.h"
+#include "kernel/memory.h"
 #include "kernel/mm.h"
 
 struct mm *mm_new() {

kernel/task.c

@@ -4,7 +4,7 @@
 #include <string.h>
 #include "kernel/calls.h"
 #include "kernel/task.h"
-#include "emu/memory.h"
+#include "kernel/memory.h"
 #include "emu/tlb.h"
 
 __thread struct task *current;

meson.build

@@ -83,6 +83,7 @@ if get_option('kernel') == 'ish'
         'kernel/errno.c',
 
         'kernel/calls.c',
+        'kernel/memory.c',
         'kernel/user.c',
         'kernel/vdso.c', vdso,
         'kernel/task.c',
@@ -148,8 +149,6 @@ if get_option('kernel') == 'ish'
         'util/fifo.c',
         'util/fchdir.c',
 
-        'emu/memory.c',
-
         'platform/' + host_machine.system() + '.c',
     ]
 

tools/ptraceomatic.c

@@ -11,7 +11,7 @@
 #include <sys/wait.h>
 #include <sys/ptrace.h>
 #include <sys/user.h>
-#undef PAGE_SIZE // defined in sys/user.h, but we want the version from emu/memory.h
+#undef PAGE_SIZE // defined in sys/user.h, but we want the version from kernel/memory.h
 #include <sys/personality.h>
 #include <sys/socket.h>
 

tools/ptutil.c

@@ -12,7 +12,7 @@
 #include <sys/prctl.h>
 #include <sys/syscall.h>
 #include <asm/prctl.h>
-#undef PAGE_SIZE // want definition from emu/memory.h
+#undef PAGE_SIZE // want definition from kernel/memory.h
 #include "../misc.h"
 
 long trycall(long res, const char *msg) {