Changeset 3832


Ignore:
Timestamp:
Apr 18, 2014, 2:26:21 AM (3 years ago)
Author:
ksherdy
Message:

Minor changes.

Location:
proto/s2k/trunk/framework/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • proto/s2k/trunk/framework/src/application/generators/ApplicationGenerator.java

    r3823 r3832  
    4444                AbstractCodeGenerator globalDefsGenerator                                                       = null;
    4545               
    46                 toolchain.b2k.lang.carrySet.CarrySetEncoder carrySetEncoder = null;
     46                toolchain.b2k.lang.runtimeInfoSet.RuntimeInfoSetEncoder runtimeInfoSetEncoder = null;
    4747                               
    4848                if(applicationConfiguration.getTarget() == Target.C_LANG) {
    4949            //s2kBuiltinsEncoder        = new toolchain.s2k.lang.S2KBuiltin2C();
    5050            b2kBuiltinsEncoder  = new toolchain.b2k.lang.B2KBuiltins2C();
    51             carrySetEncoder     = new toolchain.b2k.lang.carrySet.CarrySetBuiltins2C();
     51            runtimeInfoSetEncoder       = new toolchain.b2k.lang.runtimeInfoSet.RuntimeInfoSetBuiltins2C();
    5252                        globalDefsGenerator = new CodeGenerator(new IDISABuiltins2C(), b2kBuiltinsEncoder);                     
    5353                } else if(applicationConfiguration.getTarget() == Target.CPP_LANG) {
    5454                        //s2kBuiltinsEncoder    = new toolchain.s2k.lang.S2KBuiltin2CPP();
    5555                        b2kBuiltinsEncoder      = new toolchain.b2k.lang.B2KBuiltins2CPP();
    56                         carrySetEncoder         = new toolchain.b2k.lang.carrySet.CarrySetBuiltins2CPP();
     56                        runtimeInfoSetEncoder   = new toolchain.b2k.lang.runtimeInfoSet.RuntimeInfoSetBuiltins2CPP();
    5757                        globalDefsGenerator     = new CodeGenerator(new IDISABuiltins2CPP(), b2kBuiltinsEncoder);
    5858                } /*else if(applicationConfiguration.targetLang.contentEquals(Configuration.LLVM)) {  // default C++
     
    7676            //////////////////////////////////////////////////////////////
    7777            // s2k to b2k transformations
    78                         b2kAST = S2K2B2KTransformer.apply(b2kBuiltinsEncoder, carrySetEncoder, decoratedTree, finalBlockDecoratedTree);
     78                        b2kAST = S2K2B2KTransformer.apply(b2kBuiltinsEncoder, runtimeInfoSetEncoder, decoratedTree, finalBlockDecoratedTree);
    7979                       
    8080                } else if (applicationConfiguration.getSource() == SourceLanguage.B2K) {
  • proto/s2k/trunk/framework/src/test/s2k/TestHarness.java

    r3823 r3832  
    2424import test.helpers.FileUtil;
    2525import test.helpers.AssertNodePairComparator;
    26 import toolchain.b2k.lang.carrySet.CarrySetBuiltins2CPP;
    27 import toolchain.b2k.lang.carrySet.CarrySetEncoder;
     26import toolchain.b2k.lang.runtimeInfoSet.RuntimeInfoSetBuiltins2CPP;
     27import toolchain.b2k.lang.runtimeInfoSet.RuntimeInfoSetEncoder;
    2828import toolchain.s2k.lang.AbstractS2KBuiltinsEncoder;
    2929import toolchain.s2k.transformer.visitors.S2K2B2K.Context;
Note: See TracChangeset for help on using the changeset viewer.