From eb703a4b4e167e4d45f92203a1e0849f19cdba6d Mon Sep 17 00:00:00 2001
From: Andreas Sandberg <Andreas.Sandberg@arm.com>
Date: Fri, 2 Nov 2012 11:32:01 -0500
Subject: [PATCH] cpu: O3 add a header declaring the DerivO3CPU

SWIG needs a complete declaration of all wrapped objects. This patch
adds a header file with the DerivO3CPU class and includes it in the
SWIG interface.

--HG--
rename : src/cpu/o3/cpu_builder.cc => src/cpu/o3/deriv.cc
---
 src/cpu/o3/O3CPU.py                     |  2 ++
 src/cpu/o3/SConscript                   |  2 +-
 src/cpu/o3/{cpu_builder.cc => deriv.cc} | 11 +-----
 src/cpu/o3/deriv.hh                     | 46 +++++++++++++++++++++++++
 4 files changed, 50 insertions(+), 11 deletions(-)
 rename src/cpu/o3/{cpu_builder.cc => deriv.cc} (93%)
 create mode 100644 src/cpu/o3/deriv.hh

diff --git a/src/cpu/o3/O3CPU.py b/src/cpu/o3/O3CPU.py
index 6923e7b25..5fec3c547 100644
--- a/src/cpu/o3/O3CPU.py
+++ b/src/cpu/o3/O3CPU.py
@@ -35,6 +35,8 @@ from O3Checker import O3Checker
 
 class DerivO3CPU(BaseCPU):
     type = 'DerivO3CPU'
+    cxx_header = 'cpu/o3/deriv.hh'
+
     activity = Param.Unsigned(0, "Initial count")
 
     cachePorts = Param.Unsigned(200, "Cache Ports")
diff --git a/src/cpu/o3/SConscript b/src/cpu/o3/SConscript
index 5e8e2ea66..e97f4527b 100755
--- a/src/cpu/o3/SConscript
+++ b/src/cpu/o3/SConscript
@@ -46,7 +46,7 @@ if 'O3CPU' in env['CPU_MODELS']:
     Source('bpred_unit.cc')
     Source('commit.cc')
     Source('cpu.cc')
-    Source('cpu_builder.cc')
+    Source('deriv.cc')
     Source('decode.cc')
     Source('dyn_inst.cc')
     Source('fetch.cc')
diff --git a/src/cpu/o3/cpu_builder.cc b/src/cpu/o3/deriv.cc
similarity index 93%
rename from src/cpu/o3/cpu_builder.cc
rename to src/cpu/o3/deriv.cc
index 71cebce05..fb10934d5 100644
--- a/src/cpu/o3/cpu_builder.cc
+++ b/src/cpu/o3/deriv.cc
@@ -30,18 +30,9 @@
 
 #include <string>
 
-#include "cpu/o3/cpu.hh"
-#include "cpu/o3/impl.hh"
+#include "cpu/o3/deriv.hh"
 #include "params/DerivO3CPU.hh"
 
-class DerivO3CPU : public FullO3CPU<O3CPUImpl>
-{
-  public:
-    DerivO3CPU(DerivO3CPUParams *p)
-        : FullO3CPU<O3CPUImpl>(p)
-    { }
-};
-
 DerivO3CPU *
 DerivO3CPUParams::create()
 {
diff --git a/src/cpu/o3/deriv.hh b/src/cpu/o3/deriv.hh
new file mode 100644
index 000000000..e891c2c3f
--- /dev/null
+++ b/src/cpu/o3/deriv.hh
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2004-2006 The Regents of The University of Michigan
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met: redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer;
+ * redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution;
+ * neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Authors: Kevin Lim
+ */
+
+#ifndef __CPU_O3_DERIV_HH__
+#define __CPU_O3_DERIV_HH__
+
+#include "cpu/o3/cpu.hh"
+#include "cpu/o3/impl.hh"
+#include "params/DerivO3CPU.hh"
+
+class DerivO3CPU : public FullO3CPU<O3CPUImpl>
+{
+  public:
+    DerivO3CPU(DerivO3CPUParams *p)
+        : FullO3CPU<O3CPUImpl>(p)
+    { }
+};
+
+#endif // __CPU_O3_DERIV_HH__
-- 
2.30.2