Mercurial > hg > graal-jvmci-8
diff src/share/vm/c1/c1_Runtime1.hpp @ 6948:e522a00b91aa
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Mon, 12 Nov 2012 23:14:12 +0100 |
parents | fd71ca8c5f88 da91efe96a93 |
children | ce248dc0a656 |
line wrap: on
line diff
--- a/src/share/vm/c1/c1_Runtime1.hpp Mon Nov 12 18:11:17 2012 +0100 +++ b/src/share/vm/c1/c1_Runtime1.hpp Mon Nov 12 23:14:12 2012 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -66,6 +66,7 @@ stub(deoptimize) \ stub(access_field_patching) \ stub(load_klass_patching) \ + stub(load_mirror_patching) \ stub(g1_pre_barrier_slow) \ stub(g1_post_barrier_slow) \ stub(fpu2long_stub) \ @@ -115,6 +116,7 @@ stub(deoptimize) \ stub(access_field_patching) \ stub(load_klass_patching) \ + stub(load_mirror_patching) \ stub(g1_pre_barrier_slow) \ stub(g1_post_barrier_slow) \ stub(fpu2long_stub) \ @@ -181,12 +183,12 @@ Register arg1 = noreg, Register arg2 = noreg, Register arg3 = noreg); // runtime entry points - static void new_instance (JavaThread* thread, klassOopDesc* klass); - static void new_type_array (JavaThread* thread, klassOopDesc* klass, jint length); - static void new_object_array(JavaThread* thread, klassOopDesc* klass, jint length); - static void new_multi_array (JavaThread* thread, klassOopDesc* klass, int rank, jint* dims); + static void new_instance (JavaThread* thread, Klass* klass); + static void new_type_array (JavaThread* thread, Klass* klass, jint length); + static void new_object_array(JavaThread* thread, Klass* klass, jint length); + static void new_multi_array (JavaThread* thread, Klass* klass, int rank, jint* dims); - static address counter_overflow(JavaThread* thread, int bci, methodOopDesc* method); + static address counter_overflow(JavaThread* thread, int bci, Method* method); static void unimplemented_entry (JavaThread* thread, StubID id); @@ -217,12 +219,13 @@ LOG_OBJECT_ADDRESS = 0x04 }; static void graal_log_object(JavaThread* thread, oop msg, jint flags); -#endif +#endif // GRAAL static void deoptimize(JavaThread* thread); static int access_field_patching(JavaThread* thread); static int move_klass_patching(JavaThread* thread); + static int move_mirror_patching(JavaThread* thread); static void patch_code(JavaThread* thread, StubID stub_id);