# HG changeset patch # User Max Brister # Date 1337894706 21600 # Node ID 13465aab507f4773b7eb3a0f6a2fc7721d97d5eb # Parent 232d8ab07932c0ac00a65a4440a0f3f95156bfe2 Removed dead functions * src/pt-jit.cc (jit_typeinfo::do_to_generic, jit_typeinfo::do_to_octave_value) (jit_typeinfo::do_reset_generic): Removed * src/pt-jit.h (jit_typeinfo::to_generic, jit_typeinfo::to_octave_value) (jit_typeinfo::reset_generic): Removed diff --git a/src/pt-jit.cc b/src/pt-jit.cc --- a/src/pt-jit.cc +++ b/src/pt-jit.cc @@ -47,7 +47,6 @@ #include #include #include -#include #include "octave.h" #include "ov-fcn-handle.h" @@ -561,74 +560,6 @@ return get_any (); } -void -jit_typeinfo::do_to_generic (jit_type *type, llvm::GenericValue& gv) -{ - if (type == any) - do_to_generic (type, gv, octave_value ()); - else if (type == scalar) - do_to_generic (type, gv, octave_value (0)); - else if (type == range) - do_to_generic (type, gv, octave_value (Range ())); - else - assert (false && "Type not supported yet"); -} - -void -jit_typeinfo::do_to_generic (jit_type *type, llvm::GenericValue& gv, octave_value ov) -{ - if (type == any) - { - octave_base_value *obv = ov.internal_rep (); - obv->grab (); - ov_out.push_back (obv); - gv.PointerVal = &ov_out.back (); - } - else if (type == scalar) - { - scalar_out.push_back (ov.double_value ()); - gv.PointerVal = &scalar_out.back (); - } - else if (type == range) - { - range_out.push_back (ov.range_value ()); - gv.PointerVal = &range_out.back (); - } - else - assert (false && "Type not supported yet"); -} - -octave_value -jit_typeinfo::do_to_octave_value (jit_type *type, llvm::GenericValue& gv) -{ - if (type == any) - { - octave_base_value **ptr = reinterpret_cast(gv.PointerVal); - return octave_value (*ptr); - } - else if (type == scalar) - { - double *ptr = reinterpret_cast(gv.PointerVal); - return octave_value (*ptr); - } - else if (type == range) - { - jit_range *ptr = reinterpret_cast(gv.PointerVal); - Range rng = *ptr; - return octave_value (rng); - } - else - assert (false && "Type not supported yet"); -} - -void -jit_typeinfo::do_reset_generic (void) -{ - scalar_out.clear (); - ov_out.clear (); - range_out.clear (); -} - jit_type* jit_typeinfo::new_type (const std::string& name, jit_type *parent, llvm::Type *llvm_type) diff --git a/src/pt-jit.h b/src/pt-jit.h --- a/src/pt-jit.h +++ b/src/pt-jit.h @@ -81,7 +81,6 @@ class BasicBlock; class LLVMContext; class Type; - class GenericValue; class Twine; } @@ -309,26 +308,6 @@ { return instance->do_cast (to, from); } - - static void to_generic (jit_type *type, llvm::GenericValue& gv) - { - return instance->do_to_generic (type, gv); - } - - static void to_generic (jit_type *type, llvm::GenericValue& gv, octave_value ov) - { - return instance->do_to_generic (type, gv, ov); - } - - static octave_value to_octave_value (jit_type *type, llvm::GenericValue& gv) - { - return instance->do_to_octave_value (type, gv); - } - - static void reset_generic (void) - { - instance->do_reset_generic (); - } private: jit_typeinfo (llvm::Module *m, llvm::ExecutionEngine *e); @@ -380,14 +359,6 @@ return binary_ops[op]; } - void do_to_generic (jit_type *type, llvm::GenericValue& gv); - - void do_to_generic (jit_type *type, llvm::GenericValue& gv, octave_value ov); - - octave_value do_to_octave_value (jit_type *type, llvm::GenericValue& gv); - - void do_reset_generic (void); - const jit_function& do_cast (jit_type *to) { static jit_function null_function; @@ -500,10 +471,6 @@ // type id -> identity function std::vector identities; - - std::list scalar_out; - std::list ov_out; - std::list range_out; }; // The low level octave jit ir