# HG changeset patch
# User Hollis Blanchard <hollisb@xxxxxxxxxx>
# Node ID 176c7264715ca51611801ebdd57a9dd6a09416c4
# Parent a60e804c0a316037079a7e693f8561b4c28265ea
[POWERPC][XEN] Rename "Mambo" to "systemsim".
Signed-off-by: Hollis Blanchard <hollisb@xxxxxxxxxx>
---
xen/arch/powerpc/mambo.S | 64 -----------------------------
xen/arch/powerpc/Makefile | 2
xen/arch/powerpc/dart.c | 6 --
xen/arch/powerpc/exceptions.h | 2
xen/arch/powerpc/mm.c | 6 +-
xen/arch/powerpc/systemsim.S | 64 +++++++++++++++++++++++++++++
xen/include/asm-powerpc/config.h | 2
xen/include/asm-powerpc/msr.h | 4 -
xen/include/asm-powerpc/powerpc64/string.h | 3 +
xen/include/asm-powerpc/processor.h | 14 +++---
10 files changed, 83 insertions(+), 84 deletions(-)
diff -r a60e804c0a31 -r 176c7264715c xen/arch/powerpc/Makefile
--- a/xen/arch/powerpc/Makefile Fri Nov 03 16:53:17 2006 -0500
+++ b/xen/arch/powerpc/Makefile Fri Nov 10 16:45:25 2006 -0600
@@ -22,7 +22,7 @@ obj-y += hcalls.o
obj-y += hcalls.o
obj-y += iommu.o
obj-y += irq.o
-obj-y += mambo.o
+obj-y += systemsim.o
obj-y += memory.o
obj-y += mm.o
obj-y += mpic.o
diff -r a60e804c0a31 -r 176c7264715c xen/arch/powerpc/dart.c
--- a/xen/arch/powerpc/dart.c Fri Nov 03 16:53:17 2006 -0500
+++ b/xen/arch/powerpc/dart.c Fri Nov 10 16:45:25 2006 -0600
@@ -189,10 +189,8 @@ static int find_dart(struct dart_info *d
ofdn_t n;
char compat[128];
-
- if (on_mambo()) {
- /* mambo has no dart */
- DBG("%s: Mambo does not support a dart\n", __func__);
+ if (on_systemsim()) {
+ DBG("%s: systemsim does not support a dart\n", __func__);
return -1;
}
diff -r a60e804c0a31 -r 176c7264715c xen/arch/powerpc/exceptions.h
--- a/xen/arch/powerpc/exceptions.h Fri Nov 03 16:53:17 2006 -0500
+++ b/xen/arch/powerpc/exceptions.h Fri Nov 10 16:45:25 2006 -0600
@@ -44,8 +44,6 @@ extern void program_exception(
extern long xen_hvcall_jump(struct cpu_user_regs *regs, ulong address);
-extern void *mambo_memset(void *, int, ulong);
-extern void *mambo_memcpy(void *, const void *, ulong);
extern void sleep(void);
extern void idle_loop(void);
diff -r a60e804c0a31 -r 176c7264715c xen/arch/powerpc/mm.c
--- a/xen/arch/powerpc/mm.c Fri Nov 03 16:53:17 2006 -0500
+++ b/xen/arch/powerpc/mm.c Fri Nov 10 16:45:25 2006 -0600
@@ -27,6 +27,7 @@
#include <xen/perfc.h>
#include <asm/init.h>
#include <asm/page.h>
+#include <asm/string.h>
#ifdef VERBOSE
#define MEM_LOG(_f, _a...) \
@@ -276,9 +277,8 @@ long arch_memory_op(int op, XEN_GUEST_HA
extern void copy_page(void *dp, void *sp)
{
- if (on_mambo()) {
- extern void *mambo_memcpy(void *,const void *,__kernel_size_t);
- mambo_memcpy(dp, sp, PAGE_SIZE);
+ if (on_systemsim()) {
+ systemsim_memcpy(dp, sp, PAGE_SIZE);
} else {
memcpy(dp, sp, PAGE_SIZE);
}
diff -r a60e804c0a31 -r 176c7264715c xen/include/asm-powerpc/config.h
--- a/xen/include/asm-powerpc/config.h Fri Nov 03 16:53:17 2006 -0500
+++ b/xen/include/asm-powerpc/config.h Fri Nov 10 16:45:25 2006 -0600
@@ -21,7 +21,7 @@
#ifndef __PPC_CONFIG_H__
#define __PPC_CONFIG_H__
-#define CONFIG_MAMBO 1
+#define CONFIG_SYSTEMSIM 1
#define HYPERVISOR_VIRT_START 0x0 /* XXX temp hack for common/kernel.c */
diff -r a60e804c0a31 -r 176c7264715c xen/include/asm-powerpc/msr.h
--- a/xen/include/asm-powerpc/msr.h Fri Nov 03 16:53:17 2006 -0500
+++ b/xen/include/asm-powerpc/msr.h Fri Nov 10 16:45:25 2006 -0600
@@ -51,9 +51,9 @@
#define MSR_RI ULL(0x0000000000000002)
#define MSR_LE ULL(0x0000000000000001)
-/* MSR bits set on the Mambo simulator */
+/* MSR bits set on the systemsim simulator */
#define MSR_SIM ULL(0x0000000020000000)
-#define MSR_MAMBO ULL(0x0000000010000000)
+#define MSR_SYSTEMSIM ULL(0x0000000010000000)
/* On a trap, srr1's copy of msr defines some bits as follows: */
#define MSR_TRAP_FE ULL(0x0000000000100000) /* Floating Point Exception */
diff -r a60e804c0a31 -r 176c7264715c xen/include/asm-powerpc/powerpc64/string.h
--- a/xen/include/asm-powerpc/powerpc64/string.h Fri Nov 03 16:53:17
2006 -0500
+++ b/xen/include/asm-powerpc/powerpc64/string.h Fri Nov 10 16:45:25
2006 -0600
@@ -37,4 +37,7 @@ extern int memcmp(const void *,const voi
extern int memcmp(const void *,const void *,__kernel_size_t);
extern void * memchr(const void *,int,__kernel_size_t);
+extern void *systemsim_memset(void *, int, ulong);
+extern void *systemsim_memcpy(void *, const void *, ulong);
+
#endif
diff -r a60e804c0a31 -r 176c7264715c xen/include/asm-powerpc/processor.h
--- a/xen/include/asm-powerpc/processor.h Fri Nov 03 16:53:17 2006 -0500
+++ b/xen/include/asm-powerpc/processor.h Fri Nov 10 16:45:25 2006 -0600
@@ -276,13 +276,13 @@ static inline unsigned mfdsisr(void)
return val;
}
-#ifdef CONFIG_MAMBO
-static inline int on_mambo(void)
-{
- return !!(mfmsr() & MSR_MAMBO);
-}
-#else /* CONFIG_MAMBO */
-static inline int on_mambo(void) { return 0; }
+#ifdef CONFIG_SYSTEMSIM
+static inline int on_systemsim(void)
+{
+ return !!(mfmsr() & MSR_SYSTEMSIM);
+}
+#else /* CONFIG_SYSTEMSIM */
+static inline int on_systemsim(void) { return 0; }
#endif
#endif /* __ASSEMBLY__ */
diff -r a60e804c0a31 -r 176c7264715c xen/arch/powerpc/systemsim.S
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/xen/arch/powerpc/systemsim.S Fri Nov 10 16:45:25 2006 -0600
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2005 Jimi Xenidis <jimix@xxxxxxxxxxxxxx>, IBM Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+#include <asm/config.h>
+#include <asm/processor.h>
+
+_GLOBAL(systemsim_callthru)
+ .long 0x000eaeb0
+ blr
+
+_GLOBAL(systemsim_write)
+ mr r5, r4
+ mr r4, r3
+ li r3, 0 # Write console code
+
+ li r6, 0
+ /* need to fix return value */
+ mflr r7
+ bl _ENTRY(systemsim_callthru)
+ mtlr r7
+ mr r3, r5
+ blr
+
+_GLOBAL(systemsim_memset)
+ mr r6, r5
+ mr r5, r4
+ mr r4, r3
+ li r3, 0x47 # memset
+ /* need to fix return value */
+ mflr r7
+ bl _ENTRY(systemsim_callthru)
+ mtlr r7
+ mr r3, r4
+ blr
+
+_GLOBAL(systemsim_memcpy)
+ mr r6, r5
+ mr r5, r4
+ mr r4, r3
+ li r3, 0x45 # memcpy
+ /* need to fix return value */
+ mflr r7
+ bl _ENTRY(systemsim_callthru)
+ mtlr r7
+ mr r3, r4
+ blr
+
+
diff -r a60e804c0a31 -r 176c7264715c xen/arch/powerpc/mambo.S
--- a/xen/arch/powerpc/mambo.S Fri Nov 03 16:53:17 2006 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-/*
- * Copyright (C) 2005 Jimi Xenidis <jimix@xxxxxxxxxxxxxx>, IBM Corporation
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- */
-
-#include <asm/config.h>
-#include <asm/processor.h>
-
-_GLOBAL(mambo_callthru)
- .long 0x000eaeb0
- blr
-
-_GLOBAL(mambo_write)
- mr r5, r4
- mr r4, r3
- li r3, 0 # Write console code
-
- li r6, 0
- /* need to fix return value */
- mflr r7
- bl _ENTRY(mambo_callthru)
- mtlr r7
- mr r3, r5
- blr
-
-_GLOBAL(mambo_memset)
- mr r6, r5
- mr r5, r4
- mr r4, r3
- li r3, 0x47 # memset
- /* need to fix return value */
- mflr r7
- bl _ENTRY(mambo_callthru)
- mtlr r7
- mr r3, r4
- blr
-
-_GLOBAL(mambo_memcpy)
- mr r6, r5
- mr r5, r4
- mr r4, r3
- li r3, 0x45 # memcpy
- /* need to fix return value */
- mflr r7
- bl _ENTRY(mambo_callthru)
- mtlr r7
- mr r3, r4
- blr
-
-
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home