Mercurial > hg > graal-jvmci-8
comparison src/share/vm/runtime/vmStructs.cpp @ 18929:8f2fb6bec986
removed GPU code
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Fri, 23 Jan 2015 10:54:21 +0100 |
parents | 2a69cbe850a8 |
children | 7848fc12602b |
comparison
equal
deleted
inserted
replaced
18928:c8fc6e2d128b | 18929:8f2fb6bec986 |
---|---|
91 #include "prims/jvmtiAgentThread.hpp" | 91 #include "prims/jvmtiAgentThread.hpp" |
92 #include "runtime/arguments.hpp" | 92 #include "runtime/arguments.hpp" |
93 #include "runtime/deoptimization.hpp" | 93 #include "runtime/deoptimization.hpp" |
94 #include "runtime/vframeArray.hpp" | 94 #include "runtime/vframeArray.hpp" |
95 #include "runtime/globals.hpp" | 95 #include "runtime/globals.hpp" |
96 #include "runtime/gpu.hpp" | |
97 #include "runtime/java.hpp" | 96 #include "runtime/java.hpp" |
98 #include "runtime/javaCalls.hpp" | 97 #include "runtime/javaCalls.hpp" |
99 #include "runtime/perfMemory.hpp" | 98 #include "runtime/perfMemory.hpp" |
100 #include "runtime/serviceThread.hpp" | 99 #include "runtime/serviceThread.hpp" |
101 #include "runtime/sharedRuntime.hpp" | 100 #include "runtime/sharedRuntime.hpp" |
108 #include "utilities/hashtable.hpp" | 107 #include "utilities/hashtable.hpp" |
109 #include "utilities/macros.hpp" | 108 #include "utilities/macros.hpp" |
110 #ifdef GRAAL | 109 #ifdef GRAAL |
111 # include "graal/graalRuntime.hpp" | 110 # include "graal/graalRuntime.hpp" |
112 # include "graal/vmStructs_graal.hpp" | 111 # include "graal/vmStructs_graal.hpp" |
113 # include "hsail/vm/vmStructs_hsail.hpp" | |
114 #endif | 112 #endif |
115 #ifdef TARGET_ARCH_x86 | 113 #ifdef TARGET_ARCH_x86 |
116 # include "vmStructs_x86.hpp" | 114 # include "vmStructs_x86.hpp" |
117 #endif | 115 #endif |
118 #ifdef TARGET_ARCH_sparc | 116 #ifdef TARGET_ARCH_sparc |
3052 GENERATE_NONPRODUCT_NONSTATIC_VM_STRUCT_ENTRY, | 3050 GENERATE_NONPRODUCT_NONSTATIC_VM_STRUCT_ENTRY, |
3053 GENERATE_C2_NONSTATIC_VM_STRUCT_ENTRY, | 3051 GENERATE_C2_NONSTATIC_VM_STRUCT_ENTRY, |
3054 GENERATE_C1_UNCHECKED_STATIC_VM_STRUCT_ENTRY, | 3052 GENERATE_C1_UNCHECKED_STATIC_VM_STRUCT_ENTRY, |
3055 GENERATE_C2_UNCHECKED_STATIC_VM_STRUCT_ENTRY) | 3053 GENERATE_C2_UNCHECKED_STATIC_VM_STRUCT_ENTRY) |
3056 | 3054 |
3057 #ifdef GRAAL | |
3058 VM_STRUCTS_GPU_HSAIL(GENERATE_NONSTATIC_VM_STRUCT_ENTRY) | |
3059 #endif | |
3060 | |
3061 VM_STRUCTS_OS_CPU(GENERATE_NONSTATIC_VM_STRUCT_ENTRY, | 3055 VM_STRUCTS_OS_CPU(GENERATE_NONSTATIC_VM_STRUCT_ENTRY, |
3062 GENERATE_STATIC_VM_STRUCT_ENTRY, | 3056 GENERATE_STATIC_VM_STRUCT_ENTRY, |
3063 GENERATE_UNCHECKED_NONSTATIC_VM_STRUCT_ENTRY, | 3057 GENERATE_UNCHECKED_NONSTATIC_VM_STRUCT_ENTRY, |
3064 GENERATE_NONSTATIC_VM_STRUCT_ENTRY, | 3058 GENERATE_NONSTATIC_VM_STRUCT_ENTRY, |
3065 GENERATE_NONPRODUCT_NONSTATIC_VM_STRUCT_ENTRY, | 3059 GENERATE_NONPRODUCT_NONSTATIC_VM_STRUCT_ENTRY, |
3105 GENERATE_INTEGER_VM_TYPE_ENTRY, | 3099 GENERATE_INTEGER_VM_TYPE_ENTRY, |
3106 GENERATE_UNSIGNED_INTEGER_VM_TYPE_ENTRY, | 3100 GENERATE_UNSIGNED_INTEGER_VM_TYPE_ENTRY, |
3107 GENERATE_C1_TOPLEVEL_VM_TYPE_ENTRY, | 3101 GENERATE_C1_TOPLEVEL_VM_TYPE_ENTRY, |
3108 GENERATE_C2_VM_TYPE_ENTRY, | 3102 GENERATE_C2_VM_TYPE_ENTRY, |
3109 GENERATE_C2_TOPLEVEL_VM_TYPE_ENTRY) | 3103 GENERATE_C2_TOPLEVEL_VM_TYPE_ENTRY) |
3110 | |
3111 #ifdef GRAAL | |
3112 VM_TYPES_GPU_HSAIL(GENERATE_VM_TYPE_ENTRY, | |
3113 GENERATE_TOPLEVEL_VM_TYPE_ENTRY) | |
3114 #endif | |
3115 | 3104 |
3116 VM_TYPES_OS_CPU(GENERATE_VM_TYPE_ENTRY, | 3105 VM_TYPES_OS_CPU(GENERATE_VM_TYPE_ENTRY, |
3117 GENERATE_TOPLEVEL_VM_TYPE_ENTRY, | 3106 GENERATE_TOPLEVEL_VM_TYPE_ENTRY, |
3118 GENERATE_OOP_VM_TYPE_ENTRY, | 3107 GENERATE_OOP_VM_TYPE_ENTRY, |
3119 GENERATE_INTEGER_VM_TYPE_ENTRY, | 3108 GENERATE_INTEGER_VM_TYPE_ENTRY, |
3216 CHECK_NONPRODUCT_NONSTATIC_VM_STRUCT_ENTRY, | 3205 CHECK_NONPRODUCT_NONSTATIC_VM_STRUCT_ENTRY, |
3217 CHECK_C2_NONSTATIC_VM_STRUCT_ENTRY, | 3206 CHECK_C2_NONSTATIC_VM_STRUCT_ENTRY, |
3218 CHECK_NO_OP, | 3207 CHECK_NO_OP, |
3219 CHECK_NO_OP); | 3208 CHECK_NO_OP); |
3220 | 3209 |
3221 #ifdef GRAAL | |
3222 VM_STRUCTS_GPU_HSAIL(CHECK_NONSTATIC_VM_STRUCT_ENTRY) | |
3223 #endif | |
3224 | |
3225 VM_STRUCTS_OS_CPU(CHECK_NONSTATIC_VM_STRUCT_ENTRY, | 3210 VM_STRUCTS_OS_CPU(CHECK_NONSTATIC_VM_STRUCT_ENTRY, |
3226 CHECK_STATIC_VM_STRUCT_ENTRY, | 3211 CHECK_STATIC_VM_STRUCT_ENTRY, |
3227 CHECK_NO_OP, | 3212 CHECK_NO_OP, |
3228 CHECK_VOLATILE_NONSTATIC_VM_STRUCT_ENTRY, | 3213 CHECK_VOLATILE_NONSTATIC_VM_STRUCT_ENTRY, |
3229 CHECK_NONPRODUCT_NONSTATIC_VM_STRUCT_ENTRY, | 3214 CHECK_NONPRODUCT_NONSTATIC_VM_STRUCT_ENTRY, |
3259 CHECK_SINGLE_ARG_VM_TYPE_NO_OP, | 3244 CHECK_SINGLE_ARG_VM_TYPE_NO_OP, |
3260 CHECK_SINGLE_ARG_VM_TYPE_NO_OP, | 3245 CHECK_SINGLE_ARG_VM_TYPE_NO_OP, |
3261 CHECK_C1_TOPLEVEL_VM_TYPE_ENTRY, | 3246 CHECK_C1_TOPLEVEL_VM_TYPE_ENTRY, |
3262 CHECK_C2_VM_TYPE_ENTRY, | 3247 CHECK_C2_VM_TYPE_ENTRY, |
3263 CHECK_C2_TOPLEVEL_VM_TYPE_ENTRY); | 3248 CHECK_C2_TOPLEVEL_VM_TYPE_ENTRY); |
3264 | |
3265 #ifdef GRAAL | |
3266 VM_TYPES_GPU_HSAIL(CHECK_VM_TYPE_ENTRY, | |
3267 CHECK_SINGLE_ARG_VM_TYPE_NO_OP); | |
3268 #endif | |
3269 | 3249 |
3270 VM_TYPES_OS_CPU(CHECK_VM_TYPE_ENTRY, | 3250 VM_TYPES_OS_CPU(CHECK_VM_TYPE_ENTRY, |
3271 CHECK_SINGLE_ARG_VM_TYPE_NO_OP, | 3251 CHECK_SINGLE_ARG_VM_TYPE_NO_OP, |
3272 CHECK_SINGLE_ARG_VM_TYPE_NO_OP, | 3252 CHECK_SINGLE_ARG_VM_TYPE_NO_OP, |
3273 CHECK_SINGLE_ARG_VM_TYPE_NO_OP, | 3253 CHECK_SINGLE_ARG_VM_TYPE_NO_OP, |