Mercurial > octave-nkf

changeset 18565:3f2a95a4b98d draft lyh-review

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
jit compiler: use existing int functions
author Stefan Mahr <dac922@gmx.de>
date Sun, 24 Nov 2013 22:46:32 +0100
parents 5a5a67799338
children
files libinterp/corefcn/jit-typeinfo.cc
diffstat 1 files changed, 5 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/jit-typeinfo.cc	Sun Nov 24 23:28:50 2013 +0100
+++ b/libinterp/corefcn/jit-typeinfo.cc	Sun Nov 24 22:46:32 2013 +0100
@@ -78,6 +78,7 @@
 #include "ov-uint32.h"
 #include "ov-uint64.h"
 #include "pager.h"
+#include "oct-inttypes.h"
 
 static llvm::LLVMContext& context = llvm::getGlobalContext ();
 
@@ -1074,6 +1075,9 @@
 extern "C" uint64_t
 octave_jit_mul_uint64_uint64 (uint64_t lhs, uint64_t rhs)
 {
+#if 1
+  return octave_int_arith_base<uint64_t,false>::mul(lhs,rhs);
+#else
 #ifdef OCTAVE_INT_USE_LONG_DOUBLE
   long double p = static_cast<long double> (lhs) * static_cast<long double> (rhs);
   if (p > static_cast<long double> (std::numeric_limits<uint64_t>::max ()))
@@ -1090,6 +1094,7 @@
 
   return lo | -!!hi;
 #endif
+#endif
 }
 
 extern "C" uint64_t