commit 8326120c1a4c0d52ee4ef0fabe09cb28e0c48470
author Sergio Giro <sgiro@google.com> Mon Apr 11 20:49:20 2016 +0100
committer Sergio Giro <sgiro@google.com> Tue Apr 12 14:38:33 2016 +0100
tree 8d1b856270270745ce5513a8dbc2dcf7c03805ad
parent 274704fd37ff65c65f229638d359186e33f4912b

unstarted_runtime: add cutout for Math.floor

Needed in order to make BouncyCastleProvider initializable in
compile time

(cherry picked from commit a8908ef14cf2d2e0d05e41e319da5d6909325ae2)
Bug: 28108158

Change-Id: Id6b4e3d4dde45354562603f41134d8d21da2b423

runtime/interpreter/unstarted_runtime.cc

diff --git a/runtime/interpreter/unstarted_runtime.cc b/runtime/interpreter/unstarted_runtime.cc
index 81be959..a75f878 100644
--- a/runtime/interpreter/unstarted_runtime.cc
+++ b/runtime/interpreter/unstarted_runtime.cc
@@ -495,9 +495,7 @@
   }
 }
 
-void UnstartedRuntime::UnstartedMathCeil(
-    Thread* self ATTRIBUTE_UNUSED, ShadowFrame* shadow_frame, JValue* result, size_t arg_offset) {
-  double in = shadow_frame->GetVRegDouble(arg_offset);
+static double ComputeCeil(double in) {
   double out;
   // Special cases:
   // 1) NaN, infinity, +0, -0 -> out := in. All are guaranteed by cmath.
@@ -507,7 +505,21 @@
   } else {
     out = ceil(in);
   }
-  result->SetD(out);
+  return out;
+}
+
+void UnstartedRuntime::UnstartedMathCeil(
+    Thread* self ATTRIBUTE_UNUSED, ShadowFrame* shadow_frame, JValue* result, size_t arg_offset) {
+  double in = shadow_frame->GetVRegDouble(arg_offset);
+  result->SetD(ComputeCeil(in));
+}
+
+void UnstartedRuntime::UnstartedMathFloor(
+    Thread* self ATTRIBUTE_UNUSED, ShadowFrame* shadow_frame, JValue* result, size_t arg_offset) {
+  double in = shadow_frame->GetVRegDouble(arg_offset);
+  // From the JavaDocs:
+  // "Note that the value of Math.ceil(x) is exactly the value of -Math.floor(-x)."
+  result->SetD(-ComputeCeil(-in));
 }
 
 void UnstartedRuntime::UnstartedObjectHashCode(

runtime/interpreter/unstarted_runtime_list.h

diff --git a/runtime/interpreter/unstarted_runtime_list.h b/runtime/interpreter/unstarted_runtime_list.h
index d669b75..c76470a 100644
--- a/runtime/interpreter/unstarted_runtime_list.h
+++ b/runtime/interpreter/unstarted_runtime_list.h
@@ -34,6 +34,7 @@
   V(SystemGetSecurityManager, "java.lang.SecurityManager java.lang.System.getSecurityManager()") \
   V(ThreadLocalGet, "java.lang.Object java.lang.ThreadLocal.get()") \
   V(MathCeil, "double java.lang.Math.ceil(double)") \
+  V(MathFloor, "double java.lang.Math.floor(double)") \
   V(ObjectHashCode, "int java.lang.Object.hashCode()") \
   V(DoubleDoubleToRawLongBits, "long java.lang.Double.doubleToRawLongBits(double)") \
   V(DexCacheGetDexNative, "com.android.dex.Dex java.lang.DexCache.getDexNative()") \