1.1 --- a/src/share/vm/interpreter/oopMapCache.hpp Fri Aug 31 16:39:35 2012 -0700
1.2 +++ b/src/share/vm/interpreter/oopMapCache.hpp Sat Sep 01 13:25:18 2012 -0400
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -32,7 +32,7 @@
1.11 // The memory management system uses the cache when locating object
1.12 // references in an interpreted frame.
1.13 //
1.14 -// OopMapCache's are allocated lazily per instanceKlass.
1.15 +// OopMapCache's are allocated lazily per InstanceKlass.
1.16
1.17 // The oopMap (InterpreterOopMap) is stored as a bit mask. If the
1.18 // bit_mask can fit into two words it is stored in
1.19 @@ -83,7 +83,7 @@
1.20 };
1.21
1.22 private:
1.23 - methodOop _method; // the method for which the mask is valid
1.24 + Method* _method; // the method for which the mask is valid
1.25 unsigned short _bci; // the bci for which the mask is valid
1.26 int _mask_size; // the mask size in bits
1.27 int _expression_stack_size; // the size of the expression stack in slots
1.28 @@ -100,8 +100,8 @@
1.29 #endif
1.30
1.31 // access methods
1.32 - methodOop method() const { return _method; }
1.33 - void set_method(methodOop v) { _method = v; }
1.34 + Method* method() const { return _method; }
1.35 + void set_method(Method* v) { _method = v; }
1.36 int bci() const { return _bci; }
1.37 void set_bci(int v) { _bci = v; }
1.38 int mask_size() const { return _mask_size; }
1.39 @@ -142,9 +142,6 @@
1.40 void resource_copy(OopMapCacheEntry* from);
1.41
1.42 void iterate_oop(OffsetClosure* oop_closure);
1.43 - void oop_iterate(OopClosure * blk);
1.44 - void oop_iterate(OopClosure * blk, MemRegion mr);
1.45 - void verify();
1.46 void print();
1.47
1.48 bool is_oop (int offset) { return (entry_at(offset) & (1 << oop_bit_number )) != 0; }
1.49 @@ -185,12 +182,6 @@
1.50 // Compute an oop map without updating the cache or grabbing any locks (for debugging)
1.51 static void compute_one_oop_map(methodHandle method, int bci, InterpreterOopMap* entry);
1.52
1.53 - // Helpers
1.54 - // Iterate over the entries in the cached OopMapCacheEntry's
1.55 - void oop_iterate(OopClosure *blk);
1.56 - void oop_iterate(OopClosure *blk, MemRegion mr);
1.57 - void verify();
1.58 -
1.59 // Returns total no. of bytes allocated as part of OopMapCache's
1.60 static long memory_usage() PRODUCT_RETURN0;
1.61 };
