roseQuality() no longer needs to be part of rose's API.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ebdbec9f02d4a5f9b29a845456741a7a2f6fb423..4a07cffcaec1b2ab6fe11c681d32216dc03f8b2f 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -964,6 +964,7 @@ SET (hs_compile_SRCS
     src/rose/rose_build_merge.cpp
     src/rose/rose_build_merge.h
     src/rose/rose_build_misc.cpp
+    src/rose/rose_build_misc.h
     src/rose/rose_build_program.cpp
     src/rose/rose_build_program.h
     src/rose/rose_build_resources.h

diff --git a/src/rose/rose_build.h b/src/rose/rose_build.h
index 2219f12e5811d56ef71ec2b6514408332e747666..ca3ba3696e7cc307eaeb4676fe01878510d1b54b 100644 (file)
--- a/src/rose/rose_build.h
+++ b/src/rose/rose_build.h
@@ -134,10 +134,6 @@ std::unique_ptr<RoseBuild> makeRoseBuilder(ReportManager &rm,
 bool roseCheckRose(const RoseInGraph &ig, bool prefilter,
                    const ReportManager &rm, const CompileContext &cc);
 
-/* used by heuristics to determine the small write engine. High numbers are
- * intended to indicate a lightweight rose. */
-u32 roseQuality(const RoseEngine *t);
-
 bool roseIsPureLiteral(const RoseEngine *t);
 
 size_t maxOverlap(const ue2_literal &a, const ue2_literal &b, u32 b_delay);

diff --git a/src/rose/rose_build_bytecode.cpp b/src/rose/rose_build_bytecode.cpp
index cf3de55c4051a3dfa43757bd05f599ee3044efd8..4d9c3d7eb22d6bbd12ceb5f65c956c28b183b9a4 100644 (file)
--- a/src/rose/rose_build_bytecode.cpp
+++ b/src/rose/rose_build_bytecode.cpp
@@ -41,6 +41,7 @@
 #include "rose_build_long_lit.h"
 #include "rose_build_lookaround.h"
 #include "rose_build_matchers.h"
+#include "rose_build_misc.h"
 #include "rose_build_program.h"
 #include "rose_build_resources.h"
 #include "rose_build_scatter.h"

diff --git a/src/rose/rose_build_misc.cpp b/src/rose/rose_build_misc.cpp
index 839fd47846f001e07d69c5c5e00d8561cf5ffcbc..d8a3999456368c228e3bb56180b465688464f394 100644 (file)
--- a/src/rose/rose_build_misc.cpp
+++ b/src/rose/rose_build_misc.cpp
@@ -26,6 +26,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "rose_build_misc.h"
 #include "rose_build_impl.h"
 
 #include "hwlm/hwlm_literal.h"

diff --git a/src/rose/rose_build_misc.h b/src/rose/rose_build_misc.h
new file mode 100644 (file)
index 0000000..b9c6d5c
--- /dev/null
+++ b/src/rose/rose_build_misc.h
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2017, Intel Corporation
+ *
+ * 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 Intel Corporation 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.
+ */
+
+#ifndef ROSE_BUILD_MISC_H
+#define ROSE_BUILD_MISC_H
+
+#include "ue2common.h"
+
+struct RoseEngine;
+
+namespace ue2 {
+
+/* used by heuristics to determine the small write engine. High numbers are
+ * intended to indicate a lightweight rose. */
+u32 roseQuality(const RoseEngine *rose);
+
+}
+
+#endif