comparison src/share/vm/classfile/javaClasses.hpp @ 11198:1e6d5dec4a4e

Merge.
author Christian Humer <christian.humer@gmail.com>
date Mon, 05 Aug 2013 13:20:06 +0200
parents 6b0fd0964b87
children 3cce976666d9
comparison
equal deleted inserted replaced
11197:3479ab380552 11198:1e6d5dec4a4e
236 static bool offsets_computed; 236 static bool offsets_computed;
237 static int classRedefinedCount_offset; 237 static int classRedefinedCount_offset;
238 static GrowableArray<Klass*>* _fixup_mirror_list; 238 static GrowableArray<Klass*>* _fixup_mirror_list;
239 239
240 static void set_init_lock(oop java_class, oop init_lock); 240 static void set_init_lock(oop java_class, oop init_lock);
241 static void set_protection_domain(oop java_class, oop protection_domain);
241 public: 242 public:
242 static void compute_offsets(); 243 static void compute_offsets();
243 244
244 // Instance creation 245 // Instance creation
245 static oop create_mirror(KlassHandle k, Handle protection_domain, TRAPS); 246 static oop create_mirror(KlassHandle k, Handle protection_domain, TRAPS);
274 static int classRedefinedCount(oop the_class_mirror); 275 static int classRedefinedCount(oop the_class_mirror);
275 static void set_classRedefinedCount(oop the_class_mirror, int value); 276 static void set_classRedefinedCount(oop the_class_mirror, int value);
276 277
277 // Support for embedded per-class oops 278 // Support for embedded per-class oops
278 static oop protection_domain(oop java_class); 279 static oop protection_domain(oop java_class);
279 static void set_protection_domain(oop java_class, oop protection_domain);
280 static oop init_lock(oop java_class); 280 static oop init_lock(oop java_class);
281 static objArrayOop signers(oop java_class); 281 static objArrayOop signers(oop java_class);
282 static void set_signers(oop java_class, objArrayOop signers); 282 static void set_signers(oop java_class, objArrayOop signers);
283 283
284 static int oop_size(oop java_class); 284 static int oop_size(oop java_class);
1175 // Note that for this class the layout changed between JDK1.2 and JDK1.3, 1175 // Note that for this class the layout changed between JDK1.2 and JDK1.3,
1176 // so we compute the offsets at startup rather than hard-wiring them. 1176 // so we compute the offsets at startup rather than hard-wiring them.
1177 static int _context_offset; 1177 static int _context_offset;
1178 static int _privilegedContext_offset; 1178 static int _privilegedContext_offset;
1179 static int _isPrivileged_offset; 1179 static int _isPrivileged_offset;
1180 static int _isAuthorized_offset;
1180 1181
1181 static void compute_offsets(); 1182 static void compute_offsets();
1182 public: 1183 public:
1183 static oop create(objArrayHandle context, bool isPrivileged, Handle privileged_context, TRAPS); 1184 static oop create(objArrayHandle context, bool isPrivileged, Handle privileged_context, TRAPS);
1185
1186 static bool is_authorized(Handle context);
1184 1187
1185 // Debugging/initialization 1188 // Debugging/initialization
1186 friend class JavaClasses; 1189 friend class JavaClasses;
1187 }; 1190 };
1188 1191
1239 class java_lang_System : AllStatic { 1242 class java_lang_System : AllStatic {
1240 private: 1243 private:
1241 enum { 1244 enum {
1242 hc_static_in_offset = 0, 1245 hc_static_in_offset = 0,
1243 hc_static_out_offset = 1, 1246 hc_static_out_offset = 1,
1244 hc_static_err_offset = 2 1247 hc_static_err_offset = 2,
1248 hc_static_security_offset = 3
1245 }; 1249 };
1246 1250
1247 static int static_in_offset; 1251 static int static_in_offset;
1248 static int static_out_offset; 1252 static int static_out_offset;
1249 static int static_err_offset; 1253 static int static_err_offset;
1254 static int static_security_offset;
1250 1255
1251 public: 1256 public:
1252 static int in_offset_in_bytes(); 1257 static int in_offset_in_bytes();
1253 static int out_offset_in_bytes(); 1258 static int out_offset_in_bytes();
1254 static int err_offset_in_bytes(); 1259 static int err_offset_in_bytes();
1260
1261 static bool has_security_manager();
1255 1262
1256 // Debugging 1263 // Debugging
1257 friend class JavaClasses; 1264 friend class JavaClasses;
1258 }; 1265 };
1259 1266