Ignore:
Timestamp:
Jan 19, 2017, 2:41:02 PM (2 years ago)
Author:
nmedfort
Message:

Code clean-up. Removed Pablo Call, SetIthBit? and Prototype.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • icGREP/icgrep-devel/icgrep/pablo/pablo_compiler.cpp

    r5260 r5267  
    55 */
    66
    7 #include <pablo/pablo_compiler.h>
     7#include "pablo_compiler.h"
    88#include <pablo/pablo_kernel.h>
    99#include <pablo/pablo_toolchain.h>
    1010#include <pablo/codegenstate.h>
     11#include <pablo/boolean.h>
     12#include <pablo/arithmetic.h>
     13#include <pablo/branch.h>
     14#include <pablo/pe_advance.h>
     15#include <pablo/pe_lookahead.h>
     16#include <pablo/pe_matchstar.h>
     17#include <pablo/pe_scanthru.h>
     18#include <pablo/pe_infile.h>
     19#include <pablo/pe_count.h>
     20#include <pablo/pe_integer.h>
     21#include <pablo/pe_string.h>
     22#include <pablo/pe_zeroes.h>
     23#include <pablo/pe_ones.h>
     24#include <pablo/pe_var.h>
     25#include <pablo/ps_assign.h>
    1126#include <pablo/carry_manager.h>
    12 #include <pablo/printer_pablos.h>
    13 #include <pablo/prototype.h>
    14 #include <stdexcept>
    15 #include <sstream>
    1627#include <IR_Gen/idisa_builder.h>
    1728#include <llvm/IR/Module.h>
    18 #include <llvm/IR/IRBuilder.h>
    19 #include <iostream>
    20 #include <hrtime.h>
    21 #include <llvm/Support/Debug.h>
     29
     30using namespace llvm;
    2231
    2332namespace pablo {
     
    142151            std::string tmp;
    143152            raw_string_ostream out(tmp);
    144             PabloPrinter::print(var, out);
     153            var->print(out);
    145154            out << " is uninitialized prior to entering ";
    146             PabloPrinter::print(ifStatement, out);
     155            ifStatement->print(out);
    147156            llvm::report_fatal_error(out.str());
    148157        }
     
    186195            std::string tmp;
    187196            raw_string_ostream out(tmp);
    188             PabloPrinter::print(var, out);
     197            var->print(out);
    189198            out << " was not assigned a value.";
    190199            llvm::report_fatal_error(out.str());
     
    246255            std::string tmp;
    247256            raw_string_ostream out(tmp);
    248             PabloPrinter::print(var, out);
     257            var->print(out);
    249258            out << " is uninitialized prior to entering ";
    250             PabloPrinter::print(whileStatement, out);
     259            whileStatement->print(out);
    251260            llvm::report_fatal_error(out.str());
    252261        }
     
    298307            std::string tmp;
    299308            raw_string_ostream out(tmp);
    300             PabloPrinter::print(var, out);
     309            var->print(out);
    301310            out << " was not assigned a value.";
    302311            llvm::report_fatal_error(out.str());
     
    474483        } else {
    475484            std::string tmp;
    476             llvm::raw_string_ostream msg(tmp);
    477             msg << "Internal error: ";
    478             PabloPrinter::print(stmt, msg);
    479             msg << " is not a recognized statement in the Pablo compiler.";
    480             throw std::runtime_error(msg.str());
     485            llvm::raw_string_ostream out(tmp);
     486            out << "Internal error: ";
     487            stmt->print(out);
     488            out << " is not a recognized statement in the Pablo compiler.";
     489            throw std::runtime_error(out.str());
    481490        }
    482491
     
    535544        std::string tmp;
    536545        llvm::raw_string_ostream out(tmp);
    537         PabloPrinter::print(expr, out);
     546        expr->print(out);
    538547        out << " was used before definition!";
    539548        throw std::runtime_error(out.str());
Note: See TracChangeset for help on using the changeset viewer.