From 5d1ac920fdaef5d4ec8f66bb734488cd9660b024 Mon Sep 17 00:00:00 2001 From: jeffhao Date: Thu, 29 Sep 2011 17:41:15 -0700 Subject: Adding old unit tests to test suite. These tests are copied straight over. They'll still run, but they're using the old system. Change-Id: If494519e52ddf858a9febfc55bdae830468cb3c8 --- test/028-array-write/src/Main.java | 68 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 test/028-array-write/src/Main.java (limited to 'test/028-array-write/src/Main.java') diff --git a/test/028-array-write/src/Main.java b/test/028-array-write/src/Main.java new file mode 100644 index 0000000000..6f36f849d0 --- /dev/null +++ b/test/028-array-write/src/Main.java @@ -0,0 +1,68 @@ +// Copyright 2007 The Android Open Source Project + +/** + * Array write speed test. + */ +public class Main { + /** whether to report times */ + static boolean timing = false; + + static final int STORAGE_SIZE = 128*1024; + static int[] mStorage = new int[STORAGE_SIZE]; + + static public void report(long start, long end) { + if (! timing) { + return; + } + + System.out.println("Finished in " + ((end - start) / 1000000.0) + + " msec"); + } + + static void writeArray(int val) { + for (int i = STORAGE_SIZE-1; i >= 0; i--) + mStorage[i] = val; + } + + static void writeTest() { + long start, end; + + writeArray(0); // touch all the memory + + System.out.println("Running writeTest..."); + start = System.nanoTime(); + for (int i = 1; i < 20; i++) + writeArray(i); + end = System.nanoTime(); + + report(start, end); + } + + static void copyTest() { + long start, end; + + // touch once + System.arraycopy(mStorage, 0, mStorage, + STORAGE_SIZE/2, STORAGE_SIZE/2); + + System.out.println("Running copyTest..."); + start = System.nanoTime(); + for (int i = 1; i < 35; i++) { + System.arraycopy(mStorage, 0, mStorage, + STORAGE_SIZE/2, STORAGE_SIZE/2); + } + end = System.nanoTime(); + + report(start, end); + } + + public static void main(String[] args) { + if ((args.length >= 1) && args[0].equals("--timing")) { + timing = true; + } + + writeTest(); + copyTest(); + System.out.println("Done!"); + } +} -- cgit v1.2.3-59-g8ed1b From 2faa5f1271587cda765f26bcf2951065300a01ff Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Mon, 30 Jan 2012 14:42:07 -0800 Subject: Fix copyright headers. Change-Id: I5b7bc76a370238d810d78522bd5531600746700f --- src/asm_support.h | 16 ++++++++++++- src/assembler.cc | 16 ++++++++++++- src/assembler.h | 16 ++++++++++++- src/assembler_arm.cc | 16 ++++++++++++- src/assembler_arm.h | 16 ++++++++++++- src/assembler_x86.cc | 16 ++++++++++++- src/assembler_x86.h | 16 ++++++++++++- src/assembler_x86_test.cc | 16 ++++++++++++- src/calling_convention.cc | 16 ++++++++++++- src/calling_convention.h | 16 ++++++++++++- src/calling_convention_arm.cc | 16 ++++++++++++- src/calling_convention_arm.h | 16 ++++++++++++- src/calling_convention_x86.cc | 16 ++++++++++++- src/calling_convention_x86.h | 16 ++++++++++++- src/card_table.h | 21 ++++++++++++---- src/casts.h | 16 ++++++++++++- src/class_linker.cc | 16 ++++++++++++- src/class_linker_test.cc | 16 ++++++++++++- src/class_loader.cc | 16 ++++++++++++- src/class_loader.h | 16 ++++++++++++- src/common_test.h | 16 ++++++++++++- src/compiled_class.h | 16 ++++++++++++- src/compiled_method.cc | 16 ++++++++++++- src/compiled_method.h | 16 ++++++++++++- src/compiler.cc | 16 ++++++++++++- src/compiler.h | 16 ++++++++++++- src/compiler_test.cc | 16 ++++++++++++- src/constants.h | 16 ++++++++++++- src/constants_arm.h | 16 ++++++++++++- src/constants_x86.h | 16 ++++++++++++- src/context.cc | 16 ++++++++++++- src/context.h | 16 ++++++++++++- src/context_arm.cc | 16 ++++++++++++- src/context_arm.h | 16 ++++++++++++- src/context_x86.cc | 16 ++++++++++++- src/context_x86.h | 16 ++++++++++++- src/dex2oat.cc | 16 ++++++++++++- src/dex_cache.cc | 16 ++++++++++++- src/dex_cache.h | 16 ++++++++++++- src/dex_cache_test.cc | 16 ++++++++++++- src/dex_file.cc | 16 ++++++++++++- src/dex_file.h | 16 ++++++++++++- src/dex_file_test.cc | 16 ++++++++++++- src/dex_file_verifier.cc | 16 ++++++++++++- src/dex_file_verifier.h | 16 ++++++++++++- src/dex_instruction.cc | 16 ++++++++++++- src/dex_instruction.h | 16 ++++++++++++- src/dex_instruction_list.h | 16 ++++++++++++- src/dex_instruction_visitor.h | 16 ++++++++++++- src/dex_instruction_visitor_test.cc | 16 ++++++++++++- src/dex_verifier.cc | 16 ++++++++++++- src/dex_verifier.h | 16 ++++++++++++- src/dex_verifier_test.cc | 16 ++++++++++++- src/dlmalloc.c | 17 ++++++++++++- src/dlmalloc.h | 16 ++++++++++++- src/exception_test.cc | 16 ++++++++++++- src/file.cc | 16 ++++++++++++- src/file.h | 16 ++++++++++++- src/file_linux.cc | 16 ++++++++++++- src/file_linux.h | 16 ++++++++++++- src/file_test.cc | 16 ++++++++++++- src/globals.h | 16 ++++++++++++- src/heap.cc | 16 ++++++++++++- src/heap_bitmap.cc | 28 ++++++++++++---------- src/heap_bitmap.h | 28 ++++++++++++---------- src/heap_test.cc | 16 ++++++++++++- src/image.cc | 16 ++++++++++++- src/image.h | 16 ++++++++++++- src/image_test.cc | 16 ++++++++++++- src/image_writer.cc | 16 ++++++++++++- src/image_writer.h | 16 ++++++++++++- src/intern_table.cc | 16 ++++++++++++- src/intern_table.h | 16 ++++++++++++- src/intern_table_test.cc | 16 ++++++++++++- src/jni_compiler.cc | 16 ++++++++++++- src/jni_compiler.h | 16 ++++++++++++- src/jni_compiler_test.cc | 16 ++++++++++++- src/jni_internal.cc | 16 ++++++++++++- src/jni_internal.h | 16 ++++++++++++- src/jni_internal_arm.cc | 16 ++++++++++++- src/jni_internal_test.cc | 16 ++++++++++++- src/jni_internal_x86.cc | 16 ++++++++++++- src/leb128.h | 16 ++++++++++++- src/macros.h | 27 +++++++++++---------- src/managed_register.h | 16 ++++++++++++- src/managed_register_arm.cc | 16 ++++++++++++- src/managed_register_arm.h | 16 ++++++++++++- src/managed_register_arm_test.cc | 16 ++++++++++++- src/managed_register_x86.cc | 16 ++++++++++++- src/managed_register_x86.h | 16 ++++++++++++- src/managed_register_x86_test.cc | 16 ++++++++++++- src/mark_stack.cc | 16 ++++++++++++- src/mark_stack.h | 16 ++++++++++++- src/mark_sweep.cc | 16 ++++++++++++- src/mark_sweep.h | 16 ++++++++++++- src/memory_region.cc | 16 ++++++++++++- src/memory_region.h | 16 ++++++++++++- src/mutex_test.cc | 16 ++++++++++++- src/oat.cc | 16 ++++++++++++- src/oat.h | 16 ++++++++++++- src/oat_file.cc | 16 ++++++++++++- src/oat_file.h | 16 ++++++++++++- src/oat_test.cc | 16 ++++++++++++- src/oat_writer.cc | 16 ++++++++++++- src/oat_writer.h | 16 ++++++++++++- src/oatdump.cc | 16 ++++++++++++- src/oatexec.cc | 16 ++++++++++++- src/object.cc | 16 ++++++++++++- src/object_test.cc | 16 ++++++++++++- src/offsets.cc | 16 ++++++++++++- src/offsets.h | 16 ++++++++++++- src/os.h | 16 ++++++++++++- src/os_linux.cc | 16 ++++++++++++- src/reference_table_test.cc | 16 ++++++++++++- src/runtime.cc | 16 ++++++++++++- src/runtime.h | 16 ++++++++++++- src/runtime_android.cc | 16 ++++++++++++- src/runtime_linux.cc | 16 ++++++++++++- src/runtime_support.h | 16 ++++++++++++- src/runtime_test.cc | 16 ++++++++++++- src/scoped_jni_thread_state.h | 17 +++++++++++-- src/space.cc | 16 ++++++++++++- src/space_test.cc | 16 ++++++++++++- src/stl_util.h | 16 ++++++++++++- src/stringpiece.cc | 27 +++++++++++---------- src/stringpiece.h | 27 +++++++++++---------- src/stringprintf.cc | 16 ++++++++++++- src/stringprintf.h | 16 ++++++++++++- src/strutil.h | 16 ++++++++++++- src/stub_arm.cc | 16 ++++++++++++- src/stub_x86.cc | 16 ++++++++++++- src/thread_arm.cc | 16 ++++++++++++- src/thread_x86.cc | 16 ++++++++++++- src/trace.cc | 16 ++++++++++++- src/trace.h | 16 ++++++++++++- src/utf.cc | 16 ++++++++++++- src/utf.h | 16 ++++++++++++- src/utils.cc | 17 +++++++++++-- src/utils.h | 16 ++++++++++++- src/utils_test.cc | 16 ++++++++++++- src/zip_archive_test.cc | 16 ++++++++++++- test/003-omnibus-opcodes/src/Array.java | 17 +++++++++++-- test/003-omnibus-opcodes/src/Classes.java | 16 ++++++++++++- test/003-omnibus-opcodes/src/Compare.java | 18 +++++++++++--- test/003-omnibus-opcodes/src/FloatMath.java | 16 ++++++++++++- test/003-omnibus-opcodes/src/IntMath.java | 16 ++++++++++++- test/003-omnibus-opcodes/src/Monitor.java | 17 +++++++++++-- test/008-instanceof/src/Iface1.java | 16 ++++++++++++- test/008-instanceof/src/Iface2.java | 16 ++++++++++++- test/008-instanceof/src/Iface2Sub1.java | 16 ++++++++++++- test/008-instanceof/src/ImplA.java | 16 ++++++++++++- test/008-instanceof/src/ImplB.java | 16 ++++++++++++- test/008-instanceof/src/ImplBSub.java | 16 ++++++++++++- test/009-instanceof2/src/Iface1.java | 16 ++++++++++++- test/009-instanceof2/src/Iface2.java | 16 ++++++++++++- test/009-instanceof2/src/Iface2Sub1.java | 16 ++++++++++++- test/009-instanceof2/src/ImplA.java | 16 ++++++++++++- test/009-instanceof2/src/ImplB.java | 16 ++++++++++++- test/009-instanceof2/src/ImplBSub.java | 16 ++++++++++++- test/010-instance/src/InstanceTest.java | 16 ++++++++++++- test/011-array-copy/src/Iface1.java | 16 ++++++++++++- test/011-array-copy/src/Iface2.java | 16 ++++++++++++- test/011-array-copy/src/ImplA.java | 16 ++++++++++++- test/022-interface/src/Iface1.java | 16 ++++++++++++- test/022-interface/src/Iface2.java | 16 ++++++++++++- test/022-interface/src/Iface2Sub1.java | 16 ++++++++++++- test/022-interface/src/ImplA.java | 16 ++++++++++++- test/022-interface/src/ImplB.java | 16 ++++++++++++- test/022-interface/src/ImplBSub.java | 16 ++++++++++++- test/023-many-interfaces/src/ManyInterfaces.java | 16 ++++++++++++- test/024-illegal-access/src/PublicAccess.java | 16 ++++++++++++- test/024-illegal-access/src/SemiPrivate.java | 16 ++++++++++++- test/024-illegal-access/src2/SemiPrivate.java | 16 ++++++++++++- test/025-access-controller/src/Main.java | 16 ++++++++++++- test/025-access-controller/src/Privvy.java | 16 ++++++++++++- test/026-access/src/Main.java | 16 ++++++++++++- test/027-arithmetic/src/Main.java | 16 ++++++++++++- test/028-array-write/src/Main.java | 16 ++++++++++++- test/029-assert/src/Main.java | 16 ++++++++++++- test/030-bad-finalizer/src/BadFinalizer.java | 16 ++++++++++++- test/030-bad-finalizer/src/Main.java | 16 ++++++++++++- test/033-class-init-deadlock/src/Main.java | 16 ++++++++++++- test/034-call-null/src/Main.java | 16 ++++++++++++- test/035-enum/src/Main.java | 16 ++++++++++++- test/036-finalizer/src/FinalizerTest.java | 16 ++++++++++++- test/036-finalizer/src/Main.java | 16 ++++++++++++- test/038-inner-null/src/Main.java | 16 ++++++++++++- test/039-join-main/src/Main.java | 16 ++++++++++++- test/040-miranda/src/Main.java | 16 ++++++++++++- test/040-miranda/src/MirandaAbstract.java | 16 ++++++++++++- test/040-miranda/src/MirandaClass.java | 16 ++++++++++++- test/040-miranda/src/MirandaInterface.java | 16 ++++++++++++- test/040-miranda/src/MirandaInterface2.java | 16 ++++++++++++- test/043-privates/src/Main.java | 16 ++++++++++++- test/046-reflect/src/Main.java | 16 ++++++++++++- test/047-returns/src/Main.java | 16 ++++++++++++- test/048-server-socket/src/Main.java | 16 ++++++++++++- test/049-show-object/src/Main.java | 16 ++++++++++++- test/050-sync-test/src/Main.java | 16 ++++++++++++- test/050-sync-test/src/ThreadDeathHandler.java | 16 ++++++++++++- test/051-thread/src/Main.java | 16 ++++++++++++- test/052-verifier-fun/src/Main.java | 16 ++++++++++++- test/053-wait-some/src/Main.java | 16 ++++++++++++- test/054-uncaught/src/Main.java | 16 ++++++++++++- test/054-uncaught/src/ThreadDeathHandler.java | 16 ++++++++++++- test/059-finalizer-throw/src/Main.java | 16 ++++++++++++- test/064-field-access/src/other/OtherPackage.java | 16 ++++++++++++- test/065-mismatched-implements/src/Base.java | 16 ++++++++++++- test/065-mismatched-implements/src/Defs.java | 16 ++++++++++++- test/065-mismatched-implements/src2/Defs.java | 16 ++++++++++++- test/066-mismatched-super/src/Base.java | 16 ++++++++++++- test/066-mismatched-super/src/Defs.java | 16 ++++++++++++- test/066-mismatched-super/src2/Defs.java | 16 ++++++++++++- test/068-classloader/src-ex/DoubledExtend.java | 16 ++++++++++++- test/068-classloader/src-ex/DoubledImplement.java | 16 ++++++++++++- test/068-classloader/src-ex/Inaccessible1.java | 16 ++++++++++++- test/068-classloader/src-ex/Inaccessible2.java | 16 ++++++++++++- test/068-classloader/src-ex/Inaccessible3.java | 16 ++++++++++++- test/068-classloader/src/Base.java | 16 ++++++++++++- test/068-classloader/src/DoubledExtend.java | 16 ++++++++++++- test/068-classloader/src/DoubledImplement.java | 16 ++++++++++++- test/068-classloader/src/ICommon.java | 16 ++++++++++++- test/068-classloader/src/InaccessibleBase.java | 16 ++++++++++++- .../068-classloader/src/InaccessibleInterface.java | 16 ++++++++++++- test/068-classloader/src/SimpleBase.java | 16 ++++++++++++- test/AbstractMethod/AbstractClass.java | 16 ++++++++++++- test/AllFields/AllFields.java | 16 ++++++++++++- .../CreateMethodSignature.java | 16 ++++++++++++- test/ExceptionHandle/ExceptionHandle.java | 17 ++++++++++++- test/ExceptionTest/ExceptionTest.java | 16 ++++++++++++- test/Fibonacci/Fibonacci.java | 16 ++++++++++++- test/IntMath/IntMath.java | 16 ++++++++++++- test/Interfaces/Interfaces.java | 16 ++++++++++++- test/Main/Main.java | 16 ++++++++++++- test/MyClass/MyClass.java | 16 ++++++++++++- test/MyClassNatives/MyClassNatives.java | 16 ++++++++++++- test/Nested/Nested.java | 16 ++++++++++++- test/ProtoCompare/ProtoCompare.java | 16 ++++++++++++- test/ProtoCompare2/ProtoCompare2.java | 16 ++++++++++++- test/ReferenceMap/ReferenceMap.java | 16 ++++++++++++- test/ReferenceMap/stack_walk_refmap_jni.cc | 16 ++++++++++++- test/StackWalk/stack_walk_jni.cc | 16 ++++++++++++- test/StackWalk2/StackWalk2.java | 16 ++++++++++++- test/StaticLeafMethods/StaticLeafMethods.java | 16 ++++++++++++- test/Statics/Statics.java | 16 ++++++++++++- test/StaticsFromCode/StaticsFromCode.java | 16 ++++++++++++- test/XandY/X.java | 16 ++++++++++++- test/XandY/Y.java | 16 ++++++++++++- 248 files changed, 3723 insertions(+), 315 deletions(-) (limited to 'test/028-array-write/src/Main.java') diff --git a/src/asm_support.h b/src/asm_support.h index b4de5b0d3a..95d4754928 100644 --- a/src/asm_support.h +++ b/src/asm_support.h @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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. + */ #ifndef ART_SRC_ASM_SUPPORT_H_ #define ART_SRC_ASM_SUPPORT_H_ diff --git a/src/assembler.cc b/src/assembler.cc index d97cf5cf25..dfee8115ee 100644 --- a/src/assembler.cc +++ b/src/assembler.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 "assembler.h" diff --git a/src/assembler.h b/src/assembler.h index 30962664a6..ae2619e2ef 100644 --- a/src/assembler.h +++ b/src/assembler.h @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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. + */ #ifndef ART_SRC_ASSEMBLER_H_ #define ART_SRC_ASSEMBLER_H_ diff --git a/src/assembler_arm.cc b/src/assembler_arm.cc index a36e84def7..d452a465b7 100644 --- a/src/assembler_arm.cc +++ b/src/assembler_arm.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 "assembler_arm.h" diff --git a/src/assembler_arm.h b/src/assembler_arm.h index 2a721eae14..5b9c32de98 100644 --- a/src/assembler_arm.h +++ b/src/assembler_arm.h @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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. + */ #ifndef ART_SRC_ASSEMBLER_ARM_H_ #define ART_SRC_ASSEMBLER_ARM_H_ diff --git a/src/assembler_x86.cc b/src/assembler_x86.cc index f3b3c11d6a..a283299f90 100644 --- a/src/assembler_x86.cc +++ b/src/assembler_x86.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 "assembler_x86.h" diff --git a/src/assembler_x86.h b/src/assembler_x86.h index 2f293e4a39..70bd70c211 100644 --- a/src/assembler_x86.h +++ b/src/assembler_x86.h @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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. + */ #ifndef ART_SRC_ASSEMBLER_X86_H_ #define ART_SRC_ASSEMBLER_X86_H_ diff --git a/src/assembler_x86_test.cc b/src/assembler_x86_test.cc index ead5bcba55..5d8a3b1521 100644 --- a/src/assembler_x86_test.cc +++ b/src/assembler_x86_test.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 "assembler_x86.h" diff --git a/src/calling_convention.cc b/src/calling_convention.cc index bf27b6cc8f..396c9ddacf 100644 --- a/src/calling_convention.cc +++ b/src/calling_convention.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 "calling_convention.h" diff --git a/src/calling_convention.h b/src/calling_convention.h index bdbf1a1712..09a47e5376 100644 --- a/src/calling_convention.h +++ b/src/calling_convention.h @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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. + */ #ifndef ART_SRC_CALLING_CONVENTION_H_ #define ART_SRC_CALLING_CONVENTION_H_ diff --git a/src/calling_convention_arm.cc b/src/calling_convention_arm.cc index c9af6f1f1d..1a5b92fb8d 100644 --- a/src/calling_convention_arm.cc +++ b/src/calling_convention_arm.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 "calling_convention_arm.h" #include "logging.h" diff --git a/src/calling_convention_arm.h b/src/calling_convention_arm.h index bb4c30f1ee..4f6d4aaddc 100644 --- a/src/calling_convention_arm.h +++ b/src/calling_convention_arm.h @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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. + */ #ifndef ART_SRC_CALLING_CONVENTION_ARM_H_ #define ART_SRC_CALLING_CONVENTION_ARM_H_ diff --git a/src/calling_convention_x86.cc b/src/calling_convention_x86.cc index 7becbb3c0f..9d5bca933e 100644 --- a/src/calling_convention_x86.cc +++ b/src/calling_convention_x86.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 "calling_convention_x86.h" #include "logging.h" diff --git a/src/calling_convention_x86.h b/src/calling_convention_x86.h index c26591704e..cb2b89a370 100644 --- a/src/calling_convention_x86.h +++ b/src/calling_convention_x86.h @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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. + */ #ifndef ART_SRC_CALLING_CONVENTION_X86_H_ #define ART_SRC_CALLING_CONVENTION_X86_H_ diff --git a/src/card_table.h b/src/card_table.h index 804e97bbdb..ea0504a267 100644 --- a/src/card_table.h +++ b/src/card_table.h @@ -1,9 +1,17 @@ -// Copyright 2011 Google Inc. All Rights Reserved. - /* - * Maintain a card table from the the write barrier. All writes of - * non-NULL values to heap addresses should go through an entry in - * WriteBarrier, and from there to here. + * Copyright (C) 2011 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. */ #ifndef DALVIK_ALLOC_CARDTABLE_H_ @@ -23,6 +31,9 @@ class Object; #define GC_CARD_CLEAN 0 #define GC_CARD_DIRTY 0x70 +// Maintain a card table from the the write barrier. All writes of +// non-NULL values to heap addresses should go through an entry in +// WriteBarrier, and from there to here. class CardTable { public: diff --git a/src/casts.h b/src/casts.h index 461df21fa8..f5580ddadf 100644 --- a/src/casts.h +++ b/src/casts.h @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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. + */ #ifndef ART_SRC_CASTS_H_ #define ART_SRC_CASTS_H_ diff --git a/src/class_linker.cc b/src/class_linker.cc index c14f6bd8a5..ac2f4f1647 100644 --- a/src/class_linker.cc +++ b/src/class_linker.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 "class_linker.h" diff --git a/src/class_linker_test.cc b/src/class_linker_test.cc index 096ff2dc5d..6ddbac02d7 100644 --- a/src/class_linker_test.cc +++ b/src/class_linker_test.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 "class_linker.h" diff --git a/src/class_loader.cc b/src/class_loader.cc index 16233032b5..6b6297b435 100644 --- a/src/class_loader.cc +++ b/src/class_loader.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 "class_loader.h" diff --git a/src/class_loader.h b/src/class_loader.h index 83f35c0e50..018cea9d58 100644 --- a/src/class_loader.h +++ b/src/class_loader.h @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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. + */ #ifndef ART_SRC_CLASS_LOADER_H_ #define ART_SRC_CLASS_LOADER_H_ diff --git a/src/common_test.h b/src/common_test.h index 3da2f37d89..11d31180c0 100644 --- a/src/common_test.h +++ b/src/common_test.h @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 #include diff --git a/src/compiled_class.h b/src/compiled_class.h index 7dac93cebf..97dd8ee8d1 100644 --- a/src/compiled_class.h +++ b/src/compiled_class.h @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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. + */ #ifndef ART_SRC_COMPILED_CLASS_H_ #define ART_SRC_COMPILED_CLASS_H_ diff --git a/src/compiled_method.cc b/src/compiled_method.cc index ad36bd268e..eb79e0ee7a 100644 --- a/src/compiled_method.cc +++ b/src/compiled_method.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 "compiled_method.h" diff --git a/src/compiled_method.h b/src/compiled_method.h index 4528e52d56..15211e72fa 100644 --- a/src/compiled_method.h +++ b/src/compiled_method.h @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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. + */ #ifndef ART_SRC_COMPILED_METHOD_H_ #define ART_SRC_COMPILED_METHOD_H_ diff --git a/src/compiler.cc b/src/compiler.cc index ed5f56c864..a04a836a6e 100644 --- a/src/compiler.cc +++ b/src/compiler.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 "compiler.h" diff --git a/src/compiler.h b/src/compiler.h index ddc05d5d2b..6c67298b43 100644 --- a/src/compiler.h +++ b/src/compiler.h @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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. + */ #ifndef ART_SRC_COMPILER_H_ #define ART_SRC_COMPILER_H_ diff --git a/src/compiler_test.cc b/src/compiler_test.cc index 823aa48f53..76a39a43f3 100644 --- a/src/compiler_test.cc +++ b/src/compiler_test.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 "compiler.h" diff --git a/src/constants.h b/src/constants.h index 836c0c4732..778d646714 100644 --- a/src/constants.h +++ b/src/constants.h @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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. + */ #ifndef ART_SRC_CONSTANTS_H_ #define ART_SRC_CONSTANTS_H_ diff --git a/src/constants_arm.h b/src/constants_arm.h index 097c6bca44..dc3264ea3a 100644 --- a/src/constants_arm.h +++ b/src/constants_arm.h @@ -1,4 +1,18 @@ -// Copyright 2009 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2009 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. + */ #ifndef ART_SRC_CONSTANTS_ARM_H_ #define ART_SRC_CONSTANTS_ARM_H_ diff --git a/src/constants_x86.h b/src/constants_x86.h index 8712185018..65e2298b68 100644 --- a/src/constants_x86.h +++ b/src/constants_x86.h @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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. + */ #ifndef ART_SRC_CONSTANTS_X86_H_ #define ART_SRC_CONSTANTS_X86_H_ diff --git a/src/context.cc b/src/context.cc index 1c001d60f9..330ed1e558 100644 --- a/src/context.cc +++ b/src/context.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 "context.h" diff --git a/src/context.h b/src/context.h index 292ac849e1..478d11e445 100644 --- a/src/context.h +++ b/src/context.h @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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. + */ #ifndef ART_SRC_CONTEXT_H_ #define ART_SRC_CONTEXT_H_ diff --git a/src/context_arm.cc b/src/context_arm.cc index 2f7274dbc6..d0bc6c7559 100644 --- a/src/context_arm.cc +++ b/src/context_arm.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 "context_arm.h" diff --git a/src/context_arm.h b/src/context_arm.h index 07a4c0b886..9ee07546d8 100644 --- a/src/context_arm.h +++ b/src/context_arm.h @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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. + */ #ifndef ART_SRC_CONTEXT_ARM_H_ #define ART_SRC_CONTEXT_ARM_H_ diff --git a/src/context_x86.cc b/src/context_x86.cc index 485ce5ff34..35bfd01bd4 100644 --- a/src/context_x86.cc +++ b/src/context_x86.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 "context_x86.h" diff --git a/src/context_x86.h b/src/context_x86.h index aca994b0a2..829849e676 100644 --- a/src/context_x86.h +++ b/src/context_x86.h @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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. + */ #ifndef ART_SRC_CONTEXT_X86_H_ #define ART_SRC_CONTEXT_X86_H_ diff --git a/src/dex2oat.cc b/src/dex2oat.cc index 171ae3af0e..7a6829ecad 100644 --- a/src/dex2oat.cc +++ b/src/dex2oat.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 #include diff --git a/src/dex_cache.cc b/src/dex_cache.cc index d844909862..27f791931b 100644 --- a/src/dex_cache.cc +++ b/src/dex_cache.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 "class_linker.h" #include "dex_cache.h" diff --git a/src/dex_cache.h b/src/dex_cache.h index 9e350533b3..d87d8de6ce 100644 --- a/src/dex_cache.h +++ b/src/dex_cache.h @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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. + */ #ifndef ART_SRC_DEX_CACHE_H_ #define ART_SRC_DEX_CACHE_H_ diff --git a/src/dex_cache_test.cc b/src/dex_cache_test.cc index 054f991ccc..ce79de1082 100644 --- a/src/dex_cache_test.cc +++ b/src/dex_cache_test.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 "class_linker.h" #include "common_test.h" diff --git a/src/dex_file.cc b/src/dex_file.cc index e119ce0360..14413e8b1f 100644 --- a/src/dex_file.cc +++ b/src/dex_file.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 "dex_file.h" diff --git a/src/dex_file.h b/src/dex_file.h index 81813c3a77..4c42b9b592 100644 --- a/src/dex_file.h +++ b/src/dex_file.h @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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. + */ #ifndef ART_SRC_DEX_FILE_H_ #define ART_SRC_DEX_FILE_H_ diff --git a/src/dex_file_test.cc b/src/dex_file_test.cc index 3cbef1593d..1e876bab03 100644 --- a/src/dex_file_test.cc +++ b/src/dex_file_test.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 "dex_file.h" diff --git a/src/dex_file_verifier.cc b/src/dex_file_verifier.cc index 90c0a878e5..e731c1bcd7 100644 --- a/src/dex_file_verifier.cc +++ b/src/dex_file_verifier.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 "dex_file_verifier.h" diff --git a/src/dex_file_verifier.h b/src/dex_file_verifier.h index 9b66b6eacf..e6aa32997c 100644 --- a/src/dex_file_verifier.h +++ b/src/dex_file_verifier.h @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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. + */ #ifndef ART_SRC_DEX_FILE_VERIFIER_H_ #define ART_SRC_DEX_FILE_VERIFIER_H_ diff --git a/src/dex_instruction.cc b/src/dex_instruction.cc index e56492a6e8..2bb53d6bcb 100644 --- a/src/dex_instruction.cc +++ b/src/dex_instruction.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 "dex_instruction.h" diff --git a/src/dex_instruction.h b/src/dex_instruction.h index 5cfd7ef6a4..26e5653b5a 100644 --- a/src/dex_instruction.h +++ b/src/dex_instruction.h @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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. + */ #ifndef ART_SRC_DEX_INSTRUCTION_H_ #define ART_SRC_DEX_INSTRUCTION_H_ diff --git a/src/dex_instruction_list.h b/src/dex_instruction_list.h index 6dc5def0c2..8a5b5addd9 100644 --- a/src/dex_instruction_list.h +++ b/src/dex_instruction_list.h @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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. + */ #define DEX_INSTRUCTION_LIST(V) \ V(0x00, NOP, "nop", k10x, false, kNone, kContinue, kVerifyNone) \ diff --git a/src/dex_instruction_visitor.h b/src/dex_instruction_visitor.h index 2e1041d3c9..2808c9707a 100644 --- a/src/dex_instruction_visitor.h +++ b/src/dex_instruction_visitor.h @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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. + */ #ifndef ART_SRC_DEX_INSTRUCTION_VISITOR_H_ #define ART_SRC_DEX_INSTRUCTION_VISITOR_H_ diff --git a/src/dex_instruction_visitor_test.cc b/src/dex_instruction_visitor_test.cc index fe0f58346e..6dbc4d237e 100644 --- a/src/dex_instruction_visitor_test.cc +++ b/src/dex_instruction_visitor_test.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 "dex_instruction_visitor.h" diff --git a/src/dex_verifier.cc b/src/dex_verifier.cc index 752bbd53fd..31c2697b5c 100644 --- a/src/dex_verifier.cc +++ b/src/dex_verifier.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 "dex_verifier.h" diff --git a/src/dex_verifier.h b/src/dex_verifier.h index 875b0539c1..cbdc7fd1ca 100644 --- a/src/dex_verifier.h +++ b/src/dex_verifier.h @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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. + */ #ifndef ART_SRC_DEX_VERIFY_H_ #define ART_SRC_DEX_VERIFY_H_ diff --git a/src/dex_verifier_test.cc b/src/dex_verifier_test.cc index 1c804afe07..379e8c4eb6 100644 --- a/src/dex_verifier_test.cc +++ b/src/dex_verifier_test.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 "dex_verifier.h" diff --git a/src/dlmalloc.c b/src/dlmalloc.c index 2429ccc3a8..66bc950f1f 100644 --- a/src/dlmalloc.c +++ b/src/dlmalloc.c @@ -1,4 +1,19 @@ -// Copyright 2012 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2012 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. + */ + #define FOR_DLMALLOC_C // Avoid inclusion of src/malloc.h #include "dlmalloc.h" diff --git a/src/dlmalloc.h b/src/dlmalloc.h index 892e930b0d..cb09308aa1 100644 --- a/src/dlmalloc.h +++ b/src/dlmalloc.h @@ -1,4 +1,18 @@ -// Copyright 2012 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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. + */ #ifndef ART_SRC_DLMALLOC_H_ #define ART_SRC_DLMALLOC_H_ diff --git a/src/exception_test.cc b/src/exception_test.cc index eca1fa8cfe..2392a31474 100644 --- a/src/exception_test.cc +++ b/src/exception_test.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 diff --git a/src/file.cc b/src/file.cc index df934e980b..310876b1cc 100644 --- a/src/file.cc +++ b/src/file.cc @@ -1,4 +1,18 @@ -// Copyright 2009 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2009 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 "file.h" diff --git a/src/file.h b/src/file.h index 3353602145..7e3d72b562 100644 --- a/src/file.h +++ b/src/file.h @@ -1,4 +1,18 @@ -// Copyright 2009 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2009 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. + */ #ifndef ART_SRC_FILE_H_ #define ART_SRC_FILE_H_ diff --git a/src/file_linux.cc b/src/file_linux.cc index 367dbe8d0e..cd272fb0bb 100644 --- a/src/file_linux.cc +++ b/src/file_linux.cc @@ -1,4 +1,18 @@ -// Copyright 2010 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2010 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 "file_linux.h" diff --git a/src/file_linux.h b/src/file_linux.h index 3d381d545e..b7dcd2321c 100644 --- a/src/file_linux.h +++ b/src/file_linux.h @@ -1,4 +1,18 @@ -// Copyright 2010 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2010 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. + */ #ifndef ART_SRC_FILE_LINUX_H_ #define ART_SRC_FILE_LINUX_H_ diff --git a/src/file_test.cc b/src/file_test.cc index 2c91ab6fdd..85c130e914 100644 --- a/src/file_test.cc +++ b/src/file_test.cc @@ -1,4 +1,18 @@ -// Copyright 2009 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2009 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 "file.h" diff --git a/src/globals.h b/src/globals.h index e5b0075486..4300a6e6fe 100644 --- a/src/globals.h +++ b/src/globals.h @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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. + */ #ifndef ART_SRC_GLOBALS_H_ #define ART_SRC_GLOBALS_H_ diff --git a/src/heap.cc b/src/heap.cc index 6272bffdc7..392db8a156 100644 --- a/src/heap.cc +++ b/src/heap.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 "heap.h" diff --git a/src/heap_bitmap.cc b/src/heap_bitmap.cc index 57c60ba9f6..fd75b7ef57 100644 --- a/src/heap_bitmap.cc +++ b/src/heap_bitmap.cc @@ -1,16 +1,18 @@ -// Copyright (C) 2008 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. +/* + * Copyright (C) 2008 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 "heap_bitmap.h" diff --git a/src/heap_bitmap.h b/src/heap_bitmap.h index 0d6de60917..aa542db6ec 100644 --- a/src/heap_bitmap.h +++ b/src/heap_bitmap.h @@ -1,16 +1,18 @@ -// Copyright (C) 2008 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. +/* + * Copyright (C) 2008 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. + */ #ifndef ART_SRC_HEAP_BITMAP_H_ #define ART_SRC_HEAP_BITMAP_H_ diff --git a/src/heap_test.cc b/src/heap_test.cc index 2208e57f47..2035ce881c 100644 --- a/src/heap_test.cc +++ b/src/heap_test.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 "common_test.h" diff --git a/src/image.cc b/src/image.cc index c610c8a131..3ce27aabbb 100644 --- a/src/image.cc +++ b/src/image.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 "image.h" diff --git a/src/image.h b/src/image.h index d0071d6aec..1b80cb6cca 100644 --- a/src/image.h +++ b/src/image.h @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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. + */ #ifndef ART_SRC_IMAGE_H_ #define ART_SRC_IMAGE_H_ diff --git a/src/image_test.cc b/src/image_test.cc index 6976787045..97d37c5780 100644 --- a/src/image_test.cc +++ b/src/image_test.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 #include diff --git a/src/image_writer.cc b/src/image_writer.cc index 293bd96d02..d8bb5ea4ed 100644 --- a/src/image_writer.cc +++ b/src/image_writer.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 "image_writer.h" diff --git a/src/image_writer.h b/src/image_writer.h index 1be07bda56..4bb930e824 100644 --- a/src/image_writer.h +++ b/src/image_writer.h @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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. + */ #ifndef ART_SRC_IMAGE_WRITER_H_ #define ART_SRC_IMAGE_WRITER_H_ diff --git a/src/intern_table.cc b/src/intern_table.cc index e75597e159..f3c82acd6e 100644 --- a/src/intern_table.cc +++ b/src/intern_table.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 "intern_table.h" diff --git a/src/intern_table.h b/src/intern_table.h index a5bf1874b9..bb8e0315da 100644 --- a/src/intern_table.h +++ b/src/intern_table.h @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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. + */ #ifndef ART_SRC_INTERN_TABLE_H_ #define ART_SRC_INTERN_TABLE_H_ diff --git a/src/intern_table_test.cc b/src/intern_table_test.cc index b6ecdc6d01..52531cee32 100644 --- a/src/intern_table_test.cc +++ b/src/intern_table_test.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 "intern_table.h" diff --git a/src/jni_compiler.cc b/src/jni_compiler.cc index 6758026489..a7a7d12f3f 100644 --- a/src/jni_compiler.cc +++ b/src/jni_compiler.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 "jni_compiler.h" diff --git a/src/jni_compiler.h b/src/jni_compiler.h index f6e8cd444c..53563b3745 100644 --- a/src/jni_compiler.h +++ b/src/jni_compiler.h @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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. + */ #ifndef ART_SRC_JNI_COMPILER_H_ #define ART_SRC_JNI_COMPILER_H_ diff --git a/src/jni_compiler_test.cc b/src/jni_compiler_test.cc index 5e19d4d6ca..cf7068570f 100644 --- a/src/jni_compiler_test.cc +++ b/src/jni_compiler_test.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 "jni_compiler.h" diff --git a/src/jni_internal.cc b/src/jni_internal.cc index 5385ae2ad3..0921afb327 100644 --- a/src/jni_internal.cc +++ b/src/jni_internal.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 "jni_internal.h" diff --git a/src/jni_internal.h b/src/jni_internal.h index dc268c4935..f21b36acef 100644 --- a/src/jni_internal.h +++ b/src/jni_internal.h @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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. + */ #ifndef ART_SRC_JNI_INTERNAL_H_ #define ART_SRC_JNI_INTERNAL_H_ diff --git a/src/jni_internal_arm.cc b/src/jni_internal_arm.cc index dadf7b4220..d54d748ab3 100644 --- a/src/jni_internal_arm.cc +++ b/src/jni_internal_arm.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 "jni_internal.h" diff --git a/src/jni_internal_test.cc b/src/jni_internal_test.cc index 7db74a771f..62f55b731b 100644 --- a/src/jni_internal_test.cc +++ b/src/jni_internal_test.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 "jni_internal.h" diff --git a/src/jni_internal_x86.cc b/src/jni_internal_x86.cc index 7d931bab8c..540a071630 100644 --- a/src/jni_internal_x86.cc +++ b/src/jni_internal_x86.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 "jni_internal.h" diff --git a/src/leb128.h b/src/leb128.h index ad551990bf..918d711c9e 100644 --- a/src/leb128.h +++ b/src/leb128.h @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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. + */ #ifndef ART_SRC_LEB128_H_ #define ART_SRC_LEB128_H_ diff --git a/src/macros.h b/src/macros.h index 6f961faf97..1800deaedd 100644 --- a/src/macros.h +++ b/src/macros.h @@ -1,15 +1,18 @@ -// Copyright 2010 Google -// 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. +/* + * Copyright (C) 2010 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. + */ #ifndef ART_SRC_MACROS_H_ #define ART_SRC_MACROS_H_ diff --git a/src/managed_register.h b/src/managed_register.h index 14f8b6c2bf..e9236b94b2 100644 --- a/src/managed_register.h +++ b/src/managed_register.h @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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. + */ #ifndef ART_SRC_MANAGED_REGISTER_H_ #define ART_SRC_MANAGED_REGISTER_H_ diff --git a/src/managed_register_arm.cc b/src/managed_register_arm.cc index 984bb5344d..272c52b114 100644 --- a/src/managed_register_arm.cc +++ b/src/managed_register_arm.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 "managed_register_arm.h" diff --git a/src/managed_register_arm.h b/src/managed_register_arm.h index 1ec619854a..3576b5a7b6 100644 --- a/src/managed_register_arm.h +++ b/src/managed_register_arm.h @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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. + */ #ifndef ART_SRC_MANAGED_REGISTER_ARM_H_ #define ART_SRC_MANAGED_REGISTER_ARM_H_ diff --git a/src/managed_register_arm_test.cc b/src/managed_register_arm_test.cc index 6a8d0437b9..f5d4cc0d10 100644 --- a/src/managed_register_arm_test.cc +++ b/src/managed_register_arm_test.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 "globals.h" #include "managed_register_arm.h" diff --git a/src/managed_register_x86.cc b/src/managed_register_x86.cc index 45f73d6225..453cab79b4 100644 --- a/src/managed_register_x86.cc +++ b/src/managed_register_x86.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 "managed_register_x86.h" diff --git a/src/managed_register_x86.h b/src/managed_register_x86.h index 264032174d..94d50b2870 100644 --- a/src/managed_register_x86.h +++ b/src/managed_register_x86.h @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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. + */ #ifndef ART_SRC_MANAGED_REGISTER_X86_H_ #define ART_SRC_MANAGED_REGISTER_X86_H_ diff --git a/src/managed_register_x86_test.cc b/src/managed_register_x86_test.cc index 6121e263f8..4fbafdadf9 100644 --- a/src/managed_register_x86_test.cc +++ b/src/managed_register_x86_test.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 "globals.h" #include "managed_register_x86.h" diff --git a/src/mark_stack.cc b/src/mark_stack.cc index 917c7b4827..60c9e0d64e 100644 --- a/src/mark_stack.cc +++ b/src/mark_stack.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 "mark_stack.h" diff --git a/src/mark_stack.h b/src/mark_stack.h index 28ad1651ef..4301e0e519 100644 --- a/src/mark_stack.h +++ b/src/mark_stack.h @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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. + */ #ifndef ART_SRC_MARK_STACK_H_ #define ART_SRC_MARK_STACK_H_ diff --git a/src/mark_sweep.cc b/src/mark_sweep.cc index cc1dcde961..48473d575d 100644 --- a/src/mark_sweep.cc +++ b/src/mark_sweep.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 "mark_sweep.h" diff --git a/src/mark_sweep.h b/src/mark_sweep.h index 3b72d1a4bc..c6756759b2 100644 --- a/src/mark_sweep.h +++ b/src/mark_sweep.h @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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. + */ #ifndef ART_SRC_MARK_SWEEP_H_ #define ART_SRC_MARK_SWEEP_H_ diff --git a/src/memory_region.cc b/src/memory_region.cc index 987db51807..78cb91db55 100644 --- a/src/memory_region.cc +++ b/src/memory_region.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 #include diff --git a/src/memory_region.h b/src/memory_region.h index 3d04d91d92..5a7eab61e2 100644 --- a/src/memory_region.h +++ b/src/memory_region.h @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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. + */ #ifndef ART_SRC_MEMORY_REGION_H_ #define ART_SRC_MEMORY_REGION_H_ diff --git a/src/mutex_test.cc b/src/mutex_test.cc index bafd7899ac..2099951cb5 100644 --- a/src/mutex_test.cc +++ b/src/mutex_test.cc @@ -1,4 +1,18 @@ -// Copyright 2012 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2012 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 "mutex.h" diff --git a/src/oat.cc b/src/oat.cc index c458ea3a9f..1a884e3ad7 100644 --- a/src/oat.cc +++ b/src/oat.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 "oat.h" diff --git a/src/oat.h b/src/oat.h index 4023aed05d..23e25af149 100644 --- a/src/oat.h +++ b/src/oat.h @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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. + */ #ifndef ART_SRC_OAT_H_ #define ART_SRC_OAT_H_ diff --git a/src/oat_file.cc b/src/oat_file.cc index 168f0e34f3..4bcd9679f1 100644 --- a/src/oat_file.cc +++ b/src/oat_file.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 "oat_file.h" diff --git a/src/oat_file.h b/src/oat_file.h index 8415140549..4740ae77ab 100644 --- a/src/oat_file.h +++ b/src/oat_file.h @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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. + */ #ifndef ART_SRC_OAT_FILE_H_ #define ART_SRC_OAT_FILE_H_ diff --git a/src/oat_test.cc b/src/oat_test.cc index 5201beabb2..d64f81017e 100644 --- a/src/oat_test.cc +++ b/src/oat_test.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 "oat_file.h" #include "oat_writer.h" diff --git a/src/oat_writer.cc b/src/oat_writer.cc index b8dc14bf09..94281c9203 100644 --- a/src/oat_writer.cc +++ b/src/oat_writer.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 "oat_writer.h" diff --git a/src/oat_writer.h b/src/oat_writer.h index 33dcf0e68b..93e42098bc 100644 --- a/src/oat_writer.h +++ b/src/oat_writer.h @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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. + */ #ifndef ART_SRC_OAT_WRITER_H_ #define ART_SRC_OAT_WRITER_H_ diff --git a/src/oatdump.cc b/src/oatdump.cc index bf9962cea4..a70bcd3b0b 100644 --- a/src/oatdump.cc +++ b/src/oatdump.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 #include diff --git a/src/oatexec.cc b/src/oatexec.cc index 347cdf73fc..f4cf2f12a1 100644 --- a/src/oatexec.cc +++ b/src/oatexec.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 diff --git a/src/object.cc b/src/object.cc index 32521f8884..7ead4ab7a3 100644 --- a/src/object.cc +++ b/src/object.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 "object.h" diff --git a/src/object_test.cc b/src/object_test.cc index b1d5885c62..ce19b9b17d 100644 --- a/src/object_test.cc +++ b/src/object_test.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 "object.h" diff --git a/src/offsets.cc b/src/offsets.cc index 49e52fbabf..369140176e 100644 --- a/src/offsets.cc +++ b/src/offsets.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 "offsets.h" diff --git a/src/offsets.h b/src/offsets.h index 19c672a515..f37dbd4413 100644 --- a/src/offsets.h +++ b/src/offsets.h @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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. + */ #ifndef ART_SRC_OFFSETS_H_ #define ART_SRC_OFFSETS_H_ diff --git a/src/os.h b/src/os.h index c36680dfe2..e73d9ff56e 100644 --- a/src/os.h +++ b/src/os.h @@ -1,4 +1,18 @@ -// Copyright 2009 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2009 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. + */ #ifndef ART_SRC_OS_H_ #define ART_SRC_OS_H_ diff --git a/src/os_linux.cc b/src/os_linux.cc index 3fae386e39..5974c003d3 100644 --- a/src/os_linux.cc +++ b/src/os_linux.cc @@ -1,4 +1,18 @@ -// Copyright 2010 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2010 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 "os.h" diff --git a/src/reference_table_test.cc b/src/reference_table_test.cc index 73ec87beca..4c1e67fb11 100644 --- a/src/reference_table_test.cc +++ b/src/reference_table_test.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 "common_test.h" diff --git a/src/runtime.cc b/src/runtime.cc index 6a454a0bcd..726b30c9c2 100644 --- a/src/runtime.cc +++ b/src/runtime.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 "runtime.h" diff --git a/src/runtime.h b/src/runtime.h index f950addd0b..dda58231bb 100644 --- a/src/runtime.h +++ b/src/runtime.h @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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. + */ #ifndef ART_SRC_RUNTIME_H_ #define ART_SRC_RUNTIME_H_ diff --git a/src/runtime_android.cc b/src/runtime_android.cc index 4561552adc..4a736e6abc 100644 --- a/src/runtime_android.cc +++ b/src/runtime_android.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 "runtime.h" diff --git a/src/runtime_linux.cc b/src/runtime_linux.cc index b614a635e4..8fd81cc049 100644 --- a/src/runtime_linux.cc +++ b/src/runtime_linux.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 "runtime.h" diff --git a/src/runtime_support.h b/src/runtime_support.h index a7c40c4981..096e6ab257 100644 --- a/src/runtime_support.h +++ b/src/runtime_support.h @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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. + */ #ifndef ART_SRC_RUNTIME_SUPPORT_H_ #define ART_SRC_RUNTIME_SUPPORT_H_ diff --git a/src/runtime_test.cc b/src/runtime_test.cc index a926a2397b..42e795071d 100644 --- a/src/runtime_test.cc +++ b/src/runtime_test.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 "runtime.h" diff --git a/src/scoped_jni_thread_state.h b/src/scoped_jni_thread_state.h index b312c5aead..2db04fcdde 100644 --- a/src/scoped_jni_thread_state.h +++ b/src/scoped_jni_thread_state.h @@ -1,5 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. -// Author: enh@google.com (Elliott Hughes) +/* + * Copyright (C) 2011 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 "jni_internal.h" diff --git a/src/space.cc b/src/space.cc index 6ecca145ae..ddbf068e2d 100644 --- a/src/space.cc +++ b/src/space.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 "space.h" diff --git a/src/space_test.cc b/src/space_test.cc index 4025805a3a..eb4fa86873 100644 --- a/src/space_test.cc +++ b/src/space_test.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 "space.h" diff --git a/src/stl_util.h b/src/stl_util.h index d503a54358..c0fe6b1330 100644 --- a/src/stl_util.h +++ b/src/stl_util.h @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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. + */ #ifndef ART_SRC_STL_UTIL_H_ #define ART_SRC_STL_UTIL_H_ diff --git a/src/stringpiece.cc b/src/stringpiece.cc index 51f3980962..715d964a12 100644 --- a/src/stringpiece.cc +++ b/src/stringpiece.cc @@ -1,15 +1,18 @@ -// Copyright 2010 Google -// 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. +/* + * Copyright (C) 2010 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 "stringpiece.h" diff --git a/src/stringpiece.h b/src/stringpiece.h index e0f5ef6a3d..7299120da3 100644 --- a/src/stringpiece.h +++ b/src/stringpiece.h @@ -1,15 +1,18 @@ -// Copyright 2010 Google -// 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. +/* + * Copyright (C) 2010 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. + */ // A string-like object that points to a sized piece of memory. // diff --git a/src/stringprintf.cc b/src/stringprintf.cc index 2a11437056..aed60ebd71 100644 --- a/src/stringprintf.cc +++ b/src/stringprintf.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 "stringprintf.h" diff --git a/src/stringprintf.h b/src/stringprintf.h index 19b006bc93..21eb46535c 100644 --- a/src/stringprintf.h +++ b/src/stringprintf.h @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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. + */ #ifndef STRINGPRINTF_H_ #define STRINGPRINTF_H_ diff --git a/src/strutil.h b/src/strutil.h index c9c6caa563..b8769183da 100644 --- a/src/strutil.h +++ b/src/strutil.h @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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. + */ #ifndef ART_SRC_STRUTIL_H_ #define ART_SRC_STRUTIL_H_ diff --git a/src/stub_arm.cc b/src/stub_arm.cc index 93e93f11dd..29d6bb2d1d 100644 --- a/src/stub_arm.cc +++ b/src/stub_arm.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 "assembler_arm.h" #include "jni_internal.h" diff --git a/src/stub_x86.cc b/src/stub_x86.cc index 460c1e2d52..c330f78bef 100644 --- a/src/stub_x86.cc +++ b/src/stub_x86.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 "assembler_x86.h" #include "jni_internal.h" diff --git a/src/thread_arm.cc b/src/thread_arm.cc index 0196eb8970..b3e645441e 100644 --- a/src/thread_arm.cc +++ b/src/thread_arm.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 "thread.h" diff --git a/src/thread_x86.cc b/src/thread_x86.cc index cdba138953..b58a328f97 100644 --- a/src/thread_x86.cc +++ b/src/thread_x86.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 "thread.h" diff --git a/src/trace.cc b/src/trace.cc index ee97ee13a9..3c2f1b201e 100644 --- a/src/trace.cc +++ b/src/trace.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 "trace.h" diff --git a/src/trace.h b/src/trace.h index 85d328cb71..c84e99e96b 100644 --- a/src/trace.h +++ b/src/trace.h @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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. + */ #ifndef ART_SRC_TRACE_H_ #define ART_SRC_TRACE_H_ diff --git a/src/utf.cc b/src/utf.cc index 14f511c073..658ca6a895 100644 --- a/src/utf.cc +++ b/src/utf.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 "utf.h" diff --git a/src/utf.h b/src/utf.h index 42c6dc706b..0758896125 100644 --- a/src/utf.h +++ b/src/utf.h @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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. + */ #ifndef ART_SRC_UTF_H_ #define ART_SRC_UTF_H_ diff --git a/src/utils.cc b/src/utils.cc index 14a8facab0..97efcde899 100644 --- a/src/utils.cc +++ b/src/utils.cc @@ -1,5 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. -// Author: enh@google.com (Elliott Hughes) +/* + * Copyright (C) 2011 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 "utils.h" diff --git a/src/utils.h b/src/utils.h index be7d8badae..7daa4f97aa 100644 --- a/src/utils.h +++ b/src/utils.h @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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. + */ #ifndef ART_SRC_UTILS_H_ #define ART_SRC_UTILS_H_ diff --git a/src/utils_test.cc b/src/utils_test.cc index 1c3fe7925a..7f9f4b9e08 100644 --- a/src/utils_test.cc +++ b/src/utils_test.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 "object.h" #include "common_test.h" diff --git a/src/zip_archive_test.cc b/src/zip_archive_test.cc index 747c219e86..bd0bc6d93f 100644 --- a/src/zip_archive_test.cc +++ b/src/zip_archive_test.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 "zip_archive.h" diff --git a/test/003-omnibus-opcodes/src/Array.java b/test/003-omnibus-opcodes/src/Array.java index 1daf3b9fd5..cb3ecde21a 100644 --- a/test/003-omnibus-opcodes/src/Array.java +++ b/test/003-omnibus-opcodes/src/Array.java @@ -1,5 +1,18 @@ -// Copyright 2008 The Android Open Source Project - +/* + * Copyright (C) 2008 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. + */ /** * Exercise arrays. diff --git a/test/003-omnibus-opcodes/src/Classes.java b/test/003-omnibus-opcodes/src/Classes.java index d7f937c867..1f6b1cbd44 100644 --- a/test/003-omnibus-opcodes/src/Classes.java +++ b/test/003-omnibus-opcodes/src/Classes.java @@ -1,4 +1,18 @@ -// Copyright 2008 The Android Open Source Project +/* + * Copyright (C) 2008 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. + */ import java.io.Serializable; import java.util.Arrays; diff --git a/test/003-omnibus-opcodes/src/Compare.java b/test/003-omnibus-opcodes/src/Compare.java index c0b2fd5755..6b5975e4f0 100644 --- a/test/003-omnibus-opcodes/src/Compare.java +++ b/test/003-omnibus-opcodes/src/Compare.java @@ -1,6 +1,18 @@ -// Copyright 2008 The Android Open Source Project - - +/* + * Copyright (C) 2008 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. + */ /** * Test comparison operators. diff --git a/test/003-omnibus-opcodes/src/FloatMath.java b/test/003-omnibus-opcodes/src/FloatMath.java index 0658a65aaa..a0bc9f46dd 100644 --- a/test/003-omnibus-opcodes/src/FloatMath.java +++ b/test/003-omnibus-opcodes/src/FloatMath.java @@ -1,4 +1,18 @@ -// Copyright 2006 The Android Open Source Project +/* + * Copyright (C) 2006 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. + */ /** * Test arithmetic operations. diff --git a/test/003-omnibus-opcodes/src/IntMath.java b/test/003-omnibus-opcodes/src/IntMath.java index ae5a27345d..be883b9e7d 100644 --- a/test/003-omnibus-opcodes/src/IntMath.java +++ b/test/003-omnibus-opcodes/src/IntMath.java @@ -1,4 +1,18 @@ -// Copyright 2006 The Android Open Source Project +/* + * Copyright (C) 2006 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. + */ /** * Test arithmetic operations. diff --git a/test/003-omnibus-opcodes/src/Monitor.java b/test/003-omnibus-opcodes/src/Monitor.java index 506c60f837..ef67fd7385 100644 --- a/test/003-omnibus-opcodes/src/Monitor.java +++ b/test/003-omnibus-opcodes/src/Monitor.java @@ -1,5 +1,18 @@ -// Copyright 2008 The Android Open Source Project - +/* + * Copyright (C) 2008 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. + */ /** diff --git a/test/008-instanceof/src/Iface1.java b/test/008-instanceof/src/Iface1.java index ba17d45f2f..d7f5376833 100644 --- a/test/008-instanceof/src/Iface1.java +++ b/test/008-instanceof/src/Iface1.java @@ -1,4 +1,18 @@ -// Copyright 2005 The Android Open Source Project +/* + * Copyright (C) 2005 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. + */ /** * Test stuff. diff --git a/test/008-instanceof/src/Iface2.java b/test/008-instanceof/src/Iface2.java index 83fe6508df..2b33c39ab3 100644 --- a/test/008-instanceof/src/Iface2.java +++ b/test/008-instanceof/src/Iface2.java @@ -1,4 +1,18 @@ -// Copyright 2006 The Android Open Source Project +/* + * Copyright (C) 2006 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. + */ /** * Another interface. diff --git a/test/008-instanceof/src/Iface2Sub1.java b/test/008-instanceof/src/Iface2Sub1.java index db3e905bd4..bcff8ab1fc 100644 --- a/test/008-instanceof/src/Iface2Sub1.java +++ b/test/008-instanceof/src/Iface2Sub1.java @@ -1,4 +1,18 @@ -// Copyright 2006 The Android Open Source Project +/* + * Copyright (C) 2006 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. + */ /** * Another interface. diff --git a/test/008-instanceof/src/ImplA.java b/test/008-instanceof/src/ImplA.java index 9007001b97..27364f2c62 100644 --- a/test/008-instanceof/src/ImplA.java +++ b/test/008-instanceof/src/ImplA.java @@ -1,4 +1,18 @@ -// Copyright 2006 The Android Open Source Project +/* + * Copyright (C) 2006 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. + */ /** * Blah. diff --git a/test/008-instanceof/src/ImplB.java b/test/008-instanceof/src/ImplB.java index 619fa005b1..8b05702a97 100644 --- a/test/008-instanceof/src/ImplB.java +++ b/test/008-instanceof/src/ImplB.java @@ -1,4 +1,18 @@ -// Copyright 2006 The Android Open Source Project +/* + * Copyright (C) 2006 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. + */ /** * Blah. diff --git a/test/008-instanceof/src/ImplBSub.java b/test/008-instanceof/src/ImplBSub.java index f3a771442a..a94ae4d19a 100644 --- a/test/008-instanceof/src/ImplBSub.java +++ b/test/008-instanceof/src/ImplBSub.java @@ -1,4 +1,18 @@ -// Copyright 2006 The Android Open Source Project +/* + * Copyright (C) 2006 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. + */ /** * Interface test. diff --git a/test/009-instanceof2/src/Iface1.java b/test/009-instanceof2/src/Iface1.java index ba17d45f2f..d7f5376833 100644 --- a/test/009-instanceof2/src/Iface1.java +++ b/test/009-instanceof2/src/Iface1.java @@ -1,4 +1,18 @@ -// Copyright 2005 The Android Open Source Project +/* + * Copyright (C) 2005 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. + */ /** * Test stuff. diff --git a/test/009-instanceof2/src/Iface2.java b/test/009-instanceof2/src/Iface2.java index 83fe6508df..2b33c39ab3 100644 --- a/test/009-instanceof2/src/Iface2.java +++ b/test/009-instanceof2/src/Iface2.java @@ -1,4 +1,18 @@ -// Copyright 2006 The Android Open Source Project +/* + * Copyright (C) 2006 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. + */ /** * Another interface. diff --git a/test/009-instanceof2/src/Iface2Sub1.java b/test/009-instanceof2/src/Iface2Sub1.java index db3e905bd4..bcff8ab1fc 100644 --- a/test/009-instanceof2/src/Iface2Sub1.java +++ b/test/009-instanceof2/src/Iface2Sub1.java @@ -1,4 +1,18 @@ -// Copyright 2006 The Android Open Source Project +/* + * Copyright (C) 2006 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. + */ /** * Another interface. diff --git a/test/009-instanceof2/src/ImplA.java b/test/009-instanceof2/src/ImplA.java index 9007001b97..27364f2c62 100644 --- a/test/009-instanceof2/src/ImplA.java +++ b/test/009-instanceof2/src/ImplA.java @@ -1,4 +1,18 @@ -// Copyright 2006 The Android Open Source Project +/* + * Copyright (C) 2006 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. + */ /** * Blah. diff --git a/test/009-instanceof2/src/ImplB.java b/test/009-instanceof2/src/ImplB.java index 619fa005b1..8b05702a97 100644 --- a/test/009-instanceof2/src/ImplB.java +++ b/test/009-instanceof2/src/ImplB.java @@ -1,4 +1,18 @@ -// Copyright 2006 The Android Open Source Project +/* + * Copyright (C) 2006 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. + */ /** * Blah. diff --git a/test/009-instanceof2/src/ImplBSub.java b/test/009-instanceof2/src/ImplBSub.java index f3a771442a..a94ae4d19a 100644 --- a/test/009-instanceof2/src/ImplBSub.java +++ b/test/009-instanceof2/src/ImplBSub.java @@ -1,4 +1,18 @@ -// Copyright 2006 The Android Open Source Project +/* + * Copyright (C) 2006 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. + */ /** * Interface test. diff --git a/test/010-instance/src/InstanceTest.java b/test/010-instance/src/InstanceTest.java index 78384ff761..a8e8f4789b 100644 --- a/test/010-instance/src/InstanceTest.java +++ b/test/010-instance/src/InstanceTest.java @@ -1,4 +1,18 @@ -// Copyright 2006 The Android Open Source Project +/* + * Copyright (C) 2006 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. + */ import java.io.Serializable; diff --git a/test/011-array-copy/src/Iface1.java b/test/011-array-copy/src/Iface1.java index ba17d45f2f..d7f5376833 100644 --- a/test/011-array-copy/src/Iface1.java +++ b/test/011-array-copy/src/Iface1.java @@ -1,4 +1,18 @@ -// Copyright 2005 The Android Open Source Project +/* + * Copyright (C) 2005 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. + */ /** * Test stuff. diff --git a/test/011-array-copy/src/Iface2.java b/test/011-array-copy/src/Iface2.java index 83fe6508df..2b33c39ab3 100644 --- a/test/011-array-copy/src/Iface2.java +++ b/test/011-array-copy/src/Iface2.java @@ -1,4 +1,18 @@ -// Copyright 2006 The Android Open Source Project +/* + * Copyright (C) 2006 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. + */ /** * Another interface. diff --git a/test/011-array-copy/src/ImplA.java b/test/011-array-copy/src/ImplA.java index 9007001b97..27364f2c62 100644 --- a/test/011-array-copy/src/ImplA.java +++ b/test/011-array-copy/src/ImplA.java @@ -1,4 +1,18 @@ -// Copyright 2006 The Android Open Source Project +/* + * Copyright (C) 2006 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. + */ /** * Blah. diff --git a/test/022-interface/src/Iface1.java b/test/022-interface/src/Iface1.java index ba17d45f2f..d7f5376833 100644 --- a/test/022-interface/src/Iface1.java +++ b/test/022-interface/src/Iface1.java @@ -1,4 +1,18 @@ -// Copyright 2005 The Android Open Source Project +/* + * Copyright (C) 2005 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. + */ /** * Test stuff. diff --git a/test/022-interface/src/Iface2.java b/test/022-interface/src/Iface2.java index 83fe6508df..2b33c39ab3 100644 --- a/test/022-interface/src/Iface2.java +++ b/test/022-interface/src/Iface2.java @@ -1,4 +1,18 @@ -// Copyright 2006 The Android Open Source Project +/* + * Copyright (C) 2006 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. + */ /** * Another interface. diff --git a/test/022-interface/src/Iface2Sub1.java b/test/022-interface/src/Iface2Sub1.java index db3e905bd4..bcff8ab1fc 100644 --- a/test/022-interface/src/Iface2Sub1.java +++ b/test/022-interface/src/Iface2Sub1.java @@ -1,4 +1,18 @@ -// Copyright 2006 The Android Open Source Project +/* + * Copyright (C) 2006 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. + */ /** * Another interface. diff --git a/test/022-interface/src/ImplA.java b/test/022-interface/src/ImplA.java index 9007001b97..27364f2c62 100644 --- a/test/022-interface/src/ImplA.java +++ b/test/022-interface/src/ImplA.java @@ -1,4 +1,18 @@ -// Copyright 2006 The Android Open Source Project +/* + * Copyright (C) 2006 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. + */ /** * Blah. diff --git a/test/022-interface/src/ImplB.java b/test/022-interface/src/ImplB.java index 619fa005b1..8b05702a97 100644 --- a/test/022-interface/src/ImplB.java +++ b/test/022-interface/src/ImplB.java @@ -1,4 +1,18 @@ -// Copyright 2006 The Android Open Source Project +/* + * Copyright (C) 2006 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. + */ /** * Blah. diff --git a/test/022-interface/src/ImplBSub.java b/test/022-interface/src/ImplBSub.java index f3a771442a..a94ae4d19a 100644 --- a/test/022-interface/src/ImplBSub.java +++ b/test/022-interface/src/ImplBSub.java @@ -1,4 +1,18 @@ -// Copyright 2006 The Android Open Source Project +/* + * Copyright (C) 2006 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. + */ /** * Interface test. diff --git a/test/023-many-interfaces/src/ManyInterfaces.java b/test/023-many-interfaces/src/ManyInterfaces.java index 375938afde..c4cb4ab25f 100644 --- a/test/023-many-interfaces/src/ManyInterfaces.java +++ b/test/023-many-interfaces/src/ManyInterfaces.java @@ -1,4 +1,18 @@ -// Copyright 2007 The Android Open Source Project +/* + * Copyright (C) 2007 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. + */ /* Initial: diff --git a/test/024-illegal-access/src/PublicAccess.java b/test/024-illegal-access/src/PublicAccess.java index fdc0e9e707..4e72cd4dce 100644 --- a/test/024-illegal-access/src/PublicAccess.java +++ b/test/024-illegal-access/src/PublicAccess.java @@ -1,4 +1,18 @@ -// Copyright 2006 The Android Open Source Project +/* + * Copyright (C) 2006 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. + */ /** * Some stuff for access checks. diff --git a/test/024-illegal-access/src/SemiPrivate.java b/test/024-illegal-access/src/SemiPrivate.java index 17b2ac02f3..06b16c40b9 100644 --- a/test/024-illegal-access/src/SemiPrivate.java +++ b/test/024-illegal-access/src/SemiPrivate.java @@ -1,4 +1,18 @@ -// Copyright 2006 The Android Open Source Project +/* + * Copyright (C) 2006 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. + */ /** * Version with package scope access. diff --git a/test/024-illegal-access/src2/SemiPrivate.java b/test/024-illegal-access/src2/SemiPrivate.java index cf6f8e6e1d..064265ab37 100644 --- a/test/024-illegal-access/src2/SemiPrivate.java +++ b/test/024-illegal-access/src2/SemiPrivate.java @@ -1,4 +1,18 @@ -// Copyright 2006 The Android Open Source Project +/* + * Copyright (C) 2006 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. + */ /** * Version with private access. diff --git a/test/025-access-controller/src/Main.java b/test/025-access-controller/src/Main.java index 84dc057715..d32f19a398 100644 --- a/test/025-access-controller/src/Main.java +++ b/test/025-access-controller/src/Main.java @@ -1,4 +1,18 @@ -// Copyright 2007 The Android Open Source Project +/* + * Copyright (C) 2007 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. + */ import java.security.AccessController; diff --git a/test/025-access-controller/src/Privvy.java b/test/025-access-controller/src/Privvy.java index 07a0678151..cfaa7182df 100644 --- a/test/025-access-controller/src/Privvy.java +++ b/test/025-access-controller/src/Privvy.java @@ -1,4 +1,18 @@ -// Copyright 2007 The Android Open Source Project +/* + * Copyright (C) 2007 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. + */ import java.security.AccessController; import java.security.PrivilegedAction; diff --git a/test/026-access/src/Main.java b/test/026-access/src/Main.java index 96282598f9..6b509a3ebb 100644 --- a/test/026-access/src/Main.java +++ b/test/026-access/src/Main.java @@ -1,4 +1,18 @@ -// Copyright 2006 The Android Open Source Project +/* + * Copyright (C) 2006 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. + */ import otherpackage.PublicAccess; diff --git a/test/027-arithmetic/src/Main.java b/test/027-arithmetic/src/Main.java index 4d0f74e7d1..66c837948e 100644 --- a/test/027-arithmetic/src/Main.java +++ b/test/027-arithmetic/src/Main.java @@ -1,4 +1,18 @@ -// Copyright 2006 The Android Open Source Project +/* + * Copyright (C) 2006 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. + */ /** * Test arithmetic operations. diff --git a/test/028-array-write/src/Main.java b/test/028-array-write/src/Main.java index 6f36f849d0..9e2826ea56 100644 --- a/test/028-array-write/src/Main.java +++ b/test/028-array-write/src/Main.java @@ -1,4 +1,18 @@ -// Copyright 2007 The Android Open Source Project +/* + * Copyright (C) 2007 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. + */ /** * Array write speed test. diff --git a/test/029-assert/src/Main.java b/test/029-assert/src/Main.java index b1544fb5ab..1d3b10aa21 100644 --- a/test/029-assert/src/Main.java +++ b/test/029-assert/src/Main.java @@ -1,4 +1,18 @@ -// Copyright 2007 The Android Open Source Project +/* + * Copyright (C) 2007 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. + */ /** * Test Java language asserts. diff --git a/test/030-bad-finalizer/src/BadFinalizer.java b/test/030-bad-finalizer/src/BadFinalizer.java index 3ff422b3d2..6911a02781 100644 --- a/test/030-bad-finalizer/src/BadFinalizer.java +++ b/test/030-bad-finalizer/src/BadFinalizer.java @@ -1,4 +1,18 @@ -// Copyright 2007 The Android Open Source Project +/* + * Copyright (C) 2007 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. + */ /** * Class with a bad finalizer. diff --git a/test/030-bad-finalizer/src/Main.java b/test/030-bad-finalizer/src/Main.java index db80a87115..e19fd3eb0f 100644 --- a/test/030-bad-finalizer/src/Main.java +++ b/test/030-bad-finalizer/src/Main.java @@ -1,4 +1,18 @@ -// Copyright 2007 The Android Open Source Project +/* + * Copyright (C) 2007 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. + */ /** * Test a class with a bad finalizer. diff --git a/test/033-class-init-deadlock/src/Main.java b/test/033-class-init-deadlock/src/Main.java index 27c49220ef..e4ee9aeec0 100644 --- a/test/033-class-init-deadlock/src/Main.java +++ b/test/033-class-init-deadlock/src/Main.java @@ -1,4 +1,18 @@ -// Copyright 2006 The Android Open Source Project +/* + * Copyright (C) 2006 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. + */ /** * This causes most VMs to lock up. diff --git a/test/034-call-null/src/Main.java b/test/034-call-null/src/Main.java index a0a129e863..5b60c71817 100644 --- a/test/034-call-null/src/Main.java +++ b/test/034-call-null/src/Main.java @@ -1,4 +1,18 @@ -// Copyright 2008 The Android Open Source Project +/* + * Copyright (C) 2008 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 { int mFoo = 27; diff --git a/test/035-enum/src/Main.java b/test/035-enum/src/Main.java index 09fcc98e69..56dd66a81c 100644 --- a/test/035-enum/src/Main.java +++ b/test/035-enum/src/Main.java @@ -1,4 +1,18 @@ -// Copyright 2008 The Android Open Source Project +/* + * Copyright (C) 2008 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. + */ import java.lang.reflect.Field; diff --git a/test/036-finalizer/src/FinalizerTest.java b/test/036-finalizer/src/FinalizerTest.java index 420ec34b84..b0d014d765 100644 --- a/test/036-finalizer/src/FinalizerTest.java +++ b/test/036-finalizer/src/FinalizerTest.java @@ -1,4 +1,18 @@ -// Copyright 2008 The Android Open Source Project +/* + * Copyright (C) 2008 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. + */ import java.lang.ref.WeakReference; diff --git a/test/036-finalizer/src/Main.java b/test/036-finalizer/src/Main.java index c29cc1148d..4bc7d8d21d 100644 --- a/test/036-finalizer/src/Main.java +++ b/test/036-finalizer/src/Main.java @@ -1,4 +1,18 @@ -// Copyright 2008 The Android Open Source Project +/* + * Copyright (C) 2008 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. + */ import java.lang.ref.WeakReference; diff --git a/test/038-inner-null/src/Main.java b/test/038-inner-null/src/Main.java index acc87640b8..b4be88464a 100644 --- a/test/038-inner-null/src/Main.java +++ b/test/038-inner-null/src/Main.java @@ -1,4 +1,18 @@ -// Copyright 2008 The Android Open Source Project +/* + * Copyright (C) 2008 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 static void main(String[] args) { diff --git a/test/039-join-main/src/Main.java b/test/039-join-main/src/Main.java index 0644f1c434..2373221d71 100644 --- a/test/039-join-main/src/Main.java +++ b/test/039-join-main/src/Main.java @@ -1,4 +1,18 @@ -// Copyright 2007 The Android Open Source Project +/* + * Copyright (C) 2007 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. + */ /** * Make sure that a sub-thread can join the main thread. diff --git a/test/040-miranda/src/Main.java b/test/040-miranda/src/Main.java index 558806ac74..1fd8287ba0 100644 --- a/test/040-miranda/src/Main.java +++ b/test/040-miranda/src/Main.java @@ -1,4 +1,18 @@ -// Copyright 2006 The Android Open Source Project +/* + * Copyright (C) 2006 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. + */ /** * Miranda testing. diff --git a/test/040-miranda/src/MirandaAbstract.java b/test/040-miranda/src/MirandaAbstract.java index b603ce67a4..309ecca764 100644 --- a/test/040-miranda/src/MirandaAbstract.java +++ b/test/040-miranda/src/MirandaAbstract.java @@ -1,4 +1,18 @@ -// Copyright 2006 The Android Open Source Project +/* + * Copyright (C) 2006 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. + */ /** * Miranda testing. diff --git a/test/040-miranda/src/MirandaClass.java b/test/040-miranda/src/MirandaClass.java index 3bf670464d..0d942f0c98 100644 --- a/test/040-miranda/src/MirandaClass.java +++ b/test/040-miranda/src/MirandaClass.java @@ -1,4 +1,18 @@ -// Copyright 2006 The Android Open Source Project +/* + * Copyright (C) 2006 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. + */ /** * Miranda testing. diff --git a/test/040-miranda/src/MirandaInterface.java b/test/040-miranda/src/MirandaInterface.java index 2c0a59a77a..ddfbd860c6 100644 --- a/test/040-miranda/src/MirandaInterface.java +++ b/test/040-miranda/src/MirandaInterface.java @@ -1,4 +1,18 @@ -// Copyright 2006 The Android Open Source Project +/* + * Copyright (C) 2006 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. + */ /** * Miranda testing. diff --git a/test/040-miranda/src/MirandaInterface2.java b/test/040-miranda/src/MirandaInterface2.java index 83b6af80f5..7c93fd0634 100644 --- a/test/040-miranda/src/MirandaInterface2.java +++ b/test/040-miranda/src/MirandaInterface2.java @@ -1,4 +1,18 @@ -// Copyright 2006 The Android Open Source Project +/* + * Copyright (C) 2006 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. + */ /** * Miranda testing. diff --git a/test/043-privates/src/Main.java b/test/043-privates/src/Main.java index 73b4d79cb4..e7d4dd35a1 100644 --- a/test/043-privates/src/Main.java +++ b/test/043-privates/src/Main.java @@ -1,4 +1,18 @@ -// Copyright 2007 The Android Open Source Project +/* + * Copyright (C) 2007 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. + */ /** * Make sure private methods don't inherit. diff --git a/test/046-reflect/src/Main.java b/test/046-reflect/src/Main.java index 9269e117ba..f6d9b68f4e 100644 --- a/test/046-reflect/src/Main.java +++ b/test/046-reflect/src/Main.java @@ -1,4 +1,18 @@ -// Copyright 2006 The Android Open Source Project +/* + * Copyright (C) 2006 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. + */ import java.lang.reflect.*; import java.io.IOException; diff --git a/test/047-returns/src/Main.java b/test/047-returns/src/Main.java index d53c4a7f35..791f958a0f 100644 --- a/test/047-returns/src/Main.java +++ b/test/047-returns/src/Main.java @@ -1,4 +1,18 @@ -// Copyright 2007 The Android Open Source Project +/* + * Copyright (C) 2007 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. + */ /** * Return stuff. diff --git a/test/048-server-socket/src/Main.java b/test/048-server-socket/src/Main.java index 55dbf9a225..5b287ca42a 100644 --- a/test/048-server-socket/src/Main.java +++ b/test/048-server-socket/src/Main.java @@ -1,4 +1,18 @@ -// Copyright 2007 The Android Open Source Project +/* + * Copyright (C) 2007 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. + */ import java.net.ServerSocket; import java.io.IOException; diff --git a/test/049-show-object/src/Main.java b/test/049-show-object/src/Main.java index d31eeda5a1..9553c5f3e8 100644 --- a/test/049-show-object/src/Main.java +++ b/test/049-show-object/src/Main.java @@ -1,4 +1,18 @@ -// Copyright 2008 The Android Open Source Project +/* + * Copyright (C) 2008 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. + */ /* * Some basic operations for testing the debugger. diff --git a/test/050-sync-test/src/Main.java b/test/050-sync-test/src/Main.java index c2ea192e85..0de3159d9f 100644 --- a/test/050-sync-test/src/Main.java +++ b/test/050-sync-test/src/Main.java @@ -1,4 +1,18 @@ -// Copyright 2006 The Android Open Source Project +/* + * Copyright (C) 2006 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. + */ /** * Test synchronization primitives. diff --git a/test/050-sync-test/src/ThreadDeathHandler.java b/test/050-sync-test/src/ThreadDeathHandler.java index 5ea61a52d0..0a7437d307 100644 --- a/test/050-sync-test/src/ThreadDeathHandler.java +++ b/test/050-sync-test/src/ThreadDeathHandler.java @@ -1,4 +1,18 @@ -// Copyright 2007 The Android Open Source Project +/* + * Copyright (C) 2007 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. + */ import java.lang.Thread.UncaughtExceptionHandler; diff --git a/test/051-thread/src/Main.java b/test/051-thread/src/Main.java index 95ec1a1f91..ea587af90e 100644 --- a/test/051-thread/src/Main.java +++ b/test/051-thread/src/Main.java @@ -1,4 +1,18 @@ -// Copyright 2006 The Android Open Source Project +/* + * Copyright (C) 2006 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. + */ import java.util.ArrayList; diff --git a/test/052-verifier-fun/src/Main.java b/test/052-verifier-fun/src/Main.java index ca960cf4d4..0168412bab 100644 --- a/test/052-verifier-fun/src/Main.java +++ b/test/052-verifier-fun/src/Main.java @@ -1,4 +1,18 @@ -// Copyright 2007 The Android Open Source Project +/* + * Copyright (C) 2007 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. + */ import java.lang.reflect.Type; diff --git a/test/053-wait-some/src/Main.java b/test/053-wait-some/src/Main.java index 51e6c52145..8cd77ff919 100644 --- a/test/053-wait-some/src/Main.java +++ b/test/053-wait-some/src/Main.java @@ -1,4 +1,18 @@ -// Copyright 2007 The Android Open Source Project +/* + * Copyright (C) 2007 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. + */ /** * Exercise Object.wait(), comparing results against wall clock time. diff --git a/test/054-uncaught/src/Main.java b/test/054-uncaught/src/Main.java index 4ee6b050ad..90a2311306 100644 --- a/test/054-uncaught/src/Main.java +++ b/test/054-uncaught/src/Main.java @@ -1,4 +1,18 @@ -// Copyright 2006 The Android Open Source Project +/* + * Copyright (C) 2006 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. + */ /** * Test the uncaught exception handler. diff --git a/test/054-uncaught/src/ThreadDeathHandler.java b/test/054-uncaught/src/ThreadDeathHandler.java index 5ea61a52d0..0a7437d307 100644 --- a/test/054-uncaught/src/ThreadDeathHandler.java +++ b/test/054-uncaught/src/ThreadDeathHandler.java @@ -1,4 +1,18 @@ -// Copyright 2007 The Android Open Source Project +/* + * Copyright (C) 2007 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. + */ import java.lang.Thread.UncaughtExceptionHandler; diff --git a/test/059-finalizer-throw/src/Main.java b/test/059-finalizer-throw/src/Main.java index 42260e434c..fa80fe3f7a 100644 --- a/test/059-finalizer-throw/src/Main.java +++ b/test/059-finalizer-throw/src/Main.java @@ -1,4 +1,18 @@ -// Copyright 2008 The Android Open Source Project +/* + * Copyright (C) 2008 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. + */ import java.util.Timer; import java.util.TimerTask; diff --git a/test/064-field-access/src/other/OtherPackage.java b/test/064-field-access/src/other/OtherPackage.java index a595db54ce..5d12fc880b 100644 --- a/test/064-field-access/src/other/OtherPackage.java +++ b/test/064-field-access/src/other/OtherPackage.java @@ -1,4 +1,18 @@ -// Copyright 2008 The Android Open Source Project +/* + * Copyright (C) 2008 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. + */ package other; diff --git a/test/065-mismatched-implements/src/Base.java b/test/065-mismatched-implements/src/Base.java index 8623ad7bb8..def67e9d91 100644 --- a/test/065-mismatched-implements/src/Base.java +++ b/test/065-mismatched-implements/src/Base.java @@ -1,4 +1,18 @@ -// Copyright 2008 The Android Open Source Project +/* + * Copyright (C) 2008 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 Base implements Defs { public void func() { diff --git a/test/065-mismatched-implements/src/Defs.java b/test/065-mismatched-implements/src/Defs.java index bab92d8424..b81319e03c 100644 --- a/test/065-mismatched-implements/src/Defs.java +++ b/test/065-mismatched-implements/src/Defs.java @@ -1,4 +1,18 @@ -// Copyright 2008 The Android Open Source Project +/* + * Copyright (C) 2008 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 interface Defs { public void func(); diff --git a/test/065-mismatched-implements/src2/Defs.java b/test/065-mismatched-implements/src2/Defs.java index e7eb8a14a7..864524088d 100644 --- a/test/065-mismatched-implements/src2/Defs.java +++ b/test/065-mismatched-implements/src2/Defs.java @@ -1,4 +1,18 @@ -// Copyright 2008 The Android Open Source Project +/* + * Copyright (C) 2008 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 abstract class Defs { public void func() { diff --git a/test/066-mismatched-super/src/Base.java b/test/066-mismatched-super/src/Base.java index 6180c8bbfa..cf6c591ff9 100644 --- a/test/066-mismatched-super/src/Base.java +++ b/test/066-mismatched-super/src/Base.java @@ -1,4 +1,18 @@ -// Copyright 2008 The Android Open Source Project +/* + * Copyright (C) 2008 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 Base extends Defs { // no need to implement func(), provided by abstract class diff --git a/test/066-mismatched-super/src/Defs.java b/test/066-mismatched-super/src/Defs.java index e7eb8a14a7..864524088d 100644 --- a/test/066-mismatched-super/src/Defs.java +++ b/test/066-mismatched-super/src/Defs.java @@ -1,4 +1,18 @@ -// Copyright 2008 The Android Open Source Project +/* + * Copyright (C) 2008 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 abstract class Defs { public void func() { diff --git a/test/066-mismatched-super/src2/Defs.java b/test/066-mismatched-super/src2/Defs.java index bab92d8424..b81319e03c 100644 --- a/test/066-mismatched-super/src2/Defs.java +++ b/test/066-mismatched-super/src2/Defs.java @@ -1,4 +1,18 @@ -// Copyright 2008 The Android Open Source Project +/* + * Copyright (C) 2008 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 interface Defs { public void func(); diff --git a/test/068-classloader/src-ex/DoubledExtend.java b/test/068-classloader/src-ex/DoubledExtend.java index 6ad2708b11..e99421b8cd 100644 --- a/test/068-classloader/src-ex/DoubledExtend.java +++ b/test/068-classloader/src-ex/DoubledExtend.java @@ -1,4 +1,18 @@ -// Copyright 2008 The Android Open Source Project +/* + * Copyright (C) 2008 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. + */ /** * Doubled sub-class, form #2. diff --git a/test/068-classloader/src-ex/DoubledImplement.java b/test/068-classloader/src-ex/DoubledImplement.java index 5c44fc3190..bf3ebecbe3 100644 --- a/test/068-classloader/src-ex/DoubledImplement.java +++ b/test/068-classloader/src-ex/DoubledImplement.java @@ -1,4 +1,18 @@ -// Copyright 2008 The Android Open Source Project +/* + * Copyright (C) 2008 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. + */ /** * Doubled sub-class, form #2. diff --git a/test/068-classloader/src-ex/Inaccessible1.java b/test/068-classloader/src-ex/Inaccessible1.java index 415a8a1b62..4300c48b36 100644 --- a/test/068-classloader/src-ex/Inaccessible1.java +++ b/test/068-classloader/src-ex/Inaccessible1.java @@ -1,4 +1,18 @@ -// Copyright 2008 The Android Open Source Project +/* + * Copyright (C) 2008 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. + */ /** * Non-public class, inaccessible from Main. Note the constructor is diff --git a/test/068-classloader/src-ex/Inaccessible2.java b/test/068-classloader/src-ex/Inaccessible2.java index dc20c21b97..d3cb184ed4 100644 --- a/test/068-classloader/src-ex/Inaccessible2.java +++ b/test/068-classloader/src-ex/Inaccessible2.java @@ -1,4 +1,18 @@ -// Copyright 2008 The Android Open Source Project +/* + * Copyright (C) 2008 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 that can't access its base. diff --git a/test/068-classloader/src-ex/Inaccessible3.java b/test/068-classloader/src-ex/Inaccessible3.java index 771d0f7acc..8c1ca3dbbf 100644 --- a/test/068-classloader/src-ex/Inaccessible3.java +++ b/test/068-classloader/src-ex/Inaccessible3.java @@ -1,4 +1,18 @@ -// Copyright 2008 The Android Open Source Project +/* + * Copyright (C) 2008 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 that can't access its interface. diff --git a/test/068-classloader/src/Base.java b/test/068-classloader/src/Base.java index b297a8aa21..4135f27def 100644 --- a/test/068-classloader/src/Base.java +++ b/test/068-classloader/src/Base.java @@ -1,4 +1,18 @@ -// Copyright 2008 The Android Open Source Project +/* + * Copyright (C) 2008 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. + */ /** * Common base class. diff --git a/test/068-classloader/src/DoubledExtend.java b/test/068-classloader/src/DoubledExtend.java index 5f8ebc20f6..990a511f3c 100644 --- a/test/068-classloader/src/DoubledExtend.java +++ b/test/068-classloader/src/DoubledExtend.java @@ -1,4 +1,18 @@ -// Copyright 2008 The Android Open Source Project +/* + * Copyright (C) 2008 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. + */ /** * Doubled sub-class, form #1. diff --git a/test/068-classloader/src/DoubledImplement.java b/test/068-classloader/src/DoubledImplement.java index 64ec5e2682..ea84303ac3 100644 --- a/test/068-classloader/src/DoubledImplement.java +++ b/test/068-classloader/src/DoubledImplement.java @@ -1,4 +1,18 @@ -// Copyright 2008 The Android Open Source Project +/* + * Copyright (C) 2008 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. + */ /** * Doubled sub-class, form #1. diff --git a/test/068-classloader/src/ICommon.java b/test/068-classloader/src/ICommon.java index 35a98cc5cc..34c4671cc7 100644 --- a/test/068-classloader/src/ICommon.java +++ b/test/068-classloader/src/ICommon.java @@ -1,4 +1,18 @@ -// Copyright 2008 The Android Open Source Project +/* + * Copyright (C) 2008 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. + */ /** * Common interface. diff --git a/test/068-classloader/src/InaccessibleBase.java b/test/068-classloader/src/InaccessibleBase.java index 83af6659d5..b3fd184d9f 100644 --- a/test/068-classloader/src/InaccessibleBase.java +++ b/test/068-classloader/src/InaccessibleBase.java @@ -1,4 +1,18 @@ -// Copyright 2008 The Android Open Source Project +/* + * Copyright (C) 2008 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. + */ /** * Non-public base class, inaccessible from alternate class loader. diff --git a/test/068-classloader/src/InaccessibleInterface.java b/test/068-classloader/src/InaccessibleInterface.java index 7f52b80f0e..5e2477d595 100644 --- a/test/068-classloader/src/InaccessibleInterface.java +++ b/test/068-classloader/src/InaccessibleInterface.java @@ -1,4 +1,18 @@ -// Copyright 2008 The Android Open Source Project +/* + * Copyright (C) 2008 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. + */ /** * Non-public interface class, inaccessible from alternate class loader. diff --git a/test/068-classloader/src/SimpleBase.java b/test/068-classloader/src/SimpleBase.java index fd56db9eda..22098a686a 100644 --- a/test/068-classloader/src/SimpleBase.java +++ b/test/068-classloader/src/SimpleBase.java @@ -1,4 +1,18 @@ -// Copyright 2008 The Android Open Source Project +/* + * Copyright (C) 2008 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. + */ /** * Simple, public base class. diff --git a/test/AbstractMethod/AbstractClass.java b/test/AbstractMethod/AbstractClass.java index 0f6a33e7bf..7fc1cb0d4a 100644 --- a/test/AbstractMethod/AbstractClass.java +++ b/test/AbstractMethod/AbstractClass.java @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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. + */ // Test case for AbstractMethodError, we will try to do a non-virtual call to // foo. diff --git a/test/AllFields/AllFields.java b/test/AllFields/AllFields.java index 86b884119d..d5eac8fa2e 100644 --- a/test/AllFields/AllFields.java +++ b/test/AllFields/AllFields.java @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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. + */ class AllFields { static boolean sZ; diff --git a/test/CreateMethodSignature/CreateMethodSignature.java b/test/CreateMethodSignature/CreateMethodSignature.java index 32338f1779..f6cd6ae6fd 100644 --- a/test/CreateMethodSignature/CreateMethodSignature.java +++ b/test/CreateMethodSignature/CreateMethodSignature.java @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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. + */ class CreateMethodSignature { Float m1(int a, double b, long c, Object d) { return null; } diff --git a/test/ExceptionHandle/ExceptionHandle.java b/test/ExceptionHandle/ExceptionHandle.java index 94c6f5b8eb..357e2cbf3b 100644 --- a/test/ExceptionHandle/ExceptionHandle.java +++ b/test/ExceptionHandle/ExceptionHandle.java @@ -1,4 +1,19 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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. + */ + import java.io.IOException; public class ExceptionHandle { diff --git a/test/ExceptionTest/ExceptionTest.java b/test/ExceptionTest/ExceptionTest.java index edd549e6c6..3edae6d72c 100644 --- a/test/ExceptionTest/ExceptionTest.java +++ b/test/ExceptionTest/ExceptionTest.java @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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. + */ class ExceptionTest { diff --git a/test/Fibonacci/Fibonacci.java b/test/Fibonacci/Fibonacci.java index d8a512a983..bfe04aaded 100644 --- a/test/Fibonacci/Fibonacci.java +++ b/test/Fibonacci/Fibonacci.java @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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. + */ class Fibonacci { diff --git a/test/IntMath/IntMath.java b/test/IntMath/IntMath.java index 21f84bbf04..7491e0b0aa 100644 --- a/test/IntMath/IntMath.java +++ b/test/IntMath/IntMath.java @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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. + */ class IntMath extends IntMathBase { diff --git a/test/Interfaces/Interfaces.java b/test/Interfaces/Interfaces.java index 4bd9bfe2bf..4a13e56899 100644 --- a/test/Interfaces/Interfaces.java +++ b/test/Interfaces/Interfaces.java @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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. + */ class Interfaces { interface I { diff --git a/test/Main/Main.java b/test/Main/Main.java index 757d513201..b4df99945f 100644 --- a/test/Main/Main.java +++ b/test/Main/Main.java @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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. + */ class Main { public static void main(String args[]) { diff --git a/test/MyClass/MyClass.java b/test/MyClass/MyClass.java index 7a0ccbc6d7..b5f5184170 100644 --- a/test/MyClass/MyClass.java +++ b/test/MyClass/MyClass.java @@ -1,3 +1,17 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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. + */ class MyClass {} diff --git a/test/MyClassNatives/MyClassNatives.java b/test/MyClassNatives/MyClassNatives.java index 0c040b3e2a..d8df19b224 100644 --- a/test/MyClassNatives/MyClassNatives.java +++ b/test/MyClassNatives/MyClassNatives.java @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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. + */ class MyClass { native void throwException(); diff --git a/test/Nested/Nested.java b/test/Nested/Nested.java index 73d9e8a2cd..78b273bec0 100644 --- a/test/Nested/Nested.java +++ b/test/Nested/Nested.java @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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. + */ class Nested { class Inner { diff --git a/test/ProtoCompare/ProtoCompare.java b/test/ProtoCompare/ProtoCompare.java index 988e07aee2..00d31d80b6 100644 --- a/test/ProtoCompare/ProtoCompare.java +++ b/test/ProtoCompare/ProtoCompare.java @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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. + */ class ProtoCompare { int m1(short x, int y, long z) { return x + y + (int)z; } diff --git a/test/ProtoCompare2/ProtoCompare2.java b/test/ProtoCompare2/ProtoCompare2.java index 60d1746242..cb7bd8b9fa 100644 --- a/test/ProtoCompare2/ProtoCompare2.java +++ b/test/ProtoCompare2/ProtoCompare2.java @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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. + */ class ProtoCompare2 { int m1(short x, int y, long z) { return x + y + (int)z; } diff --git a/test/ReferenceMap/ReferenceMap.java b/test/ReferenceMap/ReferenceMap.java index 5904d0256c..c746b688e3 100644 --- a/test/ReferenceMap/ReferenceMap.java +++ b/test/ReferenceMap/ReferenceMap.java @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 ReferenceMap { public ReferenceMap() { diff --git a/test/ReferenceMap/stack_walk_refmap_jni.cc b/test/ReferenceMap/stack_walk_refmap_jni.cc index a85e4ee11a..b3f82db1e5 100644 --- a/test/ReferenceMap/stack_walk_refmap_jni.cc +++ b/test/ReferenceMap/stack_walk_refmap_jni.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 diff --git a/test/StackWalk/stack_walk_jni.cc b/test/StackWalk/stack_walk_jni.cc index a967835277..69b4837e39 100644 --- a/test/StackWalk/stack_walk_jni.cc +++ b/test/StackWalk/stack_walk_jni.cc @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 diff --git a/test/StackWalk2/StackWalk2.java b/test/StackWalk2/StackWalk2.java index b4ea2d79e7..a879b46447 100644 --- a/test/StackWalk2/StackWalk2.java +++ b/test/StackWalk2/StackWalk2.java @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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 StackWalk2 { // use v1 for this diff --git a/test/StaticLeafMethods/StaticLeafMethods.java b/test/StaticLeafMethods/StaticLeafMethods.java index 72aed8563c..404f97c40f 100644 --- a/test/StaticLeafMethods/StaticLeafMethods.java +++ b/test/StaticLeafMethods/StaticLeafMethods.java @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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. + */ class StaticLeafMethods { static void nop() { diff --git a/test/Statics/Statics.java b/test/Statics/Statics.java index d7158d4c8d..8f03b21f2c 100644 --- a/test/Statics/Statics.java +++ b/test/Statics/Statics.java @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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. + */ class Statics { static final boolean s0 = true; diff --git a/test/StaticsFromCode/StaticsFromCode.java b/test/StaticsFromCode/StaticsFromCode.java index b62d99e737..80060a536e 100644 --- a/test/StaticsFromCode/StaticsFromCode.java +++ b/test/StaticsFromCode/StaticsFromCode.java @@ -1,4 +1,18 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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. + */ class StaticsFromCode { static final Object s0 = "android"; diff --git a/test/XandY/X.java b/test/XandY/X.java index 7104ff80c9..c934b91e3e 100644 --- a/test/XandY/X.java +++ b/test/XandY/X.java @@ -1,3 +1,17 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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. + */ class X {} diff --git a/test/XandY/Y.java b/test/XandY/Y.java index a40c3ecfff..ecead6e35f 100644 --- a/test/XandY/Y.java +++ b/test/XandY/Y.java @@ -1,3 +1,17 @@ -// Copyright 2011 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2011 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. + */ class Y extends X {} -- cgit v1.2.3-59-g8ed1b From 8fa0fda8e1b6aa0a759990b3d32b78bb08065e0f Mon Sep 17 00:00:00 2001 From: buzbee Date: Wed, 27 Jun 2012 15:44:52 -0700 Subject: Quick compiler: support for arrays, misc. Continuing to flesh out support in the Quick compiler. Mostly array-related. Also, added runtest 028-array-write to the set of passing tests. Change-Id: I3c8eaf4bb14e9327e4f5fc48de73c85a5d3efb54 --- src/compiler/Frontend.cc | 4 + src/compiler/codegen/MethodBitcode.cc | 576 +++++++++++++++++++++++++--------- src/greenland/intrinsic_func_list.def | 278 +++++++++++++++- test/028-array-write/src/Main.java | 11 +- 4 files changed, 714 insertions(+), 155 deletions(-) (limited to 'test/028-array-write/src/Main.java') diff --git a/src/compiler/Frontend.cc b/src/compiler/Frontend.cc index 9e4b85787c..ba8d0d8fa9 100644 --- a/src/compiler/Frontend.cc +++ b/src/compiler/Frontend.cc @@ -768,6 +768,10 @@ CompiledMethod* oatCompileMethod(Compiler& compiler, || (PrettyMethod(method_idx, dex_file).find("math_013") != std::string::npos) || (PrettyMethod(method_idx, dex_file).find("math_014") != std::string::npos) || (PrettyMethod(method_idx, dex_file).find("float_017") != std::string::npos) + || (PrettyMethod(method_idx, dex_file).find("array_028") != std::string::npos) + || (PrettyMethod(method_idx, dex_file).find("writeArray") != std::string::npos) + || (PrettyMethod(method_idx, dex_file).find("writeTest") != std::string::npos) + || (PrettyMethod(method_idx, dex_file).find("copyTest") != std::string::npos) ) { cUnit->genBitcode = true; } diff --git a/src/compiler/codegen/MethodBitcode.cc b/src/compiler/codegen/MethodBitcode.cc index cf990ec79a..690f022bdd 100644 --- a/src/compiler/codegen/MethodBitcode.cc +++ b/src/compiler/codegen/MethodBitcode.cc @@ -140,12 +140,25 @@ const char* llvmSSAName(CompilationUnit* cUnit, int ssaReg) { return GET_ELEM_N(cUnit->ssaStrings, char*, ssaReg); } -llvm::Value* emitSget(CompilationUnit* cUnit, - greenland::IntrinsicHelper::IntrinsicId id, - llvm::ArrayRef src, RegLocation Loc) +void convertSget(CompilationUnit* cUnit, int32_t fieldIndex, + greenland::IntrinsicHelper::IntrinsicId id, + RegLocation rlDest) { + llvm::Constant* fieldIdx = cUnit->irb->getInt32(fieldIndex); llvm::Function* intr = cUnit->intrinsic_helper->GetIntrinsicFunction(id); - return cUnit->irb->CreateCall(intr, src); + llvm::Value* res = cUnit->irb->CreateCall(intr, fieldIdx); + defineValue(cUnit, res, rlDest.origSReg); +} + +void convertSput(CompilationUnit* cUnit, int32_t fieldIndex, + greenland::IntrinsicHelper::IntrinsicId id, + RegLocation rlSrc) +{ + llvm::SmallVector args; + args.push_back(cUnit->irb->getInt32(fieldIndex)); + args.push_back(getLLVMValue(cUnit, rlSrc.origSReg)); + llvm::Function* intr = cUnit->intrinsic_helper->GetIntrinsicFunction(id); + cUnit->irb->CreateCall(intr, args); } llvm::Value* emitConst(CompilationUnit* cUnit, llvm::ArrayRef src, @@ -178,8 +191,6 @@ void emitPopShadowFrame(CompilationUnit* cUnit) cUnit->irb->CreateCall(intr); } - - llvm::Value* emitCopy(CompilationUnit* cUnit, llvm::ArrayRef src, RegLocation loc) { @@ -220,6 +231,27 @@ void convertThrow(CompilationUnit* cUnit, RegLocation rlSrc) cUnit->irb->CreateUnreachable(); } +void convertMonitorEnterExit(CompilationUnit* cUnit, int optFlags, + greenland::IntrinsicHelper::IntrinsicId id, + RegLocation rlSrc) +{ + llvm::SmallVector args; + args.push_back(cUnit->irb->getInt32(optFlags)); + args.push_back(getLLVMValue(cUnit, rlSrc.origSReg)); + llvm::Function* func = cUnit->intrinsic_helper->GetIntrinsicFunction(id); + cUnit->irb->CreateCall(func, args); +} + +void convertArrayLength(CompilationUnit* cUnit, int optFlags, RegLocation rlSrc) +{ + llvm::SmallVector args; + args.push_back(cUnit->irb->getInt32(optFlags)); + args.push_back(getLLVMValue(cUnit, rlSrc.origSReg)); + llvm::Function* func = cUnit->intrinsic_helper->GetIntrinsicFunction( + greenland::IntrinsicHelper::ArrayLength); + cUnit->irb->CreateCall(func, args); +} + void convertThrowVerificationError(CompilationUnit* cUnit, int info1, int info2) { llvm::Function* func = cUnit->intrinsic_helper->GetIntrinsicFunction( @@ -450,7 +482,7 @@ void convertInvoke(CompilationUnit* cUnit, BasicBlock* bb, MIR* mir, if (info->result.fp) { id = greenland::IntrinsicHelper::HLInvokeDouble; } else { - id = greenland::IntrinsicHelper::HLInvokeFloat; + id = greenland::IntrinsicHelper::HLInvokeLong; } } else if (info->result.ref) { id = greenland::IntrinsicHelper::HLInvokeObj; @@ -478,8 +510,8 @@ void convertConstString(CompilationUnit* cUnit, BasicBlock* bb, defineValue(cUnit, res, rlDest.origSReg); } -void convertNewInstance(CompilationUnit* cUnit, BasicBlock* bb, - uint32_t type_idx, RegLocation rlDest) +void convertNewInstance(CompilationUnit* cUnit, uint32_t type_idx, + RegLocation rlDest) { greenland::IntrinsicHelper::IntrinsicId id; id = greenland::IntrinsicHelper::NewInstance; @@ -489,6 +521,58 @@ void convertNewInstance(CompilationUnit* cUnit, BasicBlock* bb, defineValue(cUnit, res, rlDest.origSReg); } +void convertNewArray(CompilationUnit* cUnit, uint32_t type_idx, + RegLocation rlDest, RegLocation rlSrc) +{ + greenland::IntrinsicHelper::IntrinsicId id; + id = greenland::IntrinsicHelper::NewArray; + llvm::Function* intr = cUnit->intrinsic_helper->GetIntrinsicFunction(id); + llvm::SmallVector args; + args.push_back(cUnit->irb->getInt32(type_idx)); + args.push_back(getLLVMValue(cUnit, rlSrc.origSReg)); + llvm::Value* res = cUnit->irb->CreateCall(intr, args); + defineValue(cUnit, res, rlDest.origSReg); +} + +void convertAget(CompilationUnit* cUnit, int optFlags, + greenland::IntrinsicHelper::IntrinsicId id, + RegLocation rlDest, RegLocation rlArray, RegLocation rlIndex) +{ + llvm::SmallVector args; + args.push_back(cUnit->irb->getInt32(optFlags)); + args.push_back(getLLVMValue(cUnit, rlArray.origSReg)); + args.push_back(getLLVMValue(cUnit, rlIndex.origSReg)); + llvm::Function* intr = cUnit->intrinsic_helper->GetIntrinsicFunction(id); + llvm::Value* res = cUnit->irb->CreateCall(intr, args); + defineValue(cUnit, res, rlDest.origSReg); +} + +void convertAput(CompilationUnit* cUnit, int optFlags, + greenland::IntrinsicHelper::IntrinsicId id, + RegLocation rlSrc, RegLocation rlArray, RegLocation rlIndex) +{ + llvm::SmallVector args; + args.push_back(cUnit->irb->getInt32(optFlags)); + args.push_back(getLLVMValue(cUnit, rlSrc.origSReg)); + args.push_back(getLLVMValue(cUnit, rlArray.origSReg)); + args.push_back(getLLVMValue(cUnit, rlIndex.origSReg)); + llvm::Function* intr = cUnit->intrinsic_helper->GetIntrinsicFunction(id); + cUnit->irb->CreateCall(intr, args); +} + +void convertInstanceOf(CompilationUnit* cUnit, uint32_t type_idx, + RegLocation rlDest, RegLocation rlSrc) +{ + greenland::IntrinsicHelper::IntrinsicId id; + id = greenland::IntrinsicHelper::InstanceOf; + llvm::Function* intr = cUnit->intrinsic_helper->GetIntrinsicFunction(id); + llvm::SmallVector args; + args.push_back(cUnit->irb->getInt32(type_idx)); + args.push_back(getLLVMValue(cUnit, rlSrc.origSReg)); + llvm::Value* res = cUnit->irb->CreateCall(intr, args); + defineValue(cUnit, res, rlDest.origSReg); +} + /* * Target-independent code generation. Use only high-level * load/store utilities here, or target-dependent genXX() handlers @@ -505,6 +589,7 @@ bool convertMIRNode(CompilationUnit* cUnit, MIR* mir, BasicBlock* bb, uint32_t vA = mir->dalvikInsn.vA; uint32_t vB = mir->dalvikInsn.vB; uint32_t vC = mir->dalvikInsn.vC; + int optFlags = mir->optimizationFlags; bool objectDefinition = false; @@ -613,11 +698,69 @@ bool convertMIRNode(CompilationUnit* cUnit, MIR* mir, BasicBlock* bb, } break; - case Instruction::SGET_OBJECT: { - llvm::Constant* fieldIdx = cUnit->irb->GetJInt(vB); - llvm::Value* res = emitSget(cUnit, greenland::IntrinsicHelper::SgetObj, - fieldIdx, rlDest); - defineValue(cUnit, res, rlDest.origSReg); + case Instruction::SPUT_OBJECT: + convertSget(cUnit, vB, greenland::IntrinsicHelper::HLSputObject, + rlSrc[0]); + break; + case Instruction::SPUT: + if (rlSrc[0].fp) { + convertSget(cUnit, vB, greenland::IntrinsicHelper::HLSputFloat, + rlSrc[0]); + } else { + convertSget(cUnit, vB, greenland::IntrinsicHelper::HLSput, rlSrc[0]); + } + break; + case Instruction::SPUT_BOOLEAN: + convertSget(cUnit, vB, greenland::IntrinsicHelper::HLSputBoolean, + rlSrc[0]); + break; + case Instruction::SPUT_BYTE: + convertSget(cUnit, vB, greenland::IntrinsicHelper::HLSputByte, rlSrc[0]); + break; + case Instruction::SPUT_CHAR: + convertSget(cUnit, vB, greenland::IntrinsicHelper::HLSputChar, rlSrc[0]); + break; + case Instruction::SPUT_SHORT: + convertSget(cUnit, vB, greenland::IntrinsicHelper::HLSputShort, rlSrc[0]); + break; + case Instruction::SPUT_WIDE: + if (rlSrc[0].fp) { + convertSget(cUnit, vB, greenland::IntrinsicHelper::HLSputDouble, + rlSrc[0]); + } else { + convertSget(cUnit, vB, greenland::IntrinsicHelper::HLSputWide, + rlSrc[0]); + } + break; + + case Instruction::SGET_OBJECT: + convertSget(cUnit, vB, greenland::IntrinsicHelper::HLSgetObject, rlDest); + break; + case Instruction::SGET: + if (rlDest.fp) { + convertSget(cUnit, vB, greenland::IntrinsicHelper::HLSgetFloat, rlDest); + } else { + convertSget(cUnit, vB, greenland::IntrinsicHelper::HLSget, rlDest); + } + break; + case Instruction::SGET_BOOLEAN: + convertSget(cUnit, vB, greenland::IntrinsicHelper::HLSgetBoolean, rlDest); + break; + case Instruction::SGET_BYTE: + convertSget(cUnit, vB, greenland::IntrinsicHelper::HLSgetByte, rlDest); + break; + case Instruction::SGET_CHAR: + convertSget(cUnit, vB, greenland::IntrinsicHelper::HLSgetChar, rlDest); + break; + case Instruction::SGET_SHORT: + convertSget(cUnit, vB, greenland::IntrinsicHelper::HLSgetShort, rlDest); + break; + case Instruction::SGET_WIDE: + if (rlDest.fp) { + convertSget(cUnit, vB, greenland::IntrinsicHelper::HLSgetDouble, + rlDest); + } else { + convertSget(cUnit, vB, greenland::IntrinsicHelper::HLSgetWide, rlDest); } break; @@ -881,7 +1024,7 @@ bool convertMIRNode(CompilationUnit* cUnit, MIR* mir, BasicBlock* bb, break; case Instruction::NEW_INSTANCE: - convertNewInstance(cUnit, bb, vB, rlDest); + convertNewInstance(cUnit, vB, rlDest); break; case Instruction::MOVE_EXCEPTION: @@ -896,70 +1039,124 @@ bool convertMIRNode(CompilationUnit* cUnit, MIR* mir, BasicBlock* bb, convertThrowVerificationError(cUnit, vA, vB); break; -#if 0 - - case Instruction::MOVE_EXCEPTION: { - int exOffset = Thread::ExceptionOffset().Int32Value(); - rlResult = oatEvalLoc(cUnit, rlDest, kCoreReg, true); -#if defined(TARGET_X86) - newLIR2(cUnit, kX86Mov32RT, rlResult.lowReg, exOffset); - newLIR2(cUnit, kX86Mov32TI, exOffset, 0); -#else - int resetReg = oatAllocTemp(cUnit); - loadWordDisp(cUnit, rSELF, exOffset, rlResult.lowReg); - loadConstant(cUnit, resetReg, 0); - storeWordDisp(cUnit, rSELF, exOffset, resetReg); - storeValue(cUnit, rlDest, rlResult); - oatFreeTemp(cUnit, resetReg); -#endif - break; - } - case Instruction::MOVE_RESULT_WIDE: - if (mir->optimizationFlags & MIR_INLINED) - break; // Nop - combined w/ previous invoke - storeValueWide(cUnit, rlDest, oatGetReturnWide(cUnit, rlDest.fp)); - break; - case Instruction::MOVE_RESULT: case Instruction::MOVE_RESULT_OBJECT: - if (mir->optimizationFlags & MIR_INLINED) - break; // Nop - combined w/ previous invoke - storeValue(cUnit, rlDest, oatGetReturn(cUnit, rlDest.fp)); + CHECK(false) << "Unexpected MOVE_RESULT"; break; case Instruction::MONITOR_ENTER: - genMonitorEnter(cUnit, mir, rlSrc[0]); + convertMonitorEnterExit(cUnit, optFlags, + greenland::IntrinsicHelper::MonitorEnter, + rlSrc[0]); break; case Instruction::MONITOR_EXIT: - genMonitorExit(cUnit, mir, rlSrc[0]); + convertMonitorEnterExit(cUnit, optFlags, + greenland::IntrinsicHelper::MonitorExit, + rlSrc[0]); break; - case Instruction::CHECK_CAST: - genCheckCast(cUnit, mir, rlSrc[0]); + case Instruction::ARRAY_LENGTH: + convertArrayLength(cUnit, optFlags, rlSrc[0]); + break; + + case Instruction::NEW_ARRAY: + convertNewArray(cUnit, vC, rlDest, rlSrc[0]); break; case Instruction::INSTANCE_OF: - genInstanceof(cUnit, mir, rlDest, rlSrc[0]); + convertInstanceOf(cUnit, vC, rlDest, rlSrc[0]); break; - case Instruction::THROW: - genThrow(cUnit, mir, rlSrc[0]); + case Instruction::AGET: + if (rlDest.fp) { + convertAget(cUnit, optFlags, + greenland::IntrinsicHelper::HLArrayGetFloat, + rlDest, rlSrc[0], rlSrc[1]); + } else { + convertAget(cUnit, optFlags, greenland::IntrinsicHelper::HLArrayGet, + rlDest, rlSrc[0], rlSrc[1]); + } + break; + case Instruction::AGET_OBJECT: + convertAget(cUnit, optFlags, greenland::IntrinsicHelper::HLArrayGetObject, + rlDest, rlSrc[0], rlSrc[1]); + break; + case Instruction::AGET_BOOLEAN: + convertAget(cUnit, optFlags, + greenland::IntrinsicHelper::HLArrayGetBoolean, + rlDest, rlSrc[0], rlSrc[1]); + break; + case Instruction::AGET_BYTE: + convertAget(cUnit, optFlags, greenland::IntrinsicHelper::HLArrayGetByte, + rlDest, rlSrc[0], rlSrc[1]); + break; + case Instruction::AGET_CHAR: + convertAget(cUnit, optFlags, greenland::IntrinsicHelper::HLArrayGetChar, + rlDest, rlSrc[0], rlSrc[1]); + break; + case Instruction::AGET_SHORT: + convertAget(cUnit, optFlags, greenland::IntrinsicHelper::HLArrayGetShort, + rlDest, rlSrc[0], rlSrc[1]); + break; + case Instruction::AGET_WIDE: + if (rlDest.fp) { + convertAget(cUnit, optFlags, + greenland::IntrinsicHelper::HLArrayGetDouble, + rlDest, rlSrc[0], rlSrc[1]); + } else { + convertAget(cUnit, optFlags, greenland::IntrinsicHelper::HLArrayGetWide, + rlDest, rlSrc[0], rlSrc[1]); + } break; - case Instruction::THROW_VERIFICATION_ERROR: - genThrowVerificationError(cUnit, mir); + case Instruction::APUT: + if (rlSrc[0].fp) { + convertAput(cUnit, optFlags, + greenland::IntrinsicHelper::HLArrayPutFloat, + rlSrc[0], rlSrc[1], rlSrc[2]); + } else { + convertAput(cUnit, optFlags, greenland::IntrinsicHelper::HLArrayPut, + rlSrc[0], rlSrc[1], rlSrc[2]); + } + break; + case Instruction::APUT_OBJECT: + convertAput(cUnit, optFlags, greenland::IntrinsicHelper::HLArrayPutObject, + rlSrc[0], rlSrc[1], rlSrc[2]); + break; + case Instruction::APUT_BOOLEAN: + convertAput(cUnit, optFlags, + greenland::IntrinsicHelper::HLArrayPutBoolean, + rlSrc[0], rlSrc[1], rlSrc[2]); + break; + case Instruction::APUT_BYTE: + convertAput(cUnit, optFlags, greenland::IntrinsicHelper::HLArrayPutByte, + rlSrc[0], rlSrc[1], rlSrc[2]); + break; + case Instruction::APUT_CHAR: + convertAput(cUnit, optFlags, greenland::IntrinsicHelper::HLArrayPutChar, + rlSrc[0], rlSrc[1], rlSrc[2]); + break; + case Instruction::APUT_SHORT: + convertAput(cUnit, optFlags, greenland::IntrinsicHelper::HLArrayPutShort, + rlSrc[0], rlSrc[1], rlSrc[2]); + break; + case Instruction::APUT_WIDE: + if (rlSrc[0].fp) { + convertAput(cUnit, optFlags, + greenland::IntrinsicHelper::HLArrayPutDouble, + rlSrc[0], rlSrc[1], rlSrc[2]); + } else { + convertAput(cUnit, optFlags, greenland::IntrinsicHelper::HLArrayPutWide, + rlSrc[0], rlSrc[1], rlSrc[2]); + } break; - case Instruction::ARRAY_LENGTH: - int lenOffset; - lenOffset = Array::LengthOffset().Int32Value(); - rlSrc[0] = loadValue(cUnit, rlSrc[0], kCoreReg); - genNullCheck(cUnit, rlSrc[0].sRegLow, rlSrc[0].lowReg, mir); - rlResult = oatEvalLoc(cUnit, rlDest, kCoreReg, true); - loadWordDisp(cUnit, rlSrc[0].lowReg, lenOffset, rlResult.lowReg); - storeValue(cUnit, rlDest, rlResult); +#if 0 + + case Instruction::CHECK_CAST: + genCheckCast(cUnit, mir, rlSrc[0]); break; case Instruction::CONST_CLASS: @@ -970,18 +1167,10 @@ bool convertMIRNode(CompilationUnit* cUnit, MIR* mir, BasicBlock* bb, genFillArrayData(cUnit, mir, rlSrc[0]); break; - case Instruction::FILLED_NEW_ARRAY: - genFilledNewArray(cUnit, mir, false /* not range */); - break; - case Instruction::FILLED_NEW_ARRAY_RANGE: genFilledNewArray(cUnit, mir, true /* range */); break; - case Instruction::NEW_ARRAY: - genNewArray(cUnit, mir, rlDest, rlSrc[0]); - break; - case Instruction::PACKED_SWITCH: genPackedSwitch(cUnit, mir, rlSrc[0]); break; @@ -1001,44 +1190,6 @@ bool convertMIRNode(CompilationUnit* cUnit, MIR* mir, BasicBlock* bb, genCmpLong(cUnit, mir, rlDest, rlSrc[0], rlSrc[1]); break; - case Instruction::AGET_WIDE: - genArrayGet(cUnit, mir, kLong, rlSrc[0], rlSrc[1], rlDest, 3); - break; - case Instruction::AGET: - case Instruction::AGET_OBJECT: - genArrayGet(cUnit, mir, kWord, rlSrc[0], rlSrc[1], rlDest, 2); - break; - case Instruction::AGET_BOOLEAN: - genArrayGet(cUnit, mir, kUnsignedByte, rlSrc[0], rlSrc[1], rlDest, 0); - break; - case Instruction::AGET_BYTE: - genArrayGet(cUnit, mir, kSignedByte, rlSrc[0], rlSrc[1], rlDest, 0); - break; - case Instruction::AGET_CHAR: - genArrayGet(cUnit, mir, kUnsignedHalf, rlSrc[0], rlSrc[1], rlDest, 1); - break; - case Instruction::AGET_SHORT: - genArrayGet(cUnit, mir, kSignedHalf, rlSrc[0], rlSrc[1], rlDest, 1); - break; - case Instruction::APUT_WIDE: - genArrayPut(cUnit, mir, kLong, rlSrc[1], rlSrc[2], rlSrc[0], 3); - break; - case Instruction::APUT: - genArrayPut(cUnit, mir, kWord, rlSrc[1], rlSrc[2], rlSrc[0], 2); - break; - case Instruction::APUT_OBJECT: - genArrayObjPut(cUnit, mir, rlSrc[1], rlSrc[2], rlSrc[0], 2); - break; - case Instruction::APUT_SHORT: - case Instruction::APUT_CHAR: - genArrayPut(cUnit, mir, kUnsignedHalf, rlSrc[1], rlSrc[2], rlSrc[0], 1); - break; - case Instruction::APUT_BYTE: - case Instruction::APUT_BOOLEAN: - genArrayPut(cUnit, mir, kUnsignedByte, rlSrc[1], rlSrc[2], - rlSrc[0], 0); - break; - case Instruction::IGET_OBJECT: //case Instruction::IGET_OBJECT_VOLATILE: genIGet(cUnit, mir, kWord, rlDest, rlSrc[0], false, true); @@ -1095,37 +1246,6 @@ bool convertMIRNode(CompilationUnit* cUnit, MIR* mir, BasicBlock* bb, genIPut(cUnit, mir, kSignedHalf, rlSrc[0], rlSrc[1], false, false); break; - case Instruction::SGET_OBJECT: - genSget(cUnit, mir, rlDest, false, true); - break; - case Instruction::SGET: - case Instruction::SGET_BOOLEAN: - case Instruction::SGET_BYTE: - case Instruction::SGET_CHAR: - case Instruction::SGET_SHORT: - genSget(cUnit, mir, rlDest, false, false); - break; - - case Instruction::SGET_WIDE: - genSget(cUnit, mir, rlDest, true, false); - break; - - case Instruction::SPUT_OBJECT: - genSput(cUnit, mir, rlSrc[0], false, true); - break; - - case Instruction::SPUT: - case Instruction::SPUT_BOOLEAN: - case Instruction::SPUT_BYTE: - case Instruction::SPUT_CHAR: - case Instruction::SPUT_SHORT: - genSput(cUnit, mir, rlSrc[0], false, false); - break; - - case Instruction::SPUT_WIDE: - genSput(cUnit, mir, rlSrc[0], true, false); - break; - case Instruction::NEG_INT: case Instruction::NOT_INT: res = genArithOpInt(cUnit, mir, rlDest, rlSrc[0], rlSrc[0]); @@ -1822,6 +1942,30 @@ void cvtNewInstance(CompilationUnit* cUnit, llvm::CallInst* callInst) genNewInstance(cUnit, typeIdx, rlDest); } +void cvtNewArray(CompilationUnit* cUnit, llvm::CallInst* callInst) +{ + DCHECK_EQ(callInst->getNumArgOperands(), 2U); + llvm::ConstantInt* typeIdxVal = + llvm::dyn_cast(callInst->getArgOperand(0)); + uint32_t typeIdx = typeIdxVal->getZExtValue(); + llvm::Value* len = callInst->getArgOperand(1); + RegLocation rlLen = getLoc(cUnit, len); + RegLocation rlDest = getLoc(cUnit, callInst); + genNewArray(cUnit, typeIdx, rlDest, rlLen); +} + +void cvtInstanceOf(CompilationUnit* cUnit, llvm::CallInst* callInst) +{ + DCHECK_EQ(callInst->getNumArgOperands(), 2U); + llvm::ConstantInt* typeIdxVal = + llvm::dyn_cast(callInst->getArgOperand(0)); + uint32_t typeIdx = typeIdxVal->getZExtValue(); + llvm::Value* src = callInst->getArgOperand(1); + RegLocation rlSrc = getLoc(cUnit, src); + RegLocation rlDest = getLoc(cUnit, callInst); + genInstanceof(cUnit, typeIdx, rlDest, rlSrc); +} + void cvtThrowVerificationError(CompilationUnit* cUnit, llvm::CallInst* callInst) { DCHECK_EQ(callInst->getNumArgOperands(), 2U); @@ -1840,6 +1984,37 @@ void cvtThrow(CompilationUnit* cUnit, llvm::CallInst* callInst) genThrow(cUnit, rlSrc); } +void cvtMonitorEnterExit(CompilationUnit* cUnit, bool isEnter, + llvm::CallInst* callInst) +{ + DCHECK_EQ(callInst->getNumArgOperands(), 2U); + llvm::ConstantInt* optFlags = + llvm::dyn_cast(callInst->getArgOperand(0)); + llvm::Value* src = callInst->getArgOperand(1); + RegLocation rlSrc = getLoc(cUnit, src); + if (isEnter) { + genMonitorEnter(cUnit, optFlags->getZExtValue(), rlSrc); + } else { + genMonitorExit(cUnit, optFlags->getZExtValue(), rlSrc); + } +} + +void cvtMonitorArrayLength(CompilationUnit* cUnit, llvm::CallInst* callInst) +{ + DCHECK_EQ(callInst->getNumArgOperands(), 2U); + llvm::ConstantInt* optFlags = + llvm::dyn_cast(callInst->getArgOperand(0)); + llvm::Value* src = callInst->getArgOperand(1); + RegLocation rlSrc = getLoc(cUnit, src); + rlSrc = loadValue(cUnit, rlSrc, kCoreReg); + genNullCheck(cUnit, rlSrc.sRegLow, rlSrc.lowReg, optFlags->getZExtValue()); + RegLocation rlDest = getLoc(cUnit, callInst); + RegLocation rlResult = oatEvalLoc(cUnit, rlDest, kCoreReg, true); + int lenOffset = Array::LengthOffset().Int32Value(); + loadWordDisp(cUnit, rlSrc.lowReg, lenOffset, rlResult.lowReg); + storeValue(cUnit, rlDest, rlResult); +} + void cvtMoveException(CompilationUnit* cUnit, llvm::CallInst* callInst) { DCHECK_EQ(callInst->getNumArgOperands(), 0U); @@ -1870,12 +2045,50 @@ void cvtSget(CompilationUnit* cUnit, llvm::CallInst* callInst, bool isWide, genSget(cUnit, typeIdx, rlDest, isWide, isObject); } +void cvtSput(CompilationUnit* cUnit, llvm::CallInst* callInst, bool isWide, + bool isObject) +{ + DCHECK_EQ(callInst->getNumArgOperands(), 2U); + llvm::ConstantInt* typeIdxVal = + llvm::dyn_cast(callInst->getArgOperand(0)); + uint32_t typeIdx = typeIdxVal->getZExtValue(); + llvm::Value* src = callInst->getArgOperand(1); + RegLocation rlSrc = getLoc(cUnit, src); + genSput(cUnit, typeIdx, rlSrc, isWide, isObject); +} + +void cvtAget(CompilationUnit* cUnit, llvm::CallInst* callInst, OpSize size, + int scale) +{ + DCHECK_EQ(callInst->getNumArgOperands(), 3U); + llvm::ConstantInt* optFlags = + llvm::dyn_cast(callInst->getArgOperand(0)); + RegLocation rlArray = getLoc(cUnit, callInst->getArgOperand(1)); + RegLocation rlIndex = getLoc(cUnit, callInst->getArgOperand(2)); + RegLocation rlDest = getLoc(cUnit, callInst); + genArrayGet(cUnit, optFlags->getZExtValue(), size, rlArray, rlIndex, + rlDest, scale); +} + +void cvtAput(CompilationUnit* cUnit, llvm::CallInst* callInst, OpSize size, + int scale) +{ + DCHECK_EQ(callInst->getNumArgOperands(), 4U); + llvm::ConstantInt* optFlags = + llvm::dyn_cast(callInst->getArgOperand(0)); + RegLocation rlSrc = getLoc(cUnit, callInst->getArgOperand(1)); + RegLocation rlArray = getLoc(cUnit, callInst->getArgOperand(2)); + RegLocation rlIndex = getLoc(cUnit, callInst->getArgOperand(3)); + genArrayPut(cUnit, optFlags->getZExtValue(), size, rlArray, rlIndex, + rlSrc, scale); +} + void cvtInvoke(CompilationUnit* cUnit, llvm::CallInst* callInst, - greenland::JType jtype) + bool isVoid) { CallInfo* info = (CallInfo*)oatNew(cUnit, sizeof(CallInfo), true, kAllocMisc); - if (jtype == greenland::kVoid) { + if (isVoid) { info->result.location = kLocInvalid; } else { info->result = getLoc(cUnit, callInst); @@ -2061,14 +2274,15 @@ bool methodBitcodeBlockCodeGen(CompilationUnit* cUnit, llvm::BasicBlock* bb) case greenland::IntrinsicHelper::CheckSuspend: genSuspendTest(cUnit, 0 /* optFlags already applied */); break; - case greenland::IntrinsicHelper::HLInvokeInt: - cvtInvoke(cUnit, callInst, greenland::kInt); - break; case greenland::IntrinsicHelper::HLInvokeObj: - cvtInvoke(cUnit, callInst, greenland::kObject); + case greenland::IntrinsicHelper::HLInvokeFloat: + case greenland::IntrinsicHelper::HLInvokeDouble: + case greenland::IntrinsicHelper::HLInvokeLong: + case greenland::IntrinsicHelper::HLInvokeInt: + cvtInvoke(cUnit, callInst, false /* isVoid */); break; case greenland::IntrinsicHelper::HLInvokeVoid: - cvtInvoke(cUnit, callInst, greenland::kVoid); + cvtInvoke(cUnit, callInst, true /* isVoid */); break; case greenland::IntrinsicHelper::ConstString: cvtConstString(cUnit, callInst); @@ -2076,9 +2290,21 @@ bool methodBitcodeBlockCodeGen(CompilationUnit* cUnit, llvm::BasicBlock* bb) case greenland::IntrinsicHelper::NewInstance: cvtNewInstance(cUnit, callInst); break; - case greenland::IntrinsicHelper::SgetObj: + case greenland::IntrinsicHelper::HLSgetObject: cvtSget(cUnit, callInst, false /* wide */, true /* Object */); break; + case greenland::IntrinsicHelper::HLSget: + case greenland::IntrinsicHelper::HLSgetFloat: + case greenland::IntrinsicHelper::HLSgetBoolean: + case greenland::IntrinsicHelper::HLSgetByte: + case greenland::IntrinsicHelper::HLSgetChar: + case greenland::IntrinsicHelper::HLSgetShort: + cvtSget(cUnit, callInst, false /* wide */, false /* Object */); + break; + case greenland::IntrinsicHelper::HLSgetWide: + case greenland::IntrinsicHelper::HLSgetDouble: + cvtSget(cUnit, callInst, true /* wide */, false /* Object */); + break; case greenland::IntrinsicHelper::GetException: cvtMoveException(cUnit, callInst); break; @@ -2086,8 +2312,68 @@ bool methodBitcodeBlockCodeGen(CompilationUnit* cUnit, llvm::BasicBlock* bb) cvtThrow(cUnit, callInst); break; case greenland::IntrinsicHelper::ThrowVerificationError: - cvtThrow(cUnit, callInst); + cvtThrowVerificationError(cUnit, callInst); + break; + case greenland::IntrinsicHelper::MonitorEnter: + cvtMonitorEnterExit(cUnit, true /* isEnter */, callInst); + break; + case greenland::IntrinsicHelper::MonitorExit: + cvtMonitorEnterExit(cUnit, false /* isEnter */, callInst); + break; + case greenland::IntrinsicHelper::ArrayLength: + cvtMonitorArrayLength(cUnit, callInst); break; + case greenland::IntrinsicHelper::NewArray: + cvtNewArray(cUnit, callInst); + break; + case greenland::IntrinsicHelper::InstanceOf: + cvtInstanceOf(cUnit, callInst); + break; + + case greenland::IntrinsicHelper::HLArrayGet: + case greenland::IntrinsicHelper::HLArrayGetObject: + case greenland::IntrinsicHelper::HLArrayGetFloat: + cvtAget(cUnit, callInst, kWord, 2); + break; + case greenland::IntrinsicHelper::HLArrayGetWide: + case greenland::IntrinsicHelper::HLArrayGetDouble: + cvtAget(cUnit, callInst, kLong, 3); + break; + case greenland::IntrinsicHelper::HLArrayGetBoolean: + cvtAget(cUnit, callInst, kUnsignedByte, 0); + break; + case greenland::IntrinsicHelper::HLArrayGetByte: + cvtAget(cUnit, callInst, kSignedByte, 0); + break; + case greenland::IntrinsicHelper::HLArrayGetChar: + cvtAget(cUnit, callInst, kUnsignedHalf, 1); + break; + case greenland::IntrinsicHelper::HLArrayGetShort: + cvtAget(cUnit, callInst, kSignedHalf, 1); + break; + + case greenland::IntrinsicHelper::HLArrayPut: + case greenland::IntrinsicHelper::HLArrayPutObject: + case greenland::IntrinsicHelper::HLArrayPutFloat: + cvtAput(cUnit, callInst, kWord, 2); + break; + case greenland::IntrinsicHelper::HLArrayPutWide: + case greenland::IntrinsicHelper::HLArrayPutDouble: + cvtAput(cUnit, callInst, kLong, 3); + break; + case greenland::IntrinsicHelper::HLArrayPutBoolean: + cvtAput(cUnit, callInst, kUnsignedByte, 0); + break; + case greenland::IntrinsicHelper::HLArrayPutByte: + cvtAput(cUnit, callInst, kSignedByte, 0); + break; + case greenland::IntrinsicHelper::HLArrayPutChar: + cvtAput(cUnit, callInst, kUnsignedHalf, 1); + break; + case greenland::IntrinsicHelper::HLArrayPutShort: + cvtAput(cUnit, callInst, kSignedHalf, 1); + break; + case greenland::IntrinsicHelper::UnknownId: cvtCall(cUnit, callInst, callee); break; diff --git a/src/greenland/intrinsic_func_list.def b/src/greenland/intrinsic_func_list.def index e2a5557fb3..5c8da8916c 100644 --- a/src/greenland/intrinsic_func_list.def +++ b/src/greenland/intrinsic_func_list.def @@ -141,7 +141,7 @@ _EVAL_DEF_INTRINSICS_FUNC(ConstStringFast, _EXPAND_ARG1(kInt32ConstantTy)) //---------------------------------------------------------------------------- -// New Instance +// Instance //---------------------------------------------------------------------------- // JavaObject* dex_lang_new_instance(uint32_t type_idx) @@ -151,16 +151,23 @@ _EVAL_DEF_INTRINSICS_FUNC(NewInstance, kJavaObjectTy, _EXPAND_ARG1(kInt32Ty)) +// bool dex_lang_instance_of(uint32_t type_idx, JavaObject* ref) +_EVAL_DEF_INTRINSICS_FUNC(InstanceOf, + dex_lang_instance_of, + kAttrNone, + kInt1Ty, + _EXPAND_ARG2(kInt32Ty, kJavaObjectTy)) + //---------------------------------------------------------------------------- // Array //---------------------------------------------------------------------------- -// uint32_t dex_lang_array_length(JavaObject* array) +// uint32_t dex_lang_array_length(int32_t opt_flags, JavaObject* array) _EVAL_DEF_INTRINSICS_FUNC(ArrayLength, dex_lang_array_length, kAttrReadOnly | kAttrNoThrow, kInt32Ty, - _EXPAND_ARG1(kJavaObjectTy)) + _EXPAND_ARG2(kInt32Ty, kJavaObjectTy)) // JavaObject* dex_lang_new_array(uint32_t type_idx, uint32_t array_size) _EVAL_DEF_INTRINSICS_FUNC(NewArray, @@ -473,6 +480,123 @@ _EVAL_DEF_INTRINSICS_FUNC(InitializeAndLoadClassSSB, kJavaObjectTy, _EXPAND_ARG3(kInt32ConstantTy, kJavaMethodTy, kJavaThreadTy)) +//---------------------------------------------------------------------------- +// High-level Array get/put +// +// Similar to dex_lang_aget/aput_xxx, but checks not yet performed. +// OptFlags contain info describing whether frontend has determined that +// null check and/or array bounds check may be skipped. +// +// [type] void dex_lang_hl_aget_[type](int optFlags, JavaObject* array, uint32_t index) +_EVAL_DEF_INTRINSICS_FUNC(HLArrayGet, + dex_lang_hl_aget, + kAttrReadOnly | kAttrNoThrow, + kInt32Ty, + _EXPAND_ARG3(kInt32Ty, kJavaObjectTy, kInt32Ty)) + +_EVAL_DEF_INTRINSICS_FUNC(HLArrayGetFloat, + dex_lang_hl_aget_float, + kAttrReadOnly | kAttrNoThrow, + kFloatTy, + _EXPAND_ARG3(kInt32Ty, kJavaObjectTy, kInt32Ty)) + +_EVAL_DEF_INTRINSICS_FUNC(HLArrayGetWide, + dex_lang_hl_aget_wide, + kAttrReadOnly | kAttrNoThrow, + kInt64Ty, + _EXPAND_ARG3(kInt32Ty, kJavaObjectTy, kInt32Ty)) + +_EVAL_DEF_INTRINSICS_FUNC(HLArrayGetDouble, + dex_lang_hl_aget_double, + kAttrReadOnly | kAttrNoThrow, + kDoubleTy, + _EXPAND_ARG3(kInt32Ty, kJavaObjectTy, kInt32Ty)) + +_EVAL_DEF_INTRINSICS_FUNC(HLArrayGetObject, + dex_lang_hl_aget_object, + kAttrReadOnly | kAttrNoThrow, + kJavaObjectTy, + _EXPAND_ARG3(kInt32Ty, kJavaObjectTy, kInt32Ty)) + +_EVAL_DEF_INTRINSICS_FUNC(HLArrayGetBoolean, + dex_lang_hl_aget_boolean, + kAttrReadOnly | kAttrNoThrow, + kInt1Ty, + _EXPAND_ARG3(kInt32Ty, kJavaObjectTy, kInt32Ty)) + +_EVAL_DEF_INTRINSICS_FUNC(HLArrayGetByte, + dex_lang_hl_aget_byte, + kAttrReadOnly | kAttrNoThrow, + kInt8Ty, + _EXPAND_ARG3(kInt32Ty, kJavaObjectTy, kInt32Ty)) + +_EVAL_DEF_INTRINSICS_FUNC(HLArrayGetChar, + dex_lang_hl_aget_char, + kAttrReadOnly | kAttrNoThrow, + kInt16Ty, + _EXPAND_ARG3(kInt32Ty, kJavaObjectTy, kInt32Ty)) + +_EVAL_DEF_INTRINSICS_FUNC(HLArrayGetShort, + dex_lang_hl_aget_short, + kAttrReadOnly | kAttrNoThrow, + kInt16Ty, + _EXPAND_ARG3(kInt32Ty, kJavaObjectTy, kInt32Ty)) + +// void dex_lang_aput_[type](int optFlags, [type] value, JavaObject* array, uint32_t index) +_EVAL_DEF_INTRINSICS_FUNC(HLArrayPut, + dex_lang_hl_aput, + kAttrNoThrow, + kVoidTy, + _EXPAND_ARG4(kInt32Ty, kInt32Ty, kJavaObjectTy, kInt32Ty)) + +_EVAL_DEF_INTRINSICS_FUNC(HLArrayPutFloat, + dex_lang_hl_aput_float, + kAttrNoThrow, + kVoidTy, + _EXPAND_ARG4(kInt32Ty, kFloatTy, kJavaObjectTy, kInt32Ty)) + +_EVAL_DEF_INTRINSICS_FUNC(HLArrayPutWide, + dex_lang_hl_aput_wide, + kAttrNoThrow, + kVoidTy, + _EXPAND_ARG4(kInt32Ty, kInt64Ty, kJavaObjectTy, kInt32Ty)) + +_EVAL_DEF_INTRINSICS_FUNC(HLArrayPutDouble, + dex_lang_hl_aput_double, + kAttrNoThrow, + kVoidTy, + _EXPAND_ARG4(kInt32Ty, kDoubleTy, kJavaObjectTy, kInt32Ty)) + +_EVAL_DEF_INTRINSICS_FUNC(HLArrayPutObject, + dex_lang_hl_aput_object, + kAttrNoThrow, + kVoidTy, + _EXPAND_ARG4(kInt32Ty, kJavaObjectTy, kJavaObjectTy, kInt32Ty)) + +_EVAL_DEF_INTRINSICS_FUNC(HLArrayPutBoolean, + dex_lang_hl_aput_boolean, + kAttrNoThrow, + kVoidTy, + _EXPAND_ARG4(kInt32Ty, kInt1Ty, kJavaObjectTy, kInt32Ty)) + +_EVAL_DEF_INTRINSICS_FUNC(HLArrayPutByte, + dex_lang_hl_aput_byte, + kAttrNoThrow, + kVoidTy, + _EXPAND_ARG4(kInt32Ty, kInt8Ty, kJavaObjectTy, kInt32Ty)) + +_EVAL_DEF_INTRINSICS_FUNC(HLArrayPutChar, + dex_lang_hl_aput_char, + kAttrNoThrow, + kVoidTy, + _EXPAND_ARG4(kInt32Ty, kInt16Ty, kJavaObjectTy, kInt32Ty)) + +_EVAL_DEF_INTRINSICS_FUNC(HLArrayPutShort, + dex_lang_hl_aput_short, + kAttrNoThrow, + kVoidTy, + _EXPAND_ARG4(kInt32Ty, kInt16Ty, kJavaObjectTy, kInt32Ty)) + //---------------------------------------------------------------------------- // High-level Invokes (fast-path determination not yet performed) // @@ -644,18 +768,160 @@ _EVAL_DEF_INTRINSICS_FUNC(CheckSuspend, kAttrNoThrow, kVoidTy, _EXPAND_ARG0()) +//---------------------------------------------------------------------------- +// sput intrinsics to assist MIR to Greenland_ir conversion. +// "HL" versions - will be deprecated when fast/slow path handling done +// in the common frontend. +//---------------------------------------------------------------------------- + +// void sput_hl(int field_idx, int val) +_EVAL_DEF_INTRINSICS_FUNC(HLSput, + dex_lang_hl_sput, + kAttrReadOnly | kAttrNoThrow, + kVoidTy, + _EXPAND_ARG2(kInt32Ty, kInt32Ty)) + +// void sput_hl_object(int field_idx, object* val) +_EVAL_DEF_INTRINSICS_FUNC(HLSputObject, + dex_lang_hl_sput_object, + kAttrReadOnly | kAttrNoThrow, + kVoidTy, + _EXPAND_ARG2(kInt32Ty, kJavaObjectTy)) + +// void sput_hl_boolean(int field_idx, kInt1Ty) +_EVAL_DEF_INTRINSICS_FUNC(HLSputBoolean, + dex_lang_hl_sput_boolean, + kAttrReadOnly | kAttrNoThrow, + kVoidTy, + _EXPAND_ARG2(kInt32Ty, kInt1Ty)) + +// void sput_hl_byte(int field_idx, int val) +_EVAL_DEF_INTRINSICS_FUNC(HLSputByte, + dex_lang_hl_sput_byte, + kAttrReadOnly | kAttrNoThrow, + kVoidTy, + _EXPAND_ARG2(kInt32Ty, kInt8Ty)) + +// void sput_hl_char(int field_idx, kInt16Ty val) +_EVAL_DEF_INTRINSICS_FUNC(HLSputChar, + dex_lang_hl_sput_char, + kAttrReadOnly | kAttrNoThrow, + kVoidTy, + _EXPAND_ARG2(kInt32Ty, kInt16Ty)) + +// void sput_hl_short(int field_idx, int val) +_EVAL_DEF_INTRINSICS_FUNC(HLSputShort, + dex_lang_hl_sput_short, + kAttrReadOnly | kAttrNoThrow, + kVoidTy, + _EXPAND_ARG2(kInt32Ty, kInt16Ty)) + +// void sput_hl_wide(int field_idx, long val) +_EVAL_DEF_INTRINSICS_FUNC(HLSputWide, + dex_lang_hl_sput_wide, + kAttrReadOnly | kAttrNoThrow, + kVoidTy, + _EXPAND_ARG2(kInt32Ty, kInt64Ty)) + +// void sput_hl_double(int field_idx, double val) +_EVAL_DEF_INTRINSICS_FUNC(HLSputDouble, + dex_lang_hl_sput_double, + kAttrReadOnly | kAttrNoThrow, + kVoidTy, + _EXPAND_ARG2(kInt32Ty, kDoubleTy)) + +// void sput_hl_float(int field_idx, float val) +_EVAL_DEF_INTRINSICS_FUNC(HLSputFloat, + dex_lang_hl_sput_float, + kAttrReadOnly | kAttrNoThrow, + kVoidTy, + _EXPAND_ARG2(kInt32Ty, kFloatTy)) //---------------------------------------------------------------------------- // sget intrinsics to assist MIR to Greenland_ir conversion. +// "HL" versions - will be deprecated when fast/slow path handling done +// in the common frontend. //---------------------------------------------------------------------------- -// object* sget_obj(int field_idx) -_EVAL_DEF_INTRINSICS_FUNC(SgetObj, - dex_lang_sget_obj, +// int sget_hl(int field_idx) +_EVAL_DEF_INTRINSICS_FUNC(HLSget, + dex_lang_hl_sget, + kAttrReadOnly | kAttrNoThrow, + kInt32Ty, + _EXPAND_ARG1(kInt32Ty)) + +// object* sget_hl_object(int field_idx) +_EVAL_DEF_INTRINSICS_FUNC(HLSgetObject, + dex_lang_hl_sget_object, kAttrReadOnly | kAttrNoThrow, kJavaObjectTy, _EXPAND_ARG1(kInt32Ty)) +// boolean sget_hl_boolean(int field_idx) +_EVAL_DEF_INTRINSICS_FUNC(HLSgetBoolean, + dex_lang_hl_sget_boolean, + kAttrReadOnly | kAttrNoThrow, + kInt1Ty, + _EXPAND_ARG1(kInt32Ty)) + +// byte sget_hl_byte(int field_idx) +_EVAL_DEF_INTRINSICS_FUNC(HLSgetByte, + dex_lang_hl_sget_byte, + kAttrReadOnly | kAttrNoThrow, + kInt8Ty, + _EXPAND_ARG1(kInt32Ty)) + +// char sget_hl_char(int field_idx) +_EVAL_DEF_INTRINSICS_FUNC(HLSgetChar, + dex_lang_hl_sget_char, + kAttrReadOnly | kAttrNoThrow, + kInt16Ty, + _EXPAND_ARG1(kInt32Ty)) + +// char sget_hl_short(int field_idx) +_EVAL_DEF_INTRINSICS_FUNC(HLSgetShort, + dex_lang_hl_sget_short, + kAttrReadOnly | kAttrNoThrow, + kInt16Ty, + _EXPAND_ARG1(kInt32Ty)) + +// char sget_hl_wide(int field_idx) +_EVAL_DEF_INTRINSICS_FUNC(HLSgetWide, + dex_lang_hl_sget_wide, + kAttrReadOnly | kAttrNoThrow, + kInt64Ty, + _EXPAND_ARG1(kInt32Ty)) + +// char sget_hl_double(int field_idx) +_EVAL_DEF_INTRINSICS_FUNC(HLSgetDouble, + dex_lang_hl_sget_double, + kAttrReadOnly | kAttrNoThrow, + kDoubleTy, + _EXPAND_ARG1(kInt32Ty)) + +// char sget_hl_float(int field_idx) +_EVAL_DEF_INTRINSICS_FUNC(HLSgetFloat, + dex_lang_hl_sget_float, + kAttrReadOnly | kAttrNoThrow, + kFloatTy, + _EXPAND_ARG1(kInt32Ty)) +//---------------------------------------------------------------------------- +// Monitor enter/exit +//---------------------------------------------------------------------------- +// uint32_t dex_lang_monitor_enter(JavaObject* obj) +_EVAL_DEF_INTRINSICS_FUNC(MonitorEnter, + dex_lang_monitor_enter, + kAttrReadOnly | kAttrNoThrow, + kVoidTy, + _EXPAND_ARG1(kJavaObjectTy)) + +// uint32_t dex_lang_monitor_exit(JavaObject* obj) +_EVAL_DEF_INTRINSICS_FUNC(MonitorExit, + dex_lang_monitor_exit, + kAttrReadOnly | kAttrNoThrow, + kVoidTy, + _EXPAND_ARG1(kJavaObjectTy)) + //---------------------------------------------------------------------------- // Shadow Frame //---------------------------------------------------------------------------- diff --git a/test/028-array-write/src/Main.java b/test/028-array-write/src/Main.java index 9e2826ea56..2618ff8aa4 100644 --- a/test/028-array-write/src/Main.java +++ b/test/028-array-write/src/Main.java @@ -70,13 +70,16 @@ public class Main { report(start, end); } + public static void array_028() { + writeTest(); + copyTest(); + System.out.println("Done!"); + } + public static void main(String[] args) { if ((args.length >= 1) && args[0].equals("--timing")) { timing = true; } - - writeTest(); - copyTest(); - System.out.println("Done!"); + array_028(); } } -- cgit v1.2.3-59-g8ed1b