Mercurial > hg > truffle
comparison src/share/vm/runtime/thread.cpp @ 1608:2389669474a6
Merge
author | jrose |
---|---|
date | Tue, 15 Jun 2010 15:57:36 -0700 |
parents | b17deadc902e d93949c5bdcc |
children | 126ea7725993 2dfd013a7465 |
comparison
equal
deleted
inserted
replaced
1594:b9bc732be7c0 | 1608:2389669474a6 |
---|---|
2698 void JavaThread::popframe_preserve_args(ByteSize size_in_bytes, void* start) { | 2698 void JavaThread::popframe_preserve_args(ByteSize size_in_bytes, void* start) { |
2699 assert(_popframe_preserved_args == NULL, "should not wipe out old PopFrame preserved arguments"); | 2699 assert(_popframe_preserved_args == NULL, "should not wipe out old PopFrame preserved arguments"); |
2700 if (in_bytes(size_in_bytes) != 0) { | 2700 if (in_bytes(size_in_bytes) != 0) { |
2701 _popframe_preserved_args = NEW_C_HEAP_ARRAY(char, in_bytes(size_in_bytes)); | 2701 _popframe_preserved_args = NEW_C_HEAP_ARRAY(char, in_bytes(size_in_bytes)); |
2702 _popframe_preserved_args_size = in_bytes(size_in_bytes); | 2702 _popframe_preserved_args_size = in_bytes(size_in_bytes); |
2703 Copy::conjoint_bytes(start, _popframe_preserved_args, _popframe_preserved_args_size); | 2703 Copy::conjoint_jbytes(start, _popframe_preserved_args, _popframe_preserved_args_size); |
2704 } | 2704 } |
2705 } | 2705 } |
2706 | 2706 |
2707 void* JavaThread::popframe_preserved_args() { | 2707 void* JavaThread::popframe_preserved_args() { |
2708 return _popframe_preserved_args; | 2708 return _popframe_preserved_args; |