1 /* |
1 /* |
2 * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved. |
2 * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved. |
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 * |
4 * |
5 * This code is free software; you can redistribute it and/or modify it |
5 * This code is free software; you can redistribute it and/or modify it |
6 * under the terms of the GNU General Public License version 2 only, as |
6 * under the terms of the GNU General Public License version 2 only, as |
7 * published by the Free Software Foundation. |
7 * published by the Free Software Foundation. |
53 #include "gc/shared/cardTableRS.hpp" |
53 #include "gc/shared/cardTableRS.hpp" |
54 #include "gc/shared/collectedHeap.hpp" |
54 #include "gc/shared/collectedHeap.hpp" |
55 #include "gc/shared/genCollectedHeap.hpp" |
55 #include "gc/shared/genCollectedHeap.hpp" |
56 #include "gc/shared/generation.hpp" |
56 #include "gc/shared/generation.hpp" |
57 #include "gc/shared/generationSpec.hpp" |
57 #include "gc/shared/generationSpec.hpp" |
|
58 #include "gc/shared/oopStorage.hpp" |
58 #include "gc/shared/space.hpp" |
59 #include "gc/shared/space.hpp" |
59 #include "interpreter/bytecodeInterpreter.hpp" |
60 #include "interpreter/bytecodeInterpreter.hpp" |
60 #include "interpreter/bytecodes.hpp" |
61 #include "interpreter/bytecodes.hpp" |
61 #include "interpreter/interpreter.hpp" |
62 #include "interpreter/interpreter.hpp" |
62 #include "memory/allocation.hpp" |
63 #include "memory/allocation.hpp" |
946 nonstatic_field(ImmutableOopMap, _count, int) \ |
947 nonstatic_field(ImmutableOopMap, _count, int) \ |
947 \ |
948 \ |
948 /*********************************/ \ |
949 /*********************************/ \ |
949 /* JNIHandles and JNIHandleBlock */ \ |
950 /* JNIHandles and JNIHandleBlock */ \ |
950 /*********************************/ \ |
951 /*********************************/ \ |
951 static_field(JNIHandles, _global_handles, JNIHandleBlock*) \ |
952 static_field(JNIHandles, _global_handles, OopStorage*) \ |
952 static_field(JNIHandles, _weak_global_handles, JNIHandleBlock*) \ |
953 static_field(JNIHandles, _weak_global_handles, OopStorage*) \ |
953 static_field(JNIHandles, _deleted_handle, oop) \ |
|
954 \ |
|
955 unchecked_nonstatic_field(JNIHandleBlock, _handles, JNIHandleBlock::block_size_in_oops * sizeof(Oop)) /* Note: no type */ \ |
954 unchecked_nonstatic_field(JNIHandleBlock, _handles, JNIHandleBlock::block_size_in_oops * sizeof(Oop)) /* Note: no type */ \ |
956 nonstatic_field(JNIHandleBlock, _top, int) \ |
955 nonstatic_field(JNIHandleBlock, _top, int) \ |
957 nonstatic_field(JNIHandleBlock, _next, JNIHandleBlock*) \ |
956 nonstatic_field(JNIHandleBlock, _next, JNIHandleBlock*) \ |
958 \ |
957 \ |
959 /********************/ \ |
958 /********************/ \ |
1674 /*********************************/ \ |
1673 /*********************************/ \ |
1675 \ |
1674 \ |
1676 declare_toplevel_type(JNIHandles) \ |
1675 declare_toplevel_type(JNIHandles) \ |
1677 declare_toplevel_type(JNIHandleBlock) \ |
1676 declare_toplevel_type(JNIHandleBlock) \ |
1678 declare_toplevel_type(jobject) \ |
1677 declare_toplevel_type(jobject) \ |
|
1678 \ |
|
1679 /**************/ \ |
|
1680 /* OopStorage */ \ |
|
1681 /**************/ \ |
|
1682 \ |
|
1683 declare_toplevel_type(OopStorage) \ |
1679 \ |
1684 \ |
1680 /**********************/ \ |
1685 /**********************/ \ |
1681 /* Runtime1 (C1 only) */ \ |
1686 /* Runtime1 (C1 only) */ \ |
1682 /**********************/ \ |
1687 /**********************/ \ |
1683 \ |
1688 \ |