archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 23:34:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Joseph Provino 2016-01-07 21:10:28 +00:00
commit 9288ff53e7
1316 changed files with 58581 additions and 14455 deletions
Download patch file Download diff file Expand all files Collapse all files

18
hotspot/src/cpu/sparc/vm/macroAssembler_sparc.cpp
View file

@ -181,19 +181,6 @@ void MacroAssembler::null_check(Register reg, int offset) {
// Ring buffer jumps
#ifndef PRODUCT
void MacroAssembler::ret( bool trace ) { if (trace) {
mov(I7, O7); // traceable register
JMP(O7, 2 * BytesPerInstWord);
} else {
jmpl( I7, 2 * BytesPerInstWord, G0 );
}
}
void MacroAssembler::retl( bool trace ) { if (trace) JMP(O7, 2 * BytesPerInstWord);
else jmpl( O7, 2 * BytesPerInstWord, G0 ); }
#endif /* PRODUCT */
void MacroAssembler::jmp2(Register r1, Register r2, const char* file, int line ) {
assert_not_delayed();
@ -758,8 +745,8 @@ void MacroAssembler::set_vm_result(Register oop_result) {
}
void MacroAssembler::ic_call(address entry, bool emit_delay) {
RelocationHolder rspec = virtual_call_Relocation::spec(pc());
void MacroAssembler::ic_call(address entry, bool emit_delay, jint method_index) {
RelocationHolder rspec = virtual_call_Relocation::spec(pc(), method_index);
patchable_set((intptr_t)Universe::non_oop_word(), G5_inline_cache_reg);
relocate(rspec);
call(entry, relocInfo::none);
@ -768,7 +755,6 @@ void MacroAssembler::ic_call(address entry, bool emit_delay) {
}
}
void MacroAssembler::card_table_write(jbyte* byte_map_base,
Register tmp, Register obj) {
#ifdef _LP64