Mercurial > hg > truffle

comparison src/cpu/x86/vm/x86_32.ad @ 12873:4e7f99b70d9d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author adlertz
date Wed, 09 Oct 2013 05:03:34 -0700
parents 268e7a2178d7
children 59e8ad757e19
comparison
equal deleted inserted replaced
12872:98692a2d36d7 12873:4e7f99b70d9d
349 // emit 32 bit value and construct relocation entry from RelocationHolder 349 // emit 32 bit value and construct relocation entry from RelocationHolder
350 void emit_d32_reloc(CodeBuffer &cbuf, int d32, RelocationHolder const& rspec, 350 void emit_d32_reloc(CodeBuffer &cbuf, int d32, RelocationHolder const& rspec,
351 int format) { 351 int format) {
352 #ifdef ASSERT 352 #ifdef ASSERT
353 if (rspec.reloc()->type() == relocInfo::oop_type && d32 != 0 && d32 != (int)Universe::non_oop_word()) { 353 if (rspec.reloc()->type() == relocInfo::oop_type && d32 != 0 && d32 != (int)Universe::non_oop_word()) {
354 assert(oop(d32)->is_oop() && (ScavengeRootsInCode || !oop(d32)->is_scavengable()), "cannot embed scavengable oops in code"); 354 assert(cast_to_oop(d32)->is_oop() && (ScavengeRootsInCode || !cast_to_oop(d32)->is_scavengable()), "cannot embed scavengable oops in code");
355 } 355 }
356 #endif 356 #endif
357 cbuf.relocate(cbuf.insts_mark(), rspec, format); 357 cbuf.relocate(cbuf.insts_mark(), rspec, format);
358 cbuf.insts()->emit_int32(d32); 358 cbuf.insts()->emit_int32(d32);
359 } 359 }