changeset 40721d032036 in /z/repo/inorder-patches
details: inorder-patches?cmd=changeset;node=40721d032036
description:
Make sure everything compiles just fine
diffstat:
2 files changed, 15 insertions(+), 11 deletions(-)
import_mixie | 4 +---
prepare_cpus.diff | 22 ++++++++++++++--------
diffs (66 lines):
diff -r 71012a6974ed -r 40721d032036 import_mixie
--- a/import_mixie Fri Feb 06 17:32:54 2009 -0800
+++ b/import_mixie Fri Feb 06 17:53:25 2009 -0800
@@ -231,11 +231,10 @@
new file mode 100644
--- /dev/null
+++ b/src/cpu/mixie/SConsopts
-@@ -0,0 +1,35 @@
+@@ -0,0 +1,33 @@
+# -*- mode:python -*-
+
+# Copyright (c) 2007 MIPS Technologies, Inc.
-+# Copyright (c) 2006 The Regents of The University of Michigan
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
@@ -266,7 +265,6 @@
+Import('*')
+
+all_cpu_list.append('MixieCPU')
-+default_cpus.append('MixieCPU')
diff --git a/src/cpu/mixie/comm.hh b/src/cpu/mixie/comm.hh
new file mode 100644
--- /dev/null
diff -r 71012a6974ed -r 40721d032036 prepare_cpus.diff
--- a/prepare_cpus.diff Fri Feb 06 17:32:54 2009 -0800
+++ b/prepare_cpus.diff Fri Feb 06 17:53:25 2009 -0800
@@ -6,24 +6,30 @@
diff --git a/src/cpu/SConscript b/src/cpu/SConscript
--- a/src/cpu/SConscript
+++ b/src/cpu/SConscript
-@@ -54,6 +54,8 @@
- virtual Fault completeAcc(Packet *pkt, %s *xc,
+@@ -48,12 +48,14 @@
+
+ # Template for execute() signature.
+ exec_sig_template = '''
+-virtual Fault execute(%s *xc, Trace::InstRecord *traceData) const = 0;
+-virtual Fault initiateAcc(%s *xc, Trace::InstRecord *traceData) const
++virtual Fault execute(%(type)s *xc, Trace::InstRecord *traceData) const = 0;
++virtual Fault initiateAcc(%(type)s *xc, Trace::InstRecord *traceData) const
+ { panic("initiateAcc not defined!"); M5_DUMMY_RETURN };
+-virtual Fault completeAcc(Packet *pkt, %s *xc,
++virtual Fault completeAcc(Packet *pkt, %(type)s *xc,
Trace::InstRecord *traceData) const
{ panic("completeAcc not defined!"); M5_DUMMY_RETURN };
-+virtual int memAccSize(%s *xc)
++virtual int memAccSize(%(type)s *xc)
+{ panic("memAccSize not defined!"); M5_DUMMY_RETURN };
'''
mem_ini_sig_template = '''
-@@ -82,7 +84,10 @@
+@@ -82,7 +84,7 @@
'''
for cpu in temp_cpu_list:
xc_type = CpuModel.dict[cpu].strings['CPU_exec_context']
- print >> f, exec_sig_template % (xc_type, xc_type, xc_type)
-+ #print >> f, exec_sig_template % (xc_type, xc_type, xc_type)
-+
-+ # Needed for Mixie CPU Model
-+ print >> f, exec_sig_template % (xc_type, xc_type, xc_type, xc_type)
++ print >> f, exec_sig_template % { 'type' : xc_type }
print >> f, '''
#endif // __CPU_STATIC_INST_EXEC_SIGS_HH__
'''
_______________________________________________
m5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/m5-dev
