Mercurial > hg > truffle
diff src/share/vm/interpreter/abstractInterpreter.hpp @ 11198:1e6d5dec4a4e
Merge.
| author | Christian Humer <christian.humer@gmail.com> |
|---|---|
| date | Mon, 05 Aug 2013 13:20:06 +0200 |
| parents | 6b0fd0964b87 |
| children | 096c224171c4 |
line wrap: on
line diff
--- a/src/share/vm/interpreter/abstractInterpreter.hpp Thu Aug 01 21:34:57 2013 +0200 +++ b/src/share/vm/interpreter/abstractInterpreter.hpp Mon Aug 05 13:20:06 2013 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, 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 @@ -105,6 +105,9 @@ java_lang_math_pow, // implementation of java.lang.Math.pow (x,y) java_lang_math_exp, // implementation of java.lang.Math.exp (x) java_lang_ref_reference_get, // implementation of java.lang.ref.Reference.get() + java_util_zip_CRC32_update, // implementation of java.util.zip.CRC32.update() + java_util_zip_CRC32_updateBytes, // implementation of java.util.zip.CRC32.updateBytes() + java_util_zip_CRC32_updateByteBuffer, // implementation of java.util.zip.CRC32.updateByteBuffer() number_of_method_entries, invalid = -1 };