1.1 --- a/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp Mon Apr 20 14:48:03 2009 -0700
1.2 +++ b/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp Tue Apr 21 11:16:30 2009 -0700
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved.
1.6 + * Copyright 1999-2009 Sun Microsystems, Inc. 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 @@ -57,13 +57,13 @@
1.11
1.12 // check for pending exceptions
1.13 { Label L;
1.14 - Address exception_addr(G2_thread, 0, in_bytes(Thread::pending_exception_offset()));
1.15 + Address exception_addr(G2_thread, Thread::pending_exception_offset());
1.16 ld_ptr(exception_addr, Gtemp);
1.17 br_null(Gtemp, false, pt, L);
1.18 delayed()->nop();
1.19 - Address vm_result_addr(G2_thread, 0, in_bytes(JavaThread::vm_result_offset()));
1.20 + Address vm_result_addr(G2_thread, JavaThread::vm_result_offset());
1.21 st_ptr(G0, vm_result_addr);
1.22 - Address vm_result_addr_2(G2_thread, 0, in_bytes(JavaThread::vm_result_2_offset()));
1.23 + Address vm_result_addr_2(G2_thread, JavaThread::vm_result_2_offset());
1.24 st_ptr(G0, vm_result_addr_2);
1.25
1.26 if (frame_size() == no_frame_size) {
1.27 @@ -73,8 +73,8 @@
1.28 } else if (_stub_id == Runtime1::forward_exception_id) {
1.29 should_not_reach_here();
1.30 } else {
1.31 - Address exc(G4, Runtime1::entry_for(Runtime1::forward_exception_id));
1.32 - jump_to(exc, 0);
1.33 + AddressLiteral exc(Runtime1::entry_for(Runtime1::forward_exception_id));
1.34 + jump_to(exc, G4);
1.35 delayed()->nop();
1.36 }
1.37 bind(L);
1.38 @@ -85,7 +85,7 @@
1.39 get_vm_result (oop_result1);
1.40 } else {
1.41 // be a little paranoid and clear the result
1.42 - Address vm_result_addr(G2_thread, 0, in_bytes(JavaThread::vm_result_offset()));
1.43 + Address vm_result_addr(G2_thread, JavaThread::vm_result_offset());
1.44 st_ptr(G0, vm_result_addr);
1.45 }
1.46
1.47 @@ -93,7 +93,7 @@
1.48 get_vm_result_2(oop_result2);
1.49 } else {
1.50 // be a little paranoid and clear the result
1.51 - Address vm_result_addr_2(G2_thread, 0, in_bytes(JavaThread::vm_result_2_offset()));
1.52 + Address vm_result_addr_2(G2_thread, JavaThread::vm_result_2_offset());
1.53 st_ptr(G0, vm_result_addr_2);
1.54 }
1.55
1.56 @@ -479,8 +479,8 @@
1.57 Register G4_length = G4; // Incoming
1.58 Register O0_obj = O0; // Outgoing
1.59
1.60 - Address klass_lh(G5_klass, 0, ((klassOopDesc::header_size() * HeapWordSize)
1.61 - + Klass::layout_helper_offset_in_bytes()));
1.62 + Address klass_lh(G5_klass, ((klassOopDesc::header_size() * HeapWordSize)
1.63 + + Klass::layout_helper_offset_in_bytes()));
1.64 assert(Klass::_lh_header_size_shift % BitsPerByte == 0, "bytewise");
1.65 assert(Klass::_lh_header_size_mask == 0xFF, "bytewise");
1.66 // Use this offset to pick out an individual byte of the layout_helper:
1.67 @@ -902,8 +902,8 @@
1.68 __ srl(addr, CardTableModRefBS::card_shift, addr);
1.69 #endif
1.70
1.71 - Address rs(cardtable, (address)byte_map_base);
1.72 - __ load_address(rs); // cardtable := <card table base>
1.73 + AddressLiteral rs(byte_map_base);
1.74 + __ set(rs, cardtable); // cardtable := <card table base>
1.75 __ ldub(addr, cardtable, tmp); // tmp := [addr + cardtable]
1.76
1.77 __ br_on_reg_cond(Assembler::rc_nz, /*annul*/false, Assembler::pt,
1.78 @@ -1022,8 +1022,8 @@
1.79
1.80 __ restore();
1.81
1.82 - Address exc(G4, Runtime1::entry_for(Runtime1::unwind_exception_id));
1.83 - __ jump_to(exc, 0);
1.84 + AddressLiteral exc(Runtime1::entry_for(Runtime1::unwind_exception_id));
1.85 + __ jump_to(exc, G4);
1.86 __ delayed()->nop();
1.87
1.88
