diff options
author | Sebastien Hertz <shertz@google.com> | 2015-01-20 16:06:43 +0100 |
---|---|---|
committer | Nicolas Geoffray <ngeoffray@google.com> | 2015-03-03 11:22:00 +0000 |
commit | 7cde48c56df5b57aed524cce44c902bc720f2d6c (patch) | |
tree | b9b9e33b29f46bfe0c2da89c7e3e87c8ee419ccc /test/455-set-vreg | |
parent | 4b39eeea67b0fecf21588d7b00e92eb844014c24 (diff) | |
download | art-7cde48c56df5b57aed524cce44c902bc720f2d6c.zip art-7cde48c56df5b57aed524cce44c902bc720f2d6c.tar.gz art-7cde48c56df5b57aed524cce44c902bc720f2d6c.tar.bz2 |
Stack support for Optimizing compiler
Allows to read/write DEX registers from physical register or stack
location when the method is compiled with the Optimizing compiler.
Required fixing arm and arm64 JNI compiler by saving floating
point registers.
Bug: 18547544
Change-Id: I401579f251d1c0a130f6cf4a93a960cdcd7518f5
Diffstat (limited to 'test/455-set-vreg')
-rw-r--r-- | test/455-set-vreg/expected.txt | 0 | ||||
-rw-r--r-- | test/455-set-vreg/info.txt | 1 | ||||
-rw-r--r-- | test/455-set-vreg/set_vreg_jni.cc | 95 | ||||
-rw-r--r-- | test/455-set-vreg/src/Main.java | 73 |
4 files changed, 169 insertions, 0 deletions
diff --git a/test/455-set-vreg/expected.txt b/test/455-set-vreg/expected.txt new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/test/455-set-vreg/expected.txt diff --git a/test/455-set-vreg/info.txt b/test/455-set-vreg/info.txt new file mode 100644 index 0000000..e8c57b5 --- /dev/null +++ b/test/455-set-vreg/info.txt @@ -0,0 +1 @@ +Tests for setting DEX registers in a Java method. diff --git a/test/455-set-vreg/set_vreg_jni.cc b/test/455-set-vreg/set_vreg_jni.cc new file mode 100644 index 0000000..24d7832 --- /dev/null +++ b/test/455-set-vreg/set_vreg_jni.cc @@ -0,0 +1,95 @@ +/* + * Copyright (C) 2015 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "arch/context.h" +#include "jni.h" +#include "mirror/art_method-inl.h" +#include "scoped_thread_state_change.h" +#include "stack.h" +#include "thread.h" + +namespace art { + +namespace { + +class TestVisitor : public StackVisitor { + public: + TestVisitor(Thread* thread, Context* context, mirror::Object* this_value) + SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) + : StackVisitor(thread, context), this_value_(this_value) {} + + bool VisitFrame() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { + mirror::ArtMethod* m = GetMethod(); + std::string m_name(m->GetName()); + + if (m_name.compare("testIntVReg") == 0) { + uint32_t value = 0; + CHECK(GetVReg(m, 1, kReferenceVReg, &value)); + CHECK_EQ(reinterpret_cast<mirror::Object*>(value), this_value_); + + CHECK(SetVReg(m, 2, 5, kIntVReg)); + CHECK(SetVReg(m, 3, 4, kIntVReg)); + CHECK(SetVReg(m, 4, 3, kIntVReg)); + CHECK(SetVReg(m, 5, 2, kIntVReg)); + CHECK(SetVReg(m, 6, 1, kIntVReg)); + } else if (m_name.compare("testLongVReg") == 0) { + uint32_t value = 0; + CHECK(GetVReg(m, 3, kReferenceVReg, &value)); + CHECK_EQ(reinterpret_cast<mirror::Object*>(value), this_value_); + + CHECK(SetVRegPair(m, 4, std::numeric_limits<int64_t>::max(), kLongLoVReg, kLongHiVReg)); + CHECK(SetVRegPair(m, 6, 4, kLongLoVReg, kLongHiVReg)); + CHECK(SetVRegPair(m, 8, 3, kLongLoVReg, kLongHiVReg)); + CHECK(SetVRegPair(m, 10, 2, kLongLoVReg, kLongHiVReg)); + CHECK(SetVRegPair(m, 12, 1, kLongLoVReg, kLongHiVReg)); + } else if (m_name.compare("testFloatVReg") == 0) { + uint32_t value = 0; + CHECK(GetVReg(m, 1, kReferenceVReg, &value)); + CHECK_EQ(reinterpret_cast<mirror::Object*>(value), this_value_); + + CHECK(SetVReg(m, 2, bit_cast<float, uint32_t>(5.0f), kFloatVReg)); + CHECK(SetVReg(m, 3, bit_cast<float, uint32_t>(4.0f), kFloatVReg)); + CHECK(SetVReg(m, 4, bit_cast<float, uint32_t>(3.0f), kFloatVReg)); + CHECK(SetVReg(m, 5, bit_cast<float, uint32_t>(2.0f), kFloatVReg)); + CHECK(SetVReg(m, 6, bit_cast<float, uint32_t>(1.0f), kFloatVReg)); + } else if (m_name.compare("testDoubleVReg") == 0) { + uint32_t value = 0; + CHECK(GetVReg(m, 3, kReferenceVReg, &value)); + CHECK_EQ(reinterpret_cast<mirror::Object*>(value), this_value_); + + CHECK(SetVRegPair(m, 4, bit_cast<double, uint64_t>(5.0), kDoubleLoVReg, kDoubleHiVReg)); + CHECK(SetVRegPair(m, 6, bit_cast<double, uint64_t>(4.0), kDoubleLoVReg, kDoubleHiVReg)); + CHECK(SetVRegPair(m, 8, bit_cast<double, uint64_t>(3.0), kDoubleLoVReg, kDoubleHiVReg)); + CHECK(SetVRegPair(m, 10, bit_cast<double, uint64_t>(2.0), kDoubleLoVReg, kDoubleHiVReg)); + CHECK(SetVRegPair(m, 12, bit_cast<double, uint64_t>(1.0), kDoubleLoVReg, kDoubleHiVReg)); + } + + return true; + } + + mirror::Object* this_value_; +}; + +extern "C" JNIEXPORT void JNICALL Java_Main_doNativeCallSetVReg(JNIEnv*, jobject value) { + ScopedObjectAccess soa(Thread::Current()); + std::unique_ptr<Context> context(Context::Create()); + TestVisitor visitor(soa.Self(), context.get(), soa.Decode<mirror::Object*>(value)); + visitor.WalkStack(); +} + +} // namespace + +} // namespace art diff --git a/test/455-set-vreg/src/Main.java b/test/455-set-vreg/src/Main.java new file mode 100644 index 0000000..2172d92 --- /dev/null +++ b/test/455-set-vreg/src/Main.java @@ -0,0 +1,73 @@ +/* + * Copyright (C) 2015 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +public class Main { + public Main() { + } + + int testIntVReg(int a, int b, int c, int d, int e) { + doNativeCallSetVReg(); + return a - b - c - d - e; + } + + long testLongVReg(long a, long b, long c, long d, long e) { + doNativeCallSetVReg(); + return a - b - c - d - e; + } + + float testFloatVReg(float a, float b, float c, float d, float e) { + doNativeCallSetVReg(); + return a - b - c - d - e; + } + + double testDoubleVReg(double a, double b, double c, double d, double e) { + doNativeCallSetVReg(); + return a - b - c - d - e; + } + + native void doNativeCallSetVReg(); + + static { + System.loadLibrary("arttest"); + } + + public static void main(String[] args) { + Main rm = new Main(); + int intExpected = 5 - 4 - 3 - 2 - 1; + int intResult = rm.testIntVReg(0, 0, 0, 0, 0); + if (intResult != intExpected) { + throw new Error("Expected " + intExpected + ", got " + intResult); + } + + long longExpected = Long.MAX_VALUE - 4 - 3 - 2 - 1; + long longResult = rm.testLongVReg(0, 0, 0, 0, 0); + if (longResult != longExpected) { + throw new Error("Expected " + longExpected + ", got " + longResult); + } + + float floatExpected = 5.0f - 4.0f - 3.0f - 2.0f - 1.0f; + float floatResult = rm.testFloatVReg(0.0f, 0.0f, 0.0f, 0.0f, 0.0f); + if (floatResult != floatExpected) { + throw new Error("Expected " + floatExpected + ", got " + floatResult); + } + + double doubleExpected = 5.0 - 4.0 - 3.0 - 2.0 - 1.0; + double doubleResult = rm.testDoubleVReg(0.0, 0.0, 0.0, 0.0, 0.0); + if (doubleResult != doubleExpected) { + throw new Error("Expected " + doubleExpected + ", got " + doubleResult); + } + } +} |