Added support for computed goto extension

src/Block.cpp

@@ -65,6 +65,8 @@
 #include "Expression.h"
 #include "VectorFilter.h"
 
+#include <string>
+#include <vector>
 using namespace std;
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -188,14 +190,40 @@ Block::make_random(CGContext &cg_context, bool looping)
 
 	curr_func->stack.pop_back();
 	if (Error::get_error() != SUCCESS) {
-		//curr_func->stack.pop_back();
+		curr_func->stack.pop_back();
 		delete b;
 		return NULL;
 	}
 
 	// ISSUE: in the exhaustive mode, do we need a return statement here
 	// if the last statement is not?
 	Error::set_error(SUCCESS);
+
+
+	if(CGOptions::computed_goto()){
+		if(curr_func->blocks[0]->stm_id==b->stm_id){
+			std::vector<string> labels;
+			labels.clear();
+			curr_func->blocks[0]->find_contained_labels(labels);
+			string ss="";
+			for (std::vector<string>::iterator itr=labels.begin();itr!=labels.end();itr++) {
+				ss.clear();
+				ss += "&&";
+				ss += *itr;
+				curr_func->blocks[0]->addr_labels.push_back(ss);//only adds in the main array related to function.
+			}
+			//__________________________________________________________
+			for (size_t i=0; i<fm->cfg_edges.size();i++) {
+				const CFGEdge* e = fm->cfg_edges[i];
+				if(e->src->eType == eGoto) {
+					const StatementGoto* sg = dynamic_cast<const StatementGoto* >(e->src);
+					assert(sg);
+					sg->change_label(curr_func->blocks[0]->addr_labels);
+				}
+			}
+
+		}
+	}
 	return b;
 }
 
@@ -295,6 +323,10 @@ Block::Output(std::ostream &out, FactMgr* fm, int indent) const
 	ss << "block id: " << stm_id;
 	output_comment_line(out, ss.str());
 
+	if(CGOptions::computed_goto()){
+		if(!this->addr_labels.empty())
+		this->print_label_addr_array(out,indent);
+	}
 	if (CGOptions::depth_protect()) {
 		out << "DEPTH++;" << endl;
 	}
@@ -805,6 +837,19 @@ Block::post_creation_analysis(CGContext& cg_context, const Effect& pre_effect)
 	}
 }
 
+void
+Block::print_label_addr_array(std::ostream &out , int indent) const{
+	ostringstream ss;
+	output_tab (out,indent);
+	cout << "/*\nNUMBER OF GOTO'S IN ABOVEE BLOCK:" << addr_labels.size()  << "*\/";
+	cout << "\nvoid *target[] = { ";
+	for(unsigned int i=0; i < addr_labels.size();i++){
+		i!=0 ? cout << ", " : cout << "";
+		cout << addr_labels[i];
+	}
+
+	cout << "};\n";
+}
 ///////////////////////////////////////////////////////////////////////////////
 
 // Local Variables:

src/Block.h

@@ -80,6 +80,9 @@ class Block : public Statement
     Block* random_parent_block(void);
 
 	int block_size() { return block_size_; }
+	std::vector<string> addr_labels;
+	void print_label_addr_array(std::ostream&, int) const;
+
 	// These are currently accessed directly.
 	std::vector<Statement *> stms;
 	std::vector<Statement *> deleted_stms;

src/CGOptions.cpp

@@ -199,6 +199,7 @@ DEFINE_GETTER_SETTER_BOOL(const_struct_union_fields);
 DEFINE_GETTER_SETTER_BOOL(lang_cpp);
 DEFINE_GETTER_SETTER_BOOL(cpp11);
 DEFINE_GETTER_SETTER_BOOL(fast_execution);
+DEFINE_GETTER_SETTER_BOOL(computed_goto);
 
 void
 CGOptions::set_default_builtin_kinds()
@@ -313,6 +314,7 @@ CGOptions::set_default_settings(void)
   fast_execution(false);
 
 	set_default_builtin_kinds();
+	computed_goto(false);
 }
 
 // Add options necessary for cpp 

