truffle: src/cpu/ppc/vm/macroAssembler

comparison src/cpu/ppc/vm/macroAssembler_ppc.cpp @ 17793:c668f307a4c0

8031319: PPC64: Some fixes in ppc and aix coding. Reviewed-by: kvn

author	goetz
date	Tue, 07 Jan 2014 17:24:59 +0100
parents	67fa91961822
children	e5e8aa897002

comparison

equal deleted inserted replaced

-:4345c6a92f35
+:c668f307a4c0
 const int inst2 = *(int *)inst2_addr;
 // The relocation points to the second instruction, the ori,
 // and the ori reads and writes the same register dst.
 const int dst = inv_rta_field(inst2);
-assert(is_ori(inst2) && inv_rs_field(inst2) == dst, "must be addi reading and writing dst");
+assert(is_ori(inst2) && inv_rs_field(inst2) == dst, "must be ori reading and writing dst");
 // Now, find the preceding addis which writes to dst.
 int inst1 = 0;
 address inst1_addr = inst2_addr - BytesPerInstWord;
 bool inst1_found = false;
 while (inst1_addr >= bound) {
 int xc = (data >> 16) & 0xffff;
 int xd = (data >>  0) & 0xffff;
 set_imm((int *)inst1_addr, (short)(xc)); // see enc_load_con_narrow_hi/_lo
-set_imm((int *)inst2_addr, (short)(xd));
+set_imm((int *)inst2_addr,        (xd)); // unsigned int
 return (int)((intptr_t)inst2_addr - (intptr_t)inst1_addr);
 }
 // Get compressed oop or klass constant.
 narrowOop MacroAssembler::get_narrow_oop(address a, address bound) {
 const int inst2 = *(int *)inst2_addr;
 // The relocation points to the second instruction, the ori,
 // and the ori reads and writes the same register dst.
 const int dst = inv_rta_field(inst2);
-assert(is_ori(inst2) && inv_rs_field(inst2) == dst, "must be addi reading and writing dst");
+assert(is_ori(inst2) && inv_rs_field(inst2) == dst, "must be ori reading and writing dst");
 // Now, find the preceding lis which writes to dst.
 int inst1 = 0;
 address inst1_addr = inst2_addr - BytesPerInstWord;
 bool inst1_found = false;
 // so do a full call-c here.
 load_const(R11, (address)fd, R0);
 bool has_env = (fd != NULL && fd->env() != NULL);
 return branch_to(R11, /*and_link=*/true,
 /*save toc=*/false,
 /*restore toc=*/false,
 /*load toc=*/true,
 /*load env=*/has_env);
 } else {
 // It's a friend function. Load the entry point and don't care about
 // toc and env. Use an optimizable call instruction, but ensure the
 // same code-size as in the case of a non-friend function.
 nop();
 || !fd->is_friend_function()) {
 // It's not a friend function as defined by class FunctionDescriptor,
 // so do a full call-c here.
 load_const(R11, (address)fd, R0);
 return branch_to(R11, /*and_link=*/true,
 /*save toc=*/false,
 /*restore toc=*/false,
 /*load toc=*/true,
 /*load env=*/true);
 } else {
 // it's a friend function, load the entry point and don't care about
 // toc and env.
 address dest = fd->entry();
 if (is_within_range_of_b(dest, pc())) {
 std(displaced_header, BasicLock::displaced_header_offset_in_bytes(), box);
 // Must fence, otherwise, preceding store(s) may float below cmpxchg.
 // Compare object markOop with mark and if equal exchange scratch1 with object markOop.
 // CmpxchgX sets cr_reg to cmpX(current, displaced).
+membar(Assembler::StoreStore);
 cmpxchgd(/*flag=*/flag,
 /*current_value=*/current_header,
 /*compare_value=*/displaced_header,
 /*exchange_value=*/box,
 /*where=*/oop,
-MacroAssembler::MemBarRel | MacroAssembler::MemBarAcq,
+MacroAssembler::MemBarAcq,
 MacroAssembler::cmpxchgx_hint_acquire_lock(),
 noreg,
 &cas_failed);
 assert(oopDesc::mark_offset_in_bytes() == 0, "offset of _mark is not 0");
 void MacroAssembler::card_table_write(jbyte* byte_map_base, Register Rtmp, Register Robj) {
 assert_different_registers(Robj, Rtmp, R0);
 load_const_optimized(Rtmp, (address)byte_map_base, R0);
 srdi(Robj, Robj, CardTableModRefBS::card_shift);
 li(R0, 0); // dirty
-if (UseConcMarkSweepGC) release();
+if (UseConcMarkSweepGC) membar(Assembler::StoreStore);
 stbx(R0, Rtmp, Robj);
 }
 #ifndef SERIALGC
 std(R0, in_bytes(JavaThread::vm_result_2_offset()), R16_thread);
 }
 void MacroAssembler::encode_klass_not_null(Register dst, Register src) {
-if (src == noreg) src = dst;
+Register current = (src != noreg) ? src : dst; // Klass is in dst if no src provided.
 if (Universe::narrow_klass_base() != 0) {
-load_const(R0, Universe::narrow_klass_base());
+load_const(R0, Universe::narrow_klass_base(), (dst != current) ? dst : noreg); // Use dst as temp if it is free.
-sub(dst, src, R0);
+sub(dst, current, R0);
-}
+current = dst;
-if (Universe::narrow_klass_shift() != 0 ||
+}
-Universe::narrow_klass_base() == 0 && src != dst) {  // Move required.
+if (Universe::narrow_klass_shift() != 0) {
-srdi(dst, src, Universe::narrow_klass_shift());
+srdi(dst, current, Universe::narrow_klass_shift());
-}
+current = dst;
+}
+mr_if_needed(dst, current); // Move may be required.
 }
 void MacroAssembler::store_klass(Register dst_oop, Register klass, Register ck) {
 if (UseCompressedClassPointers) {
 encode_klass_not_null(ck, klass);

Mercurial > hg > truffle

comparison src/cpu/ppc/vm/macroAssembler_ppc.cpp @ 17793:c668f307a4c0