Mercurial > hg > octave-nkf

comparison src/pt-jit.cc @ 14960:c959136f8c3e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename jit_check_error to jit_error_check * src/pt-jit.h (JIT_VISIT_IR_NOTEMPLATE, jit_check_error): Replace check_error with error_check. * src/pt-jit.cc (jit_convert::visit_binary_expression, jit_convert::visit_if_command_list, jit_convert::remove_dead, jit_convert::convert_llvm::visit): Replace check_error with error_check.
author Max Brister <max@2bass.com>
date Tue, 19 Jun 2012 12:36:53 -0500
parents 12fd4a62d633
children 903a5ee2cdde
comparison
equal deleted inserted replaced
14959:12fd4a62d633 14960:c959136f8c3e
1616 1616
1617 const jit_function& fn = jit_typeinfo::binary_op (be.op_type ()); 1617 const jit_function& fn = jit_typeinfo::binary_op (be.op_type ());
1618 jit_call *call = block->append (create<jit_call> (fn, lhsv, rhsv)); 1618 jit_call *call = block->append (create<jit_call> (fn, lhsv, rhsv));
1619 1619
1620 jit_block *normal = create<jit_block> (block->name ()); 1620 jit_block *normal = create<jit_block> (block->name ());
1621 block->append (create<jit_check_error> (call, normal, final_block)); 1621 block->append (create<jit_error_check> (call, normal, final_block));
1622 add_block (normal); 1622 add_block (normal);
1623 block = normal; 1623 block = normal;
1624 result = call; 1624 result = call;
1625 } 1625 }
1626 1626
1873 cond); 1873 cond);
1874 block->append (check); 1874 block->append (check);
1875 1875
1876 jit_block *next = create<jit_block> (block->name ()); 1876 jit_block *next = create<jit_block> (block->name ());
1877 add_block (next); 1877 add_block (next);
1878 block->append (create<jit_check_error> (check, next, final_block)); 1878 block->append (create<jit_error_check> (check, next, final_block));
1879 block = next; 1879 block = next;
1880 1880
1881 jit_block *body = create<jit_block> (i == 0 ? "if_body" 1881 jit_block *body = create<jit_block> (i == 0 ? "if_body"
1882 : "ifelse_body"); 1882 : "ifelse_body");
1883 add_block (body); 1883 add_block (body);
1938 jit_call *call = create<jit_call> (jit_typeinfo::paren_subsref, object, 1938 jit_call *call = create<jit_call> (jit_typeinfo::paren_subsref, object,
1939 index); 1939 index);
1940 block->append (call); 1940 block->append (call);
1941 1941
1942 jit_block *normal = create<jit_block> (block->name ()); 1942 jit_block *normal = create<jit_block> (block->name ());
1943 block->append (create<jit_check_error> (call, normal, final_block)); 1943 block->append (create<jit_error_check> (call, normal, final_block));
1944 add_block (normal); 1944 add_block (normal);
1945 block = normal; 1945 block = normal;
1946 result = call; 1946 result = call;
1947 } 1947 }
1948 1948
2348 for (biter = blocks.begin (); biter != blocks.end ();) 2348 for (biter = blocks.begin (); biter != blocks.end ();)
2349 { 2349 {
2350 jit_block *b = *biter; 2350 jit_block *b = *biter;
2351 if (b->alive ()) 2351 if (b->alive ())
2352 { 2352 {
2353 // FIXME: A special case for jit_check_error, if we generalize to 2353 // FIXME: A special case for jit_error_check, if we generalize to
2354 // we will need to change! 2354 // we will need to change!
2355 jit_terminator *term = b->terminator (); 2355 jit_terminator *term = b->terminator ();
2356 if (term && term->successor_count () == 2 && ! term->alive (0)) 2356 if (term && term->successor_count () == 2 && ! term->alive (0))
2357 { 2357 {
2358 jit_block *succ = term->successor (1); 2358 jit_block *succ = term->successor (1);
2687 { 2687 {
2688 fail ("ERROR: SSA construction should remove all variables"); 2688 fail ("ERROR: SSA construction should remove all variables");
2689 } 2689 }
2690 2690
2691 void 2691 void
2692 jit_convert::convert_llvm::visit (jit_check_error& check) 2692 jit_convert::convert_llvm::visit (jit_error_check& check)
2693 { 2693 {
2694 llvm::Value *cond = jit_typeinfo::insert_error_check (); 2694 llvm::Value *cond = jit_typeinfo::insert_error_check ();
2695 llvm::Value *br = builder.CreateCondBr (cond, check.successor_llvm (0), 2695 llvm::Value *br = builder.CreateCondBr (cond, check.successor_llvm (0),
2696 check.successor_llvm (1)); 2696 check.successor_llvm (1));
2697 check.stash_llvm (br); 2697 check.stash_llvm (br);