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/454-get-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/454-get-vreg')
-rw-r--r-- | test/454-get-vreg/expected.txt | 0 | ||||
-rw-r--r-- | test/454-get-vreg/get_vreg_jni.cc | 122 | ||||
-rw-r--r-- | test/454-get-vreg/info.txt | 1 | ||||
-rw-r--r-- | test/454-get-vreg/src/Main.java | 53 |
4 files changed, 176 insertions, 0 deletions
diff --git a/test/454-get-vreg/expected.txt b/test/454-get-vreg/expected.txt new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/test/454-get-vreg/expected.txt diff --git a/test/454-get-vreg/get_vreg_jni.cc b/test/454-get-vreg/get_vreg_jni.cc new file mode 100644 index 0000000..937d2fe --- /dev/null +++ b/test/454-get-vreg/get_vreg_jni.cc @@ -0,0 +1,122 @@ +/* + * 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), found_method_index_(0) {} + + bool VisitFrame() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { + mirror::ArtMethod* m = GetMethod(); + std::string m_name(m->GetName()); + + if (m_name.compare("testSimpleVReg") == 0) { + found_method_index_ = 1; + uint32_t value = 0; + + CHECK(GetVReg(m, 0, kIntVReg, &value)); + CHECK_EQ(value, 42u); + + bool success = GetVReg(m, 1, kIntVReg, &value); + if (m->IsOptimized(sizeof(void*))) CHECK(!success); + + success = GetVReg(m, 2, kIntVReg, &value); + if (m->IsOptimized(sizeof(void*))) CHECK(!success); + + CHECK(GetVReg(m, 3, kReferenceVReg, &value)); + CHECK_EQ(reinterpret_cast<mirror::Object*>(value), this_value_); + + CHECK(GetVReg(m, 4, kIntVReg, &value)); + CHECK_EQ(value, 1u); + + CHECK(GetVReg(m, 5, kFloatVReg, &value)); + uint32_t cast = bit_cast<float, uint32_t>(1.0f); + CHECK_EQ(value, cast); + + CHECK(GetVReg(m, 6, kIntVReg, &value)); + CHECK_EQ(value, 2u); + + CHECK(GetVReg(m, 7, kIntVReg, &value)); + CHECK_EQ(value, true); + + CHECK(GetVReg(m, 8, kIntVReg, &value)); + CHECK_EQ(value, 3u); + + CHECK(GetVReg(m, 9, kIntVReg, &value)); + CHECK_EQ(value, static_cast<uint32_t>('c')); + } else if (m_name.compare("testPairVReg") == 0) { + found_method_index_ = 2; + uint64_t value = 0; + CHECK(GetVRegPair(m, 0, kLongLoVReg, kLongHiVReg, &value)); + CHECK_EQ(value, 42u); + + bool success = GetVRegPair(m, 2, kLongLoVReg, kLongHiVReg, &value); + if (m->IsOptimized(sizeof(void*))) CHECK(!success); + + success = GetVRegPair(m, 4, kLongLoVReg, kLongHiVReg, &value); + if (m->IsOptimized(sizeof(void*))) CHECK(!success); + + uint32_t value32 = 0; + CHECK(GetVReg(m, 6, kReferenceVReg, &value32)); + CHECK_EQ(reinterpret_cast<mirror::Object*>(value32), this_value_); + + CHECK(GetVRegPair(m, 7, kLongLoVReg, kLongHiVReg, &value)); + CHECK_EQ(static_cast<int64_t>(value), std::numeric_limits<int64_t>::min()); + + CHECK(GetVRegPair(m, 9, kLongLoVReg, kLongHiVReg, &value)); + CHECK_EQ(static_cast<int64_t>(value), std::numeric_limits<int64_t>::max()); + + CHECK(GetVRegPair(m, 11, kLongLoVReg, kLongHiVReg, &value)); + CHECK_EQ(value, 0u); + + CHECK(GetVRegPair(m, 13, kDoubleLoVReg, kDoubleHiVReg, &value)); + uint64_t cast = bit_cast<double, uint64_t>(2.0); + CHECK_EQ(value, cast); + } + + return true; + } + + mirror::Object* this_value_; + + // Value returned to Java to ensure the methods testSimpleVReg and testPairVReg + // have been found and tested. + jint found_method_index_; +}; + +extern "C" JNIEXPORT jint JNICALL Java_Main_doNativeCall(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(); + return visitor.found_method_index_; +} + +} // namespace + +} // namespace art diff --git a/test/454-get-vreg/info.txt b/test/454-get-vreg/info.txt new file mode 100644 index 0000000..20df0b5 --- /dev/null +++ b/test/454-get-vreg/info.txt @@ -0,0 +1 @@ +Tests for inspecting DEX registers in a Java method. diff --git a/test/454-get-vreg/src/Main.java b/test/454-get-vreg/src/Main.java new file mode 100644 index 0000000..df07d44 --- /dev/null +++ b/test/454-get-vreg/src/Main.java @@ -0,0 +1,53 @@ +/* + * 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 testSimpleVReg(int a, float f, short s, boolean z, byte b, char c) { + int e = doCall(); + int g = doNativeCall(); + return e + g; + } + + long testPairVReg(long a, long b, long c, double e) { + long f = doCall(); + long g = doNativeCall(); + return f + g; + } + + native int doNativeCall(); + + int doCall() { + return 42; + } + + static { + System.loadLibrary("arttest"); + } + + public static void main(String[] args) { + Main rm = new Main(); + if (rm.testSimpleVReg(1, 1.0f, (short)2, true, (byte)3, 'c') != 43) { + throw new Error("Expected 43"); + } + + if (rm.testPairVReg(Long.MIN_VALUE, Long.MAX_VALUE, 0, 2.0) != 44) { + throw new Error("Expected 44"); + } + } +} |