Evaluate(): Take ArrayRef instead of pointer+size.

yasm · Sep 1, 2012 · 502925a · 502925a
1 parent b9f8ca4
commit 502925a
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 17 deletions.
diff --git a/include/yasmx/Location_util.h b/include/yasmx/Location_util.h
@@ -29,6 +29,7 @@
 /// POSSIBILITY OF SUCH DAMAGE.
 /// @endlicense
 ///
+#include "yasmx/Basic/LLVM.h"
 #include "yasmx/Config/export.h"
 #include "yasmx/Config/functional.h"
 
@@ -80,28 +81,23 @@ int SubstDist(Expr& e, DiagnosticsEngine& diags,
 ///                     Substitutions must be integer or float terms.
 ///                     If null, any substitution in the expr will result in
 ///                     evaluation failure and a false return
-/// @param nsubst       size of substitution terms array
 /// @param valueloc     replace symbols and locations with their values
 /// @param zeroreg      replace registers with zero?
 /// @return True if successful.
 YASM_LIB_EXPORT
 bool Evaluate(const Expr& e,
               DiagnosticsEngine& diags,
               ExprTerm* result,
-              const ExprTerm* subst,
-              unsigned int nsubst,
+              ArrayRef<ExprTerm> subst,
               bool valueloc=true,
               bool zeroreg=false);
 
-inline bool
-Evaluate(const Expr& e,
-         DiagnosticsEngine& diags,
-         ExprTerm* result,
-         bool valueloc=true,
-         bool zeroreg=false)
-{
-    return Evaluate(e, diags, result, 0, 0, valueloc, zeroreg);
-}
+YASM_LIB_EXPORT
+bool Evaluate(const Expr& e,
+              DiagnosticsEngine& diags,
+              ExprTerm* result,
+              bool valueloc=true,
+              bool zeroreg=false);
 
 } // namespace yasm
 

diff --git a/lib/yasmx/Location_util.cpp b/lib/yasmx/Location_util.cpp
@@ -27,6 +27,7 @@
 #include "yasmx/Location_util.h"
 
 #include "llvm/ADT/APFloat.h"
+#include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/SmallVector.h"
 #include "yasmx/Bytecode.h"
 #include "yasmx/Expr.h"
@@ -261,8 +262,7 @@ bool
 yasm::Evaluate(const Expr& e,
                DiagnosticsEngine& diags,
                ExprTerm* result,
-               const ExprTerm* subst,
-               unsigned int nsubst,
+               ArrayRef<ExprTerm> subst,
                bool valueloc,
                bool zeroreg)
 {
@@ -362,7 +362,7 @@ yasm::Evaluate(const Expr& e,
                 case ExprTerm::SUBST:
                 {
                     unsigned int substindex = *term.getSubst();
-                    if (!subst || substindex >= nsubst)
+                    if (substindex >= subst.size())
                         return false;
                     assert((subst[substindex].getType() == ExprTerm::INT ||
                             subst[substindex].getType() == ExprTerm::FLOAT) &&
@@ -403,3 +403,13 @@ yasm::Evaluate(const Expr& e,
     result->swap(stack.back());
     return true;
 }
+
+bool
+yasm::Evaluate(const Expr& e,
+               DiagnosticsEngine& diags,
+               ExprTerm* result,
+               bool valueloc,
+               bool zeroreg)
+{
+    return Evaluate(e, diags, result, ArrayRef<ExprTerm>(), valueloc, zeroreg);
+}
diff --git a/lib/yasmx/Optimizer.cpp b/lib/yasmx/Optimizer.cpp
@@ -34,6 +34,7 @@
 #include <memory>
 #include <vector>
 
+#include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/SmallPtrSet.h"
 #include "llvm/ADT/SmallString.h"
 #include "llvm/ADT/Statistic.h"
@@ -445,8 +446,8 @@ Span::RecalcNormal(DiagnosticsEngine& diags)
         for (Terms::iterator i=m_span_terms.begin(), end=m_span_terms.end();
              i != end; ++i)
             *m_expr_terms[i->m_subst].getIntNum() = i->m_new_val;
-        if (!Evaluate(*m_depval.getAbs(), diags, &result, &m_expr_terms[0],
-                      m_expr_terms.size(), false, false)
+        if (!Evaluate(*m_depval.getAbs(), diags, &result, m_expr_terms, false,
+                      false)
             || !result.isType(ExprTerm::INT))
             m_new_val = LONG_MAX;   // too complex; force to longest form
         else