Mercurial > hg > graal-jvmci-8

comparison graal/GraalCompiler/src/com/sun/c1x/target/amd64/AMD64LIRAssembler.java @ 2823:ac4b086cbd72

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Gilles Duboscq <gilles.duboscq@oracle.com>
date Mon, 30 May 2011 16:35:08 +0200
parents c379183d1c54
children 1cd59ca9ac86
comparison
equal deleted inserted replaced
2822:530366123e46 2823:ac4b086cbd72
527 assert assertEmitBranch(op); 527 assert assertEmitBranch(op);
528 528
529 if (op.cond() == Condition.TRUE) { 529 if (op.cond() == Condition.TRUE) {
530 if (op.info != null) { 530 if (op.info != null) {
531 int codePos = codePos(); 531 int codePos = codePos();
532 if (codePos > tasm.lastSafepointPos()) { 532 if (codePos <= tasm.lastSafepointPos()) {
533 tasm.recordImplicitException(codePos, op.info); 533 masm.nop();
534 } 534 }
535 tasm.recordImplicitException(codePos(), op.info);
535 } 536 }
536 masm.jmp(op.label()); 537 masm.jmp(op.label());
537 } else { 538 } else {
538 ConditionFlag acond = ConditionFlag.zero; 539 ConditionFlag acond = ConditionFlag.zero;
539 if (op.code == LIROpcode.CondFloatBranch) { 540 if (op.code == LIROpcode.CondFloatBranch) {