src/CGOptions.h

@@ -363,6 +363,8 @@ class CGOptions {
 	static bool signed_char_index(void);
 	static bool signed_char_index(bool p);
 
+	static bool computed_goto(void);
+	static bool computed_goto(bool p);
 	/////////////////////////////////////////////////////////
 	static void set_default_settings(void);
 
@@ -579,6 +581,7 @@ class CGOptions {
 	static bool no_return_dead_ptr_;
 	static bool hash_value_printf_;
 	static bool signed_char_index_;
+	static bool computed_goto_;
 	static std::string	dump_default_probabilities_;
 	static std::string	dump_random_probabilities_;
 	static std::string	probability_configuration_;

src/DefaultProgramGenerator.cpp

@@ -91,7 +91,6 @@ void
 DefaultProgramGenerator::goGenerator()
 {
 	output_mgr_->OutputHeader(argc_, argv_, seed_);
-
 	GenerateAllTypes();
 	GenerateFunctions();
 	output_mgr_->Output();

src/RandomProgramGenerator.cpp

@@ -176,6 +176,9 @@ static void print_help()
 	cout << "  --inline-function | --no-inline-function: enable | disable inline attributes on generated functions." << endl << endl;
 	cout << "  --inline-function-prob <num>: set the probability of each function being marked as inline (default is 50)." << endl << endl;
 
+	//GCC C extensions
+	cout << "  --computed-goto | --no-computed-goto: enable | disable computed goto extension (disable by default)." << endl << endl;
+
 	// numbered controls
 	cout << "  --max-array-dim <num>: limit array dimensions to <num>. (default 3)" << endl << endl;
 	cout << "  --max-array-len-per-dim <num>: limit array length per dimension to <num> (default 10)." << endl << endl;
@@ -850,6 +853,16 @@ main(int argc, char **argv)
 			continue;
 		}
 
+		if (strcmp (argv[i], "--computed-goto") == 0) {
+			CGOptions::computed_goto(true);
+			continue;
+		}
+
+		if (strcmp (argv[i], "--no-computed-goto") == 0) {
+			CGOptions::computed_goto(false);
+			continue;
+		}
+
 		if (strcmp (argv[i], "--no-jumps") == 0) {
 			CGOptions::jumps(false);
 			continue;

src/StatementGoto.cpp

@@ -260,7 +260,11 @@ StatementGoto::Output(std::ostream &out, FactMgr* /*fm*/, int indent) const
 	out << ")";
 	outputln(out);
 	output_tab(out, indent+1);
-	out << "goto " << label << ";";
+
+	if(CGOptions::computed_goto())
+		out << "goto " << other_name_for_label << ";";
+	else
+		out << "goto " << label << ";";
 	outputln(out);
 }
 
@@ -416,6 +420,27 @@ StatementGoto::doFinalization(void)
 	stm_labels.clear();
 }
 
+void
+StatementGoto::change_label(std::vector<string> addr_labels) const{
+	string find_label="";
+	find_label+="&&";
+	find_label+=label;
+	auto it = std::find(addr_labels.begin(),addr_labels.end(),find_label);
+	int index;
+	if(it == addr_labels.end()){
+		assert ("LABEL NOT FOUND");
+	}
+	else{
+	index = std::distance (addr_labels.begin(),it);
+	}
+	std::stringstream ss;
+	ss.clear();
+	ss<< "*target[";
+	ss<<index;
+	ss<<"]";
+	other_name_for_label="";
+	other_name_for_label=ss.str();
+}
 ///////////////////////////////////////////////////////////////////////////////
 
 // Local Variables:

src/StatementGoto.h

@@ -72,6 +72,9 @@ class StatementGoto : public Statement
 	std::string label;
 	std::vector<const Variable*> init_skipped_vars;
 	static std::map<const Statement*, std::string> stm_labels;
+
+	mutable std::string other_name_for_label;
+	void change_label(std::vector<string> addr_labels) const;
 };
 
 ///////////////////////////////////////////////////////////////////////////////