Module Name: src
Committed By: pooka
Date: Wed Nov 4 19:21:51 UTC 2009
Modified Files:
src/sys/rump/librump/rumpkern: Makefile.rumpkern emul.c
Removed Files:
src/sys/rump/librump/rumpkern: misc_stub.c
Log Message:
misc_stub and emul have been the same thing for a looong time now,
so just move the few remaining routines in misc_stub to emul.
To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 src/sys/rump/librump/rumpkern/Makefile.rumpkern
cvs rdiff -u -r1.108 -r1.109 src/sys/rump/librump/rumpkern/emul.c
cvs rdiff -u -r1.25 -r0 src/sys/rump/librump/rumpkern/misc_stub.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/librump/rumpkern/Makefile.rumpkern
diff -u src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.61 src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.62
--- src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.61 Wed Nov 4 19:17:53 2009
+++ src/sys/rump/librump/rumpkern/Makefile.rumpkern Wed Nov 4 19:21:51 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rumpkern,v 1.61 2009/11/04 19:17:53 pooka Exp $
+# $NetBSD: Makefile.rumpkern,v 1.62 2009/11/04 19:21:51 pooka Exp $
#
.include "${RUMPTOP}/Makefile.rump"
@@ -21,7 +21,7 @@
# stubs
#
-SRCS+= misc_stub.c pmap_stub.c
+SRCS+= pmap_stub.c
# autogenerated
#
Index: src/sys/rump/librump/rumpkern/emul.c
diff -u src/sys/rump/librump/rumpkern/emul.c:1.108 src/sys/rump/librump/rumpkern/emul.c:1.109
--- src/sys/rump/librump/rumpkern/emul.c:1.108 Wed Nov 4 19:17:53 2009
+++ src/sys/rump/librump/rumpkern/emul.c Wed Nov 4 19:21:51 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: emul.c,v 1.108 2009/11/04 19:17:53 pooka Exp $ */
+/* $NetBSD: emul.c,v 1.109 2009/11/04 19:21:51 pooka Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: emul.c,v 1.108 2009/11/04 19:17:53 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: emul.c,v 1.109 2009/11/04 19:21:51 pooka Exp $");
#include <sys/param.h>
#include <sys/null.h>
@@ -51,6 +51,8 @@
#include <sys/module.h>
#include <sys/tty.h>
#include <sys/reboot.h>
+#include <sys/syscallvar.h>
+#include <sys/xcall.h>
#include <dev/cons.h>
@@ -113,6 +115,11 @@
kmutex_t tty_lock;
+/* sparc doesn't sport constant page size */
+#ifdef __sparc__
+int nbpg = 4096;
+#endif
+
devclass_t
device_class(device_t dev)
{
@@ -465,3 +472,38 @@
/* nada */
}
+
+int
+syscall_establish(const struct emul *em, const struct syscall_package *sp)
+{
+ extern struct sysent rump_sysent[];
+ int i;
+
+ KASSERT(em == NULL || em == &emul_netbsd);
+
+ for (i = 0; sp[i].sp_call; i++)
+ rump_sysent[sp[i].sp_code].sy_call = sp[i].sp_call;
+
+ return 0;
+}
+
+int
+syscall_disestablish(const struct emul *em, const struct syscall_package *sp)
+{
+
+ return 0;
+}
+
+/* crosscalls not done, no other hardware CPUs */
+uint64_t
+xc_broadcast(u_int flags, xcfunc_t func, void *arg1, void *arg2)
+{
+
+ return -1;
+}
+
+void
+xc_wait(uint64_t where)
+{
+
+}
