stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

7119294: Two command line options cause JVM to crash

Browse Source 
Setup thread register in MacroAssembler::incr_allocated_bytes() on x64

Reviewed-by: kvn
This commit is contained in:
Igor Veresov 2012-01-05 17:25:58 -08:00
parent 05ec1c0816
commit 72f3f7db44
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hotspot/src/cpu/x86/vm/assembler_x86.cpp
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -7993,6 +7993,16 @@ void MacroAssembler::incr_allocated_bytes(Register thread,
Register var_size_in_bytes, Register var_size_in_bytes,
int con_size_in_bytes, int con_size_in_bytes,
Register t1) { Register t1) {
if (!thread->is_valid()) {
#ifdef _LP64
thread = r15_thread;
#else
assert(t1->is_valid(), "need temp reg");
thread = t1;
get_thread(thread);
#endif
}
#ifdef _LP64 #ifdef _LP64
if (var_size_in_bytes->is_valid()) { if (var_size_in_bytes->is_valid()) {
addq(Address(thread, in_bytes(JavaThread::allocated_bytes_offset())), var_size_in_bytes); addq(Address(thread, in_bytes(JavaThread::allocated_bytes_offset())), var_size_in_bytes);
@ -8000,12 +8010,6 @@ void MacroAssembler::incr_allocated_bytes(Register thread,
addq(Address(thread, in_bytes(JavaThread::allocated_bytes_offset())), con_size_in_bytes); addq(Address(thread, in_bytes(JavaThread::allocated_bytes_offset())), con_size_in_bytes);
} }
#else #else
if (!thread->is_valid()) {
assert(t1->is_valid(), "need temp reg");
thread = t1;
get_thread(thread);
}
if (var_size_in_bytes->is_valid()) { if (var_size_in_bytes->is_valid()) {
addl(Address(thread, in_bytes(JavaThread::allocated_bytes_offset())), var_size_in_bytes); addl(Address(thread, in_bytes(JavaThread::allocated_bytes_offset())), var_size_in_bytes);
} else { } else {