Changeset 4721 for icGREP/icgrep-devel


Ignore:
Timestamp:
Aug 9, 2015, 1:32:19 PM (4 years ago)
Author:
cameron
Message:

Minor fixes

Location:
icGREP/icgrep-devel/icgrep/pablo
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • icGREP/icgrep-devel/icgrep/pablo/builder.hpp

    r4718 r4721  
    123123    PabloAST * createMod64Advance(PabloAST * expr, PabloAST * shiftAmount);
    124124
     125    inline PabloAST * createMod64Advance(PabloAST * expr, const Integer::Type shiftAmount) {
     126        if (shiftAmount == 0) {
     127            return expr;
     128        }
     129        return createMod64Advance(expr, mPb->getInteger(shiftAmount));
     130    }
     131
    125132    inline PabloAST * createMod64Advance(PabloAST * expr, const Integer::Type shiftAmount, const std::string prefix) {
    126133        if (shiftAmount == 0) {
  • icGREP/icgrep-devel/icgrep/pablo/carry_manager.cpp

    r4720 r4721  
    498498
    499499void CarryManager::initializeCarryDataAtIfEntry() {
    500     if (mCarryOutPack[scopeBasePack()] == nullptr) {
    501         mCarryInfo->ifEntryPack = mZeroInitializer;
    502     }
    503     else {
    504         mCarryInfo->ifEntryPack = mCarryOutPack[scopeBasePack()];
     500    if (blockHasCarries()) {
     501        if (mCarryOutPack[scopeBasePack()] == nullptr) {
     502            mCarryInfo->ifEntryPack = mZeroInitializer;
     503        }
     504        else {
     505            mCarryInfo->ifEntryPack = mCarryOutPack[scopeBasePack()];
     506        }
    505507    }
    506508}
Note: See TracChangeset for help on using the changeset viewer.